diff --git a/Docs/Manual/English/Command_line.xml b/Docs/Manual/English/Command_line.xml
index bfd463f198a..9343db0f2e2 100644
--- a/Docs/Manual/English/Command_line.xml
+++ b/Docs/Manual/English/Command_line.xml
@@ -264,7 +264,7 @@
Specifies the type of window in which to display files.
This can be one of the keywords Text,
Table, Binary,
- Image or Webpage.
+ Image, Webpage or Folder.
diff --git a/Docs/Manual/French/Command_line.xml b/Docs/Manual/French/Command_line.xml
index ff0b6eee389..e40aafa70b3 100644
--- a/Docs/Manual/French/Command_line.xml
+++ b/Docs/Manual/French/Command_line.xml
@@ -195,8 +195,8 @@ masque de filtre ou d'un nom contenant des espaces.
Spécifie le type de fenêtre dans laquelle afficher les fichiers. Cela peut
être l'un des mots-clés Text (Texte),
Table (Tableau), Binary
-(Binaire), Image ou Webpage
-(Page Web).
+(Binaire), Image, Webpage
+(Page Web) ou Folder.
diff --git a/Docs/Manual/Hebrew/Command_line.xml b/Docs/Manual/Hebrew/Command_line.xml
index cf55b90a381..80cf8361104 100644
--- a/Docs/Manual/Hebrew/Command_line.xml
+++ b/Docs/Manual/Hebrew/Command_line.xml
@@ -184,8 +184,8 @@ keywords Full, Quick,
מציין את סוג החלון בו יוצגו קבצים. זה יכול להיות אחד ממילות המפתח
Text, Table,
-Binary, Image או
-Webpage.
+Binary, Image,
+Webpage או Folder.
diff --git a/Docs/Manual/Italian/Command_line.xml b/Docs/Manual/Italian/Command_line.xml
index c0653d06945..3c5e6f528ca 100644
--- a/Docs/Manual/Italian/Command_line.xml
+++ b/Docs/Manual/Italian/Command_line.xml
@@ -186,10 +186,11 @@ delle parole chiave Full,
- Specifica il tipo di finestra in cui visualizzare i file.Può essere una
-delle parole chiave Testo,
-Tabella, Binario,
-Immagine o Pagina Web.
+ Specifica il tipo di finestra in cui visualizzare i file. Può essere una
+delle parole chiave Text,
+Table, Binary,
+Image, Webpage o
+Folder.
diff --git a/Docs/Manual/Japanese/Command_line.xml b/Docs/Manual/Japanese/Command_line.xml
index 913c153482a..42eef216fec 100644
--- a/Docs/Manual/Japanese/Command_line.xml
+++ b/Docs/Manual/Japanese/Command_line.xml
@@ -173,7 +173,8 @@ Develのようなファイルフィルターの名前です。スペ
ファイルを表示するウィンドウの種類を指定します。次のキーワードが指定できます。 Text,
Table, Binary,
-Image, Webpage
+Image, Webpage,
+Folder
diff --git a/Src/7zCommon.cpp b/Src/7zCommon.cpp
index d82c59d27f4..7345d06a2c4 100644
--- a/Src/7zCommon.cpp
+++ b/Src/7zCommon.cpp
@@ -732,4 +732,16 @@ DecompressResult DecompressArchive(HWND hWnd, const PathContext& files)
return res;
}
+void Merge7zInitFlags()
+{
+ if (m_Merge7z.Merge7z[0])
+ return;
+ LANGID wLangID = (LANGID)GetThreadLocale();
+ DWORD flags = Merge7z::Initialize::Default | Merge7z::Initialize::Local7z | (wLangID << 16);
+ if (GetOptionsMgr()->GetBool(OPT_ARCHIVE_PROBETYPE))
+ {
+ flags |= Merge7z::Initialize::GuessFormatBySignature | Merge7z::Initialize::GuessFormatByExtension;
+ }
+ ((interface Merge7z*)m_Merge7z.Merge7z[1])->Initialize(flags);
+}
diff --git a/Src/7zCommon.h b/Src/7zCommon.h
index 22691aa6d96..f3a1d3ccdf1 100644
--- a/Src/7zCommon.h
+++ b/Src/7zCommon.h
@@ -106,3 +106,5 @@ struct DecompressResult
HRESULT hr;
};
DecompressResult DecompressArchive(HWND hWnd, const PathContext& infiles);
+void Merge7zInitFlags();
+
diff --git a/Src/Common/ScopeExit.h b/Src/Common/ScopeExit.h
new file mode 100644
index 00000000000..b52daebca3e
--- /dev/null
+++ b/Src/Common/ScopeExit.h
@@ -0,0 +1,111 @@
+/**
+ * @file ScopeExit.h
+ *
+ * @brief std::scope_exit-like implementation (C++20 Library Fundamentals TS v3)
+ *
+ * This file provides a scope exit mechanism similar to std::scope_exit from
+ * the C++20 Library Fundamentals TS. It executes a function when leaving scope.
+ *
+ * Usage example:
+ * void foo() {
+ * FILE* file = fopen("test.txt", "r");
+ * auto guard = make_scope_exit([file] { if (file) fclose(file); });
+ *
+ * // ... use file ...
+ * // file will be automatically closed when leaving scope
+ * }
+ *
+ * With release():
+ * void bar() {
+ * auto guard = make_scope_exit([]{ cleanup(); });
+ * if (success) {
+ * guard.release(); // Don't execute cleanup
+ * }
+ * }
+ */
+#pragma once
+
+#include
+#include
+
+/**
+ * @brief RAII wrapper that executes a function when going out of scope
+ *
+ * This class template is similar to std::experimental::scope_exit.
+ * The exit function is stored directly (not through std::function) for efficiency.
+ *
+ * @tparam EF The type of the exit function
+ */
+template
+class scope_exit
+{
+public:
+ /**
+ * @brief Constructs a scope_exit from an exit function
+ * @param f Exit function to be executed on scope exit
+ */
+ template::value &&
+ !std::is_same::type>::type, scope_exit>::value
+ >::type>
+ explicit scope_exit(EFP&& f) noexcept(std::is_nothrow_constructible::value || std::is_nothrow_constructible::value)
+ : m_exit_function(std::forward(f))
+ , m_execute_on_destruction(true)
+ {
+ }
+
+ /**
+ * @brief Move constructor
+ */
+ scope_exit(scope_exit&& other) noexcept(std::is_nothrow_move_constructible::value || std::is_nothrow_copy_constructible::value)
+ : m_exit_function(std::forward(other.m_exit_function))
+ , m_execute_on_destruction(other.m_execute_on_destruction)
+ {
+ other.release();
+ }
+
+ /**
+ * @brief Destructor - executes the exit function if active
+ */
+ ~scope_exit() noexcept
+ {
+ if (m_execute_on_destruction)
+ {
+ m_exit_function();
+ }
+ }
+
+ /**
+ * @brief Disables the execution of the exit function
+ */
+ void release() noexcept
+ {
+ m_execute_on_destruction = false;
+ }
+
+ // Non-copyable and non-move-assignable
+ scope_exit(const scope_exit&) = delete;
+ scope_exit& operator=(const scope_exit&) = delete;
+ scope_exit& operator=(scope_exit&&) = delete;
+
+private:
+ EF m_exit_function;
+ bool m_execute_on_destruction;
+};
+
+/**
+ * @brief Creates a scope_exit object, deducing the template argument type
+ *
+ * This is the recommended way to create scope_exit objects.
+ *
+ * @tparam EF The type of the exit function (deduced)
+ * @param f Exit function to be executed on scope exit
+ * @return scope_exit object
+ */
+template
+scope_exit::type> make_scope_exit(EF&& f) noexcept(noexcept(scope_exit::type>(std::forward(f))))
+{
+ return scope_exit::type>(std::forward(f));
+}
+
diff --git a/Src/DirDoc.cpp b/Src/DirDoc.cpp
index 8194543abe5..0522816e4ee 100644
--- a/Src/DirDoc.cpp
+++ b/Src/DirDoc.cpp
@@ -887,7 +887,8 @@ void CDirDoc::SetTitle(LPCTSTR lpszTitle)
{
String strPath = m_pCtxt->GetPath(index);
ApplyDisplayRoot(index, strPath);
- sDirName[index] = paths::FindFileName(strPath);
+ const String& desc = m_strDesc[index];
+ sDirName[index] = desc.empty() ? paths::FindFileName(strPath) : desc;
}
if (std::count(&sDirName[0], &sDirName[0] + m_nDirs, sDirName[0]) == m_nDirs)
sTitle = sDirName[0] + strutils::format(_T(" x %d"), m_nDirs);
diff --git a/Src/DirView.cpp b/Src/DirView.cpp
index 750374d2dcd..0b330d2d0f4 100644
--- a/Src/DirView.cpp
+++ b/Src/DirView.cpp
@@ -250,9 +250,9 @@ BEGIN_MESSAGE_MAP(CDirView, CListView)
ON_UPDATE_COMMAND_UI(ID_MERGE_COMPARE_LEFT2_RIGHT1, OnUpdateMergeCompare2)
ON_COMMAND(ID_MERGE_COMPARE_NONHORIZONTALLY, OnMergeCompareNonHorizontally)
// Context menu -> Compare As
- ON_COMMAND_RANGE(ID_MERGE_COMPARE_TEXT, ID_MERGE_COMPARE_WEBPAGE, OnMergeCompareAs)
+ ON_COMMAND_RANGE(ID_MERGE_COMPARE_TEXT, ID_MERGE_COMPARE_FOLDER, OnMergeCompareAs)
ON_COMMAND_RANGE(ID_UNPACKERS_FIRST, ID_UNPACKERS_LAST, OnMergeCompareAs)
- ON_UPDATE_COMMAND_UI_RANGE(ID_MERGE_COMPARE_TEXT, ID_MERGE_COMPARE_WEBPAGE, OnUpdateMergeCompare)
+ ON_UPDATE_COMMAND_UI_RANGE(ID_MERGE_COMPARE_TEXT, ID_MERGE_COMPARE_FOLDER, OnUpdateMergeCompare)
ON_UPDATE_COMMAND_UI(ID_NO_UNPACKER, OnUpdateNoUnpacker)
// Context menu -> Copy
ON_COMMAND(ID_DIR_COPY_LEFT_TO_RIGHT, (OnCtxtDirCopy))
@@ -726,8 +726,6 @@ void CDirView::OnContextMenu(CWnd*, CPoint point)
{
if (CMouseHook::IsRightWheelScrolling())
return;
- if (GetListCtrl().GetItemCount() == 0)
- return;
// Make sure window is active
GetParentFrame()->ActivateFrame();
@@ -769,6 +767,9 @@ void CDirView::OnContextMenu(CWnd*, CPoint point)
return;
}
+ if (GetListCtrl().GetItemCount() == 0)
+ return;
+
ListContextMenu(point, i);
}
@@ -4344,7 +4345,7 @@ void CDirView::OnUpdateOptionsShowMissingRightOnly(CCmdUI* pCmdUI)
*/
void CDirView::OnMergeCompare(UINT nID)
{
- bool openableForDir = !((nID >= ID_MERGE_COMPARE_TEXT && nID <= ID_MERGE_COMPARE_WEBPAGE) ||
+ bool openableForDir = !((nID >= ID_MERGE_COMPARE_TEXT && nID <= ID_MERGE_COMPARE_FOLDER) ||
(nID >= ID_UNPACKERS_FIRST && nID <= ID_UNPACKERS_LAST));
if (AreItemsComparable(SELECTIONTYPE_NORMAL, openableForDir))
@@ -4489,7 +4490,7 @@ void CDirView::OnMergeCompareNonHorizontally()
*/
void CDirView::OnMergeCompareAs(UINT nID)
{
- if (nID >= ID_MERGE_COMPARE_TEXT && nID <= ID_MERGE_COMPARE_WEBPAGE)
+ if (nID >= ID_MERGE_COMPARE_TEXT && nID <= ID_MERGE_COMPARE_FOLDER)
{
if (AreItemsComparable(SELECTIONTYPE_NORMAL, false))
{
@@ -4527,7 +4528,7 @@ void CDirView::OnMergeCompareAs(UINT nID)
*/
void CDirView::OnUpdateMergeCompare(CCmdUI *pCmdUI)
{
- bool openableForDir = !((pCmdUI->m_nID >= ID_MERGE_COMPARE_TEXT && pCmdUI->m_nID <= ID_MERGE_COMPARE_WEBPAGE) ||
+ bool openableForDir = !((pCmdUI->m_nID >= ID_MERGE_COMPARE_TEXT && pCmdUI->m_nID <= ID_MERGE_COMPARE_FOLDER) ||
(pCmdUI->m_nID >= ID_UNPACKERS_FIRST && pCmdUI->m_nID <= ID_UNPACKERS_LAST));
bool bOn = AreItemsComparable(SELECTIONTYPE_NORMAL, openableForDir);
diff --git a/Src/HexMergeDoc.cpp b/Src/HexMergeDoc.cpp
index 4b503c74773..c33e27ce2db 100644
--- a/Src/HexMergeDoc.cpp
+++ b/Src/HexMergeDoc.cpp
@@ -64,8 +64,8 @@ BEGIN_MESSAGE_MAP(CHexMergeDoc, CDocument)
ON_UPDATE_COMMAND_UI(ID_FILE_SAVE_MIDDLE, OnUpdateFileSaveMiddle)
ON_UPDATE_COMMAND_UI(ID_FILE_SAVE_RIGHT, OnUpdateFileSaveRight)
ON_COMMAND(ID_RESCAN, OnFileReload)
- ON_COMMAND_RANGE(ID_MERGE_COMPARE_TEXT, ID_MERGE_COMPARE_WEBPAGE, OnFileRecompareAs)
- ON_UPDATE_COMMAND_UI_RANGE(ID_MERGE_COMPARE_TEXT, ID_MERGE_COMPARE_WEBPAGE, OnUpdateFileRecompareAs)
+ ON_COMMAND_RANGE(ID_MERGE_COMPARE_TEXT, ID_MERGE_COMPARE_FOLDER, OnFileRecompareAs)
+ ON_UPDATE_COMMAND_UI_RANGE(ID_MERGE_COMPARE_TEXT, ID_MERGE_COMPARE_FOLDER, OnUpdateFileRecompareAs)
// [View] menu
ON_COMMAND(ID_VIEW_ZOOMIN, OnViewZoomIn)
ON_COMMAND(ID_VIEW_ZOOMOUT, OnViewZoomOut)
diff --git a/Src/ImgMergeFrm.cpp b/Src/ImgMergeFrm.cpp
index 1c6d81323d9..b179b38f456 100644
--- a/Src/ImgMergeFrm.cpp
+++ b/Src/ImgMergeFrm.cpp
@@ -77,8 +77,8 @@ BEGIN_MESSAGE_MAP(CImgMergeFrame, CMergeFrameCommon)
ON_COMMAND(ID_FILE_RIGHT_READONLY, OnFileReadOnlyRight)
ON_UPDATE_COMMAND_UI(ID_FILE_RIGHT_READONLY, OnUpdateFileReadOnlyRight)
ON_COMMAND(ID_RESCAN, OnFileReload)
- ON_COMMAND_RANGE(ID_MERGE_COMPARE_TEXT, ID_MERGE_COMPARE_WEBPAGE, OnFileRecompareAs)
- ON_UPDATE_COMMAND_UI_RANGE(ID_MERGE_COMPARE_TEXT, ID_MERGE_COMPARE_WEBPAGE, OnUpdateFileRecompareAs)
+ ON_COMMAND_RANGE(ID_MERGE_COMPARE_TEXT, ID_MERGE_COMPARE_FOLDER, OnFileRecompareAs)
+ ON_UPDATE_COMMAND_UI_RANGE(ID_MERGE_COMPARE_TEXT, ID_MERGE_COMPARE_FOLDER, OnUpdateFileRecompareAs)
// [Edit] menu
ON_COMMAND(ID_EDIT_UNDO, OnEditUndo)
ON_UPDATE_COMMAND_UI(ID_EDIT_UNDO, OnUpdateEditUndo)
diff --git a/Src/MainFrm.cpp b/Src/MainFrm.cpp
index 2abb7f1497f..c58ae01bb2c 100644
--- a/Src/MainFrm.cpp
+++ b/Src/MainFrm.cpp
@@ -17,6 +17,7 @@
#if !defined(__cppcheck__)
#include
#endif
+#include "ScopeExit.h"
#include "Constants.h"
#include "Merge.h"
#include "FileFilterHelper.h"
@@ -111,11 +112,13 @@ const CMainFrame::MENUITEM_ICON CMainFrame::m_MenuIcons[] = {
{ ID_FILE_NEW_HEX, IDB_FILE_NEW_HEX, CMainFrame::MENU_ALL },
{ ID_FILE_NEW_IMAGE, IDB_FILE_NEW_IMAGE, CMainFrame::MENU_ALL },
{ ID_FILE_NEW_WEBPAGE, IDB_FILE_NEW_WEBPAGE, CMainFrame::MENU_ALL },
+ { ID_FILE_NEW_FOLDER, IDB_FILE_NEW_FOLDER, CMainFrame::MENU_ALL },
{ ID_FILE_NEW3, IDB_FILE_NEW3, CMainFrame::MENU_ALL },
{ ID_FILE_NEW3_TABLE, IDB_FILE_NEW3_TABLE, CMainFrame::MENU_ALL },
{ ID_FILE_NEW3_HEX, IDB_FILE_NEW3_HEX, CMainFrame::MENU_ALL },
{ ID_FILE_NEW3_IMAGE, IDB_FILE_NEW3_IMAGE, CMainFrame::MENU_ALL },
{ ID_FILE_NEW3_WEBPAGE, IDB_FILE_NEW3_WEBPAGE, CMainFrame::MENU_ALL },
+ { ID_FILE_NEW3_FOLDER, IDB_FILE_NEW_FOLDER, CMainFrame::MENU_ALL },
{ ID_EDIT_COPY, IDB_EDIT_COPY, CMainFrame::MENU_ALL },
{ ID_EDIT_CUT, IDB_EDIT_CUT, CMainFrame::MENU_ALL },
{ ID_EDIT_PASTE, IDB_EDIT_PASTE, CMainFrame::MENU_ALL },
@@ -250,11 +253,13 @@ BEGIN_MESSAGE_MAP(CMainFrame, CMDIFrameWnd)
ON_COMMAND(ID_FILE_NEW_HEX, (OnFileNew<2, ID_MERGE_COMPARE_HEX>))
ON_COMMAND(ID_FILE_NEW_IMAGE, (OnFileNew<2, ID_MERGE_COMPARE_IMAGE>))
ON_COMMAND(ID_FILE_NEW_WEBPAGE, (OnFileNew<2, ID_MERGE_COMPARE_WEBPAGE>))
+ ON_COMMAND(ID_FILE_NEW_FOLDER, (OnFileNew<2, ID_MERGE_COMPARE_FOLDER>))
ON_COMMAND(ID_FILE_NEW3, (OnFileNew<3, ID_MERGE_COMPARE_TEXT>))
ON_COMMAND(ID_FILE_NEW3_TABLE, (OnFileNew<3, ID_MERGE_COMPARE_TABLE>))
ON_COMMAND(ID_FILE_NEW3_HEX, (OnFileNew<3, ID_MERGE_COMPARE_HEX>))
ON_COMMAND(ID_FILE_NEW3_IMAGE, (OnFileNew<3, ID_MERGE_COMPARE_IMAGE>))
ON_COMMAND(ID_FILE_NEW3_WEBPAGE, (OnFileNew<3, ID_MERGE_COMPARE_WEBPAGE>))
+ ON_COMMAND(ID_FILE_NEW3_FOLDER, (OnFileNew<3, ID_MERGE_COMPARE_FOLDER>))
ON_COMMAND(ID_FILE_OPEN, OnFileOpen)
ON_COMMAND(ID_FILE_OPENPROJECT, OnFileOpenProject)
ON_COMMAND(ID_FILE_SAVEPROJECT, OnSaveProject)
@@ -728,7 +733,7 @@ void CMainFrame::OnInitMenuPopup(CMenu* pPopupMenu, UINT nIndex, BOOL bSysMenu)
{
CMenu* pMenu = pPopupMenu;
// empty the menu
- for (int i = pMenu->GetMenuItemCount() - 1; i > (ID_MERGE_COMPARE_WEBPAGE - ID_MERGE_COMPARE_TEXT); --i)
+ for (int i = pMenu->GetMenuItemCount() - 1; i > (ID_MERGE_COMPARE_FOLDER - ID_MERGE_COMPARE_TEXT); --i)
pMenu->DeleteMenu(i, MF_BYPOSITION);
CMainFrame::AppendPluginMenus(pMenu, filteredFilenames, FileTransform::UnpackerEventNames, true, ID_UNPACKERS_FIRST);
@@ -852,6 +857,9 @@ bool CMainFrame::ShowAutoMergeDoc(UINT nID, IDirDoc * pDirDoc,
case ID_MERGE_COMPARE_WEBPAGE:
return ShowWebDiffDoc(pDirDoc, nFiles, ifileloc, dwFlags,
strDesc, sReportFile, infoUnpacker, infoPrediffer, dynamic_cast(pOpenParams));
+ case ID_MERGE_COMPARE_FOLDER:
+ return ShowDirDoc(nullptr, nFiles, ifileloc, dwFlags,
+ strDesc, sReportFile, infoUnpacker, infoPrediffer, dynamic_cast(pOpenParams));
default:
return ShowTextOrTableMergeDoc({}, pDirDoc, nFiles, ifileloc, dwFlags, strDesc, sReportFile, infoUnpacker, infoPrediffer, dynamic_cast(pOpenParams));
}
@@ -893,6 +901,10 @@ bool CMainFrame::ShowMergeDoc(UINT nID, IDirDoc* pDirDoc,
return ShowWebDiffDoc(pDirDoc, nFiles, ifileloc, dwFlags,
strDesc, sReportFile, infoUnpacker, infoPrediffer,
dynamic_cast(pOpenParams));
+ case ID_MERGE_COMPARE_FOLDER:
+ return ShowDirDoc(nullptr, nFiles, ifileloc, dwFlags,
+ strDesc, sReportFile, infoUnpacker, infoPrediffer,
+ dynamic_cast(pOpenParams));
default:
return ShowAutoMergeDoc(nID, pDirDoc, nFiles, ifileloc, dwFlags,
strDesc, sReportFile, infoUnpacker, infoPrediffer, pOpenParams);
@@ -1170,6 +1182,105 @@ bool CMainFrame::ShowTextMergeDoc(IDirDoc* pDirDoc, int nBuffers, const String t
return ShowTextMergeDoc(pDirDoc, nBuffers, fileloc, dwFlags, strDesc, _T(""), nullptr, nullptr, pOpenParams);
}
+bool CMainFrame::ShowDirDoc(IDirDoc * pDirDoc, int nFiles, const FileLocation fileloc[],
+ const fileopenflags_t dwFlags[], const String strDesc[], const String& sReportFile /*= _T("")*/,
+ const PackingInfo* infoUnpacker /*= nullptr*/, const PrediffingInfo* infoPrediffer /*= nullptr*/,
+ const OpenFolderParams* pOpenParams /*= nullptr*/, CTempPathContext *pTempPathContext /*= nullptr*/)
+{
+ const bool bOldArchiveEnable = GetOptionsMgr()->GetBool(OPT_ARCHIVE_ENABLE);
+ const bool bOldArchiveProbeType = GetOptionsMgr()->GetBool(OPT_ARCHIVE_PROBETYPE);
+
+ GetOptionsMgr()->SaveOption(OPT_ARCHIVE_ENABLE, true);
+ GetOptionsMgr()->SaveOption(OPT_ARCHIVE_PROBETYPE, true);
+ Merge7zInitFlags();
+
+ auto guard = make_scope_exit([&bOldArchiveEnable, &bOldArchiveProbeType]() {
+ GetOptionsMgr()->SaveOption(OPT_ARCHIVE_ENABLE, bOldArchiveEnable);
+ GetOptionsMgr()->SaveOption(OPT_ARCHIVE_PROBETYPE, bOldArchiveProbeType);
+ });
+
+ Merge7zFormatMergePluginScope scope(infoUnpacker);
+
+ // Convert FileLocation array to PathContext
+ PathContext paths;
+ for (int i = 0; i < nFiles; ++i)
+ paths.SetPath(i, fileloc[i].filepath);
+
+ // Get read-only flags
+ std::array bRO = GetROFromFlags(nFiles, dwFlags);
+
+ // Determine recursion setting
+ bool bRecurse2 = (pOpenParams && pOpenParams->m_bRecurse.has_value())
+ ? *pOpenParams->m_bRecurse
+ : GetOptionsMgr()->GetBool(OPT_CMP_INCLUDE_SUBDIRS);
+
+ // Decompress archives if needed and pTempPathContext is not provided
+ CTempPathContext *pTempPathContext2 = pTempPathContext;
+ if (pTempPathContext2 == nullptr)
+ {
+ // Add trailing '\' for directories if missing
+ for (int i = 0; i < nFiles; ++i)
+ {
+ if (!paths::EndsWithSlash(paths[i]) && !IsArchiveFile(paths[i]))
+ paths.SetPath(i, paths::AddTrailingSlash(paths[i]));
+ }
+
+ DecompressResult res = DecompressArchive(m_hWnd, paths);
+ if (FAILED(res.hr))
+ {
+ int ans = AfxMessageBox(I18n::LoadString(IDS_FAILED_EXTRACT_ARCHIVE_FILES).c_str(), MB_YESNO | MB_DONT_ASK_AGAIN | MB_ICONWARNING, IDS_FAILED_EXTRACT_ARCHIVE_FILES);
+ if (ans != IDYES)
+ {
+ delete res.pTempPathContext;
+ return false;
+ }
+ }
+ if (res.pTempPathContext)
+ {
+ paths = res.files;
+ pTempPathContext2 = res.pTempPathContext;
+ }
+ }
+
+ // Create new DirDoc if not provided
+ CDirDoc* pDirDoc2 = static_cast(pDirDoc);
+ if (pDirDoc2 == nullptr)
+ {
+ CMultiDocTemplate* pDirTemplate = theApp.GetDirTemplate();
+ CDirDoc::m_nDirsTemp = nFiles;
+ if (m_pMenus[MENU_DIRVIEW] == nullptr)
+ pDirTemplate->m_hMenuShared = NewDirViewMenu();
+ pDirDoc2 = static_cast(pDirTemplate->OpenDocumentFile(nullptr));
+ if (pDirDoc2 == nullptr)
+ {
+ if (pTempPathContext == nullptr)
+ delete pTempPathContext2;
+ return false;
+ }
+ }
+
+ // Initialize the comparison
+ pDirDoc2->InitCompare(paths, bRecurse2, pTempPathContext2);
+
+ // Apply OpenFolderParams if provided
+ if (pOpenParams)
+ pDirDoc2->SetHiddenItems(pOpenParams->m_hiddenItems);
+
+ // Set report file, descriptions, and title
+ pDirDoc2->SetReportFile(sReportFile);
+ pDirDoc2->SetDescriptions(strDesc);
+ pDirDoc2->SetTitle(nullptr);
+
+ // Set read-only flags for each pane
+ for (int i = 0; i < nFiles; ++i)
+ pDirDoc2->SetReadOnly(i, bRO[i]);
+
+ // Start the comparison
+ pDirDoc2->Rescan();
+
+ return true;
+}
+
/**
* @brief Show GNU licence information in notepad (local file) or in Web Browser
*/
@@ -1268,6 +1379,7 @@ static void AppendComparisonCommandLineParams(
case ID_MERGE_COMPARE_HEX: params += _T("/t binary "); break;
case ID_MERGE_COMPARE_IMAGE: params += _T("/t image "); break;
case ID_MERGE_COMPARE_WEBPAGE: params += _T("/t webpage "); break;
+ case ID_MERGE_COMPARE_FOLDER: params += _T("/t folder "); break;
}
// Add OpenParams
@@ -1324,7 +1436,7 @@ static void AppendComparisonCommandLineParams(
static bool AddToRecentDocs(const PathContext& paths,
const unsigned flags[], const String desc[],
- std::optional recurse, const String& filter,
+ const String& filter,
const PackingInfo *infoUnpacker, const PrediffingInfo *infoPrediffer,
UINT nID, const CMainFrame::OpenParams *pOpenParams,
bool isSelfCompare = false)
@@ -1389,8 +1501,9 @@ static bool AddToRecentDocs(const PathContext& paths,
if (nIndex < paths.GetSize() - 1)
title += _T(" - ");
}
- if (recurse.has_value())
- params += *recurse ? _T("/r ") : _T("/r- ");
+ auto pOpenFolderParams = dynamic_cast(pOpenParams);
+ if (pOpenFolderParams && pOpenFolderParams->m_bRecurse.has_value())
+ params += *pOpenFolderParams->m_bRecurse ? _T("/r ") : _T("/r- ");
if (!filter.empty())
{
String filter2 = filter;
@@ -1547,19 +1660,12 @@ bool CMainFrame::DoFileOrFolderOpen(const PathContext * pFiles /*= nullptr*/,
{
if (pDirDoc != nullptr)
{
- // Anything that can go wrong inside InitCompare() will yield an
- // exception. There is no point in checking return value.
- pDirDoc->InitCompare(tFiles, bRecurse2, pTempPathContext);
-
- if (pOpenFolderParams)
- pDirDoc->SetHiddenItems(pOpenFolderParams->m_hiddenItems);
- pDirDoc->SetReportFile(sReportFile);
- pDirDoc->SetDescriptions(strDesc);
- pDirDoc->SetTitle(nullptr);
- for (int nIndex = 0; nIndex < tFiles.GetSize(); nIndex++)
- pDirDoc->SetReadOnly(nIndex, bRO[nIndex]);
+ FileLocation fileloc[3];
+ for (int nPane = 0; nPane < tFiles.GetSize(); nPane++)
+ fileloc[nPane].setPath(tFiles[nPane]);
- pDirDoc->Rescan();
+ ShowDirDoc(pDirDoc, tFiles.GetSize(), fileloc, dwFlags, strDesc, sReportFile,
+ infoUnpacker, infoPrediffer, dynamic_cast(pOpenParams), pTempPathContext);
}
}
else
@@ -1577,7 +1683,7 @@ bool CMainFrame::DoFileOrFolderOpen(const PathContext * pFiles /*= nullptr*/,
{
String filter = (allowFolderCompare && pathsType == paths::IS_EXISTING_DIR) ?
theApp.GetGlobalFileFilter()->GetMaskOrExpression() : _T("");
- AddToRecentDocs(*pFiles, (unsigned *)dwFlags, strDesc, bRecurse, filter, infoUnpacker, infoPrediffer, nID, pOpenParams);
+ AddToRecentDocs(*pFiles, (unsigned *)dwFlags, strDesc, filter, infoUnpacker, infoPrediffer, nID, pOpenParams);
}
return true;
@@ -1596,7 +1702,7 @@ bool CMainFrame::DoFileOpen(UINT nID, const PathContext* pFiles,
bool result = ShowMergeDoc(nID, nullptr, pFiles->GetSize(), fileloc,
dwFlags, strDesc, sReportFile, infoUnpacker, infoPrediffer, pOpenParams);
if (!dwFlags || !(dwFlags[0] & FFILEOPEN_NOMRU))
- AddToRecentDocs(*pFiles, (unsigned *)dwFlags, strDesc, false, _T(""), infoUnpacker, infoPrediffer, nID, pOpenParams);
+ AddToRecentDocs(*pFiles, (unsigned *)dwFlags, strDesc, _T(""), infoUnpacker, infoPrediffer, nID, pOpenParams);
return result;
}
@@ -2155,7 +2261,30 @@ bool CMainFrame::DoFileNew(UINT nID, int nPanes,
strDesc2[i] = strDesc[i];
fileloc[i].encoding.SetCodepage(ucr::getDefaultCodepage());
}
- return ShowMergeDoc(nID, nullptr, nPanes, fileloc, dwFlags, strDesc2, _T(""), nullptr, infoPrediffer, pOpenParams);
+
+ if (nID != ID_MERGE_COMPARE_FOLDER)
+ return ShowMergeDoc(nID, nullptr, nPanes, fileloc, dwFlags, strDesc2, _T(""), nullptr, infoPrediffer, pOpenParams);
+
+ PathContext paths;
+ std::vector> newFolders;
+ unsigned dwFlags2[3] = {};
+
+ for (int i = 0; i < nPanes; ++i)
+ {
+ auto pTempFolder = std::make_shared();
+ String path = pTempFolder->Create();
+ if (path.empty())
+ return false;
+ paths.SetPath(i, path);
+ newFolders.push_back(pTempFolder);
+ dwFlags2[i] = FFILEOPEN_NOMRU | (dwFlags ? dwFlags[i] : 0);
+ }
+
+ // Keep temp folders alive until WinMerge exits
+ for (auto& f : newFolders)
+ m_tempFolders.push_back(f);
+
+ return DoFileOrFolderOpen(&paths, dwFlags2, strDesc2);
}
/**
@@ -3170,7 +3299,7 @@ bool CMainFrame::DoSelfCompare(UINT nID, const String& file, const String strDes
// Register in MRU using AddToRecentDocs with single-file PathContext in self-compare mode
if (result)
- AddToRecentDocs(PathContext(file), (unsigned *)dwFlags, strDesc, {}, _T(""), infoUnpacker, infoPrediffer, nID, pOpenParams, true);
+ AddToRecentDocs(PathContext(file), (unsigned *)dwFlags, strDesc, _T(""), infoUnpacker, infoPrediffer, nID, pOpenParams, true);
return result;
}
diff --git a/Src/MainFrm.h b/Src/MainFrm.h
index 670abd6e696..cff726d6113 100644
--- a/Src/MainFrm.h
+++ b/Src/MainFrm.h
@@ -27,6 +27,7 @@
#include
#include "DarkModeLib.h"
#include "WindowsManager.h"
+#include "TempFile.h"
class BCMenu;
class CDirView;
@@ -216,6 +217,10 @@ class CMainFrame : public CMDIFrameWnd
const fileopenflags_t dwFlags[], const String strDesc[], const String& sReportFile = _T(""),
const PackingInfo * infoUnpacker = nullptr, const PrediffingInfo * infoPrediffer = nullptr,
const OpenWebPageParams *pOpenParams = nullptr);
+ bool ShowDirDoc(IDirDoc* pDirDoc, int nFiles, const FileLocation fileloc[],
+ const fileopenflags_t dwFlags[], const String strDesc[], const String& sReportFile = _T(""),
+ const PackingInfo* infoUnpacker = nullptr, const PrediffingInfo* infoPrediffer = nullptr,
+ const OpenFolderParams* pOpenParams = nullptr, CTempPathContext* pTempPathContext = nullptr);
void UpdateTitleBarAndTabBar();
void UpdateResources();
@@ -380,6 +385,7 @@ class CMainFrame : public CMDIFrameWnd
std::unique_ptr m_pImageMenu;
std::unique_ptr m_pWebPageMenu;
std::vector m_tempFiles; /**< List of possibly needed temp files. */
+ std::vector> m_tempFolders; /**< Temp folders for "New Folder" comparisons. */
DropHandler *m_pDropHandler;
std::unique_ptr m_pDirWatcher;
std::optional m_bTabsOnTitleBar;
diff --git a/Src/Merge.cpp b/Src/Merge.cpp
index 83245fc6d32..c3406c91823 100644
--- a/Src/Merge.cpp
+++ b/Src/Merge.cpp
@@ -214,6 +214,8 @@ std::vector CMergeApp::CreateUserTasks(MergeCmdLineInfo::usertas
items.emplace_back(_(""), _T("/new /t image"), _("New Image Compare"), _T(""), _T(""), 0);
if (flags & MergeCmdLineInfo::NEW_WEBPAGE_COMPARE)
items.emplace_back(_(""), _T("/new /t webpage"), _("New Webpage Compare"), _T(""), _T(""), 0);
+ if (flags & MergeCmdLineInfo::NEW_FOLDER_COMPARE)
+ items.emplace_back(_(""), _T("/new /t folder"), _("New Folder Compare"), _T(""), _T(""), 0);
if (flags & MergeCmdLineInfo::CLIPBOARD_COMPARE)
items.emplace_back(_(""), _T("/clipboard-compare"), _("Clipboard Compare"), _T(""), _T(""), 0);
if (flags & MergeCmdLineInfo::SHOW_OPTIONS_DIALOG)
diff --git a/Src/Merge.rc b/Src/Merge.rc
index 739ffb8e31b..56d1fee3cac 100644
--- a/Src/Merge.rc
+++ b/Src/Merge.rc
@@ -316,6 +316,7 @@ BEGIN
MENUITEM "&Binary", ID_FILE_NEW_HEX
MENUITEM "&Image", ID_FILE_NEW_IMAGE
MENUITEM "&Webpage", ID_FILE_NEW_WEBPAGE
+ MENUITEM "&Folder", ID_FILE_NEW_FOLDER
END
POPUP "New (&3 panes)"
BEGIN
@@ -324,6 +325,7 @@ BEGIN
MENUITEM "&Binary", ID_FILE_NEW3_HEX
MENUITEM "&Image", ID_FILE_NEW3_IMAGE
MENUITEM "&Webpage", ID_FILE_NEW3_WEBPAGE
+ MENUITEM "&Folder", ID_FILE_NEW3_FOLDER
END
MENUITEM "&Open...\tCtrl+O", ID_FILE_OPEN
MENUITEM "Open Conflic&t File...", ID_FILE_OPENCONFLICT
@@ -417,6 +419,7 @@ BEGIN
MENUITEM "&Binary", ID_FILE_NEW_HEX
MENUITEM "&Image", ID_FILE_NEW_IMAGE
MENUITEM "&Webpage", ID_FILE_NEW_WEBPAGE
+ MENUITEM "&Folder", ID_FILE_NEW_FOLDER
END
POPUP "New (&3 panes)"
BEGIN
@@ -425,6 +428,7 @@ BEGIN
MENUITEM "&Binary", ID_FILE_NEW3_HEX
MENUITEM "&Image", ID_FILE_NEW3_IMAGE
MENUITEM "&Webpage", ID_FILE_NEW3_WEBPAGE
+ MENUITEM "&Folder", ID_FILE_NEW3_FOLDER
END
MENUITEM "&Open...\tCtrl+O", ID_FILE_OPEN
MENUITEM "Open Conflic&t File...", ID_FILE_OPENCONFLICT
@@ -592,6 +596,7 @@ BEGIN
MENUITEM "&Binary", ID_FILE_NEW_HEX
MENUITEM "&Image", ID_FILE_NEW_IMAGE
MENUITEM "&Webpage", ID_FILE_NEW_WEBPAGE
+ MENUITEM "&Folder", ID_FILE_NEW_FOLDER
END
POPUP "New (&3 panes)"
BEGIN
@@ -600,6 +605,7 @@ BEGIN
MENUITEM "&Binary", ID_FILE_NEW3_HEX
MENUITEM "&Image", ID_FILE_NEW3_IMAGE
MENUITEM "&Webpage", ID_FILE_NEW3_WEBPAGE
+ MENUITEM "&Folder", ID_FILE_NEW3_FOLDER
END
MENUITEM "&Open...\tCtrl+O", ID_FILE_OPEN
MENUITEM "Open Conflic&t File...", ID_FILE_OPENCONFLICT
@@ -651,6 +657,7 @@ BEGIN
MENUITEM "&Binary", ID_MERGE_COMPARE_HEX
MENUITEM "&Image", ID_MERGE_COMPARE_IMAGE
MENUITEM "&Webpage", ID_MERGE_COMPARE_WEBPAGE
+ MENUITEM "A&rchive", ID_MERGE_COMPARE_FOLDER
MENUITEM "< Empty >", ID_NO_UNPACKER
END
MENUITEM SEPARATOR
@@ -937,6 +944,7 @@ BEGIN
MENUITEM "&Binary", ID_MERGE_COMPARE_HEX
MENUITEM "&Image", ID_MERGE_COMPARE_IMAGE
MENUITEM "&Webpage", ID_MERGE_COMPARE_WEBPAGE
+ MENUITEM "A&rchive", ID_MERGE_COMPARE_FOLDER
MENUITEM "< Empty >", ID_NO_UNPACKER
END
MENUITEM SEPARATOR
@@ -1161,6 +1169,7 @@ BEGIN
MENUITEM "&Binary", ID_FILE_NEW_HEX
MENUITEM "&Image", ID_FILE_NEW_IMAGE
MENUITEM "&Webpage", ID_FILE_NEW_WEBPAGE
+ MENUITEM "&Folder", ID_FILE_NEW_FOLDER
END
END
@@ -1173,6 +1182,7 @@ BEGIN
MENUITEM "&Binary", ID_MERGE_COMPARE_HEX
MENUITEM "&Image", ID_MERGE_COMPARE_IMAGE
MENUITEM "&Webpage", ID_MERGE_COMPARE_WEBPAGE
+ MENUITEM "A&rchive", ID_MERGE_COMPARE_FOLDER
END
END
@@ -5313,6 +5323,7 @@ BEGIN
IDS_JUMPLIST_NEW_BINARY_COMPARE "New Binary Compare"
IDS_JUMPLIST_NEW_IMAGE_COMPARE "New Image Compare"
IDS_JUMPLIST_NEW_WEBPAGE_COMPARE "New Webpage Compare"
+ IDS_JUMPLIST_NEW_FOLDER_COMPARE "New Folder Compare"
IDS_JUMPLIST_CLIPBOARD_COMPARE "Clipboard Compare"
END
diff --git a/Src/Merge.vcxproj b/Src/Merge.vcxproj
index ead6defdfae..a286a9c01ea 100644
--- a/Src/Merge.vcxproj
+++ b/Src/Merge.vcxproj
@@ -987,6 +987,7 @@
pch.h
$(IntDir)$(TargetName)2.pch
+
@@ -1918,4 +1919,4 @@
-
+
\ No newline at end of file
diff --git a/Src/Merge.vcxproj.filters b/Src/Merge.vcxproj.filters
index 7394b18f711..a6728230894 100644
--- a/Src/Merge.vcxproj.filters
+++ b/Src/Merge.vcxproj.filters
@@ -783,7 +783,7 @@
MFCGui\Common\Source Files
-
+
MFCGui\Dialogs\Source Files
@@ -1523,7 +1523,7 @@
MFCGui\Common\Header Files
-
+
MFCGui\Dialogs\Header Files
@@ -1562,6 +1562,9 @@
MFCGui\Menu\Header Files
+
+ Header Files
+
@@ -2019,4 +2022,4 @@
Source Files
-
+
\ No newline at end of file
diff --git a/Src/Merge2.rc b/Src/Merge2.rc
index c7288a04a64..1a4c3b353f5 100644
--- a/Src/Merge2.rc
+++ b/Src/Merge2.rc
@@ -198,6 +198,7 @@ IDB_FILE_NEW3_TABLE BITMAP "res\\new3_table.bmp"
IDB_FILE_NEW3_HEX BITMAP "res\\new3_hex.bmp"
IDB_FILE_NEW3_IMAGE BITMAP "res\\new3_image.bmp"
IDB_FILE_NEW3_WEBPAGE BITMAP "res\\new3_webpage.bmp"
+IDB_FILE_NEW_FOLDER BITMAP "res\\new_folder.bmp"
/////////////////////////////////////////////////////////////////////////////
//
diff --git a/Src/MergeCmdLineInfo.cpp b/Src/MergeCmdLineInfo.cpp
index 81c7ff9a979..4f21d1baf55 100644
--- a/Src/MergeCmdLineInfo.cpp
+++ b/Src/MergeCmdLineInfo.cpp
@@ -279,6 +279,8 @@ void MergeCmdLineInfo::ParseWinMergeCmdLine(const tchar_t *q)
m_nWindowType = WindowType::IMAGE;
else if (param.substr(0, 3) == _T("web"))
m_nWindowType = WindowType::WEBPAGE;
+ else if (param == _T("folder"))
+ m_nWindowType = WindowType::FOLDER;
else
m_sErrorMessages.emplace_back(_T("Unknown window type '") + param + _T("' specified"));
}
diff --git a/Src/MergeCmdLineInfo.h b/Src/MergeCmdLineInfo.h
index a7e18604a95..c2ed602cc77 100644
--- a/Src/MergeCmdLineInfo.h
+++ b/Src/MergeCmdLineInfo.h
@@ -62,6 +62,7 @@ class MergeCmdLineInfo
BINARY,
IMAGE,
WEBPAGE,
+ FOLDER,
};
enum DialogType
@@ -80,6 +81,7 @@ class MergeCmdLineInfo
NEW_BINARY_COMPARE = 0x0004,
NEW_IMAGE_COMPARE = 0x0008,
NEW_WEBPAGE_COMPARE = 0x0010,
+ NEW_FOLDER_COMPARE = 0x0020,
CLIPBOARD_COMPARE = 0x1000,
SHOW_OPTIONS_DIALOG = 0x8000,
};
diff --git a/Src/MergeDoc.cpp b/Src/MergeDoc.cpp
index c827a8712c3..71f40c74ab6 100644
--- a/Src/MergeDoc.cpp
+++ b/Src/MergeDoc.cpp
@@ -95,7 +95,7 @@ BEGIN_MESSAGE_MAP(CMergeDoc, CDocument)
ON_UPDATE_COMMAND_UI(ID_MERGE_COMPARE_TEXT, OnUpdateFileRecompareAsText)
ON_COMMAND(ID_MERGE_COMPARE_TABLE, OnFileRecompareAsTable)
ON_UPDATE_COMMAND_UI(ID_MERGE_COMPARE_TABLE, OnUpdateFileRecompareAsTable)
- ON_COMMAND_RANGE(ID_MERGE_COMPARE_HEX, ID_MERGE_COMPARE_WEBPAGE, OnFileRecompareAs)
+ ON_COMMAND_RANGE(ID_MERGE_COMPARE_HEX, ID_MERGE_COMPARE_FOLDER, OnFileRecompareAs)
ON_COMMAND_RANGE(ID_UNPACKERS_FIRST, ID_UNPACKERS_LAST, OnFileRecompareAs)
// [View] menu
ON_COMMAND_RANGE(ID_VIEW_DIFFCONTEXT_ALL, ID_VIEW_DIFFCONTEXT_INVERT, OnDiffContext)
diff --git a/Src/OpenView.cpp b/Src/OpenView.cpp
index 6ba77667011..1ca53923192 100644
--- a/Src/OpenView.cpp
+++ b/Src/OpenView.cpp
@@ -113,8 +113,8 @@ BEGIN_MESSAGE_MAP(COpenView, CFormView)
ON_COMMAND(ID_EDIT_CUT, OnEditAction)
ON_COMMAND(ID_EDIT_UNDO, OnEditAction)
ON_COMMAND(ID_EDIT_SELECT_ALL, (OnEditAction))
- ON_COMMAND_RANGE(ID_MERGE_COMPARE_TEXT, ID_MERGE_COMPARE_WEBPAGE, OnCompare)
- ON_UPDATE_COMMAND_UI_RANGE(ID_MERGE_COMPARE_TEXT, ID_MERGE_COMPARE_WEBPAGE, OnUpdateCompare)
+ ON_COMMAND_RANGE(ID_MERGE_COMPARE_TEXT, ID_MERGE_COMPARE_FOLDER, OnCompare)
+ ON_UPDATE_COMMAND_UI_RANGE(ID_MERGE_COMPARE_TEXT, ID_MERGE_COMPARE_FOLDER, OnUpdateCompare)
ON_COMMAND_RANGE(ID_UNPACKERS_FIRST, ID_UNPACKERS_LAST, OnCompare)
ON_COMMAND_RANGE(ID_OPEN_WITH_UNPACKER, ID_OPEN_WITH_UNPACKER, OnCompare)
ON_MESSAGE(WM_USER + 1, OnUpdateStatus)
diff --git a/Src/PropShell.cpp b/Src/PropShell.cpp
index 7f7ee00ec71..1d2e16fa614 100644
--- a/Src/PropShell.cpp
+++ b/Src/PropShell.cpp
@@ -171,13 +171,14 @@ static void LoadListView(CListCtrl& list)
int i = 0;
for (auto [mask, text] : std::vector>(
{
- { MergeCmdLineInfo::NEW_TEXT_COMPARE, _("New Text Compare") },
- { MergeCmdLineInfo::NEW_TABLE_COMPARE, _("New Table Compare") },
- { MergeCmdLineInfo::NEW_BINARY_COMPARE, _("New Binary Compare") },
- { MergeCmdLineInfo::NEW_IMAGE_COMPARE, _("New Image Compare") },
- { MergeCmdLineInfo::NEW_WEBPAGE_COMPARE, _("New Webpage Compare") },
- { MergeCmdLineInfo::CLIPBOARD_COMPARE, _("Clipboard Compare") },
- { MergeCmdLineInfo::SHOW_OPTIONS_DIALOG, _("Options") },
+ { MergeCmdLineInfo::NEW_TEXT_COMPARE, _("New Text Compare") },
+ { MergeCmdLineInfo::NEW_TABLE_COMPARE, _("New Table Compare") },
+ { MergeCmdLineInfo::NEW_BINARY_COMPARE, _("New Binary Compare") },
+ { MergeCmdLineInfo::NEW_IMAGE_COMPARE, _("New Image Compare") },
+ { MergeCmdLineInfo::NEW_WEBPAGE_COMPARE, _("New Webpage Compare") },
+ { MergeCmdLineInfo::NEW_FOLDER_COMPARE, _("New Folder Compare") },
+ { MergeCmdLineInfo::CLIPBOARD_COMPARE, _("Clipboard Compare") },
+ { MergeCmdLineInfo::SHOW_OPTIONS_DIALOG, _("Options") },
}))
{
list.InsertItem(LVIF_TEXT | LVIF_PARAM, i, text.c_str(), 0, 0, 0, mask);
diff --git a/Src/WebPageDiffFrm.cpp b/Src/WebPageDiffFrm.cpp
index 686ad4345a4..5987fc041d6 100644
--- a/Src/WebPageDiffFrm.cpp
+++ b/Src/WebPageDiffFrm.cpp
@@ -76,8 +76,8 @@ BEGIN_MESSAGE_MAP(CWebPageDiffFrame, CMergeFrameCommon)
// [File] menu
ON_COMMAND(ID_FILE_CLOSE, OnFileClose)
ON_COMMAND(ID_RESCAN, OnFileReload)
- ON_COMMAND_RANGE(ID_MERGE_COMPARE_TEXT, ID_MERGE_COMPARE_WEBPAGE, OnFileRecompareAs)
- ON_UPDATE_COMMAND_UI_RANGE(ID_MERGE_COMPARE_TEXT, ID_MERGE_COMPARE_WEBPAGE, OnUpdateFileRecompareAs)
+ ON_COMMAND_RANGE(ID_MERGE_COMPARE_TEXT, ID_MERGE_COMPARE_FOLDER, OnFileRecompareAs)
+ ON_UPDATE_COMMAND_UI_RANGE(ID_MERGE_COMPARE_TEXT, ID_MERGE_COMPARE_FOLDER, OnUpdateFileRecompareAs)
// [Edit] menu
ON_COMMAND(ID_EDIT_CUT, OnEditCut)
ON_COMMAND(ID_EDIT_COPY, OnEditCopy)
diff --git a/Src/res/new_folder.bmp b/Src/res/new_folder.bmp
new file mode 100644
index 00000000000..1fbc3090fbf
Binary files /dev/null and b/Src/res/new_folder.bmp differ
diff --git a/Src/resource.h b/Src/resource.h
index 05753d9f5b7..1d45a8e776f 100644
--- a/Src/resource.h
+++ b/Src/resource.h
@@ -186,6 +186,7 @@
#define IDB_COPY_SELECTED_LINES_MIDDLE_TO_RIGHT 397
#define IDB_COPY_SELECTED_LINES_RIGHT_TO_MIDDLE 398
#define IDB_COPY_SELECTED_LINES_RIGHT_TO_LEFT 399
+#define IDB_FILE_NEW_FOLDER 400
#define IDI_FOLDER 500
#define IDI_LFOLDER 501
#define IDI_MFOLDER 502
@@ -880,24 +881,25 @@
#define ID_MERGE_COMPARE_HEX 32869
#define ID_MERGE_COMPARE_IMAGE 32870
#define ID_MERGE_COMPARE_WEBPAGE 32871
-#define ID_MERGE_COMPARE_LEFT1_LEFT2 32872
-#define ID_MERGE_COMPARE_RIGHT1_RIGHT2 32873
-#define ID_MERGE_COMPARE_LEFT1_RIGHT2 32874
-#define ID_MERGE_COMPARE_LEFT2_RIGHT1 32875
-#define ID_UNPACK_MANUAL 32876
-#define ID_UNPACK_AUTO 32877
-#define ID_OPEN_WITH_UNPACKER 32878
-#define ID_NO_PREDIFFER 32879
-#define ID_SUGGESTED_PLUGINS 32880
-#define ID_NOT_SUGGESTED_PLUGINS 32881
-#define ID_RELOAD_PLUGINS 32882
-#define ID_NO_UNPACKER 32883
-#define ID_APPLY_PREDIFFER 32884
-#define ID_TRANSFORM_WITH_SCRIPT 32885
-#define ID_SELECT_EDITOR_SCRIPT_FOR_COPYING 32886
-#define ID_WINDOW_CLOSEALL 32887
-#define ID_WINDOW_NEXT 32888
-#define ID_WINDOW_PREV 32889
+#define ID_MERGE_COMPARE_FOLDER 32872
+#define ID_MERGE_COMPARE_LEFT1_LEFT2 32873
+#define ID_MERGE_COMPARE_RIGHT1_RIGHT2 32874
+#define ID_MERGE_COMPARE_LEFT1_RIGHT2 32875
+#define ID_MERGE_COMPARE_LEFT2_RIGHT1 32876
+#define ID_UNPACK_MANUAL 32877
+#define ID_UNPACK_AUTO 32878
+#define ID_OPEN_WITH_UNPACKER 32879
+#define ID_NO_PREDIFFER 32880
+#define ID_SUGGESTED_PLUGINS 32881
+#define ID_NOT_SUGGESTED_PLUGINS 32882
+#define ID_RELOAD_PLUGINS 32883
+#define ID_NO_UNPACKER 32884
+#define ID_APPLY_PREDIFFER 32885
+#define ID_TRANSFORM_WITH_SCRIPT 32886
+#define ID_SELECT_EDITOR_SCRIPT_FOR_COPYING 32887
+#define ID_WINDOW_CLOSEALL 32888
+#define ID_WINDOW_NEXT 32889
+#define ID_WINDOW_PREV 32890
#define ID_HELP_CONTENTS 32912
#define ID_HELP_GETCONFIG 32913
#define ID_HELP_GNULICENSE 32914
@@ -1211,6 +1213,8 @@
#define ID_FILE_NEW3_HEX 34169
#define ID_FILE_NEW3_IMAGE 34170
#define ID_FILE_NEW3_WEBPAGE 34171
+#define ID_FILE_NEW_FOLDER 34177
+#define ID_FILE_NEW3_FOLDER 34178
#define ID_SWAPPANES_SWAP12 34172
#define ID_SWAPPANES_SWAP23 34173
#define ID_SWAPPANES_SWAP13 34174
@@ -2094,12 +2098,13 @@
#define IDS_WEBVIEW2_RUNTIME_NOT_INSTALLED 44614
#define IDS_PROJECT_ITEM_HIDDEN_ITEMS 44615
#define IDS_CONFIRM_COPY_ALL_DIFFS 44616
-#define IDS_JUMPLIST_NEW_TEXT_COMPARE 44620
-#define IDS_JUMPLIST_NEW_TABLE_COMPARE 44621
-#define IDS_JUMPLIST_NEW_BINARY_COMPARE 44622
-#define IDS_JUMPLIST_NEW_IMAGE_COMPARE 44623
-#define IDS_JUMPLIST_NEW_WEBPAGE_COMPARE 44624
-#define IDS_JUMPLIST_CLIPBOARD_COMPARE 44625
+#define IDS_JUMPLIST_NEW_TEXT_COMPARE 44617
+#define IDS_JUMPLIST_NEW_TABLE_COMPARE 44618
+#define IDS_JUMPLIST_NEW_BINARY_COMPARE 44619
+#define IDS_JUMPLIST_NEW_IMAGE_COMPARE 44620
+#define IDS_JUMPLIST_NEW_WEBPAGE_COMPARE 44621
+#define IDS_JUMPLIST_NEW_FOLDER_COMPARE 44622
+#define IDS_JUMPLIST_CLIPBOARD_COMPARE 44623
#define IDS_ITEMS_PER_SEC 44626
#define IDS_EXPANDSUBDIRS_DONOTEXPAND 44627
#define IDS_EXPANDSUBDIRS_ALL 44628
diff --git a/Testing/GoogleTest/CmdLine/MergeCmdLine_test.cpp b/Testing/GoogleTest/CmdLine/MergeCmdLine_test.cpp
index 201cf45fbdc..c79fd45cb40 100644
--- a/Testing/GoogleTest/CmdLine/MergeCmdLine_test.cpp
+++ b/Testing/GoogleTest/CmdLine/MergeCmdLine_test.cpp
@@ -2249,6 +2249,10 @@ namespace
MergeCmdLineInfo cmdInfo(_T("C:\\WinMerge\\WinMerge.exe /t iMAGE"));
EXPECT_EQ(MergeCmdLineInfo::WindowType::IMAGE, cmdInfo.m_nWindowType);
}
+ {
+ MergeCmdLineInfo cmdInfo(_T("C:\\WinMerge\\WinMerge.exe /t folder"));
+ EXPECT_EQ(MergeCmdLineInfo::WindowType::FOLDER, cmdInfo.m_nWindowType);
+ }
{
MergeCmdLineInfo cmdInfo(_T("C:\\WinMerge\\WinMerge.exe /t unknown"));
EXPECT_EQ(MergeCmdLineInfo::WindowType::AUTOMATIC, cmdInfo.m_nWindowType);
diff --git a/Translations/Docs/Manual/English.pot b/Translations/Docs/Manual/English.pot
index d9627ff851c..6021dca602c 100644
--- a/Translations/Docs/Manual/English.pot
+++ b/Translations/Docs/Manual/English.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WinMerge 2.16\n"
"Report-Msgid-Bugs-To: https://github.com/WinMerge/winmerge/issues\n"
-"POT-Creation-Date: 2026-04-11 18:10+0900\n"
+"POT-Creation-Date: 2026-04-13 19:02+0900\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -603,7 +603,7 @@ msgstr ""
#. type: Content of:
#: ./English/Command_line.xml:264
-msgid "Specifies the type of window in which to display files. This can be one of the keywords Text, Table, Binary, Image or Webpage."
+msgid "Specifies the type of window in which to display files. This can be one of the keywords Text, Table, Binary, Image, Webpage or Folder."
msgstr ""
#. type: Content of:
diff --git a/Translations/Docs/Manual/French.po b/Translations/Docs/Manual/French.po
index 108d365cc18..7986471d032 100644
--- a/Translations/Docs/Manual/French.po
+++ b/Translations/Docs/Manual/French.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: WinMerge 2.16\n"
"Report-Msgid-Bugs-To: https://github.com/WinMerge/winmerge/issues\n"
-"POT-Creation-Date: 2026-04-11 18:10+0900\n"
-"PO-Revision-Date: 2026-04-11 22:55-0500\n"
+"POT-Creation-Date: 2026-04-13 19:02+0900\n"
+"PO-Revision-Date: 2026-03-15 08:05+0900\n"
"Last-Translator: t3chnob0y \n"
"Language-Team: French \n"
"Language: fr\n"
@@ -946,14 +946,14 @@ msgstr ""
msgid ""
"Specifies the type of window in which to display files. This can be one of "
"the keywords Text, Table, "
-"Binary, Image or "
-"Webpage."
+"Binary, Image, "
+"Webpage or Folder."
msgstr ""
"Spécifie le type de fenêtre dans laquelle afficher les fichiers. Cela peut "
"être l'un des mots-clés Text (Texte), "
"Table (Tableau), Binary "
-"(Binaire), Image ou Webpage "
-"(Page Web)."
+"(Binaire), Image, Webpage "
+"(Page Web) ou Folder."
#. type: Content of:
#: English/Command_line.xml:272
diff --git a/Translations/Docs/Manual/Hebrew.po b/Translations/Docs/Manual/Hebrew.po
index f9c42088435..64fe81c0b4b 100644
--- a/Translations/Docs/Manual/Hebrew.po
+++ b/Translations/Docs/Manual/Hebrew.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WinMerge 2.16\n"
"Report-Msgid-Bugs-To: https://github.com/WinMerge/winmerge/issues\n"
-"POT-Creation-Date: 2026-04-11 18:10+0900\n"
+"POT-Creation-Date: 2026-04-13 19:02+0900\n"
"PO-Revision-Date: 2025-03-13 09:13+0900\n"
"Last-Translator: \n"
"Language-Team: \n"
@@ -904,13 +904,13 @@ msgstr ""
msgid ""
"Specifies the type of window in which to display files. This can be one of "
"the keywords Text, Table, "
-"Binary, Image or "
-"Webpage."
+"Binary, Image, "
+"Webpage or Folder."
msgstr ""
"מציין את סוג החלון בו יוצגו קבצים. זה יכול להיות אחד ממילות המפתח "
"Text, Table, "
-"Binary, Image או "
-"Webpage."
+"Binary, Image, "
+"Webpage או Folder."
#. type: Content of:
#: English/Command_line.xml:272
diff --git a/Translations/Docs/Manual/Italian.po b/Translations/Docs/Manual/Italian.po
index 297395cb3c9..c730c6b0ccd 100644
--- a/Translations/Docs/Manual/Italian.po
+++ b/Translations/Docs/Manual/Italian.po
@@ -6,16 +6,17 @@
#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: https://github.com/WinMerge/winmerge/issues\n"
-"POT-Creation-Date: 2026-04-11 18:10+0900\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME \n"
-"Language-Team: LANGUAGE \n"
-"Language: \n"
+"POT-Creation-Date: 2026-04-13 19:02+0900\n"
+"PO-Revision-Date: 2026-04-19 13:13+0900\n"
+"Last-Translator: \n"
+"Language-Team: \n"
+"Language: it\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Poedit 3.9\n"
#. type: Content of:
#: English/About_Doc.xml:3
@@ -934,13 +935,13 @@ msgstr ""
msgid ""
"Specifies the type of window in which to display files. This can be one of "
"the keywords Text, Table, "
-"Binary, Image or "
-"Webpage."
+"Binary, Image, "
+"Webpage or Folder."
msgstr ""
-"Specifica il tipo di finestra in cui visualizzare i file.Può essere una "
-"delle parole chiave Testo, Tabella"
-"userinput>, Binario, Immagine "
-"o Pagina Web."
+"Specifica il tipo di finestra in cui visualizzare i file. Può essere una "
+"delle parole chiave Text, Table"
+"userinput>, Binary, Image, "
+"Webpage o Folder."
#. type: Content of:
#: English/Command_line.xml:272
diff --git a/Translations/Docs/Manual/Japanese.po b/Translations/Docs/Manual/Japanese.po
index 5c86faa133b..4147f12b22f 100644
--- a/Translations/Docs/Manual/Japanese.po
+++ b/Translations/Docs/Manual/Japanese.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WinMerge\n"
"Report-Msgid-Bugs-To: https://github.com/WinMerge/winmerge/issues\n"
-"POT-Creation-Date: 2026-04-11 18:10+0900\n"
+"POT-Creation-Date: 2026-04-13 19:02+0900\n"
"PO-Revision-Date: 2026-03-16 07:07+0900\n"
"Last-Translator: Takashi Sawanaka \n"
"Language-Team: Japanese \n"
@@ -930,13 +930,13 @@ msgstr ""
msgid ""
"Specifies the type of window in which to display files. This can be one of "
"the keywords Text, Table, "
-"Binary, Image or "
-"Webpage."
+"Binary, Image, "
+"Webpage or Folder."
msgstr ""
"ファイルを表示するウィンドウの種類を指定します。次のキーワードが指定できま"
"す。 Text, Table, "
"Binary, Image, "
-"Webpage"
+"Webpage, Folder"
#. type: Content of:
#: English/Command_line.xml:272
diff --git a/Translations/WinMerge/Arabic.po b/Translations/WinMerge/Arabic.po
index 46149ccbb75..f37bcf75ff0 100644
--- a/Translations/WinMerge/Arabic.po
+++ b/Translations/WinMerge/Arabic.po
@@ -24,7 +24,7 @@ msgstr ""
"Language: ar_SA\n"
#. LANGUAGE, SUBLANGUAGE
-#: Merge.rc:26 Merge.rc:59 Merge.rc:5453
+#: Merge.rc:26 Merge.rc:59 Merge.rc:5464
msgid "LANG_ENGLISH, SUBLANG_ENGLISH_US"
msgstr "LANG_ARABIC, SUBLANG_ARABIC_SAUDI_ARABIA"
@@ -109,7 +109,7 @@ msgid "Copy Selected Diff (Right) to Clipboard\tCtrl+&3"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_SELECTLINEDIFF
-#: Merge.rc:110 Merge.rc:673
+#: Merge.rc:110 Merge.rc:680
msgid "Select Line &Difference\tF4"
msgstr "تحديد الاختلاف في السطر"
@@ -139,7 +139,7 @@ msgid "Cu&t"
msgstr "&قص"
#. IDR_POPUP_DIRVIEW
-#: Merge.rc:118 Merge.rc:943
+#: Merge.rc:118 Merge.rc:951
msgid "&Copy"
msgstr "&نسخ"
@@ -149,19 +149,19 @@ msgid "&Paste"
msgstr "&لصق"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:121 Merge.rc:875 Merge.rc:882
+#: Merge.rc:121 Merge.rc:882 Merge.rc:889
msgid "&Scripts"
msgstr "لغة نصية (سكريبت)"
#. IDS_NO_EDIT_SCRIPTS
-#: Merge.rc:123 Merge.rc:338 Merge.rc:447 Merge.rc:654 Merge.rc:659
-#: Merge.rc:865 Merge.rc:877 Merge.rc:884 Merge.rc:940 Merge.rc:1183
-#: Merge.rc:5028
+#: Merge.rc:123 Merge.rc:340 Merge.rc:451 Merge.rc:661 Merge.rc:666
+#: Merge.rc:872 Merge.rc:884 Merge.rc:891 Merge.rc:948 Merge.rc:1193
+#: Merge.rc:5038
msgid "< Empty >"
msgstr "<فارغ>"
#. IDR_POPUP_LOCATIONBAR, ID_EDIT_WMGOTO
-#: Merge.rc:126 Merge.rc:691 Merge.rc:1081
+#: Merge.rc:126 Merge.rc:698 Merge.rc:1089
msgid "&Go to...\tCtrl+G"
msgstr "ال&ذهاب إلى...\tCtrl+G"
@@ -181,27 +181,27 @@ msgid "Op&en"
msgstr "&فتح"
#. IDR_POPUP_DIRVIEW, ID_DIR_OPEN_RIGHT
-#: Merge.rc:132 Merge.rc:981 Merge.rc:988 Merge.rc:995
+#: Merge.rc:132 Merge.rc:989 Merge.rc:996 Merge.rc:1003
msgid "With &Registered Application"
msgstr "&باستخدام التطبيق المسجل"
#. IDR_POPUP_DIRVIEW, ID_DIR_OPEN_RIGHT_WITHEDITOR
-#: Merge.rc:133 Merge.rc:982 Merge.rc:989 Merge.rc:996
+#: Merge.rc:133 Merge.rc:990 Merge.rc:997 Merge.rc:1004
msgid "With &External Editor\tCtrl+Alt+E"
msgstr "باستخدام &محرر نصي خارجي\tCtrl+Alt+E"
#. IDR_POPUP_DIRVIEW, ID_DIR_OPEN_RIGHT_WITH
-#: Merge.rc:134 Merge.rc:983 Merge.rc:990 Merge.rc:997
+#: Merge.rc:134 Merge.rc:991 Merge.rc:998 Merge.rc:1005
msgid "&With..."
msgstr "با&ستخدام..."
#. IDR_POPUP_DIRVIEW, ID_DIR_OPEN_RIGHT_PARENT_FOLDER
-#: Merge.rc:135 Merge.rc:984 Merge.rc:991 Merge.rc:998
+#: Merge.rc:135 Merge.rc:992 Merge.rc:999 Merge.rc:1006
msgid "Open &Parent Folder..."
msgstr "المجلد الأساسي..."
#. IDR_POPUP_IMG_CTXT, ID_FILE_SHELLMENU
-#: Merge.rc:137 Merge.rc:1239
+#: Merge.rc:137 Merge.rc:1249
msgid "S&hell Menu"
msgstr "&قائمة البرنامج الوسيطي (الغلاف)"
@@ -236,8 +236,8 @@ msgid "Ins&ertion/Deletion Detection"
msgstr "&كشف المدخلات والحذف"
#. IDR_MERGEDOCTYPE, ID_TOOLBAR_NONE
-#: Merge.rc:176 Merge.rc:209 Merge.rc:216 Merge.rc:358 Merge.rc:507
-#: Merge.rc:751
+#: Merge.rc:176 Merge.rc:209 Merge.rc:216 Merge.rc:360 Merge.rc:511
+#: Merge.rc:758
msgid "&None"
msgstr "&لا يوجد"
@@ -252,12 +252,12 @@ msgid "&Horizontal"
msgstr "&عمودي"
#. IDR_POPUP_IMG_CTXT, ID_IMG_CURPANE_PREVPAGE
-#: Merge.rc:181 Merge.rc:189 Merge.rc:1230
+#: Merge.rc:181 Merge.rc:189 Merge.rc:1240
msgid "&Previous Page"
msgstr "ال&صفحة السابقة"
#. IDS_PREVIEWBAR_NEXTPAGE
-#: Merge.rc:182 Merge.rc:190 Merge.rc:1231 Merge.rc:5322
+#: Merge.rc:182 Merge.rc:190 Merge.rc:1241 Merge.rc:5333
msgid "&Next Page"
msgstr "الص&فحة التالية"
@@ -267,42 +267,42 @@ msgid "&Active Pane"
msgstr "ال&جزء النشط"
#. IDR_POPUP_IMG_CTXT, ID_IMG_CURPANE_ROTATE_RIGHT_90
-#: Merge.rc:185 Merge.rc:1225
+#: Merge.rc:185 Merge.rc:1235
msgid "Rotate &Right 90deg"
msgstr ""
#. IDR_POPUP_IMG_CTXT, ID_IMG_CURPANE_ROTATE_LEFT_90
-#: Merge.rc:186 Merge.rc:1226
+#: Merge.rc:186 Merge.rc:1236
msgid "Rotate &Left 90deg"
msgstr ""
#. IDR_POPUP_IMG_CTXT, ID_IMG_CURPANE_FLIP_VERTICALLY
-#: Merge.rc:187 Merge.rc:1227
+#: Merge.rc:187 Merge.rc:1237
msgid "Flip V&ertically"
msgstr ""
#. IDR_POPUP_IMG_CTXT, ID_IMG_CURPANE_FLIP_HORIZONTALLY
-#: Merge.rc:188 Merge.rc:1228
+#: Merge.rc:188 Merge.rc:1238
msgid "Flip H&orizontally"
msgstr ""
#. IDR_MERGEDOCTYPE
-#: Merge.rc:193 Merge.rc:699
+#: Merge.rc:193 Merge.rc:706
msgid "&Zoom"
msgstr "&تغيير الحجم"
#. IDR_MERGEDOCTYPE, ID_VIEW_ZOOMIN
-#: Merge.rc:202 Merge.rc:701
+#: Merge.rc:202 Merge.rc:708
msgid "Zoom &In\tCtrl++"
msgstr "ت&كبير\tCtrl++"
#. IDR_MERGEDOCTYPE, ID_VIEW_ZOOMOUT
-#: Merge.rc:203 Merge.rc:702
+#: Merge.rc:203 Merge.rc:709
msgid "Zoom &Out\tCtrl+-"
msgstr "ت&صغير\tCtrl+-"
#. IDR_MERGEDOCTYPE, ID_VIEW_ZOOMNORMAL, Zoom to normal
-#: Merge.rc:205 Merge.rc:704
+#: Merge.rc:205 Merge.rc:711
msgid "&Normal\tCtrl+*"
msgstr "ال&حجم الطبيعي\tCtrl+*"
@@ -327,27 +327,27 @@ msgid "Dragging &Mode"
msgstr "وضع ال&سحب"
#. IDR_POPUP_IMG_CTXT, ID_IMG_DRAGGINGMODE_MOVE
-#: Merge.rc:217 Merge.rc:955 Merge.rc:1233
+#: Merge.rc:217 Merge.rc:963 Merge.rc:1243
msgid "&Move"
msgstr "&تحريك"
#. IDR_POPUP_IMG_CTXT, ID_IMG_DRAGGINGMODE_ADJUST_OFFSET
-#: Merge.rc:218 Merge.rc:1234
+#: Merge.rc:218 Merge.rc:1244
msgid "&Adjust Offset"
msgstr "ت&عديل مقدار الإزاحة"
#. IDR_POPUP_IMG_CTXT, ID_IMG_DRAGGINGMODE_VERTICAL_WIPE
-#: Merge.rc:219 Merge.rc:1235
+#: Merge.rc:219 Merge.rc:1245
msgid "&Vertical Wipe"
msgstr ""
#. IDR_POPUP_IMG_CTXT, ID_IMG_DRAGGINGMODE_HORIZONTAL_WIPE
-#: Merge.rc:220 Merge.rc:1236
+#: Merge.rc:220 Merge.rc:1246
msgid "&Horizontal Wipe"
msgstr ""
#. IDR_POPUP_IMG_CTXT, ID_IMG_DRAGGINGMODE_RECTANGLE_SELECT
-#: Merge.rc:221 Merge.rc:1237
+#: Merge.rc:221 Merge.rc:1247
msgid "Rectangle &Select"
msgstr ""
@@ -382,37 +382,37 @@ msgid "Compare Extracted &Text from Images"
msgstr ""
#. IDD_OPEN, IDOK
-#: Merge.rc:272 Merge.rc:1980
+#: Merge.rc:272 Merge.rc:1990
msgid "Co&mpare"
msgstr "مقارنة"
#. IDR_POPUP_WEBPAGE_COMPARE, ID_WEB_COMPARE_SCREENSHOTS
-#: Merge.rc:274 Merge.rc:1247
+#: Merge.rc:274 Merge.rc:1257
msgid "&Screenshots"
msgstr ""
#. IDR_POPUP_WEBPAGE_COMPARE, ID_WEB_COMPARE_FULLSIZE_SCREENSHOTS
-#: Merge.rc:275 Merge.rc:1248
+#: Merge.rc:275 Merge.rc:1258
msgid "&Full Size Screenshots"
msgstr ""
#. IDR_POPUP_WEBPAGE_COMPARE, ID_WEB_COMPARE_HTMLS
-#: Merge.rc:276 Merge.rc:1249
+#: Merge.rc:276 Merge.rc:1259
msgid "&HTMLs"
msgstr ""
#. IDR_POPUP_WEBPAGE_COMPARE, ID_WEB_COMPARE_TEXTS
-#: Merge.rc:277 Merge.rc:1250
+#: Merge.rc:277 Merge.rc:1260
msgid "&Texts"
msgstr ""
#. IDR_POPUP_WEBPAGE_COMPARE, ID_WEB_COMPARE_RESOURCETREES
-#: Merge.rc:278 Merge.rc:1251
+#: Merge.rc:278 Merge.rc:1261
msgid "&Resource Trees"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_SIZE
-#: Merge.rc:280 Merge.rc:1775
+#: Merge.rc:280 Merge.rc:1785
msgid "&Size"
msgstr ""
@@ -427,27 +427,27 @@ msgid "&Event Sync"
msgstr ""
#. IDR_POPUP_WEBPAGE_SYNC_EVENTS, ID_WEB_SYNC_ENABLED
-#: Merge.rc:291 Merge.rc:1259
+#: Merge.rc:291 Merge.rc:1269
msgid "&Enabled"
msgstr ""
#. IDR_POPUP_WEBPAGE_SYNC_EVENTS, ID_WEB_SYNC_SCROLL
-#: Merge.rc:293 Merge.rc:1261
+#: Merge.rc:293 Merge.rc:1271
msgid "&Scroll"
msgstr ""
#. IDR_POPUP_WEBPAGE_SYNC_EVENTS, ID_WEB_SYNC_CLICK
-#: Merge.rc:294 Merge.rc:1262
+#: Merge.rc:294 Merge.rc:1272
msgid "&Click"
msgstr ""
#. IDR_POPUP_WEBPAGE_SYNC_EVENTS, ID_WEB_SYNC_INPUT
-#: Merge.rc:295 Merge.rc:1263
+#: Merge.rc:295 Merge.rc:1273
msgid "&Input"
msgstr ""
#. IDR_POPUP_WEBPAGE_SYNC_EVENTS, ID_WEB_SYNC_GOBACKFORWARD
-#: Merge.rc:296 Merge.rc:1264
+#: Merge.rc:296 Merge.rc:1274
msgid "&Go Back/Forward"
msgstr ""
@@ -477,4387 +477,4398 @@ msgid "&All Profiles"
msgstr ""
#. IDR_MERGEDOCTYPE
-#: Merge.rc:310 Merge.rc:411 Merge.rc:586
+#: Merge.rc:310 Merge.rc:413 Merge.rc:590
msgid "&File"
msgstr "&ملف"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:312 Merge.rc:413 Merge.rc:588
+#: Merge.rc:312 Merge.rc:415 Merge.rc:592
msgid "&New"
msgstr "&جدبد"
#. IDR_POPUP_COMPARE, ID_MERGE_COMPARE_TEXT
-#: Merge.rc:314 Merge.rc:322 Merge.rc:415 Merge.rc:423 Merge.rc:590
-#: Merge.rc:598 Merge.rc:649 Merge.rc:935 Merge.rc:1159 Merge.rc:1171
+#: Merge.rc:314 Merge.rc:323 Merge.rc:417 Merge.rc:426 Merge.rc:594
+#: Merge.rc:603 Merge.rc:655 Merge.rc:942 Merge.rc:1167 Merge.rc:1180
msgid "&Text"
msgstr "&نص"
#. IDR_POPUP_COMPARE, ID_MERGE_COMPARE_TABLE
-#: Merge.rc:315 Merge.rc:323 Merge.rc:416 Merge.rc:424 Merge.rc:591
-#: Merge.rc:599 Merge.rc:650 Merge.rc:936 Merge.rc:1160 Merge.rc:1172
+#: Merge.rc:315 Merge.rc:324 Merge.rc:418 Merge.rc:427 Merge.rc:595
+#: Merge.rc:604 Merge.rc:656 Merge.rc:943 Merge.rc:1168 Merge.rc:1181
msgid "T&able"
msgstr ""
#. IDR_POPUP_COMPARE, ID_MERGE_COMPARE_HEX
-#: Merge.rc:316 Merge.rc:324 Merge.rc:417 Merge.rc:425 Merge.rc:592
-#: Merge.rc:600 Merge.rc:651 Merge.rc:937 Merge.rc:1161 Merge.rc:1173
+#: Merge.rc:316 Merge.rc:325 Merge.rc:419 Merge.rc:428 Merge.rc:596
+#: Merge.rc:605 Merge.rc:657 Merge.rc:944 Merge.rc:1169 Merge.rc:1182
msgid "&Binary"
msgstr "ملف &ثنائي"
#. IDS_IMAGE_MENU
-#: Merge.rc:317 Merge.rc:325 Merge.rc:418 Merge.rc:426 Merge.rc:593
-#: Merge.rc:601 Merge.rc:652 Merge.rc:938 Merge.rc:1162 Merge.rc:1174
-#: Merge.rc:5123
+#: Merge.rc:317 Merge.rc:326 Merge.rc:420 Merge.rc:429 Merge.rc:597
+#: Merge.rc:606 Merge.rc:658 Merge.rc:945 Merge.rc:1170 Merge.rc:1183
+#: Merge.rc:5133
msgid "&Image"
msgstr "&صورة"
#. IDR_POPUP_COMPARE, ID_MERGE_COMPARE_WEBPAGE
-#: Merge.rc:318 Merge.rc:326 Merge.rc:419 Merge.rc:427 Merge.rc:594
-#: Merge.rc:602 Merge.rc:653 Merge.rc:939 Merge.rc:1163 Merge.rc:1175
+#: Merge.rc:318 Merge.rc:327 Merge.rc:421 Merge.rc:430 Merge.rc:598
+#: Merge.rc:607 Merge.rc:659 Merge.rc:946 Merge.rc:1171 Merge.rc:1184
msgid "&Webpage"
msgstr ""
+#. IDR_POPUP_NEW, ID_FILE_NEW_FOLDER
+#: Merge.rc:319 Merge.rc:328 Merge.rc:422 Merge.rc:431 Merge.rc:599
+#: Merge.rc:608 Merge.rc:1172
+msgid "&Folder"
+msgstr ""
+
#. IDR_MERGEDOCTYPE
-#: Merge.rc:320 Merge.rc:421 Merge.rc:596
+#: Merge.rc:321 Merge.rc:424 Merge.rc:601
msgid "New (&3 panes)"
msgstr "جديد - &3 أجزاء"
#. IDR_MERGEDOCTYPE, ID_FILE_OPEN
-#: Merge.rc:328 Merge.rc:429 Merge.rc:604
+#: Merge.rc:330 Merge.rc:433 Merge.rc:610
msgid "&Open...\tCtrl+O"
msgstr "&فتح...\tCtrl+O"
#. IDR_MERGEDOCTYPE, ID_FILE_OPENCONFLICT
-#: Merge.rc:329 Merge.rc:430 Merge.rc:605
+#: Merge.rc:331 Merge.rc:434 Merge.rc:611
msgid "Open Conflic&t File..."
msgstr "ف&تح ملف التعارض..."
#. IDR_MERGEDOCTYPE, ID_FILE_OPENCLIPBOARD
-#: Merge.rc:330 Merge.rc:431 Merge.rc:606
+#: Merge.rc:332 Merge.rc:435 Merge.rc:612
msgid "Open C&lipboard"
msgstr ""
#. IDR_POPUP_PROJECT, ID_FILE_OPENPROJECT
-#: Merge.rc:332 Merge.rc:433 Merge.rc:608 Merge.rc:1191
+#: Merge.rc:334 Merge.rc:437 Merge.rc:614 Merge.rc:1201
msgid "Open Pro&ject...\tCtrl+J"
msgstr "فتح مشروع...\tCtrl+J"
#. IDD_OPEN, ID_SAVE_PROJECT
-#: Merge.rc:333 Merge.rc:434 Merge.rc:609 Merge.rc:1193 Merge.rc:1979
+#: Merge.rc:335 Merge.rc:438 Merge.rc:615 Merge.rc:1203 Merge.rc:1989
msgid "Sa&ve Project..."
msgstr "&حفظ المشروع..."
#. IDR_MAINFRAME, ID_FILE_PROJECT_MRU_FIRST
-#: Merge.rc:335
+#: Merge.rc:337
msgid "Recent Projects"
msgstr "المشاريع الأخيرة"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:336 Merge.rc:445 Merge.rc:657
+#: Merge.rc:338 Merge.rc:449 Merge.rc:664
msgid "Recent F&iles or Folders"
msgstr "الملفات أو المجلدات الأخيرة"
#. IDR_MERGEDOCTYPE, ID_APP_EXIT
-#: Merge.rc:341 Merge.rc:450 Merge.rc:662
+#: Merge.rc:343 Merge.rc:454 Merge.rc:669
msgid "E&xit\tCtrl+Q"
msgstr "&خروج\tCtrl+Q"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:343 Merge.rc:452 Merge.rc:664
+#: Merge.rc:345 Merge.rc:456 Merge.rc:671
msgid "&Edit"
msgstr "&تحرير"
#. IDR_MERGEDOCTYPE, ID_EDIT_PASTE
-#: Merge.rc:345 Merge.rc:671
+#: Merge.rc:347 Merge.rc:678
msgid "&Paste\tCtrl+V"
msgstr "&لصق"
#. IDR_MERGEDOCTYPE, ID_OPTIONS
-#: Merge.rc:347 Merge.rc:456 Merge.rc:693
+#: Merge.rc:349 Merge.rc:460 Merge.rc:700
msgid "&Options...\tCtrl+,"
msgstr "خ&يارات...\tCtrl+,"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:349 Merge.rc:458 Merge.rc:695
+#: Merge.rc:351 Merge.rc:462 Merge.rc:702
msgid "&View"
msgstr "&عرض"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:351 Merge.rc:500 Merge.rc:744
+#: Merge.rc:353 Merge.rc:504 Merge.rc:751
msgid "Ta&b Bar"
msgstr "شريط الت&بويب"
#. IDR_MERGEDOCTYPE, ID_VIEW_TAB_BAR
-#: Merge.rc:353 Merge.rc:502 Merge.rc:746
+#: Merge.rc:355 Merge.rc:506 Merge.rc:753
msgid "&View Tab Bar"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_VIEW_TAB_BAR_ON_TITLE_BAR
-#: Merge.rc:354 Merge.rc:503 Merge.rc:747
+#: Merge.rc:356 Merge.rc:507 Merge.rc:754
msgid "&On Title Bar"
msgstr ""
#. IDR_MERGEDOCTYPE
-#: Merge.rc:356 Merge.rc:505 Merge.rc:749
+#: Merge.rc:358 Merge.rc:509 Merge.rc:756
msgid "&Toolbar"
msgstr "&شريط الأدوات"
#. IDR_MERGEDOCTYPE, ID_TOOLBAR_SMALL
-#: Merge.rc:359 Merge.rc:508 Merge.rc:752
+#: Merge.rc:361 Merge.rc:512 Merge.rc:759
msgid "&Small"
msgstr "&صغير"
#. IDR_MERGEDOCTYPE, ID_TOOLBAR_MEDIUM
-#: Merge.rc:360 Merge.rc:509 Merge.rc:753
+#: Merge.rc:362 Merge.rc:513 Merge.rc:760
msgid "&Medium"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_TOOLBAR_BIG
-#: Merge.rc:361 Merge.rc:510 Merge.rc:754
+#: Merge.rc:363 Merge.rc:514 Merge.rc:761
msgid "&Big"
msgstr "&كبير"
#. IDR_MERGEDOCTYPE, ID_TOOLBAR_HUGE
-#: Merge.rc:362 Merge.rc:511 Merge.rc:755
+#: Merge.rc:364 Merge.rc:515 Merge.rc:762
msgid "&Huge"
msgstr "&ضخم"
#. IDS_VIEW_MENU_BAR
-#: Merge.rc:364 Merge.rc:513 Merge.rc:757 Merge.rc:5357
+#: Merge.rc:366 Merge.rc:517 Merge.rc:764 Merge.rc:5368
msgid "Men&u Bar"
msgstr ""
#. IDR_DIRDOCTYPE, ID_VIEW_OUTPUT_BAR
-#: Merge.rc:365 Merge.rc:515
+#: Merge.rc:367 Merge.rc:519
msgid "&Output Pane"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_VIEW_STATUS_BAR
-#: Merge.rc:366 Merge.rc:516 Merge.rc:758
+#: Merge.rc:368 Merge.rc:520 Merge.rc:765
msgid "&Status Bar"
msgstr "شريط ال&حالة"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:368 Merge.rc:539 Merge.rc:847
+#: Merge.rc:370 Merge.rc:543 Merge.rc:854
msgid "&Tools"
msgstr "أ&دوات"
#. IDR_MERGEDOCTYPE, ID_TOOLS_FILTERS
-#: Merge.rc:370 Merge.rc:542 Merge.rc:849
+#: Merge.rc:372 Merge.rc:546 Merge.rc:856
msgid "&Filters..."
msgstr "الم&رشحات..."
#. IDR_MERGEDOCTYPE, ID_TOOLS_GENERATEPATCH
-#: Merge.rc:371 Merge.rc:543 Merge.rc:850
+#: Merge.rc:373 Merge.rc:547 Merge.rc:857
msgid "&Generate Patch..."
msgstr "ت&وليد تصحيح..."
#. IDR_MERGEDOCTYPE
-#: Merge.rc:373 Merge.rc:546 Merge.rc:853
+#: Merge.rc:375 Merge.rc:550 Merge.rc:860
msgid "&Plugins"
msgstr "الإ&ضافات"
#. IDD_PLUGINS_LIST, IDC_PLUGIN_SETTINGS
-#: Merge.rc:375 Merge.rc:548 Merge.rc:855 Merge.rc:2494 Merge.rc:2926
+#: Merge.rc:377 Merge.rc:552 Merge.rc:862 Merge.rc:2504 Merge.rc:2936
msgid "P&lugin Settings..."
msgstr "&خيارات الإضافات..."
#. IDR_MERGEDOCTYPE, ID_PREDIFFER_MANUAL
-#: Merge.rc:377 Merge.rc:550 Merge.rc:857
+#: Merge.rc:379 Merge.rc:554 Merge.rc:864
msgid "Ma&nual Prediffer"
msgstr "ا&ختلافات مسبقة محددة يدويا"
#. IDR_MERGEDOCTYPE, ID_PREDIFFER_AUTO
-#: Merge.rc:378 Merge.rc:551 Merge.rc:858
+#: Merge.rc:380 Merge.rc:555 Merge.rc:865
msgid "A&utomatic Prediffer"
msgstr "اختلافات مسبقة محددة آليا"
#. IDR_MERGEDOCTYPE, ID_UNPACK_MANUAL
-#: Merge.rc:380 Merge.rc:553 Merge.rc:860
+#: Merge.rc:382 Merge.rc:557 Merge.rc:867
msgid "&Manual Unpacking"
msgstr "تف&ريغ يدوي"
#. IDR_MERGEDOCTYPE, ID_UNPACK_AUTO
-#: Merge.rc:381 Merge.rc:554 Merge.rc:861
+#: Merge.rc:383 Merge.rc:558 Merge.rc:868
msgid "&Automatic Unpacking"
msgstr "تفري&غ آلي"
#. IDR_MERGEDOCTYPE, ID_RELOAD_PLUGINS
-#: Merge.rc:383 Merge.rc:558 Merge.rc:889
+#: Merge.rc:385 Merge.rc:562 Merge.rc:896
msgid "&Reload Plugins"
msgstr "&إعادة تحميل الإضافات"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:385 Merge.rc:560 Merge.rc:891
+#: Merge.rc:387 Merge.rc:564 Merge.rc:898
msgid "&Window"
msgstr "ناف&ذة"
#. IDR_MERGEDOCTYPE, ID_FILE_CLOSE
-#: Merge.rc:387 Merge.rc:562 Merge.rc:893
+#: Merge.rc:389 Merge.rc:566 Merge.rc:900
msgid "Cl&ose\tCtrl+W"
msgstr "إ&غلاق\tCtrl+W"
#. IDR_MERGEDOCTYPE, ID_WINDOW_CLOSEALL
-#: Merge.rc:388 Merge.rc:563 Merge.rc:894
+#: Merge.rc:390 Merge.rc:567 Merge.rc:901
msgid "Clo&se All"
msgstr "إغلاق ال&جميع"
#. IDR_MERGEDOCTYPE, ID_NEXT_PANE
-#: Merge.rc:390 Merge.rc:565 Merge.rc:896
+#: Merge.rc:392 Merge.rc:569 Merge.rc:903
msgid "Change &Pane\tF6"
msgstr "تغيير ال&جزء\tF6"
#. IDR_MERGEDOCTYPE, ID_WINDOW_TILE_HORZ
-#: Merge.rc:392 Merge.rc:567 Merge.rc:900
+#: Merge.rc:394 Merge.rc:571 Merge.rc:907
msgid "Tile &Horizontally"
msgstr "تشكيل &عمودي"
#. IDR_MERGEDOCTYPE, ID_WINDOW_TILE_VERT
-#: Merge.rc:393 Merge.rc:568 Merge.rc:901
+#: Merge.rc:395 Merge.rc:572 Merge.rc:908
msgid "Tile &Vertically"
msgstr "تشكيل &أفقي"
#. IDR_MERGEDOCTYPE, ID_WINDOW_CASCADE
-#: Merge.rc:394 Merge.rc:569 Merge.rc:902
+#: Merge.rc:396 Merge.rc:573 Merge.rc:909
msgid "&Cascade"
msgstr "&Cascade"
#. IDS_MESSAGEBOX_HELP
-#: Merge.rc:396 Merge.rc:571 Merge.rc:904 Merge.rc:3200 Merge.rc:4189
+#: Merge.rc:398 Merge.rc:575 Merge.rc:911 Merge.rc:3210 Merge.rc:4199
msgid "&Help"
msgstr "&مساعدة"
#. IDR_MERGEDOCTYPE, ID_HELP_CONTENTS
-#: Merge.rc:398 Merge.rc:573 Merge.rc:906
+#: Merge.rc:400 Merge.rc:577 Merge.rc:913
msgid "&WinMerge Help\tF1"
msgstr "م&ساعدة WinMerge\tF1"
#. IDR_MERGEDOCTYPE, ID_HELP_RELEASENOTES
-#: Merge.rc:400 Merge.rc:575 Merge.rc:908
+#: Merge.rc:402 Merge.rc:579 Merge.rc:915
msgid "R&elease Notes"
msgstr "ملاح&ظات الإصدار"
#. IDR_MERGEDOCTYPE, ID_HELP_TRANSLATIONS
-#: Merge.rc:401 Merge.rc:576 Merge.rc:909
+#: Merge.rc:403 Merge.rc:580 Merge.rc:916
msgid "&Translations"
msgstr "التر&جمات"
#. IDR_MERGEDOCTYPE, ID_HELP_GETCONFIG
-#: Merge.rc:402 Merge.rc:577 Merge.rc:910
+#: Merge.rc:404 Merge.rc:581 Merge.rc:917
msgid "C&onfiguration"
msgstr "الإ&عدادات"
#. IDR_MERGEDOCTYPE, ID_HELP_GNULICENSE
-#: Merge.rc:404 Merge.rc:579 Merge.rc:912
+#: Merge.rc:406 Merge.rc:583 Merge.rc:919
msgid "&GNU General Public License"
msgstr "&رخصة جنو العمومية"
#. IDR_MERGEDOCTYPE, ID_APP_ABOUT
-#: Merge.rc:405 Merge.rc:580 Merge.rc:913
+#: Merge.rc:407 Merge.rc:584 Merge.rc:920
msgid "&About WinMerge..."
msgstr "&حول WinMerge..."
#. IDR_MERGEDOCTYPE
-#: Merge.rc:436 Merge.rc:629
+#: Merge.rc:440 Merge.rc:635
msgid "&Read-Only"
msgstr "لل&قراءة فقط"
#. IDR_MERGEDOCTYPE, ID_FILE_LEFT_READONLY
-#: Merge.rc:438 Merge.rc:631
+#: Merge.rc:442 Merge.rc:637
msgid "L&eft Read-Only"
msgstr "الجزء الأي&سر للقراءة فقط"
#. IDR_MERGEDOCTYPE, ID_FILE_MIDDLE_READONLY
-#: Merge.rc:439 Merge.rc:632
+#: Merge.rc:443 Merge.rc:638
msgid "M&iddle Read-Only"
msgstr "الجزء الأوس&ط للقراءة فقط"
#. IDR_MERGEDOCTYPE, ID_FILE_RIGHT_READONLY
-#: Merge.rc:440 Merge.rc:633
+#: Merge.rc:444 Merge.rc:639
msgid "Ri&ght Read-Only"
msgstr "الجزء الأي&من للقراءة فقط"
#. IDD_ENCODINGERROR, IDC_FILEENCODING
-#: Merge.rc:443 Merge.rc:646 Merge.rc:1038 Merge.rc:3063
+#: Merge.rc:447 Merge.rc:652 Merge.rc:1046 Merge.rc:3073
msgid "&File Encoding..."
msgstr "ترمي&ز الملف..."
#. IDR_POPUP_OUTPUTVIEW, ID_EDIT_SELECT_ALL
-#: Merge.rc:454 Merge.rc:674 Merge.rc:1343
+#: Merge.rc:458 Merge.rc:681 Merge.rc:1353
msgid "Select &All\tCtrl+A"
msgstr "&تحديد الكل\tCtrl+A"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWIDENTICAL
-#: Merge.rc:460
+#: Merge.rc:464
msgid "Show &Identical Items"
msgstr "عرض العناصر ال&متشابهة"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWDIFFERENT
-#: Merge.rc:461
+#: Merge.rc:465
msgid "Show &Different Items"
msgstr "عرض العناصر الم&ختلفة"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWUNIQUELEFT
-#: Merge.rc:462
+#: Merge.rc:466
msgid "Show L&eft Unique Items"
msgstr "عرض العناصر ال&فريدة في الجزء الأيسر"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWUNIQUEMIDDLE
-#: Merge.rc:463
+#: Merge.rc:467
msgid "Show Midd&le Unique Items"
msgstr "عرض العناصر الف&ريدة في الجزء الأوسط"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWUNIQUERIGHT
-#: Merge.rc:464
+#: Merge.rc:468
msgid "Show Ri&ght Unique Items"
msgstr "عرض العناصر الفر&يدة في الجزء الأيمن"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWSKIPPED
-#: Merge.rc:465
+#: Merge.rc:469
msgid "Show S&kipped Items"
msgstr "عرض العناصر التي تم ت&خطيها"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWBINARIES
-#: Merge.rc:466
+#: Merge.rc:470
msgid "S&how Binary Files"
msgstr "عرض الملفات ال&ثنائية"
#. IDR_DIRDOCTYPE
-#: Merge.rc:467
+#: Merge.rc:471
msgid "&3-way Compare"
msgstr "مقارنة بين &3 ملفات"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWDIFFERENTLEFTONLY
-#: Merge.rc:469
+#: Merge.rc:473
msgid "Show &Left Only Different Items"
msgstr "عرض العناصر المختلفة في الجزء الأيسر فقط"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWDIFFERENTMIDDLEONLY
-#: Merge.rc:470
+#: Merge.rc:474
msgid "Show &Middle Only Different Items"
msgstr "عرض العناصر المختلفة في الجزء الأوسط فقط"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWDIFFERENTRIGHTONLY
-#: Merge.rc:471
+#: Merge.rc:475
msgid "Show &Right Only Different Items"
msgstr "عرض العناصر المختلفة في الجزء الأيمن فقط"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWMISSINGLEFTONLY
-#: Merge.rc:473
+#: Merge.rc:477
msgid "Show L&eft Only Missing Items"
msgstr "عرض العناصر المفقودة في الجزء الأيسر فقط"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWMISSINGMIDDLEONLY
-#: Merge.rc:474
+#: Merge.rc:478
msgid "Show Mi&ddle Only Missing Items"
msgstr "عرض العناصر المفقودة في الجزء الأوسط فقط"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWMISSINGRIGHTONLY
-#: Merge.rc:475
+#: Merge.rc:479
msgid "Show Rig&ht Only Missing Items"
msgstr "عرض العناصر المفقودة في الجزء الأيمن فقط"
#. IDR_DIRDOCTYPE, ID_VIEW_SHOWHIDDENITEMS
-#: Merge.rc:478
+#: Merge.rc:482
msgid "Show Hidd&en Items"
msgstr "عرض العناصر المخفية"
#. IDR_DIRDOCTYPE, ID_VIEW_TREEMODE
-#: Merge.rc:480
+#: Merge.rc:484
msgid "Tree &Mode"
msgstr "وضع العرض الهرمي"
#. IDR_DIRDOCTYPE
-#: Merge.rc:481
+#: Merge.rc:485
msgid "E&xpand Subfolders"
msgstr ""
#. IDR_DIRDOCTYPE, ID_VIEW_EXPAND_ALLSUBDIRS
-#: Merge.rc:483
+#: Merge.rc:487
msgid "&All Subfolders"
msgstr ""
#. IDR_DIRDOCTYPE, ID_VIEW_EXPAND_DIFFERENT_SUBDIRS
-#: Merge.rc:484
+#: Merge.rc:488
msgid "&Different Subfolders"
msgstr ""
#. IDR_DIRDOCTYPE, ID_VIEW_EXPAND_IDENTICAL_SUBDIRS
-#: Merge.rc:485
+#: Merge.rc:489
msgid "&Identical Subfolders"
msgstr ""
#. IDR_DIRDOCTYPE, ID_VIEW_COLLAPSE_ALLSUBDIRS
-#: Merge.rc:487
+#: Merge.rc:491
msgid "&Collapse All Subfolders"
msgstr "إخفاء محتويات المجلدات الفرعية"
#. IDR_DIRDOCTYPE, ID_VIEW_SHOW_EMPTY_FOLDERS
-#: Merge.rc:488
+#: Merge.rc:492
msgid "Show &Empty Folders"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_VIEW_SELECTFONT
-#: Merge.rc:490 Merge.rc:697
+#: Merge.rc:494 Merge.rc:704
msgid "Select &Font..."
msgstr "اختيار نوع الخط..."
#. IDR_MERGEDOCTYPE, ID_VIEW_USEDEFAULTFONT
-#: Merge.rc:491 Merge.rc:698
+#: Merge.rc:495 Merge.rc:705
msgid "Use Default Font"
msgstr "اختيار نوع الخط الإفتراضي"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:493 Merge.rc:736
+#: Merge.rc:497 Merge.rc:743
msgid "Sw&ap Panes"
msgstr "الأجزاء الخاصة بالمبادلة"
#. IDR_MERGEDOCTYPE, ID_SWAPPANES_SWAP12
-#: Merge.rc:495 Merge.rc:738
+#: Merge.rc:499 Merge.rc:745
msgid "Swap &1st | 2nd"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_SWAPPANES_SWAP23
-#: Merge.rc:496 Merge.rc:739
+#: Merge.rc:500 Merge.rc:746
msgid "Swap &2nd | 3rd"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_SWAPPANES_SWAP13
-#: Merge.rc:497 Merge.rc:740
+#: Merge.rc:501 Merge.rc:747
msgid "Swap 1st | &3rd"
msgstr ""
#. IDR_DIRDOCTYPE, ID_VIEW_DISPLAY_FILTER_BAR_MENU
-#: Merge.rc:514
+#: Merge.rc:518
msgid "Displa&y Filter Bar\tCtrl+Shift+L"
msgstr ""
#. IDR_DIRDOCTYPE, ID_VIEW_DIR_STATISTICS
-#: Merge.rc:518
+#: Merge.rc:522
msgid "Com&pare Statistics..."
msgstr "إحصائيات المقارنة..."
#. IDR_MERGEDOCTYPE, ID_REFRESH
-#: Merge.rc:520 Merge.rc:763
+#: Merge.rc:524 Merge.rc:770
msgid "Refresh\tF5"
msgstr "&تحديث\tF5"
#. IDR_POPUP_DIRVIEW, ID_RESCAN
-#: Merge.rc:521 Merge.rc:1030
+#: Merge.rc:525 Merge.rc:1038
msgid "&Refresh Selected\tCtrl+F5"
msgstr "تحديث ال&عناصر المحددة\tCtrl+F5"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:523 Merge.rc:765
+#: Merge.rc:527 Merge.rc:772
msgid "&Merge"
msgstr "&دمج"
#. IDR_DIRDOCTYPE, ID_MERGE_COMPARE
-#: Merge.rc:525
+#: Merge.rc:529
msgid "Co&mpare\tEnter"
msgstr "&مقارنة\tEnter"
#. IDR_MERGEDOCTYPE, ID_NEXTDIFF
-#: Merge.rc:527 Merge.rc:767
+#: Merge.rc:531 Merge.rc:774
msgid "&Next Difference\tAlt+Down"
msgstr "الاختلاف ال&تالي\tAlt+Down"
#. IDR_MERGEDOCTYPE, ID_PREVDIFF
-#: Merge.rc:528 Merge.rc:768
+#: Merge.rc:532 Merge.rc:775
msgid "&Previous Difference\tAlt+Up"
msgstr "الاختلاف ال&سابق\tAlt+Up"
#. IDR_MERGEDOCTYPE, ID_FIRSTDIFF
-#: Merge.rc:530 Merge.rc:773
+#: Merge.rc:534 Merge.rc:780
msgid "&First Difference\tAlt+Home"
msgstr "الاختلاف ال&أول\tAlt+Home"
#. IDR_MERGEDOCTYPE, ID_CURDIFF
-#: Merge.rc:531 Merge.rc:774
+#: Merge.rc:535 Merge.rc:781
msgid "&Current Difference\tAlt+Enter"
msgstr "الاختلاف ال&حالي\tAlt+Enter"
#. IDR_MERGEDOCTYPE, ID_LASTDIFF
-#: Merge.rc:532 Merge.rc:775
+#: Merge.rc:536 Merge.rc:782
msgid "&Last Difference\tAlt+End"
msgstr "الاختلاف الأ&خير\tAlt+End"
#. IDR_MERGEDOCTYPE, ID_L2R
-#: Merge.rc:534 Merge.rc:830
+#: Merge.rc:538 Merge.rc:837
msgid "Copy to &Right\tAlt+Right"
msgstr "النسخ إلى ال&يمين\tAlt+Right"
#. IDR_MERGEDOCTYPE, ID_R2L
-#: Merge.rc:535 Merge.rc:831
+#: Merge.rc:539 Merge.rc:838
msgid "Copy to L&eft\tAlt+Left"
msgstr "النسخ إلى الي&سار\tAlt+Left"
#. IDR_DIRDOCTYPE, ID_MERGE_DELETE
-#: Merge.rc:537
+#: Merge.rc:541
msgid "&Delete\tDel"
msgstr "ح&ذف\tDel"
#. IDR_POPUP_DIRVIEW, ID_TOOLS_CUSTOMIZECOLUMNS
-#: Merge.rc:541 Merge.rc:1042
+#: Merge.rc:545 Merge.rc:1050
msgid "&Customize Columns..."
msgstr "تخصيص الأعمدة..."
#. IDR_MERGEDOCTYPE, ID_TOOLS_GENERATEREPORT
-#: Merge.rc:544 Merge.rc:851
+#: Merge.rc:548 Merge.rc:858
msgid "Generate &Report..."
msgstr "انشاء تقرير..."
#. IDD_ENCODINGERROR, IDC_PLUGIN
-#: Merge.rc:556 Merge.rc:867 Merge.rc:3064
+#: Merge.rc:560 Merge.rc:874 Merge.rc:3074
msgid "&Edit with Unpacker..."
msgstr "تعديل باستخدام فاتح الحزم..."
#. IDR_MERGEDOCTYPE, ID_FILE_SAVE
-#: Merge.rc:611
+#: Merge.rc:617
msgid "&Save\tCtrl+S"
msgstr "&حفظ\tCtrl+S"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:612
+#: Merge.rc:618
msgid "Sav&e"
msgstr "حف&ظ"
#. IDR_POPUP_SAVE, ID_FILE_SAVE_LEFT
-#: Merge.rc:614 Merge.rc:1201
+#: Merge.rc:620 Merge.rc:1211
msgid "Save &Left"
msgstr "حفظ الجزء الأي&سر"
#. IDR_POPUP_SAVE, ID_FILE_SAVE_MIDDLE
-#: Merge.rc:615 Merge.rc:1202
+#: Merge.rc:621 Merge.rc:1212
msgid "Save &Middle"
msgstr "حفظ الجزء الأوس&ط"
#. IDR_POPUP_SAVE, ID_FILE_SAVE_RIGHT
-#: Merge.rc:616 Merge.rc:1203
+#: Merge.rc:622 Merge.rc:1213
msgid "Save &Right"
msgstr "حفظ الجزء الأي&من"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:618
+#: Merge.rc:624
msgid "Save &As"
msgstr "حفظ &باسم"
#. IDR_POPUP_SAVE, ID_FILE_SAVEAS_LEFT
-#: Merge.rc:620 Merge.rc:1205
+#: Merge.rc:626 Merge.rc:1215
msgid "Save &Left As..."
msgstr "حفظ الجزء الأي&سر باسم..."
#. IDR_POPUP_SAVE, ID_FILE_SAVEAS_MIDDLE
-#: Merge.rc:621 Merge.rc:1206
+#: Merge.rc:627 Merge.rc:1216
msgid "Save &Middle As..."
msgstr "حفظ الجزء الأوس&ط باسم..."
#. IDR_POPUP_SAVE, ID_FILE_SAVEAS_RIGHT
-#: Merge.rc:622 Merge.rc:1207
+#: Merge.rc:628 Merge.rc:1217
msgid "Save &Right As..."
msgstr "حفظ الجزء الأي&من باسم..."
#. IDR_MERGEDOCTYPE, ID_FILE_PRINT
-#: Merge.rc:625
+#: Merge.rc:631
msgid "&Print...\tCtrl+P"
msgstr "&طباعة...\tCtrl+P"
#. IDR_MERGEDOCTYPE, ID_FILE_PAGE_SETUP
-#: Merge.rc:626
+#: Merge.rc:632
msgid "Page Set&up..."
msgstr "&إعداد الصفحة..."
#. IDR_MERGEDOCTYPE, ID_FILE_PRINT_PREVIEW
-#: Merge.rc:627
+#: Merge.rc:633
msgid "Print Previe&w..."
msgstr "&معاينة قبل الطباعة..."
#. IDR_MERGEDOCTYPE
-#: Merge.rc:636
+#: Merge.rc:642
msgid "&Convert Line Endings to"
msgstr "&تحويل نهاية الأسطر إلى"
#. IDR_MERGEDOCTYPE, ID_FILE_MERGINGMODE
-#: Merge.rc:643
+#: Merge.rc:649
msgid "Mer&ge Mode\tF9"
msgstr "&وضع الدمج\tF9"
#. IDR_MERGEDOCTYPE, ID_RESCAN
-#: Merge.rc:645
+#: Merge.rc:651
msgid "Reloa&d\tCtrl+F5"
msgstr "إ&عادةتحميل\tCtrl+F5"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:647
+#: Merge.rc:653
msgid "Reco&mpare As"
msgstr "إعادة مقارنة بصيغة أخرى"
+#. IDR_POPUP_COMPARE, ID_MERGE_COMPARE_FOLDER
+#: Merge.rc:660 Merge.rc:947 Merge.rc:1185
+msgid "A&rchive"
+msgstr ""
+
#. IDR_MERGEDOCTYPE, ID_EDIT_UNDO
-#: Merge.rc:666
+#: Merge.rc:673
msgid "&Undo\tCtrl+Z"
msgstr "&تراجع"
#. IDR_MERGEDOCTYPE, ID_EDIT_REDO
-#: Merge.rc:667
+#: Merge.rc:674
msgid "&Redo\tCtrl+Y"
msgstr "&إعادة الأمر"
#. IDR_MERGEDOCTYPE, ID_EDIT_CUT
-#: Merge.rc:669
+#: Merge.rc:676
msgid "Cu&t\tCtrl+X"
msgstr "&قص"
#. IDR_POPUP_OUTPUTVIEW, ID_EDIT_COPY
-#: Merge.rc:670 Merge.rc:1342
+#: Merge.rc:677 Merge.rc:1352
msgid "&Copy\tCtrl+C"
msgstr "&نسخ"
#. IDR_MERGEDOCTYPE, ID_EDIT_FIND
-#: Merge.rc:676
+#: Merge.rc:683
msgid "F&ind...\tCtrl+F"
msgstr "&بحث"
#. IDR_MERGEDOCTYPE, ID_EDIT_REPLACE
-#: Merge.rc:677
+#: Merge.rc:684
msgid "Repla&ce...\tCtrl+H"
msgstr "ا&ستبدال"
#. IDR_MERGEDOCTYPE, ID_EDIT_MARK
-#: Merge.rc:678
+#: Merge.rc:685
msgid "&Marker...\tCtrl+Shift+M"
msgstr "&علامة...\tCtrl+Shift+M"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:680
+#: Merge.rc:687
msgid "Advanced"
msgstr "متقدم"
#. IDR_MERGEDOCTYPE, ID_EDIT_COPY_LINENUMBERS
-#: Merge.rc:682
+#: Merge.rc:689
msgid "&Copy With Line Numbers\tCtrl+Shift+C"
msgstr "&نسخ مع رقم السطر"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:684
+#: Merge.rc:691
msgid "&Bookmarks"
msgstr "إ&شارات مرجعية"
#. IDR_MERGEDOCTYPE, ID_EDIT_TOGGLE_BOOKMARK
-#: Merge.rc:686
+#: Merge.rc:693
msgid "&Toggle Bookmark\tCtrl+F2"
msgstr "&عكس الإشارات المرجعية\tCtrl+F2"
#. IDR_MERGEDOCTYPE, ID_EDIT_GOTO_NEXT_BOOKMARK
-#: Merge.rc:687
+#: Merge.rc:694
msgid "&Next Bookmark\tF2"
msgstr "الإشارة المرجعية ال&تالية\tF2"
#. IDR_MERGEDOCTYPE, ID_EDIT_GOTO_PREV_BOOKMARK
-#: Merge.rc:688
+#: Merge.rc:695
msgid "&Previous Bookmark\tShift+F2"
msgstr "الإشارة المرجعية ال&سابقة\tShift+F2"
#. IDR_MERGEDOCTYPE, ID_EDIT_CLEAR_ALL_BOOKMARKS
-#: Merge.rc:689
+#: Merge.rc:696
msgid "&Clear All Bookmarks"
msgstr "&مسح كافة الإشارات المرجعية"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:706
+#: Merge.rc:713
msgid "Syntax Highlight"
msgstr "تظليل النص حسب صيغته"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:711
+#: Merge.rc:718
msgid "&Diff Context"
msgstr "&سياق أداه مقارنة الملفات Diff"
#. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_ALL
-#: Merge.rc:713
+#: Merge.rc:720
msgid "&All Lines"
msgstr "&كافة الأسطر"
#. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_0
-#: Merge.rc:715
+#: Merge.rc:722
msgid "&0 Lines"
msgstr "&0 سطر"
#. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_1
-#: Merge.rc:716
+#: Merge.rc:723
msgid "&1 Line"
msgstr "&1 سطر"
#. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_3
-#: Merge.rc:717
+#: Merge.rc:724
msgid "&3 Lines"
msgstr "&3 سطر"
#. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_5
-#: Merge.rc:718
+#: Merge.rc:725
msgid "&5 Lines"
msgstr "&5 سطر"
#. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_7
-#: Merge.rc:719
+#: Merge.rc:726
msgid "&7 Lines"
msgstr "&7 سطر"
#. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_9
-#: Merge.rc:720
+#: Merge.rc:727
msgid "&9 Lines"
msgstr "&9 سطر"
#. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_TOGGLE
-#: Merge.rc:722
+#: Merge.rc:729
msgid "&Toggle All and 0-9 Lines\tCtrl+D"
msgstr "عكس الاختيار بين الكل و الأسطر 0-9\tCtrl+D"
#. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_INVERT
-#: Merge.rc:724
+#: Merge.rc:731
msgid "&Invert (Hide Different Lines)"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_VIEW_RESIZE_PANES
-#: Merge.rc:727
+#: Merge.rc:734
msgid "&Lock Panes"
msgstr "&قفل الأجزاء"
#. IDR_MERGEDOCTYPE, ID_VIEW_WHITESPACE
-#: Merge.rc:728
+#: Merge.rc:735
msgid "&View Whitespace"
msgstr "&عرض المسافة البيضاء (الفارغة)"
#. IDR_MERGEDOCTYPE, ID_VIEW_EOL
-#: Merge.rc:729
+#: Merge.rc:736
msgid "View E&OL"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_VIEW_LINEDIFFS
-#: Merge.rc:730
+#: Merge.rc:737
msgid "Vie&w Line Differences"
msgstr "عرض الا&ختلاف في السطر"
#. IDR_MERGEDOCTYPE, ID_VIEW_LINENUMBERS
-#: Merge.rc:731
+#: Merge.rc:738
msgid "View Line &Numbers"
msgstr "عرض &أرقام الأسطر"
#. IDR_MERGEDOCTYPE, ID_VIEW_SELMARGIN
-#: Merge.rc:732
+#: Merge.rc:739
msgid "View &Margins"
msgstr "عرض ال&هوامش"
#. IDR_MERGEDOCTYPE, ID_VIEW_TOPMARGIN
-#: Merge.rc:733
+#: Merge.rc:740
msgid "View To&p Margins"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_VIEW_WORDWRAP
-#: Merge.rc:734
+#: Merge.rc:741
msgid "W&rap Lines"
msgstr "إلت&فاف الأسطر"
#. IDR_MERGEDOCTYPE, ID_VIEW_SPLITVERTICALLY
-#: Merge.rc:742
+#: Merge.rc:749
msgid "Split V&ertically"
msgstr "تقسيم &عمودي"
#. IDR_MERGEDOCTYPE, ID_VIEW_DETAIL_BAR
-#: Merge.rc:759
+#: Merge.rc:766
msgid "Diff &Pane"
msgstr "ال&جزء الخاص بأداة مقارنة الملفات Diff"
#. IDR_MERGEDOCTYPE, ID_VIEW_LOCATION_BAR
-#: Merge.rc:760
+#: Merge.rc:767
msgid "Lo&cation Pane"
msgstr "الجزء الخاص &بالموقع"
#. IDS_OUTPUTBAR_CAPTION
-#: Merge.rc:761 Merge.rc:4902
+#: Merge.rc:768 Merge.rc:4912
msgid "Output Pane"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_NEXTCONFLICT
-#: Merge.rc:770
+#: Merge.rc:777
msgid "Ne&xt Conflict\tAlt+Shift+Down"
msgstr "التضارب التالي\tAlt+Shift+Down"
#. IDR_MERGEDOCTYPE, ID_PREVCONFLICT
-#: Merge.rc:771
+#: Merge.rc:778
msgid "Pre&vious Conflict\tAlt+Shift+Up"
msgstr "التضارب السابق\tAlt+Shift+Up"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:777
+#: Merge.rc:784
msgid "A&dvanced"
msgstr "&متقدم"
#. IDR_MERGEDOCTYPE, ID_NEXTDIFFLM
-#: Merge.rc:779
+#: Merge.rc:786
msgid "Next Difference (Left/Middle)\tAlt+1"
msgstr "الاختلاف التالي بين الجزء الأيسر والأوسط\tAlt+1"
#. IDR_MERGEDOCTYPE, ID_PREVDIFFLM
-#: Merge.rc:780
+#: Merge.rc:787
msgid "Previous Difference (Left/Middle)\tAlt+Shift+1"
msgstr "الاختلاف السابق بين الجزء الأيسر والأوسط\tAlt+Shift+1"
#. IDR_MERGEDOCTYPE, ID_NEXTDIFFLR
-#: Merge.rc:782
+#: Merge.rc:789
msgid "Next Difference (Left/Right)\tAlt+2"
msgstr "الاختلاف التالي بين الجزء الأيسر والأيمن\tAlt+2"
#. IDR_MERGEDOCTYPE, ID_PREVDIFFLR
-#: Merge.rc:783
+#: Merge.rc:790
msgid "Previous Difference (Left/Right)\tAlt+Shift+2"
msgstr "الاختلاف السابق بين الجزء الأيسر والأيمن\tAlt+Shift+2"
#. IDR_MERGEDOCTYPE, ID_NEXTDIFFMR
-#: Merge.rc:785
+#: Merge.rc:792
msgid "Next Difference (Middle/Right)\tAlt+3"
msgstr "الاختلاف التالي بين الجزء الأوسط والأيمن\tAlt+3"
#. IDR_MERGEDOCTYPE, ID_PREVDIFFMR
-#: Merge.rc:786
+#: Merge.rc:793
msgid "Previous Difference (Middle/Right)\tAlt+Shift+3"
msgstr "الاختلاف السابق بين الجزء الأوسط والأيمن\tAlt+Shift+3"
#. IDR_MERGEDOCTYPE, ID_NEXTDIFFLO
-#: Merge.rc:788
+#: Merge.rc:795
msgid "Next Left-Only Difference\tAlt+7"
msgstr "الاختلاف التالي في الجزء الأيسر فقط\tAlt+7"
#. IDR_MERGEDOCTYPE, ID_PREVDIFFLO
-#: Merge.rc:789
+#: Merge.rc:796
msgid "Previous Left-Only Difference\tAlt+Shift+7"
msgstr "الاختلاف السابق في الجزء الأيسر فقط\tAlt+Shift+7"
#. IDR_MERGEDOCTYPE, ID_NEXTDIFFMO
-#: Merge.rc:791
+#: Merge.rc:798
msgid "Next Middle-Only Difference\tAlt+8"
msgstr "الاختلاف التالي في الجزء الأوسط فقط\tAlt+8"
#. IDR_MERGEDOCTYPE, ID_PREVDIFFMO
-#: Merge.rc:792
+#: Merge.rc:799
msgid "Previous Middle-Only Difference\tAlt+Shift+8"
msgstr "الاختلاف السابق في الجزء الأوسط فقط\tAlt+Shift+8"
#. IDR_MERGEDOCTYPE, ID_NEXTDIFFRO
-#: Merge.rc:794
+#: Merge.rc:801
msgid "Next Right-Only Difference\tAlt+9"
msgstr "الاختلاف التالي في الجزء الأيمن فقط\tAlt+9"
#. IDR_MERGEDOCTYPE, ID_PREVDIFFRO
-#: Merge.rc:795
+#: Merge.rc:802
msgid "Previous Right-Only Difference\tAlt+Shift+9"
msgstr "الاختلاف السابق في الجزء الأيمن فقط\tAlt+Shift+9"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:797
+#: Merge.rc:804
msgid "Copy from &Left to"
msgstr ""
#. IDD_LOAD_SAVE_CODEPAGE, IDC_AFFECTS_MIDDLE_BTN
-#: Merge.rc:799 Merge.rc:810 Merge.rc:815 Merge.rc:826 Merge.rc:970
-#: Merge.rc:2545 Merge.rc:2817
+#: Merge.rc:806 Merge.rc:817 Merge.rc:822 Merge.rc:833 Merge.rc:978
+#: Merge.rc:2555 Merge.rc:2827
msgid "&Middle"
msgstr "&وسط"
#. IDD_LOAD_SAVE_CODEPAGE, IDC_AFFECTS_RIGHT_BTN
-#: Merge.rc:800 Merge.rc:805 Merge.rc:816 Merge.rc:821 Merge.rc:971
-#: Merge.rc:2546 Merge.rc:2819
+#: Merge.rc:807 Merge.rc:812 Merge.rc:823 Merge.rc:828 Merge.rc:979
+#: Merge.rc:2556 Merge.rc:2829
msgid "&Right"
msgstr "ي&مين"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:802
+#: Merge.rc:809
msgid "Copy from &Middle to"
msgstr ""
#. IDD_LOAD_SAVE_CODEPAGE, IDC_AFFECTS_LEFT_BTN
-#: Merge.rc:804 Merge.rc:809 Merge.rc:820 Merge.rc:825 Merge.rc:969
-#: Merge.rc:2544 Merge.rc:2815
+#: Merge.rc:811 Merge.rc:816 Merge.rc:827 Merge.rc:832 Merge.rc:977
+#: Merge.rc:2554 Merge.rc:2825
msgid "&Left"
msgstr "&يسار"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:807
+#: Merge.rc:814
msgid "Copy from &Right to"
msgstr ""
#. IDR_MERGEDOCTYPE
-#: Merge.rc:813
+#: Merge.rc:820
msgid "Copy Selected Lines from Le&ft to"
msgstr ""
#. IDR_MERGEDOCTYPE
-#: Merge.rc:818
+#: Merge.rc:825
msgid "Copy Selected Lines from Mi&ddle to"
msgstr ""
#. IDR_MERGEDOCTYPE
-#: Merge.rc:823
+#: Merge.rc:830
msgid "Copy Selected Lines from Ri&ght to"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_COPY_FROM_LEFT
-#: Merge.rc:833
+#: Merge.rc:840
msgid "Copy from Left\tAlt+Shift+Right"
msgstr "النسخ من الجزء الأيسر\tAlt+Shift+Right"
#. IDR_MERGEDOCTYPE, ID_COPY_FROM_RIGHT
-#: Merge.rc:834
+#: Merge.rc:841
msgid "Copy from Right\tAlt+Shift+Left"
msgstr "النسخ من الجزء الأيمن\tAlt+Shift+Left"
#. IDR_MERGEDOCTYPE, ID_L2RNEXT
-#: Merge.rc:836
+#: Merge.rc:843
msgid "C&opy to Right and Advance\tCtrl+Alt+Right"
msgstr "النسخ من الجزء الأيمن والتقدم\tCtrl+Alt+Right"
#. IDR_MERGEDOCTYPE, ID_R2LNEXT
-#: Merge.rc:837
+#: Merge.rc:844
msgid "Copy &to Left and Advance\tCtrl+Alt+Left"
msgstr "النسخ من الجزء الأيسر والتقدم\tCtrl+Alt+Left"
#. IDR_MERGEDOCTYPE, ID_ALL_RIGHT
-#: Merge.rc:839
+#: Merge.rc:846
msgid "Copy &All to Right"
msgstr "نسخ الكل إلى الجزء الأيمن"
#. IDR_MERGEDOCTYPE, ID_ALL_LEFT
-#: Merge.rc:840
+#: Merge.rc:847
msgid "Cop&y All to Left"
msgstr "نسخ الكل إلى الجزء الأيسر"
#. IDR_MERGEDOCTYPE, ID_AUTO_MERGE
-#: Merge.rc:842
+#: Merge.rc:849
msgid "A&uto Merge\tCtrl+Alt+M"
msgstr "دمج تلقائي\tCtrl+Alt+M"
#. IDR_MERGEDOCTYPE, ID_ADD_SYNCPOINT
-#: Merge.rc:844
+#: Merge.rc:851
msgid "Add &Synchronization Point\tAlt+S"
msgstr "إضافة نقطة مزامنة\tAlt+S"
#. IDR_MERGEDOCTYPE, ID_CLEAR_SYNCPOINTS
-#: Merge.rc:845
+#: Merge.rc:852
msgid "Clear Sync&hronization Points"
msgstr "مسح كل نقاط المزامنة"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:863
+#: Merge.rc:870
msgid "Unpac&ker"
msgstr ""
#. IDR_MERGEDOCTYPE
-#: Merge.rc:869
+#: Merge.rc:876
msgid "&Prediffer"
msgstr "الفروقات المسبقة"
#. IDR_MERGEDOCTYPE, ID_APPLY_PREDIFFER
-#: Merge.rc:873
+#: Merge.rc:880
msgid "Apply Pre&differ..."
msgstr ""
#. IDR_MERGEDOCTYPE, ID_TRANSFORM_WITH_SCRIPT
-#: Merge.rc:879
+#: Merge.rc:886
msgid "&Transform with Editor Script..."
msgstr ""
#. IDR_MERGEDOCTYPE
-#: Merge.rc:880
+#: Merge.rc:887
msgid "Scripts for &Copying"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_SELECT_EDITOR_SCRIPT_FOR_COPYING
-#: Merge.rc:886
+#: Merge.rc:893
msgid "Select &Editor Script..."
msgstr ""
#. IDR_MERGEDOCTYPE, ID_WINDOW_SPLIT
-#: Merge.rc:898
+#: Merge.rc:905
msgid "Sp&lit"
msgstr "فصل"
#. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE
-#: Merge.rc:921
+#: Merge.rc:928
msgid "Comp&are"
msgstr "مقارنة"
#. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE_WITH_MOVED_RENAMED
-#: Merge.rc:922
+#: Merge.rc:929
msgid "Compar&e with Renamed/Moved Items"
msgstr ""
#. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE_IN_NEW_WINDOW
-#: Merge.rc:923
+#: Merge.rc:930
msgid "Compare in New &Window"
msgstr ""
#. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE_NONHORIZONTALLY
-#: Merge.rc:924 Merge.rc:931
+#: Merge.rc:931 Merge.rc:938
msgid "Compare Non-hor&izontally..."
msgstr ""
#. IDR_POPUP_DIRVIEW
-#: Merge.rc:925
+#: Merge.rc:932
msgid "Compare Non-hor&izontally"
msgstr "مقارنة غير عمودية"
#. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE_LEFT1_LEFT2
-#: Merge.rc:927
+#: Merge.rc:934
msgid "First &Left with Second Left"
msgstr "العنصر الأول من اليسار مع العنصر الثاني من اليسار"
#. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE_RIGHT1_RIGHT2
-#: Merge.rc:928
+#: Merge.rc:935
msgid "First &Right with Second Right"
msgstr "العنصر الأول من اليمين مع العنصر الثاني من اليمين"
#. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE_LEFT1_RIGHT2
-#: Merge.rc:929
+#: Merge.rc:936
msgid "&First Left with Second Right"
msgstr "العنصر الأول من اليسار مع العنصر الثاني من اليمين"
#. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE_LEFT2_RIGHT1
-#: Merge.rc:930
+#: Merge.rc:937
msgid "&Second Left with First Right"
msgstr "العنصر الثاني من اليسار مع العنصر الأول من اليمين"
#. IDR_POPUP_DIRVIEW
-#: Merge.rc:933
+#: Merge.rc:940
msgid "Co&mpare As"
msgstr "مقارنة كـ"
#. IDS_COPY_LEFT_TO_MIDDLE2
-#: Merge.rc:945 Merge.rc:957 Merge.rc:4502
+#: Merge.rc:953 Merge.rc:965 Merge.rc:4512
#, c-format
msgid "Left to Middle (%1 of %2)"
msgstr "من اليسار إلى الوسط (%1 من %2)"
#. IDS_COPY_LEFT_TO_RIGHT2
-#: Merge.rc:946 Merge.rc:958 Merge.rc:4501
+#: Merge.rc:954 Merge.rc:966 Merge.rc:4511
#, c-format
msgid "Left to Right (%1 of %2)"
msgstr "من اليسار إلى اليمين (%1 من %2)"
#. IDS_MOVE_LEFT_TO2
-#: Merge.rc:947 Merge.rc:959 Merge.rc:1022 Merge.rc:4513 Merge.rc:4542
+#: Merge.rc:955 Merge.rc:967 Merge.rc:1030 Merge.rc:4523 Merge.rc:4552
#, c-format
msgid "Left to... (%1 of %2)"
msgstr "من اليسار إلى... (%1 من %2)"
#. IDS_COPY_MIDDLE_TO_LEFT2
-#: Merge.rc:948 Merge.rc:960 Merge.rc:4499
+#: Merge.rc:956 Merge.rc:968 Merge.rc:4509
#, c-format
msgid "Middle to Left (%1 of %2)"
msgstr "من الوسط إلى اليسار (%1 من %2)"
#. IDS_COPY_MIDDLE_TO_RIGHT2
-#: Merge.rc:949 Merge.rc:961 Merge.rc:4500
+#: Merge.rc:957 Merge.rc:969 Merge.rc:4510
#, c-format
msgid "Middle to Right (%1 of %2)"
msgstr "من الوسط إلى اليمين (%1 من %2)"
#. IDS_MOVE_MIDDLE_TO2
-#: Merge.rc:950 Merge.rc:962 Merge.rc:1023 Merge.rc:4514 Merge.rc:4543
+#: Merge.rc:958 Merge.rc:970 Merge.rc:1031 Merge.rc:4524 Merge.rc:4553
#, c-format
msgid "Middle to... (%1 of %2)"
msgstr "من الوسط إلى... (%1 من %2)"
#. IDS_COPY_RIGHT_TO_MIDDLE2
-#: Merge.rc:951 Merge.rc:963 Merge.rc:4498
+#: Merge.rc:959 Merge.rc:971 Merge.rc:4508
#, c-format
msgid "Right to Middle (%1 of %2)"
msgstr "من اليمين إلى الوسط (%1 من %2)"
#. IDS_COPY_RIGHT_TO_LEFT2
-#: Merge.rc:952 Merge.rc:964 Merge.rc:4497
+#: Merge.rc:960 Merge.rc:972 Merge.rc:4507
#, c-format
msgid "Right to Left (%1 of %2)"
msgstr "من اليمين إلى اليسار (%1 من %2)"
#. IDS_MOVE_RIGHT_TO2
-#: Merge.rc:953 Merge.rc:965 Merge.rc:1024 Merge.rc:4515 Merge.rc:4544
+#: Merge.rc:961 Merge.rc:973 Merge.rc:1032 Merge.rc:4525 Merge.rc:4554
#, c-format
msgid "Right to... (%1 of %2)"
msgstr "من اليمين إلى... (%1 من %2)"
#. IDD_EDIT_MARKER, IDC_EDIT_MARKER_DELETE
-#: Merge.rc:967 Merge.rc:2036
+#: Merge.rc:975 Merge.rc:2046
msgid "&Delete"
msgstr "&حذف"
#. IDR_POPUP_DIRVIEW, ID_DIR_DEL_BOTH
-#: Merge.rc:972
+#: Merge.rc:980
msgid "&Both"
msgstr "&كلاهما"
#. IDR_POPUP_DIRVIEW, ID_DIR_DEL_ALL
-#: Merge.rc:973
+#: Merge.rc:981
msgid "&All"
msgstr "&الكل"
#. IDD_EDIT_REPLACE, IDC_EDIT_SCOPE_SELECTION
-#: Merge.rc:974 Merge.rc:2019
+#: Merge.rc:982 Merge.rc:2029
msgid "&Selection"
msgstr "&تحديد"
#. IDR_POPUP_DIRVIEW, ID_DIR_ITEM_RENAME
-#: Merge.rc:976
+#: Merge.rc:984
msgid "Re&name"
msgstr "إ&عادة تسمية"
#. IDR_POPUP_DIRVIEW, ID_DIR_HIDE_FILENAMES
-#: Merge.rc:977
+#: Merge.rc:985
msgid "&Hide Items"
msgstr "إ&خفاء العناصر"
#. IDR_POPUP_DIRVIEW
-#: Merge.rc:979
+#: Merge.rc:987
msgid "&Open Left"
msgstr "&فتح الجزء الأيسر"
#. IDR_POPUP_DIRVIEW
-#: Merge.rc:986
+#: Merge.rc:994
msgid "Open Midd&le"
msgstr "ف&تح الجزء الأوسط"
#. IDR_POPUP_DIRVIEW
-#: Merge.rc:993
+#: Merge.rc:1001
msgid "O&pen Right"
msgstr "فتح الجزء الأي&من"
#. IDR_POPUP_DIRVIEW
-#: Merge.rc:1001
+#: Merge.rc:1009
msgid "Cop&y Paths"
msgstr "نسخ المسارات"
#. IDS_DEL_LEFT_FMT2
-#: Merge.rc:1003 Merge.rc:1012 Merge.rc:4530
+#: Merge.rc:1011 Merge.rc:1020 Merge.rc:4540
#, c-format
msgid "Left (%1 of %2)"
msgstr "اليسار (%1 من %2)"
#. IDS_DEL_MIDDLE_FMT2
-#: Merge.rc:1004 Merge.rc:1013 Merge.rc:4531
+#: Merge.rc:1012 Merge.rc:1021 Merge.rc:4541
#, c-format
msgid "Middle (%1 of %2)"
msgstr "الوسط (%1 من %2)"
#. IDS_DEL_RIGHT_FMT2
-#: Merge.rc:1005 Merge.rc:1014 Merge.rc:4532
+#: Merge.rc:1013 Merge.rc:1022 Merge.rc:4542
#, c-format
msgid "Right (%1 of %2)"
msgstr "اليمين (%1 من %2)"
#. IDS_DEL_BOTH_FMT2
-#: Merge.rc:1006 Merge.rc:1015 Merge.rc:4533
+#: Merge.rc:1014 Merge.rc:1023 Merge.rc:4543
#, c-format
msgid "Both (%1 of %2)"
msgstr "كلاهما (%1 من %2)"
#. IDS_DEL_ALL_FMT2
-#: Merge.rc:1007 Merge.rc:1016 Merge.rc:4538
+#: Merge.rc:1015 Merge.rc:1024 Merge.rc:4548
#, c-format
msgid "All (%1 of %2)"
msgstr "الكل (%1 من %2)"
#. IDR_POPUP_DIRVIEW, ID_DIR_COPY_FILENAMES
-#: Merge.rc:1009
+#: Merge.rc:1017
msgid "Copy &Filenames"
msgstr "نسخ أ&سماء الملفات"
#. IDR_POPUP_DIRVIEW
-#: Merge.rc:1010
+#: Merge.rc:1018
msgid "Copy Items to Clip&board"
msgstr "نسخ ال&عناصر إلى الحافظة"
#. IDR_POPUP_DIRVIEW, ID_DIR_COPY_ALL_DISP_COLUMNS
-#: Merge.rc:1018
+#: Merge.rc:1026
msgid "Copy All Di&splayed Columns"
msgstr ""
#. IDR_POPUP_DIRVIEW
-#: Merge.rc:1020
+#: Merge.rc:1028
msgid "&Zip"
msgstr "Zip"
#. IDS_COPY_BOTH_TO2
-#: Merge.rc:1025 Merge.rc:4516
+#: Merge.rc:1033 Merge.rc:4526
#, c-format
msgid "Both to... (%1 of %2)"
msgstr "كلاهما إلى...(%1 من %2)"
#. IDS_COPY_ALL_TO2
-#: Merge.rc:1026 Merge.rc:4517
+#: Merge.rc:1034 Merge.rc:4527
#, c-format
msgid "All to... (%1 of %2)"
msgstr "الكل إلى...(%1 من %2)"
#. IDS_COPY_DIFFERENCES_TO2
-#: Merge.rc:1027 Merge.rc:4518
+#: Merge.rc:1035 Merge.rc:4528
#, c-format
msgid "Differences to... (%1 of %2)"
msgstr "الاختلافات إلى...(%1 من %2)"
#. IDR_POPUP_DIRVIEW, ID_DIR_SHELL_CONTEXT_MENU_LEFT
-#: Merge.rc:1032
+#: Merge.rc:1040
msgid "Left Shell Menu"
msgstr "قائمة البرنامج الوسيطي (الغلاف) في الجزء الأيسر"
#. IDR_POPUP_DIRVIEW, ID_DIR_SHELL_CONTEXT_MENU_MIDDLE
-#: Merge.rc:1033
+#: Merge.rc:1041
msgid "Middle Shell Menu"
msgstr "قائمة البرنامج الوسيطي (الغلاف) في الجزء الأوسط"
#. IDR_POPUP_DIRVIEW, ID_DIR_SHELL_CONTEXT_MENU_RIGHT
-#: Merge.rc:1034
+#: Merge.rc:1042
msgid "Right Shell Menu"
msgstr "قائمة البرنامج الوسيطي (الغلاف) في الجزء الأيمن"
#. IDR_POPUP_DIRVIEW, ID_DIR_SHELL_CONTEXT_MENU_BOTH
-#: Merge.rc:1035
+#: Merge.rc:1043
msgid "Both Shell Menu"
msgstr ""
#. IDR_POPUP_DIRVIEW, ID_DIR_SHELL_CONTEXT_MENU_ALL
-#: Merge.rc:1036
+#: Merge.rc:1044
msgid "All Shell Menu"
msgstr ""
#. IDR_POPUP_EDITOR_HEADERBAR, ID_EDITOR_COPY
-#: Merge.rc:1050
+#: Merge.rc:1058
msgid "Copy"
msgstr "نسخ"
#. IDR_POPUP_EDITOR_HEADERBAR, ID_EDITOR_COPY_PATH
-#: Merge.rc:1051
+#: Merge.rc:1059
msgid "&Copy Full Path"
msgstr "&نسخ المسار الكامل"
#. IDR_POPUP_EDITOR_HEADERBAR, ID_EDITOR_COPY_FILENAME
-#: Merge.rc:1052
+#: Merge.rc:1060
msgid "Copy &Filename"
msgstr "نسخ اسم الملف"
#. IDR_POPUP_EDITOR_HEADERBAR, ID_EDITOR_EDIT_CAPTION
-#: Merge.rc:1053
+#: Merge.rc:1061
msgid "&Edit Caption\tF2"
msgstr ""
#. IDR_POPUP_EDITOR_HEADERBAR, ID_EDITOR_EDIT_PATH
-#: Merge.rc:1055
+#: Merge.rc:1063
msgid "Edit &Path\tCtrl+L"
msgstr ""
#. IDR_POPUP_EDITOR_HEADERBAR, ID_EDITOR_SELECT_FILE
-#: Merge.rc:1056
+#: Merge.rc:1064
msgid "&Open..."
msgstr ""
#. IDR_POPUP_PLUGINS_SETTINGS
-#: Merge.rc:1062
+#: Merge.rc:1070
msgid "Unpacker Settings"
msgstr ""
#. IDS_USERCHOICE_NONE
-#: Merge.rc:1064 Merge.rc:1070 Merge.rc:1789 Merge.rc:1793 Merge.rc:5030
+#: Merge.rc:1072 Merge.rc:1078 Merge.rc:1799 Merge.rc:1803 Merge.rc:5040
msgid ""
msgstr "<لا يوجد>"
#. IDS_USERCHOICE_AUTOMATIC
-#: Merge.rc:1065 Merge.rc:1071 Merge.rc:5031
+#: Merge.rc:1073 Merge.rc:1079 Merge.rc:5041
msgid ""
msgstr "<تلقائي>"
#. IDD_OPEN, IDC_SELECT_PREDIFFER
-#: Merge.rc:1066 Merge.rc:1072 Merge.rc:1970 Merge.rc:1974
+#: Merge.rc:1074 Merge.rc:1080 Merge.rc:1980 Merge.rc:1984
msgid "&Select..."
msgstr "&تحديد..."
#. IDR_POPUP_PLUGINS_SETTINGS
-#: Merge.rc:1068
+#: Merge.rc:1076
msgid "Prediffer Settings"
msgstr "إعدادات الاختلافات المسبقة"
#. IDR_POPUP_LOCATIONBAR, ID_LOCBAR_GOTODIFF
-#: Merge.rc:1080
+#: Merge.rc:1088
msgid "G&o to Diff"
msgstr "الذهاب إلى أداة مقارنة الملفات Diff"
#. IDR_POPUP_LOCATIONBAR, ID_LOCBAR_MOVECURSOR_ONCLICK
-#: Merge.rc:1083
+#: Merge.rc:1091
msgid "Move Cursor on &Click"
msgstr ""
#. IDR_POPUP_LOCATIONBAR, ID_DISPLAY_MOVED_NONE
-#: Merge.rc:1085
+#: Merge.rc:1093
msgid "&No Moved Blocks"
msgstr "لا يوجد تجميعات تم تغيير موقعها"
#. IDR_POPUP_LOCATIONBAR, ID_DISPLAY_MOVED_ALL
-#: Merge.rc:1086
+#: Merge.rc:1094
msgid "&All Moved Blocks"
msgstr "كل التجميعات التي تم تغيير مواقعها"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS
-#: Merge.rc:1094 Merge.rc:1127
+#: Merge.rc:1102 Merge.rc:1135
msgid "W&hitespaces"
msgstr "المساحات البيضاء"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_WHITESPACE_COMPARE
-#: Merge.rc:1096 Merge.rc:1129
+#: Merge.rc:1104 Merge.rc:1137
msgid "Com&pare"
msgstr "مقارنة"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_WHITESPACE_IGNORE
-#: Merge.rc:1097 Merge.rc:1130
+#: Merge.rc:1105 Merge.rc:1138
msgid "I&gnore Changes"
msgstr "تجاهل التغييرات"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_WHITESPACE_IGNOREALL
-#: Merge.rc:1098 Merge.rc:1131
+#: Merge.rc:1106 Merge.rc:1139
msgid "Ig&nore All"
msgstr "تجاهل الكل"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_IGNORE_BLANKLINES
-#: Merge.rc:1100 Merge.rc:1133
+#: Merge.rc:1108 Merge.rc:1141
msgid "Ignore Blan&k Lines"
msgstr "تجاهل الأسطر الفارغة"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_IGNORE_CASE
-#: Merge.rc:1101 Merge.rc:1134
+#: Merge.rc:1109 Merge.rc:1142
msgid "Ignore &Case"
msgstr "تجاهل حالة الحرف (للغة الإنجليزية)"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_IGNORE_EOL
-#: Merge.rc:1102 Merge.rc:1135
+#: Merge.rc:1110 Merge.rc:1143
msgid "Igno&re EOL Differences (Windows/Unix/Mac)"
msgstr ""
"تجاهل الاختلافات بين أنواع الإرجاع إلى بداية السطر (carriage return) "
"(Windows/Unix/Mac)"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_IGNORE_CODEPAGE
-#: Merge.rc:1103 Merge.rc:1136
+#: Merge.rc:1111 Merge.rc:1144
msgid "Ignore Codepage &Differences"
msgstr "تجاهل اختلافات ترميز الصفحة"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_IGNORE_NUMBERS
-#: Merge.rc:1104 Merge.rc:1137
+#: Merge.rc:1112 Merge.rc:1145
msgid "Ignore Num&bers"
msgstr ""
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_IGNORE_COMMENTS
-#: Merge.rc:1105 Merge.rc:1138
+#: Merge.rc:1113 Merge.rc:1146
msgid "Ignore C&omment Differences"
msgstr ""
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_IGNORE_MISSING_TRAILING_EOL
-#: Merge.rc:1106 Merge.rc:1139
+#: Merge.rc:1114 Merge.rc:1147
msgid "Ignore &Missing Trailing EOL"
msgstr ""
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_IGNORE_LINE_BREAKS
-#: Merge.rc:1107 Merge.rc:1140
+#: Merge.rc:1115 Merge.rc:1148
msgid "Ignore Line &Breaks (Treat as Spaces)"
msgstr ""
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_RECURS_CHECK
-#: Merge.rc:1109 Merge.rc:2963
+#: Merge.rc:1117 Merge.rc:2973
msgid "&Include Subfolders"
msgstr "تضمين المجلدات الفرعية"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS
-#: Merge.rc:1110 Merge.rc:1142
+#: Merge.rc:1118 Merge.rc:1150
msgid "&Compare Method"
msgstr "آلية المقارنة:"
#. IDS_COMPMETHOD_FULL_CONTENTS
-#: Merge.rc:1112 Merge.rc:1144 Merge.rc:1328 Merge.rc:4282
+#: Merge.rc:1120 Merge.rc:1152 Merge.rc:1338 Merge.rc:4292
msgid "Full Contents"
msgstr "المحتويات الكاملة"
#. IDS_COMPMETHOD_QUICK_CONTENTS
-#: Merge.rc:1113 Merge.rc:1145 Merge.rc:1329 Merge.rc:4283
+#: Merge.rc:1121 Merge.rc:1153 Merge.rc:1339 Merge.rc:4293
msgid "Quick Contents"
msgstr "المحتويات السريعة"
#. IDS_COMPMETHOD_BINARY_CONTENTS
-#: Merge.rc:1114 Merge.rc:1146 Merge.rc:1330 Merge.rc:4284
+#: Merge.rc:1122 Merge.rc:1154 Merge.rc:1340 Merge.rc:4294
msgid "Binary Contents"
msgstr "المحتويات الثنائية"
#. IDS_COMPMETHOD_MODDATE
-#: Merge.rc:1115 Merge.rc:1147 Merge.rc:1331 Merge.rc:4285
+#: Merge.rc:1123 Merge.rc:1155 Merge.rc:1341 Merge.rc:4295
msgid "Modified Date"
msgstr "تاريخ آخر تعديل"
#. IDS_COMPMETHOD_DATESIZE
-#: Merge.rc:1116 Merge.rc:1148 Merge.rc:1332 Merge.rc:4286
+#: Merge.rc:1124 Merge.rc:1156 Merge.rc:1342 Merge.rc:4296
msgid "Modified Date and Size"
msgstr "تاريخ وحجم آخر تعديل"
#. IDS_COMPMETHOD_SIZE
-#: Merge.rc:1117 Merge.rc:1149 Merge.rc:1333 Merge.rc:4287
+#: Merge.rc:1125 Merge.rc:1157 Merge.rc:1343 Merge.rc:4297
msgid "Size"
msgstr "الحجم"
#. IDS_COMPMETHOD_EXISTENCE
-#: Merge.rc:1118 Merge.rc:1150 Merge.rc:1334 Merge.rc:4288
+#: Merge.rc:1126 Merge.rc:1158 Merge.rc:1344 Merge.rc:4298
msgid "Existence"
msgstr ""
#. IDR_POPUP_PROJECT, ID_LOAD_PROJECT
-#: Merge.rc:1192
+#: Merge.rc:1202
msgid "&Load Project..."
msgstr "&تحميل مشروع..."
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARGALL
-#: Merge.rc:1272 Merge.rc:1301
+#: Merge.rc:1282 Merge.rc:1311
msgid "${*} - All Arguments"
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARG1
-#: Merge.rc:1273 Merge.rc:1302
+#: Merge.rc:1283 Merge.rc:1312
msgid "${1} - First Argument"
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARG2
-#: Merge.rc:1274 Merge.rc:1303
+#: Merge.rc:1284 Merge.rc:1313
msgid "${2} - Second Argument"
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARG3
-#: Merge.rc:1275 Merge.rc:1304
+#: Merge.rc:1285 Merge.rc:1314
msgid "${3} - Third Argument"
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARG4
-#: Merge.rc:1276 Merge.rc:1305
+#: Merge.rc:1286 Merge.rc:1315
msgid "${4} - Fourth Argument"
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARG5
-#: Merge.rc:1277 Merge.rc:1306
+#: Merge.rc:1287 Merge.rc:1316
msgid "${5} - Fifth Argument"
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARG6
-#: Merge.rc:1278 Merge.rc:1307
+#: Merge.rc:1288 Merge.rc:1317
msgid "${6} - Sixth Argument"
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARG7
-#: Merge.rc:1279 Merge.rc:1308
+#: Merge.rc:1289 Merge.rc:1318
msgid "${7} - Seventh Argument"
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARG8
-#: Merge.rc:1280 Merge.rc:1309
+#: Merge.rc:1290 Merge.rc:1319
msgid "${8} - Eighth Argument"
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARG9
-#: Merge.rc:1281 Merge.rc:1310
+#: Merge.rc:1291 Merge.rc:1320
msgid "${9} - Ninth Argument"
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_SRC_FILE
-#: Merge.rc:1289
+#: Merge.rc:1299
msgid "${SRC_FILE} - Source File"
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_SRC_FOLDER
-#: Merge.rc:1290
+#: Merge.rc:1300
msgid "${SRC_FOLDER} - Source Folder"
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_SRC_URL
-#: Merge.rc:1291
+#: Merge.rc:1301
msgid "${SRC_URL} - Source URL"
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_SRC_URL_PROTOCOL
-#: Merge.rc:1292
+#: Merge.rc:1302
msgid "${SRC_URL_PROTOCOL} - Source URL Protocol"
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_SRC_URL_SUFFIX
-#: Merge.rc:1293
+#: Merge.rc:1303
msgid "${SRC_URL_SUFFIX} - Source URL Suffix"
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_DST_FILE
-#: Merge.rc:1294
+#: Merge.rc:1304
msgid "${DST_FILE} - Destination File"
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_DST_FOLDER
-#: Merge.rc:1295
+#: Merge.rc:1305
msgid "${DST_FOLDER} - Destination Folder"
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_DST_URL
-#: Merge.rc:1296
+#: Merge.rc:1306
msgid "${DST_URL} - Destination URL"
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_DST_URL_PROTOCOL
-#: Merge.rc:1297
+#: Merge.rc:1307
msgid "${DST_URL_PROTOCOL} - Destination URL Protocol"
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_DST_URL_SUFFIX
-#: Merge.rc:1298
+#: Merge.rc:1308
msgid "${DST_URL_SUFFIX} - Destination URL Suffix"
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_WINMERGE_HOME
-#: Merge.rc:1299
+#: Merge.rc:1309
msgid "${WINMERGE_HOME} - WinMerge Home Directory"
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_SCRIPT_FILE
-#: Merge.rc:1300
+#: Merge.rc:1310
msgid "${SCRIPT_FILE} - Script File"
msgstr ""
#. IDR_POPUP_PLUGIN_ADD_MENU, ID_PLUGIN_ADD_UNPACKER
-#: Merge.rc:1318
+#: Merge.rc:1328
msgid "Add &Unpacker Plugin..."
msgstr ""
#. IDR_POPUP_PLUGIN_ADD_MENU, ID_PLUGIN_ADD_PREDIFFER
-#: Merge.rc:1319
+#: Merge.rc:1329
msgid "Add &Prediffer Plugin..."
msgstr ""
#. IDR_POPUP_PLUGIN_ADD_MENU, ID_PLUGIN_DUPLICATE
-#: Merge.rc:1320
+#: Merge.rc:1330
msgid "&Duplicate Plugin..."
msgstr ""
#. IDR_POPUP_OUTPUTVIEW, ID_EDIT_CLEAR_ALL
-#: Merge.rc:1344
+#: Merge.rc:1354
msgid "Clear &All"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_MASK_CLEAR
-#: Merge.rc:1352
+#: Merge.rc:1362
msgid "&Clear All"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_MASK_REMOVE_LAST
-#: Merge.rc:1353
+#: Merge.rc:1363
msgid "Remove Last Filter &Group"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_MASK_ALL
-#: Merge.rc:1354
+#: Merge.rc:1364
msgid "R&eset to Default (*.*)"
msgstr ""
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1355
+#: Merge.rc:1365
msgid "Add E&xclude File"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_SYS
-#: Merge.rc:1357
+#: Merge.rc:1367
msgid "&System Files"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_BACKUP
-#: Merge.rc:1358
+#: Merge.rc:1368
msgid "&Editor Backup Files"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_BIN
-#: Merge.rc:1359
+#: Merge.rc:1369
msgid "&Compiled Binary Files"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_LOG
-#: Merge.rc:1360
+#: Merge.rc:1370
msgid "&Log Files"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_TEMP
-#: Merge.rc:1361
+#: Merge.rc:1371
msgid "&Temporary or Cache Files"
msgstr ""
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1363
+#: Merge.rc:1373
msgid "Add Excl&ude Folder"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FOLDER_VCS
-#: Merge.rc:1365
+#: Merge.rc:1375
msgid "&Version Control"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FOLDER_BUILD
-#: Merge.rc:1366
+#: Merge.rc:1376
msgid "&Build Artifacts"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FOLDER_IDE
-#: Merge.rc:1367
+#: Merge.rc:1377
msgid "&IDE"
msgstr ""
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1370
+#: Merge.rc:1380
msgid "Add &File Condition"
msgstr ""
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1372 Merge.rc:1551
+#: Merge.rc:1382 Merge.rc:1561
msgid "File &Size"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_SIZE, ID_FILTERMENU_DIFF_SIZE_LT_1KB
-#: Merge.rc:1374 Merge.rc:1527 Merge.rc:1564 Merge.rc:1629 Merge.rc:1707
+#: Merge.rc:1384 Merge.rc:1537 Merge.rc:1574 Merge.rc:1639 Merge.rc:1717
msgid "Less than 1KB"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_SIZE, ID_FILTERMENU_DIFF_SIZE_GE_1KB
-#: Merge.rc:1375 Merge.rc:1528 Merge.rc:1565 Merge.rc:1630 Merge.rc:1708
+#: Merge.rc:1385 Merge.rc:1538 Merge.rc:1575 Merge.rc:1640 Merge.rc:1718
msgid "1KB or more"
msgstr ""
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_LT_10KB
-#: Merge.rc:1376 Merge.rc:1529 Merge.rc:1631
+#: Merge.rc:1386 Merge.rc:1539 Merge.rc:1641
msgid "Less than 10KB"
msgstr ""
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_GE_10KB
-#: Merge.rc:1377 Merge.rc:1530 Merge.rc:1632
+#: Merge.rc:1387 Merge.rc:1540 Merge.rc:1642
msgid "10KB or more"
msgstr ""
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_LT_100KB
-#: Merge.rc:1378 Merge.rc:1531 Merge.rc:1633
+#: Merge.rc:1388 Merge.rc:1541 Merge.rc:1643
msgid "Less than 100KB"
msgstr ""
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_GE_100KB
-#: Merge.rc:1379 Merge.rc:1532 Merge.rc:1634
+#: Merge.rc:1389 Merge.rc:1542 Merge.rc:1644
msgid "100KB or more"
msgstr ""
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_LT_1MB
-#: Merge.rc:1380 Merge.rc:1533 Merge.rc:1635
+#: Merge.rc:1390 Merge.rc:1543 Merge.rc:1645
msgid "Less than 1MB"
msgstr ""
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_GE_1MB
-#: Merge.rc:1381 Merge.rc:1534 Merge.rc:1636
+#: Merge.rc:1391 Merge.rc:1544 Merge.rc:1646
msgid "1MB or more"
msgstr ""
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_LT_10MB
-#: Merge.rc:1382 Merge.rc:1535 Merge.rc:1637
+#: Merge.rc:1392 Merge.rc:1545 Merge.rc:1647
msgid "Less than 10MB"
msgstr ""
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_GE_10MB
-#: Merge.rc:1383 Merge.rc:1536 Merge.rc:1638
+#: Merge.rc:1393 Merge.rc:1546 Merge.rc:1648
msgid "10MB or more"
msgstr ""
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_LT_100MB
-#: Merge.rc:1384 Merge.rc:1537 Merge.rc:1639
+#: Merge.rc:1394 Merge.rc:1547 Merge.rc:1649
msgid "Less than 100MB"
msgstr ""
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_GE_100MB
-#: Merge.rc:1385 Merge.rc:1538 Merge.rc:1640
+#: Merge.rc:1395 Merge.rc:1548 Merge.rc:1650
msgid "100MB or more"
msgstr ""
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_LT_1GB
-#: Merge.rc:1386 Merge.rc:1539 Merge.rc:1641
+#: Merge.rc:1396 Merge.rc:1549 Merge.rc:1651
msgid "Less than 1GB"
msgstr ""
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_GE_1GB
-#: Merge.rc:1387 Merge.rc:1642
+#: Merge.rc:1397 Merge.rc:1652
msgid "1GB or more"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_RANGE
-#: Merge.rc:1388 Merge.rc:1465 Merge.rc:1517 Merge.rc:1523 Merge.rc:1540
-#: Merge.rc:1566 Merge.rc:1587 Merge.rc:1643 Merge.rc:1709 Merge.rc:1734
+#: Merge.rc:1398 Merge.rc:1475 Merge.rc:1527 Merge.rc:1533 Merge.rc:1550
+#: Merge.rc:1576 Merge.rc:1597 Merge.rc:1653 Merge.rc:1719 Merge.rc:1744
msgid "Custom Range..."
msgstr ""
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1390 Merge.rc:1471 Merge.rc:1568
+#: Merge.rc:1400 Merge.rc:1481 Merge.rc:1578
msgid "&Last Modified"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE
-#: Merge.rc:1392 Merge.rc:1473 Merge.rc:1651
+#: Merge.rc:1402 Merge.rc:1483 Merge.rc:1661
msgid "&Hour"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_HOUR_BEFORE_1
-#: Merge.rc:1394 Merge.rc:1475 Merge.rc:1653
+#: Merge.rc:1404 Merge.rc:1485 Merge.rc:1663
msgid "More than 1 hour ago"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_HOUR_WITHIN_1
-#: Merge.rc:1395 Merge.rc:1476 Merge.rc:1654
+#: Merge.rc:1405 Merge.rc:1486 Merge.rc:1664
msgid "Within 1 hour"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE
-#: Merge.rc:1397 Merge.rc:1478 Merge.rc:1656
+#: Merge.rc:1407 Merge.rc:1488 Merge.rc:1666
msgid "&Day"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_DAY_BEFORE_TODAY
-#: Merge.rc:1399 Merge.rc:1480 Merge.rc:1658
+#: Merge.rc:1409 Merge.rc:1490 Merge.rc:1668
msgid "Before today"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_DAY_TODAY
-#: Merge.rc:1400 Merge.rc:1481 Merge.rc:1659
+#: Merge.rc:1410 Merge.rc:1491 Merge.rc:1669
msgid "Today"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_DAY_BEFORE_YESTERDAY
-#: Merge.rc:1401 Merge.rc:1482 Merge.rc:1660
+#: Merge.rc:1411 Merge.rc:1492 Merge.rc:1670
msgid "Before yesterday"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_DAY_YESTERDAY
-#: Merge.rc:1402 Merge.rc:1483 Merge.rc:1661
+#: Merge.rc:1412 Merge.rc:1493 Merge.rc:1671
msgid "Yesterday"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_DAY_SINCE_YESTERDAY
-#: Merge.rc:1403 Merge.rc:1484 Merge.rc:1662
+#: Merge.rc:1413 Merge.rc:1494 Merge.rc:1672
msgid "Since yesterday"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE
-#: Merge.rc:1405 Merge.rc:1486 Merge.rc:1664
+#: Merge.rc:1415 Merge.rc:1496 Merge.rc:1674
msgid "&Week"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_WEEK_BEFORE_THIS
-#: Merge.rc:1407 Merge.rc:1488 Merge.rc:1666
+#: Merge.rc:1417 Merge.rc:1498 Merge.rc:1676
msgid "Before this week"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_WEEK_THIS
-#: Merge.rc:1408 Merge.rc:1489 Merge.rc:1667
+#: Merge.rc:1418 Merge.rc:1499 Merge.rc:1677
msgid "This week"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_WEEK_BEFORE_LAST
-#: Merge.rc:1409 Merge.rc:1490 Merge.rc:1668
+#: Merge.rc:1419 Merge.rc:1500 Merge.rc:1678
msgid "Before last week"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_WEEK_LAST
-#: Merge.rc:1410 Merge.rc:1491 Merge.rc:1669
+#: Merge.rc:1420 Merge.rc:1501 Merge.rc:1679
msgid "Last week"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_WEEK_SINCE_LAST
-#: Merge.rc:1411 Merge.rc:1492 Merge.rc:1670
+#: Merge.rc:1421 Merge.rc:1502 Merge.rc:1680
msgid "Since last week"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE
-#: Merge.rc:1413 Merge.rc:1494 Merge.rc:1672
+#: Merge.rc:1423 Merge.rc:1504 Merge.rc:1682
msgid "&Month"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_MONTH_BEFORE_THIS
-#: Merge.rc:1415 Merge.rc:1496 Merge.rc:1674
+#: Merge.rc:1425 Merge.rc:1506 Merge.rc:1684
msgid "Before this month"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_MONTH_THIS
-#: Merge.rc:1416 Merge.rc:1497 Merge.rc:1675
+#: Merge.rc:1426 Merge.rc:1507 Merge.rc:1685
msgid "This month"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_MONTH_BEFORE_LAST
-#: Merge.rc:1417 Merge.rc:1498 Merge.rc:1676
+#: Merge.rc:1427 Merge.rc:1508 Merge.rc:1686
msgid "Before last month"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_MONTH_LAST
-#: Merge.rc:1418 Merge.rc:1499 Merge.rc:1677
+#: Merge.rc:1428 Merge.rc:1509 Merge.rc:1687
msgid "Last month"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_MONTH_SINCE_LAST
-#: Merge.rc:1419 Merge.rc:1500 Merge.rc:1678
+#: Merge.rc:1429 Merge.rc:1510 Merge.rc:1688
msgid "Since last month"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE
-#: Merge.rc:1421 Merge.rc:1502 Merge.rc:1680
+#: Merge.rc:1431 Merge.rc:1512 Merge.rc:1690
msgid "&Year"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_YEAR_BEFORE_THIS
-#: Merge.rc:1423 Merge.rc:1504 Merge.rc:1682
+#: Merge.rc:1433 Merge.rc:1514 Merge.rc:1692
msgid "Before this year"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_YEAR_THIS
-#: Merge.rc:1424 Merge.rc:1505 Merge.rc:1683
+#: Merge.rc:1434 Merge.rc:1515 Merge.rc:1693
msgid "This year"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_YEAR_BEFORE_LAST
-#: Merge.rc:1425 Merge.rc:1506 Merge.rc:1684
+#: Merge.rc:1435 Merge.rc:1516 Merge.rc:1694
msgid "Before last year"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_YEAR_LAST
-#: Merge.rc:1426 Merge.rc:1507 Merge.rc:1685
+#: Merge.rc:1436 Merge.rc:1517 Merge.rc:1695
msgid "Last year"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_YEAR_SINCE_LAST
-#: Merge.rc:1427 Merge.rc:1508 Merge.rc:1686
+#: Merge.rc:1437 Merge.rc:1518 Merge.rc:1696
msgid "Since last year"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_RANGE
-#: Merge.rc:1429 Merge.rc:1510 Merge.rc:1688
+#: Merge.rc:1439 Merge.rc:1520 Merge.rc:1698
msgid "&Custom Range..."
msgstr ""
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1431 Merge.rc:1589
+#: Merge.rc:1441 Merge.rc:1599
msgid "&Attributes"
msgstr ""
#. IDR_POPUP_FILTERMENU_ATTR, ID_FILTERMENU_ATTR_READONLY
-#: Merge.rc:1433 Merge.rc:1607
+#: Merge.rc:1443 Merge.rc:1617
msgid "Read-only files"
msgstr ""
#. IDR_POPUP_FILTERMENU_ATTR, ID_FILTERMENU_ATTR_NOT_READONLY
-#: Merge.rc:1434 Merge.rc:1608
+#: Merge.rc:1444 Merge.rc:1618
msgid "Not read-only files"
msgstr ""
#. IDR_POPUP_FILTERMENU_ATTR, ID_FILTERMENU_ATTR_HIDDEN
-#: Merge.rc:1435 Merge.rc:1609
+#: Merge.rc:1445 Merge.rc:1619
msgid "Hidden files"
msgstr ""
#. IDR_POPUP_FILTERMENU_ATTR, ID_FILTERMENU_ATTR_NOT_HIDDEN
-#: Merge.rc:1436 Merge.rc:1610
+#: Merge.rc:1446 Merge.rc:1620
msgid "Not hidden files"
msgstr ""
#. IDR_POPUP_FILTERMENU_ATTR, ID_FILTERMENU_ATTR_SYSTEM
-#: Merge.rc:1437 Merge.rc:1611
+#: Merge.rc:1447 Merge.rc:1621
msgid "System files"
msgstr ""
#. IDR_POPUP_FILTERMENU_ATTR, ID_FILTERMENU_ATTR_NOT_SYSTEM
-#: Merge.rc:1438 Merge.rc:1612
+#: Merge.rc:1448 Merge.rc:1622
msgid "Not system files"
msgstr ""
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1440
+#: Merge.rc:1450
msgid "File &Content"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_CONTAINS
-#: Merge.rc:1442
+#: Merge.rc:1452
msgid "Contains string..."
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_NOT_CONTAINS
-#: Merge.rc:1443
+#: Merge.rc:1453
msgid "Does not contain string..."
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_FIRST_LINE_CONTAINS
-#: Merge.rc:1444
+#: Merge.rc:1454
msgid "First line contains string..."
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_FIRST_LINE_NOT_CONTAINS
-#: Merge.rc:1445
+#: Merge.rc:1455
msgid "First line does not contain string..."
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_FIRST_10_CONTAINS
-#: Merge.rc:1446
+#: Merge.rc:1456
msgid "First 10 lines contain string..."
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_FIRST_10_NOT_CONTAINS
-#: Merge.rc:1447
+#: Merge.rc:1457
msgid "First 10 lines do not contain string..."
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_LAST_10_CONTAINS
-#: Merge.rc:1448
+#: Merge.rc:1458
msgid "Last 10 lines contain string..."
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_LAST_10_NOT_CONTAINS
-#: Merge.rc:1449
+#: Merge.rc:1459
msgid "Last 10 lines do not contain string..."
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_LAST_LINE_CONTAINS
-#: Merge.rc:1450
+#: Merge.rc:1460
msgid "Last line contains string..."
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_LAST_LINE_NOT_CONTAINS
-#: Merge.rc:1451
+#: Merge.rc:1461
msgid "Last line does not contain string..."
msgstr ""
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1453
+#: Merge.rc:1463
msgid "&Line Count"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_LT_10
-#: Merge.rc:1455
+#: Merge.rc:1465
msgid "Less than 10"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_GE_10
-#: Merge.rc:1456
+#: Merge.rc:1466
msgid "10 or more"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_LT_100
-#: Merge.rc:1457
+#: Merge.rc:1467
msgid "Less than 100"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_GE_100
-#: Merge.rc:1458
+#: Merge.rc:1468
msgid "100 or more"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_LT_1000
-#: Merge.rc:1459
+#: Merge.rc:1469
msgid "Less than 1000"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_GE_1000
-#: Merge.rc:1460
+#: Merge.rc:1470
msgid "1000 or more"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_LT_10000
-#: Merge.rc:1461
+#: Merge.rc:1471
msgid "Less than 10000"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_GE_10000
-#: Merge.rc:1462
+#: Merge.rc:1472
msgid "10000 or more"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_LT_100000
-#: Merge.rc:1463
+#: Merge.rc:1473
msgid "Less than 100000"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_GE_100000
-#: Merge.rc:1464
+#: Merge.rc:1474
msgid "100000 or more"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_PROPS
-#: Merge.rc:1467 Merge.rc:1594 Merge.rc:1761 Merge.rc:1778
+#: Merge.rc:1477 Merge.rc:1604 Merge.rc:1771 Merge.rc:1788
msgid "Additional &Properties..."
msgstr ""
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1469
+#: Merge.rc:1479
msgid "Add F&older Condition"
msgstr ""
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1513
+#: Merge.rc:1523
msgid "&Files"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FOLDER_FILES_EQ_0
-#: Merge.rc:1515
+#: Merge.rc:1525
msgid "0 files"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FOLDER_FILES_GE_1
-#: Merge.rc:1516
+#: Merge.rc:1526
msgid "1 file or more"
msgstr ""
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1519
+#: Merge.rc:1529
msgid "&Items"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FOLDER_ITEMS_EQ_0
-#: Merge.rc:1521
+#: Merge.rc:1531
msgid "0 items"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FOLDER_ITEMS_GE_1
-#: Merge.rc:1522
+#: Merge.rc:1532
msgid "1 item or more"
msgstr ""
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1525
+#: Merge.rc:1535
msgid "&Total Size"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FOLDER_STATS_RECURSIVE
-#: Merge.rc:1542
+#: Merge.rc:1552
msgid "&Recursive"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONDITION_ANY
-#: Merge.rc:1544
+#: Merge.rc:1554
msgid "Target: &Any (Left/Middle/Right)"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONDITION_LEFT
-#: Merge.rc:1545
+#: Merge.rc:1555
msgid "Target: &Left"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONDITION_MIDDLE
-#: Merge.rc:1546
+#: Merge.rc:1556
msgid "Target: &Middle"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONDITION_RIGHT
-#: Merge.rc:1547
+#: Merge.rc:1557
msgid "Target: &Right"
msgstr ""
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1549
+#: Merge.rc:1559
msgid "Add &Difference Condition"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_PROP, ID_FILTERMENU_DIFF_PROP_EQUAL
-#: Merge.rc:1553 Merge.rc:1570 Merge.rc:1591 Merge.rc:1696 Merge.rc:1717
-#: Merge.rc:1742
+#: Merge.rc:1563 Merge.rc:1580 Merge.rc:1601 Merge.rc:1706 Merge.rc:1727
+#: Merge.rc:1752
msgid "Equal"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_PROP, ID_FILTERMENU_DIFF_PROP_NOT_EQUAL
-#: Merge.rc:1554 Merge.rc:1571 Merge.rc:1592 Merge.rc:1697 Merge.rc:1718
-#: Merge.rc:1743
+#: Merge.rc:1564 Merge.rc:1581 Merge.rc:1602 Merge.rc:1707 Merge.rc:1728
+#: Merge.rc:1753
msgid "Not Equal"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_PROP, ID_FILTERMENU_DIFF_PROP_LESS
-#: Merge.rc:1555 Merge.rc:1572 Merge.rc:1698 Merge.rc:1719 Merge.rc:1744
+#: Merge.rc:1565 Merge.rc:1582 Merge.rc:1708 Merge.rc:1729 Merge.rc:1754
msgid "Less Than"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_PROP, ID_FILTERMENU_DIFF_PROP_LESS_EQUAL
-#: Merge.rc:1556 Merge.rc:1573 Merge.rc:1699 Merge.rc:1720 Merge.rc:1745
+#: Merge.rc:1566 Merge.rc:1583 Merge.rc:1709 Merge.rc:1730 Merge.rc:1755
msgid "Less Than or Equal to"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_PROP, ID_FILTERMENU_DIFF_PROP_GREATER
-#: Merge.rc:1557 Merge.rc:1574 Merge.rc:1700 Merge.rc:1721 Merge.rc:1746
+#: Merge.rc:1567 Merge.rc:1584 Merge.rc:1710 Merge.rc:1731 Merge.rc:1756
msgid "Greater Than"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_PROP, ID_FILTERMENU_DIFF_PROP_GREATER_EQUAL
-#: Merge.rc:1558 Merge.rc:1575 Merge.rc:1701 Merge.rc:1722 Merge.rc:1747
+#: Merge.rc:1568 Merge.rc:1585 Merge.rc:1711 Merge.rc:1732 Merge.rc:1757
msgid "Greater Than or Equal to"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_SIZE, ID_FILTERMENU_DIFF_SIZE_LT_10B
-#: Merge.rc:1560 Merge.rc:1703
+#: Merge.rc:1570 Merge.rc:1713
msgid "Less than 10B"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_SIZE, ID_FILTERMENU_DIFF_SIZE_GE_10B
-#: Merge.rc:1561 Merge.rc:1704
+#: Merge.rc:1571 Merge.rc:1714
msgid "10B or more"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_SIZE, ID_FILTERMENU_DIFF_SIZE_LT_100B
-#: Merge.rc:1562 Merge.rc:1705
+#: Merge.rc:1572 Merge.rc:1715
msgid "Less than 100B"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_SIZE, ID_FILTERMENU_DIFF_SIZE_GE_100B
-#: Merge.rc:1563 Merge.rc:1706
+#: Merge.rc:1573 Merge.rc:1716
msgid "100B or more"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_LT_1SECOND
-#: Merge.rc:1577 Merge.rc:1724
+#: Merge.rc:1587 Merge.rc:1734
msgid "Less than 1 second"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_GE_1SECOND
-#: Merge.rc:1578 Merge.rc:1725
+#: Merge.rc:1588 Merge.rc:1735
msgid "1 second or more"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_LT_1MINUTE
-#: Merge.rc:1579 Merge.rc:1726
+#: Merge.rc:1589 Merge.rc:1736
msgid "Less than 1 minute"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_GE_1MINUTE
-#: Merge.rc:1580 Merge.rc:1727
+#: Merge.rc:1590 Merge.rc:1737
msgid "1 minute or more"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_LT_1HOUR
-#: Merge.rc:1581 Merge.rc:1728
+#: Merge.rc:1591 Merge.rc:1738
msgid "Less than 1 hour"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_GE_1HOUR
-#: Merge.rc:1582 Merge.rc:1729
+#: Merge.rc:1592 Merge.rc:1739
msgid "1 hour or more"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_LT_1DAY
-#: Merge.rc:1583 Merge.rc:1730
+#: Merge.rc:1593 Merge.rc:1740
msgid "Less than 1 day"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_GE_1DAY
-#: Merge.rc:1584 Merge.rc:1731
+#: Merge.rc:1594 Merge.rc:1741
msgid "1 day or more"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_LT_1WEEK
-#: Merge.rc:1585 Merge.rc:1732
+#: Merge.rc:1595 Merge.rc:1742
msgid "Less than 1 week"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_GE_1WEEK
-#: Merge.rc:1586 Merge.rc:1733
+#: Merge.rc:1596 Merge.rc:1743
msgid "1 week or more"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_CONDITION_DIFF_LEFT_RIGHT
-#: Merge.rc:1596
+#: Merge.rc:1606
msgid "Target: &Left and Right"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_CONDITION_DIFF_LEFT_MIDDLE
-#: Merge.rc:1597
+#: Merge.rc:1607
msgid "Target: Left and &Middle"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_CONDITION_DIFF_MIDDLE_RIGHT
-#: Merge.rc:1598
+#: Merge.rc:1608
msgid "Target: Middle and &Right"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_CONDITION_DIFF_ALL
-#: Merge.rc:1599
+#: Merge.rc:1609
msgid "Target: &All"
msgstr ""
#. IDR_POPUP_FILTERMENU_BINARY, ID_FILTERMENU_BINARY_ONLY
-#: Merge.rc:1620
+#: Merge.rc:1630
msgid "Binary files only"
msgstr ""
#. IDR_POPUP_FILTERMENU_BINARY, ID_FILTERMENU_TEXT_ONLY
-#: Merge.rc:1621
+#: Merge.rc:1631
msgid "Text files only"
msgstr ""
#. IDR_POPUP_ADDCMPMENU, ID_ADDCMPMENU_CLEAR
-#: Merge.rc:1755
+#: Merge.rc:1765
msgid "&Clear conditions"
msgstr ""
#. IDR_POPUP_ADDCMPMENU, ID_ADDCMPMENU_CMP_SIZE
-#: Merge.rc:1757
+#: Merge.rc:1767
msgid "Compare &Size"
msgstr ""
#. IDR_POPUP_ADDCMPMENU, ID_ADDCMPMENU_CMP_DATE
-#: Merge.rc:1758
+#: Merge.rc:1768
msgid "Compare &Date"
msgstr ""
#. IDR_POPUP_ADDCMPMENU, ID_ADDCMPMENU_CMP_ATTR
-#: Merge.rc:1759
+#: Merge.rc:1769
msgid "Compare &Attributes"
msgstr ""
#. IDR_POPUP_ADDCMPMENU, ID_ADDCMPMENU_CMP_CONTENTS
-#: Merge.rc:1760
+#: Merge.rc:1770
msgid "Compare C&ontents"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_CLEAR
-#: Merge.rc:1769
+#: Merge.rc:1779
msgid "&Clear Keys"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_NAME
-#: Merge.rc:1771
+#: Merge.rc:1781
msgid "&Name"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_BASENAME
-#: Merge.rc:1772
+#: Merge.rc:1782
msgid "&Base name (without extension)"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_NORMALIZED_NAME
-#: Merge.rc:1773
+#: Merge.rc:1783
msgid "Normalized &Unicode Name"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_RELPATH
-#: Merge.rc:1774
+#: Merge.rc:1784
msgid "&Relative Path"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_DATE
-#: Merge.rc:1776
+#: Merge.rc:1786
msgid "&Date"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_HASH_MD5
-#: Merge.rc:1777
+#: Merge.rc:1787
msgid "&Hash (MD5)"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_REPLACE
-#: Merge.rc:1780
+#: Merge.rc:1790
msgid "Insert &replace() Function"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_REGEXREPLACE
-#: Merge.rc:1781
+#: Merge.rc:1791
msgid "Insert rege&xReplace() Function"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU
-#: Merge.rc:1782
+#: Merge.rc:1792
msgid "Replace &Lists"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_CREATE_REPLACELIST
-#: Merge.rc:1784
+#: Merge.rc:1794
msgid "&Create String Replace List and Insert..."
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_CREATE_REGEXREPLACELIST
-#: Merge.rc:1785
+#: Merge.rc:1795
msgid "Create &Regex Replace List and Insert..."
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU
-#: Merge.rc:1787
+#: Merge.rc:1797
msgid "&String Replace Lists"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU
-#: Merge.rc:1791
+#: Merge.rc:1801
msgid "Re&gex Replace Lists"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_STRING_REPLACE_LISTS_FOLDER
-#: Merge.rc:1796
+#: Merge.rc:1806
msgid "Open String Replace Lists Folder..."
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_REGEX_REPLACE_LISTS_FOLDER
-#: Merge.rc:1797
+#: Merge.rc:1807
msgid "Open Regex Replace Lists Folder..."
msgstr ""
#. IDD_FILTERS_CONDITION, IDC_CONDITION_MATCHCASE
-#: Merge.rc:1799 Merge.rc:1995 Merge.rc:2014 Merge.rc:2042 Merge.rc:2585
+#: Merge.rc:1809 Merge.rc:2005 Merge.rc:2024 Merge.rc:2052 Merge.rc:2595
msgid "Match &case"
msgstr "مطابقة مع مراعاة حالة الحرف (للغة الإنجليزية)"
#. IDR_POPUP_RENAMEMOVE_MENU
-#: Merge.rc:1801
+#: Merge.rc:1811
msgid "Text &Normalization"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_TOLOWER
-#: Merge.rc:1803
+#: Merge.rc:1813
msgid "&Lowercase"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_TOUPPER
-#: Merge.rc:1804
+#: Merge.rc:1814
msgid "&Uppercase"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_TOHALFWIDTH
-#: Merge.rc:1805
+#: Merge.rc:1815
msgid "&Half-width"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_TOFULLWIDTH
-#: Merge.rc:1806
+#: Merge.rc:1816
msgid "&Full-width"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU
-#: Merge.rc:1807
+#: Merge.rc:1817
msgid "&Chinese Conversion"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_TOSIMPLIFIEDCHINESE
-#: Merge.rc:1809
+#: Merge.rc:1819
msgid "&Simplified Chinese"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_TOTRADITIONALCHINESE
-#: Merge.rc:1810
+#: Merge.rc:1820
msgid "&Traditional Chinese"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU
-#: Merge.rc:1812
+#: Merge.rc:1822
msgid "&Japanese Conversion"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_TOHIRAGANA
-#: Merge.rc:1814
+#: Merge.rc:1824
msgid "&Hiragana"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_TOKATAKANA
-#: Merge.rc:1815
+#: Merge.rc:1825
msgid "&Katakana"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_NORMALIZEUNICODE
-#: Merge.rc:1817
+#: Merge.rc:1827
msgid "Normalize &Unicode"
msgstr ""
#. IDD_ABOUTBOX
-#: Merge.rc:1932
+#: Merge.rc:1942
msgid "About WinMerge"
msgstr "حول WinMerge"
#. IDD_ABOUTBOX, IDC_WWW
-#: Merge.rc:1936
+#: Merge.rc:1946
msgid "Visit the WinMerge Homepage!"
msgstr "زيارة الصفحة الرئيسية لموقع WinMerge!"
#. IDD_PLUGINS_EDITPLUGIN, IDOK
-#: Merge.rc:1938 Merge.rc:2080 Merge.rc:2431 Merge.rc:2455 Merge.rc:2469
-#: Merge.rc:2497 Merge.rc:2588 Merge.rc:2613 Merge.rc:2674 Merge.rc:2691
-#: Merge.rc:2703 Merge.rc:2867 Merge.rc:2927 Merge.rc:3062 Merge.rc:3104
-#: Merge.rc:3147 Merge.rc:3197
+#: Merge.rc:1948 Merge.rc:2090 Merge.rc:2441 Merge.rc:2465 Merge.rc:2479
+#: Merge.rc:2507 Merge.rc:2598 Merge.rc:2623 Merge.rc:2684 Merge.rc:2701
+#: Merge.rc:2713 Merge.rc:2877 Merge.rc:2937 Merge.rc:3072 Merge.rc:3114
+#: Merge.rc:3157 Merge.rc:3207
msgid "OK"
msgstr "موافق"
#. IDD_ABOUTBOX, IDC_OPEN_CONTRIBUTORS
-#: Merge.rc:1939
+#: Merge.rc:1949
msgid "Contributors"
msgstr "المساهمون"
#. IDD_SELECT_FILES_OR_FOLDERS
-#: Merge.rc:1945 Merge.rc:3070
+#: Merge.rc:1955 Merge.rc:3080
msgid "Select Files or Folders"
msgstr "اختيار الملفات أو المجلدات"
#. IDD_OPEN, IDC_FILES_DIRS_GROUP0
-#: Merge.rc:1949
+#: Merge.rc:1959
msgid "&1st File or Folder"
msgstr "ال&ملف أو المجلد الأول"
#. IDD_OPEN, IDC_PATH0_READONLY
-#: Merge.rc:1951
+#: Merge.rc:1961
msgid "Re&ad-only"
msgstr "لل&قراءة فقط"
#. IDD_OPEN, IDC_SWAP01_STATIC
-#: Merge.rc:1953
+#: Merge.rc:1963
msgid "Swap 1st | 2nd"
msgstr "مبادلة الأول والثاني"
#. IDD_GENERATE_PATCH, IDC_DIFF_BROWSE_FILE1
-#: Merge.rc:1954 Merge.rc:2310 Merge.rc:2413
+#: Merge.rc:1964 Merge.rc:2320 Merge.rc:2423
msgid "&Browse..."
msgstr "بحث..."
#. IDD_OPEN, IDC_FILES_DIRS_GROUP1
-#: Merge.rc:1955
+#: Merge.rc:1965
msgid "&2nd File or Folder"
msgstr "الملف أو المجلد ال&ثاني"
#. IDD_OPEN, IDC_PATH1_READONLY
-#: Merge.rc:1957
+#: Merge.rc:1967
msgid "Rea&d-only"
msgstr "للق&راءة فقط"
#. IDD_OPEN, IDC_SWAP12_STATIC
-#: Merge.rc:1959
+#: Merge.rc:1969
msgid "Swap 2nd | 3rd"
msgstr "مبادلة الثاني والثالث"
#. IDD_PROPPAGE_SYSTEM, IDC_FILTER_USER_BROWSE
-#: Merge.rc:1960 Merge.rc:2315
+#: Merge.rc:1970 Merge.rc:2325
msgid "B&rowse..."
msgstr "بحث..."
#. IDD_OPEN, IDC_FILES_DIRS_GROUP2
-#: Merge.rc:1961
+#: Merge.rc:1971
msgid "&3rd File or Folder (Optional)"
msgstr "الملف أو المجلد الثا&لث (اختياري)"
#. IDD_OPEN, IDC_PATH2_READONLY
-#: Merge.rc:1963
+#: Merge.rc:1973
msgid "Read-o&nly"
msgstr "للقراء&ة فقط"
#. IDD_OPEN, IDC_SWAP02_STATIC
-#: Merge.rc:1965
+#: Merge.rc:1975
msgid "Swap 1st | 3rd"
msgstr "مبادلة الأول والثالث"
#. IDD_PROPPAGE_BACKUPS, IDC_BACKUP_BROWSE
-#: Merge.rc:1966 Merge.rc:2685 Merge.rc:2883
+#: Merge.rc:1976 Merge.rc:2695 Merge.rc:2893
msgid "Browse..."
msgstr "بحث..."
#. IDD_OPEN, IDC_FILES_DIRS_GROUP3
-#: Merge.rc:1968
+#: Merge.rc:1978
msgid " Folder: Filter"
msgstr " مجلد: مرشح"
#. IDD_OPEN, IDC_RECURS_CHECK
-#: Merge.rc:1971
+#: Merge.rc:1981
msgid "&Include subfolders"
msgstr "تضمين المجلدات الفرعية"
#. IDD_OPEN, IDC_FILES_DIRS_GROUP5
-#: Merge.rc:1972
+#: Merge.rc:1982
msgid " File: Prediffer Plugin"
msgstr ""
#. IDD_OPEN, IDC_FILES_DIRS_GROUP4
-#: Merge.rc:1976
+#: Merge.rc:1986
msgid " File: Unpacker Plugin"
msgstr " ملف: إضافة فك الحزمة"
#. IDD_OPEN, IDC_SELECT_UNPACKER
-#: Merge.rc:1978
+#: Merge.rc:1988
msgid "Se&lect..."
msgstr "تحديد..."
#. IDD_PLUGINS_EDITPLUGIN, IDCANCEL
-#: Merge.rc:1981 Merge.rc:2001 Merge.rc:2025 Merge.rc:2046 Merge.rc:2081
-#: Merge.rc:2432 Merge.rc:2456 Merge.rc:2470 Merge.rc:2498 Merge.rc:2551
-#: Merge.rc:2589 Merge.rc:2614 Merge.rc:2675 Merge.rc:2692 Merge.rc:2704
-#: Merge.rc:2868 Merge.rc:2928 Merge.rc:3087 Merge.rc:3105 Merge.rc:3148
-#: Merge.rc:3198
+#: Merge.rc:1991 Merge.rc:2011 Merge.rc:2035 Merge.rc:2056 Merge.rc:2091
+#: Merge.rc:2442 Merge.rc:2466 Merge.rc:2480 Merge.rc:2508 Merge.rc:2561
+#: Merge.rc:2599 Merge.rc:2624 Merge.rc:2685 Merge.rc:2702 Merge.rc:2714
+#: Merge.rc:2878 Merge.rc:2938 Merge.rc:3097 Merge.rc:3115 Merge.rc:3158
+#: Merge.rc:3208
msgid "Cancel"
msgstr "إلغاء"
#. IDD_OPEN, IDC_OPEN_STATUS
-#: Merge.rc:1982
+#: Merge.rc:1992
msgid "Status:"
msgstr "الحالة:"
#. IDD_PLUGINS_LIST, ID_HELP
-#: Merge.rc:1983 Merge.rc:2082 Merge.rc:2929
+#: Merge.rc:1993 Merge.rc:2092 Merge.rc:2939
msgid "Help"
msgstr "مساعدة"
#. IDD_OPEN, IDC_OPTIONS
-#: Merge.rc:1984
+#: Merge.rc:1994
msgid "&Options..."
msgstr "خ&يارات..."
#. IDD_EDIT_FIND
-#: Merge.rc:1989
+#: Merge.rc:1999
msgid "Find"
msgstr "البحث"
#. IDD_EDIT_MARKER, IDC_STATIC
-#: Merge.rc:1992 Merge.rc:2009 Merge.rc:2037
+#: Merge.rc:2002 Merge.rc:2019 Merge.rc:2047
msgid "Fi&nd what:"
msgstr "ال&بحث عن:"
#. IDD_EDIT_MARKER, IDC_EDIT_WHOLE_WORD
-#: Merge.rc:1994 Merge.rc:2013 Merge.rc:2041
+#: Merge.rc:2004 Merge.rc:2023 Merge.rc:2051
msgid "Match &whole word only"
msgstr "إجراء &مطابقة للكلمة كاملة فقط"
#. IDD_EDIT_MARKER, IDC_EDIT_REGEXP
-#: Merge.rc:1996 Merge.rc:2015 Merge.rc:2043
+#: Merge.rc:2006 Merge.rc:2025 Merge.rc:2053
msgid "Regular &expression"
msgstr "التعابير النمطية"
#. IDD_EDIT_FIND, IDC_FINDDLG_DONTWRAP
-#: Merge.rc:1997
+#: Merge.rc:2007
msgid "D&on't wrap end of file"
msgstr "لا تقم بعمل التفاف لنهاية الملف"
#. IDD_EDIT_FIND, IDC_FINDDLG_DONTCLOSE
-#: Merge.rc:1998
+#: Merge.rc:2008
msgid "&Don't close this dialog"
msgstr "لا تغلق هذه النافذة"
#. IDD_EDIT_REPLACE, IDC_EDIT_SKIP
-#: Merge.rc:1999 Merge.rc:2021
+#: Merge.rc:2009 Merge.rc:2031
msgid "&Find Next"
msgstr "البحث في ال&تالي"
#. IDD_EDIT_FIND, IDC_EDIT_FINDPREV
-#: Merge.rc:2000
+#: Merge.rc:2010
msgid "Find &Prev"
msgstr "البحث في ال&سابق"
#. IDD_EDIT_REPLACE
-#: Merge.rc:2006
+#: Merge.rc:2016
msgid "Replace"
msgstr "استبدال"
#. IDD_EDIT_REPLACE, IDC_STATIC
-#: Merge.rc:2011
+#: Merge.rc:2021
msgid "Re&place with:"
msgstr "استبدال بـ:"
#. IDD_EDIT_REPLACE, IDC_EDIT_SCOPE_DONT_WRAP
-#: Merge.rc:2016
+#: Merge.rc:2026
msgid "&Don't wrap at end of file"
msgstr "لا تقم بعمل التفاف لنهاية الملف"
#. IDD_EDIT_REPLACE, IDC_STATIC
-#: Merge.rc:2018
+#: Merge.rc:2028
msgid "Replace in"
msgstr "استبدال في"
#. IDD_EDIT_REPLACE, IDC_EDIT_SCOPE_WHOLE_FILE
-#: Merge.rc:2020
+#: Merge.rc:2030
msgid "Wh&ole file"
msgstr "&كامل الملف"
#. IDD_EDIT_REPLACE, IDC_EDIT_FINDPREV
-#: Merge.rc:2022
+#: Merge.rc:2032
msgid "Find Pre&v"
msgstr ""
#. IDD_EDIT_REPLACE, IDC_EDIT_REPLACE
-#: Merge.rc:2023
+#: Merge.rc:2033
msgid "&Replace"
msgstr "&استبدال"
#. IDD_EDIT_REPLACE, IDC_EDIT_REPLACE_ALL
-#: Merge.rc:2024
+#: Merge.rc:2034
msgid "Replace &All"
msgstr "استبدال الك&ل"
#. IDS_OPTIONSPG_MARKERCOLORS
-#: Merge.rc:2030 Merge.rc:4209
+#: Merge.rc:2040 Merge.rc:4219
msgid "Markers"
msgstr "علامات"
#. IDD_EDIT_MARKER, IDC_EDIT_MARKERS_ENABLED
-#: Merge.rc:2033
+#: Merge.rc:2043
msgid "Enable &markers"
msgstr "تفعيل العلامات"
#. IDD_FILTERS_LINEFILTERS, IDC_LFILTER_ADDBTN
-#: Merge.rc:2035 Merge.rc:2057
+#: Merge.rc:2045 Merge.rc:2067
msgid "New"
msgstr "جديد"
#. IDD_EDIT_MARKER, IDC_STATIC
-#: Merge.rc:2039
+#: Merge.rc:2049
msgid "&Background color:"
msgstr "&لون الخلفية:"
#. IDS_MESSAGEBOX_OK
-#: Merge.rc:2044 Merge.rc:2829 Merge.rc:3086 Merge.rc:4171
+#: Merge.rc:2054 Merge.rc:2839 Merge.rc:3096 Merge.rc:4181
msgid "&Ok"
msgstr "&موافق"
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:2045 Merge.rc:2525 Merge.rc:3199
+#: Merge.rc:2055 Merge.rc:2535 Merge.rc:3209
msgid "&Apply"
msgstr "ت&طبيق"
#. IDD_FILTERS_LINEFILTERS
-#: Merge.rc:2051
+#: Merge.rc:2061
msgid "Line Filters"
msgstr ""
#. IDD_FILTERS_LINEFILTERS, IDC_IGNOREREGEXP
-#: Merge.rc:2054
+#: Merge.rc:2064
msgid "Enable Line Filters"
msgstr "تفعيل مرشحات الأسطر"
#. IDD_FILTERS_LINEFILTERS, IDC_STATIC
-#: Merge.rc:2055
+#: Merge.rc:2065
msgid "Regular Expressions (one per line):"
msgstr "التعابير النمطية (واحد للسطر):"
#. IDD_PLUGINS_LIST, IDC_PLUGIN_EDIT
-#: Merge.rc:2058 Merge.rc:2924
+#: Merge.rc:2068 Merge.rc:2934
msgid "Edit"
msgstr "تعديل"
#. IDD_PLUGINS_LIST, IDC_PLUGIN_REMOVE
-#: Merge.rc:2059 Merge.rc:2071 Merge.rc:2925
+#: Merge.rc:2069 Merge.rc:2081 Merge.rc:2935
msgid "Remove"
msgstr "حذف"
#. IDD_FILTERS_SUBSTITUTIONFILTERS
-#: Merge.rc:2064
+#: Merge.rc:2074
msgid "Substitution Filters"
msgstr ""
#. IDD_FILTERS_SUBSTITUTIONFILTERS, IDC_STATIC
-#: Merge.rc:2067
+#: Merge.rc:2077
msgid "Changes to the listed pairs below will be ignored or marked as insignificant. Patches are unaffected."
msgstr ""
#. IDD_FILTERS_SUBSTITUTIONFILTERS, IDC_IGNORED_SUSBSTITUTIONS_ENABLED
-#: Merge.rc:2068
+#: Merge.rc:2078
msgid "Enable"
msgstr ""
#. IDD_PLUGINS_LIST, IDC_PLUGIN_ADD
-#: Merge.rc:2070 Merge.rc:2923
+#: Merge.rc:2080 Merge.rc:2933
msgid "Add"
msgstr ""
#. IDD_FILTERS_SUBSTITUTIONFILTERS, IDC_LFILTER_CLEARBTN
-#: Merge.rc:2072
+#: Merge.rc:2082
msgid "Clear"
msgstr ""
#. IDD_PREFERENCES
-#: Merge.rc:2077
+#: Merge.rc:2087
msgid "Options"
msgstr "الخيارات"
#. IDD_PREFERENCES, IDC_TREEOPT_IMPORT
-#: Merge.rc:2086
+#: Merge.rc:2096
msgid "Import..."
msgstr "استيراد..."
#. IDD_PREFERENCES, IDC_TREEOPT_EXPORT
-#: Merge.rc:2087
+#: Merge.rc:2097
msgid "Export..."
msgstr "تصدير..."
#. IDS_OPTIONSPG_GENCOMPARE
-#: Merge.rc:2092 Merge.rc:4199 Merge.rc:4202 Merge.rc:4219
+#: Merge.rc:2102 Merge.rc:4209 Merge.rc:4212 Merge.rc:4229
msgid "General"
msgstr "عام"
#. IDD_PROPPAGE_GENERAL, IDC_SCROLL_CHECK
-#: Merge.rc:2095
+#: Merge.rc:2105
msgid "Automatically &scroll to first difference"
msgstr "الانتقال إلى الا&ختلاف الأول تلقائيا"
#. IDD_PROPPAGE_GENERAL, IDC_SCROLL_TO_FIRST_INLINE_DIFF_CHECK
-#: Merge.rc:2097
+#: Merge.rc:2107
msgid "Automatically s&croll to first inline difference"
msgstr ""
#. IDD_PROPPAGE_GENERAL, IDC_STATIC
-#: Merge.rc:2099
+#: Merge.rc:2109
msgid "Cl&ose windows with 'Esc':"
msgstr "إغلاق النوافذ باستخدام زر 'Esc':"
#. IDD_PROPPAGE_GENERAL, IDC_VERIFY_OPEN_PATHS
-#: Merge.rc:2101
+#: Merge.rc:2111
msgid "&Automatically verify paths in Open dialog"
msgstr "&تحقق من المسارات في النافذة المفتوحة"
#. IDD_PROPPAGE_GENERAL, IDC_STATIC
-#: Merge.rc:2103
+#: Merge.rc:2113
msgid "Single instance mode:"
msgstr ""
#. IDD_PROPPAGE_GENERAL, IDC_ASK_MULTIWINDOW_CLOSE
-#: Merge.rc:2105
+#: Merge.rc:2115
msgid "As&k when closing multiple windows"
msgstr "ال&سؤال قبل إغلاق نوافذ متعددة"
#. IDD_PROPPAGE_GENERAL, IDC_PRESERVE_FILETIME
-#: Merge.rc:2107
+#: Merge.rc:2117
msgid "&Preserve file time in file compare"
msgstr "الحفاظ على وقت الملف في مقارنة الملفات"
#. IDD_PROPPAGE_GENERAL, IDC_STARTUP_FOLDER_SELECT
-#: Merge.rc:2109
+#: Merge.rc:2119
msgid "Show \"Select Files or Folders\" dialog on startup"
msgstr "عرض نافذة \"اختيار الملفات أو المجلدات\" عند بدء التشغيل"
#. IDD_PROPPAGE_GENERAL, IDC_CLOSE_WITH_OK
-#: Merge.rc:2111
+#: Merge.rc:2121
msgid "Close \"Select Files or Folders\" dialog on clicking Compare button"
msgstr ""
#. IDD_PROPPAGE_GENERAL, IDC_STATIC
-#: Merge.rc:2113
+#: Merge.rc:2123
msgid "Op&en dialog Auto completion:"
msgstr "فتح نافذة الإكمال التلقائي:"
#. IDD_PROPPAGE_GENERAL, IDC_STATIC
-#: Merge.rc:2115
+#: Merge.rc:2125
msgid "Auto-&reload modified files:"
msgstr ""
#. IDD_PROPPAGE_GENERAL, IDC_STATIC
-#: Merge.rc:2117
+#: Merge.rc:2127
msgid "Language:"
msgstr "اللغة:"
#. IDD_PROPPAGE_COMPARE_WEBPAGE, IDC_COMPARE_DEFAULTS
-#: Merge.rc:2119 Merge.rc:2299 Merge.rc:2321 Merge.rc:2352 Merge.rc:2369
-#: Merge.rc:2386 Merge.rc:2394 Merge.rc:2430 Merge.rc:2454 Merge.rc:2633
-#: Merge.rc:2644 Merge.rc:2653 Merge.rc:2887 Merge.rc:2922 Merge.rc:2985
-#: Merge.rc:3010 Merge.rc:3024 Merge.rc:3038 Merge.rc:3054
+#: Merge.rc:2129 Merge.rc:2309 Merge.rc:2331 Merge.rc:2362 Merge.rc:2379
+#: Merge.rc:2396 Merge.rc:2404 Merge.rc:2440 Merge.rc:2464 Merge.rc:2643
+#: Merge.rc:2654 Merge.rc:2663 Merge.rc:2897 Merge.rc:2932 Merge.rc:2995
+#: Merge.rc:3020 Merge.rc:3034 Merge.rc:3048 Merge.rc:3064
msgid "Defaults"
msgstr "الإعدادات الافتراضية"
#. IDS_OPTIONSPG_COLORS
-#: Merge.rc:2124 Merge.rc:2140 Merge.rc:2267 Merge.rc:2292 Merge.rc:4205
+#: Merge.rc:2134 Merge.rc:2150 Merge.rc:2277 Merge.rc:2302 Merge.rc:4215
msgid "Colors"
msgstr "ألوان"
#. IDD_PROPPAGE_COLOR_SCHEMES, IDC_STATIC
-#: Merge.rc:2127
+#: Merge.rc:2137
msgid "Color &mode:"
msgstr ""
#. IDD_PROPPAGE_COLOR_SCHEMES, IDC_STATIC
-#: Merge.rc:2129
+#: Merge.rc:2139
msgid "&Light mode scheme:"
msgstr ""
#. IDD_PROPPAGE_COLOR_SCHEMES, IDC_STATIC
-#: Merge.rc:2131
+#: Merge.rc:2141
msgid "&Dark mode scheme:"
msgstr ""
#. IDD_PROPPAGE_COLOR_SCHEMES, IDC_STATIC
-#: Merge.rc:2133
+#: Merge.rc:2143
msgid "Your custom schemes"
msgstr ""
#. IDD_PROPPAGE_COLOR_SCHEMES, IDC_COLOR_SCHEME_SAVE
-#: Merge.rc:2134
+#: Merge.rc:2144
msgid "&Save current scheme..."
msgstr ""
#. IDD_PROPPAGE_COLOR_SCHEMES, IDC_COLOR_SCHEME_DELETE
-#: Merge.rc:2135
+#: Merge.rc:2145
msgid "Delete ¤t scheme..."
msgstr ""
#. IDD_PROPPAGE_COLORS_DIR, IDC_BACKGROUND_COLUMN_LABEL
-#: Merge.rc:2143 Merge.rc:2238 Merge.rc:2258 Merge.rc:2272
+#: Merge.rc:2153 Merge.rc:2248 Merge.rc:2268 Merge.rc:2282
msgid "Background"
msgstr "الخلفية"
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2144
+#: Merge.rc:2154
msgid "Deleted"
msgstr "تم الحذف"
#. IDS_OPTIONSPG_TEXTCOLORS
-#: Merge.rc:2145 Merge.rc:2207 Merge.rc:2239 Merge.rc:2273 Merge.rc:4207
+#: Merge.rc:2155 Merge.rc:2217 Merge.rc:2249 Merge.rc:2283 Merge.rc:4217
msgid "Text"
msgstr "نص"
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2146
+#: Merge.rc:2156
msgid "Difference:"
msgstr "الاختلاف:"
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2151
+#: Merge.rc:2161
msgid "Selected Difference:"
msgstr "الاختلاف المحدد:"
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2156
+#: Merge.rc:2166
msgid "Ignored Difference:"
msgstr "تجاهل الاختلاف:"
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2161
+#: Merge.rc:2171
msgid "Moved:"
msgstr "تم النقل:"
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2166
+#: Merge.rc:2176
msgid "Selected Moved:"
msgstr "تم النقل للعناصر المحددة:"
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2171
+#: Merge.rc:2181
msgid "Same As Next (3 panes):"
msgstr "نفس التالي (الأجزاء الثلاثة):"
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2176
+#: Merge.rc:2186
msgid "Same As Next (Selected):"
msgstr "نفس التالي (المحدد):"
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2181
+#: Merge.rc:2191
msgid "Word Difference:"
msgstr "الاختلافات على مستوى الكلمة:"
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2186
+#: Merge.rc:2196
msgid "Selected Word Diff:"
msgstr "المقارنة على مستوى الكلمة المحددة:"
#. IDD_INPUTBOX
-#: Merge.rc:2195 Merge.rc:2230 Merge.rc:2251 Merge.rc:3099
+#: Merge.rc:2205 Merge.rc:2240 Merge.rc:2261 Merge.rc:3109
msgid "Dialog"
msgstr "حوار"
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC
-#: Merge.rc:2198
+#: Merge.rc:2208
msgid "Keywords:"
msgstr "الكلمات المفتاحية:"
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC
-#: Merge.rc:2199
+#: Merge.rc:2209
msgid "Function names:"
msgstr "اسماء الدوال:"
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC
-#: Merge.rc:2200
+#: Merge.rc:2210
msgid "Comments:"
msgstr "التعليقات:"
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC
-#: Merge.rc:2201
+#: Merge.rc:2211
msgid "Numbers:"
msgstr "الأرقام:"
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC
-#: Merge.rc:2202
+#: Merge.rc:2212
msgid "Operators:"
msgstr "العوامل:"
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC
-#: Merge.rc:2203
+#: Merge.rc:2213
msgid "Strings:"
msgstr "الإعدادات:"
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC
-#: Merge.rc:2204
+#: Merge.rc:2214
msgid "Preprocessor:"
msgstr "المعالج التمهيدي:"
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC
-#: Merge.rc:2205
+#: Merge.rc:2215
msgid "User 1:"
msgstr "المستخدم 1:"
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC
-#: Merge.rc:2206
+#: Merge.rc:2216
msgid "User 2:"
msgstr "المستخدم 2:"
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_SCOLOR_USER2_BOLD
-#: Merge.rc:2209 Merge.rc:2211 Merge.rc:2213 Merge.rc:2215 Merge.rc:2217
-#: Merge.rc:2219 Merge.rc:2221 Merge.rc:2223 Merge.rc:2225
+#: Merge.rc:2219 Merge.rc:2221 Merge.rc:2223 Merge.rc:2225 Merge.rc:2227
+#: Merge.rc:2229 Merge.rc:2231 Merge.rc:2233 Merge.rc:2235
msgid "Bold"
msgstr "الخط العريض"
#. IDD_PROPPAGE_COLORS_TEXT, IDC_DEFAULT_STANDARD_COLORS
-#: Merge.rc:2233
+#: Merge.rc:2243
msgid "&Use customized text colors"
msgstr "ا&ستخدام ألوان مخصصة للنص"
#. IDD_PROPPAGE_COLORS_TEXT, IDC_WHITESPACE_COLOR_LABEL
-#: Merge.rc:2235
+#: Merge.rc:2245
msgid "Whitespace:"
msgstr "مساحة بيضاء (فارغة):"
#. IDD_PROPPAGE_COLORS_TEXT, IDC_TEXT_COLOR_LABEL
-#: Merge.rc:2236
+#: Merge.rc:2246
msgid "Regular text:"
msgstr "نص عادي:"
#. IDD_PROPPAGE_COLORS_TEXT, IDC_SELECTION_COLOR_LABEL
-#: Merge.rc:2237
+#: Merge.rc:2247
msgid "Selection:"
msgstr "التحديد:"
#. IDD_PROPPAGE_COLORS_DIR, IDC_STATIC
-#: Merge.rc:2245 Merge.rc:2286
+#: Merge.rc:2255 Merge.rc:2296
msgid "Margin:"
msgstr "الهامش:"
#. IDD_PROPPAGE_COLORS_MARKER, IDC_MARKER0_COLOR_LABEL
-#: Merge.rc:2254
+#: Merge.rc:2264
msgid "Search Marker:"
msgstr "علامات البحث:"
#. IDD_PROPPAGE_COLORS_MARKER, IDC_MARKER1_COLOR_LABEL
-#: Merge.rc:2255
+#: Merge.rc:2265
msgid "User Defined Marker 1:"
msgstr "العلامات المعرفة من قبل المستخدم 1:"
#. IDD_PROPPAGE_COLORS_MARKER, IDC_MARKER2_COLOR_LABEL
-#: Merge.rc:2256
+#: Merge.rc:2266
msgid "User Defined Marker 2:"
msgstr "العلامات المعرفة من قبل المستخدم 2:"
#. IDD_PROPPAGE_COLORS_MARKER, IDC_MARKER3_COLOR_LABEL
-#: Merge.rc:2257
+#: Merge.rc:2267
msgid "User Defined Marker 3:"
msgstr "العلامات المعرفة من قبل المستخدم 3:"
#. IDD_PROPPAGE_COLORS_DIR, IDC_USE_DIR_COMPARE_COLORS
-#: Merge.rc:2270
+#: Merge.rc:2280
msgid "&Use folder compare colors"
msgstr "استخدم الألوان في مقارنة المجلدات"
#. IDD_PROPPAGE_COLORS_DIR, IDC_STATIC
-#: Merge.rc:2274
+#: Merge.rc:2284
msgid "Items equal:"
msgstr "العناصر المتماثلة:"
#. IDD_PROPPAGE_COLORS_DIR, IDC_STATIC
-#: Merge.rc:2277
+#: Merge.rc:2287
msgid "Items different:"
msgstr "العناصر المختلفة:"
#. IDD_PROPPAGE_COLORS_DIR, IDC_STATIC
-#: Merge.rc:2280
+#: Merge.rc:2290
msgid "Items missing:"
msgstr "العناصر غير مكتملة:"
#. IDD_PROPPAGE_COLORS_DIR, IDC_STATIC
-#: Merge.rc:2283
+#: Merge.rc:2293
msgid "Items filtered:"
msgstr "العناصر التي تمت حصرها بالمرشح:"
#. IDD_PROPPAGE_COLORS_SYSTEM, IDC_SYSCOLOR_HOOK_ENABLED
-#: Merge.rc:2295
+#: Merge.rc:2305
msgid "&Use custom system colors"
msgstr ""
#. IDS_PRPCAT_SYSTEM
-#: Merge.rc:2304 Merge.rc:4211 Merge.rc:4212 Merge.rc:4657
+#: Merge.rc:2314 Merge.rc:4221 Merge.rc:4222 Merge.rc:4667
msgid "System"
msgstr "النظام"
#. IDD_PROPPAGE_SYSTEM, IDC_USE_RECYCLE_BIN
-#: Merge.rc:2307
+#: Merge.rc:2317
msgid "&Use Recycle Bin"
msgstr "إ&رسال الملفات المحذوفة إلى سلة المهملات"
#. IDD_PROPPAGE_SYSTEM, IDC_STATIC
-#: Merge.rc:2308
+#: Merge.rc:2318
msgid "&External editor:"
msgstr "&محرر خارجي:"
#. IDD_PROPPAGE_SYSTEM, IDC_STATIC
-#: Merge.rc:2311
+#: Merge.rc:2321
msgid "&Store user data in:"
msgstr ""
#. IDD_PROPPAGE_SYSTEM, IDC_STATIC
-#: Merge.rc:2313
+#: Merge.rc:2323
msgid "&Filter folder:"
msgstr "مر&شح المجلد:"
#. IDD_PROPPAGE_SYSTEM, IDC_STATIC
-#: Merge.rc:2316
+#: Merge.rc:2326
msgid "Temporary files folder"
msgstr "مجلد الملفات المؤقتة"
#. IDD_PROPPAGE_SYSTEM, IDC_TMPFOLDER_SYSTEM
-#: Merge.rc:2317
+#: Merge.rc:2327
msgid "S&ystem temp folder"
msgstr "مجلد ملفات النظام المؤقتة"
#. IDD_PROPPAGE_SYSTEM, IDC_STATIC
-#: Merge.rc:2318
+#: Merge.rc:2328
msgid "C&ustom folder:"
msgstr "م&جلد مخصص:"
#. IDD_GENERATE_PATCH, IDC_DIFF_BROWSE_FILE2
-#: Merge.rc:2320 Merge.rc:2416
+#: Merge.rc:2330 Merge.rc:2426
msgid "Br&owse..."
msgstr "&بحث..."
#. IDS_OPTIONSPG_COMPARE
-#: Merge.rc:2326 Merge.rc:4200
+#: Merge.rc:2336 Merge.rc:4210
msgid "Compare"
msgstr "مقارنة"
#. IDD_PROPPAGE_COMPARE, IDC_STATIC
-#: Merge.rc:2329
+#: Merge.rc:2339
msgid "Whitespaces"
msgstr "مساحة بيضاء (خالية)"
#. IDD_PROPPAGE_COMPARE, IDC_WHITESPACE
-#: Merge.rc:2330
+#: Merge.rc:2340
msgid "&Compare"
msgstr "م&قارنة"
#. IDD_PROPPAGE_COMPARE, IDC_WHITE_CHANGE
-#: Merge.rc:2331
+#: Merge.rc:2341
msgid "&Ignore change"
msgstr "تجاهل الت&غييرات"
#. IDD_PROPPAGE_COMPARE, IDC_ALL_WHITE
-#: Merge.rc:2332
+#: Merge.rc:2342
msgid "I&gnore all"
msgstr "تجاهل ال&كل"
#. IDD_PROPPAGE_COMPARE, IDC_IGNBLANKS_CHECK
-#: Merge.rc:2333
+#: Merge.rc:2343
msgid "Ignore blan&k lines"
msgstr "تجاهل الأسطر الفارغة"
#. IDD_PROPPAGE_COMPARE, IDC_IGNCASE_CHECK
-#: Merge.rc:2334
+#: Merge.rc:2344
msgid "Ignore &case"
msgstr "تجاهل حالة الحرف (للغة الإنجليزية)"
#. IDD_PROPPAGE_COMPARE, IDC_EOL_SENSITIVE
-#: Merge.rc:2335
+#: Merge.rc:2345
msgid "Igno&re EOL differences (Windows/Unix/Mac)"
msgstr ""
#. IDD_PROPPAGE_COMPARE, IDC_IGNORE_NUMBERS
-#: Merge.rc:2337
+#: Merge.rc:2347
msgid "Ignore num&bers"
msgstr ""
#. IDD_PROPPAGE_COMPARE, IDC_CP_SENSITIVE
-#: Merge.rc:2338
+#: Merge.rc:2348
msgid "Ignore codepage &differences"
msgstr "تجاهل اختلافات ترميز الصفحة"
#. IDD_PROPPAGE_COMPARE, IDC_FILTERCOMMENTS_CHECK
-#: Merge.rc:2339
+#: Merge.rc:2349
msgid "Ignore c&omment differences"
msgstr ""
#. IDD_PROPPAGE_COMPARE, IDC_IGNEOFEOL_CHECK
-#: Merge.rc:2341
+#: Merge.rc:2351
msgid "Ignore &missing trailing EOL"
msgstr ""
#. IDD_PROPPAGE_COMPARE, IDC_IGNLBRKS_CHECK
-#: Merge.rc:2343
+#: Merge.rc:2353
msgid "Ignore line &breaks (treat as spaces)"
msgstr ""
#. IDD_PROPPAGE_COMPARE, IDC_MOVED_BLOCKS
-#: Merge.rc:2345
+#: Merge.rc:2355
msgid "E&nable moved block detection"
msgstr "&تفعيل كشف المجموعات التي نقلها"
#. IDD_PROPPAGE_COMPARE, IDC_ALIGN_SIMILAR_LINES
-#: Merge.rc:2346
+#: Merge.rc:2356
msgid "Align &similar lines"
msgstr ""
#. IDD_PROPPAGE_COMPARE, IDC_STATIC
-#: Merge.rc:2347
+#: Merge.rc:2357
msgid "Diff &algorithm:"
msgstr "خوارزمية المقارنة:"
#. IDD_PROPPAGE_COMPARE, IDC_INDENT_HEURISTIC
-#: Merge.rc:2349
+#: Merge.rc:2359
msgid "Enable indent &heuristic"
msgstr "تفعيل الم&سافة البادئة الإرشادية"
#. IDD_PROPPAGE_COMPARE, IDC_COMPLETELY_BLANK_OUT_IGNORED_DIFFERENCES
-#: Merge.rc:2350
+#: Merge.rc:2360
msgid "Completely unhighlight the ignored differences"
msgstr ""
#. IDS_OPTIONSPG_EDITOR
-#: Merge.rc:2357 Merge.rc:4201
+#: Merge.rc:2367 Merge.rc:4211
msgid "Editor"
msgstr "المحرر"
#. IDD_PROPPAGE_EDITOR, IDC_HILITE_CHECK
-#: Merge.rc:2360
+#: Merge.rc:2370
msgid "&Highlight syntax"
msgstr "تضليل النص حسب نوع الملف"
#. IDD_PROPPAGE_EDITOR, IDC_MIXED_EOL
-#: Merge.rc:2361
+#: Merge.rc:2371
msgid "&Preserve original EOL"
msgstr "الإحتفا&ظ برمز نهاية الملف (EOL) الأصلي"
#. IDD_PROPPAGE_EDITOR, IDC_STATIC
-#: Merge.rc:2362
+#: Merge.rc:2372
msgid "Tabs"
msgstr "التبويات"
#. IDD_PROPPAGE_EDITOR, IDC_STATIC
-#: Merge.rc:2363
+#: Merge.rc:2373
msgid "&Tab size:"
msgstr "حجم التبويب:"
#. IDD_PROPPAGE_EDITOR, IDC_PROP_INSERT_TABS
-#: Merge.rc:2365
+#: Merge.rc:2375
msgid "&Insert tabs"
msgstr "إدرا&ج تبويبات"
#. IDD_PROPPAGE_EDITOR, IDC_PROP_INSERT_SPACES
-#: Merge.rc:2366
+#: Merge.rc:2376
msgid "Insert &spaces"
msgstr "إدراج م&ساحات"
#. IDD_PROPPAGE_EDITOR, IDC_STATIC
-#: Merge.rc:2367
+#: Merge.rc:2377
msgid "&Rendering mode:"
msgstr ""
#. IDD_PROPPAGE_EDITOR_COMPAREMERGE, IDC_AUTOMRESCAN_CHECK
-#: Merge.rc:2376
+#: Merge.rc:2386
msgid "&Automatic rescan"
msgstr "إ&عادة الفحص التلقائي"
#. IDD_PROPPAGE_EDITOR_COMPAREMERGE, IDC_STATIC
-#: Merge.rc:2377
+#: Merge.rc:2387
msgid "Copy &granularity for selected differences:"
msgstr ""
#. IDD_PROPPAGE_EDITOR_COMPAREMERGE, IDC_LINE_COLORING_GROUP
-#: Merge.rc:2379
+#: Merge.rc:2389
msgid "Line Difference Coloring"
msgstr "تلوين الاختلافات في الأسطر"
#. IDD_PROPPAGE_EDITOR_COMPAREMERGE, IDC_VIEW_LINE_DIFFERENCES
-#: Merge.rc:2380
+#: Merge.rc:2390
msgid "View line differences"
msgstr "عرض الاختلافات في الأسطر"
#. IDD_PROPPAGE_EDITOR_COMPAREMERGE, IDC_EDITOR_CHARLEVEL
-#: Merge.rc:2381
+#: Merge.rc:2391
msgid "&Character-level"
msgstr "مس&توى الرمز"
#. IDD_PROPPAGE_EDITOR_COMPAREMERGE, IDC_EDITOR_WORDLEVEL
-#: Merge.rc:2382
+#: Merge.rc:2392
msgid "&Word-level:"
msgstr "مستوى ال&كلمة:"
#. IDD_PROPPAGE_EDITOR_COMPAREMERGE, IDC_STATIC
-#: Merge.rc:2384
+#: Merge.rc:2394
msgid "W&ord break characters:"
msgstr "رمو&ز الفصل للكلمات:"
#. IDD_PROPPAGE_MESSAGEBOXES, IDC_STATIC
-#: Merge.rc:2401
+#: Merge.rc:2411
msgid "Some messages can be hidden by the user. Press Reset to make all messages visible again."
msgstr ""
"يقوم WinMerge بإخفاء بعض الرسائل العامة. إضغط على زر إعادة التعيين لجعل كافة "
"الرسائل ظاهرة مجددا."
#. IDD_SELECT_FILES_OR_FOLDERS, IDC_RESET
-#: Merge.rc:2402 Merge.rc:3085
+#: Merge.rc:2412 Merge.rc:3095
msgid "Reset"
msgstr "إعادة تعيين"
#. IDD_GENERATE_PATCH
-#: Merge.rc:2408
+#: Merge.rc:2418
msgid "Patch Generator"
msgstr "أداة توليد التصحيح"
#. IDD_GENERATE_PATCH, IDC_STATIC
-#: Merge.rc:2411
+#: Merge.rc:2421
msgid "File&1:"
msgstr "الملف &1:"
#. IDD_GENERATE_PATCH, IDC_STATIC
-#: Merge.rc:2414
+#: Merge.rc:2424
msgid "File&2:"
msgstr "الملف &2:"
#. IDD_GENERATE_PATCH, IDC_DIFF_SWAPFILES
-#: Merge.rc:2417
+#: Merge.rc:2427
msgid "&Swap"
msgstr "&تبديل"
#. IDD_DIRCMP_REPORT, IDC_REPORT_COPYCLIPBOARD
-#: Merge.rc:2418 Merge.rc:2690
+#: Merge.rc:2428 Merge.rc:2700
msgid "&Copy to clipboard"
msgstr "ال&نسخ للحافظة"
#. IDD_GENERATE_PATCH, IDC_DIFF_APPENDFILE
-#: Merge.rc:2419
+#: Merge.rc:2429
msgid "&Append to existing file"
msgstr "إ&ضافة للملف الحالي"
#. IDD_GENERATE_PATCH, IDC_STATIC
-#: Merge.rc:2420
+#: Merge.rc:2430
msgid "&Result:"
msgstr "ال&نتيجة:"
#. IDD_GENERATE_PATCH, IDC_DIFF_BROWSE_RESULT
-#: Merge.rc:2422
+#: Merge.rc:2432
msgid "Bro&wse..."
msgstr "الب&حث..."
#. IDD_GENERATE_PATCH, IDC_STATIC
-#: Merge.rc:2423
+#: Merge.rc:2433
msgid "&Format"
msgstr "ال&صيغة"
#. IDD_GENERATE_PATCH, IDC_STATIC
-#: Merge.rc:2424
+#: Merge.rc:2434
msgid "St&yle:"
msgstr "الأ&سلوب:"
#. IDD_GENERATE_PATCH, IDC_STATIC
-#: Merge.rc:2426
+#: Merge.rc:2436
msgid "&Context:"
msgstr "&الحالة:"
#. IDD_GENERATE_PATCH, IDC_DIFF_INCLCMDLINE
-#: Merge.rc:2428
+#: Merge.rc:2438
msgid "Inclu&de command line"
msgstr "دمج سطر الأوامر"
#. IDD_GENERATE_PATCH, IDC_DIFF_OPENTOEDITOR
-#: Merge.rc:2429
+#: Merge.rc:2439
msgid "Open in e&xternal editor"
msgstr "فتح في المحرر الخارجي"
#. IDD_DIRCOLS
-#: Merge.rc:2446
+#: Merge.rc:2456
msgid "Display Columns"
msgstr "عرض الأعمدة"
#. IDD_DIRCOLS, IDC_UP
-#: Merge.rc:2450
+#: Merge.rc:2460
msgid "Move &Up"
msgstr "التحرك إلى الأ&على"
#. IDD_DIRCOLS, IDC_DOWN
-#: Merge.rc:2451
+#: Merge.rc:2461
msgid "Move &Down"
msgstr "التحرك إلى الأ&سفل"
#. IDD_DIRCOLS, IDC_COLDLG_ADDITIONAL_PROPERTIES
-#: Merge.rc:2453
+#: Merge.rc:2463
msgid "&Additional Properties"
msgstr ""
#. IDD_DIRADDITIONALPROPS
-#: Merge.rc:2461
+#: Merge.rc:2471
msgid "Additional Properties"
msgstr ""
#. IDD_PLUGINS_SELECTPLUGIN
-#: Merge.rc:2475
+#: Merge.rc:2485
msgid "Select Plugin"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN, IDC_STATIC
-#: Merge.rc:2478 Merge.rc:3115
+#: Merge.rc:2488 Merge.rc:3125
msgid "Plugin &name:"
msgstr ""
#. IDD_PLUGINS_SELECTPLUGIN, IDC_STATIC
-#: Merge.rc:2480
+#: Merge.rc:2490
msgid "&Target files:"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN, IDC_STATIC
-#: Merge.rc:2482 Merge.rc:3117
+#: Merge.rc:2492 Merge.rc:3127
msgid "Extensions list:"
msgstr "قائمة امتدادات الملفات:"
#. IDD_PLUGINS_EDITPLUGIN, IDC_STATIC
-#: Merge.rc:2484 Merge.rc:3119
+#: Merge.rc:2494 Merge.rc:3129
msgid "Description:"
msgstr "الوصف:"
#. IDD_PLUGINS_EDITPLUGIN, IDC_STATIC
-#: Merge.rc:2486 Merge.rc:3121
+#: Merge.rc:2496 Merge.rc:3131
msgid "Default arguments:"
msgstr ""
#. IDD_PLUGINS_SELECTPLUGIN, IDC_PLUGIN_ALLOW_ALL
-#: Merge.rc:2488
+#: Merge.rc:2498
msgid "Display all plugins (Ignore extension)"
msgstr ""
#. IDD_PLUGINS_SELECTPLUGIN, IDC_PLUGIN_OPEN_IN_SAME_FRAME_TYPE
-#: Merge.rc:2490
+#: Merge.rc:2500
msgid "&Open files in same window type after unpacking"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_PIPELINE_STATIC
-#: Merge.rc:2492 Merge.rc:3129
+#: Merge.rc:2502 Merge.rc:3139
msgid "&Plugin pipeline:"
msgstr ""
#. IDD_PLUGINS_SELECTPLUGIN, IDC_PLUGIN_ALIAS
-#: Merge.rc:2495
+#: Merge.rc:2505
msgid "&Alias..."
msgstr ""
#. IDD_DIRCOMP_PROGRESS, IDC_COMPARISON_STOP
-#: Merge.rc:2505
+#: Merge.rc:2515
msgid "Stop"
msgstr "إيقاف"
#. IDD_DIRCOMP_PROGRESS, IDC_COMPARISON_PAUSE
-#: Merge.rc:2506
+#: Merge.rc:2516
msgid "Pause"
msgstr "إيقاف مؤقت"
#. IDD_DIRCOMP_PROGRESS, IDC_COMPARISON_CONTINUE
-#: Merge.rc:2507
+#: Merge.rc:2517
msgid "Continue"
msgstr "استمرار"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC
-#: Merge.rc:2509 Merge.rc:2973
+#: Merge.rc:2519 Merge.rc:2983
msgid "C&PU cores to use:"
msgstr ""
#. IDD_DIRCOMP_PROGRESS, IDC_STATIC
-#: Merge.rc:2510
+#: Merge.rc:2520
msgid "Items total:"
msgstr "كل العناصر:"
#. IDD_DIRCOMP_PROGRESS, IDC_STATIC
-#: Merge.rc:2511
+#: Merge.rc:2521
msgid "Items compared:"
msgstr "العناصر التي تمت مقارنتها:"
#. IDS_PREVIEWBAR_CLOSE
-#: Merge.rc:2526 Merge.rc:2846 Merge.rc:5328
+#: Merge.rc:2536 Merge.rc:2856 Merge.rc:5339
msgid "&Close"
msgstr "إ&غلاق"
#. IDD_WMGOTO
-#: Merge.rc:2537
+#: Merge.rc:2547
msgid "Go to"
msgstr "الذهاب إلى"
#. IDD_WMGOTO, IDC_STATIC
-#: Merge.rc:2540
+#: Merge.rc:2550
msgid "G&o to:"
msgstr "الذ&هاب إلى:"
#. IDD_WMGOTO, IDC_STATIC
-#: Merge.rc:2543
+#: Merge.rc:2553
msgid "File"
msgstr "الملف"
#. IDD_WMGOTO, IDC_STATIC
-#: Merge.rc:2547
+#: Merge.rc:2557
msgid "Go to what"
msgstr "الإنتقال إلى..."
#. IDD_WMGOTO, IDC_WMGOTO_TOLINE
-#: Merge.rc:2548
+#: Merge.rc:2558
msgid "Li&ne"
msgstr "الس&طر"
#. IDD_WMGOTO, IDC_WMGOTO_TODIFF
-#: Merge.rc:2549
+#: Merge.rc:2559
msgid "&Difference"
msgstr "الا&ختلاف"
#. IDD_WMGOTO, IDOK
-#: Merge.rc:2550
+#: Merge.rc:2560
msgid "&Go to"
msgstr "الذها&ب إلى"
#. IDS_PROJECT_ITEM_FILE_FILTER
-#: Merge.rc:2556 Merge.rc:4321
+#: Merge.rc:2566 Merge.rc:4331
msgid "File Filters"
msgstr ""
#. IDD_FILTERS_FILEFILTERS, IDC_STATIC
-#: Merge.rc:2559
+#: Merge.rc:2569
msgid "&Mask / Filter Expression"
msgstr ""
#. IDD_FILTERS_FILEFILTERS, IDC_STATIC
-#: Merge.rc:2562
+#: Merge.rc:2572
msgid "Preset &Filters"
msgstr ""
#. IDD_FILTERS_FILEFILTERS, IDC_FILTERFILE_TEST_BTN
-#: Merge.rc:2564
+#: Merge.rc:2574
msgid "Test..."
msgstr "اختبار..."
#. IDD_FILTERS_FILEFILTERS, IDC_FILTERFILE_INSTALL
-#: Merge.rc:2565
+#: Merge.rc:2575
msgid "Install..."
msgstr "تنصيب..."
#. IDD_FILTERS_FILEFILTERS, IDC_FILTERFILE_NEWBTN
-#: Merge.rc:2566
+#: Merge.rc:2576
msgid "New..."
msgstr "جديد..."
#. IDD_FILTERS_FILEFILTERS, IDC_FILTERFILE_EDITBTN
-#: Merge.rc:2567
+#: Merge.rc:2577
msgid "Edit..."
msgstr "تعديل..."
#. IDD_FILTERS_FILEFILTERS, IDC_FILTERFILE_DELETEBTN
-#: Merge.rc:2568
+#: Merge.rc:2578
msgid "Delete..."
msgstr "حذف..."
#. IDD_FILTERS_CONDITION
-#: Merge.rc:2573
+#: Merge.rc:2583
msgid "Filter Condition"
msgstr ""
#. IDD_FILTERS_CONDITION, IDC_STATIC
-#: Merge.rc:2576
+#: Merge.rc:2586
msgid "&Left-hand side:"
msgstr ""
#. IDD_FILTERS_CONDITION, IDC_STATIC
-#: Merge.rc:2578
+#: Merge.rc:2588
msgid "&Operator:"
msgstr ""
#. IDD_FILTERS_CONDITION, IDC_STATIC
-#: Merge.rc:2580
+#: Merge.rc:2590
msgid "&Right-hand side:"
msgstr ""
#. IDD_FILTERS_CONDITION, IDC_STATIC
-#: Merge.rc:2586
+#: Merge.rc:2596
msgid "Expression:"
msgstr ""
#. IDD_COMPARISON_RESULT_FILTER
-#: Merge.rc:2595
+#: Merge.rc:2605
msgid "Filter by Comparison Result"
msgstr ""
#. IDD_COMPARISON_RESULT_FILTER, IDC_RADIO_INCLUDE
-#: Merge.rc:2598
+#: Merge.rc:2608
msgid "&Include"
msgstr ""
#. IDD_COMPARISON_RESULT_FILTER, IDC_RADIO_EXCLUDE
-#: Merge.rc:2599
+#: Merge.rc:2609
msgid "&Exclude"
msgstr ""
#. IDD_COMPARISON_RESULT_FILTER, IDC_STATIC
-#: Merge.rc:2600
+#: Merge.rc:2610
msgid "Comparison Results"
msgstr ""
#. IDS_IDENTICAL
-#: Merge.rc:2601 Merge.rc:2733 Merge.rc:2794 Merge.rc:4698
+#: Merge.rc:2611 Merge.rc:2743 Merge.rc:2804 Merge.rc:4708
msgid "Identical"
msgstr "متطابق"
#. IDS_DIFFERENT
-#: Merge.rc:2602 Merge.rc:2714 Merge.rc:2755 Merge.rc:4708
+#: Merge.rc:2612 Merge.rc:2724 Merge.rc:2765 Merge.rc:4718
msgid "Different"
msgstr "الاختلاف"
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_LEFT_ONLY
-#: Merge.rc:2603
+#: Merge.rc:2613
msgid "Left only"
msgstr ""
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_RIGHT_ONLY
-#: Merge.rc:2604
+#: Merge.rc:2614
msgid "Right only"
msgstr ""
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_SKIPPED
-#: Merge.rc:2605
+#: Merge.rc:2615
msgid "Skipped"
msgstr ""
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_MIDDLE_ONLY
-#: Merge.rc:2606
+#: Merge.rc:2616
msgid "Middle only"
msgstr ""
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_LEFT_ONLY_DIFFERENT
-#: Merge.rc:2607
+#: Merge.rc:2617
msgid "Left only (different)"
msgstr ""
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_MIDDLE_ONLY_DIFFERENT
-#: Merge.rc:2608
+#: Merge.rc:2618
msgid "Middle only (different)"
msgstr ""
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_RIGHT_ONLY_DIFFERENT
-#: Merge.rc:2609
+#: Merge.rc:2619
msgid "Right only (different)"
msgstr ""
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_LEFT_ONLY_MISSING
-#: Merge.rc:2610
+#: Merge.rc:2620
msgid "Left only (missing)"
msgstr ""
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_MIDDLE_ONLY_MISSING
-#: Merge.rc:2611
+#: Merge.rc:2621
msgid "Middle only (missing)"
msgstr ""
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_RIGHT_ONLY_MISSING
-#: Merge.rc:2612
+#: Merge.rc:2622
msgid "Right only (missing)"
msgstr ""
#. IDS_OPTIONSPG_CODEPAGE
-#: Merge.rc:2619 Merge.rc:2811 Merge.rc:4213
+#: Merge.rc:2629 Merge.rc:2821 Merge.rc:4223
msgid "Codepage"
msgstr "صفحة الترميز"
#. IDD_PROPPAGE_CODEPAGE, IDC_STATIC
-#: Merge.rc:2622
+#: Merge.rc:2632
msgid "Default Codepage"
msgstr "صحفة الترميز الإفتراضي"
#. IDD_PROPPAGE_CODEPAGE, IDC_STATIC
-#: Merge.rc:2623
+#: Merge.rc:2633
msgid "Select the default codepage for non-Unicode files:"
msgstr "تحديد صفحة الترميز الافتراضية عند تحميل ملفات دون ترميز يونيكود:"
#. IDD_PROPPAGE_CODEPAGE, IDC_CP_SYSTEM
-#: Merge.rc:2624
+#: Merge.rc:2634
msgid "System codepage"
msgstr "صحفة الترميز للنظام"
#. IDD_PROPPAGE_CODEPAGE, IDC_CP_UI
-#: Merge.rc:2625
+#: Merge.rc:2635
msgid "According to WinMerge User Interface"
msgstr "حسب واجهة المستخدم لبرنامج WinMerge"
#. IDD_PROPPAGE_CODEPAGE, IDC_CP_CUSTOM
-#: Merge.rc:2626
+#: Merge.rc:2636
msgid "Custom codepage:"
msgstr "صفحة ترميز مخصصة:"
#. IDD_PROPPAGE_CODEPAGE, IDC_DETECT_CODEPAGE
-#: Merge.rc:2628
+#: Merge.rc:2638
msgid "Detect codepage for: .html, .rc, .xml\nRestart required."
msgstr ""
"التحقق من معلومات صفحة الترميز للملفات التالية: .html, .rc, .xml \n"
"هذا الأمر يتطلب إعادة تشغيل الجلسة."
#. IDD_PROPPAGE_CODEPAGE, IDC_DETECT_CODEPAGE2
-#: Merge.rc:2630
+#: Merge.rc:2640
msgid "Detect codepage for files with mlang.dll\nRestart required."
msgstr ""
"التحقق من ترميز الصفحة للملفات النصية باستخدام mlang.dll\n"
"هذا الأمر يتطلب إعادة تشغيل الجلسة."
#. IDS_OPTIONSPG_ARCHIVE
-#: Merge.rc:2638 Merge.rc:4214
+#: Merge.rc:2648 Merge.rc:4224
msgid "Archive Support"
msgstr "دعم الأرشفة"
#. IDD_PROPPAGE_ARCHIVE, IDC_ARCHIVE_ENABLE
-#: Merge.rc:2641
+#: Merge.rc:2651
msgid "&Enable archive file support"
msgstr "ت&فعيل دعم ملفات الأرشفة"
#. IDD_PROPPAGE_ARCHIVE, IDC_ARCHIVE_DETECTTYPE
-#: Merge.rc:2642
+#: Merge.rc:2652
msgid "&Detect archive type from file signature"
msgstr "الت&حقق مكن نوع الإرشيف عبر فحص التوقيع"
#. IDD_PROPPAGE_PROJECT, IDC_STATIC
-#: Merge.rc:2651
+#: Merge.rc:2661
msgid "Items saved to or restored from the project file:"
msgstr ""
#. IDD_SAVECLOSING
-#: Merge.rc:2658
+#: Merge.rc:2668
msgid "Save Modified Files?"
msgstr "حفظ الملفات المعدلة؟"
#. IDD_SAVECLOSING, IDC_SAVECLOSING_LEFTFRAME
-#: Merge.rc:2661
+#: Merge.rc:2671
msgid "Left side file"
msgstr "الملف في الجزء الأيسر"
#. IDD_SAVECLOSING, IDC_SAVECLOSING_SAVELEFT
-#: Merge.rc:2663
+#: Merge.rc:2673
msgid "&Save changes"
msgstr "ح&فظ التغييرات"
#. IDD_SAVECLOSING, IDC_SAVECLOSING_DISCARDLEFT
-#: Merge.rc:2664
+#: Merge.rc:2674
msgid "&Discard changes"
msgstr "ت&جاهل التغييرات"
#. IDD_SAVECLOSING, IDC_SAVECLOSING_MIDDLEFRAME
-#: Merge.rc:2665
+#: Merge.rc:2675
msgid "Middle side file"
msgstr "الملف في الجزء الأوسط"
#. IDD_SAVECLOSING, IDC_SAVECLOSING_SAVEMIDDLE
-#: Merge.rc:2667
+#: Merge.rc:2677
msgid "Sa&ve changes"
msgstr "حفظ التغييرات"
#. IDD_SAVECLOSING, IDC_SAVECLOSING_DISCARDMIDDLE
-#: Merge.rc:2668
+#: Merge.rc:2678
msgid "Discard c&hanges"
msgstr "تجاهل التغييرات"
#. IDD_SAVECLOSING, IDC_SAVECLOSING_RIGHTFRAME
-#: Merge.rc:2669
+#: Merge.rc:2679
msgid "Right side file"
msgstr "الملف في الجهة اليمنى"
#. IDD_SAVECLOSING, IDC_SAVECLOSING_SAVERIGHT
-#: Merge.rc:2671
+#: Merge.rc:2681
msgid "S&ave changes"
msgstr "حفظ التغييرات"
#. IDD_SAVECLOSING, IDC_SAVECLOSING_DISCARDRIGHT
-#: Merge.rc:2672
+#: Merge.rc:2682
msgid "Dis&card changes"
msgstr "تجاهل التغييرات"
#. IDD_SAVECLOSING, IDC_SAVECLOSING_DISCARDALL
-#: Merge.rc:2673
+#: Merge.rc:2683
msgid "Disca&rd All"
msgstr "تجاهل الكل"
#. IDD_DIRCMP_REPORT
-#: Merge.rc:2680
+#: Merge.rc:2690
msgid "Folder Compare Report"
msgstr "تقرير مقارنة المجلدات"
#. IDD_DIRCMP_REPORT, IDC_STATIC
-#: Merge.rc:2683
+#: Merge.rc:2693
msgid "Report &file:"
msgstr "ملف الت&قرير:"
#. IDD_DIRCMP_REPORT, IDC_STATIC
-#: Merge.rc:2686
+#: Merge.rc:2696
msgid "&Style:"
msgstr "الأسل&وب:"
#. IDD_DIRCMP_REPORT, IDC_REPORT_INCLUDEFILECMPREPORT
-#: Merge.rc:2688
+#: Merge.rc:2698
msgid "&Include file compare report"
msgstr "ت&ضمين ملف التقرير الخاص بالمقارنة"
#. IDD_FILTERS_FILEFILTERS_SHARED
-#: Merge.rc:2697
+#: Merge.rc:2707
msgid "Shared or Private Filter"
msgstr "مرشح مشترك أو خاص"
#. IDD_FILTERS_FILEFILTERS_SHARED, IDC_STATIC
-#: Merge.rc:2700
+#: Merge.rc:2710
msgid "What type of filter do you want?"
msgstr "ما هو نوع المرشح الذي تود إنشاءه؟"
#. IDD_FILTERS_FILEFILTERS_SHARED, IDC_SHARED
-#: Merge.rc:2701
+#: Merge.rc:2711
msgid "Shared Filter (for all users)"
msgstr "مرشح مشترك (لكل المستخدمين في هذا الجهاز)"
#. IDD_FILTERS_FILEFILTERS_SHARED, IDC_PRIVATE
-#: Merge.rc:2702
+#: Merge.rc:2712
msgid "Private Filter (current user only)"
msgstr "مرشح خاص (للمستخدم الحالي فقط)"
#. IDD_COMPARE_STATISTICS3
-#: Merge.rc:2709 Merge.rc:2750
+#: Merge.rc:2719 Merge.rc:2760
msgid "Compare Statistics"
msgstr "إحصائيات المقارنة"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2712 Merge.rc:2753
+#: Merge.rc:2722 Merge.rc:2763
msgid "Folders:"
msgstr "المجلدات:"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2713 Merge.rc:2754
+#: Merge.rc:2723 Merge.rc:2764
msgid "Files:"
msgstr "الملفات:"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2719 Merge.rc:2738 Merge.rc:2760 Merge.rc:2799
+#: Merge.rc:2729 Merge.rc:2748 Merge.rc:2770 Merge.rc:2809
msgid "Binary:"
msgstr "ثنائي:"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2722 Merge.rc:2763
+#: Merge.rc:2732 Merge.rc:2773
msgid "Unique"
msgstr "فريد"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2723 Merge.rc:2764
+#: Merge.rc:2733 Merge.rc:2774
msgid "Left:"
msgstr "يسار:"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2728 Merge.rc:2774
+#: Merge.rc:2738 Merge.rc:2784
msgid "Right:"
msgstr "يمين:"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2742 Merge.rc:2803
+#: Merge.rc:2752 Merge.rc:2813
msgid "Total:"
msgstr "الإجمالي:"
#. IDD_COMPARE_STATISTICS3, IDOK
-#: Merge.rc:2745 Merge.rc:2806
+#: Merge.rc:2755 Merge.rc:2816
msgid "Close"
msgstr "إغلاق"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2769
+#: Merge.rc:2779
msgid "Middle:"
msgstr "وسط:"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2779
+#: Merge.rc:2789
msgid "Missing Left:"
msgstr "مفقود في الجزء الأيسر:"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2784
+#: Merge.rc:2794
msgid "Missing Middle:"
msgstr "مفقود في في الجزء الأوسط:"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2789
+#: Merge.rc:2799
msgid "Missing Right:"
msgstr "مفقود في الجزء الأيمن:"
#. IDD_LOAD_SAVE_CODEPAGE, IDC_AFFECTS_GROUP
-#: Merge.rc:2814
+#: Merge.rc:2824
msgid "Affects"
msgstr "يؤثر على"
#. IDD_LOAD_SAVE_CODEPAGE, IDC_RIGHT_FILES_LABEL
-#: Merge.rc:2816 Merge.rc:2818 Merge.rc:2820
+#: Merge.rc:2826 Merge.rc:2828 Merge.rc:2830
msgid "(Affects)"
msgstr "(يؤثر على)"
#. IDD_LOAD_SAVE_CODEPAGE, IDC_LOADING_GROUP
-#: Merge.rc:2821
+#: Merge.rc:2831
msgid "Select Codepage for"
msgstr "تحديد صفحة الترميز"
#. IDD_LOAD_SAVE_CODEPAGE, IDC_LOAD_FILES_LABEL
-#: Merge.rc:2822
+#: Merge.rc:2832
msgid "&File Loading:"
msgstr "ت&حميل ملف:"
#. IDD_LOAD_SAVE_CODEPAGE, IDC_SAVE_FILES_LABEL
-#: Merge.rc:2824
+#: Merge.rc:2834
msgid "File &Saving:"
msgstr "ح&فظ الملف:"
#. IDD_LOAD_SAVE_CODEPAGE, IDC_LOAD_SAVE_SAME_CODEPAGE
-#: Merge.rc:2827
+#: Merge.rc:2837
msgid "&Use same codepage for both"
msgstr "استخدام صفحة الترميز لكليهما"
#. IDS_MESSAGEBOX_CANCEL
-#: Merge.rc:2830 Merge.rc:4172
+#: Merge.rc:2840 Merge.rc:4182
msgid "&Cancel"
msgstr "إل&غاء"
#. IDD_FILTERS_FILEFILTERS_TEST
-#: Merge.rc:2835
+#: Merge.rc:2845
msgid "Test Filter"
msgstr "فحص المرشح"
#. IDD_FILTERS_FILEFILTERS_TEST, IDC_HEADER
-#: Merge.rc:2838
+#: Merge.rc:2848
msgid "Testing filter:"
msgstr "يتم فحص المرشح:"
#. IDD_FILTERS_FILEFILTERS_TEST, IDC_PROMPT_LABEL
-#: Merge.rc:2840
+#: Merge.rc:2850
msgid "&Enter text to test:"
msgstr "إدخال ا&لنص للفحص:"
#. IDD_FILTERS_FILEFILTERS_TEST, IDC_IS_DIRECTORY
-#: Merge.rc:2842
+#: Merge.rc:2852
msgid "&Folder Name"
msgstr "اسم ال&مجلد"
#. IDD_FILTERS_FILEFILTERS_TEST, IDC_STATIC
-#: Merge.rc:2843
+#: Merge.rc:2853
msgid "Result:"
msgstr "النتيجة:"
#. IDD_FILTERS_FILEFILTERS_TEST, IDC_TEST_BTN
-#: Merge.rc:2845
+#: Merge.rc:2855
msgid "&Test"
msgstr "الا&ختبار"
#. IDS_OPTIONSPG_TABLECOMPARE
-#: Merge.rc:2851 Merge.rc:2990 Merge.rc:4228
+#: Merge.rc:2861 Merge.rc:3000 Merge.rc:4238
msgid "Table"
msgstr ""
#. IDD_OPEN_TABLE, IDC_STATIC
-#: Merge.rc:2854
+#: Merge.rc:2864
msgid "File type"
msgstr ""
#. IDD_OPEN_TABLE, IDC_COMPARETABLE_CSV
-#: Merge.rc:2855
+#: Merge.rc:2865
msgid "&CSV"
msgstr ""
#. IDD_OPEN_TABLE, IDC_COMPARETABLE_TSV
-#: Merge.rc:2856
+#: Merge.rc:2866
msgid "&TSV"
msgstr ""
#. IDD_OPEN_TABLE, IDC_COMPARETABLE_DSV
-#: Merge.rc:2857
+#: Merge.rc:2867
msgid "Custom &Delimiter-Separated Values"
msgstr ""
#. IDD_PROPPAGE_COMPARE_TABLE, IDC_STATIC
-#: Merge.rc:2859 Merge.rc:2861 Merge.rc:2996 Merge.rc:3004
+#: Merge.rc:2869 Merge.rc:2871 Merge.rc:3006 Merge.rc:3014
msgid "D&elimiter character:"
msgstr ""
#. IDD_PROPPAGE_COMPARE_TABLE, IDC_COMPARETABLE_ALLOWNEWLINE
-#: Merge.rc:2863 Merge.rc:3006
+#: Merge.rc:2873 Merge.rc:3016
msgid "&Allow newlines in quotes"
msgstr ""
#. IDD_PROPPAGE_COMPARE_TABLE, IDC_STATIC
-#: Merge.rc:2865 Merge.rc:3008
+#: Merge.rc:2875 Merge.rc:3018
msgid "&Quote character:"
msgstr ""
#. IDS_OPTIONSPG_BACKUPS
-#: Merge.rc:2873 Merge.rc:4216
+#: Merge.rc:2883 Merge.rc:4226
msgid "Backup Files"
msgstr "ملفات النسخ الاحتياطي"
#. IDD_PROPPAGE_BACKUPS, IDC_STATIC
-#: Merge.rc:2876
+#: Merge.rc:2886
msgid "Create backup files for:"
msgstr "إنشاء ملفات نسخ احتياطي في:"
#. IDD_PROPPAGE_BACKUPS, IDC_BACKUP_FOLDERCMP
-#: Merge.rc:2877
+#: Merge.rc:2887
msgid "&Folder compare"
msgstr "&مقارنة المجلدات"
#. IDD_PROPPAGE_BACKUPS, IDC_BACKUP_FILECMP
-#: Merge.rc:2878
+#: Merge.rc:2888
msgid "Fil&e compare"
msgstr "م&قارنة الملفات"
#. IDD_PROPPAGE_BACKUPS, IDC_STATIC
-#: Merge.rc:2879
+#: Merge.rc:2889
msgid "Create backup files in:"
msgstr "إنشاء ملفات احتياطية في:"
#. IDD_PROPPAGE_BACKUPS, IDC_BACKUP_ORIGFOLD
-#: Merge.rc:2880
+#: Merge.rc:2890
msgid "&Original file's folder"
msgstr "المج&لد الأصلي للملف"
#. IDD_PROPPAGE_BACKUPS, IDC_BACKUP_GLOBALFOLD
-#: Merge.rc:2881
+#: Merge.rc:2891
msgid "&Global backup folder:"
msgstr "المجل&د الشامل للنسخ الاحتياطي:"
#. IDD_PROPPAGE_BACKUPS, IDC_STATIC
-#: Merge.rc:2884
+#: Merge.rc:2894
msgid "Backup filename:"
msgstr "اسم ملف النسخ الاحتياطي:"
#. IDD_PROPPAGE_BACKUPS, IDC_BACKUP_APPEND_BAK
-#: Merge.rc:2885
+#: Merge.rc:2895
msgid "&Append .bak extension"
msgstr "إلح&ق إمتداد .bak للملف"
#. IDD_PROPPAGE_BACKUPS, IDC_BACKUP_APPEND_TIME
-#: Merge.rc:2886
+#: Merge.rc:2896
msgid "A&ppend timestamp"
msgstr "إلحق الطابع ال&زمني للملف"
#. IDS_CONFIRM_COPY_CAPTION
-#: Merge.rc:2892 Merge.rc:4565
+#: Merge.rc:2902 Merge.rc:4575
msgid "Confirm Copy"
msgstr "تأكيد النسخ"
#. IDD_CONFIRM_COPY, IDC_FLDCONFIRM_QUERY
-#: Merge.rc:2896
+#: Merge.rc:2906
msgid "Are you sure you want to copy XXX items?"
msgstr "هل أنت متأكد برغبتك في نسخ XXX عنصر؟"
#. IDD_CONFIRM_COPY, IDC_FLDCONFIRM_FROM_TEXT
-#: Merge.rc:2897
+#: Merge.rc:2907
msgid "From left"
msgstr "من اليسار"
#. IDD_CONFIRM_COPY, IDC_FLDCONFIRM_TO_TEXT
-#: Merge.rc:2899
+#: Merge.rc:2909
msgid "To right"
msgstr "من اليمين"
#. IDS_MESSAGEBOX_DONT_ASK_AGAIN
-#: Merge.rc:2901 Merge.rc:4191
+#: Merge.rc:2911 Merge.rc:4201
msgid "Don't ask this &question again."
msgstr "لا ت&سأل هذا السؤال مجددا."
#. IDD_CONFIRM_COPY, IDYES
-#: Merge.rc:2903
+#: Merge.rc:2913
msgid "Yes"
msgstr "نعم"
#. IDD_CONFIRM_COPY, IDNO
-#: Merge.rc:2904
+#: Merge.rc:2914
msgid "No"
msgstr "لا"
#. IDS_PROJECT_ITEM_PLUGIN
-#: Merge.rc:2909 Merge.rc:4323
+#: Merge.rc:2919 Merge.rc:4333
msgid "Plugins"
msgstr "الإضافات"
#. IDD_PLUGINS_LIST, IDC_PLUGINS_ENABLE
-#: Merge.rc:2912
+#: Merge.rc:2922
msgid "&Enable plugins"
msgstr "تفعيل الإضافات"
#. IDD_PLUGINS_EDITPLUGIN, IDC_STATIC
-#: Merge.rc:2913 Merge.rc:3113
+#: Merge.rc:2923 Merge.rc:3123
msgid "Plugin &type:"
msgstr ""
#. IDD_PLUGINS_LIST, IDC_STATIC
-#: Merge.rc:2916
+#: Merge.rc:2926
msgid "File filters:"
msgstr ""
#. IDD_PLUGINS_LIST, IDC_STATIC
-#: Merge.rc:2918
+#: Merge.rc:2928
msgid "&Plugin arguments:"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_AUTOMATIC
-#: Merge.rc:2920 Merge.rc:3134
+#: Merge.rc:2930 Merge.rc:3144
msgid "Enable &automatic unpacking/prediffing"
msgstr ""
#. IDS_OPTIONSPG_SHELL
-#: Merge.rc:2934 Merge.rc:4217
+#: Merge.rc:2944 Merge.rc:4227
msgid "Shell Integration"
msgstr "دمج الطرفية"
#. IDD_PROPPAGE_SHELL, IDC_STATIC
-#: Merge.rc:2937
+#: Merge.rc:2947
msgid "Explorer"
msgstr "المستكشف"
#. IDD_PROPPAGE_SHELL, IDC_EXPLORER_CONTEXT
-#: Merge.rc:2938
+#: Merge.rc:2948
msgid "&Add to context menu"
msgstr "الإ&ضافة للقائمة المنزلقة"
#. IDD_PROPPAGE_SHELL, IDC_EXPLORER_ADVANCED
-#: Merge.rc:2939
+#: Merge.rc:2949
msgid "E&nable advanced menu"
msgstr "تفعيل القائمة المتقدمة"
#. IDD_PROPPAGE_SHELL, IDC_EXPLORER_COMPARE_AS
-#: Merge.rc:2940
+#: Merge.rc:2950
msgid "Enable &Compare As menu"
msgstr ""
#. IDD_PROPPAGE_SHELL, IDC_REGISTER_SHELLEXTENSION
-#: Merge.rc:2941
+#: Merge.rc:2951
msgid "&Register Shell Extension"
msgstr "ت&سجيل امتداد الطرفية"
#. IDD_PROPPAGE_SHELL, IDC_UNREGISTER_SHELLEXTENSION
-#: Merge.rc:2942
+#: Merge.rc:2952
msgid "&Unregister Shell Extension"
msgstr "&عدم تسجيل امتداد الطرفية"
#. IDD_PROPPAGE_SHELL, IDC_REGISTER_SHELLEXTENSION_PERUSER
-#: Merge.rc:2943
+#: Merge.rc:2953
msgid "Register Shell Extension for Current User &Only"
msgstr "تسجيل امتداد الطرفية للمست&خدم الحالي فقط"
#. IDD_PROPPAGE_SHELL, IDC_UNREGISTER_SHELLEXTENSION_PERUSER
-#: Merge.rc:2944
+#: Merge.rc:2954
msgid "Unregister Shell Extension for Current User On&ly"
msgstr "عدم تسجيل امتداد الطرفية للمستخدم الحالي &فقط"
#. IDD_PROPPAGE_SHELL, IDC_REGISTER_WINMERGECONTEXTMENU
-#: Merge.rc:2945
+#: Merge.rc:2955
msgid "Register Shell Extension for &Windows 11"
msgstr ""
#. IDD_PROPPAGE_SHELL, IDC_UNREGISTER_WINMERGECONTEXTMENU
-#: Merge.rc:2946
+#: Merge.rc:2956
msgid "Unregister Shell Extension for W&indows 11"
msgstr ""
#. IDD_PROPPAGE_SHELL, IDC_STATIC
-#: Merge.rc:2947
+#: Merge.rc:2957
msgid "Jump List"
msgstr ""
#. IDD_PROPPAGE_SHELL, IDC_CLEAR_ALL_RECENT_ITEMS
-#: Merge.rc:2949
+#: Merge.rc:2959
msgid "Clear all recent items"
msgstr ""
#. IDS_OPTIONSPG_FOLDERCOMPARE
-#: Merge.rc:2954 Merge.rc:4225
+#: Merge.rc:2964 Merge.rc:4235
msgctxt "Options dialog|Categories"
msgid "Folder"
msgstr "المجلد"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC
-#: Merge.rc:2957
+#: Merge.rc:2967
msgid "&Compare method:"
msgstr "آلية المقارنة"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_COMPARE_STOPFIRST
-#: Merge.rc:2959
+#: Merge.rc:2969
msgid "S&top after first difference"
msgstr "&توقف بعد إيجاد الاختلاف الأول"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_IGNORE_SMALLTIMEDIFF
-#: Merge.rc:2961
+#: Merge.rc:2971
msgid "Ign&ore time differences less than 3 seconds"
msgstr "ت&جاهل الاختلاف في الوقت في حال كان أقل من 3 ثواني"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC
-#: Merge.rc:2964
+#: Merge.rc:2974
msgid "Expand subfolders &after comparison:"
msgstr ""
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_COMPARE_WALKSUBDIRS
-#: Merge.rc:2966
+#: Merge.rc:2976
msgid "Include &unique subfolders contents"
msgstr "إ&دراج محتويات المجلدات الفرعية الفريدة"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_IGNORE_REPARSEPOINTS
-#: Merge.rc:2968
+#: Merge.rc:2978
msgid "Ignore &reparse points"
msgstr "تجا&هل إعادة توزيع النقاط"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC
-#: Merge.rc:2969
+#: Merge.rc:2979
msgid "Switch to &quick compare when size exceeds (MB):"
msgstr ""
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC
-#: Merge.rc:2971
+#: Merge.rc:2981
msgid "Switch to &binary compare when size exceeds (MB):"
msgstr ""
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC
-#: Merge.rc:2975
+#: Merge.rc:2985
msgid "Additional comparison condi&tions:"
msgstr ""
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC
-#: Merge.rc:2978
+#: Merge.rc:2988
msgid "&Rename/move detection:"
msgstr ""
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC
-#: Merge.rc:2980
+#: Merge.rc:2990
msgid "Rename/move detection &keys:"
msgstr ""
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC
-#: Merge.rc:2983
+#: Merge.rc:2993
msgid "M&erge renames and moves:"
msgstr ""
#. IDD_PROPPAGE_COMPARE_TABLE, IDC_STATIC
-#: Merge.rc:2994 Merge.rc:2999 Merge.rc:3002
+#: Merge.rc:3004 Merge.rc:3009 Merge.rc:3012
msgid "File patterns:"
msgstr ""
#. IDD_PROPPAGE_COMPARE_TABLE, IDC_STATIC
-#: Merge.rc:3001
+#: Merge.rc:3011
msgid "Custom Delimiter-Separated Values"
msgstr ""
#. IDS_OPTIONSPG_BINARYCOMPARE
-#: Merge.rc:3015 Merge.rc:4227
+#: Merge.rc:3025 Merge.rc:4237
msgctxt "Options dialog|Categories"
msgid "Binary"
msgstr "ثنائي"
#. IDD_PROPPAGE_COMPARE_BINARY, IDC_STATIC
-#: Merge.rc:3018
+#: Merge.rc:3028
msgid "Binary file &patterns:"
msgstr "أنماط الملف الثنائي:"
#. IDD_PROPPAGE_COMPARE_BINARY, IDC_STATIC
-#: Merge.rc:3020
+#: Merge.rc:3030
msgid "Frhed settings"
msgstr "إعدادات المحرر Frhed"
#. IDD_PROPPAGE_COMPARE_BINARY, IDC_COMPAREBINARY_VIEWSETTINGS
-#: Merge.rc:3021
+#: Merge.rc:3031
msgid "View &Settings..."
msgstr "&عرض الإعدادات..."
#. IDD_PROPPAGE_COMPARE_BINARY, IDC_COMPAREBINARY_BINARYMODE
-#: Merge.rc:3022
+#: Merge.rc:3032
msgid "&Binary Mode..."
msgstr "ال&وضع الثنائي..."
#. IDD_PROPPAGE_COMPARE_BINARY, IDC_COMPAREBINARY_CHARACTERSET
-#: Merge.rc:3023
+#: Merge.rc:3033
msgid "&Character Set..."
msgstr "&مجموعة الرموز..."
#. IDS_PRPCAT_IMAGE
-#: Merge.rc:3029 Merge.rc:4226 Merge.rc:4665
+#: Merge.rc:3039 Merge.rc:4236 Merge.rc:4675
msgid "Image"
msgstr "صورة"
#. IDD_PROPPAGE_COMPARE_IMAGE, IDC_STATIC
-#: Merge.rc:3032
+#: Merge.rc:3042
msgid "Image file &patterns:"
msgstr "أ&نماط ملف الصور:"
#. IDD_PROPPAGE_COMPARE_IMAGE, IDC_ENABLE_IMGCMP_IN_DIRCMP
-#: Merge.rc:3034
+#: Merge.rc:3044
msgid "&Enable image compare in folder compare"
msgstr ""
#. IDD_PROPPAGE_COMPARE_IMAGE, IDC_STATIC
-#: Merge.rc:3036
+#: Merge.rc:3046
msgid "OCR result:"
msgstr ""
#. IDS_OPTIONSPG_WEBPAGECOMPARE
-#: Merge.rc:3043 Merge.rc:4229
+#: Merge.rc:3053 Merge.rc:4239
msgid "Webpage"
msgstr ""
#. IDD_PROPPAGE_COMPARE_WEBPAGE, IDC_STATIC
-#: Merge.rc:3046
+#: Merge.rc:3056
msgid "URL pattern to &include (Regular expression):"
msgstr ""
#. IDD_PROPPAGE_COMPARE_WEBPAGE, IDC_STATIC
-#: Merge.rc:3048
+#: Merge.rc:3058
msgid "URL pattern to &exclude (Regular expression):"
msgstr ""
#. IDD_PROPPAGE_COMPARE_WEBPAGE, IDC_STATIC
-#: Merge.rc:3050
+#: Merge.rc:3060
msgid "&User data folder location:"
msgstr ""
#. IDD_PROPPAGE_COMPARE_WEBPAGE, IDC_COMPAREWEBPAGE_USERDATAFOLDER_PERPANE
-#: Merge.rc:3052
+#: Merge.rc:3062
msgid "&Separate user data folders for each pane"
msgstr ""
#. IDD_ENCODINGERROR, IDC_HEXVIEW
-#: Merge.rc:3065
+#: Merge.rc:3075
msgid "&Hex View"
msgstr "ع&رض بصيغة نظام عد ستة عشري"
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3110
+#: Merge.rc:3120
msgid "Edit Plugin"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN, IDC_STATIC
-#: Merge.rc:3123
+#: Merge.rc:3133
msgid "&Category:"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_MENUCAPTION_STATIC
-#: Merge.rc:3125
+#: Merge.rc:3135
msgid "&Menu caption:"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_WINDOWTYPE_STATIC
-#: Merge.rc:3127
+#: Merge.rc:3137
msgid "&Window type:"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_UNPACKEDFILEEXTENSION_STATIC
-#: Merge.rc:3132
+#: Merge.rc:3142
msgid "&Unpacked file extension:"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_ARGUMENTSREQUIRED
-#: Merge.rc:3136
+#: Merge.rc:3146
msgid "&Require arguments"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_GENERATESCRIPT
-#: Merge.rc:3137
+#: Merge.rc:3147
msgid "&Generate editor script"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_COMMAND_LINE_STATIC
-#: Merge.rc:3140
+#: Merge.rc:3150
msgid "Command &line:"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_SCRIPT_FILEEXTENSION_STATIC
-#: Merge.rc:3143
+#: Merge.rc:3153
msgid "&Script file extension:"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_SCRIPT_BODY_STATIC
-#: Merge.rc:3145
+#: Merge.rc:3155
msgid "Script &body:"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3154
+#: Merge.rc:3164
msgid "Font"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3157
+#: Merge.rc:3167
msgid "&Font:"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3163
+#: Merge.rc:3173
msgid "Font st&yle:"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3169
+#: Merge.rc:3179
msgid "&Size:"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3175
+#: Merge.rc:3185
msgid "Effects"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3176
+#: Merge.rc:3186
msgid "Stri&keout"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3177
+#: Merge.rc:3187
msgid "&Underline"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3179
+#: Merge.rc:3189
msgid "&Color:"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3184
+#: Merge.rc:3194
msgid "Sample"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3185
+#: Merge.rc:3195
msgid "AaBbYyZz"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3189
+#: Merge.rc:3199
msgid "Sc&ript:"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN, IDC_MANAGE_LINK
-#: Merge.rc:3194
+#: Merge.rc:3204
msgid "Show more fonts"
msgstr ""
#. ID_INDICATOR_EXT
-#: Merge.rc:4118
+#: Merge.rc:4128
msgid "EXT"
msgstr "EXT"
#. ID_INDICATOR_CAPS
-#: Merge.rc:4119
+#: Merge.rc:4129
msgid "CAP"
msgstr "CAP"
#. ID_INDICATOR_NUM
-#: Merge.rc:4120
+#: Merge.rc:4130
msgid "NUM"
msgstr "NUM"
#. ID_INDICATOR_SCRL
-#: Merge.rc:4121
+#: Merge.rc:4131
msgid "SCRL"
msgstr "SCRL"
#. ID_INDICATOR_OVR
-#: Merge.rc:4122
+#: Merge.rc:4132
msgid "OVR"
msgstr "OVR"
#. ID_INDICATOR_REC
-#: Merge.rc:4123
+#: Merge.rc:4133
msgid "REC"
msgstr "REC"
#. ID_FILE_NEW
-#: Merge.rc:4129
+#: Merge.rc:4139
msgid ""
"\n"
"New Documents (Ctrl+N)"
@@ -4866,7 +4877,7 @@ msgstr ""
"مستندات جديدة (Ctrl+N)"
#. ID_FILE_OPEN
-#: Merge.rc:4130
+#: Merge.rc:4140
msgid ""
"\n"
"Open (Ctrl+O)"
@@ -4875,7 +4886,7 @@ msgstr ""
"فتح(Ctrl+O)"
#. ID_FILE_SAVE
-#: Merge.rc:4131
+#: Merge.rc:4141
msgid ""
"\n"
"Save (Ctrl+S)"
@@ -4884,27 +4895,27 @@ msgstr ""
"حفظ (Ctrl+S)"
#. IDS_UNK_ERROR_READING_PROJECT
-#: Merge.rc:4137
+#: Merge.rc:4147
msgid "Unknown error opening project file."
msgstr "خطأ غير معروف أثناء محاولة فتح ملف المشروع."
#. IDS_UNK_ERROR_SAVING_PROJECT
-#: Merge.rc:4138
+#: Merge.rc:4148
msgid "Unknown error saving project file."
msgstr "خطأ غير معروف أثناء محاولة حفظ ملف المشروع."
#. IDS_PROJFILE_LOAD_SUCCESS
-#: Merge.rc:4143
+#: Merge.rc:4153
msgid "Project file loaded."
msgstr "تم تحميل ملف المشروع بنجاح."
#. IDS_PROJFILE_SAVE_SUCCESS
-#: Merge.rc:4144
+#: Merge.rc:4154
msgid "Project file saved."
msgstr "تم حفظ ملف المشروع بنجاح."
#. ID_EDIT_UNDO
-#: Merge.rc:4150
+#: Merge.rc:4160
msgid ""
"\n"
"Undo (Ctrl+Z)"
@@ -4913,7 +4924,7 @@ msgstr ""
"تراجع (Ctrl+Z)"
#. ID_EDIT_REDO
-#: Merge.rc:4151
+#: Merge.rc:4161
msgid ""
"\n"
"Redo (Ctrl+Y)"
@@ -4922,7 +4933,7 @@ msgstr ""
"إعادة الأمر"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:4158
+#: Merge.rc:4168
msgid ""
"\n"
"FileCompare\n"
@@ -4941,7 +4952,7 @@ msgstr ""
"مقارنة الملف عبر WinMerge"
#. IDR_DIRDOCTYPE
-#: Merge.rc:4159
+#: Merge.rc:4169
msgid ""
"\n"
"FolderCompare\n"
@@ -4960,7 +4971,7 @@ msgstr ""
"مقارنة المجلد عبر WinMerge"
#. IDS_SPLASH_GPLTEXT
-#: Merge.rc:4165
+#: Merge.rc:4175
msgid "WinMerge comes with ABSOLUTELY NO WARRANTY. It is free software and can be redistributed under the conditions of the GNU General Public License - see the Help menu for details."
msgstr ""
"برنامج WinMerge يأتي بدون أي ضمانات تماما. هذا برنامج مجاني ويسمح لك إعادة "
@@ -4968,157 +4979,157 @@ msgstr ""
"لمعرفة المزيد."
#. IDS_MESSAGEBOX_ABORT
-#: Merge.rc:4173
+#: Merge.rc:4183
msgid "&Abort"
msgstr "إل&غاء"
#. IDS_MESSAGEBOX_RETRY
-#: Merge.rc:4174
+#: Merge.rc:4184
msgid "&Retry"
msgstr "إعادة ال&محاولة"
#. IDS_MESSAGEBOX_IGNORE
-#: Merge.rc:4175
+#: Merge.rc:4185
msgid "&Ignore"
msgstr "ت&جاهل"
#. IDS_MESSAGEBOX_IGNOREALL
-#: Merge.rc:4176
+#: Merge.rc:4186
msgid "Ignore &all"
msgstr "تجا&هل الكل"
#. IDS_MESSAGEBOX_YES
-#: Merge.rc:4177
+#: Merge.rc:4187
msgid "&Yes"
msgstr "&نعم"
#. IDS_MESSAGEBOX_YES_TO_ALL
-#: Merge.rc:4183
+#: Merge.rc:4193
msgid "Yes to &all"
msgstr "ن&عم للكل"
#. IDS_MESSAGEBOX_NO
-#: Merge.rc:4184
+#: Merge.rc:4194
msgid "&No"
msgstr "&لا"
#. IDS_MESSAGEBOX_NO_TO_ALL
-#: Merge.rc:4185
+#: Merge.rc:4195
msgid "No to a&ll"
msgstr "لا لل&كل"
#. IDS_MESSAGEBOX_CONTINUE
-#: Merge.rc:4186
+#: Merge.rc:4196
msgid "&Continue"
msgstr "ا&ستمرار"
#. IDS_MESSAGEBOX_SKIP
-#: Merge.rc:4187
+#: Merge.rc:4197
msgid "&Skip"
msgstr "تخ&طي"
#. IDS_MESSAGEBOX_SKIPALL
-#: Merge.rc:4188
+#: Merge.rc:4198
msgid "Skip &all"
msgstr "تخط&ي الكل"
#. IDS_MESSAGEBOX_DONT_DISPLAY_AGAIN
-#: Merge.rc:4190
+#: Merge.rc:4200
msgid "Don't display this &message again."
msgstr "لا تع&رض هذه الرسالة مجددا."
-#: Merge.rc:4193
+#: Merge.rc:4203
msgid "To make this message box visible, press Reset on the Message Boxes page in Options."
msgstr ""
#. IDS_OPTIONSPG_EDITOR_COMPAREMERGE
-#: Merge.rc:4203
+#: Merge.rc:4213
msgid "Compare/Merge"
msgstr ""
#. IDS_OPTIONSPG_SYNTAXCOLORS
-#: Merge.rc:4204 Merge.rc:4208
+#: Merge.rc:4214 Merge.rc:4218
msgid "Syntax"
msgstr "اللغة"
#. IDS_OPTIONSPG_COLOR_SCHEMES
-#: Merge.rc:4206
+#: Merge.rc:4216
msgid "Color Schemes"
msgstr ""
#. IDS_OPTIONSPG_DIRCOLORS
-#: Merge.rc:4210
+#: Merge.rc:4220
msgid "Folder Compare"
msgstr "مقارنة المجلد"
#. IDS_OPTIONSPG_PROJECT
-#: Merge.rc:4215
+#: Merge.rc:4225
msgid "Project"
msgstr ""
#. IDS_COLHDR_NSDIFFS
-#: Merge.rc:4218 Merge.rc:4640
+#: Merge.rc:4228 Merge.rc:4650
msgid "Differences"
msgstr "الاختلافات"
#. IDS_OPTIONSPG_MESSAGEBOXES
-#: Merge.rc:4220
+#: Merge.rc:4230
msgid "Message Boxes"
msgstr ""
#. IDS_TO
-#: Merge.rc:4235
+#: Merge.rc:4245
msgid "To:"
msgstr "إلى:"
#. IDS_FROM_LEFT
-#: Merge.rc:4236
+#: Merge.rc:4246
msgid "From left:"
msgstr "من اليسار:"
#. IDS_TO_LEFT
-#: Merge.rc:4237
+#: Merge.rc:4247
msgid "To left:"
msgstr "إلى اليسار:"
#. IDS_FROM_RIGHT
-#: Merge.rc:4238
+#: Merge.rc:4248
msgid "From right:"
msgstr "من اليمين:"
#. IDS_TO_RIGHT
-#: Merge.rc:4239
+#: Merge.rc:4249
msgid "To right:"
msgstr "إلى اليمين:"
#. IDS_FROM_MIDDLE
-#: Merge.rc:4240
+#: Merge.rc:4250
msgid "From middle:"
msgstr ""
#. IDS_TO_MIDDLE
-#: Merge.rc:4241
+#: Merge.rc:4251
msgid "To middle:"
msgstr ""
#. IDS_VERSION_FMT
-#: Merge.rc:4247
+#: Merge.rc:4257
#, c-format
msgid "Version %1"
msgstr "النسخة %1"
#. IDS_OPTIONS_TITLE
-#: Merge.rc:4253
+#: Merge.rc:4263
#, c-format
msgid "Options (%1)"
msgstr "الخيارات (%1)"
#. IDS_MESSAGE_BOX_ARE_RESET
-#: Merge.rc:4254
+#: Merge.rc:4264
msgid "All message boxes are now displayed again."
msgstr "سيتم عرض كل مربعات الرسائل مجددا."
-#: Merge.rc:4256
+#: Merge.rc:4266
#, c-format
msgid "Tab size value is out of range. Please use 1 - %1."
msgstr ""
@@ -5127,37 +5138,37 @@ msgstr ""
"يرجى استخدام قيم في نطاق 1 - %1."
#. IDS_PROJECT_OPEN
-#: Merge.rc:4262 Merge.rc:4318
+#: Merge.rc:4272 Merge.rc:4328
msgid "Open"
msgstr "فتح"
#. IDS_PROGRAMFILES
-#: Merge.rc:4263
+#: Merge.rc:4273
msgid "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||"
msgstr "البرامج|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||"
#. IDS_ALLFILES
-#: Merge.rc:4264
+#: Merge.rc:4274
msgid "All Files (*.*)|*.*||"
msgstr "كل الملفات (*.*)|*.*||"
#. IDS_PROJECTFILES
-#: Merge.rc:4265
+#: Merge.rc:4275
msgid "WinMerge Project Files (*.WinMerge)|*.WinMerge||"
msgstr "ملفات مشاريع WinMerge (*.WinMerge)|*.WinMerge||"
#. IDS_INIFILES
-#: Merge.rc:4267
+#: Merge.rc:4277
msgid "Options files (*.ini)|*.ini|All Files (*.*)|*.*||"
msgstr "ملفات الخيارات (*.ini)|*.ini|All Files (*.*)|*.*||"
#. IDS_REPLACELIST_FILES
-#: Merge.rc:4268
+#: Merge.rc:4278
msgid "Tab-Separated Values (*.tsv;*.txt)|*.tsv;*.txt|All Files (*.*)|*.*||"
msgstr ""
#. IDS_TEXT_REPORT_FILES
-#: Merge.rc:4274
+#: Merge.rc:4284
msgid ""
"Text Files (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|All Files (*.*)|"
"*.*||"
@@ -5166,126 +5177,126 @@ msgstr ""
"(*.*)|*.*||"
#. IDS_HTML_REPORT_FILES
-#: Merge.rc:4275
+#: Merge.rc:4285
msgid "HTML Files (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||"
msgstr "ملفات HTML (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||"
#. IDS_XML_REPORT_FILES
-#: Merge.rc:4276
+#: Merge.rc:4286
msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||"
msgstr "ملفات XML (*.xml)|*.xml|All Files (*.*)|*.*||"
#. IDS_EXPANDSUBDIRS_DONOTEXPAND
-#: Merge.rc:4294
+#: Merge.rc:4304
msgid "Do not expand"
msgstr ""
#. IDS_EXPANDSUBDIRS_ALL
-#: Merge.rc:4295
+#: Merge.rc:4305
msgid "Expand all subfolders"
msgstr ""
#. IDS_EXPANDSUBDIRS_DIFFERENT
-#: Merge.rc:4296
+#: Merge.rc:4306
msgid "Expand different subfolders"
msgstr ""
#. IDS_EXPANDSUBDIRS_IDENTICAL
-#: Merge.rc:4297
+#: Merge.rc:4307
msgid "Expand identical subfolders"
msgstr ""
#. IDS_SYNTAXTABLE_FILETYPE
-#: Merge.rc:4303
+#: Merge.rc:4313
msgid "File Type"
msgstr ""
#. IDS_COLHDR_EXTENSION
-#: Merge.rc:4304 Merge.rc:4597
+#: Merge.rc:4314 Merge.rc:4607
msgid "Extension"
msgstr "الإمتداد"
#. IDS_PRPCAT_MESSAGE
-#: Merge.rc:4310 Merge.rc:4669
+#: Merge.rc:4320 Merge.rc:4679
msgid "Message"
msgstr ""
#. IDS_MESSAGEBOX_ANSWER
-#: Merge.rc:4311
+#: Merge.rc:4321
msgid "Answer"
msgstr ""
#. IDS_PROJECT_ITEM
-#: Merge.rc:4317
+#: Merge.rc:4327
msgid "Item"
msgstr ""
#. IDS_PROJECT_LOAD
-#: Merge.rc:4319
+#: Merge.rc:4329
msgid "Load"
msgstr ""
#. IDS_PROJECT_SAVE
-#: Merge.rc:4320
+#: Merge.rc:4330
msgid "Save"
msgstr ""
#. IDS_PROJECT_ITEM_INCLUDE_SUBFOLDERS
-#: Merge.rc:4322
+#: Merge.rc:4332
msgid "Include Subfolders"
msgstr ""
#. IDS_PROJECT_ITEM_COMPARE_OPTIONS
-#: Merge.rc:4324
+#: Merge.rc:4334
msgid "Compare Options"
msgstr ""
#. IDS_PROJECT_ITEM_HIDDEN_ITEMS
-#: Merge.rc:4325
+#: Merge.rc:4335
msgid "Hidden Items"
msgstr ""
#. IDS_PLUGINSLIST_NAME
-#: Merge.rc:4331 Merge.rc:4956
+#: Merge.rc:4341 Merge.rc:4966
msgid "Name"
msgstr "الاسم"
#. IDS_FILTERFILE_PATHTITLE
-#: Merge.rc:4332
+#: Merge.rc:4342
msgid "Location"
msgstr "الموقع"
#. IDS_FILTER_TITLE
-#: Merge.rc:4333
+#: Merge.rc:4343
msgid "Filters"
msgstr "المرشحات"
#. IDS_FILTER_PREFIX
-#: Merge.rc:4334
+#: Merge.rc:4344
msgid "[F] "
msgstr "[F] "
#. IDS_PLUGINSLIST_DESC
-#: Merge.rc:4335 Merge.rc:4958
+#: Merge.rc:4345 Merge.rc:4968
msgid "Description"
msgstr "الوصف"
#. IDS_FILEFILTER_SAVENEW
-#: Merge.rc:4336
+#: Merge.rc:4346
msgid "Select Filename for New Filter"
msgstr "اختيار اسم الملف للمرشح الجديد"
#. IDS_FILEFILTER_FILEMASK
-#: Merge.rc:4337
+#: Merge.rc:4347
msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||"
msgstr "مرشحات الملفات (*.flt)|*.flt|كل الملفات All Files (*.*)|*.*||"
-#: Merge.rc:4339
+#: Merge.rc:4349
#, c-format
msgid "Cannot find filter template!\n\nCopy %1 to WinMerge/Filters Folder:\n%2."
msgstr "لا يمكن إيجاد قالب ملف المرشح!\n\nيرجى نسخ الملف %1 إلى WinMerge/Filters folder:\n%2."
-#: Merge.rc:4341
+#: Merge.rc:4351
#, c-format
msgid ""
"Cannot copy filter template:\n"
@@ -5298,7 +5309,7 @@ msgstr ""
"\n"
"يرجى التأكد من وجود المجلد والتأكد من وجود الصلاحية للكتابة فيه."
-#: Merge.rc:4343
+#: Merge.rc:4353
msgid ""
"User's filter folder is not defined!\n"
"\n"
@@ -5308,7 +5319,7 @@ msgstr ""
"\n"
"يرجى اختيار مجلد المرشحات من قائمة الخيارات أو قائمة النظام."
-#: Merge.rc:4345
+#: Merge.rc:4355
#, c-format
msgid ""
"Failed to delete filter:\n"
@@ -5322,11 +5333,11 @@ msgstr ""
"ربما الملف للقراءة فقط؟"
#. IDS_FILEFILTER_INSTALL
-#: Merge.rc:4346
+#: Merge.rc:4356
msgid "Locate Filter File to Install"
msgstr "تحديد ملف المرشحات للبدء في التثبيت"
-#: Merge.rc:4348
+#: Merge.rc:4358
msgid ""
"Installing filter file failed.\n"
"\n"
@@ -5337,17 +5348,17 @@ msgstr ""
"لا يمكن نسخ ملف المرشحات الجديد إلى مجلد المرشحات."
#. IDS_FILEFILTER_OVERWRITE
-#: Merge.rc:4349
+#: Merge.rc:4359
msgid "Filter file exists. Overwrite?"
msgstr "المرشح موجود مسبقا. هل ترغب في استبداله؟"
#. IDS_FILTERLINE_REGEXP
-#: Merge.rc:4355
+#: Merge.rc:4365
msgid "Regular expression"
msgstr "التعابير النمطية"
#. IDS_FILTERCHANGED
-#: Merge.rc:4361
+#: Merge.rc:4371
msgid "Filters updated. Refresh all open folder compares?\n\nSelect 'No' to refresh later."
msgstr ""
"تم تحديث المرشحات. هل ترغب في تحديث كل مقارنات المجلد المفتوحة؟\n"
@@ -5355,217 +5366,217 @@ msgstr ""
"إذا لم ترغب في تحديث كل المقارنات الأن يمكنك الرفض ثم تحديث المقارنات لاحقا."
#. IDS_DIRECTORY_WINDOW_TITLE
-#: Merge.rc:4367
+#: Merge.rc:4377
msgid "Folder Comparison Results"
msgstr "نتيجة مقارنة المجلدات"
#. IDS_FILE_COMPARISON_TITLE
-#: Merge.rc:4368
+#: Merge.rc:4378
msgid "File Comparison"
msgstr "مقارنة الملفات"
#. IDS_EMPTY_LEFT_FILE
-#: Merge.rc:4369
+#: Merge.rc:4379
msgid "Untitled Left"
msgstr "اليسار غير معنون"
#. IDS_EMPTY_MIDDLE_FILE
-#: Merge.rc:4370
+#: Merge.rc:4380
msgid "Untitled Middle"
msgstr "الوسط غير معنون"
#. IDS_EMPTY_RIGHT_FILE
-#: Merge.rc:4371
+#: Merge.rc:4381
msgid "Untitled Right"
msgstr "اليمين غير معنون"
#. IDS_CONFLICT_BASE_FILE
-#: Merge.rc:4372
+#: Merge.rc:4382
msgid "Base File"
msgstr ""
#. IDS_CONFLICT_THEIRS_FILE
-#: Merge.rc:4373
+#: Merge.rc:4383
msgid "Theirs File"
msgstr "ملفهم"
#. IDS_CONFLICT_MINE_FILE
-#: Merge.rc:4374
+#: Merge.rc:4384
msgid "Mine File"
msgstr "ملفي"
#. IDS_SELFCOMPARE_ORIGINAL_FILE
-#: Merge.rc:4375
+#: Merge.rc:4385
msgid "Original File"
msgstr ""
#. IDS_LINE_STATUS_INFO_EOL
-#: Merge.rc:4381
+#: Merge.rc:4391
#, c-format
msgid "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s"
msgstr "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s"
#. IDS_EMPTY_LINE_STATUS_INFO
-#: Merge.rc:4382
+#: Merge.rc:4392
#, c-format
msgid "Line: %s"
msgstr "السطر: %s"
#. IDS_LINE_STATUS_INFO
-#: Merge.rc:4383
+#: Merge.rc:4393
#, c-format
msgid "Ln: %s Col: %d/%d Ch: %d/%d"
msgstr "Ln: %s Col: %d/%d Ch: %d/%d"
#. IDS_LINE_STATUS_INFO_SEL
-#: Merge.rc:4384
+#: Merge.rc:4394
#, c-format
msgid " Sel: %d | %d"
msgstr ""
#. IDS_MERGEMODE_MERGING
-#: Merge.rc:4385
+#: Merge.rc:4395
msgid "Merge"
msgstr "دمج"
#. IDS_DIFF_NUMBER_STATUS_FMT
-#: Merge.rc:4386
+#: Merge.rc:4396
#, c-format
msgid "Difference %1 of %2"
msgstr "الاختلاف %1 من %2"
#. IDS_NO_DIFF_SEL_FMT
-#: Merge.rc:4387
+#: Merge.rc:4397
#, c-format
msgid "%1 Differences Found"
msgstr "%1 عدد الاختلافات التي تم العثور عليها"
#. IDS_1_DIFF_FOUND
-#: Merge.rc:4388
+#: Merge.rc:4398
msgid "1 Difference Found"
msgstr "اختلاف واحد تم العثور عليه"
#. IDS_NO_ERR_SEL_FMT
-#: Merge.rc:4389
+#: Merge.rc:4399
#, c-format
msgid "%1 Errors Found"
msgstr ""
#. IDS_1_ERR_FOUND
-#: Merge.rc:4390
+#: Merge.rc:4400
msgid "1 Error Found"
msgstr ""
#. IDS_STATUSBAR_READONLY, Abbreviation from "Read Only"
-#: Merge.rc:4391
+#: Merge.rc:4401
msgid "RO"
msgstr "RO"
#. IDS_DIRVIEW_STATUS_FMT_FOCUS
-#: Merge.rc:4397
+#: Merge.rc:4407
#, c-format
msgid "Item %1 of %2"
msgstr "العنصر %1 من %2"
#. IDS_DIRVIEW_STATUS_FMT_NOFOCUS
-#: Merge.rc:4398
+#: Merge.rc:4408
#, c-format
msgid "Items: %1"
msgstr "العناصر: %1"
#. IDS_DIRVIEW_STATUS_COMPARING
-#: Merge.rc:4399
+#: Merge.rc:4409
msgid "Comparing items..."
msgstr "يتم مقارنة العناصر..."
#. IDS_ITEMS_PER_SEC
-#: Merge.rc:4400
+#: Merge.rc:4410
#, c-format
msgid "%.1f[items/sec]"
msgstr ""
#. IDS_ERROR_INCOMPARABLE
-#: Merge.rc:4406
+#: Merge.rc:4416
msgid "Select two existing folders/files to compare."
msgstr "اختر ملفين أو مجلدين للمقارنة."
#. IDS_DIRSEL_TAG
-#: Merge.rc:4407
+#: Merge.rc:4417
msgid "Folder Selection"
msgstr "اختيار المجلد"
#. IDS_OPEN_FILESDIRS
-#: Merge.rc:4408
+#: Merge.rc:4418
msgid "Select two (or three) folders/files to compare."
msgstr "اختر مجلدين (أو ثلاثة) أو ملفين (أو ثلاثة) للمقارنة."
#. IDS_OPEN_LEFTINVALID
-#: Merge.rc:4409
+#: Merge.rc:4419
msgid "Left (1st) path is invalid!"
msgstr "المسار (الأول) الأيسر غير صالح!"
#. IDS_OPEN_MIDDLEINVALID
-#: Merge.rc:4410
+#: Merge.rc:4420
msgid "Middle (2nd) path is invalid!"
msgstr "المسار (الثاني) الأوسط غير صالح!"
#. IDS_OPEN_RIGHTINVALID2
-#: Merge.rc:4411
+#: Merge.rc:4421
msgid "Right (2nd) path is invalid!"
msgstr "المسار (الثاني) الأيمن غير صالح!"
#. IDS_OPEN_RIGHTINVALID3
-#: Merge.rc:4412
+#: Merge.rc:4422
msgid "Right (3rd) path is invalid!"
msgstr "المسار (الثالث) الأيمن غير صالح!"
#. IDS_OPEN_BOTHINVALID
-#: Merge.rc:4413
+#: Merge.rc:4423
msgid "Both paths are invalid!"
msgstr "المساران غير صالحين!"
-#: Merge.rc:4415
+#: Merge.rc:4425
msgid "Left (1st) and Middle (2nd) paths are invalid!"
msgstr "المساران الأيسر (الأول) والأوسط (الثاني) غير صالحين!"
#. IDS_OPEN_LEFTRIGHTINVALID
-#: Merge.rc:4416
+#: Merge.rc:4426
msgid "Left (1st) and Right (3rd) paths are invalid!"
msgstr "المساران الأيسر (الأول) والأيمن (الثالث) غير صالحين!"
-#: Merge.rc:4418
+#: Merge.rc:4428
msgid "Middle (2nd) and Right (3rd) paths are invalid!"
msgstr "المساران الأوسط (الثاني) والأيمن (الثالث) غير صالحين!"
#. IDS_OPEN_ALLINVALID
-#: Merge.rc:4419
+#: Merge.rc:4429
msgid "All paths are invalid!"
msgstr "كل المسارات غير صالحة!"
#. IDS_OPEN_UNPACKERDISABLED
-#: Merge.rc:4420
+#: Merge.rc:4430
msgid "Only enabled for file comparisons"
msgstr "تم التفعيل لمقارنة الملفات فقط"
#. IDS_OPEN_MISMATCH
-#: Merge.rc:4421
+#: Merge.rc:4431
msgid "Cannot compare file and folder!"
msgstr "لا يمكن إجراء المقارنة بين ملف ومجلد!"
#. IDS_ERROR_FILE_NOT_FOUND
-#: Merge.rc:4427
+#: Merge.rc:4437
#, c-format
msgid "File not found: %1"
msgstr "لم يتم العثور على الملف: %1"
#. IDS_ERROR_FILE_NOT_UNPACKED
-#: Merge.rc:4428
+#: Merge.rc:4438
#, c-format
msgid "File not unpacked: %1"
msgstr "الملف لم يتم فك تحزيمة: %1"
#. IDS_ERROR_FILEOPEN
-#: Merge.rc:4429
+#: Merge.rc:4439
#, c-format
msgid ""
"Cannot open file\n"
@@ -5579,12 +5590,12 @@ msgstr ""
"%2"
#. IDS_ERROR_CONF_RESOLVE
-#: Merge.rc:4430
+#: Merge.rc:4440
msgid "Failed to parse conflict file."
msgstr "فشل في فحص الملف محل التضارب."
#. IDS_NOT_CONFLICT_FILE
-#: Merge.rc:4431
+#: Merge.rc:4441
#, c-format
msgid "The file\n%1\nis not a conflict file."
msgstr ""
@@ -5593,34 +5604,34 @@ msgstr ""
"ليس محل تضارب."
#. IDS_COMPARE_LARGE_FILES
-#: Merge.rc:4432
+#: Merge.rc:4442
msgid "Comparing large files requires significant memory.\nShow only comparison results (not file contents)?"
msgstr ""
#. IDS_SAVE_AS_TITLE
-#: Merge.rc:4438
+#: Merge.rc:4448
msgid "Save As"
msgstr "الحفظ باسم"
#. IDS_SAVE_FMT
-#: Merge.rc:4439
+#: Merge.rc:4449
#, c-format
msgid "Save changes to %1?"
msgstr "حفظ التغييرات إلى %1؟"
#. IDS_SAVEREADONLY_FMT
-#: Merge.rc:4440
+#: Merge.rc:4450
#, c-format
msgid "%1 is read-only. Override? Or 'No' to save as new filename?"
msgstr ""
"%1 للقراءة فقط. هل ترغب في تجاوز أمر القراءة فقط؟ (أختر لا للحفظ كملف جديد)"
#. IDS_ERROR_BACKUP
-#: Merge.rc:4441
+#: Merge.rc:4451
msgid "Error backing up file"
msgstr "خطأ أثناء الحفظ الاحتياطي للملف"
-#: Merge.rc:4443
+#: Merge.rc:4453
#, c-format
msgid ""
"Unable to backup original file:\n"
@@ -5634,7 +5645,7 @@ msgstr ""
"هل ترغب بالاستمرار على أي حال؟"
#. IDS_FILESAVE_FAILED
-#: Merge.rc:4444
+#: Merge.rc:4454
#, c-format
msgid "Saving file failed.\n%1\n%2\n\t- Use different filename (OK)\n\t- Abort (Cancel)?"
msgstr ""
@@ -5645,7 +5656,7 @@ msgstr ""
"\t- استخدام اسم ملف مختلف (أضغط على زر الموافقة)\n"
"\t- إلغاء العملية الجارية (إضغط على زر الإلغاء)؟"
-#: Merge.rc:4446
+#: Merge.rc:4456
#, c-format
msgid "Plugin '%2' cannot pack changes to left file into '%1'.\n\nOriginal unchanged. Save unpacked version?"
msgstr ""
@@ -5655,12 +5666,12 @@ msgstr ""
"\n"
"هل تريد حفظ النسخة التي تم فك تحزيمها إلى ملف آخر؟"
-#: Merge.rc:4448
+#: Merge.rc:4458
#, c-format
msgid "Plugin '%2' cannot pack changes to middle file into '%1'.\n\nOriginal unchanged. Save unpacked version?"
msgstr ""
-#: Merge.rc:4450
+#: Merge.rc:4460
#, c-format
msgid "Plugin '%2' cannot pack changes to right file into '%1'.\n\nOriginal unchanged. Save unpacked version?"
msgstr ""
@@ -5671,7 +5682,7 @@ msgstr ""
"هل تريد حفظ النسخة التي تم فك تحزيمها إلى ملف آخر؟"
#. IDS_FILECHANGED_ONDISK
-#: Merge.rc:4451
+#: Merge.rc:4461
#, c-format
msgid ""
"Another application updated\n"
@@ -5688,7 +5699,7 @@ msgstr ""
"البرنامج الآخر)؟"
#. IDS_SAVEREADONLY_MULTI
-#: Merge.rc:4452
+#: Merge.rc:4462
#, c-format
msgid ""
"%1\n"
@@ -5698,7 +5709,7 @@ msgstr ""
"هو ملف للقراءة فقط. هل ترغب في تجاوز أمر القراءة فقط للعنصر؟"
#. IDS_FILECHANGED_RESCAN
-#: Merge.rc:4453
+#: Merge.rc:4463
#, c-format
msgid "Another application updated\n%1\nsince last scan.\n\nReload?"
msgstr ""
@@ -5709,22 +5720,22 @@ msgstr ""
"هل ترغب في إعادة تحميل الملف؟"
#. IDS_SAVE_LEFT_AS
-#: Merge.rc:4454
+#: Merge.rc:4464
msgid "Save Left File As"
msgstr "حفظ الملف الأيسر باسم"
#. IDS_SAVE_MIDDLE_AS
-#: Merge.rc:4455
+#: Merge.rc:4465
msgid "Save Middle File As"
msgstr "حفظ الملف الأوسط باسم"
#. IDS_SAVE_RIGHT_AS
-#: Merge.rc:4456
+#: Merge.rc:4466
msgid "Save Right File As"
msgstr "حفظ الملف الأيمن باسم"
#. IDS_FILE_DISAPPEARED
-#: Merge.rc:4461
+#: Merge.rc:4471
#, c-format
msgid ""
"File\n"
@@ -5736,7 +5747,7 @@ msgstr ""
"أختفى. يرجى حفظ نسخ من الملف للإستمرر."
#. IDS_VIEWS_OUTOFSYNC
-#: Merge.rc:4467
+#: Merge.rc:4477
msgid ""
"Cannot merge unsynched documents.\n"
"\n"
@@ -5747,186 +5758,186 @@ msgstr ""
"تحديث المستندات قبل الإستمرار."
#. IDS_BREAK_ON_WHITESPACE
-#: Merge.rc:4472
+#: Merge.rc:4482
msgid "Break at whitespace"
msgstr "فصل بين العبارات باستخدام المسافات الخالية (whitespace)"
#. IDS_BREAK_ON_PUNCTUATION
-#: Merge.rc:4473
+#: Merge.rc:4483
msgid "Break at whitespace or punctuation"
msgstr "فصل بين العبارات باستخدام المسافات الخالية أو علامات الترقيم"
#. IDS_L2M
-#: Merge.rc:4479
+#: Merge.rc:4489
msgid "Copy to &Middle\tAlt+Right"
msgstr ""
#. IDS_R2M
-#: Merge.rc:4480
+#: Merge.rc:4490
msgid "Copy to &Middle\tAlt+Left"
msgstr ""
#. IDS_COPY_FROM_MIDDLE_R
-#: Merge.rc:4481
+#: Merge.rc:4491
msgid "Copy from Middle\tAlt+Shift+Right"
msgstr ""
#. IDS_COPY_FROM_MIDDLE_L
-#: Merge.rc:4482
+#: Merge.rc:4492
msgid "Copy from Middle\tAlt+Shift+Left"
msgstr ""
#. IDS_L2MNEXT
-#: Merge.rc:4483
+#: Merge.rc:4493
msgid "Copy to Middle and Advance\tCtrl+Alt+Right"
msgstr ""
#. IDS_R2MNEXT
-#: Merge.rc:4484
+#: Merge.rc:4494
msgid "Copy to Middle and Advance\tCtrl+Alt+Left"
msgstr ""
#. IDS_ALL_MIDDLE
-#: Merge.rc:4485
+#: Merge.rc:4495
msgid "Copy All to Middle"
msgstr ""
#. IDS_COPY_RIGHT_TO_LEFT
-#: Merge.rc:4491
+#: Merge.rc:4501
#, c-format
msgid "Right to Left (%1)"
msgstr "اليمين إلى اليسار (%1)"
#. IDS_COPY_RIGHT_TO_MIDDLE
-#: Merge.rc:4492
+#: Merge.rc:4502
#, c-format
msgid "Right to Middle (%1)"
msgstr "اليمين إلى الوسط (%1)"
#. IDS_COPY_MIDDLE_TO_LEFT
-#: Merge.rc:4493
+#: Merge.rc:4503
#, c-format
msgid "Middle to Left (%1)"
msgstr "الوسط إلى اليسار (%1)"
#. IDS_COPY_MIDDLE_TO_RIGHT
-#: Merge.rc:4494
+#: Merge.rc:4504
#, c-format
msgid "Middle to Right (%1)"
msgstr "الوسط إلى اليمين (%1)"
#. IDS_COPY_LEFT_TO_RIGHT
-#: Merge.rc:4495
+#: Merge.rc:4505
#, c-format
msgid "Left to Right (%1)"
msgstr "اليسار إلى اليمين (%1)"
#. IDS_COPY_LEFT_TO_MIDDLE
-#: Merge.rc:4496
+#: Merge.rc:4506
#, c-format
msgid "Left to Middle (%1)"
msgstr "اليسار إلى الوسط (%1)"
#. IDS_MOVE_LEFT_TO
-#: Merge.rc:4507 Merge.rc:4539
+#: Merge.rc:4517 Merge.rc:4549
#, c-format
msgid "Left to... (%1)"
msgstr "اليسار إلى...(%1)"
#. IDS_MOVE_MIDDLE_TO
-#: Merge.rc:4508 Merge.rc:4540
+#: Merge.rc:4518 Merge.rc:4550
#, c-format
msgid "Middle to... (%1)"
msgstr "الوسط إلى... (%1)"
#. IDS_MOVE_RIGHT_TO
-#: Merge.rc:4509 Merge.rc:4541
+#: Merge.rc:4519 Merge.rc:4551
#, c-format
msgid "Right to... (%1)"
msgstr "اليمين إلى... (%1)"
#. IDS_COPY_BOTH_TO
-#: Merge.rc:4510
+#: Merge.rc:4520
#, c-format
msgid "Both to... (%1)"
msgstr "كلاهما إلى... (%1)"
#. IDS_COPY_ALL_TO
-#: Merge.rc:4511
+#: Merge.rc:4521
#, c-format
msgid "All to... (%1)"
msgstr "الكل إلى... (%1)"
#. IDS_COPY_DIFFERENCES_TO
-#: Merge.rc:4512
+#: Merge.rc:4522
#, c-format
msgid "Differences to... (%1)"
msgstr "الاختلافات إلى... (%1)"
#. IDS_COPY_ONLYDIFFITEMS
-#: Merge.rc:4519
+#: Merge.rc:4529
msgid "Some selected items are identical or skipped.\nCopy only items with differences?"
msgstr ""
#. IDS_DEL_LEFT_FMT
-#: Merge.rc:4525
+#: Merge.rc:4535
#, c-format
msgid "Left (%1)"
msgstr "اليسار (%1)"
#. IDS_DEL_MIDDLE_FMT
-#: Merge.rc:4526
+#: Merge.rc:4536
#, c-format
msgid "Middle (%1)"
msgstr "الوسط (%1)"
#. IDS_DEL_RIGHT_FMT
-#: Merge.rc:4527
+#: Merge.rc:4537
#, c-format
msgid "Right (%1)"
msgstr "اليمين (%1)"
#. IDS_DEL_BOTH_FMT
-#: Merge.rc:4528
+#: Merge.rc:4538
#, c-format
msgid "Both (%1)"
msgstr "كلاهما (%1)"
#. IDS_DEL_ALL_FMT
-#: Merge.rc:4529
+#: Merge.rc:4539
#, c-format
msgid "All (%1)"
msgstr "الكل (%1)"
#. IDS_SELECT_DEST_LEFT
-#: Merge.rc:4545
+#: Merge.rc:4555
msgid "Left Side - Select Destination Folder:"
msgstr "الجزء الأيسر - قم باختيار المجلد المستهدف:"
#. IDS_SELECT_DEST_MIDDLE
-#: Merge.rc:4546
+#: Merge.rc:4556
msgid "Middle Side - Select Destination Folder:"
msgstr "الجزء الأوسط - قم باختيار المجلد المستهدف:"
#. IDS_SELECT_DEST_RIGHT
-#: Merge.rc:4547
+#: Merge.rc:4557
msgid "Right Side - Select Destination Folder:"
msgstr "الجزء الأيمن - قم باختيار المجلد المستهدف:"
#. IDS_FILES_AFFECTED_FMT
-#: Merge.rc:4548
+#: Merge.rc:4558
#, c-format
msgid "(%1 Files Affected)"
msgstr "(%1 ملفات تأثرت)"
#. IDS_FILES_AFFECTED_FMT2
-#: Merge.rc:4549
+#: Merge.rc:4559
#, c-format
msgid "(%1 of %2 Files Affected)"
msgstr "(%1 من %2 ملفات تأثرت)"
#. IDS_CONFIRM_DELETE_SINGLE
-#: Merge.rc:4555
+#: Merge.rc:4565
#, c-format
msgid ""
"Are you sure you want to delete\n"
@@ -5938,18 +5949,18 @@ msgstr ""
"%1؟"
#. IDS_CONFIRM_SINGLE_COPY
-#: Merge.rc:4556
+#: Merge.rc:4566
msgid "Are you sure you want to copy?"
msgstr "هل أنت متأكد تريد نسخ:"
#. IDS_CONFIRM_MULTIPLE_COPY
-#: Merge.rc:4557
+#: Merge.rc:4567
#, c-format
msgid "Are you sure you want to copy %d items?"
msgstr "هل أنت متأكد أنك تريد نسخ %d عنصر:"
#. IDS_DIRCMP_NOTSYNC
-#: Merge.rc:4558
+#: Merge.rc:4568
#, c-format
msgid ""
"Operation aborted!\n"
@@ -5968,799 +5979,799 @@ msgstr ""
"يرجى تحديث المقارنة."
#. IDS_CONFIRM_SINGLE_MOVE
-#: Merge.rc:4563
+#: Merge.rc:4573
msgid "Are you sure you want to move?"
msgstr "هل أنت متأكد تريد نقل:"
#. IDS_CONFIRM_MULTIPLE_MOVE
-#: Merge.rc:4564
+#: Merge.rc:4574
#, c-format
msgid "Are you sure you want to move %d items?"
msgstr "هل أنت متأكد أنك تريد نقل %d عنصر:"
#. IDS_CONFIRM_MOVE_CAPTION
-#: Merge.rc:4566
+#: Merge.rc:4576
msgid "Confirm Move"
msgstr "تأكيد الأمر"
-#: Merge.rc:4568
+#: Merge.rc:4578
msgid "Close the folder comparison window?"
msgstr ""
"أنت على وشك إغلاق النافذة التي تقوم بالمقارنة بين المجلدات. هل أنت متأكد "
"برغبتك في إغلاقها؟"
-#: Merge.rc:4570
+#: Merge.rc:4580
msgid "Close the folder comparison window, which took a long time?"
msgstr ""
#. IDS_ERROR_INVALID_DIR_FILE_NAME
-#: Merge.rc:4571
+#: Merge.rc:4581
msgid "The file or folder name is invalid."
msgstr ""
#. IDS_ERROR_EXECUTE_FILE
-#: Merge.rc:4577
+#: Merge.rc:4587
#, c-format
msgid "Failed to execute external editor: %1"
msgstr "فشل في تشغيل المحرر الخارجي: %1"
#. IDS_UNKNOWN_ARCHIVE_FORMAT
-#: Merge.rc:4583
+#: Merge.rc:4593
msgid "Unknown archive format"
msgstr "نوع أرشيف غير معروف"
-#: Merge.rc:4585
+#: Merge.rc:4595
msgid "Failed to extract archive.\nCompare as text file?"
msgstr ""
#. IDS_COLHDR_FILENAME
-#: Merge.rc:4591
+#: Merge.rc:4601
msgid "Filename"
msgstr "اسم الملف"
#. IDS_COLHDR_DIR
-#: Merge.rc:4592
+#: Merge.rc:4602
msgctxt "DirView|ColumnHeader"
msgid "Folder"
msgstr "مجلد"
#. IDS_COLHDR_RESULT
-#: Merge.rc:4593
+#: Merge.rc:4603
msgid "Comparison Result"
msgstr "نتيجة المقارنة"
#. IDS_COLHDR_LTIMEM
-#: Merge.rc:4594
+#: Merge.rc:4604
msgid "Left Date"
msgstr "التاريخ في الجزء الأيسر"
#. IDS_COLHDR_RTIMEM
-#: Merge.rc:4595
+#: Merge.rc:4605
msgid "Right Date"
msgstr "التاريخ في الجزء الأيمن"
#. IDS_COLHDR_MTIMEM
-#: Merge.rc:4596
+#: Merge.rc:4606
msgid "Middle Date"
msgstr "التاريخ في الجزء الأوسط"
#. IDS_COLHDR_LSIZE
-#: Merge.rc:4598
+#: Merge.rc:4608
msgid "Left Size"
msgstr "الحجم في الجزء الأيسر"
#. IDS_COLHDR_RSIZE
-#: Merge.rc:4599
+#: Merge.rc:4609
msgid "Right Size"
msgstr "الحجم في الجزء الأيمن"
#. IDS_COLHDR_MSIZE
-#: Merge.rc:4604
+#: Merge.rc:4614
msgid "Middle Size"
msgstr "الحجم في الجزء الأوسط"
#. IDS_COLHDR_RSIZE_SHORT
-#: Merge.rc:4605
+#: Merge.rc:4615
msgid "Right Size (Short)"
msgstr "الحجم في الجزء الأيمن (مختصر)"
#. IDS_COLHDR_LSIZE_SHORT
-#: Merge.rc:4606
+#: Merge.rc:4616
msgid "Left Size (Short)"
msgstr "الحجم في الجزء الأيسر (مختصر)"
#. IDS_COLHDR_MSIZE_SHORT
-#: Merge.rc:4607
+#: Merge.rc:4617
msgid "Middle Size (Short)"
msgstr "الحجم في الجزء الأوسط (مختصر)"
#. IDS_COLHDR_LTIMEC
-#: Merge.rc:4613
+#: Merge.rc:4623
msgid "Left Creation Time"
msgstr "وقت إنشاء الملف في الجزء الأيسر"
#. IDS_COLHDR_RTIMEC
-#: Merge.rc:4614
+#: Merge.rc:4624
msgid "Right Creation Time"
msgstr "وقت إنشاء الملف في الجزء الأيمن"
#. IDS_COLHDR_MTIMEC
-#: Merge.rc:4615
+#: Merge.rc:4625
msgid "Middle Creation Time"
msgstr "وقت إنشاء الملف في الجزء الأوسط"
#. IDS_COLHDR_NEWER
-#: Merge.rc:4616
+#: Merge.rc:4626
msgid "Newer File"
msgstr "الملف الأحدث"
#. IDS_COLHDR_LVERSION
-#: Merge.rc:4617
+#: Merge.rc:4627
msgid "Left File Version"
msgstr "نسخة الملف في الجزء الأيسر"
#. IDS_COLHDR_RVERSION
-#: Merge.rc:4618
+#: Merge.rc:4628
msgid "Right File Version"
msgstr "نسخة الملف في الجزء الأيمن"
#. IDS_COLHDR_MVERSION
-#: Merge.rc:4619
+#: Merge.rc:4629
msgid "Middle File Version"
msgstr "نسخة الملف في الجزء الأوسط"
#. IDS_COLHDR_RESULT_ABBR
-#: Merge.rc:4620
+#: Merge.rc:4630
msgid "Short Result"
msgstr "النتائج المختصرة"
#. IDS_COLHDR_LATTRIBUTES
-#: Merge.rc:4621
+#: Merge.rc:4631
msgid "Left Attributes"
msgstr "السمات في الجانب الأيسر"
#. IDS_COLHDR_RATTRIBUTES
-#: Merge.rc:4622
+#: Merge.rc:4632
msgid "Right Attributes"
msgstr "السمات في الجانب الأيمن"
#. IDS_COLHDR_MATTRIBUTES
-#: Merge.rc:4623
+#: Merge.rc:4633
msgid "Middle Attributes"
msgstr "السمات في الجانب الأوسط"
#. IDS_COLHDR_LEOL_TYPE
-#: Merge.rc:4628
+#: Merge.rc:4638
msgid "Left EOL"
msgstr "نهاية السطر (EOL) في الجزء الأيسر"
#. IDS_COLHDR_MEOL_TYPE
-#: Merge.rc:4629
+#: Merge.rc:4639
msgid "Middle EOL"
msgstr "نهاية السطر (EOL) في الجزء الأوسط"
#. IDS_COLHDR_REOL_TYPE
-#: Merge.rc:4630
+#: Merge.rc:4640
msgid "Right EOL"
msgstr "نهاية السطر (EOL) في الجزء الأيمن"
#. IDS_COLHDR_LENCODING
-#: Merge.rc:4636
+#: Merge.rc:4646
msgid "Left Encoding"
msgstr "نوع الترميز في الجزء الأيسر"
#. IDS_COLHDR_RENCODING
-#: Merge.rc:4637
+#: Merge.rc:4647
msgid "Right Encoding"
msgstr "نوع الترميز في الجزء الأيمن"
#. IDS_COLHDR_MENCODING
-#: Merge.rc:4638
+#: Merge.rc:4648
msgid "Middle Encoding"
msgstr "نوع الترميز في الجزء الأوسط"
#. IDS_COLHDR_NIDIFFS
-#: Merge.rc:4639
+#: Merge.rc:4649
msgid "Ignored Diff"
msgstr "الاختلافات التي تم تجاهلها."
#. IDS_COLHDR_BINARY
-#: Merge.rc:4641
+#: Merge.rc:4651
msgctxt "DirView|ColumnHeader"
msgid "Binary"
msgstr "ثنائي"
#. IDS_PLUGINS_TYPE_UNPACKER
-#: Merge.rc:4642 Merge.rc:4959
+#: Merge.rc:4652 Merge.rc:4969
msgid "Unpacker"
msgstr "فك الحزمة"
#. IDS_PLUGIN_TYPE4
-#: Merge.rc:4643 Merge.rc:4960 Merge.rc:5267
+#: Merge.rc:4653 Merge.rc:4970 Merge.rc:5277
msgid "Prediffer"
msgstr "اختلافات مسبقة"
#. IDS_COLHDR_LEFT
-#: Merge.rc:4644
+#: Merge.rc:4654
msgid "Left"
msgstr ""
#. IDS_COLHDR_MIDDLE
-#: Merge.rc:4645
+#: Merge.rc:4655
msgid "Middle"
msgstr ""
#. IDS_COLHDR_RIGHT
-#: Merge.rc:4646
+#: Merge.rc:4656
msgid "Right"
msgstr ""
#. IDS_COLHDR_DIFF
-#: Merge.rc:4647
+#: Merge.rc:4657
msgid "Diff"
msgstr ""
#. IDS_COLHDR_LEFT_DUPLICATE
-#: Merge.rc:4648
+#: Merge.rc:4658
msgid "Left Duplicate Count"
msgstr ""
#. IDS_COLHDR_RIGHT_DUPLICATE
-#: Merge.rc:4649
+#: Merge.rc:4659
msgid "Right Duplicate Count"
msgstr ""
#. IDS_COLHDR_MIDDLE_DUPLICATE
-#: Merge.rc:4650
+#: Merge.rc:4660
msgid "Middle Duplicate Count"
msgstr ""
#. IDS_COLHDR_MOVE
-#: Merge.rc:4651
+#: Merge.rc:4661
msgid "Move"
msgstr ""
#. IDS_PRPCAT_AUDIO
-#: Merge.rc:4658
+#: Merge.rc:4668
msgid "Audio"
msgstr ""
#. IDS_PRPCAT_CALENDAR
-#: Merge.rc:4659
+#: Merge.rc:4669
msgid "Calendar"
msgstr ""
#. IDS_PRPCAT_COMMUNICATION
-#: Merge.rc:4660
+#: Merge.rc:4670
msgid "Communication"
msgstr ""
#. IDS_PRPCAT_CONTACT
-#: Merge.rc:4661
+#: Merge.rc:4671
msgid "Contact"
msgstr ""
#. IDS_PRPCAT_DEVICES
-#: Merge.rc:4662
+#: Merge.rc:4672
msgid "Devices"
msgstr ""
#. IDS_PRPCAT_DOCUMENT
-#: Merge.rc:4663
+#: Merge.rc:4673
msgid "Document"
msgstr ""
#. IDS_PRPCAT_HOME
-#: Merge.rc:4664
+#: Merge.rc:4674
msgid "Home"
msgstr ""
#. IDS_PRPCAT_JOURNAL
-#: Merge.rc:4666
+#: Merge.rc:4676
msgid "Journal"
msgstr ""
#. IDS_PRPCAT_LINK
-#: Merge.rc:4667
+#: Merge.rc:4677
msgid "Link"
msgstr ""
#. IDS_PRPCAT_MEDIA
-#: Merge.rc:4668
+#: Merge.rc:4678
msgid "Media"
msgstr ""
#. IDS_PRPCAT_MUSIC
-#: Merge.rc:4670
+#: Merge.rc:4680
msgid "Music"
msgstr ""
#. IDS_PRPCAT_NOTE
-#: Merge.rc:4671
+#: Merge.rc:4681
msgid "Note"
msgstr ""
#. IDS_PRPCAT_PHOTO
-#: Merge.rc:4672
+#: Merge.rc:4682
msgid "Photo"
msgstr ""
#. IDS_PRPCAT_RECORDEDTV
-#: Merge.rc:4673
+#: Merge.rc:4683
msgid "RecordedTV"
msgstr ""
#. IDS_PRPCAT_SEARCH
-#: Merge.rc:4674
+#: Merge.rc:4684
msgid "Search"
msgstr ""
#. IDS_PRPCAT_SECURITY
-#: Merge.rc:4675
+#: Merge.rc:4685
msgid "Security"
msgstr ""
#. IDS_PRPCAT_SOFTWARE
-#: Merge.rc:4676
+#: Merge.rc:4686
msgid "Software"
msgstr ""
#. IDS_PRPCAT_TASK
-#: Merge.rc:4677
+#: Merge.rc:4687
msgid "Task"
msgstr ""
#. IDS_PRPCAT_VIDEO
-#: Merge.rc:4678
+#: Merge.rc:4688
msgid "Video"
msgstr ""
#. IDS_PRPCAT_HASH
-#: Merge.rc:4679
+#: Merge.rc:4689
msgid "Hash"
msgstr ""
#. IDS_CANT_COMPARE_FILES
-#: Merge.rc:4685
+#: Merge.rc:4695
msgid "Unable to compare files"
msgstr "لا يمكن مقارنة الملفات"
#. IDS_ABORTED_ITEM
-#: Merge.rc:4686
+#: Merge.rc:4696
msgid "Item aborted"
msgstr "العنصر تم إلغاءه"
#. IDS_FILE_SKIPPED
-#: Merge.rc:4687
+#: Merge.rc:4697
msgid "File skipped"
msgstr "تم تخطي الملف"
#. IDS_DIR_SKIPPED
-#: Merge.rc:4688
+#: Merge.rc:4698
msgid "Folder skipped"
msgstr "تم تخطي المجلد"
#. IDS_LEFT_ONLY_IN_FMT
-#: Merge.rc:4689
+#: Merge.rc:4699
#, c-format
msgid "Left only: %1"
msgstr "في اليسار: %1 فقط"
#. IDS_MIDDLE_ONLY_IN_FMT
-#: Merge.rc:4690
+#: Merge.rc:4700
#, c-format
msgid "Middle only: %1"
msgstr "في الوسط: %1 فقط"
#. IDS_RIGHT_ONLY_IN_FMT
-#: Merge.rc:4691
+#: Merge.rc:4701
#, c-format
msgid "Right only: %1"
msgstr "في اليمين: %1 فقط"
#. IDS_DOES_NOT_EXIST_IN_FMT
-#: Merge.rc:4692
+#: Merge.rc:4702
#, c-format
msgid "Does not exist in %1"
msgstr "لا يوجد في %1"
#. IDS_BIN_FILES_SAME
-#: Merge.rc:4693
+#: Merge.rc:4703
msgid "Binary files are identical"
msgstr "الملفات الثنائية متطابقة"
#. IDS_BIN_FILES_DIFF
-#: Merge.rc:4699
+#: Merge.rc:4709
msgid "Binary files are different"
msgstr "الملفات الثنائية مختلفة"
#. IDS_FILES_ARE_DIFFERENT
-#: Merge.rc:4700
+#: Merge.rc:4710
msgid "Files are different"
msgstr "الملفات مختلفة"
#. IDS_FOLDERS_ARE_DIFFERENT
-#: Merge.rc:4701
+#: Merge.rc:4711
msgid "Folders are different"
msgstr "المجلدات مختلفة"
#. IDS_LEFTONLY
-#: Merge.rc:4702
+#: Merge.rc:4712
msgid "Left Only"
msgstr "في اليسار فقط"
#. IDS_RIGHTONLY
-#: Merge.rc:4703
+#: Merge.rc:4713
msgid "Right Only"
msgstr "في اليمين فقط"
#. IDS_MIDDLEONLY
-#: Merge.rc:4704
+#: Merge.rc:4714
msgid "Middle Only"
msgstr "في الوسط فقط"
#. IDS_NOITEMLEFT
-#: Merge.rc:4705
+#: Merge.rc:4715
msgid "No item in left"
msgstr "لا توجد عناصر في الجزء الأيسر"
#. IDS_NOITEMRIGHT
-#: Merge.rc:4706
+#: Merge.rc:4716
msgid "No item in right"
msgstr "لا توجد عناصر في الجزء الأيمن"
#. IDS_NOITEMMIDDLE
-#: Merge.rc:4707
+#: Merge.rc:4717
msgid "No item in middle"
msgstr "لا توجد عناصر في الجزء الأوسط"
#. IDS_CMPRES_ERROR
-#: Merge.rc:4709
+#: Merge.rc:4719
msgid "Error"
msgstr "خطأ"
#. IDS_TEXT_FILES_SAME
-#: Merge.rc:4710
+#: Merge.rc:4720
msgid "Text files are identical"
msgstr "الملفات النصية متطابقة"
#. IDS_LEFTONLY_DIFF
-#: Merge.rc:4711
+#: Merge.rc:4721
msgid " (Middle and right are identical)"
msgstr " (الجزء الأوسط والجزء الأيمن متطابقان)"
#. IDS_MIDDLEONLY_DIFF
-#: Merge.rc:4712
+#: Merge.rc:4722
msgid " (Left and right are identical)"
msgstr " (الجزء الأيسر والجزء الأيمن متطابقان)"
#. IDS_RIGHTONLY_DIFF
-#: Merge.rc:4713
+#: Merge.rc:4723
msgid " (Left and middle are identical)"
msgstr " (الجزء الأيسر والجزء الأوسط متطابقان)"
#. IDS_PATH_MISMATCH
-#: Merge.rc:4714
+#: Merge.rc:4724
msgid " (paths differ)"
msgstr ""
#. IDS_TEXT_FILES_DIFF
-#: Merge.rc:4715
+#: Merge.rc:4725
msgid "Text files are different"
msgstr "الملفات النصية مختلفة"
#. IDS_IMAGE_FILES_SAME
-#: Merge.rc:4716
+#: Merge.rc:4726
msgid "Image files are identical"
msgstr ""
#. IDS_IMAGE_FILES_DIFF
-#: Merge.rc:4717
+#: Merge.rc:4727
msgid "Image files are different"
msgstr ""
#. IDS_EXPR_DIFF
-#: Merge.rc:4718
+#: Merge.rc:4728
#, c-format
msgid "Files are different (expr: %1)"
msgstr ""
#. IDS_HASH_GROUP
-#: Merge.rc:4719
+#: Merge.rc:4729
#, c-format
msgid "Group%d"
msgstr ""
#. IDS_RENAME_MOVE_DETECTION_DISALBED
-#: Merge.rc:4720
+#: Merge.rc:4730
msgctxt "Options dialog|Compare|Folder|Detect renames and moves"
msgid "Disabled"
msgstr ""
#. IDS_RENAME_MOVE_DETECTION_RENAME
-#: Merge.rc:4721
+#: Merge.rc:4731
msgid "Detect renames"
msgstr ""
#. IDS_RENAME_MOVE_DETECTION_RENAME_MOVE
-#: Merge.rc:4722
+#: Merge.rc:4732
msgid "Detect renames and moves"
msgstr ""
#. IDS_RENAME_MOVE_MERGE_MODE_RENAME
-#: Merge.rc:4723
+#: Merge.rc:4733
msgid "Merge renames"
msgstr ""
#. IDS_RENAME_MOVE_MERGE_MODE_RENAME_MOVE
-#: Merge.rc:4724
+#: Merge.rc:4734
msgid "Merge renames and moves"
msgstr ""
#. IDS_RENAMED
-#: Merge.rc:4725
+#: Merge.rc:4735
msgid "Renamed"
msgstr ""
#. IDS_MOVED
-#: Merge.rc:4726
+#: Merge.rc:4736
msgid "Moved"
msgstr ""
#. IDS_RENAMED_MOVED
-#: Merge.rc:4727
+#: Merge.rc:4737
msgid "Renamed/Moved"
msgstr ""
#. IDS_RENAMED_MOVED_ITEMS
-#: Merge.rc:4728
+#: Merge.rc:4738
#, c-format
msgid "(%1 items)"
msgstr ""
#. IDS_RENAMED_MOVED_RESULT
-#: Merge.rc:4729
+#: Merge.rc:4739
#, c-format
msgid "%1 (set %2): "
msgstr ""
#. IDS_SWITCH_FLAT_MODE
-#: Merge.rc:4730
+#: Merge.rc:4740
msgid "Some moved items have been merged.\nIn Tree Mode, these items may appear in positions that do not reflect the actual folder structure, which can be confusing.\nSwitch to Flat Mode?"
msgstr ""
#. IDS_ELAPSED_TIME
-#: Merge.rc:4736
+#: Merge.rc:4746
#, c-format
msgid "Elapsed time: %ld ms"
msgstr "الوقت المنقضي: %ld م.ث"
#. IDS_STATUS_SELITEM1
-#: Merge.rc:4737
+#: Merge.rc:4747
msgid "1 item selected"
msgstr "تم اختيار عنصر واحد"
#. IDS_STATUS_SELITEMS
-#: Merge.rc:4738
+#: Merge.rc:4748
#, c-format
msgid "%1 items selected"
msgstr "%1 عنصر تم اختياره"
#. IDS_COLDESC_FILENAME
-#: Merge.rc:4744
+#: Merge.rc:4754
msgid "Filename or folder name."
msgstr "اسم الملف أو اسم المجلد."
#. IDS_COLDESC_DIR
-#: Merge.rc:4745
+#: Merge.rc:4755
msgid "Subfolder name when subfolders are included."
msgstr "اسم المجلد الفرعي عند تضمين المجلدات الفرعية."
#. IDS_COLDESC_RESULT
-#: Merge.rc:4746
+#: Merge.rc:4756
msgid "Comparison result, long form."
msgstr "نتيجة المقارنة، بالصيغة الطويلة."
#. IDS_COLDESC_LTIMEM
-#: Merge.rc:4751
+#: Merge.rc:4761
msgid "Left side modification date."
msgstr "تاريخ التعديل في الجزء الأيسر."
#. IDS_COLDESC_RTIMEM
-#: Merge.rc:4752
+#: Merge.rc:4762
msgid "Right side modification date."
msgstr "تاريخ التعديل في الجزء الأيمن."
#. IDS_COLDESC_MTIMEM
-#: Merge.rc:4753
+#: Merge.rc:4763
msgid "Middle side modification date."
msgstr "تاريخ التعديل في الجزء الأوسط."
#. IDS_COLDESC_EXTENSION
-#: Merge.rc:4754
+#: Merge.rc:4764
msgid "File's extension."
msgstr "إمتداد الملف."
#. IDS_COLDESC_LSIZE
-#: Merge.rc:4755
+#: Merge.rc:4765
msgid "Left file size in bytes."
msgstr "حجم الملف بالبايت في الجزء الأيسر."
#. IDS_COLDESC_RSIZE
-#: Merge.rc:4756
+#: Merge.rc:4766
msgid "Right file size in bytes."
msgstr "حجم الملف بالبايت في الجزء الأيمن."
#. IDS_COLDESC_MSIZE
-#: Merge.rc:4757
+#: Merge.rc:4767
msgid "Middle file size in bytes."
msgstr "حجم الملف بالبايت في الجزء الأوسط."
#. IDS_COLDESC_LSIZE_SHORT
-#: Merge.rc:4758
+#: Merge.rc:4768
msgid "Left file size abbreviated."
msgstr "حجم الملف بالبايت في الجزء الأيسر."
#. IDS_COLDESC_RSIZE_SHORT
-#: Merge.rc:4759
+#: Merge.rc:4769
msgid "Right file size abbreviated."
msgstr "حجم الملف بالبايت في الجزء الأيمن."
#. IDS_COLDESC_MSIZE_SHORT
-#: Merge.rc:4760
+#: Merge.rc:4770
msgid "Middle file size abbreviated."
msgstr "حجم الملف بالبايت في الجزء الأوسط."
#. IDS_COLDESC_LTIMEC
-#: Merge.rc:4766
+#: Merge.rc:4776
msgid "Left side creation time."
msgstr "وقت إنشاء الملف في الجزء الأيسر."
#. IDS_COLDESC_RTIMEC
-#: Merge.rc:4767
+#: Merge.rc:4777
msgid "Right side creation time."
msgstr "وقت إنشاء الملف في الجزء الأيمن."
#. IDS_COLDESC_MTIMEC
-#: Merge.rc:4768
+#: Merge.rc:4778
msgid "Middle side creation time."
msgstr "وقت إنشاء الملف في الجزء الأوسط."
#. IDS_COLDESC_NEWER
-#: Merge.rc:4769
+#: Merge.rc:4779
msgid "Tells which side has newer modification date."
msgstr "يحدد أي جانب لديه تاريخ تعديل أحدث."
#. IDS_COLDESC_LVERSION
-#: Merge.rc:4770
+#: Merge.rc:4780
msgid "Left side file version, only for some file types."
msgstr "إصدار الملف في الجانب الأيسر، فقط لبعض أنواع الملفات."
#. IDS_COLDESC_RVERSION
-#: Merge.rc:4771
+#: Merge.rc:4781
msgid "Right side file version, only for some file types."
msgstr "إصدار الملف في الجانب الأيمن، فقط لبعض أنواع الملفات."
#. IDS_COLDESC_MVERSION
-#: Merge.rc:4776
+#: Merge.rc:4786
msgid "Middle side file version, only for some file types."
msgstr "إصدار الملف في الجانب الأوسط، فقط لبعض أنواع الملفات."
#. IDS_COLDESC_RESULT_ABBR
-#: Merge.rc:4777
+#: Merge.rc:4787
msgid "Short comparison result."
msgstr "نتائج المقارنة المختصرة."
#. IDS_COLDESC_LATTRIBUTES
-#: Merge.rc:4778
+#: Merge.rc:4788
msgid "Left side attributes."
msgstr "سمات الملف في الجزء الأيسر."
#. IDS_COLDESC_RATTRIBUTES
-#: Merge.rc:4779
+#: Merge.rc:4789
msgid "Right side attributes."
msgstr "سمات الملف في الجزء الأيمن."
#. IDS_COLDESC_MATTRIBUTES
-#: Merge.rc:4780
+#: Merge.rc:4790
msgid "Middle side attributes."
msgstr "سمات الملف في الجزء الأوسط."
#. IDS_COLDESC_LEOL_TYPE
-#: Merge.rc:4781
+#: Merge.rc:4791
msgid "Left side file EOL type."
msgstr "نوع رمز نهاية السطر (EOL) في الجزء الأيسر."
#. IDS_COLDESC_REOL_TYPE
-#: Merge.rc:4782
+#: Merge.rc:4792
msgid "Right side file EOL type."
msgstr "نوع رمز نهاية السطر (EOL) في الجزء الأيمن."
#. IDS_COLDESC_MEOL_TYPE
-#: Merge.rc:4783
+#: Merge.rc:4793
msgid "Middle side file EOL type."
msgstr "نوع رمز نهاية السطر (EOL) في الجزء الأوسط."
#. IDS_COLDESC_LENCODING
-#: Merge.rc:4789
+#: Merge.rc:4799
msgid "Left side encoding."
msgstr "ترميز الملف في الجزء الأيسر."
#. IDS_COLDESC_RENCODING
-#: Merge.rc:4790
+#: Merge.rc:4800
msgid "Right side encoding."
msgstr "ترميز الملف في الجزء الأيمن."
#. IDS_COLDESC_MENCODING
-#: Merge.rc:4791
+#: Merge.rc:4801
msgid "Middle side encoding."
msgstr "ترميز الملف في الجزء الأوسط."
#. IDS_COLDESC_NIDIFFS
-#: Merge.rc:4792
+#: Merge.rc:4802
msgid "Number of ignored differences in file. Ignored and cannot be merged."
msgstr ""
"عدد الاختلافات التي تم تجاهلها في الملف. هذه الاختلافات تم تجاهلها من قبل "
"WinMerge ولا يمكن دمجها."
#. IDS_COLDESC_NSDIFFS
-#: Merge.rc:4793
+#: Merge.rc:4803
msgid "Number of differences in file (excluding ignored)."
msgstr ""
#. IDS_COLDESC_BINARY
-#: Merge.rc:4794
+#: Merge.rc:4804
msgid "Shows an asterisk (*) if the file is binary."
msgstr "ضع علامة النجمة (*) إذا كان الملف ثنائي."
#. IDS_COLDESC_UNPACKER
-#: Merge.rc:4795
+#: Merge.rc:4805
msgid "Unpacker plugin name or pipeline."
msgstr ""
#. IDS_COLDESC_PREDIFFER
-#: Merge.rc:4796
+#: Merge.rc:4806
msgid "Prediffer plugin name or pipeline."
msgstr ""
#. IDS_DIRECTORY_REPORT_TITLE
-#: Merge.rc:4802
+#: Merge.rc:4812
#, c-format
msgid "Compare %1 with %2"
msgstr "قارن بين %1 و %2"
#. IDS_DIRECTORY_REPORT_TITLE3
-#: Merge.rc:4803
+#: Merge.rc:4813
#, c-format
msgid "Compare %1 with %2 and %3"
msgstr ""
#. IDS_REPORT_COMMALIST
-#: Merge.rc:4804
+#: Merge.rc:4814
msgid "Comma-separated list"
msgstr "قائمة مرتبة بالفاصلة"
#. IDS_REPORT_TABLIST
-#: Merge.rc:4805
+#: Merge.rc:4815
msgid "Tab-separated list"
msgstr "قائمة مرتبة بالتاب (Tab)"
#. IDS_REPORT_SIMPLEHTML
-#: Merge.rc:4806
+#: Merge.rc:4816
msgid "Simple HTML"
msgstr "HTML بسيط"
#. IDS_REPORT_SIMPLEXML
-#: Merge.rc:4807
+#: Merge.rc:4817
msgid "Simple XML"
msgstr "XML بسيط"
-#: Merge.rc:4809
+#: Merge.rc:4819
msgid "Report file already exists. Overwrite?"
msgstr "ملف التقرير موجود مسبقا. هل تريد الكتابة فوق الملف الموجود؟"
#. IDS_REPORT_ERROR
-#: Merge.rc:4814
+#: Merge.rc:4824
#, c-format
msgid ""
"Error creating the report:\n"
@@ -6770,73 +6781,73 @@ msgstr ""
"%1"
#. IDS_REPORT_SUCCESS
-#: Merge.rc:4815
+#: Merge.rc:4825
msgid "Report created successfully."
msgstr "تم إنشاء التقرير بنجاح."
#. IDS_SYNCPOINT_LASTBLOCK
-#: Merge.rc:4821
+#: Merge.rc:4831
msgid "Cannot add a synchronization point at this line."
msgstr ""
#. IDS_FILE_TO_ITSELF
-#: Merge.rc:4827
+#: Merge.rc:4837
msgid "Same file is opened in both panes."
msgstr "تم فتح نفس الملف في كلا الخانتين."
#. IDS_FILESSAME
-#: Merge.rc:4828
+#: Merge.rc:4838
msgid "Selected files are identical."
msgstr "الملفات التي تم اختيارها متطابقة."
#. IDS_FILESSAME_CURCFG
-#: Merge.rc:4829
+#: Merge.rc:4839
msgid "Selected files are identical (with current settings).\r\nChecking binary identity..."
msgstr ""
#. IDS_FILESSAME_BINERROR
-#: Merge.rc:4830
+#: Merge.rc:4840
msgid "Selected files are identical (with current settings).\r\nBut binary comparison failed."
msgstr ""
#. IDS_FILESSAME_BINSAME
-#: Merge.rc:4831
+#: Merge.rc:4841
msgid "Selected files are identical (binary match)."
msgstr ""
#. IDS_FILESSAME_BINDIFF
-#: Merge.rc:4832
+#: Merge.rc:4842
msgid "Selected files are identical (with current settings).\r\nBut differ at the binary level."
msgstr ""
#. IDS_FILEERROR
-#: Merge.rc:4833
+#: Merge.rc:4843
msgid "An error occurred while comparing files."
msgstr "حدث خطأ أثناء مقارنة الملفات."
#. IDS_TEMP_FILEERROR
-#: Merge.rc:4834
+#: Merge.rc:4844
msgid ""
"Could not create temporary files. Check your temporary path settings."
msgstr "لا يمكن إنشاء ملفات مؤقتة. تحقق من إعدادات المسار الملفات المؤقتة."
#. IDS_SUGGEST_IGNOREEOL
-#: Merge.rc:4835
+#: Merge.rc:4845
msgid "Files use different EOL.\n\nTreat all EOL as equivalent?\n\nSet 'Ignore EOL differences (Windows/Unix/Mac)' in Compare section of Options."
msgstr ""
#. IDS_INVALID_DIRECTORY
-#: Merge.rc:4836
+#: Merge.rc:4846
msgid "Selected folder is invalid."
msgstr "المجلد الذي قمت باختياره غير صالح."
#. IDS_CANNOT_OPEN_BINARYFILE
-#: Merge.rc:4837
+#: Merge.rc:4847
msgid "Cannot open a binary file in Editor."
msgstr "لا يمكن فتح الملف الثنائي من المحرر."
#. IDS_CREATE_PAIR_FOLDER
-#: Merge.rc:4838
+#: Merge.rc:4848
#, c-format
msgid "Create matching folder:\n%1\non the other side and open?"
msgstr ""
@@ -6847,41 +6858,41 @@ msgstr ""
"في الجهة الأخرى وفتح هذه المجلدات؟"
#. IDS_CONFIRM_COPY_ALL_DIFFS
-#: Merge.rc:4839
+#: Merge.rc:4849
msgid "Copy all differences to other file?"
msgstr ""
#. IDS_MOVE_TO_NEXTFILE
-#: Merge.rc:4844
+#: Merge.rc:4854
msgid "Move to next file?"
msgstr "هل تريد الإنتقال إلى الملف التالي؟"
#. IDS_MOVE_TO_PREVFILE
-#: Merge.rc:4845
+#: Merge.rc:4855
msgid "Move to previous file?"
msgstr "هل تريد العودة إلى الملف السابق؟"
#. IDS_MOVE_TO_NEXTPAGE
-#: Merge.rc:4846
+#: Merge.rc:4856
msgid "Move to next page?"
msgstr "هل تريد الإنتقال إلى الصفحة التالية؟"
#. IDS_MOVE_TO_PREVPAGE
-#: Merge.rc:4847
+#: Merge.rc:4857
msgid "Move to previous page?"
msgstr "هل تريد العودة إلى الصفحة السابقة؟"
#. IDS_MOVE_TO_FIRSTFILE
-#: Merge.rc:4848
+#: Merge.rc:4858
msgid "Move to first file?"
msgstr ""
#. IDS_MOVE_TO_LASTFILE
-#: Merge.rc:4849
+#: Merge.rc:4859
msgid "Move to last file?"
msgstr ""
-#: Merge.rc:4856
+#: Merge.rc:4866
#, c-format
msgid "Different codepages: left (cp%d), right (cp%d).\nDisplay in codepage (better display) or default Windows codepage (safer merging)?\n(Recommended: default Windows codepage)"
msgstr ""
@@ -6892,53 +6903,53 @@ msgstr ""
"هل ترغب في مع التعامل مع كلا الملفين باستخدام صفحة الترميز الافتراضية الخاصة "
"بويندوز (ينصح بهذا الإجراء)؟"
-#: Merge.rc:4858
+#: Merge.rc:4868
msgid "Information lost due to encoding errors: both files"
msgstr "المعلومات فقدت بسبب أخطاء في الترميز: كلا الملفين"
-#: Merge.rc:4860
+#: Merge.rc:4870
msgid "Information lost due to encoding errors: first file"
msgstr "المعلومات فقدت بسبب أخطاء في الترميز: الملف الأول"
-#: Merge.rc:4862
+#: Merge.rc:4872
msgid "Information lost due to encoding errors: second file"
msgstr "المعلومات فقدت بسبب أخطاء في الترميز: الملف الثاني"
-#: Merge.rc:4864
+#: Merge.rc:4874
msgid "Information lost due to encoding errors: third file"
msgstr "المعلومات فقدت بسبب أخطاء في الترميز: الملف الثالث"
#. IDS_LINEDIFF_NODIFF
-#: Merge.rc:4870
+#: Merge.rc:4880
msgid "No difference"
msgstr "لا اختلافات"
#. IDS_LINEDIFF_NODIFF_CAPTION
-#: Merge.rc:4871
+#: Merge.rc:4881
msgid "Line difference"
msgstr "الاختلاف في السطر"
#. IDS_NUM_REPLACED
-#: Merge.rc:4877
+#: Merge.rc:4887
#, c-format
msgid "Replaced %1 string(s)."
msgstr "تم اتسبدال %1 سطر."
#. IDS_EDIT_TEXT_NOT_FOUND
-#: Merge.rc:4878
+#: Merge.rc:4888
#, c-format
msgid "Cannot find string \"%s\"."
msgstr "لا يمكن ايجاد السطر \"%s\"."
#. IDS_MERGE_MODE
-#: Merge.rc:4884
+#: Merge.rc:4894
msgid "Entering Merge Mode. Press F9 to turn off."
msgstr ""
"أنت الآن تدخل وضع الدمج. إذا كنت ترغب في إيقاف تشغيل وضع الدمج، قم بالضغط "
"على المفتاح F9."
#. IDS_AUTO_MERGE
-#: Merge.rc:4890
+#: Merge.rc:4900
#, c-format
msgid ""
"Automatic merges: %1\n"
@@ -6948,99 +6959,99 @@ msgstr ""
"عدد حالات التضارب التي تم حلها: %2"
#. IDS_CODEPAGE_MERGED
-#: Merge.rc:4891
+#: Merge.rc:4901
msgid "Codepage change merged."
msgstr "التغيير في صحفة الترميز تم دمجها."
#. IDS_CODEPAGE_CONFLICT
-#: Merge.rc:4892
+#: Merge.rc:4902
msgid "Codepage changes are conflicting."
msgstr "التغييرات في صفحة الترميز متضاربة."
#. IDS_EOL_MERGED
-#: Merge.rc:4893
+#: Merge.rc:4903
msgid "EOL change merged."
msgstr "التغييرات في رمز آخر السطر (EOL) تم دمجه."
#. IDS_EOL_CONFLICT
-#: Merge.rc:4894
+#: Merge.rc:4904
msgid "EOL changes are conflicting."
msgstr "التغييرات في رمز آخر السطر (EOL) متضاربة."
#. IDS_LOCBAR_CAPTION
-#: Merge.rc:4900
+#: Merge.rc:4910
msgid "Location Pane"
msgstr "الجزء الخاص بالموقع"
#. IDS_DIFFBAR_CAPTION
-#: Merge.rc:4901
+#: Merge.rc:4911
msgid "Diff Pane"
msgstr "الجزء الخاص بأداة مقارنة الملفات Diff"
#. IDS_DIFF_SUCCEEDED
-#: Merge.rc:4908
+#: Merge.rc:4918
msgid "Patch file written."
msgstr "ملف التصحيح (Patch) تم كتابتة بنجاح."
#. IDS_DIFF_ITEM1NOTFOUND
-#: Merge.rc:4909
+#: Merge.rc:4919
msgid "First item not found!"
msgstr ""
#. IDS_DIFF_ITEM2NOTFOUND
-#: Merge.rc:4910
+#: Merge.rc:4920
msgid "Second item not found!"
msgstr ""
#. IDS_DIFF_FILEOVERWRITE
-#: Merge.rc:4911
+#: Merge.rc:4921
msgid "Patch file already exists. Overwrite?"
msgstr "ملف التصحيح موجود مسبقا. هل تريد الكتابة عليه؟"
#. IDS_DIFF_SELECTEDFILES
-#: Merge.rc:4912
+#: Merge.rc:4922
#, c-format
msgid "[%1 files selected]"
msgstr "[%1 ملفات تم تحديدها]"
#. IDS_DIFF_NORMAL
-#: Merge.rc:4913
+#: Merge.rc:4923
msgid "Normal"
msgstr "عادي"
#. IDS_DIFF_CONTEXT
-#: Merge.rc:4914
+#: Merge.rc:4924
msgid "Context"
msgstr "حسب السياق"
#. IDS_DIFF_UNIFIED
-#: Merge.rc:4915
+#: Merge.rc:4925
msgid "Unified"
msgstr "موحد"
#. IDS_FILEWRITE_ERROR
-#: Merge.rc:4917
+#: Merge.rc:4927
#, c-format
msgid "Could not write to file %1."
msgstr "لا يمكن الكتابة في الملف %1."
#. IDS_PATH_NOT_ABSOLUTE
-#: Merge.rc:4918
+#: Merge.rc:4928
#, c-format
msgid "Output path is not absolute: %1"
msgstr "المسار المحدد للإخراج ليس مسارا مطلقا: %1"
#. IDS_MUST_SPECIFY_OUTPUT
-#: Merge.rc:4919
+#: Merge.rc:4929
msgid "Specify an output file."
msgstr "حدد مجلد للإخراج."
-#: Merge.rc:4921
+#: Merge.rc:4931
msgid "Cannot create patch from binary files."
msgstr "لا يمكن إنشاء ملف تصحيح من ملفات ثنائية."
#. IDS_SAVEFILES_FORPATCH
-#: Merge.rc:4922
+#: Merge.rc:4932
msgid ""
"Save all files first.\n"
"\n"
@@ -7051,12 +7062,12 @@ msgstr ""
"إنشاء ملف تصحيح يتطلب عدم وجود أي تغييرات غير محفوظة في الملفات."
#. IDS_FOLDER_NOTEXIST
-#: Merge.rc:4923
+#: Merge.rc:4933
msgid "Folder does not exist."
msgstr "المجلد غير موجود."
#. IDS_NO_ZIP_SUPPORT
-#: Merge.rc:4928
+#: Merge.rc:4938
msgid "Archive support not enabled.\n7-Zip and/or Merge7z*.dll not found.\nSee manual for archive support."
msgstr ""
"دعم الملفات المؤرشفة غير مفعل.\n"
@@ -7066,37 +7077,37 @@ msgstr ""
"تفعيلها."
#. IDS_OPT_EXPORT_CAPTION
-#: Merge.rc:4929
+#: Merge.rc:4939
msgid "Select file for export"
msgstr "قم باختيار الملف للتصدير"
#. IDS_OPT_IMPORT_CAPTION
-#: Merge.rc:4930
+#: Merge.rc:4940
msgid "Select file for import"
msgstr "قم باختيار الملف للإستيراد"
#. IDS_OPT_IMPORT_DONE
-#: Merge.rc:4931
+#: Merge.rc:4941
msgid "Options imported from file."
msgstr "الخيارات مستوردة من الملف."
#. IDS_OPT_EXPORT_DONE
-#: Merge.rc:4932
+#: Merge.rc:4942
msgid "Options exported to file."
msgstr "الخيارات مصدرة إلى الملف."
#. IDS_OPT_IMPORT_ERR
-#: Merge.rc:4933
+#: Merge.rc:4943
msgid "Failed to import options from file."
msgstr "فشل في استيراد الخيارات من الملف."
#. IDS_OPT_EXPORT_ERR
-#: Merge.rc:4934
+#: Merge.rc:4944
msgid "Failed to write options to file."
msgstr "فشل في الكتابة الخيارات إلى الملف."
#. IDS_CLOSEALL_WINDOWS
-#: Merge.rc:4935
+#: Merge.rc:4945
msgid ""
"Close multiple compare windows?\n"
"\n"
@@ -7107,44 +7118,44 @@ msgstr ""
"هل ترغب في الاستمرار؟"
#. IDS_EOL_MIXED
-#: Merge.rc:4944
+#: Merge.rc:4954
msgid "Mixed"
msgstr "مختلط"
#. IDS_EOL_BIN
-#: Merge.rc:4945
+#: Merge.rc:4955
msgctxt "EOL Type"
msgid "Binary"
msgstr "ثنائي"
#. IDS_EOL_NONE
-#: Merge.rc:4949
+#: Merge.rc:4959
msgid "None"
msgstr "لا يوجد"
#. IDS_MARKER_COLOR_FMT
-#: Merge.rc:4950
+#: Merge.rc:4960
#, c-format
msgid "Marker Color %d"
msgstr ""
#. IDS_MARKER_NEW_PATTERN
-#: Merge.rc:4951
+#: Merge.rc:4961
msgid "New Pattern"
msgstr ""
#. IDS_PLUGINSLIST_TYPE
-#: Merge.rc:4957
+#: Merge.rc:4967
msgid "Type"
msgstr "النوع"
#. IDS_PLUGINS_TYPE_EDITSCRIPT
-#: Merge.rc:4961
+#: Merge.rc:4971
msgid "Editor script"
msgstr "محرر اللغة النصية (سكريبت)"
#. ID_SELECTLINEDIFF
-#: Merge.rc:4967
+#: Merge.rc:4977
msgid ""
"\n"
"Difference in Current Line (F4)"
@@ -7153,7 +7164,7 @@ msgstr ""
"الاختلاف في السطر الحالي (F4)"
#. ID_OPTIONS
-#: Merge.rc:4968
+#: Merge.rc:4978
msgid ""
"\n"
"Options"
@@ -7162,7 +7173,7 @@ msgstr ""
"الخيارات"
#. ID_REFRESH
-#: Merge.rc:4969
+#: Merge.rc:4979
msgid ""
"\n"
"Refresh (F5)"
@@ -7171,7 +7182,7 @@ msgstr ""
"تحديث (F5)"
#. ID_PREVDIFF
-#: Merge.rc:4975
+#: Merge.rc:4985
msgid ""
"\n"
"Previous Difference (Alt+Up)"
@@ -7180,7 +7191,7 @@ msgstr ""
"الاختلاف السابق (Alt+Up)"
#. ID_NEXTDIFF
-#: Merge.rc:4976
+#: Merge.rc:4986
msgid ""
"\n"
"Next Difference (Alt+Down)"
@@ -7189,7 +7200,7 @@ msgstr ""
"الاختلاف التالي (Alt+Down)"
#. ID_PREVCONFLICT
-#: Merge.rc:4977
+#: Merge.rc:4987
msgid ""
"\n"
"Previous Conflict (Alt+Shift+Up)"
@@ -7198,7 +7209,7 @@ msgstr ""
"التضارب السابق (Alt+Shift+Up)"
#. ID_NEXTCONFLICT
-#: Merge.rc:4978
+#: Merge.rc:4988
msgid ""
"\n"
"Next Conflict (Alt+Shift+Down)"
@@ -7207,7 +7218,7 @@ msgstr ""
"التضارب التالي (Alt+Shift+Down)"
#. ID_FIRSTDIFF
-#: Merge.rc:4983
+#: Merge.rc:4993
msgid ""
"\n"
"First Difference (Alt+Home)"
@@ -7216,7 +7227,7 @@ msgstr ""
"الاختلاف الأول (Alt+Home)"
#. ID_CURDIFF
-#: Merge.rc:4984
+#: Merge.rc:4994
msgid ""
"\n"
"Current Difference (Alt+Enter)"
@@ -7225,7 +7236,7 @@ msgstr ""
"الاختلاف الحالي (Alt+Enter)"
#. ID_LASTDIFF
-#: Merge.rc:4985
+#: Merge.rc:4995
msgid ""
"\n"
"Last Difference (Alt+End)"
@@ -7234,37 +7245,37 @@ msgstr ""
"الاختلاف الأخير (Alt+End)"
#. ID_L2R
-#: Merge.rc:4986
+#: Merge.rc:4996
msgid "\nCopy to Right (Alt+Right)"
msgstr "\nالنسخ لليمين (Alt+Right)"
#. ID_R2L
-#: Merge.rc:4987
+#: Merge.rc:4997
msgid "\nCopy to Left (Alt+Left)"
msgstr "\nالنسخ لليسار (Alt+Left)"
#. ID_L2RNEXT
-#: Merge.rc:4988
+#: Merge.rc:4998
msgid "\nCopy to Right and Advance (Ctrl+Alt+Right)"
msgstr "\nالنسخ لليمين والتقدم (Ctrl+Alt+Right)"
#. ID_R2LNEXT
-#: Merge.rc:4989
+#: Merge.rc:4999
msgid "\nCopy to Left and Advance (Ctrl+Alt+Left)"
msgstr "\nالنسخ لليسار والتقدم (Ctrl+Alt+Left)"
#. ID_ALL_RIGHT
-#: Merge.rc:4990
+#: Merge.rc:5000
msgid "\nCopy All to Right"
msgstr "\nنسخ الكل إلى الجزء الأيمن"
#. ID_ALL_LEFT
-#: Merge.rc:4991
+#: Merge.rc:5001
msgid "\nCopy All to Left"
msgstr "\nنسخ الكل إلى الجزء الأيسر"
#. ID_AUTO_MERGE
-#: Merge.rc:4992
+#: Merge.rc:5002
msgid ""
"\n"
"Auto Merge (Ctrl+Alt+M)"
@@ -7273,58 +7284,58 @@ msgstr ""
"الدمج التلقائي (Ctrl+Alt+M)"
#. ID_FIRSTFILE
-#: Merge.rc:4993
+#: Merge.rc:5003
msgid "\nFirst File"
msgstr ""
#. ID_NEXTFILE
-#: Merge.rc:4994
+#: Merge.rc:5004
msgid "\nNext File (Ctrl+F8)"
msgstr ""
#. ID_LASTFILE
-#: Merge.rc:4995
+#: Merge.rc:5005
msgid "\nLast File"
msgstr ""
#. ID_PREVFILE
-#: Merge.rc:4996
+#: Merge.rc:5006
msgid "\nPrevious File (Ctrl+F7)"
msgstr ""
#. IDS_UNPACK_AUTO
-#: Merge.rc:5003
+#: Merge.rc:5013
msgid "Adapted unpacker applied to both files (one needs extension)."
msgstr ""
"أداة فك الحزمة المختارة يتم تطبيقه لكلا الملفين (ملف واحد فقط يحتاج للإمتداد)."
#. IDS_NO_PREDIFFER
-#: Merge.rc:5004
+#: Merge.rc:5014
msgid "No Prediffer (Normal)"
msgstr "لا اختلافات مسبقة (عادي)"
#. IDS_SUGGESTED_PLUGINS
-#: Merge.rc:5005
+#: Merge.rc:5015
msgid "Suggested Plugins"
msgstr "الإضافات المقترحة"
#. IDS_NOT_SUGGESTED_PLUGINS
-#: Merge.rc:5006
+#: Merge.rc:5016
msgid "All Plugins"
msgstr ""
#. IDS_PRIVATEBUILD_FMT
-#: Merge.rc:5012
+#: Merge.rc:5022
#, c-format
msgid "Private Build: %1"
msgstr "نسخة خاصة: %1"
#. IDS_CHECKFORUPDATES_UPTODATE
-#: Merge.rc:5013
+#: Merge.rc:5023
msgid "Your software is up to date."
msgstr "البرنامج محدث إلى آخر إصدار."
-#: Merge.rc:5015
+#: Merge.rc:5025
#, c-format
msgid ""
"WinMerge update available.\n"
@@ -7334,125 +7345,125 @@ msgstr ""
"%1 متوفرة الآن (النسخة الحالية %2). هل ترغب في تنزيلها الآن؟"
#. IDS_ALLRIGHTS_RESERVED
-#: Merge.rc:5016
+#: Merge.rc:5026
msgid " - All rights reserved."
msgstr ""
#. IDS_CHECKFORUPDATES_FAILED
-#: Merge.rc:5021
+#: Merge.rc:5031
msgid "Failed to download latest version information"
msgstr "فشل في تنزيل معلومات آخر إصدار"
#. IDS_TITLE_PLUGINS_SETTINGS
-#: Merge.rc:5027
+#: Merge.rc:5037
msgid "Plugin Settings"
msgstr "إعدادات الإضافات"
#. IDS_NO_SCT_SCRIPTS
-#: Merge.rc:5029
+#: Merge.rc:5039
msgid "WSH not found - .sct scripts disabled"
msgstr "WSH غير موجود - .sct سكربت معطل"
#. IDS_LOCBAR_GOTOLINE_FMT
-#: Merge.rc:5037
+#: Merge.rc:5047
#, c-format
msgid "G&o to Line %1"
msgstr "إ&ذهب إلى السطر %1"
#. IDS_GOTO_MOVED_LINE
-#: Merge.rc:5043
+#: Merge.rc:5053
msgid "Go to Moved Line\tCtrl+Shift+G"
msgstr ""
#. IDS_AUTOCOMPLETE_DISABLED
-#: Merge.rc:5049
+#: Merge.rc:5059
msgctxt "Options dialog|General|Open dialog Auto completion"
msgid "Disabled"
msgstr ""
#. IDS_AUTOCOMPLETE_FILE_SYS
-#: Merge.rc:5050
+#: Merge.rc:5060
msgid "From file system"
msgstr "من ملف النظام"
#. IDS_AUTOCOMPLETE_MRU
-#: Merge.rc:5051
+#: Merge.rc:5061
msgid "From Most Recently Used list"
msgstr "من قائمة MRU"
#. IDS_COLORSCHEME_PLAIN
-#: Merge.rc:5057
+#: Merge.rc:5067
msgid "No Highlighting"
msgstr "بدون تظليل"
#. IDS_COLORSCHEME_BATCH
-#: Merge.rc:5063
+#: Merge.rc:5073
msgid "Batch"
msgstr "متتالي"
#. IDS_COLORSCHEME_PO
-#: Merge.rc:5090
+#: Merge.rc:5100
msgid "Portable Object"
msgstr "Portable Object"
#. IDS_COLORSCHEME_RSRC
-#: Merge.rc:5094
+#: Merge.rc:5104
msgid "Resources"
msgstr "Resources"
#. IDS_COLORSCHEME_SH
-#: Merge.rc:5098
+#: Merge.rc:5108
msgid "Shell"
msgstr "Shell"
#. IDS_CLOSE_LEFT_TABS
-#: Merge.rc:5115
+#: Merge.rc:5125
msgid "Close &Left Tabs"
msgstr "إ&غلاق التبويبات في الجزء الأيسر"
#. IDS_CLOSE_RIGHT_TABS
-#: Merge.rc:5116
+#: Merge.rc:5126
msgid "Close R&ight Tabs"
msgstr "إغ&لاق التبويبات في الجزء الأيمن"
#. IDS_CLOSE_OTHER_TABS
-#: Merge.rc:5117
+#: Merge.rc:5127
msgid "Close &Other Tabs"
msgstr "إغلا&ق التبويبات الأخرى"
#. IDS_TABBAR_AUTO_MAXWIDTH
-#: Merge.rc:5118
+#: Merge.rc:5128
msgid "Enable &Auto Max Width"
msgstr "&تفعيل النطاق الأقصى التلقائي"
#. IDS_WEBPAGE_MENU
-#: Merge.rc:5128
+#: Merge.rc:5138
msgid "We&bpage"
msgstr ""
#. IDS_VIEW_WRAP_TEXT
-#: Merge.rc:5133
+#: Merge.rc:5143
msgid "W&rap Text"
msgstr ""
#. IDS_NOTINSTALLED
-#: Merge.rc:5138
+#: Merge.rc:5148
msgid "%1 is not installed."
msgstr "المحرر %1 غير مثبت."
#. IDS_CREATE_FOLDER
-#: Merge.rc:5143
+#: Merge.rc:5153
#, c-format
msgid "%1 does not exist. Create it?"
msgstr "%1 غير موجود. هل تريد إنشائه؟"
#. IDS_CREATE_FOLDER_ERROR
-#: Merge.rc:5144
+#: Merge.rc:5154
msgid "Failed to create folder."
msgstr "فشل في إنشاء المجلد."
#. IDC_EXT_EDITOR_PATH
-#: Merge.rc:5149
+#: Merge.rc:5159
msgid ""
"Parameters:\n"
"$file: Current file path\n"
@@ -7463,878 +7474,883 @@ msgstr ""
"$linenum: رقم السطر لموضع المؤشر الحالي"
#. IDS_DIFF_ALGORITHM_DEFAULT
-#: Merge.rc:5154
+#: Merge.rc:5164
msgid "default"
msgstr ""
#. IDS_DIFF_ALGORITHM_MINIMAL
-#: Merge.rc:5155
+#: Merge.rc:5165
msgid "minimal"
msgstr ""
#. IDS_DIFF_ALGORITHM_PATIENCE
-#: Merge.rc:5156
+#: Merge.rc:5166
msgid "patience"
msgstr ""
#. IDS_DIFF_ALGORITHM_HISTOGRAM
-#: Merge.rc:5157
+#: Merge.rc:5167
msgid "histogram"
msgstr ""
#. IDS_DIFF_ALGORITHM_NONE
-#: Merge.rc:5158
+#: Merge.rc:5168
msgid "none"
msgstr ""
#. IDS_RENDERING_MODE_GDI
-#: Merge.rc:5163
+#: Merge.rc:5173
msgid "GDI"
msgstr ""
#. IDS_RENDERING_MODE_DIRECTWRITE_DEFAULT
-#: Merge.rc:5164
+#: Merge.rc:5174
msgid "DirectWrite Default"
msgstr ""
#. IDS_RENDERING_MODE_DIRECTWRITE_ALIASED
-#: Merge.rc:5165
+#: Merge.rc:5175
msgid "DirectWrite Aliased"
msgstr ""
#. IDS_RENDERING_MODE_DIRECTWRITE_GDI_CLASSIC
-#: Merge.rc:5166
+#: Merge.rc:5176
msgid "DirectWrite GDI Classic"
msgstr ""
#. IDS_RENDERING_MODE_DIRECTWRITE_GDI_NATURAL
-#: Merge.rc:5167
+#: Merge.rc:5177
msgid "DirectWrite GDI Natural"
msgstr ""
#. IDS_RENDERING_MODE_DIRECTWRITE_NATURAL
-#: Merge.rc:5168
+#: Merge.rc:5178
msgid "DirectWrite Natural"
msgstr ""
#. IDS_RENDERING_MODE_DIRECTWRITE_NATURAL_SYMMETRIC
-#: Merge.rc:5169
+#: Merge.rc:5179
msgid "DirectWrite Natural Symmetric"
msgstr ""
#. IDS_CLOSE_WINDOWS_WITH_ESC_DISABLED
-#: Merge.rc:5174
+#: Merge.rc:5184
msgctxt "Options dialog|General|Close windows with Esc"
msgid "Disabled"
msgstr ""
#. IDS_CLOSE_WINDOWS_WITH_ESC_1
-#: Merge.rc:5175
+#: Merge.rc:5185
msgid "MDI child window or main window"
msgstr ""
#. IDS_CLOSE_WINDOWS_WITH_ESC_2
-#: Merge.rc:5176
+#: Merge.rc:5186
msgid "MDI child window only"
msgstr ""
#. IDS_CLOSE_WINDOWS_WITH_ESC_3
-#: Merge.rc:5177
+#: Merge.rc:5187
msgid "Close main window if only one MDI child window"
msgstr ""
#. IDS_DIFF_GROUP
-#: Merge.rc:5182
+#: Merge.rc:5192
msgctxt "ImgMergeFrame|LocationPane"
msgid "Diff"
msgstr ""
#. IDS_DIFF_HIGHLIGHT
-#: Merge.rc:5183
+#: Merge.rc:5193
msgctxt "ImgMergeFrame|LocationPane"
msgid "Highlight"
msgstr ""
#. IDS_DIFF_BLINK
-#: Merge.rc:5184
+#: Merge.rc:5194
msgctxt "ImgMergeFrame|LocationPane"
msgid "Blink"
msgstr ""
#. IDS_DIFF_BLOCKSIZE
-#: Merge.rc:5185
+#: Merge.rc:5195
msgctxt "ImgMergeFrame|LocationPane"
msgid "Block Size"
msgstr ""
#. IDS_DIFF_BLOCKALPHA
-#: Merge.rc:5186
+#: Merge.rc:5196
msgctxt "ImgMergeFrame|LocationPane"
msgid "Block Alpha"
msgstr ""
#. IDS_DIFF_CDTHRESHOLD
-#: Merge.rc:5187
+#: Merge.rc:5197
msgctxt "ImgMergeFrame|LocationPane"
msgid "CD Threshold"
msgstr ""
#. IDS_DIFF_INSERTION_DELETION_DETECTION
-#: Merge.rc:5188
+#: Merge.rc:5198
msgctxt "ImgMergeFrame|LocationPane"
msgid "Ins/Del Detection"
msgstr ""
#. IDS_OVERLAY_MODE_NONE
-#: Merge.rc:5189 Merge.rc:5194
+#: Merge.rc:5199 Merge.rc:5204
msgctxt "ImgMergeFrame|LocationPane"
msgid "None"
msgstr ""
#. IDS_DIFF_INSERTION_DELETION_DETECTION_VERTICAL
-#: Merge.rc:5190
+#: Merge.rc:5200
msgctxt "ImgMergeFrame|LocationPane"
msgid "Vertical"
msgstr ""
#. IDS_DIFF_INSERTION_DELETION_DETECTION_HORIZONTAL
-#: Merge.rc:5191
+#: Merge.rc:5201
msgctxt "ImgMergeFrame|LocationPane"
msgid "Horizontal"
msgstr ""
#. IDS_OVERLAY_GROUP
-#: Merge.rc:5192
+#: Merge.rc:5202
msgctxt "ImgMergeFrame|LocationPane"
msgid "Overlay"
msgstr ""
#. IDS_OVERLAY_ALPHA
-#: Merge.rc:5193
+#: Merge.rc:5203
msgctxt "ImgMergeFrame|LocationPane"
msgid "Alpha"
msgstr ""
#. IDS_OVERLAY_MODE_XOR
-#: Merge.rc:5195
+#: Merge.rc:5205
msgctxt "ImgMergeFrame|LocationPane"
msgid "XOR"
msgstr ""
#. IDS_OVERLAY_MODE_ALPHA
-#: Merge.rc:5196
+#: Merge.rc:5206
msgctxt "ImgMergeFrame|LocationPane"
msgid "Alpha Blend"
msgstr ""
#. IDS_OVERLAY_MODE_ALPHA_ANIMATION
-#: Merge.rc:5197
+#: Merge.rc:5207
msgctxt "ImgMergeFrame|LocationPane"
msgid "Alpha Animation"
msgstr ""
#. IDS_ZOOM
-#: Merge.rc:5198
+#: Merge.rc:5208
msgctxt "ImgMergeFrame|LocationPane"
msgid "Zoom"
msgstr ""
#. IDS_PAGE
-#: Merge.rc:5199
+#: Merge.rc:5209
msgctxt "ImgMergeFrame|LocationPane"
msgid "Page:"
msgstr ""
#. IDS_IMGCMP_STATUS_PT_RGBA_FMT
-#: Merge.rc:5200
+#: Merge.rc:5210
#, c-format
msgid "Pt: (%d, %d) RGBA: (%d, %d, %d, %d) "
msgstr ""
#. IDS_IMGCMP_STATUS_DIST1_FMT
-#: Merge.rc:5201
+#: Merge.rc:5211
#, c-format
msgid "Dist: %g "
msgstr ""
#. IDS_IMGCMP_STATUS_DIST2_FMT
-#: Merge.rc:5202
+#: Merge.rc:5212
#, c-format
msgid "Dist: %g, %g "
msgstr ""
#. IDS_IMGCMP_STATUS_PAGE_ZOOM_SIZE_BPP_FMT
-#: Merge.rc:5203
+#: Merge.rc:5213
#, c-format
msgid "Page: %d/%d Zoom: %d%% %dx%dpx %dbpp "
msgstr ""
#. IDS_IMGCMP_STATUS_RC_FMT
-#: Merge.rc:5204
+#: Merge.rc:5214
#, c-format
msgid "Rc: (%d, %d) "
msgstr ""
#. IDS_IMGCMP_STATUS_FLIPPED_FMT
-#: Merge.rc:5205
+#: Merge.rc:5215
#, c-format
msgid "Flipped: %s "
msgstr ""
#. IDS_IMGCMP_STATUS_ROTATED_FMT
-#: Merge.rc:5206
+#: Merge.rc:5216
#, c-format
msgid "Rotated: %d "
msgstr ""
#. IDS_IMGCMP_REPORT_ALLPAGES
-#: Merge.rc:5207
+#: Merge.rc:5217
msgid "All pages"
msgstr ""
#. IDS_IGNSUB_STR1
-#: Merge.rc:5212
+#: Merge.rc:5222
msgid ""
msgstr ""
#. IDS_IGNSUB_STR2
-#: Merge.rc:5213
+#: Merge.rc:5223
msgid "No differences found to select"
msgstr ""
#. IDS_IGNSUB_STR3
-#: Merge.rc:5214
+#: Merge.rc:5224
msgid "No differences found to add as substitution filter"
msgstr ""
#. IDS_IGNSUB_STR4
-#: Merge.rc:5215
+#: Merge.rc:5225
msgid "The pair is already in the Substitution Filters list"
msgstr ""
#. IDS_IGNSUB_STR5
-#: Merge.rc:5216
+#: Merge.rc:5226
msgid "Add this change to Substitution Filters?"
msgstr ""
#. IDS_OCRRESULT_TEXTONLY
-#: Merge.rc:5221
+#: Merge.rc:5231
msgid "Text only"
msgstr ""
#. IDS_OCRRESULT_POS_LINE
-#: Merge.rc:5222
+#: Merge.rc:5232
msgid "Line-by-line position and text"
msgstr ""
#. IDS_OCRRESULT_POS_WORD
-#: Merge.rc:5223
+#: Merge.rc:5233
msgid "Word-by-word position and text"
msgstr ""
#. IDS_USERDATAFOLDER_APPDATA
-#: Merge.rc:5228
+#: Merge.rc:5238
msgid "AppData (Roaming) folder"
msgstr ""
#. IDS_USERDATAFOLDER_INSTALL
-#: Merge.rc:5229
+#: Merge.rc:5239
msgid "Install folder"
msgstr ""
#. IDS_USERDATAFOLDER_DOCUMENTS
-#: Merge.rc:5230
+#: Merge.rc:5240
msgid "Documents folder"
msgstr ""
#. IDS_SINGLEINSTANCE_DISABLED
-#: Merge.rc:5235
+#: Merge.rc:5245
msgctxt "Options dialog|General|Single instance mode"
msgid "Disabled"
msgstr ""
#. IDS_SINGLEINSTANCE_STR1
-#: Merge.rc:5236
+#: Merge.rc:5246
msgid "Allow only one instance to run"
msgstr "السماح بتشغيل عنصر واحد فقط"
#. IDS_SINGLEINSTANCE_STR2
-#: Merge.rc:5237
+#: Merge.rc:5247
msgid "Allow only one instance; wait for termination"
msgstr ""
#. IDS_AUTO_RELOAD_MODIFIED_FILES_DISABLED
-#: Merge.rc:5242
+#: Merge.rc:5252
msgctxt "Options dialog|General|Auto-reload modified files"
msgid "Disabled"
msgstr ""
#. IDS_AUTO_RELOAD_MODIFIED_FILES_STR1
-#: Merge.rc:5243
+#: Merge.rc:5253
msgid "Only on window activated"
msgstr ""
#. IDS_AUTO_RELOAD_MODIFIED_FILES_STR2
-#: Merge.rc:5244
+#: Merge.rc:5254
msgid "Immediately"
msgstr ""
#. IDS_PLUGIN_ALL
-#: Merge.rc:5249
+#: Merge.rc:5259
msgid "Al&l"
msgstr ""
#. IDS_PLUGIN_OTHERS
-#: Merge.rc:5250
+#: Merge.rc:5260
msgid "&Others"
msgstr ""
-#: Merge.rc:5252
+#: Merge.rc:5262
#, c-format
msgid "Missing plugin name in pipeline: %1"
msgstr ""
-#: Merge.rc:5254
+#: Merge.rc:5264
#, c-format
msgid "Missing quote in plugin pipeline: %1"
msgstr ""
#. IDS_PLUGIN_NAME_ALREADY_EXISTS
-#: Merge.rc:5255
+#: Merge.rc:5265
#, c-format
msgid "Plugin name '%1' already exists."
msgstr ""
#. IDS_PLUGIN_TITLE1
-#: Merge.rc:5256
+#: Merge.rc:5266
msgid "Specify plugin arguments"
msgstr ""
-#: Merge.rc:5258
+#: Merge.rc:5268
#, c-format
msgid "Plugin not found or invalid: %1"
msgstr ""
#. IDS_PLUGIN_NOT_UNPACK
-#: Merge.rc:5259
+#: Merge.rc:5269
#, c-format
msgid "'%1' is not an unpacker plugin"
msgstr ""
#. IDS_PLUGIN_NOT_PREDIFF
-#: Merge.rc:5260
+#: Merge.rc:5270
#, c-format
msgid "'%1' is not a prediffer plugin"
msgstr ""
-#: Merge.rc:5262
+#: Merge.rc:5272
#, c-format
msgid "Error prediffing '%1' with '%2'. Prediffing disabled."
msgstr ""
#. IDS_PLUGIN_CIRCULAR_REFERENCE
-#: Merge.rc:5263
+#: Merge.rc:5273
#, c-format
msgid "Circular reference in plugin pipeline: %1"
msgstr ""
#. IDS_PLUGIN_TYPE1
-#: Merge.rc:5264
+#: Merge.rc:5274
msgid "URL Handler"
msgstr ""
#. IDS_PLUGIN_TYPE2
-#: Merge.rc:5265
+#: Merge.rc:5275
msgid "File Unpacker"
msgstr ""
#. IDS_PLUGIN_TYPE3
-#: Merge.rc:5266
+#: Merge.rc:5276
msgid "File or Folder Unpacker"
msgstr ""
#. IDS_PLUGIN_TYPE5
-#: Merge.rc:5268
+#: Merge.rc:5278
msgid "Alias for Unpacker"
msgstr ""
#. IDS_PLUGIN_TYPE6
-#: Merge.rc:5269
+#: Merge.rc:5279
msgid "Alias for Prediffer"
msgstr ""
#. IDS_PLUGIN_TYPE7
-#: Merge.rc:5270
+#: Merge.rc:5280
msgid "Alias for Editor script"
msgstr ""
#. IDS_PLUGIN_ALIAS_DESC
-#: Merge.rc:5271
+#: Merge.rc:5281
#, c-format
msgid "Alias for plugin pipeline '%1'"
msgstr ""
#. IDS_PLUGIN_NEW_DESC
-#: Merge.rc:5272
+#: Merge.rc:5282
msgid "New plugin description"
msgstr ""
#. IDS_PLUGIN_TARGETS_ALL
-#: Merge.rc:5273
+#: Merge.rc:5283
msgid "All"
msgstr ""
#. IDS_PLUGIN_TARGETS_1ST
-#: Merge.rc:5274
+#: Merge.rc:5284
msgid "1st"
msgstr ""
#. IDS_PLUGIN_TARGETS_2ND
-#: Merge.rc:5275
+#: Merge.rc:5285
msgid "2nd"
msgstr ""
#. IDS_PLUGIN_TARGETS_3RD
-#: Merge.rc:5276
+#: Merge.rc:5286
msgid "3rd"
msgstr ""
#. IDS_PLUGIN_TARGETS_1ST_2ND
-#: Merge.rc:5277
+#: Merge.rc:5287
msgid "1st and 2nd"
msgstr ""
#. IDS_PLUGIN_TARGETS_1ST_3RD
-#: Merge.rc:5278
+#: Merge.rc:5288
msgid "1st and 3rd"
msgstr ""
#. IDS_PLUGIN_TARGETS_2ND_3RD
-#: Merge.rc:5279
+#: Merge.rc:5289
msgid "2nd and 3rd"
msgstr ""
#. IDS_FILTER_APPLIED
-#: Merge.rc:5284
+#: Merge.rc:5294
msgid "Filter applied"
msgstr ""
#. IDS_FILTERMENU_COMPARE
-#: Merge.rc:5289
+#: Merge.rc:5299
#, c-format
msgid "Compare %1"
msgstr ""
#. IDS_FILTERMENU_FILTER_BY_THIS_COLUMN
-#: Merge.rc:5290
+#: Merge.rc:5300
msgid "&Filter by This Column"
msgstr ""
#. IDS_FILTERMENU_FILTER_BY_THIS_COLUMN2
-#: Merge.rc:5291
+#: Merge.rc:5301
msgid "&Filter by This Column..."
msgstr ""
#. IDS_CLIPBOARDHISTORY_TIME
-#: Merge.rc:5296
+#: Merge.rc:5306
#, c-format
msgid "Clipboard at %s"
msgstr ""
#. IDS_CLIPBOARDHISTORY_DISABLED
-#: Merge.rc:5297
+#: Merge.rc:5307
msgid "Clipboard history disabled.\r\nEnable: Windows logo key + V, then Turn on."
msgstr ""
-#: Merge.rc:5299
+#: Merge.rc:5309
msgid "This system does not support clipboard history."
msgstr ""
-#: Merge.rc:5301
+#: Merge.rc:5311
msgid "32-bit WinMerge does not support Clipboard Compare"
msgstr ""
#. IDS_WEBVIEW2_RUNTIME_NOT_INSTALLED
-#: Merge.rc:5306
+#: Merge.rc:5316
msgid "WebView2 runtime not installed. Download it?"
msgstr ""
#. IDS_JUMPLIST_NEW_TEXT_COMPARE
-#: Merge.rc:5311
+#: Merge.rc:5321
msgid "New Text Compare"
msgstr ""
#. IDS_JUMPLIST_NEW_TABLE_COMPARE
-#: Merge.rc:5312
+#: Merge.rc:5322
msgid "New Table Compare"
msgstr ""
#. IDS_JUMPLIST_NEW_BINARY_COMPARE
-#: Merge.rc:5313
+#: Merge.rc:5323
msgid "New Binary Compare"
msgstr ""
#. IDS_JUMPLIST_NEW_IMAGE_COMPARE
-#: Merge.rc:5314
+#: Merge.rc:5324
msgid "New Image Compare"
msgstr ""
#. IDS_JUMPLIST_NEW_WEBPAGE_COMPARE
-#: Merge.rc:5315
+#: Merge.rc:5325
msgid "New Webpage Compare"
msgstr ""
+#. IDS_JUMPLIST_NEW_FOLDER_COMPARE
+#: Merge.rc:5326
+msgid "New Folder Compare"
+msgstr ""
+
#. IDS_JUMPLIST_CLIPBOARD_COMPARE
-#: Merge.rc:5316
+#: Merge.rc:5327
msgid "Clipboard Compare"
msgstr ""
#. IDS_PREVIEWBAR_PRINT
-#: Merge.rc:5321
+#: Merge.rc:5332
msgid "&Print..."
msgstr ""
#. IDS_PREVIEWBAR_PREVPAGE
-#: Merge.rc:5323
+#: Merge.rc:5334
msgid "Pre&v Page"
msgstr ""
#. IDS_PREVIEWBAR_TWOPAGE
-#: Merge.rc:5324
+#: Merge.rc:5335
msgid "&Two Page"
msgstr ""
#. IDS_PREVIEWBAR_ONEPAGE
-#: Merge.rc:5325
+#: Merge.rc:5336
msgid "&One Page"
msgstr ""
#. IDS_PREVIEWBAR_ZOOMIN
-#: Merge.rc:5326
+#: Merge.rc:5337
msgid "Zoom &In"
msgstr ""
#. IDS_PREVIEWBAR_ZOOMOUT
-#: Merge.rc:5327
+#: Merge.rc:5338
msgid "Zoom &Out"
msgstr ""
#. IDS_WEBPAGE_COMPARING
-#: Merge.rc:5333
+#: Merge.rc:5344
msgid "Comparing..."
msgstr ""
#. IDS_WEBPAGE_ZOOM
-#: Merge.rc:5334
+#: Merge.rc:5345
msgid "Zoom:"
msgstr ""
#. IDS_COPY_GRANULARITY_DIFFHUNK
-#: Merge.rc:5339
+#: Merge.rc:5350
msgid "Diff hunk"
msgstr ""
#. IDS_COPY_GRANULARITY_INLINE
-#: Merge.rc:5340
+#: Merge.rc:5351
msgid "Inline diff"
msgstr ""
#. IDS_COPY_GRANULARITY_LINE
-#: Merge.rc:5341
+#: Merge.rc:5352
msgid "Line"
msgstr ""
-#: Merge.rc:5342
+#: Merge.rc:5353
msgid "Character"
msgstr ""
#. ID_MICE_PREVDIFF
-#: Merge.rc:5347
+#: Merge.rc:5358
msgid "\nPrevious Difference (Alt+Up)\n(Right Button+Wheel Up)\n(Alt+Wheel Up)"
msgstr ""
#. ID_MICE_NEXTDIFF
-#: Merge.rc:5348
+#: Merge.rc:5359
msgid "\nNext Difference (Alt+Down)\n(Right Button+Wheel Down)\n(Alt+Wheel Down)"
msgstr ""
#. ID_MICE_L2R
-#: Merge.rc:5349
+#: Merge.rc:5360
msgid "\nCopy to Right (Alt+Right)\n(Right Button+Wheel Right)\n(Alt+Wheel Right)\n(Alt+Shift+Wheel Down)"
msgstr ""
#. ID_MICE_R2L
-#: Merge.rc:5350
+#: Merge.rc:5361
msgid "\nCopy to Left (Alt+Left)\n(Right Button+Wheel Left)\n(Alt+Wheel Left)\n(Alt+Shift+Wheel Up)"
msgstr ""
#. ID_MICE_L2RNEXT
-#: Merge.rc:5351
+#: Merge.rc:5362
msgid "\nCopy to Right and Advance (Ctrl+Alt+Right)\n(Ctrl+Alt+Wheel Right)\n(Ctrl+Alt+Shift+Wheel Down)"
msgstr ""
#. ID_MICE_R2LNEXT
-#: Merge.rc:5352
+#: Merge.rc:5363
msgid "\nCopy to Left and Advance (Ctrl+Alt+Left)\n(Ctrl+Alt+Wheel Left)\n(Ctrl+Alt+Shift+Wheel Up)"
msgstr ""
#. IDS_LOG_COMPARING_2
-#: Merge.rc:5362
+#: Merge.rc:5373
#, c-format
msgid "Comparing %1 with %2"
msgstr ""
#. IDS_LOG_COMPARING_3
-#: Merge.rc:5363
+#: Merge.rc:5374
#, c-format
msgid "Comparing %1 with %2 and %3"
msgstr ""
#. IDS_LOG_COMPARE_COMPLETED
-#: Merge.rc:5364
+#: Merge.rc:5375
msgid "Comparison completed"
msgstr ""
#. IDS_LOG_COMPARE_ERROR_2
-#: Merge.rc:5365
+#: Merge.rc:5376
#, c-format
msgid "Failed to compare %1 with %2: "
msgstr ""
#. IDS_LOG_COMPARE_ERROR_3
-#: Merge.rc:5366
+#: Merge.rc:5377
#, c-format
msgid "Failed to compare %1 with %2 and %3: "
msgstr ""
#. IDS_LOG_FILE_SAVED
-#: Merge.rc:5367
+#: Merge.rc:5378
msgid "File saved"
msgstr ""
#. IDS_LOG_COPYING_FILES
-#: Merge.rc:5368
+#: Merge.rc:5379
msgid "Copying files..."
msgstr ""
#. IDS_LOG_MOVING_FILES
-#: Merge.rc:5369
+#: Merge.rc:5380
msgid "Moving files..."
msgstr ""
#. IDS_LOG_DELETING_FILES
-#: Merge.rc:5370
+#: Merge.rc:5381
msgid "Deleting files..."
msgstr ""
#. IDS_LOG_RECYCLEBIN
-#: Merge.rc:5371
+#: Merge.rc:5382
msgid "Recycle Bin"
msgstr ""
#. IDS_LOG_PERMANENTLY_DELETED
-#: Merge.rc:5372
+#: Merge.rc:5383
msgid "Permanently deleted"
msgstr ""
#. IDS_LOG_FILEOPERATION_COMPLETED
-#: Merge.rc:5373
+#: Merge.rc:5384
msgid "File operation completed successfully"
msgstr ""
#. IDS_LOG_FILEOPERATION_CANCELED
-#: Merge.rc:5374
+#: Merge.rc:5385
msgid "File operation canceled"
msgstr ""
#. IDS_FILTER_ERROR_NO_ERROR
-#: Merge.rc:5379
+#: Merge.rc:5390
msgid "No error"
msgstr ""
#. IDS_FILTER_ERROR_EMPTY_EXPRESSION
-#: Merge.rc:5380
+#: Merge.rc:5391
msgid "Filter expression is empty"
msgstr ""
#. IDS_FILTER_ERROR_UNKNOWN_CHAR
-#: Merge.rc:5381
+#: Merge.rc:5392
msgid "Unknown character in filter expression"
msgstr ""
#. IDS_FILTER_ERROR_UNTERMINATED_STRING
-#: Merge.rc:5382
+#: Merge.rc:5393
msgid "Unterminated string literal"
msgstr ""
#. IDS_FILTER_ERROR_SYNTAX_ERROR
-#: Merge.rc:5383
+#: Merge.rc:5394
msgid "Syntax error in filter expression"
msgstr ""
#. IDS_FILTER_ERROR_PARSE_FAILURE
-#: Merge.rc:5384
+#: Merge.rc:5395
msgid "Failed to parse filter expression"
msgstr ""
#. IDS_FILTER_ERROR_INVALID_LITERAL
-#: Merge.rc:5385
+#: Merge.rc:5396
msgid "Invalid literal value"
msgstr ""
#. IDS_FILTER_ERROR_INVALID_REGULAR_EXPRESSION
-#: Merge.rc:5386
+#: Merge.rc:5397
msgid "Invalid regular expression"
msgstr ""
#. IDS_FILTER_ERROR_UNDEFINED_IDENTIFIER
-#: Merge.rc:5387
+#: Merge.rc:5398
msgid "Undefined identifier"
msgstr ""
#. IDS_FILTER_ERROR_INVALID_ARGUMENT_COUNT
-#: Merge.rc:5388
+#: Merge.rc:5399
msgid "Invalid number of arguments"
msgstr ""
#. IDS_FILTER_ERROR_FILTER_NAME_NOT_FOUND
-#: Merge.rc:5389
+#: Merge.rc:5400
msgid "Filter name not found"
msgstr ""
#. IDS_FILTER_ERROR_DIVIDE_BY_ZERO
-#: Merge.rc:5390
+#: Merge.rc:5401
msgid "Division by zero in filter expression"
msgstr ""
#. IDS_FILTER_ERROR_UNKNOWN_ERROR
-#: Merge.rc:5391
+#: Merge.rc:5402
msgid "Unknown error"
msgstr ""
#. IDS_FILTER_ERROR_INVALID_PROPERTY_NAME
-#: Merge.rc:5392
+#: Merge.rc:5403
msgid "Invalid property name"
msgstr ""
#. IDS_FILTER_ERROR_INVALID_DIRECTIVE
-#: Merge.rc:5393
+#: Merge.rc:5404
msgid "Invalid directive"
msgstr ""
#. IDS_FILTER_OP_EQUALS
-#: Merge.rc:5398
+#: Merge.rc:5409
msgid "Equals"
msgstr ""
#. IDS_FILTER_OP_NOT_EQUALS
-#: Merge.rc:5399
+#: Merge.rc:5410
msgid "Does not equal"
msgstr ""
#. IDS_FILTER_OP_LESS_THAN
-#: Merge.rc:5400
+#: Merge.rc:5411
msgid "Less than"
msgstr ""
#. IDS_FILTER_OP_LESS_EQUAL
-#: Merge.rc:5401
+#: Merge.rc:5412
msgid "Less than or equal to"
msgstr ""
#. IDS_FILTER_OP_GREATER_EQUAL
-#: Merge.rc:5402
+#: Merge.rc:5413
msgid "Greater than or equal to"
msgstr ""
#. IDS_FILTER_OP_GREATER_THAN
-#: Merge.rc:5403
+#: Merge.rc:5414
msgid "Greater than"
msgstr ""
#. IDS_FILTER_OP_BETWEEN
-#: Merge.rc:5404
+#: Merge.rc:5415
msgid "Between"
msgstr ""
#. IDS_FILTER_OP_NOT_BETWEEN
-#: Merge.rc:5405
+#: Merge.rc:5416
msgid "Not Between"
msgstr ""
#. IDS_FILTER_OP_CONTAINS
-#: Merge.rc:5406
+#: Merge.rc:5417
msgid "Contains"
msgstr ""
#. IDS_FILTER_OP_NOT_CONTAINS
-#: Merge.rc:5407
+#: Merge.rc:5418
msgid "Not Contains"
msgstr ""
#. IDS_FILTER_OP_RECONTAINS
-#: Merge.rc:5408
+#: Merge.rc:5419
msgid "Contains (regex)"
msgstr ""
#. IDS_FILTER_OP_NOT_RECONTAINS
-#: Merge.rc:5409
+#: Merge.rc:5420
msgid "Not Contains (regex)"
msgstr ""
#. IDS_FILTER_OP_LIKE
-#: Merge.rc:5410
+#: Merge.rc:5421
msgid "Match (wildcard)"
msgstr ""
#. IDS_FILTER_OP_NOT_LIKE
-#: Merge.rc:5411
+#: Merge.rc:5422
msgid "Not match (wildcard)"
msgstr ""
#. IDS_FILTER_OP_MATCHES
-#: Merge.rc:5412
+#: Merge.rc:5423
msgid "Match (regex)"
msgstr ""
#. IDS_FILTER_OP_NOT_MATCHES
-#: Merge.rc:5413
+#: Merge.rc:5424
msgid "Not match (regex)"
msgstr ""
#. IDS_COLORMODE_LIGHT
-#: Merge.rc:5418
+#: Merge.rc:5429
msgid "Light"
msgstr ""
#. IDS_COLORMODE_DARK
-#: Merge.rc:5419
+#: Merge.rc:5430
msgid "Dark"
msgstr ""
#. IDS_COLORMODE_FOLLOWSYSTEM
-#: Merge.rc:5420
+#: Merge.rc:5431
msgid "Follow system"
msgstr ""
#. IDS_EXAMPLE
-#: Merge.rc:5425
+#: Merge.rc:5436
#, c-format
msgid "e.g. %1"
msgstr ""
#. IDS_DETECTED_PREVIOUS_CRASH
-#: Merge.rc:5430
+#: Merge.rc:5441
msgid "WinMerge detected a previous crash. Please report this if possible."
msgstr ""
#. IDS_REGEX_REPLACE_LIST_TEMPLATE
-#: Merge.rc:5435
+#: Merge.rc:5446
msgid "# Regex replacement list\r\n# Format: regexreplacement\r\n# Backreferences like $1, $2 are supported\r\n\r\n(\\d{4})-(\\d{2})-(\\d{2})\t$1_$2_$3\r\n"
msgstr ""
#. IDS_STRING_REPLACE_LIST_TEMPLATE
-#: Merge.rc:5436
+#: Merge.rc:5447
msgid "# Replacement list\r\n# Format: searchreplacement\r\n# Lines starting with # are ignored\r\n\r\nfrom1\tto1\r\nfrom2\tto2\r\n"
msgstr ""
diff --git a/Translations/WinMerge/Basque.po b/Translations/WinMerge/Basque.po
index 6a7fb636bb6..6c7be73bf3c 100644
--- a/Translations/WinMerge/Basque.po
+++ b/Translations/WinMerge/Basque.po
@@ -24,7 +24,7 @@ msgstr ""
"X-Generator: Poedit 1.5.3\n"
#. LANGUAGE, SUBLANGUAGE
-#: Merge.rc:26 Merge.rc:59 Merge.rc:5453
+#: Merge.rc:26 Merge.rc:59 Merge.rc:5464
#, c-format
msgid "LANG_ENGLISH, SUBLANG_ENGLISH_US"
msgstr "LANG_BASQUE, SUBLANG_DEFAULT"
@@ -110,7 +110,7 @@ msgid "Copy Selected Diff (Right) to Clipboard\tCtrl+&3"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_SELECTLINEDIFF
-#: Merge.rc:110 Merge.rc:673
+#: Merge.rc:110 Merge.rc:680
#, c-format
msgid "Select Line &Difference\tF4"
msgstr "Hautatu Lerro &Ezberdintasunak\tF4"
@@ -144,7 +144,7 @@ msgid "Cu&t"
msgstr "Eba&ki"
#. IDR_POPUP_DIRVIEW
-#: Merge.rc:118 Merge.rc:943
+#: Merge.rc:118 Merge.rc:951
#, c-format
msgid "&Copy"
msgstr "&Kopiatu"
@@ -156,21 +156,21 @@ msgid "&Paste"
msgstr "&Itsatsi"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:121 Merge.rc:875 Merge.rc:882
+#: Merge.rc:121 Merge.rc:882 Merge.rc:889
#, c-format
msgid "&Scripts"
msgstr "E&skriptak"
#. IDS_NO_EDIT_SCRIPTS
-#: Merge.rc:123 Merge.rc:338 Merge.rc:447 Merge.rc:654 Merge.rc:659
-#: Merge.rc:865 Merge.rc:877 Merge.rc:884 Merge.rc:940 Merge.rc:1183
-#: Merge.rc:5028
+#: Merge.rc:123 Merge.rc:340 Merge.rc:451 Merge.rc:661 Merge.rc:666
+#: Merge.rc:872 Merge.rc:884 Merge.rc:891 Merge.rc:948 Merge.rc:1193
+#: Merge.rc:5038
#, c-format
msgid "< Empty >"
msgstr "< Hutsik >"
#. IDR_POPUP_LOCATIONBAR, ID_EDIT_WMGOTO
-#: Merge.rc:126 Merge.rc:691 Merge.rc:1081
+#: Merge.rc:126 Merge.rc:698 Merge.rc:1089
msgid "&Go to...\tCtrl+G"
msgstr "&Joan hona...\tCtrl+G"
@@ -191,27 +191,27 @@ msgid "Op&en"
msgstr "Ire&ki"
#. IDR_POPUP_DIRVIEW, ID_DIR_OPEN_RIGHT
-#: Merge.rc:132 Merge.rc:981 Merge.rc:988 Merge.rc:995
+#: Merge.rc:132 Merge.rc:989 Merge.rc:996 Merge.rc:1003
msgid "With &Registered Application"
msgstr "&Erregistratutako Aplikazioarekin"
#. IDR_POPUP_DIRVIEW, ID_DIR_OPEN_RIGHT_WITHEDITOR
-#: Merge.rc:133 Merge.rc:982 Merge.rc:989 Merge.rc:996
+#: Merge.rc:133 Merge.rc:990 Merge.rc:997 Merge.rc:1004
msgid "With &External Editor\tCtrl+Alt+E"
msgstr ""
#. IDR_POPUP_DIRVIEW, ID_DIR_OPEN_RIGHT_WITH
-#: Merge.rc:134 Merge.rc:983 Merge.rc:990 Merge.rc:997
+#: Merge.rc:134 Merge.rc:991 Merge.rc:998 Merge.rc:1005
msgid "&With..."
msgstr "&Honekin..."
#. IDR_POPUP_DIRVIEW, ID_DIR_OPEN_RIGHT_PARENT_FOLDER
-#: Merge.rc:135 Merge.rc:984 Merge.rc:991 Merge.rc:998
+#: Merge.rc:135 Merge.rc:992 Merge.rc:999 Merge.rc:1006
msgid "Open &Parent Folder..."
msgstr ""
#. IDR_POPUP_IMG_CTXT, ID_FILE_SHELLMENU
-#: Merge.rc:137 Merge.rc:1239
+#: Merge.rc:137 Merge.rc:1249
msgid "S&hell Menu"
msgstr ""
@@ -249,8 +249,8 @@ msgid "Ins&ertion/Deletion Detection"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_TOOLBAR_NONE
-#: Merge.rc:176 Merge.rc:209 Merge.rc:216 Merge.rc:358 Merge.rc:507
-#: Merge.rc:751
+#: Merge.rc:176 Merge.rc:209 Merge.rc:216 Merge.rc:360 Merge.rc:511
+#: Merge.rc:758
#, c-format
msgid "&None"
msgstr "&Ezer ez"
@@ -266,13 +266,13 @@ msgid "&Horizontal"
msgstr ""
#. IDR_POPUP_IMG_CTXT, ID_IMG_CURPANE_PREVPAGE
-#: Merge.rc:181 Merge.rc:189 Merge.rc:1230
+#: Merge.rc:181 Merge.rc:189 Merge.rc:1240
#, c-format
msgid "&Previous Page"
msgstr ""
#. IDS_PREVIEWBAR_NEXTPAGE
-#: Merge.rc:182 Merge.rc:190 Merge.rc:1231 Merge.rc:5322
+#: Merge.rc:182 Merge.rc:190 Merge.rc:1241 Merge.rc:5333
#, c-format
msgid "&Next Page"
msgstr ""
@@ -284,45 +284,45 @@ msgid "&Active Pane"
msgstr ""
#. IDR_POPUP_IMG_CTXT, ID_IMG_CURPANE_ROTATE_RIGHT_90
-#: Merge.rc:185 Merge.rc:1225
+#: Merge.rc:185 Merge.rc:1235
msgid "Rotate &Right 90deg"
msgstr ""
#. IDR_POPUP_IMG_CTXT, ID_IMG_CURPANE_ROTATE_LEFT_90
-#: Merge.rc:186 Merge.rc:1226
+#: Merge.rc:186 Merge.rc:1236
msgid "Rotate &Left 90deg"
msgstr ""
#. IDR_POPUP_IMG_CTXT, ID_IMG_CURPANE_FLIP_VERTICALLY
-#: Merge.rc:187 Merge.rc:1227
+#: Merge.rc:187 Merge.rc:1237
msgid "Flip V&ertically"
msgstr ""
#. IDR_POPUP_IMG_CTXT, ID_IMG_CURPANE_FLIP_HORIZONTALLY
-#: Merge.rc:188 Merge.rc:1228
+#: Merge.rc:188 Merge.rc:1238
msgid "Flip H&orizontally"
msgstr ""
#. IDR_MERGEDOCTYPE
-#: Merge.rc:193 Merge.rc:699
+#: Merge.rc:193 Merge.rc:706
#, c-format
msgid "&Zoom"
msgstr "&Zooma"
#. IDR_MERGEDOCTYPE, ID_VIEW_ZOOMIN
-#: Merge.rc:202 Merge.rc:701
+#: Merge.rc:202 Merge.rc:708
#, c-format
msgid "Zoom &In\tCtrl++"
msgstr "Zooma &Handitu\tCtrl++"
#. IDR_MERGEDOCTYPE, ID_VIEW_ZOOMOUT
-#: Merge.rc:203 Merge.rc:702
+#: Merge.rc:203 Merge.rc:709
#, c-format
msgid "Zoom &Out\tCtrl+-"
msgstr "Zooma &Gutxitu\tCtrl+-"
#. IDR_MERGEDOCTYPE, ID_VIEW_ZOOMNORMAL, Zoom to normal
-#: Merge.rc:205 Merge.rc:704
+#: Merge.rc:205 Merge.rc:711
#, c-format
msgid "&Normal\tCtrl+*"
msgstr "&Normala\tCtrl+*"
@@ -352,29 +352,29 @@ msgid "Dragging &Mode"
msgstr ""
#. IDR_POPUP_IMG_CTXT, ID_IMG_DRAGGINGMODE_MOVE
-#: Merge.rc:217 Merge.rc:955 Merge.rc:1233
+#: Merge.rc:217 Merge.rc:963 Merge.rc:1243
#, c-format
msgid "&Move"
msgstr "&Mugitu"
#. IDR_POPUP_IMG_CTXT, ID_IMG_DRAGGINGMODE_ADJUST_OFFSET
-#: Merge.rc:218 Merge.rc:1234
+#: Merge.rc:218 Merge.rc:1244
#, c-format
msgid "&Adjust Offset"
msgstr ""
#. IDR_POPUP_IMG_CTXT, ID_IMG_DRAGGINGMODE_VERTICAL_WIPE
-#: Merge.rc:219 Merge.rc:1235
+#: Merge.rc:219 Merge.rc:1245
msgid "&Vertical Wipe"
msgstr ""
#. IDR_POPUP_IMG_CTXT, ID_IMG_DRAGGINGMODE_HORIZONTAL_WIPE
-#: Merge.rc:220 Merge.rc:1236
+#: Merge.rc:220 Merge.rc:1246
msgid "&Horizontal Wipe"
msgstr ""
#. IDR_POPUP_IMG_CTXT, ID_IMG_DRAGGINGMODE_RECTANGLE_SELECT
-#: Merge.rc:221 Merge.rc:1237
+#: Merge.rc:221 Merge.rc:1247
msgid "Rectangle &Select"
msgstr ""
@@ -410,37 +410,37 @@ msgid "Compare Extracted &Text from Images"
msgstr ""
#. IDD_OPEN, IDOK
-#: Merge.rc:272 Merge.rc:1980
+#: Merge.rc:272 Merge.rc:1990
msgid "Co&mpare"
msgstr ""
#. IDR_POPUP_WEBPAGE_COMPARE, ID_WEB_COMPARE_SCREENSHOTS
-#: Merge.rc:274 Merge.rc:1247
+#: Merge.rc:274 Merge.rc:1257
msgid "&Screenshots"
msgstr ""
#. IDR_POPUP_WEBPAGE_COMPARE, ID_WEB_COMPARE_FULLSIZE_SCREENSHOTS
-#: Merge.rc:275 Merge.rc:1248
+#: Merge.rc:275 Merge.rc:1258
msgid "&Full Size Screenshots"
msgstr ""
#. IDR_POPUP_WEBPAGE_COMPARE, ID_WEB_COMPARE_HTMLS
-#: Merge.rc:276 Merge.rc:1249
+#: Merge.rc:276 Merge.rc:1259
msgid "&HTMLs"
msgstr ""
#. IDR_POPUP_WEBPAGE_COMPARE, ID_WEB_COMPARE_TEXTS
-#: Merge.rc:277 Merge.rc:1250
+#: Merge.rc:277 Merge.rc:1260
msgid "&Texts"
msgstr ""
#. IDR_POPUP_WEBPAGE_COMPARE, ID_WEB_COMPARE_RESOURCETREES
-#: Merge.rc:278 Merge.rc:1251
+#: Merge.rc:278 Merge.rc:1261
msgid "&Resource Trees"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_SIZE
-#: Merge.rc:280 Merge.rc:1775
+#: Merge.rc:280 Merge.rc:1785
msgid "&Size"
msgstr ""
@@ -455,27 +455,27 @@ msgid "&Event Sync"
msgstr ""
#. IDR_POPUP_WEBPAGE_SYNC_EVENTS, ID_WEB_SYNC_ENABLED
-#: Merge.rc:291 Merge.rc:1259
+#: Merge.rc:291 Merge.rc:1269
msgid "&Enabled"
msgstr ""
#. IDR_POPUP_WEBPAGE_SYNC_EVENTS, ID_WEB_SYNC_SCROLL
-#: Merge.rc:293 Merge.rc:1261
+#: Merge.rc:293 Merge.rc:1271
msgid "&Scroll"
msgstr ""
#. IDR_POPUP_WEBPAGE_SYNC_EVENTS, ID_WEB_SYNC_CLICK
-#: Merge.rc:294 Merge.rc:1262
+#: Merge.rc:294 Merge.rc:1272
msgid "&Click"
msgstr ""
#. IDR_POPUP_WEBPAGE_SYNC_EVENTS, ID_WEB_SYNC_INPUT
-#: Merge.rc:295 Merge.rc:1263
+#: Merge.rc:295 Merge.rc:1273
msgid "&Input"
msgstr ""
#. IDR_POPUP_WEBPAGE_SYNC_EVENTS, ID_WEB_SYNC_GOBACKFORWARD
-#: Merge.rc:296 Merge.rc:1264
+#: Merge.rc:296 Merge.rc:1274
msgid "&Go Back/Forward"
msgstr ""
@@ -505,4883 +505,4894 @@ msgid "&All Profiles"
msgstr ""
#. IDR_MERGEDOCTYPE
-#: Merge.rc:310 Merge.rc:411 Merge.rc:586
+#: Merge.rc:310 Merge.rc:413 Merge.rc:590
#, c-format
msgid "&File"
msgstr "&Agiria"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:312 Merge.rc:413 Merge.rc:588
+#: Merge.rc:312 Merge.rc:415 Merge.rc:592
#, c-format
msgid "&New"
msgstr "&Berria"
#. IDR_POPUP_COMPARE, ID_MERGE_COMPARE_TEXT
-#: Merge.rc:314 Merge.rc:322 Merge.rc:415 Merge.rc:423 Merge.rc:590
-#: Merge.rc:598 Merge.rc:649 Merge.rc:935 Merge.rc:1159 Merge.rc:1171
+#: Merge.rc:314 Merge.rc:323 Merge.rc:417 Merge.rc:426 Merge.rc:594
+#: Merge.rc:603 Merge.rc:655 Merge.rc:942 Merge.rc:1167 Merge.rc:1180
#, c-format
msgid "&Text"
msgstr ""
#. IDR_POPUP_COMPARE, ID_MERGE_COMPARE_TABLE
-#: Merge.rc:315 Merge.rc:323 Merge.rc:416 Merge.rc:424 Merge.rc:591
-#: Merge.rc:599 Merge.rc:650 Merge.rc:936 Merge.rc:1160 Merge.rc:1172
+#: Merge.rc:315 Merge.rc:324 Merge.rc:418 Merge.rc:427 Merge.rc:595
+#: Merge.rc:604 Merge.rc:656 Merge.rc:943 Merge.rc:1168 Merge.rc:1181
msgid "T&able"
msgstr ""
#. IDR_POPUP_COMPARE, ID_MERGE_COMPARE_HEX
-#: Merge.rc:316 Merge.rc:324 Merge.rc:417 Merge.rc:425 Merge.rc:592
-#: Merge.rc:600 Merge.rc:651 Merge.rc:937 Merge.rc:1161 Merge.rc:1173
+#: Merge.rc:316 Merge.rc:325 Merge.rc:419 Merge.rc:428 Merge.rc:596
+#: Merge.rc:605 Merge.rc:657 Merge.rc:944 Merge.rc:1169 Merge.rc:1182
#, c-format
msgid "&Binary"
msgstr "&Binarioa"
#. IDS_IMAGE_MENU
-#: Merge.rc:317 Merge.rc:325 Merge.rc:418 Merge.rc:426 Merge.rc:593
-#: Merge.rc:601 Merge.rc:652 Merge.rc:938 Merge.rc:1162 Merge.rc:1174
-#: Merge.rc:5123
+#: Merge.rc:317 Merge.rc:326 Merge.rc:420 Merge.rc:429 Merge.rc:597
+#: Merge.rc:606 Merge.rc:658 Merge.rc:945 Merge.rc:1170 Merge.rc:1183
+#: Merge.rc:5133
#, c-format
msgid "&Image"
msgstr ""
#. IDR_POPUP_COMPARE, ID_MERGE_COMPARE_WEBPAGE
-#: Merge.rc:318 Merge.rc:326 Merge.rc:419 Merge.rc:427 Merge.rc:594
-#: Merge.rc:602 Merge.rc:653 Merge.rc:939 Merge.rc:1163 Merge.rc:1175
+#: Merge.rc:318 Merge.rc:327 Merge.rc:421 Merge.rc:430 Merge.rc:598
+#: Merge.rc:607 Merge.rc:659 Merge.rc:946 Merge.rc:1171 Merge.rc:1184
msgid "&Webpage"
msgstr ""
+#. IDR_POPUP_NEW, ID_FILE_NEW_FOLDER
+#: Merge.rc:319 Merge.rc:328 Merge.rc:422 Merge.rc:431 Merge.rc:599
+#: Merge.rc:608 Merge.rc:1172
+msgid "&Folder"
+msgstr ""
+
#. IDR_MERGEDOCTYPE
-#: Merge.rc:320 Merge.rc:421 Merge.rc:596
+#: Merge.rc:321 Merge.rc:424 Merge.rc:601
#, c-format
msgid "New (&3 panes)"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_FILE_OPEN
-#: Merge.rc:328 Merge.rc:429 Merge.rc:604
+#: Merge.rc:330 Merge.rc:433 Merge.rc:610
#, c-format
msgid "&Open...\tCtrl+O"
msgstr "&Ireki...\tCtrl+O"
#. IDR_MERGEDOCTYPE, ID_FILE_OPENCONFLICT
-#: Merge.rc:329 Merge.rc:430 Merge.rc:605
+#: Merge.rc:331 Merge.rc:434 Merge.rc:611
msgid "Open Conflic&t File..."
msgstr "Ire&ki Gatazka Agiria..."
#. IDR_MERGEDOCTYPE, ID_FILE_OPENCLIPBOARD
-#: Merge.rc:330 Merge.rc:431 Merge.rc:606
+#: Merge.rc:332 Merge.rc:435 Merge.rc:612
msgid "Open C&lipboard"
msgstr ""
#. IDR_POPUP_PROJECT, ID_FILE_OPENPROJECT
-#: Merge.rc:332 Merge.rc:433 Merge.rc:608 Merge.rc:1191
+#: Merge.rc:334 Merge.rc:437 Merge.rc:614 Merge.rc:1201
#, c-format
msgid "Open Pro&ject...\tCtrl+J"
msgstr "Ireki Egit&asmoa...\tCtrl+J"
#. IDD_OPEN, ID_SAVE_PROJECT
-#: Merge.rc:333 Merge.rc:434 Merge.rc:609 Merge.rc:1193 Merge.rc:1979
+#: Merge.rc:335 Merge.rc:438 Merge.rc:615 Merge.rc:1203 Merge.rc:1989
#, c-format
msgid "Sa&ve Project..."
msgstr "Gor&de Egitasmoa..."
#. IDR_MAINFRAME, ID_FILE_PROJECT_MRU_FIRST
-#: Merge.rc:335
+#: Merge.rc:337
#, c-format
msgid "Recent Projects"
msgstr "Azken Egitasmoak"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:336 Merge.rc:445 Merge.rc:657
+#: Merge.rc:338 Merge.rc:449 Merge.rc:664
#, c-format
msgid "Recent F&iles or Folders"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_APP_EXIT
-#: Merge.rc:341 Merge.rc:450 Merge.rc:662
+#: Merge.rc:343 Merge.rc:454 Merge.rc:669
msgid "E&xit\tCtrl+Q"
msgstr "Ir&ten\tCtrl+Q"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:343 Merge.rc:452 Merge.rc:664
+#: Merge.rc:345 Merge.rc:456 Merge.rc:671
#, c-format
msgid "&Edit"
msgstr "&Editatu"
#. IDR_MERGEDOCTYPE, ID_EDIT_PASTE
-#: Merge.rc:345 Merge.rc:671
+#: Merge.rc:347 Merge.rc:678
#, c-format
msgid "&Paste\tCtrl+V"
msgstr "&Itsatsi\tCtrl+V"
#. IDR_MERGEDOCTYPE, ID_OPTIONS
-#: Merge.rc:347 Merge.rc:456 Merge.rc:693
+#: Merge.rc:349 Merge.rc:460 Merge.rc:700
#, c-format
msgid "&Options...\tCtrl+,"
msgstr "&Aukerak...\tCtrl+,"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:349 Merge.rc:458 Merge.rc:695
+#: Merge.rc:351 Merge.rc:462 Merge.rc:702
#, c-format
msgid "&View"
msgstr "&Ikusi"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:351 Merge.rc:500 Merge.rc:744
+#: Merge.rc:353 Merge.rc:504 Merge.rc:751
#, c-format
msgid "Ta&b Bar"
msgstr "&Fitxa Barra"
#. IDR_MERGEDOCTYPE, ID_VIEW_TAB_BAR
-#: Merge.rc:353 Merge.rc:502 Merge.rc:746
+#: Merge.rc:355 Merge.rc:506 Merge.rc:753
msgid "&View Tab Bar"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_VIEW_TAB_BAR_ON_TITLE_BAR
-#: Merge.rc:354 Merge.rc:503 Merge.rc:747
+#: Merge.rc:356 Merge.rc:507 Merge.rc:754
msgid "&On Title Bar"
msgstr ""
#. IDR_MERGEDOCTYPE
-#: Merge.rc:356 Merge.rc:505 Merge.rc:749
+#: Merge.rc:358 Merge.rc:509 Merge.rc:756
#, c-format
msgid "&Toolbar"
msgstr "Tre&snabarra"
#. IDR_MERGEDOCTYPE, ID_TOOLBAR_SMALL
-#: Merge.rc:359 Merge.rc:508 Merge.rc:752
+#: Merge.rc:361 Merge.rc:512 Merge.rc:759
#, c-format
msgid "&Small"
msgstr "&Txikia"
#. IDR_MERGEDOCTYPE, ID_TOOLBAR_MEDIUM
-#: Merge.rc:360 Merge.rc:509 Merge.rc:753
+#: Merge.rc:362 Merge.rc:513 Merge.rc:760
msgid "&Medium"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_TOOLBAR_BIG
-#: Merge.rc:361 Merge.rc:510 Merge.rc:754
+#: Merge.rc:363 Merge.rc:514 Merge.rc:761
#, c-format
msgid "&Big"
msgstr "&Handia"
#. IDR_MERGEDOCTYPE, ID_TOOLBAR_HUGE
-#: Merge.rc:362 Merge.rc:511 Merge.rc:755
+#: Merge.rc:364 Merge.rc:515 Merge.rc:762
#, c-format
msgid "&Huge"
msgstr ""
#. IDS_VIEW_MENU_BAR
-#: Merge.rc:364 Merge.rc:513 Merge.rc:757 Merge.rc:5357
+#: Merge.rc:366 Merge.rc:517 Merge.rc:764 Merge.rc:5368
msgid "Men&u Bar"
msgstr ""
#. IDR_DIRDOCTYPE, ID_VIEW_OUTPUT_BAR
-#: Merge.rc:365 Merge.rc:515
+#: Merge.rc:367 Merge.rc:519
msgid "&Output Pane"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_VIEW_STATUS_BAR
-#: Merge.rc:366 Merge.rc:516 Merge.rc:758
+#: Merge.rc:368 Merge.rc:520 Merge.rc:765
#, c-format
msgid "&Status Bar"
msgstr "&Egoera Barra"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:368 Merge.rc:539 Merge.rc:847
+#: Merge.rc:370 Merge.rc:543 Merge.rc:854
#, c-format
msgid "&Tools"
msgstr "&Tresnak"
#. IDR_MERGEDOCTYPE, ID_TOOLS_FILTERS
-#: Merge.rc:370 Merge.rc:542 Merge.rc:849
+#: Merge.rc:372 Merge.rc:546 Merge.rc:856
#, c-format
msgid "&Filters..."
msgstr "&Iragazkiak..."
#. IDR_MERGEDOCTYPE, ID_TOOLS_GENERATEPATCH
-#: Merge.rc:371 Merge.rc:543 Merge.rc:850
+#: Merge.rc:373 Merge.rc:547 Merge.rc:857
#, c-format
msgid "&Generate Patch..."
msgstr "Sortu &Eranskina..."
#. IDR_MERGEDOCTYPE
-#: Merge.rc:373 Merge.rc:546 Merge.rc:853
+#: Merge.rc:375 Merge.rc:550 Merge.rc:860
#, c-format
msgid "&Plugins"
msgstr "&Pluginak"
#. IDD_PLUGINS_LIST, IDC_PLUGIN_SETTINGS
-#: Merge.rc:375 Merge.rc:548 Merge.rc:855 Merge.rc:2494 Merge.rc:2926
+#: Merge.rc:377 Merge.rc:552 Merge.rc:862 Merge.rc:2504 Merge.rc:2936
#, c-format
msgid "P&lugin Settings..."
msgstr ""
#. IDR_MERGEDOCTYPE, ID_PREDIFFER_MANUAL
-#: Merge.rc:377 Merge.rc:550 Merge.rc:857
+#: Merge.rc:379 Merge.rc:554 Merge.rc:864
#, c-format
msgid "Ma&nual Prediffer"
msgstr "&Eskuzko Aurrezberd"
#. IDR_MERGEDOCTYPE, ID_PREDIFFER_AUTO
-#: Merge.rc:378 Merge.rc:551 Merge.rc:858
+#: Merge.rc:380 Merge.rc:555 Merge.rc:865
#, c-format
msgid "A&utomatic Prediffer"
msgstr "&Berezgaitasunezko Aurrezberd"
#. IDR_MERGEDOCTYPE, ID_UNPACK_MANUAL
-#: Merge.rc:380 Merge.rc:553 Merge.rc:860
+#: Merge.rc:382 Merge.rc:557 Merge.rc:867
#, c-format
msgid "&Manual Unpacking"
msgstr "E&skuzko Despaketatzea"
#. IDR_MERGEDOCTYPE, ID_UNPACK_AUTO
-#: Merge.rc:381 Merge.rc:554 Merge.rc:861
+#: Merge.rc:383 Merge.rc:558 Merge.rc:868
#, c-format
msgid "&Automatic Unpacking"
msgstr "Be&rezgaitasunezko Despaketatzea"
#. IDR_MERGEDOCTYPE, ID_RELOAD_PLUGINS
-#: Merge.rc:383 Merge.rc:558 Merge.rc:889
+#: Merge.rc:385 Merge.rc:562 Merge.rc:896
#, c-format
msgid "&Reload Plugins"
msgstr "B&irgertatu pluginak"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:385 Merge.rc:560 Merge.rc:891
+#: Merge.rc:387 Merge.rc:564 Merge.rc:898
#, c-format
msgid "&Window"
msgstr "Lei&hoa"
#. IDR_MERGEDOCTYPE, ID_FILE_CLOSE
-#: Merge.rc:387 Merge.rc:562 Merge.rc:893
+#: Merge.rc:389 Merge.rc:566 Merge.rc:900
msgid "Cl&ose\tCtrl+W"
msgstr "It&xi\tCtrl+W"
#. IDR_MERGEDOCTYPE, ID_WINDOW_CLOSEALL
-#: Merge.rc:388 Merge.rc:563 Merge.rc:894
+#: Merge.rc:390 Merge.rc:567 Merge.rc:901
#, c-format
msgid "Clo&se All"
msgstr "I&txi Denak"
#. IDR_MERGEDOCTYPE, ID_NEXT_PANE
-#: Merge.rc:390 Merge.rc:565 Merge.rc:896
+#: Merge.rc:392 Merge.rc:569 Merge.rc:903
#, c-format
msgid "Change &Pane\tF6"
msgstr "Aldatu &Panela\tF6"
#. IDR_MERGEDOCTYPE, ID_WINDOW_TILE_HORZ
-#: Merge.rc:392 Merge.rc:567 Merge.rc:900
+#: Merge.rc:394 Merge.rc:571 Merge.rc:907
#, c-format
msgid "Tile &Horizontally"
msgstr "Eradonki &Etzana"
#. IDR_MERGEDOCTYPE, ID_WINDOW_TILE_VERT
-#: Merge.rc:393 Merge.rc:568 Merge.rc:901
+#: Merge.rc:395 Merge.rc:572 Merge.rc:908
#, c-format
msgid "Tile &Vertically"
msgstr "Eradonki &Zutia"
#. IDR_MERGEDOCTYPE, ID_WINDOW_CASCADE
-#: Merge.rc:394 Merge.rc:569 Merge.rc:902
+#: Merge.rc:396 Merge.rc:573 Merge.rc:909
#, c-format
msgid "&Cascade"
msgstr "&Urjauzia"
#. IDS_MESSAGEBOX_HELP
-#: Merge.rc:396 Merge.rc:571 Merge.rc:904 Merge.rc:3200 Merge.rc:4189
+#: Merge.rc:398 Merge.rc:575 Merge.rc:911 Merge.rc:3210 Merge.rc:4199
#, c-format
msgid "&Help"
msgstr "&Laguntza"
#. IDR_MERGEDOCTYPE, ID_HELP_CONTENTS
-#: Merge.rc:398 Merge.rc:573 Merge.rc:906
+#: Merge.rc:400 Merge.rc:577 Merge.rc:913
#, c-format
msgid "&WinMerge Help\tF1"
msgstr "WinMerge &Laguntza\tF1"
#. IDR_MERGEDOCTYPE, ID_HELP_RELEASENOTES
-#: Merge.rc:400 Merge.rc:575 Merge.rc:908
+#: Merge.rc:402 Merge.rc:579 Merge.rc:915
#, c-format
msgid "R&elease Notes"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_HELP_TRANSLATIONS
-#: Merge.rc:401 Merge.rc:576 Merge.rc:909
+#: Merge.rc:403 Merge.rc:580 Merge.rc:916
#, c-format
msgid "&Translations"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_HELP_GETCONFIG
-#: Merge.rc:402 Merge.rc:577 Merge.rc:910
+#: Merge.rc:404 Merge.rc:581 Merge.rc:917
#, c-format
msgid "C&onfiguration"
msgstr "It&xurapena"
#. IDR_MERGEDOCTYPE, ID_HELP_GNULICENSE
-#: Merge.rc:404 Merge.rc:579 Merge.rc:912
+#: Merge.rc:406 Merge.rc:583 Merge.rc:919
#, c-format
msgid "&GNU General Public License"
msgstr "&GNU Baimen Publiko Orokorra "
#. IDR_MERGEDOCTYPE, ID_APP_ABOUT
-#: Merge.rc:405 Merge.rc:580 Merge.rc:913
+#: Merge.rc:407 Merge.rc:584 Merge.rc:920
#, c-format
msgid "&About WinMerge..."
msgstr "&WinMergeri buruz..."
#. IDR_MERGEDOCTYPE
-#: Merge.rc:436 Merge.rc:629
+#: Merge.rc:440 Merge.rc:635
#, c-format
msgid "&Read-Only"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_FILE_LEFT_READONLY
-#: Merge.rc:438 Merge.rc:631
+#: Merge.rc:442 Merge.rc:637
#, c-format
msgid "L&eft Read-Only"
msgstr "Ezkerra Irakurri-bakarrik"
#. IDR_MERGEDOCTYPE, ID_FILE_MIDDLE_READONLY
-#: Merge.rc:439 Merge.rc:632
+#: Merge.rc:443 Merge.rc:638
#, c-format
msgid "M&iddle Read-Only"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_FILE_RIGHT_READONLY
-#: Merge.rc:440 Merge.rc:633
+#: Merge.rc:444 Merge.rc:639
#, c-format
msgid "Ri&ght Read-Only"
msgstr "Eskuina Irakurri-bakarrik"
#. IDD_ENCODINGERROR, IDC_FILEENCODING
-#: Merge.rc:443 Merge.rc:646 Merge.rc:1038 Merge.rc:3063
+#: Merge.rc:447 Merge.rc:652 Merge.rc:1046 Merge.rc:3073
#, c-format
msgid "&File Encoding..."
msgstr "&Agiria Kodeatzen..."
#. IDR_POPUP_OUTPUTVIEW, ID_EDIT_SELECT_ALL
-#: Merge.rc:454 Merge.rc:674 Merge.rc:1343
+#: Merge.rc:458 Merge.rc:681 Merge.rc:1353
#, c-format
msgid "Select &All\tCtrl+A"
msgstr "Hautatu &Denak\t Ctrl+A"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWIDENTICAL
-#: Merge.rc:460
+#: Merge.rc:464
#, c-format
msgid "Show &Identical Items"
msgstr "Erakutsi Gai &Berdinak"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWDIFFERENT
-#: Merge.rc:461
+#: Merge.rc:465
#, c-format
msgid "Show &Different Items"
msgstr "Erakutsi Gai &Ezberdinak"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWUNIQUELEFT
-#: Merge.rc:462
+#: Merge.rc:466
#, c-format
msgid "Show L&eft Unique Items"
msgstr "Erakutsi E&zkerreko Unique gaiak"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWUNIQUEMIDDLE
-#: Merge.rc:463
+#: Merge.rc:467
#, c-format
msgid "Show Midd&le Unique Items"
msgstr ""
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWUNIQUERIGHT
-#: Merge.rc:464
+#: Merge.rc:468
#, c-format
msgid "Show Ri&ght Unique Items"
msgstr "Erakutsi E&skuineko Unique gaiak"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWSKIPPED
-#: Merge.rc:465
+#: Merge.rc:469
#, c-format
msgid "Show S&kipped Items"
msgstr "Erakutsi &Jauzitako Gaiak"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWBINARIES
-#: Merge.rc:466
+#: Merge.rc:470
#, c-format
msgid "S&how Binary Files"
msgstr "&Erakutsi Agiri Binarioak"
#. IDR_DIRDOCTYPE
-#: Merge.rc:467
+#: Merge.rc:471
#, c-format
msgid "&3-way Compare"
msgstr ""
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWDIFFERENTLEFTONLY
-#: Merge.rc:469
+#: Merge.rc:473
#, c-format
msgid "Show &Left Only Different Items"
msgstr ""
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWDIFFERENTMIDDLEONLY
-#: Merge.rc:470
+#: Merge.rc:474
#, c-format
msgid "Show &Middle Only Different Items"
msgstr ""
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWDIFFERENTRIGHTONLY
-#: Merge.rc:471
+#: Merge.rc:475
#, c-format
msgid "Show &Right Only Different Items"
msgstr ""
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWMISSINGLEFTONLY
-#: Merge.rc:473
+#: Merge.rc:477
msgid "Show L&eft Only Missing Items"
msgstr ""
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWMISSINGMIDDLEONLY
-#: Merge.rc:474
+#: Merge.rc:478
msgid "Show Mi&ddle Only Missing Items"
msgstr ""
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWMISSINGRIGHTONLY
-#: Merge.rc:475
+#: Merge.rc:479
msgid "Show Rig&ht Only Missing Items"
msgstr ""
#. IDR_DIRDOCTYPE, ID_VIEW_SHOWHIDDENITEMS
-#: Merge.rc:478
+#: Merge.rc:482
#, c-format
msgid "Show Hidd&en Items"
msgstr "Erakutsi E&zkutatutako Gaiak"
#. IDR_DIRDOCTYPE, ID_VIEW_TREEMODE
-#: Merge.rc:480
+#: Merge.rc:484
#, c-format
msgid "Tree &Mode"
msgstr "Zuhaitz &Modua"
#. IDR_DIRDOCTYPE
-#: Merge.rc:481
+#: Merge.rc:485
msgid "E&xpand Subfolders"
msgstr ""
#. IDR_DIRDOCTYPE, ID_VIEW_EXPAND_ALLSUBDIRS
-#: Merge.rc:483
+#: Merge.rc:487
msgid "&All Subfolders"
msgstr ""
#. IDR_DIRDOCTYPE, ID_VIEW_EXPAND_DIFFERENT_SUBDIRS
-#: Merge.rc:484
+#: Merge.rc:488
msgid "&Different Subfolders"
msgstr ""
#. IDR_DIRDOCTYPE, ID_VIEW_EXPAND_IDENTICAL_SUBDIRS
-#: Merge.rc:485
+#: Merge.rc:489
msgid "&Identical Subfolders"
msgstr ""
#. IDR_DIRDOCTYPE, ID_VIEW_COLLAPSE_ALLSUBDIRS
-#: Merge.rc:487
+#: Merge.rc:491
#, c-format
msgid "&Collapse All Subfolders"
msgstr "&Azpiagiritegi Denak Erauzi"
#. IDR_DIRDOCTYPE, ID_VIEW_SHOW_EMPTY_FOLDERS
-#: Merge.rc:488
+#: Merge.rc:492
msgid "Show &Empty Folders"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_VIEW_SELECTFONT
-#: Merge.rc:490 Merge.rc:697
+#: Merge.rc:494 Merge.rc:704
#, c-format
msgid "Select &Font..."
msgstr "Hautatu &Hizkia..."
#. IDR_MERGEDOCTYPE, ID_VIEW_USEDEFAULTFONT
-#: Merge.rc:491 Merge.rc:698
+#: Merge.rc:495 Merge.rc:705
#, c-format
msgid "Use Default Font"
msgstr "Erabili Berezko H&izkia"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:493 Merge.rc:736
+#: Merge.rc:497 Merge.rc:743
#, c-format
msgid "Sw&ap Panes"
msgstr "&Trukatu Panelak"
#. IDR_MERGEDOCTYPE, ID_SWAPPANES_SWAP12
-#: Merge.rc:495 Merge.rc:738
+#: Merge.rc:499 Merge.rc:745
msgid "Swap &1st | 2nd"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_SWAPPANES_SWAP23
-#: Merge.rc:496 Merge.rc:739
+#: Merge.rc:500 Merge.rc:746
msgid "Swap &2nd | 3rd"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_SWAPPANES_SWAP13
-#: Merge.rc:497 Merge.rc:740
+#: Merge.rc:501 Merge.rc:747
msgid "Swap 1st | &3rd"
msgstr ""
#. IDR_DIRDOCTYPE, ID_VIEW_DISPLAY_FILTER_BAR_MENU
-#: Merge.rc:514
+#: Merge.rc:518
msgid "Displa&y Filter Bar\tCtrl+Shift+L"
msgstr ""
#. IDR_DIRDOCTYPE, ID_VIEW_DIR_STATISTICS
-#: Merge.rc:518
+#: Merge.rc:522
#, c-format
msgid "Com&pare Statistics..."
msgstr "Alderatu Esta&tistikak..."
#. IDR_MERGEDOCTYPE, ID_REFRESH
-#: Merge.rc:520 Merge.rc:763
+#: Merge.rc:524 Merge.rc:770
#, c-format
msgid "Refresh\tF5"
msgstr "Ber&ritu\tF5"
#. IDR_POPUP_DIRVIEW, ID_RESCAN
-#: Merge.rc:521 Merge.rc:1030
+#: Merge.rc:525 Merge.rc:1038
#, c-format
msgid "&Refresh Selected\tCtrl+F5"
msgstr "&Berritu Hautatutakoa\tCtrl+F5"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:523 Merge.rc:765
+#: Merge.rc:527 Merge.rc:772
#, c-format
msgid "&Merge"
msgstr "&Batu"
#. IDR_DIRDOCTYPE, ID_MERGE_COMPARE
-#: Merge.rc:525
+#: Merge.rc:529
#, c-format
msgid "Co&mpare\tEnter"
msgstr "&Alderatu\tEnter"
#. IDR_MERGEDOCTYPE, ID_NEXTDIFF
-#: Merge.rc:527 Merge.rc:767
+#: Merge.rc:531 Merge.rc:774
#, c-format
msgid "&Next Difference\tAlt+Down"
msgstr "&Hurrengo Ezberdintasuna\tAlt+Down"
#. IDR_MERGEDOCTYPE, ID_PREVDIFF
-#: Merge.rc:528 Merge.rc:768
+#: Merge.rc:532 Merge.rc:775
#, c-format
msgid "&Previous Difference\tAlt+Up"
msgstr "A&urreko Ezberdintasuna\tAlt+Up"
#. IDR_MERGEDOCTYPE, ID_FIRSTDIFF
-#: Merge.rc:530 Merge.rc:773
+#: Merge.rc:534 Merge.rc:780
#, c-format
msgid "&First Difference\tAlt+Home"
msgstr "&Lehen Ezberdintasuna\tAlt+Home"
#. IDR_MERGEDOCTYPE, ID_CURDIFF
-#: Merge.rc:531 Merge.rc:774
+#: Merge.rc:535 Merge.rc:781
#, c-format
msgid "&Current Difference\tAlt+Enter"
msgstr "U&neko Ezberdintasuna\tAlt+Enter"
#. IDR_MERGEDOCTYPE, ID_LASTDIFF
-#: Merge.rc:532 Merge.rc:775
+#: Merge.rc:536 Merge.rc:782
#, c-format
msgid "&Last Difference\tAlt+End"
msgstr "&Azken Ezberdintasuna\tAlt+End"
#. IDR_MERGEDOCTYPE, ID_L2R
-#: Merge.rc:534 Merge.rc:830
+#: Merge.rc:538 Merge.rc:837
#, c-format
msgid "Copy to &Right\tAlt+Right"
msgstr "Kopiatu E&skuinera\tAlt+Right"
#. IDR_MERGEDOCTYPE, ID_R2L
-#: Merge.rc:535 Merge.rc:831
+#: Merge.rc:539 Merge.rc:838
#, c-format
msgid "Copy to L&eft\tAlt+Left"
msgstr "Kopiatu E&zkerrera\tAlt+Left"
#. IDR_DIRDOCTYPE, ID_MERGE_DELETE
-#: Merge.rc:537
+#: Merge.rc:541
#, c-format
msgid "&Delete\tDel"
msgstr "&Ezabatu\tDel"
#. IDR_POPUP_DIRVIEW, ID_TOOLS_CUSTOMIZECOLUMNS
-#: Merge.rc:541 Merge.rc:1042
+#: Merge.rc:545 Merge.rc:1050
#, c-format
msgid "&Customize Columns..."
msgstr "&Antolatu Zutabeak..."
#. IDR_MERGEDOCTYPE, ID_TOOLS_GENERATEREPORT
-#: Merge.rc:544 Merge.rc:851
+#: Merge.rc:548 Merge.rc:858
#, c-format
msgid "Generate &Report..."
msgstr "Sortu &Jakinarazpena..."
#. IDD_ENCODINGERROR, IDC_PLUGIN
-#: Merge.rc:556 Merge.rc:867 Merge.rc:3064
+#: Merge.rc:560 Merge.rc:874 Merge.rc:3074
#, c-format
msgid "&Edit with Unpacker..."
msgstr ""
#. IDR_MERGEDOCTYPE, ID_FILE_SAVE
-#: Merge.rc:611
+#: Merge.rc:617
#, c-format
msgid "&Save\tCtrl+S"
msgstr "&Gorde\tCtrl+S"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:612
+#: Merge.rc:618
#, c-format
msgid "Sav&e"
msgstr ""
#. IDR_POPUP_SAVE, ID_FILE_SAVE_LEFT
-#: Merge.rc:614 Merge.rc:1201
+#: Merge.rc:620 Merge.rc:1211
#, c-format
msgid "Save &Left"
msgstr "Gorde E&zkerra"
#. IDR_POPUP_SAVE, ID_FILE_SAVE_MIDDLE
-#: Merge.rc:615 Merge.rc:1202
+#: Merge.rc:621 Merge.rc:1212
#, c-format
msgid "Save &Middle"
msgstr ""
#. IDR_POPUP_SAVE, ID_FILE_SAVE_RIGHT
-#: Merge.rc:616 Merge.rc:1203
+#: Merge.rc:622 Merge.rc:1213
#, c-format
msgid "Save &Right"
msgstr "Gorde E&skuina"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:618
+#: Merge.rc:624
#, c-format
msgid "Save &As"
msgstr ""
#. IDR_POPUP_SAVE, ID_FILE_SAVEAS_LEFT
-#: Merge.rc:620 Merge.rc:1205
+#: Merge.rc:626 Merge.rc:1215
#, c-format
msgid "Save &Left As..."
msgstr ""
#. IDR_POPUP_SAVE, ID_FILE_SAVEAS_MIDDLE
-#: Merge.rc:621 Merge.rc:1206
+#: Merge.rc:627 Merge.rc:1216
#, c-format
msgid "Save &Middle As..."
msgstr ""
#. IDR_POPUP_SAVE, ID_FILE_SAVEAS_RIGHT
-#: Merge.rc:622 Merge.rc:1207
+#: Merge.rc:628 Merge.rc:1217
#, c-format
msgid "Save &Right As..."
msgstr ""
#. IDR_MERGEDOCTYPE, ID_FILE_PRINT
-#: Merge.rc:625
+#: Merge.rc:631
msgid "&Print...\tCtrl+P"
msgstr "I&rarkitu...\tCtrl+P"
#. IDR_MERGEDOCTYPE, ID_FILE_PAGE_SETUP
-#: Merge.rc:626
+#: Merge.rc:632
msgid "Page Set&up..."
msgstr "Ire&ki Gatazka Agiria..."
#. IDR_MERGEDOCTYPE, ID_FILE_PRINT_PREVIEW
-#: Merge.rc:627
+#: Merge.rc:633
msgid "Print Previe&w..."
msgstr "Irarkitu Aurreikus&pena..."
#. IDR_MERGEDOCTYPE
-#: Merge.rc:636
+#: Merge.rc:642
#, c-format
msgid "&Convert Line Endings to"
msgstr "Bihurtu &Lerro Amaierak hona"
#. IDR_MERGEDOCTYPE, ID_FILE_MERGINGMODE
-#: Merge.rc:643
+#: Merge.rc:649
#, c-format
msgid "Mer&ge Mode\tF9"
msgstr "Batu &Modua\tF9"
#. IDR_MERGEDOCTYPE, ID_RESCAN
-#: Merge.rc:645
+#: Merge.rc:651
msgid "Reloa&d\tCtrl+F5"
msgstr ""
#. IDR_MERGEDOCTYPE
-#: Merge.rc:647
+#: Merge.rc:653
#, c-format
msgid "Reco&mpare As"
msgstr ""
+#. IDR_POPUP_COMPARE, ID_MERGE_COMPARE_FOLDER
+#: Merge.rc:660 Merge.rc:947 Merge.rc:1185
+msgid "A&rchive"
+msgstr ""
+
#. IDR_MERGEDOCTYPE, ID_EDIT_UNDO
-#: Merge.rc:666
+#: Merge.rc:673
#, c-format
msgid "&Undo\tCtrl+Z"
msgstr "&Desegin\tCtrl+Z"
#. IDR_MERGEDOCTYPE, ID_EDIT_REDO
-#: Merge.rc:667
+#: Merge.rc:674
#, c-format
msgid "&Redo\tCtrl+Y"
msgstr "Birre&gin\tCtrl+Y"
#. IDR_MERGEDOCTYPE, ID_EDIT_CUT
-#: Merge.rc:669
+#: Merge.rc:676
#, c-format
msgid "Cu&t\tCtrl+X"
msgstr "&Ebaki\tCtrl+X"
#. IDR_POPUP_OUTPUTVIEW, ID_EDIT_COPY
-#: Merge.rc:670 Merge.rc:1342
+#: Merge.rc:677 Merge.rc:1352
#, c-format
msgid "&Copy\tCtrl+C"
msgstr "&Kopiatu\tCtrl+C"
#. IDR_MERGEDOCTYPE, ID_EDIT_FIND
-#: Merge.rc:676
+#: Merge.rc:683
#, c-format
msgid "F&ind...\tCtrl+F"
msgstr "&Bilatu...\tCtrl+F"
#. IDR_MERGEDOCTYPE, ID_EDIT_REPLACE
-#: Merge.rc:677
+#: Merge.rc:684
#, c-format
msgid "Repla&ce...\tCtrl+H"
msgstr "&Ordeztu...\tCtrl+H"
#. IDR_MERGEDOCTYPE, ID_EDIT_MARK
-#: Merge.rc:678
+#: Merge.rc:685
#, c-format
msgid "&Marker...\tCtrl+Shift+M"
msgstr ""
#. IDR_MERGEDOCTYPE
-#: Merge.rc:680
+#: Merge.rc:687
#, c-format
msgid "Advanced"
msgstr "Aurrera&tua"
#. IDR_MERGEDOCTYPE, ID_EDIT_COPY_LINENUMBERS
-#: Merge.rc:682
+#: Merge.rc:689
#, c-format
msgid "&Copy With Line Numbers\tCtrl+Shift+C"
msgstr "&Kopiatu Lerro Zenbakiekin\tCtrl+Shift+C"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:684
+#: Merge.rc:691
#, c-format
msgid "&Bookmarks"
msgstr "Laster&markak"
#. IDR_MERGEDOCTYPE, ID_EDIT_TOGGLE_BOOKMARK
-#: Merge.rc:686
+#: Merge.rc:693
#, c-format
msgid "&Toggle Bookmark\tCtrl+F2"
msgstr "&Aldatu Lastermarka\tCtrl+F2"
#. IDR_MERGEDOCTYPE, ID_EDIT_GOTO_NEXT_BOOKMARK
-#: Merge.rc:687
+#: Merge.rc:694
#, c-format
msgid "&Next Bookmark\tF2"
msgstr "&Hurrengo Lastermarka\tF2"
#. IDR_MERGEDOCTYPE, ID_EDIT_GOTO_PREV_BOOKMARK
-#: Merge.rc:688
+#: Merge.rc:695
#, c-format
msgid "&Previous Bookmark\tShift+F2"
msgstr "A&urreko Lastermarka\tShift+F2"
#. IDR_MERGEDOCTYPE, ID_EDIT_CLEAR_ALL_BOOKMARKS
-#: Merge.rc:689
+#: Merge.rc:696
#, c-format
msgid "&Clear All Bookmarks"
msgstr "&Garbitu Lastermarka Guztiak"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:706
+#: Merge.rc:713
#, c-format
msgid "Syntax Highlight"
msgstr "Joskera Nabar&mentzea"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:711
+#: Merge.rc:718
#, c-format
msgid "&Diff Context"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_ALL
-#: Merge.rc:713
+#: Merge.rc:720
#, c-format
msgid "&All Lines"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_0
-#: Merge.rc:715
+#: Merge.rc:722
#, c-format
msgid "&0 Lines"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_1
-#: Merge.rc:716
+#: Merge.rc:723
#, c-format
msgid "&1 Line"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_3
-#: Merge.rc:717
+#: Merge.rc:724
#, c-format
msgid "&3 Lines"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_5
-#: Merge.rc:718
+#: Merge.rc:725
#, c-format
msgid "&5 Lines"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_7
-#: Merge.rc:719
+#: Merge.rc:726
#, c-format
msgid "&7 Lines"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_9
-#: Merge.rc:720
+#: Merge.rc:727
#, c-format
msgid "&9 Lines"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_TOGGLE
-#: Merge.rc:722
+#: Merge.rc:729
#, c-format
msgid "&Toggle All and 0-9 Lines\tCtrl+D"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_INVERT
-#: Merge.rc:724
+#: Merge.rc:731
msgid "&Invert (Hide Different Lines)"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_VIEW_RESIZE_PANES
-#: Merge.rc:727
+#: Merge.rc:734
#, c-format
msgid "&Lock Panes"
msgstr "Bl&okeatu Panelak"
#. IDR_MERGEDOCTYPE, ID_VIEW_WHITESPACE
-#: Merge.rc:728
+#: Merge.rc:735
#, c-format
msgid "&View Whitespace"
msgstr "Ikusi Zurigu&nea"
#. IDR_MERGEDOCTYPE, ID_VIEW_EOL
-#: Merge.rc:729
+#: Merge.rc:736
msgid "View E&OL"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_VIEW_LINEDIFFS
-#: Merge.rc:730
+#: Merge.rc:737
#, c-format
msgid "Vie&w Line Differences"
msgstr "I&kusi Lerro Ezberdintasunak"
#. IDR_MERGEDOCTYPE, ID_VIEW_LINENUMBERS
-#: Merge.rc:731
+#: Merge.rc:738
#, c-format
msgid "View Line &Numbers"
msgstr "Ikusi &Lerro Zenbakiak"
#. IDR_MERGEDOCTYPE, ID_VIEW_SELMARGIN
-#: Merge.rc:732
+#: Merge.rc:739
#, c-format
msgid "View &Margins"
msgstr "Ikusi &Bazterrak"
#. IDR_MERGEDOCTYPE, ID_VIEW_TOPMARGIN
-#: Merge.rc:733
+#: Merge.rc:740
msgid "View To&p Margins"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_VIEW_WORDWRAP
-#: Merge.rc:734
+#: Merge.rc:741
#, c-format
msgid "W&rap Lines"
msgstr "I&nguratu Lerroak"
#. IDR_MERGEDOCTYPE, ID_VIEW_SPLITVERTICALLY
-#: Merge.rc:742
+#: Merge.rc:749
#, c-format
msgid "Split V&ertically"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_VIEW_DETAIL_BAR
-#: Merge.rc:759
+#: Merge.rc:766
#, c-format
msgid "Diff &Pane"
msgstr "Ezberd &Panela"
#. IDR_MERGEDOCTYPE, ID_VIEW_LOCATION_BAR
-#: Merge.rc:760
+#: Merge.rc:767
#, c-format
msgid "Lo&cation Pane"
msgstr "Kokalek&u Panela"
#. IDS_OUTPUTBAR_CAPTION
-#: Merge.rc:761 Merge.rc:4902
+#: Merge.rc:768 Merge.rc:4912
msgid "Output Pane"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_NEXTCONFLICT
-#: Merge.rc:770
+#: Merge.rc:777
#, c-format
msgid "Ne&xt Conflict\tAlt+Shift+Down"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_PREVCONFLICT
-#: Merge.rc:771
+#: Merge.rc:778
#, c-format
msgid "Pre&vious Conflict\tAlt+Shift+Up"
msgstr ""
#. IDR_MERGEDOCTYPE
-#: Merge.rc:777
+#: Merge.rc:784
#, c-format
msgid "A&dvanced"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_NEXTDIFFLM
-#: Merge.rc:779
+#: Merge.rc:786
#, c-format
msgid "Next Difference (Left/Middle)\tAlt+1"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_PREVDIFFLM
-#: Merge.rc:780
+#: Merge.rc:787
#, c-format
msgid "Previous Difference (Left/Middle)\tAlt+Shift+1"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_NEXTDIFFLR
-#: Merge.rc:782
+#: Merge.rc:789
#, c-format
msgid "Next Difference (Left/Right)\tAlt+2"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_PREVDIFFLR
-#: Merge.rc:783
+#: Merge.rc:790
#, c-format
msgid "Previous Difference (Left/Right)\tAlt+Shift+2"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_NEXTDIFFMR
-#: Merge.rc:785
+#: Merge.rc:792
#, c-format
msgid "Next Difference (Middle/Right)\tAlt+3"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_PREVDIFFMR
-#: Merge.rc:786
+#: Merge.rc:793
#, c-format
msgid "Previous Difference (Middle/Right)\tAlt+Shift+3"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_NEXTDIFFLO
-#: Merge.rc:788
+#: Merge.rc:795
#, c-format
msgid "Next Left-Only Difference\tAlt+7"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_PREVDIFFLO
-#: Merge.rc:789
+#: Merge.rc:796
#, c-format
msgid "Previous Left-Only Difference\tAlt+Shift+7"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_NEXTDIFFMO
-#: Merge.rc:791
+#: Merge.rc:798
#, c-format
msgid "Next Middle-Only Difference\tAlt+8"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_PREVDIFFMO
-#: Merge.rc:792
+#: Merge.rc:799
#, c-format
msgid "Previous Middle-Only Difference\tAlt+Shift+8"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_NEXTDIFFRO
-#: Merge.rc:794
+#: Merge.rc:801
#, c-format
msgid "Next Right-Only Difference\tAlt+9"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_PREVDIFFRO
-#: Merge.rc:795
+#: Merge.rc:802
#, c-format
msgid "Previous Right-Only Difference\tAlt+Shift+9"
msgstr ""
#. IDR_MERGEDOCTYPE
-#: Merge.rc:797
+#: Merge.rc:804
msgid "Copy from &Left to"
msgstr ""
#. IDD_LOAD_SAVE_CODEPAGE, IDC_AFFECTS_MIDDLE_BTN
-#: Merge.rc:799 Merge.rc:810 Merge.rc:815 Merge.rc:826 Merge.rc:970
-#: Merge.rc:2545 Merge.rc:2817
+#: Merge.rc:806 Merge.rc:817 Merge.rc:822 Merge.rc:833 Merge.rc:978
+#: Merge.rc:2555 Merge.rc:2827
#, c-format
msgid "&Middle"
msgstr ""
#. IDD_LOAD_SAVE_CODEPAGE, IDC_AFFECTS_RIGHT_BTN
-#: Merge.rc:800 Merge.rc:805 Merge.rc:816 Merge.rc:821 Merge.rc:971
-#: Merge.rc:2546 Merge.rc:2819
+#: Merge.rc:807 Merge.rc:812 Merge.rc:823 Merge.rc:828 Merge.rc:979
+#: Merge.rc:2556 Merge.rc:2829
#, c-format
msgid "&Right"
msgstr "&E&skuina"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:802
+#: Merge.rc:809
msgid "Copy from &Middle to"
msgstr ""
#. IDD_LOAD_SAVE_CODEPAGE, IDC_AFFECTS_LEFT_BTN
-#: Merge.rc:804 Merge.rc:809 Merge.rc:820 Merge.rc:825 Merge.rc:969
-#: Merge.rc:2544 Merge.rc:2815
+#: Merge.rc:811 Merge.rc:816 Merge.rc:827 Merge.rc:832 Merge.rc:977
+#: Merge.rc:2554 Merge.rc:2825
#, c-format
msgid "&Left"
msgstr "Ezker&ra"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:807
+#: Merge.rc:814
msgid "Copy from &Right to"
msgstr ""
#. IDR_MERGEDOCTYPE
-#: Merge.rc:813
+#: Merge.rc:820
msgid "Copy Selected Lines from Le&ft to"
msgstr ""
#. IDR_MERGEDOCTYPE
-#: Merge.rc:818
+#: Merge.rc:825
msgid "Copy Selected Lines from Mi&ddle to"
msgstr ""
#. IDR_MERGEDOCTYPE
-#: Merge.rc:823
+#: Merge.rc:830
msgid "Copy Selected Lines from Ri&ght to"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_COPY_FROM_LEFT
-#: Merge.rc:833
+#: Merge.rc:840
#, c-format
msgid "Copy from Left\tAlt+Shift+Right"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_COPY_FROM_RIGHT
-#: Merge.rc:834
+#: Merge.rc:841
#, c-format
msgid "Copy from Right\tAlt+Shift+Left"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_L2RNEXT
-#: Merge.rc:836
+#: Merge.rc:843
msgid "C&opy to Right and Advance\tCtrl+Alt+Right"
msgstr "K&opiatu Eskuinera eta Aurrera egin\tCtrl+Alt+Right"
#. IDR_MERGEDOCTYPE, ID_R2LNEXT
-#: Merge.rc:837
+#: Merge.rc:844
msgid "Copy &to Left and Advance\tCtrl+Alt+Left"
msgstr "Kopiatu Ez&kerrera eta Aurrera egin\tCtrl+Alt+Right"
#. IDR_MERGEDOCTYPE, ID_ALL_RIGHT
-#: Merge.rc:839
+#: Merge.rc:846
#, c-format
msgid "Copy &All to Right"
msgstr "Kopiatu &Dena Eskuinera"
#. IDR_MERGEDOCTYPE, ID_ALL_LEFT
-#: Merge.rc:840
+#: Merge.rc:847
#, c-format
msgid "Cop&y All to Left"
msgstr "Kopia&tu Dena Ezkerrera"
#. IDR_MERGEDOCTYPE, ID_AUTO_MERGE
-#: Merge.rc:842
+#: Merge.rc:849
msgid "A&uto Merge\tCtrl+Alt+M"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_ADD_SYNCPOINT
-#: Merge.rc:844
+#: Merge.rc:851
#, c-format
msgid "Add &Synchronization Point\tAlt+S"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_CLEAR_SYNCPOINTS
-#: Merge.rc:845
+#: Merge.rc:852
#, c-format
msgid "Clear Sync&hronization Points"
msgstr ""
#. IDR_MERGEDOCTYPE
-#: Merge.rc:863
+#: Merge.rc:870
msgid "Unpac&ker"
msgstr ""
#. IDR_MERGEDOCTYPE
-#: Merge.rc:869
+#: Merge.rc:876
#, c-format
msgid "&Prediffer"
msgstr "Au&rrezberdintasuna"
#. IDR_MERGEDOCTYPE, ID_APPLY_PREDIFFER
-#: Merge.rc:873
+#: Merge.rc:880
msgid "Apply Pre&differ..."
msgstr ""
#. IDR_MERGEDOCTYPE, ID_TRANSFORM_WITH_SCRIPT
-#: Merge.rc:879
+#: Merge.rc:886
msgid "&Transform with Editor Script..."
msgstr ""
#. IDR_MERGEDOCTYPE
-#: Merge.rc:880
+#: Merge.rc:887
msgid "Scripts for &Copying"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_SELECT_EDITOR_SCRIPT_FOR_COPYING
-#: Merge.rc:886
+#: Merge.rc:893
msgid "Select &Editor Script..."
msgstr ""
#. IDR_MERGEDOCTYPE, ID_WINDOW_SPLIT
-#: Merge.rc:898
+#: Merge.rc:905
#, c-format
msgid "Sp&lit"
msgstr ""
#. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE
-#: Merge.rc:921
+#: Merge.rc:928
#, c-format
msgid "Comp&are"
msgstr "Alder&atu"
#. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE_WITH_MOVED_RENAMED
-#: Merge.rc:922
+#: Merge.rc:929
msgid "Compar&e with Renamed/Moved Items"
msgstr ""
#. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE_IN_NEW_WINDOW
-#: Merge.rc:923
+#: Merge.rc:930
msgid "Compare in New &Window"
msgstr ""
#. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE_NONHORIZONTALLY
-#: Merge.rc:924 Merge.rc:931
+#: Merge.rc:931 Merge.rc:938
msgid "Compare Non-hor&izontally..."
msgstr ""
#. IDR_POPUP_DIRVIEW
-#: Merge.rc:925
+#: Merge.rc:932
#, c-format
msgid "Compare Non-hor&izontally"
msgstr ""
#. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE_LEFT1_LEFT2
-#: Merge.rc:927
+#: Merge.rc:934
#, c-format
msgid "First &Left with Second Left"
msgstr ""
#. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE_RIGHT1_RIGHT2
-#: Merge.rc:928
+#: Merge.rc:935
#, c-format
msgid "First &Right with Second Right"
msgstr ""
#. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE_LEFT1_RIGHT2
-#: Merge.rc:929
+#: Merge.rc:936
#, c-format
msgid "&First Left with Second Right"
msgstr ""
#. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE_LEFT2_RIGHT1
-#: Merge.rc:930
+#: Merge.rc:937
#, c-format
msgid "&Second Left with First Right"
msgstr ""
#. IDR_POPUP_DIRVIEW
-#: Merge.rc:933
+#: Merge.rc:940
#, c-format
msgid "Co&mpare As"
msgstr "Alderatu &Honela"
#. IDS_COPY_LEFT_TO_MIDDLE2
-#: Merge.rc:945 Merge.rc:957 Merge.rc:4502
+#: Merge.rc:953 Merge.rc:965 Merge.rc:4512
#, c-format
msgid "Left to Middle (%1 of %2)"
msgstr ""
#. IDS_COPY_LEFT_TO_RIGHT2
-#: Merge.rc:946 Merge.rc:958 Merge.rc:4501
+#: Merge.rc:954 Merge.rc:966 Merge.rc:4511
#, c-format
msgid "Left to Right (%1 of %2)"
msgstr "Ezkerra Eskuinera (%1 %2-tik)"
#. IDS_MOVE_LEFT_TO2
-#: Merge.rc:947 Merge.rc:959 Merge.rc:1022 Merge.rc:4513 Merge.rc:4542
+#: Merge.rc:955 Merge.rc:967 Merge.rc:1030 Merge.rc:4523 Merge.rc:4552
#, c-format
msgid "Left to... (%1 of %2)"
msgstr "Ezkerra hona... (%1 %2-tik)"
#. IDS_COPY_MIDDLE_TO_LEFT2
-#: Merge.rc:948 Merge.rc:960 Merge.rc:4499
+#: Merge.rc:956 Merge.rc:968 Merge.rc:4509
#, c-format
msgid "Middle to Left (%1 of %2)"
msgstr ""
#. IDS_COPY_MIDDLE_TO_RIGHT2
-#: Merge.rc:949 Merge.rc:961 Merge.rc:4500
+#: Merge.rc:957 Merge.rc:969 Merge.rc:4510
#, c-format
msgid "Middle to Right (%1 of %2)"
msgstr ""
#. IDS_MOVE_MIDDLE_TO2
-#: Merge.rc:950 Merge.rc:962 Merge.rc:1023 Merge.rc:4514 Merge.rc:4543
+#: Merge.rc:958 Merge.rc:970 Merge.rc:1031 Merge.rc:4524 Merge.rc:4553
#, c-format
msgid "Middle to... (%1 of %2)"
msgstr ""
#. IDS_COPY_RIGHT_TO_MIDDLE2
-#: Merge.rc:951 Merge.rc:963 Merge.rc:4498
+#: Merge.rc:959 Merge.rc:971 Merge.rc:4508
#, c-format
msgid "Right to Middle (%1 of %2)"
msgstr ""
#. IDS_COPY_RIGHT_TO_LEFT2
-#: Merge.rc:952 Merge.rc:964 Merge.rc:4497
+#: Merge.rc:960 Merge.rc:972 Merge.rc:4507
#, c-format
msgid "Right to Left (%1 of %2)"
msgstr "Eskuina Ezkerrera (%1 %2-tik)"
#. IDS_MOVE_RIGHT_TO2
-#: Merge.rc:953 Merge.rc:965 Merge.rc:1024 Merge.rc:4515 Merge.rc:4544
+#: Merge.rc:961 Merge.rc:973 Merge.rc:1032 Merge.rc:4525 Merge.rc:4554
#, c-format
msgid "Right to... (%1 of %2)"
msgstr "Eskuina hona... (%1 %2-tik)"
#. IDD_EDIT_MARKER, IDC_EDIT_MARKER_DELETE
-#: Merge.rc:967 Merge.rc:2036
+#: Merge.rc:975 Merge.rc:2046
#, c-format
msgid "&Delete"
msgstr "&Ezabatu"
#. IDR_POPUP_DIRVIEW, ID_DIR_DEL_BOTH
-#: Merge.rc:972
+#: Merge.rc:980
#, c-format
msgid "&Both"
msgstr "&Biak"
#. IDR_POPUP_DIRVIEW, ID_DIR_DEL_ALL
-#: Merge.rc:973
+#: Merge.rc:981
#, c-format
msgid "&All"
msgstr ""
#. IDD_EDIT_REPLACE, IDC_EDIT_SCOPE_SELECTION
-#: Merge.rc:974 Merge.rc:2019
+#: Merge.rc:982 Merge.rc:2029
#, c-format
msgid "&Selection"
msgstr "Hauta&pena"
#. IDR_POPUP_DIRVIEW, ID_DIR_ITEM_RENAME
-#: Merge.rc:976
+#: Merge.rc:984
#, c-format
msgid "Re&name"
msgstr "Birri&zendatu"
#. IDR_POPUP_DIRVIEW, ID_DIR_HIDE_FILENAMES
-#: Merge.rc:977
+#: Merge.rc:985
#, c-format
msgid "&Hide Items"
msgstr "&Ezkutatu Gaiak"
#. IDR_POPUP_DIRVIEW
-#: Merge.rc:979
+#: Merge.rc:987
#, c-format
msgid "&Open Left"
msgstr "&Ireki Ezkerrekoa"
#. IDR_POPUP_DIRVIEW
-#: Merge.rc:986
+#: Merge.rc:994
#, c-format
msgid "Open Midd&le"
msgstr ""
#. IDR_POPUP_DIRVIEW
-#: Merge.rc:993
+#: Merge.rc:1001
#, c-format
msgid "O&pen Right"
msgstr "Ire&ki Eskuina"
#. IDR_POPUP_DIRVIEW
-#: Merge.rc:1001
+#: Merge.rc:1009
#, c-format
msgid "Cop&y Paths"
msgstr "Kopiatu &Helburu-izenak"
#. IDS_DEL_LEFT_FMT2
-#: Merge.rc:1003 Merge.rc:1012 Merge.rc:4530
+#: Merge.rc:1011 Merge.rc:1020 Merge.rc:4540
#, c-format
msgid "Left (%1 of %2)"
msgstr "Ezkerra (%1 %2-tik)"
#. IDS_DEL_MIDDLE_FMT2
-#: Merge.rc:1004 Merge.rc:1013 Merge.rc:4531
+#: Merge.rc:1012 Merge.rc:1021 Merge.rc:4541
#, c-format
msgid "Middle (%1 of %2)"
msgstr ""
#. IDS_DEL_RIGHT_FMT2
-#: Merge.rc:1005 Merge.rc:1014 Merge.rc:4532
+#: Merge.rc:1013 Merge.rc:1022 Merge.rc:4542
#, c-format
msgid "Right (%1 of %2)"
msgstr "Eskuina (%1 %2-tik)"
#. IDS_DEL_BOTH_FMT2
-#: Merge.rc:1006 Merge.rc:1015 Merge.rc:4533
+#: Merge.rc:1014 Merge.rc:1023 Merge.rc:4543
#, c-format
msgid "Both (%1 of %2)"
msgstr "Biak (%1 %2-tik)"
#. IDS_DEL_ALL_FMT2
-#: Merge.rc:1007 Merge.rc:1016 Merge.rc:4538
+#: Merge.rc:1015 Merge.rc:1024 Merge.rc:4548
#, c-format
msgid "All (%1 of %2)"
msgstr ""
#. IDR_POPUP_DIRVIEW, ID_DIR_COPY_FILENAMES
-#: Merge.rc:1009
+#: Merge.rc:1017
#, c-format
msgid "Copy &Filenames"
msgstr "Kopiatu &Agirizenak"
#. IDR_POPUP_DIRVIEW
-#: Merge.rc:1010
+#: Merge.rc:1018
#, c-format
msgid "Copy Items to Clip&board"
msgstr ""
#. IDR_POPUP_DIRVIEW, ID_DIR_COPY_ALL_DISP_COLUMNS
-#: Merge.rc:1018
+#: Merge.rc:1026
msgid "Copy All Di&splayed Columns"
msgstr ""
#. IDR_POPUP_DIRVIEW
-#: Merge.rc:1020
+#: Merge.rc:1028
#, c-format
msgid "&Zip"
msgstr "&Zipa"
#. IDS_COPY_BOTH_TO2
-#: Merge.rc:1025 Merge.rc:4516
+#: Merge.rc:1033 Merge.rc:4526
#, c-format
msgid "Both to... (%1 of %2)"
msgstr ""
#. IDS_COPY_ALL_TO2
-#: Merge.rc:1026 Merge.rc:4517
+#: Merge.rc:1034 Merge.rc:4527
#, c-format
msgid "All to... (%1 of %2)"
msgstr ""
#. IDS_COPY_DIFFERENCES_TO2
-#: Merge.rc:1027 Merge.rc:4518
+#: Merge.rc:1035 Merge.rc:4528
#, c-format
msgid "Differences to... (%1 of %2)"
msgstr ""
#. IDR_POPUP_DIRVIEW, ID_DIR_SHELL_CONTEXT_MENU_LEFT
-#: Merge.rc:1032
+#: Merge.rc:1040
#, c-format
msgid "Left Shell Menu"
msgstr "Ezkerreko Shell menua"
#. IDR_POPUP_DIRVIEW, ID_DIR_SHELL_CONTEXT_MENU_MIDDLE
-#: Merge.rc:1033
+#: Merge.rc:1041
#, c-format
msgid "Middle Shell Menu"
msgstr ""
#. IDR_POPUP_DIRVIEW, ID_DIR_SHELL_CONTEXT_MENU_RIGHT
-#: Merge.rc:1034
+#: Merge.rc:1042
#, c-format
msgid "Right Shell Menu"
msgstr "Eskuineko Shell menua"
#. IDR_POPUP_DIRVIEW, ID_DIR_SHELL_CONTEXT_MENU_BOTH
-#: Merge.rc:1035
+#: Merge.rc:1043
msgid "Both Shell Menu"
msgstr ""
#. IDR_POPUP_DIRVIEW, ID_DIR_SHELL_CONTEXT_MENU_ALL
-#: Merge.rc:1036
+#: Merge.rc:1044
msgid "All Shell Menu"
msgstr ""
#. IDR_POPUP_EDITOR_HEADERBAR, ID_EDITOR_COPY
-#: Merge.rc:1050
+#: Merge.rc:1058
#, c-format
msgid "Copy"
msgstr ""
#. IDR_POPUP_EDITOR_HEADERBAR, ID_EDITOR_COPY_PATH
-#: Merge.rc:1051
+#: Merge.rc:1059
#, c-format
msgid "&Copy Full Path"
msgstr "Kopiatu Helburu O&soa"
#. IDR_POPUP_EDITOR_HEADERBAR, ID_EDITOR_COPY_FILENAME
-#: Merge.rc:1052
+#: Merge.rc:1060
#, c-format
msgid "Copy &Filename"
msgstr "Kopiatu &Agirizena"
#. IDR_POPUP_EDITOR_HEADERBAR, ID_EDITOR_EDIT_CAPTION
-#: Merge.rc:1053
+#: Merge.rc:1061
msgid "&Edit Caption\tF2"
msgstr ""
#. IDR_POPUP_EDITOR_HEADERBAR, ID_EDITOR_EDIT_PATH
-#: Merge.rc:1055
+#: Merge.rc:1063
msgid "Edit &Path\tCtrl+L"
msgstr ""
#. IDR_POPUP_EDITOR_HEADERBAR, ID_EDITOR_SELECT_FILE
-#: Merge.rc:1056
+#: Merge.rc:1064
msgid "&Open..."
msgstr ""
#. IDR_POPUP_PLUGINS_SETTINGS
-#: Merge.rc:1062
+#: Merge.rc:1070
msgid "Unpacker Settings"
msgstr ""
#. IDS_USERCHOICE_NONE
-#: Merge.rc:1064 Merge.rc:1070 Merge.rc:1789 Merge.rc:1793 Merge.rc:5030
+#: Merge.rc:1072 Merge.rc:1078 Merge.rc:1799 Merge.rc:1803 Merge.rc:5040
#, c-format
msgid ""
msgstr ""
#. IDS_USERCHOICE_AUTOMATIC
-#: Merge.rc:1065 Merge.rc:1071 Merge.rc:5031
+#: Merge.rc:1073 Merge.rc:1079 Merge.rc:5041
#, c-format
msgid ""
msgstr ""
#. IDD_OPEN, IDC_SELECT_PREDIFFER
-#: Merge.rc:1066 Merge.rc:1072 Merge.rc:1970 Merge.rc:1974
+#: Merge.rc:1074 Merge.rc:1080 Merge.rc:1980 Merge.rc:1984
#, c-format
msgid "&Select..."
msgstr "&Hautatu..."
#. IDR_POPUP_PLUGINS_SETTINGS
-#: Merge.rc:1068
+#: Merge.rc:1076
#, c-format
msgid "Prediffer Settings"
msgstr "Aurrezberdintasun Ezarpenak"
#. IDR_POPUP_LOCATIONBAR, ID_LOCBAR_GOTODIFF
-#: Merge.rc:1080
+#: Merge.rc:1088
msgid "G&o to Diff"
msgstr "Jo&an Ezberd"
#. IDR_POPUP_LOCATIONBAR, ID_LOCBAR_MOVECURSOR_ONCLICK
-#: Merge.rc:1083
+#: Merge.rc:1091
msgid "Move Cursor on &Click"
msgstr ""
#. IDR_POPUP_LOCATIONBAR, ID_DISPLAY_MOVED_NONE
-#: Merge.rc:1085
+#: Merge.rc:1093
#, c-format
msgid "&No Moved Blocks"
msgstr "Mugitu &Gabeko Bloke Guztiak"
#. IDR_POPUP_LOCATIONBAR, ID_DISPLAY_MOVED_ALL
-#: Merge.rc:1086
+#: Merge.rc:1094
#, c-format
msgid "&All Moved Blocks"
msgstr "&Mugitutako Bloke Guztiak"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS
-#: Merge.rc:1094 Merge.rc:1127
+#: Merge.rc:1102 Merge.rc:1135
#, c-format
msgid "W&hitespaces"
msgstr "Zurig&uneak"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_WHITESPACE_COMPARE
-#: Merge.rc:1096 Merge.rc:1129
+#: Merge.rc:1104 Merge.rc:1137
#, c-format
msgid "Com&pare"
msgstr "Al&deratu"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_WHITESPACE_IGNORE
-#: Merge.rc:1097 Merge.rc:1130
+#: Merge.rc:1105 Merge.rc:1138
#, c-format
msgid "I&gnore Changes"
msgstr "Ezikus&i aldaketak"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_WHITESPACE_IGNOREALL
-#: Merge.rc:1098 Merge.rc:1131
+#: Merge.rc:1106 Merge.rc:1139
#, c-format
msgid "Ig&nore All"
msgstr "E&zikusi denak"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_IGNORE_BLANKLINES
-#: Merge.rc:1100 Merge.rc:1133
+#: Merge.rc:1108 Merge.rc:1141
#, c-format
msgid "Ignore Blan&k Lines"
msgstr "Ezikusi &lerro zuriak"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_IGNORE_CASE
-#: Merge.rc:1101 Merge.rc:1134
+#: Merge.rc:1109 Merge.rc:1142
#, c-format
msgid "Ignore &Case"
msgstr "Ezikusi &kasua"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_IGNORE_EOL
-#: Merge.rc:1102 Merge.rc:1135
+#: Merge.rc:1110 Merge.rc:1143
#, c-format
msgid "Igno&re EOL Differences (Windows/Unix/Mac)"
msgstr "Ezikusi g&urdi itzulera ezberdintasunak (Windows/Unix/Mac)"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_IGNORE_CODEPAGE
-#: Merge.rc:1103 Merge.rc:1136
+#: Merge.rc:1111 Merge.rc:1144
#, c-format
msgid "Ignore Codepage &Differences"
msgstr ""
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_IGNORE_NUMBERS
-#: Merge.rc:1104 Merge.rc:1137
+#: Merge.rc:1112 Merge.rc:1145
msgid "Ignore Num&bers"
msgstr ""
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_IGNORE_COMMENTS
-#: Merge.rc:1105 Merge.rc:1138
+#: Merge.rc:1113 Merge.rc:1146
msgid "Ignore C&omment Differences"
msgstr ""
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_IGNORE_MISSING_TRAILING_EOL
-#: Merge.rc:1106 Merge.rc:1139
+#: Merge.rc:1114 Merge.rc:1147
msgid "Ignore &Missing Trailing EOL"
msgstr ""
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_IGNORE_LINE_BREAKS
-#: Merge.rc:1107 Merge.rc:1140
+#: Merge.rc:1115 Merge.rc:1148
msgid "Ignore Line &Breaks (Treat as Spaces)"
msgstr ""
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_RECURS_CHECK
-#: Merge.rc:1109 Merge.rc:2963
+#: Merge.rc:1117 Merge.rc:2973
#, c-format
msgid "&Include Subfolders"
msgstr "&Az&piagiritegiak Barne"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS
-#: Merge.rc:1110 Merge.rc:1142
+#: Merge.rc:1118 Merge.rc:1150
#, c-format
msgid "&Compare Method"
msgstr "Alderaketa &metodoa"
#. IDS_COMPMETHOD_FULL_CONTENTS
-#: Merge.rc:1112 Merge.rc:1144 Merge.rc:1328 Merge.rc:4282
+#: Merge.rc:1120 Merge.rc:1152 Merge.rc:1338 Merge.rc:4292
#, c-format
msgid "Full Contents"
msgstr "Eduki Denak"
#. IDS_COMPMETHOD_QUICK_CONTENTS
-#: Merge.rc:1113 Merge.rc:1145 Merge.rc:1329 Merge.rc:4283
+#: Merge.rc:1121 Merge.rc:1153 Merge.rc:1339 Merge.rc:4293
#, c-format
msgid "Quick Contents"
msgstr "Eduki Azkarrak"
#. IDS_COMPMETHOD_BINARY_CONTENTS
-#: Merge.rc:1114 Merge.rc:1146 Merge.rc:1330 Merge.rc:4284
+#: Merge.rc:1122 Merge.rc:1154 Merge.rc:1340 Merge.rc:4294
#, c-format
msgid "Binary Contents"
msgstr ""
#. IDS_COMPMETHOD_MODDATE
-#: Merge.rc:1115 Merge.rc:1147 Merge.rc:1331 Merge.rc:4285
+#: Merge.rc:1123 Merge.rc:1155 Merge.rc:1341 Merge.rc:4295
#, c-format
msgid "Modified Date"
msgstr "Eguna Aldatuta"
#. IDS_COMPMETHOD_DATESIZE
-#: Merge.rc:1116 Merge.rc:1148 Merge.rc:1332 Merge.rc:4286
+#: Merge.rc:1124 Merge.rc:1156 Merge.rc:1342 Merge.rc:4296
#, c-format
msgid "Modified Date and Size"
msgstr "Eguna eta Neurria Aldatuta"
#. IDS_COMPMETHOD_SIZE
-#: Merge.rc:1117 Merge.rc:1149 Merge.rc:1333 Merge.rc:4287
+#: Merge.rc:1125 Merge.rc:1157 Merge.rc:1343 Merge.rc:4297
#, c-format
msgid "Size"
msgstr "Neurria"
#. IDS_COMPMETHOD_EXISTENCE
-#: Merge.rc:1118 Merge.rc:1150 Merge.rc:1334 Merge.rc:4288
+#: Merge.rc:1126 Merge.rc:1158 Merge.rc:1344 Merge.rc:4298
msgid "Existence"
msgstr ""
#. IDR_POPUP_PROJECT, ID_LOAD_PROJECT
-#: Merge.rc:1192
+#: Merge.rc:1202
#, c-format
msgid "&Load Project..."
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARGALL
-#: Merge.rc:1272 Merge.rc:1301
+#: Merge.rc:1282 Merge.rc:1311
msgid "${*} - All Arguments"
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARG1
-#: Merge.rc:1273 Merge.rc:1302
+#: Merge.rc:1283 Merge.rc:1312
msgid "${1} - First Argument"
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARG2
-#: Merge.rc:1274 Merge.rc:1303
+#: Merge.rc:1284 Merge.rc:1313
msgid "${2} - Second Argument"
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARG3
-#: Merge.rc:1275 Merge.rc:1304
+#: Merge.rc:1285 Merge.rc:1314
msgid "${3} - Third Argument"
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARG4
-#: Merge.rc:1276 Merge.rc:1305
+#: Merge.rc:1286 Merge.rc:1315
msgid "${4} - Fourth Argument"
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARG5
-#: Merge.rc:1277 Merge.rc:1306
+#: Merge.rc:1287 Merge.rc:1316
msgid "${5} - Fifth Argument"
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARG6
-#: Merge.rc:1278 Merge.rc:1307
+#: Merge.rc:1288 Merge.rc:1317
msgid "${6} - Sixth Argument"
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARG7
-#: Merge.rc:1279 Merge.rc:1308
+#: Merge.rc:1289 Merge.rc:1318
msgid "${7} - Seventh Argument"
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARG8
-#: Merge.rc:1280 Merge.rc:1309
+#: Merge.rc:1290 Merge.rc:1319
msgid "${8} - Eighth Argument"
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARG9
-#: Merge.rc:1281 Merge.rc:1310
+#: Merge.rc:1291 Merge.rc:1320
msgid "${9} - Ninth Argument"
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_SRC_FILE
-#: Merge.rc:1289
+#: Merge.rc:1299
msgid "${SRC_FILE} - Source File"
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_SRC_FOLDER
-#: Merge.rc:1290
+#: Merge.rc:1300
msgid "${SRC_FOLDER} - Source Folder"
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_SRC_URL
-#: Merge.rc:1291
+#: Merge.rc:1301
msgid "${SRC_URL} - Source URL"
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_SRC_URL_PROTOCOL
-#: Merge.rc:1292
+#: Merge.rc:1302
msgid "${SRC_URL_PROTOCOL} - Source URL Protocol"
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_SRC_URL_SUFFIX
-#: Merge.rc:1293
+#: Merge.rc:1303
msgid "${SRC_URL_SUFFIX} - Source URL Suffix"
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_DST_FILE
-#: Merge.rc:1294
+#: Merge.rc:1304
msgid "${DST_FILE} - Destination File"
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_DST_FOLDER
-#: Merge.rc:1295
+#: Merge.rc:1305
msgid "${DST_FOLDER} - Destination Folder"
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_DST_URL
-#: Merge.rc:1296
+#: Merge.rc:1306
msgid "${DST_URL} - Destination URL"
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_DST_URL_PROTOCOL
-#: Merge.rc:1297
+#: Merge.rc:1307
msgid "${DST_URL_PROTOCOL} - Destination URL Protocol"
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_DST_URL_SUFFIX
-#: Merge.rc:1298
+#: Merge.rc:1308
msgid "${DST_URL_SUFFIX} - Destination URL Suffix"
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_WINMERGE_HOME
-#: Merge.rc:1299
+#: Merge.rc:1309
msgid "${WINMERGE_HOME} - WinMerge Home Directory"
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_SCRIPT_FILE
-#: Merge.rc:1300
+#: Merge.rc:1310
msgid "${SCRIPT_FILE} - Script File"
msgstr ""
#. IDR_POPUP_PLUGIN_ADD_MENU, ID_PLUGIN_ADD_UNPACKER
-#: Merge.rc:1318
+#: Merge.rc:1328
msgid "Add &Unpacker Plugin..."
msgstr ""
#. IDR_POPUP_PLUGIN_ADD_MENU, ID_PLUGIN_ADD_PREDIFFER
-#: Merge.rc:1319
+#: Merge.rc:1329
msgid "Add &Prediffer Plugin..."
msgstr ""
#. IDR_POPUP_PLUGIN_ADD_MENU, ID_PLUGIN_DUPLICATE
-#: Merge.rc:1320
+#: Merge.rc:1330
msgid "&Duplicate Plugin..."
msgstr ""
#. IDR_POPUP_OUTPUTVIEW, ID_EDIT_CLEAR_ALL
-#: Merge.rc:1344
+#: Merge.rc:1354
msgid "Clear &All"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_MASK_CLEAR
-#: Merge.rc:1352
+#: Merge.rc:1362
msgid "&Clear All"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_MASK_REMOVE_LAST
-#: Merge.rc:1353
+#: Merge.rc:1363
msgid "Remove Last Filter &Group"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_MASK_ALL
-#: Merge.rc:1354
+#: Merge.rc:1364
msgid "R&eset to Default (*.*)"
msgstr ""
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1355
+#: Merge.rc:1365
msgid "Add E&xclude File"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_SYS
-#: Merge.rc:1357
+#: Merge.rc:1367
msgid "&System Files"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_BACKUP
-#: Merge.rc:1358
+#: Merge.rc:1368
msgid "&Editor Backup Files"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_BIN
-#: Merge.rc:1359
+#: Merge.rc:1369
msgid "&Compiled Binary Files"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_LOG
-#: Merge.rc:1360
+#: Merge.rc:1370
msgid "&Log Files"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_TEMP
-#: Merge.rc:1361
+#: Merge.rc:1371
msgid "&Temporary or Cache Files"
msgstr ""
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1363
+#: Merge.rc:1373
msgid "Add Excl&ude Folder"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FOLDER_VCS
-#: Merge.rc:1365
+#: Merge.rc:1375
msgid "&Version Control"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FOLDER_BUILD
-#: Merge.rc:1366
+#: Merge.rc:1376
msgid "&Build Artifacts"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FOLDER_IDE
-#: Merge.rc:1367
+#: Merge.rc:1377
msgid "&IDE"
msgstr ""
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1370
+#: Merge.rc:1380
msgid "Add &File Condition"
msgstr ""
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1372 Merge.rc:1551
+#: Merge.rc:1382 Merge.rc:1561
msgid "File &Size"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_SIZE, ID_FILTERMENU_DIFF_SIZE_LT_1KB
-#: Merge.rc:1374 Merge.rc:1527 Merge.rc:1564 Merge.rc:1629 Merge.rc:1707
+#: Merge.rc:1384 Merge.rc:1537 Merge.rc:1574 Merge.rc:1639 Merge.rc:1717
msgid "Less than 1KB"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_SIZE, ID_FILTERMENU_DIFF_SIZE_GE_1KB
-#: Merge.rc:1375 Merge.rc:1528 Merge.rc:1565 Merge.rc:1630 Merge.rc:1708
+#: Merge.rc:1385 Merge.rc:1538 Merge.rc:1575 Merge.rc:1640 Merge.rc:1718
msgid "1KB or more"
msgstr ""
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_LT_10KB
-#: Merge.rc:1376 Merge.rc:1529 Merge.rc:1631
+#: Merge.rc:1386 Merge.rc:1539 Merge.rc:1641
msgid "Less than 10KB"
msgstr ""
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_GE_10KB
-#: Merge.rc:1377 Merge.rc:1530 Merge.rc:1632
+#: Merge.rc:1387 Merge.rc:1540 Merge.rc:1642
msgid "10KB or more"
msgstr ""
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_LT_100KB
-#: Merge.rc:1378 Merge.rc:1531 Merge.rc:1633
+#: Merge.rc:1388 Merge.rc:1541 Merge.rc:1643
msgid "Less than 100KB"
msgstr ""
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_GE_100KB
-#: Merge.rc:1379 Merge.rc:1532 Merge.rc:1634
+#: Merge.rc:1389 Merge.rc:1542 Merge.rc:1644
msgid "100KB or more"
msgstr ""
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_LT_1MB
-#: Merge.rc:1380 Merge.rc:1533 Merge.rc:1635
+#: Merge.rc:1390 Merge.rc:1543 Merge.rc:1645
msgid "Less than 1MB"
msgstr ""
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_GE_1MB
-#: Merge.rc:1381 Merge.rc:1534 Merge.rc:1636
+#: Merge.rc:1391 Merge.rc:1544 Merge.rc:1646
msgid "1MB or more"
msgstr ""
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_LT_10MB
-#: Merge.rc:1382 Merge.rc:1535 Merge.rc:1637
+#: Merge.rc:1392 Merge.rc:1545 Merge.rc:1647
msgid "Less than 10MB"
msgstr ""
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_GE_10MB
-#: Merge.rc:1383 Merge.rc:1536 Merge.rc:1638
+#: Merge.rc:1393 Merge.rc:1546 Merge.rc:1648
msgid "10MB or more"
msgstr ""
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_LT_100MB
-#: Merge.rc:1384 Merge.rc:1537 Merge.rc:1639
+#: Merge.rc:1394 Merge.rc:1547 Merge.rc:1649
msgid "Less than 100MB"
msgstr ""
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_GE_100MB
-#: Merge.rc:1385 Merge.rc:1538 Merge.rc:1640
+#: Merge.rc:1395 Merge.rc:1548 Merge.rc:1650
msgid "100MB or more"
msgstr ""
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_LT_1GB
-#: Merge.rc:1386 Merge.rc:1539 Merge.rc:1641
+#: Merge.rc:1396 Merge.rc:1549 Merge.rc:1651
msgid "Less than 1GB"
msgstr ""
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_GE_1GB
-#: Merge.rc:1387 Merge.rc:1642
+#: Merge.rc:1397 Merge.rc:1652
msgid "1GB or more"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_RANGE
-#: Merge.rc:1388 Merge.rc:1465 Merge.rc:1517 Merge.rc:1523 Merge.rc:1540
-#: Merge.rc:1566 Merge.rc:1587 Merge.rc:1643 Merge.rc:1709 Merge.rc:1734
+#: Merge.rc:1398 Merge.rc:1475 Merge.rc:1527 Merge.rc:1533 Merge.rc:1550
+#: Merge.rc:1576 Merge.rc:1597 Merge.rc:1653 Merge.rc:1719 Merge.rc:1744
msgid "Custom Range..."
msgstr ""
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1390 Merge.rc:1471 Merge.rc:1568
+#: Merge.rc:1400 Merge.rc:1481 Merge.rc:1578
msgid "&Last Modified"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE
-#: Merge.rc:1392 Merge.rc:1473 Merge.rc:1651
+#: Merge.rc:1402 Merge.rc:1483 Merge.rc:1661
msgid "&Hour"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_HOUR_BEFORE_1
-#: Merge.rc:1394 Merge.rc:1475 Merge.rc:1653
+#: Merge.rc:1404 Merge.rc:1485 Merge.rc:1663
msgid "More than 1 hour ago"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_HOUR_WITHIN_1
-#: Merge.rc:1395 Merge.rc:1476 Merge.rc:1654
+#: Merge.rc:1405 Merge.rc:1486 Merge.rc:1664
msgid "Within 1 hour"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE
-#: Merge.rc:1397 Merge.rc:1478 Merge.rc:1656
+#: Merge.rc:1407 Merge.rc:1488 Merge.rc:1666
msgid "&Day"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_DAY_BEFORE_TODAY
-#: Merge.rc:1399 Merge.rc:1480 Merge.rc:1658
+#: Merge.rc:1409 Merge.rc:1490 Merge.rc:1668
msgid "Before today"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_DAY_TODAY
-#: Merge.rc:1400 Merge.rc:1481 Merge.rc:1659
+#: Merge.rc:1410 Merge.rc:1491 Merge.rc:1669
msgid "Today"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_DAY_BEFORE_YESTERDAY
-#: Merge.rc:1401 Merge.rc:1482 Merge.rc:1660
+#: Merge.rc:1411 Merge.rc:1492 Merge.rc:1670
msgid "Before yesterday"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_DAY_YESTERDAY
-#: Merge.rc:1402 Merge.rc:1483 Merge.rc:1661
+#: Merge.rc:1412 Merge.rc:1493 Merge.rc:1671
msgid "Yesterday"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_DAY_SINCE_YESTERDAY
-#: Merge.rc:1403 Merge.rc:1484 Merge.rc:1662
+#: Merge.rc:1413 Merge.rc:1494 Merge.rc:1672
msgid "Since yesterday"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE
-#: Merge.rc:1405 Merge.rc:1486 Merge.rc:1664
+#: Merge.rc:1415 Merge.rc:1496 Merge.rc:1674
msgid "&Week"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_WEEK_BEFORE_THIS
-#: Merge.rc:1407 Merge.rc:1488 Merge.rc:1666
+#: Merge.rc:1417 Merge.rc:1498 Merge.rc:1676
msgid "Before this week"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_WEEK_THIS
-#: Merge.rc:1408 Merge.rc:1489 Merge.rc:1667
+#: Merge.rc:1418 Merge.rc:1499 Merge.rc:1677
msgid "This week"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_WEEK_BEFORE_LAST
-#: Merge.rc:1409 Merge.rc:1490 Merge.rc:1668
+#: Merge.rc:1419 Merge.rc:1500 Merge.rc:1678
msgid "Before last week"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_WEEK_LAST
-#: Merge.rc:1410 Merge.rc:1491 Merge.rc:1669
+#: Merge.rc:1420 Merge.rc:1501 Merge.rc:1679
msgid "Last week"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_WEEK_SINCE_LAST
-#: Merge.rc:1411 Merge.rc:1492 Merge.rc:1670
+#: Merge.rc:1421 Merge.rc:1502 Merge.rc:1680
msgid "Since last week"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE
-#: Merge.rc:1413 Merge.rc:1494 Merge.rc:1672
+#: Merge.rc:1423 Merge.rc:1504 Merge.rc:1682
msgid "&Month"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_MONTH_BEFORE_THIS
-#: Merge.rc:1415 Merge.rc:1496 Merge.rc:1674
+#: Merge.rc:1425 Merge.rc:1506 Merge.rc:1684
msgid "Before this month"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_MONTH_THIS
-#: Merge.rc:1416 Merge.rc:1497 Merge.rc:1675
+#: Merge.rc:1426 Merge.rc:1507 Merge.rc:1685
msgid "This month"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_MONTH_BEFORE_LAST
-#: Merge.rc:1417 Merge.rc:1498 Merge.rc:1676
+#: Merge.rc:1427 Merge.rc:1508 Merge.rc:1686
msgid "Before last month"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_MONTH_LAST
-#: Merge.rc:1418 Merge.rc:1499 Merge.rc:1677
+#: Merge.rc:1428 Merge.rc:1509 Merge.rc:1687
msgid "Last month"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_MONTH_SINCE_LAST
-#: Merge.rc:1419 Merge.rc:1500 Merge.rc:1678
+#: Merge.rc:1429 Merge.rc:1510 Merge.rc:1688
msgid "Since last month"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE
-#: Merge.rc:1421 Merge.rc:1502 Merge.rc:1680
+#: Merge.rc:1431 Merge.rc:1512 Merge.rc:1690
msgid "&Year"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_YEAR_BEFORE_THIS
-#: Merge.rc:1423 Merge.rc:1504 Merge.rc:1682
+#: Merge.rc:1433 Merge.rc:1514 Merge.rc:1692
msgid "Before this year"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_YEAR_THIS
-#: Merge.rc:1424 Merge.rc:1505 Merge.rc:1683
+#: Merge.rc:1434 Merge.rc:1515 Merge.rc:1693
msgid "This year"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_YEAR_BEFORE_LAST
-#: Merge.rc:1425 Merge.rc:1506 Merge.rc:1684
+#: Merge.rc:1435 Merge.rc:1516 Merge.rc:1694
msgid "Before last year"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_YEAR_LAST
-#: Merge.rc:1426 Merge.rc:1507 Merge.rc:1685
+#: Merge.rc:1436 Merge.rc:1517 Merge.rc:1695
msgid "Last year"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_YEAR_SINCE_LAST
-#: Merge.rc:1427 Merge.rc:1508 Merge.rc:1686
+#: Merge.rc:1437 Merge.rc:1518 Merge.rc:1696
msgid "Since last year"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_RANGE
-#: Merge.rc:1429 Merge.rc:1510 Merge.rc:1688
+#: Merge.rc:1439 Merge.rc:1520 Merge.rc:1698
msgid "&Custom Range..."
msgstr ""
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1431 Merge.rc:1589
+#: Merge.rc:1441 Merge.rc:1599
msgid "&Attributes"
msgstr ""
#. IDR_POPUP_FILTERMENU_ATTR, ID_FILTERMENU_ATTR_READONLY
-#: Merge.rc:1433 Merge.rc:1607
+#: Merge.rc:1443 Merge.rc:1617
msgid "Read-only files"
msgstr ""
#. IDR_POPUP_FILTERMENU_ATTR, ID_FILTERMENU_ATTR_NOT_READONLY
-#: Merge.rc:1434 Merge.rc:1608
+#: Merge.rc:1444 Merge.rc:1618
msgid "Not read-only files"
msgstr ""
#. IDR_POPUP_FILTERMENU_ATTR, ID_FILTERMENU_ATTR_HIDDEN
-#: Merge.rc:1435 Merge.rc:1609
+#: Merge.rc:1445 Merge.rc:1619
msgid "Hidden files"
msgstr ""
#. IDR_POPUP_FILTERMENU_ATTR, ID_FILTERMENU_ATTR_NOT_HIDDEN
-#: Merge.rc:1436 Merge.rc:1610
+#: Merge.rc:1446 Merge.rc:1620
msgid "Not hidden files"
msgstr ""
#. IDR_POPUP_FILTERMENU_ATTR, ID_FILTERMENU_ATTR_SYSTEM
-#: Merge.rc:1437 Merge.rc:1611
+#: Merge.rc:1447 Merge.rc:1621
msgid "System files"
msgstr ""
#. IDR_POPUP_FILTERMENU_ATTR, ID_FILTERMENU_ATTR_NOT_SYSTEM
-#: Merge.rc:1438 Merge.rc:1612
+#: Merge.rc:1448 Merge.rc:1622
msgid "Not system files"
msgstr ""
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1440
+#: Merge.rc:1450
msgid "File &Content"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_CONTAINS
-#: Merge.rc:1442
+#: Merge.rc:1452
msgid "Contains string..."
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_NOT_CONTAINS
-#: Merge.rc:1443
+#: Merge.rc:1453
msgid "Does not contain string..."
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_FIRST_LINE_CONTAINS
-#: Merge.rc:1444
+#: Merge.rc:1454
msgid "First line contains string..."
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_FIRST_LINE_NOT_CONTAINS
-#: Merge.rc:1445
+#: Merge.rc:1455
msgid "First line does not contain string..."
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_FIRST_10_CONTAINS
-#: Merge.rc:1446
+#: Merge.rc:1456
msgid "First 10 lines contain string..."
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_FIRST_10_NOT_CONTAINS
-#: Merge.rc:1447
+#: Merge.rc:1457
msgid "First 10 lines do not contain string..."
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_LAST_10_CONTAINS
-#: Merge.rc:1448
+#: Merge.rc:1458
msgid "Last 10 lines contain string..."
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_LAST_10_NOT_CONTAINS
-#: Merge.rc:1449
+#: Merge.rc:1459
msgid "Last 10 lines do not contain string..."
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_LAST_LINE_CONTAINS
-#: Merge.rc:1450
+#: Merge.rc:1460
msgid "Last line contains string..."
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_LAST_LINE_NOT_CONTAINS
-#: Merge.rc:1451
+#: Merge.rc:1461
msgid "Last line does not contain string..."
msgstr ""
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1453
+#: Merge.rc:1463
msgid "&Line Count"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_LT_10
-#: Merge.rc:1455
+#: Merge.rc:1465
msgid "Less than 10"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_GE_10
-#: Merge.rc:1456
+#: Merge.rc:1466
msgid "10 or more"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_LT_100
-#: Merge.rc:1457
+#: Merge.rc:1467
msgid "Less than 100"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_GE_100
-#: Merge.rc:1458
+#: Merge.rc:1468
msgid "100 or more"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_LT_1000
-#: Merge.rc:1459
+#: Merge.rc:1469
msgid "Less than 1000"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_GE_1000
-#: Merge.rc:1460
+#: Merge.rc:1470
msgid "1000 or more"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_LT_10000
-#: Merge.rc:1461
+#: Merge.rc:1471
msgid "Less than 10000"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_GE_10000
-#: Merge.rc:1462
+#: Merge.rc:1472
msgid "10000 or more"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_LT_100000
-#: Merge.rc:1463
+#: Merge.rc:1473
msgid "Less than 100000"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_GE_100000
-#: Merge.rc:1464
+#: Merge.rc:1474
msgid "100000 or more"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_PROPS
-#: Merge.rc:1467 Merge.rc:1594 Merge.rc:1761 Merge.rc:1778
+#: Merge.rc:1477 Merge.rc:1604 Merge.rc:1771 Merge.rc:1788
msgid "Additional &Properties..."
msgstr ""
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1469
+#: Merge.rc:1479
msgid "Add F&older Condition"
msgstr ""
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1513
+#: Merge.rc:1523
msgid "&Files"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FOLDER_FILES_EQ_0
-#: Merge.rc:1515
+#: Merge.rc:1525
msgid "0 files"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FOLDER_FILES_GE_1
-#: Merge.rc:1516
+#: Merge.rc:1526
msgid "1 file or more"
msgstr ""
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1519
+#: Merge.rc:1529
msgid "&Items"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FOLDER_ITEMS_EQ_0
-#: Merge.rc:1521
+#: Merge.rc:1531
msgid "0 items"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FOLDER_ITEMS_GE_1
-#: Merge.rc:1522
+#: Merge.rc:1532
msgid "1 item or more"
msgstr ""
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1525
+#: Merge.rc:1535
msgid "&Total Size"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FOLDER_STATS_RECURSIVE
-#: Merge.rc:1542
+#: Merge.rc:1552
msgid "&Recursive"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONDITION_ANY
-#: Merge.rc:1544
+#: Merge.rc:1554
msgid "Target: &Any (Left/Middle/Right)"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONDITION_LEFT
-#: Merge.rc:1545
+#: Merge.rc:1555
msgid "Target: &Left"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONDITION_MIDDLE
-#: Merge.rc:1546
+#: Merge.rc:1556
msgid "Target: &Middle"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONDITION_RIGHT
-#: Merge.rc:1547
+#: Merge.rc:1557
msgid "Target: &Right"
msgstr ""
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1549
+#: Merge.rc:1559
msgid "Add &Difference Condition"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_PROP, ID_FILTERMENU_DIFF_PROP_EQUAL
-#: Merge.rc:1553 Merge.rc:1570 Merge.rc:1591 Merge.rc:1696 Merge.rc:1717
-#: Merge.rc:1742
+#: Merge.rc:1563 Merge.rc:1580 Merge.rc:1601 Merge.rc:1706 Merge.rc:1727
+#: Merge.rc:1752
msgid "Equal"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_PROP, ID_FILTERMENU_DIFF_PROP_NOT_EQUAL
-#: Merge.rc:1554 Merge.rc:1571 Merge.rc:1592 Merge.rc:1697 Merge.rc:1718
-#: Merge.rc:1743
+#: Merge.rc:1564 Merge.rc:1581 Merge.rc:1602 Merge.rc:1707 Merge.rc:1728
+#: Merge.rc:1753
msgid "Not Equal"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_PROP, ID_FILTERMENU_DIFF_PROP_LESS
-#: Merge.rc:1555 Merge.rc:1572 Merge.rc:1698 Merge.rc:1719 Merge.rc:1744
+#: Merge.rc:1565 Merge.rc:1582 Merge.rc:1708 Merge.rc:1729 Merge.rc:1754
msgid "Less Than"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_PROP, ID_FILTERMENU_DIFF_PROP_LESS_EQUAL
-#: Merge.rc:1556 Merge.rc:1573 Merge.rc:1699 Merge.rc:1720 Merge.rc:1745
+#: Merge.rc:1566 Merge.rc:1583 Merge.rc:1709 Merge.rc:1730 Merge.rc:1755
msgid "Less Than or Equal to"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_PROP, ID_FILTERMENU_DIFF_PROP_GREATER
-#: Merge.rc:1557 Merge.rc:1574 Merge.rc:1700 Merge.rc:1721 Merge.rc:1746
+#: Merge.rc:1567 Merge.rc:1584 Merge.rc:1710 Merge.rc:1731 Merge.rc:1756
msgid "Greater Than"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_PROP, ID_FILTERMENU_DIFF_PROP_GREATER_EQUAL
-#: Merge.rc:1558 Merge.rc:1575 Merge.rc:1701 Merge.rc:1722 Merge.rc:1747
+#: Merge.rc:1568 Merge.rc:1585 Merge.rc:1711 Merge.rc:1732 Merge.rc:1757
msgid "Greater Than or Equal to"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_SIZE, ID_FILTERMENU_DIFF_SIZE_LT_10B
-#: Merge.rc:1560 Merge.rc:1703
+#: Merge.rc:1570 Merge.rc:1713
msgid "Less than 10B"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_SIZE, ID_FILTERMENU_DIFF_SIZE_GE_10B
-#: Merge.rc:1561 Merge.rc:1704
+#: Merge.rc:1571 Merge.rc:1714
msgid "10B or more"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_SIZE, ID_FILTERMENU_DIFF_SIZE_LT_100B
-#: Merge.rc:1562 Merge.rc:1705
+#: Merge.rc:1572 Merge.rc:1715
msgid "Less than 100B"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_SIZE, ID_FILTERMENU_DIFF_SIZE_GE_100B
-#: Merge.rc:1563 Merge.rc:1706
+#: Merge.rc:1573 Merge.rc:1716
msgid "100B or more"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_LT_1SECOND
-#: Merge.rc:1577 Merge.rc:1724
+#: Merge.rc:1587 Merge.rc:1734
msgid "Less than 1 second"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_GE_1SECOND
-#: Merge.rc:1578 Merge.rc:1725
+#: Merge.rc:1588 Merge.rc:1735
msgid "1 second or more"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_LT_1MINUTE
-#: Merge.rc:1579 Merge.rc:1726
+#: Merge.rc:1589 Merge.rc:1736
msgid "Less than 1 minute"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_GE_1MINUTE
-#: Merge.rc:1580 Merge.rc:1727
+#: Merge.rc:1590 Merge.rc:1737
msgid "1 minute or more"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_LT_1HOUR
-#: Merge.rc:1581 Merge.rc:1728
+#: Merge.rc:1591 Merge.rc:1738
msgid "Less than 1 hour"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_GE_1HOUR
-#: Merge.rc:1582 Merge.rc:1729
+#: Merge.rc:1592 Merge.rc:1739
msgid "1 hour or more"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_LT_1DAY
-#: Merge.rc:1583 Merge.rc:1730
+#: Merge.rc:1593 Merge.rc:1740
msgid "Less than 1 day"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_GE_1DAY
-#: Merge.rc:1584 Merge.rc:1731
+#: Merge.rc:1594 Merge.rc:1741
msgid "1 day or more"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_LT_1WEEK
-#: Merge.rc:1585 Merge.rc:1732
+#: Merge.rc:1595 Merge.rc:1742
msgid "Less than 1 week"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_GE_1WEEK
-#: Merge.rc:1586 Merge.rc:1733
+#: Merge.rc:1596 Merge.rc:1743
msgid "1 week or more"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_CONDITION_DIFF_LEFT_RIGHT
-#: Merge.rc:1596
+#: Merge.rc:1606
msgid "Target: &Left and Right"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_CONDITION_DIFF_LEFT_MIDDLE
-#: Merge.rc:1597
+#: Merge.rc:1607
msgid "Target: Left and &Middle"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_CONDITION_DIFF_MIDDLE_RIGHT
-#: Merge.rc:1598
+#: Merge.rc:1608
msgid "Target: Middle and &Right"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_CONDITION_DIFF_ALL
-#: Merge.rc:1599
+#: Merge.rc:1609
msgid "Target: &All"
msgstr ""
#. IDR_POPUP_FILTERMENU_BINARY, ID_FILTERMENU_BINARY_ONLY
-#: Merge.rc:1620
+#: Merge.rc:1630
msgid "Binary files only"
msgstr ""
#. IDR_POPUP_FILTERMENU_BINARY, ID_FILTERMENU_TEXT_ONLY
-#: Merge.rc:1621
+#: Merge.rc:1631
msgid "Text files only"
msgstr ""
#. IDR_POPUP_ADDCMPMENU, ID_ADDCMPMENU_CLEAR
-#: Merge.rc:1755
+#: Merge.rc:1765
msgid "&Clear conditions"
msgstr ""
#. IDR_POPUP_ADDCMPMENU, ID_ADDCMPMENU_CMP_SIZE
-#: Merge.rc:1757
+#: Merge.rc:1767
msgid "Compare &Size"
msgstr ""
#. IDR_POPUP_ADDCMPMENU, ID_ADDCMPMENU_CMP_DATE
-#: Merge.rc:1758
+#: Merge.rc:1768
msgid "Compare &Date"
msgstr ""
#. IDR_POPUP_ADDCMPMENU, ID_ADDCMPMENU_CMP_ATTR
-#: Merge.rc:1759
+#: Merge.rc:1769
msgid "Compare &Attributes"
msgstr ""
#. IDR_POPUP_ADDCMPMENU, ID_ADDCMPMENU_CMP_CONTENTS
-#: Merge.rc:1760
+#: Merge.rc:1770
msgid "Compare C&ontents"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_CLEAR
-#: Merge.rc:1769
+#: Merge.rc:1779
msgid "&Clear Keys"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_NAME
-#: Merge.rc:1771
+#: Merge.rc:1781
msgid "&Name"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_BASENAME
-#: Merge.rc:1772
+#: Merge.rc:1782
msgid "&Base name (without extension)"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_NORMALIZED_NAME
-#: Merge.rc:1773
+#: Merge.rc:1783
msgid "Normalized &Unicode Name"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_RELPATH
-#: Merge.rc:1774
+#: Merge.rc:1784
msgid "&Relative Path"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_DATE
-#: Merge.rc:1776
+#: Merge.rc:1786
msgid "&Date"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_HASH_MD5
-#: Merge.rc:1777
+#: Merge.rc:1787
msgid "&Hash (MD5)"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_REPLACE
-#: Merge.rc:1780
+#: Merge.rc:1790
msgid "Insert &replace() Function"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_REGEXREPLACE
-#: Merge.rc:1781
+#: Merge.rc:1791
msgid "Insert rege&xReplace() Function"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU
-#: Merge.rc:1782
+#: Merge.rc:1792
msgid "Replace &Lists"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_CREATE_REPLACELIST
-#: Merge.rc:1784
+#: Merge.rc:1794
msgid "&Create String Replace List and Insert..."
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_CREATE_REGEXREPLACELIST
-#: Merge.rc:1785
+#: Merge.rc:1795
msgid "Create &Regex Replace List and Insert..."
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU
-#: Merge.rc:1787
+#: Merge.rc:1797
msgid "&String Replace Lists"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU
-#: Merge.rc:1791
+#: Merge.rc:1801
msgid "Re&gex Replace Lists"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_STRING_REPLACE_LISTS_FOLDER
-#: Merge.rc:1796
+#: Merge.rc:1806
msgid "Open String Replace Lists Folder..."
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_REGEX_REPLACE_LISTS_FOLDER
-#: Merge.rc:1797
+#: Merge.rc:1807
msgid "Open Regex Replace Lists Folder..."
msgstr ""
#. IDD_FILTERS_CONDITION, IDC_CONDITION_MATCHCASE
-#: Merge.rc:1799 Merge.rc:1995 Merge.rc:2014 Merge.rc:2042 Merge.rc:2585
+#: Merge.rc:1809 Merge.rc:2005 Merge.rc:2024 Merge.rc:2052 Merge.rc:2595
#, c-format
msgid "Match &case"
msgstr "Hizki larriak eta &xeheak"
#. IDR_POPUP_RENAMEMOVE_MENU
-#: Merge.rc:1801
+#: Merge.rc:1811
msgid "Text &Normalization"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_TOLOWER
-#: Merge.rc:1803
+#: Merge.rc:1813
msgid "&Lowercase"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_TOUPPER
-#: Merge.rc:1804
+#: Merge.rc:1814
msgid "&Uppercase"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_TOHALFWIDTH
-#: Merge.rc:1805
+#: Merge.rc:1815
msgid "&Half-width"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_TOFULLWIDTH
-#: Merge.rc:1806
+#: Merge.rc:1816
msgid "&Full-width"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU
-#: Merge.rc:1807
+#: Merge.rc:1817
msgid "&Chinese Conversion"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_TOSIMPLIFIEDCHINESE
-#: Merge.rc:1809
+#: Merge.rc:1819
msgid "&Simplified Chinese"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_TOTRADITIONALCHINESE
-#: Merge.rc:1810
+#: Merge.rc:1820
msgid "&Traditional Chinese"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU
-#: Merge.rc:1812
+#: Merge.rc:1822
msgid "&Japanese Conversion"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_TOHIRAGANA
-#: Merge.rc:1814
+#: Merge.rc:1824
msgid "&Hiragana"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_TOKATAKANA
-#: Merge.rc:1815
+#: Merge.rc:1825
msgid "&Katakana"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_NORMALIZEUNICODE
-#: Merge.rc:1817
+#: Merge.rc:1827
msgid "Normalize &Unicode"
msgstr ""
#. IDD_ABOUTBOX
-#: Merge.rc:1932
+#: Merge.rc:1942
#, c-format
msgid "About WinMerge"
msgstr "WinMergeri buruz"
#. IDD_ABOUTBOX, IDC_WWW
-#: Merge.rc:1936
+#: Merge.rc:1946
msgid "Visit the WinMerge Homepage!"
msgstr "Ikusi WinMerge Webgunea!"
#. IDD_PLUGINS_EDITPLUGIN, IDOK
-#: Merge.rc:1938 Merge.rc:2080 Merge.rc:2431 Merge.rc:2455 Merge.rc:2469
-#: Merge.rc:2497 Merge.rc:2588 Merge.rc:2613 Merge.rc:2674 Merge.rc:2691
-#: Merge.rc:2703 Merge.rc:2867 Merge.rc:2927 Merge.rc:3062 Merge.rc:3104
-#: Merge.rc:3147 Merge.rc:3197
+#: Merge.rc:1948 Merge.rc:2090 Merge.rc:2441 Merge.rc:2465 Merge.rc:2479
+#: Merge.rc:2507 Merge.rc:2598 Merge.rc:2623 Merge.rc:2684 Merge.rc:2701
+#: Merge.rc:2713 Merge.rc:2877 Merge.rc:2937 Merge.rc:3072 Merge.rc:3114
+#: Merge.rc:3157 Merge.rc:3207
#, c-format
msgid "OK"
msgstr "Ongi"
#. IDD_ABOUTBOX, IDC_OPEN_CONTRIBUTORS
-#: Merge.rc:1939
+#: Merge.rc:1949
#, c-format
msgid "Contributors"
msgstr "&Laguntzaileak"
#. IDD_SELECT_FILES_OR_FOLDERS
-#: Merge.rc:1945 Merge.rc:3070
+#: Merge.rc:1955 Merge.rc:3080
#, c-format
msgid "Select Files or Folders"
msgstr "Hautatu Agiriak edo Agiritegiak"
#. IDD_OPEN, IDC_FILES_DIRS_GROUP0
-#: Merge.rc:1949
+#: Merge.rc:1959
#, c-format
msgid "&1st File or Folder"
msgstr ""
#. IDD_OPEN, IDC_PATH0_READONLY
-#: Merge.rc:1951
+#: Merge.rc:1961
#, c-format
msgid "Re&ad-only"
msgstr "Irakurri-&bakarrik"
#. IDD_OPEN, IDC_SWAP01_STATIC
-#: Merge.rc:1953
+#: Merge.rc:1963
#, c-format
msgid "Swap 1st | 2nd"
msgstr ""
#. IDD_GENERATE_PATCH, IDC_DIFF_BROWSE_FILE1
-#: Merge.rc:1954 Merge.rc:2310 Merge.rc:2413
+#: Merge.rc:1964 Merge.rc:2320 Merge.rc:2423
#, c-format
msgid "&Browse..."
msgstr "Bil&atu..."
#. IDD_OPEN, IDC_FILES_DIRS_GROUP1
-#: Merge.rc:1955
+#: Merge.rc:1965
#, c-format
msgid "&2nd File or Folder"
msgstr ""
#. IDD_OPEN, IDC_PATH1_READONLY
-#: Merge.rc:1957
+#: Merge.rc:1967
#, c-format
msgid "Rea&d-only"
msgstr ""
#. IDD_OPEN, IDC_SWAP12_STATIC
-#: Merge.rc:1959
+#: Merge.rc:1969
#, c-format
msgid "Swap 2nd | 3rd"
msgstr ""
#. IDD_PROPPAGE_SYSTEM, IDC_FILTER_USER_BROWSE
-#: Merge.rc:1960 Merge.rc:2315
+#: Merge.rc:1970 Merge.rc:2325
#, c-format
msgid "B&rowse..."
msgstr "Bi&latu..."
#. IDD_OPEN, IDC_FILES_DIRS_GROUP2
-#: Merge.rc:1961
+#: Merge.rc:1971
#, c-format
msgid "&3rd File or Folder (Optional)"
msgstr ""
#. IDD_OPEN, IDC_PATH2_READONLY
-#: Merge.rc:1963
+#: Merge.rc:1973
#, c-format
msgid "Read-o&nly"
msgstr ""
#. IDD_OPEN, IDC_SWAP02_STATIC
-#: Merge.rc:1965
+#: Merge.rc:1975
#, c-format
msgid "Swap 1st | 3rd"
msgstr ""
#. IDD_PROPPAGE_BACKUPS, IDC_BACKUP_BROWSE
-#: Merge.rc:1966 Merge.rc:2685 Merge.rc:2883
+#: Merge.rc:1976 Merge.rc:2695 Merge.rc:2893
#, c-format
msgid "Browse..."
msgstr "Bilatu..."
#. IDD_OPEN, IDC_FILES_DIRS_GROUP3
-#: Merge.rc:1968
+#: Merge.rc:1978
#, c-format
msgid " Folder: Filter"
msgstr ""
#. IDD_OPEN, IDC_RECURS_CHECK
-#: Merge.rc:1971
+#: Merge.rc:1981
msgid "&Include subfolders"
msgstr "&Az&piagiritegiak Barne"
#. IDD_OPEN, IDC_FILES_DIRS_GROUP5
-#: Merge.rc:1972
+#: Merge.rc:1982
msgid " File: Prediffer Plugin"
msgstr ""
#. IDD_OPEN, IDC_FILES_DIRS_GROUP4
-#: Merge.rc:1976
+#: Merge.rc:1986
#, c-format
msgid " File: Unpacker Plugin"
msgstr ""
#. IDD_OPEN, IDC_SELECT_UNPACKER
-#: Merge.rc:1978
+#: Merge.rc:1988
#, c-format
msgid "Se&lect..."
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN, IDCANCEL
-#: Merge.rc:1981 Merge.rc:2001 Merge.rc:2025 Merge.rc:2046 Merge.rc:2081
-#: Merge.rc:2432 Merge.rc:2456 Merge.rc:2470 Merge.rc:2498 Merge.rc:2551
-#: Merge.rc:2589 Merge.rc:2614 Merge.rc:2675 Merge.rc:2692 Merge.rc:2704
-#: Merge.rc:2868 Merge.rc:2928 Merge.rc:3087 Merge.rc:3105 Merge.rc:3148
-#: Merge.rc:3198
+#: Merge.rc:1991 Merge.rc:2011 Merge.rc:2035 Merge.rc:2056 Merge.rc:2091
+#: Merge.rc:2442 Merge.rc:2466 Merge.rc:2480 Merge.rc:2508 Merge.rc:2561
+#: Merge.rc:2599 Merge.rc:2624 Merge.rc:2685 Merge.rc:2702 Merge.rc:2714
+#: Merge.rc:2878 Merge.rc:2938 Merge.rc:3097 Merge.rc:3115 Merge.rc:3158
+#: Merge.rc:3208
#, c-format
msgid "Cancel"
msgstr "Ezeztatu"
#. IDD_OPEN, IDC_OPEN_STATUS
-#: Merge.rc:1982
+#: Merge.rc:1992
#, c-format
msgid "Status:"
msgstr "Egoera:"
#. IDD_PLUGINS_LIST, ID_HELP
-#: Merge.rc:1983 Merge.rc:2082 Merge.rc:2929
+#: Merge.rc:1993 Merge.rc:2092 Merge.rc:2939
#, c-format
msgid "Help"
msgstr "Laguntza"
#. IDD_OPEN, IDC_OPTIONS
-#: Merge.rc:1984
+#: Merge.rc:1994
msgid "&Options..."
msgstr "&Aukerak..."
#. IDD_EDIT_FIND
-#: Merge.rc:1989
+#: Merge.rc:1999
#, c-format
msgid "Find"
msgstr "Bilatu"
#. IDD_EDIT_MARKER, IDC_STATIC
-#: Merge.rc:1992 Merge.rc:2009 Merge.rc:2037
+#: Merge.rc:2002 Merge.rc:2019 Merge.rc:2047
#, c-format
msgid "Fi&nd what:"
msgstr "Bi&latu zer:"
#. IDD_EDIT_MARKER, IDC_EDIT_WHOLE_WORD
-#: Merge.rc:1994 Merge.rc:2013 Merge.rc:2041
+#: Merge.rc:2004 Merge.rc:2023 Merge.rc:2051
#, c-format
msgid "Match &whole word only"
msgstr "Hitz osoa bat datorre&nean bakarrik"
#. IDD_EDIT_MARKER, IDC_EDIT_REGEXP
-#: Merge.rc:1996 Merge.rc:2015 Merge.rc:2043
+#: Merge.rc:2006 Merge.rc:2025 Merge.rc:2053
#, c-format
msgid "Regular &expression"
msgstr "Adierazpen a&rrunta"
#. IDD_EDIT_FIND, IDC_FINDDLG_DONTWRAP
-#: Merge.rc:1997
+#: Merge.rc:2007
#, c-format
msgid "D&on't wrap end of file"
msgstr "E&z inguratu agiri amaiera"
#. IDD_EDIT_FIND, IDC_FINDDLG_DONTCLOSE
-#: Merge.rc:1998
+#: Merge.rc:2008
#, c-format
msgid "&Don't close this dialog"
msgstr ""
#. IDD_EDIT_REPLACE, IDC_EDIT_SKIP
-#: Merge.rc:1999 Merge.rc:2021
+#: Merge.rc:2009 Merge.rc:2031
#, c-format
msgid "&Find Next"
msgstr "Bilatu &Hurrengoa"
#. IDD_EDIT_FIND, IDC_EDIT_FINDPREV
-#: Merge.rc:2000
+#: Merge.rc:2010
#, c-format
msgid "Find &Prev"
msgstr ""
#. IDD_EDIT_REPLACE
-#: Merge.rc:2006
+#: Merge.rc:2016
#, c-format
msgid "Replace"
msgstr "Ordeztu"
#. IDD_EDIT_REPLACE, IDC_STATIC
-#: Merge.rc:2011
+#: Merge.rc:2021
#, c-format
msgid "Re&place with:"
msgstr "Ordez&tu honekin:"
#. IDD_EDIT_REPLACE, IDC_EDIT_SCOPE_DONT_WRAP
-#: Merge.rc:2016
+#: Merge.rc:2026
#, c-format
msgid "&Don't wrap at end of file"
msgstr "&Ez inguratu agiri amaiera"
#. IDD_EDIT_REPLACE, IDC_STATIC
-#: Merge.rc:2018
+#: Merge.rc:2028
#, c-format
msgid "Replace in"
msgstr "Ordeztu hemen"
#. IDD_EDIT_REPLACE, IDC_EDIT_SCOPE_WHOLE_FILE
-#: Merge.rc:2020
+#: Merge.rc:2030
#, c-format
msgid "Wh&ole file"
msgstr "&Agiri osoa"
#. IDD_EDIT_REPLACE, IDC_EDIT_FINDPREV
-#: Merge.rc:2022
+#: Merge.rc:2032
msgid "Find Pre&v"
msgstr ""
#. IDD_EDIT_REPLACE, IDC_EDIT_REPLACE
-#: Merge.rc:2023
+#: Merge.rc:2033
#, c-format
msgid "&Replace"
msgstr "&Ordeztu"
#. IDD_EDIT_REPLACE, IDC_EDIT_REPLACE_ALL
-#: Merge.rc:2024
+#: Merge.rc:2034
#, c-format
msgid "Replace &All"
msgstr "Ordeztu &Dena"
#. IDS_OPTIONSPG_MARKERCOLORS
-#: Merge.rc:2030 Merge.rc:4209
+#: Merge.rc:2040 Merge.rc:4219
#, c-format
msgid "Markers"
msgstr ""
#. IDD_EDIT_MARKER, IDC_EDIT_MARKERS_ENABLED
-#: Merge.rc:2033
+#: Merge.rc:2043
#, c-format
msgid "Enable &markers"
msgstr ""
#. IDD_FILTERS_LINEFILTERS, IDC_LFILTER_ADDBTN
-#: Merge.rc:2035 Merge.rc:2057
+#: Merge.rc:2045 Merge.rc:2067
#, c-format
msgid "New"
msgstr "Berria"
#. IDD_EDIT_MARKER, IDC_STATIC
-#: Merge.rc:2039
+#: Merge.rc:2049
#, c-format
msgid "&Background color:"
msgstr ""
#. IDS_MESSAGEBOX_OK
-#: Merge.rc:2044 Merge.rc:2829 Merge.rc:3086 Merge.rc:4171
+#: Merge.rc:2054 Merge.rc:2839 Merge.rc:3096 Merge.rc:4181
#, c-format
msgid "&Ok"
msgstr "&Ongi"
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:2045 Merge.rc:2525 Merge.rc:3199
+#: Merge.rc:2055 Merge.rc:2535 Merge.rc:3209
#, c-format
msgid "&Apply"
msgstr "&Ezarri"
#. IDD_FILTERS_LINEFILTERS
-#: Merge.rc:2051
+#: Merge.rc:2061
msgid "Line Filters"
msgstr ""
#. IDD_FILTERS_LINEFILTERS, IDC_IGNOREREGEXP
-#: Merge.rc:2054
+#: Merge.rc:2064
#, c-format
msgid "Enable Line Filters"
msgstr "Gaitu Lerro Iragazkiak"
#. IDD_FILTERS_LINEFILTERS, IDC_STATIC
-#: Merge.rc:2055
+#: Merge.rc:2065
#, c-format
msgid "Regular Expressions (one per line):"
msgstr "Adierazpen Arruntak (bat lerroko)"
#. IDD_PLUGINS_LIST, IDC_PLUGIN_EDIT
-#: Merge.rc:2058 Merge.rc:2924
+#: Merge.rc:2068 Merge.rc:2934
#, c-format
msgid "Edit"
msgstr "Editatu"
#. IDD_PLUGINS_LIST, IDC_PLUGIN_REMOVE
-#: Merge.rc:2059 Merge.rc:2071 Merge.rc:2925
+#: Merge.rc:2069 Merge.rc:2081 Merge.rc:2935
#, c-format
msgid "Remove"
msgstr "Kendu"
#. IDD_FILTERS_SUBSTITUTIONFILTERS
-#: Merge.rc:2064
+#: Merge.rc:2074
msgid "Substitution Filters"
msgstr ""
#. IDD_FILTERS_SUBSTITUTIONFILTERS, IDC_STATIC
-#: Merge.rc:2067
+#: Merge.rc:2077
msgid "Changes to the listed pairs below will be ignored or marked as insignificant. Patches are unaffected."
msgstr ""
#. IDD_FILTERS_SUBSTITUTIONFILTERS, IDC_IGNORED_SUSBSTITUTIONS_ENABLED
-#: Merge.rc:2068
+#: Merge.rc:2078
msgid "Enable"
msgstr ""
#. IDD_PLUGINS_LIST, IDC_PLUGIN_ADD
-#: Merge.rc:2070 Merge.rc:2923
+#: Merge.rc:2080 Merge.rc:2933
msgid "Add"
msgstr ""
#. IDD_FILTERS_SUBSTITUTIONFILTERS, IDC_LFILTER_CLEARBTN
-#: Merge.rc:2072
+#: Merge.rc:2082
msgid "Clear"
msgstr ""
#. IDD_PREFERENCES
-#: Merge.rc:2077
+#: Merge.rc:2087
#, c-format
msgid "Options"
msgstr "Aukerak"
#. IDD_PREFERENCES, IDC_TREEOPT_IMPORT
-#: Merge.rc:2086
+#: Merge.rc:2096
#, c-format
msgid "Import..."
msgstr "Inportatu"
#. IDD_PREFERENCES, IDC_TREEOPT_EXPORT
-#: Merge.rc:2087
+#: Merge.rc:2097
#, c-format
msgid "Export..."
msgstr "Esportatu..."
#. IDS_OPTIONSPG_GENCOMPARE
-#: Merge.rc:2092 Merge.rc:4199 Merge.rc:4202 Merge.rc:4219
+#: Merge.rc:2102 Merge.rc:4209 Merge.rc:4212 Merge.rc:4229
#, c-format
msgid "General"
msgstr "Orokorra"
#. IDD_PROPPAGE_GENERAL, IDC_SCROLL_CHECK
-#: Merge.rc:2095
+#: Merge.rc:2105
#, c-format
msgid "Automatically &scroll to first difference"
msgstr "Berezgaitasunez &irristatu lehen ezberdintasunera"
#. IDD_PROPPAGE_GENERAL, IDC_SCROLL_TO_FIRST_INLINE_DIFF_CHECK
-#: Merge.rc:2097
+#: Merge.rc:2107
msgid "Automatically s&croll to first inline difference"
msgstr ""
#. IDD_PROPPAGE_GENERAL, IDC_STATIC
-#: Merge.rc:2099
+#: Merge.rc:2109
msgid "Cl&ose windows with 'Esc':"
msgstr "Itxi leihoak 'Es&c'-rekin:"
#. IDD_PROPPAGE_GENERAL, IDC_VERIFY_OPEN_PATHS
-#: Merge.rc:2101
+#: Merge.rc:2111
#, c-format
msgid "&Automatically verify paths in Open dialog"
msgstr "&Berezgaitasunez egiaztatu helburuak Ireki-elkarrizketan"
#. IDD_PROPPAGE_GENERAL, IDC_STATIC
-#: Merge.rc:2103
+#: Merge.rc:2113
msgid "Single instance mode:"
msgstr ""
#. IDD_PROPPAGE_GENERAL, IDC_ASK_MULTIWINDOW_CLOSE
-#: Merge.rc:2105
+#: Merge.rc:2115
#, c-format
msgid "As&k when closing multiple windows"
msgstr "Gal&detu leiho anitz isterakoan"
#. IDD_PROPPAGE_GENERAL, IDC_PRESERVE_FILETIME
-#: Merge.rc:2107
+#: Merge.rc:2117
#, c-format
msgid "&Preserve file time in file compare"
msgstr "&Heutsi agiri denborari agiri alderaketan"
#. IDD_PROPPAGE_GENERAL, IDC_STARTUP_FOLDER_SELECT
-#: Merge.rc:2109
+#: Merge.rc:2119
#, c-format
msgid "Show \"Select Files or Folders\" dialog on startup"
msgstr "Erakutsi \"Hau&tatu agiriak edo Agiritegiak\" Elkarrizk. Hasterakoan"
#. IDD_PROPPAGE_GENERAL, IDC_CLOSE_WITH_OK
-#: Merge.rc:2111
+#: Merge.rc:2121
msgid "Close \"Select Files or Folders\" dialog on clicking Compare button"
msgstr ""
#. IDD_PROPPAGE_GENERAL, IDC_STATIC
-#: Merge.rc:2113
+#: Merge.rc:2123
#, c-format
msgid "Op&en dialog Auto completion:"
msgstr "Ireki-elkarrizketa Berez-&Osaketa:"
#. IDD_PROPPAGE_GENERAL, IDC_STATIC
-#: Merge.rc:2115
+#: Merge.rc:2125
msgid "Auto-&reload modified files:"
msgstr ""
#. IDD_PROPPAGE_GENERAL, IDC_STATIC
-#: Merge.rc:2117
+#: Merge.rc:2127
#, c-format
msgid "Language:"
msgstr ""
#. IDD_PROPPAGE_COMPARE_WEBPAGE, IDC_COMPARE_DEFAULTS
-#: Merge.rc:2119 Merge.rc:2299 Merge.rc:2321 Merge.rc:2352 Merge.rc:2369
-#: Merge.rc:2386 Merge.rc:2394 Merge.rc:2430 Merge.rc:2454 Merge.rc:2633
-#: Merge.rc:2644 Merge.rc:2653 Merge.rc:2887 Merge.rc:2922 Merge.rc:2985
-#: Merge.rc:3010 Merge.rc:3024 Merge.rc:3038 Merge.rc:3054
+#: Merge.rc:2129 Merge.rc:2309 Merge.rc:2331 Merge.rc:2362 Merge.rc:2379
+#: Merge.rc:2396 Merge.rc:2404 Merge.rc:2440 Merge.rc:2464 Merge.rc:2643
+#: Merge.rc:2654 Merge.rc:2663 Merge.rc:2897 Merge.rc:2932 Merge.rc:2995
+#: Merge.rc:3020 Merge.rc:3034 Merge.rc:3048 Merge.rc:3064
#, c-format
msgid "Defaults"
msgstr "Berezkoak"
#. IDS_OPTIONSPG_COLORS
-#: Merge.rc:2124 Merge.rc:2140 Merge.rc:2267 Merge.rc:2292 Merge.rc:4205
+#: Merge.rc:2134 Merge.rc:2150 Merge.rc:2277 Merge.rc:2302 Merge.rc:4215
#, c-format
msgid "Colors"
msgstr "Margoak"
#. IDD_PROPPAGE_COLOR_SCHEMES, IDC_STATIC
-#: Merge.rc:2127
+#: Merge.rc:2137
msgid "Color &mode:"
msgstr ""
#. IDD_PROPPAGE_COLOR_SCHEMES, IDC_STATIC
-#: Merge.rc:2129
+#: Merge.rc:2139
msgid "&Light mode scheme:"
msgstr ""
#. IDD_PROPPAGE_COLOR_SCHEMES, IDC_STATIC
-#: Merge.rc:2131
+#: Merge.rc:2141
msgid "&Dark mode scheme:"
msgstr ""
#. IDD_PROPPAGE_COLOR_SCHEMES, IDC_STATIC
-#: Merge.rc:2133
+#: Merge.rc:2143
msgid "Your custom schemes"
msgstr ""
#. IDD_PROPPAGE_COLOR_SCHEMES, IDC_COLOR_SCHEME_SAVE
-#: Merge.rc:2134
+#: Merge.rc:2144
msgid "&Save current scheme..."
msgstr ""
#. IDD_PROPPAGE_COLOR_SCHEMES, IDC_COLOR_SCHEME_DELETE
-#: Merge.rc:2135
+#: Merge.rc:2145
msgid "Delete ¤t scheme..."
msgstr ""
#. IDD_PROPPAGE_COLORS_DIR, IDC_BACKGROUND_COLUMN_LABEL
-#: Merge.rc:2143 Merge.rc:2238 Merge.rc:2258 Merge.rc:2272
+#: Merge.rc:2153 Merge.rc:2248 Merge.rc:2268 Merge.rc:2282
#, c-format
msgid "Background"
msgstr "Barrena"
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2144
+#: Merge.rc:2154
#, c-format
msgid "Deleted"
msgstr "Ezabatuta"
#. IDS_OPTIONSPG_TEXTCOLORS
-#: Merge.rc:2145 Merge.rc:2207 Merge.rc:2239 Merge.rc:2273 Merge.rc:4207
+#: Merge.rc:2155 Merge.rc:2217 Merge.rc:2249 Merge.rc:2283 Merge.rc:4217
#, c-format
msgid "Text"
msgstr "Idazkia"
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2146
+#: Merge.rc:2156
#, c-format
msgid "Difference:"
msgstr "Ezberdintasuna"
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2151
+#: Merge.rc:2161
#, c-format
msgid "Selected Difference:"
msgstr "Hautatutako Ezberdintasuna:"
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2156
+#: Merge.rc:2166
#, c-format
msgid "Ignored Difference:"
msgstr "Baztertutako Ezberdintasuna:"
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2161
+#: Merge.rc:2171
#, c-format
msgid "Moved:"
msgstr "Mugituta:"
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2166
+#: Merge.rc:2176
#, c-format
msgid "Selected Moved:"
msgstr "Hautatutakoa Mugituta:"
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2171
+#: Merge.rc:2181
#, c-format
msgid "Same As Next (3 panes):"
msgstr ""
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2176
+#: Merge.rc:2186
#, c-format
msgid "Same As Next (Selected):"
msgstr ""
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2181
+#: Merge.rc:2191
#, c-format
msgid "Word Difference:"
msgstr "Hitz Ezberdintasuna:"
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2186
+#: Merge.rc:2196
#, c-format
msgid "Selected Word Diff:"
msgstr "Hautatutako Hitz Ezberd:"
#. IDD_INPUTBOX
-#: Merge.rc:2195 Merge.rc:2230 Merge.rc:2251 Merge.rc:3099
+#: Merge.rc:2205 Merge.rc:2240 Merge.rc:2261 Merge.rc:3109
#, c-format
msgid "Dialog"
msgstr "Elkarrizketa"
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC
-#: Merge.rc:2198
+#: Merge.rc:2208
#, c-format
msgid "Keywords:"
msgstr "Lasterteklak:"
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC
-#: Merge.rc:2199
+#: Merge.rc:2209
#, c-format
msgid "Function names:"
msgstr "Eginkizun izenak:"
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC
-#: Merge.rc:2200
+#: Merge.rc:2210
#, c-format
msgid "Comments:"
msgstr "Aipamenak:"
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC
-#: Merge.rc:2201
+#: Merge.rc:2211
#, c-format
msgid "Numbers:"
msgstr "Zenbakiak:"
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC
-#: Merge.rc:2202
+#: Merge.rc:2212
#, c-format
msgid "Operators:"
msgstr "Eragileak:"
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC
-#: Merge.rc:2203
+#: Merge.rc:2213
#, c-format
msgid "Strings:"
msgstr "Kateak:"
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC
-#: Merge.rc:2204
+#: Merge.rc:2214
#, c-format
msgid "Preprocessor:"
msgstr "Aurreprozesapena:"
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC
-#: Merge.rc:2205
+#: Merge.rc:2215
#, c-format
msgid "User 1:"
msgstr "1 Erabiltzailea:"
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC
-#: Merge.rc:2206
+#: Merge.rc:2216
#, c-format
msgid "User 2:"
msgstr "2 Erabiltzailea:"
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_SCOLOR_USER2_BOLD
-#: Merge.rc:2209 Merge.rc:2211 Merge.rc:2213 Merge.rc:2215 Merge.rc:2217
-#: Merge.rc:2219 Merge.rc:2221 Merge.rc:2223 Merge.rc:2225
+#: Merge.rc:2219 Merge.rc:2221 Merge.rc:2223 Merge.rc:2225 Merge.rc:2227
+#: Merge.rc:2229 Merge.rc:2231 Merge.rc:2233 Merge.rc:2235
#, c-format
msgid "Bold"
msgstr "Lodia"
#. IDD_PROPPAGE_COLORS_TEXT, IDC_DEFAULT_STANDARD_COLORS
-#: Merge.rc:2233
+#: Merge.rc:2243
#, c-format
msgid "&Use customized text colors"
msgstr "&Erabili norbere idazki margoak"
#. IDD_PROPPAGE_COLORS_TEXT, IDC_WHITESPACE_COLOR_LABEL
-#: Merge.rc:2235
+#: Merge.rc:2245
#, c-format
msgid "Whitespace:"
msgstr "Zurigunea:"
#. IDD_PROPPAGE_COLORS_TEXT, IDC_TEXT_COLOR_LABEL
-#: Merge.rc:2236
+#: Merge.rc:2246
#, c-format
msgid "Regular text:"
msgstr "Idazki arrunta:"
#. IDD_PROPPAGE_COLORS_TEXT, IDC_SELECTION_COLOR_LABEL
-#: Merge.rc:2237
+#: Merge.rc:2247
#, c-format
msgid "Selection:"
msgstr "Hautapena:"
#. IDD_PROPPAGE_COLORS_DIR, IDC_STATIC
-#: Merge.rc:2245 Merge.rc:2286
+#: Merge.rc:2255 Merge.rc:2296
#, c-format
msgid "Margin:"
msgstr ""
#. IDD_PROPPAGE_COLORS_MARKER, IDC_MARKER0_COLOR_LABEL
-#: Merge.rc:2254
+#: Merge.rc:2264
#, c-format
msgid "Search Marker:"
msgstr ""
#. IDD_PROPPAGE_COLORS_MARKER, IDC_MARKER1_COLOR_LABEL
-#: Merge.rc:2255
+#: Merge.rc:2265
#, c-format
msgid "User Defined Marker 1:"
msgstr ""
#. IDD_PROPPAGE_COLORS_MARKER, IDC_MARKER2_COLOR_LABEL
-#: Merge.rc:2256
+#: Merge.rc:2266
#, c-format
msgid "User Defined Marker 2:"
msgstr ""
#. IDD_PROPPAGE_COLORS_MARKER, IDC_MARKER3_COLOR_LABEL
-#: Merge.rc:2257
+#: Merge.rc:2267
#, c-format
msgid "User Defined Marker 3:"
msgstr ""
#. IDD_PROPPAGE_COLORS_DIR, IDC_USE_DIR_COMPARE_COLORS
-#: Merge.rc:2270
+#: Merge.rc:2280
msgid "&Use folder compare colors"
msgstr ""
#. IDD_PROPPAGE_COLORS_DIR, IDC_STATIC
-#: Merge.rc:2274
+#: Merge.rc:2284
msgid "Items equal:"
msgstr ""
#. IDD_PROPPAGE_COLORS_DIR, IDC_STATIC
-#: Merge.rc:2277
+#: Merge.rc:2287
msgid "Items different:"
msgstr ""
#. IDD_PROPPAGE_COLORS_DIR, IDC_STATIC
-#: Merge.rc:2280
+#: Merge.rc:2290
msgid "Items missing:"
msgstr ""
#. IDD_PROPPAGE_COLORS_DIR, IDC_STATIC
-#: Merge.rc:2283
+#: Merge.rc:2293
msgid "Items filtered:"
msgstr ""
#. IDD_PROPPAGE_COLORS_SYSTEM, IDC_SYSCOLOR_HOOK_ENABLED
-#: Merge.rc:2295
+#: Merge.rc:2305
msgid "&Use custom system colors"
msgstr ""
#. IDS_PRPCAT_SYSTEM
-#: Merge.rc:2304 Merge.rc:4211 Merge.rc:4212 Merge.rc:4657
+#: Merge.rc:2314 Merge.rc:4221 Merge.rc:4222 Merge.rc:4667
#, c-format
msgid "System"
msgstr "Sistema"
#. IDD_PROPPAGE_SYSTEM, IDC_USE_RECYCLE_BIN
-#: Merge.rc:2307
+#: Merge.rc:2317
#, c-format
msgid "&Use Recycle Bin"
msgstr "&Bidali ezabatutako agiriak Birziklatze Ontzira"
#. IDD_PROPPAGE_SYSTEM, IDC_STATIC
-#: Merge.rc:2308
+#: Merge.rc:2318
#, c-format
msgid "&External editor:"
msgstr "&Kanpoko editatzailea:"
#. IDD_PROPPAGE_SYSTEM, IDC_STATIC
-#: Merge.rc:2311
+#: Merge.rc:2321
msgid "&Store user data in:"
msgstr ""
#. IDD_PROPPAGE_SYSTEM, IDC_STATIC
-#: Merge.rc:2313
+#: Merge.rc:2323
#, c-format
msgid "&Filter folder:"
msgstr "&Iragazki agiritegia:"
#. IDD_PROPPAGE_SYSTEM, IDC_STATIC
-#: Merge.rc:2316
+#: Merge.rc:2326
#, c-format
msgid "Temporary files folder"
msgstr "Aldibaterako agirien agiritegia"
#. IDD_PROPPAGE_SYSTEM, IDC_TMPFOLDER_SYSTEM
-#: Merge.rc:2317
+#: Merge.rc:2327
#, c-format
msgid "S&ystem temp folder"
msgstr "&Sistemaren aldibaterako agiritegia"
#. IDD_PROPPAGE_SYSTEM, IDC_STATIC
-#: Merge.rc:2318
+#: Merge.rc:2328
#, c-format
msgid "C&ustom folder:"
msgstr "&Egile agiritegia:"
#. IDD_GENERATE_PATCH, IDC_DIFF_BROWSE_FILE2
-#: Merge.rc:2320 Merge.rc:2416
+#: Merge.rc:2330 Merge.rc:2426
#, c-format
msgid "Br&owse..."
msgstr "Bilat&u"
#. IDS_OPTIONSPG_COMPARE
-#: Merge.rc:2326 Merge.rc:4200
+#: Merge.rc:2336 Merge.rc:4210
#, c-format
msgid "Compare"
msgstr "Alderatu"
#. IDD_PROPPAGE_COMPARE, IDC_STATIC
-#: Merge.rc:2329
+#: Merge.rc:2339
msgid "Whitespaces"
msgstr "&Zurigunea"
#. IDD_PROPPAGE_COMPARE, IDC_WHITESPACE
-#: Merge.rc:2330
+#: Merge.rc:2340
#, c-format
msgid "&Compare"
msgstr "Al&deratu"
#. IDD_PROPPAGE_COMPARE, IDC_WHITE_CHANGE
-#: Merge.rc:2331
+#: Merge.rc:2341
#, c-format
msgid "&Ignore change"
msgstr "&Ezikusi aldaketa"
#. IDD_PROPPAGE_COMPARE, IDC_ALL_WHITE
-#: Merge.rc:2332
+#: Merge.rc:2342
#, c-format
msgid "I&gnore all"
msgstr "E&zikusi denak"
#. IDD_PROPPAGE_COMPARE, IDC_IGNBLANKS_CHECK
-#: Merge.rc:2333
+#: Merge.rc:2343
msgid "Ignore blan&k lines"
msgstr "Ezikusi &lerro zuriak"
#. IDD_PROPPAGE_COMPARE, IDC_IGNCASE_CHECK
-#: Merge.rc:2334
+#: Merge.rc:2344
msgid "Ignore &case"
msgstr "Ezikusi &kasua"
#. IDD_PROPPAGE_COMPARE, IDC_EOL_SENSITIVE
-#: Merge.rc:2335
+#: Merge.rc:2345
msgid "Igno&re EOL differences (Windows/Unix/Mac)"
msgstr ""
#. IDD_PROPPAGE_COMPARE, IDC_IGNORE_NUMBERS
-#: Merge.rc:2337
+#: Merge.rc:2347
msgid "Ignore num&bers"
msgstr ""
#. IDD_PROPPAGE_COMPARE, IDC_CP_SENSITIVE
-#: Merge.rc:2338
+#: Merge.rc:2348
msgid "Ignore codepage &differences"
msgstr ""
#. IDD_PROPPAGE_COMPARE, IDC_FILTERCOMMENTS_CHECK
-#: Merge.rc:2339
+#: Merge.rc:2349
msgid "Ignore c&omment differences"
msgstr ""
#. IDD_PROPPAGE_COMPARE, IDC_IGNEOFEOL_CHECK
-#: Merge.rc:2341
+#: Merge.rc:2351
msgid "Ignore &missing trailing EOL"
msgstr ""
#. IDD_PROPPAGE_COMPARE, IDC_IGNLBRKS_CHECK
-#: Merge.rc:2343
+#: Merge.rc:2353
msgid "Ignore line &breaks (treat as spaces)"
msgstr ""
#. IDD_PROPPAGE_COMPARE, IDC_MOVED_BLOCKS
-#: Merge.rc:2345
+#: Merge.rc:2355
#, c-format
msgid "E&nable moved block detection"
msgstr "Gaitu bloke &mugitu atzematea"
#. IDD_PROPPAGE_COMPARE, IDC_ALIGN_SIMILAR_LINES
-#: Merge.rc:2346
+#: Merge.rc:2356
msgid "Align &similar lines"
msgstr ""
#. IDD_PROPPAGE_COMPARE, IDC_STATIC
-#: Merge.rc:2347
+#: Merge.rc:2357
msgid "Diff &algorithm:"
msgstr ""
#. IDD_PROPPAGE_COMPARE, IDC_INDENT_HEURISTIC
-#: Merge.rc:2349
+#: Merge.rc:2359
msgid "Enable indent &heuristic"
msgstr ""
#. IDD_PROPPAGE_COMPARE, IDC_COMPLETELY_BLANK_OUT_IGNORED_DIFFERENCES
-#: Merge.rc:2350
+#: Merge.rc:2360
msgid "Completely unhighlight the ignored differences"
msgstr ""
#. IDS_OPTIONSPG_EDITOR
-#: Merge.rc:2357 Merge.rc:4201
+#: Merge.rc:2367 Merge.rc:4211
#, c-format
msgid "Editor"
msgstr "Editatzailea"
#. IDD_PROPPAGE_EDITOR, IDC_HILITE_CHECK
-#: Merge.rc:2360
+#: Merge.rc:2370
#, c-format
msgid "&Highlight syntax"
msgstr "&Nabarmendu joskera"
#. IDD_PROPPAGE_EDITOR, IDC_MIXED_EOL
-#: Merge.rc:2361
+#: Merge.rc:2371
#, c-format
msgid "&Preserve original EOL"
msgstr "&Heutsi jatorrizko EOL hizkiei"
#. IDD_PROPPAGE_EDITOR, IDC_STATIC
-#: Merge.rc:2362
+#: Merge.rc:2372
#, c-format
msgid "Tabs"
msgstr "Fitxak"
#. IDD_PROPPAGE_EDITOR, IDC_STATIC
-#: Merge.rc:2363
+#: Merge.rc:2373
#, c-format
msgid "&Tab size:"
msgstr "Fit&xa neurria:"
#. IDD_PROPPAGE_EDITOR, IDC_PROP_INSERT_TABS
-#: Merge.rc:2365
+#: Merge.rc:2375
#, c-format
msgid "&Insert tabs"
msgstr "Sartu &Fitxak"
#. IDD_PROPPAGE_EDITOR, IDC_PROP_INSERT_SPACES
-#: Merge.rc:2366
+#: Merge.rc:2376
#, c-format
msgid "Insert &spaces"
msgstr "Sartu &Tarteak"
#. IDD_PROPPAGE_EDITOR, IDC_STATIC
-#: Merge.rc:2367
+#: Merge.rc:2377
msgid "&Rendering mode:"
msgstr ""
#. IDD_PROPPAGE_EDITOR_COMPAREMERGE, IDC_AUTOMRESCAN_CHECK
-#: Merge.rc:2376
+#: Merge.rc:2386
#, c-format
msgid "&Automatic rescan"
msgstr "&Berezgaitasunezko birmihaketa"
#. IDD_PROPPAGE_EDITOR_COMPAREMERGE, IDC_STATIC
-#: Merge.rc:2377
+#: Merge.rc:2387
msgid "Copy &granularity for selected differences:"
msgstr ""
#. IDD_PROPPAGE_EDITOR_COMPAREMERGE, IDC_LINE_COLORING_GROUP
-#: Merge.rc:2379
+#: Merge.rc:2389
#, c-format
msgid "Line Difference Coloring"
msgstr "Lerro Ezberdintasuna Margotzen"
#. IDD_PROPPAGE_EDITOR_COMPAREMERGE, IDC_VIEW_LINE_DIFFERENCES
-#: Merge.rc:2380
+#: Merge.rc:2390
#, c-format
msgid "View line differences"
msgstr "&Ikusi lerro ezberdintasunak"
#. IDD_PROPPAGE_EDITOR_COMPAREMERGE, IDC_EDITOR_CHARLEVEL
-#: Merge.rc:2381
+#: Merge.rc:2391
#, c-format
msgid "&Character-level"
msgstr "Hiz&ki maila"
#. IDD_PROPPAGE_EDITOR_COMPAREMERGE, IDC_EDITOR_WORDLEVEL
-#: Merge.rc:2382
+#: Merge.rc:2392
#, c-format
msgid "&Word-level:"
msgstr "Hit&z maila:"
#. IDD_PROPPAGE_EDITOR_COMPAREMERGE, IDC_STATIC
-#: Merge.rc:2384
+#: Merge.rc:2394
#, c-format
msgid "W&ord break characters:"
msgstr ""
#. IDD_PROPPAGE_MESSAGEBOXES, IDC_STATIC
-#: Merge.rc:2401
+#: Merge.rc:2411
msgid "Some messages can be hidden by the user. Press Reset to make all messages visible again."
msgstr "WinMergek mezu-kutxatila arrunt batzuk ezkutatzea ahalbidetzen du. Sakatu Birrezarri botoia mezu-kutxatila guztiak berriro ere ikusgarri egiteko."
#. IDD_SELECT_FILES_OR_FOLDERS, IDC_RESET
-#: Merge.rc:2402 Merge.rc:3085
+#: Merge.rc:2412 Merge.rc:3095
#, c-format
msgid "Reset"
msgstr "Birrezarri"
#. IDD_GENERATE_PATCH
-#: Merge.rc:2408
+#: Merge.rc:2418
#, c-format
msgid "Patch Generator"
msgstr "Eranskin Sortzailea"
#. IDD_GENERATE_PATCH, IDC_STATIC
-#: Merge.rc:2411
+#: Merge.rc:2421
#, c-format
msgid "File&1:"
msgstr "&1 Agiria:"
#. IDD_GENERATE_PATCH, IDC_STATIC
-#: Merge.rc:2414
+#: Merge.rc:2424
#, c-format
msgid "File&2:"
msgstr "&2 Agiria:"
#. IDD_GENERATE_PATCH, IDC_DIFF_SWAPFILES
-#: Merge.rc:2417
+#: Merge.rc:2427
#, c-format
msgid "&Swap"
msgstr "A&ldaketa"
#. IDD_DIRCMP_REPORT, IDC_REPORT_COPYCLIPBOARD
-#: Merge.rc:2418 Merge.rc:2690
+#: Merge.rc:2428 Merge.rc:2700
#, c-format
msgid "&Copy to clipboard"
msgstr "&Kopiatu Gakoan"
#. IDD_GENERATE_PATCH, IDC_DIFF_APPENDFILE
-#: Merge.rc:2419
+#: Merge.rc:2429
#, c-format
msgid "&Append to existing file"
msgstr "E&rantsi dagoen agirira"
#. IDD_GENERATE_PATCH, IDC_STATIC
-#: Merge.rc:2420
+#: Merge.rc:2430
#, c-format
msgid "&Result:"
msgstr "&Emaitzak:"
#. IDD_GENERATE_PATCH, IDC_DIFF_BROWSE_RESULT
-#: Merge.rc:2422
+#: Merge.rc:2432
#, c-format
msgid "Bro&wse..."
msgstr "Bila&tu..."
#. IDD_GENERATE_PATCH, IDC_STATIC
-#: Merge.rc:2423
+#: Merge.rc:2433
#, c-format
msgid "&Format"
msgstr "&Formatoa"
#. IDD_GENERATE_PATCH, IDC_STATIC
-#: Merge.rc:2424
+#: Merge.rc:2434
#, c-format
msgid "St&yle:"
msgstr "Estil&oa:"
#. IDD_GENERATE_PATCH, IDC_STATIC
-#: Merge.rc:2426
+#: Merge.rc:2436
#, c-format
msgid "&Context:"
msgstr "Hitzi&ngurua:"
#. IDD_GENERATE_PATCH, IDC_DIFF_INCLCMDLINE
-#: Merge.rc:2428
+#: Merge.rc:2438
#, c-format
msgid "Inclu&de command line"
msgstr "Ko&mando lerroa barne"
#. IDD_GENERATE_PATCH, IDC_DIFF_OPENTOEDITOR
-#: Merge.rc:2429
+#: Merge.rc:2439
#, c-format
msgid "Open in e&xternal editor"
msgstr "Ireki kan&poko editatzailean"
#. IDD_DIRCOLS
-#: Merge.rc:2446
+#: Merge.rc:2456
#, c-format
msgid "Display Columns"
msgstr "Erakutsi Zutabeak"
#. IDD_DIRCOLS, IDC_UP
-#: Merge.rc:2450
+#: Merge.rc:2460
#, c-format
msgid "Move &Up"
msgstr "Mugitu &Gora"
#. IDD_DIRCOLS, IDC_DOWN
-#: Merge.rc:2451
+#: Merge.rc:2461
#, c-format
msgid "Move &Down"
msgstr "Mugitu &Behera"
#. IDD_DIRCOLS, IDC_COLDLG_ADDITIONAL_PROPERTIES
-#: Merge.rc:2453
+#: Merge.rc:2463
msgid "&Additional Properties"
msgstr ""
#. IDD_DIRADDITIONALPROPS
-#: Merge.rc:2461
+#: Merge.rc:2471
msgid "Additional Properties"
msgstr ""
#. IDD_PLUGINS_SELECTPLUGIN
-#: Merge.rc:2475
+#: Merge.rc:2485
msgid "Select Plugin"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN, IDC_STATIC
-#: Merge.rc:2478 Merge.rc:3115
+#: Merge.rc:2488 Merge.rc:3125
msgid "Plugin &name:"
msgstr ""
#. IDD_PLUGINS_SELECTPLUGIN, IDC_STATIC
-#: Merge.rc:2480
+#: Merge.rc:2490
msgid "&Target files:"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN, IDC_STATIC
-#: Merge.rc:2482 Merge.rc:3117
+#: Merge.rc:2492 Merge.rc:3127
#, c-format
msgid "Extensions list:"
msgstr "Luzapen zerrenda:"
#. IDD_PLUGINS_EDITPLUGIN, IDC_STATIC
-#: Merge.rc:2484 Merge.rc:3119
+#: Merge.rc:2494 Merge.rc:3129
#, c-format
msgid "Description:"
msgstr "Azalpena:"
#. IDD_PLUGINS_EDITPLUGIN, IDC_STATIC
-#: Merge.rc:2486 Merge.rc:3121
+#: Merge.rc:2496 Merge.rc:3131
msgid "Default arguments:"
msgstr ""
#. IDD_PLUGINS_SELECTPLUGIN, IDC_PLUGIN_ALLOW_ALL
-#: Merge.rc:2488
+#: Merge.rc:2498
msgid "Display all plugins (Ignore extension)"
msgstr ""
#. IDD_PLUGINS_SELECTPLUGIN, IDC_PLUGIN_OPEN_IN_SAME_FRAME_TYPE
-#: Merge.rc:2490
+#: Merge.rc:2500
msgid "&Open files in same window type after unpacking"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_PIPELINE_STATIC
-#: Merge.rc:2492 Merge.rc:3129
+#: Merge.rc:2502 Merge.rc:3139
msgid "&Plugin pipeline:"
msgstr ""
#. IDD_PLUGINS_SELECTPLUGIN, IDC_PLUGIN_ALIAS
-#: Merge.rc:2495
+#: Merge.rc:2505
msgid "&Alias..."
msgstr ""
#. IDD_DIRCOMP_PROGRESS, IDC_COMPARISON_STOP
-#: Merge.rc:2505
+#: Merge.rc:2515
#, c-format
msgid "Stop"
msgstr "Gelditu"
#. IDD_DIRCOMP_PROGRESS, IDC_COMPARISON_PAUSE
-#: Merge.rc:2506
+#: Merge.rc:2516
#, c-format
msgid "Pause"
msgstr ""
#. IDD_DIRCOMP_PROGRESS, IDC_COMPARISON_CONTINUE
-#: Merge.rc:2507
+#: Merge.rc:2517
#, c-format
msgid "Continue"
msgstr ""
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC
-#: Merge.rc:2509 Merge.rc:2973
+#: Merge.rc:2519 Merge.rc:2983
msgid "C&PU cores to use:"
msgstr ""
#. IDD_DIRCOMP_PROGRESS, IDC_STATIC
-#: Merge.rc:2510
+#: Merge.rc:2520
#, c-format
msgid "Items total:"
msgstr "Gaiak guztira:"
#. IDD_DIRCOMP_PROGRESS, IDC_STATIC
-#: Merge.rc:2511
+#: Merge.rc:2521
#, c-format
msgid "Items compared:"
msgstr "Alderatutako gaiak:"
#. IDS_PREVIEWBAR_CLOSE
-#: Merge.rc:2526 Merge.rc:2846 Merge.rc:5328
+#: Merge.rc:2536 Merge.rc:2856 Merge.rc:5339
#, c-format
msgid "&Close"
msgstr "&Itxi"
#. IDD_WMGOTO
-#: Merge.rc:2537
+#: Merge.rc:2547
msgid "Go to"
msgstr "Joan Hona"
#. IDD_WMGOTO, IDC_STATIC
-#: Merge.rc:2540
+#: Merge.rc:2550
msgid "G&o to:"
msgstr "Joan &Hona:"
#. IDD_WMGOTO, IDC_STATIC
-#: Merge.rc:2543
+#: Merge.rc:2553
#, c-format
msgid "File"
msgstr "Agiria"
#. IDD_WMGOTO, IDC_STATIC
-#: Merge.rc:2547
+#: Merge.rc:2557
msgid "Go to what"
msgstr "Joan &nora"
#. IDD_WMGOTO, IDC_WMGOTO_TOLINE
-#: Merge.rc:2548
+#: Merge.rc:2558
#, c-format
msgid "Li&ne"
msgstr "&Lerroa"
#. IDD_WMGOTO, IDC_WMGOTO_TODIFF
-#: Merge.rc:2549
+#: Merge.rc:2559
#, c-format
msgid "&Difference"
msgstr "&Ezberdintasuna"
#. IDD_WMGOTO, IDOK
-#: Merge.rc:2550
+#: Merge.rc:2560
msgid "&Go to"
msgstr "&Joan Hona"
#. IDS_PROJECT_ITEM_FILE_FILTER
-#: Merge.rc:2556 Merge.rc:4321
+#: Merge.rc:2566 Merge.rc:4331
msgid "File Filters"
msgstr ""
#. IDD_FILTERS_FILEFILTERS, IDC_STATIC
-#: Merge.rc:2559
+#: Merge.rc:2569
msgid "&Mask / Filter Expression"
msgstr ""
#. IDD_FILTERS_FILEFILTERS, IDC_STATIC
-#: Merge.rc:2562
+#: Merge.rc:2572
msgid "Preset &Filters"
msgstr ""
#. IDD_FILTERS_FILEFILTERS, IDC_FILTERFILE_TEST_BTN
-#: Merge.rc:2564
+#: Merge.rc:2574
msgid "Test..."
msgstr "Azterketa..."
#. IDD_FILTERS_FILEFILTERS, IDC_FILTERFILE_INSTALL
-#: Merge.rc:2565
+#: Merge.rc:2575
#, c-format
msgid "Install..."
msgstr "Ezarri..."
#. IDD_FILTERS_FILEFILTERS, IDC_FILTERFILE_NEWBTN
-#: Merge.rc:2566
+#: Merge.rc:2576
#, c-format
msgid "New..."
msgstr "Berria..."
#. IDD_FILTERS_FILEFILTERS, IDC_FILTERFILE_EDITBTN
-#: Merge.rc:2567
+#: Merge.rc:2577
#, c-format
msgid "Edit..."
msgstr "Editatu..."
#. IDD_FILTERS_FILEFILTERS, IDC_FILTERFILE_DELETEBTN
-#: Merge.rc:2568
+#: Merge.rc:2578
#, c-format
msgid "Delete..."
msgstr "Ezabatu..."
#. IDD_FILTERS_CONDITION
-#: Merge.rc:2573
+#: Merge.rc:2583
msgid "Filter Condition"
msgstr ""
#. IDD_FILTERS_CONDITION, IDC_STATIC
-#: Merge.rc:2576
+#: Merge.rc:2586
msgid "&Left-hand side:"
msgstr ""
#. IDD_FILTERS_CONDITION, IDC_STATIC
-#: Merge.rc:2578
+#: Merge.rc:2588
msgid "&Operator:"
msgstr ""
#. IDD_FILTERS_CONDITION, IDC_STATIC
-#: Merge.rc:2580
+#: Merge.rc:2590
msgid "&Right-hand side:"
msgstr ""
#. IDD_FILTERS_CONDITION, IDC_STATIC
-#: Merge.rc:2586
+#: Merge.rc:2596
msgid "Expression:"
msgstr ""
#. IDD_COMPARISON_RESULT_FILTER
-#: Merge.rc:2595
+#: Merge.rc:2605
msgid "Filter by Comparison Result"
msgstr ""
#. IDD_COMPARISON_RESULT_FILTER, IDC_RADIO_INCLUDE
-#: Merge.rc:2598
+#: Merge.rc:2608
msgid "&Include"
msgstr ""
#. IDD_COMPARISON_RESULT_FILTER, IDC_RADIO_EXCLUDE
-#: Merge.rc:2599
+#: Merge.rc:2609
msgid "&Exclude"
msgstr ""
#. IDD_COMPARISON_RESULT_FILTER, IDC_STATIC
-#: Merge.rc:2600
+#: Merge.rc:2610
msgid "Comparison Results"
msgstr ""
#. IDS_IDENTICAL
-#: Merge.rc:2601 Merge.rc:2733 Merge.rc:2794 Merge.rc:4698
+#: Merge.rc:2611 Merge.rc:2743 Merge.rc:2804 Merge.rc:4708
#, c-format
msgid "Identical"
msgstr "Berdin"
#. IDS_DIFFERENT
-#: Merge.rc:2602 Merge.rc:2714 Merge.rc:2755 Merge.rc:4708
+#: Merge.rc:2612 Merge.rc:2724 Merge.rc:2765 Merge.rc:4718
#, c-format
msgid "Different"
msgstr "Ezberdin"
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_LEFT_ONLY
-#: Merge.rc:2603
+#: Merge.rc:2613
msgid "Left only"
msgstr ""
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_RIGHT_ONLY
-#: Merge.rc:2604
+#: Merge.rc:2614
msgid "Right only"
msgstr ""
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_SKIPPED
-#: Merge.rc:2605
+#: Merge.rc:2615
msgid "Skipped"
msgstr ""
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_MIDDLE_ONLY
-#: Merge.rc:2606
+#: Merge.rc:2616
msgid "Middle only"
msgstr ""
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_LEFT_ONLY_DIFFERENT
-#: Merge.rc:2607
+#: Merge.rc:2617
msgid "Left only (different)"
msgstr ""
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_MIDDLE_ONLY_DIFFERENT
-#: Merge.rc:2608
+#: Merge.rc:2618
msgid "Middle only (different)"
msgstr ""
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_RIGHT_ONLY_DIFFERENT
-#: Merge.rc:2609
+#: Merge.rc:2619
msgid "Right only (different)"
msgstr ""
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_LEFT_ONLY_MISSING
-#: Merge.rc:2610
+#: Merge.rc:2620
msgid "Left only (missing)"
msgstr ""
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_MIDDLE_ONLY_MISSING
-#: Merge.rc:2611
+#: Merge.rc:2621
msgid "Middle only (missing)"
msgstr ""
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_RIGHT_ONLY_MISSING
-#: Merge.rc:2612
+#: Merge.rc:2622
msgid "Right only (missing)"
msgstr ""
#. IDS_OPTIONSPG_CODEPAGE
-#: Merge.rc:2619 Merge.rc:2811 Merge.rc:4213
+#: Merge.rc:2629 Merge.rc:2821 Merge.rc:4223
#, c-format
msgid "Codepage"
msgstr "Kode-orrialdea"
#. IDD_PROPPAGE_CODEPAGE, IDC_STATIC
-#: Merge.rc:2622
+#: Merge.rc:2632
#, c-format
msgid "Default Codepage"
msgstr "Berezko Kode-orrialdea"
#. IDD_PROPPAGE_CODEPAGE, IDC_STATIC
-#: Merge.rc:2623
+#: Merge.rc:2633
#, c-format
msgid "Select the default codepage for non-Unicode files:"
msgstr "Hautatu berezko kode-orrialdea ez-Unicode agiriak gertatzerakoan:"
#. IDD_PROPPAGE_CODEPAGE, IDC_CP_SYSTEM
-#: Merge.rc:2624
+#: Merge.rc:2634
#, c-format
msgid "System codepage"
msgstr "&Sistema kode-orrialdea"
#. IDD_PROPPAGE_CODEPAGE, IDC_CP_UI
-#: Merge.rc:2625
+#: Merge.rc:2635
#, c-format
msgid "According to WinMerge User Interface"
msgstr "&WinMerge Erabiltzaile Interfazearen arabera"
#. IDD_PROPPAGE_CODEPAGE, IDC_CP_CUSTOM
-#: Merge.rc:2626
+#: Merge.rc:2636
#, c-format
msgid "Custom codepage:"
msgstr "&Egile kode-orrialdea:"
#. IDD_PROPPAGE_CODEPAGE, IDC_DETECT_CODEPAGE
-#: Merge.rc:2628
+#: Merge.rc:2638
msgid "Detect codepage for: .html, .rc, .xml\nRestart required."
msgstr ""
"&Atzeman kode-orrialde argibideak agiri hauentzat:\n"
" .html, .rc, .xml. Saioa birrabiaraztea beharrezkoa da."
#. IDD_PROPPAGE_CODEPAGE, IDC_DETECT_CODEPAGE2
-#: Merge.rc:2630
+#: Merge.rc:2640
msgid "Detect codepage for files with mlang.dll\nRestart required."
msgstr ""
#. IDS_OPTIONSPG_ARCHIVE
-#: Merge.rc:2638 Merge.rc:4214
+#: Merge.rc:2648 Merge.rc:4224
#, c-format
msgid "Archive Support"
msgstr "Agiri Sostengua"
#. IDD_PROPPAGE_ARCHIVE, IDC_ARCHIVE_ENABLE
-#: Merge.rc:2641
+#: Merge.rc:2651
#, c-format
msgid "&Enable archive file support"
msgstr "&Gaitu agirien agiri sostengua"
#. IDD_PROPPAGE_ARCHIVE, IDC_ARCHIVE_DETECTTYPE
-#: Merge.rc:2642
+#: Merge.rc:2652
#, c-format
msgid "&Detect archive type from file signature"
msgstr "&Atzeman agiri mota agiriaren sinaduratik"
#. IDD_PROPPAGE_PROJECT, IDC_STATIC
-#: Merge.rc:2651
+#: Merge.rc:2661
msgid "Items saved to or restored from the project file:"
msgstr ""
#. IDD_SAVECLOSING
-#: Merge.rc:2658
+#: Merge.rc:2668
#, c-format
msgid "Save Modified Files?"
msgstr "Gorde amaitutako agiriak?"
#. IDD_SAVECLOSING, IDC_SAVECLOSING_LEFTFRAME
-#: Merge.rc:2661
+#: Merge.rc:2671
#, c-format
msgid "Left side file"
msgstr "Ezkerralde agiria"
#. IDD_SAVECLOSING, IDC_SAVECLOSING_SAVELEFT
-#: Merge.rc:2663
+#: Merge.rc:2673
#, c-format
msgid "&Save changes"
msgstr "Gor&de aldaketak"
#. IDD_SAVECLOSING, IDC_SAVECLOSING_DISCARDLEFT
-#: Merge.rc:2664
+#: Merge.rc:2674
#, c-format
msgid "&Discard changes"
msgstr "&Baztertu aldaketak"
#. IDD_SAVECLOSING, IDC_SAVECLOSING_MIDDLEFRAME
-#: Merge.rc:2665
+#: Merge.rc:2675
#, c-format
msgid "Middle side file"
msgstr ""
#. IDD_SAVECLOSING, IDC_SAVECLOSING_SAVEMIDDLE
-#: Merge.rc:2667
+#: Merge.rc:2677
#, c-format
msgid "Sa&ve changes"
msgstr ""
#. IDD_SAVECLOSING, IDC_SAVECLOSING_DISCARDMIDDLE
-#: Merge.rc:2668
+#: Merge.rc:2678
#, c-format
msgid "Discard c&hanges"
msgstr ""
#. IDD_SAVECLOSING, IDC_SAVECLOSING_RIGHTFRAME
-#: Merge.rc:2669
+#: Merge.rc:2679
#, c-format
msgid "Right side file"
msgstr "Eskuinalde agiria"
#. IDD_SAVECLOSING, IDC_SAVECLOSING_SAVERIGHT
-#: Merge.rc:2671
+#: Merge.rc:2681
#, c-format
msgid "S&ave changes"
msgstr "&Gorde aldaketak"
#. IDD_SAVECLOSING, IDC_SAVECLOSING_DISCARDRIGHT
-#: Merge.rc:2672
+#: Merge.rc:2682
#, c-format
msgid "Dis&card changes"
msgstr "B&aztertu aldaketak"
#. IDD_SAVECLOSING, IDC_SAVECLOSING_DISCARDALL
-#: Merge.rc:2673
+#: Merge.rc:2683
#, c-format
msgid "Disca&rd All"
msgstr ""
#. IDD_DIRCMP_REPORT
-#: Merge.rc:2680
+#: Merge.rc:2690
#, c-format
msgid "Folder Compare Report"
msgstr "Agiritegi Alderaketa Jakinarazpena"
#. IDD_DIRCMP_REPORT, IDC_STATIC
-#: Merge.rc:2683
+#: Merge.rc:2693
#, c-format
msgid "Report &file:"
msgstr "Jakinarazi &Agiria:"
#. IDD_DIRCMP_REPORT, IDC_STATIC
-#: Merge.rc:2686
+#: Merge.rc:2696
#, c-format
msgid "&Style:"
msgstr "&Estiloa"
#. IDD_DIRCMP_REPORT, IDC_REPORT_INCLUDEFILECMPREPORT
-#: Merge.rc:2688
+#: Merge.rc:2698
#, c-format
msgid "&Include file compare report"
msgstr ""
#. IDD_FILTERS_FILEFILTERS_SHARED
-#: Merge.rc:2697
+#: Merge.rc:2707
#, c-format
msgid "Shared or Private Filter"
msgstr "Iragazki Partekatua edo Pribatua"
#. IDD_FILTERS_FILEFILTERS_SHARED, IDC_STATIC
-#: Merge.rc:2700
+#: Merge.rc:2710
#, c-format
msgid "What type of filter do you want?"
msgstr "Zein iragazki mota nahi duzu sortzea?"
#. IDD_FILTERS_FILEFILTERS_SHARED, IDC_SHARED
-#: Merge.rc:2701
+#: Merge.rc:2711
#, c-format
msgid "Shared Filter (for all users)"
msgstr "Partekatutako Iragazkia (erabiltzaile guztientzat ordenagailu honetan)"
#. IDD_FILTERS_FILEFILTERS_SHARED, IDC_PRIVATE
-#: Merge.rc:2702
+#: Merge.rc:2712
#, c-format
msgid "Private Filter (current user only)"
msgstr "Iragazki Pribatua (uneko erabiltzailearentzat bakarrik)"
#. IDD_COMPARE_STATISTICS3
-#: Merge.rc:2709 Merge.rc:2750
+#: Merge.rc:2719 Merge.rc:2760
#, c-format
msgid "Compare Statistics"
msgstr "Alderatu Estatistikak"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2712 Merge.rc:2753
+#: Merge.rc:2722 Merge.rc:2763
#, c-format
msgid "Folders:"
msgstr "Agiritegiak:"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2713 Merge.rc:2754
+#: Merge.rc:2723 Merge.rc:2764
#, c-format
msgid "Files:"
msgstr "Agiriak:"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2719 Merge.rc:2738 Merge.rc:2760 Merge.rc:2799
+#: Merge.rc:2729 Merge.rc:2748 Merge.rc:2770 Merge.rc:2809
#, c-format
msgid "Binary:"
msgstr "Binarioa:"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2722 Merge.rc:2763
+#: Merge.rc:2732 Merge.rc:2773
#, c-format
msgid "Unique"
msgstr "Unique"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2723 Merge.rc:2764
+#: Merge.rc:2733 Merge.rc:2774
#, c-format
msgid "Left:"
msgstr "Ezker:"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2728 Merge.rc:2774
+#: Merge.rc:2738 Merge.rc:2784
#, c-format
msgid "Right:"
msgstr "Eskuin:"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2742 Merge.rc:2803
+#: Merge.rc:2752 Merge.rc:2813
#, c-format
msgid "Total:"
msgstr "Guztira:"
#. IDD_COMPARE_STATISTICS3, IDOK
-#: Merge.rc:2745 Merge.rc:2806
+#: Merge.rc:2755 Merge.rc:2816
#, c-format
msgid "Close"
msgstr "Itxi"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2769
+#: Merge.rc:2779
#, c-format
msgid "Middle:"
msgstr ""
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2779
+#: Merge.rc:2789
#, c-format
msgid "Missing Left:"
msgstr ""
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2784
+#: Merge.rc:2794
#, c-format
msgid "Missing Middle:"
msgstr ""
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2789
+#: Merge.rc:2799
#, c-format
msgid "Missing Right:"
msgstr ""
#. IDD_LOAD_SAVE_CODEPAGE, IDC_AFFECTS_GROUP
-#: Merge.rc:2814
+#: Merge.rc:2824
#, c-format
msgid "Affects"
msgstr "Eraginak"
#. IDD_LOAD_SAVE_CODEPAGE, IDC_RIGHT_FILES_LABEL
-#: Merge.rc:2816 Merge.rc:2818 Merge.rc:2820
+#: Merge.rc:2826 Merge.rc:2828 Merge.rc:2830
#, c-format
msgid "(Affects)"
msgstr "(Eraginak)"
#. IDD_LOAD_SAVE_CODEPAGE, IDC_LOADING_GROUP
-#: Merge.rc:2821
+#: Merge.rc:2831
#, c-format
msgid "Select Codepage for"
msgstr "Hautatu Kode-orrialdea"
#. IDD_LOAD_SAVE_CODEPAGE, IDC_LOAD_FILES_LABEL
-#: Merge.rc:2822
+#: Merge.rc:2832
#, c-format
msgid "&File Loading:"
msgstr "&Agiria Gertatzen:"
#. IDD_LOAD_SAVE_CODEPAGE, IDC_SAVE_FILES_LABEL
-#: Merge.rc:2824
+#: Merge.rc:2834
#, c-format
msgid "File &Saving:"
msgstr "Agira &Gordetzen:"
#. IDD_LOAD_SAVE_CODEPAGE, IDC_LOAD_SAVE_SAME_CODEPAGE
-#: Merge.rc:2827
+#: Merge.rc:2837
#, c-format
msgid "&Use same codepage for both"
msgstr "Erabili &kode-orrialde bera bientzat"
#. IDS_MESSAGEBOX_CANCEL
-#: Merge.rc:2830 Merge.rc:4172
+#: Merge.rc:2840 Merge.rc:4182
#, c-format
msgid "&Cancel"
msgstr "E&zeztatu"
#. IDD_FILTERS_FILEFILTERS_TEST
-#: Merge.rc:2835
+#: Merge.rc:2845
#, c-format
msgid "Test Filter"
msgstr "Azterketa Iragazkia"
#. IDD_FILTERS_FILEFILTERS_TEST, IDC_HEADER
-#: Merge.rc:2838
+#: Merge.rc:2848
msgid "Testing filter:"
msgstr "Iragazkia aztertzen:"
#. IDD_FILTERS_FILEFILTERS_TEST, IDC_PROMPT_LABEL
-#: Merge.rc:2840
+#: Merge.rc:2850
#, c-format
msgid "&Enter text to test:"
msgstr "&Sartu idazkia aztertzeko:"
#. IDD_FILTERS_FILEFILTERS_TEST, IDC_IS_DIRECTORY
-#: Merge.rc:2842
+#: Merge.rc:2852
#, c-format
msgid "&Folder Name"
msgstr "&Agiritegi Izena"
#. IDD_FILTERS_FILEFILTERS_TEST, IDC_STATIC
-#: Merge.rc:2843
+#: Merge.rc:2853
#, c-format
msgid "Result:"
msgstr "Emaitza:"
#. IDD_FILTERS_FILEFILTERS_TEST, IDC_TEST_BTN
-#: Merge.rc:2845
+#: Merge.rc:2855
#, c-format
msgid "&Test"
msgstr "&Azterketa"
#. IDS_OPTIONSPG_TABLECOMPARE
-#: Merge.rc:2851 Merge.rc:2990 Merge.rc:4228
+#: Merge.rc:2861 Merge.rc:3000 Merge.rc:4238
msgid "Table"
msgstr ""
#. IDD_OPEN_TABLE, IDC_STATIC
-#: Merge.rc:2854
+#: Merge.rc:2864
msgid "File type"
msgstr ""
#. IDD_OPEN_TABLE, IDC_COMPARETABLE_CSV
-#: Merge.rc:2855
+#: Merge.rc:2865
msgid "&CSV"
msgstr ""
#. IDD_OPEN_TABLE, IDC_COMPARETABLE_TSV
-#: Merge.rc:2856
+#: Merge.rc:2866
msgid "&TSV"
msgstr ""
#. IDD_OPEN_TABLE, IDC_COMPARETABLE_DSV
-#: Merge.rc:2857
+#: Merge.rc:2867
msgid "Custom &Delimiter-Separated Values"
msgstr ""
#. IDD_PROPPAGE_COMPARE_TABLE, IDC_STATIC
-#: Merge.rc:2859 Merge.rc:2861 Merge.rc:2996 Merge.rc:3004
+#: Merge.rc:2869 Merge.rc:2871 Merge.rc:3006 Merge.rc:3014
msgid "D&elimiter character:"
msgstr ""
#. IDD_PROPPAGE_COMPARE_TABLE, IDC_COMPARETABLE_ALLOWNEWLINE
-#: Merge.rc:2863 Merge.rc:3006
+#: Merge.rc:2873 Merge.rc:3016
msgid "&Allow newlines in quotes"
msgstr ""
#. IDD_PROPPAGE_COMPARE_TABLE, IDC_STATIC
-#: Merge.rc:2865 Merge.rc:3008
+#: Merge.rc:2875 Merge.rc:3018
msgid "&Quote character:"
msgstr ""
#. IDS_OPTIONSPG_BACKUPS
-#: Merge.rc:2873 Merge.rc:4216
+#: Merge.rc:2883 Merge.rc:4226
#, c-format
msgid "Backup Files"
msgstr "Babeskopia Agiriak"
#. IDD_PROPPAGE_BACKUPS, IDC_STATIC
-#: Merge.rc:2876
+#: Merge.rc:2886
#, c-format
msgid "Create backup files for:"
msgstr "Sortu babeskopia agiriak hemen:"
#. IDD_PROPPAGE_BACKUPS, IDC_BACKUP_FOLDERCMP
-#: Merge.rc:2877
+#: Merge.rc:2887
#, c-format
msgid "&Folder compare"
msgstr "&Agiritegi alderaketa"
#. IDD_PROPPAGE_BACKUPS, IDC_BACKUP_FILECMP
-#: Merge.rc:2878
+#: Merge.rc:2888
#, c-format
msgid "Fil&e compare"
msgstr "A&giri alderaketa"
#. IDD_PROPPAGE_BACKUPS, IDC_STATIC
-#: Merge.rc:2879
+#: Merge.rc:2889
#, c-format
msgid "Create backup files in:"
msgstr "Sortu babeskopia agiriak honen barnean:"
#. IDD_PROPPAGE_BACKUPS, IDC_BACKUP_ORIGFOLD
-#: Merge.rc:2880
+#: Merge.rc:2890
#, c-format
msgid "&Original file's folder"
msgstr "Agiriaren &jatorrizko agiritegia"
#. IDD_PROPPAGE_BACKUPS, IDC_BACKUP_GLOBALFOLD
-#: Merge.rc:2881
+#: Merge.rc:2891
#, c-format
msgid "&Global backup folder:"
msgstr "&Babeskopia agiritegi globala:"
#. IDD_PROPPAGE_BACKUPS, IDC_STATIC
-#: Merge.rc:2884
+#: Merge.rc:2894
#, c-format
msgid "Backup filename:"
msgstr "Babeskopia agirizena:"
#. IDD_PROPPAGE_BACKUPS, IDC_BACKUP_APPEND_BAK
-#: Merge.rc:2885
+#: Merge.rc:2895
msgid "&Append .bak extension"
msgstr "&Erantsi .bak luzapena"
#. IDD_PROPPAGE_BACKUPS, IDC_BACKUP_APPEND_TIME
-#: Merge.rc:2886
+#: Merge.rc:2896
#, c-format
msgid "A&ppend timestamp"
msgstr "Erantsi &denbora"
#. IDS_CONFIRM_COPY_CAPTION
-#: Merge.rc:2892 Merge.rc:4565
+#: Merge.rc:2902 Merge.rc:4575
#, c-format
msgid "Confirm Copy"
msgstr "Berretsi Kopiatzea"
#. IDD_CONFIRM_COPY, IDC_FLDCONFIRM_QUERY
-#: Merge.rc:2896
+#: Merge.rc:2906
#, c-format
msgid "Are you sure you want to copy XXX items?"
msgstr "Zihur zaude XXX gaiak kopiatzea nahi dituzula?"
#. IDD_CONFIRM_COPY, IDC_FLDCONFIRM_FROM_TEXT
-#: Merge.rc:2897
+#: Merge.rc:2907
#, c-format
msgid "From left"
msgstr "Ezkerretik"
#. IDD_CONFIRM_COPY, IDC_FLDCONFIRM_TO_TEXT
-#: Merge.rc:2899
+#: Merge.rc:2909
#, c-format
msgid "To right"
msgstr "Eskuinera"
#. IDS_MESSAGEBOX_DONT_ASK_AGAIN
-#: Merge.rc:2901 Merge.rc:4191
+#: Merge.rc:2911 Merge.rc:4201
#, c-format
msgid "Don't ask this &question again."
msgstr "Ez egin ga&ldera hau berriro."
#. IDD_CONFIRM_COPY, IDYES
-#: Merge.rc:2903
+#: Merge.rc:2913
#, c-format
msgid "Yes"
msgstr "Bai"
#. IDD_CONFIRM_COPY, IDNO
-#: Merge.rc:2904
+#: Merge.rc:2914
#, c-format
msgid "No"
msgstr "Ez"
#. IDS_PROJECT_ITEM_PLUGIN
-#: Merge.rc:2909 Merge.rc:4323
+#: Merge.rc:2919 Merge.rc:4333
#, c-format
msgid "Plugins"
msgstr "Pluginak"
#. IDD_PLUGINS_LIST, IDC_PLUGINS_ENABLE
-#: Merge.rc:2912
+#: Merge.rc:2922
#, c-format
msgid "&Enable plugins"
msgstr "Gaitu &pluginak"
#. IDD_PLUGINS_EDITPLUGIN, IDC_STATIC
-#: Merge.rc:2913 Merge.rc:3113
+#: Merge.rc:2923 Merge.rc:3123
msgid "Plugin &type:"
msgstr ""
#. IDD_PLUGINS_LIST, IDC_STATIC
-#: Merge.rc:2916
+#: Merge.rc:2926
msgid "File filters:"
msgstr ""
#. IDD_PLUGINS_LIST, IDC_STATIC
-#: Merge.rc:2918
+#: Merge.rc:2928
msgid "&Plugin arguments:"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_AUTOMATIC
-#: Merge.rc:2920 Merge.rc:3134
+#: Merge.rc:2930 Merge.rc:3144
msgid "Enable &automatic unpacking/prediffing"
msgstr ""
#. IDS_OPTIONSPG_SHELL
-#: Merge.rc:2934 Merge.rc:4217
+#: Merge.rc:2944 Merge.rc:4227
#, c-format
msgid "Shell Integration"
msgstr "Shell Baterapena"
#. IDD_PROPPAGE_SHELL, IDC_STATIC
-#: Merge.rc:2937
+#: Merge.rc:2947
#, c-format
msgid "Explorer"
msgstr "Bilaketa"
#. IDD_PROPPAGE_SHELL, IDC_EXPLORER_CONTEXT
-#: Merge.rc:2938
+#: Merge.rc:2948
#, c-format
msgid "&Add to context menu"
msgstr "Gehitu &hitzinguru menura"
#. IDD_PROPPAGE_SHELL, IDC_EXPLORER_ADVANCED
-#: Merge.rc:2939
+#: Merge.rc:2949
#, c-format
msgid "E&nable advanced menu"
msgstr "Gaitu &menu aurreratua"
#. IDD_PROPPAGE_SHELL, IDC_EXPLORER_COMPARE_AS
-#: Merge.rc:2940
+#: Merge.rc:2950
msgid "Enable &Compare As menu"
msgstr ""
#. IDD_PROPPAGE_SHELL, IDC_REGISTER_SHELLEXTENSION
-#: Merge.rc:2941
+#: Merge.rc:2951
#, c-format
msgid "&Register Shell Extension"
msgstr ""
#. IDD_PROPPAGE_SHELL, IDC_UNREGISTER_SHELLEXTENSION
-#: Merge.rc:2942
+#: Merge.rc:2952
#, c-format
msgid "&Unregister Shell Extension"
msgstr ""
#. IDD_PROPPAGE_SHELL, IDC_REGISTER_SHELLEXTENSION_PERUSER
-#: Merge.rc:2943
+#: Merge.rc:2953
msgid "Register Shell Extension for Current User &Only"
msgstr ""
#. IDD_PROPPAGE_SHELL, IDC_UNREGISTER_SHELLEXTENSION_PERUSER
-#: Merge.rc:2944
+#: Merge.rc:2954
msgid "Unregister Shell Extension for Current User On&ly"
msgstr ""
#. IDD_PROPPAGE_SHELL, IDC_REGISTER_WINMERGECONTEXTMENU
-#: Merge.rc:2945
+#: Merge.rc:2955
msgid "Register Shell Extension for &Windows 11"
msgstr ""
#. IDD_PROPPAGE_SHELL, IDC_UNREGISTER_WINMERGECONTEXTMENU
-#: Merge.rc:2946
+#: Merge.rc:2956
msgid "Unregister Shell Extension for W&indows 11"
msgstr ""
#. IDD_PROPPAGE_SHELL, IDC_STATIC
-#: Merge.rc:2947
+#: Merge.rc:2957
msgid "Jump List"
msgstr ""
#. IDD_PROPPAGE_SHELL, IDC_CLEAR_ALL_RECENT_ITEMS
-#: Merge.rc:2949
+#: Merge.rc:2959
msgid "Clear all recent items"
msgstr ""
#. IDS_OPTIONSPG_FOLDERCOMPARE
-#: Merge.rc:2954 Merge.rc:4225
+#: Merge.rc:2964 Merge.rc:4235
msgctxt "Options dialog|Categories"
msgid "Folder"
msgstr "Agiritegia"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC
-#: Merge.rc:2957
+#: Merge.rc:2967
msgid "&Compare method:"
msgstr "Alderaketa &metodoa:"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_COMPARE_STOPFIRST
-#: Merge.rc:2959
+#: Merge.rc:2969
#, c-format
msgid "S&top after first difference"
msgstr "&Gelditu lehen ezberdintasunaren ondoren"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_IGNORE_SMALLTIMEDIFF
-#: Merge.rc:2961
+#: Merge.rc:2971
#, c-format
msgid "Ign&ore time differences less than 3 seconds"
msgstr "Ezikusi 3 segundu baino gut&xiagoko ezberdintasunak"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC
-#: Merge.rc:2964
+#: Merge.rc:2974
msgid "Expand subfolders &after comparison:"
msgstr ""
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_COMPARE_WALKSUBDIRS
-#: Merge.rc:2966
+#: Merge.rc:2976
#, c-format
msgid "Include &unique subfolders contents"
msgstr ""
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_IGNORE_REPARSEPOINTS
-#: Merge.rc:2968
+#: Merge.rc:2978
#, c-format
msgid "Ignore &reparse points"
msgstr ""
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC
-#: Merge.rc:2969
+#: Merge.rc:2979
msgid "Switch to &quick compare when size exceeds (MB):"
msgstr ""
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC
-#: Merge.rc:2971
+#: Merge.rc:2981
msgid "Switch to &binary compare when size exceeds (MB):"
msgstr ""
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC
-#: Merge.rc:2975
+#: Merge.rc:2985
msgid "Additional comparison condi&tions:"
msgstr ""
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC
-#: Merge.rc:2978
+#: Merge.rc:2988
msgid "&Rename/move detection:"
msgstr ""
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC
-#: Merge.rc:2980
+#: Merge.rc:2990
msgid "Rename/move detection &keys:"
msgstr ""
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC
-#: Merge.rc:2983
+#: Merge.rc:2993
msgid "M&erge renames and moves:"
msgstr ""
#. IDD_PROPPAGE_COMPARE_TABLE, IDC_STATIC
-#: Merge.rc:2994 Merge.rc:2999 Merge.rc:3002
+#: Merge.rc:3004 Merge.rc:3009 Merge.rc:3012
msgid "File patterns:"
msgstr ""
#. IDD_PROPPAGE_COMPARE_TABLE, IDC_STATIC
-#: Merge.rc:3001
+#: Merge.rc:3011
msgid "Custom Delimiter-Separated Values"
msgstr ""
#. IDS_OPTIONSPG_BINARYCOMPARE
-#: Merge.rc:3015 Merge.rc:4227
+#: Merge.rc:3025 Merge.rc:4237
msgctxt "Options dialog|Categories"
msgid "Binary"
msgstr "Binarioa"
#. IDD_PROPPAGE_COMPARE_BINARY, IDC_STATIC
-#: Merge.rc:3018
+#: Merge.rc:3028
#, c-format
msgid "Binary file &patterns:"
msgstr ""
#. IDD_PROPPAGE_COMPARE_BINARY, IDC_STATIC
-#: Merge.rc:3020
+#: Merge.rc:3030
#, c-format
msgid "Frhed settings"
msgstr ""
#. IDD_PROPPAGE_COMPARE_BINARY, IDC_COMPAREBINARY_VIEWSETTINGS
-#: Merge.rc:3021
+#: Merge.rc:3031
#, c-format
msgid "View &Settings..."
msgstr ""
#. IDD_PROPPAGE_COMPARE_BINARY, IDC_COMPAREBINARY_BINARYMODE
-#: Merge.rc:3022
+#: Merge.rc:3032
#, c-format
msgid "&Binary Mode..."
msgstr ""
#. IDD_PROPPAGE_COMPARE_BINARY, IDC_COMPAREBINARY_CHARACTERSET
-#: Merge.rc:3023
+#: Merge.rc:3033
#, c-format
msgid "&Character Set..."
msgstr ""
#. IDS_PRPCAT_IMAGE
-#: Merge.rc:3029 Merge.rc:4226 Merge.rc:4665
+#: Merge.rc:3039 Merge.rc:4236 Merge.rc:4675
msgid "Image"
msgstr ""
#. IDD_PROPPAGE_COMPARE_IMAGE, IDC_STATIC
-#: Merge.rc:3032
+#: Merge.rc:3042
#, c-format
msgid "Image file &patterns:"
msgstr ""
#. IDD_PROPPAGE_COMPARE_IMAGE, IDC_ENABLE_IMGCMP_IN_DIRCMP
-#: Merge.rc:3034
+#: Merge.rc:3044
msgid "&Enable image compare in folder compare"
msgstr ""
#. IDD_PROPPAGE_COMPARE_IMAGE, IDC_STATIC
-#: Merge.rc:3036
+#: Merge.rc:3046
msgid "OCR result:"
msgstr ""
#. IDS_OPTIONSPG_WEBPAGECOMPARE
-#: Merge.rc:3043 Merge.rc:4229
+#: Merge.rc:3053 Merge.rc:4239
msgid "Webpage"
msgstr ""
#. IDD_PROPPAGE_COMPARE_WEBPAGE, IDC_STATIC
-#: Merge.rc:3046
+#: Merge.rc:3056
msgid "URL pattern to &include (Regular expression):"
msgstr ""
#. IDD_PROPPAGE_COMPARE_WEBPAGE, IDC_STATIC
-#: Merge.rc:3048
+#: Merge.rc:3058
msgid "URL pattern to &exclude (Regular expression):"
msgstr ""
#. IDD_PROPPAGE_COMPARE_WEBPAGE, IDC_STATIC
-#: Merge.rc:3050
+#: Merge.rc:3060
msgid "&User data folder location:"
msgstr ""
#. IDD_PROPPAGE_COMPARE_WEBPAGE, IDC_COMPAREWEBPAGE_USERDATAFOLDER_PERPANE
-#: Merge.rc:3052
+#: Merge.rc:3062
msgid "&Separate user data folders for each pane"
msgstr ""
#. IDD_ENCODINGERROR, IDC_HEXVIEW
-#: Merge.rc:3065
+#: Merge.rc:3075
#, c-format
msgid "&Hex View"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3110
+#: Merge.rc:3120
msgid "Edit Plugin"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN, IDC_STATIC
-#: Merge.rc:3123
+#: Merge.rc:3133
msgid "&Category:"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_MENUCAPTION_STATIC
-#: Merge.rc:3125
+#: Merge.rc:3135
msgid "&Menu caption:"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_WINDOWTYPE_STATIC
-#: Merge.rc:3127
+#: Merge.rc:3137
msgid "&Window type:"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_UNPACKEDFILEEXTENSION_STATIC
-#: Merge.rc:3132
+#: Merge.rc:3142
msgid "&Unpacked file extension:"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_ARGUMENTSREQUIRED
-#: Merge.rc:3136
+#: Merge.rc:3146
msgid "&Require arguments"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_GENERATESCRIPT
-#: Merge.rc:3137
+#: Merge.rc:3147
msgid "&Generate editor script"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_COMMAND_LINE_STATIC
-#: Merge.rc:3140
+#: Merge.rc:3150
msgid "Command &line:"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_SCRIPT_FILEEXTENSION_STATIC
-#: Merge.rc:3143
+#: Merge.rc:3153
msgid "&Script file extension:"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_SCRIPT_BODY_STATIC
-#: Merge.rc:3145
+#: Merge.rc:3155
msgid "Script &body:"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3154
+#: Merge.rc:3164
msgid "Font"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3157
+#: Merge.rc:3167
msgid "&Font:"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3163
+#: Merge.rc:3173
msgid "Font st&yle:"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3169
+#: Merge.rc:3179
msgid "&Size:"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3175
+#: Merge.rc:3185
msgid "Effects"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3176
+#: Merge.rc:3186
msgid "Stri&keout"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3177
+#: Merge.rc:3187
msgid "&Underline"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3179
+#: Merge.rc:3189
msgid "&Color:"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3184
+#: Merge.rc:3194
msgid "Sample"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3185
+#: Merge.rc:3195
msgid "AaBbYyZz"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3189
+#: Merge.rc:3199
msgid "Sc&ript:"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN, IDC_MANAGE_LINK
-#: Merge.rc:3194
+#: Merge.rc:3204
msgid "Show more fonts"
msgstr ""
#. ID_INDICATOR_EXT
-#: Merge.rc:4118
+#: Merge.rc:4128
#, c-format
msgid "EXT"
msgstr "EXT"
#. ID_INDICATOR_CAPS
-#: Merge.rc:4119
+#: Merge.rc:4129
#, c-format
msgid "CAP"
msgstr "NUM"
#. ID_INDICATOR_NUM
-#: Merge.rc:4120
+#: Merge.rc:4130
#, c-format
msgid "NUM"
msgstr "NUM"
#. ID_INDICATOR_SCRL
-#: Merge.rc:4121
+#: Merge.rc:4131
#, c-format
msgid "SCRL"
msgstr "SCRL"
#. ID_INDICATOR_OVR
-#: Merge.rc:4122
+#: Merge.rc:4132
#, c-format
msgid "OVR"
msgstr "OVR"
#. ID_INDICATOR_REC
-#: Merge.rc:4123
+#: Merge.rc:4133
#, c-format
msgid "REC"
msgstr "REC"
#. ID_FILE_NEW
-#: Merge.rc:4129
+#: Merge.rc:4139
#, c-format
msgid "\nNew Documents (Ctrl+N)"
msgstr ""
#. ID_FILE_OPEN
-#: Merge.rc:4130
+#: Merge.rc:4140
#, c-format
msgid "\nOpen (Ctrl+O)"
msgstr ""
#. ID_FILE_SAVE
-#: Merge.rc:4131
+#: Merge.rc:4141
#, c-format
msgid "\nSave (Ctrl+S)"
msgstr ""
#. IDS_UNK_ERROR_READING_PROJECT
-#: Merge.rc:4137
+#: Merge.rc:4147
msgid "Unknown error opening project file."
msgstr "Akats ezezagun bat egitasmo agiria irekitzen saiatzean."
#. IDS_UNK_ERROR_SAVING_PROJECT
-#: Merge.rc:4138
+#: Merge.rc:4148
msgid "Unknown error saving project file."
msgstr "Akats ezezagun bat egitasmo agiria gordetzen saiatzean."
#. IDS_PROJFILE_LOAD_SUCCESS
-#: Merge.rc:4143
+#: Merge.rc:4153
#, c-format
msgid "Project file loaded."
msgstr "Egitasmo agiria ongi gertatu da."
#. IDS_PROJFILE_SAVE_SUCCESS
-#: Merge.rc:4144
+#: Merge.rc:4154
#, c-format
msgid "Project file saved."
msgstr "Egitasmo agiria ongi gorde da."
#. ID_EDIT_UNDO
-#: Merge.rc:4150
+#: Merge.rc:4160
#, c-format
msgid "\nUndo (Ctrl+Z)"
msgstr ""
#. ID_EDIT_REDO
-#: Merge.rc:4151
+#: Merge.rc:4161
#, c-format
msgid "\nRedo (Ctrl+Y)"
msgstr ""
#. IDR_MERGEDOCTYPE
-#: Merge.rc:4158
+#: Merge.rc:4168
#, c-format
msgid ""
"\n"
@@ -5401,7 +5412,7 @@ msgstr ""
"WinMerge Agiri Alderaketa"
#. IDR_DIRDOCTYPE
-#: Merge.rc:4159
+#: Merge.rc:4169
#, c-format
msgid ""
"\n"
@@ -5421,183 +5432,183 @@ msgstr ""
"WinMerge Agirtegi Alderaketa"
#. IDS_SPLASH_GPLTEXT
-#: Merge.rc:4165
+#: Merge.rc:4175
#, c-format
msgid "WinMerge comes with ABSOLUTELY NO WARRANTY. It is free software and can be redistributed under the conditions of the GNU General Public License - see the Help menu for details."
msgstr "WinMerge BERME BAKAR BAT GABE dator. Hau software askea da eta ongi etorria zara birbanatzeko baldintza jakin batzuenpean ; ikusi GNU Baimen Publiko Orokorra, Laguntza menuan xehetasunetarako."
#. IDS_MESSAGEBOX_ABORT
-#: Merge.rc:4173
+#: Merge.rc:4183
#, c-format
msgid "&Abort"
msgstr "&Utzi"
#. IDS_MESSAGEBOX_RETRY
-#: Merge.rc:4174
+#: Merge.rc:4184
#, c-format
msgid "&Retry"
msgstr "&Birsaiatu"
#. IDS_MESSAGEBOX_IGNORE
-#: Merge.rc:4175
+#: Merge.rc:4185
#, c-format
msgid "&Ignore"
msgstr "&Baztertu"
#. IDS_MESSAGEBOX_IGNOREALL
-#: Merge.rc:4176
+#: Merge.rc:4186
#, c-format
msgid "Ignore &all"
msgstr "&Baztertu denak"
#. IDS_MESSAGEBOX_YES
-#: Merge.rc:4177
+#: Merge.rc:4187
#, c-format
msgid "&Yes"
msgstr "&Bai"
#. IDS_MESSAGEBOX_YES_TO_ALL
-#: Merge.rc:4183
+#: Merge.rc:4193
#, c-format
msgid "Yes to &all"
msgstr "Bai g&uztiari"
#. IDS_MESSAGEBOX_NO
-#: Merge.rc:4184
+#: Merge.rc:4194
#, c-format
msgid "&No"
msgstr "&Ez"
#. IDS_MESSAGEBOX_NO_TO_ALL
-#: Merge.rc:4185
+#: Merge.rc:4195
#, c-format
msgid "No to a&ll"
msgstr "Ez gu&ztiari"
#. IDS_MESSAGEBOX_CONTINUE
-#: Merge.rc:4186
+#: Merge.rc:4196
#, c-format
msgid "&Continue"
msgstr "&Jarraitu"
#. IDS_MESSAGEBOX_SKIP
-#: Merge.rc:4187
+#: Merge.rc:4197
#, c-format
msgid "&Skip"
msgstr "&Jauzi"
#. IDS_MESSAGEBOX_SKIPALL
-#: Merge.rc:4188
+#: Merge.rc:4198
#, c-format
msgid "Skip &all"
msgstr "Jauzi &guztiak"
#. IDS_MESSAGEBOX_DONT_DISPLAY_AGAIN
-#: Merge.rc:4190
+#: Merge.rc:4200
#, c-format
msgid "Don't display this &message again."
msgstr "Ez erakutsi &mezu hau berriro."
-#: Merge.rc:4193
+#: Merge.rc:4203
msgid "To make this message box visible, press Reset on the Message Boxes page in Options."
msgstr ""
#. IDS_OPTIONSPG_EDITOR_COMPAREMERGE
-#: Merge.rc:4203
+#: Merge.rc:4213
msgid "Compare/Merge"
msgstr ""
#. IDS_OPTIONSPG_SYNTAXCOLORS
-#: Merge.rc:4204 Merge.rc:4208
+#: Merge.rc:4214 Merge.rc:4218
#, c-format
msgid "Syntax"
msgstr "Joskera"
#. IDS_OPTIONSPG_COLOR_SCHEMES
-#: Merge.rc:4206
+#: Merge.rc:4216
msgid "Color Schemes"
msgstr ""
#. IDS_OPTIONSPG_DIRCOLORS
-#: Merge.rc:4210
+#: Merge.rc:4220
msgid "Folder Compare"
msgstr ""
#. IDS_OPTIONSPG_PROJECT
-#: Merge.rc:4215
+#: Merge.rc:4225
msgid "Project"
msgstr ""
#. IDS_COLHDR_NSDIFFS
-#: Merge.rc:4218 Merge.rc:4640
+#: Merge.rc:4228 Merge.rc:4650
#, c-format
msgid "Differences"
msgstr "Ezberdintasunak"
#. IDS_OPTIONSPG_MESSAGEBOXES
-#: Merge.rc:4220
+#: Merge.rc:4230
msgid "Message Boxes"
msgstr ""
#. IDS_TO
-#: Merge.rc:4235
+#: Merge.rc:4245
#, c-format
msgid "To:"
msgstr "Hona:"
#. IDS_FROM_LEFT
-#: Merge.rc:4236
+#: Merge.rc:4246
#, c-format
msgid "From left:"
msgstr "Ezkerretik:"
#. IDS_TO_LEFT
-#: Merge.rc:4237
+#: Merge.rc:4247
#, c-format
msgid "To left:"
msgstr "Ezkerrera:"
#. IDS_FROM_RIGHT
-#: Merge.rc:4238
+#: Merge.rc:4248
#, c-format
msgid "From right:"
msgstr "Eskuinetik:"
#. IDS_TO_RIGHT
-#: Merge.rc:4239
+#: Merge.rc:4249
#, c-format
msgid "To right:"
msgstr "Eskuinera:"
#. IDS_FROM_MIDDLE
-#: Merge.rc:4240
+#: Merge.rc:4250
msgid "From middle:"
msgstr ""
#. IDS_TO_MIDDLE
-#: Merge.rc:4241
+#: Merge.rc:4251
msgid "To middle:"
msgstr ""
#. IDS_VERSION_FMT
-#: Merge.rc:4247
+#: Merge.rc:4257
#, c-format
msgid "Version %1"
msgstr "Bertsioa %1"
#. IDS_OPTIONS_TITLE
-#: Merge.rc:4253
+#: Merge.rc:4263
#, c-format
msgid "Options (%1)"
msgstr "Aukerak (%1)"
#. IDS_MESSAGE_BOX_ARE_RESET
-#: Merge.rc:4254
+#: Merge.rc:4264
#, c-format
msgid "All message boxes are now displayed again."
msgstr "Mezu kutxatila guztiak erakusten dira berriro."
-#: Merge.rc:4256
+#: Merge.rc:4266
#, c-format
msgid "Tab size value is out of range. Please use 1 - %1."
msgstr ""
@@ -5606,177 +5617,177 @@ msgstr ""
"Mesedez erabili balioak 1 - %1."
#. IDS_PROJECT_OPEN
-#: Merge.rc:4262 Merge.rc:4318
+#: Merge.rc:4272 Merge.rc:4328
#, c-format
msgid "Open"
msgstr "Ireki"
#. IDS_PROGRAMFILES
-#: Merge.rc:4263
+#: Merge.rc:4273
#, c-format
msgid "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||"
msgstr "Programak|*.exe;*.bat;*.cmd|Agiri Denak (*.*)|*.*||"
#. IDS_ALLFILES
-#: Merge.rc:4264
+#: Merge.rc:4274
#, c-format
msgid "All Files (*.*)|*.*||"
msgstr "Agiri Denak (*.*)|*.*||"
#. IDS_PROJECTFILES
-#: Merge.rc:4265
+#: Merge.rc:4275
#, c-format
msgid "WinMerge Project Files (*.WinMerge)|*.WinMerge||"
msgstr "WinMerge Egitasmo Agiriak (*.WinMerge)|*.WinMerge||"
#. IDS_INIFILES
-#: Merge.rc:4267
+#: Merge.rc:4277
#, c-format
msgid "Options files (*.ini)|*.ini|All Files (*.*)|*.*||"
msgstr "Aukera agiriak (*.ini)|*.ini|Agiri Denak (*.*)|*.*||"
#. IDS_REPLACELIST_FILES
-#: Merge.rc:4268
+#: Merge.rc:4278
msgid "Tab-Separated Values (*.tsv;*.txt)|*.tsv;*.txt|All Files (*.*)|*.*||"
msgstr ""
#. IDS_TEXT_REPORT_FILES
-#: Merge.rc:4274
+#: Merge.rc:4284
#, c-format
msgid "Text Files (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|All Files (*.*)|*.*||"
msgstr "Idazki Agiriak (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|Agiri Denak (*.*)|*.*||"
#. IDS_HTML_REPORT_FILES
-#: Merge.rc:4275
+#: Merge.rc:4285
#, c-format
msgid "HTML Files (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||"
msgstr "HTML Agiriak (*.htm,*.html)|*.htm;*.html|Agiri Denak (*.*)|*.*||"
#. IDS_XML_REPORT_FILES
-#: Merge.rc:4276
+#: Merge.rc:4286
#, c-format
msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||"
msgstr "XML Agiriak (*.xml)|*.xml|Agiri Denak (*.*)|*.*||"
#. IDS_EXPANDSUBDIRS_DONOTEXPAND
-#: Merge.rc:4294
+#: Merge.rc:4304
msgid "Do not expand"
msgstr ""
#. IDS_EXPANDSUBDIRS_ALL
-#: Merge.rc:4295
+#: Merge.rc:4305
msgid "Expand all subfolders"
msgstr ""
#. IDS_EXPANDSUBDIRS_DIFFERENT
-#: Merge.rc:4296
+#: Merge.rc:4306
msgid "Expand different subfolders"
msgstr ""
#. IDS_EXPANDSUBDIRS_IDENTICAL
-#: Merge.rc:4297
+#: Merge.rc:4307
msgid "Expand identical subfolders"
msgstr ""
#. IDS_SYNTAXTABLE_FILETYPE
-#: Merge.rc:4303
+#: Merge.rc:4313
msgid "File Type"
msgstr ""
#. IDS_COLHDR_EXTENSION
-#: Merge.rc:4304 Merge.rc:4597
+#: Merge.rc:4314 Merge.rc:4607
#, c-format
msgid "Extension"
msgstr "Luzapena"
#. IDS_PRPCAT_MESSAGE
-#: Merge.rc:4310 Merge.rc:4669
+#: Merge.rc:4320 Merge.rc:4679
msgid "Message"
msgstr ""
#. IDS_MESSAGEBOX_ANSWER
-#: Merge.rc:4311
+#: Merge.rc:4321
msgid "Answer"
msgstr ""
#. IDS_PROJECT_ITEM
-#: Merge.rc:4317
+#: Merge.rc:4327
msgid "Item"
msgstr ""
#. IDS_PROJECT_LOAD
-#: Merge.rc:4319
+#: Merge.rc:4329
msgid "Load"
msgstr ""
#. IDS_PROJECT_SAVE
-#: Merge.rc:4320
+#: Merge.rc:4330
msgid "Save"
msgstr ""
#. IDS_PROJECT_ITEM_INCLUDE_SUBFOLDERS
-#: Merge.rc:4322
+#: Merge.rc:4332
msgid "Include Subfolders"
msgstr ""
#. IDS_PROJECT_ITEM_COMPARE_OPTIONS
-#: Merge.rc:4324
+#: Merge.rc:4334
msgid "Compare Options"
msgstr ""
#. IDS_PROJECT_ITEM_HIDDEN_ITEMS
-#: Merge.rc:4325
+#: Merge.rc:4335
msgid "Hidden Items"
msgstr ""
#. IDS_PLUGINSLIST_NAME
-#: Merge.rc:4331 Merge.rc:4956
+#: Merge.rc:4341 Merge.rc:4966
#, c-format
msgid "Name"
msgstr "Izena"
#. IDS_FILTERFILE_PATHTITLE
-#: Merge.rc:4332
+#: Merge.rc:4342
#, c-format
msgid "Location"
msgstr "Kokalekua"
#. IDS_FILTER_TITLE
-#: Merge.rc:4333
+#: Merge.rc:4343
#, c-format
msgid "Filters"
msgstr "Iragazkiak"
#. IDS_FILTER_PREFIX
-#: Merge.rc:4334
+#: Merge.rc:4344
#, c-format
msgid "[F] "
msgstr "[F] "
#. IDS_PLUGINSLIST_DESC
-#: Merge.rc:4335 Merge.rc:4958
+#: Merge.rc:4345 Merge.rc:4968
#, c-format
msgid "Description"
msgstr "Azalpena"
#. IDS_FILEFILTER_SAVENEW
-#: Merge.rc:4336
+#: Merge.rc:4346
#, c-format
msgid "Select Filename for New Filter"
msgstr "Hautatu agirizena iragazki berriarentzat"
#. IDS_FILEFILTER_FILEMASK
-#: Merge.rc:4337
+#: Merge.rc:4347
#, c-format
msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||"
msgstr "Agiri Iragazkiak (*.flt)|*.flt|Agiri Denak (*.*)|*.*||"
-#: Merge.rc:4339
+#: Merge.rc:4349
#, c-format
msgid "Cannot find filter template!\n\nCopy %1 to WinMerge/Filters Folder:\n%2."
msgstr "Ezinezkoa iragazki agiri eredua aurkitzea!\n\nMesedez kopiatu agiri hau: %1 WinMerge/Iragazkiak agiritegia:\n%2."
-#: Merge.rc:4341
+#: Merge.rc:4351
#, c-format
msgid ""
"Cannot copy filter template:\n"
@@ -5789,7 +5800,7 @@ msgstr ""
"\n"
"Mesedez zihurtatu zaitez dagoen agiritegia idazgarria dela."
-#: Merge.rc:4343
+#: Merge.rc:4353
#, c-format
msgid ""
"User's filter folder is not defined!\n"
@@ -5800,7 +5811,7 @@ msgstr ""
"\n"
"Mesedez hautatu iragazki agiritegia hemen: Aukerak/Sistema."
-#: Merge.rc:4345
+#: Merge.rc:4355
#, c-format
msgid ""
"Failed to delete filter:\n"
@@ -5814,12 +5825,12 @@ msgstr ""
"Badaiteke irakurtzeko-bakarrik agiria izatea?"
#. IDS_FILEFILTER_INSTALL
-#: Merge.rc:4346
+#: Merge.rc:4356
#, c-format
msgid "Locate Filter File to Install"
msgstr "Aurkitu ezartzeko iragazki agiria"
-#: Merge.rc:4348
+#: Merge.rc:4358
#, c-format
msgid ""
"Installing filter file failed.\n"
@@ -5831,19 +5842,19 @@ msgstr ""
"Ezinezkoa iragazki agiri berria iragazki agiritegira kopiatzea."
#. IDS_FILEFILTER_OVERWRITE
-#: Merge.rc:4349
+#: Merge.rc:4359
#, c-format
msgid "Filter file exists. Overwrite?"
msgstr "Iragazki agiria jadanik badago. Gainidatzi dagoen iragazkia?"
#. IDS_FILTERLINE_REGEXP
-#: Merge.rc:4355
+#: Merge.rc:4365
#, c-format
msgid "Regular expression"
msgstr "Adierazpen arrunta"
#. IDS_FILTERCHANGED
-#: Merge.rc:4361
+#: Merge.rc:4371
msgid "Filters updated. Refresh all open folder compares?\n\nSelect 'No' to refresh later."
msgstr ""
"Iragazkiak eguneratuak izan dira. Nahi duzu irekita dituzun alderaketa agiritegi guztiak berritzea?\n"
@@ -5851,240 +5862,240 @@ msgstr ""
"Ez badituzu nahi alderaketa guztiak orain berritzea hautatu Ez eta berritu alderaketak gero."
#. IDS_DIRECTORY_WINDOW_TITLE
-#: Merge.rc:4367
+#: Merge.rc:4377
#, c-format
msgid "Folder Comparison Results"
msgstr "Agiritegi Alderaketa Emaitzak"
#. IDS_FILE_COMPARISON_TITLE
-#: Merge.rc:4368
+#: Merge.rc:4378
#, c-format
msgid "File Comparison"
msgstr "Agiri Alderaketa"
#. IDS_EMPTY_LEFT_FILE
-#: Merge.rc:4369
+#: Merge.rc:4379
#, c-format
msgid "Untitled Left"
msgstr "Izenburugabeko ezkerra"
#. IDS_EMPTY_MIDDLE_FILE
-#: Merge.rc:4370
+#: Merge.rc:4380
#, c-format
msgid "Untitled Middle"
msgstr ""
#. IDS_EMPTY_RIGHT_FILE
-#: Merge.rc:4371
+#: Merge.rc:4381
#, c-format
msgid "Untitled Right"
msgstr "Izenburugabeko eskuina"
#. IDS_CONFLICT_BASE_FILE
-#: Merge.rc:4372
+#: Merge.rc:4382
msgid "Base File"
msgstr ""
#. IDS_CONFLICT_THEIRS_FILE
-#: Merge.rc:4373
+#: Merge.rc:4383
#, c-format
msgid "Theirs File"
msgstr "Theirs Agiria"
#. IDS_CONFLICT_MINE_FILE
-#: Merge.rc:4374
+#: Merge.rc:4384
#, c-format
msgid "Mine File"
msgstr "Mine Agiria"
#. IDS_SELFCOMPARE_ORIGINAL_FILE
-#: Merge.rc:4375
+#: Merge.rc:4385
msgid "Original File"
msgstr ""
#. IDS_LINE_STATUS_INFO_EOL
-#: Merge.rc:4381
+#: Merge.rc:4391
#, c-format
msgid "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s"
msgstr ""
#. IDS_EMPTY_LINE_STATUS_INFO
-#: Merge.rc:4382
+#: Merge.rc:4392
#, c-format
msgid "Line: %s"
msgstr "Lerroa: %s"
#. IDS_LINE_STATUS_INFO
-#: Merge.rc:4383
+#: Merge.rc:4393
#, c-format
msgid "Ln: %s Col: %d/%d Ch: %d/%d"
msgstr ""
#. IDS_LINE_STATUS_INFO_SEL
-#: Merge.rc:4384
+#: Merge.rc:4394
#, c-format
msgid " Sel: %d | %d"
msgstr ""
#. IDS_MERGEMODE_MERGING
-#: Merge.rc:4385
+#: Merge.rc:4395
#, c-format
msgid "Merge"
msgstr "Batu"
#. IDS_DIFF_NUMBER_STATUS_FMT
-#: Merge.rc:4386
+#: Merge.rc:4396
#, c-format
msgid "Difference %1 of %2"
msgstr "Ezberdintasuna %1 %2-tik"
#. IDS_NO_DIFF_SEL_FMT
-#: Merge.rc:4387
+#: Merge.rc:4397
#, c-format
msgid "%1 Differences Found"
msgstr "%1 Ezberdintasun Aurkiturik"
#. IDS_1_DIFF_FOUND
-#: Merge.rc:4388
+#: Merge.rc:4398
#, c-format
msgid "1 Difference Found"
msgstr "1 Ezberdintasun Aurkituta"
#. IDS_NO_ERR_SEL_FMT
-#: Merge.rc:4389
+#: Merge.rc:4399
#, c-format
msgid "%1 Errors Found"
msgstr ""
#. IDS_1_ERR_FOUND
-#: Merge.rc:4390
+#: Merge.rc:4400
msgid "1 Error Found"
msgstr ""
#. IDS_STATUSBAR_READONLY, Abbreviation from "Read Only"
-#: Merge.rc:4391
+#: Merge.rc:4401
#, c-format
msgid "RO"
msgstr "RO"
#. IDS_DIRVIEW_STATUS_FMT_FOCUS
-#: Merge.rc:4397
+#: Merge.rc:4407
#, c-format
msgid "Item %1 of %2"
msgstr "Gaiak %1 %2-tik"
#. IDS_DIRVIEW_STATUS_FMT_NOFOCUS
-#: Merge.rc:4398
+#: Merge.rc:4408
#, c-format
msgid "Items: %1"
msgstr "Gaiak:%1"
#. IDS_DIRVIEW_STATUS_COMPARING
-#: Merge.rc:4399
+#: Merge.rc:4409
#, c-format
msgid "Comparing items..."
msgstr "Gaiak alderatzen..."
#. IDS_ITEMS_PER_SEC
-#: Merge.rc:4400
+#: Merge.rc:4410
#, c-format
msgid "%.1f[items/sec]"
msgstr ""
#. IDS_ERROR_INCOMPARABLE
-#: Merge.rc:4406
+#: Merge.rc:4416
msgid "Select two existing folders/files to compare."
msgstr "Hautatu badauden bi agiritegi edo agiri alderatzeko."
#. IDS_DIRSEL_TAG
-#: Merge.rc:4407
+#: Merge.rc:4417
#, c-format
msgid "Folder Selection"
msgstr "Agirtegi Hautapena"
#. IDS_OPEN_FILESDIRS
-#: Merge.rc:4408
+#: Merge.rc:4418
#, c-format
msgid "Select two (or three) folders/files to compare."
msgstr ""
#. IDS_OPEN_LEFTINVALID
-#: Merge.rc:4409
+#: Merge.rc:4419
#, c-format
msgid "Left (1st) path is invalid!"
msgstr ""
#. IDS_OPEN_MIDDLEINVALID
-#: Merge.rc:4410
+#: Merge.rc:4420
#, c-format
msgid "Middle (2nd) path is invalid!"
msgstr ""
#. IDS_OPEN_RIGHTINVALID2
-#: Merge.rc:4411
+#: Merge.rc:4421
#, c-format
msgid "Right (2nd) path is invalid!"
msgstr ""
#. IDS_OPEN_RIGHTINVALID3
-#: Merge.rc:4412
+#: Merge.rc:4422
#, c-format
msgid "Right (3rd) path is invalid!"
msgstr ""
#. IDS_OPEN_BOTHINVALID
-#: Merge.rc:4413
+#: Merge.rc:4423
#, c-format
msgid "Both paths are invalid!"
msgstr "Bi helburuak baliogabeak dira!"
-#: Merge.rc:4415
+#: Merge.rc:4425
#, c-format
msgid "Left (1st) and Middle (2nd) paths are invalid!"
msgstr ""
#. IDS_OPEN_LEFTRIGHTINVALID
-#: Merge.rc:4416
+#: Merge.rc:4426
#, c-format
msgid "Left (1st) and Right (3rd) paths are invalid!"
msgstr ""
-#: Merge.rc:4418
+#: Merge.rc:4428
#, c-format
msgid "Middle (2nd) and Right (3rd) paths are invalid!"
msgstr ""
#. IDS_OPEN_ALLINVALID
-#: Merge.rc:4419
+#: Merge.rc:4429
#, c-format
msgid "All paths are invalid!"
msgstr ""
#. IDS_OPEN_UNPACKERDISABLED
-#: Merge.rc:4420
+#: Merge.rc:4430
msgid "Only enabled for file comparisons"
msgstr ""
#. IDS_OPEN_MISMATCH
-#: Merge.rc:4421
+#: Merge.rc:4431
#, c-format
msgid "Cannot compare file and folder!"
msgstr "Ezin dira agiria eta agiritegia alderatu!"
#. IDS_ERROR_FILE_NOT_FOUND
-#: Merge.rc:4427
+#: Merge.rc:4437
#, c-format
msgid "File not found: %1"
msgstr "Agiria ez da aurkitu: %1"
#. IDS_ERROR_FILE_NOT_UNPACKED
-#: Merge.rc:4428
+#: Merge.rc:4438
#, c-format
msgid "File not unpacked: %1"
msgstr "Agiria ez da despaketatu: %1"
#. IDS_ERROR_FILEOPEN
-#: Merge.rc:4429
+#: Merge.rc:4439
#, c-format
msgid ""
"Cannot open file\n"
@@ -6098,13 +6109,13 @@ msgstr ""
"%2"
#. IDS_ERROR_CONF_RESOLVE
-#: Merge.rc:4430
+#: Merge.rc:4440
#, c-format
msgid "Failed to parse conflict file."
msgstr "Hutsegitea gatazka agiria aztertzerakoan."
#. IDS_NOT_CONFLICT_FILE
-#: Merge.rc:4431
+#: Merge.rc:4441
#, c-format
msgid "The file\n%1\nis not a conflict file."
msgstr ""
@@ -6113,35 +6124,35 @@ msgstr ""
"ez da agiri gatazkatsu bat."
#. IDS_COMPARE_LARGE_FILES
-#: Merge.rc:4432
+#: Merge.rc:4442
msgid "Comparing large files requires significant memory.\nShow only comparison results (not file contents)?"
msgstr ""
#. IDS_SAVE_AS_TITLE
-#: Merge.rc:4438
+#: Merge.rc:4448
#, c-format
msgid "Save As"
msgstr "Gorde Honela"
#. IDS_SAVE_FMT
-#: Merge.rc:4439
+#: Merge.rc:4449
#, c-format
msgid "Save changes to %1?"
msgstr "Gorde aldaketak %1-ri?"
#. IDS_SAVEREADONLY_FMT
-#: Merge.rc:4440
+#: Merge.rc:4450
#, c-format
msgid "%1 is read-only. Override? Or 'No' to save as new filename?"
msgstr "%1 markatuta dago irrakurtzeko-bakarrik bezala. Nahi duzu ezabatzea irakurtzeko-bakarrik agiria? (Ez gordetzeko agirizen berri bezala.)"
#. IDS_ERROR_BACKUP
-#: Merge.rc:4441
+#: Merge.rc:4451
#, c-format
msgid "Error backing up file"
msgstr "Akatsa babeskopia agirian"
-#: Merge.rc:4443
+#: Merge.rc:4453
#, c-format
msgid ""
"Unable to backup original file:\n"
@@ -6155,7 +6166,7 @@ msgstr ""
"Jarraitu horrela ere?"
#. IDS_FILESAVE_FAILED
-#: Merge.rc:4444
+#: Merge.rc:4454
#, c-format
msgid "Saving file failed.\n%1\n%2\n\t- Use different filename (OK)\n\t- Abort (Cancel)?"
msgstr ""
@@ -6166,7 +6177,7 @@ msgstr ""
"\t- agirizen ezberdin bat erabiltzea (Sakatu Ongi)\n"
"\t- uneko eragiketa uztea (Sakatu Ezeztatu)?"
-#: Merge.rc:4446
+#: Merge.rc:4456
#, c-format
msgid "Plugin '%2' cannot pack changes to left file into '%1'.\n\nOriginal unchanged. Save unpacked version?"
msgstr ""
@@ -6176,12 +6187,12 @@ msgstr ""
"\n"
"Nahi duzu despaketatutako bertsioa beste agiri batean gordetzea?"
-#: Merge.rc:4448
+#: Merge.rc:4458
#, c-format
msgid "Plugin '%2' cannot pack changes to middle file into '%1'.\n\nOriginal unchanged. Save unpacked version?"
msgstr ""
-#: Merge.rc:4450
+#: Merge.rc:4460
#, c-format
msgid "Plugin '%2' cannot pack changes to right file into '%1'.\n\nOriginal unchanged. Save unpacked version?"
msgstr ""
@@ -6192,7 +6203,7 @@ msgstr ""
"Nahi duzu despaketatutako bertsioa beste agiri batean gordetzea?"
#. IDS_FILECHANGED_ONDISK
-#: Merge.rc:4451
+#: Merge.rc:4461
#, c-format
msgid ""
"Another application updated\n"
@@ -6208,7 +6219,7 @@ msgstr ""
"Gainidatzi aldatutako agiria?"
#. IDS_SAVEREADONLY_MULTI
-#: Merge.rc:4452
+#: Merge.rc:4462
#, c-format
msgid ""
"%1\n"
@@ -6218,7 +6229,7 @@ msgstr ""
"irakurtzeko-bakarrik markatuta dago. Irakurtzeko-bakarrik gaia ezeztatzea nahi duzu?"
#. IDS_FILECHANGED_RESCAN
-#: Merge.rc:4453
+#: Merge.rc:4463
#, c-format
msgid "Another application updated\n%1\nsince last scan.\n\nReload?"
msgstr ""
@@ -6229,25 +6240,25 @@ msgstr ""
"Nahi duzu agiria birgertatzea?"
#. IDS_SAVE_LEFT_AS
-#: Merge.rc:4454
+#: Merge.rc:4464
#, c-format
msgid "Save Left File As"
msgstr "Gorde Ezker Agiria Honela"
#. IDS_SAVE_MIDDLE_AS
-#: Merge.rc:4455
+#: Merge.rc:4465
#, c-format
msgid "Save Middle File As"
msgstr ""
#. IDS_SAVE_RIGHT_AS
-#: Merge.rc:4456
+#: Merge.rc:4466
#, c-format
msgid "Save Right File As"
msgstr "Gorde Eskuineko Agiria Honela"
#. IDS_FILE_DISAPPEARED
-#: Merge.rc:4461
+#: Merge.rc:4471
#, c-format
msgid ""
"File\n"
@@ -6259,7 +6270,7 @@ msgstr ""
"ezagertuta dago. Mesedez gorde agiriaren kopia bat jarraitzeko."
#. IDS_VIEWS_OUTOFSYNC
-#: Merge.rc:4467
+#: Merge.rc:4477
#, c-format
msgid ""
"Cannot merge unsynched documents.\n"
@@ -6271,189 +6282,189 @@ msgstr ""
"Berritu agiriak jarraitu aurretik."
#. IDS_BREAK_ON_WHITESPACE
-#: Merge.rc:4472
+#: Merge.rc:4482
msgid "Break at whitespace"
msgstr "Hautsi zurigunean"
#. IDS_BREAK_ON_PUNCTUATION
-#: Merge.rc:4473
+#: Merge.rc:4483
msgid "Break at whitespace or punctuation"
msgstr "Hautsi zurigunean edo puntuaketan"
#. IDS_L2M
-#: Merge.rc:4479
+#: Merge.rc:4489
msgid "Copy to &Middle\tAlt+Right"
msgstr ""
#. IDS_R2M
-#: Merge.rc:4480
+#: Merge.rc:4490
msgid "Copy to &Middle\tAlt+Left"
msgstr ""
#. IDS_COPY_FROM_MIDDLE_R
-#: Merge.rc:4481
+#: Merge.rc:4491
msgid "Copy from Middle\tAlt+Shift+Right"
msgstr ""
#. IDS_COPY_FROM_MIDDLE_L
-#: Merge.rc:4482
+#: Merge.rc:4492
msgid "Copy from Middle\tAlt+Shift+Left"
msgstr ""
#. IDS_L2MNEXT
-#: Merge.rc:4483
+#: Merge.rc:4493
msgid "Copy to Middle and Advance\tCtrl+Alt+Right"
msgstr ""
#. IDS_R2MNEXT
-#: Merge.rc:4484
+#: Merge.rc:4494
msgid "Copy to Middle and Advance\tCtrl+Alt+Left"
msgstr ""
#. IDS_ALL_MIDDLE
-#: Merge.rc:4485
+#: Merge.rc:4495
msgid "Copy All to Middle"
msgstr ""
#. IDS_COPY_RIGHT_TO_LEFT
-#: Merge.rc:4491
+#: Merge.rc:4501
#, c-format
msgid "Right to Left (%1)"
msgstr "Eskuina Ezkerrera (%1)"
#. IDS_COPY_RIGHT_TO_MIDDLE
-#: Merge.rc:4492
+#: Merge.rc:4502
#, c-format
msgid "Right to Middle (%1)"
msgstr ""
#. IDS_COPY_MIDDLE_TO_LEFT
-#: Merge.rc:4493
+#: Merge.rc:4503
#, c-format
msgid "Middle to Left (%1)"
msgstr ""
#. IDS_COPY_MIDDLE_TO_RIGHT
-#: Merge.rc:4494
+#: Merge.rc:4504
#, c-format
msgid "Middle to Right (%1)"
msgstr ""
#. IDS_COPY_LEFT_TO_RIGHT
-#: Merge.rc:4495
+#: Merge.rc:4505
#, c-format
msgid "Left to Right (%1)"
msgstr "Ezkerra Eskuinera (%1)"
#. IDS_COPY_LEFT_TO_MIDDLE
-#: Merge.rc:4496
+#: Merge.rc:4506
#, c-format
msgid "Left to Middle (%1)"
msgstr ""
#. IDS_MOVE_LEFT_TO
-#: Merge.rc:4507 Merge.rc:4539
+#: Merge.rc:4517 Merge.rc:4549
#, c-format
msgid "Left to... (%1)"
msgstr "Ezkerra hona... (%1)"
#. IDS_MOVE_MIDDLE_TO
-#: Merge.rc:4508 Merge.rc:4540
+#: Merge.rc:4518 Merge.rc:4550
#, c-format
msgid "Middle to... (%1)"
msgstr ""
#. IDS_MOVE_RIGHT_TO
-#: Merge.rc:4509 Merge.rc:4541
+#: Merge.rc:4519 Merge.rc:4551
#, c-format
msgid "Right to... (%1)"
msgstr "Eskuina hona... (%1)"
#. IDS_COPY_BOTH_TO
-#: Merge.rc:4510
+#: Merge.rc:4520
#, c-format
msgid "Both to... (%1)"
msgstr ""
#. IDS_COPY_ALL_TO
-#: Merge.rc:4511
+#: Merge.rc:4521
#, c-format
msgid "All to... (%1)"
msgstr ""
#. IDS_COPY_DIFFERENCES_TO
-#: Merge.rc:4512
+#: Merge.rc:4522
#, c-format
msgid "Differences to... (%1)"
msgstr ""
#. IDS_COPY_ONLYDIFFITEMS
-#: Merge.rc:4519
+#: Merge.rc:4529
msgid "Some selected items are identical or skipped.\nCopy only items with differences?"
msgstr ""
#. IDS_DEL_LEFT_FMT
-#: Merge.rc:4525
+#: Merge.rc:4535
#, c-format
msgid "Left (%1)"
msgstr "Ezkerra (%1)"
#. IDS_DEL_MIDDLE_FMT
-#: Merge.rc:4526
+#: Merge.rc:4536
#, c-format
msgid "Middle (%1)"
msgstr ""
#. IDS_DEL_RIGHT_FMT
-#: Merge.rc:4527
+#: Merge.rc:4537
#, c-format
msgid "Right (%1)"
msgstr "Eskuina (%1)"
#. IDS_DEL_BOTH_FMT
-#: Merge.rc:4528
+#: Merge.rc:4538
#, c-format
msgid "Both (%1)"
msgstr "Biak (%1)"
#. IDS_DEL_ALL_FMT
-#: Merge.rc:4529
+#: Merge.rc:4539
#, c-format
msgid "All (%1)"
msgstr ""
#. IDS_SELECT_DEST_LEFT
-#: Merge.rc:4545
+#: Merge.rc:4555
#, c-format
msgid "Left Side - Select Destination Folder:"
msgstr "Ezkerraldea - hautatu helmuga agiritegia:"
#. IDS_SELECT_DEST_MIDDLE
-#: Merge.rc:4546
+#: Merge.rc:4556
#, c-format
msgid "Middle Side - Select Destination Folder:"
msgstr ""
#. IDS_SELECT_DEST_RIGHT
-#: Merge.rc:4547
+#: Merge.rc:4557
#, c-format
msgid "Right Side - Select Destination Folder:"
msgstr "Eskuinaldea - hautatu helmuga agiritegia:"
#. IDS_FILES_AFFECTED_FMT
-#: Merge.rc:4548
+#: Merge.rc:4558
#, c-format
msgid "(%1 Files Affected)"
msgstr "(%1 Agiri Eraginda)"
#. IDS_FILES_AFFECTED_FMT2
-#: Merge.rc:4549
+#: Merge.rc:4559
#, c-format
msgid "(%1 of %2 Files Affected)"
msgstr "(%1 Agiri %2-tik Eraginda)"
#. IDS_CONFIRM_DELETE_SINGLE
-#: Merge.rc:4555
+#: Merge.rc:4565
#, c-format
msgid ""
"Are you sure you want to delete\n"
@@ -6465,18 +6476,18 @@ msgstr ""
"%1?"
#. IDS_CONFIRM_SINGLE_COPY
-#: Merge.rc:4556
+#: Merge.rc:4566
msgid "Are you sure you want to copy?"
msgstr "Zihur zaude hona kopiatzea nahi duzula?"
#. IDS_CONFIRM_MULTIPLE_COPY
-#: Merge.rc:4557
+#: Merge.rc:4567
#, c-format
msgid "Are you sure you want to copy %d items?"
msgstr "Zihur zaude %d gaiak kopiatzea nahi dituzula?"
#. IDS_DIRCMP_NOTSYNC
-#: Merge.rc:4558
+#: Merge.rc:4568
#, c-format
msgid ""
"Operation aborted!\n"
@@ -6496,878 +6507,878 @@ msgstr ""
"Mesedez berritu alderaketa."
#. IDS_CONFIRM_SINGLE_MOVE
-#: Merge.rc:4563
+#: Merge.rc:4573
msgid "Are you sure you want to move?"
msgstr "Zihur zaude mugitzea nahi duzula?"
#. IDS_CONFIRM_MULTIPLE_MOVE
-#: Merge.rc:4564
+#: Merge.rc:4574
#, c-format
msgid "Are you sure you want to move %d items?"
msgstr "Zihur zaude %d gaiak mugitzea nahi dituzula?"
#. IDS_CONFIRM_MOVE_CAPTION
-#: Merge.rc:4566
+#: Merge.rc:4576
#, c-format
msgid "Confirm Move"
msgstr "Berretsi Mugitzea"
-#: Merge.rc:4568
+#: Merge.rc:4578
#, c-format
msgid "Close the folder comparison window?"
msgstr ""
-#: Merge.rc:4570
+#: Merge.rc:4580
msgid "Close the folder comparison window, which took a long time?"
msgstr ""
#. IDS_ERROR_INVALID_DIR_FILE_NAME
-#: Merge.rc:4571
+#: Merge.rc:4581
msgid "The file or folder name is invalid."
msgstr ""
#. IDS_ERROR_EXECUTE_FILE
-#: Merge.rc:4577
+#: Merge.rc:4587
#, c-format
msgid "Failed to execute external editor: %1"
msgstr "Hutsegitea kanpoko editatzailea ekiterakoan: %1"
#. IDS_UNKNOWN_ARCHIVE_FORMAT
-#: Merge.rc:4583
+#: Merge.rc:4593
#, c-format
msgid "Unknown archive format"
msgstr "Agiri heuskarri ezezaguna"
-#: Merge.rc:4585
+#: Merge.rc:4595
msgid "Failed to extract archive.\nCompare as text file?"
msgstr ""
#. IDS_COLHDR_FILENAME
-#: Merge.rc:4591
+#: Merge.rc:4601
#, c-format
msgid "Filename"
msgstr "Agirizena"
#. IDS_COLHDR_DIR
-#: Merge.rc:4592
+#: Merge.rc:4602
msgctxt "DirView|ColumnHeader"
msgid "Folder"
msgstr "Agiritegia"
#. IDS_COLHDR_RESULT
-#: Merge.rc:4593
+#: Merge.rc:4603
#, c-format
msgid "Comparison Result"
msgstr "Alderaketa emaitza"
#. IDS_COLHDR_LTIMEM
-#: Merge.rc:4594
+#: Merge.rc:4604
#, c-format
msgid "Left Date"
msgstr "Ezker Eguna"
#. IDS_COLHDR_RTIMEM
-#: Merge.rc:4595
+#: Merge.rc:4605
#, c-format
msgid "Right Date"
msgstr "Eskuin Eguna"
#. IDS_COLHDR_MTIMEM
-#: Merge.rc:4596
+#: Merge.rc:4606
#, c-format
msgid "Middle Date"
msgstr ""
#. IDS_COLHDR_LSIZE
-#: Merge.rc:4598
+#: Merge.rc:4608
#, c-format
msgid "Left Size"
msgstr "Ezker Neurria"
#. IDS_COLHDR_RSIZE
-#: Merge.rc:4599
+#: Merge.rc:4609
#, c-format
msgid "Right Size"
msgstr "Eskuin Neurria"
#. IDS_COLHDR_MSIZE
-#: Merge.rc:4604
+#: Merge.rc:4614
#, c-format
msgid "Middle Size"
msgstr ""
#. IDS_COLHDR_RSIZE_SHORT
-#: Merge.rc:4605
+#: Merge.rc:4615
#, c-format
msgid "Right Size (Short)"
msgstr "Eskuin Neurria (Laburra)"
#. IDS_COLHDR_LSIZE_SHORT
-#: Merge.rc:4606
+#: Merge.rc:4616
#, c-format
msgid "Left Size (Short)"
msgstr "Ezker Neurria (Laburra)"
#. IDS_COLHDR_MSIZE_SHORT
-#: Merge.rc:4607
+#: Merge.rc:4617
#, c-format
msgid "Middle Size (Short)"
msgstr ""
#. IDS_COLHDR_LTIMEC
-#: Merge.rc:4613
+#: Merge.rc:4623
#, c-format
msgid "Left Creation Time"
msgstr "Ezkerreko Sortze Denbora"
#. IDS_COLHDR_RTIMEC
-#: Merge.rc:4614
+#: Merge.rc:4624
#, c-format
msgid "Right Creation Time"
msgstr "Eskuineko Sortze Denbora"
#. IDS_COLHDR_MTIMEC
-#: Merge.rc:4615
+#: Merge.rc:4625
#, c-format
msgid "Middle Creation Time"
msgstr ""
#. IDS_COLHDR_NEWER
-#: Merge.rc:4616
+#: Merge.rc:4626
#, c-format
msgid "Newer File"
msgstr "Agiri Berriena"
#. IDS_COLHDR_LVERSION
-#: Merge.rc:4617
+#: Merge.rc:4627
#, c-format
msgid "Left File Version"
msgstr "Ezkerreko Agiri Bertsioa"
#. IDS_COLHDR_RVERSION
-#: Merge.rc:4618
+#: Merge.rc:4628
#, c-format
msgid "Right File Version"
msgstr "Eskuineko Agiri Bertsioa"
#. IDS_COLHDR_MVERSION
-#: Merge.rc:4619
+#: Merge.rc:4629
#, c-format
msgid "Middle File Version"
msgstr ""
#. IDS_COLHDR_RESULT_ABBR
-#: Merge.rc:4620
+#: Merge.rc:4630
#, c-format
msgid "Short Result"
msgstr "Emaitz Laburra"
#. IDS_COLHDR_LATTRIBUTES
-#: Merge.rc:4621
+#: Merge.rc:4631
#, c-format
msgid "Left Attributes"
msgstr "Ezkerraren Ezaugarriak"
#. IDS_COLHDR_RATTRIBUTES
-#: Merge.rc:4622
+#: Merge.rc:4632
#, c-format
msgid "Right Attributes"
msgstr "Eskuinaren Ezaugarriak"
#. IDS_COLHDR_MATTRIBUTES
-#: Merge.rc:4623
+#: Merge.rc:4633
#, c-format
msgid "Middle Attributes"
msgstr ""
#. IDS_COLHDR_LEOL_TYPE
-#: Merge.rc:4628
+#: Merge.rc:4638
#, c-format
msgid "Left EOL"
msgstr "Ezker EOL"
#. IDS_COLHDR_MEOL_TYPE
-#: Merge.rc:4629
+#: Merge.rc:4639
#, c-format
msgid "Middle EOL"
msgstr ""
#. IDS_COLHDR_REOL_TYPE
-#: Merge.rc:4630
+#: Merge.rc:4640
#, c-format
msgid "Right EOL"
msgstr "Eskuin EOL"
#. IDS_COLHDR_LENCODING
-#: Merge.rc:4636
+#: Merge.rc:4646
#, c-format
msgid "Left Encoding"
msgstr "Ezker Kodeaketa"
#. IDS_COLHDR_RENCODING
-#: Merge.rc:4637
+#: Merge.rc:4647
#, c-format
msgid "Right Encoding"
msgstr "Eskuin Kodeaketa"
#. IDS_COLHDR_MENCODING
-#: Merge.rc:4638
+#: Merge.rc:4648
#, c-format
msgid "Middle Encoding"
msgstr ""
#. IDS_COLHDR_NIDIFFS
-#: Merge.rc:4639
+#: Merge.rc:4649
msgid "Ignored Diff"
msgstr "Ezikusitako Ezberd"
#. IDS_COLHDR_BINARY
-#: Merge.rc:4641
+#: Merge.rc:4651
msgctxt "DirView|ColumnHeader"
msgid "Binary"
msgstr "Binarioa"
#. IDS_PLUGINS_TYPE_UNPACKER
-#: Merge.rc:4642 Merge.rc:4959
+#: Merge.rc:4652 Merge.rc:4969
#, c-format
msgid "Unpacker"
msgstr "Despaketatzailea"
#. IDS_PLUGIN_TYPE4
-#: Merge.rc:4643 Merge.rc:4960 Merge.rc:5267
+#: Merge.rc:4653 Merge.rc:4970 Merge.rc:5277
#, c-format
msgid "Prediffer"
msgstr "Aurrezberd"
#. IDS_COLHDR_LEFT
-#: Merge.rc:4644
+#: Merge.rc:4654
msgid "Left"
msgstr ""
#. IDS_COLHDR_MIDDLE
-#: Merge.rc:4645
+#: Merge.rc:4655
msgid "Middle"
msgstr ""
#. IDS_COLHDR_RIGHT
-#: Merge.rc:4646
+#: Merge.rc:4656
msgid "Right"
msgstr ""
#. IDS_COLHDR_DIFF
-#: Merge.rc:4647
+#: Merge.rc:4657
msgid "Diff"
msgstr ""
#. IDS_COLHDR_LEFT_DUPLICATE
-#: Merge.rc:4648
+#: Merge.rc:4658
msgid "Left Duplicate Count"
msgstr ""
#. IDS_COLHDR_RIGHT_DUPLICATE
-#: Merge.rc:4649
+#: Merge.rc:4659
msgid "Right Duplicate Count"
msgstr ""
#. IDS_COLHDR_MIDDLE_DUPLICATE
-#: Merge.rc:4650
+#: Merge.rc:4660
msgid "Middle Duplicate Count"
msgstr ""
#. IDS_COLHDR_MOVE
-#: Merge.rc:4651
+#: Merge.rc:4661
msgid "Move"
msgstr ""
#. IDS_PRPCAT_AUDIO
-#: Merge.rc:4658
+#: Merge.rc:4668
msgid "Audio"
msgstr ""
#. IDS_PRPCAT_CALENDAR
-#: Merge.rc:4659
+#: Merge.rc:4669
msgid "Calendar"
msgstr ""
#. IDS_PRPCAT_COMMUNICATION
-#: Merge.rc:4660
+#: Merge.rc:4670
msgid "Communication"
msgstr ""
#. IDS_PRPCAT_CONTACT
-#: Merge.rc:4661
+#: Merge.rc:4671
msgid "Contact"
msgstr ""
#. IDS_PRPCAT_DEVICES
-#: Merge.rc:4662
+#: Merge.rc:4672
msgid "Devices"
msgstr ""
#. IDS_PRPCAT_DOCUMENT
-#: Merge.rc:4663
+#: Merge.rc:4673
msgid "Document"
msgstr ""
#. IDS_PRPCAT_HOME
-#: Merge.rc:4664
+#: Merge.rc:4674
msgid "Home"
msgstr ""
#. IDS_PRPCAT_JOURNAL
-#: Merge.rc:4666
+#: Merge.rc:4676
msgid "Journal"
msgstr ""
#. IDS_PRPCAT_LINK
-#: Merge.rc:4667
+#: Merge.rc:4677
msgid "Link"
msgstr ""
#. IDS_PRPCAT_MEDIA
-#: Merge.rc:4668
+#: Merge.rc:4678
msgid "Media"
msgstr ""
#. IDS_PRPCAT_MUSIC
-#: Merge.rc:4670
+#: Merge.rc:4680
msgid "Music"
msgstr ""
#. IDS_PRPCAT_NOTE
-#: Merge.rc:4671
+#: Merge.rc:4681
msgid "Note"
msgstr ""
#. IDS_PRPCAT_PHOTO
-#: Merge.rc:4672
+#: Merge.rc:4682
msgid "Photo"
msgstr ""
#. IDS_PRPCAT_RECORDEDTV
-#: Merge.rc:4673
+#: Merge.rc:4683
msgid "RecordedTV"
msgstr ""
#. IDS_PRPCAT_SEARCH
-#: Merge.rc:4674
+#: Merge.rc:4684
msgid "Search"
msgstr ""
#. IDS_PRPCAT_SECURITY
-#: Merge.rc:4675
+#: Merge.rc:4685
msgid "Security"
msgstr ""
#. IDS_PRPCAT_SOFTWARE
-#: Merge.rc:4676
+#: Merge.rc:4686
msgid "Software"
msgstr ""
#. IDS_PRPCAT_TASK
-#: Merge.rc:4677
+#: Merge.rc:4687
msgid "Task"
msgstr ""
#. IDS_PRPCAT_VIDEO
-#: Merge.rc:4678
+#: Merge.rc:4688
msgid "Video"
msgstr ""
#. IDS_PRPCAT_HASH
-#: Merge.rc:4679
+#: Merge.rc:4689
msgid "Hash"
msgstr ""
#. IDS_CANT_COMPARE_FILES
-#: Merge.rc:4685
+#: Merge.rc:4695
#, c-format
msgid "Unable to compare files"
msgstr "Ezinezkoa agiriak alderatzea"
#. IDS_ABORTED_ITEM
-#: Merge.rc:4686
+#: Merge.rc:4696
#, c-format
msgid "Item aborted"
msgstr "Gaia utzita"
#. IDS_FILE_SKIPPED
-#: Merge.rc:4687
+#: Merge.rc:4697
#, c-format
msgid "File skipped"
msgstr "Agiria Jauzita"
#. IDS_DIR_SKIPPED
-#: Merge.rc:4688
+#: Merge.rc:4698
#, c-format
msgid "Folder skipped"
msgstr "Agiritegia jauzita"
#. IDS_LEFT_ONLY_IN_FMT
-#: Merge.rc:4689
+#: Merge.rc:4699
#, c-format
msgid "Left only: %1"
msgstr "Ezkerra bakarrik: %1"
#. IDS_MIDDLE_ONLY_IN_FMT
-#: Merge.rc:4690
+#: Merge.rc:4700
#, c-format
msgid "Middle only: %1"
msgstr ""
#. IDS_RIGHT_ONLY_IN_FMT
-#: Merge.rc:4691
+#: Merge.rc:4701
#, c-format
msgid "Right only: %1"
msgstr "Eskuina bakarrik: %1"
#. IDS_DOES_NOT_EXIST_IN_FMT
-#: Merge.rc:4692
+#: Merge.rc:4702
#, c-format
msgid "Does not exist in %1"
msgstr ""
#. IDS_BIN_FILES_SAME
-#: Merge.rc:4693
+#: Merge.rc:4703
#, c-format
msgid "Binary files are identical"
msgstr "Agiri binarioak berdinak dira"
#. IDS_BIN_FILES_DIFF
-#: Merge.rc:4699
+#: Merge.rc:4709
#, c-format
msgid "Binary files are different"
msgstr "Agiri binarioak ezberdinak dira"
#. IDS_FILES_ARE_DIFFERENT
-#: Merge.rc:4700
+#: Merge.rc:4710
#, c-format
msgid "Files are different"
msgstr "Agiriak ezberdinak dira"
#. IDS_FOLDERS_ARE_DIFFERENT
-#: Merge.rc:4701
+#: Merge.rc:4711
#, c-format
msgid "Folders are different"
msgstr "Agiritegiak ezberdinak dira"
#. IDS_LEFTONLY
-#: Merge.rc:4702
+#: Merge.rc:4712
#, c-format
msgid "Left Only"
msgstr "Ezkerra Bakarrik"
#. IDS_RIGHTONLY
-#: Merge.rc:4703
+#: Merge.rc:4713
#, c-format
msgid "Right Only"
msgstr "Eskuina Bakarrik"
#. IDS_MIDDLEONLY
-#: Merge.rc:4704
+#: Merge.rc:4714
#, c-format
msgid "Middle Only"
msgstr ""
#. IDS_NOITEMLEFT
-#: Merge.rc:4705
+#: Merge.rc:4715
#, c-format
msgid "No item in left"
msgstr ""
#. IDS_NOITEMRIGHT
-#: Merge.rc:4706
+#: Merge.rc:4716
#, c-format
msgid "No item in right"
msgstr ""
#. IDS_NOITEMMIDDLE
-#: Merge.rc:4707
+#: Merge.rc:4717
#, c-format
msgid "No item in middle"
msgstr ""
#. IDS_CMPRES_ERROR
-#: Merge.rc:4709
+#: Merge.rc:4719
#, c-format
msgid "Error"
msgstr "Akatsa"
#. IDS_TEXT_FILES_SAME
-#: Merge.rc:4710
+#: Merge.rc:4720
#, c-format
msgid "Text files are identical"
msgstr "Idazki agiriak berdinak dira"
#. IDS_LEFTONLY_DIFF
-#: Merge.rc:4711
+#: Merge.rc:4721
msgid " (Middle and right are identical)"
msgstr ""
#. IDS_MIDDLEONLY_DIFF
-#: Merge.rc:4712
+#: Merge.rc:4722
msgid " (Left and right are identical)"
msgstr ""
#. IDS_RIGHTONLY_DIFF
-#: Merge.rc:4713
+#: Merge.rc:4723
msgid " (Left and middle are identical)"
msgstr ""
#. IDS_PATH_MISMATCH
-#: Merge.rc:4714
+#: Merge.rc:4724
msgid " (paths differ)"
msgstr ""
#. IDS_TEXT_FILES_DIFF
-#: Merge.rc:4715
+#: Merge.rc:4725
#, c-format
msgid "Text files are different"
msgstr "Idazki agiriak ezberdinak dira"
#. IDS_IMAGE_FILES_SAME
-#: Merge.rc:4716
+#: Merge.rc:4726
msgid "Image files are identical"
msgstr ""
#. IDS_IMAGE_FILES_DIFF
-#: Merge.rc:4717
+#: Merge.rc:4727
msgid "Image files are different"
msgstr ""
#. IDS_EXPR_DIFF
-#: Merge.rc:4718
+#: Merge.rc:4728
#, c-format
msgid "Files are different (expr: %1)"
msgstr ""
#. IDS_HASH_GROUP
-#: Merge.rc:4719
+#: Merge.rc:4729
#, c-format
msgid "Group%d"
msgstr ""
#. IDS_RENAME_MOVE_DETECTION_DISALBED
-#: Merge.rc:4720
+#: Merge.rc:4730
msgctxt "Options dialog|Compare|Folder|Detect renames and moves"
msgid "Disabled"
msgstr ""
#. IDS_RENAME_MOVE_DETECTION_RENAME
-#: Merge.rc:4721
+#: Merge.rc:4731
msgid "Detect renames"
msgstr ""
#. IDS_RENAME_MOVE_DETECTION_RENAME_MOVE
-#: Merge.rc:4722
+#: Merge.rc:4732
msgid "Detect renames and moves"
msgstr ""
#. IDS_RENAME_MOVE_MERGE_MODE_RENAME
-#: Merge.rc:4723
+#: Merge.rc:4733
msgid "Merge renames"
msgstr ""
#. IDS_RENAME_MOVE_MERGE_MODE_RENAME_MOVE
-#: Merge.rc:4724
+#: Merge.rc:4734
msgid "Merge renames and moves"
msgstr ""
#. IDS_RENAMED
-#: Merge.rc:4725
+#: Merge.rc:4735
msgid "Renamed"
msgstr ""
#. IDS_MOVED
-#: Merge.rc:4726
+#: Merge.rc:4736
msgid "Moved"
msgstr ""
#. IDS_RENAMED_MOVED
-#: Merge.rc:4727
+#: Merge.rc:4737
msgid "Renamed/Moved"
msgstr ""
#. IDS_RENAMED_MOVED_ITEMS
-#: Merge.rc:4728
+#: Merge.rc:4738
#, c-format
msgid "(%1 items)"
msgstr ""
#. IDS_RENAMED_MOVED_RESULT
-#: Merge.rc:4729
+#: Merge.rc:4739
#, c-format
msgid "%1 (set %2): "
msgstr ""
#. IDS_SWITCH_FLAT_MODE
-#: Merge.rc:4730
+#: Merge.rc:4740
msgid "Some moved items have been merged.\nIn Tree Mode, these items may appear in positions that do not reflect the actual folder structure, which can be confusing.\nSwitch to Flat Mode?"
msgstr ""
#. IDS_ELAPSED_TIME
-#: Merge.rc:4736
+#: Merge.rc:4746
#, c-format
msgid "Elapsed time: %ld ms"
msgstr "Igarotako denbora: %ld sm"
#. IDS_STATUS_SELITEM1
-#: Merge.rc:4737
+#: Merge.rc:4747
#, c-format
msgid "1 item selected"
msgstr "1 gai hautatuta"
#. IDS_STATUS_SELITEMS
-#: Merge.rc:4738
+#: Merge.rc:4748
#, c-format
msgid "%1 items selected"
msgstr "%1 gai hautatuta"
#. IDS_COLDESC_FILENAME
-#: Merge.rc:4744
+#: Merge.rc:4754
#, c-format
msgid "Filename or folder name."
msgstr "Agirizena edo agiritegi izena"
#. IDS_COLDESC_DIR
-#: Merge.rc:4745
+#: Merge.rc:4755
#, c-format
msgid "Subfolder name when subfolders are included."
msgstr "Azpiagiritegi izena azpiagiritegiak barne direnean."
#. IDS_COLDESC_RESULT
-#: Merge.rc:4746
+#: Merge.rc:4756
#, c-format
msgid "Comparison result, long form."
msgstr "Alderaketa emaitza, modu luzean."
#. IDS_COLDESC_LTIMEM
-#: Merge.rc:4751
+#: Merge.rc:4761
#, c-format
msgid "Left side modification date."
msgstr "Ezkerralde aldaketa eguna."
#. IDS_COLDESC_RTIMEM
-#: Merge.rc:4752
+#: Merge.rc:4762
#, c-format
msgid "Right side modification date."
msgstr "Eskuinalde aldaketa eguna."
#. IDS_COLDESC_MTIMEM
-#: Merge.rc:4753
+#: Merge.rc:4763
#, c-format
msgid "Middle side modification date."
msgstr ""
#. IDS_COLDESC_EXTENSION
-#: Merge.rc:4754
+#: Merge.rc:4764
#, c-format
msgid "File's extension."
msgstr "Agiriaren luzapena."
#. IDS_COLDESC_LSIZE
-#: Merge.rc:4755
+#: Merge.rc:4765
#, c-format
msgid "Left file size in bytes."
msgstr "Ezkerreko agiriaren neurria byte-tan"
#. IDS_COLDESC_RSIZE
-#: Merge.rc:4756
+#: Merge.rc:4766
#, c-format
msgid "Right file size in bytes."
msgstr "Eskuineko agiriaren neurria byte-tan"
#. IDS_COLDESC_MSIZE
-#: Merge.rc:4757
+#: Merge.rc:4767
#, c-format
msgid "Middle file size in bytes."
msgstr ""
#. IDS_COLDESC_LSIZE_SHORT
-#: Merge.rc:4758
+#: Merge.rc:4768
#, c-format
msgid "Left file size abbreviated."
msgstr "Ezkerreko agiri neurria laburtuta."
#. IDS_COLDESC_RSIZE_SHORT
-#: Merge.rc:4759
+#: Merge.rc:4769
#, c-format
msgid "Right file size abbreviated."
msgstr "Eskuineko agiri neurria laburtuta."
#. IDS_COLDESC_MSIZE_SHORT
-#: Merge.rc:4760
+#: Merge.rc:4770
#, c-format
msgid "Middle file size abbreviated."
msgstr ""
#. IDS_COLDESC_LTIMEC
-#: Merge.rc:4766
+#: Merge.rc:4776
#, c-format
msgid "Left side creation time."
msgstr "Ezkerraldearen sortze denbora."
#. IDS_COLDESC_RTIMEC
-#: Merge.rc:4767
+#: Merge.rc:4777
#, c-format
msgid "Right side creation time."
msgstr "Eskuinaldearen sortze denbora."
#. IDS_COLDESC_MTIMEC
-#: Merge.rc:4768
+#: Merge.rc:4778
#, c-format
msgid "Middle side creation time."
msgstr ""
#. IDS_COLDESC_NEWER
-#: Merge.rc:4769
+#: Merge.rc:4779
#, c-format
msgid "Tells which side has newer modification date."
msgstr "Esaten du zein aldek duen aldaketa egun berriagoa."
#. IDS_COLDESC_LVERSION
-#: Merge.rc:4770
+#: Merge.rc:4780
msgid "Left side file version, only for some file types."
msgstr "Ezkerraldeko agiri bertsioa, agiri-mota batzuentzat bakarrik."
#. IDS_COLDESC_RVERSION
-#: Merge.rc:4771
+#: Merge.rc:4781
msgid "Right side file version, only for some file types."
msgstr "Eskuinaldeko agiri bertsioa, agiri-mota batzuentzat bakarrik."
#. IDS_COLDESC_MVERSION
-#: Merge.rc:4776
+#: Merge.rc:4786
msgid "Middle side file version, only for some file types."
msgstr ""
#. IDS_COLDESC_RESULT_ABBR
-#: Merge.rc:4777
+#: Merge.rc:4787
#, c-format
msgid "Short comparison result."
msgstr "Alderaketa laburraren emaitza."
#. IDS_COLDESC_LATTRIBUTES
-#: Merge.rc:4778
+#: Merge.rc:4788
#, c-format
msgid "Left side attributes."
msgstr "Ezkerraldearen ezaugarriak."
#. IDS_COLDESC_RATTRIBUTES
-#: Merge.rc:4779
+#: Merge.rc:4789
#, c-format
msgid "Right side attributes."
msgstr "Eskuinaldearen ezaugarriak."
#. IDS_COLDESC_MATTRIBUTES
-#: Merge.rc:4780
+#: Merge.rc:4790
#, c-format
msgid "Middle side attributes."
msgstr ""
#. IDS_COLDESC_LEOL_TYPE
-#: Merge.rc:4781
+#: Merge.rc:4791
msgid "Left side file EOL type."
msgstr "Ezkerraldeko agiria EOL motakoa da."
#. IDS_COLDESC_REOL_TYPE
-#: Merge.rc:4782
+#: Merge.rc:4792
msgid "Right side file EOL type."
msgstr "Eskuinaldeko agiria EOL motakoa da."
#. IDS_COLDESC_MEOL_TYPE
-#: Merge.rc:4783
+#: Merge.rc:4793
msgid "Middle side file EOL type."
msgstr ""
#. IDS_COLDESC_LENCODING
-#: Merge.rc:4789
+#: Merge.rc:4799
#, c-format
msgid "Left side encoding."
msgstr "Eskuinalde kodeaketa."
#. IDS_COLDESC_RENCODING
-#: Merge.rc:4790
+#: Merge.rc:4800
#, c-format
msgid "Right side encoding."
msgstr "Ezkerralde kodeaketa."
#. IDS_COLDESC_MENCODING
-#: Merge.rc:4791
+#: Merge.rc:4801
#, c-format
msgid "Middle side encoding."
msgstr ""
#. IDS_COLDESC_NIDIFFS
-#: Merge.rc:4792
+#: Merge.rc:4802
#, c-format
msgid "Number of ignored differences in file. Ignored and cannot be merged."
msgstr "Agirian ezikusitako ezberdintasun zenbatekoa. Ezberdintasun hauek WinMergek ezikusi ditu eta ezin dira batu."
#. IDS_COLDESC_NSDIFFS
-#: Merge.rc:4793
+#: Merge.rc:4803
#, c-format
msgid "Number of differences in file (excluding ignored)."
msgstr "Agirian dauden ezberdintasun zenbatekoa. Zenbateko honek ez ditu barnebiltzen ezikusitako ezberdintasunak."
#. IDS_COLDESC_BINARY
-#: Merge.rc:4794
+#: Merge.rc:4804
#, c-format
msgid "Shows an asterisk (*) if the file is binary."
msgstr "Erakutsi asteriskoa (*) agiria binarioa bada."
#. IDS_COLDESC_UNPACKER
-#: Merge.rc:4795
+#: Merge.rc:4805
msgid "Unpacker plugin name or pipeline."
msgstr ""
#. IDS_COLDESC_PREDIFFER
-#: Merge.rc:4796
+#: Merge.rc:4806
msgid "Prediffer plugin name or pipeline."
msgstr ""
#. IDS_DIRECTORY_REPORT_TITLE
-#: Merge.rc:4802
+#: Merge.rc:4812
#, c-format
msgid "Compare %1 with %2"
msgstr "Alderatu %1 %2-rekin"
#. IDS_DIRECTORY_REPORT_TITLE3
-#: Merge.rc:4803
+#: Merge.rc:4813
#, c-format
msgid "Compare %1 with %2 and %3"
msgstr ""
#. IDS_REPORT_COMMALIST
-#: Merge.rc:4804
+#: Merge.rc:4814
#, c-format
msgid "Comma-separated list"
msgstr "Kakotxaz banandutako zerrenda"
#. IDS_REPORT_TABLIST
-#: Merge.rc:4805
+#: Merge.rc:4815
#, c-format
msgid "Tab-separated list"
msgstr "Fitxaz banandutako zerrenda"
#. IDS_REPORT_SIMPLEHTML
-#: Merge.rc:4806
+#: Merge.rc:4816
#, c-format
msgid "Simple HTML"
msgstr "HTML Arrunta"
#. IDS_REPORT_SIMPLEXML
-#: Merge.rc:4807
+#: Merge.rc:4817
#, c-format
msgid "Simple XML"
msgstr "XML Arrunta"
-#: Merge.rc:4809
+#: Merge.rc:4819
#, c-format
msgid "Report file already exists. Overwrite?"
msgstr "Jakinarazpen agiria jadanik badago. Dagoen agiria gainidaztea nahi duzu?"
#. IDS_REPORT_ERROR
-#: Merge.rc:4814
+#: Merge.rc:4824
#, c-format
msgid ""
"Error creating the report:\n"
@@ -7377,62 +7388,62 @@ msgstr ""
"%1"
#. IDS_REPORT_SUCCESS
-#: Merge.rc:4815
+#: Merge.rc:4825
#, c-format
msgid "Report created successfully."
msgstr "Jakinarazpena ongi sortu da."
#. IDS_SYNCPOINT_LASTBLOCK
-#: Merge.rc:4821
+#: Merge.rc:4831
msgid "Cannot add a synchronization point at this line."
msgstr ""
#. IDS_FILE_TO_ITSELF
-#: Merge.rc:4827
+#: Merge.rc:4837
#, c-format
msgid "Same file is opened in both panes."
msgstr "Agiri berdina dago irekita bi paneletan."
#. IDS_FILESSAME
-#: Merge.rc:4828
+#: Merge.rc:4838
#, c-format
msgid "Selected files are identical."
msgstr "Hautatutako agiriak berdinak dira."
#. IDS_FILESSAME_CURCFG
-#: Merge.rc:4829
+#: Merge.rc:4839
msgid "Selected files are identical (with current settings).\r\nChecking binary identity..."
msgstr ""
#. IDS_FILESSAME_BINERROR
-#: Merge.rc:4830
+#: Merge.rc:4840
msgid "Selected files are identical (with current settings).\r\nBut binary comparison failed."
msgstr ""
#. IDS_FILESSAME_BINSAME
-#: Merge.rc:4831
+#: Merge.rc:4841
msgid "Selected files are identical (binary match)."
msgstr ""
#. IDS_FILESSAME_BINDIFF
-#: Merge.rc:4832
+#: Merge.rc:4842
msgid "Selected files are identical (with current settings).\r\nBut differ at the binary level."
msgstr ""
#. IDS_FILEERROR
-#: Merge.rc:4833
+#: Merge.rc:4843
#, c-format
msgid "An error occurred while comparing files."
msgstr "Akats bat gertatu da agiriak alderatzerakoan."
#. IDS_TEMP_FILEERROR
-#: Merge.rc:4834
+#: Merge.rc:4844
#, c-format
msgid "Could not create temporary files. Check your temporary path settings."
msgstr "Aldibaterako agiriak ezin izan dira sortu. Egiaztatu zure aldibaterako helburu ezarpenak."
#. IDS_SUGGEST_IGNOREEOL
-#: Merge.rc:4835
+#: Merge.rc:4845
msgid "Files use different EOL.\n\nTreat all EOL as equivalent?\n\nSet 'Ignore EOL differences (Windows/Unix/Mac)' in Compare section of Options."
msgstr ""
"Agiri hauek gurdi itzulera mota ezberdinak erabiltzen dituzte.\n"
@@ -7442,19 +7453,19 @@ msgstr ""
"Oharra: Gurdi itzulera mota guztiak berdin bezala tratatzea nahi badituzu, ezarri 'Ezikusi gurdi itzulera ezberdintasunak (Windows/Unix/Mac)' aukera Alderaketa fitxan aukeren elkarrizketan (eskuragarri hemen: Editatu/Aukerak)."
#. IDS_INVALID_DIRECTORY
-#: Merge.rc:4836
+#: Merge.rc:4846
#, c-format
msgid "Selected folder is invalid."
msgstr "Hautatutako agiritegia ez da baliogarria"
#. IDS_CANNOT_OPEN_BINARYFILE
-#: Merge.rc:4837
+#: Merge.rc:4847
#, c-format
msgid "Cannot open a binary file in Editor."
msgstr "Ezinenezkoa agiri binarioa editatzailera irekitzea"
#. IDS_CREATE_PAIR_FOLDER
-#: Merge.rc:4838
+#: Merge.rc:4848
#, c-format
msgid "Create matching folder:\n%1\non the other side and open?"
msgstr ""
@@ -7465,45 +7476,45 @@ msgstr ""
"beste aldean eta agiritegi hauek irekitzea?"
#. IDS_CONFIRM_COPY_ALL_DIFFS
-#: Merge.rc:4839
+#: Merge.rc:4849
msgid "Copy all differences to other file?"
msgstr ""
#. IDS_MOVE_TO_NEXTFILE
-#: Merge.rc:4844
+#: Merge.rc:4854
#, c-format
msgid "Move to next file?"
msgstr ""
#. IDS_MOVE_TO_PREVFILE
-#: Merge.rc:4845
+#: Merge.rc:4855
#, c-format
msgid "Move to previous file?"
msgstr ""
#. IDS_MOVE_TO_NEXTPAGE
-#: Merge.rc:4846
+#: Merge.rc:4856
#, c-format
msgid "Move to next page?"
msgstr ""
#. IDS_MOVE_TO_PREVPAGE
-#: Merge.rc:4847
+#: Merge.rc:4857
#, c-format
msgid "Move to previous page?"
msgstr ""
#. IDS_MOVE_TO_FIRSTFILE
-#: Merge.rc:4848
+#: Merge.rc:4858
msgid "Move to first file?"
msgstr ""
#. IDS_MOVE_TO_LASTFILE
-#: Merge.rc:4849
+#: Merge.rc:4859
msgid "Move to last file?"
msgstr ""
-#: Merge.rc:4856
+#: Merge.rc:4866
#, c-format
msgid "Different codepages: left (cp%d), right (cp%d).\nDisplay in codepage (better display) or default Windows codepage (safer merging)?\n(Recommended: default Windows codepage)"
msgstr ""
@@ -7511,163 +7522,163 @@ 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:4858
+#: Merge.rc:4868
#, c-format
msgid "Information lost due to encoding errors: both files"
msgstr "Informazioa galduta kodeaketa akatsengaitik: bi agirietan"
-#: Merge.rc:4860
+#: Merge.rc:4870
#, c-format
msgid "Information lost due to encoding errors: first file"
msgstr ""
-#: Merge.rc:4862
+#: Merge.rc:4872
#, c-format
msgid "Information lost due to encoding errors: second file"
msgstr ""
-#: Merge.rc:4864
+#: Merge.rc:4874
#, c-format
msgid "Information lost due to encoding errors: third file"
msgstr ""
#. IDS_LINEDIFF_NODIFF
-#: Merge.rc:4870
+#: Merge.rc:4880
#, c-format
msgid "No difference"
msgstr "Ezberdintasunik ez"
#. IDS_LINEDIFF_NODIFF_CAPTION
-#: Merge.rc:4871
+#: Merge.rc:4881
#, c-format
msgid "Line difference"
msgstr "Lerro ezberdintasuna"
#. IDS_NUM_REPLACED
-#: Merge.rc:4877
+#: Merge.rc:4887
#, c-format
msgid "Replaced %1 string(s)."
msgstr "Ordeztuta %1 kate."
#. IDS_EDIT_TEXT_NOT_FOUND
-#: Merge.rc:4878
+#: Merge.rc:4888
#, c-format
msgid "Cannot find string \"%s\"."
msgstr "Ezin da kate hau aurkitu: \"%s\"."
#. IDS_MERGE_MODE
-#: Merge.rc:4884
+#: Merge.rc:4894
msgid "Entering Merge Mode. Press F9 to turn off."
msgstr ""
#. IDS_AUTO_MERGE
-#: Merge.rc:4890
+#: Merge.rc:4900
#, c-format
msgid "Automatic merges: %1\nUnresolved conflicts: %2"
msgstr ""
#. IDS_CODEPAGE_MERGED
-#: Merge.rc:4891
+#: Merge.rc:4901
msgid "Codepage change merged."
msgstr ""
#. IDS_CODEPAGE_CONFLICT
-#: Merge.rc:4892
+#: Merge.rc:4902
msgid "Codepage changes are conflicting."
msgstr ""
#. IDS_EOL_MERGED
-#: Merge.rc:4893
+#: Merge.rc:4903
msgid "EOL change merged."
msgstr ""
#. IDS_EOL_CONFLICT
-#: Merge.rc:4894
+#: Merge.rc:4904
msgid "EOL changes are conflicting."
msgstr ""
#. IDS_LOCBAR_CAPTION
-#: Merge.rc:4900
+#: Merge.rc:4910
#, c-format
msgid "Location Pane"
msgstr "Kokaleku Panela"
#. IDS_DIFFBAR_CAPTION
-#: Merge.rc:4901
+#: Merge.rc:4911
#, c-format
msgid "Diff Pane"
msgstr "Ezberdint. Panela"
#. IDS_DIFF_SUCCEEDED
-#: Merge.rc:4908
+#: Merge.rc:4918
#, c-format
msgid "Patch file written."
msgstr "Eranskina agiria ongi idatzi da."
#. IDS_DIFF_ITEM1NOTFOUND
-#: Merge.rc:4909
+#: Merge.rc:4919
msgid "First item not found!"
msgstr ""
#. IDS_DIFF_ITEM2NOTFOUND
-#: Merge.rc:4910
+#: Merge.rc:4920
msgid "Second item not found!"
msgstr ""
#. IDS_DIFF_FILEOVERWRITE
-#: Merge.rc:4911
+#: Merge.rc:4921
#, c-format
msgid "Patch file already exists. Overwrite?"
msgstr "Eranskin agiria jadanik badago. Gainidaztea nahi duzu?"
#. IDS_DIFF_SELECTEDFILES
-#: Merge.rc:4912
+#: Merge.rc:4922
#, c-format
msgid "[%1 files selected]"
msgstr "[%1 agiri hautatuta]"
#. IDS_DIFF_NORMAL
-#: Merge.rc:4913
+#: Merge.rc:4923
#, c-format
msgid "Normal"
msgstr "Normala"
#. IDS_DIFF_CONTEXT
-#: Merge.rc:4914
+#: Merge.rc:4924
#, c-format
msgid "Context"
msgstr "Hitzingurua"
#. IDS_DIFF_UNIFIED
-#: Merge.rc:4915
+#: Merge.rc:4925
#, c-format
msgid "Unified"
msgstr "Bateratuta"
#. IDS_FILEWRITE_ERROR
-#: Merge.rc:4917
+#: Merge.rc:4927
#, c-format
msgid "Could not write to file %1."
msgstr "Ezin da %1 agirira idatzi."
#. IDS_PATH_NOT_ABSOLUTE
-#: Merge.rc:4918
+#: Merge.rc:4928
#, c-format
msgid "Output path is not absolute: %1"
msgstr "Adierazitako irteera helburua ez helburu osoa: %1"
#. IDS_MUST_SPECIFY_OUTPUT
-#: Merge.rc:4919
+#: Merge.rc:4929
msgid "Specify an output file."
msgstr "Adierazi irteera agiri bat."
-#: Merge.rc:4921
+#: Merge.rc:4931
#, c-format
msgid "Cannot create patch from binary files."
msgstr "Ezin da eranski agiria sortu agiri binarioetatik."
#. IDS_SAVEFILES_FORPATCH
-#: Merge.rc:4922
+#: Merge.rc:4932
#, c-format
msgid ""
"Save all files first.\n"
@@ -7679,13 +7690,13 @@ msgstr ""
"Eranskina sortzeak agirietan gordegabeko aldaketarik ez egotea eskatzen du."
#. IDS_FOLDER_NOTEXIST
-#: Merge.rc:4923
+#: Merge.rc:4933
#, c-format
msgid "Folder does not exist."
msgstr "Agiritegia ez dago."
#. IDS_NO_ZIP_SUPPORT
-#: Merge.rc:4928
+#: Merge.rc:4938
msgid "Archive support not enabled.\n7-Zip and/or Merge7z*.dll not found.\nSee manual for archive support."
msgstr ""
"Agiri sostengua ez dago gaituta\n"
@@ -7693,43 +7704,43 @@ msgstr ""
"Ikusi eskuliburua argibide gehigorako agiri sostenguari buruz eta nola gaitzeaz."
#. IDS_OPT_EXPORT_CAPTION
-#: Merge.rc:4929
+#: Merge.rc:4939
#, c-format
msgid "Select file for export"
msgstr "Hautatu esportatzeko agiria"
#. IDS_OPT_IMPORT_CAPTION
-#: Merge.rc:4930
+#: Merge.rc:4940
#, c-format
msgid "Select file for import"
msgstr "Hautatu inportatzeko agiria"
#. IDS_OPT_IMPORT_DONE
-#: Merge.rc:4931
+#: Merge.rc:4941
#, c-format
msgid "Options imported from file."
msgstr "Agiritik inportatutako aukerak"
#. IDS_OPT_EXPORT_DONE
-#: Merge.rc:4932
+#: Merge.rc:4942
#, c-format
msgid "Options exported to file."
msgstr "Agiritik esportatutako aukerak"
#. IDS_OPT_IMPORT_ERR
-#: Merge.rc:4933
+#: Merge.rc:4943
#, c-format
msgid "Failed to import options from file."
msgstr "Hutsegitea agiritik aukerak inportatzerakoan."
#. IDS_OPT_EXPORT_ERR
-#: Merge.rc:4934
+#: Merge.rc:4944
#, c-format
msgid "Failed to write options to file."
msgstr "Hutsegitea aukerak agirian idazterakoan."
#. IDS_CLOSEALL_WINDOWS
-#: Merge.rc:4935
+#: Merge.rc:4945
#, c-format
msgid ""
"Close multiple compare windows?\n"
@@ -7741,1212 +7752,1217 @@ msgstr ""
"Jarraitzea nahi duzu?"
#. IDS_EOL_MIXED
-#: Merge.rc:4944
+#: Merge.rc:4954
#, c-format
msgid "Mixed"
msgstr "Mixed"
#. IDS_EOL_BIN
-#: Merge.rc:4945
+#: Merge.rc:4955
msgctxt "EOL Type"
msgid "Binary"
msgstr "Binarioa"
#. IDS_EOL_NONE
-#: Merge.rc:4949
+#: Merge.rc:4959
#, c-format
msgid "None"
msgstr "Bat ere ez"
#. IDS_MARKER_COLOR_FMT
-#: Merge.rc:4950
+#: Merge.rc:4960
#, c-format
msgid "Marker Color %d"
msgstr ""
#. IDS_MARKER_NEW_PATTERN
-#: Merge.rc:4951
+#: Merge.rc:4961
msgid "New Pattern"
msgstr ""
#. IDS_PLUGINSLIST_TYPE
-#: Merge.rc:4957
+#: Merge.rc:4967
#, c-format
msgid "Type"
msgstr "Mota"
#. IDS_PLUGINS_TYPE_EDITSCRIPT
-#: Merge.rc:4961
+#: Merge.rc:4971
#, c-format
msgid "Editor script"
msgstr "Editatzaile eskripta"
#. ID_SELECTLINEDIFF
-#: Merge.rc:4967
+#: Merge.rc:4977
#, c-format
msgid "\nDifference in Current Line (F4)"
msgstr ""
#. ID_OPTIONS
-#: Merge.rc:4968
+#: Merge.rc:4978
#, c-format
msgid "\nOptions"
msgstr ""
#. ID_REFRESH
-#: Merge.rc:4969
+#: Merge.rc:4979
#, c-format
msgid "\nRefresh (F5)"
msgstr ""
#. ID_PREVDIFF
-#: Merge.rc:4975
+#: Merge.rc:4985
#, c-format
msgid "\nPrevious Difference (Alt+Up)"
msgstr ""
#. ID_NEXTDIFF
-#: Merge.rc:4976
+#: Merge.rc:4986
#, c-format
msgid "\nNext Difference (Alt+Down)"
msgstr ""
#. ID_PREVCONFLICT
-#: Merge.rc:4977
+#: Merge.rc:4987
#, c-format
msgid "\nPrevious Conflict (Alt+Shift+Up)"
msgstr ""
#. ID_NEXTCONFLICT
-#: Merge.rc:4978
+#: Merge.rc:4988
#, c-format
msgid "\nNext Conflict (Alt+Shift+Down)"
msgstr ""
#. ID_FIRSTDIFF
-#: Merge.rc:4983
+#: Merge.rc:4993
#, c-format
msgid "\nFirst Difference (Alt+Home)"
msgstr ""
#. ID_CURDIFF
-#: Merge.rc:4984
+#: Merge.rc:4994
#, c-format
msgid "\nCurrent Difference (Alt+Enter)"
msgstr ""
#. ID_LASTDIFF
-#: Merge.rc:4985
+#: Merge.rc:4995
#, c-format
msgid "\nLast Difference (Alt+End)"
msgstr ""
#. ID_L2R
-#: Merge.rc:4986
+#: Merge.rc:4996
msgid "\nCopy to Right (Alt+Right)"
msgstr ""
#. ID_R2L
-#: Merge.rc:4987
+#: Merge.rc:4997
msgid "\nCopy to Left (Alt+Left)"
msgstr ""
#. ID_L2RNEXT
-#: Merge.rc:4988
+#: Merge.rc:4998
msgid "\nCopy to Right and Advance (Ctrl+Alt+Right)"
msgstr ""
#. ID_R2LNEXT
-#: Merge.rc:4989
+#: Merge.rc:4999
msgid "\nCopy to Left and Advance (Ctrl+Alt+Left)"
msgstr ""
#. ID_ALL_RIGHT
-#: Merge.rc:4990
+#: Merge.rc:5000
msgid "\nCopy All to Right"
msgstr "\nKopiatu Dena Eskuinera"
#. ID_ALL_LEFT
-#: Merge.rc:4991
+#: Merge.rc:5001
msgid "\nCopy All to Left"
msgstr "\nKopiatu Dena Ezkerrera"
#. ID_AUTO_MERGE
-#: Merge.rc:4992
+#: Merge.rc:5002
#, c-format
msgid "\nAuto Merge (Ctrl+Alt+M)"
msgstr ""
#. ID_FIRSTFILE
-#: Merge.rc:4993
+#: Merge.rc:5003
msgid "\nFirst File"
msgstr ""
#. ID_NEXTFILE
-#: Merge.rc:4994
+#: Merge.rc:5004
msgid "\nNext File (Ctrl+F8)"
msgstr ""
#. ID_LASTFILE
-#: Merge.rc:4995
+#: Merge.rc:5005
msgid "\nLast File"
msgstr ""
#. ID_PREVFILE
-#: Merge.rc:4996
+#: Merge.rc:5006
msgid "\nPrevious File (Ctrl+F7)"
msgstr ""
#. IDS_UNPACK_AUTO
-#: Merge.rc:5003
+#: Merge.rc:5013
msgid "Adapted unpacker applied to both files (one needs extension)."
msgstr "Egokitutako despaketatzailea bi agiriei ezartzen zaie (agiri batek bakarrik behar du luzapena)."
#. IDS_NO_PREDIFFER
-#: Merge.rc:5004
+#: Merge.rc:5014
#, c-format
msgid "No Prediffer (Normal)"
msgstr "Ez aurrezberd (normala)"
#. IDS_SUGGESTED_PLUGINS
-#: Merge.rc:5005
+#: Merge.rc:5015
#, c-format
msgid "Suggested Plugins"
msgstr "Iradokitutako pluginak"
#. IDS_NOT_SUGGESTED_PLUGINS
-#: Merge.rc:5006
+#: Merge.rc:5016
msgid "All Plugins"
msgstr ""
#. IDS_PRIVATEBUILD_FMT
-#: Merge.rc:5012
+#: Merge.rc:5022
#, c-format
msgid "Private Build: %1"
msgstr "Bilduma Pribatua: %1"
#. IDS_CHECKFORUPDATES_UPTODATE
-#: Merge.rc:5013
+#: Merge.rc:5023
msgid "Your software is up to date."
msgstr ""
-#: Merge.rc:5015
+#: Merge.rc:5025
#, c-format
msgid "WinMerge update available.\n%1 available (you have %2). Download now?"
msgstr ""
#. IDS_ALLRIGHTS_RESERVED
-#: Merge.rc:5016
+#: Merge.rc:5026
msgid " - All rights reserved."
msgstr ""
#. IDS_CHECKFORUPDATES_FAILED
-#: Merge.rc:5021
+#: Merge.rc:5031
#, c-format
msgid "Failed to download latest version information"
msgstr ""
#. IDS_TITLE_PLUGINS_SETTINGS
-#: Merge.rc:5027
+#: Merge.rc:5037
#, c-format
msgid "Plugin Settings"
msgstr "Plugin Ezarpenak"
#. IDS_NO_SCT_SCRIPTS
-#: Merge.rc:5029
+#: Merge.rc:5039
#, c-format
msgid "WSH not found - .sct scripts disabled"
msgstr "WSH ez da aurkitu - .sct eskriptak ezgaituta"
#. IDS_LOCBAR_GOTOLINE_FMT
-#: Merge.rc:5037
+#: Merge.rc:5047
#, c-format
msgid "G&o to Line %1"
msgstr "&Joan lerro honetara: %1"
#. IDS_GOTO_MOVED_LINE
-#: Merge.rc:5043
+#: Merge.rc:5053
msgid "Go to Moved Line\tCtrl+Shift+G"
msgstr ""
#. IDS_AUTOCOMPLETE_DISABLED
-#: Merge.rc:5049
+#: Merge.rc:5059
msgctxt "Options dialog|General|Open dialog Auto completion"
msgid "Disabled"
msgstr ""
#. IDS_AUTOCOMPLETE_FILE_SYS
-#: Merge.rc:5050
+#: Merge.rc:5060
#, c-format
msgid "From file system"
msgstr "Agiri sistematik"
#. IDS_AUTOCOMPLETE_MRU
-#: Merge.rc:5051
+#: Merge.rc:5061
msgid "From Most Recently Used list"
msgstr "MRU zerrendatik"
#. IDS_COLORSCHEME_PLAIN
-#: Merge.rc:5057
+#: Merge.rc:5067
#, c-format
msgid "No Highlighting"
msgstr "Ez Nabarmenduta"
#. IDS_COLORSCHEME_BATCH
-#: Merge.rc:5063
+#: Merge.rc:5073
#, c-format
msgid "Batch"
msgstr "Batch"
#. IDS_COLORSCHEME_PO
-#: Merge.rc:5090
+#: Merge.rc:5100
#, c-format
msgid "Portable Object"
msgstr "Portable Object"
#. IDS_COLORSCHEME_RSRC
-#: Merge.rc:5094
+#: Merge.rc:5104
#, c-format
msgid "Resources"
msgstr "Resources"
#. IDS_COLORSCHEME_SH
-#: Merge.rc:5098
+#: Merge.rc:5108
#, c-format
msgid "Shell"
msgstr "Shell"
#. IDS_CLOSE_LEFT_TABS
-#: Merge.rc:5115
+#: Merge.rc:5125
#, c-format
msgid "Close &Left Tabs"
msgstr ""
#. IDS_CLOSE_RIGHT_TABS
-#: Merge.rc:5116
+#: Merge.rc:5126
#, c-format
msgid "Close R&ight Tabs"
msgstr ""
#. IDS_CLOSE_OTHER_TABS
-#: Merge.rc:5117
+#: Merge.rc:5127
#, c-format
msgid "Close &Other Tabs"
msgstr ""
#. IDS_TABBAR_AUTO_MAXWIDTH
-#: Merge.rc:5118
+#: Merge.rc:5128
#, c-format
msgid "Enable &Auto Max Width"
msgstr ""
#. IDS_WEBPAGE_MENU
-#: Merge.rc:5128
+#: Merge.rc:5138
msgid "We&bpage"
msgstr ""
#. IDS_VIEW_WRAP_TEXT
-#: Merge.rc:5133
+#: Merge.rc:5143
msgid "W&rap Text"
msgstr ""
#. IDS_NOTINSTALLED
-#: Merge.rc:5138
+#: Merge.rc:5148
msgid "%1 is not installed."
msgstr ""
#. IDS_CREATE_FOLDER
-#: Merge.rc:5143
+#: Merge.rc:5153
#, c-format
msgid "%1 does not exist. Create it?"
msgstr ""
#. IDS_CREATE_FOLDER_ERROR
-#: Merge.rc:5144
+#: Merge.rc:5154
#, c-format
msgid "Failed to create folder."
msgstr ""
#. IDC_EXT_EDITOR_PATH
-#: Merge.rc:5149
+#: Merge.rc:5159
#, c-format
msgid "Parameters:\n$file: Current file path\n$linenum: Current cursor line number"
msgstr ""
#. IDS_DIFF_ALGORITHM_DEFAULT
-#: Merge.rc:5154
+#: Merge.rc:5164
msgid "default"
msgstr ""
#. IDS_DIFF_ALGORITHM_MINIMAL
-#: Merge.rc:5155
+#: Merge.rc:5165
msgid "minimal"
msgstr ""
#. IDS_DIFF_ALGORITHM_PATIENCE
-#: Merge.rc:5156
+#: Merge.rc:5166
msgid "patience"
msgstr ""
#. IDS_DIFF_ALGORITHM_HISTOGRAM
-#: Merge.rc:5157
+#: Merge.rc:5167
msgid "histogram"
msgstr ""
#. IDS_DIFF_ALGORITHM_NONE
-#: Merge.rc:5158
+#: Merge.rc:5168
msgid "none"
msgstr ""
#. IDS_RENDERING_MODE_GDI
-#: Merge.rc:5163
+#: Merge.rc:5173
msgid "GDI"
msgstr ""
#. IDS_RENDERING_MODE_DIRECTWRITE_DEFAULT
-#: Merge.rc:5164
+#: Merge.rc:5174
msgid "DirectWrite Default"
msgstr ""
#. IDS_RENDERING_MODE_DIRECTWRITE_ALIASED
-#: Merge.rc:5165
+#: Merge.rc:5175
msgid "DirectWrite Aliased"
msgstr ""
#. IDS_RENDERING_MODE_DIRECTWRITE_GDI_CLASSIC
-#: Merge.rc:5166
+#: Merge.rc:5176
msgid "DirectWrite GDI Classic"
msgstr ""
#. IDS_RENDERING_MODE_DIRECTWRITE_GDI_NATURAL
-#: Merge.rc:5167
+#: Merge.rc:5177
msgid "DirectWrite GDI Natural"
msgstr ""
#. IDS_RENDERING_MODE_DIRECTWRITE_NATURAL
-#: Merge.rc:5168
+#: Merge.rc:5178
msgid "DirectWrite Natural"
msgstr ""
#. IDS_RENDERING_MODE_DIRECTWRITE_NATURAL_SYMMETRIC
-#: Merge.rc:5169
+#: Merge.rc:5179
msgid "DirectWrite Natural Symmetric"
msgstr ""
#. IDS_CLOSE_WINDOWS_WITH_ESC_DISABLED
-#: Merge.rc:5174
+#: Merge.rc:5184
msgctxt "Options dialog|General|Close windows with Esc"
msgid "Disabled"
msgstr ""
#. IDS_CLOSE_WINDOWS_WITH_ESC_1
-#: Merge.rc:5175
+#: Merge.rc:5185
msgid "MDI child window or main window"
msgstr ""
#. IDS_CLOSE_WINDOWS_WITH_ESC_2
-#: Merge.rc:5176
+#: Merge.rc:5186
msgid "MDI child window only"
msgstr ""
#. IDS_CLOSE_WINDOWS_WITH_ESC_3
-#: Merge.rc:5177
+#: Merge.rc:5187
msgid "Close main window if only one MDI child window"
msgstr ""
#. IDS_DIFF_GROUP
-#: Merge.rc:5182
+#: Merge.rc:5192
msgctxt "ImgMergeFrame|LocationPane"
msgid "Diff"
msgstr ""
#. IDS_DIFF_HIGHLIGHT
-#: Merge.rc:5183
+#: Merge.rc:5193
msgctxt "ImgMergeFrame|LocationPane"
msgid "Highlight"
msgstr ""
#. IDS_DIFF_BLINK
-#: Merge.rc:5184
+#: Merge.rc:5194
msgctxt "ImgMergeFrame|LocationPane"
msgid "Blink"
msgstr ""
#. IDS_DIFF_BLOCKSIZE
-#: Merge.rc:5185
+#: Merge.rc:5195
msgctxt "ImgMergeFrame|LocationPane"
msgid "Block Size"
msgstr ""
#. IDS_DIFF_BLOCKALPHA
-#: Merge.rc:5186
+#: Merge.rc:5196
msgctxt "ImgMergeFrame|LocationPane"
msgid "Block Alpha"
msgstr ""
#. IDS_DIFF_CDTHRESHOLD
-#: Merge.rc:5187
+#: Merge.rc:5197
msgctxt "ImgMergeFrame|LocationPane"
msgid "CD Threshold"
msgstr ""
#. IDS_DIFF_INSERTION_DELETION_DETECTION
-#: Merge.rc:5188
+#: Merge.rc:5198
msgctxt "ImgMergeFrame|LocationPane"
msgid "Ins/Del Detection"
msgstr ""
#. IDS_OVERLAY_MODE_NONE
-#: Merge.rc:5189 Merge.rc:5194
+#: Merge.rc:5199 Merge.rc:5204
msgctxt "ImgMergeFrame|LocationPane"
msgid "None"
msgstr ""
#. IDS_DIFF_INSERTION_DELETION_DETECTION_VERTICAL
-#: Merge.rc:5190
+#: Merge.rc:5200
msgctxt "ImgMergeFrame|LocationPane"
msgid "Vertical"
msgstr ""
#. IDS_DIFF_INSERTION_DELETION_DETECTION_HORIZONTAL
-#: Merge.rc:5191
+#: Merge.rc:5201
msgctxt "ImgMergeFrame|LocationPane"
msgid "Horizontal"
msgstr ""
#. IDS_OVERLAY_GROUP
-#: Merge.rc:5192
+#: Merge.rc:5202
msgctxt "ImgMergeFrame|LocationPane"
msgid "Overlay"
msgstr ""
#. IDS_OVERLAY_ALPHA
-#: Merge.rc:5193
+#: Merge.rc:5203
msgctxt "ImgMergeFrame|LocationPane"
msgid "Alpha"
msgstr ""
#. IDS_OVERLAY_MODE_XOR
-#: Merge.rc:5195
+#: Merge.rc:5205
msgctxt "ImgMergeFrame|LocationPane"
msgid "XOR"
msgstr ""
#. IDS_OVERLAY_MODE_ALPHA
-#: Merge.rc:5196
+#: Merge.rc:5206
msgctxt "ImgMergeFrame|LocationPane"
msgid "Alpha Blend"
msgstr ""
#. IDS_OVERLAY_MODE_ALPHA_ANIMATION
-#: Merge.rc:5197
+#: Merge.rc:5207
msgctxt "ImgMergeFrame|LocationPane"
msgid "Alpha Animation"
msgstr ""
#. IDS_ZOOM
-#: Merge.rc:5198
+#: Merge.rc:5208
msgctxt "ImgMergeFrame|LocationPane"
msgid "Zoom"
msgstr ""
#. IDS_PAGE
-#: Merge.rc:5199
+#: Merge.rc:5209
msgctxt "ImgMergeFrame|LocationPane"
msgid "Page:"
msgstr ""
#. IDS_IMGCMP_STATUS_PT_RGBA_FMT
-#: Merge.rc:5200
+#: Merge.rc:5210
#, c-format
msgid "Pt: (%d, %d) RGBA: (%d, %d, %d, %d) "
msgstr ""
#. IDS_IMGCMP_STATUS_DIST1_FMT
-#: Merge.rc:5201
+#: Merge.rc:5211
#, c-format
msgid "Dist: %g "
msgstr ""
#. IDS_IMGCMP_STATUS_DIST2_FMT
-#: Merge.rc:5202
+#: Merge.rc:5212
#, c-format
msgid "Dist: %g, %g "
msgstr ""
#. IDS_IMGCMP_STATUS_PAGE_ZOOM_SIZE_BPP_FMT
-#: Merge.rc:5203
+#: Merge.rc:5213
#, c-format
msgid "Page: %d/%d Zoom: %d%% %dx%dpx %dbpp "
msgstr ""
#. IDS_IMGCMP_STATUS_RC_FMT
-#: Merge.rc:5204
+#: Merge.rc:5214
#, c-format
msgid "Rc: (%d, %d) "
msgstr ""
#. IDS_IMGCMP_STATUS_FLIPPED_FMT
-#: Merge.rc:5205
+#: Merge.rc:5215
#, c-format
msgid "Flipped: %s "
msgstr ""
#. IDS_IMGCMP_STATUS_ROTATED_FMT
-#: Merge.rc:5206
+#: Merge.rc:5216
#, c-format
msgid "Rotated: %d "
msgstr ""
#. IDS_IMGCMP_REPORT_ALLPAGES
-#: Merge.rc:5207
+#: Merge.rc:5217
msgid "All pages"
msgstr ""
#. IDS_IGNSUB_STR1
-#: Merge.rc:5212
+#: Merge.rc:5222
msgid ""
msgstr ""
#. IDS_IGNSUB_STR2
-#: Merge.rc:5213
+#: Merge.rc:5223
msgid "No differences found to select"
msgstr ""
#. IDS_IGNSUB_STR3
-#: Merge.rc:5214
+#: Merge.rc:5224
msgid "No differences found to add as substitution filter"
msgstr ""
#. IDS_IGNSUB_STR4
-#: Merge.rc:5215
+#: Merge.rc:5225
msgid "The pair is already in the Substitution Filters list"
msgstr ""
#. IDS_IGNSUB_STR5
-#: Merge.rc:5216
+#: Merge.rc:5226
msgid "Add this change to Substitution Filters?"
msgstr ""
#. IDS_OCRRESULT_TEXTONLY
-#: Merge.rc:5221
+#: Merge.rc:5231
msgid "Text only"
msgstr ""
#. IDS_OCRRESULT_POS_LINE
-#: Merge.rc:5222
+#: Merge.rc:5232
msgid "Line-by-line position and text"
msgstr ""
#. IDS_OCRRESULT_POS_WORD
-#: Merge.rc:5223
+#: Merge.rc:5233
msgid "Word-by-word position and text"
msgstr ""
#. IDS_USERDATAFOLDER_APPDATA
-#: Merge.rc:5228
+#: Merge.rc:5238
msgid "AppData (Roaming) folder"
msgstr ""
#. IDS_USERDATAFOLDER_INSTALL
-#: Merge.rc:5229
+#: Merge.rc:5239
msgid "Install folder"
msgstr ""
#. IDS_USERDATAFOLDER_DOCUMENTS
-#: Merge.rc:5230
+#: Merge.rc:5240
msgid "Documents folder"
msgstr ""
#. IDS_SINGLEINSTANCE_DISABLED
-#: Merge.rc:5235
+#: Merge.rc:5245
msgctxt "Options dialog|General|Single instance mode"
msgid "Disabled"
msgstr ""
#. IDS_SINGLEINSTANCE_STR1
-#: Merge.rc:5236
+#: Merge.rc:5246
#, c-format
msgid "Allow only one instance to run"
msgstr "Ahalbidetu ekinbide bat bakarrik "
#. IDS_SINGLEINSTANCE_STR2
-#: Merge.rc:5237
+#: Merge.rc:5247
msgid "Allow only one instance; wait for termination"
msgstr ""
#. IDS_AUTO_RELOAD_MODIFIED_FILES_DISABLED
-#: Merge.rc:5242
+#: Merge.rc:5252
msgctxt "Options dialog|General|Auto-reload modified files"
msgid "Disabled"
msgstr ""
#. IDS_AUTO_RELOAD_MODIFIED_FILES_STR1
-#: Merge.rc:5243
+#: Merge.rc:5253
msgid "Only on window activated"
msgstr ""
#. IDS_AUTO_RELOAD_MODIFIED_FILES_STR2
-#: Merge.rc:5244
+#: Merge.rc:5254
msgid "Immediately"
msgstr ""
#. IDS_PLUGIN_ALL
-#: Merge.rc:5249
+#: Merge.rc:5259
msgid "Al&l"
msgstr ""
#. IDS_PLUGIN_OTHERS
-#: Merge.rc:5250
+#: Merge.rc:5260
msgid "&Others"
msgstr ""
-#: Merge.rc:5252
+#: Merge.rc:5262
#, c-format
msgid "Missing plugin name in pipeline: %1"
msgstr ""
-#: Merge.rc:5254
+#: Merge.rc:5264
#, c-format
msgid "Missing quote in plugin pipeline: %1"
msgstr ""
#. IDS_PLUGIN_NAME_ALREADY_EXISTS
-#: Merge.rc:5255
+#: Merge.rc:5265
#, c-format
msgid "Plugin name '%1' already exists."
msgstr ""
#. IDS_PLUGIN_TITLE1
-#: Merge.rc:5256
+#: Merge.rc:5266
msgid "Specify plugin arguments"
msgstr ""
-#: Merge.rc:5258
+#: Merge.rc:5268
#, c-format
msgid "Plugin not found or invalid: %1"
msgstr ""
#. IDS_PLUGIN_NOT_UNPACK
-#: Merge.rc:5259
+#: Merge.rc:5269
#, c-format
msgid "'%1' is not an unpacker plugin"
msgstr ""
#. IDS_PLUGIN_NOT_PREDIFF
-#: Merge.rc:5260
+#: Merge.rc:5270
#, c-format
msgid "'%1' is not a prediffer plugin"
msgstr ""
-#: Merge.rc:5262
+#: Merge.rc:5272
#, c-format
msgid "Error prediffing '%1' with '%2'. Prediffing disabled."
msgstr ""
#. IDS_PLUGIN_CIRCULAR_REFERENCE
-#: Merge.rc:5263
+#: Merge.rc:5273
#, c-format
msgid "Circular reference in plugin pipeline: %1"
msgstr ""
#. IDS_PLUGIN_TYPE1
-#: Merge.rc:5264
+#: Merge.rc:5274
msgid "URL Handler"
msgstr ""
#. IDS_PLUGIN_TYPE2
-#: Merge.rc:5265
+#: Merge.rc:5275
msgid "File Unpacker"
msgstr ""
#. IDS_PLUGIN_TYPE3
-#: Merge.rc:5266
+#: Merge.rc:5276
msgid "File or Folder Unpacker"
msgstr ""
#. IDS_PLUGIN_TYPE5
-#: Merge.rc:5268
+#: Merge.rc:5278
msgid "Alias for Unpacker"
msgstr ""
#. IDS_PLUGIN_TYPE6
-#: Merge.rc:5269
+#: Merge.rc:5279
msgid "Alias for Prediffer"
msgstr ""
#. IDS_PLUGIN_TYPE7
-#: Merge.rc:5270
+#: Merge.rc:5280
msgid "Alias for Editor script"
msgstr ""
#. IDS_PLUGIN_ALIAS_DESC
-#: Merge.rc:5271
+#: Merge.rc:5281
#, c-format
msgid "Alias for plugin pipeline '%1'"
msgstr ""
#. IDS_PLUGIN_NEW_DESC
-#: Merge.rc:5272
+#: Merge.rc:5282
msgid "New plugin description"
msgstr ""
#. IDS_PLUGIN_TARGETS_ALL
-#: Merge.rc:5273
+#: Merge.rc:5283
msgid "All"
msgstr ""
#. IDS_PLUGIN_TARGETS_1ST
-#: Merge.rc:5274
+#: Merge.rc:5284
msgid "1st"
msgstr ""
#. IDS_PLUGIN_TARGETS_2ND
-#: Merge.rc:5275
+#: Merge.rc:5285
msgid "2nd"
msgstr ""
#. IDS_PLUGIN_TARGETS_3RD
-#: Merge.rc:5276
+#: Merge.rc:5286
msgid "3rd"
msgstr ""
#. IDS_PLUGIN_TARGETS_1ST_2ND
-#: Merge.rc:5277
+#: Merge.rc:5287
msgid "1st and 2nd"
msgstr ""
#. IDS_PLUGIN_TARGETS_1ST_3RD
-#: Merge.rc:5278
+#: Merge.rc:5288
msgid "1st and 3rd"
msgstr ""
#. IDS_PLUGIN_TARGETS_2ND_3RD
-#: Merge.rc:5279
+#: Merge.rc:5289
msgid "2nd and 3rd"
msgstr ""
#. IDS_FILTER_APPLIED
-#: Merge.rc:5284
+#: Merge.rc:5294
msgid "Filter applied"
msgstr ""
#. IDS_FILTERMENU_COMPARE
-#: Merge.rc:5289
+#: Merge.rc:5299
#, c-format
msgid "Compare %1"
msgstr ""
#. IDS_FILTERMENU_FILTER_BY_THIS_COLUMN
-#: Merge.rc:5290
+#: Merge.rc:5300
msgid "&Filter by This Column"
msgstr ""
#. IDS_FILTERMENU_FILTER_BY_THIS_COLUMN2
-#: Merge.rc:5291
+#: Merge.rc:5301
msgid "&Filter by This Column..."
msgstr ""
#. IDS_CLIPBOARDHISTORY_TIME
-#: Merge.rc:5296
+#: Merge.rc:5306
#, c-format
msgid "Clipboard at %s"
msgstr ""
#. IDS_CLIPBOARDHISTORY_DISABLED
-#: Merge.rc:5297
+#: Merge.rc:5307
msgid "Clipboard history disabled.\r\nEnable: Windows logo key + V, then Turn on."
msgstr ""
-#: Merge.rc:5299
+#: Merge.rc:5309
msgid "This system does not support clipboard history."
msgstr ""
-#: Merge.rc:5301
+#: Merge.rc:5311
msgid "32-bit WinMerge does not support Clipboard Compare"
msgstr ""
#. IDS_WEBVIEW2_RUNTIME_NOT_INSTALLED
-#: Merge.rc:5306
+#: Merge.rc:5316
msgid "WebView2 runtime not installed. Download it?"
msgstr ""
#. IDS_JUMPLIST_NEW_TEXT_COMPARE
-#: Merge.rc:5311
+#: Merge.rc:5321
msgid "New Text Compare"
msgstr ""
#. IDS_JUMPLIST_NEW_TABLE_COMPARE
-#: Merge.rc:5312
+#: Merge.rc:5322
msgid "New Table Compare"
msgstr ""
#. IDS_JUMPLIST_NEW_BINARY_COMPARE
-#: Merge.rc:5313
+#: Merge.rc:5323
msgid "New Binary Compare"
msgstr ""
#. IDS_JUMPLIST_NEW_IMAGE_COMPARE
-#: Merge.rc:5314
+#: Merge.rc:5324
msgid "New Image Compare"
msgstr ""
#. IDS_JUMPLIST_NEW_WEBPAGE_COMPARE
-#: Merge.rc:5315
+#: Merge.rc:5325
msgid "New Webpage Compare"
msgstr ""
+#. IDS_JUMPLIST_NEW_FOLDER_COMPARE
+#: Merge.rc:5326
+msgid "New Folder Compare"
+msgstr ""
+
#. IDS_JUMPLIST_CLIPBOARD_COMPARE
-#: Merge.rc:5316
+#: Merge.rc:5327
msgid "Clipboard Compare"
msgstr ""
#. IDS_PREVIEWBAR_PRINT
-#: Merge.rc:5321
+#: Merge.rc:5332
msgid "&Print..."
msgstr ""
#. IDS_PREVIEWBAR_PREVPAGE
-#: Merge.rc:5323
+#: Merge.rc:5334
msgid "Pre&v Page"
msgstr ""
#. IDS_PREVIEWBAR_TWOPAGE
-#: Merge.rc:5324
+#: Merge.rc:5335
msgid "&Two Page"
msgstr ""
#. IDS_PREVIEWBAR_ONEPAGE
-#: Merge.rc:5325
+#: Merge.rc:5336
msgid "&One Page"
msgstr ""
#. IDS_PREVIEWBAR_ZOOMIN
-#: Merge.rc:5326
+#: Merge.rc:5337
msgid "Zoom &In"
msgstr ""
#. IDS_PREVIEWBAR_ZOOMOUT
-#: Merge.rc:5327
+#: Merge.rc:5338
msgid "Zoom &Out"
msgstr ""
#. IDS_WEBPAGE_COMPARING
-#: Merge.rc:5333
+#: Merge.rc:5344
msgid "Comparing..."
msgstr ""
#. IDS_WEBPAGE_ZOOM
-#: Merge.rc:5334
+#: Merge.rc:5345
msgid "Zoom:"
msgstr ""
#. IDS_COPY_GRANULARITY_DIFFHUNK
-#: Merge.rc:5339
+#: Merge.rc:5350
msgid "Diff hunk"
msgstr ""
#. IDS_COPY_GRANULARITY_INLINE
-#: Merge.rc:5340
+#: Merge.rc:5351
msgid "Inline diff"
msgstr ""
#. IDS_COPY_GRANULARITY_LINE
-#: Merge.rc:5341
+#: Merge.rc:5352
msgid "Line"
msgstr ""
-#: Merge.rc:5342
+#: Merge.rc:5353
msgid "Character"
msgstr ""
#. ID_MICE_PREVDIFF
-#: Merge.rc:5347
+#: Merge.rc:5358
msgid "\nPrevious Difference (Alt+Up)\n(Right Button+Wheel Up)\n(Alt+Wheel Up)"
msgstr ""
#. ID_MICE_NEXTDIFF
-#: Merge.rc:5348
+#: Merge.rc:5359
msgid "\nNext Difference (Alt+Down)\n(Right Button+Wheel Down)\n(Alt+Wheel Down)"
msgstr ""
#. ID_MICE_L2R
-#: Merge.rc:5349
+#: Merge.rc:5360
msgid "\nCopy to Right (Alt+Right)\n(Right Button+Wheel Right)\n(Alt+Wheel Right)\n(Alt+Shift+Wheel Down)"
msgstr ""
#. ID_MICE_R2L
-#: Merge.rc:5350
+#: Merge.rc:5361
msgid "\nCopy to Left (Alt+Left)\n(Right Button+Wheel Left)\n(Alt+Wheel Left)\n(Alt+Shift+Wheel Up)"
msgstr ""
#. ID_MICE_L2RNEXT
-#: Merge.rc:5351
+#: Merge.rc:5362
msgid "\nCopy to Right and Advance (Ctrl+Alt+Right)\n(Ctrl+Alt+Wheel Right)\n(Ctrl+Alt+Shift+Wheel Down)"
msgstr ""
#. ID_MICE_R2LNEXT
-#: Merge.rc:5352
+#: Merge.rc:5363
msgid "\nCopy to Left and Advance (Ctrl+Alt+Left)\n(Ctrl+Alt+Wheel Left)\n(Ctrl+Alt+Shift+Wheel Up)"
msgstr ""
#. IDS_LOG_COMPARING_2
-#: Merge.rc:5362
+#: Merge.rc:5373
#, c-format
msgid "Comparing %1 with %2"
msgstr ""
#. IDS_LOG_COMPARING_3
-#: Merge.rc:5363
+#: Merge.rc:5374
#, c-format
msgid "Comparing %1 with %2 and %3"
msgstr ""
#. IDS_LOG_COMPARE_COMPLETED
-#: Merge.rc:5364
+#: Merge.rc:5375
msgid "Comparison completed"
msgstr ""
#. IDS_LOG_COMPARE_ERROR_2
-#: Merge.rc:5365
+#: Merge.rc:5376
#, c-format
msgid "Failed to compare %1 with %2: "
msgstr ""
#. IDS_LOG_COMPARE_ERROR_3
-#: Merge.rc:5366
+#: Merge.rc:5377
#, c-format
msgid "Failed to compare %1 with %2 and %3: "
msgstr ""
#. IDS_LOG_FILE_SAVED
-#: Merge.rc:5367
+#: Merge.rc:5378
msgid "File saved"
msgstr ""
#. IDS_LOG_COPYING_FILES
-#: Merge.rc:5368
+#: Merge.rc:5379
msgid "Copying files..."
msgstr ""
#. IDS_LOG_MOVING_FILES
-#: Merge.rc:5369
+#: Merge.rc:5380
msgid "Moving files..."
msgstr ""
#. IDS_LOG_DELETING_FILES
-#: Merge.rc:5370
+#: Merge.rc:5381
msgid "Deleting files..."
msgstr ""
#. IDS_LOG_RECYCLEBIN
-#: Merge.rc:5371
+#: Merge.rc:5382
msgid "Recycle Bin"
msgstr ""
#. IDS_LOG_PERMANENTLY_DELETED
-#: Merge.rc:5372
+#: Merge.rc:5383
msgid "Permanently deleted"
msgstr ""
#. IDS_LOG_FILEOPERATION_COMPLETED
-#: Merge.rc:5373
+#: Merge.rc:5384
msgid "File operation completed successfully"
msgstr ""
#. IDS_LOG_FILEOPERATION_CANCELED
-#: Merge.rc:5374
+#: Merge.rc:5385
msgid "File operation canceled"
msgstr ""
#. IDS_FILTER_ERROR_NO_ERROR
-#: Merge.rc:5379
+#: Merge.rc:5390
msgid "No error"
msgstr ""
#. IDS_FILTER_ERROR_EMPTY_EXPRESSION
-#: Merge.rc:5380
+#: Merge.rc:5391
msgid "Filter expression is empty"
msgstr ""
#. IDS_FILTER_ERROR_UNKNOWN_CHAR
-#: Merge.rc:5381
+#: Merge.rc:5392
msgid "Unknown character in filter expression"
msgstr ""
#. IDS_FILTER_ERROR_UNTERMINATED_STRING
-#: Merge.rc:5382
+#: Merge.rc:5393
msgid "Unterminated string literal"
msgstr ""
#. IDS_FILTER_ERROR_SYNTAX_ERROR
-#: Merge.rc:5383
+#: Merge.rc:5394
msgid "Syntax error in filter expression"
msgstr ""
#. IDS_FILTER_ERROR_PARSE_FAILURE
-#: Merge.rc:5384
+#: Merge.rc:5395
msgid "Failed to parse filter expression"
msgstr ""
#. IDS_FILTER_ERROR_INVALID_LITERAL
-#: Merge.rc:5385
+#: Merge.rc:5396
msgid "Invalid literal value"
msgstr ""
#. IDS_FILTER_ERROR_INVALID_REGULAR_EXPRESSION
-#: Merge.rc:5386
+#: Merge.rc:5397
msgid "Invalid regular expression"
msgstr ""
#. IDS_FILTER_ERROR_UNDEFINED_IDENTIFIER
-#: Merge.rc:5387
+#: Merge.rc:5398
msgid "Undefined identifier"
msgstr ""
#. IDS_FILTER_ERROR_INVALID_ARGUMENT_COUNT
-#: Merge.rc:5388
+#: Merge.rc:5399
msgid "Invalid number of arguments"
msgstr ""
#. IDS_FILTER_ERROR_FILTER_NAME_NOT_FOUND
-#: Merge.rc:5389
+#: Merge.rc:5400
msgid "Filter name not found"
msgstr ""
#. IDS_FILTER_ERROR_DIVIDE_BY_ZERO
-#: Merge.rc:5390
+#: Merge.rc:5401
msgid "Division by zero in filter expression"
msgstr ""
#. IDS_FILTER_ERROR_UNKNOWN_ERROR
-#: Merge.rc:5391
+#: Merge.rc:5402
msgid "Unknown error"
msgstr ""
#. IDS_FILTER_ERROR_INVALID_PROPERTY_NAME
-#: Merge.rc:5392
+#: Merge.rc:5403
msgid "Invalid property name"
msgstr ""
#. IDS_FILTER_ERROR_INVALID_DIRECTIVE
-#: Merge.rc:5393
+#: Merge.rc:5404
msgid "Invalid directive"
msgstr ""
#. IDS_FILTER_OP_EQUALS
-#: Merge.rc:5398
+#: Merge.rc:5409
msgid "Equals"
msgstr ""
#. IDS_FILTER_OP_NOT_EQUALS
-#: Merge.rc:5399
+#: Merge.rc:5410
msgid "Does not equal"
msgstr ""
#. IDS_FILTER_OP_LESS_THAN
-#: Merge.rc:5400
+#: Merge.rc:5411
msgid "Less than"
msgstr ""
#. IDS_FILTER_OP_LESS_EQUAL
-#: Merge.rc:5401
+#: Merge.rc:5412
msgid "Less than or equal to"
msgstr ""
#. IDS_FILTER_OP_GREATER_EQUAL
-#: Merge.rc:5402
+#: Merge.rc:5413
msgid "Greater than or equal to"
msgstr ""
#. IDS_FILTER_OP_GREATER_THAN
-#: Merge.rc:5403
+#: Merge.rc:5414
msgid "Greater than"
msgstr ""
#. IDS_FILTER_OP_BETWEEN
-#: Merge.rc:5404
+#: Merge.rc:5415
msgid "Between"
msgstr ""
#. IDS_FILTER_OP_NOT_BETWEEN
-#: Merge.rc:5405
+#: Merge.rc:5416
msgid "Not Between"
msgstr ""
#. IDS_FILTER_OP_CONTAINS
-#: Merge.rc:5406
+#: Merge.rc:5417
msgid "Contains"
msgstr ""
#. IDS_FILTER_OP_NOT_CONTAINS
-#: Merge.rc:5407
+#: Merge.rc:5418
msgid "Not Contains"
msgstr ""
#. IDS_FILTER_OP_RECONTAINS
-#: Merge.rc:5408
+#: Merge.rc:5419
msgid "Contains (regex)"
msgstr ""
#. IDS_FILTER_OP_NOT_RECONTAINS
-#: Merge.rc:5409
+#: Merge.rc:5420
msgid "Not Contains (regex)"
msgstr ""
#. IDS_FILTER_OP_LIKE
-#: Merge.rc:5410
+#: Merge.rc:5421
msgid "Match (wildcard)"
msgstr ""
#. IDS_FILTER_OP_NOT_LIKE
-#: Merge.rc:5411
+#: Merge.rc:5422
msgid "Not match (wildcard)"
msgstr ""
#. IDS_FILTER_OP_MATCHES
-#: Merge.rc:5412
+#: Merge.rc:5423
msgid "Match (regex)"
msgstr ""
#. IDS_FILTER_OP_NOT_MATCHES
-#: Merge.rc:5413
+#: Merge.rc:5424
msgid "Not match (regex)"
msgstr ""
#. IDS_COLORMODE_LIGHT
-#: Merge.rc:5418
+#: Merge.rc:5429
msgid "Light"
msgstr ""
#. IDS_COLORMODE_DARK
-#: Merge.rc:5419
+#: Merge.rc:5430
msgid "Dark"
msgstr ""
#. IDS_COLORMODE_FOLLOWSYSTEM
-#: Merge.rc:5420
+#: Merge.rc:5431
msgid "Follow system"
msgstr ""
#. IDS_EXAMPLE
-#: Merge.rc:5425
+#: Merge.rc:5436
#, c-format
msgid "e.g. %1"
msgstr ""
#. IDS_DETECTED_PREVIOUS_CRASH
-#: Merge.rc:5430
+#: Merge.rc:5441
msgid "WinMerge detected a previous crash. Please report this if possible."
msgstr ""
#. IDS_REGEX_REPLACE_LIST_TEMPLATE
-#: Merge.rc:5435
+#: Merge.rc:5446
msgid "# Regex replacement list\r\n# Format: regexreplacement\r\n# Backreferences like $1, $2 are supported\r\n\r\n(\\d{4})-(\\d{2})-(\\d{2})\t$1_$2_$3\r\n"
msgstr ""
#. IDS_STRING_REPLACE_LIST_TEMPLATE
-#: Merge.rc:5436
+#: Merge.rc:5447
msgid "# Replacement list\r\n# Format: searchreplacement\r\n# Lines starting with # are ignored\r\n\r\nfrom1\tto1\r\nfrom2\tto2\r\n"
msgstr ""
diff --git a/Translations/WinMerge/Brazilian.po b/Translations/WinMerge/Brazilian.po
index 1a026a363b3..7517c6def11 100644
--- a/Translations/WinMerge/Brazilian.po
+++ b/Translations/WinMerge/Brazilian.po
@@ -25,7 +25,7 @@ msgstr ""
"X-Generator: Poedit 3.8\n"
#. LANGUAGE, SUBLANGUAGE
-#: Merge.rc:26 Merge.rc:59 Merge.rc:5453
+#: Merge.rc:26 Merge.rc:59 Merge.rc:5464
msgid "LANG_ENGLISH, SUBLANG_ENGLISH_US"
msgstr "LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN"
@@ -110,7 +110,7 @@ msgid "Copy Selected Diff (Right) to Clipboard\tCtrl+&3"
msgstr "Copiar Diferença(s) Selecionada(s) (da Direita) para a Área de Transferência\tCtrl+&3"
#. IDR_MERGEDOCTYPE, ID_SELECTLINEDIFF
-#: Merge.rc:110 Merge.rc:673
+#: Merge.rc:110 Merge.rc:680
msgid "Select Line &Difference\tF4"
msgstr "Selecionar a &Diferença da Linha\tF4"
@@ -140,7 +140,7 @@ msgid "Cu&t"
msgstr "Co&rtar"
#. IDR_POPUP_DIRVIEW
-#: Merge.rc:118 Merge.rc:943
+#: Merge.rc:118 Merge.rc:951
msgid "&Copy"
msgstr "&Copiar"
@@ -150,19 +150,19 @@ msgid "&Paste"
msgstr "C&olar"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:121 Merge.rc:875 Merge.rc:882
+#: Merge.rc:121 Merge.rc:882 Merge.rc:889
msgid "&Scripts"
msgstr "&Scripts"
#. IDS_NO_EDIT_SCRIPTS
-#: Merge.rc:123 Merge.rc:338 Merge.rc:447 Merge.rc:654 Merge.rc:659
-#: Merge.rc:865 Merge.rc:877 Merge.rc:884 Merge.rc:940 Merge.rc:1183
-#: Merge.rc:5028
+#: Merge.rc:123 Merge.rc:340 Merge.rc:451 Merge.rc:661 Merge.rc:666
+#: Merge.rc:872 Merge.rc:884 Merge.rc:891 Merge.rc:948 Merge.rc:1193
+#: Merge.rc:5038
msgid "< Empty >"
msgstr "< Vazio >"
#. IDR_POPUP_LOCATIONBAR, ID_EDIT_WMGOTO
-#: Merge.rc:126 Merge.rc:691 Merge.rc:1081
+#: Merge.rc:126 Merge.rc:698 Merge.rc:1089
msgid "&Go to...\tCtrl+G"
msgstr "&Ir para...\tCtrl+G"
@@ -182,27 +182,27 @@ msgid "Op&en"
msgstr "Ab&rir"
#. IDR_POPUP_DIRVIEW, ID_DIR_OPEN_RIGHT
-#: Merge.rc:132 Merge.rc:981 Merge.rc:988 Merge.rc:995
+#: Merge.rc:132 Merge.rc:989 Merge.rc:996 Merge.rc:1003
msgid "With &Registered Application"
msgstr "Com &o Aplicativo Registrado"
#. IDR_POPUP_DIRVIEW, ID_DIR_OPEN_RIGHT_WITHEDITOR
-#: Merge.rc:133 Merge.rc:982 Merge.rc:989 Merge.rc:996
+#: Merge.rc:133 Merge.rc:990 Merge.rc:997 Merge.rc:1004
msgid "With &External Editor\tCtrl+Alt+E"
msgstr "Com o &Editor Externo\tCtrl+Alt+E"
#. IDR_POPUP_DIRVIEW, ID_DIR_OPEN_RIGHT_WITH
-#: Merge.rc:134 Merge.rc:983 Merge.rc:990 Merge.rc:997
+#: Merge.rc:134 Merge.rc:991 Merge.rc:998 Merge.rc:1005
msgid "&With..."
msgstr "&Com..."
#. IDR_POPUP_DIRVIEW, ID_DIR_OPEN_RIGHT_PARENT_FOLDER
-#: Merge.rc:135 Merge.rc:984 Merge.rc:991 Merge.rc:998
+#: Merge.rc:135 Merge.rc:992 Merge.rc:999 Merge.rc:1006
msgid "Open &Parent Folder..."
msgstr "Abrir &Pasta Pai..."
#. IDR_POPUP_IMG_CTXT, ID_FILE_SHELLMENU
-#: Merge.rc:137 Merge.rc:1239
+#: Merge.rc:137 Merge.rc:1249
msgid "S&hell Menu"
msgstr "M&enu do Shell"
@@ -237,8 +237,8 @@ msgid "Ins&ertion/Deletion Detection"
msgstr "Det&ecção de Inserção/Exclusão"
#. IDR_MERGEDOCTYPE, ID_TOOLBAR_NONE
-#: Merge.rc:176 Merge.rc:209 Merge.rc:216 Merge.rc:358 Merge.rc:507
-#: Merge.rc:751
+#: Merge.rc:176 Merge.rc:209 Merge.rc:216 Merge.rc:360 Merge.rc:511
+#: Merge.rc:758
msgid "&None"
msgstr "&Nenhuma"
@@ -253,12 +253,12 @@ msgid "&Horizontal"
msgstr "&Horizontal"
#. IDR_POPUP_IMG_CTXT, ID_IMG_CURPANE_PREVPAGE
-#: Merge.rc:181 Merge.rc:189 Merge.rc:1230
+#: Merge.rc:181 Merge.rc:189 Merge.rc:1240
msgid "&Previous Page"
msgstr "&Página Anterior"
#. IDS_PREVIEWBAR_NEXTPAGE
-#: Merge.rc:182 Merge.rc:190 Merge.rc:1231 Merge.rc:5322
+#: Merge.rc:182 Merge.rc:190 Merge.rc:1241 Merge.rc:5333
msgid "&Next Page"
msgstr "Pá&gina Seguinte"
@@ -268,42 +268,42 @@ msgid "&Active Pane"
msgstr "P&ainel Ativo"
#. IDR_POPUP_IMG_CTXT, ID_IMG_CURPANE_ROTATE_RIGHT_90
-#: Merge.rc:185 Merge.rc:1225
+#: Merge.rc:185 Merge.rc:1235
msgid "Rotate &Right 90deg"
msgstr "&Rotacionar 90 graus para a direita"
#. IDR_POPUP_IMG_CTXT, ID_IMG_CURPANE_ROTATE_LEFT_90
-#: Merge.rc:186 Merge.rc:1226
+#: Merge.rc:186 Merge.rc:1236
msgid "Rotate &Left 90deg"
msgstr "Rotacionar 90 graus para a &esquerda"
#. IDR_POPUP_IMG_CTXT, ID_IMG_CURPANE_FLIP_VERTICALLY
-#: Merge.rc:187 Merge.rc:1227
+#: Merge.rc:187 Merge.rc:1237
msgid "Flip V&ertically"
msgstr "Virar V&erticalmente"
#. IDR_POPUP_IMG_CTXT, ID_IMG_CURPANE_FLIP_HORIZONTALLY
-#: Merge.rc:188 Merge.rc:1228
+#: Merge.rc:188 Merge.rc:1238
msgid "Flip H&orizontally"
msgstr "Virar H&orizontalmente"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:193 Merge.rc:699
+#: Merge.rc:193 Merge.rc:706
msgid "&Zoom"
msgstr "&Zoom"
#. IDR_MERGEDOCTYPE, ID_VIEW_ZOOMIN
-#: Merge.rc:202 Merge.rc:701
+#: Merge.rc:202 Merge.rc:708
msgid "Zoom &In\tCtrl++"
msgstr "&Ampliar\tCtrl++"
#. IDR_MERGEDOCTYPE, ID_VIEW_ZOOMOUT
-#: Merge.rc:203 Merge.rc:702
+#: Merge.rc:203 Merge.rc:709
msgid "Zoom &Out\tCtrl+-"
msgstr "&Reduzir\tCtrl+-"
#. IDR_MERGEDOCTYPE, ID_VIEW_ZOOMNORMAL, Zoom to normal
-#: Merge.rc:205 Merge.rc:704
+#: Merge.rc:205 Merge.rc:711
msgid "&Normal\tCtrl+*"
msgstr "&Normal\tCtrl+*"
@@ -328,27 +328,27 @@ msgid "Dragging &Mode"
msgstr "&Modo de Arrastar"
#. IDR_POPUP_IMG_CTXT, ID_IMG_DRAGGINGMODE_MOVE
-#: Merge.rc:217 Merge.rc:955 Merge.rc:1233
+#: Merge.rc:217 Merge.rc:963 Merge.rc:1243
msgid "&Move"
msgstr "&Mover"
#. IDR_POPUP_IMG_CTXT, ID_IMG_DRAGGINGMODE_ADJUST_OFFSET
-#: Merge.rc:218 Merge.rc:1234
+#: Merge.rc:218 Merge.rc:1244
msgid "&Adjust Offset"
msgstr "&Ajustar Deslocamento"
#. IDR_POPUP_IMG_CTXT, ID_IMG_DRAGGINGMODE_VERTICAL_WIPE
-#: Merge.rc:219 Merge.rc:1235
+#: Merge.rc:219 Merge.rc:1245
msgid "&Vertical Wipe"
msgstr "Limpeza &Vertical"
#. IDR_POPUP_IMG_CTXT, ID_IMG_DRAGGINGMODE_HORIZONTAL_WIPE
-#: Merge.rc:220 Merge.rc:1236
+#: Merge.rc:220 Merge.rc:1246
msgid "&Horizontal Wipe"
msgstr "Limpeza &Horizontal"
#. IDR_POPUP_IMG_CTXT, ID_IMG_DRAGGINGMODE_RECTANGLE_SELECT
-#: Merge.rc:221 Merge.rc:1237
+#: Merge.rc:221 Merge.rc:1247
msgid "Rectangle &Select"
msgstr "Seleção de &Retângulo"
@@ -383,37 +383,37 @@ msgid "Compare Extracted &Text from Images"
msgstr "Comparar Texto &Extraído de Imagens"
#. IDD_OPEN, IDOK
-#: Merge.rc:272 Merge.rc:1980
+#: Merge.rc:272 Merge.rc:1990
msgid "Co&mpare"
msgstr "Co&mparar"
#. IDR_POPUP_WEBPAGE_COMPARE, ID_WEB_COMPARE_SCREENSHOTS
-#: Merge.rc:274 Merge.rc:1247
+#: Merge.rc:274 Merge.rc:1257
msgid "&Screenshots"
msgstr "Captura&s de Tela"
#. IDR_POPUP_WEBPAGE_COMPARE, ID_WEB_COMPARE_FULLSIZE_SCREENSHOTS
-#: Merge.rc:275 Merge.rc:1248
+#: Merge.rc:275 Merge.rc:1258
msgid "&Full Size Screenshots"
msgstr "Ca&pturas de Tela em Tamanho Real"
#. IDR_POPUP_WEBPAGE_COMPARE, ID_WEB_COMPARE_HTMLS
-#: Merge.rc:276 Merge.rc:1249
+#: Merge.rc:276 Merge.rc:1259
msgid "&HTMLs"
msgstr "&HTMLs"
#. IDR_POPUP_WEBPAGE_COMPARE, ID_WEB_COMPARE_TEXTS
-#: Merge.rc:277 Merge.rc:1250
+#: Merge.rc:277 Merge.rc:1260
msgid "&Texts"
msgstr "&Textos"
#. IDR_POPUP_WEBPAGE_COMPARE, ID_WEB_COMPARE_RESOURCETREES
-#: Merge.rc:278 Merge.rc:1251
+#: Merge.rc:278 Merge.rc:1261
msgid "&Resource Trees"
msgstr "Árvores de &Recursos"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_SIZE
-#: Merge.rc:280 Merge.rc:1775
+#: Merge.rc:280 Merge.rc:1785
msgid "&Size"
msgstr "T&amanho"
@@ -428,27 +428,27 @@ msgid "&Event Sync"
msgstr "Sincronização de &Eventos"
#. IDR_POPUP_WEBPAGE_SYNC_EVENTS, ID_WEB_SYNC_ENABLED
-#: Merge.rc:291 Merge.rc:1259
+#: Merge.rc:291 Merge.rc:1269
msgid "&Enabled"
msgstr "&Habilitado"
#. IDR_POPUP_WEBPAGE_SYNC_EVENTS, ID_WEB_SYNC_SCROLL
-#: Merge.rc:293 Merge.rc:1261
+#: Merge.rc:293 Merge.rc:1271
msgid "&Scroll"
msgstr "&Rolar"
#. IDR_POPUP_WEBPAGE_SYNC_EVENTS, ID_WEB_SYNC_CLICK
-#: Merge.rc:294 Merge.rc:1262
+#: Merge.rc:294 Merge.rc:1272
msgid "&Click"
msgstr "&Clicar"
#. IDR_POPUP_WEBPAGE_SYNC_EVENTS, ID_WEB_SYNC_INPUT
-#: Merge.rc:295 Merge.rc:1263
+#: Merge.rc:295 Merge.rc:1273
msgid "&Input"
msgstr "&Entrada"
#. IDR_POPUP_WEBPAGE_SYNC_EVENTS, ID_WEB_SYNC_GOBACKFORWARD
-#: Merge.rc:296 Merge.rc:1264
+#: Merge.rc:296 Merge.rc:1274
msgid "&Go Back/Forward"
msgstr "&Voltar/Avançar"
@@ -478,7583 +478,7599 @@ msgid "&All Profiles"
msgstr "&Todos os Perfis"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:310 Merge.rc:411 Merge.rc:586
+#: Merge.rc:310 Merge.rc:413 Merge.rc:590
msgid "&File"
msgstr "&Arquivo"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:312 Merge.rc:413 Merge.rc:588
+#: Merge.rc:312 Merge.rc:415 Merge.rc:592
msgid "&New"
msgstr "&Novo"
#. IDR_POPUP_COMPARE, ID_MERGE_COMPARE_TEXT
-#: Merge.rc:314 Merge.rc:322 Merge.rc:415 Merge.rc:423 Merge.rc:590
-#: Merge.rc:598 Merge.rc:649 Merge.rc:935 Merge.rc:1159 Merge.rc:1171
+#: Merge.rc:314 Merge.rc:323 Merge.rc:417 Merge.rc:426 Merge.rc:594
+#: Merge.rc:603 Merge.rc:655 Merge.rc:942 Merge.rc:1167 Merge.rc:1180
msgid "&Text"
msgstr "&Texto"
#. IDR_POPUP_COMPARE, ID_MERGE_COMPARE_TABLE
-#: Merge.rc:315 Merge.rc:323 Merge.rc:416 Merge.rc:424 Merge.rc:591
-#: Merge.rc:599 Merge.rc:650 Merge.rc:936 Merge.rc:1160 Merge.rc:1172
+#: Merge.rc:315 Merge.rc:324 Merge.rc:418 Merge.rc:427 Merge.rc:595
+#: Merge.rc:604 Merge.rc:656 Merge.rc:943 Merge.rc:1168 Merge.rc:1181
msgid "T&able"
msgstr "T&abela"
#. IDR_POPUP_COMPARE, ID_MERGE_COMPARE_HEX
-#: Merge.rc:316 Merge.rc:324 Merge.rc:417 Merge.rc:425 Merge.rc:592
-#: Merge.rc:600 Merge.rc:651 Merge.rc:937 Merge.rc:1161 Merge.rc:1173
+#: Merge.rc:316 Merge.rc:325 Merge.rc:419 Merge.rc:428 Merge.rc:596
+#: Merge.rc:605 Merge.rc:657 Merge.rc:944 Merge.rc:1169 Merge.rc:1182
msgid "&Binary"
msgstr "&Binário"
#. IDS_IMAGE_MENU
-#: Merge.rc:317 Merge.rc:325 Merge.rc:418 Merge.rc:426 Merge.rc:593
-#: Merge.rc:601 Merge.rc:652 Merge.rc:938 Merge.rc:1162 Merge.rc:1174
-#: Merge.rc:5123
+#: Merge.rc:317 Merge.rc:326 Merge.rc:420 Merge.rc:429 Merge.rc:597
+#: Merge.rc:606 Merge.rc:658 Merge.rc:945 Merge.rc:1170 Merge.rc:1183
+#: Merge.rc:5133
msgid "&Image"
msgstr "&Imagem"
#. IDR_POPUP_COMPARE, ID_MERGE_COMPARE_WEBPAGE
-#: Merge.rc:318 Merge.rc:326 Merge.rc:419 Merge.rc:427 Merge.rc:594
-#: Merge.rc:602 Merge.rc:653 Merge.rc:939 Merge.rc:1163 Merge.rc:1175
+#: Merge.rc:318 Merge.rc:327 Merge.rc:421 Merge.rc:430 Merge.rc:598
+#: Merge.rc:607 Merge.rc:659 Merge.rc:946 Merge.rc:1171 Merge.rc:1184
msgid "&Webpage"
msgstr "Página da &Web"
+#. IDR_POPUP_NEW, ID_FILE_NEW_FOLDER
+#: Merge.rc:319 Merge.rc:328 Merge.rc:422 Merge.rc:431 Merge.rc:599
+#: Merge.rc:608 Merge.rc:1172
+msgid "&Folder"
+msgstr ""
+
#. IDR_MERGEDOCTYPE
-#: Merge.rc:320 Merge.rc:421 Merge.rc:596
+#: Merge.rc:321 Merge.rc:424 Merge.rc:601
msgid "New (&3 panes)"
msgstr "Novo (&3 painéis)"
#. IDR_MERGEDOCTYPE, ID_FILE_OPEN
-#: Merge.rc:328 Merge.rc:429 Merge.rc:604
+#: Merge.rc:330 Merge.rc:433 Merge.rc:610
msgid "&Open...\tCtrl+O"
msgstr "&Abrir...\tCtrl+O"
#. IDR_MERGEDOCTYPE, ID_FILE_OPENCONFLICT
-#: Merge.rc:329 Merge.rc:430 Merge.rc:605
+#: Merge.rc:331 Merge.rc:434 Merge.rc:611
msgid "Open Conflic&t File..."
msgstr "Abrir Arquiv&o de Conflito..."
#. IDR_MERGEDOCTYPE, ID_FILE_OPENCLIPBOARD
-#: Merge.rc:330 Merge.rc:431 Merge.rc:606
+#: Merge.rc:332 Merge.rc:435 Merge.rc:612
msgid "Open C&lipboard"
msgstr "Abrir Á&rea de Transferência"
#. IDR_POPUP_PROJECT, ID_FILE_OPENPROJECT
-#: Merge.rc:332 Merge.rc:433 Merge.rc:608 Merge.rc:1191
+#: Merge.rc:334 Merge.rc:437 Merge.rc:614 Merge.rc:1201
msgid "Open Pro&ject...\tCtrl+J"
msgstr "Abrir Pro&jeto...\tCtrl+J"
#. IDD_OPEN, ID_SAVE_PROJECT
-#: Merge.rc:333 Merge.rc:434 Merge.rc:609 Merge.rc:1193 Merge.rc:1979
+#: Merge.rc:335 Merge.rc:438 Merge.rc:615 Merge.rc:1203 Merge.rc:1989
msgid "Sa&ve Project..."
msgstr "Sal&var Projeto..."
#. IDR_MAINFRAME, ID_FILE_PROJECT_MRU_FIRST
-#: Merge.rc:335
+#: Merge.rc:337
msgid "Recent Projects"
msgstr "Projetos Recentes"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:336 Merge.rc:445 Merge.rc:657
+#: Merge.rc:338 Merge.rc:449 Merge.rc:664
msgid "Recent F&iles or Folders"
msgstr "Arqu&ivos ou Pastas Recentes"
#. IDR_MERGEDOCTYPE, ID_APP_EXIT
-#: Merge.rc:341 Merge.rc:450 Merge.rc:662
+#: Merge.rc:343 Merge.rc:454 Merge.rc:669
msgid "E&xit\tCtrl+Q"
msgstr "&Sair\tCtrl+Q"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:343 Merge.rc:452 Merge.rc:664
+#: Merge.rc:345 Merge.rc:456 Merge.rc:671
msgid "&Edit"
msgstr "&Editar"
#. IDR_MERGEDOCTYPE, ID_EDIT_PASTE
-#: Merge.rc:345 Merge.rc:671
+#: Merge.rc:347 Merge.rc:678
msgid "&Paste\tCtrl+V"
msgstr "C&olar\tCtrl+V"
#. IDR_MERGEDOCTYPE, ID_OPTIONS
-#: Merge.rc:347 Merge.rc:456 Merge.rc:693
+#: Merge.rc:349 Merge.rc:460 Merge.rc:700
msgid "&Options...\tCtrl+,"
msgstr "O&pções...\tCtrl+,"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:349 Merge.rc:458 Merge.rc:695
+#: Merge.rc:351 Merge.rc:462 Merge.rc:702
msgid "&View"
msgstr "&Ver"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:351 Merge.rc:500 Merge.rc:744
+#: Merge.rc:353 Merge.rc:504 Merge.rc:751
msgid "Ta&b Bar"
msgstr "Ba&rra de Abas"
#. IDR_MERGEDOCTYPE, ID_VIEW_TAB_BAR
-#: Merge.rc:353 Merge.rc:502 Merge.rc:746
+#: Merge.rc:355 Merge.rc:506 Merge.rc:753
msgid "&View Tab Bar"
msgstr "&Ver Barra de Abas"
#. IDR_MERGEDOCTYPE, ID_VIEW_TAB_BAR_ON_TITLE_BAR
-#: Merge.rc:354 Merge.rc:503 Merge.rc:747
+#: Merge.rc:356 Merge.rc:507 Merge.rc:754
msgid "&On Title Bar"
msgstr "Na Barra de Títul&os"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:356 Merge.rc:505 Merge.rc:749
+#: Merge.rc:358 Merge.rc:509 Merge.rc:756
msgid "&Toolbar"
msgstr "&Barra de Ferramentas"
#. IDR_MERGEDOCTYPE, ID_TOOLBAR_SMALL
-#: Merge.rc:359 Merge.rc:508 Merge.rc:752
+#: Merge.rc:361 Merge.rc:512 Merge.rc:759
msgid "&Small"
msgstr "&Pequena"
#. IDR_MERGEDOCTYPE, ID_TOOLBAR_MEDIUM
-#: Merge.rc:360 Merge.rc:509 Merge.rc:753
+#: Merge.rc:362 Merge.rc:513 Merge.rc:760
msgid "&Medium"
msgstr "&Média"
#. IDR_MERGEDOCTYPE, ID_TOOLBAR_BIG
-#: Merge.rc:361 Merge.rc:510 Merge.rc:754
+#: Merge.rc:363 Merge.rc:514 Merge.rc:761
msgid "&Big"
msgstr "&Grande"
#. IDR_MERGEDOCTYPE, ID_TOOLBAR_HUGE
-#: Merge.rc:362 Merge.rc:511 Merge.rc:755
+#: Merge.rc:364 Merge.rc:515 Merge.rc:762
msgid "&Huge"
msgstr "&Enorme"
#. IDS_VIEW_MENU_BAR
-#: Merge.rc:364 Merge.rc:513 Merge.rc:757 Merge.rc:5357
+#: Merge.rc:366 Merge.rc:517 Merge.rc:764 Merge.rc:5368
msgid "Men&u Bar"
msgstr "Barra de Men&us"
#. IDR_DIRDOCTYPE, ID_VIEW_OUTPUT_BAR
-#: Merge.rc:365 Merge.rc:515
+#: Merge.rc:367 Merge.rc:519
msgid "&Output Pane"
msgstr "&Painel de Saída"
#. IDR_MERGEDOCTYPE, ID_VIEW_STATUS_BAR
-#: Merge.rc:366 Merge.rc:516 Merge.rc:758
+#: Merge.rc:368 Merge.rc:520 Merge.rc:765
msgid "&Status Bar"
msgstr "Barra &de Status"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:368 Merge.rc:539 Merge.rc:847
+#: Merge.rc:370 Merge.rc:543 Merge.rc:854
msgid "&Tools"
msgstr "&Ferramentas"
#. IDR_MERGEDOCTYPE, ID_TOOLS_FILTERS
-#: Merge.rc:370 Merge.rc:542 Merge.rc:849
+#: Merge.rc:372 Merge.rc:546 Merge.rc:856
msgid "&Filters..."
msgstr "F&iltros..."
#. IDR_MERGEDOCTYPE, ID_TOOLS_GENERATEPATCH
-#: Merge.rc:371 Merge.rc:543 Merge.rc:850
+#: Merge.rc:373 Merge.rc:547 Merge.rc:857
msgid "&Generate Patch..."
msgstr "&Gerar Patch..."
#. IDR_MERGEDOCTYPE
-#: Merge.rc:373 Merge.rc:546 Merge.rc:853
+#: Merge.rc:375 Merge.rc:550 Merge.rc:860
msgid "&Plugins"
msgstr "&Plugins"
#. IDD_PLUGINS_LIST, IDC_PLUGIN_SETTINGS
-#: Merge.rc:375 Merge.rc:548 Merge.rc:855 Merge.rc:2494 Merge.rc:2926
+#: Merge.rc:377 Merge.rc:552 Merge.rc:862 Merge.rc:2504 Merge.rc:2936
msgid "P&lugin Settings..."
msgstr "C&onfigurações de Plugin..."
#. IDR_MERGEDOCTYPE, ID_PREDIFFER_MANUAL
-#: Merge.rc:377 Merge.rc:550 Merge.rc:857
+#: Merge.rc:379 Merge.rc:554 Merge.rc:864
msgid "Ma&nual Prediffer"
msgstr "Pré-Diferenciação Ma&nual"
#. IDR_MERGEDOCTYPE, ID_PREDIFFER_AUTO
-#: Merge.rc:378 Merge.rc:551 Merge.rc:858
+#: Merge.rc:380 Merge.rc:555 Merge.rc:865
msgid "A&utomatic Prediffer"
msgstr "Pré-Diferenciação A&utomática"
#. IDR_MERGEDOCTYPE, ID_UNPACK_MANUAL
-#: Merge.rc:380 Merge.rc:553 Merge.rc:860
+#: Merge.rc:382 Merge.rc:557 Merge.rc:867
msgid "&Manual Unpacking"
msgstr "Descompactação &Manual"
#. IDR_MERGEDOCTYPE, ID_UNPACK_AUTO
-#: Merge.rc:381 Merge.rc:554 Merge.rc:861
+#: Merge.rc:383 Merge.rc:558 Merge.rc:868
msgid "&Automatic Unpacking"
msgstr "Descompactação &Automática"
#. IDR_MERGEDOCTYPE, ID_RELOAD_PLUGINS
-#: Merge.rc:383 Merge.rc:558 Merge.rc:889
+#: Merge.rc:385 Merge.rc:562 Merge.rc:896
msgid "&Reload Plugins"
msgstr "&Recarregar Plugins"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:385 Merge.rc:560 Merge.rc:891
+#: Merge.rc:387 Merge.rc:564 Merge.rc:898
msgid "&Window"
msgstr "&Janela"
#. IDR_MERGEDOCTYPE, ID_FILE_CLOSE
-#: Merge.rc:387 Merge.rc:562 Merge.rc:893
+#: Merge.rc:389 Merge.rc:566 Merge.rc:900
msgid "Cl&ose\tCtrl+W"
msgstr "Fe&char\tCtrl+W"
#. IDR_MERGEDOCTYPE, ID_WINDOW_CLOSEALL
-#: Merge.rc:388 Merge.rc:563 Merge.rc:894
+#: Merge.rc:390 Merge.rc:567 Merge.rc:901
msgid "Clo&se All"
msgstr "Fec&har Tudo"
#. IDR_MERGEDOCTYPE, ID_NEXT_PANE
-#: Merge.rc:390 Merge.rc:565 Merge.rc:896
+#: Merge.rc:392 Merge.rc:569 Merge.rc:903
msgid "Change &Pane\tF6"
msgstr "Mudar &Painel\tF6"
#. IDR_MERGEDOCTYPE, ID_WINDOW_TILE_HORZ
-#: Merge.rc:392 Merge.rc:567 Merge.rc:900
+#: Merge.rc:394 Merge.rc:571 Merge.rc:907
msgid "Tile &Horizontally"
msgstr "Lado a Lado H&orizontalmente"
#. IDR_MERGEDOCTYPE, ID_WINDOW_TILE_VERT
-#: Merge.rc:393 Merge.rc:568 Merge.rc:901
+#: Merge.rc:395 Merge.rc:572 Merge.rc:908
msgid "Tile &Vertically"
msgstr "Lado a Lado &Verticalmente"
#. IDR_MERGEDOCTYPE, ID_WINDOW_CASCADE
-#: Merge.rc:394 Merge.rc:569 Merge.rc:902
+#: Merge.rc:396 Merge.rc:573 Merge.rc:909
msgid "&Cascade"
msgstr "&Em Cascata"
#. IDS_MESSAGEBOX_HELP
-#: Merge.rc:396 Merge.rc:571 Merge.rc:904 Merge.rc:3200 Merge.rc:4189
+#: Merge.rc:398 Merge.rc:575 Merge.rc:911 Merge.rc:3210 Merge.rc:4199
msgid "&Help"
msgstr "Aj&uda"
#. IDR_MERGEDOCTYPE, ID_HELP_CONTENTS
-#: Merge.rc:398 Merge.rc:573 Merge.rc:906
+#: Merge.rc:400 Merge.rc:577 Merge.rc:913
msgid "&WinMerge Help\tF1"
msgstr "Ajuda do &WinMerge\tF1"
#. IDR_MERGEDOCTYPE, ID_HELP_RELEASENOTES
-#: Merge.rc:400 Merge.rc:575 Merge.rc:908
+#: Merge.rc:402 Merge.rc:579 Merge.rc:915
msgid "R&elease Notes"
msgstr "&Notas de Lançamento"
#. IDR_MERGEDOCTYPE, ID_HELP_TRANSLATIONS
-#: Merge.rc:401 Merge.rc:576 Merge.rc:909
+#: Merge.rc:403 Merge.rc:580 Merge.rc:916
msgid "&Translations"
msgstr "&Traduções"
#. IDR_MERGEDOCTYPE, ID_HELP_GETCONFIG
-#: Merge.rc:402 Merge.rc:577 Merge.rc:910
+#: Merge.rc:404 Merge.rc:581 Merge.rc:917
msgid "C&onfiguration"
msgstr "C&onfiguração"
#. IDR_MERGEDOCTYPE, ID_HELP_GNULICENSE
-#: Merge.rc:404 Merge.rc:579 Merge.rc:912
+#: Merge.rc:406 Merge.rc:583 Merge.rc:919
msgid "&GNU General Public License"
msgstr "&Licença Pública Geral do GNU"
#. IDR_MERGEDOCTYPE, ID_APP_ABOUT
-#: Merge.rc:405 Merge.rc:580 Merge.rc:913
+#: Merge.rc:407 Merge.rc:584 Merge.rc:920
msgid "&About WinMerge..."
msgstr "&Sobre o WinMerge..."
#. IDR_MERGEDOCTYPE
-#: Merge.rc:436 Merge.rc:629
+#: Merge.rc:440 Merge.rc:635
msgid "&Read-Only"
msgstr "&Somente Leitura"
#. IDR_MERGEDOCTYPE, ID_FILE_LEFT_READONLY
-#: Merge.rc:438 Merge.rc:631
+#: Merge.rc:442 Merge.rc:637
msgid "L&eft Read-Only"
msgstr "S&omente Leitura à Esquerda"
#. IDR_MERGEDOCTYPE, ID_FILE_MIDDLE_READONLY
-#: Merge.rc:439 Merge.rc:632
+#: Merge.rc:443 Merge.rc:638
msgid "M&iddle Read-Only"
msgstr "Somente Leitura no &Meio"
#. IDR_MERGEDOCTYPE, ID_FILE_RIGHT_READONLY
-#: Merge.rc:440 Merge.rc:633
+#: Merge.rc:444 Merge.rc:639
msgid "Ri&ght Read-Only"
msgstr "Somente Leitura à &Direita"
#. IDD_ENCODINGERROR, IDC_FILEENCODING
-#: Merge.rc:443 Merge.rc:646 Merge.rc:1038 Merge.rc:3063
+#: Merge.rc:447 Merge.rc:652 Merge.rc:1046 Merge.rc:3073
msgid "&File Encoding..."
msgstr "C&odificação do Arquivo..."
#. IDR_POPUP_OUTPUTVIEW, ID_EDIT_SELECT_ALL
-#: Merge.rc:454 Merge.rc:674 Merge.rc:1343
+#: Merge.rc:458 Merge.rc:681 Merge.rc:1353
msgid "Select &All\tCtrl+A"
msgstr "Selecionar &Tudo\tCtrl+A"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWIDENTICAL
-#: Merge.rc:460
+#: Merge.rc:464
msgid "Show &Identical Items"
msgstr "Mostrar &Itens Idênticos"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWDIFFERENT
-#: Merge.rc:461
+#: Merge.rc:465
msgid "Show &Different Items"
msgstr "Mostrar Itens &Diferentes"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWUNIQUELEFT
-#: Merge.rc:462
+#: Merge.rc:466
msgid "Show L&eft Unique Items"
msgstr "Mostrar I&tens Únicos à Esquerda"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWUNIQUEMIDDLE
-#: Merge.rc:463
+#: Merge.rc:467
msgid "Show Midd&le Unique Items"
msgstr "Mostrar It&ens Únicos no Meio"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWUNIQUERIGHT
-#: Merge.rc:464
+#: Merge.rc:468
msgid "Show Ri&ght Unique Items"
msgstr "Mostrar Ite&ns Únicos à Direita"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWSKIPPED
-#: Merge.rc:465
+#: Merge.rc:469
msgid "Show S&kipped Items"
msgstr "Mostrar Iten&s Pulados"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWBINARIES
-#: Merge.rc:466
+#: Merge.rc:470
msgid "S&how Binary Files"
msgstr "M&ostrar Arquivos Binários"
#. IDR_DIRDOCTYPE
-#: Merge.rc:467
+#: Merge.rc:471
msgid "&3-way Compare"
msgstr "&Comparação Tripla"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWDIFFERENTLEFTONLY
-#: Merge.rc:469
+#: Merge.rc:473
msgid "Show &Left Only Different Items"
msgstr "Mostrar Só Itens Diferentes à &Esquerda"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWDIFFERENTMIDDLEONLY
-#: Merge.rc:470
+#: Merge.rc:474
msgid "Show &Middle Only Different Items"
msgstr "Mostrar Só Itens Diferentes no &Meio"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWDIFFERENTRIGHTONLY
-#: Merge.rc:471
+#: Merge.rc:475
msgid "Show &Right Only Different Items"
msgstr "Mostrar Só Itens Diferentes à &Direita"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWMISSINGLEFTONLY
-#: Merge.rc:473
+#: Merge.rc:477
msgid "Show L&eft Only Missing Items"
msgstr "Mostrar Só &Itens Ausentes à Esquerda"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWMISSINGMIDDLEONLY
-#: Merge.rc:474
+#: Merge.rc:478
msgid "Show Mi&ddle Only Missing Items"
msgstr "Mostrar Só I&tens Ausentes no Meio"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWMISSINGRIGHTONLY
-#: Merge.rc:475
+#: Merge.rc:479
msgid "Show Rig&ht Only Missing Items"
msgstr "Mostrar Só It&ens Ausentes à Direita"
#. IDR_DIRDOCTYPE, ID_VIEW_SHOWHIDDENITEMS
-#: Merge.rc:478
+#: Merge.rc:482
msgid "Show Hidd&en Items"
msgstr "Mostrar Ite&ns Ocultados"
#. IDR_DIRDOCTYPE, ID_VIEW_TREEMODE
-#: Merge.rc:480
+#: Merge.rc:484
msgid "Tree &Mode"
msgstr "&Modo Árvore"
#. IDR_DIRDOCTYPE
-#: Merge.rc:481
+#: Merge.rc:485
msgid "E&xpand Subfolders"
msgstr "E&xpandir Subpastas"
#. IDR_DIRDOCTYPE, ID_VIEW_EXPAND_ALLSUBDIRS
-#: Merge.rc:483
+#: Merge.rc:487
msgid "&All Subfolders"
msgstr "Tod&as as Subpastas"
#. IDR_DIRDOCTYPE, ID_VIEW_EXPAND_DIFFERENT_SUBDIRS
-#: Merge.rc:484
+#: Merge.rc:488
msgid "&Different Subfolders"
msgstr "Subpastas &Diferentes"
#. IDR_DIRDOCTYPE, ID_VIEW_EXPAND_IDENTICAL_SUBDIRS
-#: Merge.rc:485
+#: Merge.rc:489
msgid "&Identical Subfolders"
msgstr "Subpastas &Idênticas"
#. IDR_DIRDOCTYPE, ID_VIEW_COLLAPSE_ALLSUBDIRS
-#: Merge.rc:487
+#: Merge.rc:491
msgid "&Collapse All Subfolders"
msgstr "&Retrair Todas as Subpastas"
#. IDR_DIRDOCTYPE, ID_VIEW_SHOW_EMPTY_FOLDERS
-#: Merge.rc:488
+#: Merge.rc:492
msgid "Show &Empty Folders"
msgstr "Mostrar Pastas Vazias"
#. IDR_MERGEDOCTYPE, ID_VIEW_SELECTFONT
-#: Merge.rc:490 Merge.rc:697
+#: Merge.rc:494 Merge.rc:704
msgid "Select &Font..."
msgstr "Selecionar &Fonte..."
#. IDR_MERGEDOCTYPE, ID_VIEW_USEDEFAULTFONT
-#: Merge.rc:491 Merge.rc:698
+#: Merge.rc:495 Merge.rc:705
msgid "Use Default Font"
msgstr "Usar Fonte Padrão"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:493 Merge.rc:736
+#: Merge.rc:497 Merge.rc:743
msgid "Sw&ap Panes"
msgstr "Tr&ocar os Painéis"
#. IDR_MERGEDOCTYPE, ID_SWAPPANES_SWAP12
-#: Merge.rc:495 Merge.rc:738
+#: Merge.rc:499 Merge.rc:745
msgid "Swap &1st | 2nd"
msgstr "Trocar &1º | 2º"
#. IDR_MERGEDOCTYPE, ID_SWAPPANES_SWAP23
-#: Merge.rc:496 Merge.rc:739
+#: Merge.rc:500 Merge.rc:746
msgid "Swap &2nd | 3rd"
msgstr "Trocar &2º | 3º"
#. IDR_MERGEDOCTYPE, ID_SWAPPANES_SWAP13
-#: Merge.rc:497 Merge.rc:740
+#: Merge.rc:501 Merge.rc:747
msgid "Swap 1st | &3rd"
msgstr "Trocar 1º | &3º"
#. IDR_DIRDOCTYPE, ID_VIEW_DISPLAY_FILTER_BAR_MENU
-#: Merge.rc:514
+#: Merge.rc:518
msgid "Displa&y Filter Bar\tCtrl+Shift+L"
msgstr "E&xibir Barra de Filtros\tCtrl+Shift+L"
#. IDR_DIRDOCTYPE, ID_VIEW_DIR_STATISTICS
-#: Merge.rc:518
+#: Merge.rc:522
msgid "Com&pare Statistics..."
msgstr "Com¶r Estatísticas..."
#. IDR_MERGEDOCTYPE, ID_REFRESH
-#: Merge.rc:520 Merge.rc:763
+#: Merge.rc:524 Merge.rc:770
msgid "Refresh\tF5"
msgstr "Renovar\tF5"
#. IDR_POPUP_DIRVIEW, ID_RESCAN
-#: Merge.rc:521 Merge.rc:1030
+#: Merge.rc:525 Merge.rc:1038
msgid "&Refresh Selected\tCtrl+F5"
msgstr "&Renovar os Selecionados\tCtrl+F5"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:523 Merge.rc:765
+#: Merge.rc:527 Merge.rc:772
msgid "&Merge"
msgstr "U&nir"
#. IDR_DIRDOCTYPE, ID_MERGE_COMPARE
-#: Merge.rc:525
+#: Merge.rc:529
msgid "Co&mpare\tEnter"
msgstr "Co&mparar\tEnter"
#. IDR_MERGEDOCTYPE, ID_NEXTDIFF
-#: Merge.rc:527 Merge.rc:767
+#: Merge.rc:531 Merge.rc:774
msgid "&Next Difference\tAlt+Down"
msgstr "Diferença &Seguinte\tAlt+Pra Baixo"
#. IDR_MERGEDOCTYPE, ID_PREVDIFF
-#: Merge.rc:528 Merge.rc:768
+#: Merge.rc:532 Merge.rc:775
msgid "&Previous Difference\tAlt+Up"
msgstr "Diferença &Anterior\tAlt+Pra Cima"
#. IDR_MERGEDOCTYPE, ID_FIRSTDIFF
-#: Merge.rc:530 Merge.rc:773
+#: Merge.rc:534 Merge.rc:780
msgid "&First Difference\tAlt+Home"
msgstr "&Primeira Diferença\tAlt+Home"
#. IDR_MERGEDOCTYPE, ID_CURDIFF
-#: Merge.rc:531 Merge.rc:774
+#: Merge.rc:535 Merge.rc:781
msgid "&Current Difference\tAlt+Enter"
msgstr "Diferença A&tual\tAlt+Enter"
#. IDR_MERGEDOCTYPE, ID_LASTDIFF
-#: Merge.rc:532 Merge.rc:775
+#: Merge.rc:536 Merge.rc:782
msgid "&Last Difference\tAlt+End"
msgstr "Ú<ima Diferença\tAlt+End"
#. IDR_MERGEDOCTYPE, ID_L2R
-#: Merge.rc:534 Merge.rc:830
+#: Merge.rc:538 Merge.rc:837
msgid "Copy to &Right\tAlt+Right"
msgstr "Copiar para a &Direita\tAlt+Direita"
#. IDR_MERGEDOCTYPE, ID_R2L
-#: Merge.rc:535 Merge.rc:831
+#: Merge.rc:539 Merge.rc:838
msgid "Copy to L&eft\tAlt+Left"
msgstr "Copiar para a E&squerda\tAlt+Esquerda"
#. IDR_DIRDOCTYPE, ID_MERGE_DELETE
-#: Merge.rc:537
+#: Merge.rc:541
msgid "&Delete\tDel"
msgstr "&Excluir\tDel"
#. IDR_POPUP_DIRVIEW, ID_TOOLS_CUSTOMIZECOLUMNS
-#: Merge.rc:541 Merge.rc:1042
+#: Merge.rc:545 Merge.rc:1050
msgid "&Customize Columns..."
msgstr "&Personalizar Colunas..."
#. IDR_MERGEDOCTYPE, ID_TOOLS_GENERATEREPORT
-#: Merge.rc:544 Merge.rc:851
+#: Merge.rc:548 Merge.rc:858
msgid "Generate &Report..."
msgstr "Gerar &Relatório..."
#. IDD_ENCODINGERROR, IDC_PLUGIN
-#: Merge.rc:556 Merge.rc:867 Merge.rc:3064
+#: Merge.rc:560 Merge.rc:874 Merge.rc:3074
msgid "&Edit with Unpacker..."
msgstr "&Editar com o Descompactador..."
#. IDR_MERGEDOCTYPE, ID_FILE_SAVE
-#: Merge.rc:611
+#: Merge.rc:617
msgid "&Save\tCtrl+S"
msgstr "&Salvar\tCtrl+S"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:612
+#: Merge.rc:618
msgid "Sav&e"
msgstr "Sal&var"
#. IDR_POPUP_SAVE, ID_FILE_SAVE_LEFT
-#: Merge.rc:614 Merge.rc:1201
+#: Merge.rc:620 Merge.rc:1211
msgid "Save &Left"
msgstr "Salvar o da &Esquerda"
#. IDR_POPUP_SAVE, ID_FILE_SAVE_MIDDLE
-#: Merge.rc:615 Merge.rc:1202
+#: Merge.rc:621 Merge.rc:1212
msgid "Save &Middle"
msgstr "Salvar o do &Meio"
#. IDR_POPUP_SAVE, ID_FILE_SAVE_RIGHT
-#: Merge.rc:616 Merge.rc:1203
+#: Merge.rc:622 Merge.rc:1213
msgid "Save &Right"
msgstr "Salvar o da &Direita"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:618
+#: Merge.rc:624
msgid "Save &As"
msgstr "Salvar &Como"
#. IDR_POPUP_SAVE, ID_FILE_SAVEAS_LEFT
-#: Merge.rc:620 Merge.rc:1205
+#: Merge.rc:626 Merge.rc:1215
msgid "Save &Left As..."
msgstr "Salvar o da &Esquerda Como..."
#. IDR_POPUP_SAVE, ID_FILE_SAVEAS_MIDDLE
-#: Merge.rc:621 Merge.rc:1206
+#: Merge.rc:627 Merge.rc:1216
msgid "Save &Middle As..."
msgstr "Salvar o do &Meio Como..."
#. IDR_POPUP_SAVE, ID_FILE_SAVEAS_RIGHT
-#: Merge.rc:622 Merge.rc:1207
+#: Merge.rc:628 Merge.rc:1217
msgid "Save &Right As..."
msgstr "Salvar o da &Direita Como..."
#. IDR_MERGEDOCTYPE, ID_FILE_PRINT
-#: Merge.rc:625
+#: Merge.rc:631
msgid "&Print...\tCtrl+P"
msgstr "&Imprimir...\tCtrl+P"
#. IDR_MERGEDOCTYPE, ID_FILE_PAGE_SETUP
-#: Merge.rc:626
+#: Merge.rc:632
msgid "Page Set&up..."
msgstr "Configuração da Pá&gina..."
#. IDR_MERGEDOCTYPE, ID_FILE_PRINT_PREVIEW
-#: Merge.rc:627
+#: Merge.rc:633
msgid "Print Previe&w..."
msgstr "Pré-Visualização da Impressã&o..."
#. IDR_MERGEDOCTYPE
-#: Merge.rc:636
+#: Merge.rc:642
msgid "&Convert Line Endings to"
msgstr "&Converter Finais de Linha para"
#. IDR_MERGEDOCTYPE, ID_FILE_MERGINGMODE
-#: Merge.rc:643
+#: Merge.rc:649
msgid "Mer&ge Mode\tF9"
msgstr "Mod&o de União\tF9"
#. IDR_MERGEDOCTYPE, ID_RESCAN
-#: Merge.rc:645
+#: Merge.rc:651
msgid "Reloa&d\tCtrl+F5"
msgstr "Re&carregar\tCtrl+F5"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:647
+#: Merge.rc:653
msgid "Reco&mpare As"
msgstr "Reco&mparar Como"
+#. IDR_POPUP_COMPARE, ID_MERGE_COMPARE_FOLDER
+#: Merge.rc:660 Merge.rc:947 Merge.rc:1185
+msgid "A&rchive"
+msgstr ""
+
#. IDR_MERGEDOCTYPE, ID_EDIT_UNDO
-#: Merge.rc:666
+#: Merge.rc:673
msgid "&Undo\tCtrl+Z"
msgstr "&Desfazer\tCtrl+Z"
#. IDR_MERGEDOCTYPE, ID_EDIT_REDO
-#: Merge.rc:667
+#: Merge.rc:674
msgid "&Redo\tCtrl+Y"
msgstr "&Refazer\tCtrl+Y"
#. IDR_MERGEDOCTYPE, ID_EDIT_CUT
-#: Merge.rc:669
+#: Merge.rc:676
msgid "Cu&t\tCtrl+X"
msgstr "Co&rtar\tCtrl+X"
#. IDR_POPUP_OUTPUTVIEW, ID_EDIT_COPY
-#: Merge.rc:670 Merge.rc:1342
+#: Merge.rc:677 Merge.rc:1352
msgid "&Copy\tCtrl+C"
msgstr "&Copiar\tCtrl+C"
#. IDR_MERGEDOCTYPE, ID_EDIT_FIND
-#: Merge.rc:676
+#: Merge.rc:683
msgid "F&ind...\tCtrl+F"
msgstr "&Encontrar...\tCtrl+F"
#. IDR_MERGEDOCTYPE, ID_EDIT_REPLACE
-#: Merge.rc:677
+#: Merge.rc:684
msgid "Repla&ce...\tCtrl+H"
msgstr "Subst&ituir...\tCtrl+H"
#. IDR_MERGEDOCTYPE, ID_EDIT_MARK
-#: Merge.rc:678
+#: Merge.rc:685
msgid "&Marker...\tCtrl+Shift+M"
msgstr "&Marcador...\tCtrl+Shift+M"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:680
+#: Merge.rc:687
msgid "Advanced"
msgstr "Avançado"
#. IDR_MERGEDOCTYPE, ID_EDIT_COPY_LINENUMBERS
-#: Merge.rc:682
+#: Merge.rc:689
msgid "&Copy With Line Numbers\tCtrl+Shift+C"
msgstr "&Copiar Com Números de Linha\tCtrl+Shift+C"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:684
+#: Merge.rc:691
msgid "&Bookmarks"
msgstr "M&arcadores"
#. IDR_MERGEDOCTYPE, ID_EDIT_TOGGLE_BOOKMARK
-#: Merge.rc:686
+#: Merge.rc:693
msgid "&Toggle Bookmark\tCtrl+F2"
msgstr "&Alternar Marcador\tCtrl+F2"
#. IDR_MERGEDOCTYPE, ID_EDIT_GOTO_NEXT_BOOKMARK
-#: Merge.rc:687
+#: Merge.rc:694
msgid "&Next Bookmark\tF2"
msgstr "Marcador &Seguinte\tF2"
#. IDR_MERGEDOCTYPE, ID_EDIT_GOTO_PREV_BOOKMARK
-#: Merge.rc:688
+#: Merge.rc:695
msgid "&Previous Bookmark\tShift+F2"
msgstr "Marcador A&nterior\tShift+F2"
#. IDR_MERGEDOCTYPE, ID_EDIT_CLEAR_ALL_BOOKMARKS
-#: Merge.rc:689
+#: Merge.rc:696
msgid "&Clear All Bookmarks"
msgstr "&Limpar Todos os Marcadores"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:706
+#: Merge.rc:713
msgid "Syntax Highlight"
msgstr "Destaque de Sintaxe"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:711
+#: Merge.rc:718
msgid "&Diff Context"
msgstr "&Contexto da Diferenciação"
#. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_ALL
-#: Merge.rc:713
+#: Merge.rc:720
msgid "&All Lines"
msgstr "&Todas as Linhas"
#. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_0
-#: Merge.rc:715
+#: Merge.rc:722
msgid "&0 Lines"
msgstr "&0 Linhas"
#. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_1
-#: Merge.rc:716
+#: Merge.rc:723
msgid "&1 Line"
msgstr "&1 Linha"
#. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_3
-#: Merge.rc:717
+#: Merge.rc:724
msgid "&3 Lines"
msgstr "&3 Linhas"
#. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_5
-#: Merge.rc:718
+#: Merge.rc:725
msgid "&5 Lines"
msgstr "&5 Linhas"
#. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_7
-#: Merge.rc:719
+#: Merge.rc:726
msgid "&7 Lines"
msgstr "&7 Linhas"
#. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_9
-#: Merge.rc:720
+#: Merge.rc:727
msgid "&9 Lines"
msgstr "&9 Linhas"
#. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_TOGGLE
-#: Merge.rc:722
+#: Merge.rc:729
msgid "&Toggle All and 0-9 Lines\tCtrl+D"
msgstr "&Alternar Tudo e Linhas 0-9\tCtrl+D"
#. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_INVERT
-#: Merge.rc:724
+#: Merge.rc:731
msgid "&Invert (Hide Different Lines)"
msgstr "&Inverter (Ocultar Linhas Diferentes)"
#. IDR_MERGEDOCTYPE, ID_VIEW_RESIZE_PANES
-#: Merge.rc:727
+#: Merge.rc:734
msgid "&Lock Panes"
msgstr "&Travar os Painéis"
#. IDR_MERGEDOCTYPE, ID_VIEW_WHITESPACE
-#: Merge.rc:728
+#: Merge.rc:735
msgid "&View Whitespace"
msgstr "&Ver Espaços em Branco"
#. IDR_MERGEDOCTYPE, ID_VIEW_EOL
-#: Merge.rc:729
+#: Merge.rc:736
msgid "View E&OL"
msgstr "Ver E&OL"
#. IDR_MERGEDOCTYPE, ID_VIEW_LINEDIFFS
-#: Merge.rc:730
+#: Merge.rc:737
msgid "Vie&w Line Differences"
msgstr "V&er Diferenças de Linha"
#. IDR_MERGEDOCTYPE, ID_VIEW_LINENUMBERS
-#: Merge.rc:731
+#: Merge.rc:738
msgid "View Line &Numbers"
msgstr "Ver &Números de Linha"
#. IDR_MERGEDOCTYPE, ID_VIEW_SELMARGIN
-#: Merge.rc:732
+#: Merge.rc:739
msgid "View &Margins"
msgstr "Ver &Margens"
#. IDR_MERGEDOCTYPE, ID_VIEW_TOPMARGIN
-#: Merge.rc:733
+#: Merge.rc:740
msgid "View To&p Margins"
msgstr "Ver Margens &Superiores"
#. IDR_MERGEDOCTYPE, ID_VIEW_WORDWRAP
-#: Merge.rc:734
+#: Merge.rc:741
msgid "W&rap Lines"
msgstr "&Quebrar Linhas"
#. IDR_MERGEDOCTYPE, ID_VIEW_SPLITVERTICALLY
-#: Merge.rc:742
+#: Merge.rc:749
msgid "Split V&ertically"
msgstr "Dividir V&erticalmente"
#. IDR_MERGEDOCTYPE, ID_VIEW_DETAIL_BAR
-#: Merge.rc:759
+#: Merge.rc:766
msgid "Diff &Pane"
msgstr "Painel da Di&ferenciação"
#. IDR_MERGEDOCTYPE, ID_VIEW_LOCATION_BAR
-#: Merge.rc:760
+#: Merge.rc:767
msgid "Lo&cation Pane"
msgstr "Pa&inel de Localização"
#. IDS_OUTPUTBAR_CAPTION
-#: Merge.rc:761 Merge.rc:4902
+#: Merge.rc:768 Merge.rc:4912
msgid "Output Pane"
msgstr "Painel de Saída"
#. IDR_MERGEDOCTYPE, ID_NEXTCONFLICT
-#: Merge.rc:770
+#: Merge.rc:777
msgid "Ne&xt Conflict\tAlt+Shift+Down"
msgstr "Co&nflito Seguinte\tAlt+Shift+Pra Baixo"
#. IDR_MERGEDOCTYPE, ID_PREVCONFLICT
-#: Merge.rc:771
+#: Merge.rc:778
msgid "Pre&vious Conflict\tAlt+Shift+Up"
msgstr "Con&flito Anterior\tAlt+Shift+Pra Cima"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:777
+#: Merge.rc:784
msgid "A&dvanced"
msgstr "A&vançado"
#. IDR_MERGEDOCTYPE, ID_NEXTDIFFLM
-#: Merge.rc:779
+#: Merge.rc:786
msgid "Next Difference (Left/Middle)\tAlt+1"
msgstr "Diferença Seguinte (Esquerda/Meio)\tAlt+1"
#. IDR_MERGEDOCTYPE, ID_PREVDIFFLM
-#: Merge.rc:780
+#: Merge.rc:787
msgid "Previous Difference (Left/Middle)\tAlt+Shift+1"
msgstr "Diferença Anterior (Esquerda/Meio)\tAlt+Shift+1"
#. IDR_MERGEDOCTYPE, ID_NEXTDIFFLR
-#: Merge.rc:782
+#: Merge.rc:789
msgid "Next Difference (Left/Right)\tAlt+2"
msgstr "Diferença Seguinte (Esquerda/Direita)\tAlt+2"
#. IDR_MERGEDOCTYPE, ID_PREVDIFFLR
-#: Merge.rc:783
+#: Merge.rc:790
msgid "Previous Difference (Left/Right)\tAlt+Shift+2"
msgstr "Diferença Anterior (Esquerda/Direita)\tAlt+Shift+2"
#. IDR_MERGEDOCTYPE, ID_NEXTDIFFMR
-#: Merge.rc:785
+#: Merge.rc:792
msgid "Next Difference (Middle/Right)\tAlt+3"
msgstr "Diferença Seguinte (Meio/Direita)\tAlt+3"
#. IDR_MERGEDOCTYPE, ID_PREVDIFFMR
-#: Merge.rc:786
+#: Merge.rc:793
msgid "Previous Difference (Middle/Right)\tAlt+Shift+3"
msgstr "Diferença Anterior (Meio/Direita)\tAlt+Shift+3"
#. IDR_MERGEDOCTYPE, ID_NEXTDIFFLO
-#: Merge.rc:788
+#: Merge.rc:795
msgid "Next Left-Only Difference\tAlt+7"
msgstr "Diferença Seguinte Apenas à Esquerda\tAlt+7"
#. IDR_MERGEDOCTYPE, ID_PREVDIFFLO
-#: Merge.rc:789
+#: Merge.rc:796
msgid "Previous Left-Only Difference\tAlt+Shift+7"
msgstr "Diferença Anterior Apenas à Esquerda\tAlt+Shift+7"
#. IDR_MERGEDOCTYPE, ID_NEXTDIFFMO
-#: Merge.rc:791
+#: Merge.rc:798
msgid "Next Middle-Only Difference\tAlt+8"
msgstr "Diferença Seguinte Apenas no Meio\tAlt+8"
#. IDR_MERGEDOCTYPE, ID_PREVDIFFMO
-#: Merge.rc:792
+#: Merge.rc:799
msgid "Previous Middle-Only Difference\tAlt+Shift+8"
msgstr "Diferença Anterior Apenas no Meio\tAlt+Shift+8"
#. IDR_MERGEDOCTYPE, ID_NEXTDIFFRO
-#: Merge.rc:794
+#: Merge.rc:801
msgid "Next Right-Only Difference\tAlt+9"
msgstr "Diferença Seguinte Apenas à Direita\tAlt+9"
#. IDR_MERGEDOCTYPE, ID_PREVDIFFRO
-#: Merge.rc:795
+#: Merge.rc:802
msgid "Previous Right-Only Difference\tAlt+Shift+9"
msgstr "Diferença Anterior Apenas à Direita\tAlt+Shift+9"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:797
+#: Merge.rc:804
msgid "Copy from &Left to"
msgstr "Copiar da &Esquerda para"
#. IDD_LOAD_SAVE_CODEPAGE, IDC_AFFECTS_MIDDLE_BTN
-#: Merge.rc:799 Merge.rc:810 Merge.rc:815 Merge.rc:826 Merge.rc:970
-#: Merge.rc:2545 Merge.rc:2817
+#: Merge.rc:806 Merge.rc:817 Merge.rc:822 Merge.rc:833 Merge.rc:978
+#: Merge.rc:2555 Merge.rc:2827
msgid "&Middle"
msgstr "o &Meio"
#. IDD_LOAD_SAVE_CODEPAGE, IDC_AFFECTS_RIGHT_BTN
-#: Merge.rc:800 Merge.rc:805 Merge.rc:816 Merge.rc:821 Merge.rc:971
-#: Merge.rc:2546 Merge.rc:2819
+#: Merge.rc:807 Merge.rc:812 Merge.rc:823 Merge.rc:828 Merge.rc:979
+#: Merge.rc:2556 Merge.rc:2829
msgid "&Right"
msgstr "a &Direita"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:802
+#: Merge.rc:809
msgid "Copy from &Middle to"
msgstr "Copiar do &Meio para"
#. IDD_LOAD_SAVE_CODEPAGE, IDC_AFFECTS_LEFT_BTN
-#: Merge.rc:804 Merge.rc:809 Merge.rc:820 Merge.rc:825 Merge.rc:969
-#: Merge.rc:2544 Merge.rc:2815
+#: Merge.rc:811 Merge.rc:816 Merge.rc:827 Merge.rc:832 Merge.rc:977
+#: Merge.rc:2554 Merge.rc:2825
msgid "&Left"
msgstr "a &Esquerda"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:807
+#: Merge.rc:814
msgid "Copy from &Right to"
msgstr "Copiar da &Direita para"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:813
+#: Merge.rc:820
msgid "Copy Selected Lines from Le&ft to"
msgstr "Copiar Linhas Selecionadas da E&squerda para"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:818
+#: Merge.rc:825
msgid "Copy Selected Lines from Mi&ddle to"
msgstr "Copiar Linhas Selecionadas do Me&io para"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:823
+#: Merge.rc:830
msgid "Copy Selected Lines from Ri&ght to"
msgstr "Copiar Linhas Selecionadas da Di&reita para"
#. IDR_MERGEDOCTYPE, ID_COPY_FROM_LEFT
-#: Merge.rc:833
+#: Merge.rc:840
msgid "Copy from Left\tAlt+Shift+Right"
msgstr "Copiar da Esquerda\tAlt+Shift+Direita"
#. IDR_MERGEDOCTYPE, ID_COPY_FROM_RIGHT
-#: Merge.rc:834
+#: Merge.rc:841
msgid "Copy from Right\tAlt+Shift+Left"
msgstr "Copiar da Direita\tAlt+Shift+Esquerda"
#. IDR_MERGEDOCTYPE, ID_L2RNEXT
-#: Merge.rc:836
+#: Merge.rc:843
msgid "C&opy to Right and Advance\tCtrl+Alt+Right"
msgstr "C&opiar para a Direita e Avançar\tCtrl+Alt+Direita"
#. IDR_MERGEDOCTYPE, ID_R2LNEXT
-#: Merge.rc:837
+#: Merge.rc:844
msgid "Copy &to Left and Advance\tCtrl+Alt+Left"
msgstr "Copiar ¶ a Esquerda e Avançar\tCtrl+Alt+Esquerda"
#. IDR_MERGEDOCTYPE, ID_ALL_RIGHT
-#: Merge.rc:839
+#: Merge.rc:846
msgid "Copy &All to Right"
msgstr "Copiar &Tudo para a Direita"
#. IDR_MERGEDOCTYPE, ID_ALL_LEFT
-#: Merge.rc:840
+#: Merge.rc:847
msgid "Cop&y All to Left"
msgstr "Cop&iar Tudo para a Esquerda"
#. IDR_MERGEDOCTYPE, ID_AUTO_MERGE
-#: Merge.rc:842
+#: Merge.rc:849
msgid "A&uto Merge\tCtrl+Alt+M"
msgstr "&Unir Automaticamente\tCtrl+Alt+M"
#. IDR_MERGEDOCTYPE, ID_ADD_SYNCPOINT
-#: Merge.rc:844
+#: Merge.rc:851
msgid "Add &Synchronization Point\tAlt+S"
msgstr "Adicionar &Ponto de Sincronização\tAlt+S"
#. IDR_MERGEDOCTYPE, ID_CLEAR_SYNCPOINTS
-#: Merge.rc:845
+#: Merge.rc:852
msgid "Clear Sync&hronization Points"
msgstr "Limpar Pont&os de Sincronização"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:863
+#: Merge.rc:870
msgid "Unpac&ker"
msgstr "Descompacta&dor"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:869
+#: Merge.rc:876
msgid "&Prediffer"
msgstr "&Pré-Diferenciação"
#. IDR_MERGEDOCTYPE, ID_APPLY_PREDIFFER
-#: Merge.rc:873
+#: Merge.rc:880
msgid "Apply Pre&differ..."
msgstr "Aplicar Pré-&Diferenciação..."
#. IDR_MERGEDOCTYPE, ID_TRANSFORM_WITH_SCRIPT
-#: Merge.rc:879
+#: Merge.rc:886
msgid "&Transform with Editor Script..."
msgstr "&Transformar com o Script do Editor..."
#. IDR_MERGEDOCTYPE
-#: Merge.rc:880
+#: Merge.rc:887
msgid "Scripts for &Copying"
msgstr "Scripts para &Copiar"
#. IDR_MERGEDOCTYPE, ID_SELECT_EDITOR_SCRIPT_FOR_COPYING
-#: Merge.rc:886
+#: Merge.rc:893
msgid "Select &Editor Script..."
msgstr "Selecionar Script do &Editor..."
#. IDR_MERGEDOCTYPE, ID_WINDOW_SPLIT
-#: Merge.rc:898
+#: Merge.rc:905
msgid "Sp&lit"
msgstr "Di&vidir"
#. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE
-#: Merge.rc:921
+#: Merge.rc:928
msgid "Comp&are"
msgstr "Comp&arar"
#. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE_WITH_MOVED_RENAMED
-#: Merge.rc:922
+#: Merge.rc:929
msgid "Compar&e with Renamed/Moved Items"
msgstr "Comparar com It&ens Renomeados/Movidos"
#. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE_IN_NEW_WINDOW
-#: Merge.rc:923
+#: Merge.rc:930
msgid "Compare in New &Window"
msgstr "Comparar em Nova &Janela"
#. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE_NONHORIZONTALLY
-#: Merge.rc:924 Merge.rc:931
+#: Merge.rc:931 Merge.rc:938
msgid "Compare Non-hor&izontally..."
msgstr "Comparar Não Hor&izontalmente..."
#. IDR_POPUP_DIRVIEW
-#: Merge.rc:925
+#: Merge.rc:932
msgid "Compare Non-hor&izontally"
msgstr "Comparar Não Hor&izontalmente"
#. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE_LEFT1_LEFT2
-#: Merge.rc:927
+#: Merge.rc:934
msgid "First &Left with Second Left"
msgstr "Primeiro à &Esquerda com o Segundo à Esquerda"
#. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE_RIGHT1_RIGHT2
-#: Merge.rc:928
+#: Merge.rc:935
msgid "First &Right with Second Right"
msgstr "Primeiro à &Direita com o Segundo à Direita"
#. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE_LEFT1_RIGHT2
-#: Merge.rc:929
+#: Merge.rc:936
msgid "&First Left with Second Right"
msgstr "&Primeiro à Esquerda com o Segundo à Direita"
#. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE_LEFT2_RIGHT1
-#: Merge.rc:930
+#: Merge.rc:937
msgid "&Second Left with First Right"
msgstr "&Segundo à Esquerda com o Primeiro à Direita"
#. IDR_POPUP_DIRVIEW
-#: Merge.rc:933
+#: Merge.rc:940
msgid "Co&mpare As"
msgstr "Co&mparar Como"
#. IDS_COPY_LEFT_TO_MIDDLE2
-#: Merge.rc:945 Merge.rc:957 Merge.rc:4502
+#: Merge.rc:953 Merge.rc:965 Merge.rc:4512
#, c-format
msgid "Left to Middle (%1 of %2)"
msgstr "Da Esquerda para o Meio (%1 de %2)"
#. IDS_COPY_LEFT_TO_RIGHT2
-#: Merge.rc:946 Merge.rc:958 Merge.rc:4501
+#: Merge.rc:954 Merge.rc:966 Merge.rc:4511
#, c-format
msgid "Left to Right (%1 of %2)"
msgstr "Da Esquerda para a Direita (%1 de %2)"
#. IDS_MOVE_LEFT_TO2
-#: Merge.rc:947 Merge.rc:959 Merge.rc:1022 Merge.rc:4513 Merge.rc:4542
+#: Merge.rc:955 Merge.rc:967 Merge.rc:1030 Merge.rc:4523 Merge.rc:4552
#, c-format
msgid "Left to... (%1 of %2)"
msgstr "Da Esquerda para... (%1 de %2)"
#. IDS_COPY_MIDDLE_TO_LEFT2
-#: Merge.rc:948 Merge.rc:960 Merge.rc:4499
+#: Merge.rc:956 Merge.rc:968 Merge.rc:4509
#, c-format
msgid "Middle to Left (%1 of %2)"
msgstr "Do Meio para a Esquerda (%1 de %2)"
#. IDS_COPY_MIDDLE_TO_RIGHT2
-#: Merge.rc:949 Merge.rc:961 Merge.rc:4500
+#: Merge.rc:957 Merge.rc:969 Merge.rc:4510
#, c-format
msgid "Middle to Right (%1 of %2)"
msgstr "Do Meio para a Direita (%1 de %2)"
#. IDS_MOVE_MIDDLE_TO2
-#: Merge.rc:950 Merge.rc:962 Merge.rc:1023 Merge.rc:4514 Merge.rc:4543
+#: Merge.rc:958 Merge.rc:970 Merge.rc:1031 Merge.rc:4524 Merge.rc:4553
#, c-format
msgid "Middle to... (%1 of %2)"
msgstr "Do Meio para... (%1 de %2)"
#. IDS_COPY_RIGHT_TO_MIDDLE2
-#: Merge.rc:951 Merge.rc:963 Merge.rc:4498
+#: Merge.rc:959 Merge.rc:971 Merge.rc:4508
#, c-format
msgid "Right to Middle (%1 of %2)"
msgstr "Da Direita para o Meio (%1 de %2)"
#. IDS_COPY_RIGHT_TO_LEFT2
-#: Merge.rc:952 Merge.rc:964 Merge.rc:4497
+#: Merge.rc:960 Merge.rc:972 Merge.rc:4507
#, c-format
msgid "Right to Left (%1 of %2)"
msgstr "Da Direita para a Esquerda (%1 de %2)"
#. IDS_MOVE_RIGHT_TO2
-#: Merge.rc:953 Merge.rc:965 Merge.rc:1024 Merge.rc:4515 Merge.rc:4544
+#: Merge.rc:961 Merge.rc:973 Merge.rc:1032 Merge.rc:4525 Merge.rc:4554
#, c-format
msgid "Right to... (%1 of %2)"
msgstr "Da Direita para... (%1 de %2)"
#. IDD_EDIT_MARKER, IDC_EDIT_MARKER_DELETE
-#: Merge.rc:967 Merge.rc:2036
+#: Merge.rc:975 Merge.rc:2046
msgid "&Delete"
msgstr "&Excluir"
#. IDR_POPUP_DIRVIEW, ID_DIR_DEL_BOTH
-#: Merge.rc:972
+#: Merge.rc:980
msgid "&Both"
msgstr "&Ambos"
#. IDR_POPUP_DIRVIEW, ID_DIR_DEL_ALL
-#: Merge.rc:973
+#: Merge.rc:981
msgid "&All"
msgstr "&Tudo"
#. IDD_EDIT_REPLACE, IDC_EDIT_SCOPE_SELECTION
-#: Merge.rc:974 Merge.rc:2019
+#: Merge.rc:982 Merge.rc:2029
msgid "&Selection"
msgstr "&Seleção"
#. IDR_POPUP_DIRVIEW, ID_DIR_ITEM_RENAME
-#: Merge.rc:976
+#: Merge.rc:984
msgid "Re&name"
msgstr "Re&nomear"
#. IDR_POPUP_DIRVIEW, ID_DIR_HIDE_FILENAMES
-#: Merge.rc:977
+#: Merge.rc:985
msgid "&Hide Items"
msgstr "&Ocultar Itens"
#. IDR_POPUP_DIRVIEW
-#: Merge.rc:979
+#: Merge.rc:987
msgid "&Open Left"
msgstr "&Abrir o Esquerdo"
#. IDR_POPUP_DIRVIEW
-#: Merge.rc:986
+#: Merge.rc:994
msgid "Open Midd&le"
msgstr "Abrir o do Me&io"
#. IDR_POPUP_DIRVIEW
-#: Merge.rc:993
+#: Merge.rc:1001
msgid "O&pen Right"
msgstr "A&brir o Direito"
#. IDR_POPUP_DIRVIEW
-#: Merge.rc:1001
+#: Merge.rc:1009
msgid "Cop&y Paths"
msgstr "Cop&iar Caminhos"
#. IDS_DEL_LEFT_FMT2
-#: Merge.rc:1003 Merge.rc:1012 Merge.rc:4530
+#: Merge.rc:1011 Merge.rc:1020 Merge.rc:4540
#, c-format
msgid "Left (%1 of %2)"
msgstr "Da Esquerda (%1 de %2)"
#. IDS_DEL_MIDDLE_FMT2
-#: Merge.rc:1004 Merge.rc:1013 Merge.rc:4531
+#: Merge.rc:1012 Merge.rc:1021 Merge.rc:4541
#, c-format
msgid "Middle (%1 of %2)"
msgstr "Do Meio (%1 de %2)"
#. IDS_DEL_RIGHT_FMT2
-#: Merge.rc:1005 Merge.rc:1014 Merge.rc:4532
+#: Merge.rc:1013 Merge.rc:1022 Merge.rc:4542
#, c-format
msgid "Right (%1 of %2)"
msgstr "Da Direita (%1 de %2)"
#. IDS_DEL_BOTH_FMT2
-#: Merge.rc:1006 Merge.rc:1015 Merge.rc:4533
+#: Merge.rc:1014 Merge.rc:1023 Merge.rc:4543
#, c-format
msgid "Both (%1 of %2)"
msgstr "De Ambos(as) (%1 de %2)"
#. IDS_DEL_ALL_FMT2
-#: Merge.rc:1007 Merge.rc:1016 Merge.rc:4538
+#: Merge.rc:1015 Merge.rc:1024 Merge.rc:4548
#, c-format
msgid "All (%1 of %2)"
msgstr "De Tudo (%1 de %2)"
#. IDR_POPUP_DIRVIEW, ID_DIR_COPY_FILENAMES
-#: Merge.rc:1009
+#: Merge.rc:1017
msgid "Copy &Filenames"
msgstr "Copiar N&omes de Arquivo"
#. IDR_POPUP_DIRVIEW
-#: Merge.rc:1010
+#: Merge.rc:1018
msgid "Copy Items to Clip&board"
msgstr "Copiar Itens Para a Área de Tran&sferência"
#. IDR_POPUP_DIRVIEW, ID_DIR_COPY_ALL_DISP_COLUMNS
-#: Merge.rc:1018
+#: Merge.rc:1026
msgid "Copy All Di&splayed Columns"
msgstr "Copiar Todas as Colunas E&xibidas"
#. IDR_POPUP_DIRVIEW
-#: Merge.rc:1020
+#: Merge.rc:1028
msgid "&Zip"
msgstr "&Compactar"
#. IDS_COPY_BOTH_TO2
-#: Merge.rc:1025 Merge.rc:4516
+#: Merge.rc:1033 Merge.rc:4526
#, c-format
msgid "Both to... (%1 of %2)"
msgstr "Ambos para... (%1 de %2)"
#. IDS_COPY_ALL_TO2
-#: Merge.rc:1026 Merge.rc:4517
+#: Merge.rc:1034 Merge.rc:4527
#, c-format
msgid "All to... (%1 of %2)"
msgstr "Todos para... (%1 de %2)"
#. IDS_COPY_DIFFERENCES_TO2
-#: Merge.rc:1027 Merge.rc:4518
+#: Merge.rc:1035 Merge.rc:4528
#, c-format
msgid "Differences to... (%1 of %2)"
msgstr "Diferenças para... (%1 de %2)"
#. IDR_POPUP_DIRVIEW, ID_DIR_SHELL_CONTEXT_MENU_LEFT
-#: Merge.rc:1032
+#: Merge.rc:1040
msgid "Left Shell Menu"
msgstr "Menu do Shell Esquerdo"
#. IDR_POPUP_DIRVIEW, ID_DIR_SHELL_CONTEXT_MENU_MIDDLE
-#: Merge.rc:1033
+#: Merge.rc:1041
msgid "Middle Shell Menu"
msgstr "Menu do Shell do Meio"
#. IDR_POPUP_DIRVIEW, ID_DIR_SHELL_CONTEXT_MENU_RIGHT
-#: Merge.rc:1034
+#: Merge.rc:1042
msgid "Right Shell Menu"
msgstr "Menu do Shell Direito"
#. IDR_POPUP_DIRVIEW, ID_DIR_SHELL_CONTEXT_MENU_BOTH
-#: Merge.rc:1035
+#: Merge.rc:1043
msgid "Both Shell Menu"
msgstr "Ambos os Menus do Shell"
#. IDR_POPUP_DIRVIEW, ID_DIR_SHELL_CONTEXT_MENU_ALL
-#: Merge.rc:1036
+#: Merge.rc:1044
msgid "All Shell Menu"
msgstr "Todos os Menus do Shell"
#. IDR_POPUP_EDITOR_HEADERBAR, ID_EDITOR_COPY
-#: Merge.rc:1050
+#: Merge.rc:1058
msgid "Copy"
msgstr "Copiar"
#. IDR_POPUP_EDITOR_HEADERBAR, ID_EDITOR_COPY_PATH
-#: Merge.rc:1051
+#: Merge.rc:1059
msgid "&Copy Full Path"
msgstr "&Copiar o Caminho Completo"
#. IDR_POPUP_EDITOR_HEADERBAR, ID_EDITOR_COPY_FILENAME
-#: Merge.rc:1052
+#: Merge.rc:1060
msgid "Copy &Filename"
msgstr "Copiar &o Nome do Arquivo"
#. IDR_POPUP_EDITOR_HEADERBAR, ID_EDITOR_EDIT_CAPTION
-#: Merge.rc:1053
+#: Merge.rc:1061
msgid "&Edit Caption\tF2"
msgstr "&Editar Legenda\tF2"
#. IDR_POPUP_EDITOR_HEADERBAR, ID_EDITOR_EDIT_PATH
-#: Merge.rc:1055
+#: Merge.rc:1063
msgid "Edit &Path\tCtrl+L"
msgstr "E&ditar Caminho\tCtrl+L"
#. IDR_POPUP_EDITOR_HEADERBAR, ID_EDITOR_SELECT_FILE
-#: Merge.rc:1056
+#: Merge.rc:1064
msgid "&Open..."
msgstr "&Abrir..."
#. IDR_POPUP_PLUGINS_SETTINGS
-#: Merge.rc:1062
+#: Merge.rc:1070
msgid "Unpacker Settings"
msgstr "Configurações do Descompactador"
#. IDS_USERCHOICE_NONE
-#: Merge.rc:1064 Merge.rc:1070 Merge.rc:1789 Merge.rc:1793 Merge.rc:5030
+#: Merge.rc:1072 Merge.rc:1078 Merge.rc:1799 Merge.rc:1803 Merge.rc:5040
msgid ""
msgstr ""
#. IDS_USERCHOICE_AUTOMATIC
-#: Merge.rc:1065 Merge.rc:1071 Merge.rc:5031
+#: Merge.rc:1073 Merge.rc:1079 Merge.rc:5041
msgid ""
msgstr ""
#. IDD_OPEN, IDC_SELECT_PREDIFFER
-#: Merge.rc:1066 Merge.rc:1072 Merge.rc:1970 Merge.rc:1974
+#: Merge.rc:1074 Merge.rc:1080 Merge.rc:1980 Merge.rc:1984
msgid "&Select..."
msgstr "&Selecionar..."
#. IDR_POPUP_PLUGINS_SETTINGS
-#: Merge.rc:1068
+#: Merge.rc:1076
msgid "Prediffer Settings"
msgstr "Configurações da Pré-Diferenciação"
#. IDR_POPUP_LOCATIONBAR, ID_LOCBAR_GOTODIFF
-#: Merge.rc:1080
+#: Merge.rc:1088
msgid "G&o to Diff"
msgstr "I&r para a Diferenciação"
#. IDR_POPUP_LOCATIONBAR, ID_LOCBAR_MOVECURSOR_ONCLICK
-#: Merge.rc:1083
+#: Merge.rc:1091
msgid "Move Cursor on &Click"
msgstr "Mover Cursor ao &Clicar"
#. IDR_POPUP_LOCATIONBAR, ID_DISPLAY_MOVED_NONE
-#: Merge.rc:1085
+#: Merge.rc:1093
msgid "&No Moved Blocks"
msgstr "&Nenhum dos Blocos Movidos"
#. IDR_POPUP_LOCATIONBAR, ID_DISPLAY_MOVED_ALL
-#: Merge.rc:1086
+#: Merge.rc:1094
msgid "&All Moved Blocks"
msgstr "&Todos os Blocos Movidos"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS
-#: Merge.rc:1094 Merge.rc:1127
+#: Merge.rc:1102 Merge.rc:1135
msgid "W&hitespaces"
msgstr "E&spaços em branco"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_WHITESPACE_COMPARE
-#: Merge.rc:1096 Merge.rc:1129
+#: Merge.rc:1104 Merge.rc:1137
msgid "Com&pare"
msgstr "Com¶r"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_WHITESPACE_IGNORE
-#: Merge.rc:1097 Merge.rc:1130
+#: Merge.rc:1105 Merge.rc:1138
msgid "I&gnore Changes"
msgstr "I&gnorar Alterações"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_WHITESPACE_IGNOREALL
-#: Merge.rc:1098 Merge.rc:1131
+#: Merge.rc:1106 Merge.rc:1139
msgid "Ig&nore All"
msgstr "Ig&norar Tudo"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_IGNORE_BLANKLINES
-#: Merge.rc:1100 Merge.rc:1133
+#: Merge.rc:1108 Merge.rc:1141
msgid "Ignore Blan&k Lines"
msgstr "Ignorar Linha&s em Branco"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_IGNORE_CASE
-#: Merge.rc:1101 Merge.rc:1134
+#: Merge.rc:1109 Merge.rc:1142
msgid "Ignore &Case"
msgstr "Ignorar &Maiúsculas/Minúsculas"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_IGNORE_EOL
-#: Merge.rc:1102 Merge.rc:1135
+#: Merge.rc:1110 Merge.rc:1143
msgid "Igno&re EOL Differences (Windows/Unix/Mac)"
msgstr "Igno&rar Diferenças de Caractere de Final de Linha (Windows/Unix/Mac)"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_IGNORE_CODEPAGE
-#: Merge.rc:1103 Merge.rc:1136
+#: Merge.rc:1111 Merge.rc:1144
msgid "Ignore Codepage &Differences"
msgstr "Ignorar &Diferenças de Página de Código"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_IGNORE_NUMBERS
-#: Merge.rc:1104 Merge.rc:1137
+#: Merge.rc:1112 Merge.rc:1145
msgid "Ignore Num&bers"
msgstr "Ignorar &Números"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_IGNORE_COMMENTS
-#: Merge.rc:1105 Merge.rc:1138
+#: Merge.rc:1113 Merge.rc:1146
msgid "Ignore C&omment Differences"
msgstr "Ignorar D&iferenças de Comentário"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_IGNORE_MISSING_TRAILING_EOL
-#: Merge.rc:1106 Merge.rc:1139
+#: Merge.rc:1114 Merge.rc:1147
msgid "Ignore &Missing Trailing EOL"
msgstr "Ignorar &Falta do Caracter EOL no Final"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_IGNORE_LINE_BREAKS
-#: Merge.rc:1107 Merge.rc:1140
+#: Merge.rc:1115 Merge.rc:1148
msgid "Ignore Line &Breaks (Treat as Spaces)"
msgstr "Ignorar Que&bras de Linha (Tratar como Espaços)"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_RECURS_CHECK
-#: Merge.rc:1109 Merge.rc:2963
+#: Merge.rc:1117 Merge.rc:2973
msgid "&Include Subfolders"
msgstr "&Incluir Subpastas"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS
-#: Merge.rc:1110 Merge.rc:1142
+#: Merge.rc:1118 Merge.rc:1150
msgid "&Compare Method"
msgstr "&Método de Comparação"
#. IDS_COMPMETHOD_FULL_CONTENTS
-#: Merge.rc:1112 Merge.rc:1144 Merge.rc:1328 Merge.rc:4282
+#: Merge.rc:1120 Merge.rc:1152 Merge.rc:1338 Merge.rc:4292
msgid "Full Contents"
msgstr "Conteúdo Completo"
#. IDS_COMPMETHOD_QUICK_CONTENTS
-#: Merge.rc:1113 Merge.rc:1145 Merge.rc:1329 Merge.rc:4283
+#: Merge.rc:1121 Merge.rc:1153 Merge.rc:1339 Merge.rc:4293
msgid "Quick Contents"
msgstr "Conteúdo Rápido"
#. IDS_COMPMETHOD_BINARY_CONTENTS
-#: Merge.rc:1114 Merge.rc:1146 Merge.rc:1330 Merge.rc:4284
+#: Merge.rc:1122 Merge.rc:1154 Merge.rc:1340 Merge.rc:4294
msgid "Binary Contents"
msgstr "Conteúdo Binário"
#. IDS_COMPMETHOD_MODDATE
-#: Merge.rc:1115 Merge.rc:1147 Merge.rc:1331 Merge.rc:4285
+#: Merge.rc:1123 Merge.rc:1155 Merge.rc:1341 Merge.rc:4295
msgid "Modified Date"
msgstr "Data de Modificação"
#. IDS_COMPMETHOD_DATESIZE
-#: Merge.rc:1116 Merge.rc:1148 Merge.rc:1332 Merge.rc:4286
+#: Merge.rc:1124 Merge.rc:1156 Merge.rc:1342 Merge.rc:4296
msgid "Modified Date and Size"
msgstr "Data de Modificação e Tamanho"
#. IDS_COMPMETHOD_SIZE
-#: Merge.rc:1117 Merge.rc:1149 Merge.rc:1333 Merge.rc:4287
+#: Merge.rc:1125 Merge.rc:1157 Merge.rc:1343 Merge.rc:4297
msgid "Size"
msgstr "Tamanho"
#. IDS_COMPMETHOD_EXISTENCE
-#: Merge.rc:1118 Merge.rc:1150 Merge.rc:1334 Merge.rc:4288
+#: Merge.rc:1126 Merge.rc:1158 Merge.rc:1344 Merge.rc:4298
msgid "Existence"
msgstr "Existência"
#. IDR_POPUP_PROJECT, ID_LOAD_PROJECT
-#: Merge.rc:1192
+#: Merge.rc:1202
msgid "&Load Project..."
msgstr "&Carregar Projeto..."
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARGALL
-#: Merge.rc:1272 Merge.rc:1301
+#: Merge.rc:1282 Merge.rc:1311
msgid "${*} - All Arguments"
msgstr "${*} - Todos os Argumentos"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARG1
-#: Merge.rc:1273 Merge.rc:1302
+#: Merge.rc:1283 Merge.rc:1312
msgid "${1} - First Argument"
msgstr "${1} - Primeiro Argumento"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARG2
-#: Merge.rc:1274 Merge.rc:1303
+#: Merge.rc:1284 Merge.rc:1313
msgid "${2} - Second Argument"
msgstr "${2} - Segundo Argumento"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARG3
-#: Merge.rc:1275 Merge.rc:1304
+#: Merge.rc:1285 Merge.rc:1314
msgid "${3} - Third Argument"
msgstr "${3} - Terceiro Argumento"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARG4
-#: Merge.rc:1276 Merge.rc:1305
+#: Merge.rc:1286 Merge.rc:1315
msgid "${4} - Fourth Argument"
msgstr "${4} - Quarto Argumento"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARG5
-#: Merge.rc:1277 Merge.rc:1306
+#: Merge.rc:1287 Merge.rc:1316
msgid "${5} - Fifth Argument"
msgstr "${5} - Quinto Argumento"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARG6
-#: Merge.rc:1278 Merge.rc:1307
+#: Merge.rc:1288 Merge.rc:1317
msgid "${6} - Sixth Argument"
msgstr "${6} - Sexto Argumento"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARG7
-#: Merge.rc:1279 Merge.rc:1308
+#: Merge.rc:1289 Merge.rc:1318
msgid "${7} - Seventh Argument"
msgstr "${7} - Sétimo Argumento"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARG8
-#: Merge.rc:1280 Merge.rc:1309
+#: Merge.rc:1290 Merge.rc:1319
msgid "${8} - Eighth Argument"
msgstr "${8} - Oitavo Argumento"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARG9
-#: Merge.rc:1281 Merge.rc:1310
+#: Merge.rc:1291 Merge.rc:1320
msgid "${9} - Ninth Argument"
msgstr "${9} - Nono Argumento"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_SRC_FILE
-#: Merge.rc:1289
+#: Merge.rc:1299
msgid "${SRC_FILE} - Source File"
msgstr "${SRC_FILE} - Arquivo de Origem"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_SRC_FOLDER
-#: Merge.rc:1290
+#: Merge.rc:1300
msgid "${SRC_FOLDER} - Source Folder"
msgstr "${SRC_FOLDER} - Pasta de Origem"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_SRC_URL
-#: Merge.rc:1291
+#: Merge.rc:1301
msgid "${SRC_URL} - Source URL"
msgstr "${SRC_URL} - URL de Origem"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_SRC_URL_PROTOCOL
-#: Merge.rc:1292
+#: Merge.rc:1302
msgid "${SRC_URL_PROTOCOL} - Source URL Protocol"
msgstr "${SRC_URL_PROTOCOL} - Protocolo do URL de Origem"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_SRC_URL_SUFFIX
-#: Merge.rc:1293
+#: Merge.rc:1303
msgid "${SRC_URL_SUFFIX} - Source URL Suffix"
msgstr "${SRC_URL_SUFFIX} - Sufixo do URL de Origem"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_DST_FILE
-#: Merge.rc:1294
+#: Merge.rc:1304
msgid "${DST_FILE} - Destination File"
msgstr "${DST_FILE} - Arquivo de Destino"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_DST_FOLDER
-#: Merge.rc:1295
+#: Merge.rc:1305
msgid "${DST_FOLDER} - Destination Folder"
msgstr "${DST_FOLDER} - Pasta de Destino"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_DST_URL
-#: Merge.rc:1296
+#: Merge.rc:1306
msgid "${DST_URL} - Destination URL"
msgstr "${DST_URL} - URL de Destino"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_DST_URL_PROTOCOL
-#: Merge.rc:1297
+#: Merge.rc:1307
msgid "${DST_URL_PROTOCOL} - Destination URL Protocol"
msgstr "${DST_URL_PROTOCOL} - Protocolo do URL de Destino"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_DST_URL_SUFFIX
-#: Merge.rc:1298
+#: Merge.rc:1308
msgid "${DST_URL_SUFFIX} - Destination URL Suffix"
msgstr "${DST_URL_SUFFIX} - Sufixo do URL de Destino"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_WINMERGE_HOME
-#: Merge.rc:1299
+#: Merge.rc:1309
msgid "${WINMERGE_HOME} - WinMerge Home Directory"
msgstr "${WINMERGE_HOME} - Pasta de Instalação do WinMerge"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_SCRIPT_FILE
-#: Merge.rc:1300
+#: Merge.rc:1310
msgid "${SCRIPT_FILE} - Script File"
msgstr "${SCRIPT_FILE} - Arquivo de Script"
#. IDR_POPUP_PLUGIN_ADD_MENU, ID_PLUGIN_ADD_UNPACKER
-#: Merge.rc:1318
+#: Merge.rc:1328
msgid "Add &Unpacker Plugin..."
msgstr "Adicionar Pl&ugin de Descompactador..."
#. IDR_POPUP_PLUGIN_ADD_MENU, ID_PLUGIN_ADD_PREDIFFER
-#: Merge.rc:1319
+#: Merge.rc:1329
msgid "Add &Prediffer Plugin..."
msgstr "Adicionar Plugin de &Pré-Diferenciação..."
#. IDR_POPUP_PLUGIN_ADD_MENU, ID_PLUGIN_DUPLICATE
-#: Merge.rc:1320
+#: Merge.rc:1330
msgid "&Duplicate Plugin..."
msgstr "&Duplicar Plugin..."
#. IDR_POPUP_OUTPUTVIEW, ID_EDIT_CLEAR_ALL
-#: Merge.rc:1344
+#: Merge.rc:1354
msgid "Clear &All"
msgstr "Limpar &Tudo"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_MASK_CLEAR
-#: Merge.rc:1352
+#: Merge.rc:1362
msgid "&Clear All"
msgstr "&Limpar Tudo"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_MASK_REMOVE_LAST
-#: Merge.rc:1353
+#: Merge.rc:1363
msgid "Remove Last Filter &Group"
msgstr "Remover Último &Grupo de Filtros"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_MASK_ALL
-#: Merge.rc:1354
+#: Merge.rc:1364
msgid "R&eset to Default (*.*)"
msgstr "R&estaurar os Padrões (*.*)"
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1355
+#: Merge.rc:1365
msgid "Add E&xclude File"
msgstr "Adicionar Arquivo para E&xcluir"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_SYS
-#: Merge.rc:1357
+#: Merge.rc:1367
msgid "&System Files"
msgstr "Arquivos de &Sistema"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_BACKUP
-#: Merge.rc:1358
+#: Merge.rc:1368
msgid "&Editor Backup Files"
msgstr "Arquivos de Backup do &Editor"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_BIN
-#: Merge.rc:1359
+#: Merge.rc:1369
msgid "&Compiled Binary Files"
msgstr "Arquivos Binários &Compilados"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_LOG
-#: Merge.rc:1360
+#: Merge.rc:1370
msgid "&Log Files"
msgstr "Arquivos de &Registro"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_TEMP
-#: Merge.rc:1361
+#: Merge.rc:1371
msgid "&Temporary or Cache Files"
msgstr "Arquivos &Temporários ou de Cache"
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1363
+#: Merge.rc:1373
msgid "Add Excl&ude Folder"
msgstr "Adicionar Pasta para Excl&uir"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FOLDER_VCS
-#: Merge.rc:1365
+#: Merge.rc:1375
msgid "&Version Control"
msgstr "Controle de &Versão"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FOLDER_BUILD
-#: Merge.rc:1366
+#: Merge.rc:1376
msgid "&Build Artifacts"
msgstr "Artefatos de &Compilação"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FOLDER_IDE
-#: Merge.rc:1367
+#: Merge.rc:1377
msgid "&IDE"
msgstr "&IDE"
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1370
+#: Merge.rc:1380
msgid "Add &File Condition"
msgstr "Adicionar Condição de &Arquivo"
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1372 Merge.rc:1551
+#: Merge.rc:1382 Merge.rc:1561
msgid "File &Size"
msgstr "&Tamanho de Arquivo"
#. IDR_POPUP_FILTERMENU_DIFF_SIZE, ID_FILTERMENU_DIFF_SIZE_LT_1KB
-#: Merge.rc:1374 Merge.rc:1527 Merge.rc:1564 Merge.rc:1629 Merge.rc:1707
+#: Merge.rc:1384 Merge.rc:1537 Merge.rc:1574 Merge.rc:1639 Merge.rc:1717
msgid "Less than 1KB"
msgstr "Menos de 1KB"
#. IDR_POPUP_FILTERMENU_DIFF_SIZE, ID_FILTERMENU_DIFF_SIZE_GE_1KB
-#: Merge.rc:1375 Merge.rc:1528 Merge.rc:1565 Merge.rc:1630 Merge.rc:1708
+#: Merge.rc:1385 Merge.rc:1538 Merge.rc:1575 Merge.rc:1640 Merge.rc:1718
msgid "1KB or more"
msgstr "1KB ou mais"
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_LT_10KB
-#: Merge.rc:1376 Merge.rc:1529 Merge.rc:1631
+#: Merge.rc:1386 Merge.rc:1539 Merge.rc:1641
msgid "Less than 10KB"
msgstr "Menos de 10KB"
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_GE_10KB
-#: Merge.rc:1377 Merge.rc:1530 Merge.rc:1632
+#: Merge.rc:1387 Merge.rc:1540 Merge.rc:1642
msgid "10KB or more"
msgstr "10KB ou mais"
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_LT_100KB
-#: Merge.rc:1378 Merge.rc:1531 Merge.rc:1633
+#: Merge.rc:1388 Merge.rc:1541 Merge.rc:1643
msgid "Less than 100KB"
msgstr "Menos de 100KB"
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_GE_100KB
-#: Merge.rc:1379 Merge.rc:1532 Merge.rc:1634
+#: Merge.rc:1389 Merge.rc:1542 Merge.rc:1644
msgid "100KB or more"
msgstr "100KB ou mais"
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_LT_1MB
-#: Merge.rc:1380 Merge.rc:1533 Merge.rc:1635
+#: Merge.rc:1390 Merge.rc:1543 Merge.rc:1645
msgid "Less than 1MB"
msgstr "Menos de 1MB"
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_GE_1MB
-#: Merge.rc:1381 Merge.rc:1534 Merge.rc:1636
+#: Merge.rc:1391 Merge.rc:1544 Merge.rc:1646
msgid "1MB or more"
msgstr "1MB ou mais"
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_LT_10MB
-#: Merge.rc:1382 Merge.rc:1535 Merge.rc:1637
+#: Merge.rc:1392 Merge.rc:1545 Merge.rc:1647
msgid "Less than 10MB"
msgstr "Menos de 10MB"
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_GE_10MB
-#: Merge.rc:1383 Merge.rc:1536 Merge.rc:1638
+#: Merge.rc:1393 Merge.rc:1546 Merge.rc:1648
msgid "10MB or more"
msgstr "10MB ou mais"
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_LT_100MB
-#: Merge.rc:1384 Merge.rc:1537 Merge.rc:1639
+#: Merge.rc:1394 Merge.rc:1547 Merge.rc:1649
msgid "Less than 100MB"
msgstr "Menos de 100MB"
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_GE_100MB
-#: Merge.rc:1385 Merge.rc:1538 Merge.rc:1640
+#: Merge.rc:1395 Merge.rc:1548 Merge.rc:1650
msgid "100MB or more"
msgstr "100MB ou mais"
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_LT_1GB
-#: Merge.rc:1386 Merge.rc:1539 Merge.rc:1641
+#: Merge.rc:1396 Merge.rc:1549 Merge.rc:1651
msgid "Less than 1GB"
msgstr "Menos de 1GB"
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_GE_1GB
-#: Merge.rc:1387 Merge.rc:1642
+#: Merge.rc:1397 Merge.rc:1652
msgid "1GB or more"
msgstr "1GB ou mais"
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_RANGE
-#: Merge.rc:1388 Merge.rc:1465 Merge.rc:1517 Merge.rc:1523 Merge.rc:1540
-#: Merge.rc:1566 Merge.rc:1587 Merge.rc:1643 Merge.rc:1709 Merge.rc:1734
+#: Merge.rc:1398 Merge.rc:1475 Merge.rc:1527 Merge.rc:1533 Merge.rc:1550
+#: Merge.rc:1576 Merge.rc:1597 Merge.rc:1653 Merge.rc:1719 Merge.rc:1744
msgid "Custom Range..."
msgstr "Intervalo Personalizado..."
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1390 Merge.rc:1471 Merge.rc:1568
+#: Merge.rc:1400 Merge.rc:1481 Merge.rc:1578
msgid "&Last Modified"
msgstr "Ú<ima Modificação"
#. IDR_POPUP_FILTERMENU_DATE
-#: Merge.rc:1392 Merge.rc:1473 Merge.rc:1651
+#: Merge.rc:1402 Merge.rc:1483 Merge.rc:1661
msgid "&Hour"
msgstr "&Hora"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_HOUR_BEFORE_1
-#: Merge.rc:1394 Merge.rc:1475 Merge.rc:1653
+#: Merge.rc:1404 Merge.rc:1485 Merge.rc:1663
msgid "More than 1 hour ago"
msgstr "Mais de 1 hora atrás"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_HOUR_WITHIN_1
-#: Merge.rc:1395 Merge.rc:1476 Merge.rc:1654
+#: Merge.rc:1405 Merge.rc:1486 Merge.rc:1664
msgid "Within 1 hour"
msgstr "Dentro de 1 hora"
#. IDR_POPUP_FILTERMENU_DATE
-#: Merge.rc:1397 Merge.rc:1478 Merge.rc:1656
+#: Merge.rc:1407 Merge.rc:1488 Merge.rc:1666
msgid "&Day"
msgstr "&Dia"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_DAY_BEFORE_TODAY
-#: Merge.rc:1399 Merge.rc:1480 Merge.rc:1658
+#: Merge.rc:1409 Merge.rc:1490 Merge.rc:1668
msgid "Before today"
msgstr "Antes de hoje"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_DAY_TODAY
-#: Merge.rc:1400 Merge.rc:1481 Merge.rc:1659
+#: Merge.rc:1410 Merge.rc:1491 Merge.rc:1669
msgid "Today"
msgstr "Hoje"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_DAY_BEFORE_YESTERDAY
-#: Merge.rc:1401 Merge.rc:1482 Merge.rc:1660
+#: Merge.rc:1411 Merge.rc:1492 Merge.rc:1670
msgid "Before yesterday"
msgstr "Antes de ontem"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_DAY_YESTERDAY
-#: Merge.rc:1402 Merge.rc:1483 Merge.rc:1661
+#: Merge.rc:1412 Merge.rc:1493 Merge.rc:1671
msgid "Yesterday"
msgstr "Ontem"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_DAY_SINCE_YESTERDAY
-#: Merge.rc:1403 Merge.rc:1484 Merge.rc:1662
+#: Merge.rc:1413 Merge.rc:1494 Merge.rc:1672
msgid "Since yesterday"
msgstr "Desde ontem"
#. IDR_POPUP_FILTERMENU_DATE
-#: Merge.rc:1405 Merge.rc:1486 Merge.rc:1664
+#: Merge.rc:1415 Merge.rc:1496 Merge.rc:1674
msgid "&Week"
msgstr "&Semana"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_WEEK_BEFORE_THIS
-#: Merge.rc:1407 Merge.rc:1488 Merge.rc:1666
+#: Merge.rc:1417 Merge.rc:1498 Merge.rc:1676
msgid "Before this week"
msgstr "Antes desta semana"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_WEEK_THIS
-#: Merge.rc:1408 Merge.rc:1489 Merge.rc:1667
+#: Merge.rc:1418 Merge.rc:1499 Merge.rc:1677
msgid "This week"
msgstr "Esta semana"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_WEEK_BEFORE_LAST
-#: Merge.rc:1409 Merge.rc:1490 Merge.rc:1668
+#: Merge.rc:1419 Merge.rc:1500 Merge.rc:1678
msgid "Before last week"
msgstr "Antes da semana passada"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_WEEK_LAST
-#: Merge.rc:1410 Merge.rc:1491 Merge.rc:1669
+#: Merge.rc:1420 Merge.rc:1501 Merge.rc:1679
msgid "Last week"
msgstr "Semana passada"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_WEEK_SINCE_LAST
-#: Merge.rc:1411 Merge.rc:1492 Merge.rc:1670
+#: Merge.rc:1421 Merge.rc:1502 Merge.rc:1680
msgid "Since last week"
msgstr "Desde a semana passada"
#. IDR_POPUP_FILTERMENU_DATE
-#: Merge.rc:1413 Merge.rc:1494 Merge.rc:1672
+#: Merge.rc:1423 Merge.rc:1504 Merge.rc:1682
msgid "&Month"
msgstr "&Mês"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_MONTH_BEFORE_THIS
-#: Merge.rc:1415 Merge.rc:1496 Merge.rc:1674
+#: Merge.rc:1425 Merge.rc:1506 Merge.rc:1684
msgid "Before this month"
msgstr "Antes deste mês"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_MONTH_THIS
-#: Merge.rc:1416 Merge.rc:1497 Merge.rc:1675
+#: Merge.rc:1426 Merge.rc:1507 Merge.rc:1685
msgid "This month"
msgstr "Este mês"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_MONTH_BEFORE_LAST
-#: Merge.rc:1417 Merge.rc:1498 Merge.rc:1676
+#: Merge.rc:1427 Merge.rc:1508 Merge.rc:1686
msgid "Before last month"
msgstr "Antes do mês passado"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_MONTH_LAST
-#: Merge.rc:1418 Merge.rc:1499 Merge.rc:1677
+#: Merge.rc:1428 Merge.rc:1509 Merge.rc:1687
msgid "Last month"
msgstr "Mês passado"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_MONTH_SINCE_LAST
-#: Merge.rc:1419 Merge.rc:1500 Merge.rc:1678
+#: Merge.rc:1429 Merge.rc:1510 Merge.rc:1688
msgid "Since last month"
msgstr "Desde o mês passado"
#. IDR_POPUP_FILTERMENU_DATE
-#: Merge.rc:1421 Merge.rc:1502 Merge.rc:1680
+#: Merge.rc:1431 Merge.rc:1512 Merge.rc:1690
msgid "&Year"
msgstr "&Ano"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_YEAR_BEFORE_THIS
-#: Merge.rc:1423 Merge.rc:1504 Merge.rc:1682
+#: Merge.rc:1433 Merge.rc:1514 Merge.rc:1692
msgid "Before this year"
msgstr "Antes deste ano"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_YEAR_THIS
-#: Merge.rc:1424 Merge.rc:1505 Merge.rc:1683
+#: Merge.rc:1434 Merge.rc:1515 Merge.rc:1693
msgid "This year"
msgstr "Este ano"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_YEAR_BEFORE_LAST
-#: Merge.rc:1425 Merge.rc:1506 Merge.rc:1684
+#: Merge.rc:1435 Merge.rc:1516 Merge.rc:1694
msgid "Before last year"
msgstr "Antes do ano passado"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_YEAR_LAST
-#: Merge.rc:1426 Merge.rc:1507 Merge.rc:1685
+#: Merge.rc:1436 Merge.rc:1517 Merge.rc:1695
msgid "Last year"
msgstr "Ano passado"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_YEAR_SINCE_LAST
-#: Merge.rc:1427 Merge.rc:1508 Merge.rc:1686
+#: Merge.rc:1437 Merge.rc:1518 Merge.rc:1696
msgid "Since last year"
msgstr "Desde o ano passado"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_RANGE
-#: Merge.rc:1429 Merge.rc:1510 Merge.rc:1688
+#: Merge.rc:1439 Merge.rc:1520 Merge.rc:1698
msgid "&Custom Range..."
msgstr "&Intervalo Personalizado..."
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1431 Merge.rc:1589
+#: Merge.rc:1441 Merge.rc:1599
msgid "&Attributes"
msgstr "&Atributos"
#. IDR_POPUP_FILTERMENU_ATTR, ID_FILTERMENU_ATTR_READONLY
-#: Merge.rc:1433 Merge.rc:1607
+#: Merge.rc:1443 Merge.rc:1617
msgid "Read-only files"
msgstr "Arquivos somente leitura"
#. IDR_POPUP_FILTERMENU_ATTR, ID_FILTERMENU_ATTR_NOT_READONLY
-#: Merge.rc:1434 Merge.rc:1608
+#: Merge.rc:1444 Merge.rc:1618
msgid "Not read-only files"
msgstr "Arquivos não somente leitura"
#. IDR_POPUP_FILTERMENU_ATTR, ID_FILTERMENU_ATTR_HIDDEN
-#: Merge.rc:1435 Merge.rc:1609
+#: Merge.rc:1445 Merge.rc:1619
msgid "Hidden files"
msgstr "Arquivos ocultados"
#. IDR_POPUP_FILTERMENU_ATTR, ID_FILTERMENU_ATTR_NOT_HIDDEN
-#: Merge.rc:1436 Merge.rc:1610
+#: Merge.rc:1446 Merge.rc:1620
msgid "Not hidden files"
msgstr "Arquivos não ocultados"
#. IDR_POPUP_FILTERMENU_ATTR, ID_FILTERMENU_ATTR_SYSTEM
-#: Merge.rc:1437 Merge.rc:1611
+#: Merge.rc:1447 Merge.rc:1621
msgid "System files"
msgstr "Arquivos de sistema"
#. IDR_POPUP_FILTERMENU_ATTR, ID_FILTERMENU_ATTR_NOT_SYSTEM
-#: Merge.rc:1438 Merge.rc:1612
+#: Merge.rc:1448 Merge.rc:1622
msgid "Not system files"
msgstr "Arquivos não de sistema"
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1440
+#: Merge.rc:1450
msgid "File &Content"
msgstr "&Conteúdo do Arquivo"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_CONTAINS
-#: Merge.rc:1442
+#: Merge.rc:1452
msgid "Contains string..."
msgstr "Contém string..."
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_NOT_CONTAINS
-#: Merge.rc:1443
+#: Merge.rc:1453
msgid "Does not contain string..."
msgstr "Não contém string..."
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_FIRST_LINE_CONTAINS
-#: Merge.rc:1444
+#: Merge.rc:1454
msgid "First line contains string..."
msgstr "Primeira linha contém string..."
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_FIRST_LINE_NOT_CONTAINS
-#: Merge.rc:1445
+#: Merge.rc:1455
msgid "First line does not contain string..."
msgstr "Primeira linha não contém string..."
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_FIRST_10_CONTAINS
-#: Merge.rc:1446
+#: Merge.rc:1456
msgid "First 10 lines contain string..."
msgstr "Primeiras 10 linhas contêm string..."
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_FIRST_10_NOT_CONTAINS
-#: Merge.rc:1447
+#: Merge.rc:1457
msgid "First 10 lines do not contain string..."
msgstr "Primeiras 10 linhas não contêm string..."
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_LAST_10_CONTAINS
-#: Merge.rc:1448
+#: Merge.rc:1458
msgid "Last 10 lines contain string..."
msgstr "Últimas 10 linhas contêm string..."
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_LAST_10_NOT_CONTAINS
-#: Merge.rc:1449
+#: Merge.rc:1459
msgid "Last 10 lines do not contain string..."
msgstr "Últimas 10 linhas não contêm string..."
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_LAST_LINE_CONTAINS
-#: Merge.rc:1450
+#: Merge.rc:1460
msgid "Last line contains string..."
msgstr "Última linha contém string..."
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_LAST_LINE_NOT_CONTAINS
-#: Merge.rc:1451
+#: Merge.rc:1461
msgid "Last line does not contain string..."
msgstr "Última linha não contém string..."
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1453
+#: Merge.rc:1463
msgid "&Line Count"
msgstr "Contagem de &Linhas"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_LT_10
-#: Merge.rc:1455
+#: Merge.rc:1465
msgid "Less than 10"
msgstr "Menos de 10"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_GE_10
-#: Merge.rc:1456
+#: Merge.rc:1466
msgid "10 or more"
msgstr "10 ou mais"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_LT_100
-#: Merge.rc:1457
+#: Merge.rc:1467
msgid "Less than 100"
msgstr "Menos de 100"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_GE_100
-#: Merge.rc:1458
+#: Merge.rc:1468
msgid "100 or more"
msgstr "100 ou mais"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_LT_1000
-#: Merge.rc:1459
+#: Merge.rc:1469
msgid "Less than 1000"
msgstr "Menos de 1000"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_GE_1000
-#: Merge.rc:1460
+#: Merge.rc:1470
msgid "1000 or more"
msgstr "1000 ou mais"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_LT_10000
-#: Merge.rc:1461
+#: Merge.rc:1471
msgid "Less than 10000"
msgstr "Menos de 10000"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_GE_10000
-#: Merge.rc:1462
+#: Merge.rc:1472
msgid "10000 or more"
msgstr "10000 ou mais"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_LT_100000
-#: Merge.rc:1463
+#: Merge.rc:1473
msgid "Less than 100000"
msgstr "Menos de 100000"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_GE_100000
-#: Merge.rc:1464
+#: Merge.rc:1474
msgid "100000 or more"
msgstr "100000 ou mais"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_PROPS
-#: Merge.rc:1467 Merge.rc:1594 Merge.rc:1761 Merge.rc:1778
+#: Merge.rc:1477 Merge.rc:1604 Merge.rc:1771 Merge.rc:1788
msgid "Additional &Properties..."
msgstr "&Propriedades Adicionais..."
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1469
+#: Merge.rc:1479
msgid "Add F&older Condition"
msgstr "Adicionar C&ondição de Pasta"
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1513
+#: Merge.rc:1523
msgid "&Files"
msgstr "&Arquivos"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FOLDER_FILES_EQ_0
-#: Merge.rc:1515
+#: Merge.rc:1525
msgid "0 files"
msgstr "0 arquivos"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FOLDER_FILES_GE_1
-#: Merge.rc:1516
+#: Merge.rc:1526
msgid "1 file or more"
msgstr "1 arquivo ou mais"
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1519
+#: Merge.rc:1529
msgid "&Items"
msgstr "&Itens"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FOLDER_ITEMS_EQ_0
-#: Merge.rc:1521
+#: Merge.rc:1531
msgid "0 items"
msgstr "0 itens"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FOLDER_ITEMS_GE_1
-#: Merge.rc:1522
+#: Merge.rc:1532
msgid "1 item or more"
msgstr "1 item ou mais"
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1525
+#: Merge.rc:1535
msgid "&Total Size"
msgstr "&Tamanho Total"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FOLDER_STATS_RECURSIVE
-#: Merge.rc:1542
+#: Merge.rc:1552
msgid "&Recursive"
msgstr "&Recursivo"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONDITION_ANY
-#: Merge.rc:1544
+#: Merge.rc:1554
msgid "Target: &Any (Left/Middle/Right)"
msgstr "A&lvo: Qualquer (Esquerda/Meio/Direita)"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONDITION_LEFT
-#: Merge.rc:1545
+#: Merge.rc:1555
msgid "Target: &Left"
msgstr "Alvo: &Esquerda"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONDITION_MIDDLE
-#: Merge.rc:1546
+#: Merge.rc:1556
msgid "Target: &Middle"
msgstr "Alvo: &Meio"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONDITION_RIGHT
-#: Merge.rc:1547
+#: Merge.rc:1557
msgid "Target: &Right"
msgstr "Alvo: &Direita"
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1549
+#: Merge.rc:1559
msgid "Add &Difference Condition"
msgstr "Adicionar Condição de D&iferença"
#. IDR_POPUP_FILTERMENU_DIFF_PROP, ID_FILTERMENU_DIFF_PROP_EQUAL
-#: Merge.rc:1553 Merge.rc:1570 Merge.rc:1591 Merge.rc:1696 Merge.rc:1717
-#: Merge.rc:1742
+#: Merge.rc:1563 Merge.rc:1580 Merge.rc:1601 Merge.rc:1706 Merge.rc:1727
+#: Merge.rc:1752
msgid "Equal"
msgstr "Igual"
#. IDR_POPUP_FILTERMENU_DIFF_PROP, ID_FILTERMENU_DIFF_PROP_NOT_EQUAL
-#: Merge.rc:1554 Merge.rc:1571 Merge.rc:1592 Merge.rc:1697 Merge.rc:1718
-#: Merge.rc:1743
+#: Merge.rc:1564 Merge.rc:1581 Merge.rc:1602 Merge.rc:1707 Merge.rc:1728
+#: Merge.rc:1753
msgid "Not Equal"
msgstr "Não Igual"
#. IDR_POPUP_FILTERMENU_DIFF_PROP, ID_FILTERMENU_DIFF_PROP_LESS
-#: Merge.rc:1555 Merge.rc:1572 Merge.rc:1698 Merge.rc:1719 Merge.rc:1744
+#: Merge.rc:1565 Merge.rc:1582 Merge.rc:1708 Merge.rc:1729 Merge.rc:1754
msgid "Less Than"
msgstr "Menos Que"
#. IDR_POPUP_FILTERMENU_DIFF_PROP, ID_FILTERMENU_DIFF_PROP_LESS_EQUAL
-#: Merge.rc:1556 Merge.rc:1573 Merge.rc:1699 Merge.rc:1720 Merge.rc:1745
+#: Merge.rc:1566 Merge.rc:1583 Merge.rc:1709 Merge.rc:1730 Merge.rc:1755
msgid "Less Than or Equal to"
msgstr "Menos Que ou Igual a"
#. IDR_POPUP_FILTERMENU_DIFF_PROP, ID_FILTERMENU_DIFF_PROP_GREATER
-#: Merge.rc:1557 Merge.rc:1574 Merge.rc:1700 Merge.rc:1721 Merge.rc:1746
+#: Merge.rc:1567 Merge.rc:1584 Merge.rc:1710 Merge.rc:1731 Merge.rc:1756
msgid "Greater Than"
msgstr "Maior Que"
#. IDR_POPUP_FILTERMENU_DIFF_PROP, ID_FILTERMENU_DIFF_PROP_GREATER_EQUAL
-#: Merge.rc:1558 Merge.rc:1575 Merge.rc:1701 Merge.rc:1722 Merge.rc:1747
+#: Merge.rc:1568 Merge.rc:1585 Merge.rc:1711 Merge.rc:1732 Merge.rc:1757
msgid "Greater Than or Equal to"
msgstr "Maior Que ou Igual a"
#. IDR_POPUP_FILTERMENU_DIFF_SIZE, ID_FILTERMENU_DIFF_SIZE_LT_10B
-#: Merge.rc:1560 Merge.rc:1703
+#: Merge.rc:1570 Merge.rc:1713
msgid "Less than 10B"
msgstr "Menos de 10B"
#. IDR_POPUP_FILTERMENU_DIFF_SIZE, ID_FILTERMENU_DIFF_SIZE_GE_10B
-#: Merge.rc:1561 Merge.rc:1704
+#: Merge.rc:1571 Merge.rc:1714
msgid "10B or more"
msgstr "10B ou mais"
#. IDR_POPUP_FILTERMENU_DIFF_SIZE, ID_FILTERMENU_DIFF_SIZE_LT_100B
-#: Merge.rc:1562 Merge.rc:1705
+#: Merge.rc:1572 Merge.rc:1715
msgid "Less than 100B"
msgstr "Menos de 100B"
#. IDR_POPUP_FILTERMENU_DIFF_SIZE, ID_FILTERMENU_DIFF_SIZE_GE_100B
-#: Merge.rc:1563 Merge.rc:1706
+#: Merge.rc:1573 Merge.rc:1716
msgid "100B or more"
msgstr "100B ou mais"
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_LT_1SECOND
-#: Merge.rc:1577 Merge.rc:1724
+#: Merge.rc:1587 Merge.rc:1734
msgid "Less than 1 second"
msgstr "Menos de 1 segundo"
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_GE_1SECOND
-#: Merge.rc:1578 Merge.rc:1725
+#: Merge.rc:1588 Merge.rc:1735
msgid "1 second or more"
msgstr "1 segundo ou mais"
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_LT_1MINUTE
-#: Merge.rc:1579 Merge.rc:1726
+#: Merge.rc:1589 Merge.rc:1736
msgid "Less than 1 minute"
msgstr "Menos de 1 minuto"
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_GE_1MINUTE
-#: Merge.rc:1580 Merge.rc:1727
+#: Merge.rc:1590 Merge.rc:1737
msgid "1 minute or more"
msgstr "1 minuto ou mais"
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_LT_1HOUR
-#: Merge.rc:1581 Merge.rc:1728
+#: Merge.rc:1591 Merge.rc:1738
msgid "Less than 1 hour"
msgstr "Menos de 1 hora"
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_GE_1HOUR
-#: Merge.rc:1582 Merge.rc:1729
+#: Merge.rc:1592 Merge.rc:1739
msgid "1 hour or more"
msgstr "1 hora ou mais"
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_LT_1DAY
-#: Merge.rc:1583 Merge.rc:1730
+#: Merge.rc:1593 Merge.rc:1740
msgid "Less than 1 day"
msgstr "Menos de 1 dia"
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_GE_1DAY
-#: Merge.rc:1584 Merge.rc:1731
+#: Merge.rc:1594 Merge.rc:1741
msgid "1 day or more"
msgstr "1 dia ou mais"
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_LT_1WEEK
-#: Merge.rc:1585 Merge.rc:1732
+#: Merge.rc:1595 Merge.rc:1742
msgid "Less than 1 week"
msgstr "Menos de 1 semana"
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_GE_1WEEK
-#: Merge.rc:1586 Merge.rc:1733
+#: Merge.rc:1596 Merge.rc:1743
msgid "1 week or more"
msgstr "1 semana ou mais"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_CONDITION_DIFF_LEFT_RIGHT
-#: Merge.rc:1596
+#: Merge.rc:1606
msgid "Target: &Left and Right"
msgstr "Alvo: &Esquerda e Direita"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_CONDITION_DIFF_LEFT_MIDDLE
-#: Merge.rc:1597
+#: Merge.rc:1607
msgid "Target: Left and &Middle"
msgstr "Alvo: Esquerda e &Meio"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_CONDITION_DIFF_MIDDLE_RIGHT
-#: Merge.rc:1598
+#: Merge.rc:1608
msgid "Target: Middle and &Right"
msgstr "Alvo: Meio e &Direita"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_CONDITION_DIFF_ALL
-#: Merge.rc:1599
+#: Merge.rc:1609
msgid "Target: &All"
msgstr "&Alvo: Todos"
#. IDR_POPUP_FILTERMENU_BINARY, ID_FILTERMENU_BINARY_ONLY
-#: Merge.rc:1620
+#: Merge.rc:1630
msgid "Binary files only"
msgstr "Apenas arquivos binários"
#. IDR_POPUP_FILTERMENU_BINARY, ID_FILTERMENU_TEXT_ONLY
-#: Merge.rc:1621
+#: Merge.rc:1631
msgid "Text files only"
msgstr "Apenas arquivos texto"
#. IDR_POPUP_ADDCMPMENU, ID_ADDCMPMENU_CLEAR
-#: Merge.rc:1755
+#: Merge.rc:1765
msgid "&Clear conditions"
msgstr "Limpar &condições"
#. IDR_POPUP_ADDCMPMENU, ID_ADDCMPMENU_CMP_SIZE
-#: Merge.rc:1757
+#: Merge.rc:1767
msgid "Compare &Size"
msgstr "Comparar &Tamanho"
#. IDR_POPUP_ADDCMPMENU, ID_ADDCMPMENU_CMP_DATE
-#: Merge.rc:1758
+#: Merge.rc:1768
msgid "Compare &Date"
msgstr "Comparar &Data"
#. IDR_POPUP_ADDCMPMENU, ID_ADDCMPMENU_CMP_ATTR
-#: Merge.rc:1759
+#: Merge.rc:1769
msgid "Compare &Attributes"
msgstr "Comparar &Atributos"
#. IDR_POPUP_ADDCMPMENU, ID_ADDCMPMENU_CMP_CONTENTS
-#: Merge.rc:1760
+#: Merge.rc:1770
msgid "Compare C&ontents"
msgstr "Comparar C&onteúdo"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_CLEAR
-#: Merge.rc:1769
+#: Merge.rc:1779
msgid "&Clear Keys"
msgstr "Limpar &Chaves"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_NAME
-#: Merge.rc:1771
+#: Merge.rc:1781
msgid "&Name"
msgstr "&Nome"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_BASENAME
-#: Merge.rc:1772
+#: Merge.rc:1782
msgid "&Base name (without extension)"
msgstr "Nome &base (sem extensão)"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_NORMALIZED_NAME
-#: Merge.rc:1773
+#: Merge.rc:1783
msgid "Normalized &Unicode Name"
msgstr "Nome &Unicode Normalizado"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_RELPATH
-#: Merge.rc:1774
+#: Merge.rc:1784
msgid "&Relative Path"
msgstr "Caminho &Relativo"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_DATE
-#: Merge.rc:1776
+#: Merge.rc:1786
msgid "&Date"
msgstr "&Data"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_HASH_MD5
-#: Merge.rc:1777
+#: Merge.rc:1787
msgid "&Hash (MD5)"
msgstr "&Hash (MD5)"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_REPLACE
-#: Merge.rc:1780
+#: Merge.rc:1790
msgid "Insert &replace() Function"
msgstr "Inserir Função &replace()"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_REGEXREPLACE
-#: Merge.rc:1781
+#: Merge.rc:1791
msgid "Insert rege&xReplace() Function"
msgstr "Inserir Função rege&xReplace()"
#. IDR_POPUP_RENAMEMOVE_MENU
-#: Merge.rc:1782
+#: Merge.rc:1792
msgid "Replace &Lists"
msgstr "Substituir &Listas"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_CREATE_REPLACELIST
-#: Merge.rc:1784
+#: Merge.rc:1794
msgid "&Create String Replace List and Insert..."
msgstr "&Criar Lista de Substituição de String e Adicionar..."
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_CREATE_REGEXREPLACELIST
-#: Merge.rc:1785
+#: Merge.rc:1795
msgid "Create &Regex Replace List and Insert..."
msgstr "Criar Lista de Substituição &Regex e Adicionar..."
#. IDR_POPUP_RENAMEMOVE_MENU
-#: Merge.rc:1787
+#: Merge.rc:1797
msgid "&String Replace Lists"
msgstr "Listas de Substituição de &String"
#. IDR_POPUP_RENAMEMOVE_MENU
-#: Merge.rc:1791
+#: Merge.rc:1801
msgid "Re&gex Replace Lists"
msgstr "Listas de Substituição de Re&gex"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_STRING_REPLACE_LISTS_FOLDER
-#: Merge.rc:1796
+#: Merge.rc:1806
msgid "Open String Replace Lists Folder..."
msgstr "Abrir Pasta de Listas de Substituição de String..."
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_REGEX_REPLACE_LISTS_FOLDER
-#: Merge.rc:1797
+#: Merge.rc:1807
msgid "Open Regex Replace Lists Folder..."
msgstr "Abrir Pasta de Listas de Substituição de Regex..."
#. IDD_FILTERS_CONDITION, IDC_CONDITION_MATCHCASE
-#: Merge.rc:1799 Merge.rc:1995 Merge.rc:2014 Merge.rc:2042 Merge.rc:2585
+#: Merge.rc:1809 Merge.rc:2005 Merge.rc:2024 Merge.rc:2052 Merge.rc:2595
msgid "Match &case"
msgstr "&Corresponder maiúsculas/minúsculas"
#. IDR_POPUP_RENAMEMOVE_MENU
-#: Merge.rc:1801
+#: Merge.rc:1811
msgid "Text &Normalization"
msgstr "&Normalização de Texto"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_TOLOWER
-#: Merge.rc:1803
+#: Merge.rc:1813
msgid "&Lowercase"
msgstr "Minúscu&las"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_TOUPPER
-#: Merge.rc:1804
+#: Merge.rc:1814
msgid "&Uppercase"
msgstr "Maiúsc&ulas"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_TOHALFWIDTH
-#: Merge.rc:1805
+#: Merge.rc:1815
msgid "&Half-width"
msgstr "Meia lar&gura"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_TOFULLWIDTH
-#: Merge.rc:1806
+#: Merge.rc:1816
msgid "&Full-width"
msgstr "L&argura total"
#. IDR_POPUP_RENAMEMOVE_MENU
-#: Merge.rc:1807
+#: Merge.rc:1817
msgid "&Chinese Conversion"
msgstr "Conversão do &Chinês"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_TOSIMPLIFIEDCHINESE
-#: Merge.rc:1809
+#: Merge.rc:1819
msgid "&Simplified Chinese"
msgstr "Chinês &Simplificado"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_TOTRADITIONALCHINESE
-#: Merge.rc:1810
+#: Merge.rc:1820
msgid "&Traditional Chinese"
msgstr "Chinês &Tradicional"
#. IDR_POPUP_RENAMEMOVE_MENU
-#: Merge.rc:1812
+#: Merge.rc:1822
msgid "&Japanese Conversion"
msgstr "Conversão do &Japonês"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_TOHIRAGANA
-#: Merge.rc:1814
+#: Merge.rc:1824
msgid "&Hiragana"
msgstr "&Hiragana"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_TOKATAKANA
-#: Merge.rc:1815
+#: Merge.rc:1825
msgid "&Katakana"
msgstr "&Katakana"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_NORMALIZEUNICODE
-#: Merge.rc:1817
+#: Merge.rc:1827
msgid "Normalize &Unicode"
msgstr "Normalizar &Unicode"
#. IDD_ABOUTBOX
-#: Merge.rc:1932
+#: Merge.rc:1942
msgid "About WinMerge"
msgstr "Sobre o WinMerge"
#. IDD_ABOUTBOX, IDC_WWW
-#: Merge.rc:1936
+#: Merge.rc:1946
msgid "Visit the WinMerge Homepage!"
msgstr "Visite a Página Inicial do WinMerge!"
#. IDD_PLUGINS_EDITPLUGIN, IDOK
-#: Merge.rc:1938 Merge.rc:2080 Merge.rc:2431 Merge.rc:2455 Merge.rc:2469
-#: Merge.rc:2497 Merge.rc:2588 Merge.rc:2613 Merge.rc:2674 Merge.rc:2691
-#: Merge.rc:2703 Merge.rc:2867 Merge.rc:2927 Merge.rc:3062 Merge.rc:3104
-#: Merge.rc:3147 Merge.rc:3197
+#: Merge.rc:1948 Merge.rc:2090 Merge.rc:2441 Merge.rc:2465 Merge.rc:2479
+#: Merge.rc:2507 Merge.rc:2598 Merge.rc:2623 Merge.rc:2684 Merge.rc:2701
+#: Merge.rc:2713 Merge.rc:2877 Merge.rc:2937 Merge.rc:3072 Merge.rc:3114
+#: Merge.rc:3157 Merge.rc:3207
msgid "OK"
msgstr "OK"
#. IDD_ABOUTBOX, IDC_OPEN_CONTRIBUTORS
-#: Merge.rc:1939
+#: Merge.rc:1949
msgid "Contributors"
msgstr "Contribuidores"
#. IDD_SELECT_FILES_OR_FOLDERS
-#: Merge.rc:1945 Merge.rc:3070
+#: Merge.rc:1955 Merge.rc:3080
msgid "Select Files or Folders"
msgstr "Selecionar Arquivos ou Pastas"
#. IDD_OPEN, IDC_FILES_DIRS_GROUP0
-#: Merge.rc:1949
+#: Merge.rc:1959
msgid "&1st File or Folder"
msgstr "&1º Arquivo ou Pasta"
#. IDD_OPEN, IDC_PATH0_READONLY
-#: Merge.rc:1951
+#: Merge.rc:1961
msgid "Re&ad-only"
msgstr "So&mente Leitura"
#. IDD_OPEN, IDC_SWAP01_STATIC
-#: Merge.rc:1953
+#: Merge.rc:1963
msgid "Swap 1st | 2nd"
msgstr "Trocar 1º | 2º"
#. IDD_GENERATE_PATCH, IDC_DIFF_BROWSE_FILE1
-#: Merge.rc:1954 Merge.rc:2310 Merge.rc:2413
+#: Merge.rc:1964 Merge.rc:2320 Merge.rc:2423
msgid "&Browse..."
msgstr "&Navegar..."
#. IDD_OPEN, IDC_FILES_DIRS_GROUP1
-#: Merge.rc:1955
+#: Merge.rc:1965
msgid "&2nd File or Folder"
msgstr "&2º Arquivo ou Pasta"
#. IDD_OPEN, IDC_PATH1_READONLY
-#: Merge.rc:1957
+#: Merge.rc:1967
msgid "Rea&d-only"
msgstr "Som&ente Leitura"
#. IDD_OPEN, IDC_SWAP12_STATIC
-#: Merge.rc:1959
+#: Merge.rc:1969
msgid "Swap 2nd | 3rd"
msgstr "Trocar 2º | 3º"
#. IDD_PROPPAGE_SYSTEM, IDC_FILTER_USER_BROWSE
-#: Merge.rc:1960 Merge.rc:2315
+#: Merge.rc:1970 Merge.rc:2325
msgid "B&rowse..."
msgstr "N&avegar..."
#. IDD_OPEN, IDC_FILES_DIRS_GROUP2
-#: Merge.rc:1961
+#: Merge.rc:1971
msgid "&3rd File or Folder (Optional)"
msgstr "&3º Arquivo ou Pasta (Opcional)"
#. IDD_OPEN, IDC_PATH2_READONLY
-#: Merge.rc:1963
+#: Merge.rc:1973
msgid "Read-o&nly"
msgstr "Somen&te Leitura"
#. IDD_OPEN, IDC_SWAP02_STATIC
-#: Merge.rc:1965
+#: Merge.rc:1975
msgid "Swap 1st | 3rd"
msgstr "Trocar 1º | 3º"
#. IDD_PROPPAGE_BACKUPS, IDC_BACKUP_BROWSE
-#: Merge.rc:1966 Merge.rc:2685 Merge.rc:2883
+#: Merge.rc:1976 Merge.rc:2695 Merge.rc:2893
msgid "Browse..."
msgstr "Navegar..."
#. IDD_OPEN, IDC_FILES_DIRS_GROUP3
-#: Merge.rc:1968
+#: Merge.rc:1978
msgid " Folder: Filter"
msgstr " Pasta: Filtro"
#. IDD_OPEN, IDC_RECURS_CHECK
-#: Merge.rc:1971
+#: Merge.rc:1981
msgid "&Include subfolders"
msgstr "&Incluir subpastas"
#. IDD_OPEN, IDC_FILES_DIRS_GROUP5
-#: Merge.rc:1972
+#: Merge.rc:1982
msgid " File: Prediffer Plugin"
msgstr " Arquivo: Plugin de Pré-Diferenciação"
#. IDD_OPEN, IDC_FILES_DIRS_GROUP4
-#: Merge.rc:1976
+#: Merge.rc:1986
msgid " File: Unpacker Plugin"
msgstr " Arquivo: Plugin de Descompactador"
#. IDD_OPEN, IDC_SELECT_UNPACKER
-#: Merge.rc:1978
+#: Merge.rc:1988
msgid "Se&lect..."
msgstr "Se&lecionar..."
#. IDD_PLUGINS_EDITPLUGIN, IDCANCEL
-#: Merge.rc:1981 Merge.rc:2001 Merge.rc:2025 Merge.rc:2046 Merge.rc:2081
-#: Merge.rc:2432 Merge.rc:2456 Merge.rc:2470 Merge.rc:2498 Merge.rc:2551
-#: Merge.rc:2589 Merge.rc:2614 Merge.rc:2675 Merge.rc:2692 Merge.rc:2704
-#: Merge.rc:2868 Merge.rc:2928 Merge.rc:3087 Merge.rc:3105 Merge.rc:3148
-#: Merge.rc:3198
+#: Merge.rc:1991 Merge.rc:2011 Merge.rc:2035 Merge.rc:2056 Merge.rc:2091
+#: Merge.rc:2442 Merge.rc:2466 Merge.rc:2480 Merge.rc:2508 Merge.rc:2561
+#: Merge.rc:2599 Merge.rc:2624 Merge.rc:2685 Merge.rc:2702 Merge.rc:2714
+#: Merge.rc:2878 Merge.rc:2938 Merge.rc:3097 Merge.rc:3115 Merge.rc:3158
+#: Merge.rc:3208
msgid "Cancel"
msgstr "Cancelar"
#. IDD_OPEN, IDC_OPEN_STATUS
-#: Merge.rc:1982
+#: Merge.rc:1992
msgid "Status:"
msgstr "Status:"
#. IDD_PLUGINS_LIST, ID_HELP
-#: Merge.rc:1983 Merge.rc:2082 Merge.rc:2929
+#: Merge.rc:1993 Merge.rc:2092 Merge.rc:2939
msgid "Help"
msgstr "Ajuda"
#. IDD_OPEN, IDC_OPTIONS
-#: Merge.rc:1984
+#: Merge.rc:1994
msgid "&Options..."
msgstr "&Opções..."
#. IDD_EDIT_FIND
-#: Merge.rc:1989
+#: Merge.rc:1999
msgid "Find"
msgstr "Encontrar"
#. IDD_EDIT_MARKER, IDC_STATIC
-#: Merge.rc:1992 Merge.rc:2009 Merge.rc:2037
+#: Merge.rc:2002 Merge.rc:2019 Merge.rc:2047
msgid "Fi&nd what:"
msgstr "E&ncontrar o quê:"
#. IDD_EDIT_MARKER, IDC_EDIT_WHOLE_WORD
-#: Merge.rc:1994 Merge.rc:2013 Merge.rc:2041
+#: Merge.rc:2004 Merge.rc:2023 Merge.rc:2051
msgid "Match &whole word only"
msgstr "C&orresponder apenas palavras inteiras"
#. IDD_EDIT_MARKER, IDC_EDIT_REGEXP
-#: Merge.rc:1996 Merge.rc:2015 Merge.rc:2043
+#: Merge.rc:2006 Merge.rc:2025 Merge.rc:2053
msgid "Regular &expression"
msgstr "Expressão ®ular"
#. IDD_EDIT_FIND, IDC_FINDDLG_DONTWRAP
-#: Merge.rc:1997
+#: Merge.rc:2007
msgid "D&on't wrap end of file"
msgstr "Não &quebrar final de arquivo"
#. IDD_EDIT_FIND, IDC_FINDDLG_DONTCLOSE
-#: Merge.rc:1998
+#: Merge.rc:2008
msgid "&Don't close this dialog"
msgstr "&Não fechar esta caixa de diálogo"
#. IDD_EDIT_REPLACE, IDC_EDIT_SKIP
-#: Merge.rc:1999 Merge.rc:2021
+#: Merge.rc:2009 Merge.rc:2031
msgid "&Find Next"
msgstr "&Encontrar a Próxima"
#. IDD_EDIT_FIND, IDC_EDIT_FINDPREV
-#: Merge.rc:2000
+#: Merge.rc:2010
msgid "Find &Prev"
msgstr "Encontrar a &Anterior"
#. IDD_EDIT_REPLACE
-#: Merge.rc:2006
+#: Merge.rc:2016
msgid "Replace"
msgstr "Substituir"
#. IDD_EDIT_REPLACE, IDC_STATIC
-#: Merge.rc:2011
+#: Merge.rc:2021
msgid "Re&place with:"
msgstr "Su&bstituir por:"
#. IDD_EDIT_REPLACE, IDC_EDIT_SCOPE_DONT_WRAP
-#: Merge.rc:2016
+#: Merge.rc:2026
msgid "&Don't wrap at end of file"
msgstr "&Não quebrar no final do arquivo"
#. IDD_EDIT_REPLACE, IDC_STATIC
-#: Merge.rc:2018
+#: Merge.rc:2028
msgid "Replace in"
msgstr "Substituir em"
#. IDD_EDIT_REPLACE, IDC_EDIT_SCOPE_WHOLE_FILE
-#: Merge.rc:2020
+#: Merge.rc:2030
msgid "Wh&ole file"
msgstr "O &arquivo inteiro"
#. IDD_EDIT_REPLACE, IDC_EDIT_FINDPREV
-#: Merge.rc:2022
+#: Merge.rc:2032
msgid "Find Pre&v"
msgstr "Encontrar a An&terior"
#. IDD_EDIT_REPLACE, IDC_EDIT_REPLACE
-#: Merge.rc:2023
+#: Merge.rc:2033
msgid "&Replace"
msgstr "S&ubstituir"
#. IDD_EDIT_REPLACE, IDC_EDIT_REPLACE_ALL
-#: Merge.rc:2024
+#: Merge.rc:2034
msgid "Replace &All"
msgstr "Subst&ituir Tudo"
#. IDS_OPTIONSPG_MARKERCOLORS
-#: Merge.rc:2030 Merge.rc:4209
+#: Merge.rc:2040 Merge.rc:4219
msgid "Markers"
msgstr "Marcadores"
#. IDD_EDIT_MARKER, IDC_EDIT_MARKERS_ENABLED
-#: Merge.rc:2033
+#: Merge.rc:2043
msgid "Enable &markers"
msgstr "Habilitar &marcadores"
#. IDD_FILTERS_LINEFILTERS, IDC_LFILTER_ADDBTN
-#: Merge.rc:2035 Merge.rc:2057
+#: Merge.rc:2045 Merge.rc:2067
msgid "New"
msgstr "Novo"
#. IDD_EDIT_MARKER, IDC_STATIC
-#: Merge.rc:2039
+#: Merge.rc:2049
msgid "&Background color:"
msgstr "&Cor do plano de fundo:"
#. IDS_MESSAGEBOX_OK
-#: Merge.rc:2044 Merge.rc:2829 Merge.rc:3086 Merge.rc:4171
+#: Merge.rc:2054 Merge.rc:2839 Merge.rc:3096 Merge.rc:4181
msgid "&Ok"
msgstr "&Ok"
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:2045 Merge.rc:2525 Merge.rc:3199
+#: Merge.rc:2055 Merge.rc:2535 Merge.rc:3209
msgid "&Apply"
msgstr "&Aplicar"
#. IDD_FILTERS_LINEFILTERS
-#: Merge.rc:2051
+#: Merge.rc:2061
msgid "Line Filters"
msgstr "Filtros de Linha"
#. IDD_FILTERS_LINEFILTERS, IDC_IGNOREREGEXP
-#: Merge.rc:2054
+#: Merge.rc:2064
msgid "Enable Line Filters"
msgstr "Habilitar Filtros de Linha"
#. IDD_FILTERS_LINEFILTERS, IDC_STATIC
-#: Merge.rc:2055
+#: Merge.rc:2065
msgid "Regular Expressions (one per line):"
msgstr "Expressões Regulares (uma por linha):"
#. IDD_PLUGINS_LIST, IDC_PLUGIN_EDIT
-#: Merge.rc:2058 Merge.rc:2924
+#: Merge.rc:2068 Merge.rc:2934
msgid "Edit"
msgstr "Editar"
#. IDD_PLUGINS_LIST, IDC_PLUGIN_REMOVE
-#: Merge.rc:2059 Merge.rc:2071 Merge.rc:2925
+#: Merge.rc:2069 Merge.rc:2081 Merge.rc:2935
msgid "Remove"
msgstr "Remover"
#. IDD_FILTERS_SUBSTITUTIONFILTERS
-#: Merge.rc:2064
+#: Merge.rc:2074
msgid "Substitution Filters"
msgstr "Filtros de Substituição"
#. IDD_FILTERS_SUBSTITUTIONFILTERS, IDC_STATIC
-#: Merge.rc:2067
+#: Merge.rc:2077
msgid "Changes to the listed pairs below will be ignored or marked as insignificant. Patches are unaffected."
msgstr "Alterações nos pares listados abaixo serão ignoradas ou marcadas como insignificantes. Os patches não são afetados."
#. IDD_FILTERS_SUBSTITUTIONFILTERS, IDC_IGNORED_SUSBSTITUTIONS_ENABLED
-#: Merge.rc:2068
+#: Merge.rc:2078
msgid "Enable"
msgstr "Habilitar"
#. IDD_PLUGINS_LIST, IDC_PLUGIN_ADD
-#: Merge.rc:2070 Merge.rc:2923
+#: Merge.rc:2080 Merge.rc:2933
msgid "Add"
msgstr "Adicionar"
#. IDD_FILTERS_SUBSTITUTIONFILTERS, IDC_LFILTER_CLEARBTN
-#: Merge.rc:2072
+#: Merge.rc:2082
msgid "Clear"
msgstr "Limpar"
#. IDD_PREFERENCES
-#: Merge.rc:2077
+#: Merge.rc:2087
msgid "Options"
msgstr "Opções"
#. IDD_PREFERENCES, IDC_TREEOPT_IMPORT
-#: Merge.rc:2086
+#: Merge.rc:2096
msgid "Import..."
msgstr "Importar..."
#. IDD_PREFERENCES, IDC_TREEOPT_EXPORT
-#: Merge.rc:2087
+#: Merge.rc:2097
msgid "Export..."
msgstr "Exportar..."
#. IDS_OPTIONSPG_GENCOMPARE
-#: Merge.rc:2092 Merge.rc:4199 Merge.rc:4202 Merge.rc:4219
+#: Merge.rc:2102 Merge.rc:4209 Merge.rc:4212 Merge.rc:4229
msgid "General"
msgstr "Geral"
#. IDD_PROPPAGE_GENERAL, IDC_SCROLL_CHECK
-#: Merge.rc:2095
+#: Merge.rc:2105
msgid "Automatically &scroll to first difference"
msgstr "Rolar &automaticamente para a primeira diferença"
#. IDD_PROPPAGE_GENERAL, IDC_SCROLL_TO_FIRST_INLINE_DIFF_CHECK
-#: Merge.rc:2097
+#: Merge.rc:2107
msgid "Automatically s&croll to first inline difference"
msgstr "Rolar a&utomaticamente para a primeira diferença em linha"
#. IDD_PROPPAGE_GENERAL, IDC_STATIC
-#: Merge.rc:2099
+#: Merge.rc:2109
msgid "Cl&ose windows with 'Esc':"
msgstr "Fe&char janelas com 'Esc':"
#. IDD_PROPPAGE_GENERAL, IDC_VERIFY_OPEN_PATHS
-#: Merge.rc:2101
+#: Merge.rc:2111
msgid "&Automatically verify paths in Open dialog"
msgstr "&Verificar automaticamente os caminhos na caixa de diálogo Abrir"
#. IDD_PROPPAGE_GENERAL, IDC_STATIC
-#: Merge.rc:2103
+#: Merge.rc:2113
msgid "Single instance mode:"
msgstr "Modo de instância única:"
#. IDD_PROPPAGE_GENERAL, IDC_ASK_MULTIWINDOW_CLOSE
-#: Merge.rc:2105
+#: Merge.rc:2115
msgid "As&k when closing multiple windows"
msgstr "Pe&rguntar quando fechar múltiplas janelas"
#. IDD_PROPPAGE_GENERAL, IDC_PRESERVE_FILETIME
-#: Merge.rc:2107
+#: Merge.rc:2117
msgid "&Preserve file time in file compare"
msgstr "&Preservar hora do arquivo na comparação de arquivos"
#. IDD_PROPPAGE_GENERAL, IDC_STARTUP_FOLDER_SELECT
-#: Merge.rc:2109
+#: Merge.rc:2119
msgid "Show \"Select Files or Folders\" dialog on startup"
msgstr "Mostrar a caixa de diálogo “Selecionar Arquivos ou Pastas” ao iniciar"
#. IDD_PROPPAGE_GENERAL, IDC_CLOSE_WITH_OK
-#: Merge.rc:2111
+#: Merge.rc:2121
msgid "Close \"Select Files or Folders\" dialog on clicking Compare button"
msgstr "Fechar a caixa de diálogo “Selecionar Arquivos ou Pastas” ao clicar no botão Comparar"
#. IDD_PROPPAGE_GENERAL, IDC_STATIC
-#: Merge.rc:2113
+#: Merge.rc:2123
msgid "Op&en dialog Auto completion:"
msgstr "Pr&eenchimento automático da caixa de diálogo Abrir:"
#. IDD_PROPPAGE_GENERAL, IDC_STATIC
-#: Merge.rc:2115
+#: Merge.rc:2125
msgid "Auto-&reload modified files:"
msgstr "Recarregar automaticamente os arquivos modificados:"
#. IDD_PROPPAGE_GENERAL, IDC_STATIC
-#: Merge.rc:2117
+#: Merge.rc:2127
msgid "Language:"
msgstr "Idioma:"
#. IDD_PROPPAGE_COMPARE_WEBPAGE, IDC_COMPARE_DEFAULTS
-#: Merge.rc:2119 Merge.rc:2299 Merge.rc:2321 Merge.rc:2352 Merge.rc:2369
-#: Merge.rc:2386 Merge.rc:2394 Merge.rc:2430 Merge.rc:2454 Merge.rc:2633
-#: Merge.rc:2644 Merge.rc:2653 Merge.rc:2887 Merge.rc:2922 Merge.rc:2985
-#: Merge.rc:3010 Merge.rc:3024 Merge.rc:3038 Merge.rc:3054
+#: Merge.rc:2129 Merge.rc:2309 Merge.rc:2331 Merge.rc:2362 Merge.rc:2379
+#: Merge.rc:2396 Merge.rc:2404 Merge.rc:2440 Merge.rc:2464 Merge.rc:2643
+#: Merge.rc:2654 Merge.rc:2663 Merge.rc:2897 Merge.rc:2932 Merge.rc:2995
+#: Merge.rc:3020 Merge.rc:3034 Merge.rc:3048 Merge.rc:3064
msgid "Defaults"
msgstr "Padrões"
#. IDS_OPTIONSPG_COLORS
-#: Merge.rc:2124 Merge.rc:2140 Merge.rc:2267 Merge.rc:2292 Merge.rc:4205
+#: Merge.rc:2134 Merge.rc:2150 Merge.rc:2277 Merge.rc:2302 Merge.rc:4215
msgid "Colors"
msgstr "Cores"
#. IDD_PROPPAGE_COLOR_SCHEMES, IDC_STATIC
-#: Merge.rc:2127
+#: Merge.rc:2137
msgid "Color &mode:"
msgstr "&Modo de cor:"
#. IDD_PROPPAGE_COLOR_SCHEMES, IDC_STATIC
-#: Merge.rc:2129
+#: Merge.rc:2139
msgid "&Light mode scheme:"
msgstr "Esquema do modo &claro:"
#. IDD_PROPPAGE_COLOR_SCHEMES, IDC_STATIC
-#: Merge.rc:2131
+#: Merge.rc:2141
msgid "&Dark mode scheme:"
msgstr "Esquema do modo &escuro:"
#. IDD_PROPPAGE_COLOR_SCHEMES, IDC_STATIC
-#: Merge.rc:2133
+#: Merge.rc:2143
msgid "Your custom schemes"
msgstr "Seus esquemas personalizados"
#. IDD_PROPPAGE_COLOR_SCHEMES, IDC_COLOR_SCHEME_SAVE
-#: Merge.rc:2134
+#: Merge.rc:2144
msgid "&Save current scheme..."
msgstr "&Salvar esquema atual..."
#. IDD_PROPPAGE_COLOR_SCHEMES, IDC_COLOR_SCHEME_DELETE
-#: Merge.rc:2135
+#: Merge.rc:2145
msgid "Delete ¤t scheme..."
msgstr "Ex&cluir esquema atual..."
#. IDD_PROPPAGE_COLORS_DIR, IDC_BACKGROUND_COLUMN_LABEL
-#: Merge.rc:2143 Merge.rc:2238 Merge.rc:2258 Merge.rc:2272
+#: Merge.rc:2153 Merge.rc:2248 Merge.rc:2268 Merge.rc:2282
msgid "Background"
msgstr "Plano de fundo"
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2144
+#: Merge.rc:2154
msgid "Deleted"
msgstr "Excluído"
#. IDS_OPTIONSPG_TEXTCOLORS
-#: Merge.rc:2145 Merge.rc:2207 Merge.rc:2239 Merge.rc:2273 Merge.rc:4207
+#: Merge.rc:2155 Merge.rc:2217 Merge.rc:2249 Merge.rc:2283 Merge.rc:4217
msgid "Text"
msgstr "Texto"
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2146
+#: Merge.rc:2156
msgid "Difference:"
msgstr "Diferença:"
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2151
+#: Merge.rc:2161
msgid "Selected Difference:"
msgstr "Diferença Selecionada:"
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2156
+#: Merge.rc:2166
msgid "Ignored Difference:"
msgstr "Diferença Ignorada:"
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2161
+#: Merge.rc:2171
msgid "Moved:"
msgstr "Movido:"
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2166
+#: Merge.rc:2176
msgid "Selected Moved:"
msgstr "Movido Selecionado:"
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2171
+#: Merge.rc:2181
msgid "Same As Next (3 panes):"
msgstr "O Mesmo que o Próximo (3 painéis):"
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2176
+#: Merge.rc:2186
msgid "Same As Next (Selected):"
msgstr "O Mesmo que o Próximo (Selecionado):"
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2181
+#: Merge.rc:2191
msgid "Word Difference:"
msgstr "Diferença de Palavra:"
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2186
+#: Merge.rc:2196
msgid "Selected Word Diff:"
msgstr "Diferença de Palavra Selecionada:"
#. IDD_INPUTBOX
-#: Merge.rc:2195 Merge.rc:2230 Merge.rc:2251 Merge.rc:3099
+#: Merge.rc:2205 Merge.rc:2240 Merge.rc:2261 Merge.rc:3109
msgid "Dialog"
msgstr "Caixa de diálogo"
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC
-#: Merge.rc:2198
+#: Merge.rc:2208
msgid "Keywords:"
msgstr "Palavras-chave:"
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC
-#: Merge.rc:2199
+#: Merge.rc:2209
msgid "Function names:"
msgstr "Nomes de função:"
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC
-#: Merge.rc:2200
+#: Merge.rc:2210
msgid "Comments:"
msgstr "Comentários:"
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC
-#: Merge.rc:2201
+#: Merge.rc:2211
msgid "Numbers:"
msgstr "Números:"
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC
-#: Merge.rc:2202
+#: Merge.rc:2212
msgid "Operators:"
msgstr "Operadores:"
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC
-#: Merge.rc:2203
+#: Merge.rc:2213
msgid "Strings:"
msgstr "Strings:"
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC
-#: Merge.rc:2204
+#: Merge.rc:2214
msgid "Preprocessor:"
msgstr "Pré-processador:"
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC
-#: Merge.rc:2205
+#: Merge.rc:2215
msgid "User 1:"
msgstr "Usuário 1:"
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC
-#: Merge.rc:2206
+#: Merge.rc:2216
msgid "User 2:"
msgstr "Usuário 2:"
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_SCOLOR_USER2_BOLD
-#: Merge.rc:2209 Merge.rc:2211 Merge.rc:2213 Merge.rc:2215 Merge.rc:2217
-#: Merge.rc:2219 Merge.rc:2221 Merge.rc:2223 Merge.rc:2225
+#: Merge.rc:2219 Merge.rc:2221 Merge.rc:2223 Merge.rc:2225 Merge.rc:2227
+#: Merge.rc:2229 Merge.rc:2231 Merge.rc:2233 Merge.rc:2235
msgid "Bold"
msgstr "Negrito"
#. IDD_PROPPAGE_COLORS_TEXT, IDC_DEFAULT_STANDARD_COLORS
-#: Merge.rc:2233
+#: Merge.rc:2243
msgid "&Use customized text colors"
msgstr "&Usar cores de texto personalizadas"
#. IDD_PROPPAGE_COLORS_TEXT, IDC_WHITESPACE_COLOR_LABEL
-#: Merge.rc:2235
+#: Merge.rc:2245
msgid "Whitespace:"
msgstr "Espaço em branco:"
#. IDD_PROPPAGE_COLORS_TEXT, IDC_TEXT_COLOR_LABEL
-#: Merge.rc:2236
+#: Merge.rc:2246
msgid "Regular text:"
msgstr "Texto regular:"
#. IDD_PROPPAGE_COLORS_TEXT, IDC_SELECTION_COLOR_LABEL
-#: Merge.rc:2237
+#: Merge.rc:2247
msgid "Selection:"
msgstr "Seleção:"
#. IDD_PROPPAGE_COLORS_DIR, IDC_STATIC
-#: Merge.rc:2245 Merge.rc:2286
+#: Merge.rc:2255 Merge.rc:2296
msgid "Margin:"
msgstr "Margem:"
#. IDD_PROPPAGE_COLORS_MARKER, IDC_MARKER0_COLOR_LABEL
-#: Merge.rc:2254
+#: Merge.rc:2264
msgid "Search Marker:"
msgstr "Marcador de Busca:"
#. IDD_PROPPAGE_COLORS_MARKER, IDC_MARKER1_COLOR_LABEL
-#: Merge.rc:2255
+#: Merge.rc:2265
msgid "User Defined Marker 1:"
msgstr "Marcador 1 Definido pelo Usuário:"
#. IDD_PROPPAGE_COLORS_MARKER, IDC_MARKER2_COLOR_LABEL
-#: Merge.rc:2256
+#: Merge.rc:2266
msgid "User Defined Marker 2:"
msgstr "Marcador 2 Definido pelo Usuário:"
#. IDD_PROPPAGE_COLORS_MARKER, IDC_MARKER3_COLOR_LABEL
-#: Merge.rc:2257
+#: Merge.rc:2267
msgid "User Defined Marker 3:"
msgstr "Marcador 3 Definido pelo Usuário:"
#. IDD_PROPPAGE_COLORS_DIR, IDC_USE_DIR_COMPARE_COLORS
-#: Merge.rc:2270
+#: Merge.rc:2280
msgid "&Use folder compare colors"
msgstr "&Usar cores de comparação de pastas"
#. IDD_PROPPAGE_COLORS_DIR, IDC_STATIC
-#: Merge.rc:2274
+#: Merge.rc:2284
msgid "Items equal:"
msgstr "Itens iguais:"
#. IDD_PROPPAGE_COLORS_DIR, IDC_STATIC
-#: Merge.rc:2277
+#: Merge.rc:2287
msgid "Items different:"
msgstr "Itens diferentes:"
#. IDD_PROPPAGE_COLORS_DIR, IDC_STATIC
-#: Merge.rc:2280
+#: Merge.rc:2290
msgid "Items missing:"
msgstr "Itens faltantes:"
#. IDD_PROPPAGE_COLORS_DIR, IDC_STATIC
-#: Merge.rc:2283
+#: Merge.rc:2293
msgid "Items filtered:"
msgstr "Itens filtrados:"
#. IDD_PROPPAGE_COLORS_SYSTEM, IDC_SYSCOLOR_HOOK_ENABLED
-#: Merge.rc:2295
+#: Merge.rc:2305
msgid "&Use custom system colors"
msgstr "&Usar cores personalizadas do sistema"
#. IDS_PRPCAT_SYSTEM
-#: Merge.rc:2304 Merge.rc:4211 Merge.rc:4212 Merge.rc:4657
+#: Merge.rc:2314 Merge.rc:4221 Merge.rc:4222 Merge.rc:4667
msgid "System"
msgstr "Sistema"
#. IDD_PROPPAGE_SYSTEM, IDC_USE_RECYCLE_BIN
-#: Merge.rc:2307
+#: Merge.rc:2317
msgid "&Use Recycle Bin"
msgstr "&Usar a Lixeira"
#. IDD_PROPPAGE_SYSTEM, IDC_STATIC
-#: Merge.rc:2308
+#: Merge.rc:2318
msgid "&External editor:"
msgstr "&Editor externo:"
#. IDD_PROPPAGE_SYSTEM, IDC_STATIC
-#: Merge.rc:2311
+#: Merge.rc:2321
msgid "&Store user data in:"
msgstr "Armazenar dado&s do usuário em:"
#. IDD_PROPPAGE_SYSTEM, IDC_STATIC
-#: Merge.rc:2313
+#: Merge.rc:2323
msgid "&Filter folder:"
msgstr "Pasta de &filtros:"
#. IDD_PROPPAGE_SYSTEM, IDC_STATIC
-#: Merge.rc:2316
+#: Merge.rc:2326
msgid "Temporary files folder"
msgstr "Pasta de arquivos temporários"
#. IDD_PROPPAGE_SYSTEM, IDC_TMPFOLDER_SYSTEM
-#: Merge.rc:2317
+#: Merge.rc:2327
msgid "S&ystem temp folder"
msgstr "P&asta temp do sistema"
#. IDD_PROPPAGE_SYSTEM, IDC_STATIC
-#: Merge.rc:2318
+#: Merge.rc:2328
msgid "C&ustom folder:"
msgstr "Pa&sta personalizada:"
#. IDD_GENERATE_PATCH, IDC_DIFF_BROWSE_FILE2
-#: Merge.rc:2320 Merge.rc:2416
+#: Merge.rc:2330 Merge.rc:2426
msgid "Br&owse..."
msgstr "Na&vegar..."
#. IDS_OPTIONSPG_COMPARE
-#: Merge.rc:2326 Merge.rc:4200
+#: Merge.rc:2336 Merge.rc:4210
msgid "Compare"
msgstr "Comparar"
#. IDD_PROPPAGE_COMPARE, IDC_STATIC
-#: Merge.rc:2329
+#: Merge.rc:2339
msgid "Whitespaces"
msgstr "Espaços em branco"
#. IDD_PROPPAGE_COMPARE, IDC_WHITESPACE
-#: Merge.rc:2330
+#: Merge.rc:2340
msgid "&Compare"
msgstr "&Comparar"
#. IDD_PROPPAGE_COMPARE, IDC_WHITE_CHANGE
-#: Merge.rc:2331
+#: Merge.rc:2341
msgid "&Ignore change"
msgstr "&Ignorar alteração"
#. IDD_PROPPAGE_COMPARE, IDC_ALL_WHITE
-#: Merge.rc:2332
+#: Merge.rc:2342
msgid "I&gnore all"
msgstr "I&gnorar tudo"
#. IDD_PROPPAGE_COMPARE, IDC_IGNBLANKS_CHECK
-#: Merge.rc:2333
+#: Merge.rc:2343
msgid "Ignore blan&k lines"
msgstr "Ignorar linha&s em branco"
#. IDD_PROPPAGE_COMPARE, IDC_IGNCASE_CHECK
-#: Merge.rc:2334
+#: Merge.rc:2344
msgid "Ignore &case"
msgstr "Ignorar &maiúsculas/minúsculas"
#. IDD_PROPPAGE_COMPARE, IDC_EOL_SENSITIVE
-#: Merge.rc:2335
+#: Merge.rc:2345
msgid "Igno&re EOL differences (Windows/Unix/Mac)"
msgstr "Igno&rar diferenças de caractere EOL (Windows/Unix/Mac)"
#. IDD_PROPPAGE_COMPARE, IDC_IGNORE_NUMBERS
-#: Merge.rc:2337
+#: Merge.rc:2347
msgid "Ignore num&bers"
msgstr "Ignorar &números"
#. IDD_PROPPAGE_COMPARE, IDC_CP_SENSITIVE
-#: Merge.rc:2338
+#: Merge.rc:2348
msgid "Ignore codepage &differences"
msgstr "Ignorar diferenças de &página de código"
#. IDD_PROPPAGE_COMPARE, IDC_FILTERCOMMENTS_CHECK
-#: Merge.rc:2339
+#: Merge.rc:2349
msgid "Ignore c&omment differences"
msgstr "Ignorar di&ferenças de comentário"
#. IDD_PROPPAGE_COMPARE, IDC_IGNEOFEOL_CHECK
-#: Merge.rc:2341
+#: Merge.rc:2351
msgid "Ignore &missing trailing EOL"
msgstr "Ign&orar falta do caractere EOL no final"
#. IDD_PROPPAGE_COMPARE, IDC_IGNLBRKS_CHECK
-#: Merge.rc:2343
+#: Merge.rc:2353
msgid "Ignore line &breaks (treat as spaces)"
msgstr "Ignorar que&bras de linha (tratar como espaços)"
#. IDD_PROPPAGE_COMPARE, IDC_MOVED_BLOCKS
-#: Merge.rc:2345
+#: Merge.rc:2355
msgid "E&nable moved block detection"
msgstr "&Habilitar detecção de bloco movido"
#. IDD_PROPPAGE_COMPARE, IDC_ALIGN_SIMILAR_LINES
-#: Merge.rc:2346
+#: Merge.rc:2356
msgid "Align &similar lines"
msgstr "A&linhar linhas similares"
#. IDD_PROPPAGE_COMPARE, IDC_STATIC
-#: Merge.rc:2347
+#: Merge.rc:2357
msgid "Diff &algorithm:"
msgstr "Algoritmo da &diferenciação:"
#. IDD_PROPPAGE_COMPARE, IDC_INDENT_HEURISTIC
-#: Merge.rc:2349
+#: Merge.rc:2359
msgid "Enable indent &heuristic"
msgstr "H&abilitar heurística de recuo"
#. IDD_PROPPAGE_COMPARE, IDC_COMPLETELY_BLANK_OUT_IGNORED_DIFFERENCES
-#: Merge.rc:2350
+#: Merge.rc:2360
msgid "Completely unhighlight the ignored differences"
msgstr "Remover completamente o destaque das diferenças ignoradas"
#. IDS_OPTIONSPG_EDITOR
-#: Merge.rc:2357 Merge.rc:4201
+#: Merge.rc:2367 Merge.rc:4211
msgid "Editor"
msgstr "Editor"
#. IDD_PROPPAGE_EDITOR, IDC_HILITE_CHECK
-#: Merge.rc:2360
+#: Merge.rc:2370
msgid "&Highlight syntax"
msgstr "&Destacar a sintaxe"
#. IDD_PROPPAGE_EDITOR, IDC_MIXED_EOL
-#: Merge.rc:2361
+#: Merge.rc:2371
msgid "&Preserve original EOL"
msgstr "&Preservar o caractere EOL original"
#. IDD_PROPPAGE_EDITOR, IDC_STATIC
-#: Merge.rc:2362
+#: Merge.rc:2372
msgid "Tabs"
msgstr "Tabulações"
#. IDD_PROPPAGE_EDITOR, IDC_STATIC
-#: Merge.rc:2363
+#: Merge.rc:2373
msgid "&Tab size:"
msgstr "&Tamanho da tabulação:"
#. IDD_PROPPAGE_EDITOR, IDC_PROP_INSERT_TABS
-#: Merge.rc:2365
+#: Merge.rc:2375
msgid "&Insert tabs"
msgstr "&Inserir tabulações"
#. IDD_PROPPAGE_EDITOR, IDC_PROP_INSERT_SPACES
-#: Merge.rc:2366
+#: Merge.rc:2376
msgid "Insert &spaces"
msgstr "Inserir &espaços"
#. IDD_PROPPAGE_EDITOR, IDC_STATIC
-#: Merge.rc:2367
+#: Merge.rc:2377
msgid "&Rendering mode:"
msgstr "&Modo de renderização:"
#. IDD_PROPPAGE_EDITOR_COMPAREMERGE, IDC_AUTOMRESCAN_CHECK
-#: Merge.rc:2376
+#: Merge.rc:2386
msgid "&Automatic rescan"
msgstr "&Reescaneamento automático"
#. IDD_PROPPAGE_EDITOR_COMPAREMERGE, IDC_STATIC
-#: Merge.rc:2377
+#: Merge.rc:2387
msgid "Copy &granularity for selected differences:"
msgstr "Copiar &granularidade para diferenças selecionadas:"
#. IDD_PROPPAGE_EDITOR_COMPAREMERGE, IDC_LINE_COLORING_GROUP
-#: Merge.rc:2379
+#: Merge.rc:2389
msgid "Line Difference Coloring"
msgstr "Coloração da Diferença de Linha"
#. IDD_PROPPAGE_EDITOR_COMPAREMERGE, IDC_VIEW_LINE_DIFFERENCES
-#: Merge.rc:2380
+#: Merge.rc:2390
msgid "View line differences"
msgstr "Visualizar as diferenças de linha"
#. IDD_PROPPAGE_EDITOR_COMPAREMERGE, IDC_EDITOR_CHARLEVEL
-#: Merge.rc:2381
+#: Merge.rc:2391
msgid "&Character-level"
msgstr "Nível de &caractere"
#. IDD_PROPPAGE_EDITOR_COMPAREMERGE, IDC_EDITOR_WORDLEVEL
-#: Merge.rc:2382
+#: Merge.rc:2392
msgid "&Word-level:"
msgstr "Nível de &palavra:"
#. IDD_PROPPAGE_EDITOR_COMPAREMERGE, IDC_STATIC
-#: Merge.rc:2384
+#: Merge.rc:2394
msgid "W&ord break characters:"
msgstr "C&aracteres de quebra de palavra:"
#. IDD_PROPPAGE_MESSAGEBOXES, IDC_STATIC
-#: Merge.rc:2401
+#: Merge.rc:2411
msgid "Some messages can be hidden by the user. Press Reset to make all messages visible again."
msgstr "Algumas mensagens podem ser ocultadas pelo usuário. Pressione Restaurar para tornar todas as mensagens visíveis novamente."
#. IDD_SELECT_FILES_OR_FOLDERS, IDC_RESET
-#: Merge.rc:2402 Merge.rc:3085
+#: Merge.rc:2412 Merge.rc:3095
msgid "Reset"
msgstr "Restaurar"
#. IDD_GENERATE_PATCH
-#: Merge.rc:2408
+#: Merge.rc:2418
msgid "Patch Generator"
msgstr "Gerador de Patches"
#. IDD_GENERATE_PATCH, IDC_STATIC
-#: Merge.rc:2411
+#: Merge.rc:2421
msgid "File&1:"
msgstr "Arquivo&1:"
#. IDD_GENERATE_PATCH, IDC_STATIC
-#: Merge.rc:2414
+#: Merge.rc:2424
msgid "File&2:"
msgstr "Arquivo&2:"
#. IDD_GENERATE_PATCH, IDC_DIFF_SWAPFILES
-#: Merge.rc:2417
+#: Merge.rc:2427
msgid "&Swap"
msgstr "&Trocar"
#. IDD_DIRCMP_REPORT, IDC_REPORT_COPYCLIPBOARD
-#: Merge.rc:2418 Merge.rc:2690
+#: Merge.rc:2428 Merge.rc:2700
msgid "&Copy to clipboard"
msgstr "C&opiar para a área de transferência"
#. IDD_GENERATE_PATCH, IDC_DIFF_APPENDFILE
-#: Merge.rc:2419
+#: Merge.rc:2429
msgid "&Append to existing file"
msgstr "&Anexar ao arquivo existente"
#. IDD_GENERATE_PATCH, IDC_STATIC
-#: Merge.rc:2420
+#: Merge.rc:2430
msgid "&Result:"
msgstr "&Resultado:"
#. IDD_GENERATE_PATCH, IDC_DIFF_BROWSE_RESULT
-#: Merge.rc:2422
+#: Merge.rc:2432
msgid "Bro&wse..."
msgstr "Nav&egar..."
#. IDD_GENERATE_PATCH, IDC_STATIC
-#: Merge.rc:2423
+#: Merge.rc:2433
msgid "&Format"
msgstr "&Formato"
#. IDD_GENERATE_PATCH, IDC_STATIC
-#: Merge.rc:2424
+#: Merge.rc:2434
msgid "St&yle:"
msgstr "E&stilo:"
#. IDD_GENERATE_PATCH, IDC_STATIC
-#: Merge.rc:2426
+#: Merge.rc:2436
msgid "&Context:"
msgstr "&Contexto:"
#. IDD_GENERATE_PATCH, IDC_DIFF_INCLCMDLINE
-#: Merge.rc:2428
+#: Merge.rc:2438
msgid "Inclu&de command line"
msgstr "Inclu&ir linha de comando"
#. IDD_GENERATE_PATCH, IDC_DIFF_OPENTOEDITOR
-#: Merge.rc:2429
+#: Merge.rc:2439
msgid "Open in e&xternal editor"
msgstr "Abrir no e&ditor externo"
#. IDD_DIRCOLS
-#: Merge.rc:2446
+#: Merge.rc:2456
msgid "Display Columns"
msgstr "Exibir Colunas"
#. IDD_DIRCOLS, IDC_UP
-#: Merge.rc:2450
+#: Merge.rc:2460
msgid "Move &Up"
msgstr "Mover para &Cima"
#. IDD_DIRCOLS, IDC_DOWN
-#: Merge.rc:2451
+#: Merge.rc:2461
msgid "Move &Down"
msgstr "Mover para &Baixo"
#. IDD_DIRCOLS, IDC_COLDLG_ADDITIONAL_PROPERTIES
-#: Merge.rc:2453
+#: Merge.rc:2463
msgid "&Additional Properties"
msgstr "Propriedades &Adicionais"
#. IDD_DIRADDITIONALPROPS
-#: Merge.rc:2461
+#: Merge.rc:2471
msgid "Additional Properties"
msgstr "Propriedades Adicionais"
#. IDD_PLUGINS_SELECTPLUGIN
-#: Merge.rc:2475
+#: Merge.rc:2485
msgid "Select Plugin"
msgstr "Selecionar Plugin"
#. IDD_PLUGINS_EDITPLUGIN, IDC_STATIC
-#: Merge.rc:2478 Merge.rc:3115
+#: Merge.rc:2488 Merge.rc:3125
msgid "Plugin &name:"
msgstr "Nome do &plugin:"
#. IDD_PLUGINS_SELECTPLUGIN, IDC_STATIC
-#: Merge.rc:2480
+#: Merge.rc:2490
msgid "&Target files:"
msgstr "Arquivos de des&tino:"
#. IDD_PLUGINS_EDITPLUGIN, IDC_STATIC
-#: Merge.rc:2482 Merge.rc:3117
+#: Merge.rc:2492 Merge.rc:3127
msgid "Extensions list:"
msgstr "Lista das extensões:"
#. IDD_PLUGINS_EDITPLUGIN, IDC_STATIC
-#: Merge.rc:2484 Merge.rc:3119
+#: Merge.rc:2494 Merge.rc:3129
msgid "Description:"
msgstr "Descrição:"
#. IDD_PLUGINS_EDITPLUGIN, IDC_STATIC
-#: Merge.rc:2486 Merge.rc:3121
+#: Merge.rc:2496 Merge.rc:3131
msgid "Default arguments:"
msgstr "Argumentos padrão:"
#. IDD_PLUGINS_SELECTPLUGIN, IDC_PLUGIN_ALLOW_ALL
-#: Merge.rc:2488
+#: Merge.rc:2498
msgid "Display all plugins (Ignore extension)"
msgstr "Exibir todos os plugins (Ignorar extensão)"
#. IDD_PLUGINS_SELECTPLUGIN, IDC_PLUGIN_OPEN_IN_SAME_FRAME_TYPE
-#: Merge.rc:2490
+#: Merge.rc:2500
msgid "&Open files in same window type after unpacking"
msgstr "&Abrir arquivos no mesmo tipo de janela após descompactar"
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_PIPELINE_STATIC
-#: Merge.rc:2492 Merge.rc:3129
+#: Merge.rc:2502 Merge.rc:3139
msgid "&Plugin pipeline:"
msgstr "&Pipeline do plugin:"
#. IDD_PLUGINS_SELECTPLUGIN, IDC_PLUGIN_ALIAS
-#: Merge.rc:2495
+#: Merge.rc:2505
msgid "&Alias..."
msgstr "&Alias..."
#. IDD_DIRCOMP_PROGRESS, IDC_COMPARISON_STOP
-#: Merge.rc:2505
+#: Merge.rc:2515
msgid "Stop"
msgstr "Parar"
#. IDD_DIRCOMP_PROGRESS, IDC_COMPARISON_PAUSE
-#: Merge.rc:2506
+#: Merge.rc:2516
msgid "Pause"
msgstr "Pausar"
#. IDD_DIRCOMP_PROGRESS, IDC_COMPARISON_CONTINUE
-#: Merge.rc:2507
+#: Merge.rc:2517
msgid "Continue"
msgstr "Continuar"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC
-#: Merge.rc:2509 Merge.rc:2973
+#: Merge.rc:2519 Merge.rc:2983
msgid "C&PU cores to use:"
msgstr "&Núcleos da CPU a usar:"
#. IDD_DIRCOMP_PROGRESS, IDC_STATIC
-#: Merge.rc:2510
+#: Merge.rc:2520
msgid "Items total:"
msgstr "Total de itens:"
#. IDD_DIRCOMP_PROGRESS, IDC_STATIC
-#: Merge.rc:2511
+#: Merge.rc:2521
msgid "Items compared:"
msgstr "Itens comparados:"
#. IDS_PREVIEWBAR_CLOSE
-#: Merge.rc:2526 Merge.rc:2846 Merge.rc:5328
+#: Merge.rc:2536 Merge.rc:2856 Merge.rc:5339
msgid "&Close"
msgstr "&Fechar"
#. IDD_WMGOTO
-#: Merge.rc:2537
+#: Merge.rc:2547
msgid "Go to"
msgstr "Ir para"
#. IDD_WMGOTO, IDC_STATIC
-#: Merge.rc:2540
+#: Merge.rc:2550
msgid "G&o to:"
msgstr "I&r para:"
#. IDD_WMGOTO, IDC_STATIC
-#: Merge.rc:2543
+#: Merge.rc:2553
msgid "File"
msgstr "Arquivo"
#. IDD_WMGOTO, IDC_STATIC
-#: Merge.rc:2547
+#: Merge.rc:2557
msgid "Go to what"
msgstr "Ir para o quê"
#. IDD_WMGOTO, IDC_WMGOTO_TOLINE
-#: Merge.rc:2548
+#: Merge.rc:2558
msgid "Li&ne"
msgstr "Li&nha"
#. IDD_WMGOTO, IDC_WMGOTO_TODIFF
-#: Merge.rc:2549
+#: Merge.rc:2559
msgid "&Difference"
msgstr "&Diferença"
#. IDD_WMGOTO, IDOK
-#: Merge.rc:2550
+#: Merge.rc:2560
msgid "&Go to"
msgstr "&Ir para"
#. IDS_PROJECT_ITEM_FILE_FILTER
-#: Merge.rc:2556 Merge.rc:4321
+#: Merge.rc:2566 Merge.rc:4331
msgid "File Filters"
msgstr "Filtros de Arquivo"
#. IDD_FILTERS_FILEFILTERS, IDC_STATIC
-#: Merge.rc:2559
+#: Merge.rc:2569
msgid "&Mask / Filter Expression"
msgstr "Expressão de &Máscara / Filtro"
#. IDD_FILTERS_FILEFILTERS, IDC_STATIC
-#: Merge.rc:2562
+#: Merge.rc:2572
msgid "Preset &Filters"
msgstr "&Filtros Predefinidos"
#. IDD_FILTERS_FILEFILTERS, IDC_FILTERFILE_TEST_BTN
-#: Merge.rc:2564
+#: Merge.rc:2574
msgid "Test..."
msgstr "Testar..."
#. IDD_FILTERS_FILEFILTERS, IDC_FILTERFILE_INSTALL
-#: Merge.rc:2565
+#: Merge.rc:2575
msgid "Install..."
msgstr "Instalar..."
#. IDD_FILTERS_FILEFILTERS, IDC_FILTERFILE_NEWBTN
-#: Merge.rc:2566
+#: Merge.rc:2576
msgid "New..."
msgstr "Novo..."
#. IDD_FILTERS_FILEFILTERS, IDC_FILTERFILE_EDITBTN
-#: Merge.rc:2567
+#: Merge.rc:2577
msgid "Edit..."
msgstr "Editar..."
#. IDD_FILTERS_FILEFILTERS, IDC_FILTERFILE_DELETEBTN
-#: Merge.rc:2568
+#: Merge.rc:2578
msgid "Delete..."
msgstr "Excluir..."
#. IDD_FILTERS_CONDITION
-#: Merge.rc:2573
+#: Merge.rc:2583
msgid "Filter Condition"
msgstr "Condição do Filtro"
#. IDD_FILTERS_CONDITION, IDC_STATIC
-#: Merge.rc:2576
+#: Merge.rc:2586
msgid "&Left-hand side:"
msgstr "Lado &esquerdo:"
#. IDD_FILTERS_CONDITION, IDC_STATIC
-#: Merge.rc:2578
+#: Merge.rc:2588
msgid "&Operator:"
msgstr "&Operador:"
#. IDD_FILTERS_CONDITION, IDC_STATIC
-#: Merge.rc:2580
+#: Merge.rc:2590
msgid "&Right-hand side:"
msgstr "Lado &direito:"
#. IDD_FILTERS_CONDITION, IDC_STATIC
-#: Merge.rc:2586
+#: Merge.rc:2596
msgid "Expression:"
msgstr "Expressão:"
#. IDD_COMPARISON_RESULT_FILTER
-#: Merge.rc:2595
+#: Merge.rc:2605
msgid "Filter by Comparison Result"
msgstr "Filtrar por Resultado da Comparação"
#. IDD_COMPARISON_RESULT_FILTER, IDC_RADIO_INCLUDE
-#: Merge.rc:2598
+#: Merge.rc:2608
msgid "&Include"
msgstr "&Incluir"
#. IDD_COMPARISON_RESULT_FILTER, IDC_RADIO_EXCLUDE
-#: Merge.rc:2599
+#: Merge.rc:2609
msgid "&Exclude"
msgstr "&Excluir"
#. IDD_COMPARISON_RESULT_FILTER, IDC_STATIC
-#: Merge.rc:2600
+#: Merge.rc:2610
msgid "Comparison Results"
msgstr "Resultados da Comparação"
#. IDS_IDENTICAL
-#: Merge.rc:2601 Merge.rc:2733 Merge.rc:2794 Merge.rc:4698
+#: Merge.rc:2611 Merge.rc:2743 Merge.rc:2804 Merge.rc:4708
msgid "Identical"
msgstr "Idênticos(as)"
#. IDS_DIFFERENT
-#: Merge.rc:2602 Merge.rc:2714 Merge.rc:2755 Merge.rc:4708
+#: Merge.rc:2612 Merge.rc:2724 Merge.rc:2765 Merge.rc:4718
msgid "Different"
msgstr "Diferentes"
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_LEFT_ONLY
-#: Merge.rc:2603
+#: Merge.rc:2613
msgid "Left only"
msgstr "Apenas à esquerda"
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_RIGHT_ONLY
-#: Merge.rc:2604
+#: Merge.rc:2614
msgid "Right only"
msgstr "Apenas à direita"
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_SKIPPED
-#: Merge.rc:2605
+#: Merge.rc:2615
msgid "Skipped"
msgstr "Pulado"
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_MIDDLE_ONLY
-#: Merge.rc:2606
+#: Merge.rc:2616
msgid "Middle only"
msgstr "Apenas no meio"
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_LEFT_ONLY_DIFFERENT
-#: Merge.rc:2607
+#: Merge.rc:2617
msgid "Left only (different)"
msgstr "Apenas à esquerda (diferente)"
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_MIDDLE_ONLY_DIFFERENT
-#: Merge.rc:2608
+#: Merge.rc:2618
msgid "Middle only (different)"
msgstr "Apenas no meio (diferente)"
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_RIGHT_ONLY_DIFFERENT
-#: Merge.rc:2609
+#: Merge.rc:2619
msgid "Right only (different)"
msgstr "Apenas à direita (diferente)"
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_LEFT_ONLY_MISSING
-#: Merge.rc:2610
+#: Merge.rc:2620
msgid "Left only (missing)"
msgstr "Apenas à esquerda (faltando)"
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_MIDDLE_ONLY_MISSING
-#: Merge.rc:2611
+#: Merge.rc:2621
msgid "Middle only (missing)"
msgstr "Apenas no meio (faltando)"
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_RIGHT_ONLY_MISSING
-#: Merge.rc:2612
+#: Merge.rc:2622
msgid "Right only (missing)"
msgstr "Apenas à direita (faltando)"
#. IDS_OPTIONSPG_CODEPAGE
-#: Merge.rc:2619 Merge.rc:2811 Merge.rc:4213
+#: Merge.rc:2629 Merge.rc:2821 Merge.rc:4223
msgid "Codepage"
msgstr "Página de código"
#. IDD_PROPPAGE_CODEPAGE, IDC_STATIC
-#: Merge.rc:2622
+#: Merge.rc:2632
msgid "Default Codepage"
msgstr "Página de Código Padrão"
#. IDD_PROPPAGE_CODEPAGE, IDC_STATIC
-#: Merge.rc:2623
+#: Merge.rc:2633
msgid "Select the default codepage for non-Unicode files:"
msgstr "Selecionar a página de código padrão para arquivos não Unicode:"
#. IDD_PROPPAGE_CODEPAGE, IDC_CP_SYSTEM
-#: Merge.rc:2624
+#: Merge.rc:2634
msgid "System codepage"
msgstr "Página de código do sistema"
#. IDD_PROPPAGE_CODEPAGE, IDC_CP_UI
-#: Merge.rc:2625
+#: Merge.rc:2635
msgid "According to WinMerge User Interface"
msgstr "De Acordo com a Interface de Usuário do WinMerge"
#. IDD_PROPPAGE_CODEPAGE, IDC_CP_CUSTOM
-#: Merge.rc:2626
+#: Merge.rc:2636
msgid "Custom codepage:"
msgstr "Página de código personalizada:"
#. IDD_PROPPAGE_CODEPAGE, IDC_DETECT_CODEPAGE
-#: Merge.rc:2628
+#: Merge.rc:2638
msgid "Detect codepage for: .html, .rc, .xml\nRestart required."
msgstr "Detectar página de código para: .html, .rc, .xml \nReinicialização necessária."
#. IDD_PROPPAGE_CODEPAGE, IDC_DETECT_CODEPAGE2
-#: Merge.rc:2630
+#: Merge.rc:2640
msgid "Detect codepage for files with mlang.dll\nRestart required."
msgstr "Detectar página de código para arquivos com o mlang.dll\nReinicialização necessária."
#. IDS_OPTIONSPG_ARCHIVE
-#: Merge.rc:2638 Merge.rc:4214
+#: Merge.rc:2648 Merge.rc:4224
msgid "Archive Support"
msgstr "Suporte a Arquivos Compactados"
#. IDD_PROPPAGE_ARCHIVE, IDC_ARCHIVE_ENABLE
-#: Merge.rc:2641
+#: Merge.rc:2651
msgid "&Enable archive file support"
msgstr "&Habilitar suporte a arquivos compactados"
#. IDD_PROPPAGE_ARCHIVE, IDC_ARCHIVE_DETECTTYPE
-#: Merge.rc:2642
+#: Merge.rc:2652
msgid "&Detect archive type from file signature"
msgstr "&Detectar o tipo de arquivo compactado pela assinatura do arquivo"
#. IDD_PROPPAGE_PROJECT, IDC_STATIC
-#: Merge.rc:2651
+#: Merge.rc:2661
msgid "Items saved to or restored from the project file:"
msgstr "Itens salvos no ou restaurados do arquivo de projeto:"
#. IDD_SAVECLOSING
-#: Merge.rc:2658
+#: Merge.rc:2668
msgid "Save Modified Files?"
msgstr "Salvar os Arquivos Modificados?"
#. IDD_SAVECLOSING, IDC_SAVECLOSING_LEFTFRAME
-#: Merge.rc:2661
+#: Merge.rc:2671
msgid "Left side file"
msgstr "Arquivo do lado esquerdo"
#. IDD_SAVECLOSING, IDC_SAVECLOSING_SAVELEFT
-#: Merge.rc:2663
+#: Merge.rc:2673
msgid "&Save changes"
msgstr "&Salvar as alterações"
#. IDD_SAVECLOSING, IDC_SAVECLOSING_DISCARDLEFT
-#: Merge.rc:2664
+#: Merge.rc:2674
msgid "&Discard changes"
msgstr "&Descartar as alterações"
#. IDD_SAVECLOSING, IDC_SAVECLOSING_MIDDLEFRAME
-#: Merge.rc:2665
+#: Merge.rc:2675
msgid "Middle side file"
msgstr "Arquivo do lado do meio"
#. IDD_SAVECLOSING, IDC_SAVECLOSING_SAVEMIDDLE
-#: Merge.rc:2667
+#: Merge.rc:2677
msgid "Sa&ve changes"
msgstr "S&alvar as alterações"
#. IDD_SAVECLOSING, IDC_SAVECLOSING_DISCARDMIDDLE
-#: Merge.rc:2668
+#: Merge.rc:2678
msgid "Discard c&hanges"
msgstr "D&escartar as alterações"
#. IDD_SAVECLOSING, IDC_SAVECLOSING_RIGHTFRAME
-#: Merge.rc:2669
+#: Merge.rc:2679
msgid "Right side file"
msgstr "Arquivo do lado direito"
#. IDD_SAVECLOSING, IDC_SAVECLOSING_SAVERIGHT
-#: Merge.rc:2671
+#: Merge.rc:2681
msgid "S&ave changes"
msgstr "Sa&lvar as alterações"
#. IDD_SAVECLOSING, IDC_SAVECLOSING_DISCARDRIGHT
-#: Merge.rc:2672
+#: Merge.rc:2682
msgid "Dis&card changes"
msgstr "Des&cartar as alterações"
#. IDD_SAVECLOSING, IDC_SAVECLOSING_DISCARDALL
-#: Merge.rc:2673
+#: Merge.rc:2683
msgid "Disca&rd All"
msgstr "Desca&rtar Tudo"
#. IDD_DIRCMP_REPORT
-#: Merge.rc:2680
+#: Merge.rc:2690
msgid "Folder Compare Report"
msgstr "Relatório de Comparação de Pastas"
#. IDD_DIRCMP_REPORT, IDC_STATIC
-#: Merge.rc:2683
+#: Merge.rc:2693
msgid "Report &file:"
msgstr "&Arquivo de relatório:"
#. IDD_DIRCMP_REPORT, IDC_STATIC
-#: Merge.rc:2686
+#: Merge.rc:2696
msgid "&Style:"
msgstr "&Estilo:"
#. IDD_DIRCMP_REPORT, IDC_REPORT_INCLUDEFILECMPREPORT
-#: Merge.rc:2688
+#: Merge.rc:2698
msgid "&Include file compare report"
msgstr "&Incluir relatório de comparação de arquivos"
#. IDD_FILTERS_FILEFILTERS_SHARED
-#: Merge.rc:2697
+#: Merge.rc:2707
msgid "Shared or Private Filter"
msgstr "Filtro Compartilhado ou Privado"
#. IDD_FILTERS_FILEFILTERS_SHARED, IDC_STATIC
-#: Merge.rc:2700
+#: Merge.rc:2710
msgid "What type of filter do you want?"
msgstr "Que tipo de filtro você deseja?"
#. IDD_FILTERS_FILEFILTERS_SHARED, IDC_SHARED
-#: Merge.rc:2701
+#: Merge.rc:2711
msgid "Shared Filter (for all users)"
msgstr "Filtro Compartilhado (para todos os usuários)"
#. IDD_FILTERS_FILEFILTERS_SHARED, IDC_PRIVATE
-#: Merge.rc:2702
+#: Merge.rc:2712
msgid "Private Filter (current user only)"
msgstr "Filtro Privado (somente usuário atual)"
#. IDD_COMPARE_STATISTICS3
-#: Merge.rc:2709 Merge.rc:2750
+#: Merge.rc:2719 Merge.rc:2760
msgid "Compare Statistics"
msgstr "Comparar as Estatísticas"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2712 Merge.rc:2753
+#: Merge.rc:2722 Merge.rc:2763
msgid "Folders:"
msgstr "Pastas:"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2713 Merge.rc:2754
+#: Merge.rc:2723 Merge.rc:2764
msgid "Files:"
msgstr "Arquivos:"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2719 Merge.rc:2738 Merge.rc:2760 Merge.rc:2799
+#: Merge.rc:2729 Merge.rc:2748 Merge.rc:2770 Merge.rc:2809
msgid "Binary:"
msgstr "Binário:"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2722 Merge.rc:2763
+#: Merge.rc:2732 Merge.rc:2773
msgid "Unique"
msgstr "Único"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2723 Merge.rc:2764
+#: Merge.rc:2733 Merge.rc:2774
msgid "Left:"
msgstr "Esquerda:"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2728 Merge.rc:2774
+#: Merge.rc:2738 Merge.rc:2784
msgid "Right:"
msgstr "Direita:"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2742 Merge.rc:2803
+#: Merge.rc:2752 Merge.rc:2813
msgid "Total:"
msgstr "Total:"
#. IDD_COMPARE_STATISTICS3, IDOK
-#: Merge.rc:2745 Merge.rc:2806
+#: Merge.rc:2755 Merge.rc:2816
msgid "Close"
msgstr "Fechar"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2769
+#: Merge.rc:2779
msgid "Middle:"
msgstr "Meio:"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2779
+#: Merge.rc:2789
msgid "Missing Left:"
msgstr "Ausente à Esquerda:"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2784
+#: Merge.rc:2794
msgid "Missing Middle:"
msgstr "Ausente no Meio:"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2789
+#: Merge.rc:2799
msgid "Missing Right:"
msgstr "Ausente à Direita:"
#. IDD_LOAD_SAVE_CODEPAGE, IDC_AFFECTS_GROUP
-#: Merge.rc:2814
+#: Merge.rc:2824
msgid "Affects"
msgstr "Afeta"
#. IDD_LOAD_SAVE_CODEPAGE, IDC_RIGHT_FILES_LABEL
-#: Merge.rc:2816 Merge.rc:2818 Merge.rc:2820
+#: Merge.rc:2826 Merge.rc:2828 Merge.rc:2830
msgid "(Affects)"
msgstr "(Afeta)"
#. IDD_LOAD_SAVE_CODEPAGE, IDC_LOADING_GROUP
-#: Merge.rc:2821
+#: Merge.rc:2831
msgid "Select Codepage for"
msgstr "Selecionar Página de Código para"
#. IDD_LOAD_SAVE_CODEPAGE, IDC_LOAD_FILES_LABEL
-#: Merge.rc:2822
+#: Merge.rc:2832
msgid "&File Loading:"
msgstr "&Carregamento do Arquivo:"
#. IDD_LOAD_SAVE_CODEPAGE, IDC_SAVE_FILES_LABEL
-#: Merge.rc:2824
+#: Merge.rc:2834
msgid "File &Saving:"
msgstr "Salvamento do &Arquivo:"
#. IDD_LOAD_SAVE_CODEPAGE, IDC_LOAD_SAVE_SAME_CODEPAGE
-#: Merge.rc:2827
+#: Merge.rc:2837
msgid "&Use same codepage for both"
msgstr "&Usar a mesma página de código para ambos"
#. IDS_MESSAGEBOX_CANCEL
-#: Merge.rc:2830 Merge.rc:4172
+#: Merge.rc:2840 Merge.rc:4182
msgid "&Cancel"
msgstr "&Cancelar"
#. IDD_FILTERS_FILEFILTERS_TEST
-#: Merge.rc:2835
+#: Merge.rc:2845
msgid "Test Filter"
msgstr "Testar Filtro"
#. IDD_FILTERS_FILEFILTERS_TEST, IDC_HEADER
-#: Merge.rc:2838
+#: Merge.rc:2848
msgid "Testing filter:"
msgstr "Testando o filtro:"
#. IDD_FILTERS_FILEFILTERS_TEST, IDC_PROMPT_LABEL
-#: Merge.rc:2840
+#: Merge.rc:2850
msgid "&Enter text to test:"
msgstr "&Inserir texto para testar:"
#. IDD_FILTERS_FILEFILTERS_TEST, IDC_IS_DIRECTORY
-#: Merge.rc:2842
+#: Merge.rc:2852
msgid "&Folder Name"
msgstr "&Nome da Pasta"
#. IDD_FILTERS_FILEFILTERS_TEST, IDC_STATIC
-#: Merge.rc:2843
+#: Merge.rc:2853
msgid "Result:"
msgstr "Resultado:"
#. IDD_FILTERS_FILEFILTERS_TEST, IDC_TEST_BTN
-#: Merge.rc:2845
+#: Merge.rc:2855
msgid "&Test"
msgstr "&Testar"
#. IDS_OPTIONSPG_TABLECOMPARE
-#: Merge.rc:2851 Merge.rc:2990 Merge.rc:4228
+#: Merge.rc:2861 Merge.rc:3000 Merge.rc:4238
msgid "Table"
msgstr "Tabela"
#. IDD_OPEN_TABLE, IDC_STATIC
-#: Merge.rc:2854
+#: Merge.rc:2864
msgid "File type"
msgstr "Tipo de arquivo"
#. IDD_OPEN_TABLE, IDC_COMPARETABLE_CSV
-#: Merge.rc:2855
+#: Merge.rc:2865
msgid "&CSV"
msgstr "&CSV"
#. IDD_OPEN_TABLE, IDC_COMPARETABLE_TSV
-#: Merge.rc:2856
+#: Merge.rc:2866
msgid "&TSV"
msgstr "&TSV"
#. IDD_OPEN_TABLE, IDC_COMPARETABLE_DSV
-#: Merge.rc:2857
+#: Merge.rc:2867
msgid "Custom &Delimiter-Separated Values"
msgstr "Valores Personalizados &Separados por Delimitadores"
#. IDD_PROPPAGE_COMPARE_TABLE, IDC_STATIC
-#: Merge.rc:2859 Merge.rc:2861 Merge.rc:2996 Merge.rc:3004
+#: Merge.rc:2869 Merge.rc:2871 Merge.rc:3006 Merge.rc:3014
msgid "D&elimiter character:"
msgstr "C&aractere delimitador:"
#. IDD_PROPPAGE_COMPARE_TABLE, IDC_COMPARETABLE_ALLOWNEWLINE
-#: Merge.rc:2863 Merge.rc:3006
+#: Merge.rc:2873 Merge.rc:3016
msgid "&Allow newlines in quotes"
msgstr "&Permitir linhas novas nas citações"
#. IDD_PROPPAGE_COMPARE_TABLE, IDC_STATIC
-#: Merge.rc:2865 Merge.rc:3008
+#: Merge.rc:2875 Merge.rc:3018
msgid "&Quote character:"
msgstr "&Caractere de citação:"
#. IDS_OPTIONSPG_BACKUPS
-#: Merge.rc:2873 Merge.rc:4216
+#: Merge.rc:2883 Merge.rc:4226
msgid "Backup Files"
msgstr "Arquivos de Backup"
#. IDD_PROPPAGE_BACKUPS, IDC_STATIC
-#: Merge.rc:2876
+#: Merge.rc:2886
msgid "Create backup files for:"
msgstr "Criar arquivos de backup para:"
#. IDD_PROPPAGE_BACKUPS, IDC_BACKUP_FOLDERCMP
-#: Merge.rc:2877
+#: Merge.rc:2887
msgid "&Folder compare"
msgstr "&Comparação de pastas"
#. IDD_PROPPAGE_BACKUPS, IDC_BACKUP_FILECMP
-#: Merge.rc:2878
+#: Merge.rc:2888
msgid "Fil&e compare"
msgstr "Com¶ção de arquivos"
#. IDD_PROPPAGE_BACKUPS, IDC_STATIC
-#: Merge.rc:2879
+#: Merge.rc:2889
msgid "Create backup files in:"
msgstr "Criar arquivos de backup em:"
#. IDD_PROPPAGE_BACKUPS, IDC_BACKUP_ORIGFOLD
-#: Merge.rc:2880
+#: Merge.rc:2890
msgid "&Original file's folder"
msgstr "&Pasta original do arquivo"
#. IDD_PROPPAGE_BACKUPS, IDC_BACKUP_GLOBALFOLD
-#: Merge.rc:2881
+#: Merge.rc:2891
msgid "&Global backup folder:"
msgstr "&Pasta global de backups:"
#. IDD_PROPPAGE_BACKUPS, IDC_STATIC
-#: Merge.rc:2884
+#: Merge.rc:2894
msgid "Backup filename:"
msgstr "Nome do arquivo de backup:"
#. IDD_PROPPAGE_BACKUPS, IDC_BACKUP_APPEND_BAK
-#: Merge.rc:2885
+#: Merge.rc:2895
msgid "&Append .bak extension"
msgstr "&Anexar a extensão .bak"
#. IDD_PROPPAGE_BACKUPS, IDC_BACKUP_APPEND_TIME
-#: Merge.rc:2886
+#: Merge.rc:2896
msgid "A&ppend timestamp"
msgstr "A&nexar carimbo de data/hora"
#. IDS_CONFIRM_COPY_CAPTION
-#: Merge.rc:2892 Merge.rc:4565
+#: Merge.rc:2902 Merge.rc:4575
msgid "Confirm Copy"
msgstr "Confirmar a Cópia"
#. IDD_CONFIRM_COPY, IDC_FLDCONFIRM_QUERY
-#: Merge.rc:2896
+#: Merge.rc:2906
msgid "Are you sure you want to copy XXX items?"
msgstr "Tem certeza de que quer copiar XXX itens?"
#. IDD_CONFIRM_COPY, IDC_FLDCONFIRM_FROM_TEXT
-#: Merge.rc:2897
+#: Merge.rc:2907
msgid "From left"
msgstr "Da esquerda"
#. IDD_CONFIRM_COPY, IDC_FLDCONFIRM_TO_TEXT
-#: Merge.rc:2899
+#: Merge.rc:2909
msgid "To right"
msgstr "Para a direita"
#. IDS_MESSAGEBOX_DONT_ASK_AGAIN
-#: Merge.rc:2901 Merge.rc:4191
+#: Merge.rc:2911 Merge.rc:4201
msgid "Don't ask this &question again."
msgstr "Não fazer essa &pergunta novamente."
#. IDD_CONFIRM_COPY, IDYES
-#: Merge.rc:2903
+#: Merge.rc:2913
msgid "Yes"
msgstr "Sim"
#. IDD_CONFIRM_COPY, IDNO
-#: Merge.rc:2904
+#: Merge.rc:2914
msgid "No"
msgstr "Não"
#. IDS_PROJECT_ITEM_PLUGIN
-#: Merge.rc:2909 Merge.rc:4323
+#: Merge.rc:2919 Merge.rc:4333
msgid "Plugins"
msgstr "Plugins"
#. IDD_PLUGINS_LIST, IDC_PLUGINS_ENABLE
-#: Merge.rc:2912
+#: Merge.rc:2922
msgid "&Enable plugins"
msgstr "&Habilitar plugins"
#. IDD_PLUGINS_EDITPLUGIN, IDC_STATIC
-#: Merge.rc:2913 Merge.rc:3113
+#: Merge.rc:2923 Merge.rc:3123
msgid "Plugin &type:"
msgstr "&Tipo de Plugin:"
#. IDD_PLUGINS_LIST, IDC_STATIC
-#: Merge.rc:2916
+#: Merge.rc:2926
msgid "File filters:"
msgstr "Filtros de arquivo:"
#. IDD_PLUGINS_LIST, IDC_STATIC
-#: Merge.rc:2918
+#: Merge.rc:2928
msgid "&Plugin arguments:"
msgstr "&Argumentos do plugin:"
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_AUTOMATIC
-#: Merge.rc:2920 Merge.rc:3134
+#: Merge.rc:2930 Merge.rc:3144
msgid "Enable &automatic unpacking/prediffing"
msgstr "Habilitar &descompactação/pré-diferenciação automáticas"
#. IDS_OPTIONSPG_SHELL
-#: Merge.rc:2934 Merge.rc:4217
+#: Merge.rc:2944 Merge.rc:4227
msgid "Shell Integration"
msgstr "Integração com o Shell"
#. IDD_PROPPAGE_SHELL, IDC_STATIC
-#: Merge.rc:2937
+#: Merge.rc:2947
msgid "Explorer"
msgstr "Explorador de Arquivos"
#. IDD_PROPPAGE_SHELL, IDC_EXPLORER_CONTEXT
-#: Merge.rc:2938
+#: Merge.rc:2948
msgid "&Add to context menu"
msgstr "&Adicionar ao menu de contexto"
#. IDD_PROPPAGE_SHELL, IDC_EXPLORER_ADVANCED
-#: Merge.rc:2939
+#: Merge.rc:2949
msgid "E&nable advanced menu"
msgstr "&Habilitar o menu avançado"
#. IDD_PROPPAGE_SHELL, IDC_EXPLORER_COMPARE_AS
-#: Merge.rc:2940
+#: Merge.rc:2950
msgid "Enable &Compare As menu"
msgstr "Habilitar o menu &Comparar Como"
#. IDD_PROPPAGE_SHELL, IDC_REGISTER_SHELLEXTENSION
-#: Merge.rc:2941
+#: Merge.rc:2951
msgid "&Register Shell Extension"
msgstr "&Registrar a Extensão do Shell"
#. IDD_PROPPAGE_SHELL, IDC_UNREGISTER_SHELLEXTENSION
-#: Merge.rc:2942
+#: Merge.rc:2952
msgid "&Unregister Shell Extension"
msgstr "&Desregistrar a Extensão do Shell"
#. IDD_PROPPAGE_SHELL, IDC_REGISTER_SHELLEXTENSION_PERUSER
-#: Merge.rc:2943
+#: Merge.rc:2953
msgid "Register Shell Extension for Current User &Only"
msgstr "Registrar a Extensão do Shell Só para o Usuário &Atual"
#. IDD_PROPPAGE_SHELL, IDC_UNREGISTER_SHELLEXTENSION_PERUSER
-#: Merge.rc:2944
+#: Merge.rc:2954
msgid "Unregister Shell Extension for Current User On&ly"
msgstr "Desregistrar a Extensão do Shell Só para o Usuário Atua&l"
#. IDD_PROPPAGE_SHELL, IDC_REGISTER_WINMERGECONTEXTMENU
-#: Merge.rc:2945
+#: Merge.rc:2955
msgid "Register Shell Extension for &Windows 11"
msgstr "Registrar a Extensão do Shell para o &Windows 11"
#. IDD_PROPPAGE_SHELL, IDC_UNREGISTER_WINMERGECONTEXTMENU
-#: Merge.rc:2946
+#: Merge.rc:2956
msgid "Unregister Shell Extension for W&indows 11"
msgstr "Desregistrar a Extensão do Shell para o W&indows 11"
#. IDD_PROPPAGE_SHELL, IDC_STATIC
-#: Merge.rc:2947
+#: Merge.rc:2957
msgid "Jump List"
msgstr "Lista de Atalhos"
#. IDD_PROPPAGE_SHELL, IDC_CLEAR_ALL_RECENT_ITEMS
-#: Merge.rc:2949
+#: Merge.rc:2959
msgid "Clear all recent items"
msgstr "Limpar todos os itens recentes"
#. IDS_OPTIONSPG_FOLDERCOMPARE
-#: Merge.rc:2954 Merge.rc:4225
+#: Merge.rc:2964 Merge.rc:4235
msgctxt "Options dialog|Categories"
msgid "Folder"
msgstr "Pasta"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC
-#: Merge.rc:2957
+#: Merge.rc:2967
msgid "&Compare method:"
msgstr "&Método de comparação:"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_COMPARE_STOPFIRST
-#: Merge.rc:2959
+#: Merge.rc:2969
msgid "S&top after first difference"
msgstr "P&arar após a primeira diferença"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_IGNORE_SMALLTIMEDIFF
-#: Merge.rc:2961
+#: Merge.rc:2971
msgid "Ign&ore time differences less than 3 seconds"
msgstr "Ign&orar as diferenças de tempo menores do que 3 segundos"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC
-#: Merge.rc:2964
+#: Merge.rc:2974
msgid "Expand subfolders &after comparison:"
msgstr "Expandir &subpastas após a comparação:"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_COMPARE_WALKSUBDIRS
-#: Merge.rc:2966
+#: Merge.rc:2976
msgid "Include &unique subfolders contents"
msgstr "Incluir o &conteúdo de subpastas únicas"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_IGNORE_REPARSEPOINTS
-#: Merge.rc:2968
+#: Merge.rc:2978
msgid "Ignore &reparse points"
msgstr "Ignorar &pontos de reanálise"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC
-#: Merge.rc:2969
+#: Merge.rc:2979
msgid "Switch to &quick compare when size exceeds (MB):"
msgstr "Trocar para comparação &rápida quando o tamanho exceder (MB):"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC
-#: Merge.rc:2971
+#: Merge.rc:2981
msgid "Switch to &binary compare when size exceeds (MB):"
msgstr "Trocar para comparação &binária quando o tamanho exceder (MB):"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC
-#: Merge.rc:2975
+#: Merge.rc:2985
msgid "Additional comparison condi&tions:"
msgstr "Con&dições de comparação adicionais:"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC
-#: Merge.rc:2978
+#: Merge.rc:2988
msgid "&Rename/move detection:"
msgstr "Detecção de r&enomear/mover:"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC
-#: Merge.rc:2980
+#: Merge.rc:2990
msgid "Rename/move detection &keys:"
msgstr "C&haves de detecção de renomear/mover:"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC
-#: Merge.rc:2983
+#: Merge.rc:2993
msgid "M&erge renames and moves:"
msgstr "Unir renom&eados e movidos:"
#. IDD_PROPPAGE_COMPARE_TABLE, IDC_STATIC
-#: Merge.rc:2994 Merge.rc:2999 Merge.rc:3002
+#: Merge.rc:3004 Merge.rc:3009 Merge.rc:3012
msgid "File patterns:"
msgstr "Padrões de arquivo:"
#. IDD_PROPPAGE_COMPARE_TABLE, IDC_STATIC
-#: Merge.rc:3001
+#: Merge.rc:3011
msgid "Custom Delimiter-Separated Values"
msgstr "Valores Personalizados Separados por Delimitadores"
#. IDS_OPTIONSPG_BINARYCOMPARE
-#: Merge.rc:3015 Merge.rc:4227
+#: Merge.rc:3025 Merge.rc:4237
msgctxt "Options dialog|Categories"
msgid "Binary"
msgstr "Binário"
#. IDD_PROPPAGE_COMPARE_BINARY, IDC_STATIC
-#: Merge.rc:3018
+#: Merge.rc:3028
msgid "Binary file &patterns:"
msgstr "&Padrões de arquivo binário:"
#. IDD_PROPPAGE_COMPARE_BINARY, IDC_STATIC
-#: Merge.rc:3020
+#: Merge.rc:3030
msgid "Frhed settings"
msgstr "Configurações do Frhed"
#. IDD_PROPPAGE_COMPARE_BINARY, IDC_COMPAREBINARY_VIEWSETTINGS
-#: Merge.rc:3021
+#: Merge.rc:3031
msgid "View &Settings..."
msgstr "Visualizar &Configurações..."
#. IDD_PROPPAGE_COMPARE_BINARY, IDC_COMPAREBINARY_BINARYMODE
-#: Merge.rc:3022
+#: Merge.rc:3032
msgid "&Binary Mode..."
msgstr "&Modo Binário..."
#. IDD_PROPPAGE_COMPARE_BINARY, IDC_COMPAREBINARY_CHARACTERSET
-#: Merge.rc:3023
+#: Merge.rc:3033
msgid "&Character Set..."
msgstr "C&onjunto de Caracteres..."
#. IDS_PRPCAT_IMAGE
-#: Merge.rc:3029 Merge.rc:4226 Merge.rc:4665
+#: Merge.rc:3039 Merge.rc:4236 Merge.rc:4675
msgid "Image"
msgstr "Imagem"
#. IDD_PROPPAGE_COMPARE_IMAGE, IDC_STATIC
-#: Merge.rc:3032
+#: Merge.rc:3042
msgid "Image file &patterns:"
msgstr "&Padrões de arquivo de imagem:"
#. IDD_PROPPAGE_COMPARE_IMAGE, IDC_ENABLE_IMGCMP_IN_DIRCMP
-#: Merge.rc:3034
+#: Merge.rc:3044
msgid "&Enable image compare in folder compare"
msgstr "&Habilitar comparação de imagens na comparação de pastas"
#. IDD_PROPPAGE_COMPARE_IMAGE, IDC_STATIC
-#: Merge.rc:3036
+#: Merge.rc:3046
msgid "OCR result:"
msgstr "Resultado do OCR:"
#. IDS_OPTIONSPG_WEBPAGECOMPARE
-#: Merge.rc:3043 Merge.rc:4229
+#: Merge.rc:3053 Merge.rc:4239
msgid "Webpage"
msgstr "Página da Web"
#. IDD_PROPPAGE_COMPARE_WEBPAGE, IDC_STATIC
-#: Merge.rc:3046
+#: Merge.rc:3056
msgid "URL pattern to &include (Regular expression):"
msgstr "Padrão de URL a &incluir (Expressão regular):"
#. IDD_PROPPAGE_COMPARE_WEBPAGE, IDC_STATIC
-#: Merge.rc:3048
+#: Merge.rc:3058
msgid "URL pattern to &exclude (Regular expression):"
msgstr "Padrão de URL a &excluir (Expressão regular):"
#. IDD_PROPPAGE_COMPARE_WEBPAGE, IDC_STATIC
-#: Merge.rc:3050
+#: Merge.rc:3060
msgid "&User data folder location:"
msgstr "Localização da pasta de dados do &usuário:"
#. IDD_PROPPAGE_COMPARE_WEBPAGE, IDC_COMPAREWEBPAGE_USERDATAFOLDER_PERPANE
-#: Merge.rc:3052
+#: Merge.rc:3062
msgid "&Separate user data folders for each pane"
msgstr "&Separar pastas de dados do usuário para cada painel"
#. IDD_ENCODINGERROR, IDC_HEXVIEW
-#: Merge.rc:3065
+#: Merge.rc:3075
msgid "&Hex View"
msgstr "&Visualização Hex"
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3110
+#: Merge.rc:3120
msgid "Edit Plugin"
msgstr "Editar Plugin"
#. IDD_PLUGINS_EDITPLUGIN, IDC_STATIC
-#: Merge.rc:3123
+#: Merge.rc:3133
msgid "&Category:"
msgstr "&Categoria:"
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_MENUCAPTION_STATIC
-#: Merge.rc:3125
+#: Merge.rc:3135
msgid "&Menu caption:"
msgstr "Legenda do &menu:"
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_WINDOWTYPE_STATIC
-#: Merge.rc:3127
+#: Merge.rc:3137
msgid "&Window type:"
msgstr "Tipo de &janela:"
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_UNPACKEDFILEEXTENSION_STATIC
-#: Merge.rc:3132
+#: Merge.rc:3142
msgid "&Unpacked file extension:"
msgstr "E&xtensão de arquivo descompactado:"
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_ARGUMENTSREQUIRED
-#: Merge.rc:3136
+#: Merge.rc:3146
msgid "&Require arguments"
msgstr "&Requer argumentos"
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_GENERATESCRIPT
-#: Merge.rc:3137
+#: Merge.rc:3147
msgid "&Generate editor script"
msgstr "&Gerar script do editor"
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_COMMAND_LINE_STATIC
-#: Merge.rc:3140
+#: Merge.rc:3150
msgid "Command &line:"
msgstr "&Linha de comando:"
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_SCRIPT_FILEEXTENSION_STATIC
-#: Merge.rc:3143
+#: Merge.rc:3153
msgid "&Script file extension:"
msgstr "Exten&são de arquivo de script:"
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_SCRIPT_BODY_STATIC
-#: Merge.rc:3145
+#: Merge.rc:3155
msgid "Script &body:"
msgstr "Cor&po do script:"
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3154
+#: Merge.rc:3164
msgid "Font"
msgstr "Fonte"
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3157
+#: Merge.rc:3167
msgid "&Font:"
msgstr "&Fonte:"
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3163
+#: Merge.rc:3173
msgid "Font st&yle:"
msgstr "Est&ilo de fonte:"
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3169
+#: Merge.rc:3179
msgid "&Size:"
msgstr "&Tamanho:"
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3175
+#: Merge.rc:3185
msgid "Effects"
msgstr "Efeitos"
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3176
+#: Merge.rc:3186
msgid "Stri&keout"
msgstr "Tac&har"
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3177
+#: Merge.rc:3187
msgid "&Underline"
msgstr "S&ublinhar"
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3179
+#: Merge.rc:3189
msgid "&Color:"
msgstr "&Cor:"
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3184
+#: Merge.rc:3194
msgid "Sample"
msgstr "Amostra"
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3185
+#: Merge.rc:3195
msgid "AaBbYyZz"
msgstr "AaBbYyZz"
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3189
+#: Merge.rc:3199
msgid "Sc&ript:"
msgstr "Sc&ript:"
#. IDD_PLUGINS_EDITPLUGIN, IDC_MANAGE_LINK
-#: Merge.rc:3194
+#: Merge.rc:3204
msgid "Show more fonts"
msgstr "Mostrar mais fontes"
#. ID_INDICATOR_EXT
-#: Merge.rc:4118
+#: Merge.rc:4128
msgid "EXT"
msgstr "EXT"
#. ID_INDICATOR_CAPS
-#: Merge.rc:4119
+#: Merge.rc:4129
msgid "CAP"
msgstr "CAP"
#. ID_INDICATOR_NUM
-#: Merge.rc:4120
+#: Merge.rc:4130
msgid "NUM"
msgstr "NUM"
#. ID_INDICATOR_SCRL
-#: Merge.rc:4121
+#: Merge.rc:4131
msgid "SCRL"
msgstr "SCRL"
#. ID_INDICATOR_OVR
-#: Merge.rc:4122
+#: Merge.rc:4132
msgid "OVR"
msgstr "OVR"
#. ID_INDICATOR_REC
-#: Merge.rc:4123
+#: Merge.rc:4133
msgid "REC"
msgstr "REC"
#. ID_FILE_NEW
-#: Merge.rc:4129
+#: Merge.rc:4139
msgid "\nNew Documents (Ctrl+N)"
msgstr "\nNovos Documentos (Ctrl+N)"
#. ID_FILE_OPEN
-#: Merge.rc:4130
+#: Merge.rc:4140
msgid "\nOpen (Ctrl+O)"
msgstr "\nAbrir (Ctrl+O)"
#. ID_FILE_SAVE
-#: Merge.rc:4131
+#: Merge.rc:4141
msgid "\nSave (Ctrl+S)"
msgstr "\nSalvar (Ctrl+S)"
#. IDS_UNK_ERROR_READING_PROJECT
-#: Merge.rc:4137
+#: Merge.rc:4147
msgid "Unknown error opening project file."
msgstr "Erro desconhecido ao abrir o arquivo de projeto."
#. IDS_UNK_ERROR_SAVING_PROJECT
-#: Merge.rc:4138
+#: Merge.rc:4148
msgid "Unknown error saving project file."
msgstr "Erro desconhecido ao salvar o arquivo de projeto."
#. IDS_PROJFILE_LOAD_SUCCESS
-#: Merge.rc:4143
+#: Merge.rc:4153
msgid "Project file loaded."
msgstr "Arquivo de projeto carregado."
#. IDS_PROJFILE_SAVE_SUCCESS
-#: Merge.rc:4144
+#: Merge.rc:4154
msgid "Project file saved."
msgstr "Arquivo de projeto salvo."
#. ID_EDIT_UNDO
-#: Merge.rc:4150
+#: Merge.rc:4160
msgid "\nUndo (Ctrl+Z)"
msgstr "\nDesfazer (Ctrl+Z)"
#. ID_EDIT_REDO
-#: Merge.rc:4151
+#: Merge.rc:4161
msgid "\nRedo (Ctrl+Y)"
msgstr "\nRefazer (Ctrl+Y)"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:4158
+#: Merge.rc:4168
msgid "\nFileCompare\n\n\n\nWinMerge.FileCompare\nWinMerge File Compare"
msgstr "\nComparaçãoDeArquivos\n\n\n\nWinMerge.FileCompare\nComparação de Arquivos do WinMerge"
#. IDR_DIRDOCTYPE
-#: Merge.rc:4159
+#: Merge.rc:4169
msgid "\nFolderCompare\n\n\n\nWinMerge.FolderCompare\nWinMerge Folder Compare"
msgstr "\nComparaçãoDePastas\n\n\n\nWinMerge.FolderCompare\nComparação de Pastas do WinMerge"
#. IDS_SPLASH_GPLTEXT
-#: Merge.rc:4165
+#: Merge.rc:4175
msgid "WinMerge comes with ABSOLUTELY NO WARRANTY. It is free software and can be redistributed under the conditions of the GNU General Public License - see the Help menu for details."
msgstr "O WinMerge vem com ABSOLUTAMENTE NENHUMA GARANTIA. Ele é um software livre e pode ser redistribuído sob as condições da Licença Pública Geral do GNU - veja o menu de Ajuda para detalhes."
#. IDS_MESSAGEBOX_ABORT
-#: Merge.rc:4173
+#: Merge.rc:4183
msgid "&Abort"
msgstr "&Abortar"
#. IDS_MESSAGEBOX_RETRY
-#: Merge.rc:4174
+#: Merge.rc:4184
msgid "&Retry"
msgstr "&Tentar de novo"
#. IDS_MESSAGEBOX_IGNORE
-#: Merge.rc:4175
+#: Merge.rc:4185
msgid "&Ignore"
msgstr "&Ignorar"
#. IDS_MESSAGEBOX_IGNOREALL
-#: Merge.rc:4176
+#: Merge.rc:4186
msgid "Ignore &all"
msgstr "Ignorar &tudo"
#. IDS_MESSAGEBOX_YES
-#: Merge.rc:4177
+#: Merge.rc:4187
msgid "&Yes"
msgstr "&Sim"
#. IDS_MESSAGEBOX_YES_TO_ALL
-#: Merge.rc:4183
+#: Merge.rc:4193
msgid "Yes to &all"
msgstr "Sim para &tudo"
#. IDS_MESSAGEBOX_NO
-#: Merge.rc:4184
+#: Merge.rc:4194
msgid "&No"
msgstr "&Não"
#. IDS_MESSAGEBOX_NO_TO_ALL
-#: Merge.rc:4185
+#: Merge.rc:4195
msgid "No to a&ll"
msgstr "Não para t&udo"
#. IDS_MESSAGEBOX_CONTINUE
-#: Merge.rc:4186
+#: Merge.rc:4196
msgid "&Continue"
msgstr "&Continuar"
#. IDS_MESSAGEBOX_SKIP
-#: Merge.rc:4187
+#: Merge.rc:4197
msgid "&Skip"
msgstr "&Pular"
#. IDS_MESSAGEBOX_SKIPALL
-#: Merge.rc:4188
+#: Merge.rc:4198
msgid "Skip &all"
msgstr "Pular &tudo"
#. IDS_MESSAGEBOX_DONT_DISPLAY_AGAIN
-#: Merge.rc:4190
+#: Merge.rc:4200
msgid "Don't display this &message again."
msgstr "Não exibir essa &mensagem novamente."
-#: Merge.rc:4193
+#: Merge.rc:4203
msgid "To make this message box visible, press Reset on the Message Boxes page in Options."
msgstr "Para tornar esta caixa de mensagem visível, pressione Restaurar na página Caixas de Mensagens em Opções."
#. IDS_OPTIONSPG_EDITOR_COMPAREMERGE
-#: Merge.rc:4203
+#: Merge.rc:4213
msgid "Compare/Merge"
msgstr "Comparar/Unir"
#. IDS_OPTIONSPG_SYNTAXCOLORS
-#: Merge.rc:4204 Merge.rc:4208
+#: Merge.rc:4214 Merge.rc:4218
msgid "Syntax"
msgstr "Sintaxe"
#. IDS_OPTIONSPG_COLOR_SCHEMES
-#: Merge.rc:4206
+#: Merge.rc:4216
msgid "Color Schemes"
msgstr "Esquemas de Cores"
#. IDS_OPTIONSPG_DIRCOLORS
-#: Merge.rc:4210
+#: Merge.rc:4220
msgid "Folder Compare"
msgstr "Comparação de Pastas"
#. IDS_OPTIONSPG_PROJECT
-#: Merge.rc:4215
+#: Merge.rc:4225
msgid "Project"
msgstr "Projeto"
#. IDS_COLHDR_NSDIFFS
-#: Merge.rc:4218 Merge.rc:4640
+#: Merge.rc:4228 Merge.rc:4650
msgid "Differences"
msgstr "Diferenças"
#. IDS_OPTIONSPG_MESSAGEBOXES
-#: Merge.rc:4220
+#: Merge.rc:4230
msgid "Message Boxes"
msgstr "Caixas de Mensagens"
#. IDS_TO
-#: Merge.rc:4235
+#: Merge.rc:4245
msgid "To:"
msgstr "Para:"
#. IDS_FROM_LEFT
-#: Merge.rc:4236
+#: Merge.rc:4246
msgid "From left:"
msgstr "Da esquerda:"
#. IDS_TO_LEFT
-#: Merge.rc:4237
+#: Merge.rc:4247
msgid "To left:"
msgstr "Para a esquerda:"
#. IDS_FROM_RIGHT
-#: Merge.rc:4238
+#: Merge.rc:4248
msgid "From right:"
msgstr "Da direita:"
#. IDS_TO_RIGHT
-#: Merge.rc:4239
+#: Merge.rc:4249
msgid "To right:"
msgstr "Para a direita:"
#. IDS_FROM_MIDDLE
-#: Merge.rc:4240
+#: Merge.rc:4250
msgid "From middle:"
msgstr "Do meio:"
#. IDS_TO_MIDDLE
-#: Merge.rc:4241
+#: Merge.rc:4251
msgid "To middle:"
msgstr "Para o meio:"
#. IDS_VERSION_FMT
-#: Merge.rc:4247
+#: Merge.rc:4257
#, c-format
msgid "Version %1"
msgstr "Versão %1"
#. IDS_OPTIONS_TITLE
-#: Merge.rc:4253
+#: Merge.rc:4263
#, c-format
msgid "Options (%1)"
msgstr "Opções (%1)"
#. IDS_MESSAGE_BOX_ARE_RESET
-#: Merge.rc:4254
+#: Merge.rc:4264
msgid "All message boxes are now displayed again."
msgstr "Todas as caixas de mensagens agora são exibidas novamente."
-#: Merge.rc:4256
+#: Merge.rc:4266
#, c-format
msgid "Tab size value is out of range. Please use 1 - %1."
msgstr "O valor do tamanho da tabulação está fora do intervalo. Por favor, use 1 - %1."
#. IDS_PROJECT_OPEN
-#: Merge.rc:4262 Merge.rc:4318
+#: Merge.rc:4272 Merge.rc:4328
msgid "Open"
msgstr "Abrir"
#. IDS_PROGRAMFILES
-#: Merge.rc:4263
+#: Merge.rc:4273
msgid "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||"
msgstr "Programas|*.exe;*.bat;*.cmd|Todos os Arquivos (*.*)|*.*||"
#. IDS_ALLFILES
-#: Merge.rc:4264
+#: Merge.rc:4274
msgid "All Files (*.*)|*.*||"
msgstr "Todos os Arquivos (*.*)|*.*||"
#. IDS_PROJECTFILES
-#: Merge.rc:4265
+#: Merge.rc:4275
msgid "WinMerge Project Files (*.WinMerge)|*.WinMerge||"
msgstr "Arquivos de Projeto do WinMerge (*.WinMerge)|*.WinMerge||"
#. IDS_INIFILES
-#: Merge.rc:4267
+#: Merge.rc:4277
msgid "Options files (*.ini)|*.ini|All Files (*.*)|*.*||"
msgstr "Arquivos de Opções (*.ini)|*.ini|Todos os Arquivos (*.*)|*.*||"
#. IDS_REPLACELIST_FILES
-#: Merge.rc:4268
+#: Merge.rc:4278
msgid "Tab-Separated Values (*.tsv;*.txt)|*.tsv;*.txt|All Files (*.*)|*.*||"
msgstr "Valores Separados por Tab (*.tsv;*.txt)|*.tsv;*.txt|Todos os Arquivos (*.*)|*.*||"
#. IDS_TEXT_REPORT_FILES
-#: Merge.rc:4274
+#: Merge.rc:4284
msgid "Text Files (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|All Files (*.*)|*.*||"
msgstr "Arquivos de Texto (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|Todos os Arquivos (*.*)|*.*||"
#. IDS_HTML_REPORT_FILES
-#: Merge.rc:4275
+#: Merge.rc:4285
msgid "HTML Files (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||"
msgstr "Arquivos HTML (*.htm,*.html)|*.htm;*.html|Todos os Arquivos (*.*)|*.*||"
#. IDS_XML_REPORT_FILES
-#: Merge.rc:4276
+#: Merge.rc:4286
msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||"
msgstr "Arquivos XML (*.xml)|*.xml|Todos os Arquivos (*.*)|*.*||"
#. IDS_EXPANDSUBDIRS_DONOTEXPAND
-#: Merge.rc:4294
+#: Merge.rc:4304
msgid "Do not expand"
msgstr "Não expandir"
#. IDS_EXPANDSUBDIRS_ALL
-#: Merge.rc:4295
+#: Merge.rc:4305
msgid "Expand all subfolders"
msgstr "Expandir todas as subpastas"
#. IDS_EXPANDSUBDIRS_DIFFERENT
-#: Merge.rc:4296
+#: Merge.rc:4306
msgid "Expand different subfolders"
msgstr "Expandir subpastas diferentes"
#. IDS_EXPANDSUBDIRS_IDENTICAL
-#: Merge.rc:4297
+#: Merge.rc:4307
msgid "Expand identical subfolders"
msgstr "Expandir subpastas idênticas"
#. IDS_SYNTAXTABLE_FILETYPE
-#: Merge.rc:4303
+#: Merge.rc:4313
msgid "File Type"
msgstr "Tipo de Arquivo"
#. IDS_COLHDR_EXTENSION
-#: Merge.rc:4304 Merge.rc:4597
+#: Merge.rc:4314 Merge.rc:4607
msgid "Extension"
msgstr "Extensão"
#. IDS_PRPCAT_MESSAGE
-#: Merge.rc:4310 Merge.rc:4669
+#: Merge.rc:4320 Merge.rc:4679
msgid "Message"
msgstr "Mensagem"
#. IDS_MESSAGEBOX_ANSWER
-#: Merge.rc:4311
+#: Merge.rc:4321
msgid "Answer"
msgstr "Resposta"
#. IDS_PROJECT_ITEM
-#: Merge.rc:4317
+#: Merge.rc:4327
msgid "Item"
msgstr "Item"
#. IDS_PROJECT_LOAD
-#: Merge.rc:4319
+#: Merge.rc:4329
msgid "Load"
msgstr "Carregar"
#. IDS_PROJECT_SAVE
-#: Merge.rc:4320
+#: Merge.rc:4330
msgid "Save"
msgstr "Salvar"
#. IDS_PROJECT_ITEM_INCLUDE_SUBFOLDERS
-#: Merge.rc:4322
+#: Merge.rc:4332
msgid "Include Subfolders"
msgstr "Incluir Subpastas"
#. IDS_PROJECT_ITEM_COMPARE_OPTIONS
-#: Merge.rc:4324
+#: Merge.rc:4334
msgid "Compare Options"
msgstr "Opções de Comparação"
#. IDS_PROJECT_ITEM_HIDDEN_ITEMS
-#: Merge.rc:4325
+#: Merge.rc:4335
msgid "Hidden Items"
msgstr "Itens Ocultados"
#. IDS_PLUGINSLIST_NAME
-#: Merge.rc:4331 Merge.rc:4956
+#: Merge.rc:4341 Merge.rc:4966
msgid "Name"
msgstr "Nome"
#. IDS_FILTERFILE_PATHTITLE
-#: Merge.rc:4332
+#: Merge.rc:4342
msgid "Location"
msgstr "Localização"
#. IDS_FILTER_TITLE
-#: Merge.rc:4333
+#: Merge.rc:4343
msgid "Filters"
msgstr "Filtros"
#. IDS_FILTER_PREFIX
-#: Merge.rc:4334
+#: Merge.rc:4344
msgid "[F] "
msgstr "[F] "
#. IDS_PLUGINSLIST_DESC
-#: Merge.rc:4335 Merge.rc:4958
+#: Merge.rc:4345 Merge.rc:4968
msgid "Description"
msgstr "Descrição"
#. IDS_FILEFILTER_SAVENEW
-#: Merge.rc:4336
+#: Merge.rc:4346
msgid "Select Filename for New Filter"
msgstr "Selecione o Nome de Arquivo para o Novo Filtro"
#. IDS_FILEFILTER_FILEMASK
-#: Merge.rc:4337
+#: Merge.rc:4347
msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||"
msgstr "Filtros de Arquivo (*.flt)|*.flt|Todos os Arquivos (*.*)|*.*||"
-#: Merge.rc:4339
+#: Merge.rc:4349
#, c-format
msgid "Cannot find filter template!\n\nCopy %1 to WinMerge/Filters Folder:\n%2."
msgstr "Não foi possível encontrar o modelo de filtro!\n\nCopie %1 para a Pasta WinMerge/Filtros:\n%2."
-#: Merge.rc:4341
+#: Merge.rc:4351
#, c-format
msgid "Cannot copy filter template:\n%1\n\nMake sure the folder exists and is writable."
msgstr "Não foi possível copiar o modelo de filtro:\n%1\n\nCertifique-se de que a pasta existe e é gravável."
-#: Merge.rc:4343
+#: Merge.rc:4353
msgid "User's filter folder is not defined!\n\nSelect filter folder in Options/System."
msgstr "A pasta de filtros do usuário não está definida!\n\nSelecione a pasta de filtros em Opções/Sistema."
-#: Merge.rc:4345
+#: Merge.rc:4355
#, c-format
msgid "Failed to delete filter:\n%1\n\nFile may be read-only."
msgstr "Não foi possível excluir o filtro:\n%1\n\nO arquivo pode ser somente leitura."
#. IDS_FILEFILTER_INSTALL
-#: Merge.rc:4346
+#: Merge.rc:4356
msgid "Locate Filter File to Install"
msgstr "Localizar Arquivo de Filtros para Instalar"
-#: Merge.rc:4348
+#: Merge.rc:4358
msgid "Installing filter file failed.\n\nCould not copy new filter to folder."
msgstr "A instalação do arquivo de filtros falhou.\n\nNão foi possível copiar o novo filtro para a pasta."
#. IDS_FILEFILTER_OVERWRITE
-#: Merge.rc:4349
+#: Merge.rc:4359
msgid "Filter file exists. Overwrite?"
msgstr "O arquivo de filtros existe. Sobrescrever?"
#. IDS_FILTERLINE_REGEXP
-#: Merge.rc:4355
+#: Merge.rc:4365
msgid "Regular expression"
msgstr "Expressão regular"
#. IDS_FILTERCHANGED
-#: Merge.rc:4361
+#: Merge.rc:4371
msgid "Filters updated. Refresh all open folder compares?\n\nSelect 'No' to refresh later."
msgstr "Filtros atualizados. Renovar todas as comparações de pastas abertas?\n\nSelecione 'Não' para renovar mais tarde."
#. IDS_DIRECTORY_WINDOW_TITLE
-#: Merge.rc:4367
+#: Merge.rc:4377
msgid "Folder Comparison Results"
msgstr "Resultados da Comparação de Pastas"
#. IDS_FILE_COMPARISON_TITLE
-#: Merge.rc:4368
+#: Merge.rc:4378
msgid "File Comparison"
msgstr "Comparação de Arquivos"
#. IDS_EMPTY_LEFT_FILE
-#: Merge.rc:4369
+#: Merge.rc:4379
msgid "Untitled Left"
msgstr "Esquerda Sem Título"
#. IDS_EMPTY_MIDDLE_FILE
-#: Merge.rc:4370
+#: Merge.rc:4380
msgid "Untitled Middle"
msgstr "Meio Sem Título"
#. IDS_EMPTY_RIGHT_FILE
-#: Merge.rc:4371
+#: Merge.rc:4381
msgid "Untitled Right"
msgstr "Direita Sem Título"
#. IDS_CONFLICT_BASE_FILE
-#: Merge.rc:4372
+#: Merge.rc:4382
msgid "Base File"
msgstr "Arquivo Base"
#. IDS_CONFLICT_THEIRS_FILE
-#: Merge.rc:4373
+#: Merge.rc:4383
msgid "Theirs File"
msgstr "O Arquivo Deles"
#. IDS_CONFLICT_MINE_FILE
-#: Merge.rc:4374
+#: Merge.rc:4384
msgid "Mine File"
msgstr "Meu Arquivo"
#. IDS_SELFCOMPARE_ORIGINAL_FILE
-#: Merge.rc:4375
+#: Merge.rc:4385
msgid "Original File"
msgstr "Arquivo Original"
#. IDS_LINE_STATUS_INFO_EOL
-#: Merge.rc:4381
+#: Merge.rc:4391
#, c-format
msgid "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s"
msgstr "Lin: %s Col: %d/%d Car: %d/%d EOL: %s"
#. IDS_EMPTY_LINE_STATUS_INFO
-#: Merge.rc:4382
+#: Merge.rc:4392
#, c-format
msgid "Line: %s"
msgstr "Linha: %s"
#. IDS_LINE_STATUS_INFO
-#: Merge.rc:4383
+#: Merge.rc:4393
#, c-format
msgid "Ln: %s Col: %d/%d Ch: %d/%d"
msgstr "Lin: %s Col: %d/%d Car: %d/%d"
#. IDS_LINE_STATUS_INFO_SEL
-#: Merge.rc:4384
+#: Merge.rc:4394
#, c-format
msgid " Sel: %d | %d"
msgstr " Sel: %d | %d"
#. IDS_MERGEMODE_MERGING
-#: Merge.rc:4385
+#: Merge.rc:4395
msgid "Merge"
msgstr "Unir"
#. IDS_DIFF_NUMBER_STATUS_FMT
-#: Merge.rc:4386
+#: Merge.rc:4396
#, c-format
msgid "Difference %1 of %2"
msgstr "Diferença %1 de %2"
#. IDS_NO_DIFF_SEL_FMT
-#: Merge.rc:4387
+#: Merge.rc:4397
#, c-format
msgid "%1 Differences Found"
msgstr "%1 Diferenças Encontradas"
#. IDS_1_DIFF_FOUND
-#: Merge.rc:4388
+#: Merge.rc:4398
msgid "1 Difference Found"
msgstr "1 Diferença Encontrada"
#. IDS_NO_ERR_SEL_FMT
-#: Merge.rc:4389
+#: Merge.rc:4399
#, c-format
msgid "%1 Errors Found"
msgstr "%1 Erros Encontrados"
#. IDS_1_ERR_FOUND
-#: Merge.rc:4390
+#: Merge.rc:4400
msgid "1 Error Found"
msgstr "1 Erro Encontrado"
#. IDS_STATUSBAR_READONLY, Abbreviation from "Read Only"
-#: Merge.rc:4391
+#: Merge.rc:4401
msgid "RO"
msgstr "SL"
#. IDS_DIRVIEW_STATUS_FMT_FOCUS
-#: Merge.rc:4397
+#: Merge.rc:4407
#, c-format
msgid "Item %1 of %2"
msgstr "Item %1 de %2"
#. IDS_DIRVIEW_STATUS_FMT_NOFOCUS
-#: Merge.rc:4398
+#: Merge.rc:4408
#, c-format
msgid "Items: %1"
msgstr "Itens: %1"
#. IDS_DIRVIEW_STATUS_COMPARING
-#: Merge.rc:4399
+#: Merge.rc:4409
msgid "Comparing items..."
msgstr "Comparando os itens..."
#. IDS_ITEMS_PER_SEC
-#: Merge.rc:4400
+#: Merge.rc:4410
#, c-format
msgid "%.1f[items/sec]"
msgstr "%.1f[itens/seg]"
#. IDS_ERROR_INCOMPARABLE
-#: Merge.rc:4406
+#: Merge.rc:4416
msgid "Select two existing folders/files to compare."
msgstr "Selecione duas/dois pastas/arquivos existentes para comparar."
#. IDS_DIRSEL_TAG
-#: Merge.rc:4407
+#: Merge.rc:4417
msgid "Folder Selection"
msgstr "Seleção de Pastas"
#. IDS_OPEN_FILESDIRS
-#: Merge.rc:4408
+#: Merge.rc:4418
msgid "Select two (or three) folders/files to compare."
msgstr "Selecione duas/dois (ou três) pastas/arquivos para comparar."
#. IDS_OPEN_LEFTINVALID
-#: Merge.rc:4409
+#: Merge.rc:4419
msgid "Left (1st) path is invalid!"
msgstr "O caminho da esquerda (1º) é inválido!"
#. IDS_OPEN_MIDDLEINVALID
-#: Merge.rc:4410
+#: Merge.rc:4420
msgid "Middle (2nd) path is invalid!"
msgstr "O caminho do meio (2º) é inválido!"
#. IDS_OPEN_RIGHTINVALID2
-#: Merge.rc:4411
+#: Merge.rc:4421
msgid "Right (2nd) path is invalid!"
msgstr "O caminho da direita (2º) é inválido!"
#. IDS_OPEN_RIGHTINVALID3
-#: Merge.rc:4412
+#: Merge.rc:4422
msgid "Right (3rd) path is invalid!"
msgstr "O caminho da direita (3º) é inválido!"
#. IDS_OPEN_BOTHINVALID
-#: Merge.rc:4413
+#: Merge.rc:4423
msgid "Both paths are invalid!"
msgstr "Ambos os caminhos são inválidos!"
-#: Merge.rc:4415
+#: Merge.rc:4425
msgid "Left (1st) and Middle (2nd) paths are invalid!"
msgstr "Os caminhos da esquerda (1º) e do meio (2º) são inválidos!"
#. IDS_OPEN_LEFTRIGHTINVALID
-#: Merge.rc:4416
+#: Merge.rc:4426
msgid "Left (1st) and Right (3rd) paths are invalid!"
msgstr "Os caminhos da esquerda (1º) e da direita (3º) são inválidos!"
-#: Merge.rc:4418
+#: Merge.rc:4428
msgid "Middle (2nd) and Right (3rd) paths are invalid!"
msgstr "Os caminhos do meio (2º) e da direita (3º) são inválidos!"
#. IDS_OPEN_ALLINVALID
-#: Merge.rc:4419
+#: Merge.rc:4429
msgid "All paths are invalid!"
msgstr "Todos os caminhos são inválidos!"
#. IDS_OPEN_UNPACKERDISABLED
-#: Merge.rc:4420
+#: Merge.rc:4430
msgid "Only enabled for file comparisons"
msgstr "Só habilitado para comparações de arquivos"
#. IDS_OPEN_MISMATCH
-#: Merge.rc:4421
+#: Merge.rc:4431
msgid "Cannot compare file and folder!"
msgstr "Não foi possível comparar o arquivo e a pasta!"
#. IDS_ERROR_FILE_NOT_FOUND
-#: Merge.rc:4427
+#: Merge.rc:4437
#, c-format
msgid "File not found: %1"
msgstr "Arquivo não encontrado: %1"
#. IDS_ERROR_FILE_NOT_UNPACKED
-#: Merge.rc:4428
+#: Merge.rc:4438
#, c-format
msgid "File not unpacked: %1"
msgstr "Arquivo não descompactado: %1"
#. IDS_ERROR_FILEOPEN
-#: Merge.rc:4429
+#: Merge.rc:4439
#, c-format
msgid "Cannot open file\n%1\n\n%2"
msgstr "Não foi possível abrir o arquivo\n%1\n\n%2"
#. IDS_ERROR_CONF_RESOLVE
-#: Merge.rc:4430
+#: Merge.rc:4440
msgid "Failed to parse conflict file."
msgstr "Falha ao analisar o arquivo de conflito."
#. IDS_NOT_CONFLICT_FILE
-#: Merge.rc:4431
+#: Merge.rc:4441
#, c-format
msgid "The file\n%1\nis not a conflict file."
msgstr "O arquivo\n%1\nnão é um arquivo de conflito."
#. IDS_COMPARE_LARGE_FILES
-#: Merge.rc:4432
+#: Merge.rc:4442
msgid "Comparing large files requires significant memory.\nShow only comparison results (not file contents)?"
msgstr "A comparação de arquivos grandes requer uma memória significativa.\nMostrar apenas os resultados da comparação (não o conteúdo dos arquivos)?"
#. IDS_SAVE_AS_TITLE
-#: Merge.rc:4438
+#: Merge.rc:4448
msgid "Save As"
msgstr "Salvar Como"
#. IDS_SAVE_FMT
-#: Merge.rc:4439
+#: Merge.rc:4449
#, c-format
msgid "Save changes to %1?"
msgstr "Salvar as alterações em %1?"
#. IDS_SAVEREADONLY_FMT
-#: Merge.rc:4440
+#: Merge.rc:4450
#, c-format
msgid "%1 is read-only. Override? Or 'No' to save as new filename?"
msgstr "%1 é somente leitura. Substituir? Ou 'Não' para salvar como novo nome de arquivo?"
#. IDS_ERROR_BACKUP
-#: Merge.rc:4441
+#: Merge.rc:4451
msgid "Error backing up file"
msgstr "Erro ao fazer o backup do arquivo"
-#: Merge.rc:4443
+#: Merge.rc:4453
#, c-format
msgid "Unable to backup original file:\n%1\n\nContinue anyway?"
msgstr "Incapaz de fazer o backup do arquivo original:\n%1\n\nContinuar de qualquer maneira?"
#. IDS_FILESAVE_FAILED
-#: Merge.rc:4444
+#: Merge.rc:4454
#, c-format
msgid "Saving file failed.\n%1\n%2\n\t- Use different filename (OK)\n\t- Abort (Cancel)?"
msgstr "Falha ao salvar o arquivo.\n%1\n%2\n\t- Usar um nome de arquivo diferente (OK)\n\t- Abortar (Cancelar)?"
-#: Merge.rc:4446
+#: Merge.rc:4456
#, c-format
msgid "Plugin '%2' cannot pack changes to left file into '%1'.\n\nOriginal unchanged. Save unpacked version?"
msgstr "O plug-in ‘%2’ não consegue compactar as alterações do arquivo da esquerda em ‘%1’.\n\nOriginal inalterado. Salvar a versão descompactada?"
-#: Merge.rc:4448
+#: Merge.rc:4458
#, c-format
msgid "Plugin '%2' cannot pack changes to middle file into '%1'.\n\nOriginal unchanged. Save unpacked version?"
msgstr "O plug-in ‘%2’ não consegue compactar as alterações no arquivo do meio em ‘%1’.\n\nOriginal inalterado. Salvar a versão descompactada?"
-#: Merge.rc:4450
+#: Merge.rc:4460
#, c-format
msgid "Plugin '%2' cannot pack changes to right file into '%1'.\n\nOriginal unchanged. Save unpacked version?"
msgstr "O plug-in ‘%2’ não consegue compactar as alterações no arquivo da direita em ‘%1’.\n\nOriginal inalterado. Salvar a versão descompactada?"
#. IDS_FILECHANGED_ONDISK
-#: Merge.rc:4451
+#: Merge.rc:4461
#, c-format
msgid "Another application updated\n%1\nsince WinMerge loaded it.\n\nOverwrite?"
msgstr "Outro aplicativo atualizou\n%1\ndesde que o WinMerge o carregou.\n\nSobrescrever?"
#. IDS_SAVEREADONLY_MULTI
-#: Merge.rc:4452
+#: Merge.rc:4462
#, c-format
msgid "%1\nis read-only. Override?"
msgstr "%1\né somente leitura. Substituir?"
#. IDS_FILECHANGED_RESCAN
-#: Merge.rc:4453
+#: Merge.rc:4463
#, c-format
msgid "Another application updated\n%1\nsince last scan.\n\nReload?"
msgstr "Outro aplicativo atualizou\n%1\ndesde o último escaneamento.\n\nRecarregar?"
#. IDS_SAVE_LEFT_AS
-#: Merge.rc:4454
+#: Merge.rc:4464
msgid "Save Left File As"
msgstr "Salvar o Arquivo da Esquerda Como"
#. IDS_SAVE_MIDDLE_AS
-#: Merge.rc:4455
+#: Merge.rc:4465
msgid "Save Middle File As"
msgstr "Salvar o Arquivo do Meio Como"
#. IDS_SAVE_RIGHT_AS
-#: Merge.rc:4456
+#: Merge.rc:4466
msgid "Save Right File As"
msgstr "Salvar o Arquivo da Direita Como"
#. IDS_FILE_DISAPPEARED
-#: Merge.rc:4461
+#: Merge.rc:4471
#, c-format
msgid "File\n%1\nnot found. Save a copy to continue."
msgstr "Arquivo\n%1\nnão encontrado. Salve uma cópia para continuar."
#. IDS_VIEWS_OUTOFSYNC
-#: Merge.rc:4467
+#: Merge.rc:4477
msgid "Cannot merge unsynched documents.\n\nRefresh before continuing."
msgstr "Não é possível unir documentos não sincronizados.\n\nRenove antes de continuar."
#. IDS_BREAK_ON_WHITESPACE
-#: Merge.rc:4472
+#: Merge.rc:4482
msgid "Break at whitespace"
msgstr "Quebrar no espaço em branco"
#. IDS_BREAK_ON_PUNCTUATION
-#: Merge.rc:4473
+#: Merge.rc:4483
msgid "Break at whitespace or punctuation"
msgstr "Quebrar no espaço em branco ou pontuação"
#. IDS_L2M
-#: Merge.rc:4479
+#: Merge.rc:4489
msgid "Copy to &Middle\tAlt+Right"
msgstr "Copiar para o &Meio\tAlt+Right"
#. IDS_R2M
-#: Merge.rc:4480
+#: Merge.rc:4490
msgid "Copy to &Middle\tAlt+Left"
msgstr "Copiar para o &Meio\tAlt+Left"
#. IDS_COPY_FROM_MIDDLE_R
-#: Merge.rc:4481
+#: Merge.rc:4491
msgid "Copy from Middle\tAlt+Shift+Right"
msgstr "Copiar do Meio\tAlt+Shift+Right"
#. IDS_COPY_FROM_MIDDLE_L
-#: Merge.rc:4482
+#: Merge.rc:4492
msgid "Copy from Middle\tAlt+Shift+Left"
msgstr "Copiar do Meio\tAlt+Shift+Left"
#. IDS_L2MNEXT
-#: Merge.rc:4483
+#: Merge.rc:4493
msgid "Copy to Middle and Advance\tCtrl+Alt+Right"
msgstr "Copiar para o &Meio e Avançar\tCtrl+Alt+Right"
#. IDS_R2MNEXT
-#: Merge.rc:4484
+#: Merge.rc:4494
msgid "Copy to Middle and Advance\tCtrl+Alt+Left"
msgstr "Copiar para o Meio e Avançar\tCtrl+Alt+Left"
#. IDS_ALL_MIDDLE
-#: Merge.rc:4485
+#: Merge.rc:4495
msgid "Copy All to Middle"
msgstr "Copiar Tudo para o Meio"
#. IDS_COPY_RIGHT_TO_LEFT
-#: Merge.rc:4491
+#: Merge.rc:4501
#, c-format
msgid "Right to Left (%1)"
msgstr "Da Direita para a Esquerda (%1)"
#. IDS_COPY_RIGHT_TO_MIDDLE
-#: Merge.rc:4492
+#: Merge.rc:4502
#, c-format
msgid "Right to Middle (%1)"
msgstr "Da Direita para o Meio (%1)"
#. IDS_COPY_MIDDLE_TO_LEFT
-#: Merge.rc:4493
+#: Merge.rc:4503
#, c-format
msgid "Middle to Left (%1)"
msgstr "Do Meio para a Esquerda (%1)"
#. IDS_COPY_MIDDLE_TO_RIGHT
-#: Merge.rc:4494
+#: Merge.rc:4504
#, c-format
msgid "Middle to Right (%1)"
msgstr "Do Meio para a Direita (%1)"
#. IDS_COPY_LEFT_TO_RIGHT
-#: Merge.rc:4495
+#: Merge.rc:4505
#, c-format
msgid "Left to Right (%1)"
msgstr "Da Esquerda para a Direita (%1)"
#. IDS_COPY_LEFT_TO_MIDDLE
-#: Merge.rc:4496
+#: Merge.rc:4506
#, c-format
msgid "Left to Middle (%1)"
msgstr "Da Esquerda para o Meio (%1)"
#. IDS_MOVE_LEFT_TO
-#: Merge.rc:4507 Merge.rc:4539
+#: Merge.rc:4517 Merge.rc:4549
#, c-format
msgid "Left to... (%1)"
msgstr "Da Esquerda para... (%1)"
#. IDS_MOVE_MIDDLE_TO
-#: Merge.rc:4508 Merge.rc:4540
+#: Merge.rc:4518 Merge.rc:4550
#, c-format
msgid "Middle to... (%1)"
msgstr "Do Meio para... (%1)"
#. IDS_MOVE_RIGHT_TO
-#: Merge.rc:4509 Merge.rc:4541
+#: Merge.rc:4519 Merge.rc:4551
#, c-format
msgid "Right to... (%1)"
msgstr "Da Direita para... (%1)"
#. IDS_COPY_BOTH_TO
-#: Merge.rc:4510
+#: Merge.rc:4520
#, c-format
msgid "Both to... (%1)"
msgstr "De Ambos para... (%1)"
#. IDS_COPY_ALL_TO
-#: Merge.rc:4511
+#: Merge.rc:4521
#, c-format
msgid "All to... (%1)"
msgstr "De Todos para... (%1)"
#. IDS_COPY_DIFFERENCES_TO
-#: Merge.rc:4512
+#: Merge.rc:4522
#, c-format
msgid "Differences to... (%1)"
msgstr "Diferenças para... (%1)"
#. IDS_COPY_ONLYDIFFITEMS
-#: Merge.rc:4519
+#: Merge.rc:4529
msgid "Some selected items are identical or skipped.\nCopy only items with differences?"
msgstr "Alguns itens selecionados são idênticos ou foram pulados.\nCopiar apenas os itens com diferenças?"
#. IDS_DEL_LEFT_FMT
-#: Merge.rc:4525
+#: Merge.rc:4535
#, c-format
msgid "Left (%1)"
msgstr "Esquerda (%1)"
#. IDS_DEL_MIDDLE_FMT
-#: Merge.rc:4526
+#: Merge.rc:4536
#, c-format
msgid "Middle (%1)"
msgstr "Meio (%1)"
#. IDS_DEL_RIGHT_FMT
-#: Merge.rc:4527
+#: Merge.rc:4537
#, c-format
msgid "Right (%1)"
msgstr "Direita (%1)"
#. IDS_DEL_BOTH_FMT
-#: Merge.rc:4528
+#: Merge.rc:4538
#, c-format
msgid "Both (%1)"
msgstr "Ambos(as) (%1)"
#. IDS_DEL_ALL_FMT
-#: Merge.rc:4529
+#: Merge.rc:4539
#, c-format
msgid "All (%1)"
msgstr "Tudo (%1)"
#. IDS_SELECT_DEST_LEFT
-#: Merge.rc:4545
+#: Merge.rc:4555
msgid "Left Side - Select Destination Folder:"
msgstr "Lado Esquerdo - Selecionar Pasta de Destino:"
#. IDS_SELECT_DEST_MIDDLE
-#: Merge.rc:4546
+#: Merge.rc:4556
msgid "Middle Side - Select Destination Folder:"
msgstr "Lado do Meio - Selecionar Pasta de Destino:"
#. IDS_SELECT_DEST_RIGHT
-#: Merge.rc:4547
+#: Merge.rc:4557
msgid "Right Side - Select Destination Folder:"
msgstr "Lado Direito - Selecionar Pasta de Destino:"
#. IDS_FILES_AFFECTED_FMT
-#: Merge.rc:4548
+#: Merge.rc:4558
#, c-format
msgid "(%1 Files Affected)"
msgstr "(%1 Arquivos Afetados)"
#. IDS_FILES_AFFECTED_FMT2
-#: Merge.rc:4549
+#: Merge.rc:4559
#, c-format
msgid "(%1 of %2 Files Affected)"
msgstr "(%1 de %2 Arquivos Afetados)"
#. IDS_CONFIRM_DELETE_SINGLE
-#: Merge.rc:4555
+#: Merge.rc:4565
#, c-format
msgid "Are you sure you want to delete\n\n%1 ?"
msgstr "Tem certeza de que quer excluir \n\n%1 ?"
#. IDS_CONFIRM_SINGLE_COPY
-#: Merge.rc:4556
+#: Merge.rc:4566
msgid "Are you sure you want to copy?"
msgstr "Tem certeza de que quer copiar?"
#. IDS_CONFIRM_MULTIPLE_COPY
-#: Merge.rc:4557
+#: Merge.rc:4567
#, c-format
msgid "Are you sure you want to copy %d items?"
msgstr "Tem certeza de que quer copiar %d itens?"
#. IDS_DIRCMP_NOTSYNC
-#: Merge.rc:4558
+#: Merge.rc:4568
#, c-format
msgid "Operation aborted!\n\nFolder contents changed, path\n%1\nnot found.\n\nRefresh the compare."
msgstr "Operação abortada!\n\nConteúdo da pasta alterado, caminho\n%1\nnão encontrado.\n\nRenove a comparação."
#. IDS_CONFIRM_SINGLE_MOVE
-#: Merge.rc:4563
+#: Merge.rc:4573
msgid "Are you sure you want to move?"
msgstr "Tem certeza de que quer mover?"
#. IDS_CONFIRM_MULTIPLE_MOVE
-#: Merge.rc:4564
+#: Merge.rc:4574
#, c-format
msgid "Are you sure you want to move %d items?"
msgstr "Tem certeza de que quer mover %d itens?"
#. IDS_CONFIRM_MOVE_CAPTION
-#: Merge.rc:4566
+#: Merge.rc:4576
msgid "Confirm Move"
msgstr "Confirmar o Movimento"
-#: Merge.rc:4568
+#: Merge.rc:4578
msgid "Close the folder comparison window?"
msgstr "Fechar a janela de comparação de pastas?"
-#: Merge.rc:4570
+#: Merge.rc:4580
msgid "Close the folder comparison window, which took a long time?"
msgstr "Fechar a janela de comparação de pastas, que demandou um longo tempo?"
#. IDS_ERROR_INVALID_DIR_FILE_NAME
-#: Merge.rc:4571
+#: Merge.rc:4581
msgid "The file or folder name is invalid."
msgstr "O nome do arquivo ou da pasta é inválido."
#. IDS_ERROR_EXECUTE_FILE
-#: Merge.rc:4577
+#: Merge.rc:4587
#, c-format
msgid "Failed to execute external editor: %1"
msgstr "Falha ao executar o editor externo: %1"
#. IDS_UNKNOWN_ARCHIVE_FORMAT
-#: Merge.rc:4583
+#: Merge.rc:4593
msgid "Unknown archive format"
msgstr "Formato de arquivo compactado desconhecido"
-#: Merge.rc:4585
+#: Merge.rc:4595
msgid "Failed to extract archive.\nCompare as text file?"
msgstr "Falha ao extrair arquivo compactado.\nComparar como arquivo de texto?"
#. IDS_COLHDR_FILENAME
-#: Merge.rc:4591
+#: Merge.rc:4601
msgid "Filename"
msgstr "Nome de arquivo"
#. IDS_COLHDR_DIR
-#: Merge.rc:4592
+#: Merge.rc:4602
msgctxt "DirView|ColumnHeader"
msgid "Folder"
msgstr "Pasta"
#. IDS_COLHDR_RESULT
-#: Merge.rc:4593
+#: Merge.rc:4603
msgid "Comparison Result"
msgstr "Resultado da Comparação"
#. IDS_COLHDR_LTIMEM
-#: Merge.rc:4594
+#: Merge.rc:4604
msgid "Left Date"
msgstr "Data da Esquerda"
#. IDS_COLHDR_RTIMEM
-#: Merge.rc:4595
+#: Merge.rc:4605
msgid "Right Date"
msgstr "Data da Direita"
#. IDS_COLHDR_MTIMEM
-#: Merge.rc:4596
+#: Merge.rc:4606
msgid "Middle Date"
msgstr "Data do Meio"
#. IDS_COLHDR_LSIZE
-#: Merge.rc:4598
+#: Merge.rc:4608
msgid "Left Size"
msgstr "Tamanho da Esquerda"
#. IDS_COLHDR_RSIZE
-#: Merge.rc:4599
+#: Merge.rc:4609
msgid "Right Size"
msgstr "Tamanho da Direita"
#. IDS_COLHDR_MSIZE
-#: Merge.rc:4604
+#: Merge.rc:4614
msgid "Middle Size"
msgstr "Tamanho do Meio"
#. IDS_COLHDR_RSIZE_SHORT
-#: Merge.rc:4605
+#: Merge.rc:4615
msgid "Right Size (Short)"
msgstr "Tamanho da Direita (Curto)"
#. IDS_COLHDR_LSIZE_SHORT
-#: Merge.rc:4606
+#: Merge.rc:4616
msgid "Left Size (Short)"
msgstr "Tamanho da Esquerda (Curto)"
#. IDS_COLHDR_MSIZE_SHORT
-#: Merge.rc:4607
+#: Merge.rc:4617
msgid "Middle Size (Short)"
msgstr "Tamanho do Meio (Curto)"
#. IDS_COLHDR_LTIMEC
-#: Merge.rc:4613
+#: Merge.rc:4623
msgid "Left Creation Time"
msgstr "Hora de Criação da Esquerda"
#. IDS_COLHDR_RTIMEC
-#: Merge.rc:4614
+#: Merge.rc:4624
msgid "Right Creation Time"
msgstr "Hora de Criação da Direita"
#. IDS_COLHDR_MTIMEC
-#: Merge.rc:4615
+#: Merge.rc:4625
msgid "Middle Creation Time"
msgstr "Hora de Criação do Meio"
#. IDS_COLHDR_NEWER
-#: Merge.rc:4616
+#: Merge.rc:4626
msgid "Newer File"
msgstr "Arquivo Mais Novo"
#. IDS_COLHDR_LVERSION
-#: Merge.rc:4617
+#: Merge.rc:4627
msgid "Left File Version"
msgstr "Versão do Arquivo da Esquerda"
#. IDS_COLHDR_RVERSION
-#: Merge.rc:4618
+#: Merge.rc:4628
msgid "Right File Version"
msgstr "Versão do Arquivo da Direita"
#. IDS_COLHDR_MVERSION
-#: Merge.rc:4619
+#: Merge.rc:4629
msgid "Middle File Version"
msgstr "Versão do Arquivo do Meio"
#. IDS_COLHDR_RESULT_ABBR
-#: Merge.rc:4620
+#: Merge.rc:4630
msgid "Short Result"
msgstr "Resultado Curto"
#. IDS_COLHDR_LATTRIBUTES
-#: Merge.rc:4621
+#: Merge.rc:4631
msgid "Left Attributes"
msgstr "Atributos da Esquerda"
#. IDS_COLHDR_RATTRIBUTES
-#: Merge.rc:4622
+#: Merge.rc:4632
msgid "Right Attributes"
msgstr "Atributos da Direita"
#. IDS_COLHDR_MATTRIBUTES
-#: Merge.rc:4623
+#: Merge.rc:4633
msgid "Middle Attributes"
msgstr "Atributos do Meio"
#. IDS_COLHDR_LEOL_TYPE
-#: Merge.rc:4628
+#: Merge.rc:4638
msgid "Left EOL"
msgstr "EOL da Esquerda"
#. IDS_COLHDR_MEOL_TYPE
-#: Merge.rc:4629
+#: Merge.rc:4639
msgid "Middle EOL"
msgstr "EOL do Meio"
#. IDS_COLHDR_REOL_TYPE
-#: Merge.rc:4630
+#: Merge.rc:4640
msgid "Right EOL"
msgstr "EOL da Direita"
#. IDS_COLHDR_LENCODING
-#: Merge.rc:4636
+#: Merge.rc:4646
msgid "Left Encoding"
msgstr "Codificação da Esquerda"
#. IDS_COLHDR_RENCODING
-#: Merge.rc:4637
+#: Merge.rc:4647
msgid "Right Encoding"
msgstr "Codificação da Direita"
#. IDS_COLHDR_MENCODING
-#: Merge.rc:4638
+#: Merge.rc:4648
msgid "Middle Encoding"
msgstr "Codificação do Meio"
#. IDS_COLHDR_NIDIFFS
-#: Merge.rc:4639
+#: Merge.rc:4649
msgid "Ignored Diff"
msgstr "Diferença Ignorada"
#. IDS_COLHDR_BINARY
-#: Merge.rc:4641
+#: Merge.rc:4651
msgctxt "DirView|ColumnHeader"
msgid "Binary"
msgstr "Binário"
#. IDS_PLUGINS_TYPE_UNPACKER
-#: Merge.rc:4642 Merge.rc:4959
+#: Merge.rc:4652 Merge.rc:4969
msgid "Unpacker"
msgstr "Descompactador"
#. IDS_PLUGIN_TYPE4
-#: Merge.rc:4643 Merge.rc:4960 Merge.rc:5267
+#: Merge.rc:4653 Merge.rc:4970 Merge.rc:5277
msgid "Prediffer"
msgstr "Pré-Diferenciação"
#. IDS_COLHDR_LEFT
-#: Merge.rc:4644
+#: Merge.rc:4654
msgid "Left"
msgstr "Esquerda"
#. IDS_COLHDR_MIDDLE
-#: Merge.rc:4645
+#: Merge.rc:4655
msgid "Middle"
msgstr "Meio"
#. IDS_COLHDR_RIGHT
-#: Merge.rc:4646
+#: Merge.rc:4656
msgid "Right"
msgstr "Direita"
#. IDS_COLHDR_DIFF
-#: Merge.rc:4647
+#: Merge.rc:4657
msgid "Diff"
msgstr "Diferenciação"
#. IDS_COLHDR_LEFT_DUPLICATE
-#: Merge.rc:4648
+#: Merge.rc:4658
msgid "Left Duplicate Count"
msgstr "Contagem de Duplicados à Esquerda"
#. IDS_COLHDR_RIGHT_DUPLICATE
-#: Merge.rc:4649
+#: Merge.rc:4659
msgid "Right Duplicate Count"
msgstr "Contagem de Duplicados à Direita"
#. IDS_COLHDR_MIDDLE_DUPLICATE
-#: Merge.rc:4650
+#: Merge.rc:4660
msgid "Middle Duplicate Count"
msgstr "Contagem de Duplicados no Meio"
#. IDS_COLHDR_MOVE
-#: Merge.rc:4651
+#: Merge.rc:4661
msgid "Move"
msgstr "Movimento"
#. IDS_PRPCAT_AUDIO
-#: Merge.rc:4658
+#: Merge.rc:4668
msgid "Audio"
msgstr "Áudio"
#. IDS_PRPCAT_CALENDAR
-#: Merge.rc:4659
+#: Merge.rc:4669
msgid "Calendar"
msgstr "Calendário"
#. IDS_PRPCAT_COMMUNICATION
-#: Merge.rc:4660
+#: Merge.rc:4670
msgid "Communication"
msgstr "Comunicação"
#. IDS_PRPCAT_CONTACT
-#: Merge.rc:4661
+#: Merge.rc:4671
msgid "Contact"
msgstr "Contato"
#. IDS_PRPCAT_DEVICES
-#: Merge.rc:4662
+#: Merge.rc:4672
msgid "Devices"
msgstr "Dispositivos"
#. IDS_PRPCAT_DOCUMENT
-#: Merge.rc:4663
+#: Merge.rc:4673
msgid "Document"
msgstr "Documento"
#. IDS_PRPCAT_HOME
-#: Merge.rc:4664
+#: Merge.rc:4674
msgid "Home"
msgstr "Página inicial"
#. IDS_PRPCAT_JOURNAL
-#: Merge.rc:4666
+#: Merge.rc:4676
msgid "Journal"
msgstr "Diário"
#. IDS_PRPCAT_LINK
-#: Merge.rc:4667
+#: Merge.rc:4677
msgid "Link"
msgstr "Link"
#. IDS_PRPCAT_MEDIA
-#: Merge.rc:4668
+#: Merge.rc:4678
msgid "Media"
msgstr "Mídia"
#. IDS_PRPCAT_MUSIC
-#: Merge.rc:4670
+#: Merge.rc:4680
msgid "Music"
msgstr "Música"
#. IDS_PRPCAT_NOTE
-#: Merge.rc:4671
+#: Merge.rc:4681
msgid "Note"
msgstr "Nota"
#. IDS_PRPCAT_PHOTO
-#: Merge.rc:4672
+#: Merge.rc:4682
msgid "Photo"
msgstr "Foto"
#. IDS_PRPCAT_RECORDEDTV
-#: Merge.rc:4673
+#: Merge.rc:4683
msgid "RecordedTV"
msgstr "TV Gravada"
#. IDS_PRPCAT_SEARCH
-#: Merge.rc:4674
+#: Merge.rc:4684
msgid "Search"
msgstr "Busca"
#. IDS_PRPCAT_SECURITY
-#: Merge.rc:4675
+#: Merge.rc:4685
msgid "Security"
msgstr "Segurança"
#. IDS_PRPCAT_SOFTWARE
-#: Merge.rc:4676
+#: Merge.rc:4686
msgid "Software"
msgstr "Software"
#. IDS_PRPCAT_TASK
-#: Merge.rc:4677
+#: Merge.rc:4687
msgid "Task"
msgstr "Tarefa"
#. IDS_PRPCAT_VIDEO
-#: Merge.rc:4678
+#: Merge.rc:4688
msgid "Video"
msgstr "Vídeo"
#. IDS_PRPCAT_HASH
-#: Merge.rc:4679
+#: Merge.rc:4689
msgid "Hash"
msgstr "Hash"
#. IDS_CANT_COMPARE_FILES
-#: Merge.rc:4685
+#: Merge.rc:4695
msgid "Unable to compare files"
msgstr "Incapaz de comparar os arquivos"
#. IDS_ABORTED_ITEM
-#: Merge.rc:4686
+#: Merge.rc:4696
msgid "Item aborted"
msgstr "Item abortado"
#. IDS_FILE_SKIPPED
-#: Merge.rc:4687
+#: Merge.rc:4697
msgid "File skipped"
msgstr "Arquivo pulado"
#. IDS_DIR_SKIPPED
-#: Merge.rc:4688
+#: Merge.rc:4698
msgid "Folder skipped"
msgstr "Pasta pulada"
#. IDS_LEFT_ONLY_IN_FMT
-#: Merge.rc:4689
+#: Merge.rc:4699
#, c-format
msgid "Left only: %1"
msgstr "Só à esquerda: %1"
#. IDS_MIDDLE_ONLY_IN_FMT
-#: Merge.rc:4690
+#: Merge.rc:4700
#, c-format
msgid "Middle only: %1"
msgstr "Só no meio: %1"
#. IDS_RIGHT_ONLY_IN_FMT
-#: Merge.rc:4691
+#: Merge.rc:4701
#, c-format
msgid "Right only: %1"
msgstr "Só à direita: %1"
#. IDS_DOES_NOT_EXIST_IN_FMT
-#: Merge.rc:4692
+#: Merge.rc:4702
#, c-format
msgid "Does not exist in %1"
msgstr "Não existe em %1"
#. IDS_BIN_FILES_SAME
-#: Merge.rc:4693
+#: Merge.rc:4703
msgid "Binary files are identical"
msgstr "Os arquivos binários são idênticos"
#. IDS_BIN_FILES_DIFF
-#: Merge.rc:4699
+#: Merge.rc:4709
msgid "Binary files are different"
msgstr "Os arquivos binários são diferentes"
#. IDS_FILES_ARE_DIFFERENT
-#: Merge.rc:4700
+#: Merge.rc:4710
msgid "Files are different"
msgstr "Os arquivos são diferentes"
#. IDS_FOLDERS_ARE_DIFFERENT
-#: Merge.rc:4701
+#: Merge.rc:4711
msgid "Folders are different"
msgstr "As pastas são diferentes"
#. IDS_LEFTONLY
-#: Merge.rc:4702
+#: Merge.rc:4712
msgid "Left Only"
msgstr "Somente à Esquerda"
#. IDS_RIGHTONLY
-#: Merge.rc:4703
+#: Merge.rc:4713
msgid "Right Only"
msgstr "Somente à Direita"
#. IDS_MIDDLEONLY
-#: Merge.rc:4704
+#: Merge.rc:4714
msgid "Middle Only"
msgstr "Somente no Meio"
#. IDS_NOITEMLEFT
-#: Merge.rc:4705
+#: Merge.rc:4715
msgid "No item in left"
msgstr "Nenhum item na esquerda"
#. IDS_NOITEMRIGHT
-#: Merge.rc:4706
+#: Merge.rc:4716
msgid "No item in right"
msgstr "Nenhum item na direita"
#. IDS_NOITEMMIDDLE
-#: Merge.rc:4707
+#: Merge.rc:4717
msgid "No item in middle"
msgstr "Nenhum item no meio"
#. IDS_CMPRES_ERROR
-#: Merge.rc:4709
+#: Merge.rc:4719
msgid "Error"
msgstr "Erro"
#. IDS_TEXT_FILES_SAME
-#: Merge.rc:4710
+#: Merge.rc:4720
msgid "Text files are identical"
msgstr "Os arquivos de texto são idênticos"
#. IDS_LEFTONLY_DIFF
-#: Merge.rc:4711
+#: Merge.rc:4721
msgid " (Middle and right are identical)"
msgstr " (O do meio e o da direita são idênticos)"
#. IDS_MIDDLEONLY_DIFF
-#: Merge.rc:4712
+#: Merge.rc:4722
msgid " (Left and right are identical)"
msgstr " (O da esquerda e o da direita são idênticos)"
#. IDS_RIGHTONLY_DIFF
-#: Merge.rc:4713
+#: Merge.rc:4723
msgid " (Left and middle are identical)"
msgstr " (O da esquerda e o do meio são idênticos)"
#. IDS_PATH_MISMATCH
-#: Merge.rc:4714
+#: Merge.rc:4724
msgid " (paths differ)"
msgstr " (diferenças nos caminhos)"
#. IDS_TEXT_FILES_DIFF
-#: Merge.rc:4715
+#: Merge.rc:4725
msgid "Text files are different"
msgstr "Os arquivos de texto são diferentes"
#. IDS_IMAGE_FILES_SAME
-#: Merge.rc:4716
+#: Merge.rc:4726
msgid "Image files are identical"
msgstr "Os arquivos de imagem são idênticos"
#. IDS_IMAGE_FILES_DIFF
-#: Merge.rc:4717
+#: Merge.rc:4727
msgid "Image files are different"
msgstr "Os arquivos de imagem são diferentes"
#. IDS_EXPR_DIFF
-#: Merge.rc:4718
+#: Merge.rc:4728
#, c-format
msgid "Files are different (expr: %1)"
msgstr "Os arquivos são diferentes (expr: %1)"
#. IDS_HASH_GROUP
-#: Merge.rc:4719
+#: Merge.rc:4729
#, c-format
msgid "Group%d"
msgstr "Grupo%d"
#. IDS_RENAME_MOVE_DETECTION_DISALBED
-#: Merge.rc:4720
+#: Merge.rc:4730
msgctxt "Options dialog|Compare|Folder|Detect renames and moves"
msgid "Disabled"
msgstr "Desabilitada"
#. IDS_RENAME_MOVE_DETECTION_RENAME
-#: Merge.rc:4721
+#: Merge.rc:4731
msgid "Detect renames"
msgstr "Detectar renomeações"
#. IDS_RENAME_MOVE_DETECTION_RENAME_MOVE
-#: Merge.rc:4722
+#: Merge.rc:4732
msgid "Detect renames and moves"
msgstr "Detectar renomeações e movimentações"
#. IDS_RENAME_MOVE_MERGE_MODE_RENAME
-#: Merge.rc:4723
+#: Merge.rc:4733
msgid "Merge renames"
msgstr "Unir renomeados"
#. IDS_RENAME_MOVE_MERGE_MODE_RENAME_MOVE
-#: Merge.rc:4724
+#: Merge.rc:4734
msgid "Merge renames and moves"
msgstr "Unir renomeados e movidos"
#. IDS_RENAMED
-#: Merge.rc:4725
+#: Merge.rc:4735
msgid "Renamed"
msgstr "Renomeados"
#. IDS_MOVED
-#: Merge.rc:4726
+#: Merge.rc:4736
msgid "Moved"
msgstr "Movidos"
#. IDS_RENAMED_MOVED
-#: Merge.rc:4727
+#: Merge.rc:4737
msgid "Renamed/Moved"
msgstr "Renomeados/Movidos"
#. IDS_RENAMED_MOVED_ITEMS
-#: Merge.rc:4728
+#: Merge.rc:4738
#, c-format
msgid "(%1 items)"
msgstr "(%1 itens)"
#. IDS_RENAMED_MOVED_RESULT
-#: Merge.rc:4729
+#: Merge.rc:4739
#, c-format
msgid "%1 (set %2): "
msgstr "%1 (conjunto %2): "
#. IDS_SWITCH_FLAT_MODE
-#: Merge.rc:4730
+#: Merge.rc:4740
msgid "Some moved items have been merged.\nIn Tree Mode, these items may appear in positions that do not reflect the actual folder structure, which can be confusing.\nSwitch to Flat Mode?"
msgstr "Alguns itens movidos foram unidos.\nNo Modo Árvore, estes itens podem aparecer em posições que não refletem a estrutura real da pasta, o que pode ser confuso.\nAlternar para Modo Normal?"
#. IDS_ELAPSED_TIME
-#: Merge.rc:4736
+#: Merge.rc:4746
#, c-format
msgid "Elapsed time: %ld ms"
msgstr "Tempo decorrido: %ld ms"
#. IDS_STATUS_SELITEM1
-#: Merge.rc:4737
+#: Merge.rc:4747
msgid "1 item selected"
msgstr "1 item selecionado"
#. IDS_STATUS_SELITEMS
-#: Merge.rc:4738
+#: Merge.rc:4748
#, c-format
msgid "%1 items selected"
msgstr "%1 itens selecionados"
#. IDS_COLDESC_FILENAME
-#: Merge.rc:4744
+#: Merge.rc:4754
msgid "Filename or folder name."
msgstr "Nome do arquivo ou nome da pasta."
#. IDS_COLDESC_DIR
-#: Merge.rc:4745
+#: Merge.rc:4755
msgid "Subfolder name when subfolders are included."
msgstr "Nome da subpasta quando as subpastas são incluídas."
#. IDS_COLDESC_RESULT
-#: Merge.rc:4746
+#: Merge.rc:4756
msgid "Comparison result, long form."
msgstr "Resultado da comparação, formulário longo."
#. IDS_COLDESC_LTIMEM
-#: Merge.rc:4751
+#: Merge.rc:4761
msgid "Left side modification date."
msgstr "Data de modificação do lado esquerdo."
#. IDS_COLDESC_RTIMEM
-#: Merge.rc:4752
+#: Merge.rc:4762
msgid "Right side modification date."
msgstr "Data de modificação do lado direito."
#. IDS_COLDESC_MTIMEM
-#: Merge.rc:4753
+#: Merge.rc:4763
msgid "Middle side modification date."
msgstr "Data de modificação do lado do meio."
#. IDS_COLDESC_EXTENSION
-#: Merge.rc:4754
+#: Merge.rc:4764
msgid "File's extension."
msgstr "Extensão do arquivo."
#. IDS_COLDESC_LSIZE
-#: Merge.rc:4755
+#: Merge.rc:4765
msgid "Left file size in bytes."
msgstr "Tamanho do arquivo à esquerda em bytes."
#. IDS_COLDESC_RSIZE
-#: Merge.rc:4756
+#: Merge.rc:4766
msgid "Right file size in bytes."
msgstr "Tamanho do arquivo à direita em bytes."
#. IDS_COLDESC_MSIZE
-#: Merge.rc:4757
+#: Merge.rc:4767
msgid "Middle file size in bytes."
msgstr "Tamanho do arquivo do meio em bytes."
#. IDS_COLDESC_LSIZE_SHORT
-#: Merge.rc:4758
+#: Merge.rc:4768
msgid "Left file size abbreviated."
msgstr "Tamanho do arquivo à esquerda abreviado."
#. IDS_COLDESC_RSIZE_SHORT
-#: Merge.rc:4759
+#: Merge.rc:4769
msgid "Right file size abbreviated."
msgstr "Tamanho do arquivo à direita abreviado."
#. IDS_COLDESC_MSIZE_SHORT
-#: Merge.rc:4760
+#: Merge.rc:4770
msgid "Middle file size abbreviated."
msgstr "Tamanho do arquivo do meio abreviado."
#. IDS_COLDESC_LTIMEC
-#: Merge.rc:4766
+#: Merge.rc:4776
msgid "Left side creation time."
msgstr "Hora de criação do lado esquerdo."
#. IDS_COLDESC_RTIMEC
-#: Merge.rc:4767
+#: Merge.rc:4777
msgid "Right side creation time."
msgstr "Hora de criação do lado direito."
#. IDS_COLDESC_MTIMEC
-#: Merge.rc:4768
+#: Merge.rc:4778
msgid "Middle side creation time."
msgstr "Hora de criação do lado do meio."
#. IDS_COLDESC_NEWER
-#: Merge.rc:4769
+#: Merge.rc:4779
msgid "Tells which side has newer modification date."
msgstr "Diz qual lado tem a data de modificação mais nova."
#. IDS_COLDESC_LVERSION
-#: Merge.rc:4770
+#: Merge.rc:4780
msgid "Left side file version, only for some file types."
msgstr "Versão do arquivo do lado esquerdo, só para alguns tipos de arquivo."
#. IDS_COLDESC_RVERSION
-#: Merge.rc:4771
+#: Merge.rc:4781
msgid "Right side file version, only for some file types."
msgstr "Versão do arquivo do lado direito, só para alguns tipos de arquivo."
#. IDS_COLDESC_MVERSION
-#: Merge.rc:4776
+#: Merge.rc:4786
msgid "Middle side file version, only for some file types."
msgstr "Versão do arquivo do lado do meio, só para alguns tipos de arquivo."
#. IDS_COLDESC_RESULT_ABBR
-#: Merge.rc:4777
+#: Merge.rc:4787
msgid "Short comparison result."
msgstr "Resultado curto da comparação."
#. IDS_COLDESC_LATTRIBUTES
-#: Merge.rc:4778
+#: Merge.rc:4788
msgid "Left side attributes."
msgstr "Atributos do lado esquerdo."
#. IDS_COLDESC_RATTRIBUTES
-#: Merge.rc:4779
+#: Merge.rc:4789
msgid "Right side attributes."
msgstr "Atributos do lado direito."
#. IDS_COLDESC_MATTRIBUTES
-#: Merge.rc:4780
+#: Merge.rc:4790
msgid "Middle side attributes."
msgstr "Atributos do lado do meio."
#. IDS_COLDESC_LEOL_TYPE
-#: Merge.rc:4781
+#: Merge.rc:4791
msgid "Left side file EOL type."
msgstr "Tipo de EOL do arquivo do lado esquerdo."
#. IDS_COLDESC_REOL_TYPE
-#: Merge.rc:4782
+#: Merge.rc:4792
msgid "Right side file EOL type."
msgstr "Tipo de EOL do arquivo do lado direito."
#. IDS_COLDESC_MEOL_TYPE
-#: Merge.rc:4783
+#: Merge.rc:4793
msgid "Middle side file EOL type."
msgstr "Tipo de EOL do arquivo do lado do meio."
#. IDS_COLDESC_LENCODING
-#: Merge.rc:4789
+#: Merge.rc:4799
msgid "Left side encoding."
msgstr "Codificação do lado esquerdo."
#. IDS_COLDESC_RENCODING
-#: Merge.rc:4790
+#: Merge.rc:4800
msgid "Right side encoding."
msgstr "Codificação do lado direito."
#. IDS_COLDESC_MENCODING
-#: Merge.rc:4791
+#: Merge.rc:4801
msgid "Middle side encoding."
msgstr "Codificação do lado do meio."
#. IDS_COLDESC_NIDIFFS
-#: Merge.rc:4792
+#: Merge.rc:4802
msgid "Number of ignored differences in file. Ignored and cannot be merged."
msgstr "Número de diferenças ignoradas no arquivo. Ignoradas e não podem ser unidas."
#. IDS_COLDESC_NSDIFFS
-#: Merge.rc:4793
+#: Merge.rc:4803
msgid "Number of differences in file (excluding ignored)."
msgstr "Número de diferenças no arquivo (excluindo as ignoradas)."
#. IDS_COLDESC_BINARY
-#: Merge.rc:4794
+#: Merge.rc:4804
msgid "Shows an asterisk (*) if the file is binary."
msgstr "Mostrar um asterisco (*) se o arquivo é binário."
#. IDS_COLDESC_UNPACKER
-#: Merge.rc:4795
+#: Merge.rc:4805
msgid "Unpacker plugin name or pipeline."
msgstr "Nome ou pipeline do plugin de descompactador."
#. IDS_COLDESC_PREDIFFER
-#: Merge.rc:4796
+#: Merge.rc:4806
msgid "Prediffer plugin name or pipeline."
msgstr "Nome ou pipeline do plugin de pré-diferenciação."
#. IDS_DIRECTORY_REPORT_TITLE
-#: Merge.rc:4802
+#: Merge.rc:4812
#, c-format
msgid "Compare %1 with %2"
msgstr "Comparar %1 com %2"
#. IDS_DIRECTORY_REPORT_TITLE3
-#: Merge.rc:4803
+#: Merge.rc:4813
#, c-format
msgid "Compare %1 with %2 and %3"
msgstr "Comparar %1 com %2 e %3"
#. IDS_REPORT_COMMALIST
-#: Merge.rc:4804
+#: Merge.rc:4814
msgid "Comma-separated list"
msgstr "Lista separada por vírgulas"
#. IDS_REPORT_TABLIST
-#: Merge.rc:4805
+#: Merge.rc:4815
msgid "Tab-separated list"
msgstr "Lista separada por tabulações"
#. IDS_REPORT_SIMPLEHTML
-#: Merge.rc:4806
+#: Merge.rc:4816
msgid "Simple HTML"
msgstr "HTML Simples"
#. IDS_REPORT_SIMPLEXML
-#: Merge.rc:4807
+#: Merge.rc:4817
msgid "Simple XML"
msgstr "XML Simples"
-#: Merge.rc:4809
+#: Merge.rc:4819
msgid "Report file already exists. Overwrite?"
msgstr "O arquivo de relatório já existe. Sobrescrever?"
#. IDS_REPORT_ERROR
-#: Merge.rc:4814
+#: Merge.rc:4824
#, c-format
msgid "Error creating the report:\n%1"
msgstr "Erro ao criar o relatório:\n%1"
#. IDS_REPORT_SUCCESS
-#: Merge.rc:4815
+#: Merge.rc:4825
msgid "Report created successfully."
msgstr "Relatório criado com sucesso."
#. IDS_SYNCPOINT_LASTBLOCK
-#: Merge.rc:4821
+#: Merge.rc:4831
msgid "Cannot add a synchronization point at this line."
msgstr "Não é possível adicionar um ponto de sincronização nesta linha."
#. IDS_FILE_TO_ITSELF
-#: Merge.rc:4827
+#: Merge.rc:4837
msgid "Same file is opened in both panes."
msgstr "O mesmo arquivo está aberto em ambos os painéis."
#. IDS_FILESSAME
-#: Merge.rc:4828
+#: Merge.rc:4838
msgid "Selected files are identical."
msgstr "Os arquivos selecionados são idênticos."
#. IDS_FILESSAME_CURCFG
-#: Merge.rc:4829
+#: Merge.rc:4839
msgid "Selected files are identical (with current settings).\r\nChecking binary identity..."
msgstr "Os arquivos selecionados são idênticos (com as configurações atuais).\r\nChecando identidade binária..."
#. IDS_FILESSAME_BINERROR
-#: Merge.rc:4830
+#: Merge.rc:4840
msgid "Selected files are identical (with current settings).\r\nBut binary comparison failed."
msgstr "Os arquivos selecionados são idênticos (com as configurações atuais).\r\nMas a comparação binária falhou."
#. IDS_FILESSAME_BINSAME
-#: Merge.rc:4831
+#: Merge.rc:4841
msgid "Selected files are identical (binary match)."
msgstr "Os arquivos selecionados são idênticos (correspondência binária)."
#. IDS_FILESSAME_BINDIFF
-#: Merge.rc:4832
+#: Merge.rc:4842
msgid "Selected files are identical (with current settings).\r\nBut differ at the binary level."
msgstr "Os arquivos selecionados são idênticos (com as configurações atuais).\r\nMas diferem no nível binário."
#. IDS_FILEERROR
-#: Merge.rc:4833
+#: Merge.rc:4843
msgid "An error occurred while comparing files."
msgstr "Ocorreu um erro ao comparar os arquivos."
#. IDS_TEMP_FILEERROR
-#: Merge.rc:4834
+#: Merge.rc:4844
msgid "Could not create temporary files. Check your temporary path settings."
msgstr "Não foi possível criar arquivos temporários. Verifique suas configurações do caminho de temporários."
#. IDS_SUGGEST_IGNOREEOL
-#: Merge.rc:4835
+#: Merge.rc:4845
msgid "Files use different EOL.\n\nTreat all EOL as equivalent?\n\nSet 'Ignore EOL differences (Windows/Unix/Mac)' in Compare section of Options."
msgstr "Os arquivos usam caracteres EOL diferentes.\n\nTratar todos os caracteres EOL como equivalentes?\n\nDefina 'Ignorar diferenças de caractere EOL (Windows/Unix/Mac)' na seção Comparar das Opções."
#. IDS_INVALID_DIRECTORY
-#: Merge.rc:4836
+#: Merge.rc:4846
msgid "Selected folder is invalid."
msgstr "A pasta selecionada é inválida."
#. IDS_CANNOT_OPEN_BINARYFILE
-#: Merge.rc:4837
+#: Merge.rc:4847
msgid "Cannot open a binary file in Editor."
msgstr "Não é possível abrir um arquivo binário no Editor."
#. IDS_CREATE_PAIR_FOLDER
-#: Merge.rc:4838
+#: Merge.rc:4848
#, c-format
msgid "Create matching folder:\n%1\non the other side and open?"
msgstr "Criar pasta correspondente:\n%1\nno outro lado e abrir?"
#. IDS_CONFIRM_COPY_ALL_DIFFS
-#: Merge.rc:4839
+#: Merge.rc:4849
msgid "Copy all differences to other file?"
msgstr "Copiar todas as diferenças para o outro arquivo?"
#. IDS_MOVE_TO_NEXTFILE
-#: Merge.rc:4844
+#: Merge.rc:4854
msgid "Move to next file?"
msgstr "Mover para o próximo arquivo?"
#. IDS_MOVE_TO_PREVFILE
-#: Merge.rc:4845
+#: Merge.rc:4855
msgid "Move to previous file?"
msgstr "Mover para o arquivo anterior?"
#. IDS_MOVE_TO_NEXTPAGE
-#: Merge.rc:4846
+#: Merge.rc:4856
msgid "Move to next page?"
msgstr "Mover para a próxima página?"
#. IDS_MOVE_TO_PREVPAGE
-#: Merge.rc:4847
+#: Merge.rc:4857
msgid "Move to previous page?"
msgstr "Mover para a página anterior?"
#. IDS_MOVE_TO_FIRSTFILE
-#: Merge.rc:4848
+#: Merge.rc:4858
msgid "Move to first file?"
msgstr "Mover para o primeiro arquivo?"
#. IDS_MOVE_TO_LASTFILE
-#: Merge.rc:4849
+#: Merge.rc:4859
msgid "Move to last file?"
msgstr "Mover para o último arquivo?"
-#: Merge.rc:4856
+#: Merge.rc:4866
#, c-format
msgid "Different codepages: left (cp%d), right (cp%d).\nDisplay in codepage (better display) or default Windows codepage (safer merging)?\n(Recommended: default Windows codepage)"
msgstr "Páginas de código diferentes: esquerda (cp%d), direita (cp%d).\nExibir na página de código (melhor exibição) ou na página de código padrão do Windows (unificação mais segura)?\n(Recomendado: página de código padrão do Windows)"
-#: Merge.rc:4858
+#: Merge.rc:4868
msgid "Information lost due to encoding errors: both files"
msgstr "Informação perdida devido a erros de codificação: ambos os arquivos"
-#: Merge.rc:4860
+#: Merge.rc:4870
msgid "Information lost due to encoding errors: first file"
msgstr "Informação perdida devido a erros de codificação: primeiro arquivo"
-#: Merge.rc:4862
+#: Merge.rc:4872
msgid "Information lost due to encoding errors: second file"
msgstr "Informação perdida devido a erros de codificação: segundo arquivo"
-#: Merge.rc:4864
+#: Merge.rc:4874
msgid "Information lost due to encoding errors: third file"
msgstr "Informação perdida devido a erros de codificação: terceiro arquivo"
#. IDS_LINEDIFF_NODIFF
-#: Merge.rc:4870
+#: Merge.rc:4880
msgid "No difference"
msgstr "Sem diferença"
#. IDS_LINEDIFF_NODIFF_CAPTION
-#: Merge.rc:4871
+#: Merge.rc:4881
msgid "Line difference"
msgstr "Diferença da linha"
#. IDS_NUM_REPLACED
-#: Merge.rc:4877
+#: Merge.rc:4887
#, c-format
msgid "Replaced %1 string(s)."
msgstr "Substituiu %1 string(s)."
#. IDS_EDIT_TEXT_NOT_FOUND
-#: Merge.rc:4878
+#: Merge.rc:4888
#, c-format
msgid "Cannot find string \"%s\"."
msgstr "Não é possível encontrar a string “%s”."
#. IDS_MERGE_MODE
-#: Merge.rc:4884
+#: Merge.rc:4894
msgid "Entering Merge Mode. Press F9 to turn off."
msgstr "Entrando no Modo de União. Pressione F9 para desativar."
#. IDS_AUTO_MERGE
-#: Merge.rc:4890
+#: Merge.rc:4900
#, c-format
msgid "Automatic merges: %1\nUnresolved conflicts: %2"
msgstr "Uniões automáticas: %1\nConflitos não resolvidos: %2"
#. IDS_CODEPAGE_MERGED
-#: Merge.rc:4891
+#: Merge.rc:4901
msgid "Codepage change merged."
msgstr "Alteração de página de código unida."
#. IDS_CODEPAGE_CONFLICT
-#: Merge.rc:4892
+#: Merge.rc:4902
msgid "Codepage changes are conflicting."
msgstr "As alterações de página de código estão em conflito."
#. IDS_EOL_MERGED
-#: Merge.rc:4893
+#: Merge.rc:4903
msgid "EOL change merged."
msgstr "Alteração de caractere EOL unida."
#. IDS_EOL_CONFLICT
-#: Merge.rc:4894
+#: Merge.rc:4904
msgid "EOL changes are conflicting."
msgstr "As alterações de caractere EOL estão em conflito."
#. IDS_LOCBAR_CAPTION
-#: Merge.rc:4900
+#: Merge.rc:4910
msgid "Location Pane"
msgstr "Painel de Localização"
#. IDS_DIFFBAR_CAPTION
-#: Merge.rc:4901
+#: Merge.rc:4911
msgid "Diff Pane"
msgstr "Painel de Diferenciação"
#. IDS_DIFF_SUCCEEDED
-#: Merge.rc:4908
+#: Merge.rc:4918
msgid "Patch file written."
msgstr "Arquivo de patch gravado."
#. IDS_DIFF_ITEM1NOTFOUND
-#: Merge.rc:4909
+#: Merge.rc:4919
msgid "First item not found!"
msgstr "Primeiro item não encontrado!"
#. IDS_DIFF_ITEM2NOTFOUND
-#: Merge.rc:4910
+#: Merge.rc:4920
msgid "Second item not found!"
msgstr "Segundo item não encontrado!"
#. IDS_DIFF_FILEOVERWRITE
-#: Merge.rc:4911
+#: Merge.rc:4921
msgid "Patch file already exists. Overwrite?"
msgstr "O arquivo de patch já existe. Sobrescrever?"
#. IDS_DIFF_SELECTEDFILES
-#: Merge.rc:4912
+#: Merge.rc:4922
#, c-format
msgid "[%1 files selected]"
msgstr "[%1 arquivos selecionados]"
#. IDS_DIFF_NORMAL
-#: Merge.rc:4913
+#: Merge.rc:4923
msgid "Normal"
msgstr "Normal"
#. IDS_DIFF_CONTEXT
-#: Merge.rc:4914
+#: Merge.rc:4924
msgid "Context"
msgstr "Contexto"
#. IDS_DIFF_UNIFIED
-#: Merge.rc:4915
+#: Merge.rc:4925
msgid "Unified"
msgstr "Unificado"
#. IDS_FILEWRITE_ERROR
-#: Merge.rc:4917
+#: Merge.rc:4927
#, c-format
msgid "Could not write to file %1."
msgstr "Não foi possível gravar no arquivo %1."
#. IDS_PATH_NOT_ABSOLUTE
-#: Merge.rc:4918
+#: Merge.rc:4928
#, c-format
msgid "Output path is not absolute: %1"
msgstr "O caminho de saída não é absoluto: %1"
#. IDS_MUST_SPECIFY_OUTPUT
-#: Merge.rc:4919
+#: Merge.rc:4929
msgid "Specify an output file."
msgstr "Especifique um arquivo de saída."
-#: Merge.rc:4921
+#: Merge.rc:4931
msgid "Cannot create patch from binary files."
msgstr "Não é possível criar patch a partir de arquivos binários."
#. IDS_SAVEFILES_FORPATCH
-#: Merge.rc:4922
+#: Merge.rc:4932
msgid "Save all files first.\n\nCreating a patch requires no unsaved changes."
msgstr "Salve todos os arquivos primeiro.\n\nA criação de um patch requer que não haja alterações não salvas."
#. IDS_FOLDER_NOTEXIST
-#: Merge.rc:4923
+#: Merge.rc:4933
msgid "Folder does not exist."
msgstr "A pasta não existe."
#. IDS_NO_ZIP_SUPPORT
-#: Merge.rc:4928
+#: Merge.rc:4938
msgid "Archive support not enabled.\n7-Zip and/or Merge7z*.dll not found.\nSee manual for archive support."
msgstr "Suporte a arquivos compactados não habilitado.\n7-Zip e/ou Merge7z*.dll não encontrados.\nVeja o manual para suporte a arquivos compactados."
#. IDS_OPT_EXPORT_CAPTION
-#: Merge.rc:4929
+#: Merge.rc:4939
msgid "Select file for export"
msgstr "Selecione o arquivo para exportar"
#. IDS_OPT_IMPORT_CAPTION
-#: Merge.rc:4930
+#: Merge.rc:4940
msgid "Select file for import"
msgstr "Selecione o arquivo para importar"
#. IDS_OPT_IMPORT_DONE
-#: Merge.rc:4931
+#: Merge.rc:4941
msgid "Options imported from file."
msgstr "Opções importadas do arquivo."
#. IDS_OPT_EXPORT_DONE
-#: Merge.rc:4932
+#: Merge.rc:4942
msgid "Options exported to file."
msgstr "Opções exportadas para o arquivo."
#. IDS_OPT_IMPORT_ERR
-#: Merge.rc:4933
+#: Merge.rc:4943
msgid "Failed to import options from file."
msgstr "Falha na importação de opções do arquivo."
#. IDS_OPT_EXPORT_ERR
-#: Merge.rc:4934
+#: Merge.rc:4944
msgid "Failed to write options to file."
msgstr "Falha na gravação de opções em arquivo."
#. IDS_CLOSEALL_WINDOWS
-#: Merge.rc:4935
+#: Merge.rc:4945
msgid "Close multiple compare windows?\n\nContinue?"
msgstr "Fechar várias janelas de comparação?\n\nContinuar?"
#. IDS_EOL_MIXED
-#: Merge.rc:4944
+#: Merge.rc:4954
msgid "Mixed"
msgstr "Misturado"
#. IDS_EOL_BIN
-#: Merge.rc:4945
+#: Merge.rc:4955
msgctxt "EOL Type"
msgid "Binary"
msgstr "Binário"
#. IDS_EOL_NONE
-#: Merge.rc:4949
+#: Merge.rc:4959
msgid "None"
msgstr "Nenhum"
#. IDS_MARKER_COLOR_FMT
-#: Merge.rc:4950
+#: Merge.rc:4960
#, c-format
msgid "Marker Color %d"
msgstr "Cor do Marcador %d"
#. IDS_MARKER_NEW_PATTERN
-#: Merge.rc:4951
+#: Merge.rc:4961
msgid "New Pattern"
msgstr "Novo Padrão"
#. IDS_PLUGINSLIST_TYPE
-#: Merge.rc:4957
+#: Merge.rc:4967
msgid "Type"
msgstr "Tipo"
#. IDS_PLUGINS_TYPE_EDITSCRIPT
-#: Merge.rc:4961
+#: Merge.rc:4971
msgid "Editor script"
msgstr "Script do editor"
#. ID_SELECTLINEDIFF
-#: Merge.rc:4967
+#: Merge.rc:4977
msgid "\nDifference in Current Line (F4)"
msgstr "\nDiferença na Linha Atual (F4)"
#. ID_OPTIONS
-#: Merge.rc:4968
+#: Merge.rc:4978
msgid "\nOptions"
msgstr "\nOpções"
#. ID_REFRESH
-#: Merge.rc:4969
+#: Merge.rc:4979
msgid "\nRefresh (F5)"
msgstr "\nRenovar (F5)"
#. ID_PREVDIFF
-#: Merge.rc:4975
+#: Merge.rc:4985
msgid "\nPrevious Difference (Alt+Up)"
msgstr "\nDiferença Anterior (Alt+Pra Cima)"
#. ID_NEXTDIFF
-#: Merge.rc:4976
+#: Merge.rc:4986
msgid "\nNext Difference (Alt+Down)"
msgstr "\nDiferença Seguinte (Alt+Pra Baixo)"
#. ID_PREVCONFLICT
-#: Merge.rc:4977
+#: Merge.rc:4987
msgid "\nPrevious Conflict (Alt+Shift+Up)"
msgstr "\nConflito Anterior (Alt+Shift+Pra Cima)"
#. ID_NEXTCONFLICT
-#: Merge.rc:4978
+#: Merge.rc:4988
msgid "\nNext Conflict (Alt+Shift+Down)"
msgstr "\nConflito Seguinte (Alt+Shift+Pra Baixo)"
#. ID_FIRSTDIFF
-#: Merge.rc:4983
+#: Merge.rc:4993
msgid "\nFirst Difference (Alt+Home)"
msgstr "\nPrimeira Diferença (Alt+Home)"
#. ID_CURDIFF
-#: Merge.rc:4984
+#: Merge.rc:4994
msgid "\nCurrent Difference (Alt+Enter)"
msgstr "\nDiferença Atual (Alt+Enter)"
#. ID_LASTDIFF
-#: Merge.rc:4985
+#: Merge.rc:4995
msgid "\nLast Difference (Alt+End)"
msgstr "\nÚltima Diferença (Alt+End)"
#. ID_L2R
-#: Merge.rc:4986
+#: Merge.rc:4996
msgid "\nCopy to Right (Alt+Right)"
msgstr "\nCopiar para a Direita (Alt+Direita)"
#. ID_R2L
-#: Merge.rc:4987
+#: Merge.rc:4997
msgid "\nCopy to Left (Alt+Left)"
msgstr "\nCopiar para a Esquerda (Alt+Esquerda)"
#. ID_L2RNEXT
-#: Merge.rc:4988
+#: Merge.rc:4998
msgid "\nCopy to Right and Advance (Ctrl+Alt+Right)"
msgstr "\nCopiar para a Direita e Avançar (Ctrl+Alt+Direita)"
#. ID_R2LNEXT
-#: Merge.rc:4989
+#: Merge.rc:4999
msgid "\nCopy to Left and Advance (Ctrl+Alt+Left)"
msgstr "\nCopiar para a Esquerda e Avançar (Ctrl+Alt+Esquerda)"
#. ID_ALL_RIGHT
-#: Merge.rc:4990
+#: Merge.rc:5000
msgid "\nCopy All to Right"
msgstr "\nCopiar Tudo para a Direita"
#. ID_ALL_LEFT
-#: Merge.rc:4991
+#: Merge.rc:5001
msgid "\nCopy All to Left"
msgstr "\nCopiar Tudo para a Esquerda"
#. ID_AUTO_MERGE
-#: Merge.rc:4992
+#: Merge.rc:5002
msgid "\nAuto Merge (Ctrl+Alt+M)"
msgstr "\nUnião Automática (Ctrl+Alt+M)"
#. ID_FIRSTFILE
-#: Merge.rc:4993
+#: Merge.rc:5003
msgid "\nFirst File"
msgstr "\nPrimeiro Arquivo"
#. ID_NEXTFILE
-#: Merge.rc:4994
+#: Merge.rc:5004
msgid "\nNext File (Ctrl+F8)"
msgstr "\nPróximo Arquivo (Ctrl+F8)"
#. ID_LASTFILE
-#: Merge.rc:4995
+#: Merge.rc:5005
msgid "\nLast File"
msgstr "\nÚltimo Arquivo"
#. ID_PREVFILE
-#: Merge.rc:4996
+#: Merge.rc:5006
msgid "\nPrevious File (Ctrl+F7)"
msgstr "\nArquivo Anterior (Ctrl+F7)"
#. IDS_UNPACK_AUTO
-#: Merge.rc:5003
+#: Merge.rc:5013
msgid "Adapted unpacker applied to both files (one needs extension)."
msgstr "Descompactador adaptado aplicado a ambos os arquivos (um deles precisa de extensão)."
#. IDS_NO_PREDIFFER
-#: Merge.rc:5004
+#: Merge.rc:5014
msgid "No Prediffer (Normal)"
msgstr "Sem Pré-Diferenciação (Normal)"
#. IDS_SUGGESTED_PLUGINS
-#: Merge.rc:5005
+#: Merge.rc:5015
msgid "Suggested Plugins"
msgstr "Plugins Sugeridos"
#. IDS_NOT_SUGGESTED_PLUGINS
-#: Merge.rc:5006
+#: Merge.rc:5016
msgid "All Plugins"
msgstr "Todos os Plugins"
#. IDS_PRIVATEBUILD_FMT
-#: Merge.rc:5012
+#: Merge.rc:5022
#, c-format
msgid "Private Build: %1"
msgstr "Compilação Privada: %1"
#. IDS_CHECKFORUPDATES_UPTODATE
-#: Merge.rc:5013
+#: Merge.rc:5023
msgid "Your software is up to date."
msgstr "Seu software está atualizado."
-#: Merge.rc:5015
+#: Merge.rc:5025
#, c-format
msgid "WinMerge update available.\n%1 available (you have %2). Download now?"
msgstr "Atualização do WinMerge disponível.\nA %1 está disponível (você tem a %2). Baixar agora?"
#. IDS_ALLRIGHTS_RESERVED
-#: Merge.rc:5016
+#: Merge.rc:5026
msgid " - All rights reserved."
msgstr " - Todos os direitos reservados."
#. IDS_CHECKFORUPDATES_FAILED
-#: Merge.rc:5021
+#: Merge.rc:5031
msgid "Failed to download latest version information"
msgstr "Falha em baixar a informação da versão mais recente"
#. IDS_TITLE_PLUGINS_SETTINGS
-#: Merge.rc:5027
+#: Merge.rc:5037
msgid "Plugin Settings"
msgstr "Configurações do Plugin"
#. IDS_NO_SCT_SCRIPTS
-#: Merge.rc:5029
+#: Merge.rc:5039
msgid "WSH not found - .sct scripts disabled"
msgstr "WSH não encontrado - scripts .sct desabilitados"
#. IDS_LOCBAR_GOTOLINE_FMT
-#: Merge.rc:5037
+#: Merge.rc:5047
#, c-format
msgid "G&o to Line %1"
msgstr "I&r para a Linha %1"
#. IDS_GOTO_MOVED_LINE
-#: Merge.rc:5043
+#: Merge.rc:5053
msgid "Go to Moved Line\tCtrl+Shift+G"
msgstr "Ir para a Linha Movida\tCtrl+Shift+G"
#. IDS_AUTOCOMPLETE_DISABLED
-#: Merge.rc:5049
+#: Merge.rc:5059
msgctxt "Options dialog|General|Open dialog Auto completion"
msgid "Disabled"
msgstr "Desabilitado"
#. IDS_AUTOCOMPLETE_FILE_SYS
-#: Merge.rc:5050
+#: Merge.rc:5060
msgid "From file system"
msgstr "Do sistema de arquivos"
#. IDS_AUTOCOMPLETE_MRU
-#: Merge.rc:5051
+#: Merge.rc:5061
msgid "From Most Recently Used list"
msgstr "Da lista Mais Recentemente Usados"
#. IDS_COLORSCHEME_PLAIN
-#: Merge.rc:5057
+#: Merge.rc:5067
msgid "No Highlighting"
msgstr "Sem Destaque"
#. IDS_COLORSCHEME_BATCH
-#: Merge.rc:5063
+#: Merge.rc:5073
msgid "Batch"
msgstr "Lote"
#. IDS_COLORSCHEME_PO
-#: Merge.rc:5090
+#: Merge.rc:5100
msgid "Portable Object"
msgstr "Objeto Portátil"
#. IDS_COLORSCHEME_RSRC
-#: Merge.rc:5094
+#: Merge.rc:5104
msgid "Resources"
msgstr "Recursos"
#. IDS_COLORSCHEME_SH
-#: Merge.rc:5098
+#: Merge.rc:5108
msgid "Shell"
msgstr "Shell"
#. IDS_CLOSE_LEFT_TABS
-#: Merge.rc:5115
+#: Merge.rc:5125
msgid "Close &Left Tabs"
msgstr "Fechar as &Abas da Esquerda"
#. IDS_CLOSE_RIGHT_TABS
-#: Merge.rc:5116
+#: Merge.rc:5126
msgid "Close R&ight Tabs"
msgstr "Fechar as A&bas da Direita"
#. IDS_CLOSE_OTHER_TABS
-#: Merge.rc:5117
+#: Merge.rc:5127
msgid "Close &Other Tabs"
msgstr "Fechar as &Outras Abas"
#. IDS_TABBAR_AUTO_MAXWIDTH
-#: Merge.rc:5118
+#: Merge.rc:5128
msgid "Enable &Auto Max Width"
msgstr "Habilitar Largura &Máxima Automática"
#. IDS_WEBPAGE_MENU
-#: Merge.rc:5128
+#: Merge.rc:5138
msgid "We&bpage"
msgstr "Página da W&eb"
#. IDS_VIEW_WRAP_TEXT
-#: Merge.rc:5133
+#: Merge.rc:5143
msgid "W&rap Text"
msgstr "Queb&rar Texto"
#. IDS_NOTINSTALLED
-#: Merge.rc:5138
+#: Merge.rc:5148
#, c-format
msgid "%1 is not installed."
msgstr "%1 não está instalado."
#. IDS_CREATE_FOLDER
-#: Merge.rc:5143
+#: Merge.rc:5153
#, c-format
msgid "%1 does not exist. Create it?"
msgstr "%1 não existe. Criá-la?"
#. IDS_CREATE_FOLDER_ERROR
-#: Merge.rc:5144
+#: Merge.rc:5154
msgid "Failed to create folder."
msgstr "Falha ao criar a pasta."
#. IDC_EXT_EDITOR_PATH
-#: Merge.rc:5149
+#: Merge.rc:5159
msgid "Parameters:\n$file: Current file path\n$linenum: Current cursor line number"
msgstr "Parâmetros:\n$file: Caminho do arquivo atual\n$linenum: Número da linha atual do cursor"
#. IDS_DIFF_ALGORITHM_DEFAULT
-#: Merge.rc:5154
+#: Merge.rc:5164
msgid "default"
msgstr "padrão"
#. IDS_DIFF_ALGORITHM_MINIMAL
-#: Merge.rc:5155
+#: Merge.rc:5165
msgid "minimal"
msgstr "mínimo"
#. IDS_DIFF_ALGORITHM_PATIENCE
-#: Merge.rc:5156
+#: Merge.rc:5166
msgid "patience"
msgstr "paciência"
#. IDS_DIFF_ALGORITHM_HISTOGRAM
-#: Merge.rc:5157
+#: Merge.rc:5167
msgid "histogram"
msgstr "histograma"
#. IDS_DIFF_ALGORITHM_NONE
-#: Merge.rc:5158
+#: Merge.rc:5168
msgid "none"
msgstr "nenhum"
#. IDS_RENDERING_MODE_GDI
-#: Merge.rc:5163
+#: Merge.rc:5173
msgid "GDI"
msgstr "GDI"
#. IDS_RENDERING_MODE_DIRECTWRITE_DEFAULT
-#: Merge.rc:5164
+#: Merge.rc:5174
msgid "DirectWrite Default"
msgstr "DirectWrite Padrão"
#. IDS_RENDERING_MODE_DIRECTWRITE_ALIASED
-#: Merge.rc:5165
+#: Merge.rc:5175
msgid "DirectWrite Aliased"
msgstr "DirectWrite com Efeito de Alias"
#. IDS_RENDERING_MODE_DIRECTWRITE_GDI_CLASSIC
-#: Merge.rc:5166
+#: Merge.rc:5176
msgid "DirectWrite GDI Classic"
msgstr "DirectWrite GDI Clássico"
#. IDS_RENDERING_MODE_DIRECTWRITE_GDI_NATURAL
-#: Merge.rc:5167
+#: Merge.rc:5177
msgid "DirectWrite GDI Natural"
msgstr "DirectWrite GDI Natural"
#. IDS_RENDERING_MODE_DIRECTWRITE_NATURAL
-#: Merge.rc:5168
+#: Merge.rc:5178
msgid "DirectWrite Natural"
msgstr "DirectWrite Natural"
#. IDS_RENDERING_MODE_DIRECTWRITE_NATURAL_SYMMETRIC
-#: Merge.rc:5169
+#: Merge.rc:5179
msgid "DirectWrite Natural Symmetric"
msgstr "DirectWrite Natural Simétrico"
#. IDS_CLOSE_WINDOWS_WITH_ESC_DISABLED
-#: Merge.rc:5174
+#: Merge.rc:5184
msgctxt "Options dialog|General|Close windows with Esc"
msgid "Disabled"
msgstr "Desabilitado"
#. IDS_CLOSE_WINDOWS_WITH_ESC_1
-#: Merge.rc:5175
+#: Merge.rc:5185
msgid "MDI child window or main window"
msgstr "Janela filha ou janela principal da MDI"
#. IDS_CLOSE_WINDOWS_WITH_ESC_2
-#: Merge.rc:5176
+#: Merge.rc:5186
msgid "MDI child window only"
msgstr "Só janela filha da MDI"
#. IDS_CLOSE_WINDOWS_WITH_ESC_3
-#: Merge.rc:5177
+#: Merge.rc:5187
msgid "Close main window if only one MDI child window"
msgstr "Fechar a janela principal se só houver uma janela filha da MDI"
#. IDS_DIFF_GROUP
-#: Merge.rc:5182
+#: Merge.rc:5192
msgctxt "ImgMergeFrame|LocationPane"
msgid "Diff"
msgstr "Diferenciação"
#. IDS_DIFF_HIGHLIGHT
-#: Merge.rc:5183
+#: Merge.rc:5193
msgctxt "ImgMergeFrame|LocationPane"
msgid "Highlight"
msgstr "Destacar"
#. IDS_DIFF_BLINK
-#: Merge.rc:5184
+#: Merge.rc:5194
msgctxt "ImgMergeFrame|LocationPane"
msgid "Blink"
msgstr "Piscar"
#. IDS_DIFF_BLOCKSIZE
-#: Merge.rc:5185
+#: Merge.rc:5195
msgctxt "ImgMergeFrame|LocationPane"
msgid "Block Size"
msgstr "Tamanho do Bloco"
#. IDS_DIFF_BLOCKALPHA
-#: Merge.rc:5186
+#: Merge.rc:5196
msgctxt "ImgMergeFrame|LocationPane"
msgid "Block Alpha"
msgstr "Alfa do Bloco"
#. IDS_DIFF_CDTHRESHOLD
-#: Merge.rc:5187
+#: Merge.rc:5197
msgctxt "ImgMergeFrame|LocationPane"
msgid "CD Threshold"
msgstr "Limiar da DC"
#. IDS_DIFF_INSERTION_DELETION_DETECTION
-#: Merge.rc:5188
+#: Merge.rc:5198
msgctxt "ImgMergeFrame|LocationPane"
msgid "Ins/Del Detection"
msgstr "Detecção de Ins/Del"
#. IDS_OVERLAY_MODE_NONE
-#: Merge.rc:5189 Merge.rc:5194
+#: Merge.rc:5199 Merge.rc:5204
msgctxt "ImgMergeFrame|LocationPane"
msgid "None"
msgstr "Nenhuma"
#. IDS_DIFF_INSERTION_DELETION_DETECTION_VERTICAL
-#: Merge.rc:5190
+#: Merge.rc:5200
msgctxt "ImgMergeFrame|LocationPane"
msgid "Vertical"
msgstr "Vertical"
#. IDS_DIFF_INSERTION_DELETION_DETECTION_HORIZONTAL
-#: Merge.rc:5191
+#: Merge.rc:5201
msgctxt "ImgMergeFrame|LocationPane"
msgid "Horizontal"
msgstr "Horizontal"
#. IDS_OVERLAY_GROUP
-#: Merge.rc:5192
+#: Merge.rc:5202
msgctxt "ImgMergeFrame|LocationPane"
msgid "Overlay"
msgstr "Sobreposição"
#. IDS_OVERLAY_ALPHA
-#: Merge.rc:5193
+#: Merge.rc:5203
msgctxt "ImgMergeFrame|LocationPane"
msgid "Alpha"
msgstr "Alfa"
#. IDS_OVERLAY_MODE_XOR
-#: Merge.rc:5195
+#: Merge.rc:5205
msgctxt "ImgMergeFrame|LocationPane"
msgid "XOR"
msgstr "XOR"
#. IDS_OVERLAY_MODE_ALPHA
-#: Merge.rc:5196
+#: Merge.rc:5206
msgctxt "ImgMergeFrame|LocationPane"
msgid "Alpha Blend"
msgstr "Mistura do Alfa"
#. IDS_OVERLAY_MODE_ALPHA_ANIMATION
-#: Merge.rc:5197
+#: Merge.rc:5207
msgctxt "ImgMergeFrame|LocationPane"
msgid "Alpha Animation"
msgstr "Animação do Alfa"
#. IDS_ZOOM
-#: Merge.rc:5198
+#: Merge.rc:5208
msgctxt "ImgMergeFrame|LocationPane"
msgid "Zoom"
msgstr "Zoom"
#. IDS_PAGE
-#: Merge.rc:5199
+#: Merge.rc:5209
msgctxt "ImgMergeFrame|LocationPane"
msgid "Page:"
msgstr "Página:"
#. IDS_IMGCMP_STATUS_PT_RGBA_FMT
-#: Merge.rc:5200
+#: Merge.rc:5210
#, c-format
msgid "Pt: (%d, %d) RGBA: (%d, %d, %d, %d) "
msgstr "Pt: (%d, %d) RGBA: (%d, %d, %d, %d) "
#. IDS_IMGCMP_STATUS_DIST1_FMT
-#: Merge.rc:5201
+#: Merge.rc:5211
#, c-format
msgid "Dist: %g "
msgstr "Dist: %g "
#. IDS_IMGCMP_STATUS_DIST2_FMT
-#: Merge.rc:5202
+#: Merge.rc:5212
#, c-format
msgid "Dist: %g, %g "
msgstr "Dist: %g, %g "
#. IDS_IMGCMP_STATUS_PAGE_ZOOM_SIZE_BPP_FMT
-#: Merge.rc:5203
+#: Merge.rc:5213
#, c-format
msgid "Page: %d/%d Zoom: %d%% %dx%dpx %dbpp "
msgstr "Página: %d/%d Zoom: %d%% %dx%dpx %dbpp "
#. IDS_IMGCMP_STATUS_RC_FMT
-#: Merge.rc:5204
+#: Merge.rc:5214
#, c-format
msgid "Rc: (%d, %d) "
msgstr "Rc: (%d, %d) "
#. IDS_IMGCMP_STATUS_FLIPPED_FMT
-#: Merge.rc:5205
+#: Merge.rc:5215
#, c-format
msgid "Flipped: %s "
msgstr "Virada: %s "
#. IDS_IMGCMP_STATUS_ROTATED_FMT
-#: Merge.rc:5206
+#: Merge.rc:5216
#, c-format
msgid "Rotated: %d "
msgstr "Rotacionada: %d "
#. IDS_IMGCMP_REPORT_ALLPAGES
-#: Merge.rc:5207
+#: Merge.rc:5217
msgid "All pages"
msgstr "Todas as páginas"
#. IDS_IGNSUB_STR1
-#: Merge.rc:5212
+#: Merge.rc:5222
msgid ""
msgstr ""
#. IDS_IGNSUB_STR2
-#: Merge.rc:5213
+#: Merge.rc:5223
msgid "No differences found to select"
msgstr "Nenhuma diferença encontrada para selecionar"
#. IDS_IGNSUB_STR3
-#: Merge.rc:5214
+#: Merge.rc:5224
msgid "No differences found to add as substitution filter"
msgstr "Nenhuma diferença encontrada para adicionar como filtro de substituição"
#. IDS_IGNSUB_STR4
-#: Merge.rc:5215
+#: Merge.rc:5225
msgid "The pair is already in the Substitution Filters list"
msgstr "O par já está na lista de Filtros de Substituição"
#. IDS_IGNSUB_STR5
-#: Merge.rc:5216
+#: Merge.rc:5226
msgid "Add this change to Substitution Filters?"
msgstr "Adicionar esta alteração aos Filtros de Substituição?"
#. IDS_OCRRESULT_TEXTONLY
-#: Merge.rc:5221
+#: Merge.rc:5231
msgid "Text only"
msgstr "Só texto"
#. IDS_OCRRESULT_POS_LINE
-#: Merge.rc:5222
+#: Merge.rc:5232
msgid "Line-by-line position and text"
msgstr "Posição e texto linha por linha"
#. IDS_OCRRESULT_POS_WORD
-#: Merge.rc:5223
+#: Merge.rc:5233
msgid "Word-by-word position and text"
msgstr "Posição e texto palavra por palavra"
#. IDS_USERDATAFOLDER_APPDATA
-#: Merge.rc:5228
+#: Merge.rc:5238
msgid "AppData (Roaming) folder"
msgstr "Pasta AppData (Roaming)"
#. IDS_USERDATAFOLDER_INSTALL
-#: Merge.rc:5229
+#: Merge.rc:5239
msgid "Install folder"
msgstr "Pasta de instalação"
#. IDS_USERDATAFOLDER_DOCUMENTS
-#: Merge.rc:5230
+#: Merge.rc:5240
msgid "Documents folder"
msgstr "Pasta Documentos"
#. IDS_SINGLEINSTANCE_DISABLED
-#: Merge.rc:5235
+#: Merge.rc:5245
msgctxt "Options dialog|General|Single instance mode"
msgid "Disabled"
msgstr "Desabilitado"
#. IDS_SINGLEINSTANCE_STR1
-#: Merge.rc:5236
+#: Merge.rc:5246
msgid "Allow only one instance to run"
msgstr "Permitir que apenas uma instância seja executada"
#. IDS_SINGLEINSTANCE_STR2
-#: Merge.rc:5237
+#: Merge.rc:5247
msgid "Allow only one instance; wait for termination"
msgstr "Permitir apenas uma instância; aguardar encerramento"
#. IDS_AUTO_RELOAD_MODIFIED_FILES_DISABLED
-#: Merge.rc:5242
+#: Merge.rc:5252
msgctxt "Options dialog|General|Auto-reload modified files"
msgid "Disabled"
msgstr "Desabilitado"
#. IDS_AUTO_RELOAD_MODIFIED_FILES_STR1
-#: Merge.rc:5243
+#: Merge.rc:5253
msgid "Only on window activated"
msgstr "Apenas na janela ativada"
#. IDS_AUTO_RELOAD_MODIFIED_FILES_STR2
-#: Merge.rc:5244
+#: Merge.rc:5254
msgid "Immediately"
msgstr "Imediatamente"
#. IDS_PLUGIN_ALL
-#: Merge.rc:5249
+#: Merge.rc:5259
msgid "Al&l"
msgstr "Tu&do"
#. IDS_PLUGIN_OTHERS
-#: Merge.rc:5250
+#: Merge.rc:5260
msgid "&Others"
msgstr "&Outros"
-#: Merge.rc:5252
+#: Merge.rc:5262
#, c-format
msgid "Missing plugin name in pipeline: %1"
msgstr "Nome do plugin ausente no pipeline: %1"
-#: Merge.rc:5254
+#: Merge.rc:5264
#, c-format
msgid "Missing quote in plugin pipeline: %1"
msgstr "Aspas ausentes no pipeline do plugin: %1"
#. IDS_PLUGIN_NAME_ALREADY_EXISTS
-#: Merge.rc:5255
+#: Merge.rc:5265
#, c-format
msgid "Plugin name '%1' already exists."
msgstr "O nome de plugin '%1' já existe."
#. IDS_PLUGIN_TITLE1
-#: Merge.rc:5256
+#: Merge.rc:5266
msgid "Specify plugin arguments"
msgstr "Especifique os argumentos do plugin"
-#: Merge.rc:5258
+#: Merge.rc:5268
#, c-format
msgid "Plugin not found or invalid: %1"
msgstr "Plugin não encontrado ou inválido: %1"
#. IDS_PLUGIN_NOT_UNPACK
-#: Merge.rc:5259
+#: Merge.rc:5269
#, c-format
msgid "'%1' is not an unpacker plugin"
msgstr "'%1' não é um plugin de descompactador"
#. IDS_PLUGIN_NOT_PREDIFF
-#: Merge.rc:5260
+#: Merge.rc:5270
#, c-format
msgid "'%1' is not a prediffer plugin"
msgstr "'%1' não é um plugin de pré-diferenciação"
-#: Merge.rc:5262
+#: Merge.rc:5272
#, c-format
msgid "Error prediffing '%1' with '%2'. Prediffing disabled."
msgstr "Erro ao pré-diferenciar ‘%1’ com ‘%2’. Pré-diferenciação desabilitada."
#. IDS_PLUGIN_CIRCULAR_REFERENCE
-#: Merge.rc:5263
+#: Merge.rc:5273
#, c-format
msgid "Circular reference in plugin pipeline: %1"
msgstr "Referência circular no pipeline do plugin: %1"
#. IDS_PLUGIN_TYPE1
-#: Merge.rc:5264
+#: Merge.rc:5274
msgid "URL Handler"
msgstr "Manipulador de URL"
#. IDS_PLUGIN_TYPE2
-#: Merge.rc:5265
+#: Merge.rc:5275
msgid "File Unpacker"
msgstr "Descompactador de Arquivo"
#. IDS_PLUGIN_TYPE3
-#: Merge.rc:5266
+#: Merge.rc:5276
msgid "File or Folder Unpacker"
msgstr "Descompactador de Arquivo ou Pasta"
#. IDS_PLUGIN_TYPE5
-#: Merge.rc:5268
+#: Merge.rc:5278
msgid "Alias for Unpacker"
msgstr "Alias para o Descompactador"
#. IDS_PLUGIN_TYPE6
-#: Merge.rc:5269
+#: Merge.rc:5279
msgid "Alias for Prediffer"
msgstr "Alias para o Pré-Diferenciador"
#. IDS_PLUGIN_TYPE7
-#: Merge.rc:5270
+#: Merge.rc:5280
msgid "Alias for Editor script"
msgstr "Alias para o script do Editor"
#. IDS_PLUGIN_ALIAS_DESC
-#: Merge.rc:5271
+#: Merge.rc:5281
#, c-format
msgid "Alias for plugin pipeline '%1'"
msgstr "Alias para o pipeline de plugin '%1'"
#. IDS_PLUGIN_NEW_DESC
-#: Merge.rc:5272
+#: Merge.rc:5282
msgid "New plugin description"
msgstr "Descrição do novo plugin"
#. IDS_PLUGIN_TARGETS_ALL
-#: Merge.rc:5273
+#: Merge.rc:5283
msgid "All"
msgstr "Todos"
#. IDS_PLUGIN_TARGETS_1ST
-#: Merge.rc:5274
+#: Merge.rc:5284
msgid "1st"
msgstr "1º"
#. IDS_PLUGIN_TARGETS_2ND
-#: Merge.rc:5275
+#: Merge.rc:5285
msgid "2nd"
msgstr "2º"
#. IDS_PLUGIN_TARGETS_3RD
-#: Merge.rc:5276
+#: Merge.rc:5286
msgid "3rd"
msgstr "3º"
#. IDS_PLUGIN_TARGETS_1ST_2ND
-#: Merge.rc:5277
+#: Merge.rc:5287
msgid "1st and 2nd"
msgstr "1º e 2º"
#. IDS_PLUGIN_TARGETS_1ST_3RD
-#: Merge.rc:5278
+#: Merge.rc:5288
msgid "1st and 3rd"
msgstr "1º e 3º"
#. IDS_PLUGIN_TARGETS_2ND_3RD
-#: Merge.rc:5279
+#: Merge.rc:5289
msgid "2nd and 3rd"
msgstr "2º e 3º"
#. IDS_FILTER_APPLIED
-#: Merge.rc:5284
+#: Merge.rc:5294
msgid "Filter applied"
msgstr "Filtro aplicado"
#. IDS_FILTERMENU_COMPARE
-#: Merge.rc:5289
+#: Merge.rc:5299
#, c-format
msgid "Compare %1"
msgstr "Comparar %1"
#. IDS_FILTERMENU_FILTER_BY_THIS_COLUMN
-#: Merge.rc:5290
+#: Merge.rc:5300
msgid "&Filter by This Column"
msgstr "&Filtrar por Esta Coluna"
#. IDS_FILTERMENU_FILTER_BY_THIS_COLUMN2
-#: Merge.rc:5291
+#: Merge.rc:5301
msgid "&Filter by This Column..."
msgstr "&Filtrar por Esta Coluna..."
#. IDS_CLIPBOARDHISTORY_TIME
-#: Merge.rc:5296
+#: Merge.rc:5306
#, c-format
msgid "Clipboard at %s"
msgstr "Área de transferência em %s"
#. IDS_CLIPBOARDHISTORY_DISABLED
-#: Merge.rc:5297
+#: Merge.rc:5307
msgid "Clipboard history disabled.\r\nEnable: Windows logo key + V, then Turn on."
msgstr "Histórico da área de transferência desabilitado.\r\nHabilitar: tecla do logotipo do Windows + V e, em seguida, Ativar."
-#: Merge.rc:5299
+#: Merge.rc:5309
msgid "This system does not support clipboard history."
msgstr "Este sistema não suporta histórico da área de transferência."
-#: Merge.rc:5301
+#: Merge.rc:5311
msgid "32-bit WinMerge does not support Clipboard Compare"
msgstr "O WinMerge de 32 bits não suporta a Comparação da Área de Transferência"
#. IDS_WEBVIEW2_RUNTIME_NOT_INSTALLED
-#: Merge.rc:5306
+#: Merge.rc:5316
msgid "WebView2 runtime not installed. Download it?"
msgstr "O WebView2 runtime não está instalado. Baixá-lo?"
#. IDS_JUMPLIST_NEW_TEXT_COMPARE
-#: Merge.rc:5311
+#: Merge.rc:5321
msgid "New Text Compare"
msgstr "Nova Comparação de Textos"
#. IDS_JUMPLIST_NEW_TABLE_COMPARE
-#: Merge.rc:5312
+#: Merge.rc:5322
msgid "New Table Compare"
msgstr "Nova Comparação de Tabelas"
#. IDS_JUMPLIST_NEW_BINARY_COMPARE
-#: Merge.rc:5313
+#: Merge.rc:5323
msgid "New Binary Compare"
msgstr "Nova Comparação de Binários"
#. IDS_JUMPLIST_NEW_IMAGE_COMPARE
-#: Merge.rc:5314
+#: Merge.rc:5324
msgid "New Image Compare"
msgstr "Nova Comparação de Imagens"
#. IDS_JUMPLIST_NEW_WEBPAGE_COMPARE
-#: Merge.rc:5315
+#: Merge.rc:5325
msgid "New Webpage Compare"
msgstr "Nova Comparação de Páginas da Web"
+#. IDS_JUMPLIST_NEW_FOLDER_COMPARE
+#: Merge.rc:5326
+msgid "New Folder Compare"
+msgstr ""
+
#. IDS_JUMPLIST_CLIPBOARD_COMPARE
-#: Merge.rc:5316
+#: Merge.rc:5327
msgid "Clipboard Compare"
msgstr "Comparação da Área de Transferência"
#. IDS_PREVIEWBAR_PRINT
-#: Merge.rc:5321
+#: Merge.rc:5332
msgid "&Print..."
msgstr "&Imprimir..."
#. IDS_PREVIEWBAR_PREVPAGE
-#: Merge.rc:5323
+#: Merge.rc:5334
msgid "Pre&v Page"
msgstr "&Página Anterior"
#. IDS_PREVIEWBAR_TWOPAGE
-#: Merge.rc:5324
+#: Merge.rc:5335
msgid "&Two Page"
msgstr "&Duas Páginas"
#. IDS_PREVIEWBAR_ONEPAGE
-#: Merge.rc:5325
+#: Merge.rc:5336
msgid "&One Page"
msgstr "&Uma Página"
#. IDS_PREVIEWBAR_ZOOMIN
-#: Merge.rc:5326
+#: Merge.rc:5337
msgid "Zoom &In"
msgstr "&Ampliar"
#. IDS_PREVIEWBAR_ZOOMOUT
-#: Merge.rc:5327
+#: Merge.rc:5338
msgid "Zoom &Out"
msgstr "&Reduzir"
#. IDS_WEBPAGE_COMPARING
-#: Merge.rc:5333
+#: Merge.rc:5344
msgid "Comparing..."
msgstr "Comparando..."
#. IDS_WEBPAGE_ZOOM
-#: Merge.rc:5334
+#: Merge.rc:5345
msgid "Zoom:"
msgstr "Zoom:"
#. IDS_COPY_GRANULARITY_DIFFHUNK
-#: Merge.rc:5339
+#: Merge.rc:5350
msgid "Diff hunk"
msgstr "Bloco da diferenciação"
#. IDS_COPY_GRANULARITY_INLINE
-#: Merge.rc:5340
+#: Merge.rc:5351
msgid "Inline diff"
msgstr "Diferenciação em linha"
#. IDS_COPY_GRANULARITY_LINE
-#: Merge.rc:5341
+#: Merge.rc:5352
msgid "Line"
msgstr "Linha"
-#: Merge.rc:5342
+#: Merge.rc:5353
msgid "Character"
msgstr "Caracter"
#. ID_MICE_PREVDIFF
-#: Merge.rc:5347
+#: Merge.rc:5358
msgid "\nPrevious Difference (Alt+Up)\n(Right Button+Wheel Up)\n(Alt+Wheel Up)"
msgstr "\nDiferença Anterior (Alt+para Cima)\n(Botão Direito+Rolagem para Cima)\n(Alt+Rolagem para Cima)"
#. ID_MICE_NEXTDIFF
-#: Merge.rc:5348
+#: Merge.rc:5359
msgid "\nNext Difference (Alt+Down)\n(Right Button+Wheel Down)\n(Alt+Wheel Down)"
msgstr "\nDiferença Seguinte (Alt+para Baixo)\n(Botão Direito+Rolagem para Baixo)\n(Alt+Rolagem para Baixo)"
#. ID_MICE_L2R
-#: Merge.rc:5349
+#: Merge.rc:5360
msgid "\nCopy to Right (Alt+Right)\n(Right Button+Wheel Right)\n(Alt+Wheel Right)\n(Alt+Shift+Wheel Down)"
msgstr "\nCopiar para a Direita (Alt+Direita)\n(Botão Direito+Rolagem para a Direita)\n(Alt+Rolagem para a Direita)\n(Alt+Shift+Rolagem para Baixo)"
#. ID_MICE_R2L
-#: Merge.rc:5350
+#: Merge.rc:5361
msgid "\nCopy to Left (Alt+Left)\n(Right Button+Wheel Left)\n(Alt+Wheel Left)\n(Alt+Shift+Wheel Up)"
msgstr "\nCopiar para a Esquerda (Alt+Esquerda)\n(Botão Direito+Rolagem para a Esquerda)\n(Alt+Rolagem para a Esquerda)\n(Alt+Shift+Rolagem para Cima)"
#. ID_MICE_L2RNEXT
-#: Merge.rc:5351
+#: Merge.rc:5362
msgid "\nCopy to Right and Advance (Ctrl+Alt+Right)\n(Ctrl+Alt+Wheel Right)\n(Ctrl+Alt+Shift+Wheel Down)"
msgstr "\nCopiar para a Direita e Avançar (Ctrl+Alt+Direita)\n(Ctrl+Alt+Rolagem para a Direita)\n(Ctrl+Alt+Shift+Rolagem para Baixo)"
#. ID_MICE_R2LNEXT
-#: Merge.rc:5352
+#: Merge.rc:5363
msgid "\nCopy to Left and Advance (Ctrl+Alt+Left)\n(Ctrl+Alt+Wheel Left)\n(Ctrl+Alt+Shift+Wheel Up)"
msgstr "\nCopiar para a Esquerda e Avançar (Ctrl+Alt+Esquerda)\n(Ctrl+Alt+Rolagem para a Esquerda)\n(Ctrl+Alt+Shift+Rolagem para Cima)"
#. IDS_LOG_COMPARING_2
-#: Merge.rc:5362
+#: Merge.rc:5373
#, c-format
msgid "Comparing %1 with %2"
msgstr "Comparando %1 com %2"
#. IDS_LOG_COMPARING_3
-#: Merge.rc:5363
+#: Merge.rc:5374
#, c-format
msgid "Comparing %1 with %2 and %3"
msgstr "Comparando %1 com %2 e %3"
#. IDS_LOG_COMPARE_COMPLETED
-#: Merge.rc:5364
+#: Merge.rc:5375
msgid "Comparison completed"
msgstr "Comparação completada"
#. IDS_LOG_COMPARE_ERROR_2
-#: Merge.rc:5365
+#: Merge.rc:5376
#, c-format
msgid "Failed to compare %1 with %2: "
msgstr "Falha ao comparar %1 com %2: "
#. IDS_LOG_COMPARE_ERROR_3
-#: Merge.rc:5366
+#: Merge.rc:5377
#, c-format
msgid "Failed to compare %1 with %2 and %3: "
msgstr "Falha ao comparar %1 com %2 e %3: "
#. IDS_LOG_FILE_SAVED
-#: Merge.rc:5367
+#: Merge.rc:5378
msgid "File saved"
msgstr "Arquivo salvo"
#. IDS_LOG_COPYING_FILES
-#: Merge.rc:5368
+#: Merge.rc:5379
msgid "Copying files..."
msgstr "Copiando arquivos..."
#. IDS_LOG_MOVING_FILES
-#: Merge.rc:5369
+#: Merge.rc:5380
msgid "Moving files..."
msgstr "Movendo arquivos..."
#. IDS_LOG_DELETING_FILES
-#: Merge.rc:5370
+#: Merge.rc:5381
msgid "Deleting files..."
msgstr "Excluindo arquivos..."
#. IDS_LOG_RECYCLEBIN
-#: Merge.rc:5371
+#: Merge.rc:5382
msgid "Recycle Bin"
msgstr "Lixeira"
#. IDS_LOG_PERMANENTLY_DELETED
-#: Merge.rc:5372
+#: Merge.rc:5383
msgid "Permanently deleted"
msgstr "Excluído(s) permanentemente"
#. IDS_LOG_FILEOPERATION_COMPLETED
-#: Merge.rc:5373
+#: Merge.rc:5384
msgid "File operation completed successfully"
msgstr "Operação de arquivos completada com sucesso"
#. IDS_LOG_FILEOPERATION_CANCELED
-#: Merge.rc:5374
+#: Merge.rc:5385
msgid "File operation canceled"
msgstr "Operação de arquivos cancelada"
#. IDS_FILTER_ERROR_NO_ERROR
-#: Merge.rc:5379
+#: Merge.rc:5390
msgid "No error"
msgstr "Sem erro"
#. IDS_FILTER_ERROR_EMPTY_EXPRESSION
-#: Merge.rc:5380
+#: Merge.rc:5391
msgid "Filter expression is empty"
msgstr "A expressão de filtro está vazia"
#. IDS_FILTER_ERROR_UNKNOWN_CHAR
-#: Merge.rc:5381
+#: Merge.rc:5392
msgid "Unknown character in filter expression"
msgstr "Caracter desconhecido na expressão de filtro"
#. IDS_FILTER_ERROR_UNTERMINATED_STRING
-#: Merge.rc:5382
+#: Merge.rc:5393
msgid "Unterminated string literal"
msgstr "Literal de string não terminado"
#. IDS_FILTER_ERROR_SYNTAX_ERROR
-#: Merge.rc:5383
+#: Merge.rc:5394
msgid "Syntax error in filter expression"
msgstr "Erro de sintaxe na expressão de filtro"
#. IDS_FILTER_ERROR_PARSE_FAILURE
-#: Merge.rc:5384
+#: Merge.rc:5395
msgid "Failed to parse filter expression"
msgstr "Falha ao analisar a expressão de filtro"
#. IDS_FILTER_ERROR_INVALID_LITERAL
-#: Merge.rc:5385
+#: Merge.rc:5396
msgid "Invalid literal value"
msgstr "Valor de literal inválido"
#. IDS_FILTER_ERROR_INVALID_REGULAR_EXPRESSION
-#: Merge.rc:5386
+#: Merge.rc:5397
msgid "Invalid regular expression"
msgstr "Expressão regular inválida"
#. IDS_FILTER_ERROR_UNDEFINED_IDENTIFIER
-#: Merge.rc:5387
+#: Merge.rc:5398
msgid "Undefined identifier"
msgstr "Identificador indefinido"
#. IDS_FILTER_ERROR_INVALID_ARGUMENT_COUNT
-#: Merge.rc:5388
+#: Merge.rc:5399
msgid "Invalid number of arguments"
msgstr "Número de argumentos inválido"
#. IDS_FILTER_ERROR_FILTER_NAME_NOT_FOUND
-#: Merge.rc:5389
+#: Merge.rc:5400
msgid "Filter name not found"
msgstr "Nome de filtro não encontrado"
#. IDS_FILTER_ERROR_DIVIDE_BY_ZERO
-#: Merge.rc:5390
+#: Merge.rc:5401
msgid "Division by zero in filter expression"
msgstr "Divisão por zero na expressão de filtro"
#. IDS_FILTER_ERROR_UNKNOWN_ERROR
-#: Merge.rc:5391
+#: Merge.rc:5402
msgid "Unknown error"
msgstr "Erro desconhecido"
#. IDS_FILTER_ERROR_INVALID_PROPERTY_NAME
-#: Merge.rc:5392
+#: Merge.rc:5403
msgid "Invalid property name"
msgstr "Nome de propriedade inválido"
#. IDS_FILTER_ERROR_INVALID_DIRECTIVE
-#: Merge.rc:5393
+#: Merge.rc:5404
msgid "Invalid directive"
msgstr "Diretiva inválida"
#. IDS_FILTER_OP_EQUALS
-#: Merge.rc:5398
+#: Merge.rc:5409
msgid "Equals"
msgstr "Igual a"
#. IDS_FILTER_OP_NOT_EQUALS
-#: Merge.rc:5399
+#: Merge.rc:5410
msgid "Does not equal"
msgstr "Não é igual a"
#. IDS_FILTER_OP_LESS_THAN
-#: Merge.rc:5400
+#: Merge.rc:5411
msgid "Less than"
msgstr "Menor que"
#. IDS_FILTER_OP_LESS_EQUAL
-#: Merge.rc:5401
+#: Merge.rc:5412
msgid "Less than or equal to"
msgstr "Menor que ou igual a"
#. IDS_FILTER_OP_GREATER_EQUAL
-#: Merge.rc:5402
+#: Merge.rc:5413
msgid "Greater than or equal to"
msgstr "Maior que ou igual a"
#. IDS_FILTER_OP_GREATER_THAN
-#: Merge.rc:5403
+#: Merge.rc:5414
msgid "Greater than"
msgstr "Maior que"
#. IDS_FILTER_OP_BETWEEN
-#: Merge.rc:5404
+#: Merge.rc:5415
msgid "Between"
msgstr "Entre"
#. IDS_FILTER_OP_NOT_BETWEEN
-#: Merge.rc:5405
+#: Merge.rc:5416
msgid "Not Between"
msgstr "Não Entre"
#. IDS_FILTER_OP_CONTAINS
-#: Merge.rc:5406
+#: Merge.rc:5417
msgid "Contains"
msgstr "Contém"
#. IDS_FILTER_OP_NOT_CONTAINS
-#: Merge.rc:5407
+#: Merge.rc:5418
msgid "Not Contains"
msgstr "Não Contém"
#. IDS_FILTER_OP_RECONTAINS
-#: Merge.rc:5408
+#: Merge.rc:5419
msgid "Contains (regex)"
msgstr "Contém (regex)"
#. IDS_FILTER_OP_NOT_RECONTAINS
-#: Merge.rc:5409
+#: Merge.rc:5420
msgid "Not Contains (regex)"
msgstr "Não Contém (regex)"
#. IDS_FILTER_OP_LIKE
-#: Merge.rc:5410
+#: Merge.rc:5421
msgid "Match (wildcard)"
msgstr "Corresponde (coringa)"
#. IDS_FILTER_OP_NOT_LIKE
-#: Merge.rc:5411
+#: Merge.rc:5422
msgid "Not match (wildcard)"
msgstr "Não corresponde (coringa)"
#. IDS_FILTER_OP_MATCHES
-#: Merge.rc:5412
+#: Merge.rc:5423
msgid "Match (regex)"
msgstr "Corresponde (regex)"
#. IDS_FILTER_OP_NOT_MATCHES
-#: Merge.rc:5413
+#: Merge.rc:5424
msgid "Not match (regex)"
msgstr "Não corresponde (regex)"
#. IDS_COLORMODE_LIGHT
-#: Merge.rc:5418
+#: Merge.rc:5429
msgid "Light"
msgstr "Claro"
#. IDS_COLORMODE_DARK
-#: Merge.rc:5419
+#: Merge.rc:5430
msgid "Dark"
msgstr "Escuro"
#. IDS_COLORMODE_FOLLOWSYSTEM
-#: Merge.rc:5420
+#: Merge.rc:5431
msgid "Follow system"
msgstr "Seguir o sistema"
#. IDS_EXAMPLE
-#: Merge.rc:5425
+#: Merge.rc:5436
#, c-format
msgid "e.g. %1"
msgstr "p.ex. %1"
#. IDS_DETECTED_PREVIOUS_CRASH
-#: Merge.rc:5430
+#: Merge.rc:5441
msgid "WinMerge detected a previous crash. Please report this if possible."
msgstr "O WinMerge detectou um travamento ocorrido. Por favor, relate-o, se possível."
#. IDS_REGEX_REPLACE_LIST_TEMPLATE
-#: Merge.rc:5435
+#: Merge.rc:5446
msgid "# Regex replacement list\r\n# Format: regexreplacement\r\n# Backreferences like $1, $2 are supported\r\n\r\n(\\d{4})-(\\d{2})-(\\d{2})\t$1_$2_$3\r\n"
msgstr "# Lista de substituição Regex\r\n# Formato: regexsubstituto\r\n# Referências anteriores como $1, $2 são suportadas\r\n\r\n(\\d{4})-(\\d{2})-(\\d{2})\t$1_$2_$3\r\n"
#. IDS_STRING_REPLACE_LIST_TEMPLATE
-#: Merge.rc:5436
+#: Merge.rc:5447
msgid "# Replacement list\r\n# Format: searchreplacement\r\n# Lines starting with # are ignored\r\n\r\nfrom1\tto1\r\nfrom2\tto2\r\n"
msgstr "# Lista de substuição\r\n# Formato: buscasubstituto\r\n# Linhas começando com # são ignoradas\r\n\r\nde1\tpara1\r\nde2\tpara2\r\n"
diff --git a/Translations/WinMerge/Bulgarian.po b/Translations/WinMerge/Bulgarian.po
index b0eadca0f67..8d380e0db66 100644
--- a/Translations/WinMerge/Bulgarian.po
+++ b/Translations/WinMerge/Bulgarian.po
@@ -20,7 +20,7 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
#. LANGUAGE, SUBLANGUAGE
-#: Merge.rc:26 Merge.rc:59 Merge.rc:5453
+#: Merge.rc:26 Merge.rc:59 Merge.rc:5464
msgid "LANG_ENGLISH, SUBLANG_ENGLISH_US"
msgstr "LANG_BULGARIAN, SUBLANG_DEFAULT"
@@ -105,7 +105,7 @@ msgid "Copy Selected Diff (Right) to Clipboard\tCtrl+&3"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_SELECTLINEDIFF
-#: Merge.rc:110 Merge.rc:673
+#: Merge.rc:110 Merge.rc:680
msgid "Select Line &Difference\tF4"
msgstr "&Избиране на различията на реда\tF4"
@@ -135,7 +135,7 @@ msgid "Cu&t"
msgstr "Из&рязване"
#. IDR_POPUP_DIRVIEW
-#: Merge.rc:118 Merge.rc:943
+#: Merge.rc:118 Merge.rc:951
msgid "&Copy"
msgstr "&Копиране"
@@ -145,19 +145,19 @@ msgid "&Paste"
msgstr "По&ставяне"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:121 Merge.rc:875 Merge.rc:882
+#: Merge.rc:121 Merge.rc:882 Merge.rc:889
msgid "&Scripts"
msgstr "&Скриптове"
#. IDS_NO_EDIT_SCRIPTS
-#: Merge.rc:123 Merge.rc:338 Merge.rc:447 Merge.rc:654 Merge.rc:659
-#: Merge.rc:865 Merge.rc:877 Merge.rc:884 Merge.rc:940 Merge.rc:1183
-#: Merge.rc:5028
+#: Merge.rc:123 Merge.rc:340 Merge.rc:451 Merge.rc:661 Merge.rc:666
+#: Merge.rc:872 Merge.rc:884 Merge.rc:891 Merge.rc:948 Merge.rc:1193
+#: Merge.rc:5038
msgid "< Empty >"
msgstr "<празно>"
#. IDR_POPUP_LOCATIONBAR, ID_EDIT_WMGOTO
-#: Merge.rc:126 Merge.rc:691 Merge.rc:1081
+#: Merge.rc:126 Merge.rc:698 Merge.rc:1089
msgid "&Go to...\tCtrl+G"
msgstr "Отиване &към…\tCtrl+G"
@@ -177,27 +177,27 @@ msgid "Op&en"
msgstr "&Отваряне"
#. IDR_POPUP_DIRVIEW, ID_DIR_OPEN_RIGHT
-#: Merge.rc:132 Merge.rc:981 Merge.rc:988 Merge.rc:995
+#: Merge.rc:132 Merge.rc:989 Merge.rc:996 Merge.rc:1003
msgid "With &Registered Application"
msgstr "С &регистрираното приложение"
#. IDR_POPUP_DIRVIEW, ID_DIR_OPEN_RIGHT_WITHEDITOR
-#: Merge.rc:133 Merge.rc:982 Merge.rc:989 Merge.rc:996
+#: Merge.rc:133 Merge.rc:990 Merge.rc:997 Merge.rc:1004
msgid "With &External Editor\tCtrl+Alt+E"
msgstr "С &външен редактор\tCtrl+Alt+E"
#. IDR_POPUP_DIRVIEW, ID_DIR_OPEN_RIGHT_WITH
-#: Merge.rc:134 Merge.rc:983 Merge.rc:990 Merge.rc:997
+#: Merge.rc:134 Merge.rc:991 Merge.rc:998 Merge.rc:1005
msgid "&With..."
msgstr "&С…"
#. IDR_POPUP_DIRVIEW, ID_DIR_OPEN_RIGHT_PARENT_FOLDER
-#: Merge.rc:135 Merge.rc:984 Merge.rc:991 Merge.rc:998
+#: Merge.rc:135 Merge.rc:992 Merge.rc:999 Merge.rc:1006
msgid "Open &Parent Folder..."
msgstr "&Родителска папка…"
#. IDR_POPUP_IMG_CTXT, ID_FILE_SHELLMENU
-#: Merge.rc:137 Merge.rc:1239
+#: Merge.rc:137 Merge.rc:1249
msgid "S&hell Menu"
msgstr "Меню на о&бкръжението"
@@ -232,8 +232,8 @@ msgid "Ins&ertion/Deletion Detection"
msgstr "Разпознаван&е на вмъкване/изтриване"
#. IDR_MERGEDOCTYPE, ID_TOOLBAR_NONE
-#: Merge.rc:176 Merge.rc:209 Merge.rc:216 Merge.rc:358 Merge.rc:507
-#: Merge.rc:751
+#: Merge.rc:176 Merge.rc:209 Merge.rc:216 Merge.rc:360 Merge.rc:511
+#: Merge.rc:758
msgid "&None"
msgstr "&Няма"
@@ -248,12 +248,12 @@ msgid "&Horizontal"
msgstr "&Хоризонтал"
#. IDR_POPUP_IMG_CTXT, ID_IMG_CURPANE_PREVPAGE
-#: Merge.rc:181 Merge.rc:189 Merge.rc:1230
+#: Merge.rc:181 Merge.rc:189 Merge.rc:1240
msgid "&Previous Page"
msgstr "&Предишна страница"
#. IDS_PREVIEWBAR_NEXTPAGE
-#: Merge.rc:182 Merge.rc:190 Merge.rc:1231 Merge.rc:5322
+#: Merge.rc:182 Merge.rc:190 Merge.rc:1241 Merge.rc:5333
msgid "&Next Page"
msgstr "&Следваща страница"
@@ -263,42 +263,42 @@ msgid "&Active Pane"
msgstr "&Текущ панел"
#. IDR_POPUP_IMG_CTXT, ID_IMG_CURPANE_ROTATE_RIGHT_90
-#: Merge.rc:185 Merge.rc:1225
+#: Merge.rc:185 Merge.rc:1235
msgid "Rotate &Right 90deg"
msgstr "Завъртане на&дясно 90⁰"
#. IDR_POPUP_IMG_CTXT, ID_IMG_CURPANE_ROTATE_LEFT_90
-#: Merge.rc:186 Merge.rc:1226
+#: Merge.rc:186 Merge.rc:1236
msgid "Rotate &Left 90deg"
msgstr "Завъртане на&ляво 90⁰"
#. IDR_POPUP_IMG_CTXT, ID_IMG_CURPANE_FLIP_VERTICALLY
-#: Merge.rc:187 Merge.rc:1227
+#: Merge.rc:187 Merge.rc:1237
msgid "Flip V&ertically"
msgstr "Завъртане по &хоризонталната ос"
#. IDR_POPUP_IMG_CTXT, ID_IMG_CURPANE_FLIP_HORIZONTALLY
-#: Merge.rc:188 Merge.rc:1228
+#: Merge.rc:188 Merge.rc:1238
msgid "Flip H&orizontally"
msgstr "Завъртане по &вертикалната ос"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:193 Merge.rc:699
+#: Merge.rc:193 Merge.rc:706
msgid "&Zoom"
msgstr "Маща&биране"
#. IDR_MERGEDOCTYPE, ID_VIEW_ZOOMIN
-#: Merge.rc:202 Merge.rc:701
+#: Merge.rc:202 Merge.rc:708
msgid "Zoom &In\tCtrl++"
msgstr "&Увеличаване\tCtrl++"
#. IDR_MERGEDOCTYPE, ID_VIEW_ZOOMOUT
-#: Merge.rc:203 Merge.rc:702
+#: Merge.rc:203 Merge.rc:709
msgid "Zoom &Out\tCtrl+-"
msgstr "&Намаляване\tCtrl+-"
#. IDR_MERGEDOCTYPE, ID_VIEW_ZOOMNORMAL, Zoom to normal
-#: Merge.rc:205 Merge.rc:704
+#: Merge.rc:205 Merge.rc:711
msgid "&Normal\tCtrl+*"
msgstr "Ну&лиране\tCtrl+*"
@@ -323,27 +323,27 @@ msgid "Dragging &Mode"
msgstr "Режим с &влачене"
#. IDR_POPUP_IMG_CTXT, ID_IMG_DRAGGINGMODE_MOVE
-#: Merge.rc:217 Merge.rc:955 Merge.rc:1233
+#: Merge.rc:217 Merge.rc:963 Merge.rc:1243
msgid "&Move"
msgstr "&Преместване"
#. IDR_POPUP_IMG_CTXT, ID_IMG_DRAGGINGMODE_ADJUST_OFFSET
-#: Merge.rc:218 Merge.rc:1234
+#: Merge.rc:218 Merge.rc:1244
msgid "&Adjust Offset"
msgstr "&Корекция на отместването"
#. IDR_POPUP_IMG_CTXT, ID_IMG_DRAGGINGMODE_VERTICAL_WIPE
-#: Merge.rc:219 Merge.rc:1235
+#: Merge.rc:219 Merge.rc:1245
msgid "&Vertical Wipe"
msgstr ""
#. IDR_POPUP_IMG_CTXT, ID_IMG_DRAGGINGMODE_HORIZONTAL_WIPE
-#: Merge.rc:220 Merge.rc:1236
+#: Merge.rc:220 Merge.rc:1246
msgid "&Horizontal Wipe"
msgstr ""
#. IDR_POPUP_IMG_CTXT, ID_IMG_DRAGGINGMODE_RECTANGLE_SELECT
-#: Merge.rc:221 Merge.rc:1237
+#: Merge.rc:221 Merge.rc:1247
msgid "Rectangle &Select"
msgstr ""
@@ -378,37 +378,37 @@ msgid "Compare Extracted &Text from Images"
msgstr "Сравняване на &текста от изображението"
#. IDD_OPEN, IDOK
-#: Merge.rc:272 Merge.rc:1980
+#: Merge.rc:272 Merge.rc:1990
msgid "Co&mpare"
msgstr "&Сравняване"
#. IDR_POPUP_WEBPAGE_COMPARE, ID_WEB_COMPARE_SCREENSHOTS
-#: Merge.rc:274 Merge.rc:1247
+#: Merge.rc:274 Merge.rc:1257
msgid "&Screenshots"
msgstr "Снимки на &екрана"
#. IDR_POPUP_WEBPAGE_COMPARE, ID_WEB_COMPARE_FULLSIZE_SCREENSHOTS
-#: Merge.rc:275 Merge.rc:1248
+#: Merge.rc:275 Merge.rc:1258
msgid "&Full Size Screenshots"
msgstr ""
#. IDR_POPUP_WEBPAGE_COMPARE, ID_WEB_COMPARE_HTMLS
-#: Merge.rc:276 Merge.rc:1249
+#: Merge.rc:276 Merge.rc:1259
msgid "&HTMLs"
msgstr ""
#. IDR_POPUP_WEBPAGE_COMPARE, ID_WEB_COMPARE_TEXTS
-#: Merge.rc:277 Merge.rc:1250
+#: Merge.rc:277 Merge.rc:1260
msgid "&Texts"
msgstr ""
#. IDR_POPUP_WEBPAGE_COMPARE, ID_WEB_COMPARE_RESOURCETREES
-#: Merge.rc:278 Merge.rc:1251
+#: Merge.rc:278 Merge.rc:1261
msgid "&Resource Trees"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_SIZE
-#: Merge.rc:280 Merge.rc:1775
+#: Merge.rc:280 Merge.rc:1785
msgid "&Size"
msgstr ""
@@ -423,27 +423,27 @@ msgid "&Event Sync"
msgstr ""
#. IDR_POPUP_WEBPAGE_SYNC_EVENTS, ID_WEB_SYNC_ENABLED
-#: Merge.rc:291 Merge.rc:1259
+#: Merge.rc:291 Merge.rc:1269
msgid "&Enabled"
msgstr ""
#. IDR_POPUP_WEBPAGE_SYNC_EVENTS, ID_WEB_SYNC_SCROLL
-#: Merge.rc:293 Merge.rc:1261
+#: Merge.rc:293 Merge.rc:1271
msgid "&Scroll"
msgstr ""
#. IDR_POPUP_WEBPAGE_SYNC_EVENTS, ID_WEB_SYNC_CLICK
-#: Merge.rc:294 Merge.rc:1262
+#: Merge.rc:294 Merge.rc:1272
msgid "&Click"
msgstr ""
#. IDR_POPUP_WEBPAGE_SYNC_EVENTS, ID_WEB_SYNC_INPUT
-#: Merge.rc:295 Merge.rc:1263
+#: Merge.rc:295 Merge.rc:1273
msgid "&Input"
msgstr ""
#. IDR_POPUP_WEBPAGE_SYNC_EVENTS, ID_WEB_SYNC_GOBACKFORWARD
-#: Merge.rc:296 Merge.rc:1264
+#: Merge.rc:296 Merge.rc:1274
msgid "&Go Back/Forward"
msgstr ""
@@ -473,3607 +473,3618 @@ msgid "&All Profiles"
msgstr ""
#. IDR_MERGEDOCTYPE
-#: Merge.rc:310 Merge.rc:411 Merge.rc:586
+#: Merge.rc:310 Merge.rc:413 Merge.rc:590
msgid "&File"
msgstr "&Файл"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:312 Merge.rc:413 Merge.rc:588
+#: Merge.rc:312 Merge.rc:415 Merge.rc:592
msgid "&New"
msgstr "&Нов"
#. IDR_POPUP_COMPARE, ID_MERGE_COMPARE_TEXT
-#: Merge.rc:314 Merge.rc:322 Merge.rc:415 Merge.rc:423 Merge.rc:590
-#: Merge.rc:598 Merge.rc:649 Merge.rc:935 Merge.rc:1159 Merge.rc:1171
+#: Merge.rc:314 Merge.rc:323 Merge.rc:417 Merge.rc:426 Merge.rc:594
+#: Merge.rc:603 Merge.rc:655 Merge.rc:942 Merge.rc:1167 Merge.rc:1180
msgid "&Text"
msgstr "&Текстови файлове"
#. IDR_POPUP_COMPARE, ID_MERGE_COMPARE_TABLE
-#: Merge.rc:315 Merge.rc:323 Merge.rc:416 Merge.rc:424 Merge.rc:591
-#: Merge.rc:599 Merge.rc:650 Merge.rc:936 Merge.rc:1160 Merge.rc:1172
+#: Merge.rc:315 Merge.rc:324 Merge.rc:418 Merge.rc:427 Merge.rc:595
+#: Merge.rc:604 Merge.rc:656 Merge.rc:943 Merge.rc:1168 Merge.rc:1181
msgid "T&able"
msgstr "Та&блица"
#. IDR_POPUP_COMPARE, ID_MERGE_COMPARE_HEX
-#: Merge.rc:316 Merge.rc:324 Merge.rc:417 Merge.rc:425 Merge.rc:592
-#: Merge.rc:600 Merge.rc:651 Merge.rc:937 Merge.rc:1161 Merge.rc:1173
+#: Merge.rc:316 Merge.rc:325 Merge.rc:419 Merge.rc:428 Merge.rc:596
+#: Merge.rc:605 Merge.rc:657 Merge.rc:944 Merge.rc:1169 Merge.rc:1182
msgid "&Binary"
msgstr "&Двоични файлове"
#. IDS_IMAGE_MENU
-#: Merge.rc:317 Merge.rc:325 Merge.rc:418 Merge.rc:426 Merge.rc:593
-#: Merge.rc:601 Merge.rc:652 Merge.rc:938 Merge.rc:1162 Merge.rc:1174
-#: Merge.rc:5123
+#: Merge.rc:317 Merge.rc:326 Merge.rc:420 Merge.rc:429 Merge.rc:597
+#: Merge.rc:606 Merge.rc:658 Merge.rc:945 Merge.rc:1170 Merge.rc:1183
+#: Merge.rc:5133
msgid "&Image"
msgstr "&Изображения"
#. IDR_POPUP_COMPARE, ID_MERGE_COMPARE_WEBPAGE
-#: Merge.rc:318 Merge.rc:326 Merge.rc:419 Merge.rc:427 Merge.rc:594
-#: Merge.rc:602 Merge.rc:653 Merge.rc:939 Merge.rc:1163 Merge.rc:1175
+#: Merge.rc:318 Merge.rc:327 Merge.rc:421 Merge.rc:430 Merge.rc:598
+#: Merge.rc:607 Merge.rc:659 Merge.rc:946 Merge.rc:1171 Merge.rc:1184
msgid "&Webpage"
msgstr ""
+#. IDR_POPUP_NEW, ID_FILE_NEW_FOLDER
+#: Merge.rc:319 Merge.rc:328 Merge.rc:422 Merge.rc:431 Merge.rc:599
+#: Merge.rc:608 Merge.rc:1172
+msgid "&Folder"
+msgstr ""
+
#. IDR_MERGEDOCTYPE
-#: Merge.rc:320 Merge.rc:421 Merge.rc:596
+#: Merge.rc:321 Merge.rc:424 Merge.rc:601
msgid "New (&3 panes)"
msgstr "Нов (&3 панела)"
#. IDR_MERGEDOCTYPE, ID_FILE_OPEN
-#: Merge.rc:328 Merge.rc:429 Merge.rc:604
+#: Merge.rc:330 Merge.rc:433 Merge.rc:610
msgid "&Open...\tCtrl+O"
msgstr "&Отваряне…\tCtrl+O"
#. IDR_MERGEDOCTYPE, ID_FILE_OPENCONFLICT
-#: Merge.rc:329 Merge.rc:430 Merge.rc:605
+#: Merge.rc:331 Merge.rc:434 Merge.rc:611
msgid "Open Conflic&t File..."
msgstr "Отваряне на файл с &конфликти…"
#. IDR_MERGEDOCTYPE, ID_FILE_OPENCLIPBOARD
-#: Merge.rc:330 Merge.rc:431 Merge.rc:606
+#: Merge.rc:332 Merge.rc:435 Merge.rc:612
msgid "Open C&lipboard"
msgstr "Отваряне на междинната &памет"
#. IDR_POPUP_PROJECT, ID_FILE_OPENPROJECT
-#: Merge.rc:332 Merge.rc:433 Merge.rc:608 Merge.rc:1191
+#: Merge.rc:334 Merge.rc:437 Merge.rc:614 Merge.rc:1201
msgid "Open Pro&ject...\tCtrl+J"
msgstr "Отваряне на &проект…\tCtrl+J"
#. IDD_OPEN, ID_SAVE_PROJECT
-#: Merge.rc:333 Merge.rc:434 Merge.rc:609 Merge.rc:1193 Merge.rc:1979
+#: Merge.rc:335 Merge.rc:438 Merge.rc:615 Merge.rc:1203 Merge.rc:1989
msgid "Sa&ve Project..."
msgstr "&Запазване на проект…"
#. IDR_MAINFRAME, ID_FILE_PROJECT_MRU_FIRST
-#: Merge.rc:335
+#: Merge.rc:337
msgid "Recent Projects"
msgstr "Последни проекти"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:336 Merge.rc:445 Merge.rc:657
+#: Merge.rc:338 Merge.rc:449 Merge.rc:664
msgid "Recent F&iles or Folders"
msgstr "Последни &файлове и папки"
#. IDR_MERGEDOCTYPE, ID_APP_EXIT
-#: Merge.rc:341 Merge.rc:450 Merge.rc:662
+#: Merge.rc:343 Merge.rc:454 Merge.rc:669
msgid "E&xit\tCtrl+Q"
msgstr "&Изход\tCtrl+Q"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:343 Merge.rc:452 Merge.rc:664
+#: Merge.rc:345 Merge.rc:456 Merge.rc:671
msgid "&Edit"
msgstr "П&роменяне"
#. IDR_MERGEDOCTYPE, ID_EDIT_PASTE
-#: Merge.rc:345 Merge.rc:671
+#: Merge.rc:347 Merge.rc:678
msgid "&Paste\tCtrl+V"
msgstr "&Поставяне\tCtrl+V"
#. IDR_MERGEDOCTYPE, ID_OPTIONS
-#: Merge.rc:347 Merge.rc:456 Merge.rc:693
+#: Merge.rc:349 Merge.rc:460 Merge.rc:700
msgid "&Options...\tCtrl+,"
msgstr "&Настройки…\tCtrl+,"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:349 Merge.rc:458 Merge.rc:695
+#: Merge.rc:351 Merge.rc:462 Merge.rc:702
msgid "&View"
msgstr "И&зглед"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:351 Merge.rc:500 Merge.rc:744
+#: Merge.rc:353 Merge.rc:504 Merge.rc:751
msgid "Ta&b Bar"
msgstr "Лента с &раздели"
#. IDR_MERGEDOCTYPE, ID_VIEW_TAB_BAR
-#: Merge.rc:353 Merge.rc:502 Merge.rc:746
+#: Merge.rc:355 Merge.rc:506 Merge.rc:753
msgid "&View Tab Bar"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_VIEW_TAB_BAR_ON_TITLE_BAR
-#: Merge.rc:354 Merge.rc:503 Merge.rc:747
+#: Merge.rc:356 Merge.rc:507 Merge.rc:754
msgid "&On Title Bar"
msgstr ""
#. IDR_MERGEDOCTYPE
-#: Merge.rc:356 Merge.rc:505 Merge.rc:749
+#: Merge.rc:358 Merge.rc:509 Merge.rc:756
msgid "&Toolbar"
msgstr "Лента с &инструменти"
#. IDR_MERGEDOCTYPE, ID_TOOLBAR_SMALL
-#: Merge.rc:359 Merge.rc:508 Merge.rc:752
+#: Merge.rc:361 Merge.rc:512 Merge.rc:759
msgid "&Small"
msgstr "&Малък"
#. IDR_MERGEDOCTYPE, ID_TOOLBAR_MEDIUM
-#: Merge.rc:360 Merge.rc:509 Merge.rc:753
+#: Merge.rc:362 Merge.rc:513 Merge.rc:760
msgid "&Medium"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_TOOLBAR_BIG
-#: Merge.rc:361 Merge.rc:510 Merge.rc:754
+#: Merge.rc:363 Merge.rc:514 Merge.rc:761
msgid "&Big"
msgstr "&Голям"
#. IDR_MERGEDOCTYPE, ID_TOOLBAR_HUGE
-#: Merge.rc:362 Merge.rc:511 Merge.rc:755
+#: Merge.rc:364 Merge.rc:515 Merge.rc:762
msgid "&Huge"
msgstr "&Огромен"
#. IDS_VIEW_MENU_BAR
-#: Merge.rc:364 Merge.rc:513 Merge.rc:757 Merge.rc:5357
+#: Merge.rc:366 Merge.rc:517 Merge.rc:764 Merge.rc:5368
msgid "Men&u Bar"
msgstr "&Лента с менюто"
#. IDR_DIRDOCTYPE, ID_VIEW_OUTPUT_BAR
-#: Merge.rc:365 Merge.rc:515
+#: Merge.rc:367 Merge.rc:519
msgid "&Output Pane"
msgstr "Панел за &извеждане на съдържание"
#. IDR_MERGEDOCTYPE, ID_VIEW_STATUS_BAR
-#: Merge.rc:366 Merge.rc:516 Merge.rc:758
+#: Merge.rc:368 Merge.rc:520 Merge.rc:765
msgid "&Status Bar"
msgstr "&Лента за състоянието"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:368 Merge.rc:539 Merge.rc:847
+#: Merge.rc:370 Merge.rc:543 Merge.rc:854
msgid "&Tools"
msgstr "&Инструменти"
#. IDR_MERGEDOCTYPE, ID_TOOLS_FILTERS
-#: Merge.rc:370 Merge.rc:542 Merge.rc:849
+#: Merge.rc:372 Merge.rc:546 Merge.rc:856
msgid "&Filters..."
msgstr "&Филтри…"
#. IDR_MERGEDOCTYPE, ID_TOOLS_GENERATEPATCH
-#: Merge.rc:371 Merge.rc:543 Merge.rc:850
+#: Merge.rc:373 Merge.rc:547 Merge.rc:857
msgid "&Generate Patch..."
msgstr "&Създаване на кръпки…"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:373 Merge.rc:546 Merge.rc:853
+#: Merge.rc:375 Merge.rc:550 Merge.rc:860
msgid "&Plugins"
msgstr "&Добавки"
#. IDD_PLUGINS_LIST, IDC_PLUGIN_SETTINGS
-#: Merge.rc:375 Merge.rc:548 Merge.rc:855 Merge.rc:2494 Merge.rc:2926
+#: Merge.rc:377 Merge.rc:552 Merge.rc:862 Merge.rc:2504 Merge.rc:2936
msgid "P&lugin Settings..."
msgstr "Настройки на &добавки…"
#. IDR_MERGEDOCTYPE, ID_PREDIFFER_MANUAL
-#: Merge.rc:377 Merge.rc:550 Merge.rc:857
+#: Merge.rc:379 Merge.rc:554 Merge.rc:864
msgid "Ma&nual Prediffer"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_PREDIFFER_AUTO
-#: Merge.rc:378 Merge.rc:551 Merge.rc:858
+#: Merge.rc:380 Merge.rc:555 Merge.rc:865
msgid "A&utomatic Prediffer"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_UNPACK_MANUAL
-#: Merge.rc:380 Merge.rc:553 Merge.rc:860
+#: Merge.rc:382 Merge.rc:557 Merge.rc:867
msgid "&Manual Unpacking"
msgstr "&Ръчно разархивиране"
#. IDR_MERGEDOCTYPE, ID_UNPACK_AUTO
-#: Merge.rc:381 Merge.rc:554 Merge.rc:861
+#: Merge.rc:383 Merge.rc:558 Merge.rc:868
msgid "&Automatic Unpacking"
msgstr "&Автоматично разархивиране"
#. IDR_MERGEDOCTYPE, ID_RELOAD_PLUGINS
-#: Merge.rc:383 Merge.rc:558 Merge.rc:889
+#: Merge.rc:385 Merge.rc:562 Merge.rc:896
msgid "&Reload Plugins"
msgstr "&Презареждане на добавки"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:385 Merge.rc:560 Merge.rc:891
+#: Merge.rc:387 Merge.rc:564 Merge.rc:898
msgid "&Window"
msgstr "&Прозорци"
#. IDR_MERGEDOCTYPE, ID_FILE_CLOSE
-#: Merge.rc:387 Merge.rc:562 Merge.rc:893
+#: Merge.rc:389 Merge.rc:566 Merge.rc:900
msgid "Cl&ose\tCtrl+W"
msgstr "&Затваряне\tCtrl+W"
#. IDR_MERGEDOCTYPE, ID_WINDOW_CLOSEALL
-#: Merge.rc:388 Merge.rc:563 Merge.rc:894
+#: Merge.rc:390 Merge.rc:567 Merge.rc:901
msgid "Clo&se All"
msgstr "Затваряне на &всички"
#. IDR_MERGEDOCTYPE, ID_NEXT_PANE
-#: Merge.rc:390 Merge.rc:565 Merge.rc:896
+#: Merge.rc:392 Merge.rc:569 Merge.rc:903
msgid "Change &Pane\tF6"
msgstr "Смяна на &панела\tF6"
#. IDR_MERGEDOCTYPE, ID_WINDOW_TILE_HORZ
-#: Merge.rc:392 Merge.rc:567 Merge.rc:900
+#: Merge.rc:394 Merge.rc:571 Merge.rc:907
msgid "Tile &Horizontally"
msgstr "&Хоризонтална подредба"
#. IDR_MERGEDOCTYPE, ID_WINDOW_TILE_VERT
-#: Merge.rc:393 Merge.rc:568 Merge.rc:901
+#: Merge.rc:395 Merge.rc:572 Merge.rc:908
msgid "Tile &Vertically"
msgstr "&Вертикална подредба"
#. IDR_MERGEDOCTYPE, ID_WINDOW_CASCADE
-#: Merge.rc:394 Merge.rc:569 Merge.rc:902
+#: Merge.rc:396 Merge.rc:573 Merge.rc:909
msgid "&Cascade"
msgstr "&Каскадна подредба"
#. IDS_MESSAGEBOX_HELP
-#: Merge.rc:396 Merge.rc:571 Merge.rc:904 Merge.rc:3200 Merge.rc:4189
+#: Merge.rc:398 Merge.rc:575 Merge.rc:911 Merge.rc:3210 Merge.rc:4199
msgid "&Help"
msgstr "Помо&щ"
#. IDR_MERGEDOCTYPE, ID_HELP_CONTENTS
-#: Merge.rc:398 Merge.rc:573 Merge.rc:906
+#: Merge.rc:400 Merge.rc:577 Merge.rc:913
msgid "&WinMerge Help\tF1"
msgstr "Помощ за &WinMerge\tF1"
#. IDR_MERGEDOCTYPE, ID_HELP_RELEASENOTES
-#: Merge.rc:400 Merge.rc:575 Merge.rc:908
+#: Merge.rc:402 Merge.rc:579 Merge.rc:915
msgid "R&elease Notes"
msgstr "Б&ележки към изданието"
#. IDR_MERGEDOCTYPE, ID_HELP_TRANSLATIONS
-#: Merge.rc:401 Merge.rc:576 Merge.rc:909
+#: Merge.rc:403 Merge.rc:580 Merge.rc:916
msgid "&Translations"
msgstr "&Преводи"
#. IDR_MERGEDOCTYPE, ID_HELP_GETCONFIG
-#: Merge.rc:402 Merge.rc:577 Merge.rc:910
+#: Merge.rc:404 Merge.rc:581 Merge.rc:917
msgid "C&onfiguration"
msgstr "&Настройки"
#. IDR_MERGEDOCTYPE, ID_HELP_GNULICENSE
-#: Merge.rc:404 Merge.rc:579 Merge.rc:912
+#: Merge.rc:406 Merge.rc:583 Merge.rc:919
msgid "&GNU General Public License"
msgstr "&GNU общ публичен лиценз"
#. IDR_MERGEDOCTYPE, ID_APP_ABOUT
-#: Merge.rc:405 Merge.rc:580 Merge.rc:913
+#: Merge.rc:407 Merge.rc:584 Merge.rc:920
msgid "&About WinMerge..."
msgstr "&Относно WinMerge…"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:436 Merge.rc:629
+#: Merge.rc:440 Merge.rc:635
msgid "&Read-Only"
msgstr "&Само за четене"
#. IDR_MERGEDOCTYPE, ID_FILE_LEFT_READONLY
-#: Merge.rc:438 Merge.rc:631
+#: Merge.rc:442 Merge.rc:637
msgid "L&eft Read-Only"
msgstr "О&тляво само за четене"
#. IDR_MERGEDOCTYPE, ID_FILE_MIDDLE_READONLY
-#: Merge.rc:439 Merge.rc:632
+#: Merge.rc:443 Merge.rc:638
msgid "M&iddle Read-Only"
msgstr "&Среден само за четене"
#. IDR_MERGEDOCTYPE, ID_FILE_RIGHT_READONLY
-#: Merge.rc:440 Merge.rc:633
+#: Merge.rc:444 Merge.rc:639
msgid "Ri&ght Read-Only"
msgstr "Отдяс&но само за четене"
#. IDD_ENCODINGERROR, IDC_FILEENCODING
-#: Merge.rc:443 Merge.rc:646 Merge.rc:1038 Merge.rc:3063
+#: Merge.rc:447 Merge.rc:652 Merge.rc:1046 Merge.rc:3073
msgid "&File Encoding..."
msgstr "Избиране на &кодировка…"
#. IDR_POPUP_OUTPUTVIEW, ID_EDIT_SELECT_ALL
-#: Merge.rc:454 Merge.rc:674 Merge.rc:1343
+#: Merge.rc:458 Merge.rc:681 Merge.rc:1353
msgid "Select &All\tCtrl+A"
msgstr "Избиране на &всичко\tCtrl+A"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWIDENTICAL
-#: Merge.rc:460
+#: Merge.rc:464
msgid "Show &Identical Items"
msgstr "Показване на &еднакви"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWDIFFERENT
-#: Merge.rc:461
+#: Merge.rc:465
msgid "Show &Different Items"
msgstr "Показване на &различни"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWUNIQUELEFT
-#: Merge.rc:462
+#: Merge.rc:466
msgid "Show L&eft Unique Items"
msgstr "Показване на уникални от&ляво"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWUNIQUEMIDDLE
-#: Merge.rc:463
+#: Merge.rc:467
msgid "Show Midd&le Unique Items"
msgstr "Показване на уникални по&средата"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWUNIQUERIGHT
-#: Merge.rc:464
+#: Merge.rc:468
msgid "Show Ri&ght Unique Items"
msgstr "Показване на уникални от&дясно"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWSKIPPED
-#: Merge.rc:465
+#: Merge.rc:469
msgid "Show S&kipped Items"
msgstr "Показване на &прескочени"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWBINARIES
-#: Merge.rc:466
+#: Merge.rc:470
msgid "S&how Binary Files"
msgstr "Показване на &двоични файлове"
#. IDR_DIRDOCTYPE
-#: Merge.rc:467
+#: Merge.rc:471
msgid "&3-way Compare"
msgstr "&3-странно сравняване"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWDIFFERENTLEFTONLY
-#: Merge.rc:469
+#: Merge.rc:473
msgid "Show &Left Only Different Items"
msgstr "Показване само на уникални от&ляво"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWDIFFERENTMIDDLEONLY
-#: Merge.rc:470
+#: Merge.rc:474
msgid "Show &Middle Only Different Items"
msgstr "Показване само на уникални по&средата"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWDIFFERENTRIGHTONLY
-#: Merge.rc:471
+#: Merge.rc:475
msgid "Show &Right Only Different Items"
msgstr "Показване само на уникални от&дясно"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWMISSINGLEFTONLY
-#: Merge.rc:473
+#: Merge.rc:477
msgid "Show L&eft Only Missing Items"
msgstr "Показване само на &липсващи отляво"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWMISSINGMIDDLEONLY
-#: Merge.rc:474
+#: Merge.rc:478
msgid "Show Mi&ddle Only Missing Items"
msgstr "Показване само на л&ипсващи посредата"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWMISSINGRIGHTONLY
-#: Merge.rc:475
+#: Merge.rc:479
msgid "Show Rig&ht Only Missing Items"
msgstr "Показване само на ли&псващи отдясно"
#. IDR_DIRDOCTYPE, ID_VIEW_SHOWHIDDENITEMS
-#: Merge.rc:478
+#: Merge.rc:482
msgid "Show Hidd&en Items"
msgstr "Показване на &скрити елементи"
#. IDR_DIRDOCTYPE, ID_VIEW_TREEMODE
-#: Merge.rc:480
+#: Merge.rc:484
msgid "Tree &Mode"
msgstr "&Дървовиден режим"
#. IDR_DIRDOCTYPE
-#: Merge.rc:481
+#: Merge.rc:485
msgid "E&xpand Subfolders"
msgstr "&Разтваряне на папки"
#. IDR_DIRDOCTYPE, ID_VIEW_EXPAND_ALLSUBDIRS
-#: Merge.rc:483
+#: Merge.rc:487
msgid "&All Subfolders"
msgstr "&Всички подпапки"
#. IDR_DIRDOCTYPE, ID_VIEW_EXPAND_DIFFERENT_SUBDIRS
-#: Merge.rc:484
+#: Merge.rc:488
msgid "&Different Subfolders"
msgstr "&Различните подпапки"
#. IDR_DIRDOCTYPE, ID_VIEW_EXPAND_IDENTICAL_SUBDIRS
-#: Merge.rc:485
+#: Merge.rc:489
msgid "&Identical Subfolders"
msgstr "&Еднаквите подпапки"
#. IDR_DIRDOCTYPE, ID_VIEW_COLLAPSE_ALLSUBDIRS
-#: Merge.rc:487
+#: Merge.rc:491
msgid "&Collapse All Subfolders"
msgstr "&Свиване на всички възли"
#. IDR_DIRDOCTYPE, ID_VIEW_SHOW_EMPTY_FOLDERS
-#: Merge.rc:488
+#: Merge.rc:492
msgid "Show &Empty Folders"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_VIEW_SELECTFONT
-#: Merge.rc:490 Merge.rc:697
+#: Merge.rc:494 Merge.rc:704
msgid "Select &Font..."
msgstr "Избиране на &шрифт…"
#. IDR_MERGEDOCTYPE, ID_VIEW_USEDEFAULTFONT
-#: Merge.rc:491 Merge.rc:698
+#: Merge.rc:495 Merge.rc:705
msgid "Use Default Font"
msgstr "Използване на стандартен ш&рифт"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:493 Merge.rc:736
+#: Merge.rc:497 Merge.rc:743
msgid "Sw&ap Panes"
msgstr "Раз&меняне на панели"
#. IDR_MERGEDOCTYPE, ID_SWAPPANES_SWAP12
-#: Merge.rc:495 Merge.rc:738
+#: Merge.rc:499 Merge.rc:745
msgid "Swap &1st | 2nd"
msgstr "Разменяне на №&1 с №2"
#. IDR_MERGEDOCTYPE, ID_SWAPPANES_SWAP23
-#: Merge.rc:496 Merge.rc:739
+#: Merge.rc:500 Merge.rc:746
msgid "Swap &2nd | 3rd"
msgstr "Разменяне на №&2 с №3"
#. IDR_MERGEDOCTYPE, ID_SWAPPANES_SWAP13
-#: Merge.rc:497 Merge.rc:740
+#: Merge.rc:501 Merge.rc:747
msgid "Swap 1st | &3rd"
msgstr "Разменяне на №1 с №&3"
#. IDR_DIRDOCTYPE, ID_VIEW_DISPLAY_FILTER_BAR_MENU
-#: Merge.rc:514
+#: Merge.rc:518
msgid "Displa&y Filter Bar\tCtrl+Shift+L"
msgstr ""
#. IDR_DIRDOCTYPE, ID_VIEW_DIR_STATISTICS
-#: Merge.rc:518
+#: Merge.rc:522
msgid "Com&pare Statistics..."
msgstr "Статистика на &сравнение…"
#. IDR_MERGEDOCTYPE, ID_REFRESH
-#: Merge.rc:520 Merge.rc:763
+#: Merge.rc:524 Merge.rc:770
msgid "Refresh\tF5"
msgstr "Презареждане\tF5"
#. IDR_POPUP_DIRVIEW, ID_RESCAN
-#: Merge.rc:521 Merge.rc:1030
+#: Merge.rc:525 Merge.rc:1038
msgid "&Refresh Selected\tCtrl+F5"
msgstr "Презареждане на &избрани\tCtrl+F5"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:523 Merge.rc:765
+#: Merge.rc:527 Merge.rc:772
msgid "&Merge"
msgstr "Сли&ване"
#. IDR_DIRDOCTYPE, ID_MERGE_COMPARE
-#: Merge.rc:525
+#: Merge.rc:529
msgid "Co&mpare\tEnter"
msgstr "&Сравняване\tEnter"
#. IDR_MERGEDOCTYPE, ID_NEXTDIFF
-#: Merge.rc:527 Merge.rc:767
+#: Merge.rc:531 Merge.rc:774
msgid "&Next Difference\tAlt+Down"
msgstr "&Следващо различие\tAlt+Down"
#. IDR_MERGEDOCTYPE, ID_PREVDIFF
-#: Merge.rc:528 Merge.rc:768
+#: Merge.rc:532 Merge.rc:775
msgid "&Previous Difference\tAlt+Up"
msgstr "&Предишно различие\tAlt+Up"
#. IDR_MERGEDOCTYPE, ID_FIRSTDIFF
-#: Merge.rc:530 Merge.rc:773
+#: Merge.rc:534 Merge.rc:780
msgid "&First Difference\tAlt+Home"
msgstr "П&ърво различие\tAlt+Home"
#. IDR_MERGEDOCTYPE, ID_CURDIFF
-#: Merge.rc:531 Merge.rc:774
+#: Merge.rc:535 Merge.rc:781
msgid "&Current Difference\tAlt+Enter"
msgstr "&Текущо различие\tAlt+Enter"
#. IDR_MERGEDOCTYPE, ID_LASTDIFF
-#: Merge.rc:532 Merge.rc:775
+#: Merge.rc:536 Merge.rc:782
msgid "&Last Difference\tAlt+End"
msgstr "По&следно различие\tAlt+End"
#. IDR_MERGEDOCTYPE, ID_L2R
-#: Merge.rc:534 Merge.rc:830
+#: Merge.rc:538 Merge.rc:837
msgid "Copy to &Right\tAlt+Right"
msgstr "Копиране в &дясно\tAlt+Right"
#. IDR_MERGEDOCTYPE, ID_R2L
-#: Merge.rc:535 Merge.rc:831
+#: Merge.rc:539 Merge.rc:838
msgid "Copy to L&eft\tAlt+Left"
msgstr "Копиране в &ляво\tAlt+Left"
#. IDR_DIRDOCTYPE, ID_MERGE_DELETE
-#: Merge.rc:537
+#: Merge.rc:541
msgid "&Delete\tDel"
msgstr "&Изтриване\tDel"
#. IDR_POPUP_DIRVIEW, ID_TOOLS_CUSTOMIZECOLUMNS
-#: Merge.rc:541 Merge.rc:1042
+#: Merge.rc:545 Merge.rc:1050
msgid "&Customize Columns..."
msgstr "&Избиране на колони…"
#. IDR_MERGEDOCTYPE, ID_TOOLS_GENERATEREPORT
-#: Merge.rc:544 Merge.rc:851
+#: Merge.rc:548 Merge.rc:858
msgid "Generate &Report..."
msgstr "Изготвяне на &отчет…"
#. IDD_ENCODINGERROR, IDC_PLUGIN
-#: Merge.rc:556 Merge.rc:867 Merge.rc:3064
+#: Merge.rc:560 Merge.rc:874 Merge.rc:3074
msgid "&Edit with Unpacker..."
msgstr "П&роменяне с разопаковчик…"
#. IDR_MERGEDOCTYPE, ID_FILE_SAVE
-#: Merge.rc:611
+#: Merge.rc:617
msgid "&Save\tCtrl+S"
msgstr "&Запазване\tCtrl+S"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:612
+#: Merge.rc:618
msgid "Sav&e"
msgstr "&Запазване"
#. IDR_POPUP_SAVE, ID_FILE_SAVE_LEFT
-#: Merge.rc:614 Merge.rc:1201
+#: Merge.rc:620 Merge.rc:1211
msgid "Save &Left"
msgstr "Запазване на &левия"
#. IDR_POPUP_SAVE, ID_FILE_SAVE_MIDDLE
-#: Merge.rc:615 Merge.rc:1202
+#: Merge.rc:621 Merge.rc:1212
msgid "Save &Middle"
msgstr "Запазване на &средния"
#. IDR_POPUP_SAVE, ID_FILE_SAVE_RIGHT
-#: Merge.rc:616 Merge.rc:1203
+#: Merge.rc:622 Merge.rc:1213
msgid "Save &Right"
msgstr "Запазване на &десния"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:618
+#: Merge.rc:624
msgid "Save &As"
msgstr "Запазване &като"
#. IDR_POPUP_SAVE, ID_FILE_SAVEAS_LEFT
-#: Merge.rc:620 Merge.rc:1205
+#: Merge.rc:626 Merge.rc:1215
msgid "Save &Left As..."
msgstr "Запазване на &левия като…"
#. IDR_POPUP_SAVE, ID_FILE_SAVEAS_MIDDLE
-#: Merge.rc:621 Merge.rc:1206
+#: Merge.rc:627 Merge.rc:1216
msgid "Save &Middle As..."
msgstr "Запазване на &средния като…"
#. IDR_POPUP_SAVE, ID_FILE_SAVEAS_RIGHT
-#: Merge.rc:622 Merge.rc:1207
+#: Merge.rc:628 Merge.rc:1217
msgid "Save &Right As..."
msgstr "Запазване на &десния като…"
#. IDR_MERGEDOCTYPE, ID_FILE_PRINT
-#: Merge.rc:625
+#: Merge.rc:631
msgid "&Print...\tCtrl+P"
msgstr "&Отпечатване…\tCtrl+P"
#. IDR_MERGEDOCTYPE, ID_FILE_PAGE_SETUP
-#: Merge.rc:626
+#: Merge.rc:632
msgid "Page Set&up..."
msgstr "Настройки на &страницата..."
#. IDR_MERGEDOCTYPE, ID_FILE_PRINT_PREVIEW
-#: Merge.rc:627
+#: Merge.rc:633
msgid "Print Previe&w..."
msgstr "П&реглед преди отпечатване..."
#. IDR_MERGEDOCTYPE
-#: Merge.rc:636
+#: Merge.rc:642
msgid "&Convert Line Endings to"
msgstr "Про&меняне на знака за нов ред"
#. IDR_MERGEDOCTYPE, ID_FILE_MERGINGMODE
-#: Merge.rc:643
+#: Merge.rc:649
msgid "Mer&ge Mode\tF9"
msgstr "Режим на &сливане\tF9"
#. IDR_MERGEDOCTYPE, ID_RESCAN
-#: Merge.rc:645
+#: Merge.rc:651
msgid "Reloa&d\tCtrl+F5"
msgstr "Пре&зареждане\tCtrl+F5"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:647
+#: Merge.rc:653
msgid "Reco&mpare As"
msgstr "Сравняване &като"
+#. IDR_POPUP_COMPARE, ID_MERGE_COMPARE_FOLDER
+#: Merge.rc:660 Merge.rc:947 Merge.rc:1185
+msgid "A&rchive"
+msgstr ""
+
#. IDR_MERGEDOCTYPE, ID_EDIT_UNDO
-#: Merge.rc:666
+#: Merge.rc:673
msgid "&Undo\tCtrl+Z"
msgstr "&Отменяне\tCtrl+Z"
#. IDR_MERGEDOCTYPE, ID_EDIT_REDO
-#: Merge.rc:667
+#: Merge.rc:674
msgid "&Redo\tCtrl+Y"
msgstr "По&вторение\tCtrl+Y"
#. IDR_MERGEDOCTYPE, ID_EDIT_CUT
-#: Merge.rc:669
+#: Merge.rc:676
msgid "Cu&t\tCtrl+X"
msgstr "Из&рязване\tCtrl+X"
#. IDR_POPUP_OUTPUTVIEW, ID_EDIT_COPY
-#: Merge.rc:670 Merge.rc:1342
+#: Merge.rc:677 Merge.rc:1352
msgid "&Copy\tCtrl+C"
msgstr "&Копиране\tCtrl+C"
#. IDR_MERGEDOCTYPE, ID_EDIT_FIND
-#: Merge.rc:676
+#: Merge.rc:683
msgid "F&ind...\tCtrl+F"
msgstr "Търс&ене…\tCtrl+F"
#. IDR_MERGEDOCTYPE, ID_EDIT_REPLACE
-#: Merge.rc:677
+#: Merge.rc:684
msgid "Repla&ce...\tCtrl+H"
msgstr "Замес&тване\tCtrl+H"
#. IDR_MERGEDOCTYPE, ID_EDIT_MARK
-#: Merge.rc:678
+#: Merge.rc:685
msgid "&Marker...\tCtrl+Shift+M"
msgstr "&Маркер…\tCtrl+Shift+M"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:680
+#: Merge.rc:687
msgid "Advanced"
msgstr "Допълнителни"
#. IDR_MERGEDOCTYPE, ID_EDIT_COPY_LINENUMBERS
-#: Merge.rc:682
+#: Merge.rc:689
msgid "&Copy With Line Numbers\tCtrl+Shift+C"
msgstr "&Копиране с номера на реда\tCtrl+Shift+C"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:684
+#: Merge.rc:691
msgid "&Bookmarks"
msgstr "&Отметки"
#. IDR_MERGEDOCTYPE, ID_EDIT_TOGGLE_BOOKMARK
-#: Merge.rc:686
+#: Merge.rc:693
msgid "&Toggle Bookmark\tCtrl+F2"
msgstr "&Прикрепи отметка\tCtrl+F2"
#. IDR_MERGEDOCTYPE, ID_EDIT_GOTO_NEXT_BOOKMARK
-#: Merge.rc:687
+#: Merge.rc:694
msgid "&Next Bookmark\tF2"
msgstr "&Следваща отметка\tF2"
#. IDR_MERGEDOCTYPE, ID_EDIT_GOTO_PREV_BOOKMARK
-#: Merge.rc:688
+#: Merge.rc:695
msgid "&Previous Bookmark\tShift+F2"
msgstr "П&редишна отметка\tShift+F2"
#. IDR_MERGEDOCTYPE, ID_EDIT_CLEAR_ALL_BOOKMARKS
-#: Merge.rc:689
+#: Merge.rc:696
msgid "&Clear All Bookmarks"
msgstr "&Изчисти всички отметки"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:706
+#: Merge.rc:713
msgid "Syntax Highlight"
msgstr "&Синтактично оцветяване"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:711
+#: Merge.rc:718
msgid "&Diff Context"
msgstr "&Контекстуалност на различия"
#. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_ALL
-#: Merge.rc:713
+#: Merge.rc:720
msgid "&All Lines"
msgstr "Всички &редове"
#. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_0
-#: Merge.rc:715
+#: Merge.rc:722
msgid "&0 Lines"
msgstr "&0 реда"
#. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_1
-#: Merge.rc:716
+#: Merge.rc:723
msgid "&1 Line"
msgstr "&1 ред"
#. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_3
-#: Merge.rc:717
+#: Merge.rc:724
msgid "&3 Lines"
msgstr "&3 реда"
#. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_5
-#: Merge.rc:718
+#: Merge.rc:725
msgid "&5 Lines"
msgstr "&5 реда"
#. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_7
-#: Merge.rc:719
+#: Merge.rc:726
msgid "&7 Lines"
msgstr "&7 реда"
#. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_9
-#: Merge.rc:720
+#: Merge.rc:727
msgid "&9 Lines"
msgstr "&9 реда"
#. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_TOGGLE
-#: Merge.rc:722
+#: Merge.rc:729
msgid "&Toggle All and 0-9 Lines\tCtrl+D"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_INVERT
-#: Merge.rc:724
+#: Merge.rc:731
msgid "&Invert (Hide Different Lines)"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_VIEW_RESIZE_PANES
-#: Merge.rc:727
+#: Merge.rc:734
msgid "&Lock Panes"
msgstr "Заключване на &панелите"
#. IDR_MERGEDOCTYPE, ID_VIEW_WHITESPACE
-#: Merge.rc:728
+#: Merge.rc:735
msgid "&View Whitespace"
msgstr "&Интервали"
#. IDR_MERGEDOCTYPE, ID_VIEW_EOL
-#: Merge.rc:729
+#: Merge.rc:736
msgid "View E&OL"
msgstr "Знаци за нов &ред"
#. IDR_MERGEDOCTYPE, ID_VIEW_LINEDIFFS
-#: Merge.rc:730
+#: Merge.rc:737
msgid "Vie&w Line Differences"
msgstr "Ра&зличия на реда"
#. IDR_MERGEDOCTYPE, ID_VIEW_LINENUMBERS
-#: Merge.rc:731
+#: Merge.rc:738
msgid "View Line &Numbers"
msgstr "&Номериране на редовете"
#. IDR_MERGEDOCTYPE, ID_VIEW_SELMARGIN
-#: Merge.rc:732
+#: Merge.rc:739
msgid "View &Margins"
msgstr "&Oтстъп"
#. IDR_MERGEDOCTYPE, ID_VIEW_TOPMARGIN
-#: Merge.rc:733
+#: Merge.rc:740
msgid "View To&p Margins"
msgstr "Горна с&кала"
#. IDR_MERGEDOCTYPE, ID_VIEW_WORDWRAP
-#: Merge.rc:734
+#: Merge.rc:741
msgid "W&rap Lines"
msgstr "Прена&сяне на редовете"
#. IDR_MERGEDOCTYPE, ID_VIEW_SPLITVERTICALLY
-#: Merge.rc:742
+#: Merge.rc:749
msgid "Split V&ertically"
msgstr "В&ертикално разделяне"
#. IDR_MERGEDOCTYPE, ID_VIEW_DETAIL_BAR
-#: Merge.rc:759
+#: Merge.rc:766
msgid "Diff &Pane"
msgstr "Панел с &различия"
#. IDR_MERGEDOCTYPE, ID_VIEW_LOCATION_BAR
-#: Merge.rc:760
+#: Merge.rc:767
msgid "Lo&cation Pane"
msgstr "Миниатюрна &карта"
#. IDS_OUTPUTBAR_CAPTION
-#: Merge.rc:761 Merge.rc:4902
+#: Merge.rc:768 Merge.rc:4912
msgid "Output Pane"
msgstr "Панел за извеждане на съдържание"
#. IDR_MERGEDOCTYPE, ID_NEXTCONFLICT
-#: Merge.rc:770
+#: Merge.rc:777
msgid "Ne&xt Conflict\tAlt+Shift+Down"
msgstr "С&ледващ конфликт\tAlt+Shift+Down"
#. IDR_MERGEDOCTYPE, ID_PREVCONFLICT
-#: Merge.rc:771
+#: Merge.rc:778
msgid "Pre&vious Conflict\tAlt+Shift+Up"
msgstr "П&редишен конфликт\tAlt+Shift+Up"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:777
+#: Merge.rc:784
msgid "A&dvanced"
msgstr "Р&азширени"
#. IDR_MERGEDOCTYPE, ID_NEXTDIFFLM
-#: Merge.rc:779
+#: Merge.rc:786
msgid "Next Difference (Left/Middle)\tAlt+1"
msgstr "Следващо различие между ляв и среден\tAlt+1"
#. IDR_MERGEDOCTYPE, ID_PREVDIFFLM
-#: Merge.rc:780
+#: Merge.rc:787
msgid "Previous Difference (Left/Middle)\tAlt+Shift+1"
msgstr "Предишно различие между ляв и среден\tAlt+Shift+1"
#. IDR_MERGEDOCTYPE, ID_NEXTDIFFLR
-#: Merge.rc:782
+#: Merge.rc:789
msgid "Next Difference (Left/Right)\tAlt+2"
msgstr "Следващо различие между ляв и десен\tAlt+2"
#. IDR_MERGEDOCTYPE, ID_PREVDIFFLR
-#: Merge.rc:783
+#: Merge.rc:790
msgid "Previous Difference (Left/Right)\tAlt+Shift+2"
msgstr "Предишно различие между ляв и десен\tAlt+Shift+2"
#. IDR_MERGEDOCTYPE, ID_NEXTDIFFMR
-#: Merge.rc:785
+#: Merge.rc:792
msgid "Next Difference (Middle/Right)\tAlt+3"
msgstr "Следващо различие между среден и десен\tAlt+3"
#. IDR_MERGEDOCTYPE, ID_PREVDIFFMR
-#: Merge.rc:786
+#: Merge.rc:793
msgid "Previous Difference (Middle/Right)\tAlt+Shift+3"
msgstr "Предишно различие между среден и десен\tAlt+Shift+3"
#. IDR_MERGEDOCTYPE, ID_NEXTDIFFLO
-#: Merge.rc:788
+#: Merge.rc:795
msgid "Next Left-Only Difference\tAlt+7"
msgstr "Следващо различие само от ляво\tAlt+7"
#. IDR_MERGEDOCTYPE, ID_PREVDIFFLO
-#: Merge.rc:789
+#: Merge.rc:796
msgid "Previous Left-Only Difference\tAlt+Shift+7"
msgstr "Предишно различие само от ляво\tAlt+Shift+7"
#. IDR_MERGEDOCTYPE, ID_NEXTDIFFMO
-#: Merge.rc:791
+#: Merge.rc:798
msgid "Next Middle-Only Difference\tAlt+8"
msgstr "Следващо различие само в средата\tAlt+8"
#. IDR_MERGEDOCTYPE, ID_PREVDIFFMO
-#: Merge.rc:792
+#: Merge.rc:799
msgid "Previous Middle-Only Difference\tAlt+Shift+8"
msgstr "Предишно различие само в средата\tAlt+Shift+8"
#. IDR_MERGEDOCTYPE, ID_NEXTDIFFRO
-#: Merge.rc:794
+#: Merge.rc:801
msgid "Next Right-Only Difference\tAlt+9"
msgstr "Следващо различие само от дясно\tAlt+9"
#. IDR_MERGEDOCTYPE, ID_PREVDIFFRO
-#: Merge.rc:795
+#: Merge.rc:802
msgid "Previous Right-Only Difference\tAlt+Shift+9"
msgstr "Предишно различие само от дясно\tAlt+Shift+9"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:797
+#: Merge.rc:804
msgid "Copy from &Left to"
msgstr "Копиране от &ляво в"
#. IDD_LOAD_SAVE_CODEPAGE, IDC_AFFECTS_MIDDLE_BTN
-#: Merge.rc:799 Merge.rc:810 Merge.rc:815 Merge.rc:826 Merge.rc:970
-#: Merge.rc:2545 Merge.rc:2817
+#: Merge.rc:806 Merge.rc:817 Merge.rc:822 Merge.rc:833 Merge.rc:978
+#: Merge.rc:2555 Merge.rc:2827
msgid "&Middle"
msgstr "&Средата"
#. IDD_LOAD_SAVE_CODEPAGE, IDC_AFFECTS_RIGHT_BTN
-#: Merge.rc:800 Merge.rc:805 Merge.rc:816 Merge.rc:821 Merge.rc:971
-#: Merge.rc:2546 Merge.rc:2819
+#: Merge.rc:807 Merge.rc:812 Merge.rc:823 Merge.rc:828 Merge.rc:979
+#: Merge.rc:2556 Merge.rc:2829
msgid "&Right"
msgstr "&Дясно"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:802
+#: Merge.rc:809
msgid "Copy from &Middle to"
msgstr "Копиране от &средата в"
#. IDD_LOAD_SAVE_CODEPAGE, IDC_AFFECTS_LEFT_BTN
-#: Merge.rc:804 Merge.rc:809 Merge.rc:820 Merge.rc:825 Merge.rc:969
-#: Merge.rc:2544 Merge.rc:2815
+#: Merge.rc:811 Merge.rc:816 Merge.rc:827 Merge.rc:832 Merge.rc:977
+#: Merge.rc:2554 Merge.rc:2825
msgid "&Left"
msgstr "&Ляво"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:807
+#: Merge.rc:814
msgid "Copy from &Right to"
msgstr "Копиране от &дясно в"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:813
+#: Merge.rc:820
msgid "Copy Selected Lines from Le&ft to"
msgstr "Копиране на избраните &редове от ляво в"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:818
+#: Merge.rc:825
msgid "Copy Selected Lines from Mi&ddle to"
msgstr "Копиране на избраните редове от ср&едата в"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:823
+#: Merge.rc:830
msgid "Copy Selected Lines from Ri&ght to"
msgstr "Копиране на избраните редове от дясн&о в"
#. IDR_MERGEDOCTYPE, ID_COPY_FROM_LEFT
-#: Merge.rc:833
+#: Merge.rc:840
msgid "Copy from Left\tAlt+Shift+Right"
msgstr "Копиране от ляво\tAlt+Shift+Right"
#. IDR_MERGEDOCTYPE, ID_COPY_FROM_RIGHT
-#: Merge.rc:834
+#: Merge.rc:841
msgid "Copy from Right\tAlt+Shift+Left"
msgstr "Копиране от дясно\tAlt+Shift+Left"
#. IDR_MERGEDOCTYPE, ID_L2RNEXT
-#: Merge.rc:836
+#: Merge.rc:843
msgid "C&opy to Right and Advance\tCtrl+Alt+Right"
msgstr "К&опиране в дясно и продължаване\tCtrl+Alt+Right"
#. IDR_MERGEDOCTYPE, ID_R2LNEXT
-#: Merge.rc:837
+#: Merge.rc:844
msgid "Copy &to Left and Advance\tCtrl+Alt+Left"
msgstr "Копиране в ляво и &продължаване\tCtrl+Alt+Left"
#. IDR_MERGEDOCTYPE, ID_ALL_RIGHT
-#: Merge.rc:839
+#: Merge.rc:846
msgid "Copy &All to Right"
msgstr "Копиране &всичко в дясно"
#. IDR_MERGEDOCTYPE, ID_ALL_LEFT
-#: Merge.rc:840
+#: Merge.rc:847
msgid "Cop&y All to Left"
msgstr "Копира&не всичко в ляво"
#. IDR_MERGEDOCTYPE, ID_AUTO_MERGE
-#: Merge.rc:842
+#: Merge.rc:849
msgid "A&uto Merge\tCtrl+Alt+M"
msgstr "А&втоматично сливане\tCtrl+Alt+M"
#. IDR_MERGEDOCTYPE, ID_ADD_SYNCPOINT
-#: Merge.rc:844
+#: Merge.rc:851
msgid "Add &Synchronization Point\tAlt+S"
msgstr "Добавяне точка за &синхронизация\tAlt+S"
#. IDR_MERGEDOCTYPE, ID_CLEAR_SYNCPOINTS
-#: Merge.rc:845
+#: Merge.rc:852
msgid "Clear Sync&hronization Points"
msgstr "Изтриване точки за &синхронизация"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:863
+#: Merge.rc:870
msgid "Unpac&ker"
msgstr "Ра&зопаковчик"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:869
+#: Merge.rc:876
msgid "&Prediffer"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_APPLY_PREDIFFER
-#: Merge.rc:873
+#: Merge.rc:880
msgid "Apply Pre&differ..."
msgstr ""
#. IDR_MERGEDOCTYPE, ID_TRANSFORM_WITH_SCRIPT
-#: Merge.rc:879
+#: Merge.rc:886
msgid "&Transform with Editor Script..."
msgstr ""
#. IDR_MERGEDOCTYPE
-#: Merge.rc:880
+#: Merge.rc:887
msgid "Scripts for &Copying"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_SELECT_EDITOR_SCRIPT_FOR_COPYING
-#: Merge.rc:886
+#: Merge.rc:893
msgid "Select &Editor Script..."
msgstr ""
#. IDR_MERGEDOCTYPE, ID_WINDOW_SPLIT
-#: Merge.rc:898
+#: Merge.rc:905
msgid "Sp&lit"
msgstr "Ра&зделяне"
#. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE
-#: Merge.rc:921
+#: Merge.rc:928
msgid "Comp&are"
msgstr "&Сравняване"
#. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE_WITH_MOVED_RENAMED
-#: Merge.rc:922
+#: Merge.rc:929
msgid "Compar&e with Renamed/Moved Items"
msgstr ""
#. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE_IN_NEW_WINDOW
-#: Merge.rc:923
+#: Merge.rc:930
msgid "Compare in New &Window"
msgstr "Сравняване в нов &прозорец"
#. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE_NONHORIZONTALLY
-#: Merge.rc:924 Merge.rc:931
+#: Merge.rc:931 Merge.rc:938
msgid "Compare Non-hor&izontally..."
msgstr "Нехоризонтално &сравняване…"
#. IDR_POPUP_DIRVIEW
-#: Merge.rc:925
+#: Merge.rc:932
msgid "Compare Non-hor&izontally"
msgstr "Нехоризонтално &сравняване"
#. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE_LEFT1_LEFT2
-#: Merge.rc:927
+#: Merge.rc:934
msgid "First &Left with Second Left"
msgstr "Първи &ляв с втори ляв елемент"
#. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE_RIGHT1_RIGHT2
-#: Merge.rc:928
+#: Merge.rc:935
msgid "First &Right with Second Right"
msgstr "Първи и &десен с втори десен елемент"
#. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE_LEFT1_RIGHT2
-#: Merge.rc:929
+#: Merge.rc:936
msgid "&First Left with Second Right"
msgstr "&Първи ляв с втори десен елемент"
#. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE_LEFT2_RIGHT1
-#: Merge.rc:930
+#: Merge.rc:937
msgid "&Second Left with First Right"
msgstr "&Втори ляв с първи десен елемент"
#. IDR_POPUP_DIRVIEW
-#: Merge.rc:933
+#: Merge.rc:940
msgid "Co&mpare As"
msgstr "С&равняване като"
#. IDS_COPY_LEFT_TO_MIDDLE2
-#: Merge.rc:945 Merge.rc:957 Merge.rc:4502
+#: Merge.rc:953 Merge.rc:965 Merge.rc:4512
#, c-format
msgid "Left to Middle (%1 of %2)"
msgstr "Ляв със среден (%1 от %2)"
#. IDS_COPY_LEFT_TO_RIGHT2
-#: Merge.rc:946 Merge.rc:958 Merge.rc:4501
+#: Merge.rc:954 Merge.rc:966 Merge.rc:4511
#, c-format
msgid "Left to Right (%1 of %2)"
msgstr "Ляв с десен (%1 от %2)"
#. IDS_MOVE_LEFT_TO2
-#: Merge.rc:947 Merge.rc:959 Merge.rc:1022 Merge.rc:4513 Merge.rc:4542
+#: Merge.rc:955 Merge.rc:967 Merge.rc:1030 Merge.rc:4523 Merge.rc:4552
#, c-format
msgid "Left to... (%1 of %2)"
msgstr "Ляв с… (%1 от %2)"
#. IDS_COPY_MIDDLE_TO_LEFT2
-#: Merge.rc:948 Merge.rc:960 Merge.rc:4499
+#: Merge.rc:956 Merge.rc:968 Merge.rc:4509
#, c-format
msgid "Middle to Left (%1 of %2)"
msgstr "Среден с ляв (%1 от %2)"
#. IDS_COPY_MIDDLE_TO_RIGHT2
-#: Merge.rc:949 Merge.rc:961 Merge.rc:4500
+#: Merge.rc:957 Merge.rc:969 Merge.rc:4510
#, c-format
msgid "Middle to Right (%1 of %2)"
msgstr "Среден с десен (%1 от %2)"
#. IDS_MOVE_MIDDLE_TO2
-#: Merge.rc:950 Merge.rc:962 Merge.rc:1023 Merge.rc:4514 Merge.rc:4543
+#: Merge.rc:958 Merge.rc:970 Merge.rc:1031 Merge.rc:4524 Merge.rc:4553
#, c-format
msgid "Middle to... (%1 of %2)"
msgstr "Среден с… (%1 от %2)"
#. IDS_COPY_RIGHT_TO_MIDDLE2
-#: Merge.rc:951 Merge.rc:963 Merge.rc:4498
+#: Merge.rc:959 Merge.rc:971 Merge.rc:4508
#, c-format
msgid "Right to Middle (%1 of %2)"
msgstr "Десен със среден (%1 от %2)"
#. IDS_COPY_RIGHT_TO_LEFT2
-#: Merge.rc:952 Merge.rc:964 Merge.rc:4497
+#: Merge.rc:960 Merge.rc:972 Merge.rc:4507
#, c-format
msgid "Right to Left (%1 of %2)"
msgstr "Десен с ляв (%1 от %2)"
#. IDS_MOVE_RIGHT_TO2
-#: Merge.rc:953 Merge.rc:965 Merge.rc:1024 Merge.rc:4515 Merge.rc:4544
+#: Merge.rc:961 Merge.rc:973 Merge.rc:1032 Merge.rc:4525 Merge.rc:4554
#, c-format
msgid "Right to... (%1 of %2)"
msgstr "Десен с… (%1 от %2)"
#. IDD_EDIT_MARKER, IDC_EDIT_MARKER_DELETE
-#: Merge.rc:967 Merge.rc:2036
+#: Merge.rc:975 Merge.rc:2046
msgid "&Delete"
msgstr "&Изтриване"
#. IDR_POPUP_DIRVIEW, ID_DIR_DEL_BOTH
-#: Merge.rc:972
+#: Merge.rc:980
msgid "&Both"
msgstr "&Двете"
#. IDR_POPUP_DIRVIEW, ID_DIR_DEL_ALL
-#: Merge.rc:973
+#: Merge.rc:981
msgid "&All"
msgstr "&Всички"
#. IDD_EDIT_REPLACE, IDC_EDIT_SCOPE_SELECTION
-#: Merge.rc:974 Merge.rc:2019
+#: Merge.rc:982 Merge.rc:2029
msgid "&Selection"
msgstr "&Избраното"
#. IDR_POPUP_DIRVIEW, ID_DIR_ITEM_RENAME
-#: Merge.rc:976
+#: Merge.rc:984
msgid "Re&name"
msgstr "&Преименуване"
#. IDR_POPUP_DIRVIEW, ID_DIR_HIDE_FILENAMES
-#: Merge.rc:977
+#: Merge.rc:985
msgid "&Hide Items"
msgstr "&Скрийване"
#. IDR_POPUP_DIRVIEW
-#: Merge.rc:979
+#: Merge.rc:987
msgid "&Open Left"
msgstr "&Отваряне на &левия"
#. IDR_POPUP_DIRVIEW
-#: Merge.rc:986
+#: Merge.rc:994
msgid "Open Midd&le"
msgstr "Отваряне на &средния"
#. IDR_POPUP_DIRVIEW
-#: Merge.rc:993
+#: Merge.rc:1001
msgid "O&pen Right"
msgstr "Отваряне на &десния"
#. IDR_POPUP_DIRVIEW
-#: Merge.rc:1001
+#: Merge.rc:1009
msgid "Cop&y Paths"
msgstr "Копиране на &пътищата"
#. IDS_DEL_LEFT_FMT2
-#: Merge.rc:1003 Merge.rc:1012 Merge.rc:4530
+#: Merge.rc:1011 Merge.rc:1020 Merge.rc:4540
#, c-format
msgid "Left (%1 of %2)"
msgstr "Ляв (%1 от %2)"
#. IDS_DEL_MIDDLE_FMT2
-#: Merge.rc:1004 Merge.rc:1013 Merge.rc:4531
+#: Merge.rc:1012 Merge.rc:1021 Merge.rc:4541
#, c-format
msgid "Middle (%1 of %2)"
msgstr "Среден (%1 от %2)"
#. IDS_DEL_RIGHT_FMT2
-#: Merge.rc:1005 Merge.rc:1014 Merge.rc:4532
+#: Merge.rc:1013 Merge.rc:1022 Merge.rc:4542
#, c-format
msgid "Right (%1 of %2)"
msgstr "Десен (%1 от %2)"
#. IDS_DEL_BOTH_FMT2
-#: Merge.rc:1006 Merge.rc:1015 Merge.rc:4533
+#: Merge.rc:1014 Merge.rc:1023 Merge.rc:4543
#, c-format
msgid "Both (%1 of %2)"
msgstr "Двата (%1 от %2)"
#. IDS_DEL_ALL_FMT2
-#: Merge.rc:1007 Merge.rc:1016 Merge.rc:4538
+#: Merge.rc:1015 Merge.rc:1024 Merge.rc:4548
#, c-format
msgid "All (%1 of %2)"
msgstr "Всички (%1 от %2)"
#. IDR_POPUP_DIRVIEW, ID_DIR_COPY_FILENAMES
-#: Merge.rc:1009
+#: Merge.rc:1017
msgid "Copy &Filenames"
msgstr "Копиране на &файловите имена"
#. IDR_POPUP_DIRVIEW
-#: Merge.rc:1010
+#: Merge.rc:1018
msgid "Copy Items to Clip&board"
msgstr "&Копиране елементите в системния буфер"
#. IDR_POPUP_DIRVIEW, ID_DIR_COPY_ALL_DISP_COLUMNS
-#: Merge.rc:1018
+#: Merge.rc:1026
msgid "Copy All Di&splayed Columns"
msgstr ""
#. IDR_POPUP_DIRVIEW
-#: Merge.rc:1020
+#: Merge.rc:1028
msgid "&Zip"
msgstr "&Zip"
#. IDS_COPY_BOTH_TO2
-#: Merge.rc:1025 Merge.rc:4516
+#: Merge.rc:1033 Merge.rc:4526
#, c-format
msgid "Both to... (%1 of %2)"
msgstr "И двата… (%1 от %2)"
#. IDS_COPY_ALL_TO2
-#: Merge.rc:1026 Merge.rc:4517
+#: Merge.rc:1034 Merge.rc:4527
#, c-format
msgid "All to... (%1 of %2)"
msgstr "Всички към… (%1 от %2)"
#. IDS_COPY_DIFFERENCES_TO2
-#: Merge.rc:1027 Merge.rc:4518
+#: Merge.rc:1035 Merge.rc:4528
#, c-format
msgid "Differences to... (%1 of %2)"
msgstr "Различията към… (%1 от %2)"
#. IDR_POPUP_DIRVIEW, ID_DIR_SHELL_CONTEXT_MENU_LEFT
-#: Merge.rc:1032
+#: Merge.rc:1040
msgid "Left Shell Menu"
msgstr "Меню на обкръжението на левия"
#. IDR_POPUP_DIRVIEW, ID_DIR_SHELL_CONTEXT_MENU_MIDDLE
-#: Merge.rc:1033
+#: Merge.rc:1041
msgid "Middle Shell Menu"
msgstr "Меню на обкръжението на средния"
#. IDR_POPUP_DIRVIEW, ID_DIR_SHELL_CONTEXT_MENU_RIGHT
-#: Merge.rc:1034
+#: Merge.rc:1042
msgid "Right Shell Menu"
msgstr "Меню на обкръжението на десния"
#. IDR_POPUP_DIRVIEW, ID_DIR_SHELL_CONTEXT_MENU_BOTH
-#: Merge.rc:1035
+#: Merge.rc:1043
msgid "Both Shell Menu"
msgstr ""
#. IDR_POPUP_DIRVIEW, ID_DIR_SHELL_CONTEXT_MENU_ALL
-#: Merge.rc:1036
+#: Merge.rc:1044
msgid "All Shell Menu"
msgstr ""
#. IDR_POPUP_EDITOR_HEADERBAR, ID_EDITOR_COPY
-#: Merge.rc:1050
+#: Merge.rc:1058
msgid "Copy"
msgstr "Копиране"
#. IDR_POPUP_EDITOR_HEADERBAR, ID_EDITOR_COPY_PATH
-#: Merge.rc:1051
+#: Merge.rc:1059
msgid "&Copy Full Path"
msgstr "&Копиране на пълния път"
#. IDR_POPUP_EDITOR_HEADERBAR, ID_EDITOR_COPY_FILENAME
-#: Merge.rc:1052
+#: Merge.rc:1060
msgid "Copy &Filename"
msgstr "Копиране на &името"
#. IDR_POPUP_EDITOR_HEADERBAR, ID_EDITOR_EDIT_CAPTION
-#: Merge.rc:1053
+#: Merge.rc:1061
msgid "&Edit Caption\tF2"
msgstr "Промяна на &заглавието\tF2"
#. IDR_POPUP_EDITOR_HEADERBAR, ID_EDITOR_EDIT_PATH
-#: Merge.rc:1055
+#: Merge.rc:1063
msgid "Edit &Path\tCtrl+L"
msgstr ""
#. IDR_POPUP_EDITOR_HEADERBAR, ID_EDITOR_SELECT_FILE
-#: Merge.rc:1056
+#: Merge.rc:1064
msgid "&Open..."
msgstr "&Отваряне…"
#. IDR_POPUP_PLUGINS_SETTINGS
-#: Merge.rc:1062
+#: Merge.rc:1070
msgid "Unpacker Settings"
msgstr "Настройки на разопаковчик"
#. IDS_USERCHOICE_NONE
-#: Merge.rc:1064 Merge.rc:1070 Merge.rc:1789 Merge.rc:1793 Merge.rc:5030
+#: Merge.rc:1072 Merge.rc:1078 Merge.rc:1799 Merge.rc:1803 Merge.rc:5040
msgid ""
msgstr "<Няма>"
#. IDS_USERCHOICE_AUTOMATIC
-#: Merge.rc:1065 Merge.rc:1071 Merge.rc:5031
+#: Merge.rc:1073 Merge.rc:1079 Merge.rc:5041
msgid ""
msgstr "<Автоматично>"
#. IDD_OPEN, IDC_SELECT_PREDIFFER
-#: Merge.rc:1066 Merge.rc:1072 Merge.rc:1970 Merge.rc:1974
+#: Merge.rc:1074 Merge.rc:1080 Merge.rc:1980 Merge.rc:1984
msgid "&Select..."
msgstr "&Избиране…"
#. IDR_POPUP_PLUGINS_SETTINGS
-#: Merge.rc:1068
+#: Merge.rc:1076
msgid "Prediffer Settings"
msgstr ""
#. IDR_POPUP_LOCATIONBAR, ID_LOCBAR_GOTODIFF
-#: Merge.rc:1080
+#: Merge.rc:1088
msgid "G&o to Diff"
msgstr "&Отиване към различие"
#. IDR_POPUP_LOCATIONBAR, ID_LOCBAR_MOVECURSOR_ONCLICK
-#: Merge.rc:1083
+#: Merge.rc:1091
msgid "Move Cursor on &Click"
msgstr "Преместване на &показалеца при щракване"
#. IDR_POPUP_LOCATIONBAR, ID_DISPLAY_MOVED_NONE
-#: Merge.rc:1085
+#: Merge.rc:1093
msgid "&No Moved Blocks"
msgstr "&Без преместени блокове"
#. IDR_POPUP_LOCATIONBAR, ID_DISPLAY_MOVED_ALL
-#: Merge.rc:1086
+#: Merge.rc:1094
msgid "&All Moved Blocks"
msgstr "&Всички преместени блокове"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS
-#: Merge.rc:1094 Merge.rc:1127
+#: Merge.rc:1102 Merge.rc:1135
msgid "W&hitespaces"
msgstr "&Интервали"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_WHITESPACE_COMPARE
-#: Merge.rc:1096 Merge.rc:1129
+#: Merge.rc:1104 Merge.rc:1137
msgid "Com&pare"
msgstr "Срав&няване"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_WHITESPACE_IGNORE
-#: Merge.rc:1097 Merge.rc:1130
+#: Merge.rc:1105 Merge.rc:1138
msgid "I&gnore Changes"
msgstr "Пренебре&гване на променените"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_WHITESPACE_IGNOREALL
-#: Merge.rc:1098 Merge.rc:1131
+#: Merge.rc:1106 Merge.rc:1139
msgid "Ig&nore All"
msgstr "Пре&небрегване на всички"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_IGNORE_BLANKLINES
-#: Merge.rc:1100 Merge.rc:1133
+#: Merge.rc:1108 Merge.rc:1141
msgid "Ignore Blan&k Lines"
msgstr "Пренебрегване на пра&зни редове"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_IGNORE_CASE
-#: Merge.rc:1101 Merge.rc:1134
+#: Merge.rc:1109 Merge.rc:1142
msgid "Ignore &Case"
msgstr "Пренебре&гване на регистъра"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_IGNORE_EOL
-#: Merge.rc:1102 Merge.rc:1135
+#: Merge.rc:1110 Merge.rc:1143
msgid "Igno&re EOL Differences (Windows/Unix/Mac)"
msgstr "Пренебрегване на &знаци за нов ред (Windows/Unix/Mac)"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_IGNORE_CODEPAGE
-#: Merge.rc:1103 Merge.rc:1136
+#: Merge.rc:1111 Merge.rc:1144
msgid "Ignore Codepage &Differences"
msgstr "Пропускане на &различия в кодова страница"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_IGNORE_NUMBERS
-#: Merge.rc:1104 Merge.rc:1137
+#: Merge.rc:1112 Merge.rc:1145
msgid "Ignore Num&bers"
msgstr "Пренебрегване на &числа"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_IGNORE_COMMENTS
-#: Merge.rc:1105 Merge.rc:1138
+#: Merge.rc:1113 Merge.rc:1146
msgid "Ignore C&omment Differences"
msgstr "Пренебрегване на различията в &коментари"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_IGNORE_MISSING_TRAILING_EOL
-#: Merge.rc:1106 Merge.rc:1139
+#: Merge.rc:1114 Merge.rc:1147
msgid "Ignore &Missing Trailing EOL"
msgstr ""
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_IGNORE_LINE_BREAKS
-#: Merge.rc:1107 Merge.rc:1140
+#: Merge.rc:1115 Merge.rc:1148
msgid "Ignore Line &Breaks (Treat as Spaces)"
msgstr ""
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_RECURS_CHECK
-#: Merge.rc:1109 Merge.rc:2963
+#: Merge.rc:1117 Merge.rc:2973
msgid "&Include Subfolders"
msgstr "&Включително подпапки"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS
-#: Merge.rc:1110 Merge.rc:1142
+#: Merge.rc:1118 Merge.rc:1150
msgid "&Compare Method"
msgstr "Метод за &сравняване"
#. IDS_COMPMETHOD_FULL_CONTENTS
-#: Merge.rc:1112 Merge.rc:1144 Merge.rc:1328 Merge.rc:4282
+#: Merge.rc:1120 Merge.rc:1152 Merge.rc:1338 Merge.rc:4292
msgid "Full Contents"
msgstr "Цялото съдържание"
#. IDS_COMPMETHOD_QUICK_CONTENTS
-#: Merge.rc:1113 Merge.rc:1145 Merge.rc:1329 Merge.rc:4283
+#: Merge.rc:1121 Merge.rc:1153 Merge.rc:1339 Merge.rc:4293
msgid "Quick Contents"
msgstr "Част от съдържанието"
#. IDS_COMPMETHOD_BINARY_CONTENTS
-#: Merge.rc:1114 Merge.rc:1146 Merge.rc:1330 Merge.rc:4284
+#: Merge.rc:1122 Merge.rc:1154 Merge.rc:1340 Merge.rc:4294
msgid "Binary Contents"
msgstr "Двоично съдържание"
#. IDS_COMPMETHOD_MODDATE
-#: Merge.rc:1115 Merge.rc:1147 Merge.rc:1331 Merge.rc:4285
+#: Merge.rc:1123 Merge.rc:1155 Merge.rc:1341 Merge.rc:4295
msgid "Modified Date"
msgstr "Промени в датата"
#. IDS_COMPMETHOD_DATESIZE
-#: Merge.rc:1116 Merge.rc:1148 Merge.rc:1332 Merge.rc:4286
+#: Merge.rc:1124 Merge.rc:1156 Merge.rc:1342 Merge.rc:4296
msgid "Modified Date and Size"
msgstr "Промени в датата и размера"
#. IDS_COMPMETHOD_SIZE
-#: Merge.rc:1117 Merge.rc:1149 Merge.rc:1333 Merge.rc:4287
+#: Merge.rc:1125 Merge.rc:1157 Merge.rc:1343 Merge.rc:4297
msgid "Size"
msgstr "Размер"
#. IDS_COMPMETHOD_EXISTENCE
-#: Merge.rc:1118 Merge.rc:1150 Merge.rc:1334 Merge.rc:4288
+#: Merge.rc:1126 Merge.rc:1158 Merge.rc:1344 Merge.rc:4298
msgid "Existence"
msgstr "Съществуване"
#. IDR_POPUP_PROJECT, ID_LOAD_PROJECT
-#: Merge.rc:1192
+#: Merge.rc:1202
msgid "&Load Project..."
msgstr "&Отваряне на проект…"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARGALL
-#: Merge.rc:1272 Merge.rc:1301
+#: Merge.rc:1282 Merge.rc:1311
msgid "${*} - All Arguments"
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARG1
-#: Merge.rc:1273 Merge.rc:1302
+#: Merge.rc:1283 Merge.rc:1312
msgid "${1} - First Argument"
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARG2
-#: Merge.rc:1274 Merge.rc:1303
+#: Merge.rc:1284 Merge.rc:1313
msgid "${2} - Second Argument"
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARG3
-#: Merge.rc:1275 Merge.rc:1304
+#: Merge.rc:1285 Merge.rc:1314
msgid "${3} - Third Argument"
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARG4
-#: Merge.rc:1276 Merge.rc:1305
+#: Merge.rc:1286 Merge.rc:1315
msgid "${4} - Fourth Argument"
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARG5
-#: Merge.rc:1277 Merge.rc:1306
+#: Merge.rc:1287 Merge.rc:1316
msgid "${5} - Fifth Argument"
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARG6
-#: Merge.rc:1278 Merge.rc:1307
+#: Merge.rc:1288 Merge.rc:1317
msgid "${6} - Sixth Argument"
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARG7
-#: Merge.rc:1279 Merge.rc:1308
+#: Merge.rc:1289 Merge.rc:1318
msgid "${7} - Seventh Argument"
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARG8
-#: Merge.rc:1280 Merge.rc:1309
+#: Merge.rc:1290 Merge.rc:1319
msgid "${8} - Eighth Argument"
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARG9
-#: Merge.rc:1281 Merge.rc:1310
+#: Merge.rc:1291 Merge.rc:1320
msgid "${9} - Ninth Argument"
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_SRC_FILE
-#: Merge.rc:1289
+#: Merge.rc:1299
msgid "${SRC_FILE} - Source File"
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_SRC_FOLDER
-#: Merge.rc:1290
+#: Merge.rc:1300
msgid "${SRC_FOLDER} - Source Folder"
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_SRC_URL
-#: Merge.rc:1291
+#: Merge.rc:1301
msgid "${SRC_URL} - Source URL"
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_SRC_URL_PROTOCOL
-#: Merge.rc:1292
+#: Merge.rc:1302
msgid "${SRC_URL_PROTOCOL} - Source URL Protocol"
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_SRC_URL_SUFFIX
-#: Merge.rc:1293
+#: Merge.rc:1303
msgid "${SRC_URL_SUFFIX} - Source URL Suffix"
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_DST_FILE
-#: Merge.rc:1294
+#: Merge.rc:1304
msgid "${DST_FILE} - Destination File"
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_DST_FOLDER
-#: Merge.rc:1295
+#: Merge.rc:1305
msgid "${DST_FOLDER} - Destination Folder"
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_DST_URL
-#: Merge.rc:1296
+#: Merge.rc:1306
msgid "${DST_URL} - Destination URL"
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_DST_URL_PROTOCOL
-#: Merge.rc:1297
+#: Merge.rc:1307
msgid "${DST_URL_PROTOCOL} - Destination URL Protocol"
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_DST_URL_SUFFIX
-#: Merge.rc:1298
+#: Merge.rc:1308
msgid "${DST_URL_SUFFIX} - Destination URL Suffix"
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_WINMERGE_HOME
-#: Merge.rc:1299
+#: Merge.rc:1309
msgid "${WINMERGE_HOME} - WinMerge Home Directory"
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_SCRIPT_FILE
-#: Merge.rc:1300
+#: Merge.rc:1310
msgid "${SCRIPT_FILE} - Script File"
msgstr ""
#. IDR_POPUP_PLUGIN_ADD_MENU, ID_PLUGIN_ADD_UNPACKER
-#: Merge.rc:1318
+#: Merge.rc:1328
msgid "Add &Unpacker Plugin..."
msgstr ""
#. IDR_POPUP_PLUGIN_ADD_MENU, ID_PLUGIN_ADD_PREDIFFER
-#: Merge.rc:1319
+#: Merge.rc:1329
msgid "Add &Prediffer Plugin..."
msgstr ""
#. IDR_POPUP_PLUGIN_ADD_MENU, ID_PLUGIN_DUPLICATE
-#: Merge.rc:1320
+#: Merge.rc:1330
msgid "&Duplicate Plugin..."
msgstr ""
#. IDR_POPUP_OUTPUTVIEW, ID_EDIT_CLEAR_ALL
-#: Merge.rc:1344
+#: Merge.rc:1354
msgid "Clear &All"
msgstr "Изчистване &всички"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_MASK_CLEAR
-#: Merge.rc:1352
+#: Merge.rc:1362
msgid "&Clear All"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_MASK_REMOVE_LAST
-#: Merge.rc:1353
+#: Merge.rc:1363
msgid "Remove Last Filter &Group"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_MASK_ALL
-#: Merge.rc:1354
+#: Merge.rc:1364
msgid "R&eset to Default (*.*)"
msgstr ""
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1355
+#: Merge.rc:1365
msgid "Add E&xclude File"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_SYS
-#: Merge.rc:1357
+#: Merge.rc:1367
msgid "&System Files"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_BACKUP
-#: Merge.rc:1358
+#: Merge.rc:1368
msgid "&Editor Backup Files"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_BIN
-#: Merge.rc:1359
+#: Merge.rc:1369
msgid "&Compiled Binary Files"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_LOG
-#: Merge.rc:1360
+#: Merge.rc:1370
msgid "&Log Files"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_TEMP
-#: Merge.rc:1361
+#: Merge.rc:1371
msgid "&Temporary or Cache Files"
msgstr ""
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1363
+#: Merge.rc:1373
msgid "Add Excl&ude Folder"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FOLDER_VCS
-#: Merge.rc:1365
+#: Merge.rc:1375
msgid "&Version Control"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FOLDER_BUILD
-#: Merge.rc:1366
+#: Merge.rc:1376
msgid "&Build Artifacts"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FOLDER_IDE
-#: Merge.rc:1367
+#: Merge.rc:1377
msgid "&IDE"
msgstr ""
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1370
+#: Merge.rc:1380
msgid "Add &File Condition"
msgstr ""
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1372 Merge.rc:1551
+#: Merge.rc:1382 Merge.rc:1561
msgid "File &Size"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_SIZE, ID_FILTERMENU_DIFF_SIZE_LT_1KB
-#: Merge.rc:1374 Merge.rc:1527 Merge.rc:1564 Merge.rc:1629 Merge.rc:1707
+#: Merge.rc:1384 Merge.rc:1537 Merge.rc:1574 Merge.rc:1639 Merge.rc:1717
msgid "Less than 1KB"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_SIZE, ID_FILTERMENU_DIFF_SIZE_GE_1KB
-#: Merge.rc:1375 Merge.rc:1528 Merge.rc:1565 Merge.rc:1630 Merge.rc:1708
+#: Merge.rc:1385 Merge.rc:1538 Merge.rc:1575 Merge.rc:1640 Merge.rc:1718
msgid "1KB or more"
msgstr ""
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_LT_10KB
-#: Merge.rc:1376 Merge.rc:1529 Merge.rc:1631
+#: Merge.rc:1386 Merge.rc:1539 Merge.rc:1641
msgid "Less than 10KB"
msgstr ""
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_GE_10KB
-#: Merge.rc:1377 Merge.rc:1530 Merge.rc:1632
+#: Merge.rc:1387 Merge.rc:1540 Merge.rc:1642
msgid "10KB or more"
msgstr ""
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_LT_100KB
-#: Merge.rc:1378 Merge.rc:1531 Merge.rc:1633
+#: Merge.rc:1388 Merge.rc:1541 Merge.rc:1643
msgid "Less than 100KB"
msgstr ""
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_GE_100KB
-#: Merge.rc:1379 Merge.rc:1532 Merge.rc:1634
+#: Merge.rc:1389 Merge.rc:1542 Merge.rc:1644
msgid "100KB or more"
msgstr ""
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_LT_1MB
-#: Merge.rc:1380 Merge.rc:1533 Merge.rc:1635
+#: Merge.rc:1390 Merge.rc:1543 Merge.rc:1645
msgid "Less than 1MB"
msgstr ""
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_GE_1MB
-#: Merge.rc:1381 Merge.rc:1534 Merge.rc:1636
+#: Merge.rc:1391 Merge.rc:1544 Merge.rc:1646
msgid "1MB or more"
msgstr ""
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_LT_10MB
-#: Merge.rc:1382 Merge.rc:1535 Merge.rc:1637
+#: Merge.rc:1392 Merge.rc:1545 Merge.rc:1647
msgid "Less than 10MB"
msgstr ""
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_GE_10MB
-#: Merge.rc:1383 Merge.rc:1536 Merge.rc:1638
+#: Merge.rc:1393 Merge.rc:1546 Merge.rc:1648
msgid "10MB or more"
msgstr ""
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_LT_100MB
-#: Merge.rc:1384 Merge.rc:1537 Merge.rc:1639
+#: Merge.rc:1394 Merge.rc:1547 Merge.rc:1649
msgid "Less than 100MB"
msgstr ""
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_GE_100MB
-#: Merge.rc:1385 Merge.rc:1538 Merge.rc:1640
+#: Merge.rc:1395 Merge.rc:1548 Merge.rc:1650
msgid "100MB or more"
msgstr ""
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_LT_1GB
-#: Merge.rc:1386 Merge.rc:1539 Merge.rc:1641
+#: Merge.rc:1396 Merge.rc:1549 Merge.rc:1651
msgid "Less than 1GB"
msgstr ""
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_GE_1GB
-#: Merge.rc:1387 Merge.rc:1642
+#: Merge.rc:1397 Merge.rc:1652
msgid "1GB or more"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_RANGE
-#: Merge.rc:1388 Merge.rc:1465 Merge.rc:1517 Merge.rc:1523 Merge.rc:1540
-#: Merge.rc:1566 Merge.rc:1587 Merge.rc:1643 Merge.rc:1709 Merge.rc:1734
+#: Merge.rc:1398 Merge.rc:1475 Merge.rc:1527 Merge.rc:1533 Merge.rc:1550
+#: Merge.rc:1576 Merge.rc:1597 Merge.rc:1653 Merge.rc:1719 Merge.rc:1744
msgid "Custom Range..."
msgstr ""
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1390 Merge.rc:1471 Merge.rc:1568
+#: Merge.rc:1400 Merge.rc:1481 Merge.rc:1578
msgid "&Last Modified"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE
-#: Merge.rc:1392 Merge.rc:1473 Merge.rc:1651
+#: Merge.rc:1402 Merge.rc:1483 Merge.rc:1661
msgid "&Hour"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_HOUR_BEFORE_1
-#: Merge.rc:1394 Merge.rc:1475 Merge.rc:1653
+#: Merge.rc:1404 Merge.rc:1485 Merge.rc:1663
msgid "More than 1 hour ago"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_HOUR_WITHIN_1
-#: Merge.rc:1395 Merge.rc:1476 Merge.rc:1654
+#: Merge.rc:1405 Merge.rc:1486 Merge.rc:1664
msgid "Within 1 hour"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE
-#: Merge.rc:1397 Merge.rc:1478 Merge.rc:1656
+#: Merge.rc:1407 Merge.rc:1488 Merge.rc:1666
msgid "&Day"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_DAY_BEFORE_TODAY
-#: Merge.rc:1399 Merge.rc:1480 Merge.rc:1658
+#: Merge.rc:1409 Merge.rc:1490 Merge.rc:1668
msgid "Before today"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_DAY_TODAY
-#: Merge.rc:1400 Merge.rc:1481 Merge.rc:1659
+#: Merge.rc:1410 Merge.rc:1491 Merge.rc:1669
msgid "Today"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_DAY_BEFORE_YESTERDAY
-#: Merge.rc:1401 Merge.rc:1482 Merge.rc:1660
+#: Merge.rc:1411 Merge.rc:1492 Merge.rc:1670
msgid "Before yesterday"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_DAY_YESTERDAY
-#: Merge.rc:1402 Merge.rc:1483 Merge.rc:1661
+#: Merge.rc:1412 Merge.rc:1493 Merge.rc:1671
msgid "Yesterday"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_DAY_SINCE_YESTERDAY
-#: Merge.rc:1403 Merge.rc:1484 Merge.rc:1662
+#: Merge.rc:1413 Merge.rc:1494 Merge.rc:1672
msgid "Since yesterday"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE
-#: Merge.rc:1405 Merge.rc:1486 Merge.rc:1664
+#: Merge.rc:1415 Merge.rc:1496 Merge.rc:1674
msgid "&Week"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_WEEK_BEFORE_THIS
-#: Merge.rc:1407 Merge.rc:1488 Merge.rc:1666
+#: Merge.rc:1417 Merge.rc:1498 Merge.rc:1676
msgid "Before this week"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_WEEK_THIS
-#: Merge.rc:1408 Merge.rc:1489 Merge.rc:1667
+#: Merge.rc:1418 Merge.rc:1499 Merge.rc:1677
msgid "This week"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_WEEK_BEFORE_LAST
-#: Merge.rc:1409 Merge.rc:1490 Merge.rc:1668
+#: Merge.rc:1419 Merge.rc:1500 Merge.rc:1678
msgid "Before last week"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_WEEK_LAST
-#: Merge.rc:1410 Merge.rc:1491 Merge.rc:1669
+#: Merge.rc:1420 Merge.rc:1501 Merge.rc:1679
msgid "Last week"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_WEEK_SINCE_LAST
-#: Merge.rc:1411 Merge.rc:1492 Merge.rc:1670
+#: Merge.rc:1421 Merge.rc:1502 Merge.rc:1680
msgid "Since last week"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE
-#: Merge.rc:1413 Merge.rc:1494 Merge.rc:1672
+#: Merge.rc:1423 Merge.rc:1504 Merge.rc:1682
msgid "&Month"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_MONTH_BEFORE_THIS
-#: Merge.rc:1415 Merge.rc:1496 Merge.rc:1674
+#: Merge.rc:1425 Merge.rc:1506 Merge.rc:1684
msgid "Before this month"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_MONTH_THIS
-#: Merge.rc:1416 Merge.rc:1497 Merge.rc:1675
+#: Merge.rc:1426 Merge.rc:1507 Merge.rc:1685
msgid "This month"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_MONTH_BEFORE_LAST
-#: Merge.rc:1417 Merge.rc:1498 Merge.rc:1676
+#: Merge.rc:1427 Merge.rc:1508 Merge.rc:1686
msgid "Before last month"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_MONTH_LAST
-#: Merge.rc:1418 Merge.rc:1499 Merge.rc:1677
+#: Merge.rc:1428 Merge.rc:1509 Merge.rc:1687
msgid "Last month"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_MONTH_SINCE_LAST
-#: Merge.rc:1419 Merge.rc:1500 Merge.rc:1678
+#: Merge.rc:1429 Merge.rc:1510 Merge.rc:1688
msgid "Since last month"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE
-#: Merge.rc:1421 Merge.rc:1502 Merge.rc:1680
+#: Merge.rc:1431 Merge.rc:1512 Merge.rc:1690
msgid "&Year"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_YEAR_BEFORE_THIS
-#: Merge.rc:1423 Merge.rc:1504 Merge.rc:1682
+#: Merge.rc:1433 Merge.rc:1514 Merge.rc:1692
msgid "Before this year"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_YEAR_THIS
-#: Merge.rc:1424 Merge.rc:1505 Merge.rc:1683
+#: Merge.rc:1434 Merge.rc:1515 Merge.rc:1693
msgid "This year"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_YEAR_BEFORE_LAST
-#: Merge.rc:1425 Merge.rc:1506 Merge.rc:1684
+#: Merge.rc:1435 Merge.rc:1516 Merge.rc:1694
msgid "Before last year"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_YEAR_LAST
-#: Merge.rc:1426 Merge.rc:1507 Merge.rc:1685
+#: Merge.rc:1436 Merge.rc:1517 Merge.rc:1695
msgid "Last year"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_YEAR_SINCE_LAST
-#: Merge.rc:1427 Merge.rc:1508 Merge.rc:1686
+#: Merge.rc:1437 Merge.rc:1518 Merge.rc:1696
msgid "Since last year"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_RANGE
-#: Merge.rc:1429 Merge.rc:1510 Merge.rc:1688
+#: Merge.rc:1439 Merge.rc:1520 Merge.rc:1698
msgid "&Custom Range..."
msgstr ""
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1431 Merge.rc:1589
+#: Merge.rc:1441 Merge.rc:1599
msgid "&Attributes"
msgstr ""
#. IDR_POPUP_FILTERMENU_ATTR, ID_FILTERMENU_ATTR_READONLY
-#: Merge.rc:1433 Merge.rc:1607
+#: Merge.rc:1443 Merge.rc:1617
msgid "Read-only files"
msgstr ""
#. IDR_POPUP_FILTERMENU_ATTR, ID_FILTERMENU_ATTR_NOT_READONLY
-#: Merge.rc:1434 Merge.rc:1608
+#: Merge.rc:1444 Merge.rc:1618
msgid "Not read-only files"
msgstr ""
#. IDR_POPUP_FILTERMENU_ATTR, ID_FILTERMENU_ATTR_HIDDEN
-#: Merge.rc:1435 Merge.rc:1609
+#: Merge.rc:1445 Merge.rc:1619
msgid "Hidden files"
msgstr ""
#. IDR_POPUP_FILTERMENU_ATTR, ID_FILTERMENU_ATTR_NOT_HIDDEN
-#: Merge.rc:1436 Merge.rc:1610
+#: Merge.rc:1446 Merge.rc:1620
msgid "Not hidden files"
msgstr ""
#. IDR_POPUP_FILTERMENU_ATTR, ID_FILTERMENU_ATTR_SYSTEM
-#: Merge.rc:1437 Merge.rc:1611
+#: Merge.rc:1447 Merge.rc:1621
msgid "System files"
msgstr ""
#. IDR_POPUP_FILTERMENU_ATTR, ID_FILTERMENU_ATTR_NOT_SYSTEM
-#: Merge.rc:1438 Merge.rc:1612
+#: Merge.rc:1448 Merge.rc:1622
msgid "Not system files"
msgstr ""
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1440
+#: Merge.rc:1450
msgid "File &Content"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_CONTAINS
-#: Merge.rc:1442
+#: Merge.rc:1452
msgid "Contains string..."
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_NOT_CONTAINS
-#: Merge.rc:1443
+#: Merge.rc:1453
msgid "Does not contain string..."
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_FIRST_LINE_CONTAINS
-#: Merge.rc:1444
+#: Merge.rc:1454
msgid "First line contains string..."
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_FIRST_LINE_NOT_CONTAINS
-#: Merge.rc:1445
+#: Merge.rc:1455
msgid "First line does not contain string..."
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_FIRST_10_CONTAINS
-#: Merge.rc:1446
+#: Merge.rc:1456
msgid "First 10 lines contain string..."
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_FIRST_10_NOT_CONTAINS
-#: Merge.rc:1447
+#: Merge.rc:1457
msgid "First 10 lines do not contain string..."
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_LAST_10_CONTAINS
-#: Merge.rc:1448
+#: Merge.rc:1458
msgid "Last 10 lines contain string..."
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_LAST_10_NOT_CONTAINS
-#: Merge.rc:1449
+#: Merge.rc:1459
msgid "Last 10 lines do not contain string..."
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_LAST_LINE_CONTAINS
-#: Merge.rc:1450
+#: Merge.rc:1460
msgid "Last line contains string..."
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_LAST_LINE_NOT_CONTAINS
-#: Merge.rc:1451
+#: Merge.rc:1461
msgid "Last line does not contain string..."
msgstr ""
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1453
+#: Merge.rc:1463
msgid "&Line Count"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_LT_10
-#: Merge.rc:1455
+#: Merge.rc:1465
msgid "Less than 10"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_GE_10
-#: Merge.rc:1456
+#: Merge.rc:1466
msgid "10 or more"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_LT_100
-#: Merge.rc:1457
+#: Merge.rc:1467
msgid "Less than 100"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_GE_100
-#: Merge.rc:1458
+#: Merge.rc:1468
msgid "100 or more"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_LT_1000
-#: Merge.rc:1459
+#: Merge.rc:1469
msgid "Less than 1000"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_GE_1000
-#: Merge.rc:1460
+#: Merge.rc:1470
msgid "1000 or more"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_LT_10000
-#: Merge.rc:1461
+#: Merge.rc:1471
msgid "Less than 10000"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_GE_10000
-#: Merge.rc:1462
+#: Merge.rc:1472
msgid "10000 or more"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_LT_100000
-#: Merge.rc:1463
+#: Merge.rc:1473
msgid "Less than 100000"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_GE_100000
-#: Merge.rc:1464
+#: Merge.rc:1474
msgid "100000 or more"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_PROPS
-#: Merge.rc:1467 Merge.rc:1594 Merge.rc:1761 Merge.rc:1778
+#: Merge.rc:1477 Merge.rc:1604 Merge.rc:1771 Merge.rc:1788
msgid "Additional &Properties..."
msgstr "Допълнителни &атрибути…"
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1469
+#: Merge.rc:1479
msgid "Add F&older Condition"
msgstr ""
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1513
+#: Merge.rc:1523
msgid "&Files"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FOLDER_FILES_EQ_0
-#: Merge.rc:1515
+#: Merge.rc:1525
msgid "0 files"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FOLDER_FILES_GE_1
-#: Merge.rc:1516
+#: Merge.rc:1526
msgid "1 file or more"
msgstr ""
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1519
+#: Merge.rc:1529
msgid "&Items"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FOLDER_ITEMS_EQ_0
-#: Merge.rc:1521
+#: Merge.rc:1531
msgid "0 items"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FOLDER_ITEMS_GE_1
-#: Merge.rc:1522
+#: Merge.rc:1532
msgid "1 item or more"
msgstr ""
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1525
+#: Merge.rc:1535
msgid "&Total Size"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FOLDER_STATS_RECURSIVE
-#: Merge.rc:1542
+#: Merge.rc:1552
msgid "&Recursive"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONDITION_ANY
-#: Merge.rc:1544
+#: Merge.rc:1554
msgid "Target: &Any (Left/Middle/Right)"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONDITION_LEFT
-#: Merge.rc:1545
+#: Merge.rc:1555
msgid "Target: &Left"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONDITION_MIDDLE
-#: Merge.rc:1546
+#: Merge.rc:1556
msgid "Target: &Middle"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONDITION_RIGHT
-#: Merge.rc:1547
+#: Merge.rc:1557
msgid "Target: &Right"
msgstr ""
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1549
+#: Merge.rc:1559
msgid "Add &Difference Condition"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_PROP, ID_FILTERMENU_DIFF_PROP_EQUAL
-#: Merge.rc:1553 Merge.rc:1570 Merge.rc:1591 Merge.rc:1696 Merge.rc:1717
-#: Merge.rc:1742
+#: Merge.rc:1563 Merge.rc:1580 Merge.rc:1601 Merge.rc:1706 Merge.rc:1727
+#: Merge.rc:1752
msgid "Equal"
msgstr "Равно"
#. IDR_POPUP_FILTERMENU_DIFF_PROP, ID_FILTERMENU_DIFF_PROP_NOT_EQUAL
-#: Merge.rc:1554 Merge.rc:1571 Merge.rc:1592 Merge.rc:1697 Merge.rc:1718
-#: Merge.rc:1743
+#: Merge.rc:1564 Merge.rc:1581 Merge.rc:1602 Merge.rc:1707 Merge.rc:1728
+#: Merge.rc:1753
msgid "Not Equal"
msgstr "Не равно"
#. IDR_POPUP_FILTERMENU_DIFF_PROP, ID_FILTERMENU_DIFF_PROP_LESS
-#: Merge.rc:1555 Merge.rc:1572 Merge.rc:1698 Merge.rc:1719 Merge.rc:1744
+#: Merge.rc:1565 Merge.rc:1582 Merge.rc:1708 Merge.rc:1729 Merge.rc:1754
msgid "Less Than"
msgstr "По-малко"
#. IDR_POPUP_FILTERMENU_DIFF_PROP, ID_FILTERMENU_DIFF_PROP_LESS_EQUAL
-#: Merge.rc:1556 Merge.rc:1573 Merge.rc:1699 Merge.rc:1720 Merge.rc:1745
+#: Merge.rc:1566 Merge.rc:1583 Merge.rc:1709 Merge.rc:1730 Merge.rc:1755
msgid "Less Than or Equal to"
msgstr "По-малко или равно"
#. IDR_POPUP_FILTERMENU_DIFF_PROP, ID_FILTERMENU_DIFF_PROP_GREATER
-#: Merge.rc:1557 Merge.rc:1574 Merge.rc:1700 Merge.rc:1721 Merge.rc:1746
+#: Merge.rc:1567 Merge.rc:1584 Merge.rc:1710 Merge.rc:1731 Merge.rc:1756
msgid "Greater Than"
msgstr "По-голямо"
#. IDR_POPUP_FILTERMENU_DIFF_PROP, ID_FILTERMENU_DIFF_PROP_GREATER_EQUAL
-#: Merge.rc:1558 Merge.rc:1575 Merge.rc:1701 Merge.rc:1722 Merge.rc:1747
+#: Merge.rc:1568 Merge.rc:1585 Merge.rc:1711 Merge.rc:1732 Merge.rc:1757
msgid "Greater Than or Equal to"
msgstr "По-голямо или равно"
#. IDR_POPUP_FILTERMENU_DIFF_SIZE, ID_FILTERMENU_DIFF_SIZE_LT_10B
-#: Merge.rc:1560 Merge.rc:1703
+#: Merge.rc:1570 Merge.rc:1713
msgid "Less than 10B"
msgstr "По-малко от 10 б"
#. IDR_POPUP_FILTERMENU_DIFF_SIZE, ID_FILTERMENU_DIFF_SIZE_GE_10B
-#: Merge.rc:1561 Merge.rc:1704
+#: Merge.rc:1571 Merge.rc:1714
msgid "10B or more"
msgstr "10 б и повече"
#. IDR_POPUP_FILTERMENU_DIFF_SIZE, ID_FILTERMENU_DIFF_SIZE_LT_100B
-#: Merge.rc:1562 Merge.rc:1705
+#: Merge.rc:1572 Merge.rc:1715
msgid "Less than 100B"
msgstr "По-малко от 100 б"
#. IDR_POPUP_FILTERMENU_DIFF_SIZE, ID_FILTERMENU_DIFF_SIZE_GE_100B
-#: Merge.rc:1563 Merge.rc:1706
+#: Merge.rc:1573 Merge.rc:1716
msgid "100B or more"
msgstr "100 б и повече"
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_LT_1SECOND
-#: Merge.rc:1577 Merge.rc:1724
+#: Merge.rc:1587 Merge.rc:1734
msgid "Less than 1 second"
msgstr "По-малко от 1 секунда"
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_GE_1SECOND
-#: Merge.rc:1578 Merge.rc:1725
+#: Merge.rc:1588 Merge.rc:1735
msgid "1 second or more"
msgstr "1 секунда и повече"
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_LT_1MINUTE
-#: Merge.rc:1579 Merge.rc:1726
+#: Merge.rc:1589 Merge.rc:1736
msgid "Less than 1 minute"
msgstr "По-малко от 1 минута"
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_GE_1MINUTE
-#: Merge.rc:1580 Merge.rc:1727
+#: Merge.rc:1590 Merge.rc:1737
msgid "1 minute or more"
msgstr "1 минута и повече"
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_LT_1HOUR
-#: Merge.rc:1581 Merge.rc:1728
+#: Merge.rc:1591 Merge.rc:1738
msgid "Less than 1 hour"
msgstr "По-малко от 1 час"
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_GE_1HOUR
-#: Merge.rc:1582 Merge.rc:1729
+#: Merge.rc:1592 Merge.rc:1739
msgid "1 hour or more"
msgstr "1 час и повече"
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_LT_1DAY
-#: Merge.rc:1583 Merge.rc:1730
+#: Merge.rc:1593 Merge.rc:1740
msgid "Less than 1 day"
msgstr "По-малко от 1 ден"
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_GE_1DAY
-#: Merge.rc:1584 Merge.rc:1731
+#: Merge.rc:1594 Merge.rc:1741
msgid "1 day or more"
msgstr "1 ден и повече"
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_LT_1WEEK
-#: Merge.rc:1585 Merge.rc:1732
+#: Merge.rc:1595 Merge.rc:1742
msgid "Less than 1 week"
msgstr "По-малко от 1 седмица"
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_GE_1WEEK
-#: Merge.rc:1586 Merge.rc:1733
+#: Merge.rc:1596 Merge.rc:1743
msgid "1 week or more"
msgstr "1 седмица и повеЧе"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_CONDITION_DIFF_LEFT_RIGHT
-#: Merge.rc:1596
+#: Merge.rc:1606
msgid "Target: &Left and Right"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_CONDITION_DIFF_LEFT_MIDDLE
-#: Merge.rc:1597
+#: Merge.rc:1607
msgid "Target: Left and &Middle"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_CONDITION_DIFF_MIDDLE_RIGHT
-#: Merge.rc:1598
+#: Merge.rc:1608
msgid "Target: Middle and &Right"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_CONDITION_DIFF_ALL
-#: Merge.rc:1599
+#: Merge.rc:1609
msgid "Target: &All"
msgstr ""
#. IDR_POPUP_FILTERMENU_BINARY, ID_FILTERMENU_BINARY_ONLY
-#: Merge.rc:1620
+#: Merge.rc:1630
msgid "Binary files only"
msgstr ""
#. IDR_POPUP_FILTERMENU_BINARY, ID_FILTERMENU_TEXT_ONLY
-#: Merge.rc:1621
+#: Merge.rc:1631
msgid "Text files only"
msgstr ""
#. IDR_POPUP_ADDCMPMENU, ID_ADDCMPMENU_CLEAR
-#: Merge.rc:1755
+#: Merge.rc:1765
msgid "&Clear conditions"
msgstr ""
#. IDR_POPUP_ADDCMPMENU, ID_ADDCMPMENU_CMP_SIZE
-#: Merge.rc:1757
+#: Merge.rc:1767
msgid "Compare &Size"
msgstr ""
#. IDR_POPUP_ADDCMPMENU, ID_ADDCMPMENU_CMP_DATE
-#: Merge.rc:1758
+#: Merge.rc:1768
msgid "Compare &Date"
msgstr ""
#. IDR_POPUP_ADDCMPMENU, ID_ADDCMPMENU_CMP_ATTR
-#: Merge.rc:1759
+#: Merge.rc:1769
msgid "Compare &Attributes"
msgstr ""
#. IDR_POPUP_ADDCMPMENU, ID_ADDCMPMENU_CMP_CONTENTS
-#: Merge.rc:1760
+#: Merge.rc:1770
msgid "Compare C&ontents"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_CLEAR
-#: Merge.rc:1769
+#: Merge.rc:1779
msgid "&Clear Keys"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_NAME
-#: Merge.rc:1771
+#: Merge.rc:1781
msgid "&Name"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_BASENAME
-#: Merge.rc:1772
+#: Merge.rc:1782
msgid "&Base name (without extension)"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_NORMALIZED_NAME
-#: Merge.rc:1773
+#: Merge.rc:1783
msgid "Normalized &Unicode Name"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_RELPATH
-#: Merge.rc:1774
+#: Merge.rc:1784
msgid "&Relative Path"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_DATE
-#: Merge.rc:1776
+#: Merge.rc:1786
msgid "&Date"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_HASH_MD5
-#: Merge.rc:1777
+#: Merge.rc:1787
msgid "&Hash (MD5)"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_REPLACE
-#: Merge.rc:1780
+#: Merge.rc:1790
msgid "Insert &replace() Function"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_REGEXREPLACE
-#: Merge.rc:1781
+#: Merge.rc:1791
msgid "Insert rege&xReplace() Function"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU
-#: Merge.rc:1782
+#: Merge.rc:1792
msgid "Replace &Lists"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_CREATE_REPLACELIST
-#: Merge.rc:1784
+#: Merge.rc:1794
msgid "&Create String Replace List and Insert..."
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_CREATE_REGEXREPLACELIST
-#: Merge.rc:1785
+#: Merge.rc:1795
msgid "Create &Regex Replace List and Insert..."
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU
-#: Merge.rc:1787
+#: Merge.rc:1797
msgid "&String Replace Lists"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU
-#: Merge.rc:1791
+#: Merge.rc:1801
msgid "Re&gex Replace Lists"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_STRING_REPLACE_LISTS_FOLDER
-#: Merge.rc:1796
+#: Merge.rc:1806
msgid "Open String Replace Lists Folder..."
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_REGEX_REPLACE_LISTS_FOLDER
-#: Merge.rc:1797
+#: Merge.rc:1807
msgid "Open Regex Replace Lists Folder..."
msgstr ""
#. IDD_FILTERS_CONDITION, IDC_CONDITION_MATCHCASE
-#: Merge.rc:1799 Merge.rc:1995 Merge.rc:2014 Merge.rc:2042 Merge.rc:2585
+#: Merge.rc:1809 Merge.rc:2005 Merge.rc:2024 Merge.rc:2052 Merge.rc:2595
msgid "Match &case"
msgstr "Съвпадение на &регистъра"
#. IDR_POPUP_RENAMEMOVE_MENU
-#: Merge.rc:1801
+#: Merge.rc:1811
msgid "Text &Normalization"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_TOLOWER
-#: Merge.rc:1803
+#: Merge.rc:1813
msgid "&Lowercase"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_TOUPPER
-#: Merge.rc:1804
+#: Merge.rc:1814
msgid "&Uppercase"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_TOHALFWIDTH
-#: Merge.rc:1805
+#: Merge.rc:1815
msgid "&Half-width"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_TOFULLWIDTH
-#: Merge.rc:1806
+#: Merge.rc:1816
msgid "&Full-width"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU
-#: Merge.rc:1807
+#: Merge.rc:1817
msgid "&Chinese Conversion"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_TOSIMPLIFIEDCHINESE
-#: Merge.rc:1809
+#: Merge.rc:1819
msgid "&Simplified Chinese"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_TOTRADITIONALCHINESE
-#: Merge.rc:1810
+#: Merge.rc:1820
msgid "&Traditional Chinese"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU
-#: Merge.rc:1812
+#: Merge.rc:1822
msgid "&Japanese Conversion"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_TOHIRAGANA
-#: Merge.rc:1814
+#: Merge.rc:1824
msgid "&Hiragana"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_TOKATAKANA
-#: Merge.rc:1815
+#: Merge.rc:1825
msgid "&Katakana"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_NORMALIZEUNICODE
-#: Merge.rc:1817
+#: Merge.rc:1827
msgid "Normalize &Unicode"
msgstr ""
#. IDD_ABOUTBOX
-#: Merge.rc:1932
+#: Merge.rc:1942
msgid "About WinMerge"
msgstr "Относно WinMerge"
#. IDD_ABOUTBOX, IDC_WWW
-#: Merge.rc:1936
+#: Merge.rc:1946
msgid "Visit the WinMerge Homepage!"
msgstr "Посетете страницата на WinMerge!"
#. IDD_PLUGINS_EDITPLUGIN, IDOK
-#: Merge.rc:1938 Merge.rc:2080 Merge.rc:2431 Merge.rc:2455 Merge.rc:2469
-#: Merge.rc:2497 Merge.rc:2588 Merge.rc:2613 Merge.rc:2674 Merge.rc:2691
-#: Merge.rc:2703 Merge.rc:2867 Merge.rc:2927 Merge.rc:3062 Merge.rc:3104
-#: Merge.rc:3147 Merge.rc:3197
+#: Merge.rc:1948 Merge.rc:2090 Merge.rc:2441 Merge.rc:2465 Merge.rc:2479
+#: Merge.rc:2507 Merge.rc:2598 Merge.rc:2623 Merge.rc:2684 Merge.rc:2701
+#: Merge.rc:2713 Merge.rc:2877 Merge.rc:2937 Merge.rc:3072 Merge.rc:3114
+#: Merge.rc:3157 Merge.rc:3207
msgid "OK"
msgstr "Добре"
#. IDD_ABOUTBOX, IDC_OPEN_CONTRIBUTORS
-#: Merge.rc:1939
+#: Merge.rc:1949
msgid "Contributors"
msgstr "Дарители"
#. IDD_SELECT_FILES_OR_FOLDERS
-#: Merge.rc:1945 Merge.rc:3070
+#: Merge.rc:1955 Merge.rc:3080
msgid "Select Files or Folders"
msgstr "Избиране на файове или папки"
#. IDD_OPEN, IDC_FILES_DIRS_GROUP0
-#: Merge.rc:1949
+#: Merge.rc:1959
msgid "&1st File or Folder"
msgstr "Файл или папка №&1"
#. IDD_OPEN, IDC_PATH0_READONLY
-#: Merge.rc:1951
+#: Merge.rc:1961
msgid "Re&ad-only"
msgstr "Само за &четене"
#. IDD_OPEN, IDC_SWAP01_STATIC
-#: Merge.rc:1953
+#: Merge.rc:1963
msgid "Swap 1st | 2nd"
msgstr "Разменяне на №1 с №2"
#. IDD_GENERATE_PATCH, IDC_DIFF_BROWSE_FILE1
-#: Merge.rc:1954 Merge.rc:2310 Merge.rc:2413
+#: Merge.rc:1964 Merge.rc:2320 Merge.rc:2423
msgid "&Browse..."
msgstr "Изби&ране…"
#. IDD_OPEN, IDC_FILES_DIRS_GROUP1
-#: Merge.rc:1955
+#: Merge.rc:1965
msgid "&2nd File or Folder"
msgstr "Файл или папка №&2"
#. IDD_OPEN, IDC_PATH1_READONLY
-#: Merge.rc:1957
+#: Merge.rc:1967
msgid "Rea&d-only"
msgstr "Само за че&тене"
#. IDD_OPEN, IDC_SWAP12_STATIC
-#: Merge.rc:1959
+#: Merge.rc:1969
msgid "Swap 2nd | 3rd"
msgstr "Разменяне на №2 с №3"
#. IDD_PROPPAGE_SYSTEM, IDC_FILTER_USER_BROWSE
-#: Merge.rc:1960 Merge.rc:2315
+#: Merge.rc:1970 Merge.rc:2325
msgid "B&rowse..."
msgstr "И&збиране…"
#. IDD_OPEN, IDC_FILES_DIRS_GROUP2
-#: Merge.rc:1961
+#: Merge.rc:1971
msgid "&3rd File or Folder (Optional)"
msgstr "Файл или папка №&3 (по избор)"
#. IDD_OPEN, IDC_PATH2_READONLY
-#: Merge.rc:1963
+#: Merge.rc:1973
msgid "Read-o&nly"
msgstr "Само за чете&не"
#. IDD_OPEN, IDC_SWAP02_STATIC
-#: Merge.rc:1965
+#: Merge.rc:1975
msgid "Swap 1st | 3rd"
msgstr "Разменяне на №1 с №3"
#. IDD_PROPPAGE_BACKUPS, IDC_BACKUP_BROWSE
-#: Merge.rc:1966 Merge.rc:2685 Merge.rc:2883
+#: Merge.rc:1976 Merge.rc:2695 Merge.rc:2893
msgid "Browse..."
msgstr "Избиране…"
#. IDD_OPEN, IDC_FILES_DIRS_GROUP3
-#: Merge.rc:1968
+#: Merge.rc:1978
msgid " Folder: Filter"
msgstr " Папка: Филтър"
#. IDD_OPEN, IDC_RECURS_CHECK
-#: Merge.rc:1971
+#: Merge.rc:1981
msgid "&Include subfolders"
msgstr "&Включително подпапки"
#. IDD_OPEN, IDC_FILES_DIRS_GROUP5
-#: Merge.rc:1972
+#: Merge.rc:1982
msgid " File: Prediffer Plugin"
msgstr " Файл: добавка за обработка преди намиране на различия"
#. IDD_OPEN, IDC_FILES_DIRS_GROUP4
-#: Merge.rc:1976
+#: Merge.rc:1986
msgid " File: Unpacker Plugin"
msgstr " Файл: добавка разопаковчик"
#. IDD_OPEN, IDC_SELECT_UNPACKER
-#: Merge.rc:1978
+#: Merge.rc:1988
msgid "Se&lect..."
msgstr "Изби&ране…"
#. IDD_PLUGINS_EDITPLUGIN, IDCANCEL
-#: Merge.rc:1981 Merge.rc:2001 Merge.rc:2025 Merge.rc:2046 Merge.rc:2081
-#: Merge.rc:2432 Merge.rc:2456 Merge.rc:2470 Merge.rc:2498 Merge.rc:2551
-#: Merge.rc:2589 Merge.rc:2614 Merge.rc:2675 Merge.rc:2692 Merge.rc:2704
-#: Merge.rc:2868 Merge.rc:2928 Merge.rc:3087 Merge.rc:3105 Merge.rc:3148
-#: Merge.rc:3198
+#: Merge.rc:1991 Merge.rc:2011 Merge.rc:2035 Merge.rc:2056 Merge.rc:2091
+#: Merge.rc:2442 Merge.rc:2466 Merge.rc:2480 Merge.rc:2508 Merge.rc:2561
+#: Merge.rc:2599 Merge.rc:2624 Merge.rc:2685 Merge.rc:2702 Merge.rc:2714
+#: Merge.rc:2878 Merge.rc:2938 Merge.rc:3097 Merge.rc:3115 Merge.rc:3158
+#: Merge.rc:3208
msgid "Cancel"
msgstr "Отказ"
#. IDD_OPEN, IDC_OPEN_STATUS
-#: Merge.rc:1982
+#: Merge.rc:1992
msgid "Status:"
msgstr "Състояние:"
#. IDD_PLUGINS_LIST, ID_HELP
-#: Merge.rc:1983 Merge.rc:2082 Merge.rc:2929
+#: Merge.rc:1993 Merge.rc:2092 Merge.rc:2939
msgid "Help"
msgstr "Помощ"
#. IDD_OPEN, IDC_OPTIONS
-#: Merge.rc:1984
+#: Merge.rc:1994
msgid "&Options..."
msgstr "&Настройки…"
#. IDD_EDIT_FIND
-#: Merge.rc:1989
+#: Merge.rc:1999
msgid "Find"
msgstr "Търсене"
#. IDD_EDIT_MARKER, IDC_STATIC
-#: Merge.rc:1992 Merge.rc:2009 Merge.rc:2037
+#: Merge.rc:2002 Merge.rc:2019 Merge.rc:2047
msgid "Fi&nd what:"
msgstr "Търс&ене:"
#. IDD_EDIT_MARKER, IDC_EDIT_WHOLE_WORD
-#: Merge.rc:1994 Merge.rc:2013 Merge.rc:2041
+#: Merge.rc:2004 Merge.rc:2023 Merge.rc:2051
msgid "Match &whole word only"
msgstr "&Само цели думи"
#. IDD_EDIT_MARKER, IDC_EDIT_REGEXP
-#: Merge.rc:1996 Merge.rc:2015 Merge.rc:2043
+#: Merge.rc:2006 Merge.rc:2025 Merge.rc:2053
msgid "Regular &expression"
msgstr "Регулярен &израз"
#. IDD_EDIT_FIND, IDC_FINDDLG_DONTWRAP
-#: Merge.rc:1997
+#: Merge.rc:2007
msgid "D&on't wrap end of file"
msgstr "До &края на файла"
#. IDD_EDIT_FIND, IDC_FINDDLG_DONTCLOSE
-#: Merge.rc:1998
+#: Merge.rc:2008
msgid "&Don't close this dialog"
msgstr "&Без затваряне на диалога"
#. IDD_EDIT_REPLACE, IDC_EDIT_SKIP
-#: Merge.rc:1999 Merge.rc:2021
+#: Merge.rc:2009 Merge.rc:2031
msgid "&Find Next"
msgstr "&Търсене"
#. IDD_EDIT_FIND, IDC_EDIT_FINDPREV
-#: Merge.rc:2000
+#: Merge.rc:2010
msgid "Find &Prev"
msgstr "Търсене &назад"
#. IDD_EDIT_REPLACE
-#: Merge.rc:2006
+#: Merge.rc:2016
msgid "Replace"
msgstr "Заменяне"
#. IDD_EDIT_REPLACE, IDC_STATIC
-#: Merge.rc:2011
+#: Merge.rc:2021
msgid "Re&place with:"
msgstr "&Заменяне:"
#. IDD_EDIT_REPLACE, IDC_EDIT_SCOPE_DONT_WRAP
-#: Merge.rc:2016
+#: Merge.rc:2026
msgid "&Don't wrap at end of file"
msgstr "До &края на файла"
#. IDD_EDIT_REPLACE, IDC_STATIC
-#: Merge.rc:2018
+#: Merge.rc:2028
msgid "Replace in"
msgstr "Заменяне в"
#. IDD_EDIT_REPLACE, IDC_EDIT_SCOPE_WHOLE_FILE
-#: Merge.rc:2020
+#: Merge.rc:2030
msgid "Wh&ole file"
msgstr "В &целия файл"
#. IDD_EDIT_REPLACE, IDC_EDIT_FINDPREV
-#: Merge.rc:2022
+#: Merge.rc:2032
msgid "Find Pre&v"
msgstr "Търсене &назад"
#. IDD_EDIT_REPLACE, IDC_EDIT_REPLACE
-#: Merge.rc:2023
+#: Merge.rc:2033
msgid "&Replace"
msgstr "&Заменяне"
#. IDD_EDIT_REPLACE, IDC_EDIT_REPLACE_ALL
-#: Merge.rc:2024
+#: Merge.rc:2034
msgid "Replace &All"
msgstr "Зам. &всичко"
#. IDS_OPTIONSPG_MARKERCOLORS
-#: Merge.rc:2030 Merge.rc:4209
+#: Merge.rc:2040 Merge.rc:4219
msgid "Markers"
msgstr "Маркер"
#. IDD_EDIT_MARKER, IDC_EDIT_MARKERS_ENABLED
-#: Merge.rc:2033
+#: Merge.rc:2043
msgid "Enable &markers"
msgstr "Използване на &маркер"
#. IDD_FILTERS_LINEFILTERS, IDC_LFILTER_ADDBTN
-#: Merge.rc:2035 Merge.rc:2057
+#: Merge.rc:2045 Merge.rc:2067
msgid "New"
msgstr "&Нов"
#. IDD_EDIT_MARKER, IDC_STATIC
-#: Merge.rc:2039
+#: Merge.rc:2049
msgid "&Background color:"
msgstr "Цвят на &фона:"
#. IDS_MESSAGEBOX_OK
-#: Merge.rc:2044 Merge.rc:2829 Merge.rc:3086 Merge.rc:4171
+#: Merge.rc:2054 Merge.rc:2839 Merge.rc:3096 Merge.rc:4181
msgid "&Ok"
msgstr "&Добре"
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:2045 Merge.rc:2525 Merge.rc:3199
+#: Merge.rc:2055 Merge.rc:2535 Merge.rc:3209
msgid "&Apply"
msgstr "&Прилагане"
#. IDD_FILTERS_LINEFILTERS
-#: Merge.rc:2051
+#: Merge.rc:2061
msgid "Line Filters"
msgstr "Филтри за редове"
#. IDD_FILTERS_LINEFILTERS, IDC_IGNOREREGEXP
-#: Merge.rc:2054
+#: Merge.rc:2064
msgid "Enable Line Filters"
msgstr "Включване филтри за редове"
#. IDD_FILTERS_LINEFILTERS, IDC_STATIC
-#: Merge.rc:2055
+#: Merge.rc:2065
msgid "Regular Expressions (one per line):"
msgstr "Регулярни изрази (по един на ред):"
#. IDD_PLUGINS_LIST, IDC_PLUGIN_EDIT
-#: Merge.rc:2058 Merge.rc:2924
+#: Merge.rc:2068 Merge.rc:2934
msgid "Edit"
msgstr "Променяне"
#. IDD_PLUGINS_LIST, IDC_PLUGIN_REMOVE
-#: Merge.rc:2059 Merge.rc:2071 Merge.rc:2925
+#: Merge.rc:2069 Merge.rc:2081 Merge.rc:2935
msgid "Remove"
msgstr "Премахване"
#. IDD_FILTERS_SUBSTITUTIONFILTERS
-#: Merge.rc:2064
+#: Merge.rc:2074
msgid "Substitution Filters"
msgstr "Заместващи филтри"
#. IDD_FILTERS_SUBSTITUTIONFILTERS, IDC_STATIC
-#: Merge.rc:2067
+#: Merge.rc:2077
msgid "Changes to the listed pairs below will be ignored or marked as insignificant. Patches are unaffected."
msgstr ""
#. IDD_FILTERS_SUBSTITUTIONFILTERS, IDC_IGNORED_SUSBSTITUTIONS_ENABLED
-#: Merge.rc:2068
+#: Merge.rc:2078
msgid "Enable"
msgstr "Включване"
#. IDD_PLUGINS_LIST, IDC_PLUGIN_ADD
-#: Merge.rc:2070 Merge.rc:2923
+#: Merge.rc:2080 Merge.rc:2933
msgid "Add"
msgstr "Добавяне"
#. IDD_FILTERS_SUBSTITUTIONFILTERS, IDC_LFILTER_CLEARBTN
-#: Merge.rc:2072
+#: Merge.rc:2082
msgid "Clear"
msgstr "Изчистване"
#. IDD_PREFERENCES
-#: Merge.rc:2077
+#: Merge.rc:2087
msgid "Options"
msgstr "Настройки"
#. IDD_PREFERENCES, IDC_TREEOPT_IMPORT
-#: Merge.rc:2086
+#: Merge.rc:2096
msgid "Import..."
msgstr "Внасяне…"
#. IDD_PREFERENCES, IDC_TREEOPT_EXPORT
-#: Merge.rc:2087
+#: Merge.rc:2097
msgid "Export..."
msgstr "Изнасяне…"
#. IDS_OPTIONSPG_GENCOMPARE
-#: Merge.rc:2092 Merge.rc:4199 Merge.rc:4202 Merge.rc:4219
+#: Merge.rc:2102 Merge.rc:4209 Merge.rc:4212 Merge.rc:4229
msgid "General"
msgstr "Основни"
#. IDD_PROPPAGE_GENERAL, IDC_SCROLL_CHECK
-#: Merge.rc:2095
+#: Merge.rc:2105
msgid "Automatically &scroll to first difference"
msgstr "Автоматично плъзване към първото &различие"
#. IDD_PROPPAGE_GENERAL, IDC_SCROLL_TO_FIRST_INLINE_DIFF_CHECK
-#: Merge.rc:2097
+#: Merge.rc:2107
msgid "Automatically s&croll to first inline difference"
msgstr "Автоматично п&лъзване към първото различие на реда"
#. IDD_PROPPAGE_GENERAL, IDC_STATIC
-#: Merge.rc:2099
+#: Merge.rc:2109
msgid "Cl&ose windows with 'Esc':"
msgstr "Затваряне &прозорците при „Esc“:"
#. IDD_PROPPAGE_GENERAL, IDC_VERIFY_OPEN_PATHS
-#: Merge.rc:2101
+#: Merge.rc:2111
msgid "&Automatically verify paths in Open dialog"
msgstr "&Автоматична проверка на пътищата в диалога за отваряне"
#. IDD_PROPPAGE_GENERAL, IDC_STATIC
-#: Merge.rc:2103
+#: Merge.rc:2113
msgid "Single instance mode:"
msgstr "Режим на единствен екземпляр:"
#. IDD_PROPPAGE_GENERAL, IDC_ASK_MULTIWINDOW_CLOSE
-#: Merge.rc:2105
+#: Merge.rc:2115
msgid "As&k when closing multiple windows"
msgstr "Потвърждение при &затваряне на няколко прозореца"
#. IDD_PROPPAGE_GENERAL, IDC_PRESERVE_FILETIME
-#: Merge.rc:2107
+#: Merge.rc:2117
msgid "&Preserve file time in file compare"
msgstr "Запазване &времето на файла при сравняване"
#. IDD_PROPPAGE_GENERAL, IDC_STARTUP_FOLDER_SELECT
-#: Merge.rc:2109
+#: Merge.rc:2119
msgid "Show \"Select Files or Folders\" dialog on startup"
msgstr "Показване „Избиране на файлове или папки“ при стартиране"
#. IDD_PROPPAGE_GENERAL, IDC_CLOSE_WITH_OK
-#: Merge.rc:2111
+#: Merge.rc:2121
msgid "Close \"Select Files or Folders\" dialog on clicking Compare button"
msgstr "Затваряне „Избиране на файлове или папки“ при натискане на Сравняване"
#. IDD_PROPPAGE_GENERAL, IDC_STATIC
-#: Merge.rc:2113
+#: Merge.rc:2123
msgid "Op&en dialog Auto completion:"
msgstr "Автоматично &довършване в „Избиране на файлове или папки“:"
#. IDD_PROPPAGE_GENERAL, IDC_STATIC
-#: Merge.rc:2115
+#: Merge.rc:2125
msgid "Auto-&reload modified files:"
msgstr "Автоматично &презареждане на променени файлове:"
#. IDD_PROPPAGE_GENERAL, IDC_STATIC
-#: Merge.rc:2117
+#: Merge.rc:2127
msgid "Language:"
msgstr "Език:"
#. IDD_PROPPAGE_COMPARE_WEBPAGE, IDC_COMPARE_DEFAULTS
-#: Merge.rc:2119 Merge.rc:2299 Merge.rc:2321 Merge.rc:2352 Merge.rc:2369
-#: Merge.rc:2386 Merge.rc:2394 Merge.rc:2430 Merge.rc:2454 Merge.rc:2633
-#: Merge.rc:2644 Merge.rc:2653 Merge.rc:2887 Merge.rc:2922 Merge.rc:2985
-#: Merge.rc:3010 Merge.rc:3024 Merge.rc:3038 Merge.rc:3054
+#: Merge.rc:2129 Merge.rc:2309 Merge.rc:2331 Merge.rc:2362 Merge.rc:2379
+#: Merge.rc:2396 Merge.rc:2404 Merge.rc:2440 Merge.rc:2464 Merge.rc:2643
+#: Merge.rc:2654 Merge.rc:2663 Merge.rc:2897 Merge.rc:2932 Merge.rc:2995
+#: Merge.rc:3020 Merge.rc:3034 Merge.rc:3048 Merge.rc:3064
msgid "Defaults"
msgstr "По подразбиране"
#. IDS_OPTIONSPG_COLORS
-#: Merge.rc:2124 Merge.rc:2140 Merge.rc:2267 Merge.rc:2292 Merge.rc:4205
+#: Merge.rc:2134 Merge.rc:2150 Merge.rc:2277 Merge.rc:2302 Merge.rc:4215
msgid "Colors"
msgstr "Цветове"
#. IDD_PROPPAGE_COLOR_SCHEMES, IDC_STATIC
-#: Merge.rc:2127
+#: Merge.rc:2137
msgid "Color &mode:"
msgstr "Цветови &режим&"
#. IDD_PROPPAGE_COLOR_SCHEMES, IDC_STATIC
-#: Merge.rc:2129
+#: Merge.rc:2139
msgid "&Light mode scheme:"
msgstr "Тема на &светлия режим:"
#. IDD_PROPPAGE_COLOR_SCHEMES, IDC_STATIC
-#: Merge.rc:2131
+#: Merge.rc:2141
msgid "&Dark mode scheme:"
msgstr "Тема на &тъмния режим:"
#. IDD_PROPPAGE_COLOR_SCHEMES, IDC_STATIC
-#: Merge.rc:2133
+#: Merge.rc:2143
msgid "Your custom schemes"
msgstr "Потребителски теми"
#. IDD_PROPPAGE_COLOR_SCHEMES, IDC_COLOR_SCHEME_SAVE
-#: Merge.rc:2134
+#: Merge.rc:2144
msgid "&Save current scheme..."
msgstr "&Запазване на текущата тема…"
#. IDD_PROPPAGE_COLOR_SCHEMES, IDC_COLOR_SCHEME_DELETE
-#: Merge.rc:2135
+#: Merge.rc:2145
msgid "Delete ¤t scheme..."
msgstr "&Премахване на текущата тема…"
#. IDD_PROPPAGE_COLORS_DIR, IDC_BACKGROUND_COLUMN_LABEL
-#: Merge.rc:2143 Merge.rc:2238 Merge.rc:2258 Merge.rc:2272
+#: Merge.rc:2153 Merge.rc:2248 Merge.rc:2268 Merge.rc:2282
msgid "Background"
msgstr "Фон"
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2144
+#: Merge.rc:2154
msgid "Deleted"
msgstr "Изтрити"
#. IDS_OPTIONSPG_TEXTCOLORS
-#: Merge.rc:2145 Merge.rc:2207 Merge.rc:2239 Merge.rc:2273 Merge.rc:4207
+#: Merge.rc:2155 Merge.rc:2217 Merge.rc:2249 Merge.rc:2283 Merge.rc:4217
msgid "Text"
msgstr "Текст"
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2146
+#: Merge.rc:2156
msgid "Difference:"
msgstr "Различия:"
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2151
+#: Merge.rc:2161
msgid "Selected Difference:"
msgstr "Избрани различия:"
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2156
+#: Merge.rc:2166
msgid "Ignored Difference:"
msgstr "Пренебрегнати различия:"
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2161
+#: Merge.rc:2171
msgid "Moved:"
msgstr "Преместени:"
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2166
+#: Merge.rc:2176
msgid "Selected Moved:"
msgstr "Избрани и преместени:"
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2171
+#: Merge.rc:2181
msgid "Same As Next (3 panes):"
msgstr "Също като следващото (3 панела):"
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2176
+#: Merge.rc:2186
msgid "Same As Next (Selected):"
msgstr "Също като следващото (избрано):"
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2181
+#: Merge.rc:2191
msgid "Word Difference:"
msgstr "Различия в думи:"
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2186
+#: Merge.rc:2196
msgid "Selected Word Diff:"
msgstr "В избраните думи:"
#. IDD_INPUTBOX
-#: Merge.rc:2195 Merge.rc:2230 Merge.rc:2251 Merge.rc:3099
+#: Merge.rc:2205 Merge.rc:2240 Merge.rc:2261 Merge.rc:3109
msgid "Dialog"
msgstr "Диалог"
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC
-#: Merge.rc:2198
+#: Merge.rc:2208
msgid "Keywords:"
msgstr "Ключови думи:"
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC
-#: Merge.rc:2199
+#: Merge.rc:2209
msgid "Function names:"
msgstr "Имена на функции:"
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC
-#: Merge.rc:2200
+#: Merge.rc:2210
msgid "Comments:"
msgstr "Коментари:"
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC
-#: Merge.rc:2201
+#: Merge.rc:2211
msgid "Numbers:"
msgstr "Числа:"
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC
-#: Merge.rc:2202
+#: Merge.rc:2212
msgid "Operators:"
msgstr "Оператори:"
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC
-#: Merge.rc:2203
+#: Merge.rc:2213
msgid "Strings:"
msgstr "Низове:"
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC
-#: Merge.rc:2204
+#: Merge.rc:2214
msgid "Preprocessor:"
msgstr "Предпроцесор:"
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC
-#: Merge.rc:2205
+#: Merge.rc:2215
msgid "User 1:"
msgstr "Потребител 1:"
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC
-#: Merge.rc:2206
+#: Merge.rc:2216
msgid "User 2:"
msgstr "Потребител 2:"
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_SCOLOR_USER2_BOLD
-#: Merge.rc:2209 Merge.rc:2211 Merge.rc:2213 Merge.rc:2215 Merge.rc:2217
-#: Merge.rc:2219 Merge.rc:2221 Merge.rc:2223 Merge.rc:2225
+#: Merge.rc:2219 Merge.rc:2221 Merge.rc:2223 Merge.rc:2225 Merge.rc:2227
+#: Merge.rc:2229 Merge.rc:2231 Merge.rc:2233 Merge.rc:2235
msgid "Bold"
msgstr "Получер"
#. IDD_PROPPAGE_COLORS_TEXT, IDC_DEFAULT_STANDARD_COLORS
-#: Merge.rc:2233
+#: Merge.rc:2243
msgid "&Use customized text colors"
msgstr "&Задаване на цветове за текст"
#. IDD_PROPPAGE_COLORS_TEXT, IDC_WHITESPACE_COLOR_LABEL
-#: Merge.rc:2235
+#: Merge.rc:2245
msgid "Whitespace:"
msgstr "Интервали:"
#. IDD_PROPPAGE_COLORS_TEXT, IDC_TEXT_COLOR_LABEL
-#: Merge.rc:2236
+#: Merge.rc:2246
msgid "Regular text:"
msgstr "Нормален текст:"
#. IDD_PROPPAGE_COLORS_TEXT, IDC_SELECTION_COLOR_LABEL
-#: Merge.rc:2237
+#: Merge.rc:2247
msgid "Selection:"
msgstr "Избран:"
#. IDD_PROPPAGE_COLORS_DIR, IDC_STATIC
-#: Merge.rc:2245 Merge.rc:2286
+#: Merge.rc:2255 Merge.rc:2296
msgid "Margin:"
msgstr "Поле:"
#. IDD_PROPPAGE_COLORS_MARKER, IDC_MARKER0_COLOR_LABEL
-#: Merge.rc:2254
+#: Merge.rc:2264
msgid "Search Marker:"
msgstr "При търсене:"
#. IDD_PROPPAGE_COLORS_MARKER, IDC_MARKER1_COLOR_LABEL
-#: Merge.rc:2255
+#: Merge.rc:2265
msgid "User Defined Marker 1:"
msgstr "Маркер 1:"
#. IDD_PROPPAGE_COLORS_MARKER, IDC_MARKER2_COLOR_LABEL
-#: Merge.rc:2256
+#: Merge.rc:2266
msgid "User Defined Marker 2:"
msgstr "Маркер 2:"
#. IDD_PROPPAGE_COLORS_MARKER, IDC_MARKER3_COLOR_LABEL
-#: Merge.rc:2257
+#: Merge.rc:2267
msgid "User Defined Marker 3:"
msgstr "Маркер 3:"
#. IDD_PROPPAGE_COLORS_DIR, IDC_USE_DIR_COMPARE_COLORS
-#: Merge.rc:2270
+#: Merge.rc:2280
msgid "&Use folder compare colors"
msgstr "&Задаване на цветове при сравняване на папки"
#. IDD_PROPPAGE_COLORS_DIR, IDC_STATIC
-#: Merge.rc:2274
+#: Merge.rc:2284
msgid "Items equal:"
msgstr "Еднакви елементи:"
#. IDD_PROPPAGE_COLORS_DIR, IDC_STATIC
-#: Merge.rc:2277
+#: Merge.rc:2287
msgid "Items different:"
msgstr "Различни елементи:"
#. IDD_PROPPAGE_COLORS_DIR, IDC_STATIC
-#: Merge.rc:2280
+#: Merge.rc:2290
msgid "Items missing:"
msgstr "Липсващи елементи:"
#. IDD_PROPPAGE_COLORS_DIR, IDC_STATIC
-#: Merge.rc:2283
+#: Merge.rc:2293
msgid "Items filtered:"
msgstr "Филтрирани елементи:"
#. IDD_PROPPAGE_COLORS_SYSTEM, IDC_SYSCOLOR_HOOK_ENABLED
-#: Merge.rc:2295
+#: Merge.rc:2305
msgid "&Use custom system colors"
msgstr ""
#. IDS_PRPCAT_SYSTEM
-#: Merge.rc:2304 Merge.rc:4211 Merge.rc:4212 Merge.rc:4657
+#: Merge.rc:2314 Merge.rc:4221 Merge.rc:4222 Merge.rc:4667
msgid "System"
msgstr "Системни"
#. IDD_PROPPAGE_SYSTEM, IDC_USE_RECYCLE_BIN
-#: Merge.rc:2307
+#: Merge.rc:2317
msgid "&Use Recycle Bin"
msgstr "&Използване на Кошчето"
#. IDD_PROPPAGE_SYSTEM, IDC_STATIC
-#: Merge.rc:2308
+#: Merge.rc:2318
msgid "&External editor:"
msgstr "&Външен редактор:"
#. IDD_PROPPAGE_SYSTEM, IDC_STATIC
-#: Merge.rc:2311
+#: Merge.rc:2321
msgid "&Store user data in:"
msgstr ""
#. IDD_PROPPAGE_SYSTEM, IDC_STATIC
-#: Merge.rc:2313
+#: Merge.rc:2323
msgid "&Filter folder:"
msgstr "&Папка за филтри:"
#. IDD_PROPPAGE_SYSTEM, IDC_STATIC
-#: Merge.rc:2316
+#: Merge.rc:2326
msgid "Temporary files folder"
msgstr "Временна папка"
#. IDD_PROPPAGE_SYSTEM, IDC_TMPFOLDER_SYSTEM
-#: Merge.rc:2317
+#: Merge.rc:2327
msgid "S&ystem temp folder"
msgstr "Папката с &временни файлове"
#. IDD_PROPPAGE_SYSTEM, IDC_STATIC
-#: Merge.rc:2318
+#: Merge.rc:2328
msgid "C&ustom folder:"
msgstr "Друга &папка:"
#. IDD_GENERATE_PATCH, IDC_DIFF_BROWSE_FILE2
-#: Merge.rc:2320 Merge.rc:2416
+#: Merge.rc:2330 Merge.rc:2426
msgid "Br&owse..."
msgstr "Изби&ране…"
#. IDS_OPTIONSPG_COMPARE
-#: Merge.rc:2326 Merge.rc:4200
+#: Merge.rc:2336 Merge.rc:4210
msgid "Compare"
msgstr "Сравняване"
#. IDD_PROPPAGE_COMPARE, IDC_STATIC
-#: Merge.rc:2329
+#: Merge.rc:2339
msgid "Whitespaces"
msgstr "Интервали"
#. IDD_PROPPAGE_COMPARE, IDC_WHITESPACE
-#: Merge.rc:2330
+#: Merge.rc:2340
msgid "&Compare"
msgstr "&Сравняване"
#. IDD_PROPPAGE_COMPARE, IDC_WHITE_CHANGE
-#: Merge.rc:2331
+#: Merge.rc:2341
msgid "&Ignore change"
msgstr "&Пренебрегване на променените"
#. IDD_PROPPAGE_COMPARE, IDC_ALL_WHITE
-#: Merge.rc:2332
+#: Merge.rc:2342
msgid "I&gnore all"
msgstr "Пренебре&гване на всички"
#. IDD_PROPPAGE_COMPARE, IDC_IGNBLANKS_CHECK
-#: Merge.rc:2333
+#: Merge.rc:2343
msgid "Ignore blan&k lines"
msgstr "Пренебрегване на пра&зни редове"
#. IDD_PROPPAGE_COMPARE, IDC_IGNCASE_CHECK
-#: Merge.rc:2334
+#: Merge.rc:2344
msgid "Ignore &case"
msgstr "Пренебре&гване на регистъра"
#. IDD_PROPPAGE_COMPARE, IDC_EOL_SENSITIVE
-#: Merge.rc:2335
+#: Merge.rc:2345
msgid "Igno&re EOL differences (Windows/Unix/Mac)"
msgstr "Пренебрегване на &знаци за нов ред (Windows/Unix/Mac)"
#. IDD_PROPPAGE_COMPARE, IDC_IGNORE_NUMBERS
-#: Merge.rc:2337
+#: Merge.rc:2347
msgid "Ignore num&bers"
msgstr "Пренебрегване на &числа"
#. IDD_PROPPAGE_COMPARE, IDC_CP_SENSITIVE
-#: Merge.rc:2338
+#: Merge.rc:2348
msgid "Ignore codepage &differences"
msgstr "Пропускане на &различия в кодова страница"
#. IDD_PROPPAGE_COMPARE, IDC_FILTERCOMMENTS_CHECK
-#: Merge.rc:2339
+#: Merge.rc:2349
msgid "Ignore c&omment differences"
msgstr "Пренебрегване на различията в &коментари"
#. IDD_PROPPAGE_COMPARE, IDC_IGNEOFEOL_CHECK
-#: Merge.rc:2341
+#: Merge.rc:2351
msgid "Ignore &missing trailing EOL"
msgstr "Пренебрегване липсващи &висящи знаци за нов ред"
#. IDD_PROPPAGE_COMPARE, IDC_IGNLBRKS_CHECK
-#: Merge.rc:2343
+#: Merge.rc:2353
msgid "Ignore line &breaks (treat as spaces)"
msgstr "Пренебрегване на знаците за нов ред (смятат се за интервали)"
#. IDD_PROPPAGE_COMPARE, IDC_MOVED_BLOCKS
-#: Merge.rc:2345
+#: Merge.rc:2355
msgid "E&nable moved block detection"
msgstr "Разпознаване на преместени па&раграфи"
#. IDD_PROPPAGE_COMPARE, IDC_ALIGN_SIMILAR_LINES
-#: Merge.rc:2346
+#: Merge.rc:2356
msgid "Align &similar lines"
msgstr "Подра&вняване на подобни редове"
#. IDD_PROPPAGE_COMPARE, IDC_STATIC
-#: Merge.rc:2347
+#: Merge.rc:2357
msgid "Diff &algorithm:"
msgstr "&Алгоритъм за различия:"
#. IDD_PROPPAGE_COMPARE, IDC_INDENT_HEURISTIC
-#: Merge.rc:2349
+#: Merge.rc:2359
msgid "Enable indent &heuristic"
msgstr "П&редполагане на отстъпа"
#. IDD_PROPPAGE_COMPARE, IDC_COMPLETELY_BLANK_OUT_IGNORED_DIFFERENCES
-#: Merge.rc:2350
+#: Merge.rc:2360
msgid "Completely unhighlight the ignored differences"
msgstr "Без синтактично оцветяване на пренебрегнати различия"
#. IDS_OPTIONSPG_EDITOR
-#: Merge.rc:2357 Merge.rc:4201
+#: Merge.rc:2367 Merge.rc:4211
msgid "Editor"
msgstr "Редактор"
#. IDD_PROPPAGE_EDITOR, IDC_HILITE_CHECK
-#: Merge.rc:2360
+#: Merge.rc:2370
msgid "&Highlight syntax"
msgstr "С&интактично оцветяване"
#. IDD_PROPPAGE_EDITOR, IDC_MIXED_EOL
-#: Merge.rc:2361
+#: Merge.rc:2371
msgid "&Preserve original EOL"
msgstr "&Запазване на изходните знаци за нов ред"
#. IDD_PROPPAGE_EDITOR, IDC_STATIC
-#: Merge.rc:2362
+#: Merge.rc:2372
msgid "Tabs"
msgstr "Табулатор"
#. IDD_PROPPAGE_EDITOR, IDC_STATIC
-#: Merge.rc:2363
+#: Merge.rc:2373
msgid "&Tab size:"
msgstr "&Дължина на табулатор:"
#. IDD_PROPPAGE_EDITOR, IDC_PROP_INSERT_TABS
-#: Merge.rc:2365
+#: Merge.rc:2375
msgid "&Insert tabs"
msgstr "&Вмъкване на табулатор"
#. IDD_PROPPAGE_EDITOR, IDC_PROP_INSERT_SPACES
-#: Merge.rc:2366
+#: Merge.rc:2376
msgid "Insert &spaces"
msgstr "Вмъкване на &интервал"
#. IDD_PROPPAGE_EDITOR, IDC_STATIC
-#: Merge.rc:2367
+#: Merge.rc:2377
msgid "&Rendering mode:"
msgstr "&Режим на изчертаване:"
#. IDD_PROPPAGE_EDITOR_COMPAREMERGE, IDC_AUTOMRESCAN_CHECK
-#: Merge.rc:2376
+#: Merge.rc:2386
msgid "&Automatic rescan"
msgstr "&Автоматично сканиране"
#. IDD_PROPPAGE_EDITOR_COMPAREMERGE, IDC_STATIC
-#: Merge.rc:2377
+#: Merge.rc:2387
msgid "Copy &granularity for selected differences:"
msgstr ""
#. IDD_PROPPAGE_EDITOR_COMPAREMERGE, IDC_LINE_COLORING_GROUP
-#: Merge.rc:2379
+#: Merge.rc:2389
msgid "Line Difference Coloring"
msgstr "Оцветяване на редове с различия"
#. IDD_PROPPAGE_EDITOR_COMPAREMERGE, IDC_VIEW_LINE_DIFFERENCES
-#: Merge.rc:2380
+#: Merge.rc:2390
msgid "View line differences"
msgstr "Показване на различия на реда"
#. IDD_PROPPAGE_EDITOR_COMPAREMERGE, IDC_EDITOR_CHARLEVEL
-#: Merge.rc:2381
+#: Merge.rc:2391
msgid "&Character-level"
msgstr "На ниво &символ"
#. IDD_PROPPAGE_EDITOR_COMPAREMERGE, IDC_EDITOR_WORDLEVEL
-#: Merge.rc:2382
+#: Merge.rc:2392
msgid "&Word-level:"
msgstr "На ниво &дума:"
#. IDD_PROPPAGE_EDITOR_COMPAREMERGE, IDC_STATIC
-#: Merge.rc:2384
+#: Merge.rc:2394
msgid "W&ord break characters:"
msgstr "Символ за пренасяне на &дума:"
#. IDD_PROPPAGE_MESSAGEBOXES, IDC_STATIC
-#: Merge.rc:2401
+#: Merge.rc:2411
msgid "Some messages can be hidden by the user. Press Reset to make all messages visible again."
msgstr "Потребителят може да скрие някои съобщения. За да бъдат показани повторно, натиснете бутона Нулиране."
#. IDD_SELECT_FILES_OR_FOLDERS, IDC_RESET
-#: Merge.rc:2402 Merge.rc:3085
+#: Merge.rc:2412 Merge.rc:3095
msgid "Reset"
msgstr "Нулиране"
#. IDD_GENERATE_PATCH
-#: Merge.rc:2408
+#: Merge.rc:2418
msgid "Patch Generator"
msgstr "Създаване на кръпки"
#. IDD_GENERATE_PATCH, IDC_STATIC
-#: Merge.rc:2411
+#: Merge.rc:2421
msgid "File&1:"
msgstr "Файл&1:"
#. IDD_GENERATE_PATCH, IDC_STATIC
-#: Merge.rc:2414
+#: Merge.rc:2424
msgid "File&2:"
msgstr "Файл&2:"
#. IDD_GENERATE_PATCH, IDC_DIFF_SWAPFILES
-#: Merge.rc:2417
+#: Merge.rc:2427
msgid "&Swap"
msgstr "&Разменяне"
#. IDD_DIRCMP_REPORT, IDC_REPORT_COPYCLIPBOARD
-#: Merge.rc:2418 Merge.rc:2690
+#: Merge.rc:2428 Merge.rc:2700
msgid "&Copy to clipboard"
msgstr "&Копиране в междинната памет"
#. IDD_GENERATE_PATCH, IDC_DIFF_APPENDFILE
-#: Merge.rc:2419
+#: Merge.rc:2429
msgid "&Append to existing file"
msgstr "&Прилагане към съществуващ файл"
#. IDD_GENERATE_PATCH, IDC_STATIC
-#: Merge.rc:2420
+#: Merge.rc:2430
msgid "&Result:"
msgstr "&Резултат:"
#. IDD_GENERATE_PATCH, IDC_DIFF_BROWSE_RESULT
-#: Merge.rc:2422
+#: Merge.rc:2432
msgid "Bro&wse..."
msgstr "Изби&ране…"
#. IDD_GENERATE_PATCH, IDC_STATIC
-#: Merge.rc:2423
+#: Merge.rc:2433
msgid "&Format"
msgstr "&Формат"
#. IDD_GENERATE_PATCH, IDC_STATIC
-#: Merge.rc:2424
+#: Merge.rc:2434
msgid "St&yle:"
msgstr "Сти&л:"
#. IDD_GENERATE_PATCH, IDC_STATIC
-#: Merge.rc:2426
+#: Merge.rc:2436
msgid "&Context:"
msgstr "&Контекст:"
#. IDD_GENERATE_PATCH, IDC_DIFF_INCLCMDLINE
-#: Merge.rc:2428
+#: Merge.rc:2438
msgid "Inclu&de command line"
msgstr "Включително командния &ред"
#. IDD_GENERATE_PATCH, IDC_DIFF_OPENTOEDITOR
-#: Merge.rc:2429
+#: Merge.rc:2439
msgid "Open in e&xternal editor"
msgstr "Отваряне с външе&н редактор"
#. IDD_DIRCOLS
-#: Merge.rc:2446
+#: Merge.rc:2456
msgid "Display Columns"
msgstr "Видими колони"
#. IDD_DIRCOLS, IDC_UP
-#: Merge.rc:2450
+#: Merge.rc:2460
msgid "Move &Up"
msgstr "На&горе"
#. IDD_DIRCOLS, IDC_DOWN
-#: Merge.rc:2451
+#: Merge.rc:2461
msgid "Move &Down"
msgstr "На&долу"
#. IDD_DIRCOLS, IDC_COLDLG_ADDITIONAL_PROPERTIES
-#: Merge.rc:2453
+#: Merge.rc:2463
msgid "&Additional Properties"
msgstr "Разширени &настройки"
#. IDD_DIRADDITIONALPROPS
-#: Merge.rc:2461
+#: Merge.rc:2471
msgid "Additional Properties"
msgstr "Разширени настройки"
#. IDD_PLUGINS_SELECTPLUGIN
-#: Merge.rc:2475
+#: Merge.rc:2485
msgid "Select Plugin"
msgstr "Избиране на добавка"
#. IDD_PLUGINS_EDITPLUGIN, IDC_STATIC
-#: Merge.rc:2478 Merge.rc:3115
+#: Merge.rc:2488 Merge.rc:3125
msgid "Plugin &name:"
msgstr "Д&обавка:"
#. IDD_PLUGINS_SELECTPLUGIN, IDC_STATIC
-#: Merge.rc:2480
+#: Merge.rc:2490
msgid "&Target files:"
msgstr "&Целеви файлове:"
#. IDD_PLUGINS_EDITPLUGIN, IDC_STATIC
-#: Merge.rc:2482 Merge.rc:3117
+#: Merge.rc:2492 Merge.rc:3127
msgid "Extensions list:"
msgstr "Разширения:"
#. IDD_PLUGINS_EDITPLUGIN, IDC_STATIC
-#: Merge.rc:2484 Merge.rc:3119
+#: Merge.rc:2494 Merge.rc:3129
msgid "Description:"
msgstr "Описание:"
#. IDD_PLUGINS_EDITPLUGIN, IDC_STATIC
-#: Merge.rc:2486 Merge.rc:3121
+#: Merge.rc:2496 Merge.rc:3131
msgid "Default arguments:"
msgstr "Aргументи:"
#. IDD_PLUGINS_SELECTPLUGIN, IDC_PLUGIN_ALLOW_ALL
-#: Merge.rc:2488
+#: Merge.rc:2498
msgid "Display all plugins (Ignore extension)"
msgstr ""
#. IDD_PLUGINS_SELECTPLUGIN, IDC_PLUGIN_OPEN_IN_SAME_FRAME_TYPE
-#: Merge.rc:2490
+#: Merge.rc:2500
msgid "&Open files in same window type after unpacking"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_PIPELINE_STATIC
-#: Merge.rc:2492 Merge.rc:3129
+#: Merge.rc:2502 Merge.rc:3139
msgid "&Plugin pipeline:"
msgstr "Кон&вейер:"
#. IDD_PLUGINS_SELECTPLUGIN, IDC_PLUGIN_ALIAS
-#: Merge.rc:2495
+#: Merge.rc:2505
msgid "&Alias..."
msgstr "&Псевдоним…"
#. IDD_DIRCOMP_PROGRESS, IDC_COMPARISON_STOP
-#: Merge.rc:2505
+#: Merge.rc:2515
msgid "Stop"
msgstr "Спиране"
#. IDD_DIRCOMP_PROGRESS, IDC_COMPARISON_PAUSE
-#: Merge.rc:2506
+#: Merge.rc:2516
msgid "Pause"
msgstr "Пауза"
#. IDD_DIRCOMP_PROGRESS, IDC_COMPARISON_CONTINUE
-#: Merge.rc:2507
+#: Merge.rc:2517
msgid "Continue"
msgstr "Продължаване"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC
-#: Merge.rc:2509 Merge.rc:2973
+#: Merge.rc:2519 Merge.rc:2983
msgid "C&PU cores to use:"
msgstr "Използа&не на брой процесорни ядра:"
#. IDD_DIRCOMP_PROGRESS, IDC_STATIC
-#: Merge.rc:2510
+#: Merge.rc:2520
msgid "Items total:"
msgstr "Всичко:"
#. IDD_DIRCOMP_PROGRESS, IDC_STATIC
-#: Merge.rc:2511
+#: Merge.rc:2521
msgid "Items compared:"
msgstr "Сравнени:"
#. IDS_PREVIEWBAR_CLOSE
-#: Merge.rc:2526 Merge.rc:2846 Merge.rc:5328
+#: Merge.rc:2536 Merge.rc:2856 Merge.rc:5339
msgid "&Close"
msgstr "&Затваряне"
#. IDD_WMGOTO
-#: Merge.rc:2537
+#: Merge.rc:2547
msgid "Go to"
msgstr "Отиване към"
#. IDD_WMGOTO, IDC_STATIC
-#: Merge.rc:2540
+#: Merge.rc:2550
msgid "G&o to:"
msgstr "&Отиване към:"
#. IDD_WMGOTO, IDC_STATIC
-#: Merge.rc:2543
+#: Merge.rc:2553
msgid "File"
msgstr "Файл"
#. IDD_WMGOTO, IDC_STATIC
-#: Merge.rc:2547
+#: Merge.rc:2557
msgid "Go to what"
msgstr "Отиване нанякъде"
#. IDD_WMGOTO, IDC_WMGOTO_TOLINE
-#: Merge.rc:2548
+#: Merge.rc:2558
msgid "Li&ne"
msgstr "Ре&д"
#. IDD_WMGOTO, IDC_WMGOTO_TODIFF
-#: Merge.rc:2549
+#: Merge.rc:2559
msgid "&Difference"
msgstr "&Различие"
#. IDD_WMGOTO, IDOK
-#: Merge.rc:2550
+#: Merge.rc:2560
msgid "&Go to"
msgstr "&Отиване"
#. IDS_PROJECT_ITEM_FILE_FILTER
-#: Merge.rc:2556 Merge.rc:4321
+#: Merge.rc:2566 Merge.rc:4331
msgid "File Filters"
msgstr "Филтри за файлове"
#. IDD_FILTERS_FILEFILTERS, IDC_STATIC
-#: Merge.rc:2559
+#: Merge.rc:2569
msgid "&Mask / Filter Expression"
msgstr ""
#. IDD_FILTERS_FILEFILTERS, IDC_STATIC
-#: Merge.rc:2562
+#: Merge.rc:2572
msgid "Preset &Filters"
msgstr ""
#. IDD_FILTERS_FILEFILTERS, IDC_FILTERFILE_TEST_BTN
-#: Merge.rc:2564
+#: Merge.rc:2574
msgid "Test..."
msgstr "Изпробване..."
#. IDD_FILTERS_FILEFILTERS, IDC_FILTERFILE_INSTALL
-#: Merge.rc:2565
+#: Merge.rc:2575
msgid "Install..."
msgstr "Инсталиране…"
#. IDD_FILTERS_FILEFILTERS, IDC_FILTERFILE_NEWBTN
-#: Merge.rc:2566
+#: Merge.rc:2576
msgid "New..."
msgstr "Нов…"
#. IDD_FILTERS_FILEFILTERS, IDC_FILTERFILE_EDITBTN
-#: Merge.rc:2567
+#: Merge.rc:2577
msgid "Edit..."
msgstr "Променяне…"
#. IDD_FILTERS_FILEFILTERS, IDC_FILTERFILE_DELETEBTN
-#: Merge.rc:2568
+#: Merge.rc:2578
msgid "Delete..."
msgstr "Изтриване…"
#. IDD_FILTERS_CONDITION
-#: Merge.rc:2573
+#: Merge.rc:2583
msgid "Filter Condition"
msgstr ""
#. IDD_FILTERS_CONDITION, IDC_STATIC
-#: Merge.rc:2576
+#: Merge.rc:2586
msgid "&Left-hand side:"
msgstr ""
#. IDD_FILTERS_CONDITION, IDC_STATIC
-#: Merge.rc:2578
+#: Merge.rc:2588
msgid "&Operator:"
msgstr ""
#. IDD_FILTERS_CONDITION, IDC_STATIC
-#: Merge.rc:2580
+#: Merge.rc:2590
msgid "&Right-hand side:"
msgstr ""
#. IDD_FILTERS_CONDITION, IDC_STATIC
-#: Merge.rc:2586
+#: Merge.rc:2596
msgid "Expression:"
msgstr ""
#. IDD_COMPARISON_RESULT_FILTER
-#: Merge.rc:2595
+#: Merge.rc:2605
msgid "Filter by Comparison Result"
msgstr ""
#. IDD_COMPARISON_RESULT_FILTER, IDC_RADIO_INCLUDE
-#: Merge.rc:2598
+#: Merge.rc:2608
msgid "&Include"
msgstr ""
#. IDD_COMPARISON_RESULT_FILTER, IDC_RADIO_EXCLUDE
-#: Merge.rc:2599
+#: Merge.rc:2609
msgid "&Exclude"
msgstr ""
#. IDD_COMPARISON_RESULT_FILTER, IDC_STATIC
-#: Merge.rc:2600
+#: Merge.rc:2610
msgid "Comparison Results"
msgstr ""
#. IDS_IDENTICAL
-#: Merge.rc:2601 Merge.rc:2733 Merge.rc:2794 Merge.rc:4698
+#: Merge.rc:2611 Merge.rc:2743 Merge.rc:2804 Merge.rc:4708
msgid "Identical"
msgstr "Еднакви"
#. IDS_DIFFERENT
-#: Merge.rc:2602 Merge.rc:2714 Merge.rc:2755 Merge.rc:4708
+#: Merge.rc:2612 Merge.rc:2724 Merge.rc:2765 Merge.rc:4718
msgid "Different"
msgstr "Различни"
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_LEFT_ONLY
-#: Merge.rc:2603
+#: Merge.rc:2613
msgid "Left only"
msgstr ""
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_RIGHT_ONLY
-#: Merge.rc:2604
+#: Merge.rc:2614
msgid "Right only"
msgstr ""
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_SKIPPED
-#: Merge.rc:2605
+#: Merge.rc:2615
msgid "Skipped"
msgstr ""
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_MIDDLE_ONLY
-#: Merge.rc:2606
+#: Merge.rc:2616
msgid "Middle only"
msgstr ""
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_LEFT_ONLY_DIFFERENT
-#: Merge.rc:2607
+#: Merge.rc:2617
msgid "Left only (different)"
msgstr ""
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_MIDDLE_ONLY_DIFFERENT
-#: Merge.rc:2608
+#: Merge.rc:2618
msgid "Middle only (different)"
msgstr ""
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_RIGHT_ONLY_DIFFERENT
-#: Merge.rc:2609
+#: Merge.rc:2619
msgid "Right only (different)"
msgstr ""
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_LEFT_ONLY_MISSING
-#: Merge.rc:2610
+#: Merge.rc:2620
msgid "Left only (missing)"
msgstr ""
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_MIDDLE_ONLY_MISSING
-#: Merge.rc:2611
+#: Merge.rc:2621
msgid "Middle only (missing)"
msgstr ""
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_RIGHT_ONLY_MISSING
-#: Merge.rc:2612
+#: Merge.rc:2622
msgid "Right only (missing)"
msgstr ""
#. IDS_OPTIONSPG_CODEPAGE
-#: Merge.rc:2619 Merge.rc:2811 Merge.rc:4213
+#: Merge.rc:2629 Merge.rc:2821 Merge.rc:4223
msgid "Codepage"
msgstr "Кодова страница"
#. IDD_PROPPAGE_CODEPAGE, IDC_STATIC
-#: Merge.rc:2622
+#: Merge.rc:2632
msgid "Default Codepage"
msgstr "Стандартна кодова страница"
#. IDD_PROPPAGE_CODEPAGE, IDC_STATIC
-#: Merge.rc:2623
+#: Merge.rc:2633
msgid "Select the default codepage for non-Unicode files:"
msgstr "Изберете стандартната кодова страница за не-Unicode файлове:"
#. IDD_PROPPAGE_CODEPAGE, IDC_CP_SYSTEM
-#: Merge.rc:2624
+#: Merge.rc:2634
msgid "System codepage"
msgstr "Кодова страница на системата"
#. IDD_PROPPAGE_CODEPAGE, IDC_CP_UI
-#: Merge.rc:2625
+#: Merge.rc:2635
msgid "According to WinMerge User Interface"
msgstr "Според интерфейса на WinMerge"
#. IDD_PROPPAGE_CODEPAGE, IDC_CP_CUSTOM
-#: Merge.rc:2626
+#: Merge.rc:2636
msgid "Custom codepage:"
msgstr "Потребителска кодова страница:"
#. IDD_PROPPAGE_CODEPAGE, IDC_DETECT_CODEPAGE
-#: Merge.rc:2628
+#: Merge.rc:2638
msgid ""
"Detect codepage for: .html, .rc, .xml\n"
"Restart required."
@@ -4082,7 +4093,7 @@ msgstr ""
"Изисква рестартиране."
#. IDD_PROPPAGE_CODEPAGE, IDC_DETECT_CODEPAGE2
-#: Merge.rc:2630
+#: Merge.rc:2640
msgid ""
"Detect codepage for files with mlang.dll\n"
"Restart required."
@@ -4091,769 +4102,769 @@ msgstr ""
"изисква рестартиране."
#. IDS_OPTIONSPG_ARCHIVE
-#: Merge.rc:2638 Merge.rc:4214
+#: Merge.rc:2648 Merge.rc:4224
msgid "Archive Support"
msgstr "Поддръжка на архиви"
#. IDD_PROPPAGE_ARCHIVE, IDC_ARCHIVE_ENABLE
-#: Merge.rc:2641
+#: Merge.rc:2651
msgid "&Enable archive file support"
msgstr "Включване на &поддръжката на архиви"
#. IDD_PROPPAGE_ARCHIVE, IDC_ARCHIVE_DETECTTYPE
-#: Merge.rc:2642
+#: Merge.rc:2652
msgid "&Detect archive type from file signature"
msgstr "Откриване на вида на &архива от подписа на файла"
#. IDD_PROPPAGE_PROJECT, IDC_STATIC
-#: Merge.rc:2651
+#: Merge.rc:2661
msgid "Items saved to or restored from the project file:"
msgstr "Елементи, които да бъдат запазвани и възстановявани от файла на проекта:"
#. IDD_SAVECLOSING
-#: Merge.rc:2658
+#: Merge.rc:2668
msgid "Save Modified Files?"
msgstr "Запазване на променени файлове?"
#. IDD_SAVECLOSING, IDC_SAVECLOSING_LEFTFRAME
-#: Merge.rc:2661
+#: Merge.rc:2671
msgid "Left side file"
msgstr "Ляв файл"
#. IDD_SAVECLOSING, IDC_SAVECLOSING_SAVELEFT
-#: Merge.rc:2663
+#: Merge.rc:2673
msgid "&Save changes"
msgstr "&Запазване на промените"
#. IDD_SAVECLOSING, IDC_SAVECLOSING_DISCARDLEFT
-#: Merge.rc:2664
+#: Merge.rc:2674
msgid "&Discard changes"
msgstr "&Отказ от промените"
#. IDD_SAVECLOSING, IDC_SAVECLOSING_MIDDLEFRAME
-#: Merge.rc:2665
+#: Merge.rc:2675
msgid "Middle side file"
msgstr "Среден файл"
#. IDD_SAVECLOSING, IDC_SAVECLOSING_SAVEMIDDLE
-#: Merge.rc:2667
+#: Merge.rc:2677
msgid "Sa&ve changes"
msgstr "За&пазване на промените"
#. IDD_SAVECLOSING, IDC_SAVECLOSING_DISCARDMIDDLE
-#: Merge.rc:2668
+#: Merge.rc:2678
msgid "Discard c&hanges"
msgstr "Отк&азване от промените"
#. IDD_SAVECLOSING, IDC_SAVECLOSING_RIGHTFRAME
-#: Merge.rc:2669
+#: Merge.rc:2679
msgid "Right side file"
msgstr "Десен файл"
#. IDD_SAVECLOSING, IDC_SAVECLOSING_SAVERIGHT
-#: Merge.rc:2671
+#: Merge.rc:2681
msgid "S&ave changes"
msgstr "Запазва&не на промените"
#. IDD_SAVECLOSING, IDC_SAVECLOSING_DISCARDRIGHT
-#: Merge.rc:2672
+#: Merge.rc:2682
msgid "Dis&card changes"
msgstr "Отказване от пром&ените"
#. IDD_SAVECLOSING, IDC_SAVECLOSING_DISCARDALL
-#: Merge.rc:2673
+#: Merge.rc:2683
msgid "Disca&rd All"
msgstr "Отказ от &всички"
#. IDD_DIRCMP_REPORT
-#: Merge.rc:2680
+#: Merge.rc:2690
msgid "Folder Compare Report"
msgstr "Отчет за сравняване на папки"
#. IDD_DIRCMP_REPORT, IDC_STATIC
-#: Merge.rc:2683
+#: Merge.rc:2693
msgid "Report &file:"
msgstr "Файл с &отчета:"
#. IDD_DIRCMP_REPORT, IDC_STATIC
-#: Merge.rc:2686
+#: Merge.rc:2696
msgid "&Style:"
msgstr "&Стил:"
#. IDD_DIRCMP_REPORT, IDC_REPORT_INCLUDEFILECMPREPORT
-#: Merge.rc:2688
+#: Merge.rc:2698
msgid "&Include file compare report"
msgstr ""
#. IDD_FILTERS_FILEFILTERS_SHARED
-#: Merge.rc:2697
+#: Merge.rc:2707
msgid "Shared or Private Filter"
msgstr "Споделен или личен филтър"
#. IDD_FILTERS_FILEFILTERS_SHARED, IDC_STATIC
-#: Merge.rc:2700
+#: Merge.rc:2710
msgid "What type of filter do you want?"
msgstr "Какъв вид филтър желаете?"
#. IDD_FILTERS_FILEFILTERS_SHARED, IDC_SHARED
-#: Merge.rc:2701
+#: Merge.rc:2711
msgid "Shared Filter (for all users)"
msgstr "Споделен филтър (за всички потребители на този компютър)"
#. IDD_FILTERS_FILEFILTERS_SHARED, IDC_PRIVATE
-#: Merge.rc:2702
+#: Merge.rc:2712
msgid "Private Filter (current user only)"
msgstr "Личен филтър (само за текущия потребител)"
#. IDD_COMPARE_STATISTICS3
-#: Merge.rc:2709 Merge.rc:2750
+#: Merge.rc:2719 Merge.rc:2760
msgid "Compare Statistics"
msgstr "Статистика на сравнението"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2712 Merge.rc:2753
+#: Merge.rc:2722 Merge.rc:2763
msgid "Folders:"
msgstr "Папки:"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2713 Merge.rc:2754
+#: Merge.rc:2723 Merge.rc:2764
msgid "Files:"
msgstr "Файлове:"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2719 Merge.rc:2738 Merge.rc:2760 Merge.rc:2799
+#: Merge.rc:2729 Merge.rc:2748 Merge.rc:2770 Merge.rc:2809
msgid "Binary:"
msgstr "Двоични:"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2722 Merge.rc:2763
+#: Merge.rc:2732 Merge.rc:2773
msgid "Unique"
msgstr "Уникални"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2723 Merge.rc:2764
+#: Merge.rc:2733 Merge.rc:2774
msgid "Left:"
msgstr "Ляво:"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2728 Merge.rc:2774
+#: Merge.rc:2738 Merge.rc:2784
msgid "Right:"
msgstr "Дясно:"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2742 Merge.rc:2803
+#: Merge.rc:2752 Merge.rc:2813
msgid "Total:"
msgstr "Общо:"
#. IDD_COMPARE_STATISTICS3, IDOK
-#: Merge.rc:2745 Merge.rc:2806
+#: Merge.rc:2755 Merge.rc:2816
msgid "Close"
msgstr "Затваряне"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2769
+#: Merge.rc:2779
msgid "Middle:"
msgstr "Средно:"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2779
+#: Merge.rc:2789
msgid "Missing Left:"
msgstr "Липсващи вляво:"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2784
+#: Merge.rc:2794
msgid "Missing Middle:"
msgstr "Липсващи всредата:"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2789
+#: Merge.rc:2799
msgid "Missing Right:"
msgstr "Липсващи вдясно:"
#. IDD_LOAD_SAVE_CODEPAGE, IDC_AFFECTS_GROUP
-#: Merge.rc:2814
+#: Merge.rc:2824
msgid "Affects"
msgstr "Промяна на кодовата страница"
#. IDD_LOAD_SAVE_CODEPAGE, IDC_RIGHT_FILES_LABEL
-#: Merge.rc:2816 Merge.rc:2818 Merge.rc:2820
+#: Merge.rc:2826 Merge.rc:2828 Merge.rc:2830
msgid "(Affects)"
msgstr "(промени)"
#. IDD_LOAD_SAVE_CODEPAGE, IDC_LOADING_GROUP
-#: Merge.rc:2821
+#: Merge.rc:2831
msgid "Select Codepage for"
msgstr "Кодова страница при"
#. IDD_LOAD_SAVE_CODEPAGE, IDC_LOAD_FILES_LABEL
-#: Merge.rc:2822
+#: Merge.rc:2832
msgid "&File Loading:"
msgstr "&Отваряне:"
#. IDD_LOAD_SAVE_CODEPAGE, IDC_SAVE_FILES_LABEL
-#: Merge.rc:2824
+#: Merge.rc:2834
msgid "File &Saving:"
msgstr "&Запазване:"
#. IDD_LOAD_SAVE_CODEPAGE, IDC_LOAD_SAVE_SAME_CODEPAGE
-#: Merge.rc:2827
+#: Merge.rc:2837
msgid "&Use same codepage for both"
msgstr "&Използване на еднаква кодова страница и за двете действия"
#. IDS_MESSAGEBOX_CANCEL
-#: Merge.rc:2830 Merge.rc:4172
+#: Merge.rc:2840 Merge.rc:4182
msgid "&Cancel"
msgstr "&Отказ"
#. IDD_FILTERS_FILEFILTERS_TEST
-#: Merge.rc:2835
+#: Merge.rc:2845
msgid "Test Filter"
msgstr "Изпробване на филтър"
#. IDD_FILTERS_FILEFILTERS_TEST, IDC_HEADER
-#: Merge.rc:2838
+#: Merge.rc:2848
msgid "Testing filter:"
msgstr "Изпробване на филтър:"
#. IDD_FILTERS_FILEFILTERS_TEST, IDC_PROMPT_LABEL
-#: Merge.rc:2840
+#: Merge.rc:2850
msgid "&Enter text to test:"
msgstr "&Въведете текст за изпробване:"
#. IDD_FILTERS_FILEFILTERS_TEST, IDC_IS_DIRECTORY
-#: Merge.rc:2842
+#: Merge.rc:2852
msgid "&Folder Name"
msgstr "&Име на папка"
#. IDD_FILTERS_FILEFILTERS_TEST, IDC_STATIC
-#: Merge.rc:2843
+#: Merge.rc:2853
msgid "Result:"
msgstr "Резултат:"
#. IDD_FILTERS_FILEFILTERS_TEST, IDC_TEST_BTN
-#: Merge.rc:2845
+#: Merge.rc:2855
msgid "&Test"
msgstr "&Изпробване"
#. IDS_OPTIONSPG_TABLECOMPARE
-#: Merge.rc:2851 Merge.rc:2990 Merge.rc:4228
+#: Merge.rc:2861 Merge.rc:3000 Merge.rc:4238
msgid "Table"
msgstr "Таблици"
#. IDD_OPEN_TABLE, IDC_STATIC
-#: Merge.rc:2854
+#: Merge.rc:2864
msgid "File type"
msgstr "Вид файл"
#. IDD_OPEN_TABLE, IDC_COMPARETABLE_CSV
-#: Merge.rc:2855
+#: Merge.rc:2865
msgid "&CSV"
msgstr "&CSV"
#. IDD_OPEN_TABLE, IDC_COMPARETABLE_TSV
-#: Merge.rc:2856
+#: Merge.rc:2866
msgid "&TSV"
msgstr "&TSV"
#. IDD_OPEN_TABLE, IDC_COMPARETABLE_DSV
-#: Merge.rc:2857
+#: Merge.rc:2867
msgid "Custom &Delimiter-Separated Values"
msgstr "Стойности с &разделител по желание"
#. IDD_PROPPAGE_COMPARE_TABLE, IDC_STATIC
-#: Merge.rc:2859 Merge.rc:2861 Merge.rc:2996 Merge.rc:3004
+#: Merge.rc:2869 Merge.rc:2871 Merge.rc:3006 Merge.rc:3014
msgid "D&elimiter character:"
msgstr "Знак на &разделител:"
#. IDD_PROPPAGE_COMPARE_TABLE, IDC_COMPARETABLE_ALLOWNEWLINE
-#: Merge.rc:2863 Merge.rc:3006
+#: Merge.rc:2873 Merge.rc:3016
msgid "&Allow newlines in quotes"
msgstr "Разрешаване на нов ред в &кавичките"
#. IDD_PROPPAGE_COMPARE_TABLE, IDC_STATIC
-#: Merge.rc:2865 Merge.rc:3008
+#: Merge.rc:2875 Merge.rc:3018
msgid "&Quote character:"
msgstr "&Знак за кавички:"
#. IDS_OPTIONSPG_BACKUPS
-#: Merge.rc:2873 Merge.rc:4216
+#: Merge.rc:2883 Merge.rc:4226
msgid "Backup Files"
msgstr "Резервни копия"
#. IDD_PROPPAGE_BACKUPS, IDC_STATIC
-#: Merge.rc:2876
+#: Merge.rc:2886
msgid "Create backup files for:"
msgstr "Създаване на резервни копия на:"
#. IDD_PROPPAGE_BACKUPS, IDC_BACKUP_FOLDERCMP
-#: Merge.rc:2877
+#: Merge.rc:2887
msgid "&Folder compare"
msgstr "Сравняване на &папки"
#. IDD_PROPPAGE_BACKUPS, IDC_BACKUP_FILECMP
-#: Merge.rc:2878
+#: Merge.rc:2888
msgid "Fil&e compare"
msgstr "Сравняване на &файлове"
#. IDD_PROPPAGE_BACKUPS, IDC_STATIC
-#: Merge.rc:2879
+#: Merge.rc:2889
msgid "Create backup files in:"
msgstr "Създаване на резервни копия в:"
#. IDD_PROPPAGE_BACKUPS, IDC_BACKUP_ORIGFOLD
-#: Merge.rc:2880
+#: Merge.rc:2890
msgid "&Original file's folder"
msgstr "&Изходната папка на файла"
#. IDD_PROPPAGE_BACKUPS, IDC_BACKUP_GLOBALFOLD
-#: Merge.rc:2881
+#: Merge.rc:2891
msgid "&Global backup folder:"
msgstr "Обособена за &целта папка:"
#. IDD_PROPPAGE_BACKUPS, IDC_STATIC
-#: Merge.rc:2884
+#: Merge.rc:2894
msgid "Backup filename:"
msgstr "Име на файла с резервно копие:"
#. IDD_PROPPAGE_BACKUPS, IDC_BACKUP_APPEND_BAK
-#: Merge.rc:2885
+#: Merge.rc:2895
msgid "&Append .bak extension"
msgstr "Добавяне на &разширение „.bak“"
#. IDD_PROPPAGE_BACKUPS, IDC_BACKUP_APPEND_TIME
-#: Merge.rc:2886
+#: Merge.rc:2896
msgid "A&ppend timestamp"
msgstr "Добавяне на времеви &маркер"
#. IDS_CONFIRM_COPY_CAPTION
-#: Merge.rc:2892 Merge.rc:4565
+#: Merge.rc:2902 Merge.rc:4575
msgid "Confirm Copy"
msgstr "Потвърждаване на копиране"
#. IDD_CONFIRM_COPY, IDC_FLDCONFIRM_QUERY
-#: Merge.rc:2896
+#: Merge.rc:2906
msgid "Are you sure you want to copy XXX items?"
msgstr "Искате ли XXX елемента да бъдат копирани?"
#. IDD_CONFIRM_COPY, IDC_FLDCONFIRM_FROM_TEXT
-#: Merge.rc:2897
+#: Merge.rc:2907
msgid "From left"
msgstr "От ляво"
#. IDD_CONFIRM_COPY, IDC_FLDCONFIRM_TO_TEXT
-#: Merge.rc:2899
+#: Merge.rc:2909
msgid "To right"
msgstr "Към дясно"
#. IDS_MESSAGEBOX_DONT_ASK_AGAIN
-#: Merge.rc:2901 Merge.rc:4191
+#: Merge.rc:2911 Merge.rc:4201
msgid "Don't ask this &question again."
msgstr "Без &повторно задаване на този въпрос."
#. IDD_CONFIRM_COPY, IDYES
-#: Merge.rc:2903
+#: Merge.rc:2913
msgid "Yes"
msgstr "Да"
#. IDD_CONFIRM_COPY, IDNO
-#: Merge.rc:2904
+#: Merge.rc:2914
msgid "No"
msgstr "Не"
#. IDS_PROJECT_ITEM_PLUGIN
-#: Merge.rc:2909 Merge.rc:4323
+#: Merge.rc:2919 Merge.rc:4333
msgid "Plugins"
msgstr "Добавки"
#. IDD_PLUGINS_LIST, IDC_PLUGINS_ENABLE
-#: Merge.rc:2912
+#: Merge.rc:2922
msgid "&Enable plugins"
msgstr "Включване на &добавките"
#. IDD_PLUGINS_EDITPLUGIN, IDC_STATIC
-#: Merge.rc:2913 Merge.rc:3113
+#: Merge.rc:2923 Merge.rc:3123
msgid "Plugin &type:"
msgstr ""
#. IDD_PLUGINS_LIST, IDC_STATIC
-#: Merge.rc:2916
+#: Merge.rc:2926
msgid "File filters:"
msgstr "Филтри за файлове:"
#. IDD_PLUGINS_LIST, IDC_STATIC
-#: Merge.rc:2918
+#: Merge.rc:2928
msgid "&Plugin arguments:"
msgstr "&Аргументи за добавките:"
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_AUTOMATIC
-#: Merge.rc:2920 Merge.rc:3134
+#: Merge.rc:2930 Merge.rc:3144
msgid "Enable &automatic unpacking/prediffing"
msgstr ""
#. IDS_OPTIONSPG_SHELL
-#: Merge.rc:2934 Merge.rc:4217
+#: Merge.rc:2944 Merge.rc:4227
msgid "Shell Integration"
msgstr "Сливане със системата"
#. IDD_PROPPAGE_SHELL, IDC_STATIC
-#: Merge.rc:2937
+#: Merge.rc:2947
msgid "Explorer"
msgstr "Explorer"
#. IDD_PROPPAGE_SHELL, IDC_EXPLORER_CONTEXT
-#: Merge.rc:2938
+#: Merge.rc:2948
msgid "&Add to context menu"
msgstr "Добавяне в &контекстуалното меню"
#. IDD_PROPPAGE_SHELL, IDC_EXPLORER_ADVANCED
-#: Merge.rc:2939
+#: Merge.rc:2949
msgid "E&nable advanced menu"
msgstr "Включване на &разширено меню"
#. IDD_PROPPAGE_SHELL, IDC_EXPLORER_COMPARE_AS
-#: Merge.rc:2940
+#: Merge.rc:2950
msgid "Enable &Compare As menu"
msgstr "Включване на меню &Сравняване като"
#. IDD_PROPPAGE_SHELL, IDC_REGISTER_SHELLEXTENSION
-#: Merge.rc:2941
+#: Merge.rc:2951
msgid "&Register Shell Extension"
msgstr "&Регистриране на разширение на обвивката"
#. IDD_PROPPAGE_SHELL, IDC_UNREGISTER_SHELLEXTENSION
-#: Merge.rc:2942
+#: Merge.rc:2952
msgid "&Unregister Shell Extension"
msgstr "&Премахване на разширение на обвивката"
#. IDD_PROPPAGE_SHELL, IDC_REGISTER_SHELLEXTENSION_PERUSER
-#: Merge.rc:2943
+#: Merge.rc:2953
msgid "Register Shell Extension for Current User &Only"
msgstr "Р&егистриране на разширение на обвивката (текущ потребител)"
#. IDD_PROPPAGE_SHELL, IDC_UNREGISTER_SHELLEXTENSION_PERUSER
-#: Merge.rc:2944
+#: Merge.rc:2954
msgid "Unregister Shell Extension for Current User On&ly"
msgstr "Пр&емахване на разширение на обвивката (текущ потребител)"
#. IDD_PROPPAGE_SHELL, IDC_REGISTER_WINMERGECONTEXTMENU
-#: Merge.rc:2945
+#: Merge.rc:2955
msgid "Register Shell Extension for &Windows 11"
msgstr ""
#. IDD_PROPPAGE_SHELL, IDC_UNREGISTER_WINMERGECONTEXTMENU
-#: Merge.rc:2946
+#: Merge.rc:2956
msgid "Unregister Shell Extension for W&indows 11"
msgstr ""
#. IDD_PROPPAGE_SHELL, IDC_STATIC
-#: Merge.rc:2947
+#: Merge.rc:2957
msgid "Jump List"
msgstr ""
#. IDD_PROPPAGE_SHELL, IDC_CLEAR_ALL_RECENT_ITEMS
-#: Merge.rc:2949
+#: Merge.rc:2959
msgid "Clear all recent items"
msgstr ""
#. IDS_OPTIONSPG_FOLDERCOMPARE
-#: Merge.rc:2954 Merge.rc:4225
+#: Merge.rc:2964 Merge.rc:4235
msgctxt "Options dialog|Categories"
msgid "Folder"
msgstr "Папки"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC
-#: Merge.rc:2957
+#: Merge.rc:2967
msgid "&Compare method:"
msgstr "Метод за &сравняване:"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_COMPARE_STOPFIRST
-#: Merge.rc:2959
+#: Merge.rc:2969
msgid "S&top after first difference"
msgstr "&Спиране след първото различие"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_IGNORE_SMALLTIMEDIFF
-#: Merge.rc:2961
+#: Merge.rc:2971
msgid "Ign&ore time differences less than 3 seconds"
msgstr "Пропускане на &различия във времето по-малки от 3 секунди"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC
-#: Merge.rc:2964
+#: Merge.rc:2974
msgid "Expand subfolders &after comparison:"
msgstr "Р&азтваряне на подпапките след сравняване:"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_COMPARE_WALKSUBDIRS
-#: Merge.rc:2966
+#: Merge.rc:2976
msgid "Include &unique subfolders contents"
msgstr "Включване на &уникално съдържание от подпапки"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_IGNORE_REPARSEPOINTS
-#: Merge.rc:2968
+#: Merge.rc:2978
msgid "Ignore &reparse points"
msgstr "Пренебрегване на точките за &повторен разбор"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC
-#: Merge.rc:2969
+#: Merge.rc:2979
msgid "Switch to &quick compare when size exceeds (MB):"
msgstr "Използване на &бързо сравняване при размер над (МБ):"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC
-#: Merge.rc:2971
+#: Merge.rc:2981
msgid "Switch to &binary compare when size exceeds (MB):"
msgstr "Използване на &двоично сравняване при размер над (МБ):"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC
-#: Merge.rc:2975
+#: Merge.rc:2985
msgid "Additional comparison condi&tions:"
msgstr "Допълнителни &условия за сравняване:"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC
-#: Merge.rc:2978
+#: Merge.rc:2988
msgid "&Rename/move detection:"
msgstr ""
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC
-#: Merge.rc:2980
+#: Merge.rc:2990
msgid "Rename/move detection &keys:"
msgstr ""
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC
-#: Merge.rc:2983
+#: Merge.rc:2993
msgid "M&erge renames and moves:"
msgstr ""
#. IDD_PROPPAGE_COMPARE_TABLE, IDC_STATIC
-#: Merge.rc:2994 Merge.rc:2999 Merge.rc:3002
+#: Merge.rc:3004 Merge.rc:3009 Merge.rc:3012
msgid "File patterns:"
msgstr "Шаблони за име на файл:"
#. IDD_PROPPAGE_COMPARE_TABLE, IDC_STATIC
-#: Merge.rc:3001
+#: Merge.rc:3011
msgid "Custom Delimiter-Separated Values"
msgstr "Стойности с разделител по желание"
#. IDS_OPTIONSPG_BINARYCOMPARE
-#: Merge.rc:3015 Merge.rc:4227
+#: Merge.rc:3025 Merge.rc:4237
msgctxt "Options dialog|Categories"
msgid "Binary"
msgstr "Двоични"
#. IDD_PROPPAGE_COMPARE_BINARY, IDC_STATIC
-#: Merge.rc:3018
+#: Merge.rc:3028
msgid "Binary file &patterns:"
msgstr "&Шаблони за двоични файлове:"
#. IDD_PROPPAGE_COMPARE_BINARY, IDC_STATIC
-#: Merge.rc:3020
+#: Merge.rc:3030
msgid "Frhed settings"
msgstr "Настройки на Frhed"
#. IDD_PROPPAGE_COMPARE_BINARY, IDC_COMPAREBINARY_VIEWSETTINGS
-#: Merge.rc:3021
+#: Merge.rc:3031
msgid "View &Settings..."
msgstr "&Настройки преглед…"
#. IDD_PROPPAGE_COMPARE_BINARY, IDC_COMPAREBINARY_BINARYMODE
-#: Merge.rc:3022
+#: Merge.rc:3032
msgid "&Binary Mode..."
msgstr "&Двоичен режим…"
#. IDD_PROPPAGE_COMPARE_BINARY, IDC_COMPAREBINARY_CHARACTERSET
-#: Merge.rc:3023
+#: Merge.rc:3033
msgid "&Character Set..."
msgstr "Набор от &символи…"
#. IDS_PRPCAT_IMAGE
-#: Merge.rc:3029 Merge.rc:4226 Merge.rc:4665
+#: Merge.rc:3039 Merge.rc:4236 Merge.rc:4675
msgid "Image"
msgstr "Изображения"
#. IDD_PROPPAGE_COMPARE_IMAGE, IDC_STATIC
-#: Merge.rc:3032
+#: Merge.rc:3042
msgid "Image file &patterns:"
msgstr "Файлови &разширения на изображения:"
#. IDD_PROPPAGE_COMPARE_IMAGE, IDC_ENABLE_IMGCMP_IN_DIRCMP
-#: Merge.rc:3034
+#: Merge.rc:3044
msgid "&Enable image compare in folder compare"
msgstr "&Сравняване и на изображения при сравняване на папки"
#. IDD_PROPPAGE_COMPARE_IMAGE, IDC_STATIC
-#: Merge.rc:3036
+#: Merge.rc:3046
msgid "OCR result:"
msgstr "Резултат от OCR:"
#. IDS_OPTIONSPG_WEBPAGECOMPARE
-#: Merge.rc:3043 Merge.rc:4229
+#: Merge.rc:3053 Merge.rc:4239
msgid "Webpage"
msgstr "Страница в интернет"
#. IDD_PROPPAGE_COMPARE_WEBPAGE, IDC_STATIC
-#: Merge.rc:3046
+#: Merge.rc:3056
msgid "URL pattern to &include (Regular expression):"
msgstr ""
#. IDD_PROPPAGE_COMPARE_WEBPAGE, IDC_STATIC
-#: Merge.rc:3048
+#: Merge.rc:3058
msgid "URL pattern to &exclude (Regular expression):"
msgstr ""
#. IDD_PROPPAGE_COMPARE_WEBPAGE, IDC_STATIC
-#: Merge.rc:3050
+#: Merge.rc:3060
msgid "&User data folder location:"
msgstr ""
#. IDD_PROPPAGE_COMPARE_WEBPAGE, IDC_COMPAREWEBPAGE_USERDATAFOLDER_PERPANE
-#: Merge.rc:3052
+#: Merge.rc:3062
msgid "&Separate user data folders for each pane"
msgstr ""
#. IDD_ENCODINGERROR, IDC_HEXVIEW
-#: Merge.rc:3065
+#: Merge.rc:3075
msgid "&Hex View"
msgstr "&Шестнадесетичен изглед"
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3110
+#: Merge.rc:3120
msgid "Edit Plugin"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN, IDC_STATIC
-#: Merge.rc:3123
+#: Merge.rc:3133
msgid "&Category:"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_MENUCAPTION_STATIC
-#: Merge.rc:3125
+#: Merge.rc:3135
msgid "&Menu caption:"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_WINDOWTYPE_STATIC
-#: Merge.rc:3127
+#: Merge.rc:3137
msgid "&Window type:"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_UNPACKEDFILEEXTENSION_STATIC
-#: Merge.rc:3132
+#: Merge.rc:3142
msgid "&Unpacked file extension:"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_ARGUMENTSREQUIRED
-#: Merge.rc:3136
+#: Merge.rc:3146
msgid "&Require arguments"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_GENERATESCRIPT
-#: Merge.rc:3137
+#: Merge.rc:3147
msgid "&Generate editor script"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_COMMAND_LINE_STATIC
-#: Merge.rc:3140
+#: Merge.rc:3150
msgid "Command &line:"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_SCRIPT_FILEEXTENSION_STATIC
-#: Merge.rc:3143
+#: Merge.rc:3153
msgid "&Script file extension:"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_SCRIPT_BODY_STATIC
-#: Merge.rc:3145
+#: Merge.rc:3155
msgid "Script &body:"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3154
+#: Merge.rc:3164
msgid "Font"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3157
+#: Merge.rc:3167
msgid "&Font:"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3163
+#: Merge.rc:3173
msgid "Font st&yle:"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3169
+#: Merge.rc:3179
msgid "&Size:"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3175
+#: Merge.rc:3185
msgid "Effects"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3176
+#: Merge.rc:3186
msgid "Stri&keout"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3177
+#: Merge.rc:3187
msgid "&Underline"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3179
+#: Merge.rc:3189
msgid "&Color:"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3184
+#: Merge.rc:3194
msgid "Sample"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3185
+#: Merge.rc:3195
msgid "AaBbYyZz"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3189
+#: Merge.rc:3199
msgid "Sc&ript:"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN, IDC_MANAGE_LINK
-#: Merge.rc:3194
+#: Merge.rc:3204
msgid "Show more fonts"
msgstr ""
#. ID_INDICATOR_EXT
-#: Merge.rc:4118
+#: Merge.rc:4128
msgid "EXT"
msgstr "EXT"
#. ID_INDICATOR_CAPS
-#: Merge.rc:4119
+#: Merge.rc:4129
msgid "CAP"
msgstr "CAP"
#. ID_INDICATOR_NUM
-#: Merge.rc:4120
+#: Merge.rc:4130
msgid "NUM"
msgstr "NUM"
#. ID_INDICATOR_SCRL
-#: Merge.rc:4121
+#: Merge.rc:4131
msgid "SCRL"
msgstr "SCRL"
#. ID_INDICATOR_OVR
-#: Merge.rc:4122
+#: Merge.rc:4132
msgid "OVR"
msgstr "OVR"
#. ID_INDICATOR_REC
-#: Merge.rc:4123
+#: Merge.rc:4133
msgid "REC"
msgstr "REC"
#. ID_FILE_NEW
-#: Merge.rc:4129
+#: Merge.rc:4139
msgid ""
"\n"
"New Documents (Ctrl+N)"
@@ -4862,7 +4873,7 @@ msgstr ""
"Нови документи (Ctrl+N)"
#. ID_FILE_OPEN
-#: Merge.rc:4130
+#: Merge.rc:4140
msgid ""
"\n"
"Open (Ctrl+O)"
@@ -4871,7 +4882,7 @@ msgstr ""
"Отваряне (Ctrl+O)"
#. ID_FILE_SAVE
-#: Merge.rc:4131
+#: Merge.rc:4141
msgid ""
"\n"
"Save (Ctrl+S)"
@@ -4880,27 +4891,27 @@ msgstr ""
"Запазване (Ctrl+S)"
#. IDS_UNK_ERROR_READING_PROJECT
-#: Merge.rc:4137
+#: Merge.rc:4147
msgid "Unknown error opening project file."
msgstr "Неочаквана грешка при отваряне на файл с проект."
#. IDS_UNK_ERROR_SAVING_PROJECT
-#: Merge.rc:4138
+#: Merge.rc:4148
msgid "Unknown error saving project file."
msgstr "Неочаквана грешка при записване на файл с проект."
#. IDS_PROJFILE_LOAD_SUCCESS
-#: Merge.rc:4143
+#: Merge.rc:4153
msgid "Project file loaded."
msgstr "Проектът е зареден."
#. IDS_PROJFILE_SAVE_SUCCESS
-#: Merge.rc:4144
+#: Merge.rc:4154
msgid "Project file saved."
msgstr "Проектът е запазен."
#. ID_EDIT_UNDO
-#: Merge.rc:4150
+#: Merge.rc:4160
msgid ""
"\n"
"Undo (Ctrl+Z)"
@@ -4909,7 +4920,7 @@ msgstr ""
"Отменяне (Ctrl+Z)"
#. ID_EDIT_REDO
-#: Merge.rc:4151
+#: Merge.rc:4161
msgid ""
"\n"
"Redo (Ctrl+Y)"
@@ -4918,7 +4929,7 @@ msgstr ""
"Повтаряне (Ctrl+Y)"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:4158
+#: Merge.rc:4168
msgid ""
"\n"
"FileCompare\n"
@@ -4937,7 +4948,7 @@ msgstr ""
"Сравняване на файлове с WinMerge"
#. IDR_DIRDOCTYPE
-#: Merge.rc:4159
+#: Merge.rc:4169
msgid ""
"\n"
"FolderCompare\n"
@@ -4956,317 +4967,317 @@ msgstr ""
"Сравняване на папки с WinMerge"
#. IDS_SPLASH_GPLTEXT
-#: Merge.rc:4165
+#: Merge.rc:4175
msgid "WinMerge comes with ABSOLUTELY NO WARRANTY. It is free software and can be redistributed under the conditions of the GNU General Public License - see the Help menu for details."
msgstr "WinMerge идва БЕЗ НИКАКВА ГАРАНЦИЯ. Приложението е свободен софтуер и сте свободни да го разпространявате при определени условия; за подробности вижте Публичния лиценз на GNU в менюто Помощ."
#. IDS_MESSAGEBOX_ABORT
-#: Merge.rc:4173
+#: Merge.rc:4183
msgid "&Abort"
msgstr "&Прекъсване"
#. IDS_MESSAGEBOX_RETRY
-#: Merge.rc:4174
+#: Merge.rc:4184
msgid "&Retry"
msgstr "&Повторен опит"
#. IDS_MESSAGEBOX_IGNORE
-#: Merge.rc:4175
+#: Merge.rc:4185
msgid "&Ignore"
msgstr "&Пренебрегване"
#. IDS_MESSAGEBOX_IGNOREALL
-#: Merge.rc:4176
+#: Merge.rc:4186
msgid "Ignore &all"
msgstr "Пренебрегване на &всички"
#. IDS_MESSAGEBOX_YES
-#: Merge.rc:4177
+#: Merge.rc:4187
msgid "&Yes"
msgstr "&Да"
#. IDS_MESSAGEBOX_YES_TO_ALL
-#: Merge.rc:4183
+#: Merge.rc:4193
msgid "Yes to &all"
msgstr "Да, за &всички"
#. IDS_MESSAGEBOX_NO
-#: Merge.rc:4184
+#: Merge.rc:4194
msgid "&No"
msgstr "&Не"
#. IDS_MESSAGEBOX_NO_TO_ALL
-#: Merge.rc:4185
+#: Merge.rc:4195
msgid "No to a&ll"
msgstr "Не, за в&сички"
#. IDS_MESSAGEBOX_CONTINUE
-#: Merge.rc:4186
+#: Merge.rc:4196
msgid "&Continue"
msgstr "&Продължаване"
#. IDS_MESSAGEBOX_SKIP
-#: Merge.rc:4187
+#: Merge.rc:4197
msgid "&Skip"
msgstr "&Прескачане"
#. IDS_MESSAGEBOX_SKIPALL
-#: Merge.rc:4188
+#: Merge.rc:4198
msgid "Skip &all"
msgstr "Прескачане на &всички"
#. IDS_MESSAGEBOX_DONT_DISPLAY_AGAIN
-#: Merge.rc:4190
+#: Merge.rc:4200
msgid "Don't display this &message again."
msgstr "Без &повторно показване на това съобщение."
-#: Merge.rc:4193
+#: Merge.rc:4203
msgid "To make this message box visible, press Reset on the Message Boxes page in Options."
msgstr ""
#. IDS_OPTIONSPG_EDITOR_COMPAREMERGE
-#: Merge.rc:4203
+#: Merge.rc:4213
msgid "Compare/Merge"
msgstr "Сравняване/сливане"
#. IDS_OPTIONSPG_SYNTAXCOLORS
-#: Merge.rc:4204 Merge.rc:4208
+#: Merge.rc:4214 Merge.rc:4218
msgid "Syntax"
msgstr "Синтаксис"
#. IDS_OPTIONSPG_COLOR_SCHEMES
-#: Merge.rc:4206
+#: Merge.rc:4216
msgid "Color Schemes"
msgstr "Теми"
#. IDS_OPTIONSPG_DIRCOLORS
-#: Merge.rc:4210
+#: Merge.rc:4220
msgid "Folder Compare"
msgstr "Сравняване на папки"
#. IDS_OPTIONSPG_PROJECT
-#: Merge.rc:4215
+#: Merge.rc:4225
msgid "Project"
msgstr "Проекти"
#. IDS_COLHDR_NSDIFFS
-#: Merge.rc:4218 Merge.rc:4640
+#: Merge.rc:4228 Merge.rc:4650
msgid "Differences"
msgstr "Различия"
#. IDS_OPTIONSPG_MESSAGEBOXES
-#: Merge.rc:4220
+#: Merge.rc:4230
msgid "Message Boxes"
msgstr "Диалогови прозорци"
#. IDS_TO
-#: Merge.rc:4235
+#: Merge.rc:4245
msgid "To:"
msgstr "В:"
#. IDS_FROM_LEFT
-#: Merge.rc:4236
+#: Merge.rc:4246
msgid "From left:"
msgstr "От ляво:"
#. IDS_TO_LEFT
-#: Merge.rc:4237
+#: Merge.rc:4247
msgid "To left:"
msgstr "Вляво:"
#. IDS_FROM_RIGHT
-#: Merge.rc:4238
+#: Merge.rc:4248
msgid "From right:"
msgstr "От дясно:"
#. IDS_TO_RIGHT
-#: Merge.rc:4239
+#: Merge.rc:4249
msgid "To right:"
msgstr "Вдясно:"
#. IDS_FROM_MIDDLE
-#: Merge.rc:4240
+#: Merge.rc:4250
msgid "From middle:"
msgstr "От средата:"
#. IDS_TO_MIDDLE
-#: Merge.rc:4241
+#: Merge.rc:4251
msgid "To middle:"
msgstr "Всредата:"
#. IDS_VERSION_FMT
-#: Merge.rc:4247
+#: Merge.rc:4257
#, c-format
msgid "Version %1"
msgstr "Издание %1"
#. IDS_OPTIONS_TITLE
-#: Merge.rc:4253
+#: Merge.rc:4263
#, c-format
msgid "Options (%1)"
msgstr "Настройки (%1)"
#. IDS_MESSAGE_BOX_ARE_RESET
-#: Merge.rc:4254
+#: Merge.rc:4264
msgid "All message boxes are now displayed again."
msgstr "Всички съобщения ще се показват отново."
-#: Merge.rc:4256
+#: Merge.rc:4266
#, c-format
msgid "Tab size value is out of range. Please use 1 - %1."
msgstr "Размерът на табулацията е извън границите. Използвайте стойност между 1 и %1."
#. IDS_PROJECT_OPEN
-#: Merge.rc:4262 Merge.rc:4318
+#: Merge.rc:4272 Merge.rc:4328
msgid "Open"
msgstr "Отваряне"
#. IDS_PROGRAMFILES
-#: Merge.rc:4263
+#: Merge.rc:4273
msgid "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||"
msgstr "Приложения|*.exe;*.bat;*.cmd|Всички файлове (*.*)|*.*||"
#. IDS_ALLFILES
-#: Merge.rc:4264
+#: Merge.rc:4274
msgid "All Files (*.*)|*.*||"
msgstr "Всички файлове (*.*)|*.*||"
#. IDS_PROJECTFILES
-#: Merge.rc:4265
+#: Merge.rc:4275
msgid "WinMerge Project Files (*.WinMerge)|*.WinMerge||"
msgstr "Проекти на WinMerge (*.WinMerge)|*.WinMerge||"
#. IDS_INIFILES
-#: Merge.rc:4267
+#: Merge.rc:4277
msgid "Options files (*.ini)|*.ini|All Files (*.*)|*.*||"
msgstr "Файлове за настройка (*.ini)|*.ini|Всички файлове (*.*)|*.*||"
#. IDS_REPLACELIST_FILES
-#: Merge.rc:4268
+#: Merge.rc:4278
msgid "Tab-Separated Values (*.tsv;*.txt)|*.tsv;*.txt|All Files (*.*)|*.*||"
msgstr ""
#. IDS_TEXT_REPORT_FILES
-#: Merge.rc:4274
+#: Merge.rc:4284
msgid "Text Files (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|All Files (*.*)|*.*||"
msgstr "Текстови файлове (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|Всички файлове (*.*)|*.*||"
#. IDS_HTML_REPORT_FILES
-#: Merge.rc:4275
+#: Merge.rc:4285
msgid "HTML Files (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||"
msgstr "HTML файлове (*.htm,*.html)|*.htm;*.html|Всички файлове (*.*)|*.*||"
#. IDS_XML_REPORT_FILES
-#: Merge.rc:4276
+#: Merge.rc:4286
msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||"
msgstr "XML файлове (*.xml)|*.xml|Всички файлове (*.*)|*.*||"
#. IDS_EXPANDSUBDIRS_DONOTEXPAND
-#: Merge.rc:4294
+#: Merge.rc:4304
msgid "Do not expand"
msgstr "Без разгъване"
#. IDS_EXPANDSUBDIRS_ALL
-#: Merge.rc:4295
+#: Merge.rc:4305
msgid "Expand all subfolders"
msgstr "Разгъване на всички подпапки"
#. IDS_EXPANDSUBDIRS_DIFFERENT
-#: Merge.rc:4296
+#: Merge.rc:4306
msgid "Expand different subfolders"
msgstr "Разгъване на различните подпапки"
#. IDS_EXPANDSUBDIRS_IDENTICAL
-#: Merge.rc:4297
+#: Merge.rc:4307
msgid "Expand identical subfolders"
msgstr "Разгъване на еднаквите подпапки"
#. IDS_SYNTAXTABLE_FILETYPE
-#: Merge.rc:4303
+#: Merge.rc:4313
msgid "File Type"
msgstr "Вид на файла"
#. IDS_COLHDR_EXTENSION
-#: Merge.rc:4304 Merge.rc:4597
+#: Merge.rc:4314 Merge.rc:4607
msgid "Extension"
msgstr "Разширение"
#. IDS_PRPCAT_MESSAGE
-#: Merge.rc:4310 Merge.rc:4669
+#: Merge.rc:4320 Merge.rc:4679
msgid "Message"
msgstr "Съобщение"
#. IDS_MESSAGEBOX_ANSWER
-#: Merge.rc:4311
+#: Merge.rc:4321
msgid "Answer"
msgstr "Отговор"
#. IDS_PROJECT_ITEM
-#: Merge.rc:4317
+#: Merge.rc:4327
msgid "Item"
msgstr "Елемент"
#. IDS_PROJECT_LOAD
-#: Merge.rc:4319
+#: Merge.rc:4329
msgid "Load"
msgstr "Зареждане"
#. IDS_PROJECT_SAVE
-#: Merge.rc:4320
+#: Merge.rc:4330
msgid "Save"
msgstr "Запазване"
#. IDS_PROJECT_ITEM_INCLUDE_SUBFOLDERS
-#: Merge.rc:4322
+#: Merge.rc:4332
msgid "Include Subfolders"
msgstr "Включително подпапки"
#. IDS_PROJECT_ITEM_COMPARE_OPTIONS
-#: Merge.rc:4324
+#: Merge.rc:4334
msgid "Compare Options"
msgstr "Настройки на сравняване"
#. IDS_PROJECT_ITEM_HIDDEN_ITEMS
-#: Merge.rc:4325
+#: Merge.rc:4335
msgid "Hidden Items"
msgstr "Скрити елементи"
#. IDS_PLUGINSLIST_NAME
-#: Merge.rc:4331 Merge.rc:4956
+#: Merge.rc:4341 Merge.rc:4966
msgid "Name"
msgstr "Име"
#. IDS_FILTERFILE_PATHTITLE
-#: Merge.rc:4332
+#: Merge.rc:4342
msgid "Location"
msgstr "Място"
#. IDS_FILTER_TITLE
-#: Merge.rc:4333
+#: Merge.rc:4343
msgid "Filters"
msgstr "Филтри"
#. IDS_FILTER_PREFIX
-#: Merge.rc:4334
+#: Merge.rc:4344
msgid "[F] "
msgstr "[Ф] "
#. IDS_PLUGINSLIST_DESC
-#: Merge.rc:4335 Merge.rc:4958
+#: Merge.rc:4345 Merge.rc:4968
msgid "Description"
msgstr "Описание"
#. IDS_FILEFILTER_SAVENEW
-#: Merge.rc:4336
+#: Merge.rc:4346
msgid "Select Filename for New Filter"
msgstr "Име на новия филтър"
#. IDS_FILEFILTER_FILEMASK
-#: Merge.rc:4337
+#: Merge.rc:4347
msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||"
msgstr "Файлове с филтри (*.flt)|*.flt|Всички файлове (*.*)|*.*||"
-#: Merge.rc:4339
+#: Merge.rc:4349
#, c-format
msgid ""
"Cannot find filter template!\n"
@@ -5279,7 +5290,7 @@ msgstr ""
"Kопирайте файла %1 в папката WinMerge/Filters:\n"
"%2."
-#: Merge.rc:4341
+#: Merge.rc:4351
#, c-format
msgid ""
"Cannot copy filter template:\n"
@@ -5292,7 +5303,7 @@ msgstr ""
"\n"
"Уверете се че папката съществува и в нея може да се запазва."
-#: Merge.rc:4343
+#: Merge.rc:4353
msgid ""
"User's filter folder is not defined!\n"
"\n"
@@ -5302,7 +5313,7 @@ msgstr ""
"\n"
"Изберете папка за филтри в Настройки/Системни."
-#: Merge.rc:4345
+#: Merge.rc:4355
#, c-format
msgid ""
"Failed to delete filter:\n"
@@ -5316,11 +5327,11 @@ msgstr ""
"Може би файлът е само за четене?"
#. IDS_FILEFILTER_INSTALL
-#: Merge.rc:4346
+#: Merge.rc:4356
msgid "Locate Filter File to Install"
msgstr "Избиране на филтър, който да бъде инсталиран"
-#: Merge.rc:4348
+#: Merge.rc:4358
msgid ""
"Installing filter file failed.\n"
"\n"
@@ -5331,17 +5342,17 @@ msgstr ""
"Не може да бъде копиран в папката с филтри."
#. IDS_FILEFILTER_OVERWRITE
-#: Merge.rc:4349
+#: Merge.rc:4359
msgid "Filter file exists. Overwrite?"
msgstr "Файлът с филтри съществува. Да бъде ли презаписан?"
#. IDS_FILTERLINE_REGEXP
-#: Merge.rc:4355
+#: Merge.rc:4365
msgid "Regular expression"
msgstr "Регулярни изрази"
#. IDS_FILTERCHANGED
-#: Merge.rc:4361
+#: Merge.rc:4371
msgid ""
"Filters updated. Refresh all open folder compares?\n"
"\n"
@@ -5352,217 +5363,217 @@ msgstr ""
"Изберете „Не“ за презареждане по-късно."
#. IDS_DIRECTORY_WINDOW_TITLE
-#: Merge.rc:4367
+#: Merge.rc:4377
msgid "Folder Comparison Results"
msgstr "Резултати от сравняване на папки"
#. IDS_FILE_COMPARISON_TITLE
-#: Merge.rc:4368
+#: Merge.rc:4378
msgid "File Comparison"
msgstr "Сравняване на файлове"
#. IDS_EMPTY_LEFT_FILE
-#: Merge.rc:4369
+#: Merge.rc:4379
msgid "Untitled Left"
msgstr "Неозаглавен ляв"
#. IDS_EMPTY_MIDDLE_FILE
-#: Merge.rc:4370
+#: Merge.rc:4380
msgid "Untitled Middle"
msgstr "Неозаглавен среден"
#. IDS_EMPTY_RIGHT_FILE
-#: Merge.rc:4371
+#: Merge.rc:4381
msgid "Untitled Right"
msgstr "Неозаглавен десен"
#. IDS_CONFLICT_BASE_FILE
-#: Merge.rc:4372
+#: Merge.rc:4382
msgid "Base File"
msgstr "Изходен файл"
#. IDS_CONFLICT_THEIRS_FILE
-#: Merge.rc:4373
+#: Merge.rc:4383
msgid "Theirs File"
msgstr "Техен файл"
#. IDS_CONFLICT_MINE_FILE
-#: Merge.rc:4374
+#: Merge.rc:4384
msgid "Mine File"
msgstr "Мой файл"
#. IDS_SELFCOMPARE_ORIGINAL_FILE
-#: Merge.rc:4375
+#: Merge.rc:4385
msgid "Original File"
msgstr "Оригинален файл"
#. IDS_LINE_STATUS_INFO_EOL
-#: Merge.rc:4381
+#: Merge.rc:4391
#, c-format
msgid "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s"
msgstr "Ред: %s колона: %d/%d знак: %d/%d EOL: %s"
#. IDS_EMPTY_LINE_STATUS_INFO
-#: Merge.rc:4382
+#: Merge.rc:4392
#, c-format
msgid "Line: %s"
msgstr "Ред: %s"
#. IDS_LINE_STATUS_INFO
-#: Merge.rc:4383
+#: Merge.rc:4393
#, c-format
msgid "Ln: %s Col: %d/%d Ch: %d/%d"
msgstr "Ред: %s колона: %d/%d знак: %d/%d"
#. IDS_LINE_STATUS_INFO_SEL
-#: Merge.rc:4384
+#: Merge.rc:4394
#, c-format
msgid " Sel: %d | %d"
msgstr " Избр: %d | %d"
#. IDS_MERGEMODE_MERGING
-#: Merge.rc:4385
+#: Merge.rc:4395
msgid "Merge"
msgstr "Сливане"
#. IDS_DIFF_NUMBER_STATUS_FMT
-#: Merge.rc:4386
+#: Merge.rc:4396
#, c-format
msgid "Difference %1 of %2"
msgstr "Различие %1 от %2"
#. IDS_NO_DIFF_SEL_FMT
-#: Merge.rc:4387
+#: Merge.rc:4397
#, c-format
msgid "%1 Differences Found"
msgstr "%1 различия"
#. IDS_1_DIFF_FOUND
-#: Merge.rc:4388
+#: Merge.rc:4398
msgid "1 Difference Found"
msgstr "1 различие"
#. IDS_NO_ERR_SEL_FMT
-#: Merge.rc:4389
+#: Merge.rc:4399
#, c-format
msgid "%1 Errors Found"
msgstr "%1 грешки"
#. IDS_1_ERR_FOUND
-#: Merge.rc:4390
+#: Merge.rc:4400
msgid "1 Error Found"
msgstr "1 грешка"
#. IDS_STATUSBAR_READONLY, Abbreviation from "Read Only"
-#: Merge.rc:4391
+#: Merge.rc:4401
msgid "RO"
msgstr "СЧ"
#. IDS_DIRVIEW_STATUS_FMT_FOCUS
-#: Merge.rc:4397
+#: Merge.rc:4407
#, c-format
msgid "Item %1 of %2"
msgstr "Елемент %1 от %2"
#. IDS_DIRVIEW_STATUS_FMT_NOFOCUS
-#: Merge.rc:4398
+#: Merge.rc:4408
#, c-format
msgid "Items: %1"
msgstr "Общо: %1"
#. IDS_DIRVIEW_STATUS_COMPARING
-#: Merge.rc:4399
+#: Merge.rc:4409
msgid "Comparing items..."
msgstr "Сравняване на…"
#. IDS_ITEMS_PER_SEC
-#: Merge.rc:4400
+#: Merge.rc:4410
#, c-format
msgid "%.1f[items/sec]"
msgstr "%.1f[елемента/сек]"
#. IDS_ERROR_INCOMPARABLE
-#: Merge.rc:4406
+#: Merge.rc:4416
msgid "Select two existing folders/files to compare."
msgstr "Изберете два съществуващи файла/папки, които да бъдат сравнени."
#. IDS_DIRSEL_TAG
-#: Merge.rc:4407
+#: Merge.rc:4417
msgid "Folder Selection"
msgstr "Избор на папка"
#. IDS_OPEN_FILESDIRS
-#: Merge.rc:4408
+#: Merge.rc:4418
msgid "Select two (or three) folders/files to compare."
msgstr "Изберете два (или три) съществуващи файла/папки, които да бъдат сравнени."
#. IDS_OPEN_LEFTINVALID
-#: Merge.rc:4409
+#: Merge.rc:4419
msgid "Left (1st) path is invalid!"
msgstr "Левият (№1) път е недействителен!"
#. IDS_OPEN_MIDDLEINVALID
-#: Merge.rc:4410
+#: Merge.rc:4420
msgid "Middle (2nd) path is invalid!"
msgstr "Средният (№2) път е недействителен!"
#. IDS_OPEN_RIGHTINVALID2
-#: Merge.rc:4411
+#: Merge.rc:4421
msgid "Right (2nd) path is invalid!"
msgstr "Десният (№2) път е недействителен!"
#. IDS_OPEN_RIGHTINVALID3
-#: Merge.rc:4412
+#: Merge.rc:4422
msgid "Right (3rd) path is invalid!"
msgstr "Десният (№3) път е недействителен!"
#. IDS_OPEN_BOTHINVALID
-#: Merge.rc:4413
+#: Merge.rc:4423
msgid "Both paths are invalid!"
msgstr "Двата пътя са невалидни!"
-#: Merge.rc:4415
+#: Merge.rc:4425
msgid "Left (1st) and Middle (2nd) paths are invalid!"
msgstr "Левият (№1) и средният (№2) път са недействителни!"
#. IDS_OPEN_LEFTRIGHTINVALID
-#: Merge.rc:4416
+#: Merge.rc:4426
msgid "Left (1st) and Right (3rd) paths are invalid!"
msgstr "Левият (№3) и десният (№3) път са недействителни!"
-#: Merge.rc:4418
+#: Merge.rc:4428
msgid "Middle (2nd) and Right (3rd) paths are invalid!"
msgstr "Средният (№2) и десният (№3) път са недействителни!"
#. IDS_OPEN_ALLINVALID
-#: Merge.rc:4419
+#: Merge.rc:4429
msgid "All paths are invalid!"
msgstr "Всички пътища са недействителни!"
#. IDS_OPEN_UNPACKERDISABLED
-#: Merge.rc:4420
+#: Merge.rc:4430
msgid "Only enabled for file comparisons"
msgstr "Разрешено само при сравняване на файлове"
#. IDS_OPEN_MISMATCH
-#: Merge.rc:4421
+#: Merge.rc:4431
msgid "Cannot compare file and folder!"
msgstr "Не могат да бъдат сравнявани файлове с папки!"
#. IDS_ERROR_FILE_NOT_FOUND
-#: Merge.rc:4427
+#: Merge.rc:4437
#, c-format
msgid "File not found: %1"
msgstr "Не е намерен файла: %1"
#. IDS_ERROR_FILE_NOT_UNPACKED
-#: Merge.rc:4428
+#: Merge.rc:4438
#, c-format
msgid "File not unpacked: %1"
msgstr "Не е разархивиран файла: %1"
#. IDS_ERROR_FILEOPEN
-#: Merge.rc:4429
+#: Merge.rc:4439
#, c-format
msgid ""
"Cannot open file\n"
@@ -5576,12 +5587,12 @@ msgstr ""
"%2"
#. IDS_ERROR_CONF_RESOLVE
-#: Merge.rc:4430
+#: Merge.rc:4440
msgid "Failed to parse conflict file."
msgstr "Грешка при разбора на файла с конфликти."
#. IDS_NOT_CONFLICT_FILE
-#: Merge.rc:4431
+#: Merge.rc:4441
#, c-format
msgid ""
"The file\n"
@@ -5593,7 +5604,7 @@ msgstr ""
"не съдържа конфликти."
#. IDS_COMPARE_LARGE_FILES
-#: Merge.rc:4432
+#: Merge.rc:4442
msgid ""
"Comparing large files requires significant memory.\n"
"Show only comparison results (not file contents)?"
@@ -5602,28 +5613,28 @@ msgstr ""
"Показване само на резултата от сравнението (без съдържанието)?"
#. IDS_SAVE_AS_TITLE
-#: Merge.rc:4438
+#: Merge.rc:4448
msgid "Save As"
msgstr "Запазване като"
#. IDS_SAVE_FMT
-#: Merge.rc:4439
+#: Merge.rc:4449
#, c-format
msgid "Save changes to %1?"
msgstr "Запазване на промените на %1?"
#. IDS_SAVEREADONLY_FMT
-#: Merge.rc:4440
+#: Merge.rc:4450
#, c-format
msgid "%1 is read-only. Override? Or 'No' to save as new filename?"
msgstr "Файлът %1 е само за четене. Презаписване? При „Не“, ще бъде запазен под ново име."
#. IDS_ERROR_BACKUP
-#: Merge.rc:4441
+#: Merge.rc:4451
msgid "Error backing up file"
msgstr "Грешка при създаване на резервно копие"
-#: Merge.rc:4443
+#: Merge.rc:4453
#, c-format
msgid ""
"Unable to backup original file:\n"
@@ -5637,7 +5648,7 @@ msgstr ""
"Продължаване?"
#. IDS_FILESAVE_FAILED
-#: Merge.rc:4444
+#: Merge.rc:4454
#, c-format
msgid ""
"Saving file failed.\n"
@@ -5652,7 +5663,7 @@ msgstr ""
"\t- използване на различно име (изберете Добре)\n"
"\t- отменяне текущото действие (изберете Отказ)?"
-#: Merge.rc:4446
+#: Merge.rc:4456
#, c-format
msgid ""
"Plugin '%2' cannot pack changes to left file into '%1'.\n"
@@ -5663,7 +5674,7 @@ msgstr ""
"\n"
"Изходният файл няма да бъде променян. Запазване на непакетираната версия?"
-#: Merge.rc:4448
+#: Merge.rc:4458
#, c-format
msgid ""
"Plugin '%2' cannot pack changes to middle file into '%1'.\n"
@@ -5674,7 +5685,7 @@ msgstr ""
"\n"
"Изходният файл няма да бъде променян. Запазване на непакетираната версия?"
-#: Merge.rc:4450
+#: Merge.rc:4460
#, c-format
msgid ""
"Plugin '%2' cannot pack changes to right file into '%1'.\n"
@@ -5686,7 +5697,7 @@ msgstr ""
"Изходният файл няма да бъде променян. Запазване на непакетираната версия?"
#. IDS_FILECHANGED_ONDISK
-#: Merge.rc:4451
+#: Merge.rc:4461
#, c-format
msgid ""
"Another application updated\n"
@@ -5702,7 +5713,7 @@ msgstr ""
"Желаете ли файлът да бъде презаписан?"
#. IDS_SAVEREADONLY_MULTI
-#: Merge.rc:4452
+#: Merge.rc:4462
#, c-format
msgid ""
"%1\n"
@@ -5712,7 +5723,7 @@ msgstr ""
"е само за четене. Презаписване?"
#. IDS_FILECHANGED_RESCAN
-#: Merge.rc:4453
+#: Merge.rc:4463
#, c-format
msgid ""
"Another application updated\n"
@@ -5728,22 +5739,22 @@ msgstr ""
"Презареждане?"
#. IDS_SAVE_LEFT_AS
-#: Merge.rc:4454
+#: Merge.rc:4464
msgid "Save Left File As"
msgstr "Запазване на левия файл като"
#. IDS_SAVE_MIDDLE_AS
-#: Merge.rc:4455
+#: Merge.rc:4465
msgid "Save Middle File As"
msgstr "Запазване на средния файл като"
#. IDS_SAVE_RIGHT_AS
-#: Merge.rc:4456
+#: Merge.rc:4466
msgid "Save Right File As"
msgstr "Запазване на десния файл като"
#. IDS_FILE_DISAPPEARED
-#: Merge.rc:4461
+#: Merge.rc:4471
#, c-format
msgid ""
"File\n"
@@ -5755,7 +5766,7 @@ msgstr ""
"не е намерен. Запазете негово копие и продължете."
#. IDS_VIEWS_OUTOFSYNC
-#: Merge.rc:4467
+#: Merge.rc:4477
msgid ""
"Cannot merge unsynched documents.\n"
"\n"
@@ -5766,188 +5777,188 @@ msgstr ""
"Презаредете документите преди да продължите."
#. IDS_BREAK_ON_WHITESPACE
-#: Merge.rc:4472
+#: Merge.rc:4482
msgid "Break at whitespace"
msgstr "Пренасяне при интервали"
#. IDS_BREAK_ON_PUNCTUATION
-#: Merge.rc:4473
+#: Merge.rc:4483
msgid "Break at whitespace or punctuation"
msgstr "Пренасяне при интервали или пунктуация"
#. IDS_L2M
-#: Merge.rc:4479
+#: Merge.rc:4489
msgid "Copy to &Middle\tAlt+Right"
msgstr "Копиране в средата\tAlt+Right"
#. IDS_R2M
-#: Merge.rc:4480
+#: Merge.rc:4490
msgid "Copy to &Middle\tAlt+Left"
msgstr "Копиране в средата\tAlt+Left"
#. IDS_COPY_FROM_MIDDLE_R
-#: Merge.rc:4481
+#: Merge.rc:4491
msgid "Copy from Middle\tAlt+Shift+Right"
msgstr "Копиране oт средата\tAlt+Shift+Right"
#. IDS_COPY_FROM_MIDDLE_L
-#: Merge.rc:4482
+#: Merge.rc:4492
msgid "Copy from Middle\tAlt+Shift+Left"
msgstr "Копиране oт средата\tAlt+Shift+Left"
#. IDS_L2MNEXT
-#: Merge.rc:4483
+#: Merge.rc:4493
msgid "Copy to Middle and Advance\tCtrl+Alt+Right"
msgstr "Копиране в средата и продължаване\tCtrl+Alt+Right"
#. IDS_R2MNEXT
-#: Merge.rc:4484
+#: Merge.rc:4494
msgid "Copy to Middle and Advance\tCtrl+Alt+Left"
msgstr "Копиране в средата и продължаване\tCtrl+Alt+Left"
#. IDS_ALL_MIDDLE
-#: Merge.rc:4485
+#: Merge.rc:4495
msgid "Copy All to Middle"
msgstr "Копиране на всички в средата"
#. IDS_COPY_RIGHT_TO_LEFT
-#: Merge.rc:4491
+#: Merge.rc:4501
#, c-format
msgid "Right to Left (%1)"
msgstr "От дясно към ляво (%1)"
#. IDS_COPY_RIGHT_TO_MIDDLE
-#: Merge.rc:4492
+#: Merge.rc:4502
#, c-format
msgid "Right to Middle (%1)"
msgstr "От дясно към средно (%1)"
#. IDS_COPY_MIDDLE_TO_LEFT
-#: Merge.rc:4493
+#: Merge.rc:4503
#, c-format
msgid "Middle to Left (%1)"
msgstr "От средно към ляво (%1)"
#. IDS_COPY_MIDDLE_TO_RIGHT
-#: Merge.rc:4494
+#: Merge.rc:4504
#, c-format
msgid "Middle to Right (%1)"
msgstr "От средно към дясно (%1)"
#. IDS_COPY_LEFT_TO_RIGHT
-#: Merge.rc:4495
+#: Merge.rc:4505
#, c-format
msgid "Left to Right (%1)"
msgstr "От ляво към дясно (%1)"
#. IDS_COPY_LEFT_TO_MIDDLE
-#: Merge.rc:4496
+#: Merge.rc:4506
#, c-format
msgid "Left to Middle (%1)"
msgstr "От ляво към средно (%1)"
#. IDS_MOVE_LEFT_TO
-#: Merge.rc:4507 Merge.rc:4539
+#: Merge.rc:4517 Merge.rc:4549
#, c-format
msgid "Left to... (%1)"
msgstr "Ляво към… (%1)"
#. IDS_MOVE_MIDDLE_TO
-#: Merge.rc:4508 Merge.rc:4540
+#: Merge.rc:4518 Merge.rc:4550
#, c-format
msgid "Middle to... (%1)"
msgstr "Средно към… (%1)"
#. IDS_MOVE_RIGHT_TO
-#: Merge.rc:4509 Merge.rc:4541
+#: Merge.rc:4519 Merge.rc:4551
#, c-format
msgid "Right to... (%1)"
msgstr "Дясно към… (%1)"
#. IDS_COPY_BOTH_TO
-#: Merge.rc:4510
+#: Merge.rc:4520
#, c-format
msgid "Both to... (%1)"
msgstr "Двете към… (%1)"
#. IDS_COPY_ALL_TO
-#: Merge.rc:4511
+#: Merge.rc:4521
#, c-format
msgid "All to... (%1)"
msgstr "Всички към… (%1)"
#. IDS_COPY_DIFFERENCES_TO
-#: Merge.rc:4512
+#: Merge.rc:4522
#, c-format
msgid "Differences to... (%1)"
msgstr "Различия към… (%1)"
#. IDS_COPY_ONLYDIFFITEMS
-#: Merge.rc:4519
+#: Merge.rc:4529
msgid ""
"Some selected items are identical or skipped.\n"
"Copy only items with differences?"
msgstr ""
#. IDS_DEL_LEFT_FMT
-#: Merge.rc:4525
+#: Merge.rc:4535
#, c-format
msgid "Left (%1)"
msgstr "Ляво (%1)"
#. IDS_DEL_MIDDLE_FMT
-#: Merge.rc:4526
+#: Merge.rc:4536
#, c-format
msgid "Middle (%1)"
msgstr "Средно (%1)"
#. IDS_DEL_RIGHT_FMT
-#: Merge.rc:4527
+#: Merge.rc:4537
#, c-format
msgid "Right (%1)"
msgstr "Дясно (%1)"
#. IDS_DEL_BOTH_FMT
-#: Merge.rc:4528
+#: Merge.rc:4538
#, c-format
msgid "Both (%1)"
msgstr "Двете (%1)"
#. IDS_DEL_ALL_FMT
-#: Merge.rc:4529
+#: Merge.rc:4539
#, c-format
msgid "All (%1)"
msgstr "Всички (%1)"
#. IDS_SELECT_DEST_LEFT
-#: Merge.rc:4545
+#: Merge.rc:4555
msgid "Left Side - Select Destination Folder:"
msgstr "Лява част - изберете целева папка:"
#. IDS_SELECT_DEST_MIDDLE
-#: Merge.rc:4546
+#: Merge.rc:4556
msgid "Middle Side - Select Destination Folder:"
msgstr "Средна част - изберете целева папка:"
#. IDS_SELECT_DEST_RIGHT
-#: Merge.rc:4547
+#: Merge.rc:4557
msgid "Right Side - Select Destination Folder:"
msgstr "Дясна част - изберете целева папка:"
#. IDS_FILES_AFFECTED_FMT
-#: Merge.rc:4548
+#: Merge.rc:4558
#, c-format
msgid "(%1 Files Affected)"
msgstr "(%1 Файла засегнати)"
#. IDS_FILES_AFFECTED_FMT2
-#: Merge.rc:4549
+#: Merge.rc:4559
#, c-format
msgid "(%1 of %2 Files Affected)"
msgstr "(%1 от %2 файла засегнати)"
#. IDS_CONFIRM_DELETE_SINGLE
-#: Merge.rc:4555
+#: Merge.rc:4565
#, c-format
msgid ""
"Are you sure you want to delete\n"
@@ -5959,18 +5970,18 @@ msgstr ""
"%1 ?"
#. IDS_CONFIRM_SINGLE_COPY
-#: Merge.rc:4556
+#: Merge.rc:4566
msgid "Are you sure you want to copy?"
msgstr "Искате ли да копирате?"
#. IDS_CONFIRM_MULTIPLE_COPY
-#: Merge.rc:4557
+#: Merge.rc:4567
#, c-format
msgid "Are you sure you want to copy %d items?"
msgstr "Искате ли да копирате %d елементи?"
#. IDS_DIRCMP_NOTSYNC
-#: Merge.rc:4558
+#: Merge.rc:4568
#, c-format
msgid ""
"Operation aborted!\n"
@@ -5990,797 +6001,797 @@ msgstr ""
"Презаредете, за да бъде извършено сравняване."
#. IDS_CONFIRM_SINGLE_MOVE
-#: Merge.rc:4563
+#: Merge.rc:4573
msgid "Are you sure you want to move?"
msgstr "Наистина ли искате да преместите?"
#. IDS_CONFIRM_MULTIPLE_MOVE
-#: Merge.rc:4564
+#: Merge.rc:4574
#, c-format
msgid "Are you sure you want to move %d items?"
msgstr "Наистина ли искате да преместите %d елемента?"
#. IDS_CONFIRM_MOVE_CAPTION
-#: Merge.rc:4566
+#: Merge.rc:4576
msgid "Confirm Move"
msgstr "Потвърдете преместването"
-#: Merge.rc:4568
+#: Merge.rc:4578
msgid "Close the folder comparison window?"
msgstr "Затваряне на прозореца за сравняване на папки?"
-#: Merge.rc:4570
+#: Merge.rc:4580
msgid "Close the folder comparison window, which took a long time?"
msgstr "Затваряне на прозореца за сравняване на папки, което е отнело много време?"
#. IDS_ERROR_INVALID_DIR_FILE_NAME
-#: Merge.rc:4571
+#: Merge.rc:4581
msgid "The file or folder name is invalid."
msgstr "Името на файла или папката е недействително."
#. IDS_ERROR_EXECUTE_FILE
-#: Merge.rc:4577
+#: Merge.rc:4587
#, c-format
msgid "Failed to execute external editor: %1"
msgstr "Външният редактор не може да стартира: %1"
#. IDS_UNKNOWN_ARCHIVE_FORMAT
-#: Merge.rc:4583
+#: Merge.rc:4593
msgid "Unknown archive format"
msgstr "Непознат архив"
-#: Merge.rc:4585
+#: Merge.rc:4595
msgid ""
"Failed to extract archive.\n"
"Compare as text file?"
msgstr ""
#. IDS_COLHDR_FILENAME
-#: Merge.rc:4591
+#: Merge.rc:4601
msgid "Filename"
msgstr "Име"
#. IDS_COLHDR_DIR
-#: Merge.rc:4592
+#: Merge.rc:4602
msgctxt "DirView|ColumnHeader"
msgid "Folder"
msgstr "Папка"
#. IDS_COLHDR_RESULT
-#: Merge.rc:4593
+#: Merge.rc:4603
msgid "Comparison Result"
msgstr "Резултати при сравняване"
#. IDS_COLHDR_LTIMEM
-#: Merge.rc:4594
+#: Merge.rc:4604
msgid "Left Date"
msgstr "Дата ляво"
#. IDS_COLHDR_RTIMEM
-#: Merge.rc:4595
+#: Merge.rc:4605
msgid "Right Date"
msgstr "Дата дясно"
#. IDS_COLHDR_MTIMEM
-#: Merge.rc:4596
+#: Merge.rc:4606
msgid "Middle Date"
msgstr "Дата средата"
#. IDS_COLHDR_LSIZE
-#: Merge.rc:4598
+#: Merge.rc:4608
msgid "Left Size"
msgstr "Размер ляво"
#. IDS_COLHDR_RSIZE
-#: Merge.rc:4599
+#: Merge.rc:4609
msgid "Right Size"
msgstr "Размер дясно"
#. IDS_COLHDR_MSIZE
-#: Merge.rc:4604
+#: Merge.rc:4614
msgid "Middle Size"
msgstr "Размер средата"
#. IDS_COLHDR_RSIZE_SHORT
-#: Merge.rc:4605
+#: Merge.rc:4615
msgid "Right Size (Short)"
msgstr "Размер дясно (кратък)"
#. IDS_COLHDR_LSIZE_SHORT
-#: Merge.rc:4606
+#: Merge.rc:4616
msgid "Left Size (Short)"
msgstr "Размер ляво (кратък)"
#. IDS_COLHDR_MSIZE_SHORT
-#: Merge.rc:4607
+#: Merge.rc:4617
msgid "Middle Size (Short)"
msgstr "Размер средата (кратък)"
#. IDS_COLHDR_LTIMEC
-#: Merge.rc:4613
+#: Merge.rc:4623
msgid "Left Creation Time"
msgstr "Дата на създаване ляво"
#. IDS_COLHDR_RTIMEC
-#: Merge.rc:4614
+#: Merge.rc:4624
msgid "Right Creation Time"
msgstr "Дата на създаване дясно"
#. IDS_COLHDR_MTIMEC
-#: Merge.rc:4615
+#: Merge.rc:4625
msgid "Middle Creation Time"
msgstr "Дата на създаване средата"
#. IDS_COLHDR_NEWER
-#: Merge.rc:4616
+#: Merge.rc:4626
msgid "Newer File"
msgstr "По-нов файл"
#. IDS_COLHDR_LVERSION
-#: Merge.rc:4617
+#: Merge.rc:4627
msgid "Left File Version"
msgstr "Версия ляв файл"
#. IDS_COLHDR_RVERSION
-#: Merge.rc:4618
+#: Merge.rc:4628
msgid "Right File Version"
msgstr "Версия десен файл"
#. IDS_COLHDR_MVERSION
-#: Merge.rc:4619
+#: Merge.rc:4629
msgid "Middle File Version"
msgstr "Версия среден файл"
#. IDS_COLHDR_RESULT_ABBR
-#: Merge.rc:4620
+#: Merge.rc:4630
msgid "Short Result"
msgstr "Бързи резултати"
#. IDS_COLHDR_LATTRIBUTES
-#: Merge.rc:4621
+#: Merge.rc:4631
msgid "Left Attributes"
msgstr "Атрибути ляво"
#. IDS_COLHDR_RATTRIBUTES
-#: Merge.rc:4622
+#: Merge.rc:4632
msgid "Right Attributes"
msgstr "Атрибути дясно"
#. IDS_COLHDR_MATTRIBUTES
-#: Merge.rc:4623
+#: Merge.rc:4633
msgid "Middle Attributes"
msgstr "Атрибути средата"
#. IDS_COLHDR_LEOL_TYPE
-#: Merge.rc:4628
+#: Merge.rc:4638
msgid "Left EOL"
msgstr "Знак за нов ред ляво"
#. IDS_COLHDR_MEOL_TYPE
-#: Merge.rc:4629
+#: Merge.rc:4639
msgid "Middle EOL"
msgstr "Знак за нов ред средата"
#. IDS_COLHDR_REOL_TYPE
-#: Merge.rc:4630
+#: Merge.rc:4640
msgid "Right EOL"
msgstr "Знак за нов ред дясно"
#. IDS_COLHDR_LENCODING
-#: Merge.rc:4636
+#: Merge.rc:4646
msgid "Left Encoding"
msgstr "Кодиравка ляво"
#. IDS_COLHDR_RENCODING
-#: Merge.rc:4637
+#: Merge.rc:4647
msgid "Right Encoding"
msgstr "Кодиравка дясно"
#. IDS_COLHDR_MENCODING
-#: Merge.rc:4638
+#: Merge.rc:4648
msgid "Middle Encoding"
msgstr "Кодиравка средата"
#. IDS_COLHDR_NIDIFFS
-#: Merge.rc:4639
+#: Merge.rc:4649
msgid "Ignored Diff"
msgstr "Пренебрегнати различия"
#. IDS_COLHDR_BINARY
-#: Merge.rc:4641
+#: Merge.rc:4651
msgctxt "DirView|ColumnHeader"
msgid "Binary"
msgstr "Двоичен"
#. IDS_PLUGINS_TYPE_UNPACKER
-#: Merge.rc:4642 Merge.rc:4959
+#: Merge.rc:4652 Merge.rc:4969
msgid "Unpacker"
msgstr "Разопаковчик"
#. IDS_PLUGIN_TYPE4
-#: Merge.rc:4643 Merge.rc:4960 Merge.rc:5267
+#: Merge.rc:4653 Merge.rc:4970 Merge.rc:5277
msgid "Prediffer"
msgstr ""
#. IDS_COLHDR_LEFT
-#: Merge.rc:4644
+#: Merge.rc:4654
msgid "Left"
msgstr ""
#. IDS_COLHDR_MIDDLE
-#: Merge.rc:4645
+#: Merge.rc:4655
msgid "Middle"
msgstr ""
#. IDS_COLHDR_RIGHT
-#: Merge.rc:4646
+#: Merge.rc:4656
msgid "Right"
msgstr ""
#. IDS_COLHDR_DIFF
-#: Merge.rc:4647
+#: Merge.rc:4657
msgid "Diff"
msgstr ""
#. IDS_COLHDR_LEFT_DUPLICATE
-#: Merge.rc:4648
+#: Merge.rc:4658
msgid "Left Duplicate Count"
msgstr ""
#. IDS_COLHDR_RIGHT_DUPLICATE
-#: Merge.rc:4649
+#: Merge.rc:4659
msgid "Right Duplicate Count"
msgstr ""
#. IDS_COLHDR_MIDDLE_DUPLICATE
-#: Merge.rc:4650
+#: Merge.rc:4660
msgid "Middle Duplicate Count"
msgstr ""
#. IDS_COLHDR_MOVE
-#: Merge.rc:4651
+#: Merge.rc:4661
msgid "Move"
msgstr "Преместване"
#. IDS_PRPCAT_AUDIO
-#: Merge.rc:4658
+#: Merge.rc:4668
msgid "Audio"
msgstr "Аудио"
#. IDS_PRPCAT_CALENDAR
-#: Merge.rc:4659
+#: Merge.rc:4669
msgid "Calendar"
msgstr "Календар"
#. IDS_PRPCAT_COMMUNICATION
-#: Merge.rc:4660
+#: Merge.rc:4670
msgid "Communication"
msgstr "Разговори"
#. IDS_PRPCAT_CONTACT
-#: Merge.rc:4661
+#: Merge.rc:4671
msgid "Contact"
msgstr "Контакт"
#. IDS_PRPCAT_DEVICES
-#: Merge.rc:4662
+#: Merge.rc:4672
msgid "Devices"
msgstr "Устройства"
#. IDS_PRPCAT_DOCUMENT
-#: Merge.rc:4663
+#: Merge.rc:4673
msgid "Document"
msgstr "Документ"
#. IDS_PRPCAT_HOME
-#: Merge.rc:4664
+#: Merge.rc:4674
msgid "Home"
msgstr "Дом"
#. IDS_PRPCAT_JOURNAL
-#: Merge.rc:4666
+#: Merge.rc:4676
msgid "Journal"
msgstr "Дневник"
#. IDS_PRPCAT_LINK
-#: Merge.rc:4667
+#: Merge.rc:4677
msgid "Link"
msgstr "Препратка"
#. IDS_PRPCAT_MEDIA
-#: Merge.rc:4668
+#: Merge.rc:4678
msgid "Media"
msgstr "Медия"
#. IDS_PRPCAT_MUSIC
-#: Merge.rc:4670
+#: Merge.rc:4680
msgid "Music"
msgstr "Музика"
#. IDS_PRPCAT_NOTE
-#: Merge.rc:4671
+#: Merge.rc:4681
msgid "Note"
msgstr "Бележка"
#. IDS_PRPCAT_PHOTO
-#: Merge.rc:4672
+#: Merge.rc:4682
msgid "Photo"
msgstr "Снимка"
#. IDS_PRPCAT_RECORDEDTV
-#: Merge.rc:4673
+#: Merge.rc:4683
msgid "RecordedTV"
msgstr "Запис"
#. IDS_PRPCAT_SEARCH
-#: Merge.rc:4674
+#: Merge.rc:4684
msgid "Search"
msgstr "Търсене"
#. IDS_PRPCAT_SECURITY
-#: Merge.rc:4675
+#: Merge.rc:4685
msgid "Security"
msgstr "Сигурност"
#. IDS_PRPCAT_SOFTWARE
-#: Merge.rc:4676
+#: Merge.rc:4686
msgid "Software"
msgstr "Софтуер"
#. IDS_PRPCAT_TASK
-#: Merge.rc:4677
+#: Merge.rc:4687
msgid "Task"
msgstr "Задача"
#. IDS_PRPCAT_VIDEO
-#: Merge.rc:4678
+#: Merge.rc:4688
msgid "Video"
msgstr "Видео"
#. IDS_PRPCAT_HASH
-#: Merge.rc:4679
+#: Merge.rc:4689
msgid "Hash"
msgstr "Цифров отпечатък"
#. IDS_CANT_COMPARE_FILES
-#: Merge.rc:4685
+#: Merge.rc:4695
msgid "Unable to compare files"
msgstr "Файловете не могат да бъдат сравнени"
#. IDS_ABORTED_ITEM
-#: Merge.rc:4686
+#: Merge.rc:4696
msgid "Item aborted"
msgstr "Елементът е прекъснат"
#. IDS_FILE_SKIPPED
-#: Merge.rc:4687
+#: Merge.rc:4697
msgid "File skipped"
msgstr "Пропуснат файл"
#. IDS_DIR_SKIPPED
-#: Merge.rc:4688
+#: Merge.rc:4698
msgid "Folder skipped"
msgstr "Пропусната папка"
#. IDS_LEFT_ONLY_IN_FMT
-#: Merge.rc:4689
+#: Merge.rc:4699
#, c-format
msgid "Left only: %1"
msgstr "От ляво само: %1"
#. IDS_MIDDLE_ONLY_IN_FMT
-#: Merge.rc:4690
+#: Merge.rc:4700
#, c-format
msgid "Middle only: %1"
msgstr "Само в средата: %1"
#. IDS_RIGHT_ONLY_IN_FMT
-#: Merge.rc:4691
+#: Merge.rc:4701
#, c-format
msgid "Right only: %1"
msgstr "От дясно само: %1"
#. IDS_DOES_NOT_EXIST_IN_FMT
-#: Merge.rc:4692
+#: Merge.rc:4702
#, c-format
msgid "Does not exist in %1"
msgstr "Не съществува в %1"
#. IDS_BIN_FILES_SAME
-#: Merge.rc:4693
+#: Merge.rc:4703
msgid "Binary files are identical"
msgstr "Двоичните файлове са еднакви"
#. IDS_BIN_FILES_DIFF
-#: Merge.rc:4699
+#: Merge.rc:4709
msgid "Binary files are different"
msgstr "Двоичните файлове са различни"
#. IDS_FILES_ARE_DIFFERENT
-#: Merge.rc:4700
+#: Merge.rc:4710
msgid "Files are different"
msgstr "Файловете са различни"
#. IDS_FOLDERS_ARE_DIFFERENT
-#: Merge.rc:4701
+#: Merge.rc:4711
msgid "Folders are different"
msgstr "Папките са различни"
#. IDS_LEFTONLY
-#: Merge.rc:4702
+#: Merge.rc:4712
msgid "Left Only"
msgstr "Само левият"
#. IDS_RIGHTONLY
-#: Merge.rc:4703
+#: Merge.rc:4713
msgid "Right Only"
msgstr "Само десният"
#. IDS_MIDDLEONLY
-#: Merge.rc:4704
+#: Merge.rc:4714
msgid "Middle Only"
msgstr "Само средният"
#. IDS_NOITEMLEFT
-#: Merge.rc:4705
+#: Merge.rc:4715
msgid "No item in left"
msgstr "Няма елемент вляво"
#. IDS_NOITEMRIGHT
-#: Merge.rc:4706
+#: Merge.rc:4716
msgid "No item in right"
msgstr "Няма елемент вдясно"
#. IDS_NOITEMMIDDLE
-#: Merge.rc:4707
+#: Merge.rc:4717
msgid "No item in middle"
msgstr "Няма елемент в средата"
#. IDS_CMPRES_ERROR
-#: Merge.rc:4709
+#: Merge.rc:4719
msgid "Error"
msgstr "Грешка"
#. IDS_TEXT_FILES_SAME
-#: Merge.rc:4710
+#: Merge.rc:4720
msgid "Text files are identical"
msgstr "Текстовите файлове са еднакви"
#. IDS_LEFTONLY_DIFF
-#: Merge.rc:4711
+#: Merge.rc:4721
msgid " (Middle and right are identical)"
msgstr " (Среда и дясно са еднакви)"
#. IDS_MIDDLEONLY_DIFF
-#: Merge.rc:4712
+#: Merge.rc:4722
msgid " (Left and right are identical)"
msgstr " (Ляво и дясно са еднакви)"
#. IDS_RIGHTONLY_DIFF
-#: Merge.rc:4713
+#: Merge.rc:4723
msgid " (Left and middle are identical)"
msgstr " (Ляво и среда са еднакви)"
#. IDS_PATH_MISMATCH
-#: Merge.rc:4714
+#: Merge.rc:4724
msgid " (paths differ)"
msgstr ""
#. IDS_TEXT_FILES_DIFF
-#: Merge.rc:4715
+#: Merge.rc:4725
msgid "Text files are different"
msgstr "Текстовите файлове са различни"
#. IDS_IMAGE_FILES_SAME
-#: Merge.rc:4716
+#: Merge.rc:4726
msgid "Image files are identical"
msgstr "Файловете с изображения са еднакви"
#. IDS_IMAGE_FILES_DIFF
-#: Merge.rc:4717
+#: Merge.rc:4727
msgid "Image files are different"
msgstr "Файловете с изображения са различни"
#. IDS_EXPR_DIFF
-#: Merge.rc:4718
+#: Merge.rc:4728
#, c-format
msgid "Files are different (expr: %1)"
msgstr "Файловете са различни (израз: %1)"
#. IDS_HASH_GROUP
-#: Merge.rc:4719
+#: Merge.rc:4729
#, c-format
msgid "Group%d"
msgstr "Група%d"
#. IDS_RENAME_MOVE_DETECTION_DISALBED
-#: Merge.rc:4720
+#: Merge.rc:4730
msgctxt "Options dialog|Compare|Folder|Detect renames and moves"
msgid "Disabled"
msgstr ""
#. IDS_RENAME_MOVE_DETECTION_RENAME
-#: Merge.rc:4721
+#: Merge.rc:4731
msgid "Detect renames"
msgstr ""
#. IDS_RENAME_MOVE_DETECTION_RENAME_MOVE
-#: Merge.rc:4722
+#: Merge.rc:4732
msgid "Detect renames and moves"
msgstr ""
#. IDS_RENAME_MOVE_MERGE_MODE_RENAME
-#: Merge.rc:4723
+#: Merge.rc:4733
msgid "Merge renames"
msgstr ""
#. IDS_RENAME_MOVE_MERGE_MODE_RENAME_MOVE
-#: Merge.rc:4724
+#: Merge.rc:4734
msgid "Merge renames and moves"
msgstr ""
#. IDS_RENAMED
-#: Merge.rc:4725
+#: Merge.rc:4735
msgid "Renamed"
msgstr ""
#. IDS_MOVED
-#: Merge.rc:4726
+#: Merge.rc:4736
msgid "Moved"
msgstr ""
#. IDS_RENAMED_MOVED
-#: Merge.rc:4727
+#: Merge.rc:4737
msgid "Renamed/Moved"
msgstr ""
#. IDS_RENAMED_MOVED_ITEMS
-#: Merge.rc:4728
+#: Merge.rc:4738
#, c-format
msgid "(%1 items)"
msgstr ""
#. IDS_RENAMED_MOVED_RESULT
-#: Merge.rc:4729
+#: Merge.rc:4739
#, c-format
msgid "%1 (set %2): "
msgstr ""
#. IDS_SWITCH_FLAT_MODE
-#: Merge.rc:4730
+#: Merge.rc:4740
msgid "Some moved items have been merged.\nIn Tree Mode, these items may appear in positions that do not reflect the actual folder structure, which can be confusing.\nSwitch to Flat Mode?"
msgstr ""
#. IDS_ELAPSED_TIME
-#: Merge.rc:4736
+#: Merge.rc:4746
#, c-format
msgid "Elapsed time: %ld ms"
msgstr "Изминало време: %ld мс"
#. IDS_STATUS_SELITEM1
-#: Merge.rc:4737
+#: Merge.rc:4747
msgid "1 item selected"
msgstr "1 избран обект"
#. IDS_STATUS_SELITEMS
-#: Merge.rc:4738
+#: Merge.rc:4748
#, c-format
msgid "%1 items selected"
msgstr "%1 избрани обекта"
#. IDS_COLDESC_FILENAME
-#: Merge.rc:4744
+#: Merge.rc:4754
msgid "Filename or folder name."
msgstr "Име на папка или файл."
#. IDS_COLDESC_DIR
-#: Merge.rc:4745
+#: Merge.rc:4755
msgid "Subfolder name when subfolders are included."
msgstr "Име на подпапка, при включени подпапки."
#. IDS_COLDESC_RESULT
-#: Merge.rc:4746
+#: Merge.rc:4756
msgid "Comparison result, long form."
msgstr "Резултат на сравнението, дълга форма."
#. IDS_COLDESC_LTIMEM
-#: Merge.rc:4751
+#: Merge.rc:4761
msgid "Left side modification date."
msgstr "Дата на промяна на лявата секция."
#. IDS_COLDESC_RTIMEM
-#: Merge.rc:4752
+#: Merge.rc:4762
msgid "Right side modification date."
msgstr "Дата на промяна на дясната секция."
#. IDS_COLDESC_MTIMEM
-#: Merge.rc:4753
+#: Merge.rc:4763
msgid "Middle side modification date."
msgstr "Дата на промяна на средната секция."
#. IDS_COLDESC_EXTENSION
-#: Merge.rc:4754
+#: Merge.rc:4764
msgid "File's extension."
msgstr "Разширение на файла."
#. IDS_COLDESC_LSIZE
-#: Merge.rc:4755
+#: Merge.rc:4765
msgid "Left file size in bytes."
msgstr "Размер на файла отляво в байтове."
#. IDS_COLDESC_RSIZE
-#: Merge.rc:4756
+#: Merge.rc:4766
msgid "Right file size in bytes."
msgstr "Размер на файла отдясно в байтове."
#. IDS_COLDESC_MSIZE
-#: Merge.rc:4757
+#: Merge.rc:4767
msgid "Middle file size in bytes."
msgstr "Размер на файла всредата в байтове."
#. IDS_COLDESC_LSIZE_SHORT
-#: Merge.rc:4758
+#: Merge.rc:4768
msgid "Left file size abbreviated."
msgstr "Съкратен размер на файла отляво."
#. IDS_COLDESC_RSIZE_SHORT
-#: Merge.rc:4759
+#: Merge.rc:4769
msgid "Right file size abbreviated."
msgstr "Съкратен размер на файла отдясно."
#. IDS_COLDESC_MSIZE_SHORT
-#: Merge.rc:4760
+#: Merge.rc:4770
msgid "Middle file size abbreviated."
msgstr "Съкратен размер на файла всредата."
#. IDS_COLDESC_LTIMEC
-#: Merge.rc:4766
+#: Merge.rc:4776
msgid "Left side creation time."
msgstr "Дата на създаване на лявата секция."
#. IDS_COLDESC_RTIMEC
-#: Merge.rc:4767
+#: Merge.rc:4777
msgid "Right side creation time."
msgstr "Дата на създаване на дясната секция."
#. IDS_COLDESC_MTIMEC
-#: Merge.rc:4768
+#: Merge.rc:4778
msgid "Middle side creation time."
msgstr "Дата на създаване на средната секция."
#. IDS_COLDESC_NEWER
-#: Merge.rc:4769
+#: Merge.rc:4779
msgid "Tells which side has newer modification date."
msgstr "Показва коя секция има късна дата на промяна."
#. IDS_COLDESC_LVERSION
-#: Merge.rc:4770
+#: Merge.rc:4780
msgid "Left side file version, only for some file types."
msgstr "Версия на файла вляво, само за файлове от един вид."
#. IDS_COLDESC_RVERSION
-#: Merge.rc:4771
+#: Merge.rc:4781
msgid "Right side file version, only for some file types."
msgstr "Версия на файла вдясно, само за файлове от един вид."
#. IDS_COLDESC_MVERSION
-#: Merge.rc:4776
+#: Merge.rc:4786
msgid "Middle side file version, only for some file types."
msgstr "Версия на файла всредата, само за файлове от един вид."
#. IDS_COLDESC_RESULT_ABBR
-#: Merge.rc:4777
+#: Merge.rc:4787
msgid "Short comparison result."
msgstr "Кратък резултат от сравнението."
#. IDS_COLDESC_LATTRIBUTES
-#: Merge.rc:4778
+#: Merge.rc:4788
msgid "Left side attributes."
msgstr "Атрибути на лявата секция."
#. IDS_COLDESC_RATTRIBUTES
-#: Merge.rc:4779
+#: Merge.rc:4789
msgid "Right side attributes."
msgstr "Атрибути на дясната секция."
#. IDS_COLDESC_MATTRIBUTES
-#: Merge.rc:4780
+#: Merge.rc:4790
msgid "Middle side attributes."
msgstr "Атрибути на средната секция."
#. IDS_COLDESC_LEOL_TYPE
-#: Merge.rc:4781
+#: Merge.rc:4791
msgid "Left side file EOL type."
msgstr "Знакът за нов ред на файла отляво."
#. IDS_COLDESC_REOL_TYPE
-#: Merge.rc:4782
+#: Merge.rc:4792
msgid "Right side file EOL type."
msgstr "Знакът за нов ред на файла отдясно."
#. IDS_COLDESC_MEOL_TYPE
-#: Merge.rc:4783
+#: Merge.rc:4793
msgid "Middle side file EOL type."
msgstr "Знакът за нов ред за файла всредата."
#. IDS_COLDESC_LENCODING
-#: Merge.rc:4789
+#: Merge.rc:4799
msgid "Left side encoding."
msgstr "Кодировка на лявата секция."
#. IDS_COLDESC_RENCODING
-#: Merge.rc:4790
+#: Merge.rc:4800
msgid "Right side encoding."
msgstr "Кодировка на дясната секция."
#. IDS_COLDESC_MENCODING
-#: Merge.rc:4791
+#: Merge.rc:4801
msgid "Middle side encoding."
msgstr "Кодиравка на средната секция."
#. IDS_COLDESC_NIDIFFS
-#: Merge.rc:4792
+#: Merge.rc:4802
msgid "Number of ignored differences in file. Ignored and cannot be merged."
msgstr "Брой пропуснати различия във файла. Те са пренебрегнати от WinMerge и не могат да бъдат сливани."
#. IDS_COLDESC_NSDIFFS
-#: Merge.rc:4793
+#: Merge.rc:4803
msgid "Number of differences in file (excluding ignored)."
msgstr "Брой различия във файла. Не включва пренебрегнатите различия."
#. IDS_COLDESC_BINARY
-#: Merge.rc:4794
+#: Merge.rc:4804
msgid "Shows an asterisk (*) if the file is binary."
msgstr "Показва звездичка (*), ако файлът е двоичен."
#. IDS_COLDESC_UNPACKER
-#: Merge.rc:4795
+#: Merge.rc:4805
msgid "Unpacker plugin name or pipeline."
msgstr ""
#. IDS_COLDESC_PREDIFFER
-#: Merge.rc:4796
+#: Merge.rc:4806
msgid "Prediffer plugin name or pipeline."
msgstr ""
#. IDS_DIRECTORY_REPORT_TITLE
-#: Merge.rc:4802
+#: Merge.rc:4812
#, c-format
msgid "Compare %1 with %2"
msgstr "Сравняване на %1 с %2"
#. IDS_DIRECTORY_REPORT_TITLE3
-#: Merge.rc:4803
+#: Merge.rc:4813
#, c-format
msgid "Compare %1 with %2 and %3"
msgstr "Сравняване на %1 с %2 и %3"
#. IDS_REPORT_COMMALIST
-#: Merge.rc:4804
+#: Merge.rc:4814
msgid "Comma-separated list"
msgstr "Списък, разделен със запетая"
#. IDS_REPORT_TABLIST
-#: Merge.rc:4805
+#: Merge.rc:4815
msgid "Tab-separated list"
msgstr "Списък, разделен с табулация"
#. IDS_REPORT_SIMPLEHTML
-#: Merge.rc:4806
+#: Merge.rc:4816
msgid "Simple HTML"
msgstr "Чист HTML"
#. IDS_REPORT_SIMPLEXML
-#: Merge.rc:4807
+#: Merge.rc:4817
msgid "Simple XML"
msgstr "Чист XML"
-#: Merge.rc:4809
+#: Merge.rc:4819
msgid "Report file already exists. Overwrite?"
msgstr "Файлът с отчета вече съществува. Искате ли да замените съществуващия файл?"
#. IDS_REPORT_ERROR
-#: Merge.rc:4814
+#: Merge.rc:4824
#, c-format
msgid ""
"Error creating the report:\n"
@@ -6790,57 +6801,57 @@ msgstr ""
"%1"
#. IDS_REPORT_SUCCESS
-#: Merge.rc:4815
+#: Merge.rc:4825
msgid "Report created successfully."
msgstr "Отчетът беше създаден успешно."
#. IDS_SYNCPOINT_LASTBLOCK
-#: Merge.rc:4821
+#: Merge.rc:4831
msgid "Cannot add a synchronization point at this line."
msgstr "Точка за синхронизация не може да бъде добавена на този ред."
#. IDS_FILE_TO_ITSELF
-#: Merge.rc:4827
+#: Merge.rc:4837
msgid "Same file is opened in both panes."
msgstr "Един и същи файл е отворен и в двата панела."
#. IDS_FILESSAME
-#: Merge.rc:4828
+#: Merge.rc:4838
msgid "Selected files are identical."
msgstr "Избраните файлове са еднакви."
#. IDS_FILESSAME_CURCFG
-#: Merge.rc:4829
+#: Merge.rc:4839
msgid "Selected files are identical (with current settings).\r\nChecking binary identity..."
msgstr ""
#. IDS_FILESSAME_BINERROR
-#: Merge.rc:4830
+#: Merge.rc:4840
msgid "Selected files are identical (with current settings).\r\nBut binary comparison failed."
msgstr ""
#. IDS_FILESSAME_BINSAME
-#: Merge.rc:4831
+#: Merge.rc:4841
msgid "Selected files are identical (binary match)."
msgstr ""
#. IDS_FILESSAME_BINDIFF
-#: Merge.rc:4832
+#: Merge.rc:4842
msgid "Selected files are identical (with current settings).\r\nBut differ at the binary level."
msgstr ""
#. IDS_FILEERROR
-#: Merge.rc:4833
+#: Merge.rc:4843
msgid "An error occurred while comparing files."
msgstr "Възникна грешка при сравнение на файловете."
#. IDS_TEMP_FILEERROR
-#: Merge.rc:4834
+#: Merge.rc:4844
msgid "Could not create temporary files. Check your temporary path settings."
msgstr "Не могат да бъдат създададени временни файлове. Проверете настройките за временната папка."
#. IDS_SUGGEST_IGNOREEOL
-#: Merge.rc:4835
+#: Merge.rc:4845
msgid ""
"Files use different EOL.\n"
"\n"
@@ -6850,17 +6861,17 @@ msgid ""
msgstr ""
#. IDS_INVALID_DIRECTORY
-#: Merge.rc:4836
+#: Merge.rc:4846
msgid "Selected folder is invalid."
msgstr "Избраната папка е недействителна."
#. IDS_CANNOT_OPEN_BINARYFILE
-#: Merge.rc:4837
+#: Merge.rc:4847
msgid "Cannot open a binary file in Editor."
msgstr "Не може да бъде отворен двоичен файл с редактор."
#. IDS_CREATE_PAIR_FOLDER
-#: Merge.rc:4838
+#: Merge.rc:4848
#, c-format
msgid ""
"Create matching folder:\n"
@@ -6872,41 +6883,41 @@ msgstr ""
"да бъде създадена и да бъде отворена?"
#. IDS_CONFIRM_COPY_ALL_DIFFS
-#: Merge.rc:4839
+#: Merge.rc:4849
msgid "Copy all differences to other file?"
msgstr "Желаете ли всички различия да бъдат копирани в отсрещния файл?"
#. IDS_MOVE_TO_NEXTFILE
-#: Merge.rc:4844
+#: Merge.rc:4854
msgid "Move to next file?"
msgstr "Желаете ли да бъде отворен следващия файл?"
#. IDS_MOVE_TO_PREVFILE
-#: Merge.rc:4845
+#: Merge.rc:4855
msgid "Move to previous file?"
msgstr "Желаете ли да бъде отворен предишния файл?"
#. IDS_MOVE_TO_NEXTPAGE
-#: Merge.rc:4846
+#: Merge.rc:4856
msgid "Move to next page?"
msgstr "Желаете ли да бъде отворенa следващата страница?"
#. IDS_MOVE_TO_PREVPAGE
-#: Merge.rc:4847
+#: Merge.rc:4857
msgid "Move to previous page?"
msgstr "Желаете ли да бъде отворенa предишната страница?"
#. IDS_MOVE_TO_FIRSTFILE
-#: Merge.rc:4848
+#: Merge.rc:4858
msgid "Move to first file?"
msgstr "Желаете ли да бъде отворен първия файл?"
#. IDS_MOVE_TO_LASTFILE
-#: Merge.rc:4849
+#: Merge.rc:4859
msgid "Move to last file?"
msgstr "Желаете ли да бъде отворен последния файл?"
-#: Merge.rc:4856
+#: Merge.rc:4866
#, c-format
msgid ""
"Different codepages: left (cp%d), right (cp%d).\n"
@@ -6917,51 +6928,51 @@ msgstr ""
"Показването на всеки файл с неговата кодова страница ще даде по-добра видимост, но сливането или копирането ще е рисковано.\n"
"Желаете ли файловете да бъдат третирани със зададената кодова страница на Windows (препоръчително)?"
-#: Merge.rc:4858
+#: Merge.rc:4868
msgid "Information lost due to encoding errors: both files"
msgstr "Има загуба на информация, поради грешка в кодировката на: двата файла"
-#: Merge.rc:4860
+#: Merge.rc:4870
msgid "Information lost due to encoding errors: first file"
msgstr "Има загуба на информация, поради грешка в кодировката на: първи файл"
-#: Merge.rc:4862
+#: Merge.rc:4872
msgid "Information lost due to encoding errors: second file"
msgstr "Има загуба на информация, поради грешка в кодировката на: втори файл"
-#: Merge.rc:4864
+#: Merge.rc:4874
msgid "Information lost due to encoding errors: third file"
msgstr "Има загуба на информация, поради грешка в кодировката на: трети файл"
#. IDS_LINEDIFF_NODIFF
-#: Merge.rc:4870
+#: Merge.rc:4880
msgid "No difference"
msgstr "Без различия"
#. IDS_LINEDIFF_NODIFF_CAPTION
-#: Merge.rc:4871
+#: Merge.rc:4881
msgid "Line difference"
msgstr "Различия в редовете"
#. IDS_NUM_REPLACED
-#: Merge.rc:4877
+#: Merge.rc:4887
#, c-format
msgid "Replaced %1 string(s)."
msgstr "Заменени %1 низ(а)."
#. IDS_EDIT_TEXT_NOT_FOUND
-#: Merge.rc:4878
+#: Merge.rc:4888
#, c-format
msgid "Cannot find string \"%s\"."
msgstr "Низът „%s“ не може да бъде намерен."
#. IDS_MERGE_MODE
-#: Merge.rc:4884
+#: Merge.rc:4894
msgid "Entering Merge Mode. Press F9 to turn off."
msgstr "Режим на сливане. Ако желаете да излезете от него, натиснете клавиша F9."
#. IDS_AUTO_MERGE
-#: Merge.rc:4890
+#: Merge.rc:4900
#, c-format
msgid ""
"Automatic merges: %1\n"
@@ -6971,99 +6982,99 @@ msgstr ""
"Брой неразрешени конфликти: %2"
#. IDS_CODEPAGE_MERGED
-#: Merge.rc:4891
+#: Merge.rc:4901
msgid "Codepage change merged."
msgstr "Промяната на кодовата страница е слята."
#. IDS_CODEPAGE_CONFLICT
-#: Merge.rc:4892
+#: Merge.rc:4902
msgid "Codepage changes are conflicting."
msgstr "Промените в кодовата страница са противоречиви."
#. IDS_EOL_MERGED
-#: Merge.rc:4893
+#: Merge.rc:4903
msgid "EOL change merged."
msgstr "Промяната на EOL е обединена."
#. IDS_EOL_CONFLICT
-#: Merge.rc:4894
+#: Merge.rc:4904
msgid "EOL changes are conflicting."
msgstr "Промените в EOL са противоречиви."
#. IDS_LOCBAR_CAPTION
-#: Merge.rc:4900
+#: Merge.rc:4910
msgid "Location Pane"
msgstr "Kарта"
#. IDS_DIFFBAR_CAPTION
-#: Merge.rc:4901
+#: Merge.rc:4911
msgid "Diff Pane"
msgstr "Панел с различия"
#. IDS_DIFF_SUCCEEDED
-#: Merge.rc:4908
+#: Merge.rc:4918
msgid "Patch file written."
msgstr "Кръпката е успешно запазена."
#. IDS_DIFF_ITEM1NOTFOUND
-#: Merge.rc:4909
+#: Merge.rc:4919
msgid "First item not found!"
msgstr ""
#. IDS_DIFF_ITEM2NOTFOUND
-#: Merge.rc:4910
+#: Merge.rc:4920
msgid "Second item not found!"
msgstr ""
#. IDS_DIFF_FILEOVERWRITE
-#: Merge.rc:4911
+#: Merge.rc:4921
msgid "Patch file already exists. Overwrite?"
msgstr "Кръпката вече съществува. Да бъдели презаписана?"
#. IDS_DIFF_SELECTEDFILES
-#: Merge.rc:4912
+#: Merge.rc:4922
#, c-format
msgid "[%1 files selected]"
msgstr "[%1 избрани файлове]"
#. IDS_DIFF_NORMAL
-#: Merge.rc:4913
+#: Merge.rc:4923
msgid "Normal"
msgstr "Нормален"
#. IDS_DIFF_CONTEXT
-#: Merge.rc:4914
+#: Merge.rc:4924
msgid "Context"
msgstr "Контекст"
#. IDS_DIFF_UNIFIED
-#: Merge.rc:4915
+#: Merge.rc:4925
msgid "Unified"
msgstr "Унифициран"
#. IDS_FILEWRITE_ERROR
-#: Merge.rc:4917
+#: Merge.rc:4927
#, c-format
msgid "Could not write to file %1."
msgstr "Не може да се запише върху %1."
#. IDS_PATH_NOT_ABSOLUTE
-#: Merge.rc:4918
+#: Merge.rc:4928
#, c-format
msgid "Output path is not absolute: %1"
msgstr "Зададеният път не е пълен път: %1"
#. IDS_MUST_SPECIFY_OUTPUT
-#: Merge.rc:4919
+#: Merge.rc:4929
msgid "Specify an output file."
msgstr "Задайте изходен файл."
-#: Merge.rc:4921
+#: Merge.rc:4931
msgid "Cannot create patch from binary files."
msgstr "Не може да се създаде пач от двоични файлове."
#. IDS_SAVEFILES_FORPATCH
-#: Merge.rc:4922
+#: Merge.rc:4932
msgid ""
"Save all files first.\n"
"\n"
@@ -7074,12 +7085,12 @@ msgstr ""
"Създаването на пач изисква да няма незаписани промени във файловете."
#. IDS_FOLDER_NOTEXIST
-#: Merge.rc:4923
+#: Merge.rc:4933
msgid "Folder does not exist."
msgstr "Папката не съществува."
#. IDS_NO_ZIP_SUPPORT
-#: Merge.rc:4928
+#: Merge.rc:4938
msgid ""
"Archive support not enabled.\n"
"7-Zip and/or Merge7z*.dll not found.\n"
@@ -7090,37 +7101,37 @@ msgstr ""
"Погледнете ръководството за повече информация относно поддръжката на архиви и как да я включите."
#. IDS_OPT_EXPORT_CAPTION
-#: Merge.rc:4929
+#: Merge.rc:4939
msgid "Select file for export"
msgstr "Изберете файл за експорт"
#. IDS_OPT_IMPORT_CAPTION
-#: Merge.rc:4930
+#: Merge.rc:4940
msgid "Select file for import"
msgstr "Изберете файл за импорт"
#. IDS_OPT_IMPORT_DONE
-#: Merge.rc:4931
+#: Merge.rc:4941
msgid "Options imported from file."
msgstr "Настройките са внесени от файла."
#. IDS_OPT_EXPORT_DONE
-#: Merge.rc:4932
+#: Merge.rc:4942
msgid "Options exported to file."
msgstr "Настройките са изнесени във файла."
#. IDS_OPT_IMPORT_ERR
-#: Merge.rc:4933
+#: Merge.rc:4943
msgid "Failed to import options from file."
msgstr "Грешка при внасяне на насторйките от файл."
#. IDS_OPT_EXPORT_ERR
-#: Merge.rc:4934
+#: Merge.rc:4944
msgid "Failed to write options to file."
msgstr "Грешка при изнасяне на насторйките във файл."
#. IDS_CLOSEALL_WINDOWS
-#: Merge.rc:4935
+#: Merge.rc:4945
msgid ""
"Close multiple compare windows?\n"
"\n"
@@ -7131,44 +7142,44 @@ msgstr ""
"Желаете ли да продължите?"
#. IDS_EOL_MIXED
-#: Merge.rc:4944
+#: Merge.rc:4954
msgid "Mixed"
msgstr "Смесен"
#. IDS_EOL_BIN
-#: Merge.rc:4945
+#: Merge.rc:4955
msgctxt "EOL Type"
msgid "Binary"
msgstr "Двоичен"
#. IDS_EOL_NONE
-#: Merge.rc:4949
+#: Merge.rc:4959
msgid "None"
msgstr "Няма"
#. IDS_MARKER_COLOR_FMT
-#: Merge.rc:4950
+#: Merge.rc:4960
#, c-format
msgid "Marker Color %d"
msgstr ""
#. IDS_MARKER_NEW_PATTERN
-#: Merge.rc:4951
+#: Merge.rc:4961
msgid "New Pattern"
msgstr ""
#. IDS_PLUGINSLIST_TYPE
-#: Merge.rc:4957
+#: Merge.rc:4967
msgid "Type"
msgstr "Вид"
#. IDS_PLUGINS_TYPE_EDITSCRIPT
-#: Merge.rc:4961
+#: Merge.rc:4971
msgid "Editor script"
msgstr ""
#. ID_SELECTLINEDIFF
-#: Merge.rc:4967
+#: Merge.rc:4977
msgid ""
"\n"
"Difference in Current Line (F4)"
@@ -7177,7 +7188,7 @@ msgstr ""
"Различия на текущия ред (F4)"
#. ID_OPTIONS
-#: Merge.rc:4968
+#: Merge.rc:4978
msgid ""
"\n"
"Options"
@@ -7186,7 +7197,7 @@ msgstr ""
"Настройки"
#. ID_REFRESH
-#: Merge.rc:4969
+#: Merge.rc:4979
msgid ""
"\n"
"Refresh (F5)"
@@ -7195,7 +7206,7 @@ msgstr ""
"Презареждане (F5)"
#. ID_PREVDIFF
-#: Merge.rc:4975
+#: Merge.rc:4985
msgid ""
"\n"
"Previous Difference (Alt+Up)"
@@ -7204,7 +7215,7 @@ msgstr ""
"Предишно различие (Alt+Up)"
#. ID_NEXTDIFF
-#: Merge.rc:4976
+#: Merge.rc:4986
msgid ""
"\n"
"Next Difference (Alt+Down)"
@@ -7213,7 +7224,7 @@ msgstr ""
"Следващо различие (Alt+Down)"
#. ID_PREVCONFLICT
-#: Merge.rc:4977
+#: Merge.rc:4987
msgid ""
"\n"
"Previous Conflict (Alt+Shift+Up)"
@@ -7222,7 +7233,7 @@ msgstr ""
"Предишен конфликт (Alt+Shift+Up)"
#. ID_NEXTCONFLICT
-#: Merge.rc:4978
+#: Merge.rc:4988
msgid ""
"\n"
"Next Conflict (Alt+Shift+Down)"
@@ -7231,7 +7242,7 @@ msgstr ""
"Следващ конфликт (Alt+Shift+Down)"
#. ID_FIRSTDIFF
-#: Merge.rc:4983
+#: Merge.rc:4993
msgid ""
"\n"
"First Difference (Alt+Home)"
@@ -7240,7 +7251,7 @@ msgstr ""
"Първо различие (Alt+Home)"
#. ID_CURDIFF
-#: Merge.rc:4984
+#: Merge.rc:4994
msgid ""
"\n"
"Current Difference (Alt+Enter)"
@@ -7249,7 +7260,7 @@ msgstr ""
"Текущо различие (Alt+Enter)"
#. ID_LASTDIFF
-#: Merge.rc:4985
+#: Merge.rc:4995
msgid ""
"\n"
"Last Difference (Alt+End)"
@@ -7258,7 +7269,7 @@ msgstr ""
"Последно различие (Alt+End)"
#. ID_L2R
-#: Merge.rc:4986
+#: Merge.rc:4996
msgid ""
"\n"
"Copy to Right (Alt+Right)"
@@ -7267,7 +7278,7 @@ msgstr ""
"Копира вдясно (Alt+Right)"
#. ID_R2L
-#: Merge.rc:4987
+#: Merge.rc:4997
msgid ""
"\n"
"Copy to Left (Alt+Left)"
@@ -7276,7 +7287,7 @@ msgstr ""
"Копира вляво (Alt+Left)"
#. ID_L2RNEXT
-#: Merge.rc:4988
+#: Merge.rc:4998
msgid ""
"\n"
"Copy to Right and Advance (Ctrl+Alt+Right)"
@@ -7285,7 +7296,7 @@ msgstr ""
"Копира вдясно и продължава (Ctrl+Alt+Right)"
#. ID_R2LNEXT
-#: Merge.rc:4989
+#: Merge.rc:4999
msgid ""
"\n"
"Copy to Left and Advance (Ctrl+Alt+Left)"
@@ -7294,7 +7305,7 @@ msgstr ""
"Копира вляво и продължава (Ctrl+Alt+Left)"
#. ID_ALL_RIGHT
-#: Merge.rc:4990
+#: Merge.rc:5000
msgid ""
"\n"
"Copy All to Right"
@@ -7303,7 +7314,7 @@ msgstr ""
"Копира всичко вдясно"
#. ID_ALL_LEFT
-#: Merge.rc:4991
+#: Merge.rc:5001
msgid ""
"\n"
"Copy All to Left"
@@ -7312,7 +7323,7 @@ msgstr ""
"Копира всичко вляво"
#. ID_AUTO_MERGE
-#: Merge.rc:4992
+#: Merge.rc:5002
msgid ""
"\n"
"Auto Merge (Ctrl+Alt+M)"
@@ -7321,7 +7332,7 @@ msgstr ""
"Автоматично сливане (Ctrl+Alt+M)"
#. ID_FIRSTFILE
-#: Merge.rc:4993
+#: Merge.rc:5003
msgid ""
"\n"
"First File"
@@ -7330,7 +7341,7 @@ msgstr ""
"Първи файл"
#. ID_NEXTFILE
-#: Merge.rc:4994
+#: Merge.rc:5004
msgid ""
"\n"
"Next File (Ctrl+F8)"
@@ -7339,7 +7350,7 @@ msgstr ""
"Следващ файл (Ctrl+F8)"
#. ID_LASTFILE
-#: Merge.rc:4995
+#: Merge.rc:5005
msgid ""
"\n"
"Last File"
@@ -7348,7 +7359,7 @@ msgstr ""
"Последен файл"
#. ID_PREVFILE
-#: Merge.rc:4996
+#: Merge.rc:5006
msgid ""
"\n"
"Previous File (Ctrl+F7)"
@@ -7357,37 +7368,37 @@ msgstr ""
"Предишен файл (Ctrl+F7)"
#. IDS_UNPACK_AUTO
-#: Merge.rc:5003
+#: Merge.rc:5013
msgid "Adapted unpacker applied to both files (one needs extension)."
msgstr "Зададения разархиватор ще се приложи и за двата файла (необходимо е разширение само на единия файл)."
#. IDS_NO_PREDIFFER
-#: Merge.rc:5004
+#: Merge.rc:5014
msgid "No Prediffer (Normal)"
msgstr ""
#. IDS_SUGGESTED_PLUGINS
-#: Merge.rc:5005
+#: Merge.rc:5015
msgid "Suggested Plugins"
msgstr "Предложена добавка"
#. IDS_NOT_SUGGESTED_PLUGINS
-#: Merge.rc:5006
+#: Merge.rc:5016
msgid "All Plugins"
msgstr "Всички добавки"
#. IDS_PRIVATEBUILD_FMT
-#: Merge.rc:5012
+#: Merge.rc:5022
#, c-format
msgid "Private Build: %1"
msgstr "Вътрешен билд: %1"
#. IDS_CHECKFORUPDATES_UPTODATE
-#: Merge.rc:5013
+#: Merge.rc:5023
msgid "Your software is up to date."
msgstr "Приложението е последно издание."
-#: Merge.rc:5015
+#: Merge.rc:5025
#, c-format
msgid ""
"WinMerge update available.\n"
@@ -7397,125 +7408,125 @@ msgstr ""
"Налично е %1 (инсталирано е %2). Желаете ли новото издание да бъде изтеглено?"
#. IDS_ALLRIGHTS_RESERVED
-#: Merge.rc:5016
+#: Merge.rc:5026
msgid " - All rights reserved."
msgstr " - Всички права запазени."
#. IDS_CHECKFORUPDATES_FAILED
-#: Merge.rc:5021
+#: Merge.rc:5031
msgid "Failed to download latest version information"
msgstr "Грешка при изтегляне на данните за ново издание"
#. IDS_TITLE_PLUGINS_SETTINGS
-#: Merge.rc:5027
+#: Merge.rc:5037
msgid "Plugin Settings"
msgstr "Настройки на добавки"
#. IDS_NO_SCT_SCRIPTS
-#: Merge.rc:5029
+#: Merge.rc:5039
msgid "WSH not found - .sct scripts disabled"
msgstr "WSH не е намерен - скриптовете на .sct са забранени"
#. IDS_LOCBAR_GOTOLINE_FMT
-#: Merge.rc:5037
+#: Merge.rc:5047
#, c-format
msgid "G&o to Line %1"
msgstr "От&иване на ред %1"
#. IDS_GOTO_MOVED_LINE
-#: Merge.rc:5043
+#: Merge.rc:5053
msgid "Go to Moved Line\tCtrl+Shift+G"
msgstr ""
#. IDS_AUTOCOMPLETE_DISABLED
-#: Merge.rc:5049
+#: Merge.rc:5059
msgctxt "Options dialog|General|Open dialog Auto completion"
msgid "Disabled"
msgstr "Изключено"
#. IDS_AUTOCOMPLETE_FILE_SYS
-#: Merge.rc:5050
+#: Merge.rc:5060
msgid "From file system"
msgstr "От файловата система"
#. IDS_AUTOCOMPLETE_MRU
-#: Merge.rc:5051
+#: Merge.rc:5061
msgid "From Most Recently Used list"
msgstr "От последно отваряните"
#. IDS_COLORSCHEME_PLAIN
-#: Merge.rc:5057
+#: Merge.rc:5067
msgid "No Highlighting"
msgstr "Без оцветяване"
#. IDS_COLORSCHEME_BATCH
-#: Merge.rc:5063
+#: Merge.rc:5073
msgid "Batch"
msgstr "Batch"
#. IDS_COLORSCHEME_PO
-#: Merge.rc:5090
+#: Merge.rc:5100
msgid "Portable Object"
msgstr "Portable Object"
#. IDS_COLORSCHEME_RSRC
-#: Merge.rc:5094
+#: Merge.rc:5104
msgid "Resources"
msgstr "Ресурси"
#. IDS_COLORSCHEME_SH
-#: Merge.rc:5098
+#: Merge.rc:5108
msgid "Shell"
msgstr "Shell"
#. IDS_CLOSE_LEFT_TABS
-#: Merge.rc:5115
+#: Merge.rc:5125
msgid "Close &Left Tabs"
msgstr "Затваряне на &левия раздел"
#. IDS_CLOSE_RIGHT_TABS
-#: Merge.rc:5116
+#: Merge.rc:5126
msgid "Close R&ight Tabs"
msgstr "Затваряне на &десния раздел"
#. IDS_CLOSE_OTHER_TABS
-#: Merge.rc:5117
+#: Merge.rc:5127
msgid "Close &Other Tabs"
msgstr "Затваряне на д&ругите раздели"
#. IDS_TABBAR_AUTO_MAXWIDTH
-#: Merge.rc:5118
+#: Merge.rc:5128
msgid "Enable &Auto Max Width"
msgstr "Автоматична &максимална ширина"
#. IDS_WEBPAGE_MENU
-#: Merge.rc:5128
+#: Merge.rc:5138
msgid "We&bpage"
msgstr "Страница от &интернет"
#. IDS_VIEW_WRAP_TEXT
-#: Merge.rc:5133
+#: Merge.rc:5143
msgid "W&rap Text"
msgstr "П&ренасяне на текста"
#. IDS_NOTINSTALLED
-#: Merge.rc:5138
+#: Merge.rc:5148
msgid "%1 is not installed."
msgstr "%1 не е инсталиран."
#. IDS_CREATE_FOLDER
-#: Merge.rc:5143
+#: Merge.rc:5153
#, c-format
msgid "%1 does not exist. Create it?"
msgstr "%1 не съществува. Искате ли да я създадете?"
#. IDS_CREATE_FOLDER_ERROR
-#: Merge.rc:5144
+#: Merge.rc:5154
msgid "Failed to create folder."
msgstr "Неуспешно създаване на папка."
#. IDC_EXT_EDITOR_PATH
-#: Merge.rc:5149
+#: Merge.rc:5159
msgid ""
"Parameters:\n"
"$file: Current file path\n"
@@ -7526,595 +7537,600 @@ msgstr ""
"$linenum: Номер на ред на текуща позиция на каретката"
#. IDS_DIFF_ALGORITHM_DEFAULT
-#: Merge.rc:5154
+#: Merge.rc:5164
msgid "default"
msgstr "по подразбиране"
#. IDS_DIFF_ALGORITHM_MINIMAL
-#: Merge.rc:5155
+#: Merge.rc:5165
msgid "minimal"
msgstr "minimal"
#. IDS_DIFF_ALGORITHM_PATIENCE
-#: Merge.rc:5156
+#: Merge.rc:5166
msgid "patience"
msgstr "patience"
#. IDS_DIFF_ALGORITHM_HISTOGRAM
-#: Merge.rc:5157
+#: Merge.rc:5167
msgid "histogram"
msgstr "histogram"
#. IDS_DIFF_ALGORITHM_NONE
-#: Merge.rc:5158
+#: Merge.rc:5168
msgid "none"
msgstr "няма"
#. IDS_RENDERING_MODE_GDI
-#: Merge.rc:5163
+#: Merge.rc:5173
msgid "GDI"
msgstr "GDI"
#. IDS_RENDERING_MODE_DIRECTWRITE_DEFAULT
-#: Merge.rc:5164
+#: Merge.rc:5174
msgid "DirectWrite Default"
msgstr "Стандартен DirectWrite"
#. IDS_RENDERING_MODE_DIRECTWRITE_ALIASED
-#: Merge.rc:5165
+#: Merge.rc:5175
msgid "DirectWrite Aliased"
msgstr "Назъбен DirectWrite"
#. IDS_RENDERING_MODE_DIRECTWRITE_GDI_CLASSIC
-#: Merge.rc:5166
+#: Merge.rc:5176
msgid "DirectWrite GDI Classic"
msgstr "Класически DirectWrite GDI"
#. IDS_RENDERING_MODE_DIRECTWRITE_GDI_NATURAL
-#: Merge.rc:5167
+#: Merge.rc:5177
msgid "DirectWrite GDI Natural"
msgstr "Естествен DirectWrite GDI"
#. IDS_RENDERING_MODE_DIRECTWRITE_NATURAL
-#: Merge.rc:5168
+#: Merge.rc:5178
msgid "DirectWrite Natural"
msgstr "Естествен DirectWrite"
#. IDS_RENDERING_MODE_DIRECTWRITE_NATURAL_SYMMETRIC
-#: Merge.rc:5169
+#: Merge.rc:5179
msgid "DirectWrite Natural Symmetric"
msgstr "Естествен симтричен DirectWrite"
#. IDS_CLOSE_WINDOWS_WITH_ESC_DISABLED
-#: Merge.rc:5174
+#: Merge.rc:5184
msgctxt "Options dialog|General|Close windows with Esc"
msgid "Disabled"
msgstr "Изключено"
#. IDS_CLOSE_WINDOWS_WITH_ESC_1
-#: Merge.rc:5175
+#: Merge.rc:5185
msgid "MDI child window or main window"
msgstr "Дъщерен или основен прозорец (MDI)"
#. IDS_CLOSE_WINDOWS_WITH_ESC_2
-#: Merge.rc:5176
+#: Merge.rc:5186
msgid "MDI child window only"
msgstr "Само дъщерен прозорец (MDI)"
#. IDS_CLOSE_WINDOWS_WITH_ESC_3
-#: Merge.rc:5177
+#: Merge.rc:5187
msgid "Close main window if only one MDI child window"
msgstr "Затваряне на основния прозорец ако има само един дъщерен (MDI)"
#. IDS_DIFF_GROUP
-#: Merge.rc:5182
+#: Merge.rc:5192
msgctxt "ImgMergeFrame|LocationPane"
msgid "Diff"
msgstr ""
#. IDS_DIFF_HIGHLIGHT
-#: Merge.rc:5183
+#: Merge.rc:5193
msgctxt "ImgMergeFrame|LocationPane"
msgid "Highlight"
msgstr ""
#. IDS_DIFF_BLINK
-#: Merge.rc:5184
+#: Merge.rc:5194
msgctxt "ImgMergeFrame|LocationPane"
msgid "Blink"
msgstr ""
#. IDS_DIFF_BLOCKSIZE
-#: Merge.rc:5185
+#: Merge.rc:5195
msgctxt "ImgMergeFrame|LocationPane"
msgid "Block Size"
msgstr ""
#. IDS_DIFF_BLOCKALPHA
-#: Merge.rc:5186
+#: Merge.rc:5196
msgctxt "ImgMergeFrame|LocationPane"
msgid "Block Alpha"
msgstr ""
#. IDS_DIFF_CDTHRESHOLD
-#: Merge.rc:5187
+#: Merge.rc:5197
msgctxt "ImgMergeFrame|LocationPane"
msgid "CD Threshold"
msgstr ""
#. IDS_DIFF_INSERTION_DELETION_DETECTION
-#: Merge.rc:5188
+#: Merge.rc:5198
msgctxt "ImgMergeFrame|LocationPane"
msgid "Ins/Del Detection"
msgstr ""
#. IDS_OVERLAY_MODE_NONE
-#: Merge.rc:5189 Merge.rc:5194
+#: Merge.rc:5199 Merge.rc:5204
msgctxt "ImgMergeFrame|LocationPane"
msgid "None"
msgstr ""
#. IDS_DIFF_INSERTION_DELETION_DETECTION_VERTICAL
-#: Merge.rc:5190
+#: Merge.rc:5200
msgctxt "ImgMergeFrame|LocationPane"
msgid "Vertical"
msgstr ""
#. IDS_DIFF_INSERTION_DELETION_DETECTION_HORIZONTAL
-#: Merge.rc:5191
+#: Merge.rc:5201
msgctxt "ImgMergeFrame|LocationPane"
msgid "Horizontal"
msgstr ""
#. IDS_OVERLAY_GROUP
-#: Merge.rc:5192
+#: Merge.rc:5202
msgctxt "ImgMergeFrame|LocationPane"
msgid "Overlay"
msgstr ""
#. IDS_OVERLAY_ALPHA
-#: Merge.rc:5193
+#: Merge.rc:5203
msgctxt "ImgMergeFrame|LocationPane"
msgid "Alpha"
msgstr ""
#. IDS_OVERLAY_MODE_XOR
-#: Merge.rc:5195
+#: Merge.rc:5205
msgctxt "ImgMergeFrame|LocationPane"
msgid "XOR"
msgstr "ИЛИ"
#. IDS_OVERLAY_MODE_ALPHA
-#: Merge.rc:5196
+#: Merge.rc:5206
msgctxt "ImgMergeFrame|LocationPane"
msgid "Alpha Blend"
msgstr ""
#. IDS_OVERLAY_MODE_ALPHA_ANIMATION
-#: Merge.rc:5197
+#: Merge.rc:5207
msgctxt "ImgMergeFrame|LocationPane"
msgid "Alpha Animation"
msgstr ""
#. IDS_ZOOM
-#: Merge.rc:5198
+#: Merge.rc:5208
msgctxt "ImgMergeFrame|LocationPane"
msgid "Zoom"
msgstr "Мащаб"
#. IDS_PAGE
-#: Merge.rc:5199
+#: Merge.rc:5209
msgctxt "ImgMergeFrame|LocationPane"
msgid "Page:"
msgstr "Страница:"
#. IDS_IMGCMP_STATUS_PT_RGBA_FMT
-#: Merge.rc:5200
+#: Merge.rc:5210
#, c-format
msgid "Pt: (%d, %d) RGBA: (%d, %d, %d, %d) "
msgstr ""
#. IDS_IMGCMP_STATUS_DIST1_FMT
-#: Merge.rc:5201
+#: Merge.rc:5211
#, c-format
msgid "Dist: %g "
msgstr ""
#. IDS_IMGCMP_STATUS_DIST2_FMT
-#: Merge.rc:5202
+#: Merge.rc:5212
#, c-format
msgid "Dist: %g, %g "
msgstr ""
#. IDS_IMGCMP_STATUS_PAGE_ZOOM_SIZE_BPP_FMT
-#: Merge.rc:5203
+#: Merge.rc:5213
#, c-format
msgid "Page: %d/%d Zoom: %d%% %dx%dpx %dbpp "
msgstr ""
#. IDS_IMGCMP_STATUS_RC_FMT
-#: Merge.rc:5204
+#: Merge.rc:5214
#, c-format
msgid "Rc: (%d, %d) "
msgstr ""
#. IDS_IMGCMP_STATUS_FLIPPED_FMT
-#: Merge.rc:5205
+#: Merge.rc:5215
#, c-format
msgid "Flipped: %s "
msgstr ""
#. IDS_IMGCMP_STATUS_ROTATED_FMT
-#: Merge.rc:5206
+#: Merge.rc:5216
#, c-format
msgid "Rotated: %d "
msgstr ""
#. IDS_IMGCMP_REPORT_ALLPAGES
-#: Merge.rc:5207
+#: Merge.rc:5217
msgid "All pages"
msgstr "Всички страници"
#. IDS_IGNSUB_STR1
-#: Merge.rc:5212
+#: Merge.rc:5222
msgid ""
msgstr "<въведете>"
#. IDS_IGNSUB_STR2
-#: Merge.rc:5213
+#: Merge.rc:5223
msgid "No differences found to select"
msgstr "Липсват различия, които да бъдат избрани"
#. IDS_IGNSUB_STR3
-#: Merge.rc:5214
+#: Merge.rc:5224
msgid "No differences found to add as substitution filter"
msgstr "Липсват различия, които да бъдат добавени като заместващ филтър"
#. IDS_IGNSUB_STR4
-#: Merge.rc:5215
+#: Merge.rc:5225
msgid "The pair is already in the Substitution Filters list"
msgstr "Двойката вече съществува в заместващите филтри"
#. IDS_IGNSUB_STR5
-#: Merge.rc:5216
+#: Merge.rc:5226
msgid "Add this change to Substitution Filters?"
msgstr "Нов заместващ филтър от тази промяна?"
#. IDS_OCRRESULT_TEXTONLY
-#: Merge.rc:5221
+#: Merge.rc:5231
msgid "Text only"
msgstr "Само текст"
#. IDS_OCRRESULT_POS_LINE
-#: Merge.rc:5222
+#: Merge.rc:5232
msgid "Line-by-line position and text"
msgstr "Позиция на редове и текст"
#. IDS_OCRRESULT_POS_WORD
-#: Merge.rc:5223
+#: Merge.rc:5233
msgid "Word-by-word position and text"
msgstr "Позиция на думи и текст"
#. IDS_USERDATAFOLDER_APPDATA
-#: Merge.rc:5228
+#: Merge.rc:5238
msgid "AppData (Roaming) folder"
msgstr ""
#. IDS_USERDATAFOLDER_INSTALL
-#: Merge.rc:5229
+#: Merge.rc:5239
msgid "Install folder"
msgstr ""
#. IDS_USERDATAFOLDER_DOCUMENTS
-#: Merge.rc:5230
+#: Merge.rc:5240
msgid "Documents folder"
msgstr ""
#. IDS_SINGLEINSTANCE_DISABLED
-#: Merge.rc:5235
+#: Merge.rc:5245
msgctxt "Options dialog|General|Single instance mode"
msgid "Disabled"
msgstr "Изключено"
#. IDS_SINGLEINSTANCE_STR1
-#: Merge.rc:5236
+#: Merge.rc:5246
msgid "Allow only one instance to run"
msgstr "Позволи само едно стартирано копие"
#. IDS_SINGLEINSTANCE_STR2
-#: Merge.rc:5237
+#: Merge.rc:5247
msgid "Allow only one instance; wait for termination"
msgstr ""
#. IDS_AUTO_RELOAD_MODIFIED_FILES_DISABLED
-#: Merge.rc:5242
+#: Merge.rc:5252
msgctxt "Options dialog|General|Auto-reload modified files"
msgid "Disabled"
msgstr "Изключено"
#. IDS_AUTO_RELOAD_MODIFIED_FILES_STR1
-#: Merge.rc:5243
+#: Merge.rc:5253
msgid "Only on window activated"
msgstr "Само при фокусиране на прозореца"
#. IDS_AUTO_RELOAD_MODIFIED_FILES_STR2
-#: Merge.rc:5244
+#: Merge.rc:5254
msgid "Immediately"
msgstr "Незабавно"
#. IDS_PLUGIN_ALL
-#: Merge.rc:5249
+#: Merge.rc:5259
msgid "Al&l"
msgstr "В&сички"
#. IDS_PLUGIN_OTHERS
-#: Merge.rc:5250
+#: Merge.rc:5260
msgid "&Others"
msgstr "&Други"
-#: Merge.rc:5252
+#: Merge.rc:5262
#, c-format
msgid "Missing plugin name in pipeline: %1"
msgstr ""
-#: Merge.rc:5254
+#: Merge.rc:5264
#, c-format
msgid "Missing quote in plugin pipeline: %1"
msgstr ""
#. IDS_PLUGIN_NAME_ALREADY_EXISTS
-#: Merge.rc:5255
+#: Merge.rc:5265
#, c-format
msgid "Plugin name '%1' already exists."
msgstr ""
#. IDS_PLUGIN_TITLE1
-#: Merge.rc:5256
+#: Merge.rc:5266
msgid "Specify plugin arguments"
msgstr ""
-#: Merge.rc:5258
+#: Merge.rc:5268
#, c-format
msgid "Plugin not found or invalid: %1"
msgstr ""
#. IDS_PLUGIN_NOT_UNPACK
-#: Merge.rc:5259
+#: Merge.rc:5269
#, c-format
msgid "'%1' is not an unpacker plugin"
msgstr ""
#. IDS_PLUGIN_NOT_PREDIFF
-#: Merge.rc:5260
+#: Merge.rc:5270
#, c-format
msgid "'%1' is not a prediffer plugin"
msgstr ""
-#: Merge.rc:5262
+#: Merge.rc:5272
#, c-format
msgid "Error prediffing '%1' with '%2'. Prediffing disabled."
msgstr ""
#. IDS_PLUGIN_CIRCULAR_REFERENCE
-#: Merge.rc:5263
+#: Merge.rc:5273
#, c-format
msgid "Circular reference in plugin pipeline: %1"
msgstr ""
#. IDS_PLUGIN_TYPE1
-#: Merge.rc:5264
+#: Merge.rc:5274
msgid "URL Handler"
msgstr ""
#. IDS_PLUGIN_TYPE2
-#: Merge.rc:5265
+#: Merge.rc:5275
msgid "File Unpacker"
msgstr ""
#. IDS_PLUGIN_TYPE3
-#: Merge.rc:5266
+#: Merge.rc:5276
msgid "File or Folder Unpacker"
msgstr ""
#. IDS_PLUGIN_TYPE5
-#: Merge.rc:5268
+#: Merge.rc:5278
msgid "Alias for Unpacker"
msgstr ""
#. IDS_PLUGIN_TYPE6
-#: Merge.rc:5269
+#: Merge.rc:5279
msgid "Alias for Prediffer"
msgstr ""
#. IDS_PLUGIN_TYPE7
-#: Merge.rc:5270
+#: Merge.rc:5280
msgid "Alias for Editor script"
msgstr ""
#. IDS_PLUGIN_ALIAS_DESC
-#: Merge.rc:5271
+#: Merge.rc:5281
#, c-format
msgid "Alias for plugin pipeline '%1'"
msgstr ""
#. IDS_PLUGIN_NEW_DESC
-#: Merge.rc:5272
+#: Merge.rc:5282
msgid "New plugin description"
msgstr ""
#. IDS_PLUGIN_TARGETS_ALL
-#: Merge.rc:5273
+#: Merge.rc:5283
msgid "All"
msgstr ""
#. IDS_PLUGIN_TARGETS_1ST
-#: Merge.rc:5274
+#: Merge.rc:5284
msgid "1st"
msgstr ""
#. IDS_PLUGIN_TARGETS_2ND
-#: Merge.rc:5275
+#: Merge.rc:5285
msgid "2nd"
msgstr ""
#. IDS_PLUGIN_TARGETS_3RD
-#: Merge.rc:5276
+#: Merge.rc:5286
msgid "3rd"
msgstr ""
#. IDS_PLUGIN_TARGETS_1ST_2ND
-#: Merge.rc:5277
+#: Merge.rc:5287
msgid "1st and 2nd"
msgstr ""
#. IDS_PLUGIN_TARGETS_1ST_3RD
-#: Merge.rc:5278
+#: Merge.rc:5288
msgid "1st and 3rd"
msgstr ""
#. IDS_PLUGIN_TARGETS_2ND_3RD
-#: Merge.rc:5279
+#: Merge.rc:5289
msgid "2nd and 3rd"
msgstr ""
#. IDS_FILTER_APPLIED
-#: Merge.rc:5284
+#: Merge.rc:5294
msgid "Filter applied"
msgstr ""
#. IDS_FILTERMENU_COMPARE
-#: Merge.rc:5289
+#: Merge.rc:5299
#, c-format
msgid "Compare %1"
msgstr "Сравняване на %1"
#. IDS_FILTERMENU_FILTER_BY_THIS_COLUMN
-#: Merge.rc:5290
+#: Merge.rc:5300
msgid "&Filter by This Column"
msgstr ""
#. IDS_FILTERMENU_FILTER_BY_THIS_COLUMN2
-#: Merge.rc:5291
+#: Merge.rc:5301
msgid "&Filter by This Column..."
msgstr ""
#. IDS_CLIPBOARDHISTORY_TIME
-#: Merge.rc:5296
+#: Merge.rc:5306
#, c-format
msgid "Clipboard at %s"
msgstr ""
#. IDS_CLIPBOARDHISTORY_DISABLED
-#: Merge.rc:5297
+#: Merge.rc:5307
msgid ""
"Clipboard history disabled.\r\n"
"Enable: Windows logo key + V, then Turn on."
msgstr ""
-#: Merge.rc:5299
+#: Merge.rc:5309
msgid "This system does not support clipboard history."
msgstr ""
-#: Merge.rc:5301
+#: Merge.rc:5311
msgid "32-bit WinMerge does not support Clipboard Compare"
msgstr ""
#. IDS_WEBVIEW2_RUNTIME_NOT_INSTALLED
-#: Merge.rc:5306
+#: Merge.rc:5316
msgid "WebView2 runtime not installed. Download it?"
msgstr ""
#. IDS_JUMPLIST_NEW_TEXT_COMPARE
-#: Merge.rc:5311
+#: Merge.rc:5321
msgid "New Text Compare"
msgstr ""
#. IDS_JUMPLIST_NEW_TABLE_COMPARE
-#: Merge.rc:5312
+#: Merge.rc:5322
msgid "New Table Compare"
msgstr ""
#. IDS_JUMPLIST_NEW_BINARY_COMPARE
-#: Merge.rc:5313
+#: Merge.rc:5323
msgid "New Binary Compare"
msgstr ""
#. IDS_JUMPLIST_NEW_IMAGE_COMPARE
-#: Merge.rc:5314
+#: Merge.rc:5324
msgid "New Image Compare"
msgstr ""
#. IDS_JUMPLIST_NEW_WEBPAGE_COMPARE
-#: Merge.rc:5315
+#: Merge.rc:5325
msgid "New Webpage Compare"
msgstr ""
+#. IDS_JUMPLIST_NEW_FOLDER_COMPARE
+#: Merge.rc:5326
+msgid "New Folder Compare"
+msgstr ""
+
#. IDS_JUMPLIST_CLIPBOARD_COMPARE
-#: Merge.rc:5316
+#: Merge.rc:5327
msgid "Clipboard Compare"
msgstr ""
#. IDS_PREVIEWBAR_PRINT
-#: Merge.rc:5321
+#: Merge.rc:5332
msgid "&Print..."
msgstr ""
#. IDS_PREVIEWBAR_PREVPAGE
-#: Merge.rc:5323
+#: Merge.rc:5334
msgid "Pre&v Page"
msgstr ""
#. IDS_PREVIEWBAR_TWOPAGE
-#: Merge.rc:5324
+#: Merge.rc:5335
msgid "&Two Page"
msgstr ""
#. IDS_PREVIEWBAR_ONEPAGE
-#: Merge.rc:5325
+#: Merge.rc:5336
msgid "&One Page"
msgstr ""
#. IDS_PREVIEWBAR_ZOOMIN
-#: Merge.rc:5326
+#: Merge.rc:5337
msgid "Zoom &In"
msgstr ""
#. IDS_PREVIEWBAR_ZOOMOUT
-#: Merge.rc:5327
+#: Merge.rc:5338
msgid "Zoom &Out"
msgstr ""
#. IDS_WEBPAGE_COMPARING
-#: Merge.rc:5333
+#: Merge.rc:5344
msgid "Comparing..."
msgstr "Сравняване…"
#. IDS_WEBPAGE_ZOOM
-#: Merge.rc:5334
+#: Merge.rc:5345
msgid "Zoom:"
msgstr "Мащаб:"
#. IDS_COPY_GRANULARITY_DIFFHUNK
-#: Merge.rc:5339
+#: Merge.rc:5350
msgid "Diff hunk"
msgstr ""
#. IDS_COPY_GRANULARITY_INLINE
-#: Merge.rc:5340
+#: Merge.rc:5351
msgid "Inline diff"
msgstr ""
#. IDS_COPY_GRANULARITY_LINE
-#: Merge.rc:5341
+#: Merge.rc:5352
msgid "Line"
msgstr "Ред"
-#: Merge.rc:5342
+#: Merge.rc:5353
msgid "Character"
msgstr "Знак"
#. ID_MICE_PREVDIFF
-#: Merge.rc:5347
+#: Merge.rc:5358
msgid ""
"\n"
"Previous Difference (Alt+Up)\n"
@@ -8123,7 +8139,7 @@ msgid ""
msgstr ""
#. ID_MICE_NEXTDIFF
-#: Merge.rc:5348
+#: Merge.rc:5359
msgid ""
"\n"
"Next Difference (Alt+Down)\n"
@@ -8132,7 +8148,7 @@ msgid ""
msgstr ""
#. ID_MICE_L2R
-#: Merge.rc:5349
+#: Merge.rc:5360
msgid ""
"\n"
"Copy to Right (Alt+Right)\n"
@@ -8142,7 +8158,7 @@ msgid ""
msgstr ""
#. ID_MICE_R2L
-#: Merge.rc:5350
+#: Merge.rc:5361
msgid ""
"\n"
"Copy to Left (Alt+Left)\n"
@@ -8152,7 +8168,7 @@ msgid ""
msgstr ""
#. ID_MICE_L2RNEXT
-#: Merge.rc:5351
+#: Merge.rc:5362
msgid ""
"\n"
"Copy to Right and Advance (Ctrl+Alt+Right)\n"
@@ -8161,7 +8177,7 @@ msgid ""
msgstr ""
#. ID_MICE_R2LNEXT
-#: Merge.rc:5352
+#: Merge.rc:5363
msgid ""
"\n"
"Copy to Left and Advance (Ctrl+Alt+Left)\n"
@@ -8170,262 +8186,262 @@ msgid ""
msgstr ""
#. IDS_LOG_COMPARING_2
-#: Merge.rc:5362
+#: Merge.rc:5373
#, c-format
msgid "Comparing %1 with %2"
msgstr ""
#. IDS_LOG_COMPARING_3
-#: Merge.rc:5363
+#: Merge.rc:5374
#, c-format
msgid "Comparing %1 with %2 and %3"
msgstr ""
#. IDS_LOG_COMPARE_COMPLETED
-#: Merge.rc:5364
+#: Merge.rc:5375
msgid "Comparison completed"
msgstr ""
#. IDS_LOG_COMPARE_ERROR_2
-#: Merge.rc:5365
+#: Merge.rc:5376
#, c-format
msgid "Failed to compare %1 with %2: "
msgstr ""
#. IDS_LOG_COMPARE_ERROR_3
-#: Merge.rc:5366
+#: Merge.rc:5377
#, c-format
msgid "Failed to compare %1 with %2 and %3: "
msgstr ""
#. IDS_LOG_FILE_SAVED
-#: Merge.rc:5367
+#: Merge.rc:5378
msgid "File saved"
msgstr ""
#. IDS_LOG_COPYING_FILES
-#: Merge.rc:5368
+#: Merge.rc:5379
msgid "Copying files..."
msgstr ""
#. IDS_LOG_MOVING_FILES
-#: Merge.rc:5369
+#: Merge.rc:5380
msgid "Moving files..."
msgstr ""
#. IDS_LOG_DELETING_FILES
-#: Merge.rc:5370
+#: Merge.rc:5381
msgid "Deleting files..."
msgstr ""
#. IDS_LOG_RECYCLEBIN
-#: Merge.rc:5371
+#: Merge.rc:5382
msgid "Recycle Bin"
msgstr ""
#. IDS_LOG_PERMANENTLY_DELETED
-#: Merge.rc:5372
+#: Merge.rc:5383
msgid "Permanently deleted"
msgstr ""
#. IDS_LOG_FILEOPERATION_COMPLETED
-#: Merge.rc:5373
+#: Merge.rc:5384
msgid "File operation completed successfully"
msgstr ""
#. IDS_LOG_FILEOPERATION_CANCELED
-#: Merge.rc:5374
+#: Merge.rc:5385
msgid "File operation canceled"
msgstr ""
#. IDS_FILTER_ERROR_NO_ERROR
-#: Merge.rc:5379
+#: Merge.rc:5390
msgid "No error"
msgstr ""
#. IDS_FILTER_ERROR_EMPTY_EXPRESSION
-#: Merge.rc:5380
+#: Merge.rc:5391
msgid "Filter expression is empty"
msgstr ""
#. IDS_FILTER_ERROR_UNKNOWN_CHAR
-#: Merge.rc:5381
+#: Merge.rc:5392
msgid "Unknown character in filter expression"
msgstr ""
#. IDS_FILTER_ERROR_UNTERMINATED_STRING
-#: Merge.rc:5382
+#: Merge.rc:5393
msgid "Unterminated string literal"
msgstr ""
#. IDS_FILTER_ERROR_SYNTAX_ERROR
-#: Merge.rc:5383
+#: Merge.rc:5394
msgid "Syntax error in filter expression"
msgstr ""
#. IDS_FILTER_ERROR_PARSE_FAILURE
-#: Merge.rc:5384
+#: Merge.rc:5395
msgid "Failed to parse filter expression"
msgstr ""
#. IDS_FILTER_ERROR_INVALID_LITERAL
-#: Merge.rc:5385
+#: Merge.rc:5396
msgid "Invalid literal value"
msgstr ""
#. IDS_FILTER_ERROR_INVALID_REGULAR_EXPRESSION
-#: Merge.rc:5386
+#: Merge.rc:5397
msgid "Invalid regular expression"
msgstr ""
#. IDS_FILTER_ERROR_UNDEFINED_IDENTIFIER
-#: Merge.rc:5387
+#: Merge.rc:5398
msgid "Undefined identifier"
msgstr ""
#. IDS_FILTER_ERROR_INVALID_ARGUMENT_COUNT
-#: Merge.rc:5388
+#: Merge.rc:5399
msgid "Invalid number of arguments"
msgstr ""
#. IDS_FILTER_ERROR_FILTER_NAME_NOT_FOUND
-#: Merge.rc:5389
+#: Merge.rc:5400
msgid "Filter name not found"
msgstr ""
#. IDS_FILTER_ERROR_DIVIDE_BY_ZERO
-#: Merge.rc:5390
+#: Merge.rc:5401
msgid "Division by zero in filter expression"
msgstr ""
#. IDS_FILTER_ERROR_UNKNOWN_ERROR
-#: Merge.rc:5391
+#: Merge.rc:5402
msgid "Unknown error"
msgstr "Неочаквана грешка"
#. IDS_FILTER_ERROR_INVALID_PROPERTY_NAME
-#: Merge.rc:5392
+#: Merge.rc:5403
msgid "Invalid property name"
msgstr "Неприемливо име на свойство"
#. IDS_FILTER_ERROR_INVALID_DIRECTIVE
-#: Merge.rc:5393
+#: Merge.rc:5404
msgid "Invalid directive"
msgstr ""
#. IDS_FILTER_OP_EQUALS
-#: Merge.rc:5398
+#: Merge.rc:5409
msgid "Equals"
msgstr "Е равно на"
#. IDS_FILTER_OP_NOT_EQUALS
-#: Merge.rc:5399
+#: Merge.rc:5410
msgid "Does not equal"
msgstr "Не е равно на"
#. IDS_FILTER_OP_LESS_THAN
-#: Merge.rc:5400
+#: Merge.rc:5411
msgid "Less than"
msgstr "По-малко от"
#. IDS_FILTER_OP_LESS_EQUAL
-#: Merge.rc:5401
+#: Merge.rc:5412
msgid "Less than or equal to"
msgstr "По-малко или равно на"
#. IDS_FILTER_OP_GREATER_EQUAL
-#: Merge.rc:5402
+#: Merge.rc:5413
msgid "Greater than or equal to"
msgstr "По-голямо или равно на"
#. IDS_FILTER_OP_GREATER_THAN
-#: Merge.rc:5403
+#: Merge.rc:5414
msgid "Greater than"
msgstr "По-голямо на"
#. IDS_FILTER_OP_BETWEEN
-#: Merge.rc:5404
+#: Merge.rc:5415
msgid "Between"
msgstr "Между"
#. IDS_FILTER_OP_NOT_BETWEEN
-#: Merge.rc:5405
+#: Merge.rc:5416
msgid "Not Between"
msgstr "Не меЖду"
#. IDS_FILTER_OP_CONTAINS
-#: Merge.rc:5406
+#: Merge.rc:5417
msgid "Contains"
msgstr "Съдържа"
#. IDS_FILTER_OP_NOT_CONTAINS
-#: Merge.rc:5407
+#: Merge.rc:5418
msgid "Not Contains"
msgstr "Не съдържа"
#. IDS_FILTER_OP_RECONTAINS
-#: Merge.rc:5408
+#: Merge.rc:5419
msgid "Contains (regex)"
msgstr "Съдържа (регулярен израз)"
#. IDS_FILTER_OP_NOT_RECONTAINS
-#: Merge.rc:5409
+#: Merge.rc:5420
msgid "Not Contains (regex)"
msgstr "Не съдържа (регулярен израз)"
#. IDS_FILTER_OP_LIKE
-#: Merge.rc:5410
+#: Merge.rc:5421
msgid "Match (wildcard)"
msgstr ""
#. IDS_FILTER_OP_NOT_LIKE
-#: Merge.rc:5411
+#: Merge.rc:5422
msgid "Not match (wildcard)"
msgstr ""
#. IDS_FILTER_OP_MATCHES
-#: Merge.rc:5412
+#: Merge.rc:5423
msgid "Match (regex)"
msgstr ""
#. IDS_FILTER_OP_NOT_MATCHES
-#: Merge.rc:5413
+#: Merge.rc:5424
msgid "Not match (regex)"
msgstr ""
#. IDS_COLORMODE_LIGHT
-#: Merge.rc:5418
+#: Merge.rc:5429
msgid "Light"
msgstr "Светла"
#. IDS_COLORMODE_DARK
-#: Merge.rc:5419
+#: Merge.rc:5430
msgid "Dark"
msgstr "Тъмна"
#. IDS_COLORMODE_FOLLOWSYSTEM
-#: Merge.rc:5420
+#: Merge.rc:5431
msgid "Follow system"
msgstr "Според системата"
#. IDS_EXAMPLE
-#: Merge.rc:5425
+#: Merge.rc:5436
#, c-format
msgid "e.g. %1"
msgstr ""
#. IDS_DETECTED_PREVIOUS_CRASH
-#: Merge.rc:5430
+#: Merge.rc:5441
msgid "WinMerge detected a previous crash. Please report this if possible."
msgstr ""
#. IDS_REGEX_REPLACE_LIST_TEMPLATE
-#: Merge.rc:5435
+#: Merge.rc:5446
msgid "# Regex replacement list\r\n# Format: regexreplacement\r\n# Backreferences like $1, $2 are supported\r\n\r\n(\\d{4})-(\\d{2})-(\\d{2})\t$1_$2_$3\r\n"
msgstr ""
#. IDS_STRING_REPLACE_LIST_TEMPLATE
-#: Merge.rc:5436
+#: Merge.rc:5447
msgid "# Replacement list\r\n# Format: searchreplacement\r\n# Lines starting with # are ignored\r\n\r\nfrom1\tto1\r\nfrom2\tto2\r\n"
msgstr ""
diff --git a/Translations/WinMerge/Catalan.po b/Translations/WinMerge/Catalan.po
index e5c7369f7ff..9502366c1ca 100644
--- a/Translations/WinMerge/Catalan.po
+++ b/Translations/WinMerge/Catalan.po
@@ -22,7 +22,7 @@ msgstr ""
"X-Generator: Poedit 3.4.2\n"
#. LANGUAGE, SUBLANGUAGE
-#: Merge.rc:26 Merge.rc:59 Merge.rc:5453
+#: Merge.rc:26 Merge.rc:59 Merge.rc:5464
#, c-format
msgid "LANG_ENGLISH, SUBLANG_ENGLISH_US"
msgstr "LANG_CATALAN, SUBLANG_DEFAULT"
@@ -108,7 +108,7 @@ msgid "Copy Selected Diff (Right) to Clipboard\tCtrl+&3"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_SELECTLINEDIFF
-#: Merge.rc:110 Merge.rc:673
+#: Merge.rc:110 Merge.rc:680
#, c-format
msgid "Select Line &Difference\tF4"
msgstr "Selecciona la diferència de la &línia\tF4"
@@ -142,7 +142,7 @@ msgid "Cu&t"
msgstr "Re&talla"
#. IDR_POPUP_DIRVIEW
-#: Merge.rc:118 Merge.rc:943
+#: Merge.rc:118 Merge.rc:951
#, c-format
msgid "&Copy"
msgstr "&Copia"
@@ -154,21 +154,21 @@ msgid "&Paste"
msgstr "En&ganxa"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:121 Merge.rc:875 Merge.rc:882
+#: Merge.rc:121 Merge.rc:882 Merge.rc:889
#, c-format
msgid "&Scripts"
msgstr "&Seqüències d'ordres"
#. IDS_NO_EDIT_SCRIPTS
-#: Merge.rc:123 Merge.rc:338 Merge.rc:447 Merge.rc:654 Merge.rc:659
-#: Merge.rc:865 Merge.rc:877 Merge.rc:884 Merge.rc:940 Merge.rc:1183
-#: Merge.rc:5028
+#: Merge.rc:123 Merge.rc:340 Merge.rc:451 Merge.rc:661 Merge.rc:666
+#: Merge.rc:872 Merge.rc:884 Merge.rc:891 Merge.rc:948 Merge.rc:1193
+#: Merge.rc:5038
#, c-format
msgid "< Empty >"
msgstr "< Buit >"
#. IDR_POPUP_LOCATIONBAR, ID_EDIT_WMGOTO
-#: Merge.rc:126 Merge.rc:691 Merge.rc:1081
+#: Merge.rc:126 Merge.rc:698 Merge.rc:1089
msgid "&Go to...\tCtrl+G"
msgstr "&Ves a...\tControl+G"
@@ -189,27 +189,27 @@ msgid "Op&en"
msgstr "O&bre"
#. IDR_POPUP_DIRVIEW, ID_DIR_OPEN_RIGHT
-#: Merge.rc:132 Merge.rc:981 Merge.rc:988 Merge.rc:995
+#: Merge.rc:132 Merge.rc:989 Merge.rc:996 Merge.rc:1003
msgid "With &Registered Application"
msgstr "Amb l'aplicació ®istrada"
#. IDR_POPUP_DIRVIEW, ID_DIR_OPEN_RIGHT_WITHEDITOR
-#: Merge.rc:133 Merge.rc:982 Merge.rc:989 Merge.rc:996
+#: Merge.rc:133 Merge.rc:990 Merge.rc:997 Merge.rc:1004
msgid "With &External Editor\tCtrl+Alt+E"
msgstr "Amb l'editor &extern\tControl+Alt+E"
#. IDR_POPUP_DIRVIEW, ID_DIR_OPEN_RIGHT_WITH
-#: Merge.rc:134 Merge.rc:983 Merge.rc:990 Merge.rc:997
+#: Merge.rc:134 Merge.rc:991 Merge.rc:998 Merge.rc:1005
msgid "&With..."
msgstr "A&mb..."
#. IDR_POPUP_DIRVIEW, ID_DIR_OPEN_RIGHT_PARENT_FOLDER
-#: Merge.rc:135 Merge.rc:984 Merge.rc:991 Merge.rc:998
+#: Merge.rc:135 Merge.rc:992 Merge.rc:999 Merge.rc:1006
msgid "Open &Parent Folder..."
msgstr "Obre el directori &Pare..."
#. IDR_POPUP_IMG_CTXT, ID_FILE_SHELLMENU
-#: Merge.rc:137 Merge.rc:1239
+#: Merge.rc:137 Merge.rc:1249
msgid "S&hell Menu"
msgstr "Menú de &Sistema"
@@ -247,8 +247,8 @@ msgid "Ins&ertion/Deletion Detection"
msgstr "D&etector d'inserció/eliminació"
#. IDR_MERGEDOCTYPE, ID_TOOLBAR_NONE
-#: Merge.rc:176 Merge.rc:209 Merge.rc:216 Merge.rc:358 Merge.rc:507
-#: Merge.rc:751
+#: Merge.rc:176 Merge.rc:209 Merge.rc:216 Merge.rc:360 Merge.rc:511
+#: Merge.rc:758
#, c-format
msgid "&None"
msgstr "&Cap"
@@ -264,13 +264,13 @@ msgid "&Horizontal"
msgstr "&Horitzontal"
#. IDR_POPUP_IMG_CTXT, ID_IMG_CURPANE_PREVPAGE
-#: Merge.rc:181 Merge.rc:189 Merge.rc:1230
+#: Merge.rc:181 Merge.rc:189 Merge.rc:1240
#, c-format
msgid "&Previous Page"
msgstr "&Pàgina anterior"
#. IDS_PREVIEWBAR_NEXTPAGE
-#: Merge.rc:182 Merge.rc:190 Merge.rc:1231 Merge.rc:5322
+#: Merge.rc:182 Merge.rc:190 Merge.rc:1241 Merge.rc:5333
#, c-format
msgid "&Next Page"
msgstr "Pàgina següe&nt"
@@ -282,45 +282,45 @@ msgid "&Active Pane"
msgstr "Subfinestra &activa"
#. IDR_POPUP_IMG_CTXT, ID_IMG_CURPANE_ROTATE_RIGHT_90
-#: Merge.rc:185 Merge.rc:1225
+#: Merge.rc:185 Merge.rc:1235
msgid "Rotate &Right 90deg"
msgstr "Gira a la &dreta 90 graus"
#. IDR_POPUP_IMG_CTXT, ID_IMG_CURPANE_ROTATE_LEFT_90
-#: Merge.rc:186 Merge.rc:1226
+#: Merge.rc:186 Merge.rc:1236
msgid "Rotate &Left 90deg"
msgstr "Gira a l'&esquerra 90 graus"
#. IDR_POPUP_IMG_CTXT, ID_IMG_CURPANE_FLIP_VERTICALLY
-#: Merge.rc:187 Merge.rc:1227
+#: Merge.rc:187 Merge.rc:1237
msgid "Flip V&ertically"
msgstr "Voltejar &verticalment"
#. IDR_POPUP_IMG_CTXT, ID_IMG_CURPANE_FLIP_HORIZONTALLY
-#: Merge.rc:188 Merge.rc:1228
+#: Merge.rc:188 Merge.rc:1238
msgid "Flip H&orizontally"
msgstr "Volteja &horitzontalment"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:193 Merge.rc:699
+#: Merge.rc:193 Merge.rc:706
#, c-format
msgid "&Zoom"
msgstr "&Zoom"
#. IDR_MERGEDOCTYPE, ID_VIEW_ZOOMIN
-#: Merge.rc:202 Merge.rc:701
+#: Merge.rc:202 Merge.rc:708
#, c-format
msgid "Zoom &In\tCtrl++"
msgstr "A&propa\tControl++"
#. IDR_MERGEDOCTYPE, ID_VIEW_ZOOMOUT
-#: Merge.rc:203 Merge.rc:702
+#: Merge.rc:203 Merge.rc:709
#, c-format
msgid "Zoom &Out\tCtrl+-"
msgstr "All&unya\tControl+-"
#. IDR_MERGEDOCTYPE, ID_VIEW_ZOOMNORMAL, Zoom to normal
-#: Merge.rc:205 Merge.rc:704
+#: Merge.rc:205 Merge.rc:711
#, c-format
msgid "&Normal\tCtrl+*"
msgstr "Zoom &Normal\tControl+*"
@@ -350,29 +350,29 @@ msgid "Dragging &Mode"
msgstr "&Acció en arrossegar el ratolí"
#. IDR_POPUP_IMG_CTXT, ID_IMG_DRAGGINGMODE_MOVE
-#: Merge.rc:217 Merge.rc:955 Merge.rc:1233
+#: Merge.rc:217 Merge.rc:963 Merge.rc:1243
#, c-format
msgid "&Move"
msgstr "&Mou"
#. IDR_POPUP_IMG_CTXT, ID_IMG_DRAGGINGMODE_ADJUST_OFFSET
-#: Merge.rc:218 Merge.rc:1234
+#: Merge.rc:218 Merge.rc:1244
#, c-format
msgid "&Adjust Offset"
msgstr "&Ajusta el desplaçament"
#. IDR_POPUP_IMG_CTXT, ID_IMG_DRAGGINGMODE_VERTICAL_WIPE
-#: Merge.rc:219 Merge.rc:1235
+#: Merge.rc:219 Merge.rc:1245
msgid "&Vertical Wipe"
msgstr "Superposa v&erticalment"
#. IDR_POPUP_IMG_CTXT, ID_IMG_DRAGGINGMODE_HORIZONTAL_WIPE
-#: Merge.rc:220 Merge.rc:1236
+#: Merge.rc:220 Merge.rc:1246
msgid "&Horizontal Wipe"
msgstr "Superposa h&oritzontalment"
#. IDR_POPUP_IMG_CTXT, ID_IMG_DRAGGINGMODE_RECTANGLE_SELECT
-#: Merge.rc:221 Merge.rc:1237
+#: Merge.rc:221 Merge.rc:1247
msgid "Rectangle &Select"
msgstr "&Selecció de rectangle"
@@ -408,37 +408,37 @@ msgid "Compare Extracted &Text from Images"
msgstr "Compara el &text extret de les imatges"
#. IDD_OPEN, IDOK
-#: Merge.rc:272 Merge.rc:1980
+#: Merge.rc:272 Merge.rc:1990
msgid "Co&mpare"
msgstr "Co&mpara"
#. IDR_POPUP_WEBPAGE_COMPARE, ID_WEB_COMPARE_SCREENSHOTS
-#: Merge.rc:274 Merge.rc:1247
+#: Merge.rc:274 Merge.rc:1257
msgid "&Screenshots"
msgstr "&Captures de pantalla"
#. IDR_POPUP_WEBPAGE_COMPARE, ID_WEB_COMPARE_FULLSIZE_SCREENSHOTS
-#: Merge.rc:275 Merge.rc:1248
+#: Merge.rc:275 Merge.rc:1258
msgid "&Full Size Screenshots"
msgstr "C&aptures de la pantalla completa"
#. IDR_POPUP_WEBPAGE_COMPARE, ID_WEB_COMPARE_HTMLS
-#: Merge.rc:276 Merge.rc:1249
+#: Merge.rc:276 Merge.rc:1259
msgid "&HTMLs"
msgstr "&HTMLs"
#. IDR_POPUP_WEBPAGE_COMPARE, ID_WEB_COMPARE_TEXTS
-#: Merge.rc:277 Merge.rc:1250
+#: Merge.rc:277 Merge.rc:1260
msgid "&Texts"
msgstr "&Textos"
#. IDR_POPUP_WEBPAGE_COMPARE, ID_WEB_COMPARE_RESOURCETREES
-#: Merge.rc:278 Merge.rc:1251
+#: Merge.rc:278 Merge.rc:1261
msgid "&Resource Trees"
msgstr "&Arbres de recursos"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_SIZE
-#: Merge.rc:280 Merge.rc:1775
+#: Merge.rc:280 Merge.rc:1785
msgid "&Size"
msgstr "&Mida"
@@ -453,27 +453,27 @@ msgid "&Event Sync"
msgstr "&Sincronització d'esdeveniments"
#. IDR_POPUP_WEBPAGE_SYNC_EVENTS, ID_WEB_SYNC_ENABLED
-#: Merge.rc:291 Merge.rc:1259
+#: Merge.rc:291 Merge.rc:1269
msgid "&Enabled"
msgstr "&Activat"
#. IDR_POPUP_WEBPAGE_SYNC_EVENTS, ID_WEB_SYNC_SCROLL
-#: Merge.rc:293 Merge.rc:1261
+#: Merge.rc:293 Merge.rc:1271
msgid "&Scroll"
msgstr "&Desplaçament"
#. IDR_POPUP_WEBPAGE_SYNC_EVENTS, ID_WEB_SYNC_CLICK
-#: Merge.rc:294 Merge.rc:1262
+#: Merge.rc:294 Merge.rc:1272
msgid "&Click"
msgstr "&Clic"
#. IDR_POPUP_WEBPAGE_SYNC_EVENTS, ID_WEB_SYNC_INPUT
-#: Merge.rc:295 Merge.rc:1263
+#: Merge.rc:295 Merge.rc:1273
msgid "&Input"
msgstr "&Entrada"
#. IDR_POPUP_WEBPAGE_SYNC_EVENTS, ID_WEB_SYNC_GOBACKFORWARD
-#: Merge.rc:296 Merge.rc:1264
+#: Merge.rc:296 Merge.rc:1274
msgid "&Go Back/Forward"
msgstr "&Ves enrere/avança"
@@ -503,3970 +503,3981 @@ msgid "&All Profiles"
msgstr "&Tots els perfils"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:310 Merge.rc:411 Merge.rc:586
+#: Merge.rc:310 Merge.rc:413 Merge.rc:590
#, c-format
msgid "&File"
msgstr "&Fitxer"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:312 Merge.rc:413 Merge.rc:588
+#: Merge.rc:312 Merge.rc:415 Merge.rc:592
#, c-format
msgid "&New"
msgstr "&Nou"
#. IDR_POPUP_COMPARE, ID_MERGE_COMPARE_TEXT
-#: Merge.rc:314 Merge.rc:322 Merge.rc:415 Merge.rc:423 Merge.rc:590
-#: Merge.rc:598 Merge.rc:649 Merge.rc:935 Merge.rc:1159 Merge.rc:1171
+#: Merge.rc:314 Merge.rc:323 Merge.rc:417 Merge.rc:426 Merge.rc:594
+#: Merge.rc:603 Merge.rc:655 Merge.rc:942 Merge.rc:1167 Merge.rc:1180
#, c-format
msgid "&Text"
msgstr "&Text"
#. IDR_POPUP_COMPARE, ID_MERGE_COMPARE_TABLE
-#: Merge.rc:315 Merge.rc:323 Merge.rc:416 Merge.rc:424 Merge.rc:591
-#: Merge.rc:599 Merge.rc:650 Merge.rc:936 Merge.rc:1160 Merge.rc:1172
+#: Merge.rc:315 Merge.rc:324 Merge.rc:418 Merge.rc:427 Merge.rc:595
+#: Merge.rc:604 Merge.rc:656 Merge.rc:943 Merge.rc:1168 Merge.rc:1181
msgid "T&able"
msgstr "T&aula"
#. IDR_POPUP_COMPARE, ID_MERGE_COMPARE_HEX
-#: Merge.rc:316 Merge.rc:324 Merge.rc:417 Merge.rc:425 Merge.rc:592
-#: Merge.rc:600 Merge.rc:651 Merge.rc:937 Merge.rc:1161 Merge.rc:1173
+#: Merge.rc:316 Merge.rc:325 Merge.rc:419 Merge.rc:428 Merge.rc:596
+#: Merge.rc:605 Merge.rc:657 Merge.rc:944 Merge.rc:1169 Merge.rc:1182
#, c-format
msgid "&Binary"
msgstr "&Binari"
#. IDS_IMAGE_MENU
-#: Merge.rc:317 Merge.rc:325 Merge.rc:418 Merge.rc:426 Merge.rc:593
-#: Merge.rc:601 Merge.rc:652 Merge.rc:938 Merge.rc:1162 Merge.rc:1174
-#: Merge.rc:5123
+#: Merge.rc:317 Merge.rc:326 Merge.rc:420 Merge.rc:429 Merge.rc:597
+#: Merge.rc:606 Merge.rc:658 Merge.rc:945 Merge.rc:1170 Merge.rc:1183
+#: Merge.rc:5133
#, c-format
msgid "&Image"
msgstr "&Imatge"
#. IDR_POPUP_COMPARE, ID_MERGE_COMPARE_WEBPAGE
-#: Merge.rc:318 Merge.rc:326 Merge.rc:419 Merge.rc:427 Merge.rc:594
-#: Merge.rc:602 Merge.rc:653 Merge.rc:939 Merge.rc:1163 Merge.rc:1175
+#: Merge.rc:318 Merge.rc:327 Merge.rc:421 Merge.rc:430 Merge.rc:598
+#: Merge.rc:607 Merge.rc:659 Merge.rc:946 Merge.rc:1171 Merge.rc:1184
msgid "&Webpage"
msgstr "Pàgina &web"
+#. IDR_POPUP_NEW, ID_FILE_NEW_FOLDER
+#: Merge.rc:319 Merge.rc:328 Merge.rc:422 Merge.rc:431 Merge.rc:599
+#: Merge.rc:608 Merge.rc:1172
+msgid "&Folder"
+msgstr ""
+
#. IDR_MERGEDOCTYPE
-#: Merge.rc:320 Merge.rc:421 Merge.rc:596
+#: Merge.rc:321 Merge.rc:424 Merge.rc:601
#, c-format
msgid "New (&3 panes)"
msgstr "Nou (&3 subfinestres)"
#. IDR_MERGEDOCTYPE, ID_FILE_OPEN
-#: Merge.rc:328 Merge.rc:429 Merge.rc:604
+#: Merge.rc:330 Merge.rc:433 Merge.rc:610
#, c-format
msgid "&Open...\tCtrl+O"
msgstr "&Obre...\tControl+O"
#. IDR_MERGEDOCTYPE, ID_FILE_OPENCONFLICT
-#: Merge.rc:329 Merge.rc:430 Merge.rc:605
+#: Merge.rc:331 Merge.rc:434 Merge.rc:611
msgid "Open Conflic&t File..."
msgstr "Obre un fitxer amb conflic&tes..."
#. IDR_MERGEDOCTYPE, ID_FILE_OPENCLIPBOARD
-#: Merge.rc:330 Merge.rc:431 Merge.rc:606
+#: Merge.rc:332 Merge.rc:435 Merge.rc:612
msgid "Open C&lipboard"
msgstr "Obre el porta-reta&lls"
#. IDR_POPUP_PROJECT, ID_FILE_OPENPROJECT
-#: Merge.rc:332 Merge.rc:433 Merge.rc:608 Merge.rc:1191
+#: Merge.rc:334 Merge.rc:437 Merge.rc:614 Merge.rc:1201
#, c-format
msgid "Open Pro&ject...\tCtrl+J"
msgstr "Obre un pro&jecte...\tControl+J"
#. IDD_OPEN, ID_SAVE_PROJECT
-#: Merge.rc:333 Merge.rc:434 Merge.rc:609 Merge.rc:1193 Merge.rc:1979
+#: Merge.rc:335 Merge.rc:438 Merge.rc:615 Merge.rc:1203 Merge.rc:1989
#, c-format
msgid "Sa&ve Project..."
msgstr "Desa el p&rojecte..."
#. IDR_MAINFRAME, ID_FILE_PROJECT_MRU_FIRST
-#: Merge.rc:335
+#: Merge.rc:337
#, c-format
msgid "Recent Projects"
msgstr "Projectes recents"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:336 Merge.rc:445 Merge.rc:657
+#: Merge.rc:338 Merge.rc:449 Merge.rc:664
#, c-format
msgid "Recent F&iles or Folders"
msgstr "Fitxers i &carpetes recents"
#. IDR_MERGEDOCTYPE, ID_APP_EXIT
-#: Merge.rc:341 Merge.rc:450 Merge.rc:662
+#: Merge.rc:343 Merge.rc:454 Merge.rc:669
msgid "E&xit\tCtrl+Q"
msgstr "&Surt\tControl+Q"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:343 Merge.rc:452 Merge.rc:664
+#: Merge.rc:345 Merge.rc:456 Merge.rc:671
#, c-format
msgid "&Edit"
msgstr "E&dita"
#. IDR_MERGEDOCTYPE, ID_EDIT_PASTE
-#: Merge.rc:345 Merge.rc:671
+#: Merge.rc:347 Merge.rc:678
#, c-format
msgid "&Paste\tCtrl+V"
msgstr "Engan&xa\tControl+V"
#. IDR_MERGEDOCTYPE, ID_OPTIONS
-#: Merge.rc:347 Merge.rc:456 Merge.rc:693
+#: Merge.rc:349 Merge.rc:460 Merge.rc:700
#, c-format
msgid "&Options...\tCtrl+,"
msgstr "O&pcions...\tControl+,"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:349 Merge.rc:458 Merge.rc:695
+#: Merge.rc:351 Merge.rc:462 Merge.rc:702
#, c-format
msgid "&View"
msgstr "&Visualització"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:351 Merge.rc:500 Merge.rc:744
+#: Merge.rc:353 Merge.rc:504 Merge.rc:751
#, c-format
msgid "Ta&b Bar"
msgstr "Barra de ta&bulacions"
#. IDR_MERGEDOCTYPE, ID_VIEW_TAB_BAR
-#: Merge.rc:353 Merge.rc:502 Merge.rc:746
+#: Merge.rc:355 Merge.rc:506 Merge.rc:753
msgid "&View Tab Bar"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_VIEW_TAB_BAR_ON_TITLE_BAR
-#: Merge.rc:354 Merge.rc:503 Merge.rc:747
+#: Merge.rc:356 Merge.rc:507 Merge.rc:754
msgid "&On Title Bar"
msgstr ""
#. IDR_MERGEDOCTYPE
-#: Merge.rc:356 Merge.rc:505 Merge.rc:749
+#: Merge.rc:358 Merge.rc:509 Merge.rc:756
#, c-format
msgid "&Toolbar"
msgstr "Barra d'ei&nes"
#. IDR_MERGEDOCTYPE, ID_TOOLBAR_SMALL
-#: Merge.rc:359 Merge.rc:508 Merge.rc:752
+#: Merge.rc:361 Merge.rc:512 Merge.rc:759
#, c-format
msgid "&Small"
msgstr "&Petita"
#. IDR_MERGEDOCTYPE, ID_TOOLBAR_MEDIUM
-#: Merge.rc:360 Merge.rc:509 Merge.rc:753
+#: Merge.rc:362 Merge.rc:513 Merge.rc:760
msgid "&Medium"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_TOOLBAR_BIG
-#: Merge.rc:361 Merge.rc:510 Merge.rc:754
+#: Merge.rc:363 Merge.rc:514 Merge.rc:761
#, c-format
msgid "&Big"
msgstr "&Gran"
#. IDR_MERGEDOCTYPE, ID_TOOLBAR_HUGE
-#: Merge.rc:362 Merge.rc:511 Merge.rc:755
+#: Merge.rc:364 Merge.rc:515 Merge.rc:762
#, c-format
msgid "&Huge"
msgstr "&Immensa"
#. IDS_VIEW_MENU_BAR
-#: Merge.rc:364 Merge.rc:513 Merge.rc:757 Merge.rc:5357
+#: Merge.rc:366 Merge.rc:517 Merge.rc:764 Merge.rc:5368
msgid "Men&u Bar"
msgstr ""
#. IDR_DIRDOCTYPE, ID_VIEW_OUTPUT_BAR
-#: Merge.rc:365 Merge.rc:515
+#: Merge.rc:367 Merge.rc:519
msgid "&Output Pane"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_VIEW_STATUS_BAR
-#: Merge.rc:366 Merge.rc:516 Merge.rc:758
+#: Merge.rc:368 Merge.rc:520 Merge.rc:765
#, c-format
msgid "&Status Bar"
msgstr "Barra d'est&at"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:368 Merge.rc:539 Merge.rc:847
+#: Merge.rc:370 Merge.rc:543 Merge.rc:854
#, c-format
msgid "&Tools"
msgstr "&Eines"
#. IDR_MERGEDOCTYPE, ID_TOOLS_FILTERS
-#: Merge.rc:370 Merge.rc:542 Merge.rc:849
+#: Merge.rc:372 Merge.rc:546 Merge.rc:856
#, c-format
msgid "&Filters..."
msgstr "&Filtres..."
#. IDR_MERGEDOCTYPE, ID_TOOLS_GENERATEPATCH
-#: Merge.rc:371 Merge.rc:543 Merge.rc:850
+#: Merge.rc:373 Merge.rc:547 Merge.rc:857
#, c-format
msgid "&Generate Patch..."
msgstr "&Genera un pedaç..."
#. IDR_MERGEDOCTYPE
-#: Merge.rc:373 Merge.rc:546 Merge.rc:853
+#: Merge.rc:375 Merge.rc:550 Merge.rc:860
#, c-format
msgid "&Plugins"
msgstr "&Connectors"
#. IDD_PLUGINS_LIST, IDC_PLUGIN_SETTINGS
-#: Merge.rc:375 Merge.rc:548 Merge.rc:855 Merge.rc:2494 Merge.rc:2926
+#: Merge.rc:377 Merge.rc:552 Merge.rc:862 Merge.rc:2504 Merge.rc:2936
#, c-format
msgid "P&lugin Settings..."
msgstr "Opcions dels connectors..."
#. IDR_MERGEDOCTYPE, ID_PREDIFFER_MANUAL
-#: Merge.rc:377 Merge.rc:550 Merge.rc:857
+#: Merge.rc:379 Merge.rc:554 Merge.rc:864
#, c-format
msgid "Ma&nual Prediffer"
msgstr "Prediferenciació &manual"
#. IDR_MERGEDOCTYPE, ID_PREDIFFER_AUTO
-#: Merge.rc:378 Merge.rc:551 Merge.rc:858
+#: Merge.rc:380 Merge.rc:555 Merge.rc:865
#, c-format
msgid "A&utomatic Prediffer"
msgstr "Prediferenciació a&utomàtica"
#. IDR_MERGEDOCTYPE, ID_UNPACK_MANUAL
-#: Merge.rc:380 Merge.rc:553 Merge.rc:860
+#: Merge.rc:382 Merge.rc:557 Merge.rc:867
#, c-format
msgid "&Manual Unpacking"
msgstr "Desempaquetament &manual"
#. IDR_MERGEDOCTYPE, ID_UNPACK_AUTO
-#: Merge.rc:381 Merge.rc:554 Merge.rc:861
+#: Merge.rc:383 Merge.rc:558 Merge.rc:868
#, c-format
msgid "&Automatic Unpacking"
msgstr "Desempaquetament &automàtic"
#. IDR_MERGEDOCTYPE, ID_RELOAD_PLUGINS
-#: Merge.rc:383 Merge.rc:558 Merge.rc:889
+#: Merge.rc:385 Merge.rc:562 Merge.rc:896
#, c-format
msgid "&Reload Plugins"
msgstr "&Recarrega els connectors"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:385 Merge.rc:560 Merge.rc:891
+#: Merge.rc:387 Merge.rc:564 Merge.rc:898
#, c-format
msgid "&Window"
msgstr "Fi&nestra"
#. IDR_MERGEDOCTYPE, ID_FILE_CLOSE
-#: Merge.rc:387 Merge.rc:562 Merge.rc:893
+#: Merge.rc:389 Merge.rc:566 Merge.rc:900
msgid "Cl&ose\tCtrl+W"
msgstr "&Tanca\tControl+W"
#. IDR_MERGEDOCTYPE, ID_WINDOW_CLOSEALL
-#: Merge.rc:388 Merge.rc:563 Merge.rc:894
+#: Merge.rc:390 Merge.rc:567 Merge.rc:901
#, c-format
msgid "Clo&se All"
msgstr "T&anca-ho tot"
#. IDR_MERGEDOCTYPE, ID_NEXT_PANE
-#: Merge.rc:390 Merge.rc:565 Merge.rc:896
+#: Merge.rc:392 Merge.rc:569 Merge.rc:903
#, c-format
msgid "Change &Pane\tF6"
msgstr "Canvia de &subfinestra\tF6"
#. IDR_MERGEDOCTYPE, ID_WINDOW_TILE_HORZ
-#: Merge.rc:392 Merge.rc:567 Merge.rc:900
+#: Merge.rc:394 Merge.rc:571 Merge.rc:907
#, c-format
msgid "Tile &Horizontally"
msgstr "Finestres en mosaic &horitzontal"
#. IDR_MERGEDOCTYPE, ID_WINDOW_TILE_VERT
-#: Merge.rc:393 Merge.rc:568 Merge.rc:901
+#: Merge.rc:395 Merge.rc:572 Merge.rc:908
#, c-format
msgid "Tile &Vertically"
msgstr "Finestres en mosaic &vertical"
#. IDR_MERGEDOCTYPE, ID_WINDOW_CASCADE
-#: Merge.rc:394 Merge.rc:569 Merge.rc:902
+#: Merge.rc:396 Merge.rc:573 Merge.rc:909
#, c-format
msgid "&Cascade"
msgstr "Finestres en &cascada"
#. IDS_MESSAGEBOX_HELP
-#: Merge.rc:396 Merge.rc:571 Merge.rc:904 Merge.rc:3200 Merge.rc:4189
+#: Merge.rc:398 Merge.rc:575 Merge.rc:911 Merge.rc:3210 Merge.rc:4199
#, c-format
msgid "&Help"
msgstr "&Ajuda"
#. IDR_MERGEDOCTYPE, ID_HELP_CONTENTS
-#: Merge.rc:398 Merge.rc:573 Merge.rc:906
+#: Merge.rc:400 Merge.rc:577 Merge.rc:913
#, c-format
msgid "&WinMerge Help\tF1"
msgstr "Ajuda del &WinMerge\tF1"
#. IDR_MERGEDOCTYPE, ID_HELP_RELEASENOTES
-#: Merge.rc:400 Merge.rc:575 Merge.rc:908
+#: Merge.rc:402 Merge.rc:579 Merge.rc:915
#, c-format
msgid "R&elease Notes"
msgstr "Notes de la v&ersió"
#. IDR_MERGEDOCTYPE, ID_HELP_TRANSLATIONS
-#: Merge.rc:401 Merge.rc:576 Merge.rc:909
+#: Merge.rc:403 Merge.rc:580 Merge.rc:916
#, c-format
msgid "&Translations"
msgstr "&Traduccions"
#. IDR_MERGEDOCTYPE, ID_HELP_GETCONFIG
-#: Merge.rc:402 Merge.rc:577 Merge.rc:910
+#: Merge.rc:404 Merge.rc:581 Merge.rc:917
#, c-format
msgid "C&onfiguration"
msgstr "C&onfiguració"
#. IDR_MERGEDOCTYPE, ID_HELP_GNULICENSE
-#: Merge.rc:404 Merge.rc:579 Merge.rc:912
+#: Merge.rc:406 Merge.rc:583 Merge.rc:919
#, c-format
msgid "&GNU General Public License"
msgstr "Llicència &GNU General Public License"
#. IDR_MERGEDOCTYPE, ID_APP_ABOUT
-#: Merge.rc:405 Merge.rc:580 Merge.rc:913
+#: Merge.rc:407 Merge.rc:584 Merge.rc:920
#, c-format
msgid "&About WinMerge..."
msgstr "&Quant al WinMerge..."
#. IDR_MERGEDOCTYPE
-#: Merge.rc:436 Merge.rc:629
+#: Merge.rc:440 Merge.rc:635
#, c-format
msgid "&Read-Only"
msgstr "Només lectura"
#. IDR_MERGEDOCTYPE, ID_FILE_LEFT_READONLY
-#: Merge.rc:438 Merge.rc:631
+#: Merge.rc:442 Merge.rc:637
#, c-format
msgid "L&eft Read-Only"
msgstr "Fes l'es&querra de només lectura"
#. IDR_MERGEDOCTYPE, ID_FILE_MIDDLE_READONLY
-#: Merge.rc:439 Merge.rc:632
+#: Merge.rc:443 Merge.rc:638
#, c-format
msgid "M&iddle Read-Only"
msgstr "Fes el del mig de només lectura"
#. IDR_MERGEDOCTYPE, ID_FILE_RIGHT_READONLY
-#: Merge.rc:440 Merge.rc:633
+#: Merge.rc:444 Merge.rc:639
#, c-format
msgid "Ri&ght Read-Only"
msgstr "Fes la dre&ta de només lectura"
#. IDD_ENCODINGERROR, IDC_FILEENCODING
-#: Merge.rc:443 Merge.rc:646 Merge.rc:1038 Merge.rc:3063
+#: Merge.rc:447 Merge.rc:652 Merge.rc:1046 Merge.rc:3073
#, c-format
msgid "&File Encoding..."
msgstr "Codificació de caràcters del &fitxer..."
#. IDR_POPUP_OUTPUTVIEW, ID_EDIT_SELECT_ALL
-#: Merge.rc:454 Merge.rc:674 Merge.rc:1343
+#: Merge.rc:458 Merge.rc:681 Merge.rc:1353
#, c-format
msgid "Select &All\tCtrl+A"
msgstr "Selecciona-ho &tot\tControl+A"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWIDENTICAL
-#: Merge.rc:460
+#: Merge.rc:464
#, c-format
msgid "Show &Identical Items"
msgstr "Mostra els elements &idèntics"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWDIFFERENT
-#: Merge.rc:461
+#: Merge.rc:465
#, c-format
msgid "Show &Different Items"
msgstr "Mostra els elements di&ferents"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWUNIQUELEFT
-#: Merge.rc:462
+#: Merge.rc:466
#, c-format
msgid "Show L&eft Unique Items"
msgstr "Mostra els elements únics de l'&esquerra"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWUNIQUEMIDDLE
-#: Merge.rc:463
+#: Merge.rc:467
#, c-format
msgid "Show Midd&le Unique Items"
msgstr "Mostra els elements únics del mi&g"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWUNIQUERIGHT
-#: Merge.rc:464
+#: Merge.rc:468
#, c-format
msgid "Show Ri&ght Unique Items"
msgstr "Mostra els elements únics de la &dreta"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWSKIPPED
-#: Merge.rc:465
+#: Merge.rc:469
#, c-format
msgid "Show S&kipped Items"
msgstr "Mostra els elements &omesos"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWBINARIES
-#: Merge.rc:466
+#: Merge.rc:470
#, c-format
msgid "S&how Binary Files"
msgstr "Mostra els fitxers &binaris"
#. IDR_DIRDOCTYPE
-#: Merge.rc:467
+#: Merge.rc:471
#, c-format
msgid "&3-way Compare"
msgstr "Comparació a &3 bandes"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWDIFFERENTLEFTONLY
-#: Merge.rc:469
+#: Merge.rc:473
#, c-format
msgid "Show &Left Only Different Items"
msgstr "Mostra només els elements diferents de l'&esquerra"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWDIFFERENTMIDDLEONLY
-#: Merge.rc:470
+#: Merge.rc:474
#, c-format
msgid "Show &Middle Only Different Items"
msgstr "Mostra només els elements diferents del &mig"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWDIFFERENTRIGHTONLY
-#: Merge.rc:471
+#: Merge.rc:475
#, c-format
msgid "Show &Right Only Different Items"
msgstr "Mostra només els elements diferents de la &dreta"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWMISSINGLEFTONLY
-#: Merge.rc:473
+#: Merge.rc:477
msgid "Show L&eft Only Missing Items"
msgstr "Mostra només els elements que falten a l'es&querra"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWMISSINGMIDDLEONLY
-#: Merge.rc:474
+#: Merge.rc:478
msgid "Show Mi&ddle Only Missing Items"
msgstr "Mostra només els elements que falten al m&ig"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWMISSINGRIGHTONLY
-#: Merge.rc:475
+#: Merge.rc:479
msgid "Show Rig&ht Only Missing Items"
msgstr "Mostra només els elements que falten a la dre&ta"
#. IDR_DIRDOCTYPE, ID_VIEW_SHOWHIDDENITEMS
-#: Merge.rc:478
+#: Merge.rc:482
#, c-format
msgid "Show Hidd&en Items"
msgstr "Mostra els elements ama&gats"
#. IDR_DIRDOCTYPE, ID_VIEW_TREEMODE
-#: Merge.rc:480
+#: Merge.rc:484
#, c-format
msgid "Tree &Mode"
msgstr "&Mode d'arbre"
#. IDR_DIRDOCTYPE
-#: Merge.rc:481
+#: Merge.rc:485
msgid "E&xpand Subfolders"
msgstr "E&xpandeix les subcarpetes"
#. IDR_DIRDOCTYPE, ID_VIEW_EXPAND_ALLSUBDIRS
-#: Merge.rc:483
+#: Merge.rc:487
msgid "&All Subfolders"
msgstr "&Totes les subcarpetes"
#. IDR_DIRDOCTYPE, ID_VIEW_EXPAND_DIFFERENT_SUBDIRS
-#: Merge.rc:484
+#: Merge.rc:488
msgid "&Different Subfolders"
msgstr "Subcarpetes &diferents"
#. IDR_DIRDOCTYPE, ID_VIEW_EXPAND_IDENTICAL_SUBDIRS
-#: Merge.rc:485
+#: Merge.rc:489
msgid "&Identical Subfolders"
msgstr "Subcarpetes &idèntiques"
#. IDR_DIRDOCTYPE, ID_VIEW_COLLAPSE_ALLSUBDIRS
-#: Merge.rc:487
+#: Merge.rc:491
#, c-format
msgid "&Collapse All Subfolders"
msgstr "&Contrau les subcarpetes"
#. IDR_DIRDOCTYPE, ID_VIEW_SHOW_EMPTY_FOLDERS
-#: Merge.rc:488
+#: Merge.rc:492
msgid "Show &Empty Folders"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_VIEW_SELECTFONT
-#: Merge.rc:490 Merge.rc:697
+#: Merge.rc:494 Merge.rc:704
#, c-format
msgid "Select &Font..."
msgstr "&Tipus de lletra..."
#. IDR_MERGEDOCTYPE, ID_VIEW_USEDEFAULTFONT
-#: Merge.rc:491 Merge.rc:698
+#: Merge.rc:495 Merge.rc:705
#, c-format
msgid "Use Default Font"
msgstr "Empra el tipus de lletra del sistema"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:493 Merge.rc:736
+#: Merge.rc:497 Merge.rc:743
#, c-format
msgid "Sw&ap Panes"
msgstr "&Intercanvia les subfinestres"
#. IDR_MERGEDOCTYPE, ID_SWAPPANES_SWAP12
-#: Merge.rc:495 Merge.rc:738
+#: Merge.rc:499 Merge.rc:745
msgid "Swap &1st | 2nd"
msgstr "Intercanvia &1er | 2n"
#. IDR_MERGEDOCTYPE, ID_SWAPPANES_SWAP23
-#: Merge.rc:496 Merge.rc:739
+#: Merge.rc:500 Merge.rc:746
msgid "Swap &2nd | 3rd"
msgstr "Intercanvia &2n | 3r"
#. IDR_MERGEDOCTYPE, ID_SWAPPANES_SWAP13
-#: Merge.rc:497 Merge.rc:740
+#: Merge.rc:501 Merge.rc:747
msgid "Swap 1st | &3rd"
msgstr "Intercanvia 1er | &3r"
#. IDR_DIRDOCTYPE, ID_VIEW_DISPLAY_FILTER_BAR_MENU
-#: Merge.rc:514
+#: Merge.rc:518
msgid "Displa&y Filter Bar\tCtrl+Shift+L"
msgstr ""
#. IDR_DIRDOCTYPE, ID_VIEW_DIR_STATISTICS
-#: Merge.rc:518
+#: Merge.rc:522
#, c-format
msgid "Com&pare Statistics..."
msgstr "Estadístiques de &comparació..."
#. IDR_MERGEDOCTYPE, ID_REFRESH
-#: Merge.rc:520 Merge.rc:763
+#: Merge.rc:524 Merge.rc:770
#, c-format
msgid "Refresh\tF5"
msgstr "Actualit&za\tF5"
#. IDR_POPUP_DIRVIEW, ID_RESCAN
-#: Merge.rc:521 Merge.rc:1030
+#: Merge.rc:525 Merge.rc:1038
#, c-format
msgid "&Refresh Selected\tCtrl+F5"
msgstr "Actualitza &seleccionats\tControl+F5"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:523 Merge.rc:765
+#: Merge.rc:527 Merge.rc:772
#, c-format
msgid "&Merge"
msgstr "Co&mbinació"
#. IDR_DIRDOCTYPE, ID_MERGE_COMPARE
-#: Merge.rc:525
+#: Merge.rc:529
#, c-format
msgid "Co&mpare\tEnter"
msgstr "&Compara\tRetorn"
#. IDR_MERGEDOCTYPE, ID_NEXTDIFF
-#: Merge.rc:527 Merge.rc:767
+#: Merge.rc:531 Merge.rc:774
#, c-format
msgid "&Next Difference\tAlt+Down"
msgstr "Diferència se&güent\tAlt+Avall"
#. IDR_MERGEDOCTYPE, ID_PREVDIFF
-#: Merge.rc:528 Merge.rc:768
+#: Merge.rc:532 Merge.rc:775
#, c-format
msgid "&Previous Difference\tAlt+Up"
msgstr "Diferència a&nterior\tAlt+Amunt"
#. IDR_MERGEDOCTYPE, ID_FIRSTDIFF
-#: Merge.rc:530 Merge.rc:773
+#: Merge.rc:534 Merge.rc:780
#, c-format
msgid "&First Difference\tAlt+Home"
msgstr "Pri&mera diferència\tAlt+Inici"
#. IDR_MERGEDOCTYPE, ID_CURDIFF
-#: Merge.rc:531 Merge.rc:774
+#: Merge.rc:535 Merge.rc:781
#, c-format
msgid "&Current Difference\tAlt+Enter"
msgstr "Diferència &actual\tAlt+Retorn"
#. IDR_MERGEDOCTYPE, ID_LASTDIFF
-#: Merge.rc:532 Merge.rc:775
+#: Merge.rc:536 Merge.rc:782
#, c-format
msgid "&Last Difference\tAlt+End"
msgstr "Da&rrera diferència\tAlt+Fi"
#. IDR_MERGEDOCTYPE, ID_L2R
-#: Merge.rc:534 Merge.rc:830
+#: Merge.rc:538 Merge.rc:837
#, c-format
msgid "Copy to &Right\tAlt+Right"
msgstr "Copia a la &dreta\tAlt+Dreta"
#. IDR_MERGEDOCTYPE, ID_R2L
-#: Merge.rc:535 Merge.rc:831
+#: Merge.rc:539 Merge.rc:838
#, c-format
msgid "Copy to L&eft\tAlt+Left"
msgstr "Copia a l'&esquerra\tAlt+Esquerra"
#. IDR_DIRDOCTYPE, ID_MERGE_DELETE
-#: Merge.rc:537
+#: Merge.rc:541
#, c-format
msgid "&Delete\tDel"
msgstr "S&uprimeix\tSupr"
#. IDR_POPUP_DIRVIEW, ID_TOOLS_CUSTOMIZECOLUMNS
-#: Merge.rc:541 Merge.rc:1042
+#: Merge.rc:545 Merge.rc:1050
#, c-format
msgid "&Customize Columns..."
msgstr "&Personalitza les columnes..."
#. IDR_MERGEDOCTYPE, ID_TOOLS_GENERATEREPORT
-#: Merge.rc:544 Merge.rc:851
+#: Merge.rc:548 Merge.rc:858
#, c-format
msgid "Generate &Report..."
msgstr "Gene&ra un informe..."
#. IDD_ENCODINGERROR, IDC_PLUGIN
-#: Merge.rc:556 Merge.rc:867 Merge.rc:3064
+#: Merge.rc:560 Merge.rc:874 Merge.rc:3074
#, c-format
msgid "&Edit with Unpacker..."
msgstr "&Edita amb el desempaquetador..."
#. IDR_MERGEDOCTYPE, ID_FILE_SAVE
-#: Merge.rc:611
+#: Merge.rc:617
#, c-format
msgid "&Save\tCtrl+S"
msgstr "&Desa\tControl+S"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:612
+#: Merge.rc:618
#, c-format
msgid "Sav&e"
msgstr "D&esa"
#. IDR_POPUP_SAVE, ID_FILE_SAVE_LEFT
-#: Merge.rc:614 Merge.rc:1201
+#: Merge.rc:620 Merge.rc:1211
#, c-format
msgid "Save &Left"
msgstr "Desa l'&esquerra"
#. IDR_POPUP_SAVE, ID_FILE_SAVE_MIDDLE
-#: Merge.rc:615 Merge.rc:1202
+#: Merge.rc:621 Merge.rc:1212
#, c-format
msgid "Save &Middle"
msgstr "Desa el del &mig"
#. IDR_POPUP_SAVE, ID_FILE_SAVE_RIGHT
-#: Merge.rc:616 Merge.rc:1203
+#: Merge.rc:622 Merge.rc:1213
#, c-format
msgid "Save &Right"
msgstr "Desa la d&reta"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:618
+#: Merge.rc:624
#, c-format
msgid "Save &As"
msgstr "Anomena i desa"
#. IDR_POPUP_SAVE, ID_FILE_SAVEAS_LEFT
-#: Merge.rc:620 Merge.rc:1205
+#: Merge.rc:626 Merge.rc:1215
#, c-format
msgid "Save &Left As..."
msgstr "Desa l'&esquerra com..."
#. IDR_POPUP_SAVE, ID_FILE_SAVEAS_MIDDLE
-#: Merge.rc:621 Merge.rc:1206
+#: Merge.rc:627 Merge.rc:1216
#, c-format
msgid "Save &Middle As..."
msgstr "Desa el del &mig com..."
#. IDR_POPUP_SAVE, ID_FILE_SAVEAS_RIGHT
-#: Merge.rc:622 Merge.rc:1207
+#: Merge.rc:628 Merge.rc:1217
#, c-format
msgid "Save &Right As..."
msgstr "Desa la d&reta com..."
#. IDR_MERGEDOCTYPE, ID_FILE_PRINT
-#: Merge.rc:625
+#: Merge.rc:631
msgid "&Print...\tCtrl+P"
msgstr "&Imprimeix...\tControl+P"
#. IDR_MERGEDOCTYPE, ID_FILE_PAGE_SETUP
-#: Merge.rc:626
+#: Merge.rc:632
msgid "Page Set&up..."
msgstr "Configuració de la pàgina..."
#. IDR_MERGEDOCTYPE, ID_FILE_PRINT_PREVIEW
-#: Merge.rc:627
+#: Merge.rc:633
msgid "Print Previe&w..."
msgstr "&Visualització prèvia de la impressió..."
#. IDR_MERGEDOCTYPE
-#: Merge.rc:636
+#: Merge.rc:642
#, c-format
msgid "&Convert Line Endings to"
msgstr "&Converteix retorns de línia a"
#. IDR_MERGEDOCTYPE, ID_FILE_MERGINGMODE
-#: Merge.rc:643
+#: Merge.rc:649
#, c-format
msgid "Mer&ge Mode\tF9"
msgstr "&Mode de combinació\tF9"
#. IDR_MERGEDOCTYPE, ID_RESCAN
-#: Merge.rc:645
+#: Merge.rc:651
msgid "Reloa&d\tCtrl+F5"
msgstr "Recarrega\tControl+F5"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:647
+#: Merge.rc:653
#, c-format
msgid "Reco&mpare As"
msgstr "Torna a comparar com"
+#. IDR_POPUP_COMPARE, ID_MERGE_COMPARE_FOLDER
+#: Merge.rc:660 Merge.rc:947 Merge.rc:1185
+msgid "A&rchive"
+msgstr ""
+
#. IDR_MERGEDOCTYPE, ID_EDIT_UNDO
-#: Merge.rc:666
+#: Merge.rc:673
#, c-format
msgid "&Undo\tCtrl+Z"
msgstr "&Desfés\tControl+Z"
#. IDR_MERGEDOCTYPE, ID_EDIT_REDO
-#: Merge.rc:667
+#: Merge.rc:674
#, c-format
msgid "&Redo\tCtrl+Y"
msgstr "Re&fés\tControl+Y"
#. IDR_MERGEDOCTYPE, ID_EDIT_CUT
-#: Merge.rc:669
+#: Merge.rc:676
#, c-format
msgid "Cu&t\tCtrl+X"
msgstr "&Retalla\tControl+X"
#. IDR_POPUP_OUTPUTVIEW, ID_EDIT_COPY
-#: Merge.rc:670 Merge.rc:1342
+#: Merge.rc:677 Merge.rc:1352
#, c-format
msgid "&Copy\tCtrl+C"
msgstr "C&opia\tControl+C"
#. IDR_MERGEDOCTYPE, ID_EDIT_FIND
-#: Merge.rc:676
+#: Merge.rc:683
#, c-format
msgid "F&ind...\tCtrl+F"
msgstr "&Cerca...\tControl+F"
#. IDR_MERGEDOCTYPE, ID_EDIT_REPLACE
-#: Merge.rc:677
+#: Merge.rc:684
#, c-format
msgid "Repla&ce...\tCtrl+H"
msgstr "Subst&itueix...\tControl+H"
#. IDR_MERGEDOCTYPE, ID_EDIT_MARK
-#: Merge.rc:678
+#: Merge.rc:685
#, c-format
msgid "&Marker...\tCtrl+Shift+M"
msgstr "&Marcadors...\tControl+Maj+M"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:680
+#: Merge.rc:687
#, c-format
msgid "Advanced"
msgstr "Avançat"
#. IDR_MERGEDOCTYPE, ID_EDIT_COPY_LINENUMBERS
-#: Merge.rc:682
+#: Merge.rc:689
#, c-format
msgid "&Copy With Line Numbers\tCtrl+Shift+C"
msgstr "&Copia amb els números de línia\tControl+Maj+C"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:684
+#: Merge.rc:691
#, c-format
msgid "&Bookmarks"
msgstr "&Punts d'interès"
#. IDR_MERGEDOCTYPE, ID_EDIT_TOGGLE_BOOKMARK
-#: Merge.rc:686
+#: Merge.rc:693
#, c-format
msgid "&Toggle Bookmark\tCtrl+F2"
msgstr "&Activa/desactiva el punt d'interès\tControl+F2"
#. IDR_MERGEDOCTYPE, ID_EDIT_GOTO_NEXT_BOOKMARK
-#: Merge.rc:687
+#: Merge.rc:694
#, c-format
msgid "&Next Bookmark\tF2"
msgstr "&Següent punt d'interès\tF2"
#. IDR_MERGEDOCTYPE, ID_EDIT_GOTO_PREV_BOOKMARK
-#: Merge.rc:688
+#: Merge.rc:695
#, c-format
msgid "&Previous Bookmark\tShift+F2"
msgstr "&Punt d'interès previ\tMaj+F2"
#. IDR_MERGEDOCTYPE, ID_EDIT_CLEAR_ALL_BOOKMARKS
-#: Merge.rc:689
+#: Merge.rc:696
#, c-format
msgid "&Clear All Bookmarks"
msgstr "&Esborra tots els punts d'interès"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:706
+#: Merge.rc:713
#, c-format
msgid "Syntax Highlight"
msgstr "Ressaltat de la sintaxi"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:711
+#: Merge.rc:718
#, c-format
msgid "&Diff Context"
msgstr "Diferències en context"
#. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_ALL
-#: Merge.rc:713
+#: Merge.rc:720
#, c-format
msgid "&All Lines"
msgstr "&Totes les línies"
#. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_0
-#: Merge.rc:715
+#: Merge.rc:722
#, c-format
msgid "&0 Lines"
msgstr "&0 línies"
#. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_1
-#: Merge.rc:716
+#: Merge.rc:723
#, c-format
msgid "&1 Line"
msgstr "&1 línia"
#. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_3
-#: Merge.rc:717
+#: Merge.rc:724
#, c-format
msgid "&3 Lines"
msgstr "&3 línies"
#. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_5
-#: Merge.rc:718
+#: Merge.rc:725
#, c-format
msgid "&5 Lines"
msgstr "&5 línies"
#. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_7
-#: Merge.rc:719
+#: Merge.rc:726
#, c-format
msgid "&7 Lines"
msgstr "&7 línies"
#. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_9
-#: Merge.rc:720
+#: Merge.rc:727
#, c-format
msgid "&9 Lines"
msgstr "&9 línies"
#. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_TOGGLE
-#: Merge.rc:722
+#: Merge.rc:729
#, c-format
msgid "&Toggle All and 0-9 Lines\tCtrl+D"
msgstr "Intercanvia entre totes i les línies 0-9\tControl+D"
#. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_INVERT
-#: Merge.rc:724
+#: Merge.rc:731
msgid "&Invert (Hide Different Lines)"
msgstr "&Inverteix (Amaga les línies diferents)"
#. IDR_MERGEDOCTYPE, ID_VIEW_RESIZE_PANES
-#: Merge.rc:727
+#: Merge.rc:734
#, c-format
msgid "&Lock Panes"
msgstr "Bloqueja les subfinestres (multimonitor)"
#. IDR_MERGEDOCTYPE, ID_VIEW_WHITESPACE
-#: Merge.rc:728
+#: Merge.rc:735
#, c-format
msgid "&View Whitespace"
msgstr "Mostra els es&pais"
#. IDR_MERGEDOCTYPE, ID_VIEW_EOL
-#: Merge.rc:729
+#: Merge.rc:736
msgid "View E&OL"
msgstr "Mostra els salts de línia"
#. IDR_MERGEDOCTYPE, ID_VIEW_LINEDIFFS
-#: Merge.rc:730
+#: Merge.rc:737
#, c-format
msgid "Vie&w Line Differences"
msgstr "Mostra les &diferències de la línia"
#. IDR_MERGEDOCTYPE, ID_VIEW_LINENUMBERS
-#: Merge.rc:731
+#: Merge.rc:738
#, c-format
msgid "View Line &Numbers"
msgstr "Mostra els &números de línia"
#. IDR_MERGEDOCTYPE, ID_VIEW_SELMARGIN
-#: Merge.rc:732
+#: Merge.rc:739
#, c-format
msgid "View &Margins"
msgstr "Mostra els &marges"
#. IDR_MERGEDOCTYPE, ID_VIEW_TOPMARGIN
-#: Merge.rc:733
+#: Merge.rc:740
msgid "View To&p Margins"
msgstr "Mostra els marges &superiors"
#. IDR_MERGEDOCTYPE, ID_VIEW_WORDWRAP
-#: Merge.rc:734
+#: Merge.rc:741
#, c-format
msgid "W&rap Lines"
msgstr "A&justa les línies"
#. IDR_MERGEDOCTYPE, ID_VIEW_SPLITVERTICALLY
-#: Merge.rc:742
+#: Merge.rc:749
#, c-format
msgid "Split V&ertically"
msgstr "Separa v&erticalment"
#. IDR_MERGEDOCTYPE, ID_VIEW_DETAIL_BAR
-#: Merge.rc:759
+#: Merge.rc:766
#, c-format
msgid "Diff &Pane"
msgstr "Subfinest&ra de diferències"
#. IDR_MERGEDOCTYPE, ID_VIEW_LOCATION_BAR
-#: Merge.rc:760
+#: Merge.rc:767
#, c-format
msgid "Lo&cation Pane"
msgstr "Subfinestra d'&ubicació"
#. IDS_OUTPUTBAR_CAPTION
-#: Merge.rc:761 Merge.rc:4902
+#: Merge.rc:768 Merge.rc:4912
msgid "Output Pane"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_NEXTCONFLICT
-#: Merge.rc:770
+#: Merge.rc:777
#, c-format
msgid "Ne&xt Conflict\tAlt+Shift+Down"
msgstr "&Conflicte següent\tAlt+Maj+Avall"
#. IDR_MERGEDOCTYPE, ID_PREVCONFLICT
-#: Merge.rc:771
+#: Merge.rc:778
#, c-format
msgid "Pre&vious Conflict\tAlt+Shift+Up"
msgstr "Con&flicte anterior\tAlt+Maj+Amunt"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:777
+#: Merge.rc:784
#, c-format
msgid "A&dvanced"
msgstr "Avançat"
#. IDR_MERGEDOCTYPE, ID_NEXTDIFFLM
-#: Merge.rc:779
+#: Merge.rc:786
#, c-format
msgid "Next Difference (Left/Middle)\tAlt+1"
msgstr "Diferència següent entre l'esquerra i el mig\tAlt+1"
#. IDR_MERGEDOCTYPE, ID_PREVDIFFLM
-#: Merge.rc:780
+#: Merge.rc:787
#, c-format
msgid "Previous Difference (Left/Middle)\tAlt+Shift+1"
msgstr "Diferència anterior entre l'esquerra i el mig\tAlt+Maj+1"
#. IDR_MERGEDOCTYPE, ID_NEXTDIFFLR
-#: Merge.rc:782
+#: Merge.rc:789
#, c-format
msgid "Next Difference (Left/Right)\tAlt+2"
msgstr "Diferència següent entre l'esquerra i la dreta\tAlt+2"
#. IDR_MERGEDOCTYPE, ID_PREVDIFFLR
-#: Merge.rc:783
+#: Merge.rc:790
#, c-format
msgid "Previous Difference (Left/Right)\tAlt+Shift+2"
msgstr "Diferència anterior entre l'esquerra i la dreta\tAlt+Maj+2"
#. IDR_MERGEDOCTYPE, ID_NEXTDIFFMR
-#: Merge.rc:785
+#: Merge.rc:792
#, c-format
msgid "Next Difference (Middle/Right)\tAlt+3"
msgstr "Diferència següent entre el mig i la dreta\tAlt+3"
#. IDR_MERGEDOCTYPE, ID_PREVDIFFMR
-#: Merge.rc:786
+#: Merge.rc:793
#, c-format
msgid "Previous Difference (Middle/Right)\tAlt+Shift+3"
msgstr "Diferència anterior entre el mig i la dreta\tAlt+Maj+3"
#. IDR_MERGEDOCTYPE, ID_NEXTDIFFLO
-#: Merge.rc:788
+#: Merge.rc:795
#, c-format
msgid "Next Left-Only Difference\tAlt+7"
msgstr "Diferència següent de només l'esquerra\tAlt+7"
#. IDR_MERGEDOCTYPE, ID_PREVDIFFLO
-#: Merge.rc:789
+#: Merge.rc:796
#, c-format
msgid "Previous Left-Only Difference\tAlt+Shift+7"
msgstr "Diferència anterior de només l'esquerra\tAlt+Maj+7"
#. IDR_MERGEDOCTYPE, ID_NEXTDIFFMO
-#: Merge.rc:791
+#: Merge.rc:798
#, c-format
msgid "Next Middle-Only Difference\tAlt+8"
msgstr "Diferència següent de només el mig\tAlt+8"
#. IDR_MERGEDOCTYPE, ID_PREVDIFFMO
-#: Merge.rc:792
+#: Merge.rc:799
#, c-format
msgid "Previous Middle-Only Difference\tAlt+Shift+8"
msgstr "Diferència anterior de només el mig\tAlt+Maj+8"
#. IDR_MERGEDOCTYPE, ID_NEXTDIFFRO
-#: Merge.rc:794
+#: Merge.rc:801
#, c-format
msgid "Next Right-Only Difference\tAlt+9"
msgstr "Diferència següent de només la dreta\tAlt+9"
#. IDR_MERGEDOCTYPE, ID_PREVDIFFRO
-#: Merge.rc:795
+#: Merge.rc:802
#, c-format
msgid "Previous Right-Only Difference\tAlt+Shift+9"
msgstr "Diferència anterior de només la dreta\tAlt+Maj+9"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:797
+#: Merge.rc:804
msgid "Copy from &Left to"
msgstr "Copia de l'&esquerra a"
#. IDD_LOAD_SAVE_CODEPAGE, IDC_AFFECTS_MIDDLE_BTN
-#: Merge.rc:799 Merge.rc:810 Merge.rc:815 Merge.rc:826 Merge.rc:970
-#: Merge.rc:2545 Merge.rc:2817
+#: Merge.rc:806 Merge.rc:817 Merge.rc:822 Merge.rc:833 Merge.rc:978
+#: Merge.rc:2555 Merge.rc:2827
#, c-format
msgid "&Middle"
msgstr "al &mig"
#. IDD_LOAD_SAVE_CODEPAGE, IDC_AFFECTS_RIGHT_BTN
-#: Merge.rc:800 Merge.rc:805 Merge.rc:816 Merge.rc:821 Merge.rc:971
-#: Merge.rc:2546 Merge.rc:2819
+#: Merge.rc:807 Merge.rc:812 Merge.rc:823 Merge.rc:828 Merge.rc:979
+#: Merge.rc:2556 Merge.rc:2829
#, c-format
msgid "&Right"
msgstr "la &dreta"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:802
+#: Merge.rc:809
msgid "Copy from &Middle to"
msgstr "Copia del &mig a"
#. IDD_LOAD_SAVE_CODEPAGE, IDC_AFFECTS_LEFT_BTN
-#: Merge.rc:804 Merge.rc:809 Merge.rc:820 Merge.rc:825 Merge.rc:969
-#: Merge.rc:2544 Merge.rc:2815
+#: Merge.rc:811 Merge.rc:816 Merge.rc:827 Merge.rc:832 Merge.rc:977
+#: Merge.rc:2554 Merge.rc:2825
#, c-format
msgid "&Left"
msgstr "l'&esquerra"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:807
+#: Merge.rc:814
msgid "Copy from &Right to"
msgstr "Copia de la &dreta a"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:813
+#: Merge.rc:820
msgid "Copy Selected Lines from Le&ft to"
msgstr "Copia les línies seleccionades de l'esquerra a"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:818
+#: Merge.rc:825
msgid "Copy Selected Lines from Mi&ddle to"
msgstr "Copia les línies seleccionades del mig a"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:823
+#: Merge.rc:830
msgid "Copy Selected Lines from Ri&ght to"
msgstr "Copia les línies seleccionades de la dreta a"
#. IDR_MERGEDOCTYPE, ID_COPY_FROM_LEFT
-#: Merge.rc:833
+#: Merge.rc:840
#, c-format
msgid "Copy from Left\tAlt+Shift+Right"
msgstr "Copia des de l'esquerra\tAlt+Maj+Dreta"
#. IDR_MERGEDOCTYPE, ID_COPY_FROM_RIGHT
-#: Merge.rc:834
+#: Merge.rc:841
#, c-format
msgid "Copy from Right\tAlt+Shift+Left"
msgstr "Copia des de la dreta\tAlt+Maj+Esquerra"
#. IDR_MERGEDOCTYPE, ID_L2RNEXT
-#: Merge.rc:836
+#: Merge.rc:843
msgid "C&opy to Right and Advance\tCtrl+Alt+Right"
msgstr "Copia a la dreta i a&vança\tControl+Alt+Dreta"
#. IDR_MERGEDOCTYPE, ID_R2LNEXT
-#: Merge.rc:837
+#: Merge.rc:844
msgid "Copy &to Left and Advance\tCtrl+Alt+Left"
msgstr "Copia a l'esquerra i avan&ça\tControl+Alt+Esquerra"
#. IDR_MERGEDOCTYPE, ID_ALL_RIGHT
-#: Merge.rc:839
+#: Merge.rc:846
#, c-format
msgid "Copy &All to Right"
msgstr "Copia-ho &tot a la dreta"
#. IDR_MERGEDOCTYPE, ID_ALL_LEFT
-#: Merge.rc:840
+#: Merge.rc:847
#, c-format
msgid "Cop&y All to Left"
msgstr "Copia-ho t&ot a l'esquerra"
#. IDR_MERGEDOCTYPE, ID_AUTO_MERGE
-#: Merge.rc:842
+#: Merge.rc:849
msgid "A&uto Merge\tCtrl+Alt+M"
msgstr "Combina a&utomàticament\tControl+Alt+M"
#. IDR_MERGEDOCTYPE, ID_ADD_SYNCPOINT
-#: Merge.rc:844
+#: Merge.rc:851
#, c-format
msgid "Add &Synchronization Point\tAlt+S"
msgstr "Afegei&x un punt de sincronització\tAlt+S"
#. IDR_MERGEDOCTYPE, ID_CLEAR_SYNCPOINTS
-#: Merge.rc:845
+#: Merge.rc:852
#, c-format
msgid "Clear Sync&hronization Points"
msgstr "Es&borra els punts de sincronització"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:863
+#: Merge.rc:870
msgid "Unpac&ker"
msgstr "Desempaquetador"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:869
+#: Merge.rc:876
#, c-format
msgid "&Prediffer"
msgstr "&Prediferenciador"
#. IDR_MERGEDOCTYPE, ID_APPLY_PREDIFFER
-#: Merge.rc:873
+#: Merge.rc:880
msgid "Apply Pre&differ..."
msgstr "&Aplica el prediferenciador..."
#. IDR_MERGEDOCTYPE, ID_TRANSFORM_WITH_SCRIPT
-#: Merge.rc:879
+#: Merge.rc:886
msgid "&Transform with Editor Script..."
msgstr "Transforma amb un script de l'editor..."
#. IDR_MERGEDOCTYPE
-#: Merge.rc:880
+#: Merge.rc:887
msgid "Scripts for &Copying"
msgstr "Scripts per &copiar"
#. IDR_MERGEDOCTYPE, ID_SELECT_EDITOR_SCRIPT_FOR_COPYING
-#: Merge.rc:886
+#: Merge.rc:893
msgid "Select &Editor Script..."
msgstr "Selecciona l'script &editor..."
#. IDR_MERGEDOCTYPE, ID_WINDOW_SPLIT
-#: Merge.rc:898
+#: Merge.rc:905
#, c-format
msgid "Sp&lit"
msgstr "Separa"
#. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE
-#: Merge.rc:921
+#: Merge.rc:928
#, c-format
msgid "Comp&are"
msgstr "Compa&ra"
#. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE_WITH_MOVED_RENAMED
-#: Merge.rc:922
+#: Merge.rc:929
msgid "Compar&e with Renamed/Moved Items"
msgstr ""
#. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE_IN_NEW_WINDOW
-#: Merge.rc:923
+#: Merge.rc:930
msgid "Compare in New &Window"
msgstr "Compara en una nova &finestra"
#. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE_NONHORIZONTALLY
-#: Merge.rc:924 Merge.rc:931
+#: Merge.rc:931 Merge.rc:938
msgid "Compare Non-hor&izontally..."
msgstr "Compara no-hor&itzontalment..."
#. IDR_POPUP_DIRVIEW
-#: Merge.rc:925
+#: Merge.rc:932
#, c-format
msgid "Compare Non-hor&izontally"
msgstr "Compara no-hor&itzontalment"
#. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE_LEFT1_LEFT2
-#: Merge.rc:927
+#: Merge.rc:934
#, c-format
msgid "First &Left with Second Left"
msgstr "El primer element de l'&esquerra amb el segon element de l'esquerra"
#. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE_RIGHT1_RIGHT2
-#: Merge.rc:928
+#: Merge.rc:935
#, c-format
msgid "First &Right with Second Right"
msgstr "El primer element de la &dreta amb el segon element de la dreta"
#. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE_LEFT1_RIGHT2
-#: Merge.rc:929
+#: Merge.rc:936
#, c-format
msgid "&First Left with Second Right"
msgstr "El &primer element de l'esquerra amb el segon element de la dreta"
#. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE_LEFT2_RIGHT1
-#: Merge.rc:930
+#: Merge.rc:937
#, c-format
msgid "&Second Left with First Right"
msgstr "El &segon element de l'esquerra amb el primer element de la dreta"
#. IDR_POPUP_DIRVIEW
-#: Merge.rc:933
+#: Merge.rc:940
#, c-format
msgid "Co&mpare As"
msgstr "Compara com"
#. IDS_COPY_LEFT_TO_MIDDLE2
-#: Merge.rc:945 Merge.rc:957 Merge.rc:4502
+#: Merge.rc:953 Merge.rc:965 Merge.rc:4512
#, c-format
msgid "Left to Middle (%1 of %2)"
msgstr "Esquerra al mig (%1 de %2)"
#. IDS_COPY_LEFT_TO_RIGHT2
-#: Merge.rc:946 Merge.rc:958 Merge.rc:4501
+#: Merge.rc:954 Merge.rc:966 Merge.rc:4511
#, c-format
msgid "Left to Right (%1 of %2)"
msgstr "Esquerra a dreta (%1 de %2)"
#. IDS_MOVE_LEFT_TO2
-#: Merge.rc:947 Merge.rc:959 Merge.rc:1022 Merge.rc:4513 Merge.rc:4542
+#: Merge.rc:955 Merge.rc:967 Merge.rc:1030 Merge.rc:4523 Merge.rc:4552
#, c-format
msgid "Left to... (%1 of %2)"
msgstr "Esquerra a... (%1 de %2)"
#. IDS_COPY_MIDDLE_TO_LEFT2
-#: Merge.rc:948 Merge.rc:960 Merge.rc:4499
+#: Merge.rc:956 Merge.rc:968 Merge.rc:4509
#, c-format
msgid "Middle to Left (%1 of %2)"
msgstr "Del mig a esquerra (%1 de %2)"
#. IDS_COPY_MIDDLE_TO_RIGHT2
-#: Merge.rc:949 Merge.rc:961 Merge.rc:4500
+#: Merge.rc:957 Merge.rc:969 Merge.rc:4510
#, c-format
msgid "Middle to Right (%1 of %2)"
msgstr "Del mig a dreta (%1 de %2)"
#. IDS_MOVE_MIDDLE_TO2
-#: Merge.rc:950 Merge.rc:962 Merge.rc:1023 Merge.rc:4514 Merge.rc:4543
+#: Merge.rc:958 Merge.rc:970 Merge.rc:1031 Merge.rc:4524 Merge.rc:4553
#, c-format
msgid "Middle to... (%1 of %2)"
msgstr "Del mig a... (%1 de %2)"
#. IDS_COPY_RIGHT_TO_MIDDLE2
-#: Merge.rc:951 Merge.rc:963 Merge.rc:4498
+#: Merge.rc:959 Merge.rc:971 Merge.rc:4508
#, c-format
msgid "Right to Middle (%1 of %2)"
msgstr "Dreta al mig (%1 de %2)"
#. IDS_COPY_RIGHT_TO_LEFT2
-#: Merge.rc:952 Merge.rc:964 Merge.rc:4497
+#: Merge.rc:960 Merge.rc:972 Merge.rc:4507
#, c-format
msgid "Right to Left (%1 of %2)"
msgstr "Dreta a esquerra (%1 de %2)"
#. IDS_MOVE_RIGHT_TO2
-#: Merge.rc:953 Merge.rc:965 Merge.rc:1024 Merge.rc:4515 Merge.rc:4544
+#: Merge.rc:961 Merge.rc:973 Merge.rc:1032 Merge.rc:4525 Merge.rc:4554
#, c-format
msgid "Right to... (%1 of %2)"
msgstr "Dreta a... (%1 de %2)"
#. IDD_EDIT_MARKER, IDC_EDIT_MARKER_DELETE
-#: Merge.rc:967 Merge.rc:2036
+#: Merge.rc:975 Merge.rc:2046
#, c-format
msgid "&Delete"
msgstr "&Suprimeix"
#. IDR_POPUP_DIRVIEW, ID_DIR_DEL_BOTH
-#: Merge.rc:972
+#: Merge.rc:980
#, c-format
msgid "&Both"
msgstr "D'&ambdós costats"
#. IDR_POPUP_DIRVIEW, ID_DIR_DEL_ALL
-#: Merge.rc:973
+#: Merge.rc:981
#, c-format
msgid "&All"
msgstr "Tots"
#. IDD_EDIT_REPLACE, IDC_EDIT_SCOPE_SELECTION
-#: Merge.rc:974 Merge.rc:2019
+#: Merge.rc:982 Merge.rc:2029
#, c-format
msgid "&Selection"
msgstr "&Selecció"
#. IDR_POPUP_DIRVIEW, ID_DIR_ITEM_RENAME
-#: Merge.rc:976
+#: Merge.rc:984
#, c-format
msgid "Re&name"
msgstr "Canvia el &nom"
#. IDR_POPUP_DIRVIEW, ID_DIR_HIDE_FILENAMES
-#: Merge.rc:977
+#: Merge.rc:985
#, c-format
msgid "&Hide Items"
msgstr "&Amaga els elements"
#. IDR_POPUP_DIRVIEW
-#: Merge.rc:979
+#: Merge.rc:987
#, c-format
msgid "&Open Left"
msgstr "Obre l'&esquerra"
#. IDR_POPUP_DIRVIEW
-#: Merge.rc:986
+#: Merge.rc:994
#, c-format
msgid "Open Midd&le"
msgstr "Obre el del mi&g"
#. IDR_POPUP_DIRVIEW
-#: Merge.rc:993
+#: Merge.rc:1001
#, c-format
msgid "O&pen Right"
msgstr "Obre la &dreta"
#. IDR_POPUP_DIRVIEW
-#: Merge.rc:1001
+#: Merge.rc:1009
#, c-format
msgid "Cop&y Paths"
msgstr "C&opia els camins"
#. IDS_DEL_LEFT_FMT2
-#: Merge.rc:1003 Merge.rc:1012 Merge.rc:4530
+#: Merge.rc:1011 Merge.rc:1020 Merge.rc:4540
#, c-format
msgid "Left (%1 of %2)"
msgstr "Esquerra (%1 de %2)"
#. IDS_DEL_MIDDLE_FMT2
-#: Merge.rc:1004 Merge.rc:1013 Merge.rc:4531
+#: Merge.rc:1012 Merge.rc:1021 Merge.rc:4541
#, c-format
msgid "Middle (%1 of %2)"
msgstr "Mig (%1 de %2)"
#. IDS_DEL_RIGHT_FMT2
-#: Merge.rc:1005 Merge.rc:1014 Merge.rc:4532
+#: Merge.rc:1013 Merge.rc:1022 Merge.rc:4542
#, c-format
msgid "Right (%1 of %2)"
msgstr "Dreta (%1 de %2)"
#. IDS_DEL_BOTH_FMT2
-#: Merge.rc:1006 Merge.rc:1015 Merge.rc:4533
+#: Merge.rc:1014 Merge.rc:1023 Merge.rc:4543
#, c-format
msgid "Both (%1 of %2)"
msgstr "Ambdós (%1 de %2)"
#. IDS_DEL_ALL_FMT2
-#: Merge.rc:1007 Merge.rc:1016 Merge.rc:4538
+#: Merge.rc:1015 Merge.rc:1024 Merge.rc:4548
#, c-format
msgid "All (%1 of %2)"
msgstr "Tots (%1 de %2)"
#. IDR_POPUP_DIRVIEW, ID_DIR_COPY_FILENAMES
-#: Merge.rc:1009
+#: Merge.rc:1017
#, c-format
msgid "Copy &Filenames"
msgstr "Co&pia els noms de fitxer"
#. IDR_POPUP_DIRVIEW
-#: Merge.rc:1010
+#: Merge.rc:1018
#, c-format
msgid "Copy Items to Clip&board"
msgstr "Copia els elements al porta-re&talls"
#. IDR_POPUP_DIRVIEW, ID_DIR_COPY_ALL_DISP_COLUMNS
-#: Merge.rc:1018
+#: Merge.rc:1026
msgid "Copy All Di&splayed Columns"
msgstr "Copia totes les columne&s visualitzades"
#. IDR_POPUP_DIRVIEW
-#: Merge.rc:1020
+#: Merge.rc:1028
#, c-format
msgid "&Zip"
msgstr "Co&mprimeix"
#. IDS_COPY_BOTH_TO2
-#: Merge.rc:1025 Merge.rc:4516
+#: Merge.rc:1033 Merge.rc:4526
#, c-format
msgid "Both to... (%1 of %2)"
msgstr "Ambdós a... (%1 de %2)"
#. IDS_COPY_ALL_TO2
-#: Merge.rc:1026 Merge.rc:4517
+#: Merge.rc:1034 Merge.rc:4527
#, c-format
msgid "All to... (%1 of %2)"
msgstr "Tots a... (%1 de %2)"
#. IDS_COPY_DIFFERENCES_TO2
-#: Merge.rc:1027 Merge.rc:4518
+#: Merge.rc:1035 Merge.rc:4528
#, c-format
msgid "Differences to... (%1 of %2)"
msgstr "Diferències a... (%1 de %2)"
#. IDR_POPUP_DIRVIEW, ID_DIR_SHELL_CONTEXT_MENU_LEFT
-#: Merge.rc:1032
+#: Merge.rc:1040
#, c-format
msgid "Left Shell Menu"
msgstr "Menú de sistema de l'esquerra"
#. IDR_POPUP_DIRVIEW, ID_DIR_SHELL_CONTEXT_MENU_MIDDLE
-#: Merge.rc:1033
+#: Merge.rc:1041
#, c-format
msgid "Middle Shell Menu"
msgstr "Menú de sistema del mig"
#. IDR_POPUP_DIRVIEW, ID_DIR_SHELL_CONTEXT_MENU_RIGHT
-#: Merge.rc:1034
+#: Merge.rc:1042
#, c-format
msgid "Right Shell Menu"
msgstr "Menú de sistema de la dreta"
#. IDR_POPUP_DIRVIEW, ID_DIR_SHELL_CONTEXT_MENU_BOTH
-#: Merge.rc:1035
+#: Merge.rc:1043
msgid "Both Shell Menu"
msgstr "Els dos menús de sistema"
#. IDR_POPUP_DIRVIEW, ID_DIR_SHELL_CONTEXT_MENU_ALL
-#: Merge.rc:1036
+#: Merge.rc:1044
msgid "All Shell Menu"
msgstr "Tots els menús de sistema"
#. IDR_POPUP_EDITOR_HEADERBAR, ID_EDITOR_COPY
-#: Merge.rc:1050
+#: Merge.rc:1058
#, c-format
msgid "Copy"
msgstr "Copia"
#. IDR_POPUP_EDITOR_HEADERBAR, ID_EDITOR_COPY_PATH
-#: Merge.rc:1051
+#: Merge.rc:1059
#, c-format
msgid "&Copy Full Path"
msgstr "&Copia el camí sencer del fitxer"
#. IDR_POPUP_EDITOR_HEADERBAR, ID_EDITOR_COPY_FILENAME
-#: Merge.rc:1052
+#: Merge.rc:1060
#, c-format
msgid "Copy &Filename"
msgstr "Copia el nom del &fitxer"
#. IDR_POPUP_EDITOR_HEADERBAR, ID_EDITOR_EDIT_CAPTION
-#: Merge.rc:1053
+#: Merge.rc:1061
msgid "&Edit Caption\tF2"
msgstr "&Edita la llegenda\tF2"
#. IDR_POPUP_EDITOR_HEADERBAR, ID_EDITOR_EDIT_PATH
-#: Merge.rc:1055
+#: Merge.rc:1063
msgid "Edit &Path\tCtrl+L"
msgstr ""
#. IDR_POPUP_EDITOR_HEADERBAR, ID_EDITOR_SELECT_FILE
-#: Merge.rc:1056
+#: Merge.rc:1064
msgid "&Open..."
msgstr "&Obre..."
#. IDR_POPUP_PLUGINS_SETTINGS
-#: Merge.rc:1062
+#: Merge.rc:1070
msgid "Unpacker Settings"
msgstr "Opcions del desempaquetador"
#. IDS_USERCHOICE_NONE
-#: Merge.rc:1064 Merge.rc:1070 Merge.rc:1789 Merge.rc:1793 Merge.rc:5030
+#: Merge.rc:1072 Merge.rc:1078 Merge.rc:1799 Merge.rc:1803 Merge.rc:5040
#, c-format
msgid ""
msgstr ""
#. IDS_USERCHOICE_AUTOMATIC
-#: Merge.rc:1065 Merge.rc:1071 Merge.rc:5031
+#: Merge.rc:1073 Merge.rc:1079 Merge.rc:5041
#, c-format
msgid ""
msgstr ""
#. IDD_OPEN, IDC_SELECT_PREDIFFER
-#: Merge.rc:1066 Merge.rc:1072 Merge.rc:1970 Merge.rc:1974
+#: Merge.rc:1074 Merge.rc:1080 Merge.rc:1980 Merge.rc:1984
#, c-format
msgid "&Select..."
msgstr "T&ria..."
#. IDR_POPUP_PLUGINS_SETTINGS
-#: Merge.rc:1068
+#: Merge.rc:1076
#, c-format
msgid "Prediffer Settings"
msgstr "Opcions de prediferenciació"
#. IDR_POPUP_LOCATIONBAR, ID_LOCBAR_GOTODIFF
-#: Merge.rc:1080
+#: Merge.rc:1088
msgid "G&o to Diff"
msgstr "Ve&s a la diferència"
#. IDR_POPUP_LOCATIONBAR, ID_LOCBAR_MOVECURSOR_ONCLICK
-#: Merge.rc:1083
+#: Merge.rc:1091
msgid "Move Cursor on &Click"
msgstr ""
#. IDR_POPUP_LOCATIONBAR, ID_DISPLAY_MOVED_NONE
-#: Merge.rc:1085
+#: Merge.rc:1093
#, c-format
msgid "&No Moved Blocks"
msgstr "Blocs &no moguts"
#. IDR_POPUP_LOCATIONBAR, ID_DISPLAY_MOVED_ALL
-#: Merge.rc:1086
+#: Merge.rc:1094
#, c-format
msgid "&All Moved Blocks"
msgstr "&Tots els blocs moguts"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS
-#: Merge.rc:1094 Merge.rc:1127
+#: Merge.rc:1102 Merge.rc:1135
#, c-format
msgid "W&hitespaces"
msgstr "Espais"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_WHITESPACE_COMPARE
-#: Merge.rc:1096 Merge.rc:1129
+#: Merge.rc:1104 Merge.rc:1137
#, c-format
msgid "Com&pare"
msgstr "Co&mpara'ls"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_WHITESPACE_IGNORE
-#: Merge.rc:1097 Merge.rc:1130
+#: Merge.rc:1105 Merge.rc:1138
#, c-format
msgid "I&gnore Changes"
msgstr "&Ignora'n els canvis"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_WHITESPACE_IGNOREALL
-#: Merge.rc:1098 Merge.rc:1131
+#: Merge.rc:1106 Merge.rc:1139
#, c-format
msgid "Ig&nore All"
msgstr "I&gnora'ls tots"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_IGNORE_BLANKLINES
-#: Merge.rc:1100 Merge.rc:1133
+#: Merge.rc:1108 Merge.rc:1141
#, c-format
msgid "Ignore Blan&k Lines"
msgstr "&Ignora les línies en blanc"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_IGNORE_CASE
-#: Merge.rc:1101 Merge.rc:1134
+#: Merge.rc:1109 Merge.rc:1142
#, c-format
msgid "Ignore &Case"
msgstr "Ignora &majúscules/minúscules"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_IGNORE_EOL
-#: Merge.rc:1102 Merge.rc:1135
+#: Merge.rc:1110 Merge.rc:1143
#, c-format
msgid "Igno&re EOL Differences (Windows/Unix/Mac)"
msgstr "Ignora les diferències de salts de línia (Windows/Unix/Mac)"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_IGNORE_CODEPAGE
-#: Merge.rc:1103 Merge.rc:1136
+#: Merge.rc:1111 Merge.rc:1144
#, c-format
msgid "Ignore Codepage &Differences"
msgstr "Ignora les diferències de codificació de caràcters"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_IGNORE_NUMBERS
-#: Merge.rc:1104 Merge.rc:1137
+#: Merge.rc:1112 Merge.rc:1145
msgid "Ignore Num&bers"
msgstr "Ignora els nombres"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_IGNORE_COMMENTS
-#: Merge.rc:1105 Merge.rc:1138
+#: Merge.rc:1113 Merge.rc:1146
msgid "Ignore C&omment Differences"
msgstr "Ingora les diferències en els comentaris"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_IGNORE_MISSING_TRAILING_EOL
-#: Merge.rc:1106 Merge.rc:1139
+#: Merge.rc:1114 Merge.rc:1147
msgid "Ignore &Missing Trailing EOL"
msgstr ""
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_IGNORE_LINE_BREAKS
-#: Merge.rc:1107 Merge.rc:1140
+#: Merge.rc:1115 Merge.rc:1148
msgid "Ignore Line &Breaks (Treat as Spaces)"
msgstr ""
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_RECURS_CHECK
-#: Merge.rc:1109 Merge.rc:2963
+#: Merge.rc:1117 Merge.rc:2973
#, c-format
msgid "&Include Subfolders"
msgstr "&Inclou-hi les subcarpetes"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS
-#: Merge.rc:1110 Merge.rc:1142
+#: Merge.rc:1118 Merge.rc:1150
#, c-format
msgid "&Compare Method"
msgstr "Mètode de &comparació"
#. IDS_COMPMETHOD_FULL_CONTENTS
-#: Merge.rc:1112 Merge.rc:1144 Merge.rc:1328 Merge.rc:4282
+#: Merge.rc:1120 Merge.rc:1152 Merge.rc:1338 Merge.rc:4292
#, c-format
msgid "Full Contents"
msgstr "Tot el contingut"
#. IDS_COMPMETHOD_QUICK_CONTENTS
-#: Merge.rc:1113 Merge.rc:1145 Merge.rc:1329 Merge.rc:4283
+#: Merge.rc:1121 Merge.rc:1153 Merge.rc:1339 Merge.rc:4293
#, c-format
msgid "Quick Contents"
msgstr "Contingut en un cop d'ull"
#. IDS_COMPMETHOD_BINARY_CONTENTS
-#: Merge.rc:1114 Merge.rc:1146 Merge.rc:1330 Merge.rc:4284
+#: Merge.rc:1122 Merge.rc:1154 Merge.rc:1340 Merge.rc:4294
#, c-format
msgid "Binary Contents"
msgstr "Contingut binari"
#. IDS_COMPMETHOD_MODDATE
-#: Merge.rc:1115 Merge.rc:1147 Merge.rc:1331 Merge.rc:4285
+#: Merge.rc:1123 Merge.rc:1155 Merge.rc:1341 Merge.rc:4295
#, c-format
msgid "Modified Date"
msgstr "Data de modificació"
#. IDS_COMPMETHOD_DATESIZE
-#: Merge.rc:1116 Merge.rc:1148 Merge.rc:1332 Merge.rc:4286
+#: Merge.rc:1124 Merge.rc:1156 Merge.rc:1342 Merge.rc:4296
#, c-format
msgid "Modified Date and Size"
msgstr "Data de modificació i mida"
#. IDS_COMPMETHOD_SIZE
-#: Merge.rc:1117 Merge.rc:1149 Merge.rc:1333 Merge.rc:4287
+#: Merge.rc:1125 Merge.rc:1157 Merge.rc:1343 Merge.rc:4297
#, c-format
msgid "Size"
msgstr "Mida"
#. IDS_COMPMETHOD_EXISTENCE
-#: Merge.rc:1118 Merge.rc:1150 Merge.rc:1334 Merge.rc:4288
+#: Merge.rc:1126 Merge.rc:1158 Merge.rc:1344 Merge.rc:4298
msgid "Existence"
msgstr ""
#. IDR_POPUP_PROJECT, ID_LOAD_PROJECT
-#: Merge.rc:1192
+#: Merge.rc:1202
#, c-format
msgid "&Load Project..."
msgstr "Carrega un pr&ojecte..."
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARGALL
-#: Merge.rc:1272 Merge.rc:1301
+#: Merge.rc:1282 Merge.rc:1311
msgid "${*} - All Arguments"
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARG1
-#: Merge.rc:1273 Merge.rc:1302
+#: Merge.rc:1283 Merge.rc:1312
msgid "${1} - First Argument"
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARG2
-#: Merge.rc:1274 Merge.rc:1303
+#: Merge.rc:1284 Merge.rc:1313
msgid "${2} - Second Argument"
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARG3
-#: Merge.rc:1275 Merge.rc:1304
+#: Merge.rc:1285 Merge.rc:1314
msgid "${3} - Third Argument"
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARG4
-#: Merge.rc:1276 Merge.rc:1305
+#: Merge.rc:1286 Merge.rc:1315
msgid "${4} - Fourth Argument"
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARG5
-#: Merge.rc:1277 Merge.rc:1306
+#: Merge.rc:1287 Merge.rc:1316
msgid "${5} - Fifth Argument"
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARG6
-#: Merge.rc:1278 Merge.rc:1307
+#: Merge.rc:1288 Merge.rc:1317
msgid "${6} - Sixth Argument"
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARG7
-#: Merge.rc:1279 Merge.rc:1308
+#: Merge.rc:1289 Merge.rc:1318
msgid "${7} - Seventh Argument"
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARG8
-#: Merge.rc:1280 Merge.rc:1309
+#: Merge.rc:1290 Merge.rc:1319
msgid "${8} - Eighth Argument"
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARG9
-#: Merge.rc:1281 Merge.rc:1310
+#: Merge.rc:1291 Merge.rc:1320
msgid "${9} - Ninth Argument"
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_SRC_FILE
-#: Merge.rc:1289
+#: Merge.rc:1299
msgid "${SRC_FILE} - Source File"
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_SRC_FOLDER
-#: Merge.rc:1290
+#: Merge.rc:1300
msgid "${SRC_FOLDER} - Source Folder"
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_SRC_URL
-#: Merge.rc:1291
+#: Merge.rc:1301
msgid "${SRC_URL} - Source URL"
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_SRC_URL_PROTOCOL
-#: Merge.rc:1292
+#: Merge.rc:1302
msgid "${SRC_URL_PROTOCOL} - Source URL Protocol"
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_SRC_URL_SUFFIX
-#: Merge.rc:1293
+#: Merge.rc:1303
msgid "${SRC_URL_SUFFIX} - Source URL Suffix"
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_DST_FILE
-#: Merge.rc:1294
+#: Merge.rc:1304
msgid "${DST_FILE} - Destination File"
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_DST_FOLDER
-#: Merge.rc:1295
+#: Merge.rc:1305
msgid "${DST_FOLDER} - Destination Folder"
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_DST_URL
-#: Merge.rc:1296
+#: Merge.rc:1306
msgid "${DST_URL} - Destination URL"
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_DST_URL_PROTOCOL
-#: Merge.rc:1297
+#: Merge.rc:1307
msgid "${DST_URL_PROTOCOL} - Destination URL Protocol"
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_DST_URL_SUFFIX
-#: Merge.rc:1298
+#: Merge.rc:1308
msgid "${DST_URL_SUFFIX} - Destination URL Suffix"
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_WINMERGE_HOME
-#: Merge.rc:1299
+#: Merge.rc:1309
msgid "${WINMERGE_HOME} - WinMerge Home Directory"
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_SCRIPT_FILE
-#: Merge.rc:1300
+#: Merge.rc:1310
msgid "${SCRIPT_FILE} - Script File"
msgstr ""
#. IDR_POPUP_PLUGIN_ADD_MENU, ID_PLUGIN_ADD_UNPACKER
-#: Merge.rc:1318
+#: Merge.rc:1328
msgid "Add &Unpacker Plugin..."
msgstr ""
#. IDR_POPUP_PLUGIN_ADD_MENU, ID_PLUGIN_ADD_PREDIFFER
-#: Merge.rc:1319
+#: Merge.rc:1329
msgid "Add &Prediffer Plugin..."
msgstr ""
#. IDR_POPUP_PLUGIN_ADD_MENU, ID_PLUGIN_DUPLICATE
-#: Merge.rc:1320
+#: Merge.rc:1330
msgid "&Duplicate Plugin..."
msgstr ""
#. IDR_POPUP_OUTPUTVIEW, ID_EDIT_CLEAR_ALL
-#: Merge.rc:1344
+#: Merge.rc:1354
msgid "Clear &All"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_MASK_CLEAR
-#: Merge.rc:1352
+#: Merge.rc:1362
msgid "&Clear All"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_MASK_REMOVE_LAST
-#: Merge.rc:1353
+#: Merge.rc:1363
msgid "Remove Last Filter &Group"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_MASK_ALL
-#: Merge.rc:1354
+#: Merge.rc:1364
msgid "R&eset to Default (*.*)"
msgstr ""
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1355
+#: Merge.rc:1365
msgid "Add E&xclude File"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_SYS
-#: Merge.rc:1357
+#: Merge.rc:1367
msgid "&System Files"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_BACKUP
-#: Merge.rc:1358
+#: Merge.rc:1368
msgid "&Editor Backup Files"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_BIN
-#: Merge.rc:1359
+#: Merge.rc:1369
msgid "&Compiled Binary Files"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_LOG
-#: Merge.rc:1360
+#: Merge.rc:1370
msgid "&Log Files"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_TEMP
-#: Merge.rc:1361
+#: Merge.rc:1371
msgid "&Temporary or Cache Files"
msgstr ""
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1363
+#: Merge.rc:1373
msgid "Add Excl&ude Folder"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FOLDER_VCS
-#: Merge.rc:1365
+#: Merge.rc:1375
msgid "&Version Control"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FOLDER_BUILD
-#: Merge.rc:1366
+#: Merge.rc:1376
msgid "&Build Artifacts"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FOLDER_IDE
-#: Merge.rc:1367
+#: Merge.rc:1377
msgid "&IDE"
msgstr ""
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1370
+#: Merge.rc:1380
msgid "Add &File Condition"
msgstr ""
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1372 Merge.rc:1551
+#: Merge.rc:1382 Merge.rc:1561
msgid "File &Size"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_SIZE, ID_FILTERMENU_DIFF_SIZE_LT_1KB
-#: Merge.rc:1374 Merge.rc:1527 Merge.rc:1564 Merge.rc:1629 Merge.rc:1707
+#: Merge.rc:1384 Merge.rc:1537 Merge.rc:1574 Merge.rc:1639 Merge.rc:1717
msgid "Less than 1KB"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_SIZE, ID_FILTERMENU_DIFF_SIZE_GE_1KB
-#: Merge.rc:1375 Merge.rc:1528 Merge.rc:1565 Merge.rc:1630 Merge.rc:1708
+#: Merge.rc:1385 Merge.rc:1538 Merge.rc:1575 Merge.rc:1640 Merge.rc:1718
msgid "1KB or more"
msgstr ""
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_LT_10KB
-#: Merge.rc:1376 Merge.rc:1529 Merge.rc:1631
+#: Merge.rc:1386 Merge.rc:1539 Merge.rc:1641
msgid "Less than 10KB"
msgstr ""
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_GE_10KB
-#: Merge.rc:1377 Merge.rc:1530 Merge.rc:1632
+#: Merge.rc:1387 Merge.rc:1540 Merge.rc:1642
msgid "10KB or more"
msgstr ""
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_LT_100KB
-#: Merge.rc:1378 Merge.rc:1531 Merge.rc:1633
+#: Merge.rc:1388 Merge.rc:1541 Merge.rc:1643
msgid "Less than 100KB"
msgstr ""
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_GE_100KB
-#: Merge.rc:1379 Merge.rc:1532 Merge.rc:1634
+#: Merge.rc:1389 Merge.rc:1542 Merge.rc:1644
msgid "100KB or more"
msgstr ""
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_LT_1MB
-#: Merge.rc:1380 Merge.rc:1533 Merge.rc:1635
+#: Merge.rc:1390 Merge.rc:1543 Merge.rc:1645
msgid "Less than 1MB"
msgstr ""
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_GE_1MB
-#: Merge.rc:1381 Merge.rc:1534 Merge.rc:1636
+#: Merge.rc:1391 Merge.rc:1544 Merge.rc:1646
msgid "1MB or more"
msgstr ""
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_LT_10MB
-#: Merge.rc:1382 Merge.rc:1535 Merge.rc:1637
+#: Merge.rc:1392 Merge.rc:1545 Merge.rc:1647
msgid "Less than 10MB"
msgstr ""
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_GE_10MB
-#: Merge.rc:1383 Merge.rc:1536 Merge.rc:1638
+#: Merge.rc:1393 Merge.rc:1546 Merge.rc:1648
msgid "10MB or more"
msgstr ""
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_LT_100MB
-#: Merge.rc:1384 Merge.rc:1537 Merge.rc:1639
+#: Merge.rc:1394 Merge.rc:1547 Merge.rc:1649
msgid "Less than 100MB"
msgstr ""
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_GE_100MB
-#: Merge.rc:1385 Merge.rc:1538 Merge.rc:1640
+#: Merge.rc:1395 Merge.rc:1548 Merge.rc:1650
msgid "100MB or more"
msgstr ""
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_LT_1GB
-#: Merge.rc:1386 Merge.rc:1539 Merge.rc:1641
+#: Merge.rc:1396 Merge.rc:1549 Merge.rc:1651
msgid "Less than 1GB"
msgstr ""
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_GE_1GB
-#: Merge.rc:1387 Merge.rc:1642
+#: Merge.rc:1397 Merge.rc:1652
msgid "1GB or more"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_RANGE
-#: Merge.rc:1388 Merge.rc:1465 Merge.rc:1517 Merge.rc:1523 Merge.rc:1540
-#: Merge.rc:1566 Merge.rc:1587 Merge.rc:1643 Merge.rc:1709 Merge.rc:1734
+#: Merge.rc:1398 Merge.rc:1475 Merge.rc:1527 Merge.rc:1533 Merge.rc:1550
+#: Merge.rc:1576 Merge.rc:1597 Merge.rc:1653 Merge.rc:1719 Merge.rc:1744
msgid "Custom Range..."
msgstr ""
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1390 Merge.rc:1471 Merge.rc:1568
+#: Merge.rc:1400 Merge.rc:1481 Merge.rc:1578
msgid "&Last Modified"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE
-#: Merge.rc:1392 Merge.rc:1473 Merge.rc:1651
+#: Merge.rc:1402 Merge.rc:1483 Merge.rc:1661
msgid "&Hour"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_HOUR_BEFORE_1
-#: Merge.rc:1394 Merge.rc:1475 Merge.rc:1653
+#: Merge.rc:1404 Merge.rc:1485 Merge.rc:1663
msgid "More than 1 hour ago"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_HOUR_WITHIN_1
-#: Merge.rc:1395 Merge.rc:1476 Merge.rc:1654
+#: Merge.rc:1405 Merge.rc:1486 Merge.rc:1664
msgid "Within 1 hour"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE
-#: Merge.rc:1397 Merge.rc:1478 Merge.rc:1656
+#: Merge.rc:1407 Merge.rc:1488 Merge.rc:1666
msgid "&Day"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_DAY_BEFORE_TODAY
-#: Merge.rc:1399 Merge.rc:1480 Merge.rc:1658
+#: Merge.rc:1409 Merge.rc:1490 Merge.rc:1668
msgid "Before today"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_DAY_TODAY
-#: Merge.rc:1400 Merge.rc:1481 Merge.rc:1659
+#: Merge.rc:1410 Merge.rc:1491 Merge.rc:1669
msgid "Today"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_DAY_BEFORE_YESTERDAY
-#: Merge.rc:1401 Merge.rc:1482 Merge.rc:1660
+#: Merge.rc:1411 Merge.rc:1492 Merge.rc:1670
msgid "Before yesterday"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_DAY_YESTERDAY
-#: Merge.rc:1402 Merge.rc:1483 Merge.rc:1661
+#: Merge.rc:1412 Merge.rc:1493 Merge.rc:1671
msgid "Yesterday"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_DAY_SINCE_YESTERDAY
-#: Merge.rc:1403 Merge.rc:1484 Merge.rc:1662
+#: Merge.rc:1413 Merge.rc:1494 Merge.rc:1672
msgid "Since yesterday"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE
-#: Merge.rc:1405 Merge.rc:1486 Merge.rc:1664
+#: Merge.rc:1415 Merge.rc:1496 Merge.rc:1674
msgid "&Week"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_WEEK_BEFORE_THIS
-#: Merge.rc:1407 Merge.rc:1488 Merge.rc:1666
+#: Merge.rc:1417 Merge.rc:1498 Merge.rc:1676
msgid "Before this week"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_WEEK_THIS
-#: Merge.rc:1408 Merge.rc:1489 Merge.rc:1667
+#: Merge.rc:1418 Merge.rc:1499 Merge.rc:1677
msgid "This week"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_WEEK_BEFORE_LAST
-#: Merge.rc:1409 Merge.rc:1490 Merge.rc:1668
+#: Merge.rc:1419 Merge.rc:1500 Merge.rc:1678
msgid "Before last week"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_WEEK_LAST
-#: Merge.rc:1410 Merge.rc:1491 Merge.rc:1669
+#: Merge.rc:1420 Merge.rc:1501 Merge.rc:1679
msgid "Last week"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_WEEK_SINCE_LAST
-#: Merge.rc:1411 Merge.rc:1492 Merge.rc:1670
+#: Merge.rc:1421 Merge.rc:1502 Merge.rc:1680
msgid "Since last week"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE
-#: Merge.rc:1413 Merge.rc:1494 Merge.rc:1672
+#: Merge.rc:1423 Merge.rc:1504 Merge.rc:1682
msgid "&Month"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_MONTH_BEFORE_THIS
-#: Merge.rc:1415 Merge.rc:1496 Merge.rc:1674
+#: Merge.rc:1425 Merge.rc:1506 Merge.rc:1684
msgid "Before this month"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_MONTH_THIS
-#: Merge.rc:1416 Merge.rc:1497 Merge.rc:1675
+#: Merge.rc:1426 Merge.rc:1507 Merge.rc:1685
msgid "This month"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_MONTH_BEFORE_LAST
-#: Merge.rc:1417 Merge.rc:1498 Merge.rc:1676
+#: Merge.rc:1427 Merge.rc:1508 Merge.rc:1686
msgid "Before last month"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_MONTH_LAST
-#: Merge.rc:1418 Merge.rc:1499 Merge.rc:1677
+#: Merge.rc:1428 Merge.rc:1509 Merge.rc:1687
msgid "Last month"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_MONTH_SINCE_LAST
-#: Merge.rc:1419 Merge.rc:1500 Merge.rc:1678
+#: Merge.rc:1429 Merge.rc:1510 Merge.rc:1688
msgid "Since last month"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE
-#: Merge.rc:1421 Merge.rc:1502 Merge.rc:1680
+#: Merge.rc:1431 Merge.rc:1512 Merge.rc:1690
msgid "&Year"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_YEAR_BEFORE_THIS
-#: Merge.rc:1423 Merge.rc:1504 Merge.rc:1682
+#: Merge.rc:1433 Merge.rc:1514 Merge.rc:1692
msgid "Before this year"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_YEAR_THIS
-#: Merge.rc:1424 Merge.rc:1505 Merge.rc:1683
+#: Merge.rc:1434 Merge.rc:1515 Merge.rc:1693
msgid "This year"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_YEAR_BEFORE_LAST
-#: Merge.rc:1425 Merge.rc:1506 Merge.rc:1684
+#: Merge.rc:1435 Merge.rc:1516 Merge.rc:1694
msgid "Before last year"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_YEAR_LAST
-#: Merge.rc:1426 Merge.rc:1507 Merge.rc:1685
+#: Merge.rc:1436 Merge.rc:1517 Merge.rc:1695
msgid "Last year"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_YEAR_SINCE_LAST
-#: Merge.rc:1427 Merge.rc:1508 Merge.rc:1686
+#: Merge.rc:1437 Merge.rc:1518 Merge.rc:1696
msgid "Since last year"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_RANGE
-#: Merge.rc:1429 Merge.rc:1510 Merge.rc:1688
+#: Merge.rc:1439 Merge.rc:1520 Merge.rc:1698
msgid "&Custom Range..."
msgstr ""
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1431 Merge.rc:1589
+#: Merge.rc:1441 Merge.rc:1599
msgid "&Attributes"
msgstr ""
#. IDR_POPUP_FILTERMENU_ATTR, ID_FILTERMENU_ATTR_READONLY
-#: Merge.rc:1433 Merge.rc:1607
+#: Merge.rc:1443 Merge.rc:1617
msgid "Read-only files"
msgstr ""
#. IDR_POPUP_FILTERMENU_ATTR, ID_FILTERMENU_ATTR_NOT_READONLY
-#: Merge.rc:1434 Merge.rc:1608
+#: Merge.rc:1444 Merge.rc:1618
msgid "Not read-only files"
msgstr ""
#. IDR_POPUP_FILTERMENU_ATTR, ID_FILTERMENU_ATTR_HIDDEN
-#: Merge.rc:1435 Merge.rc:1609
+#: Merge.rc:1445 Merge.rc:1619
msgid "Hidden files"
msgstr ""
#. IDR_POPUP_FILTERMENU_ATTR, ID_FILTERMENU_ATTR_NOT_HIDDEN
-#: Merge.rc:1436 Merge.rc:1610
+#: Merge.rc:1446 Merge.rc:1620
msgid "Not hidden files"
msgstr ""
#. IDR_POPUP_FILTERMENU_ATTR, ID_FILTERMENU_ATTR_SYSTEM
-#: Merge.rc:1437 Merge.rc:1611
+#: Merge.rc:1447 Merge.rc:1621
msgid "System files"
msgstr ""
#. IDR_POPUP_FILTERMENU_ATTR, ID_FILTERMENU_ATTR_NOT_SYSTEM
-#: Merge.rc:1438 Merge.rc:1612
+#: Merge.rc:1448 Merge.rc:1622
msgid "Not system files"
msgstr ""
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1440
+#: Merge.rc:1450
msgid "File &Content"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_CONTAINS
-#: Merge.rc:1442
+#: Merge.rc:1452
msgid "Contains string..."
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_NOT_CONTAINS
-#: Merge.rc:1443
+#: Merge.rc:1453
msgid "Does not contain string..."
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_FIRST_LINE_CONTAINS
-#: Merge.rc:1444
+#: Merge.rc:1454
msgid "First line contains string..."
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_FIRST_LINE_NOT_CONTAINS
-#: Merge.rc:1445
+#: Merge.rc:1455
msgid "First line does not contain string..."
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_FIRST_10_CONTAINS
-#: Merge.rc:1446
+#: Merge.rc:1456
msgid "First 10 lines contain string..."
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_FIRST_10_NOT_CONTAINS
-#: Merge.rc:1447
+#: Merge.rc:1457
msgid "First 10 lines do not contain string..."
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_LAST_10_CONTAINS
-#: Merge.rc:1448
+#: Merge.rc:1458
msgid "Last 10 lines contain string..."
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_LAST_10_NOT_CONTAINS
-#: Merge.rc:1449
+#: Merge.rc:1459
msgid "Last 10 lines do not contain string..."
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_LAST_LINE_CONTAINS
-#: Merge.rc:1450
+#: Merge.rc:1460
msgid "Last line contains string..."
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_LAST_LINE_NOT_CONTAINS
-#: Merge.rc:1451
+#: Merge.rc:1461
msgid "Last line does not contain string..."
msgstr ""
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1453
+#: Merge.rc:1463
msgid "&Line Count"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_LT_10
-#: Merge.rc:1455
+#: Merge.rc:1465
msgid "Less than 10"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_GE_10
-#: Merge.rc:1456
+#: Merge.rc:1466
msgid "10 or more"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_LT_100
-#: Merge.rc:1457
+#: Merge.rc:1467
msgid "Less than 100"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_GE_100
-#: Merge.rc:1458
+#: Merge.rc:1468
msgid "100 or more"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_LT_1000
-#: Merge.rc:1459
+#: Merge.rc:1469
msgid "Less than 1000"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_GE_1000
-#: Merge.rc:1460
+#: Merge.rc:1470
msgid "1000 or more"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_LT_10000
-#: Merge.rc:1461
+#: Merge.rc:1471
msgid "Less than 10000"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_GE_10000
-#: Merge.rc:1462
+#: Merge.rc:1472
msgid "10000 or more"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_LT_100000
-#: Merge.rc:1463
+#: Merge.rc:1473
msgid "Less than 100000"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_GE_100000
-#: Merge.rc:1464
+#: Merge.rc:1474
msgid "100000 or more"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_PROPS
-#: Merge.rc:1467 Merge.rc:1594 Merge.rc:1761 Merge.rc:1778
+#: Merge.rc:1477 Merge.rc:1604 Merge.rc:1771 Merge.rc:1788
msgid "Additional &Properties..."
msgstr ""
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1469
+#: Merge.rc:1479
msgid "Add F&older Condition"
msgstr ""
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1513
+#: Merge.rc:1523
msgid "&Files"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FOLDER_FILES_EQ_0
-#: Merge.rc:1515
+#: Merge.rc:1525
msgid "0 files"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FOLDER_FILES_GE_1
-#: Merge.rc:1516
+#: Merge.rc:1526
msgid "1 file or more"
msgstr ""
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1519
+#: Merge.rc:1529
msgid "&Items"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FOLDER_ITEMS_EQ_0
-#: Merge.rc:1521
+#: Merge.rc:1531
msgid "0 items"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FOLDER_ITEMS_GE_1
-#: Merge.rc:1522
+#: Merge.rc:1532
msgid "1 item or more"
msgstr ""
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1525
+#: Merge.rc:1535
msgid "&Total Size"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FOLDER_STATS_RECURSIVE
-#: Merge.rc:1542
+#: Merge.rc:1552
msgid "&Recursive"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONDITION_ANY
-#: Merge.rc:1544
+#: Merge.rc:1554
msgid "Target: &Any (Left/Middle/Right)"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONDITION_LEFT
-#: Merge.rc:1545
+#: Merge.rc:1555
msgid "Target: &Left"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONDITION_MIDDLE
-#: Merge.rc:1546
+#: Merge.rc:1556
msgid "Target: &Middle"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONDITION_RIGHT
-#: Merge.rc:1547
+#: Merge.rc:1557
msgid "Target: &Right"
msgstr ""
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1549
+#: Merge.rc:1559
msgid "Add &Difference Condition"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_PROP, ID_FILTERMENU_DIFF_PROP_EQUAL
-#: Merge.rc:1553 Merge.rc:1570 Merge.rc:1591 Merge.rc:1696 Merge.rc:1717
-#: Merge.rc:1742
+#: Merge.rc:1563 Merge.rc:1580 Merge.rc:1601 Merge.rc:1706 Merge.rc:1727
+#: Merge.rc:1752
msgid "Equal"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_PROP, ID_FILTERMENU_DIFF_PROP_NOT_EQUAL
-#: Merge.rc:1554 Merge.rc:1571 Merge.rc:1592 Merge.rc:1697 Merge.rc:1718
-#: Merge.rc:1743
+#: Merge.rc:1564 Merge.rc:1581 Merge.rc:1602 Merge.rc:1707 Merge.rc:1728
+#: Merge.rc:1753
msgid "Not Equal"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_PROP, ID_FILTERMENU_DIFF_PROP_LESS
-#: Merge.rc:1555 Merge.rc:1572 Merge.rc:1698 Merge.rc:1719 Merge.rc:1744
+#: Merge.rc:1565 Merge.rc:1582 Merge.rc:1708 Merge.rc:1729 Merge.rc:1754
msgid "Less Than"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_PROP, ID_FILTERMENU_DIFF_PROP_LESS_EQUAL
-#: Merge.rc:1556 Merge.rc:1573 Merge.rc:1699 Merge.rc:1720 Merge.rc:1745
+#: Merge.rc:1566 Merge.rc:1583 Merge.rc:1709 Merge.rc:1730 Merge.rc:1755
msgid "Less Than or Equal to"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_PROP, ID_FILTERMENU_DIFF_PROP_GREATER
-#: Merge.rc:1557 Merge.rc:1574 Merge.rc:1700 Merge.rc:1721 Merge.rc:1746
+#: Merge.rc:1567 Merge.rc:1584 Merge.rc:1710 Merge.rc:1731 Merge.rc:1756
msgid "Greater Than"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_PROP, ID_FILTERMENU_DIFF_PROP_GREATER_EQUAL
-#: Merge.rc:1558 Merge.rc:1575 Merge.rc:1701 Merge.rc:1722 Merge.rc:1747
+#: Merge.rc:1568 Merge.rc:1585 Merge.rc:1711 Merge.rc:1732 Merge.rc:1757
msgid "Greater Than or Equal to"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_SIZE, ID_FILTERMENU_DIFF_SIZE_LT_10B
-#: Merge.rc:1560 Merge.rc:1703
+#: Merge.rc:1570 Merge.rc:1713
msgid "Less than 10B"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_SIZE, ID_FILTERMENU_DIFF_SIZE_GE_10B
-#: Merge.rc:1561 Merge.rc:1704
+#: Merge.rc:1571 Merge.rc:1714
msgid "10B or more"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_SIZE, ID_FILTERMENU_DIFF_SIZE_LT_100B
-#: Merge.rc:1562 Merge.rc:1705
+#: Merge.rc:1572 Merge.rc:1715
msgid "Less than 100B"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_SIZE, ID_FILTERMENU_DIFF_SIZE_GE_100B
-#: Merge.rc:1563 Merge.rc:1706
+#: Merge.rc:1573 Merge.rc:1716
msgid "100B or more"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_LT_1SECOND
-#: Merge.rc:1577 Merge.rc:1724
+#: Merge.rc:1587 Merge.rc:1734
msgid "Less than 1 second"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_GE_1SECOND
-#: Merge.rc:1578 Merge.rc:1725
+#: Merge.rc:1588 Merge.rc:1735
msgid "1 second or more"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_LT_1MINUTE
-#: Merge.rc:1579 Merge.rc:1726
+#: Merge.rc:1589 Merge.rc:1736
msgid "Less than 1 minute"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_GE_1MINUTE
-#: Merge.rc:1580 Merge.rc:1727
+#: Merge.rc:1590 Merge.rc:1737
msgid "1 minute or more"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_LT_1HOUR
-#: Merge.rc:1581 Merge.rc:1728
+#: Merge.rc:1591 Merge.rc:1738
msgid "Less than 1 hour"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_GE_1HOUR
-#: Merge.rc:1582 Merge.rc:1729
+#: Merge.rc:1592 Merge.rc:1739
msgid "1 hour or more"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_LT_1DAY
-#: Merge.rc:1583 Merge.rc:1730
+#: Merge.rc:1593 Merge.rc:1740
msgid "Less than 1 day"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_GE_1DAY
-#: Merge.rc:1584 Merge.rc:1731
+#: Merge.rc:1594 Merge.rc:1741
msgid "1 day or more"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_LT_1WEEK
-#: Merge.rc:1585 Merge.rc:1732
+#: Merge.rc:1595 Merge.rc:1742
msgid "Less than 1 week"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_GE_1WEEK
-#: Merge.rc:1586 Merge.rc:1733
+#: Merge.rc:1596 Merge.rc:1743
msgid "1 week or more"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_CONDITION_DIFF_LEFT_RIGHT
-#: Merge.rc:1596
+#: Merge.rc:1606
msgid "Target: &Left and Right"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_CONDITION_DIFF_LEFT_MIDDLE
-#: Merge.rc:1597
+#: Merge.rc:1607
msgid "Target: Left and &Middle"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_CONDITION_DIFF_MIDDLE_RIGHT
-#: Merge.rc:1598
+#: Merge.rc:1608
msgid "Target: Middle and &Right"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_CONDITION_DIFF_ALL
-#: Merge.rc:1599
+#: Merge.rc:1609
msgid "Target: &All"
msgstr ""
#. IDR_POPUP_FILTERMENU_BINARY, ID_FILTERMENU_BINARY_ONLY
-#: Merge.rc:1620
+#: Merge.rc:1630
msgid "Binary files only"
msgstr ""
#. IDR_POPUP_FILTERMENU_BINARY, ID_FILTERMENU_TEXT_ONLY
-#: Merge.rc:1621
+#: Merge.rc:1631
msgid "Text files only"
msgstr ""
#. IDR_POPUP_ADDCMPMENU, ID_ADDCMPMENU_CLEAR
-#: Merge.rc:1755
+#: Merge.rc:1765
msgid "&Clear conditions"
msgstr ""
#. IDR_POPUP_ADDCMPMENU, ID_ADDCMPMENU_CMP_SIZE
-#: Merge.rc:1757
+#: Merge.rc:1767
msgid "Compare &Size"
msgstr ""
#. IDR_POPUP_ADDCMPMENU, ID_ADDCMPMENU_CMP_DATE
-#: Merge.rc:1758
+#: Merge.rc:1768
msgid "Compare &Date"
msgstr ""
#. IDR_POPUP_ADDCMPMENU, ID_ADDCMPMENU_CMP_ATTR
-#: Merge.rc:1759
+#: Merge.rc:1769
msgid "Compare &Attributes"
msgstr ""
#. IDR_POPUP_ADDCMPMENU, ID_ADDCMPMENU_CMP_CONTENTS
-#: Merge.rc:1760
+#: Merge.rc:1770
msgid "Compare C&ontents"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_CLEAR
-#: Merge.rc:1769
+#: Merge.rc:1779
msgid "&Clear Keys"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_NAME
-#: Merge.rc:1771
+#: Merge.rc:1781
msgid "&Name"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_BASENAME
-#: Merge.rc:1772
+#: Merge.rc:1782
msgid "&Base name (without extension)"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_NORMALIZED_NAME
-#: Merge.rc:1773
+#: Merge.rc:1783
msgid "Normalized &Unicode Name"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_RELPATH
-#: Merge.rc:1774
+#: Merge.rc:1784
msgid "&Relative Path"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_DATE
-#: Merge.rc:1776
+#: Merge.rc:1786
msgid "&Date"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_HASH_MD5
-#: Merge.rc:1777
+#: Merge.rc:1787
msgid "&Hash (MD5)"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_REPLACE
-#: Merge.rc:1780
+#: Merge.rc:1790
msgid "Insert &replace() Function"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_REGEXREPLACE
-#: Merge.rc:1781
+#: Merge.rc:1791
msgid "Insert rege&xReplace() Function"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU
-#: Merge.rc:1782
+#: Merge.rc:1792
msgid "Replace &Lists"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_CREATE_REPLACELIST
-#: Merge.rc:1784
+#: Merge.rc:1794
msgid "&Create String Replace List and Insert..."
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_CREATE_REGEXREPLACELIST
-#: Merge.rc:1785
+#: Merge.rc:1795
msgid "Create &Regex Replace List and Insert..."
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU
-#: Merge.rc:1787
+#: Merge.rc:1797
msgid "&String Replace Lists"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU
-#: Merge.rc:1791
+#: Merge.rc:1801
msgid "Re&gex Replace Lists"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_STRING_REPLACE_LISTS_FOLDER
-#: Merge.rc:1796
+#: Merge.rc:1806
msgid "Open String Replace Lists Folder..."
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_REGEX_REPLACE_LISTS_FOLDER
-#: Merge.rc:1797
+#: Merge.rc:1807
msgid "Open Regex Replace Lists Folder..."
msgstr ""
#. IDD_FILTERS_CONDITION, IDC_CONDITION_MATCHCASE
-#: Merge.rc:1799 Merge.rc:1995 Merge.rc:2014 Merge.rc:2042 Merge.rc:2585
+#: Merge.rc:1809 Merge.rc:2005 Merge.rc:2024 Merge.rc:2052 Merge.rc:2595
#, c-format
msgid "Match &case"
msgstr "&Distingeix entre majúscules i minúscules"
#. IDR_POPUP_RENAMEMOVE_MENU
-#: Merge.rc:1801
+#: Merge.rc:1811
msgid "Text &Normalization"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_TOLOWER
-#: Merge.rc:1803
+#: Merge.rc:1813
msgid "&Lowercase"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_TOUPPER
-#: Merge.rc:1804
+#: Merge.rc:1814
msgid "&Uppercase"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_TOHALFWIDTH
-#: Merge.rc:1805
+#: Merge.rc:1815
msgid "&Half-width"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_TOFULLWIDTH
-#: Merge.rc:1806
+#: Merge.rc:1816
msgid "&Full-width"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU
-#: Merge.rc:1807
+#: Merge.rc:1817
msgid "&Chinese Conversion"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_TOSIMPLIFIEDCHINESE
-#: Merge.rc:1809
+#: Merge.rc:1819
msgid "&Simplified Chinese"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_TOTRADITIONALCHINESE
-#: Merge.rc:1810
+#: Merge.rc:1820
msgid "&Traditional Chinese"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU
-#: Merge.rc:1812
+#: Merge.rc:1822
msgid "&Japanese Conversion"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_TOHIRAGANA
-#: Merge.rc:1814
+#: Merge.rc:1824
msgid "&Hiragana"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_TOKATAKANA
-#: Merge.rc:1815
+#: Merge.rc:1825
msgid "&Katakana"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_NORMALIZEUNICODE
-#: Merge.rc:1817
+#: Merge.rc:1827
msgid "Normalize &Unicode"
msgstr ""
#. IDD_ABOUTBOX
-#: Merge.rc:1932
+#: Merge.rc:1942
#, c-format
msgid "About WinMerge"
msgstr "Quant al WinMerge"
#. IDD_ABOUTBOX, IDC_WWW
-#: Merge.rc:1936
+#: Merge.rc:1946
msgid "Visit the WinMerge Homepage!"
msgstr "Visiteu la pàgina web del WinMerge."
#. IDD_PLUGINS_EDITPLUGIN, IDOK
-#: Merge.rc:1938 Merge.rc:2080 Merge.rc:2431 Merge.rc:2455 Merge.rc:2469
-#: Merge.rc:2497 Merge.rc:2588 Merge.rc:2613 Merge.rc:2674 Merge.rc:2691
-#: Merge.rc:2703 Merge.rc:2867 Merge.rc:2927 Merge.rc:3062 Merge.rc:3104
-#: Merge.rc:3147 Merge.rc:3197
+#: Merge.rc:1948 Merge.rc:2090 Merge.rc:2441 Merge.rc:2465 Merge.rc:2479
+#: Merge.rc:2507 Merge.rc:2598 Merge.rc:2623 Merge.rc:2684 Merge.rc:2701
+#: Merge.rc:2713 Merge.rc:2877 Merge.rc:2937 Merge.rc:3072 Merge.rc:3114
+#: Merge.rc:3157 Merge.rc:3207
#, c-format
msgid "OK"
msgstr "D'acord"
#. IDD_ABOUTBOX, IDC_OPEN_CONTRIBUTORS
-#: Merge.rc:1939
+#: Merge.rc:1949
#, c-format
msgid "Contributors"
msgstr "Col·laboradors"
#. IDD_SELECT_FILES_OR_FOLDERS
-#: Merge.rc:1945 Merge.rc:3070
+#: Merge.rc:1955 Merge.rc:3080
#, c-format
msgid "Select Files or Folders"
msgstr "Selecciona fitxers o directoris"
#. IDD_OPEN, IDC_FILES_DIRS_GROUP0
-#: Merge.rc:1949
+#: Merge.rc:1959
#, c-format
msgid "&1st File or Folder"
msgstr "1er fitxer o directori"
#. IDD_OPEN, IDC_PATH0_READONLY
-#: Merge.rc:1951
+#: Merge.rc:1961
#, c-format
msgid "Re&ad-only"
msgstr "Només de &lectura"
#. IDD_OPEN, IDC_SWAP01_STATIC
-#: Merge.rc:1953
+#: Merge.rc:1963
#, c-format
msgid "Swap 1st | 2nd"
msgstr "Intercanvia 1er | 2n"
#. IDD_GENERATE_PATCH, IDC_DIFF_BROWSE_FILE1
-#: Merge.rc:1954 Merge.rc:2310 Merge.rc:2413
+#: Merge.rc:1964 Merge.rc:2320 Merge.rc:2423
#, c-format
msgid "&Browse..."
msgstr "&Navega..."
#. IDD_OPEN, IDC_FILES_DIRS_GROUP1
-#: Merge.rc:1955
+#: Merge.rc:1965
#, c-format
msgid "&2nd File or Folder"
msgstr "&2n fitxer o directori"
#. IDD_OPEN, IDC_PATH1_READONLY
-#: Merge.rc:1957
+#: Merge.rc:1967
#, c-format
msgid "Rea&d-only"
msgstr "Només de l&ectura"
#. IDD_OPEN, IDC_SWAP12_STATIC
-#: Merge.rc:1959
+#: Merge.rc:1969
#, c-format
msgid "Swap 2nd | 3rd"
msgstr "Intercanvia 2n | 3r"
#. IDD_PROPPAGE_SYSTEM, IDC_FILTER_USER_BROWSE
-#: Merge.rc:1960 Merge.rc:2315
+#: Merge.rc:1970 Merge.rc:2325
#, c-format
msgid "B&rowse..."
msgstr "Na&vega..."
#. IDD_OPEN, IDC_FILES_DIRS_GROUP2
-#: Merge.rc:1961
+#: Merge.rc:1971
#, c-format
msgid "&3rd File or Folder (Optional)"
msgstr "&3r fitxer o directori (Opcional)"
#. IDD_OPEN, IDC_PATH2_READONLY
-#: Merge.rc:1963
+#: Merge.rc:1973
#, c-format
msgid "Read-o&nly"
msgstr "Només de le&ctura"
#. IDD_OPEN, IDC_SWAP02_STATIC
-#: Merge.rc:1965
+#: Merge.rc:1975
#, c-format
msgid "Swap 1st | 3rd"
msgstr "Intercanvia 1er | 3r"
#. IDD_PROPPAGE_BACKUPS, IDC_BACKUP_BROWSE
-#: Merge.rc:1966 Merge.rc:2685 Merge.rc:2883
+#: Merge.rc:1976 Merge.rc:2695 Merge.rc:2893
#, c-format
msgid "Browse..."
msgstr "Nave&ga..."
#. IDD_OPEN, IDC_FILES_DIRS_GROUP3
-#: Merge.rc:1968
+#: Merge.rc:1978
#, c-format
msgid " Folder: Filter"
msgstr " Carpeta: Filtre"
#. IDD_OPEN, IDC_RECURS_CHECK
-#: Merge.rc:1971
+#: Merge.rc:1981
msgid "&Include subfolders"
msgstr "&Inclou-hi les subcarpetes"
#. IDD_OPEN, IDC_FILES_DIRS_GROUP5
-#: Merge.rc:1972
+#: Merge.rc:1982
msgid " File: Prediffer Plugin"
msgstr " Fitxer: Connector Prediffer"
#. IDD_OPEN, IDC_FILES_DIRS_GROUP4
-#: Merge.rc:1976
+#: Merge.rc:1986
#, c-format
msgid " File: Unpacker Plugin"
msgstr " Fitxer: Connector desempaquetador"
#. IDD_OPEN, IDC_SELECT_UNPACKER
-#: Merge.rc:1978
+#: Merge.rc:1988
#, c-format
msgid "Se&lect..."
msgstr "Selecciona..."
#. IDD_PLUGINS_EDITPLUGIN, IDCANCEL
-#: Merge.rc:1981 Merge.rc:2001 Merge.rc:2025 Merge.rc:2046 Merge.rc:2081
-#: Merge.rc:2432 Merge.rc:2456 Merge.rc:2470 Merge.rc:2498 Merge.rc:2551
-#: Merge.rc:2589 Merge.rc:2614 Merge.rc:2675 Merge.rc:2692 Merge.rc:2704
-#: Merge.rc:2868 Merge.rc:2928 Merge.rc:3087 Merge.rc:3105 Merge.rc:3148
-#: Merge.rc:3198
+#: Merge.rc:1991 Merge.rc:2011 Merge.rc:2035 Merge.rc:2056 Merge.rc:2091
+#: Merge.rc:2442 Merge.rc:2466 Merge.rc:2480 Merge.rc:2508 Merge.rc:2561
+#: Merge.rc:2599 Merge.rc:2624 Merge.rc:2685 Merge.rc:2702 Merge.rc:2714
+#: Merge.rc:2878 Merge.rc:2938 Merge.rc:3097 Merge.rc:3115 Merge.rc:3158
+#: Merge.rc:3208
#, c-format
msgid "Cancel"
msgstr "Cancel·la"
#. IDD_OPEN, IDC_OPEN_STATUS
-#: Merge.rc:1982
+#: Merge.rc:1992
#, c-format
msgid "Status:"
msgstr "Estat:"
#. IDD_PLUGINS_LIST, ID_HELP
-#: Merge.rc:1983 Merge.rc:2082 Merge.rc:2929
+#: Merge.rc:1993 Merge.rc:2092 Merge.rc:2939
#, c-format
msgid "Help"
msgstr "Ajuda"
#. IDD_OPEN, IDC_OPTIONS
-#: Merge.rc:1984
+#: Merge.rc:1994
msgid "&Options..."
msgstr "O&pcions..."
#. IDD_EDIT_FIND
-#: Merge.rc:1989
+#: Merge.rc:1999
#, c-format
msgid "Find"
msgstr "Cerca"
#. IDD_EDIT_MARKER, IDC_STATIC
-#: Merge.rc:1992 Merge.rc:2009 Merge.rc:2037
+#: Merge.rc:2002 Merge.rc:2019 Merge.rc:2047
#, c-format
msgid "Fi&nd what:"
msgstr "Text a &cercar:"
#. IDD_EDIT_MARKER, IDC_EDIT_WHOLE_WORD
-#: Merge.rc:1994 Merge.rc:2013 Merge.rc:2041
+#: Merge.rc:2004 Merge.rc:2023 Merge.rc:2051
#, c-format
msgid "Match &whole word only"
msgstr "N&omés paraules senceres"
#. IDD_EDIT_MARKER, IDC_EDIT_REGEXP
-#: Merge.rc:1996 Merge.rc:2015 Merge.rc:2043
+#: Merge.rc:2006 Merge.rc:2025 Merge.rc:2053
#, c-format
msgid "Regular &expression"
msgstr "&Expressió regular"
#. IDD_EDIT_FIND, IDC_FINDDLG_DONTWRAP
-#: Merge.rc:1997
+#: Merge.rc:2007
#, c-format
msgid "D&on't wrap end of file"
msgstr "No facis la &volta al final del fitxer"
#. IDD_EDIT_FIND, IDC_FINDDLG_DONTCLOSE
-#: Merge.rc:1998
+#: Merge.rc:2008
#, c-format
msgid "&Don't close this dialog"
msgstr "No &tanquis aquesta finestra"
#. IDD_EDIT_REPLACE, IDC_EDIT_SKIP
-#: Merge.rc:1999 Merge.rc:2021
+#: Merge.rc:2009 Merge.rc:2031
#, c-format
msgid "&Find Next"
msgstr "&Següent"
#. IDD_EDIT_FIND, IDC_EDIT_FINDPREV
-#: Merge.rc:2000
+#: Merge.rc:2010
#, c-format
msgid "Find &Prev"
msgstr "&Anterior"
#. IDD_EDIT_REPLACE
-#: Merge.rc:2006
+#: Merge.rc:2016
#, c-format
msgid "Replace"
msgstr "Substitueix"
#. IDD_EDIT_REPLACE, IDC_STATIC
-#: Merge.rc:2011
+#: Merge.rc:2021
#, c-format
msgid "Re&place with:"
msgstr "Substitueix-ho p&er:"
#. IDD_EDIT_REPLACE, IDC_EDIT_SCOPE_DONT_WRAP
-#: Merge.rc:2016
+#: Merge.rc:2026
#, c-format
msgid "&Don't wrap at end of file"
msgstr "No facis la &volta al final del fitxer"
#. IDD_EDIT_REPLACE, IDC_STATIC
-#: Merge.rc:2018
+#: Merge.rc:2028
#, c-format
msgid "Replace in"
msgstr "Substitueix a"
#. IDD_EDIT_REPLACE, IDC_EDIT_SCOPE_WHOLE_FILE
-#: Merge.rc:2020
+#: Merge.rc:2030
#, c-format
msgid "Wh&ole file"
msgstr "&Fitxer sencer"
#. IDD_EDIT_REPLACE, IDC_EDIT_FINDPREV
-#: Merge.rc:2022
+#: Merge.rc:2032
msgid "Find Pre&v"
msgstr "Anterior"
#. IDD_EDIT_REPLACE, IDC_EDIT_REPLACE
-#: Merge.rc:2023
+#: Merge.rc:2033
#, c-format
msgid "&Replace"
msgstr "S&ubstitueix-ho"
#. IDD_EDIT_REPLACE, IDC_EDIT_REPLACE_ALL
-#: Merge.rc:2024
+#: Merge.rc:2034
#, c-format
msgid "Replace &All"
msgstr "Su&bstitueix-ho tot"
#. IDS_OPTIONSPG_MARKERCOLORS
-#: Merge.rc:2030 Merge.rc:4209
+#: Merge.rc:2040 Merge.rc:4219
#, c-format
msgid "Markers"
msgstr "Marques"
#. IDD_EDIT_MARKER, IDC_EDIT_MARKERS_ENABLED
-#: Merge.rc:2033
+#: Merge.rc:2043
#, c-format
msgid "Enable &markers"
msgstr "Habilita les marques"
#. IDD_FILTERS_LINEFILTERS, IDC_LFILTER_ADDBTN
-#: Merge.rc:2035 Merge.rc:2057
+#: Merge.rc:2045 Merge.rc:2067
#, c-format
msgid "New"
msgstr "Nova"
#. IDD_EDIT_MARKER, IDC_STATIC
-#: Merge.rc:2039
+#: Merge.rc:2049
#, c-format
msgid "&Background color:"
msgstr "Color de fons:"
#. IDS_MESSAGEBOX_OK
-#: Merge.rc:2044 Merge.rc:2829 Merge.rc:3086 Merge.rc:4171
+#: Merge.rc:2054 Merge.rc:2839 Merge.rc:3096 Merge.rc:4181
#, c-format
msgid "&Ok"
msgstr "&D'acord"
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:2045 Merge.rc:2525 Merge.rc:3199
+#: Merge.rc:2055 Merge.rc:2535 Merge.rc:3209
#, c-format
msgid "&Apply"
msgstr "&Aplica"
#. IDD_FILTERS_LINEFILTERS
-#: Merge.rc:2051
+#: Merge.rc:2061
msgid "Line Filters"
msgstr "Filtres de línia"
#. IDD_FILTERS_LINEFILTERS, IDC_IGNOREREGEXP
-#: Merge.rc:2054
+#: Merge.rc:2064
#, c-format
msgid "Enable Line Filters"
msgstr "Habilita els filtres de línia"
#. IDD_FILTERS_LINEFILTERS, IDC_STATIC
-#: Merge.rc:2055
+#: Merge.rc:2065
#, c-format
msgid "Regular Expressions (one per line):"
msgstr "Expressions ®ulars (una per línia):"
#. IDD_PLUGINS_LIST, IDC_PLUGIN_EDIT
-#: Merge.rc:2058 Merge.rc:2924
+#: Merge.rc:2068 Merge.rc:2934
#, c-format
msgid "Edit"
msgstr "Edita"
#. IDD_PLUGINS_LIST, IDC_PLUGIN_REMOVE
-#: Merge.rc:2059 Merge.rc:2071 Merge.rc:2925
+#: Merge.rc:2069 Merge.rc:2081 Merge.rc:2935
#, c-format
msgid "Remove"
msgstr "Suprimeix"
#. IDD_FILTERS_SUBSTITUTIONFILTERS
-#: Merge.rc:2064
+#: Merge.rc:2074
msgid "Substitution Filters"
msgstr "Filtres de substitució"
#. IDD_FILTERS_SUBSTITUTIONFILTERS, IDC_STATIC
-#: Merge.rc:2067
+#: Merge.rc:2077
msgid "Changes to the listed pairs below will be ignored or marked as insignificant. Patches are unaffected."
msgstr "Els canvis que apareixen a les subfinestres com els parells llistats a continuació seran ignorats o marcats com insignificants. Els pedaços no es veuran afectats."
#. IDD_FILTERS_SUBSTITUTIONFILTERS, IDC_IGNORED_SUSBSTITUTIONS_ENABLED
-#: Merge.rc:2068
+#: Merge.rc:2078
msgid "Enable"
msgstr "Habilita"
#. IDD_PLUGINS_LIST, IDC_PLUGIN_ADD
-#: Merge.rc:2070 Merge.rc:2923
+#: Merge.rc:2080 Merge.rc:2933
msgid "Add"
msgstr "Afegeix"
#. IDD_FILTERS_SUBSTITUTIONFILTERS, IDC_LFILTER_CLEARBTN
-#: Merge.rc:2072
+#: Merge.rc:2082
msgid "Clear"
msgstr "Esborra"
#. IDD_PREFERENCES
-#: Merge.rc:2077
+#: Merge.rc:2087
#, c-format
msgid "Options"
msgstr "Opcions"
#. IDD_PREFERENCES, IDC_TREEOPT_IMPORT
-#: Merge.rc:2086
+#: Merge.rc:2096
#, c-format
msgid "Import..."
msgstr "Importa..."
#. IDD_PREFERENCES, IDC_TREEOPT_EXPORT
-#: Merge.rc:2087
+#: Merge.rc:2097
#, c-format
msgid "Export..."
msgstr "Exporta..."
#. IDS_OPTIONSPG_GENCOMPARE
-#: Merge.rc:2092 Merge.rc:4199 Merge.rc:4202 Merge.rc:4219
+#: Merge.rc:2102 Merge.rc:4209 Merge.rc:4212 Merge.rc:4229
#, c-format
msgid "General"
msgstr "General"
#. IDD_PROPPAGE_GENERAL, IDC_SCROLL_CHECK
-#: Merge.rc:2095
+#: Merge.rc:2105
#, c-format
msgid "Automatically &scroll to first difference"
msgstr "&Desplaça automàticament fins a la primera diferència"
#. IDD_PROPPAGE_GENERAL, IDC_SCROLL_TO_FIRST_INLINE_DIFF_CHECK
-#: Merge.rc:2097
+#: Merge.rc:2107
msgid "Automatically s&croll to first inline difference"
msgstr "&Desplaça automàticament fins a la primera diferència de la línia"
#. IDD_PROPPAGE_GENERAL, IDC_STATIC
-#: Merge.rc:2099
+#: Merge.rc:2109
msgid "Cl&ose windows with 'Esc':"
msgstr "T&anca les finestres amb 'Esc':"
#. IDD_PROPPAGE_GENERAL, IDC_VERIFY_OPEN_PATHS
-#: Merge.rc:2101
+#: Merge.rc:2111
#, c-format
msgid "&Automatically verify paths in Open dialog"
msgstr "&Verifica els camins automàticament al diàleg d'obrir fitxers"
#. IDD_PROPPAGE_GENERAL, IDC_STATIC
-#: Merge.rc:2103
+#: Merge.rc:2113
msgid "Single instance mode:"
msgstr "Mode de només una instància:"
#. IDD_PROPPAGE_GENERAL, IDC_ASK_MULTIWINDOW_CLOSE
-#: Merge.rc:2105
+#: Merge.rc:2115
#, c-format
msgid "As&k when closing multiple windows"
msgstr "Pregunta abans de tancar múltiples finestres"
#. IDD_PROPPAGE_GENERAL, IDC_PRESERVE_FILETIME
-#: Merge.rc:2107
+#: Merge.rc:2117
#, c-format
msgid "&Preserve file time in file compare"
msgstr "Preserva la data en les comparacions de fitxers"
#. IDD_PROPPAGE_GENERAL, IDC_STARTUP_FOLDER_SELECT
-#: Merge.rc:2109
+#: Merge.rc:2119
#, c-format
msgid "Show \"Select Files or Folders\" dialog on startup"
msgstr "Mostra el diàlec \"Selecciona fitxers o directoris\" a l'iniciar"
#. IDD_PROPPAGE_GENERAL, IDC_CLOSE_WITH_OK
-#: Merge.rc:2111
+#: Merge.rc:2121
msgid "Close \"Select Files or Folders\" dialog on clicking Compare button"
msgstr "Tanca el diàleg \"Selecciona fitxers o directoris\" al fer clic en comparar"
#. IDD_PROPPAGE_GENERAL, IDC_STATIC
-#: Merge.rc:2113
+#: Merge.rc:2123
#, c-format
msgid "Op&en dialog Auto completion:"
msgstr "Autocompletar al diàleg d'obrir:"
#. IDD_PROPPAGE_GENERAL, IDC_STATIC
-#: Merge.rc:2115
+#: Merge.rc:2125
msgid "Auto-&reload modified files:"
msgstr "&Recarrega automàticament els fitxers modificats:"
#. IDD_PROPPAGE_GENERAL, IDC_STATIC
-#: Merge.rc:2117
+#: Merge.rc:2127
#, c-format
msgid "Language:"
msgstr "Idioma:"
#. IDD_PROPPAGE_COMPARE_WEBPAGE, IDC_COMPARE_DEFAULTS
-#: Merge.rc:2119 Merge.rc:2299 Merge.rc:2321 Merge.rc:2352 Merge.rc:2369
-#: Merge.rc:2386 Merge.rc:2394 Merge.rc:2430 Merge.rc:2454 Merge.rc:2633
-#: Merge.rc:2644 Merge.rc:2653 Merge.rc:2887 Merge.rc:2922 Merge.rc:2985
-#: Merge.rc:3010 Merge.rc:3024 Merge.rc:3038 Merge.rc:3054
+#: Merge.rc:2129 Merge.rc:2309 Merge.rc:2331 Merge.rc:2362 Merge.rc:2379
+#: Merge.rc:2396 Merge.rc:2404 Merge.rc:2440 Merge.rc:2464 Merge.rc:2643
+#: Merge.rc:2654 Merge.rc:2663 Merge.rc:2897 Merge.rc:2932 Merge.rc:2995
+#: Merge.rc:3020 Merge.rc:3034 Merge.rc:3048 Merge.rc:3064
#, c-format
msgid "Defaults"
msgstr "Predeterminats"
#. IDS_OPTIONSPG_COLORS
-#: Merge.rc:2124 Merge.rc:2140 Merge.rc:2267 Merge.rc:2292 Merge.rc:4205
+#: Merge.rc:2134 Merge.rc:2150 Merge.rc:2277 Merge.rc:2302 Merge.rc:4215
#, c-format
msgid "Colors"
msgstr "Colors"
#. IDD_PROPPAGE_COLOR_SCHEMES, IDC_STATIC
-#: Merge.rc:2127
+#: Merge.rc:2137
msgid "Color &mode:"
msgstr ""
#. IDD_PROPPAGE_COLOR_SCHEMES, IDC_STATIC
-#: Merge.rc:2129
+#: Merge.rc:2139
msgid "&Light mode scheme:"
msgstr ""
#. IDD_PROPPAGE_COLOR_SCHEMES, IDC_STATIC
-#: Merge.rc:2131
+#: Merge.rc:2141
msgid "&Dark mode scheme:"
msgstr ""
#. IDD_PROPPAGE_COLOR_SCHEMES, IDC_STATIC
-#: Merge.rc:2133
+#: Merge.rc:2143
msgid "Your custom schemes"
msgstr ""
#. IDD_PROPPAGE_COLOR_SCHEMES, IDC_COLOR_SCHEME_SAVE
-#: Merge.rc:2134
+#: Merge.rc:2144
msgid "&Save current scheme..."
msgstr ""
#. IDD_PROPPAGE_COLOR_SCHEMES, IDC_COLOR_SCHEME_DELETE
-#: Merge.rc:2135
+#: Merge.rc:2145
msgid "Delete ¤t scheme..."
msgstr ""
#. IDD_PROPPAGE_COLORS_DIR, IDC_BACKGROUND_COLUMN_LABEL
-#: Merge.rc:2143 Merge.rc:2238 Merge.rc:2258 Merge.rc:2272
+#: Merge.rc:2153 Merge.rc:2248 Merge.rc:2268 Merge.rc:2282
#, c-format
msgid "Background"
msgstr "Fons"
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2144
+#: Merge.rc:2154
#, c-format
msgid "Deleted"
msgstr "Esborrat"
#. IDS_OPTIONSPG_TEXTCOLORS
-#: Merge.rc:2145 Merge.rc:2207 Merge.rc:2239 Merge.rc:2273 Merge.rc:4207
+#: Merge.rc:2155 Merge.rc:2217 Merge.rc:2249 Merge.rc:2283 Merge.rc:4217
#, c-format
msgid "Text"
msgstr "Text"
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2146
+#: Merge.rc:2156
#, c-format
msgid "Difference:"
msgstr "Diferència:"
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2151
+#: Merge.rc:2161
#, c-format
msgid "Selected Difference:"
msgstr "Diferència seleccionada:"
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2156
+#: Merge.rc:2166
#, c-format
msgid "Ignored Difference:"
msgstr "Diferència ignorada:"
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2161
+#: Merge.rc:2171
#, c-format
msgid "Moved:"
msgstr "Text mogut:"
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2166
+#: Merge.rc:2176
#, c-format
msgid "Selected Moved:"
msgstr "Text mogut seleccionat:"
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2171
+#: Merge.rc:2181
#, c-format
msgid "Same As Next (3 panes):"
msgstr "Igual que el següent (3 subfinestres):"
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2176
+#: Merge.rc:2186
#, c-format
msgid "Same As Next (Selected):"
msgstr "Igual que el següent (seleccionat):"
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2181
+#: Merge.rc:2191
#, c-format
msgid "Word Difference:"
msgstr "Paraula diferent:"
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2186
+#: Merge.rc:2196
#, c-format
msgid "Selected Word Diff:"
msgstr "Paraula diferent seleccionada:"
#. IDD_INPUTBOX
-#: Merge.rc:2195 Merge.rc:2230 Merge.rc:2251 Merge.rc:3099
+#: Merge.rc:2205 Merge.rc:2240 Merge.rc:2261 Merge.rc:3109
#, c-format
msgid "Dialog"
msgstr "Diàleg"
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC
-#: Merge.rc:2198
+#: Merge.rc:2208
#, c-format
msgid "Keywords:"
msgstr "Paraules clau:"
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC
-#: Merge.rc:2199
+#: Merge.rc:2209
#, c-format
msgid "Function names:"
msgstr "Noms de funció:"
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC
-#: Merge.rc:2200
+#: Merge.rc:2210
#, c-format
msgid "Comments:"
msgstr "Comentaris:"
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC
-#: Merge.rc:2201
+#: Merge.rc:2211
#, c-format
msgid "Numbers:"
msgstr "Nombres:"
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC
-#: Merge.rc:2202
+#: Merge.rc:2212
#, c-format
msgid "Operators:"
msgstr "Operadors:"
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC
-#: Merge.rc:2203
+#: Merge.rc:2213
#, c-format
msgid "Strings:"
msgstr "Cadenes:"
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC
-#: Merge.rc:2204
+#: Merge.rc:2214
#, c-format
msgid "Preprocessor:"
msgstr "Preprocessador:"
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC
-#: Merge.rc:2205
+#: Merge.rc:2215
#, c-format
msgid "User 1:"
msgstr "Usuari 1:"
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC
-#: Merge.rc:2206
+#: Merge.rc:2216
#, c-format
msgid "User 2:"
msgstr "Usuari 2:"
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_SCOLOR_USER2_BOLD
-#: Merge.rc:2209 Merge.rc:2211 Merge.rc:2213 Merge.rc:2215 Merge.rc:2217
-#: Merge.rc:2219 Merge.rc:2221 Merge.rc:2223 Merge.rc:2225
+#: Merge.rc:2219 Merge.rc:2221 Merge.rc:2223 Merge.rc:2225 Merge.rc:2227
+#: Merge.rc:2229 Merge.rc:2231 Merge.rc:2233 Merge.rc:2235
#, c-format
msgid "Bold"
msgstr "Negreta"
#. IDD_PROPPAGE_COLORS_TEXT, IDC_DEFAULT_STANDARD_COLORS
-#: Merge.rc:2233
+#: Merge.rc:2243
#, c-format
msgid "&Use customized text colors"
msgstr "&Usa colors de text personalitzats"
#. IDD_PROPPAGE_COLORS_TEXT, IDC_WHITESPACE_COLOR_LABEL
-#: Merge.rc:2235
+#: Merge.rc:2245
#, c-format
msgid "Whitespace:"
msgstr "Espais:"
#. IDD_PROPPAGE_COLORS_TEXT, IDC_TEXT_COLOR_LABEL
-#: Merge.rc:2236
+#: Merge.rc:2246
#, c-format
msgid "Regular text:"
msgstr "Text regular:"
#. IDD_PROPPAGE_COLORS_TEXT, IDC_SELECTION_COLOR_LABEL
-#: Merge.rc:2237
+#: Merge.rc:2247
#, c-format
msgid "Selection:"
msgstr "Selecció:"
#. IDD_PROPPAGE_COLORS_DIR, IDC_STATIC
-#: Merge.rc:2245 Merge.rc:2286
+#: Merge.rc:2255 Merge.rc:2296
#, c-format
msgid "Margin:"
msgstr "Marge:"
#. IDD_PROPPAGE_COLORS_MARKER, IDC_MARKER0_COLOR_LABEL
-#: Merge.rc:2254
+#: Merge.rc:2264
#, c-format
msgid "Search Marker:"
msgstr "Marcador de cerca:"
#. IDD_PROPPAGE_COLORS_MARKER, IDC_MARKER1_COLOR_LABEL
-#: Merge.rc:2255
+#: Merge.rc:2265
#, c-format
msgid "User Defined Marker 1:"
msgstr "Marcador definit per l'usuari1:"
#. IDD_PROPPAGE_COLORS_MARKER, IDC_MARKER2_COLOR_LABEL
-#: Merge.rc:2256
+#: Merge.rc:2266
#, c-format
msgid "User Defined Marker 2:"
msgstr "Marcador definit per l'usuari2:"
#. IDD_PROPPAGE_COLORS_MARKER, IDC_MARKER3_COLOR_LABEL
-#: Merge.rc:2257
+#: Merge.rc:2267
#, c-format
msgid "User Defined Marker 3:"
msgstr "Marcador definit per l'usuari3:"
#. IDD_PROPPAGE_COLORS_DIR, IDC_USE_DIR_COMPARE_COLORS
-#: Merge.rc:2270
+#: Merge.rc:2280
msgid "&Use folder compare colors"
msgstr "&Usa colors comparació de carpetes"
#. IDD_PROPPAGE_COLORS_DIR, IDC_STATIC
-#: Merge.rc:2274
+#: Merge.rc:2284
msgid "Items equal:"
msgstr "Elements iguals:"
#. IDD_PROPPAGE_COLORS_DIR, IDC_STATIC
-#: Merge.rc:2277
+#: Merge.rc:2287
msgid "Items different:"
msgstr "Elements diferents:"
#. IDD_PROPPAGE_COLORS_DIR, IDC_STATIC
-#: Merge.rc:2280
+#: Merge.rc:2290
msgid "Items missing:"
msgstr "Elements que no existeixen en tots:"
#. IDD_PROPPAGE_COLORS_DIR, IDC_STATIC
-#: Merge.rc:2283
+#: Merge.rc:2293
msgid "Items filtered:"
msgstr "Elements filtrats:"
#. IDD_PROPPAGE_COLORS_SYSTEM, IDC_SYSCOLOR_HOOK_ENABLED
-#: Merge.rc:2295
+#: Merge.rc:2305
msgid "&Use custom system colors"
msgstr ""
#. IDS_PRPCAT_SYSTEM
-#: Merge.rc:2304 Merge.rc:4211 Merge.rc:4212 Merge.rc:4657
+#: Merge.rc:2314 Merge.rc:4221 Merge.rc:4222 Merge.rc:4667
#, c-format
msgid "System"
msgstr "Sistema"
#. IDD_PROPPAGE_SYSTEM, IDC_USE_RECYCLE_BIN
-#: Merge.rc:2307
+#: Merge.rc:2317
#, c-format
msgid "&Use Recycle Bin"
msgstr "&Desa els fitxers suprimits a la Paperera de reciclatge"
#. IDD_PROPPAGE_SYSTEM, IDC_STATIC
-#: Merge.rc:2308
+#: Merge.rc:2318
#, c-format
msgid "&External editor:"
msgstr "&Editor extern:"
#. IDD_PROPPAGE_SYSTEM, IDC_STATIC
-#: Merge.rc:2311
+#: Merge.rc:2321
msgid "&Store user data in:"
msgstr ""
#. IDD_PROPPAGE_SYSTEM, IDC_STATIC
-#: Merge.rc:2313
+#: Merge.rc:2323
#, c-format
msgid "&Filter folder:"
msgstr "&Carpeta de filtres:"
#. IDD_PROPPAGE_SYSTEM, IDC_STATIC
-#: Merge.rc:2316
+#: Merge.rc:2326
#, c-format
msgid "Temporary files folder"
msgstr "Carpeta temporal"
#. IDD_PROPPAGE_SYSTEM, IDC_TMPFOLDER_SYSTEM
-#: Merge.rc:2317
+#: Merge.rc:2327
#, c-format
msgid "S&ystem temp folder"
msgstr "Carpeta temporal del sistema"
#. IDD_PROPPAGE_SYSTEM, IDC_STATIC
-#: Merge.rc:2318
+#: Merge.rc:2328
#, c-format
msgid "C&ustom folder:"
msgstr "Directori personalitzat:"
#. IDD_GENERATE_PATCH, IDC_DIFF_BROWSE_FILE2
-#: Merge.rc:2320 Merge.rc:2416
+#: Merge.rc:2330 Merge.rc:2426
#, c-format
msgid "Br&owse..."
msgstr "N&avega..."
#. IDS_OPTIONSPG_COMPARE
-#: Merge.rc:2326 Merge.rc:4200
+#: Merge.rc:2336 Merge.rc:4210
#, c-format
msgid "Compare"
msgstr "Comparació"
#. IDD_PROPPAGE_COMPARE, IDC_STATIC
-#: Merge.rc:2329
+#: Merge.rc:2339
#, c-format
msgid "Whitespaces"
msgstr "Espais en blanc"
#. IDD_PROPPAGE_COMPARE, IDC_WHITESPACE
-#: Merge.rc:2330
+#: Merge.rc:2340
#, c-format
msgid "&Compare"
msgstr "Compara els &espais"
#. IDD_PROPPAGE_COMPARE, IDC_WHITE_CHANGE
-#: Merge.rc:2331
+#: Merge.rc:2341
#, c-format
msgid "&Ignore change"
msgstr "Ignora els &canvis en els espais"
#. IDD_PROPPAGE_COMPARE, IDC_ALL_WHITE
-#: Merge.rc:2332
+#: Merge.rc:2342
#, c-format
msgid "I&gnore all"
msgstr "Ignora t&ots els espais"
#. IDD_PROPPAGE_COMPARE, IDC_IGNBLANKS_CHECK
-#: Merge.rc:2333
+#: Merge.rc:2343
msgid "Ignore blan&k lines"
msgstr "&Ignora les línies en blanc"
#. IDD_PROPPAGE_COMPARE, IDC_IGNCASE_CHECK
-#: Merge.rc:2334
+#: Merge.rc:2344
msgid "Ignore &case"
msgstr "Ignora &majúscules/minúscules"
#. IDD_PROPPAGE_COMPARE, IDC_EOL_SENSITIVE
-#: Merge.rc:2335
+#: Merge.rc:2345
msgid "Igno&re EOL differences (Windows/Unix/Mac)"
msgstr ""
#. IDD_PROPPAGE_COMPARE, IDC_IGNORE_NUMBERS
-#: Merge.rc:2337
+#: Merge.rc:2347
msgid "Ignore num&bers"
msgstr "Ignora els nombres"
#. IDD_PROPPAGE_COMPARE, IDC_CP_SENSITIVE
-#: Merge.rc:2338
+#: Merge.rc:2348
msgid "Ignore codepage &differences"
msgstr "Ignora les diferències de codificació de caràcters"
#. IDD_PROPPAGE_COMPARE, IDC_FILTERCOMMENTS_CHECK
-#: Merge.rc:2339
+#: Merge.rc:2349
msgid "Ignore c&omment differences"
msgstr "Ingora les diferències en els comentaris"
#. IDD_PROPPAGE_COMPARE, IDC_IGNEOFEOL_CHECK
-#: Merge.rc:2341
+#: Merge.rc:2351
msgid "Ignore &missing trailing EOL"
msgstr ""
#. IDD_PROPPAGE_COMPARE, IDC_IGNLBRKS_CHECK
-#: Merge.rc:2343
+#: Merge.rc:2353
msgid "Ignore line &breaks (treat as spaces)"
msgstr ""
#. IDD_PROPPAGE_COMPARE, IDC_MOVED_BLOCKS
-#: Merge.rc:2345
+#: Merge.rc:2355
#, c-format
msgid "E&nable moved block detection"
msgstr "&Habilita detecció de blocs desplaçats"
#. IDD_PROPPAGE_COMPARE, IDC_ALIGN_SIMILAR_LINES
-#: Merge.rc:2346
+#: Merge.rc:2356
msgid "Align &similar lines"
msgstr "Em&parella les línies similars"
#. IDD_PROPPAGE_COMPARE, IDC_STATIC
-#: Merge.rc:2347
+#: Merge.rc:2357
msgid "Diff &algorithm:"
msgstr "Algoritme de diferenciació:"
#. IDD_PROPPAGE_COMPARE, IDC_INDENT_HEURISTIC
-#: Merge.rc:2349
+#: Merge.rc:2359
msgid "Enable indent &heuristic"
msgstr "Habilita la heurística de sagnat"
#. IDD_PROPPAGE_COMPARE, IDC_COMPLETELY_BLANK_OUT_IGNORED_DIFFERENCES
-#: Merge.rc:2350
+#: Merge.rc:2360
msgid "Completely unhighlight the ignored differences"
msgstr "No ressaltis les diferències ignorades"
#. IDS_OPTIONSPG_EDITOR
-#: Merge.rc:2357 Merge.rc:4201
+#: Merge.rc:2367 Merge.rc:4211
#, c-format
msgid "Editor"
msgstr "Editor"
#. IDD_PROPPAGE_EDITOR, IDC_HILITE_CHECK
-#: Merge.rc:2360
+#: Merge.rc:2370
#, c-format
msgid "&Highlight syntax"
msgstr "&Ressalta la sintaxi"
#. IDD_PROPPAGE_EDITOR, IDC_MIXED_EOL
-#: Merge.rc:2361
+#: Merge.rc:2371
#, c-format
msgid "&Preserve original EOL"
msgstr "&Preserva els caràcters de salt de línia originals"
#. IDD_PROPPAGE_EDITOR, IDC_STATIC
-#: Merge.rc:2362
+#: Merge.rc:2372
#, c-format
msgid "Tabs"
msgstr "Tabulacions"
#. IDD_PROPPAGE_EDITOR, IDC_STATIC
-#: Merge.rc:2363
+#: Merge.rc:2373
#, c-format
msgid "&Tab size:"
msgstr "&Mida de les tabulacions:"
#. IDD_PROPPAGE_EDITOR, IDC_PROP_INSERT_TABS
-#: Merge.rc:2365
+#: Merge.rc:2375
#, c-format
msgid "&Insert tabs"
msgstr "&Insereix tabulacions"
#. IDD_PROPPAGE_EDITOR, IDC_PROP_INSERT_SPACES
-#: Merge.rc:2366
+#: Merge.rc:2376
#, c-format
msgid "Insert &spaces"
msgstr "In&sereix espais"
#. IDD_PROPPAGE_EDITOR, IDC_STATIC
-#: Merge.rc:2367
+#: Merge.rc:2377
msgid "&Rendering mode:"
msgstr "&Mode de renderització:"
#. IDD_PROPPAGE_EDITOR_COMPAREMERGE, IDC_AUTOMRESCAN_CHECK
-#: Merge.rc:2376
+#: Merge.rc:2386
#, c-format
msgid "&Automatic rescan"
msgstr "Reexploració &automàtica"
#. IDD_PROPPAGE_EDITOR_COMPAREMERGE, IDC_STATIC
-#: Merge.rc:2377
+#: Merge.rc:2387
msgid "Copy &granularity for selected differences:"
msgstr "Copia la &granularitat per a les diferències seleccionades:"
#. IDD_PROPPAGE_EDITOR_COMPAREMERGE, IDC_LINE_COLORING_GROUP
-#: Merge.rc:2379
+#: Merge.rc:2389
#, c-format
msgid "Line Difference Coloring"
msgstr "Acoloriment de diferència de línia"
#. IDD_PROPPAGE_EDITOR_COMPAREMERGE, IDC_VIEW_LINE_DIFFERENCES
-#: Merge.rc:2380
+#: Merge.rc:2390
#, c-format
msgid "View line differences"
msgstr "&Veure les diferències de la línia"
#. IDD_PROPPAGE_EDITOR_COMPAREMERGE, IDC_EDITOR_CHARLEVEL
-#: Merge.rc:2381
+#: Merge.rc:2391
#, c-format
msgid "&Character-level"
msgstr "Nivell de &caràcter"
#. IDD_PROPPAGE_EDITOR_COMPAREMERGE, IDC_EDITOR_WORDLEVEL
-#: Merge.rc:2382
+#: Merge.rc:2392
#, c-format
msgid "&Word-level:"
msgstr "Nivell de ¶ula:"
#. IDD_PROPPAGE_EDITOR_COMPAREMERGE, IDC_STATIC
-#: Merge.rc:2384
+#: Merge.rc:2394
#, c-format
msgid "W&ord break characters:"
msgstr "Caràcters de separació de paraules:"
#. IDD_PROPPAGE_MESSAGEBOXES, IDC_STATIC
-#: Merge.rc:2401
+#: Merge.rc:2411
msgid "Some messages can be hidden by the user. Press Reset to make all messages visible again."
msgstr "El WinMerge permet ocultar alguns quadres de missatges comuns. Premeu el botó Reinicialitza per fer visibles tots els quadres de missatges altre cop."
#. IDD_SELECT_FILES_OR_FOLDERS, IDC_RESET
-#: Merge.rc:2402 Merge.rc:3085
+#: Merge.rc:2412 Merge.rc:3095
#, c-format
msgid "Reset"
msgstr "Reinicialitza"
#. IDD_GENERATE_PATCH
-#: Merge.rc:2408
+#: Merge.rc:2418
#, c-format
msgid "Patch Generator"
msgstr "Generador de pedaços"
#. IDD_GENERATE_PATCH, IDC_STATIC
-#: Merge.rc:2411
+#: Merge.rc:2421
#, c-format
msgid "File&1:"
msgstr "Fitxer &1:"
#. IDD_GENERATE_PATCH, IDC_STATIC
-#: Merge.rc:2414
+#: Merge.rc:2424
#, c-format
msgid "File&2:"
msgstr "Fitxer &2:"
#. IDD_GENERATE_PATCH, IDC_DIFF_SWAPFILES
-#: Merge.rc:2417
+#: Merge.rc:2427
#, c-format
msgid "&Swap"
msgstr "Inter&canvia"
#. IDD_DIRCMP_REPORT, IDC_REPORT_COPYCLIPBOARD
-#: Merge.rc:2418 Merge.rc:2690
+#: Merge.rc:2428 Merge.rc:2700
#, c-format
msgid "&Copy to clipboard"
msgstr "&Copia al Porta-retalls"
#. IDD_GENERATE_PATCH, IDC_DIFF_APPENDFILE
-#: Merge.rc:2419
+#: Merge.rc:2429
#, c-format
msgid "&Append to existing file"
msgstr "A&fegeix al final del fitxer existent"
#. IDD_GENERATE_PATCH, IDC_STATIC
-#: Merge.rc:2420
+#: Merge.rc:2430
#, c-format
msgid "&Result:"
msgstr "&Resultat:"
#. IDD_GENERATE_PATCH, IDC_DIFF_BROWSE_RESULT
-#: Merge.rc:2422
+#: Merge.rc:2432
#, c-format
msgid "Bro&wse..."
msgstr "N&avega..."
#. IDD_GENERATE_PATCH, IDC_STATIC
-#: Merge.rc:2423
+#: Merge.rc:2433
#, c-format
msgid "&Format"
msgstr "Format"
#. IDD_GENERATE_PATCH, IDC_STATIC
-#: Merge.rc:2424
+#: Merge.rc:2434
#, c-format
msgid "St&yle:"
msgstr "E&stil:"
#. IDD_GENERATE_PATCH, IDC_STATIC
-#: Merge.rc:2426
+#: Merge.rc:2436
#, c-format
msgid "&Context:"
msgstr "Context:"
#. IDD_GENERATE_PATCH, IDC_DIFF_INCLCMDLINE
-#: Merge.rc:2428
+#: Merge.rc:2438
#, c-format
msgid "Inclu&de command line"
msgstr "Inc&lou-hi la línia d'ordres"
#. IDD_GENERATE_PATCH, IDC_DIFF_OPENTOEDITOR
-#: Merge.rc:2429
+#: Merge.rc:2439
#, c-format
msgid "Open in e&xternal editor"
msgstr "Obre-ho en un &editor extern"
#. IDD_DIRCOLS
-#: Merge.rc:2446
+#: Merge.rc:2456
#, c-format
msgid "Display Columns"
msgstr "Visualització de columnes"
#. IDD_DIRCOLS, IDC_UP
-#: Merge.rc:2450
+#: Merge.rc:2460
#, c-format
msgid "Move &Up"
msgstr "Mou Am&unt"
#. IDD_DIRCOLS, IDC_DOWN
-#: Merge.rc:2451
+#: Merge.rc:2461
#, c-format
msgid "Move &Down"
msgstr "Mou a&vall"
#. IDD_DIRCOLS, IDC_COLDLG_ADDITIONAL_PROPERTIES
-#: Merge.rc:2453
+#: Merge.rc:2463
msgid "&Additional Properties"
msgstr "Propietats addicionals"
#. IDD_DIRADDITIONALPROPS
-#: Merge.rc:2461
+#: Merge.rc:2471
msgid "Additional Properties"
msgstr "Propietats addicionals"
#. IDD_PLUGINS_SELECTPLUGIN
-#: Merge.rc:2475
+#: Merge.rc:2485
msgid "Select Plugin"
msgstr "Selecciona el connector"
#. IDD_PLUGINS_EDITPLUGIN, IDC_STATIC
-#: Merge.rc:2478 Merge.rc:3115
+#: Merge.rc:2488 Merge.rc:3125
msgid "Plugin &name:"
msgstr "Nom del connector:"
#. IDD_PLUGINS_SELECTPLUGIN, IDC_STATIC
-#: Merge.rc:2480
+#: Merge.rc:2490
msgid "&Target files:"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN, IDC_STATIC
-#: Merge.rc:2482 Merge.rc:3117
+#: Merge.rc:2492 Merge.rc:3127
#, c-format
msgid "Extensions list:"
msgstr "Llistat d'extensions:"
#. IDD_PLUGINS_EDITPLUGIN, IDC_STATIC
-#: Merge.rc:2484 Merge.rc:3119
+#: Merge.rc:2494 Merge.rc:3129
#, c-format
msgid "Description:"
msgstr "&Descripció:"
#. IDD_PLUGINS_EDITPLUGIN, IDC_STATIC
-#: Merge.rc:2486 Merge.rc:3121
+#: Merge.rc:2496 Merge.rc:3131
msgid "Default arguments:"
msgstr "Paràmetres per defecte:"
#. IDD_PLUGINS_SELECTPLUGIN, IDC_PLUGIN_ALLOW_ALL
-#: Merge.rc:2488
+#: Merge.rc:2498
msgid "Display all plugins (Ignore extension)"
msgstr "&Visualitza tots els connectors, sense verificar l'extensió"
#. IDD_PLUGINS_SELECTPLUGIN, IDC_PLUGIN_OPEN_IN_SAME_FRAME_TYPE
-#: Merge.rc:2490
+#: Merge.rc:2500
msgid "&Open files in same window type after unpacking"
msgstr "Obre els fitxers al mateix tipus de finestra després de desempaquetar"
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_PIPELINE_STATIC
-#: Merge.rc:2492 Merge.rc:3129
+#: Merge.rc:2502 Merge.rc:3139
msgid "&Plugin pipeline:"
msgstr "Etapes del connector:"
#. IDD_PLUGINS_SELECTPLUGIN, IDC_PLUGIN_ALIAS
-#: Merge.rc:2495
+#: Merge.rc:2505
msgid "&Alias..."
msgstr ""
#. IDD_DIRCOMP_PROGRESS, IDC_COMPARISON_STOP
-#: Merge.rc:2505
+#: Merge.rc:2515
#, c-format
msgid "Stop"
msgstr "&Atura"
#. IDD_DIRCOMP_PROGRESS, IDC_COMPARISON_PAUSE
-#: Merge.rc:2506
+#: Merge.rc:2516
#, c-format
msgid "Pause"
msgstr "Pausa"
#. IDD_DIRCOMP_PROGRESS, IDC_COMPARISON_CONTINUE
-#: Merge.rc:2507
+#: Merge.rc:2517
#, c-format
msgid "Continue"
msgstr "Continua"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC
-#: Merge.rc:2509 Merge.rc:2973
+#: Merge.rc:2519 Merge.rc:2983
msgid "C&PU cores to use:"
msgstr "&Nombre de nuclis CPU a utilitzar:"
#. IDD_DIRCOMP_PROGRESS, IDC_STATIC
-#: Merge.rc:2510
+#: Merge.rc:2520
#, c-format
msgid "Items total:"
msgstr "Elements totals:"
#. IDD_DIRCOMP_PROGRESS, IDC_STATIC
-#: Merge.rc:2511
+#: Merge.rc:2521
#, c-format
msgid "Items compared:"
msgstr "Elements comparats:"
#. IDS_PREVIEWBAR_CLOSE
-#: Merge.rc:2526 Merge.rc:2846 Merge.rc:5328
+#: Merge.rc:2536 Merge.rc:2856 Merge.rc:5339
#, c-format
msgid "&Close"
msgstr "&Tanca"
#. IDD_WMGOTO
-#: Merge.rc:2537
+#: Merge.rc:2547
msgid "Go to"
msgstr "Ves a"
#. IDD_WMGOTO, IDC_STATIC
-#: Merge.rc:2540
+#: Merge.rc:2550
msgid "G&o to:"
msgstr "&Ves a:"
#. IDD_WMGOTO, IDC_STATIC
-#: Merge.rc:2543
+#: Merge.rc:2553
#, c-format
msgid "File"
msgstr "Fitxer"
#. IDD_WMGOTO, IDC_STATIC
-#: Merge.rc:2547
+#: Merge.rc:2557
msgid "Go to what"
msgstr "Anar a on"
#. IDD_WMGOTO, IDC_WMGOTO_TOLINE
-#: Merge.rc:2548
+#: Merge.rc:2558
#, c-format
msgid "Li&ne"
msgstr "&Línia"
#. IDD_WMGOTO, IDC_WMGOTO_TODIFF
-#: Merge.rc:2549
+#: Merge.rc:2559
#, c-format
msgid "&Difference"
msgstr "&Diferència"
#. IDD_WMGOTO, IDOK
-#: Merge.rc:2550
+#: Merge.rc:2560
msgid "&Go to"
msgstr "&Ves a"
#. IDS_PROJECT_ITEM_FILE_FILTER
-#: Merge.rc:2556 Merge.rc:4321
+#: Merge.rc:2566 Merge.rc:4331
msgid "File Filters"
msgstr "Filtres de fitxer"
#. IDD_FILTERS_FILEFILTERS, IDC_STATIC
-#: Merge.rc:2559
+#: Merge.rc:2569
msgid "&Mask / Filter Expression"
msgstr ""
#. IDD_FILTERS_FILEFILTERS, IDC_STATIC
-#: Merge.rc:2562
+#: Merge.rc:2572
msgid "Preset &Filters"
msgstr ""
#. IDD_FILTERS_FILEFILTERS, IDC_FILTERFILE_TEST_BTN
-#: Merge.rc:2564
+#: Merge.rc:2574
msgid "Test..."
msgstr "&Prova..."
#. IDD_FILTERS_FILEFILTERS, IDC_FILTERFILE_INSTALL
-#: Merge.rc:2565
+#: Merge.rc:2575
#, c-format
msgid "Install..."
msgstr "&Instal·la..."
#. IDD_FILTERS_FILEFILTERS, IDC_FILTERFILE_NEWBTN
-#: Merge.rc:2566
+#: Merge.rc:2576
#, c-format
msgid "New..."
msgstr "&Nou..."
#. IDD_FILTERS_FILEFILTERS, IDC_FILTERFILE_EDITBTN
-#: Merge.rc:2567
+#: Merge.rc:2577
#, c-format
msgid "Edit..."
msgstr "&Edita..."
#. IDD_FILTERS_FILEFILTERS, IDC_FILTERFILE_DELETEBTN
-#: Merge.rc:2568
+#: Merge.rc:2578
#, c-format
msgid "Delete..."
msgstr "&Suprimeix..."
#. IDD_FILTERS_CONDITION
-#: Merge.rc:2573
+#: Merge.rc:2583
msgid "Filter Condition"
msgstr ""
#. IDD_FILTERS_CONDITION, IDC_STATIC
-#: Merge.rc:2576
+#: Merge.rc:2586
msgid "&Left-hand side:"
msgstr ""
#. IDD_FILTERS_CONDITION, IDC_STATIC
-#: Merge.rc:2578
+#: Merge.rc:2588
msgid "&Operator:"
msgstr ""
#. IDD_FILTERS_CONDITION, IDC_STATIC
-#: Merge.rc:2580
+#: Merge.rc:2590
msgid "&Right-hand side:"
msgstr ""
#. IDD_FILTERS_CONDITION, IDC_STATIC
-#: Merge.rc:2586
+#: Merge.rc:2596
msgid "Expression:"
msgstr ""
#. IDD_COMPARISON_RESULT_FILTER
-#: Merge.rc:2595
+#: Merge.rc:2605
msgid "Filter by Comparison Result"
msgstr ""
#. IDD_COMPARISON_RESULT_FILTER, IDC_RADIO_INCLUDE
-#: Merge.rc:2598
+#: Merge.rc:2608
msgid "&Include"
msgstr ""
#. IDD_COMPARISON_RESULT_FILTER, IDC_RADIO_EXCLUDE
-#: Merge.rc:2599
+#: Merge.rc:2609
msgid "&Exclude"
msgstr ""
#. IDD_COMPARISON_RESULT_FILTER, IDC_STATIC
-#: Merge.rc:2600
+#: Merge.rc:2610
msgid "Comparison Results"
msgstr ""
#. IDS_IDENTICAL
-#: Merge.rc:2601 Merge.rc:2733 Merge.rc:2794 Merge.rc:4698
+#: Merge.rc:2611 Merge.rc:2743 Merge.rc:2804 Merge.rc:4708
#, c-format
msgid "Identical"
msgstr "Idèntics"
#. IDS_DIFFERENT
-#: Merge.rc:2602 Merge.rc:2714 Merge.rc:2755 Merge.rc:4708
+#: Merge.rc:2612 Merge.rc:2724 Merge.rc:2765 Merge.rc:4718
#, c-format
msgid "Different"
msgstr "Diferents"
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_LEFT_ONLY
-#: Merge.rc:2603
+#: Merge.rc:2613
msgid "Left only"
msgstr ""
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_RIGHT_ONLY
-#: Merge.rc:2604
+#: Merge.rc:2614
msgid "Right only"
msgstr ""
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_SKIPPED
-#: Merge.rc:2605
+#: Merge.rc:2615
msgid "Skipped"
msgstr ""
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_MIDDLE_ONLY
-#: Merge.rc:2606
+#: Merge.rc:2616
msgid "Middle only"
msgstr ""
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_LEFT_ONLY_DIFFERENT
-#: Merge.rc:2607
+#: Merge.rc:2617
msgid "Left only (different)"
msgstr ""
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_MIDDLE_ONLY_DIFFERENT
-#: Merge.rc:2608
+#: Merge.rc:2618
msgid "Middle only (different)"
msgstr ""
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_RIGHT_ONLY_DIFFERENT
-#: Merge.rc:2609
+#: Merge.rc:2619
msgid "Right only (different)"
msgstr ""
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_LEFT_ONLY_MISSING
-#: Merge.rc:2610
+#: Merge.rc:2620
msgid "Left only (missing)"
msgstr ""
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_MIDDLE_ONLY_MISSING
-#: Merge.rc:2611
+#: Merge.rc:2621
msgid "Middle only (missing)"
msgstr ""
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_RIGHT_ONLY_MISSING
-#: Merge.rc:2612
+#: Merge.rc:2622
msgid "Right only (missing)"
msgstr ""
#. IDS_OPTIONSPG_CODEPAGE
-#: Merge.rc:2619 Merge.rc:2811 Merge.rc:4213
+#: Merge.rc:2629 Merge.rc:2821 Merge.rc:4223
#, c-format
msgid "Codepage"
msgstr "Codificació de caràcters"
#. IDD_PROPPAGE_CODEPAGE, IDC_STATIC
-#: Merge.rc:2622
+#: Merge.rc:2632
#, c-format
msgid "Default Codepage"
msgstr "Codificació de caràcters predeterminada"
#. IDD_PROPPAGE_CODEPAGE, IDC_STATIC
-#: Merge.rc:2623
+#: Merge.rc:2633
#, c-format
msgid "Select the default codepage for non-Unicode files:"
msgstr "Selecciona la codificació de caràcters predeterminada que s'utilitzarà en carregar fitxers no-Unicode:"
#. IDD_PROPPAGE_CODEPAGE, IDC_CP_SYSTEM
-#: Merge.rc:2624
+#: Merge.rc:2634
#, c-format
msgid "System codepage"
msgstr "Codificació de caràcters del sistema"
#. IDD_PROPPAGE_CODEPAGE, IDC_CP_UI
-#: Merge.rc:2625
+#: Merge.rc:2635
#, c-format
msgid "According to WinMerge User Interface"
msgstr "En funció de l'idioma de l'interfície d'usuari del WinMerge"
#. IDD_PROPPAGE_CODEPAGE, IDC_CP_CUSTOM
-#: Merge.rc:2626
+#: Merge.rc:2636
#, c-format
msgid "Custom codepage:"
msgstr "Codificació de caràcters personalitzada:"
#. IDD_PROPPAGE_CODEPAGE, IDC_DETECT_CODEPAGE
-#: Merge.rc:2628
+#: Merge.rc:2638
msgid ""
"Detect codepage for: .html, .rc, .xml\n"
"Restart required."
@@ -4475,7 +4486,7 @@ msgstr ""
"Cal reiniciar l'aplicació."
#. IDD_PROPPAGE_CODEPAGE, IDC_DETECT_CODEPAGE2
-#: Merge.rc:2630
+#: Merge.rc:2640
msgid ""
"Detect codepage for files with mlang.dll\n"
"Restart required."
@@ -4484,857 +4495,857 @@ msgstr ""
"Cal reiniciar l'aplicació."
#. IDS_OPTIONSPG_ARCHIVE
-#: Merge.rc:2638 Merge.rc:4214
+#: Merge.rc:2648 Merge.rc:4224
#, c-format
msgid "Archive Support"
msgstr "Suport d'arxivament"
#. IDD_PROPPAGE_ARCHIVE, IDC_ARCHIVE_ENABLE
-#: Merge.rc:2641
+#: Merge.rc:2651
#, c-format
msgid "&Enable archive file support"
msgstr "&Habilita el suport de fitxers d'arxivament"
#. IDD_PROPPAGE_ARCHIVE, IDC_ARCHIVE_DETECTTYPE
-#: Merge.rc:2642
+#: Merge.rc:2652
#, c-format
msgid "&Detect archive type from file signature"
msgstr "&Detecta el tipus d'arxiu a partir de la signatura del fitxer"
#. IDD_PROPPAGE_PROJECT, IDC_STATIC
-#: Merge.rc:2651
+#: Merge.rc:2661
msgid "Items saved to or restored from the project file:"
msgstr "Elements desats a o restaurats del fitxer de projecte:"
#. IDD_SAVECLOSING
-#: Merge.rc:2658
+#: Merge.rc:2668
#, c-format
msgid "Save Modified Files?"
msgstr "Voleu desar els fitxers modificats?"
#. IDD_SAVECLOSING, IDC_SAVECLOSING_LEFTFRAME
-#: Merge.rc:2661
+#: Merge.rc:2671
#, c-format
msgid "Left side file"
msgstr "Fitxer del costat esquerre"
#. IDD_SAVECLOSING, IDC_SAVECLOSING_SAVELEFT
-#: Merge.rc:2663
+#: Merge.rc:2673
#, c-format
msgid "&Save changes"
msgstr "&Desa-hi els canvis"
#. IDD_SAVECLOSING, IDC_SAVECLOSING_DISCARDLEFT
-#: Merge.rc:2664
+#: Merge.rc:2674
#, c-format
msgid "&Discard changes"
msgstr "D&escarta'n els canvis"
#. IDD_SAVECLOSING, IDC_SAVECLOSING_MIDDLEFRAME
-#: Merge.rc:2665
+#: Merge.rc:2675
#, c-format
msgid "Middle side file"
msgstr "Fitxer del Mig"
#. IDD_SAVECLOSING, IDC_SAVECLOSING_SAVEMIDDLE
-#: Merge.rc:2667
+#: Merge.rc:2677
#, c-format
msgid "Sa&ve changes"
msgstr "Desa els canvis"
#. IDD_SAVECLOSING, IDC_SAVECLOSING_DISCARDMIDDLE
-#: Merge.rc:2668
+#: Merge.rc:2678
#, c-format
msgid "Discard c&hanges"
msgstr "D&escarta'n els canvis"
#. IDD_SAVECLOSING, IDC_SAVECLOSING_RIGHTFRAME
-#: Merge.rc:2669
+#: Merge.rc:2679
#, c-format
msgid "Right side file"
msgstr "Fitxer del costat dret"
#. IDD_SAVECLOSING, IDC_SAVECLOSING_SAVERIGHT
-#: Merge.rc:2671
+#: Merge.rc:2681
#, c-format
msgid "S&ave changes"
msgstr "De&sa-hi els canvis"
#. IDD_SAVECLOSING, IDC_SAVECLOSING_DISCARDRIGHT
-#: Merge.rc:2672
+#: Merge.rc:2682
#, c-format
msgid "Dis&card changes"
msgstr "Des&carta'n els canvis"
#. IDD_SAVECLOSING, IDC_SAVECLOSING_DISCARDALL
-#: Merge.rc:2673
+#: Merge.rc:2683
#, c-format
msgid "Disca&rd All"
msgstr "Descarta-ho tot"
#. IDD_DIRCMP_REPORT
-#: Merge.rc:2680
+#: Merge.rc:2690
#, c-format
msgid "Folder Compare Report"
msgstr "Informe de comparació de directoris"
#. IDD_DIRCMP_REPORT, IDC_STATIC
-#: Merge.rc:2683
+#: Merge.rc:2693
#, c-format
msgid "Report &file:"
msgstr "&Fitxer d'informe:"
#. IDD_DIRCMP_REPORT, IDC_STATIC
-#: Merge.rc:2686
+#: Merge.rc:2696
#, c-format
msgid "&Style:"
msgstr "&Estil:"
#. IDD_DIRCMP_REPORT, IDC_REPORT_INCLUDEFILECMPREPORT
-#: Merge.rc:2688
+#: Merge.rc:2698
#, c-format
msgid "&Include file compare report"
msgstr "Inclou l'informa de comparació de fitxers"
#. IDD_FILTERS_FILEFILTERS_SHARED
-#: Merge.rc:2697
+#: Merge.rc:2707
#, c-format
msgid "Shared or Private Filter"
msgstr "Filtre compartit o privat"
#. IDD_FILTERS_FILEFILTERS_SHARED, IDC_STATIC
-#: Merge.rc:2700
+#: Merge.rc:2710
#, c-format
msgid "What type of filter do you want?"
msgstr "Quina mena de filtre voleu crear?"
#. IDD_FILTERS_FILEFILTERS_SHARED, IDC_SHARED
-#: Merge.rc:2701
+#: Merge.rc:2711
#, c-format
msgid "Shared Filter (for all users)"
msgstr "Filtre compartit (per a tots els usuaris d'aquesta màquina)"
#. IDD_FILTERS_FILEFILTERS_SHARED, IDC_PRIVATE
-#: Merge.rc:2702
+#: Merge.rc:2712
#, c-format
msgid "Private Filter (current user only)"
msgstr "Filtre privat (només per a l'usuari actual)"
#. IDD_COMPARE_STATISTICS3
-#: Merge.rc:2709 Merge.rc:2750
+#: Merge.rc:2719 Merge.rc:2760
#, c-format
msgid "Compare Statistics"
msgstr "Estadístiques de comparació"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2712 Merge.rc:2753
+#: Merge.rc:2722 Merge.rc:2763
#, c-format
msgid "Folders:"
msgstr "Carpetes:"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2713 Merge.rc:2754
+#: Merge.rc:2723 Merge.rc:2764
#, c-format
msgid "Files:"
msgstr "Fitxers:"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2719 Merge.rc:2738 Merge.rc:2760 Merge.rc:2799
+#: Merge.rc:2729 Merge.rc:2748 Merge.rc:2770 Merge.rc:2809
#, c-format
msgid "Binary:"
msgstr "Binaris:"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2722 Merge.rc:2763
+#: Merge.rc:2732 Merge.rc:2773
#, c-format
msgid "Unique"
msgstr "Únics"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2723 Merge.rc:2764
+#: Merge.rc:2733 Merge.rc:2774
#, c-format
msgid "Left:"
msgstr "Esquerra:"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2728 Merge.rc:2774
+#: Merge.rc:2738 Merge.rc:2784
#, c-format
msgid "Right:"
msgstr "Dreta:"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2742 Merge.rc:2803
+#: Merge.rc:2752 Merge.rc:2813
#, c-format
msgid "Total:"
msgstr "Elements totals:"
#. IDD_COMPARE_STATISTICS3, IDOK
-#: Merge.rc:2745 Merge.rc:2806
+#: Merge.rc:2755 Merge.rc:2816
#, c-format
msgid "Close"
msgstr "Tanca"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2769
+#: Merge.rc:2779
#, c-format
msgid "Middle:"
msgstr "Mig:"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2779
+#: Merge.rc:2789
#, c-format
msgid "Missing Left:"
msgstr "Manca a l'Esquerra:"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2784
+#: Merge.rc:2794
#, c-format
msgid "Missing Middle:"
msgstr "Manca al Mig:"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2789
+#: Merge.rc:2799
#, c-format
msgid "Missing Right:"
msgstr "Manca a la dreta:"
#. IDD_LOAD_SAVE_CODEPAGE, IDC_AFFECTS_GROUP
-#: Merge.rc:2814
+#: Merge.rc:2824
#, c-format
msgid "Affects"
msgstr "Afectament"
#. IDD_LOAD_SAVE_CODEPAGE, IDC_RIGHT_FILES_LABEL
-#: Merge.rc:2816 Merge.rc:2818 Merge.rc:2820
+#: Merge.rc:2826 Merge.rc:2828 Merge.rc:2830
#, c-format
msgid "(Affects)"
msgstr "(Afecta)"
#. IDD_LOAD_SAVE_CODEPAGE, IDC_LOADING_GROUP
-#: Merge.rc:2821
+#: Merge.rc:2831
#, c-format
msgid "Select Codepage for"
msgstr "Selecciona la codificació de caràcters per a"
#. IDD_LOAD_SAVE_CODEPAGE, IDC_LOAD_FILES_LABEL
-#: Merge.rc:2822
+#: Merge.rc:2832
#, c-format
msgid "&File Loading:"
msgstr "&Càrrega de fitxers:"
#. IDD_LOAD_SAVE_CODEPAGE, IDC_SAVE_FILES_LABEL
-#: Merge.rc:2824
+#: Merge.rc:2834
#, c-format
msgid "File &Saving:"
msgstr "&Desament de fitxers:"
#. IDD_LOAD_SAVE_CODEPAGE, IDC_LOAD_SAVE_SAME_CODEPAGE
-#: Merge.rc:2827
+#: Merge.rc:2837
#, c-format
msgid "&Use same codepage for both"
msgstr "&Empra la mateixa codificació de caràcters a ambdós"
#. IDS_MESSAGEBOX_CANCEL
-#: Merge.rc:2830 Merge.rc:4172
+#: Merge.rc:2840 Merge.rc:4182
#, c-format
msgid "&Cancel"
msgstr "&Cancel·la"
#. IDD_FILTERS_FILEFILTERS_TEST
-#: Merge.rc:2835
+#: Merge.rc:2845
#, c-format
msgid "Test Filter"
msgstr "Prova de filtre"
#. IDD_FILTERS_FILEFILTERS_TEST, IDC_HEADER
-#: Merge.rc:2838
+#: Merge.rc:2848
msgid "Testing filter:"
msgstr "Provant el filtre:"
#. IDD_FILTERS_FILEFILTERS_TEST, IDC_PROMPT_LABEL
-#: Merge.rc:2840
+#: Merge.rc:2850
#, c-format
msgid "&Enter text to test:"
msgstr "&Introduïu el text a provar:"
#. IDD_FILTERS_FILEFILTERS_TEST, IDC_IS_DIRECTORY
-#: Merge.rc:2842
+#: Merge.rc:2852
#, c-format
msgid "&Folder Name"
msgstr "&Nom de la carpeta"
#. IDD_FILTERS_FILEFILTERS_TEST, IDC_STATIC
-#: Merge.rc:2843
+#: Merge.rc:2853
#, c-format
msgid "Result:"
msgstr "Resultat:"
#. IDD_FILTERS_FILEFILTERS_TEST, IDC_TEST_BTN
-#: Merge.rc:2845
+#: Merge.rc:2855
#, c-format
msgid "&Test"
msgstr "&Prova"
#. IDS_OPTIONSPG_TABLECOMPARE
-#: Merge.rc:2851 Merge.rc:2990 Merge.rc:4228
+#: Merge.rc:2861 Merge.rc:3000 Merge.rc:4238
msgid "Table"
msgstr "Taula"
#. IDD_OPEN_TABLE, IDC_STATIC
-#: Merge.rc:2854
+#: Merge.rc:2864
msgid "File type"
msgstr "Tipus de fitxers"
#. IDD_OPEN_TABLE, IDC_COMPARETABLE_CSV
-#: Merge.rc:2855
+#: Merge.rc:2865
msgid "&CSV"
msgstr "&CSV"
#. IDD_OPEN_TABLE, IDC_COMPARETABLE_TSV
-#: Merge.rc:2856
+#: Merge.rc:2866
msgid "&TSV"
msgstr "&TSV"
#. IDD_OPEN_TABLE, IDC_COMPARETABLE_DSV
-#: Merge.rc:2857
+#: Merge.rc:2867
msgid "Custom &Delimiter-Separated Values"
msgstr "Valors separats amb un &delimitador personalitzat"
#. IDD_PROPPAGE_COMPARE_TABLE, IDC_STATIC
-#: Merge.rc:2859 Merge.rc:2861 Merge.rc:2996 Merge.rc:3004
+#: Merge.rc:2869 Merge.rc:2871 Merge.rc:3006 Merge.rc:3014
msgid "D&elimiter character:"
msgstr "Caràcter d&elimitador:"
#. IDD_PROPPAGE_COMPARE_TABLE, IDC_COMPARETABLE_ALLOWNEWLINE
-#: Merge.rc:2863 Merge.rc:3006
+#: Merge.rc:2873 Merge.rc:3016
msgid "&Allow newlines in quotes"
msgstr "Permet salts de línia entre cometes"
#. IDD_PROPPAGE_COMPARE_TABLE, IDC_STATIC
-#: Merge.rc:2865 Merge.rc:3008
+#: Merge.rc:2875 Merge.rc:3018
msgid "&Quote character:"
msgstr "Caràcter de cometes:"
#. IDS_OPTIONSPG_BACKUPS
-#: Merge.rc:2873 Merge.rc:4216
+#: Merge.rc:2883 Merge.rc:4226
#, c-format
msgid "Backup Files"
msgstr "Fitxers de còpia de seguretat"
#. IDD_PROPPAGE_BACKUPS, IDC_STATIC
-#: Merge.rc:2876
+#: Merge.rc:2886
#, c-format
msgid "Create backup files for:"
msgstr "Crea els fitxers de còpia de seguretat en:"
#. IDD_PROPPAGE_BACKUPS, IDC_BACKUP_FOLDERCMP
-#: Merge.rc:2877
+#: Merge.rc:2887
#, c-format
msgid "&Folder compare"
msgstr "Comparació de &carpetes"
#. IDD_PROPPAGE_BACKUPS, IDC_BACKUP_FILECMP
-#: Merge.rc:2878
+#: Merge.rc:2888
#, c-format
msgid "Fil&e compare"
msgstr "Comparació de &fitxers"
#. IDD_PROPPAGE_BACKUPS, IDC_STATIC
-#: Merge.rc:2879
+#: Merge.rc:2889
#, c-format
msgid "Create backup files in:"
msgstr "Crea els fitxers de còpia de seguretat a:"
#. IDD_PROPPAGE_BACKUPS, IDC_BACKUP_ORIGFOLD
-#: Merge.rc:2880
+#: Merge.rc:2890
#, c-format
msgid "&Original file's folder"
msgstr "Carpeta del fitxer &original"
#. IDD_PROPPAGE_BACKUPS, IDC_BACKUP_GLOBALFOLD
-#: Merge.rc:2881
+#: Merge.rc:2891
#, c-format
msgid "&Global backup folder:"
msgstr "Carpeta de còpia de seguretat &global:"
#. IDD_PROPPAGE_BACKUPS, IDC_STATIC
-#: Merge.rc:2884
+#: Merge.rc:2894
#, c-format
msgid "Backup filename:"
msgstr "Nom de fitxer de còpia de seguretat:"
#. IDD_PROPPAGE_BACKUPS, IDC_BACKUP_APPEND_BAK
-#: Merge.rc:2885
+#: Merge.rc:2895
msgid "&Append .bak extension"
msgstr "&Afegeix l'extensió .bak"
#. IDD_PROPPAGE_BACKUPS, IDC_BACKUP_APPEND_TIME
-#: Merge.rc:2886
+#: Merge.rc:2896
#, c-format
msgid "A&ppend timestamp"
msgstr "A&fegeix una marca horària"
#. IDS_CONFIRM_COPY_CAPTION
-#: Merge.rc:2892 Merge.rc:4565
+#: Merge.rc:2902 Merge.rc:4575
#, c-format
msgid "Confirm Copy"
msgstr "Confirmació de còpia"
#. IDD_CONFIRM_COPY, IDC_FLDCONFIRM_QUERY
-#: Merge.rc:2896
+#: Merge.rc:2906
#, c-format
msgid "Are you sure you want to copy XXX items?"
msgstr "Esteu segur que voleu copiar XXX elements?"
#. IDD_CONFIRM_COPY, IDC_FLDCONFIRM_FROM_TEXT
-#: Merge.rc:2897
+#: Merge.rc:2907
#, c-format
msgid "From left"
msgstr "D'esquerra"
#. IDD_CONFIRM_COPY, IDC_FLDCONFIRM_TO_TEXT
-#: Merge.rc:2899
+#: Merge.rc:2909
#, c-format
msgid "To right"
msgstr "A dreta"
#. IDS_MESSAGEBOX_DONT_ASK_AGAIN
-#: Merge.rc:2901 Merge.rc:4191
+#: Merge.rc:2911 Merge.rc:4201
#, c-format
msgid "Don't ask this &question again."
msgstr "No tornis a preguntar-ho."
#. IDD_CONFIRM_COPY, IDYES
-#: Merge.rc:2903
+#: Merge.rc:2913
#, c-format
msgid "Yes"
msgstr "Sí"
#. IDD_CONFIRM_COPY, IDNO
-#: Merge.rc:2904
+#: Merge.rc:2914
#, c-format
msgid "No"
msgstr "No"
#. IDS_PROJECT_ITEM_PLUGIN
-#: Merge.rc:2909 Merge.rc:4323
+#: Merge.rc:2919 Merge.rc:4333
#, c-format
msgid "Plugins"
msgstr "&Connectors"
#. IDD_PLUGINS_LIST, IDC_PLUGINS_ENABLE
-#: Merge.rc:2912
+#: Merge.rc:2922
#, c-format
msgid "&Enable plugins"
msgstr "&Habilita els Connectors"
#. IDD_PLUGINS_EDITPLUGIN, IDC_STATIC
-#: Merge.rc:2913 Merge.rc:3113
+#: Merge.rc:2923 Merge.rc:3123
msgid "Plugin &type:"
msgstr ""
#. IDD_PLUGINS_LIST, IDC_STATIC
-#: Merge.rc:2916
+#: Merge.rc:2926
msgid "File filters:"
msgstr "Filtres de fitxer:"
#. IDD_PLUGINS_LIST, IDC_STATIC
-#: Merge.rc:2918
+#: Merge.rc:2928
msgid "&Plugin arguments:"
msgstr "Paràmetres dels connectors:"
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_AUTOMATIC
-#: Merge.rc:2920 Merge.rc:3134
+#: Merge.rc:2930 Merge.rc:3144
msgid "Enable &automatic unpacking/prediffing"
msgstr "Activa el desempaquetament/prediferenciació automàtica pel connector"
#. IDS_OPTIONSPG_SHELL
-#: Merge.rc:2934 Merge.rc:4217
+#: Merge.rc:2944 Merge.rc:4227
#, c-format
msgid "Shell Integration"
msgstr "Integració amb el sistema"
#. IDD_PROPPAGE_SHELL, IDC_STATIC
-#: Merge.rc:2937
+#: Merge.rc:2947
#, c-format
msgid "Explorer"
msgstr "Explorador de fitxers"
#. IDD_PROPPAGE_SHELL, IDC_EXPLORER_CONTEXT
-#: Merge.rc:2938
+#: Merge.rc:2948
#, c-format
msgid "&Add to context menu"
msgstr "Afegeix al menú contextual"
#. IDD_PROPPAGE_SHELL, IDC_EXPLORER_ADVANCED
-#: Merge.rc:2939
+#: Merge.rc:2949
#, c-format
msgid "E&nable advanced menu"
msgstr "Habilita el &menú avançat"
#. IDD_PROPPAGE_SHELL, IDC_EXPLORER_COMPARE_AS
-#: Merge.rc:2940
+#: Merge.rc:2950
msgid "Enable &Compare As menu"
msgstr "Activa el menú &Compara com"
#. IDD_PROPPAGE_SHELL, IDC_REGISTER_SHELLEXTENSION
-#: Merge.rc:2941
+#: Merge.rc:2951
#, c-format
msgid "&Register Shell Extension"
msgstr "Registra la extensió del sistema"
#. IDD_PROPPAGE_SHELL, IDC_UNREGISTER_SHELLEXTENSION
-#: Merge.rc:2942
+#: Merge.rc:2952
#, c-format
msgid "&Unregister Shell Extension"
msgstr "Desinstal·la la extensió del sistema"
#. IDD_PROPPAGE_SHELL, IDC_REGISTER_SHELLEXTENSION_PERUSER
-#: Merge.rc:2943
+#: Merge.rc:2953
msgid "Register Shell Extension for Current User &Only"
msgstr "Registra la extensió del sistema només per a l'usuari actual"
#. IDD_PROPPAGE_SHELL, IDC_UNREGISTER_SHELLEXTENSION_PERUSER
-#: Merge.rc:2944
+#: Merge.rc:2954
msgid "Unregister Shell Extension for Current User On&ly"
msgstr "Desinstal·la la extensió del sistema només per a l'usuari actual"
#. IDD_PROPPAGE_SHELL, IDC_REGISTER_WINMERGECONTEXTMENU
-#: Merge.rc:2945
+#: Merge.rc:2955
msgid "Register Shell Extension for &Windows 11"
msgstr "Registra la extensió del sistema per a Windows 11 o posterior"
#. IDD_PROPPAGE_SHELL, IDC_UNREGISTER_WINMERGECONTEXTMENU
-#: Merge.rc:2946
+#: Merge.rc:2956
msgid "Unregister Shell Extension for W&indows 11"
msgstr "Desinstal·la la extensió del sistema per a Windows 11 o posterior"
#. IDD_PROPPAGE_SHELL, IDC_STATIC
-#: Merge.rc:2947
+#: Merge.rc:2957
msgid "Jump List"
msgstr "Llista de salts"
#. IDD_PROPPAGE_SHELL, IDC_CLEAR_ALL_RECENT_ITEMS
-#: Merge.rc:2949
+#: Merge.rc:2959
msgid "Clear all recent items"
msgstr "Esborra tots els elements recents"
#. IDS_OPTIONSPG_FOLDERCOMPARE
-#: Merge.rc:2954 Merge.rc:4225
+#: Merge.rc:2964 Merge.rc:4235
msgctxt "Options dialog|Categories"
msgid "Folder"
msgstr "Directori"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC
-#: Merge.rc:2957
+#: Merge.rc:2967
msgid "&Compare method:"
msgstr "Mètode de &comparació:"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_COMPARE_STOPFIRST
-#: Merge.rc:2959
+#: Merge.rc:2969
#, c-format
msgid "S&top after first difference"
msgstr "&Atura després de la primera diferència"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_IGNORE_SMALLTIMEDIFF
-#: Merge.rc:2961
+#: Merge.rc:2971
#, c-format
msgid "Ign&ore time differences less than 3 seconds"
msgstr "Ignora diferències en l'&hora inferiors a 3 segons"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC
-#: Merge.rc:2964
+#: Merge.rc:2974
msgid "Expand subfolders &after comparison:"
msgstr "&Amplia automàticament les subcarpetes després de la comparació:"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_COMPARE_WALKSUBDIRS
-#: Merge.rc:2966
+#: Merge.rc:2976
#, c-format
msgid "Include &unique subfolders contents"
msgstr "Inclou el contingut de les carpetes que no estan als dos costats"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_IGNORE_REPARSEPOINTS
-#: Merge.rc:2968
+#: Merge.rc:2978
#, c-format
msgid "Ignore &reparse points"
msgstr "Ignora els punts de &reanàlisi"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC
-#: Merge.rc:2969
+#: Merge.rc:2979
msgid "Switch to &quick compare when size exceeds (MB):"
msgstr "Llindar per realitzar una comparació ràpida (MB):"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC
-#: Merge.rc:2971
+#: Merge.rc:2981
msgid "Switch to &binary compare when size exceeds (MB):"
msgstr "Llindar per realitzar una comparació binària (MB):"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC
-#: Merge.rc:2975
+#: Merge.rc:2985
msgid "Additional comparison condi&tions:"
msgstr ""
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC
-#: Merge.rc:2978
+#: Merge.rc:2988
msgid "&Rename/move detection:"
msgstr ""
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC
-#: Merge.rc:2980
+#: Merge.rc:2990
msgid "Rename/move detection &keys:"
msgstr ""
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC
-#: Merge.rc:2983
+#: Merge.rc:2993
msgid "M&erge renames and moves:"
msgstr ""
#. IDD_PROPPAGE_COMPARE_TABLE, IDC_STATIC
-#: Merge.rc:2994 Merge.rc:2999 Merge.rc:3002
+#: Merge.rc:3004 Merge.rc:3009 Merge.rc:3012
msgid "File patterns:"
msgstr "Patrons de fitxer:"
#. IDD_PROPPAGE_COMPARE_TABLE, IDC_STATIC
-#: Merge.rc:3001
+#: Merge.rc:3011
msgid "Custom Delimiter-Separated Values"
msgstr "Delimitador de valors personalitzat"
#. IDS_OPTIONSPG_BINARYCOMPARE
-#: Merge.rc:3015 Merge.rc:4227
+#: Merge.rc:3025 Merge.rc:4237
msgctxt "Options dialog|Categories"
msgid "Binary"
msgstr "Binari"
#. IDD_PROPPAGE_COMPARE_BINARY, IDC_STATIC
-#: Merge.rc:3018
+#: Merge.rc:3028
#, c-format
msgid "Binary file &patterns:"
msgstr "Patrons de fitxer binari:"
#. IDD_PROPPAGE_COMPARE_BINARY, IDC_STATIC
-#: Merge.rc:3020
+#: Merge.rc:3030
#, c-format
msgid "Frhed settings"
msgstr "Opcions de Frhed"
#. IDD_PROPPAGE_COMPARE_BINARY, IDC_COMPAREBINARY_VIEWSETTINGS
-#: Merge.rc:3021
+#: Merge.rc:3031
#, c-format
msgid "View &Settings..."
msgstr "Opcions de visualització..."
#. IDD_PROPPAGE_COMPARE_BINARY, IDC_COMPAREBINARY_BINARYMODE
-#: Merge.rc:3022
+#: Merge.rc:3032
#, c-format
msgid "&Binary Mode..."
msgstr "Mode binari..."
#. IDD_PROPPAGE_COMPARE_BINARY, IDC_COMPAREBINARY_CHARACTERSET
-#: Merge.rc:3023
+#: Merge.rc:3033
#, c-format
msgid "&Character Set..."
msgstr "Taula de codificació de caràcters..."
#. IDS_PRPCAT_IMAGE
-#: Merge.rc:3029 Merge.rc:4226 Merge.rc:4665
+#: Merge.rc:3039 Merge.rc:4236 Merge.rc:4675
msgid "Image"
msgstr "Imatge"
#. IDD_PROPPAGE_COMPARE_IMAGE, IDC_STATIC
-#: Merge.rc:3032
+#: Merge.rc:3042
#, c-format
msgid "Image file &patterns:"
msgstr "Patrons de fitxer d'imatge:"
#. IDD_PROPPAGE_COMPARE_IMAGE, IDC_ENABLE_IMGCMP_IN_DIRCMP
-#: Merge.rc:3034
+#: Merge.rc:3044
msgid "&Enable image compare in folder compare"
msgstr "Habilita la comparació d'imatge en la comparació de directoris"
#. IDD_PROPPAGE_COMPARE_IMAGE, IDC_STATIC
-#: Merge.rc:3036
+#: Merge.rc:3046
msgid "OCR result:"
msgstr "Resultat OCR:"
#. IDS_OPTIONSPG_WEBPAGECOMPARE
-#: Merge.rc:3043 Merge.rc:4229
+#: Merge.rc:3053 Merge.rc:4239
msgid "Webpage"
msgstr "Pàgina web"
#. IDD_PROPPAGE_COMPARE_WEBPAGE, IDC_STATIC
-#: Merge.rc:3046
+#: Merge.rc:3056
msgid "URL pattern to &include (Regular expression):"
msgstr "Patró d'URL a &incloure (expressió regular):"
#. IDD_PROPPAGE_COMPARE_WEBPAGE, IDC_STATIC
-#: Merge.rc:3048
+#: Merge.rc:3058
msgid "URL pattern to &exclude (Regular expression):"
msgstr "Patró d'URL a &excloure (expressió regular):"
#. IDD_PROPPAGE_COMPARE_WEBPAGE, IDC_STATIC
-#: Merge.rc:3050
+#: Merge.rc:3060
msgid "&User data folder location:"
msgstr "&Ubicació de la carpeta de dades de l'usuari:"
#. IDD_PROPPAGE_COMPARE_WEBPAGE, IDC_COMPAREWEBPAGE_USERDATAFOLDER_PERPANE
-#: Merge.rc:3052
+#: Merge.rc:3062
msgid "&Separate user data folders for each pane"
msgstr "&Separa les carpetes de dades d'usuari per a cada subfinestra"
#. IDD_ENCODINGERROR, IDC_HEXVIEW
-#: Merge.rc:3065
+#: Merge.rc:3075
#, c-format
msgid "&Hex View"
msgstr "Vista &Hexadecimal"
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3110
+#: Merge.rc:3120
msgid "Edit Plugin"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN, IDC_STATIC
-#: Merge.rc:3123
+#: Merge.rc:3133
msgid "&Category:"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_MENUCAPTION_STATIC
-#: Merge.rc:3125
+#: Merge.rc:3135
msgid "&Menu caption:"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_WINDOWTYPE_STATIC
-#: Merge.rc:3127
+#: Merge.rc:3137
msgid "&Window type:"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_UNPACKEDFILEEXTENSION_STATIC
-#: Merge.rc:3132
+#: Merge.rc:3142
msgid "&Unpacked file extension:"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_ARGUMENTSREQUIRED
-#: Merge.rc:3136
+#: Merge.rc:3146
msgid "&Require arguments"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_GENERATESCRIPT
-#: Merge.rc:3137
+#: Merge.rc:3147
msgid "&Generate editor script"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_COMMAND_LINE_STATIC
-#: Merge.rc:3140
+#: Merge.rc:3150
msgid "Command &line:"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_SCRIPT_FILEEXTENSION_STATIC
-#: Merge.rc:3143
+#: Merge.rc:3153
msgid "&Script file extension:"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_SCRIPT_BODY_STATIC
-#: Merge.rc:3145
+#: Merge.rc:3155
msgid "Script &body:"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3154
+#: Merge.rc:3164
msgid "Font"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3157
+#: Merge.rc:3167
msgid "&Font:"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3163
+#: Merge.rc:3173
msgid "Font st&yle:"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3169
+#: Merge.rc:3179
msgid "&Size:"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3175
+#: Merge.rc:3185
msgid "Effects"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3176
+#: Merge.rc:3186
msgid "Stri&keout"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3177
+#: Merge.rc:3187
msgid "&Underline"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3179
+#: Merge.rc:3189
msgid "&Color:"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3184
+#: Merge.rc:3194
msgid "Sample"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3185
+#: Merge.rc:3195
msgid "AaBbYyZz"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3189
+#: Merge.rc:3199
msgid "Sc&ript:"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN, IDC_MANAGE_LINK
-#: Merge.rc:3194
+#: Merge.rc:3204
msgid "Show more fonts"
msgstr ""
#. ID_INDICATOR_EXT
-#: Merge.rc:4118
+#: Merge.rc:4128
#, c-format
msgid "EXT"
msgstr "EXT"
#. ID_INDICATOR_CAPS
-#: Merge.rc:4119
+#: Merge.rc:4129
#, c-format
msgid "CAP"
msgstr "CAP"
#. ID_INDICATOR_NUM
-#: Merge.rc:4120
+#: Merge.rc:4130
#, c-format
msgid "NUM"
msgstr "NUM"
#. ID_INDICATOR_SCRL
-#: Merge.rc:4121
+#: Merge.rc:4131
#, c-format
msgid "SCRL"
msgstr "SCRL"
#. ID_INDICATOR_OVR
-#: Merge.rc:4122
+#: Merge.rc:4132
#, c-format
msgid "OVR"
msgstr "OVR"
#. ID_INDICATOR_REC
-#: Merge.rc:4123
+#: Merge.rc:4133
#, c-format
msgid "REC"
msgstr "REC"
#. ID_FILE_NEW
-#: Merge.rc:4129
+#: Merge.rc:4139
#, c-format
msgid ""
"\n"
@@ -5344,7 +5355,7 @@ msgstr ""
"Nous documents (Control+N)"
#. ID_FILE_OPEN
-#: Merge.rc:4130
+#: Merge.rc:4140
#, c-format
msgid ""
"\n"
@@ -5354,7 +5365,7 @@ msgstr ""
"Obre (Control+O)"
#. ID_FILE_SAVE
-#: Merge.rc:4131
+#: Merge.rc:4141
#, c-format
msgid ""
"\n"
@@ -5364,29 +5375,29 @@ msgstr ""
"Desa (Control+S)"
#. IDS_UNK_ERROR_READING_PROJECT
-#: Merge.rc:4137
+#: Merge.rc:4147
msgid "Unknown error opening project file."
msgstr "S'ha produït un error desconegut en intentar obrir un fitxer de projecte."
#. IDS_UNK_ERROR_SAVING_PROJECT
-#: Merge.rc:4138
+#: Merge.rc:4148
msgid "Unknown error saving project file."
msgstr "S'ha produït un error desconegut en intentar desar un fitxer de projecte."
#. IDS_PROJFILE_LOAD_SUCCESS
-#: Merge.rc:4143
+#: Merge.rc:4153
#, c-format
msgid "Project file loaded."
msgstr "El fitxer de projecte s'ha carregat correctament."
#. IDS_PROJFILE_SAVE_SUCCESS
-#: Merge.rc:4144
+#: Merge.rc:4154
#, c-format
msgid "Project file saved."
msgstr "El fitxer de projecte s'ha desat correctament."
#. ID_EDIT_UNDO
-#: Merge.rc:4150
+#: Merge.rc:4160
#, c-format
msgid ""
"\n"
@@ -5396,7 +5407,7 @@ msgstr ""
"Desfés (Control+Z)"
#. ID_EDIT_REDO
-#: Merge.rc:4151
+#: Merge.rc:4161
#, c-format
msgid ""
"\n"
@@ -5406,7 +5417,7 @@ msgstr ""
"Refés (Control+Y)"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:4158
+#: Merge.rc:4168
#, c-format
msgid ""
"\n"
@@ -5426,7 +5437,7 @@ msgstr ""
"WinMerge File Compare"
#. IDR_DIRDOCTYPE
-#: Merge.rc:4159
+#: Merge.rc:4169
#, c-format
msgid ""
"\n"
@@ -5446,183 +5457,183 @@ msgstr ""
"WinMerge Folder Compare"
#. IDS_SPLASH_GPLTEXT
-#: Merge.rc:4165
+#: Merge.rc:4175
#, c-format
msgid "WinMerge comes with ABSOLUTELY NO WARRANTY. It is free software and can be redistributed under the conditions of the GNU General Public License - see the Help menu for details."
msgstr "El WinMerge es proporciona SENSE CAP MENA DE GARANTIA. És programari lliure i podeu redistribuir-lo sota certes circumstàncies. Consulteu la Llicència Pública General de GNU al menú d'ajuda per obtenir-ne més detalls."
#. IDS_MESSAGEBOX_ABORT
-#: Merge.rc:4173
+#: Merge.rc:4183
#, c-format
msgid "&Abort"
msgstr "&Avorta"
#. IDS_MESSAGEBOX_RETRY
-#: Merge.rc:4174
+#: Merge.rc:4184
#, c-format
msgid "&Retry"
msgstr "&Reintenta"
#. IDS_MESSAGEBOX_IGNORE
-#: Merge.rc:4175
+#: Merge.rc:4185
#, c-format
msgid "&Ignore"
msgstr "&Ignora"
#. IDS_MESSAGEBOX_IGNOREALL
-#: Merge.rc:4176
+#: Merge.rc:4186
#, c-format
msgid "Ignore &all"
msgstr "Ignora-ho &tot"
#. IDS_MESSAGEBOX_YES
-#: Merge.rc:4177
+#: Merge.rc:4187
#, c-format
msgid "&Yes"
msgstr "&Sí"
#. IDS_MESSAGEBOX_YES_TO_ALL
-#: Merge.rc:4183
+#: Merge.rc:4193
#, c-format
msgid "Yes to &all"
msgstr "Sí a &tot"
#. IDS_MESSAGEBOX_NO
-#: Merge.rc:4184
+#: Merge.rc:4194
#, c-format
msgid "&No"
msgstr "&No"
#. IDS_MESSAGEBOX_NO_TO_ALL
-#: Merge.rc:4185
+#: Merge.rc:4195
#, c-format
msgid "No to a&ll"
msgstr "No a t&ot"
#. IDS_MESSAGEBOX_CONTINUE
-#: Merge.rc:4186
+#: Merge.rc:4196
#, c-format
msgid "&Continue"
msgstr "&Continua"
#. IDS_MESSAGEBOX_SKIP
-#: Merge.rc:4187
+#: Merge.rc:4197
#, c-format
msgid "&Skip"
msgstr "&Omet"
#. IDS_MESSAGEBOX_SKIPALL
-#: Merge.rc:4188
+#: Merge.rc:4198
#, c-format
msgid "Skip &all"
msgstr "Omet-ho &tot"
#. IDS_MESSAGEBOX_DONT_DISPLAY_AGAIN
-#: Merge.rc:4190
+#: Merge.rc:4200
#, c-format
msgid "Don't display this &message again."
msgstr "No tornis a mostrar aquest missatge."
-#: Merge.rc:4193
+#: Merge.rc:4203
msgid "To make this message box visible, press Reset on the Message Boxes page in Options."
msgstr "Per fer que aquest quadre de missatge es mostri de nou, premeu el botó Reinicialitza a la secció Quadres de missatges a la finestra d'Opcions."
#. IDS_OPTIONSPG_EDITOR_COMPAREMERGE
-#: Merge.rc:4203
+#: Merge.rc:4213
msgid "Compare/Merge"
msgstr "Compara/fusiona"
#. IDS_OPTIONSPG_SYNTAXCOLORS
-#: Merge.rc:4204 Merge.rc:4208
+#: Merge.rc:4214 Merge.rc:4218
#, c-format
msgid "Syntax"
msgstr "Sintaxi"
#. IDS_OPTIONSPG_COLOR_SCHEMES
-#: Merge.rc:4206
+#: Merge.rc:4216
msgid "Color Schemes"
msgstr "Esquemes de colors"
#. IDS_OPTIONSPG_DIRCOLORS
-#: Merge.rc:4210
+#: Merge.rc:4220
msgid "Folder Compare"
msgstr "Comparació de carpetes"
#. IDS_OPTIONSPG_PROJECT
-#: Merge.rc:4215
+#: Merge.rc:4225
msgid "Project"
msgstr "Projecte"
#. IDS_COLHDR_NSDIFFS
-#: Merge.rc:4218 Merge.rc:4640
+#: Merge.rc:4228 Merge.rc:4650
#, c-format
msgid "Differences"
msgstr "Diferències"
#. IDS_OPTIONSPG_MESSAGEBOXES
-#: Merge.rc:4220
+#: Merge.rc:4230
msgid "Message Boxes"
msgstr "Quadres de missatges"
#. IDS_TO
-#: Merge.rc:4235
+#: Merge.rc:4245
#, c-format
msgid "To:"
msgstr "A:"
#. IDS_FROM_LEFT
-#: Merge.rc:4236
+#: Merge.rc:4246
#, c-format
msgid "From left:"
msgstr "D'esquerra:"
#. IDS_TO_LEFT
-#: Merge.rc:4237
+#: Merge.rc:4247
#, c-format
msgid "To left:"
msgstr "A esquerra:"
#. IDS_FROM_RIGHT
-#: Merge.rc:4238
+#: Merge.rc:4248
#, c-format
msgid "From right:"
msgstr "De dreta:"
#. IDS_TO_RIGHT
-#: Merge.rc:4239
+#: Merge.rc:4249
#, c-format
msgid "To right:"
msgstr "A dreta:"
#. IDS_FROM_MIDDLE
-#: Merge.rc:4240
+#: Merge.rc:4250
msgid "From middle:"
msgstr "Del mig:"
#. IDS_TO_MIDDLE
-#: Merge.rc:4241
+#: Merge.rc:4251
msgid "To middle:"
msgstr "Cap al Mig:"
#. IDS_VERSION_FMT
-#: Merge.rc:4247
+#: Merge.rc:4257
#, c-format
msgid "Version %1"
msgstr "Versió %1"
#. IDS_OPTIONS_TITLE
-#: Merge.rc:4253
+#: Merge.rc:4263
#, c-format
msgid "Options (%1)"
msgstr "Opcions (%1)"
#. IDS_MESSAGE_BOX_ARE_RESET
-#: Merge.rc:4254
+#: Merge.rc:4264
#, c-format
msgid "All message boxes are now displayed again."
msgstr "Ara es tornen a mostrar tots els quadres de missatges."
-#: Merge.rc:4256
+#: Merge.rc:4266
#, c-format
msgid "Tab size value is out of range. Please use 1 - %1."
msgstr ""
@@ -5631,172 +5642,172 @@ msgstr ""
"Useu valors entre 1 i %1."
#. IDS_PROJECT_OPEN
-#: Merge.rc:4262 Merge.rc:4318
+#: Merge.rc:4272 Merge.rc:4328
#, c-format
msgid "Open"
msgstr "Obre"
#. IDS_PROGRAMFILES
-#: Merge.rc:4263
+#: Merge.rc:4273
#, c-format
msgid "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||"
msgstr "Programes|*.exe;*.bat;*.cmd|Tots els fitxers (*.*)|*.*||"
#. IDS_ALLFILES
-#: Merge.rc:4264
+#: Merge.rc:4274
#, c-format
msgid "All Files (*.*)|*.*||"
msgstr "Tots els fitxers (*.*)|*.*||"
#. IDS_PROJECTFILES
-#: Merge.rc:4265
+#: Merge.rc:4275
#, c-format
msgid "WinMerge Project Files (*.WinMerge)|*.WinMerge||"
msgstr "Fitxers de projecte del WinMerge (*.WinMerge)|*.WinMerge||"
#. IDS_INIFILES
-#: Merge.rc:4267
+#: Merge.rc:4277
#, c-format
msgid "Options files (*.ini)|*.ini|All Files (*.*)|*.*||"
msgstr "Fitxers d'opcions de configuració (*.ini)|*.ini|Tots els fitxers (*.*)|*.*||"
#. IDS_REPLACELIST_FILES
-#: Merge.rc:4268
+#: Merge.rc:4278
msgid "Tab-Separated Values (*.tsv;*.txt)|*.tsv;*.txt|All Files (*.*)|*.*||"
msgstr ""
#. IDS_TEXT_REPORT_FILES
-#: Merge.rc:4274
+#: Merge.rc:4284
#, c-format
msgid "Text Files (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|All Files (*.*)|*.*||"
msgstr "Fitxers de text (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|Tots els fitxers (*.*)|*.*||"
#. IDS_HTML_REPORT_FILES
-#: Merge.rc:4275
+#: Merge.rc:4285
#, c-format
msgid "HTML Files (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||"
msgstr "Fitxers HTML (*.htm,*.html)|*.htm;*.html|Tots els fitxers (*.*)|*.*||"
#. IDS_XML_REPORT_FILES
-#: Merge.rc:4276
+#: Merge.rc:4286
#, c-format
msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||"
msgstr "Fitxers XML (*.xml)|*.xml|Tots els fitxers (*.*)|*.*||"
#. IDS_EXPANDSUBDIRS_DONOTEXPAND
-#: Merge.rc:4294
+#: Merge.rc:4304
msgid "Do not expand"
msgstr "No expandeixis"
#. IDS_EXPANDSUBDIRS_ALL
-#: Merge.rc:4295
+#: Merge.rc:4305
msgid "Expand all subfolders"
msgstr "Expandeix totes les subcarpetes"
#. IDS_EXPANDSUBDIRS_DIFFERENT
-#: Merge.rc:4296
+#: Merge.rc:4306
msgid "Expand different subfolders"
msgstr "Expandeix les subcarpetes diferents"
#. IDS_EXPANDSUBDIRS_IDENTICAL
-#: Merge.rc:4297
+#: Merge.rc:4307
msgid "Expand identical subfolders"
msgstr "Expandeix les subcarpetes idèntiques"
#. IDS_SYNTAXTABLE_FILETYPE
-#: Merge.rc:4303
+#: Merge.rc:4313
msgid "File Type"
msgstr "Tipus de fitxer"
#. IDS_COLHDR_EXTENSION
-#: Merge.rc:4304 Merge.rc:4597
+#: Merge.rc:4314 Merge.rc:4607
#, c-format
msgid "Extension"
msgstr "Extensió"
#. IDS_PRPCAT_MESSAGE
-#: Merge.rc:4310 Merge.rc:4669
+#: Merge.rc:4320 Merge.rc:4679
msgid "Message"
msgstr "Missatge"
#. IDS_MESSAGEBOX_ANSWER
-#: Merge.rc:4311
+#: Merge.rc:4321
msgid "Answer"
msgstr "Resposta"
#. IDS_PROJECT_ITEM
-#: Merge.rc:4317
+#: Merge.rc:4327
msgid "Item"
msgstr "Element"
#. IDS_PROJECT_LOAD
-#: Merge.rc:4319
+#: Merge.rc:4329
msgid "Load"
msgstr "Carrega"
#. IDS_PROJECT_SAVE
-#: Merge.rc:4320
+#: Merge.rc:4330
msgid "Save"
msgstr "Desa"
#. IDS_PROJECT_ITEM_INCLUDE_SUBFOLDERS
-#: Merge.rc:4322
+#: Merge.rc:4332
msgid "Include Subfolders"
msgstr "Inclou les subcarpetes"
#. IDS_PROJECT_ITEM_COMPARE_OPTIONS
-#: Merge.rc:4324
+#: Merge.rc:4334
msgid "Compare Options"
msgstr "Opcions de comparació"
#. IDS_PROJECT_ITEM_HIDDEN_ITEMS
-#: Merge.rc:4325
+#: Merge.rc:4335
msgid "Hidden Items"
msgstr "Elements ocults"
#. IDS_PLUGINSLIST_NAME
-#: Merge.rc:4331 Merge.rc:4956
+#: Merge.rc:4341 Merge.rc:4966
#, c-format
msgid "Name"
msgstr "Nom"
#. IDS_FILTERFILE_PATHTITLE
-#: Merge.rc:4332
+#: Merge.rc:4342
#, c-format
msgid "Location"
msgstr "Ubicació"
#. IDS_FILTER_TITLE
-#: Merge.rc:4333
+#: Merge.rc:4343
#, c-format
msgid "Filters"
msgstr "Filtres"
#. IDS_FILTER_PREFIX
-#: Merge.rc:4334
+#: Merge.rc:4344
#, c-format
msgid "[F] "
msgstr "[F] "
#. IDS_PLUGINSLIST_DESC
-#: Merge.rc:4335 Merge.rc:4958
+#: Merge.rc:4345 Merge.rc:4968
#, c-format
msgid "Description"
msgstr "Descripció"
#. IDS_FILEFILTER_SAVENEW
-#: Merge.rc:4336
+#: Merge.rc:4346
#, c-format
msgid "Select Filename for New Filter"
msgstr "Selecciona un nom de fitxer per al nou filtre"
#. IDS_FILEFILTER_FILEMASK
-#: Merge.rc:4337
+#: Merge.rc:4347
#, c-format
msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||"
msgstr "Filtres de fitxer (*.flt)|*.flt|Tots els fitxers (*.*)|*.*||"
-#: Merge.rc:4339
+#: Merge.rc:4349
#, c-format
msgid ""
"Cannot find filter template!\n"
@@ -5809,7 +5820,7 @@ msgstr ""
"Copieu el fitxer %1 a la carpeta WinMerge/Filters:\n"
"%2."
-#: Merge.rc:4341
+#: Merge.rc:4351
#, c-format
msgid ""
"Cannot copy filter template:\n"
@@ -5822,7 +5833,7 @@ msgstr ""
"\n"
"Verifiqueu que la carpeta existeix i s'hi pot escriure."
-#: Merge.rc:4343
+#: Merge.rc:4353
#, c-format
msgid ""
"User's filter folder is not defined!\n"
@@ -5833,7 +5844,7 @@ msgstr ""
"\n"
"Seleccioneu la carpeta de filtres a Opcions/Sistema."
-#: Merge.rc:4345
+#: Merge.rc:4355
#, c-format
msgid ""
"Failed to delete filter:\n"
@@ -5847,12 +5858,12 @@ msgstr ""
"Potser el fitxer és només de lectura?"
#. IDS_FILEFILTER_INSTALL
-#: Merge.rc:4346
+#: Merge.rc:4356
#, c-format
msgid "Locate Filter File to Install"
msgstr "Localitza el fitxer de filtre a instal·lar"
-#: Merge.rc:4348
+#: Merge.rc:4358
#, c-format
msgid ""
"Installing filter file failed.\n"
@@ -5864,19 +5875,19 @@ msgstr ""
"No s'ha pogut copiar el nou fitxer de filtre a la carpeta de filtres."
#. IDS_FILEFILTER_OVERWRITE
-#: Merge.rc:4349
+#: Merge.rc:4359
#, c-format
msgid "Filter file exists. Overwrite?"
msgstr "El fitxer de filtre ja existeix. Voleu sobreescriure el filtre existent?"
#. IDS_FILTERLINE_REGEXP
-#: Merge.rc:4355
+#: Merge.rc:4365
#, c-format
msgid "Regular expression"
msgstr "Expressió regular"
#. IDS_FILTERCHANGED
-#: Merge.rc:4361
+#: Merge.rc:4371
msgid ""
"Filters updated. Refresh all open folder compares?\n"
"\n"
@@ -5887,240 +5898,240 @@ msgstr ""
"Si no voleu tornar-los a analitzar ara, podeu seleccionar 'No' i fer-ho més tard."
#. IDS_DIRECTORY_WINDOW_TITLE
-#: Merge.rc:4367
+#: Merge.rc:4377
#, c-format
msgid "Folder Comparison Results"
msgstr "Resultats de la comparació dels directoris"
#. IDS_FILE_COMPARISON_TITLE
-#: Merge.rc:4368
+#: Merge.rc:4378
#, c-format
msgid "File Comparison"
msgstr "Comparació de fitxers"
#. IDS_EMPTY_LEFT_FILE
-#: Merge.rc:4369
+#: Merge.rc:4379
#, c-format
msgid "Untitled Left"
msgstr "Fitxer esquerre sense títol"
#. IDS_EMPTY_MIDDLE_FILE
-#: Merge.rc:4370
+#: Merge.rc:4380
#, c-format
msgid "Untitled Middle"
msgstr "Fitxer del mig sense títol"
#. IDS_EMPTY_RIGHT_FILE
-#: Merge.rc:4371
+#: Merge.rc:4381
#, c-format
msgid "Untitled Right"
msgstr "Fitxer dret sense títol"
#. IDS_CONFLICT_BASE_FILE
-#: Merge.rc:4372
+#: Merge.rc:4382
msgid "Base File"
msgstr "Fitxer base"
#. IDS_CONFLICT_THEIRS_FILE
-#: Merge.rc:4373
+#: Merge.rc:4383
#, c-format
msgid "Theirs File"
msgstr "El seu fitxer"
#. IDS_CONFLICT_MINE_FILE
-#: Merge.rc:4374
+#: Merge.rc:4384
#, c-format
msgid "Mine File"
msgstr "El meu fitxer"
#. IDS_SELFCOMPARE_ORIGINAL_FILE
-#: Merge.rc:4375
+#: Merge.rc:4385
msgid "Original File"
msgstr "Fitxer original"
#. IDS_LINE_STATUS_INFO_EOL
-#: Merge.rc:4381
+#: Merge.rc:4391
#, c-format
msgid "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s"
msgstr "Lïn: %s Col: %d/%d Car: %d/%d EOL: %s"
#. IDS_EMPTY_LINE_STATUS_INFO
-#: Merge.rc:4382
+#: Merge.rc:4392
#, c-format
msgid "Line: %s"
msgstr "Línia: %s"
#. IDS_LINE_STATUS_INFO
-#: Merge.rc:4383
+#: Merge.rc:4393
#, c-format
msgid "Ln: %s Col: %d/%d Ch: %d/%d"
msgstr "Lin: %s Col: %d/%d Car: %d/%d"
#. IDS_LINE_STATUS_INFO_SEL
-#: Merge.rc:4384
+#: Merge.rc:4394
#, c-format
msgid " Sel: %d | %d"
msgstr " Sel: %d | %d"
#. IDS_MERGEMODE_MERGING
-#: Merge.rc:4385
+#: Merge.rc:4395
#, c-format
msgid "Merge"
msgstr "Combina"
#. IDS_DIFF_NUMBER_STATUS_FMT
-#: Merge.rc:4386
+#: Merge.rc:4396
#, c-format
msgid "Difference %1 of %2"
msgstr "Diferència %1 de %2"
#. IDS_NO_DIFF_SEL_FMT
-#: Merge.rc:4387
+#: Merge.rc:4397
#, c-format
msgid "%1 Differences Found"
msgstr "S'han trobat %1 diferències"
#. IDS_1_DIFF_FOUND
-#: Merge.rc:4388
+#: Merge.rc:4398
#, c-format
msgid "1 Difference Found"
msgstr "S'ha trobat una diferència"
#. IDS_NO_ERR_SEL_FMT
-#: Merge.rc:4389
+#: Merge.rc:4399
#, c-format
msgid "%1 Errors Found"
msgstr ""
#. IDS_1_ERR_FOUND
-#: Merge.rc:4390
+#: Merge.rc:4400
msgid "1 Error Found"
msgstr ""
#. IDS_STATUSBAR_READONLY, Abbreviation from "Read Only"
-#: Merge.rc:4391
+#: Merge.rc:4401
#, c-format
msgid "RO"
msgstr "LE"
#. IDS_DIRVIEW_STATUS_FMT_FOCUS
-#: Merge.rc:4397
+#: Merge.rc:4407
#, c-format
msgid "Item %1 of %2"
msgstr "Element %1 de %2"
#. IDS_DIRVIEW_STATUS_FMT_NOFOCUS
-#: Merge.rc:4398
+#: Merge.rc:4408
#, c-format
msgid "Items: %1"
msgstr "Elements: %1"
#. IDS_DIRVIEW_STATUS_COMPARING
-#: Merge.rc:4399
+#: Merge.rc:4409
#, c-format
msgid "Comparing items..."
msgstr "Comparant elements..."
#. IDS_ITEMS_PER_SEC
-#: Merge.rc:4400
+#: Merge.rc:4410
#, c-format
msgid "%.1f[items/sec]"
msgstr "%.1f[elements/seg.]"
#. IDS_ERROR_INCOMPARABLE
-#: Merge.rc:4406
+#: Merge.rc:4416
msgid "Select two existing folders/files to compare."
msgstr "Selecciona dos directoris o fitxers existents per a comparar."
#. IDS_DIRSEL_TAG
-#: Merge.rc:4407
+#: Merge.rc:4417
#, c-format
msgid "Folder Selection"
msgstr "Selecció de directori"
#. IDS_OPEN_FILESDIRS
-#: Merge.rc:4408
+#: Merge.rc:4418
#, c-format
msgid "Select two (or three) folders/files to compare."
msgstr "Selecciona dos (o tres) directoris o dos (o tres) fitxers per a comparar."
#. IDS_OPEN_LEFTINVALID
-#: Merge.rc:4409
+#: Merge.rc:4419
#, c-format
msgid "Left (1st) path is invalid!"
msgstr "El camí de l'esquerra (1er) no és vàlid."
#. IDS_OPEN_MIDDLEINVALID
-#: Merge.rc:4410
+#: Merge.rc:4420
#, c-format
msgid "Middle (2nd) path is invalid!"
msgstr "El camí del mig (2n) no és vàlid."
#. IDS_OPEN_RIGHTINVALID2
-#: Merge.rc:4411
+#: Merge.rc:4421
#, c-format
msgid "Right (2nd) path is invalid!"
msgstr "El camí de la dreta (2n) no és vàlid."
#. IDS_OPEN_RIGHTINVALID3
-#: Merge.rc:4412
+#: Merge.rc:4422
#, c-format
msgid "Right (3rd) path is invalid!"
msgstr "El camí de la dreta (3er) no és vàlid."
#. IDS_OPEN_BOTHINVALID
-#: Merge.rc:4413
+#: Merge.rc:4423
#, c-format
msgid "Both paths are invalid!"
msgstr "Els dos camins no són vàlids."
-#: Merge.rc:4415
+#: Merge.rc:4425
#, c-format
msgid "Left (1st) and Middle (2nd) paths are invalid!"
msgstr "Els camins de l'esquerra (1er) i del mig (2n) no són vàlids."
#. IDS_OPEN_LEFTRIGHTINVALID
-#: Merge.rc:4416
+#: Merge.rc:4426
#, c-format
msgid "Left (1st) and Right (3rd) paths are invalid!"
msgstr "Els camins de l'esquerra (1er) i de la dreta (3er) no són vàlids."
-#: Merge.rc:4418
+#: Merge.rc:4428
#, c-format
msgid "Middle (2nd) and Right (3rd) paths are invalid!"
msgstr "Els camins del mig (2on) i de l'esquerra (3er) no són vàlids."
#. IDS_OPEN_ALLINVALID
-#: Merge.rc:4419
+#: Merge.rc:4429
#, c-format
msgid "All paths are invalid!"
msgstr "No hi ha cap camí que sigui vàlid."
#. IDS_OPEN_UNPACKERDISABLED
-#: Merge.rc:4420
+#: Merge.rc:4430
msgid "Only enabled for file comparisons"
msgstr "Només activat per a comparació de fitxers"
#. IDS_OPEN_MISMATCH
-#: Merge.rc:4421
+#: Merge.rc:4431
#, c-format
msgid "Cannot compare file and folder!"
msgstr "No es pot comparar un fitxer i un directori."
#. IDS_ERROR_FILE_NOT_FOUND
-#: Merge.rc:4427
+#: Merge.rc:4437
#, c-format
msgid "File not found: %1"
msgstr "No s'ha trobat el fitxer: %1"
#. IDS_ERROR_FILE_NOT_UNPACKED
-#: Merge.rc:4428
+#: Merge.rc:4438
#, c-format
msgid "File not unpacked: %1"
msgstr "El fitxer no s'ha desempaquetat: %1"
#. IDS_ERROR_FILEOPEN
-#: Merge.rc:4429
+#: Merge.rc:4439
#, c-format
msgid ""
"Cannot open file\n"
@@ -6134,13 +6145,13 @@ msgstr ""
"%2"
#. IDS_ERROR_CONF_RESOLVE
-#: Merge.rc:4430
+#: Merge.rc:4440
#, c-format
msgid "Failed to parse conflict file."
msgstr "No s'ha pogut interpretar el fitxer amb conflictes."
#. IDS_NOT_CONFLICT_FILE
-#: Merge.rc:4431
+#: Merge.rc:4441
#, c-format
msgid "The file\n%1\nis not a conflict file."
msgstr ""
@@ -6149,7 +6160,7 @@ msgstr ""
"no és un fitxer amb conflictes."
#. IDS_COMPARE_LARGE_FILES
-#: Merge.rc:4432
+#: Merge.rc:4442
msgid "Comparing large files requires significant memory.\nShow only comparison results (not file contents)?"
msgstr ""
"Esteu a punt de comparar fitxers molt grans.\n"
@@ -6158,30 +6169,30 @@ msgstr ""
"\n"
#. IDS_SAVE_AS_TITLE
-#: Merge.rc:4438
+#: Merge.rc:4448
#, c-format
msgid "Save As"
msgstr "Anomena i desa"
#. IDS_SAVE_FMT
-#: Merge.rc:4439
+#: Merge.rc:4449
#, c-format
msgid "Save changes to %1?"
msgstr "Voleu desar els canvis a %1?"
#. IDS_SAVEREADONLY_FMT
-#: Merge.rc:4440
+#: Merge.rc:4450
#, c-format
msgid "%1 is read-only. Override? Or 'No' to save as new filename?"
msgstr "El fitxer %1 és només de lectura. Voleu substituir el fitxer només de lectura? (Premeu no per desar amb un nom nou.)"
#. IDS_ERROR_BACKUP
-#: Merge.rc:4441
+#: Merge.rc:4451
#, c-format
msgid "Error backing up file"
msgstr "Hi ha hagut un error en crear una còpia de seguretat del fitxer"
-#: Merge.rc:4443
+#: Merge.rc:4453
#, c-format
msgid ""
"Unable to backup original file:\n"
@@ -6195,7 +6206,7 @@ msgstr ""
"Voleu continuar de totes maneres?"
#. IDS_FILESAVE_FAILED
-#: Merge.rc:4444
+#: Merge.rc:4454
#, c-format
msgid "Saving file failed.\n%1\n%2\n\t- Use different filename (OK)\n\t- Abort (Cancel)?"
msgstr ""
@@ -6206,7 +6217,7 @@ msgstr ""
"\t- desar-lo amb un nom diferent (premeu D'acord)\n"
"\t- avortar l'operació actual (Premeu Cancel·lar)?"
-#: Merge.rc:4446
+#: Merge.rc:4456
#, c-format
msgid "Plugin '%2' cannot pack changes to left file into '%1'.\n\nOriginal unchanged. Save unpacked version?"
msgstr ""
@@ -6216,7 +6227,7 @@ msgstr ""
"\n"
"Voleu desar la versió desempaquetada en un altre fitxer?"
-#: Merge.rc:4448
+#: Merge.rc:4458
#, c-format
msgid "Plugin '%2' cannot pack changes to middle file into '%1'.\n\nOriginal unchanged. Save unpacked version?"
msgstr ""
@@ -6226,7 +6237,7 @@ msgstr ""
"\n"
"Voleu desar la versió desempaquetada en un altre fitxer?"
-#: Merge.rc:4450
+#: Merge.rc:4460
#, c-format
msgid "Plugin '%2' cannot pack changes to right file into '%1'.\n\nOriginal unchanged. Save unpacked version?"
msgstr ""
@@ -6237,7 +6248,7 @@ msgstr ""
"Voleu desar la versió desempaquetada en un altre fitxer?"
#. IDS_FILECHANGED_ONDISK
-#: Merge.rc:4451
+#: Merge.rc:4461
#, c-format
msgid ""
"Another application updated\n"
@@ -6253,7 +6264,7 @@ msgstr ""
"Voleu sobreescriure el fitxer?"
#. IDS_SAVEREADONLY_MULTI
-#: Merge.rc:4452
+#: Merge.rc:4462
#, c-format
msgid ""
"%1\n"
@@ -6263,7 +6274,7 @@ msgstr ""
"està marcat com a només de lectura. Voleu substituir l'element només de lectura?"
#. IDS_FILECHANGED_RESCAN
-#: Merge.rc:4453
+#: Merge.rc:4463
#, c-format
msgid "Another application updated\n%1\nsince last scan.\n\nReload?"
msgstr ""
@@ -6274,25 +6285,25 @@ msgstr ""
"Voleu recarregar el fitxer?"
#. IDS_SAVE_LEFT_AS
-#: Merge.rc:4454
+#: Merge.rc:4464
#, c-format
msgid "Save Left File As"
msgstr "Anomena i desa el fitxer de l'esquerra"
#. IDS_SAVE_MIDDLE_AS
-#: Merge.rc:4455
+#: Merge.rc:4465
#, c-format
msgid "Save Middle File As"
msgstr "Anomena i desa el fitxer del mig"
#. IDS_SAVE_RIGHT_AS
-#: Merge.rc:4456
+#: Merge.rc:4466
#, c-format
msgid "Save Right File As"
msgstr "Anomena i desa el fitxer de la dreta"
#. IDS_FILE_DISAPPEARED
-#: Merge.rc:4461
+#: Merge.rc:4471
#, c-format
msgid ""
"File\n"
@@ -6304,7 +6315,7 @@ msgstr ""
"ha desapareguit. Si us plau, deseu una còpia del fitxer abans de continuar."
#. IDS_VIEWS_OUTOFSYNC
-#: Merge.rc:4467
+#: Merge.rc:4477
#, c-format
msgid ""
"Cannot merge unsynched documents.\n"
@@ -6316,189 +6327,189 @@ msgstr ""
"Cal que refresqueu els documents abans de continuar."
#. IDS_BREAK_ON_WHITESPACE
-#: Merge.rc:4472
+#: Merge.rc:4482
msgid "Break at whitespace"
msgstr "Separa a l'espai"
#. IDS_BREAK_ON_PUNCTUATION
-#: Merge.rc:4473
+#: Merge.rc:4483
msgid "Break at whitespace or punctuation"
msgstr "Separa a l'espai o puntuació"
#. IDS_L2M
-#: Merge.rc:4479
+#: Merge.rc:4489
msgid "Copy to &Middle\tAlt+Right"
msgstr "Copia al mig\tAlt+Dreta"
#. IDS_R2M
-#: Merge.rc:4480
+#: Merge.rc:4490
msgid "Copy to &Middle\tAlt+Left"
msgstr "Copia al mig\tAlt+Esquerra"
#. IDS_COPY_FROM_MIDDLE_R
-#: Merge.rc:4481
+#: Merge.rc:4491
msgid "Copy from Middle\tAlt+Shift+Right"
msgstr "Copia des del mig\tAlt+Maj+Dreta"
#. IDS_COPY_FROM_MIDDLE_L
-#: Merge.rc:4482
+#: Merge.rc:4492
msgid "Copy from Middle\tAlt+Shift+Left"
msgstr "Copia des del mig\tAlt+Maj+Esquerra"
#. IDS_L2MNEXT
-#: Merge.rc:4483
+#: Merge.rc:4493
msgid "Copy to Middle and Advance\tCtrl+Alt+Right"
msgstr "Copia al mig i avança\tControl+Alt+Dreta"
#. IDS_R2MNEXT
-#: Merge.rc:4484
+#: Merge.rc:4494
msgid "Copy to Middle and Advance\tCtrl+Alt+Left"
msgstr "Copia al mig i avança\tControl+Alt+Esquerra"
#. IDS_ALL_MIDDLE
-#: Merge.rc:4485
+#: Merge.rc:4495
msgid "Copy All to Middle"
msgstr "Copia-ho tot cap al mig"
#. IDS_COPY_RIGHT_TO_LEFT
-#: Merge.rc:4491
+#: Merge.rc:4501
#, c-format
msgid "Right to Left (%1)"
msgstr "Dreta a esquerra (%1)"
#. IDS_COPY_RIGHT_TO_MIDDLE
-#: Merge.rc:4492
+#: Merge.rc:4502
#, c-format
msgid "Right to Middle (%1)"
msgstr "Esquerra cap al mig (%1)"
#. IDS_COPY_MIDDLE_TO_LEFT
-#: Merge.rc:4493
+#: Merge.rc:4503
#, c-format
msgid "Middle to Left (%1)"
msgstr "Mig cap a l'esquerra (%1)"
#. IDS_COPY_MIDDLE_TO_RIGHT
-#: Merge.rc:4494
+#: Merge.rc:4504
#, c-format
msgid "Middle to Right (%1)"
msgstr "Mig cap a la dreta (%1)"
#. IDS_COPY_LEFT_TO_RIGHT
-#: Merge.rc:4495
+#: Merge.rc:4505
#, c-format
msgid "Left to Right (%1)"
msgstr "Esquerra a dreta (%1)"
#. IDS_COPY_LEFT_TO_MIDDLE
-#: Merge.rc:4496
+#: Merge.rc:4506
#, c-format
msgid "Left to Middle (%1)"
msgstr "Dreta cap al Mig (%1)"
#. IDS_MOVE_LEFT_TO
-#: Merge.rc:4507 Merge.rc:4539
+#: Merge.rc:4517 Merge.rc:4549
#, c-format
msgid "Left to... (%1)"
msgstr "Esquerra a... (%1)"
#. IDS_MOVE_MIDDLE_TO
-#: Merge.rc:4508 Merge.rc:4540
+#: Merge.rc:4518 Merge.rc:4550
#, c-format
msgid "Middle to... (%1)"
msgstr "Mig cap a... (%1)"
#. IDS_MOVE_RIGHT_TO
-#: Merge.rc:4509 Merge.rc:4541
+#: Merge.rc:4519 Merge.rc:4551
#, c-format
msgid "Right to... (%1)"
msgstr "Dreta a... (%1)"
#. IDS_COPY_BOTH_TO
-#: Merge.rc:4510
+#: Merge.rc:4520
#, c-format
msgid "Both to... (%1)"
msgstr "Ambdós a... (%1)"
#. IDS_COPY_ALL_TO
-#: Merge.rc:4511
+#: Merge.rc:4521
#, c-format
msgid "All to... (%1)"
msgstr "Tots a... (%1)"
#. IDS_COPY_DIFFERENCES_TO
-#: Merge.rc:4512
+#: Merge.rc:4522
#, c-format
msgid "Differences to... (%1)"
msgstr "Diferències a... (%1)"
#. IDS_COPY_ONLYDIFFITEMS
-#: Merge.rc:4519
+#: Merge.rc:4529
msgid "Some selected items are identical or skipped.\nCopy only items with differences?"
msgstr ""
#. IDS_DEL_LEFT_FMT
-#: Merge.rc:4525
+#: Merge.rc:4535
#, c-format
msgid "Left (%1)"
msgstr "Esquerra (%1)"
#. IDS_DEL_MIDDLE_FMT
-#: Merge.rc:4526
+#: Merge.rc:4536
#, c-format
msgid "Middle (%1)"
msgstr "Mig (%1)"
#. IDS_DEL_RIGHT_FMT
-#: Merge.rc:4527
+#: Merge.rc:4537
#, c-format
msgid "Right (%1)"
msgstr "Dreta (%1)"
#. IDS_DEL_BOTH_FMT
-#: Merge.rc:4528
+#: Merge.rc:4538
#, c-format
msgid "Both (%1)"
msgstr "Ambdós (%1)"
#. IDS_DEL_ALL_FMT
-#: Merge.rc:4529
+#: Merge.rc:4539
#, c-format
msgid "All (%1)"
msgstr "Tots (%1)"
#. IDS_SELECT_DEST_LEFT
-#: Merge.rc:4545
+#: Merge.rc:4555
#, c-format
msgid "Left Side - Select Destination Folder:"
msgstr "Costat esquerre - seleccioneu la carpeta de destinació:"
#. IDS_SELECT_DEST_MIDDLE
-#: Merge.rc:4546
+#: Merge.rc:4556
#, c-format
msgid "Middle Side - Select Destination Folder:"
msgstr "Costat del mig - seleccioneu la carpeta de destinació:"
#. IDS_SELECT_DEST_RIGHT
-#: Merge.rc:4547
+#: Merge.rc:4557
#, c-format
msgid "Right Side - Select Destination Folder:"
msgstr "Costat dret - seleccioneu la carpeta de destinació:"
#. IDS_FILES_AFFECTED_FMT
-#: Merge.rc:4548
+#: Merge.rc:4558
#, c-format
msgid "(%1 Files Affected)"
msgstr "(%1 fitxers afectats)"
#. IDS_FILES_AFFECTED_FMT2
-#: Merge.rc:4549
+#: Merge.rc:4559
#, c-format
msgid "(%1 of %2 Files Affected)"
msgstr "(%1 de %2 fitxers afectats)"
#. IDS_CONFIRM_DELETE_SINGLE
-#: Merge.rc:4555
+#: Merge.rc:4565
#, c-format
msgid ""
"Are you sure you want to delete\n"
@@ -6510,18 +6521,18 @@ msgstr ""
"%1 ?"
#. IDS_CONFIRM_SINGLE_COPY
-#: Merge.rc:4556
+#: Merge.rc:4566
msgid "Are you sure you want to copy?"
msgstr "Esteu segur que voleu copiar?"
#. IDS_CONFIRM_MULTIPLE_COPY
-#: Merge.rc:4557
+#: Merge.rc:4567
#, c-format
msgid "Are you sure you want to copy %d items?"
msgstr "Esteu segur que voleu copiar %d elements?"
#. IDS_DIRCMP_NOTSYNC
-#: Merge.rc:4558
+#: Merge.rc:4568
#, c-format
msgid ""
"Operation aborted!\n"
@@ -6541,49 +6552,49 @@ msgstr ""
"Actualitzeu la comparació."
#. IDS_CONFIRM_SINGLE_MOVE
-#: Merge.rc:4563
+#: Merge.rc:4573
msgid "Are you sure you want to move?"
msgstr "Esteu segur que voleu moure?"
#. IDS_CONFIRM_MULTIPLE_MOVE
-#: Merge.rc:4564
+#: Merge.rc:4574
#, c-format
msgid "Are you sure you want to move %d items?"
msgstr "Esteu segur que voleu moure %d elements?"
#. IDS_CONFIRM_MOVE_CAPTION
-#: Merge.rc:4566
+#: Merge.rc:4576
#, c-format
msgid "Confirm Move"
msgstr "Confirmeu l'acció de moure"
-#: Merge.rc:4568
+#: Merge.rc:4578
#, c-format
msgid "Close the folder comparison window?"
msgstr "Esteu a punt de tancar la finestra que compara els directoris. Esteu segurs de tancar la finestra?"
-#: Merge.rc:4570
+#: Merge.rc:4580
msgid "Close the folder comparison window, which took a long time?"
msgstr "Esteu a punt de tancar la finestra de comparació de carpetes que ha trigat molt de temps. Esteu segur que voleu tancar la finestra?"
#. IDS_ERROR_INVALID_DIR_FILE_NAME
-#: Merge.rc:4571
+#: Merge.rc:4581
msgid "The file or folder name is invalid."
msgstr "El nom del fitxer o de la carpeta no és vàlid."
#. IDS_ERROR_EXECUTE_FILE
-#: Merge.rc:4577
+#: Merge.rc:4587
#, c-format
msgid "Failed to execute external editor: %1"
msgstr "No s'ha pogut executar l'editor extern: %1"
#. IDS_UNKNOWN_ARCHIVE_FORMAT
-#: Merge.rc:4583
+#: Merge.rc:4593
#, c-format
msgid "Unknown archive format"
msgstr "El format de l'arxiu és desconegut"
-#: Merge.rc:4585
+#: Merge.rc:4595
msgid ""
"Failed to extract archive.\n"
"Compare as text file?"
@@ -6592,831 +6603,831 @@ msgstr ""
"Voleu comparar els fitxers de l'arxiu com a fitxers de text?"
#. IDS_COLHDR_FILENAME
-#: Merge.rc:4591
+#: Merge.rc:4601
#, c-format
msgid "Filename"
msgstr "Nom de fitxer"
#. IDS_COLHDR_DIR
-#: Merge.rc:4592
+#: Merge.rc:4602
msgctxt "DirView|ColumnHeader"
msgid "Folder"
msgstr "Directori"
#. IDS_COLHDR_RESULT
-#: Merge.rc:4593
+#: Merge.rc:4603
#, c-format
msgid "Comparison Result"
msgstr "Resultat de la comparació"
#. IDS_COLHDR_LTIMEM
-#: Merge.rc:4594
+#: Merge.rc:4604
#, c-format
msgid "Left Date"
msgstr "Data esquerra"
#. IDS_COLHDR_RTIMEM
-#: Merge.rc:4595
+#: Merge.rc:4605
#, c-format
msgid "Right Date"
msgstr "Data dreta"
#. IDS_COLHDR_MTIMEM
-#: Merge.rc:4596
+#: Merge.rc:4606
#, c-format
msgid "Middle Date"
msgstr "Data del Mig"
#. IDS_COLHDR_LSIZE
-#: Merge.rc:4598
+#: Merge.rc:4608
#, c-format
msgid "Left Size"
msgstr "Mida esquerra"
#. IDS_COLHDR_RSIZE
-#: Merge.rc:4599
+#: Merge.rc:4609
#, c-format
msgid "Right Size"
msgstr "Mida dreta"
#. IDS_COLHDR_MSIZE
-#: Merge.rc:4604
+#: Merge.rc:4614
#, c-format
msgid "Middle Size"
msgstr "Mida del Mig"
#. IDS_COLHDR_RSIZE_SHORT
-#: Merge.rc:4605
+#: Merge.rc:4615
#, c-format
msgid "Right Size (Short)"
msgstr "Mida dreta (breu)"
#. IDS_COLHDR_LSIZE_SHORT
-#: Merge.rc:4606
+#: Merge.rc:4616
#, c-format
msgid "Left Size (Short)"
msgstr "Mida esquerra (breu)"
#. IDS_COLHDR_MSIZE_SHORT
-#: Merge.rc:4607
+#: Merge.rc:4617
#, c-format
msgid "Middle Size (Short)"
msgstr "Mida del Mig (Curta)"
#. IDS_COLHDR_LTIMEC
-#: Merge.rc:4613
+#: Merge.rc:4623
#, c-format
msgid "Left Creation Time"
msgstr "Data de creació esquerra"
#. IDS_COLHDR_RTIMEC
-#: Merge.rc:4614
+#: Merge.rc:4624
#, c-format
msgid "Right Creation Time"
msgstr "Data de creació dreta"
#. IDS_COLHDR_MTIMEC
-#: Merge.rc:4615
+#: Merge.rc:4625
#, c-format
msgid "Middle Creation Time"
msgstr "Data de creació del Mig"
#. IDS_COLHDR_NEWER
-#: Merge.rc:4616
+#: Merge.rc:4626
#, c-format
msgid "Newer File"
msgstr "Fitxer més nou"
#. IDS_COLHDR_LVERSION
-#: Merge.rc:4617
+#: Merge.rc:4627
#, c-format
msgid "Left File Version"
msgstr "Versió del fitxer esquerra"
#. IDS_COLHDR_RVERSION
-#: Merge.rc:4618
+#: Merge.rc:4628
#, c-format
msgid "Right File Version"
msgstr "Versió del fitxer dreta"
#. IDS_COLHDR_MVERSION
-#: Merge.rc:4619
+#: Merge.rc:4629
#, c-format
msgid "Middle File Version"
msgstr "Versió del Mig"
#. IDS_COLHDR_RESULT_ABBR
-#: Merge.rc:4620
+#: Merge.rc:4630
#, c-format
msgid "Short Result"
msgstr "Resultat breu"
#. IDS_COLHDR_LATTRIBUTES
-#: Merge.rc:4621
+#: Merge.rc:4631
#, c-format
msgid "Left Attributes"
msgstr "Atributs esquerra"
#. IDS_COLHDR_RATTRIBUTES
-#: Merge.rc:4622
+#: Merge.rc:4632
#, c-format
msgid "Right Attributes"
msgstr "Atributs dreta"
#. IDS_COLHDR_MATTRIBUTES
-#: Merge.rc:4623
+#: Merge.rc:4633
#, c-format
msgid "Middle Attributes"
msgstr "Atributs del Mig"
#. IDS_COLHDR_LEOL_TYPE
-#: Merge.rc:4628
+#: Merge.rc:4638
#, c-format
msgid "Left EOL"
msgstr "Salt de línia esquerra"
#. IDS_COLHDR_MEOL_TYPE
-#: Merge.rc:4629
+#: Merge.rc:4639
#, c-format
msgid "Middle EOL"
msgstr "Salt de línia del Mig"
#. IDS_COLHDR_REOL_TYPE
-#: Merge.rc:4630
+#: Merge.rc:4640
#, c-format
msgid "Right EOL"
msgstr "Salt de línia dreta"
#. IDS_COLHDR_LENCODING
-#: Merge.rc:4636
+#: Merge.rc:4646
#, c-format
msgid "Left Encoding"
msgstr "Codificació esquerra"
#. IDS_COLHDR_RENCODING
-#: Merge.rc:4637
+#: Merge.rc:4647
#, c-format
msgid "Right Encoding"
msgstr "Codificació dreta"
#. IDS_COLHDR_MENCODING
-#: Merge.rc:4638
+#: Merge.rc:4648
#, c-format
msgid "Middle Encoding"
msgstr "Codificació del Mig"
#. IDS_COLHDR_NIDIFFS
-#: Merge.rc:4639
+#: Merge.rc:4649
msgid "Ignored Diff"
msgstr "Diferències ignorades"
#. IDS_COLHDR_BINARY
-#: Merge.rc:4641
+#: Merge.rc:4651
msgctxt "DirView|ColumnHeader"
msgid "Binary"
msgstr "Binari"
#. IDS_PLUGINS_TYPE_UNPACKER
-#: Merge.rc:4642 Merge.rc:4959
+#: Merge.rc:4652 Merge.rc:4969
#, c-format
msgid "Unpacker"
msgstr "Desempaquetador"
#. IDS_PLUGIN_TYPE4
-#: Merge.rc:4643 Merge.rc:4960 Merge.rc:5267
+#: Merge.rc:4653 Merge.rc:4970 Merge.rc:5277
#, c-format
msgid "Prediffer"
msgstr "Prediferenciador"
#. IDS_COLHDR_LEFT
-#: Merge.rc:4644
+#: Merge.rc:4654
msgid "Left"
msgstr "Esquerra"
#. IDS_COLHDR_MIDDLE
-#: Merge.rc:4645
+#: Merge.rc:4655
msgid "Middle"
msgstr "Mig"
#. IDS_COLHDR_RIGHT
-#: Merge.rc:4646
+#: Merge.rc:4656
msgid "Right"
msgstr "Dreta"
#. IDS_COLHDR_DIFF
-#: Merge.rc:4647
+#: Merge.rc:4657
msgid "Diff"
msgstr "Diferència"
#. IDS_COLHDR_LEFT_DUPLICATE
-#: Merge.rc:4648
+#: Merge.rc:4658
msgid "Left Duplicate Count"
msgstr "Duplicats de l'esquerra"
#. IDS_COLHDR_RIGHT_DUPLICATE
-#: Merge.rc:4649
+#: Merge.rc:4659
msgid "Right Duplicate Count"
msgstr "Duplicats de la dreta"
#. IDS_COLHDR_MIDDLE_DUPLICATE
-#: Merge.rc:4650
+#: Merge.rc:4660
msgid "Middle Duplicate Count"
msgstr "Duplicats del Mig"
#. IDS_COLHDR_MOVE
-#: Merge.rc:4651
+#: Merge.rc:4661
msgid "Move"
msgstr "Mou"
#. IDS_PRPCAT_AUDIO
-#: Merge.rc:4658
+#: Merge.rc:4668
msgid "Audio"
msgstr "Àudio"
#. IDS_PRPCAT_CALENDAR
-#: Merge.rc:4659
+#: Merge.rc:4669
msgid "Calendar"
msgstr "Calendari"
#. IDS_PRPCAT_COMMUNICATION
-#: Merge.rc:4660
+#: Merge.rc:4670
msgid "Communication"
msgstr "Comunicació"
#. IDS_PRPCAT_CONTACT
-#: Merge.rc:4661
+#: Merge.rc:4671
msgid "Contact"
msgstr "Contacte"
#. IDS_PRPCAT_DEVICES
-#: Merge.rc:4662
+#: Merge.rc:4672
msgid "Devices"
msgstr "Dispositius"
#. IDS_PRPCAT_DOCUMENT
-#: Merge.rc:4663
+#: Merge.rc:4673
msgid "Document"
msgstr "Document"
#. IDS_PRPCAT_HOME
-#: Merge.rc:4664
+#: Merge.rc:4674
msgid "Home"
msgstr "Inici"
#. IDS_PRPCAT_JOURNAL
-#: Merge.rc:4666
+#: Merge.rc:4676
msgid "Journal"
msgstr "Diari"
#. IDS_PRPCAT_LINK
-#: Merge.rc:4667
+#: Merge.rc:4677
msgid "Link"
msgstr "Enllaç"
#. IDS_PRPCAT_MEDIA
-#: Merge.rc:4668
+#: Merge.rc:4678
msgid "Media"
msgstr "Mitjans"
#. IDS_PRPCAT_MUSIC
-#: Merge.rc:4670
+#: Merge.rc:4680
msgid "Music"
msgstr "Música"
#. IDS_PRPCAT_NOTE
-#: Merge.rc:4671
+#: Merge.rc:4681
msgid "Note"
msgstr "Nota"
#. IDS_PRPCAT_PHOTO
-#: Merge.rc:4672
+#: Merge.rc:4682
msgid "Photo"
msgstr "Foto"
#. IDS_PRPCAT_RECORDEDTV
-#: Merge.rc:4673
+#: Merge.rc:4683
msgid "RecordedTV"
msgstr "RecordedTV"
#. IDS_PRPCAT_SEARCH
-#: Merge.rc:4674
+#: Merge.rc:4684
msgid "Search"
msgstr "Cerca"
#. IDS_PRPCAT_SECURITY
-#: Merge.rc:4675
+#: Merge.rc:4685
msgid "Security"
msgstr "Seguretat"
#. IDS_PRPCAT_SOFTWARE
-#: Merge.rc:4676
+#: Merge.rc:4686
msgid "Software"
msgstr "Aplicacions"
#. IDS_PRPCAT_TASK
-#: Merge.rc:4677
+#: Merge.rc:4687
msgid "Task"
msgstr "Tasques"
#. IDS_PRPCAT_VIDEO
-#: Merge.rc:4678
+#: Merge.rc:4688
msgid "Video"
msgstr "Vídeo"
#. IDS_PRPCAT_HASH
-#: Merge.rc:4679
+#: Merge.rc:4689
msgid "Hash"
msgstr "Resum"
#. IDS_CANT_COMPARE_FILES
-#: Merge.rc:4685
+#: Merge.rc:4695
#, c-format
msgid "Unable to compare files"
msgstr "No es pot comparar els fitxers"
#. IDS_ABORTED_ITEM
-#: Merge.rc:4686
+#: Merge.rc:4696
#, c-format
msgid "Item aborted"
msgstr "Element avortat"
#. IDS_FILE_SKIPPED
-#: Merge.rc:4687
+#: Merge.rc:4697
#, c-format
msgid "File skipped"
msgstr "Fitxer omès"
#. IDS_DIR_SKIPPED
-#: Merge.rc:4688
+#: Merge.rc:4698
#, c-format
msgid "Folder skipped"
msgstr "Directori omès"
#. IDS_LEFT_ONLY_IN_FMT
-#: Merge.rc:4689
+#: Merge.rc:4699
#, c-format
msgid "Left only: %1"
msgstr "Només esquerra: %1"
#. IDS_MIDDLE_ONLY_IN_FMT
-#: Merge.rc:4690
+#: Merge.rc:4700
#, c-format
msgid "Middle only: %1"
msgstr "Només mig: %1"
#. IDS_RIGHT_ONLY_IN_FMT
-#: Merge.rc:4691
+#: Merge.rc:4701
#, c-format
msgid "Right only: %1"
msgstr "Només dreta: %1"
#. IDS_DOES_NOT_EXIST_IN_FMT
-#: Merge.rc:4692
+#: Merge.rc:4702
#, c-format
msgid "Does not exist in %1"
msgstr "No existeix en %1"
#. IDS_BIN_FILES_SAME
-#: Merge.rc:4693
+#: Merge.rc:4703
#, c-format
msgid "Binary files are identical"
msgstr "Els fitxers binaris són idèntics"
#. IDS_BIN_FILES_DIFF
-#: Merge.rc:4699
+#: Merge.rc:4709
#, c-format
msgid "Binary files are different"
msgstr "Els fitxers binaris són diferents"
#. IDS_FILES_ARE_DIFFERENT
-#: Merge.rc:4700
+#: Merge.rc:4710
#, c-format
msgid "Files are different"
msgstr "Els fitxers són diferents"
#. IDS_FOLDERS_ARE_DIFFERENT
-#: Merge.rc:4701
+#: Merge.rc:4711
#, c-format
msgid "Folders are different"
msgstr "Els directoris són diferents"
#. IDS_LEFTONLY
-#: Merge.rc:4702
+#: Merge.rc:4712
#, c-format
msgid "Left Only"
msgstr "Només l'esquerre"
#. IDS_RIGHTONLY
-#: Merge.rc:4703
+#: Merge.rc:4713
#, c-format
msgid "Right Only"
msgstr "Només el dret"
#. IDS_MIDDLEONLY
-#: Merge.rc:4704
+#: Merge.rc:4714
#, c-format
msgid "Middle Only"
msgstr "Només el del mig"
#. IDS_NOITEMLEFT
-#: Merge.rc:4705
+#: Merge.rc:4715
#, c-format
msgid "No item in left"
msgstr "Sense element a l'esquerra"
#. IDS_NOITEMRIGHT
-#: Merge.rc:4706
+#: Merge.rc:4716
#, c-format
msgid "No item in right"
msgstr "Sense element al mig"
#. IDS_NOITEMMIDDLE
-#: Merge.rc:4707
+#: Merge.rc:4717
#, c-format
msgid "No item in middle"
msgstr "Sense element al mig"
#. IDS_CMPRES_ERROR
-#: Merge.rc:4709
+#: Merge.rc:4719
#, c-format
msgid "Error"
msgstr "Error"
#. IDS_TEXT_FILES_SAME
-#: Merge.rc:4710
+#: Merge.rc:4720
#, c-format
msgid "Text files are identical"
msgstr "Els fitxers de text són idèntics"
#. IDS_LEFTONLY_DIFF
-#: Merge.rc:4711
+#: Merge.rc:4721
msgid " (Middle and right are identical)"
msgstr " (Mig i dreta són idèntics)"
#. IDS_MIDDLEONLY_DIFF
-#: Merge.rc:4712
+#: Merge.rc:4722
msgid " (Left and right are identical)"
msgstr " (Esquerra i dreta són idèntics)"
#. IDS_RIGHTONLY_DIFF
-#: Merge.rc:4713
+#: Merge.rc:4723
msgid " (Left and middle are identical)"
msgstr " (Esquerra i mig són idèntics)"
#. IDS_PATH_MISMATCH
-#: Merge.rc:4714
+#: Merge.rc:4724
msgid " (paths differ)"
msgstr ""
#. IDS_TEXT_FILES_DIFF
-#: Merge.rc:4715
+#: Merge.rc:4725
#, c-format
msgid "Text files are different"
msgstr "Els fitxers de text són diferents"
#. IDS_IMAGE_FILES_SAME
-#: Merge.rc:4716
+#: Merge.rc:4726
msgid "Image files are identical"
msgstr "Les imatges són idèntiques"
#. IDS_IMAGE_FILES_DIFF
-#: Merge.rc:4717
+#: Merge.rc:4727
msgid "Image files are different"
msgstr "Les imatges són diferents"
#. IDS_EXPR_DIFF
-#: Merge.rc:4718
+#: Merge.rc:4728
#, c-format
msgid "Files are different (expr: %1)"
msgstr ""
#. IDS_HASH_GROUP
-#: Merge.rc:4719
+#: Merge.rc:4729
#, c-format
msgid "Group%d"
msgstr "Grup%d"
#. IDS_RENAME_MOVE_DETECTION_DISALBED
-#: Merge.rc:4720
+#: Merge.rc:4730
msgctxt "Options dialog|Compare|Folder|Detect renames and moves"
msgid "Disabled"
msgstr ""
#. IDS_RENAME_MOVE_DETECTION_RENAME
-#: Merge.rc:4721
+#: Merge.rc:4731
msgid "Detect renames"
msgstr ""
#. IDS_RENAME_MOVE_DETECTION_RENAME_MOVE
-#: Merge.rc:4722
+#: Merge.rc:4732
msgid "Detect renames and moves"
msgstr ""
#. IDS_RENAME_MOVE_MERGE_MODE_RENAME
-#: Merge.rc:4723
+#: Merge.rc:4733
msgid "Merge renames"
msgstr ""
#. IDS_RENAME_MOVE_MERGE_MODE_RENAME_MOVE
-#: Merge.rc:4724
+#: Merge.rc:4734
msgid "Merge renames and moves"
msgstr ""
#. IDS_RENAMED
-#: Merge.rc:4725
+#: Merge.rc:4735
msgid "Renamed"
msgstr ""
#. IDS_MOVED
-#: Merge.rc:4726
+#: Merge.rc:4736
msgid "Moved"
msgstr ""
#. IDS_RENAMED_MOVED
-#: Merge.rc:4727
+#: Merge.rc:4737
msgid "Renamed/Moved"
msgstr ""
#. IDS_RENAMED_MOVED_ITEMS
-#: Merge.rc:4728
+#: Merge.rc:4738
#, c-format
msgid "(%1 items)"
msgstr ""
#. IDS_RENAMED_MOVED_RESULT
-#: Merge.rc:4729
+#: Merge.rc:4739
#, c-format
msgid "%1 (set %2): "
msgstr ""
#. IDS_SWITCH_FLAT_MODE
-#: Merge.rc:4730
+#: Merge.rc:4740
msgid "Some moved items have been merged.\nIn Tree Mode, these items may appear in positions that do not reflect the actual folder structure, which can be confusing.\nSwitch to Flat Mode?"
msgstr ""
#. IDS_ELAPSED_TIME
-#: Merge.rc:4736
+#: Merge.rc:4746
#, c-format
msgid "Elapsed time: %ld ms"
msgstr "Temps transcorregut: %ld ms"
#. IDS_STATUS_SELITEM1
-#: Merge.rc:4737
+#: Merge.rc:4747
#, c-format
msgid "1 item selected"
msgstr "1 element seleccionat"
#. IDS_STATUS_SELITEMS
-#: Merge.rc:4738
+#: Merge.rc:4748
#, c-format
msgid "%1 items selected"
msgstr "%1 elements seleccionats"
#. IDS_COLDESC_FILENAME
-#: Merge.rc:4744
+#: Merge.rc:4754
#, c-format
msgid "Filename or folder name."
msgstr "Nom del fitxer o directori."
#. IDS_COLDESC_DIR
-#: Merge.rc:4745
+#: Merge.rc:4755
#, c-format
msgid "Subfolder name when subfolders are included."
msgstr "Nom del subdirectori quan s'incloguin els subdirectoris."
#. IDS_COLDESC_RESULT
-#: Merge.rc:4746
+#: Merge.rc:4756
#, c-format
msgid "Comparison result, long form."
msgstr "Resultat de la comparació, en forma llarga."
#. IDS_COLDESC_LTIMEM
-#: Merge.rc:4751
+#: Merge.rc:4761
#, c-format
msgid "Left side modification date."
msgstr "Data de modificació del costat esquerre."
#. IDS_COLDESC_RTIMEM
-#: Merge.rc:4752
+#: Merge.rc:4762
#, c-format
msgid "Right side modification date."
msgstr "Data de modificació del costat dret."
#. IDS_COLDESC_MTIMEM
-#: Merge.rc:4753
+#: Merge.rc:4763
#, c-format
msgid "Middle side modification date."
msgstr "Data de modificació del mig."
#. IDS_COLDESC_EXTENSION
-#: Merge.rc:4754
+#: Merge.rc:4764
#, c-format
msgid "File's extension."
msgstr "Extensió del fitxer."
#. IDS_COLDESC_LSIZE
-#: Merge.rc:4755
+#: Merge.rc:4765
#, c-format
msgid "Left file size in bytes."
msgstr "Mida en bytes del fitxer esquerre."
#. IDS_COLDESC_RSIZE
-#: Merge.rc:4756
+#: Merge.rc:4766
#, c-format
msgid "Right file size in bytes."
msgstr "Mida en bytes del fitxer dret."
#. IDS_COLDESC_MSIZE
-#: Merge.rc:4757
+#: Merge.rc:4767
#, c-format
msgid "Middle file size in bytes."
msgstr "Mida en bytes del fitxer del mig."
#. IDS_COLDESC_LSIZE_SHORT
-#: Merge.rc:4758
+#: Merge.rc:4768
#, c-format
msgid "Left file size abbreviated."
msgstr "Mida del fitxer esquerre en format abreujat."
#. IDS_COLDESC_RSIZE_SHORT
-#: Merge.rc:4759
+#: Merge.rc:4769
#, c-format
msgid "Right file size abbreviated."
msgstr "Mida del fitxer dret en format abreujat."
#. IDS_COLDESC_MSIZE_SHORT
-#: Merge.rc:4760
+#: Merge.rc:4770
#, c-format
msgid "Middle file size abbreviated."
msgstr "Mida del fitxer del mig en format abreujat."
#. IDS_COLDESC_LTIMEC
-#: Merge.rc:4766
+#: Merge.rc:4776
#, c-format
msgid "Left side creation time."
msgstr "Data de creació del fitxer esquerre."
#. IDS_COLDESC_RTIMEC
-#: Merge.rc:4767
+#: Merge.rc:4777
#, c-format
msgid "Right side creation time."
msgstr "Data de creació del fitxer dret."
#. IDS_COLDESC_MTIMEC
-#: Merge.rc:4768
+#: Merge.rc:4778
#, c-format
msgid "Middle side creation time."
msgstr "Data de creació del fitxer del mig."
#. IDS_COLDESC_NEWER
-#: Merge.rc:4769
+#: Merge.rc:4779
#, c-format
msgid "Tells which side has newer modification date."
msgstr "Indica quin costat té una data de modificació més recent."
#. IDS_COLDESC_LVERSION
-#: Merge.rc:4770
+#: Merge.rc:4780
msgid "Left side file version, only for some file types."
msgstr "Versió del fitxer del costat esquerre, només per a alguns tipus de fitxer."
#. IDS_COLDESC_RVERSION
-#: Merge.rc:4771
+#: Merge.rc:4781
msgid "Right side file version, only for some file types."
msgstr "Versió del fitxer del costat dret, només per a alguns tipus de fitxer."
#. IDS_COLDESC_MVERSION
-#: Merge.rc:4776
+#: Merge.rc:4786
msgid "Middle side file version, only for some file types."
msgstr "Versió del fitxer del mig, només per a alguns tipus de fitxer."
#. IDS_COLDESC_RESULT_ABBR
-#: Merge.rc:4777
+#: Merge.rc:4787
#, c-format
msgid "Short comparison result."
msgstr "Resultat breu de la comparació."
#. IDS_COLDESC_LATTRIBUTES
-#: Merge.rc:4778
+#: Merge.rc:4788
#, c-format
msgid "Left side attributes."
msgstr "Atributs del costat esquerre."
#. IDS_COLDESC_RATTRIBUTES
-#: Merge.rc:4779
+#: Merge.rc:4789
#, c-format
msgid "Right side attributes."
msgstr "Atributs del costat dret."
#. IDS_COLDESC_MATTRIBUTES
-#: Merge.rc:4780
+#: Merge.rc:4790
#, c-format
msgid "Middle side attributes."
msgstr "Atributs del mig."
#. IDS_COLDESC_LEOL_TYPE
-#: Merge.rc:4781
+#: Merge.rc:4791
msgid "Left side file EOL type."
msgstr "Tipus de salt de línia del fitxer del costat esquerre."
#. IDS_COLDESC_REOL_TYPE
-#: Merge.rc:4782
+#: Merge.rc:4792
msgid "Right side file EOL type."
msgstr "Tipus de salt de línia del fitxer del costat dret."
#. IDS_COLDESC_MEOL_TYPE
-#: Merge.rc:4783
+#: Merge.rc:4793
msgid "Middle side file EOL type."
msgstr "Tipus de salt de línia del fitxer del mig."
#. IDS_COLDESC_LENCODING
-#: Merge.rc:4789
+#: Merge.rc:4799
#, c-format
msgid "Left side encoding."
msgstr "Codificació del costat esquerre."
#. IDS_COLDESC_RENCODING
-#: Merge.rc:4790
+#: Merge.rc:4800
#, c-format
msgid "Right side encoding."
msgstr "Codificació del costat dret."
#. IDS_COLDESC_MENCODING
-#: Merge.rc:4791
+#: Merge.rc:4801
#, c-format
msgid "Middle side encoding."
msgstr "Codificació del mig."
#. IDS_COLDESC_NIDIFFS
-#: Merge.rc:4792
+#: Merge.rc:4802
#, c-format
msgid "Number of ignored differences in file. Ignored 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."
#. IDS_COLDESC_NSDIFFS
-#: Merge.rc:4793
+#: Merge.rc:4803
#, c-format
msgid "Number of differences in file (excluding ignored)."
msgstr "Nombre de diferències al fitxer. Aquest nombre no inclou les diferències ignorades."
#. IDS_COLDESC_BINARY
-#: Merge.rc:4794
+#: Merge.rc:4804
#, c-format
msgid "Shows an asterisk (*) if the file is binary."
msgstr "Mostra un asterisc (*) si el fitxer és binari."
#. IDS_COLDESC_UNPACKER
-#: Merge.rc:4795
+#: Merge.rc:4805
msgid "Unpacker plugin name or pipeline."
msgstr "Nom del connector desempaquetador o seqüència."
#. IDS_COLDESC_PREDIFFER
-#: Merge.rc:4796
+#: Merge.rc:4806
msgid "Prediffer plugin name or pipeline."
msgstr "Nom del connector de prediferenciació o seqüència."
#. IDS_DIRECTORY_REPORT_TITLE
-#: Merge.rc:4802
+#: Merge.rc:4812
#, c-format
msgid "Compare %1 with %2"
msgstr "Compara %1 amb %2"
#. IDS_DIRECTORY_REPORT_TITLE3
-#: Merge.rc:4803
+#: Merge.rc:4813
#, c-format
msgid "Compare %1 with %2 and %3"
msgstr "Compara %1 amb %2 i %3"
#. IDS_REPORT_COMMALIST
-#: Merge.rc:4804
+#: Merge.rc:4814
#, c-format
msgid "Comma-separated list"
msgstr "Llista delimitada per comes"
#. IDS_REPORT_TABLIST
-#: Merge.rc:4805
+#: Merge.rc:4815
#, c-format
msgid "Tab-separated list"
msgstr "Llista delimitada per tabulacions"
#. IDS_REPORT_SIMPLEHTML
-#: Merge.rc:4806
+#: Merge.rc:4816
#, c-format
msgid "Simple HTML"
msgstr "HTML simple"
#. IDS_REPORT_SIMPLEXML
-#: Merge.rc:4807
+#: Merge.rc:4817
#, c-format
msgid "Simple XML"
msgstr "XML simple"
-#: Merge.rc:4809
+#: Merge.rc:4819
#, c-format
msgid "Report file already exists. Overwrite?"
msgstr "El fitxer d'informe ja existeix. Voleu sobreescriure'l?"
#. IDS_REPORT_ERROR
-#: Merge.rc:4814
+#: Merge.rc:4824
#, c-format
msgid ""
"Error creating the report:\n"
@@ -7426,62 +7437,62 @@ msgstr ""
"%1"
#. IDS_REPORT_SUCCESS
-#: Merge.rc:4815
+#: Merge.rc:4825
#, c-format
msgid "Report created successfully."
msgstr "L'informe s'ha creat satisfactòriament."
#. IDS_SYNCPOINT_LASTBLOCK
-#: Merge.rc:4821
+#: Merge.rc:4831
msgid "Cannot add a synchronization point at this line."
msgstr "No es pot afegir un punt de sincronització en aquesta línia."
#. IDS_FILE_TO_ITSELF
-#: Merge.rc:4827
+#: Merge.rc:4837
#, c-format
msgid "Same file is opened in both panes."
msgstr "El mateix fitxer és obert a ambdues subfinestres."
#. IDS_FILESSAME
-#: Merge.rc:4828
+#: Merge.rc:4838
#, c-format
msgid "Selected files are identical."
msgstr "Els fitxers seleccionats són idèntics."
#. IDS_FILESSAME_CURCFG
-#: Merge.rc:4829
+#: Merge.rc:4839
msgid "Selected files are identical (with current settings).\r\nChecking binary identity..."
msgstr ""
#. IDS_FILESSAME_BINERROR
-#: Merge.rc:4830
+#: Merge.rc:4840
msgid "Selected files are identical (with current settings).\r\nBut binary comparison failed."
msgstr ""
#. IDS_FILESSAME_BINSAME
-#: Merge.rc:4831
+#: Merge.rc:4841
msgid "Selected files are identical (binary match)."
msgstr ""
#. IDS_FILESSAME_BINDIFF
-#: Merge.rc:4832
+#: Merge.rc:4842
msgid "Selected files are identical (with current settings).\r\nBut differ at the binary level."
msgstr ""
#. IDS_FILEERROR
-#: Merge.rc:4833
+#: Merge.rc:4843
#, c-format
msgid "An error occurred while comparing files."
msgstr "S'ha produït un error en comparar els fitxers."
#. IDS_TEMP_FILEERROR
-#: Merge.rc:4834
+#: Merge.rc:4844
#, c-format
msgid "Could not create temporary files. Check your temporary path settings."
msgstr "No s'han pogut obrir els fitxers temporals. Comproveu la configuració del directori temporal."
#. IDS_SUGGEST_IGNOREEOL
-#: Merge.rc:4835
+#: Merge.rc:4845
msgid "Files use different EOL.\n\nTreat all EOL as equivalent?\n\nSet 'Ignore EOL differences (Windows/Unix/Mac)' in Compare section of Options."
msgstr ""
"Els fitxers tenen tipus de salt de línia de diferents.\n"
@@ -7491,19 +7502,19 @@ msgstr ""
"Nota: Si voleu tractar els salts de línia sempre com a equivalents, especifiqueu l'opció 'Ignora les diferències de salt de línia (Windows/Unix/Mac)' a la secció Comparació de la finestra d'opcions (disponible des del menú Edita/Opcions)."
#. IDS_INVALID_DIRECTORY
-#: Merge.rc:4836
+#: Merge.rc:4846
#, c-format
msgid "Selected folder is invalid."
msgstr "La carpeta seleccionada no és vàlida."
#. IDS_CANNOT_OPEN_BINARYFILE
-#: Merge.rc:4837
+#: Merge.rc:4847
#, c-format
msgid "Cannot open a binary file in Editor."
msgstr "No es poden obrir fitxers binaris a l'editor."
#. IDS_CREATE_PAIR_FOLDER
-#: Merge.rc:4838
+#: Merge.rc:4848
#, c-format
msgid "Create matching folder:\n%1\non the other side and open?"
msgstr ""
@@ -7514,45 +7525,45 @@ msgstr ""
"i obrir ambdós directoris?"
#. IDS_CONFIRM_COPY_ALL_DIFFS
-#: Merge.rc:4839
+#: Merge.rc:4849
msgid "Copy all differences to other file?"
msgstr "Esteu segur que voleu copiar totes les diferències a l'altre fitxer?"
#. IDS_MOVE_TO_NEXTFILE
-#: Merge.rc:4844
+#: Merge.rc:4854
#, c-format
msgid "Move to next file?"
msgstr "Voleu anar al següent fitxer?"
#. IDS_MOVE_TO_PREVFILE
-#: Merge.rc:4845
+#: Merge.rc:4855
#, c-format
msgid "Move to previous file?"
msgstr "Voleu anar al fitxer anterior?"
#. IDS_MOVE_TO_NEXTPAGE
-#: Merge.rc:4846
+#: Merge.rc:4856
#, c-format
msgid "Move to next page?"
msgstr "Voleu anar a la següent pàgina?"
#. IDS_MOVE_TO_PREVPAGE
-#: Merge.rc:4847
+#: Merge.rc:4857
#, c-format
msgid "Move to previous page?"
msgstr "Voleu anar a la pàgina anterior?"
#. IDS_MOVE_TO_FIRSTFILE
-#: Merge.rc:4848
+#: Merge.rc:4858
msgid "Move to first file?"
msgstr "Voleu anar al primer fitxer?"
#. IDS_MOVE_TO_LASTFILE
-#: Merge.rc:4849
+#: Merge.rc:4859
msgid "Move to last file?"
msgstr "Voleu anar a l'últim fitxer?"
-#: Merge.rc:4856
+#: Merge.rc:4866
#, c-format
msgid "Different codepages: left (cp%d), right (cp%d).\nDisplay in codepage (better display) or default Windows codepage (safer merging)?\n(Recommended: default Windows codepage)"
msgstr ""
@@ -7560,57 +7571,57 @@ msgstr ""
"Si es mostra cada fitxer en la seva codificació potser es visualitzaran millor, però la fusió/còpia serà perillosa.\n"
"Voleu tractar ambdós fitxers com si tinguessin la codificació predeterminada del Windows (recomanat)?"
-#: Merge.rc:4858
+#: Merge.rc:4868
#, 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:4860
+#: Merge.rc:4870
#, c-format
msgid "Information lost due to encoding errors: first file"
msgstr "S'ha perdut informació degut a errors de codificació: primer fitxer"
-#: Merge.rc:4862
+#: Merge.rc:4872
#, c-format
msgid "Information lost due to encoding errors: second file"
msgstr "S'ha perdut informació degut a errors de codificació: segon fitxer"
-#: Merge.rc:4864
+#: Merge.rc:4874
#, c-format
msgid "Information lost due to encoding errors: third file"
msgstr "S'ha perdut informació degut a errors de codificació: tercer fitxer"
#. IDS_LINEDIFF_NODIFF
-#: Merge.rc:4870
+#: Merge.rc:4880
#, c-format
msgid "No difference"
msgstr "Sense diferències"
#. IDS_LINEDIFF_NODIFF_CAPTION
-#: Merge.rc:4871
+#: Merge.rc:4881
#, c-format
msgid "Line difference"
msgstr "Diferència de línia"
#. IDS_NUM_REPLACED
-#: Merge.rc:4877
+#: Merge.rc:4887
#, c-format
msgid "Replaced %1 string(s)."
msgstr "S'ha(n) substituït %1 cadena(es)."
#. IDS_EDIT_TEXT_NOT_FOUND
-#: Merge.rc:4878
+#: Merge.rc:4888
#, c-format
msgid "Cannot find string \"%s\"."
msgstr "No s'ha trobat la cadena \"%s\"."
#. IDS_MERGE_MODE
-#: Merge.rc:4884
+#: Merge.rc:4894
msgid "Entering Merge Mode. Press F9 to turn off."
msgstr "Esteu entrant al mode de fusió. Si voleu desactivar el mode de fusió, premeu la tecla F9."
#. IDS_AUTO_MERGE
-#: Merge.rc:4890
+#: Merge.rc:4900
#, c-format
msgid ""
"Automatic merges: %1\n"
@@ -7620,107 +7631,107 @@ msgstr ""
"El nombre de conflictes no resolts: %2"
#. IDS_CODEPAGE_MERGED
-#: Merge.rc:4891
+#: Merge.rc:4901
msgid "Codepage change merged."
msgstr "El canvi de codificació de caràcters s'ha fusionat."
#. IDS_CODEPAGE_CONFLICT
-#: Merge.rc:4892
+#: Merge.rc:4902
msgid "Codepage changes are conflicting."
msgstr "Els canvis de codificació de caràcters estan en conflicte."
#. IDS_EOL_MERGED
-#: Merge.rc:4893
+#: Merge.rc:4903
msgid "EOL change merged."
msgstr "El canvi en els salts de línia s'han fusionat."
#. IDS_EOL_CONFLICT
-#: Merge.rc:4894
+#: Merge.rc:4904
msgid "EOL changes are conflicting."
msgstr "Els canvis en els salts de línia estan en conflicte."
#. IDS_LOCBAR_CAPTION
-#: Merge.rc:4900
+#: Merge.rc:4910
#, c-format
msgid "Location Pane"
msgstr "Subfinestra d'ubicació"
#. IDS_DIFFBAR_CAPTION
-#: Merge.rc:4901
+#: Merge.rc:4911
#, c-format
msgid "Diff Pane"
msgstr "Subfinestra de diferències"
#. IDS_DIFF_SUCCEEDED
-#: Merge.rc:4908
+#: Merge.rc:4918
#, c-format
msgid "Patch file written."
msgstr "El pedaç s'ha generat satisfactòriament."
#. IDS_DIFF_ITEM1NOTFOUND
-#: Merge.rc:4909
+#: Merge.rc:4919
msgid "First item not found!"
msgstr "1. No es troba l'element."
#. IDS_DIFF_ITEM2NOTFOUND
-#: Merge.rc:4910
+#: Merge.rc:4920
msgid "Second item not found!"
msgstr "2. No es troba l'element."
#. IDS_DIFF_FILEOVERWRITE
-#: Merge.rc:4911
+#: Merge.rc:4921
#, c-format
msgid "Patch file already exists. Overwrite?"
msgstr "El fitxer de pedaç ja existeix. El voleu sobreescriure?"
#. IDS_DIFF_SELECTEDFILES
-#: Merge.rc:4912
+#: Merge.rc:4922
#, c-format
msgid "[%1 files selected]"
msgstr "[%1 fitxers seleccionats]"
#. IDS_DIFF_NORMAL
-#: Merge.rc:4913
+#: Merge.rc:4923
#, c-format
msgid "Normal"
msgstr "Normal"
#. IDS_DIFF_CONTEXT
-#: Merge.rc:4914
+#: Merge.rc:4924
#, c-format
msgid "Context"
msgstr "Context"
#. IDS_DIFF_UNIFIED
-#: Merge.rc:4915
+#: Merge.rc:4925
#, c-format
msgid "Unified"
msgstr "Unificat"
#. IDS_FILEWRITE_ERROR
-#: Merge.rc:4917
+#: Merge.rc:4927
#, c-format
msgid "Could not write to file %1."
msgstr "No s'ha pogut escriure al fitxer %1."
#. IDS_PATH_NOT_ABSOLUTE
-#: Merge.rc:4918
+#: Merge.rc:4928
#, c-format
msgid "Output path is not absolute: %1"
msgstr "El camí de sortida especificat no és un camí absolut: %1"
#. IDS_MUST_SPECIFY_OUTPUT
-#: Merge.rc:4919
+#: Merge.rc:4929
msgid "Specify an output file."
msgstr "Especifiqueu un fitxer de sortida."
-#: Merge.rc:4921
+#: Merge.rc:4931
#, c-format
msgid "Cannot create patch from binary files."
msgstr "No es pot crear un pedaç de fitxers binaris."
#. IDS_SAVEFILES_FORPATCH
-#: Merge.rc:4922
+#: Merge.rc:4932
#, c-format
msgid ""
"Save all files first.\n"
@@ -7732,13 +7743,13 @@ msgstr ""
"Cal que no hi hagi cap fitxer pendent de desar per tal de crear un pedaç."
#. IDS_FOLDER_NOTEXIST
-#: Merge.rc:4923
+#: Merge.rc:4933
#, c-format
msgid "Folder does not exist."
msgstr "El directori no existeix."
#. IDS_NO_ZIP_SUPPORT
-#: Merge.rc:4928
+#: Merge.rc:4938
msgid ""
"Archive support not enabled.\n"
"7-Zip and/or Merge7z*.dll not found.\n"
@@ -7749,43 +7760,43 @@ msgstr ""
"Vegeu el manual per a més informació sobre al suport per a arxivament i com habilitar-lo."
#. IDS_OPT_EXPORT_CAPTION
-#: Merge.rc:4929
+#: Merge.rc:4939
#, c-format
msgid "Select file for export"
msgstr "Trieu el fitxer a exportar"
#. IDS_OPT_IMPORT_CAPTION
-#: Merge.rc:4930
+#: Merge.rc:4940
#, c-format
msgid "Select file for import"
msgstr "Trieu el fitxer a importar"
#. IDS_OPT_IMPORT_DONE
-#: Merge.rc:4931
+#: Merge.rc:4941
#, c-format
msgid "Options imported from file."
msgstr "S'ha importat les opcions des del fitxer."
#. IDS_OPT_EXPORT_DONE
-#: Merge.rc:4932
+#: Merge.rc:4942
#, c-format
msgid "Options exported to file."
msgstr "S'ha exportat les opcions al fitxer."
#. IDS_OPT_IMPORT_ERR
-#: Merge.rc:4933
+#: Merge.rc:4943
#, c-format
msgid "Failed to import options from file."
msgstr "No s'ha pogut importar les opcions del fitxer."
#. IDS_OPT_EXPORT_ERR
-#: Merge.rc:4934
+#: Merge.rc:4944
#, c-format
msgid "Failed to write options to file."
msgstr "No s'ha pogut escriure les opcions al fitxer."
#. IDS_CLOSEALL_WINDOWS
-#: Merge.rc:4935
+#: Merge.rc:4945
#, c-format
msgid ""
"Close multiple compare windows?\n"
@@ -7797,48 +7808,48 @@ msgstr ""
"Voleu continuar?"
#. IDS_EOL_MIXED
-#: Merge.rc:4944
+#: Merge.rc:4954
#, c-format
msgid "Mixed"
msgstr "Barrejat"
#. IDS_EOL_BIN
-#: Merge.rc:4945
+#: Merge.rc:4955
msgctxt "EOL Type"
msgid "Binary"
msgstr "Binari"
#. IDS_EOL_NONE
-#: Merge.rc:4949
+#: Merge.rc:4959
#, c-format
msgid "None"
msgstr "Cap"
#. IDS_MARKER_COLOR_FMT
-#: Merge.rc:4950
+#: Merge.rc:4960
#, c-format
msgid "Marker Color %d"
msgstr "Color de marca %d"
#. IDS_MARKER_NEW_PATTERN
-#: Merge.rc:4951
+#: Merge.rc:4961
msgid "New Pattern"
msgstr "Patró nou"
#. IDS_PLUGINSLIST_TYPE
-#: Merge.rc:4957
+#: Merge.rc:4967
#, c-format
msgid "Type"
msgstr "Tipus"
#. IDS_PLUGINS_TYPE_EDITSCRIPT
-#: Merge.rc:4961
+#: Merge.rc:4971
#, c-format
msgid "Editor script"
msgstr "Editor de scripts"
#. ID_SELECTLINEDIFF
-#: Merge.rc:4967
+#: Merge.rc:4977
#, c-format
msgid ""
"\n"
@@ -7848,7 +7859,7 @@ msgstr ""
"Diferència en la línia actual (F4)"
#. ID_OPTIONS
-#: Merge.rc:4968
+#: Merge.rc:4978
#, c-format
msgid ""
"\n"
@@ -7858,7 +7869,7 @@ msgstr ""
"Opcions"
#. ID_REFRESH
-#: Merge.rc:4969
+#: Merge.rc:4979
#, c-format
msgid ""
"\n"
@@ -7868,7 +7879,7 @@ msgstr ""
"Actualitza (F5)"
#. ID_PREVDIFF
-#: Merge.rc:4975
+#: Merge.rc:4985
#, c-format
msgid ""
"\n"
@@ -7878,7 +7889,7 @@ msgstr ""
"Diferència anterior (Alt+Amunt)"
#. ID_NEXTDIFF
-#: Merge.rc:4976
+#: Merge.rc:4986
#, c-format
msgid ""
"\n"
@@ -7888,7 +7899,7 @@ msgstr ""
"Diferència següent (Alt+Avall)"
#. ID_PREVCONFLICT
-#: Merge.rc:4977
+#: Merge.rc:4987
#, c-format
msgid ""
"\n"
@@ -7898,7 +7909,7 @@ msgstr ""
"Conflicte anterior (Alt+Maj+Amunt)"
#. ID_NEXTCONFLICT
-#: Merge.rc:4978
+#: Merge.rc:4988
#, c-format
msgid ""
"\n"
@@ -7908,7 +7919,7 @@ msgstr ""
"Conflicte següent (Alt+Maj+Avall)"
#. ID_FIRSTDIFF
-#: Merge.rc:4983
+#: Merge.rc:4993
#, c-format
msgid ""
"\n"
@@ -7918,7 +7929,7 @@ msgstr ""
"Primera diferència (Alt+Inici)"
#. ID_CURDIFF
-#: Merge.rc:4984
+#: Merge.rc:4994
#, c-format
msgid ""
"\n"
@@ -7928,7 +7939,7 @@ msgstr ""
"Diferència actual (Alt+Retorn)"
#. ID_LASTDIFF
-#: Merge.rc:4985
+#: Merge.rc:4995
#, c-format
msgid ""
"\n"
@@ -7938,7 +7949,7 @@ msgstr ""
"Darrera diferència (Alt+Fi)"
#. ID_L2R
-#: Merge.rc:4986
+#: Merge.rc:4996
msgid ""
"\n"
"Copy to Right (Alt+Right)"
@@ -7947,7 +7958,7 @@ msgstr ""
"Copia a la dreta (Alt+Dreta)"
#. ID_R2L
-#: Merge.rc:4987
+#: Merge.rc:4997
msgid ""
"\n"
"Copy to Left (Alt+Left)"
@@ -7956,7 +7967,7 @@ msgstr ""
"Copia a l'esquerra (Alt+Esquerra)"
#. ID_L2RNEXT
-#: Merge.rc:4988
+#: Merge.rc:4998
msgid ""
"\n"
"Copy to Right and Advance (Ctrl+Alt+Right)"
@@ -7965,7 +7976,7 @@ msgstr ""
"Copia a la dreta i avança (Alt+Control+Dreta)"
#. ID_R2LNEXT
-#: Merge.rc:4989
+#: Merge.rc:4999
msgid ""
"\n"
"Copy to Left and Advance (Ctrl+Alt+Left)"
@@ -7974,7 +7985,7 @@ msgstr ""
"Copia a l'esquerra i avança (Alt+Control+Esquerra)"
#. ID_ALL_RIGHT
-#: Merge.rc:4990
+#: Merge.rc:5000
msgid ""
"\n"
"Copy All to Right"
@@ -7983,7 +7994,7 @@ msgstr ""
"Copia-ho tot a la dreta"
#. ID_ALL_LEFT
-#: Merge.rc:4991
+#: Merge.rc:5001
msgid ""
"\n"
"Copy All to Left"
@@ -7992,7 +8003,7 @@ msgstr ""
"Copia-ho tot a l'esquerra"
#. ID_AUTO_MERGE
-#: Merge.rc:4992
+#: Merge.rc:5002
#, c-format
msgid ""
"\n"
@@ -8002,7 +8013,7 @@ msgstr ""
"Fusiona automàticament (Control+Alt+M)"
#. ID_FIRSTFILE
-#: Merge.rc:4993
+#: Merge.rc:5003
msgid ""
"\n"
"First File"
@@ -8011,7 +8022,7 @@ msgstr ""
"Primer fitxer"
#. ID_NEXTFILE
-#: Merge.rc:4994
+#: Merge.rc:5004
msgid ""
"\n"
"Next File (Ctrl+F8)"
@@ -8020,7 +8031,7 @@ msgstr ""
"Següent fitxer (Control+F8)"
#. ID_LASTFILE
-#: Merge.rc:4995
+#: Merge.rc:5005
msgid ""
"\n"
"Last File"
@@ -8029,7 +8040,7 @@ msgstr ""
"Darrer fitxer"
#. ID_PREVFILE
-#: Merge.rc:4996
+#: Merge.rc:5006
msgid ""
"\n"
"Previous File (Ctrl+F7)"
@@ -8038,39 +8049,39 @@ msgstr ""
"Fitxer anterior (Control+F7)"
#. IDS_UNPACK_AUTO
-#: Merge.rc:5003
+#: Merge.rc:5013
msgid "Adapted unpacker applied to both files (one needs extension)."
msgstr "El desempaquetador adaptat s'aplica a ambdós fitxers (només hi cal l'extensió en un fitxer)."
#. IDS_NO_PREDIFFER
-#: Merge.rc:5004
+#: Merge.rc:5014
#, c-format
msgid "No Prediffer (Normal)"
msgstr "Sense prediferència (normal)"
#. IDS_SUGGESTED_PLUGINS
-#: Merge.rc:5005
+#: Merge.rc:5015
#, c-format
msgid "Suggested Plugins"
msgstr "Connectors suggerits"
#. IDS_NOT_SUGGESTED_PLUGINS
-#: Merge.rc:5006
+#: Merge.rc:5016
msgid "All Plugins"
msgstr "Tots els connectors"
#. IDS_PRIVATEBUILD_FMT
-#: Merge.rc:5012
+#: Merge.rc:5022
#, c-format
msgid "Private Build: %1"
msgstr "Muntatge privat: %1"
#. IDS_CHECKFORUPDATES_UPTODATE
-#: Merge.rc:5013
+#: Merge.rc:5023
msgid "Your software is up to date."
msgstr "L'aplicació està actualitzada."
-#: Merge.rc:5015
+#: Merge.rc:5025
#, c-format
msgid ""
"WinMerge update available.\n"
@@ -8080,140 +8091,140 @@ msgstr ""
"%1 està disponible (teniu la versió %2). Voleu descarregar-la ara mateix?"
#. IDS_ALLRIGHTS_RESERVED
-#: Merge.rc:5016
+#: Merge.rc:5026
msgid " - All rights reserved."
msgstr ""
#. IDS_CHECKFORUPDATES_FAILED
-#: Merge.rc:5021
+#: Merge.rc:5031
#, c-format
msgid "Failed to download latest version information"
msgstr "No s'ha pogut descarregar la informació de la versió més recent"
#. IDS_TITLE_PLUGINS_SETTINGS
-#: Merge.rc:5027
+#: Merge.rc:5037
#, c-format
msgid "Plugin Settings"
msgstr "Paràmetres del connector"
#. IDS_NO_SCT_SCRIPTS
-#: Merge.rc:5029
+#: Merge.rc:5039
#, c-format
msgid "WSH not found - .sct scripts disabled"
msgstr "No s'ha trobat el WSH - s'inhabiliten les seqüències d'ordres .sct"
#. IDS_LOCBAR_GOTOLINE_FMT
-#: Merge.rc:5037
+#: Merge.rc:5047
#, c-format
msgid "G&o to Line %1"
msgstr "Ves a la línia %1"
#. IDS_GOTO_MOVED_LINE
-#: Merge.rc:5043
+#: Merge.rc:5053
msgid "Go to Moved Line\tCtrl+Shift+G"
msgstr "Ves a la línia desplaçada\tControl+Maj+G"
#. IDS_AUTOCOMPLETE_DISABLED
-#: Merge.rc:5049
+#: Merge.rc:5059
msgctxt "Options dialog|General|Open dialog Auto completion"
msgid "Disabled"
msgstr ""
#. IDS_AUTOCOMPLETE_FILE_SYS
-#: Merge.rc:5050
+#: Merge.rc:5060
#, c-format
msgid "From file system"
msgstr "Des del sistema de fitxers"
#. IDS_AUTOCOMPLETE_MRU
-#: Merge.rc:5051
+#: Merge.rc:5061
#, c-format
msgid "From Most Recently Used list"
msgstr "Des de la llista de recents"
#. IDS_COLORSCHEME_PLAIN
-#: Merge.rc:5057
+#: Merge.rc:5067
#, c-format
msgid "No Highlighting"
msgstr "Sense ressaltat"
#. IDS_COLORSCHEME_BATCH
-#: Merge.rc:5063
+#: Merge.rc:5073
#, c-format
msgid "Batch"
msgstr "Seqüència d'ordres"
#. IDS_COLORSCHEME_PO
-#: Merge.rc:5090
+#: Merge.rc:5100
#, c-format
msgid "Portable Object"
msgstr "Objecte portable"
#. IDS_COLORSCHEME_RSRC
-#: Merge.rc:5094
+#: Merge.rc:5104
#, c-format
msgid "Resources"
msgstr "Recursos"
#. IDS_COLORSCHEME_SH
-#: Merge.rc:5098
+#: Merge.rc:5108
#, c-format
msgid "Shell"
msgstr "Finestra d'ordres"
#. IDS_CLOSE_LEFT_TABS
-#: Merge.rc:5115
+#: Merge.rc:5125
#, c-format
msgid "Close &Left Tabs"
msgstr "Tanca les pestanyes de l'esquerra"
#. IDS_CLOSE_RIGHT_TABS
-#: Merge.rc:5116
+#: Merge.rc:5126
#, c-format
msgid "Close R&ight Tabs"
msgstr "Tanca les pestanyes de la dreta"
#. IDS_CLOSE_OTHER_TABS
-#: Merge.rc:5117
+#: Merge.rc:5127
#, c-format
msgid "Close &Other Tabs"
msgstr "Tanca les altres pestanyes"
#. IDS_TABBAR_AUTO_MAXWIDTH
-#: Merge.rc:5118
+#: Merge.rc:5128
#, c-format
msgid "Enable &Auto Max Width"
msgstr "Activa l'amplada màxima automàtica"
#. IDS_WEBPAGE_MENU
-#: Merge.rc:5128
+#: Merge.rc:5138
msgid "We&bpage"
msgstr "Pàgina &web"
#. IDS_VIEW_WRAP_TEXT
-#: Merge.rc:5133
+#: Merge.rc:5143
msgid "W&rap Text"
msgstr "&Ajusta el text"
#. IDS_NOTINSTALLED
-#: Merge.rc:5138
+#: Merge.rc:5148
msgid "%1 is not installed."
msgstr "L'aplicació %1 no està instal·lada."
#. IDS_CREATE_FOLDER
-#: Merge.rc:5143
+#: Merge.rc:5153
#, c-format
msgid "%1 does not exist. Create it?"
msgstr "No existeix %1. Voleu crear-lo?"
#. IDS_CREATE_FOLDER_ERROR
-#: Merge.rc:5144
+#: Merge.rc:5154
#, c-format
msgid "Failed to create folder."
msgstr "No s'ha pogut crear el directori."
#. IDC_EXT_EDITOR_PATH
-#: Merge.rc:5149
+#: Merge.rc:5159
#, c-format
msgid ""
"Parameters:\n"
@@ -8225,487 +8236,487 @@ msgstr ""
"$linenum: Línia de la posició actual del cursor"
#. IDS_DIFF_ALGORITHM_DEFAULT
-#: Merge.rc:5154
+#: Merge.rc:5164
msgid "default"
msgstr "per defecte"
#. IDS_DIFF_ALGORITHM_MINIMAL
-#: Merge.rc:5155
+#: Merge.rc:5165
msgid "minimal"
msgstr "mínim"
#. IDS_DIFF_ALGORITHM_PATIENCE
-#: Merge.rc:5156
+#: Merge.rc:5166
msgid "patience"
msgstr "paciència"
#. IDS_DIFF_ALGORITHM_HISTOGRAM
-#: Merge.rc:5157
+#: Merge.rc:5167
msgid "histogram"
msgstr "histograma"
#. IDS_DIFF_ALGORITHM_NONE
-#: Merge.rc:5158
+#: Merge.rc:5168
msgid "none"
msgstr "cap"
#. IDS_RENDERING_MODE_GDI
-#: Merge.rc:5163
+#: Merge.rc:5173
msgid "GDI"
msgstr "GDI"
#. IDS_RENDERING_MODE_DIRECTWRITE_DEFAULT
-#: Merge.rc:5164
+#: Merge.rc:5174
msgid "DirectWrite Default"
msgstr "DirectWrite per defecte"
#. IDS_RENDERING_MODE_DIRECTWRITE_ALIASED
-#: Merge.rc:5165
+#: Merge.rc:5175
msgid "DirectWrite Aliased"
msgstr "DirectWrite amb aliasing"
#. IDS_RENDERING_MODE_DIRECTWRITE_GDI_CLASSIC
-#: Merge.rc:5166
+#: Merge.rc:5176
msgid "DirectWrite GDI Classic"
msgstr "DirectWrite GDI clàssic"
#. IDS_RENDERING_MODE_DIRECTWRITE_GDI_NATURAL
-#: Merge.rc:5167
+#: Merge.rc:5177
msgid "DirectWrite GDI Natural"
msgstr "DirectWrite GDI natural"
#. IDS_RENDERING_MODE_DIRECTWRITE_NATURAL
-#: Merge.rc:5168
+#: Merge.rc:5178
msgid "DirectWrite Natural"
msgstr "DirectWrite Natural"
#. IDS_RENDERING_MODE_DIRECTWRITE_NATURAL_SYMMETRIC
-#: Merge.rc:5169
+#: Merge.rc:5179
msgid "DirectWrite Natural Symmetric"
msgstr "DirectWrite natural simètric"
#. IDS_CLOSE_WINDOWS_WITH_ESC_DISABLED
-#: Merge.rc:5174
+#: Merge.rc:5184
msgctxt "Options dialog|General|Close windows with Esc"
msgid "Disabled"
msgstr ""
#. IDS_CLOSE_WINDOWS_WITH_ESC_1
-#: Merge.rc:5175
+#: Merge.rc:5185
msgid "MDI child window or main window"
msgstr "Subfinestra filla MDI o finestra principal"
#. IDS_CLOSE_WINDOWS_WITH_ESC_2
-#: Merge.rc:5176
+#: Merge.rc:5186
msgid "MDI child window only"
msgstr "Només subfinestra filla MDI"
#. IDS_CLOSE_WINDOWS_WITH_ESC_3
-#: Merge.rc:5177
+#: Merge.rc:5187
msgid "Close main window if only one MDI child window"
msgstr "Tanca la finestra principal si només hi ha una única subfinestra filla MDI"
#. IDS_DIFF_GROUP
-#: Merge.rc:5182
+#: Merge.rc:5192
msgctxt "ImgMergeFrame|LocationPane"
msgid "Diff"
msgstr "Diferències"
#. IDS_DIFF_HIGHLIGHT
-#: Merge.rc:5183
+#: Merge.rc:5193
msgctxt "ImgMergeFrame|LocationPane"
msgid "Highlight"
msgstr "Ressalta"
#. IDS_DIFF_BLINK
-#: Merge.rc:5184
+#: Merge.rc:5194
msgctxt "ImgMergeFrame|LocationPane"
msgid "Blink"
msgstr "Parpelleja"
#. IDS_DIFF_BLOCKSIZE
-#: Merge.rc:5185
+#: Merge.rc:5195
msgctxt "ImgMergeFrame|LocationPane"
msgid "Block Size"
msgstr "Mida del bloc"
#. IDS_DIFF_BLOCKALPHA
-#: Merge.rc:5186
+#: Merge.rc:5196
msgctxt "ImgMergeFrame|LocationPane"
msgid "Block Alpha"
msgstr "Trans. del bloc"
#. IDS_DIFF_CDTHRESHOLD
-#: Merge.rc:5187
+#: Merge.rc:5197
msgctxt "ImgMergeFrame|LocationPane"
msgid "CD Threshold"
msgstr "Llindar Dif. Col."
#. IDS_DIFF_INSERTION_DELETION_DETECTION
-#: Merge.rc:5188
+#: Merge.rc:5198
msgctxt "ImgMergeFrame|LocationPane"
msgid "Ins/Del Detection"
msgstr "Detecció Ins/Elim"
#. IDS_OVERLAY_MODE_NONE
-#: Merge.rc:5189 Merge.rc:5194
+#: Merge.rc:5199 Merge.rc:5204
msgctxt "ImgMergeFrame|LocationPane"
msgid "None"
msgstr "Cap"
#. IDS_DIFF_INSERTION_DELETION_DETECTION_VERTICAL
-#: Merge.rc:5190
+#: Merge.rc:5200
msgctxt "ImgMergeFrame|LocationPane"
msgid "Vertical"
msgstr "Vertical"
#. IDS_DIFF_INSERTION_DELETION_DETECTION_HORIZONTAL
-#: Merge.rc:5191
+#: Merge.rc:5201
msgctxt "ImgMergeFrame|LocationPane"
msgid "Horizontal"
msgstr "Horitzontal"
#. IDS_OVERLAY_GROUP
-#: Merge.rc:5192
+#: Merge.rc:5202
msgctxt "ImgMergeFrame|LocationPane"
msgid "Overlay"
msgstr "Superposició"
#. IDS_OVERLAY_ALPHA
-#: Merge.rc:5193
+#: Merge.rc:5203
msgctxt "ImgMergeFrame|LocationPane"
msgid "Alpha"
msgstr "Grau transp."
#. IDS_OVERLAY_MODE_XOR
-#: Merge.rc:5195
+#: Merge.rc:5205
msgctxt "ImgMergeFrame|LocationPane"
msgid "XOR"
msgstr "XOR"
#. IDS_OVERLAY_MODE_ALPHA
-#: Merge.rc:5196
+#: Merge.rc:5206
msgctxt "ImgMergeFrame|LocationPane"
msgid "Alpha Blend"
msgstr "Superp. transp."
#. IDS_OVERLAY_MODE_ALPHA_ANIMATION
-#: Merge.rc:5197
+#: Merge.rc:5207
msgctxt "ImgMergeFrame|LocationPane"
msgid "Alpha Animation"
msgstr "Superp. animada"
#. IDS_ZOOM
-#: Merge.rc:5198
+#: Merge.rc:5208
msgctxt "ImgMergeFrame|LocationPane"
msgid "Zoom"
msgstr "Zoom"
#. IDS_PAGE
-#: Merge.rc:5199
+#: Merge.rc:5209
msgctxt "ImgMergeFrame|LocationPane"
msgid "Page:"
msgstr "Pàgina:"
#. IDS_IMGCMP_STATUS_PT_RGBA_FMT
-#: Merge.rc:5200
+#: Merge.rc:5210
#, c-format
msgid "Pt: (%d, %d) RGBA: (%d, %d, %d, %d) "
msgstr "Pt: (%d, %d) RGBA: (%d, %d, %d, %d) "
#. IDS_IMGCMP_STATUS_DIST1_FMT
-#: Merge.rc:5201
+#: Merge.rc:5211
#, c-format
msgid "Dist: %g "
msgstr "Dist: %g "
#. IDS_IMGCMP_STATUS_DIST2_FMT
-#: Merge.rc:5202
+#: Merge.rc:5212
#, c-format
msgid "Dist: %g, %g "
msgstr "Dist: %g, %g "
#. IDS_IMGCMP_STATUS_PAGE_ZOOM_SIZE_BPP_FMT
-#: Merge.rc:5203
+#: Merge.rc:5213
#, c-format
msgid "Page: %d/%d Zoom: %d%% %dx%dpx %dbpp "
msgstr "Pàgina: %d/%d Zoom: %d%% %dx%dpx %dbpp "
#. IDS_IMGCMP_STATUS_RC_FMT
-#: Merge.rc:5204
+#: Merge.rc:5214
#, c-format
msgid "Rc: (%d, %d) "
msgstr "Rc: (%d, %d) "
#. IDS_IMGCMP_STATUS_FLIPPED_FMT
-#: Merge.rc:5205
+#: Merge.rc:5215
#, c-format
msgid "Flipped: %s "
msgstr "Voltejat: %s "
#. IDS_IMGCMP_STATUS_ROTATED_FMT
-#: Merge.rc:5206
+#: Merge.rc:5216
#, c-format
msgid "Rotated: %d "
msgstr "Girat: %d "
#. IDS_IMGCMP_REPORT_ALLPAGES
-#: Merge.rc:5207
+#: Merge.rc:5217
msgid "All pages"
msgstr "Totes les pàgines"
#. IDS_IGNSUB_STR1
-#: Merge.rc:5212
+#: Merge.rc:5222
msgid ""
msgstr ""
#. IDS_IGNSUB_STR2
-#: Merge.rc:5213
+#: Merge.rc:5223
msgid "No differences found to select"
msgstr "No s'han trobat diferències per seleccionar"
#. IDS_IGNSUB_STR3
-#: Merge.rc:5214
+#: Merge.rc:5224
msgid "No differences found to add as substitution filter"
msgstr "No s'han trobat diferències per afegir com a filtre de substitució"
#. IDS_IGNSUB_STR4
-#: Merge.rc:5215
+#: Merge.rc:5225
msgid "The pair is already in the Substitution Filters list"
msgstr "La parella ja està present a la llista de filtres de substitució"
#. IDS_IGNSUB_STR5
-#: Merge.rc:5216
+#: Merge.rc:5226
msgid "Add this change to Substitution Filters?"
msgstr "Voleu afegir aquest canvi als filtres de substitució?"
#. IDS_OCRRESULT_TEXTONLY
-#: Merge.rc:5221
+#: Merge.rc:5231
msgid "Text only"
msgstr "Només text"
#. IDS_OCRRESULT_POS_LINE
-#: Merge.rc:5222
+#: Merge.rc:5232
msgid "Line-by-line position and text"
msgstr "Posició Línia a línia i text"
#. IDS_OCRRESULT_POS_WORD
-#: Merge.rc:5223
+#: Merge.rc:5233
msgid "Word-by-word position and text"
msgstr "Posició paraula a paraula i text"
#. IDS_USERDATAFOLDER_APPDATA
-#: Merge.rc:5228
+#: Merge.rc:5238
msgid "AppData (Roaming) folder"
msgstr ""
#. IDS_USERDATAFOLDER_INSTALL
-#: Merge.rc:5229
+#: Merge.rc:5239
msgid "Install folder"
msgstr "Carpeta d'instal·lació"
#. IDS_USERDATAFOLDER_DOCUMENTS
-#: Merge.rc:5230
+#: Merge.rc:5240
msgid "Documents folder"
msgstr ""
#. IDS_SINGLEINSTANCE_DISABLED
-#: Merge.rc:5235
+#: Merge.rc:5245
msgctxt "Options dialog|General|Single instance mode"
msgid "Disabled"
msgstr ""
#. IDS_SINGLEINSTANCE_STR1
-#: Merge.rc:5236
+#: Merge.rc:5246
#, c-format
msgid "Allow only one instance to run"
msgstr "Permet d'executar només una instància"
#. IDS_SINGLEINSTANCE_STR2
-#: Merge.rc:5237
+#: Merge.rc:5247
msgid "Allow only one instance; wait for termination"
msgstr "Permet d'executar només una instància i espera que la instància acabi"
#. IDS_AUTO_RELOAD_MODIFIED_FILES_DISABLED
-#: Merge.rc:5242
+#: Merge.rc:5252
msgctxt "Options dialog|General|Auto-reload modified files"
msgid "Disabled"
msgstr ""
#. IDS_AUTO_RELOAD_MODIFIED_FILES_STR1
-#: Merge.rc:5243
+#: Merge.rc:5253
msgid "Only on window activated"
msgstr "Només a la finestra activada"
#. IDS_AUTO_RELOAD_MODIFIED_FILES_STR2
-#: Merge.rc:5244
+#: Merge.rc:5254
msgid "Immediately"
msgstr "Immediatament"
#. IDS_PLUGIN_ALL
-#: Merge.rc:5249
+#: Merge.rc:5259
msgid "Al&l"
msgstr "Tot"
#. IDS_PLUGIN_OTHERS
-#: Merge.rc:5250
+#: Merge.rc:5260
msgid "&Others"
msgstr "Altres"
-#: Merge.rc:5252
+#: Merge.rc:5262
#, c-format
msgid "Missing plugin name in pipeline: %1"
msgstr "Manca el nom del connector a la seqüència: %1"
-#: Merge.rc:5254
+#: Merge.rc:5264
#, c-format
msgid "Missing quote in plugin pipeline: %1"
msgstr "Manca les cometes a la seqüència: %1"
#. IDS_PLUGIN_NAME_ALREADY_EXISTS
-#: Merge.rc:5255
+#: Merge.rc:5265
#, c-format
msgid "Plugin name '%1' already exists."
msgstr ""
#. IDS_PLUGIN_TITLE1
-#: Merge.rc:5256
+#: Merge.rc:5266
msgid "Specify plugin arguments"
msgstr "Especifiqueu els paràmetres del connector"
-#: Merge.rc:5258
+#: Merge.rc:5268
#, c-format
msgid "Plugin not found or invalid: %1"
msgstr "El connector no s'ha trobat o no és vàlid: %1"
#. IDS_PLUGIN_NOT_UNPACK
-#: Merge.rc:5259
+#: Merge.rc:5269
#, c-format
msgid "'%1' is not an unpacker plugin"
msgstr "«%1» no és un connector desempaquetador"
#. IDS_PLUGIN_NOT_PREDIFF
-#: Merge.rc:5260
+#: Merge.rc:5270
#, c-format
msgid "'%1' is not a prediffer plugin"
msgstr "«%1» no és un connector de prediferència"
-#: Merge.rc:5262
+#: Merge.rc:5272
#, c-format
msgid "Error prediffing '%1' with '%2'. Prediffing disabled."
msgstr "S'ha produït un error en veure les prediferències del fitxer «%1» amb el connector «%2». La prediferència ja no s'aplica."
#. IDS_PLUGIN_CIRCULAR_REFERENCE
-#: Merge.rc:5263
+#: Merge.rc:5273
#, c-format
msgid "Circular reference in plugin pipeline: %1"
msgstr ""
#. IDS_PLUGIN_TYPE1
-#: Merge.rc:5264
+#: Merge.rc:5274
msgid "URL Handler"
msgstr ""
#. IDS_PLUGIN_TYPE2
-#: Merge.rc:5265
+#: Merge.rc:5275
msgid "File Unpacker"
msgstr ""
#. IDS_PLUGIN_TYPE3
-#: Merge.rc:5266
+#: Merge.rc:5276
msgid "File or Folder Unpacker"
msgstr ""
#. IDS_PLUGIN_TYPE5
-#: Merge.rc:5268
+#: Merge.rc:5278
msgid "Alias for Unpacker"
msgstr ""
#. IDS_PLUGIN_TYPE6
-#: Merge.rc:5269
+#: Merge.rc:5279
msgid "Alias for Prediffer"
msgstr ""
#. IDS_PLUGIN_TYPE7
-#: Merge.rc:5270
+#: Merge.rc:5280
msgid "Alias for Editor script"
msgstr ""
#. IDS_PLUGIN_ALIAS_DESC
-#: Merge.rc:5271
+#: Merge.rc:5281
#, c-format
msgid "Alias for plugin pipeline '%1'"
msgstr ""
#. IDS_PLUGIN_NEW_DESC
-#: Merge.rc:5272
+#: Merge.rc:5282
msgid "New plugin description"
msgstr ""
#. IDS_PLUGIN_TARGETS_ALL
-#: Merge.rc:5273
+#: Merge.rc:5283
msgid "All"
msgstr ""
#. IDS_PLUGIN_TARGETS_1ST
-#: Merge.rc:5274
+#: Merge.rc:5284
msgid "1st"
msgstr ""
#. IDS_PLUGIN_TARGETS_2ND
-#: Merge.rc:5275
+#: Merge.rc:5285
msgid "2nd"
msgstr ""
#. IDS_PLUGIN_TARGETS_3RD
-#: Merge.rc:5276
+#: Merge.rc:5286
msgid "3rd"
msgstr ""
#. IDS_PLUGIN_TARGETS_1ST_2ND
-#: Merge.rc:5277
+#: Merge.rc:5287
msgid "1st and 2nd"
msgstr ""
#. IDS_PLUGIN_TARGETS_1ST_3RD
-#: Merge.rc:5278
+#: Merge.rc:5288
msgid "1st and 3rd"
msgstr ""
#. IDS_PLUGIN_TARGETS_2ND_3RD
-#: Merge.rc:5279
+#: Merge.rc:5289
msgid "2nd and 3rd"
msgstr ""
#. IDS_FILTER_APPLIED
-#: Merge.rc:5284
+#: Merge.rc:5294
msgid "Filter applied"
msgstr "Filtre aplicat"
#. IDS_FILTERMENU_COMPARE
-#: Merge.rc:5289
+#: Merge.rc:5299
#, c-format
msgid "Compare %1"
msgstr ""
#. IDS_FILTERMENU_FILTER_BY_THIS_COLUMN
-#: Merge.rc:5290
+#: Merge.rc:5300
msgid "&Filter by This Column"
msgstr ""
#. IDS_FILTERMENU_FILTER_BY_THIS_COLUMN2
-#: Merge.rc:5291
+#: Merge.rc:5301
msgid "&Filter by This Column..."
msgstr ""
#. IDS_CLIPBOARDHISTORY_TIME
-#: Merge.rc:5296
+#: Merge.rc:5306
#, c-format
msgid "Clipboard at %s"
msgstr "Porta-retalls a %s"
#. IDS_CLIPBOARDHISTORY_DISABLED
-#: Merge.rc:5297
+#: Merge.rc:5307
msgid ""
"Clipboard history disabled.\r\n"
"Enable: Windows logo key + V, then Turn on."
@@ -8713,395 +8724,400 @@ msgstr ""
"L'historial del porta-retalls està desactivat.\r\n"
"Per activar l'historial del porta-retalls, premeu la tecla del logotip de Windows + V i aleshores feu clic al botó Activa."
-#: Merge.rc:5299
+#: Merge.rc:5309
msgid "This system does not support clipboard history."
msgstr "Aquest sistema no té suport per a l'historial del porta-retalls."
-#: Merge.rc:5301
+#: Merge.rc:5311
msgid "32-bit WinMerge does not support Clipboard Compare"
msgstr "La versió de 32 bits del WinMerge no suporta comparar via porta-retalls"
#. IDS_WEBVIEW2_RUNTIME_NOT_INSTALLED
-#: Merge.rc:5306
+#: Merge.rc:5316
msgid "WebView2 runtime not installed. Download it?"
msgstr "L'entorn d'execució WebView2 no està instal·lat. El voleu descarregar?"
#. IDS_JUMPLIST_NEW_TEXT_COMPARE
-#: Merge.rc:5311
+#: Merge.rc:5321
msgid "New Text Compare"
msgstr "Nova comparació de text"
#. IDS_JUMPLIST_NEW_TABLE_COMPARE
-#: Merge.rc:5312
+#: Merge.rc:5322
msgid "New Table Compare"
msgstr "Nova comparació de taules"
#. IDS_JUMPLIST_NEW_BINARY_COMPARE
-#: Merge.rc:5313
+#: Merge.rc:5323
msgid "New Binary Compare"
msgstr "Nova comparació binària"
#. IDS_JUMPLIST_NEW_IMAGE_COMPARE
-#: Merge.rc:5314
+#: Merge.rc:5324
msgid "New Image Compare"
msgstr "Nova comparació d'imatges"
#. IDS_JUMPLIST_NEW_WEBPAGE_COMPARE
-#: Merge.rc:5315
+#: Merge.rc:5325
msgid "New Webpage Compare"
msgstr "Nova comparació de pàgines web"
+#. IDS_JUMPLIST_NEW_FOLDER_COMPARE
+#: Merge.rc:5326
+msgid "New Folder Compare"
+msgstr ""
+
#. IDS_JUMPLIST_CLIPBOARD_COMPARE
-#: Merge.rc:5316
+#: Merge.rc:5327
msgid "Clipboard Compare"
msgstr "Comparació del porta-retalls"
#. IDS_PREVIEWBAR_PRINT
-#: Merge.rc:5321
+#: Merge.rc:5332
msgid "&Print..."
msgstr "&Imprimeix..."
#. IDS_PREVIEWBAR_PREVPAGE
-#: Merge.rc:5323
+#: Merge.rc:5334
msgid "Pre&v Page"
msgstr "Pàgina &anterior"
#. IDS_PREVIEWBAR_TWOPAGE
-#: Merge.rc:5324
+#: Merge.rc:5335
msgid "&Two Page"
msgstr "&Dues pàgines"
#. IDS_PREVIEWBAR_ONEPAGE
-#: Merge.rc:5325
+#: Merge.rc:5336
msgid "&One Page"
msgstr "&Una pàgina"
#. IDS_PREVIEWBAR_ZOOMIN
-#: Merge.rc:5326
+#: Merge.rc:5337
msgid "Zoom &In"
msgstr "A&propa"
#. IDS_PREVIEWBAR_ZOOMOUT
-#: Merge.rc:5327
+#: Merge.rc:5338
msgid "Zoom &Out"
msgstr "All&unya"
#. IDS_WEBPAGE_COMPARING
-#: Merge.rc:5333
+#: Merge.rc:5344
msgid "Comparing..."
msgstr "Comparant..."
#. IDS_WEBPAGE_ZOOM
-#: Merge.rc:5334
+#: Merge.rc:5345
msgid "Zoom:"
msgstr "Zoom:"
#. IDS_COPY_GRANULARITY_DIFFHUNK
-#: Merge.rc:5339
+#: Merge.rc:5350
msgid "Diff hunk"
msgstr "Tros de diferència"
#. IDS_COPY_GRANULARITY_INLINE
-#: Merge.rc:5340
+#: Merge.rc:5351
msgid "Inline diff"
msgstr "Diferència en línia"
#. IDS_COPY_GRANULARITY_LINE
-#: Merge.rc:5341
+#: Merge.rc:5352
msgid "Line"
msgstr "Línia"
-#: Merge.rc:5342
+#: Merge.rc:5353
msgid "Character"
msgstr "Caràcter"
#. ID_MICE_PREVDIFF
-#: Merge.rc:5347
+#: Merge.rc:5358
msgid "\nPrevious Difference (Alt+Up)\n(Right Button+Wheel Up)\n(Alt+Wheel Up)"
msgstr ""
#. ID_MICE_NEXTDIFF
-#: Merge.rc:5348
+#: Merge.rc:5359
msgid "\nNext Difference (Alt+Down)\n(Right Button+Wheel Down)\n(Alt+Wheel Down)"
msgstr ""
#. ID_MICE_L2R
-#: Merge.rc:5349
+#: Merge.rc:5360
msgid "\nCopy to Right (Alt+Right)\n(Right Button+Wheel Right)\n(Alt+Wheel Right)\n(Alt+Shift+Wheel Down)"
msgstr ""
#. ID_MICE_R2L
-#: Merge.rc:5350
+#: Merge.rc:5361
msgid "\nCopy to Left (Alt+Left)\n(Right Button+Wheel Left)\n(Alt+Wheel Left)\n(Alt+Shift+Wheel Up)"
msgstr ""
#. ID_MICE_L2RNEXT
-#: Merge.rc:5351
+#: Merge.rc:5362
msgid "\nCopy to Right and Advance (Ctrl+Alt+Right)\n(Ctrl+Alt+Wheel Right)\n(Ctrl+Alt+Shift+Wheel Down)"
msgstr ""
#. ID_MICE_R2LNEXT
-#: Merge.rc:5352
+#: Merge.rc:5363
msgid "\nCopy to Left and Advance (Ctrl+Alt+Left)\n(Ctrl+Alt+Wheel Left)\n(Ctrl+Alt+Shift+Wheel Up)"
msgstr ""
#. IDS_LOG_COMPARING_2
-#: Merge.rc:5362
+#: Merge.rc:5373
#, c-format
msgid "Comparing %1 with %2"
msgstr ""
#. IDS_LOG_COMPARING_3
-#: Merge.rc:5363
+#: Merge.rc:5374
#, c-format
msgid "Comparing %1 with %2 and %3"
msgstr ""
#. IDS_LOG_COMPARE_COMPLETED
-#: Merge.rc:5364
+#: Merge.rc:5375
msgid "Comparison completed"
msgstr ""
#. IDS_LOG_COMPARE_ERROR_2
-#: Merge.rc:5365
+#: Merge.rc:5376
#, c-format
msgid "Failed to compare %1 with %2: "
msgstr ""
#. IDS_LOG_COMPARE_ERROR_3
-#: Merge.rc:5366
+#: Merge.rc:5377
#, c-format
msgid "Failed to compare %1 with %2 and %3: "
msgstr ""
#. IDS_LOG_FILE_SAVED
-#: Merge.rc:5367
+#: Merge.rc:5378
msgid "File saved"
msgstr ""
#. IDS_LOG_COPYING_FILES
-#: Merge.rc:5368
+#: Merge.rc:5379
msgid "Copying files..."
msgstr ""
#. IDS_LOG_MOVING_FILES
-#: Merge.rc:5369
+#: Merge.rc:5380
msgid "Moving files..."
msgstr ""
#. IDS_LOG_DELETING_FILES
-#: Merge.rc:5370
+#: Merge.rc:5381
msgid "Deleting files..."
msgstr ""
#. IDS_LOG_RECYCLEBIN
-#: Merge.rc:5371
+#: Merge.rc:5382
msgid "Recycle Bin"
msgstr ""
#. IDS_LOG_PERMANENTLY_DELETED
-#: Merge.rc:5372
+#: Merge.rc:5383
msgid "Permanently deleted"
msgstr ""
#. IDS_LOG_FILEOPERATION_COMPLETED
-#: Merge.rc:5373
+#: Merge.rc:5384
msgid "File operation completed successfully"
msgstr ""
#. IDS_LOG_FILEOPERATION_CANCELED
-#: Merge.rc:5374
+#: Merge.rc:5385
msgid "File operation canceled"
msgstr ""
#. IDS_FILTER_ERROR_NO_ERROR
-#: Merge.rc:5379
+#: Merge.rc:5390
msgid "No error"
msgstr ""
#. IDS_FILTER_ERROR_EMPTY_EXPRESSION
-#: Merge.rc:5380
+#: Merge.rc:5391
msgid "Filter expression is empty"
msgstr ""
#. IDS_FILTER_ERROR_UNKNOWN_CHAR
-#: Merge.rc:5381
+#: Merge.rc:5392
msgid "Unknown character in filter expression"
msgstr ""
#. IDS_FILTER_ERROR_UNTERMINATED_STRING
-#: Merge.rc:5382
+#: Merge.rc:5393
msgid "Unterminated string literal"
msgstr ""
#. IDS_FILTER_ERROR_SYNTAX_ERROR
-#: Merge.rc:5383
+#: Merge.rc:5394
msgid "Syntax error in filter expression"
msgstr ""
#. IDS_FILTER_ERROR_PARSE_FAILURE
-#: Merge.rc:5384
+#: Merge.rc:5395
msgid "Failed to parse filter expression"
msgstr ""
#. IDS_FILTER_ERROR_INVALID_LITERAL
-#: Merge.rc:5385
+#: Merge.rc:5396
msgid "Invalid literal value"
msgstr ""
#. IDS_FILTER_ERROR_INVALID_REGULAR_EXPRESSION
-#: Merge.rc:5386
+#: Merge.rc:5397
msgid "Invalid regular expression"
msgstr ""
#. IDS_FILTER_ERROR_UNDEFINED_IDENTIFIER
-#: Merge.rc:5387
+#: Merge.rc:5398
msgid "Undefined identifier"
msgstr ""
#. IDS_FILTER_ERROR_INVALID_ARGUMENT_COUNT
-#: Merge.rc:5388
+#: Merge.rc:5399
msgid "Invalid number of arguments"
msgstr ""
#. IDS_FILTER_ERROR_FILTER_NAME_NOT_FOUND
-#: Merge.rc:5389
+#: Merge.rc:5400
msgid "Filter name not found"
msgstr ""
#. IDS_FILTER_ERROR_DIVIDE_BY_ZERO
-#: Merge.rc:5390
+#: Merge.rc:5401
msgid "Division by zero in filter expression"
msgstr ""
#. IDS_FILTER_ERROR_UNKNOWN_ERROR
-#: Merge.rc:5391
+#: Merge.rc:5402
msgid "Unknown error"
msgstr ""
#. IDS_FILTER_ERROR_INVALID_PROPERTY_NAME
-#: Merge.rc:5392
+#: Merge.rc:5403
msgid "Invalid property name"
msgstr ""
#. IDS_FILTER_ERROR_INVALID_DIRECTIVE
-#: Merge.rc:5393
+#: Merge.rc:5404
msgid "Invalid directive"
msgstr ""
#. IDS_FILTER_OP_EQUALS
-#: Merge.rc:5398
+#: Merge.rc:5409
msgid "Equals"
msgstr ""
#. IDS_FILTER_OP_NOT_EQUALS
-#: Merge.rc:5399
+#: Merge.rc:5410
msgid "Does not equal"
msgstr ""
#. IDS_FILTER_OP_LESS_THAN
-#: Merge.rc:5400
+#: Merge.rc:5411
msgid "Less than"
msgstr ""
#. IDS_FILTER_OP_LESS_EQUAL
-#: Merge.rc:5401
+#: Merge.rc:5412
msgid "Less than or equal to"
msgstr ""
#. IDS_FILTER_OP_GREATER_EQUAL
-#: Merge.rc:5402
+#: Merge.rc:5413
msgid "Greater than or equal to"
msgstr ""
#. IDS_FILTER_OP_GREATER_THAN
-#: Merge.rc:5403
+#: Merge.rc:5414
msgid "Greater than"
msgstr ""
#. IDS_FILTER_OP_BETWEEN
-#: Merge.rc:5404
+#: Merge.rc:5415
msgid "Between"
msgstr ""
#. IDS_FILTER_OP_NOT_BETWEEN
-#: Merge.rc:5405
+#: Merge.rc:5416
msgid "Not Between"
msgstr ""
#. IDS_FILTER_OP_CONTAINS
-#: Merge.rc:5406
+#: Merge.rc:5417
msgid "Contains"
msgstr ""
#. IDS_FILTER_OP_NOT_CONTAINS
-#: Merge.rc:5407
+#: Merge.rc:5418
msgid "Not Contains"
msgstr ""
#. IDS_FILTER_OP_RECONTAINS
-#: Merge.rc:5408
+#: Merge.rc:5419
msgid "Contains (regex)"
msgstr ""
#. IDS_FILTER_OP_NOT_RECONTAINS
-#: Merge.rc:5409
+#: Merge.rc:5420
msgid "Not Contains (regex)"
msgstr ""
#. IDS_FILTER_OP_LIKE
-#: Merge.rc:5410
+#: Merge.rc:5421
msgid "Match (wildcard)"
msgstr ""
#. IDS_FILTER_OP_NOT_LIKE
-#: Merge.rc:5411
+#: Merge.rc:5422
msgid "Not match (wildcard)"
msgstr ""
#. IDS_FILTER_OP_MATCHES
-#: Merge.rc:5412
+#: Merge.rc:5423
msgid "Match (regex)"
msgstr ""
#. IDS_FILTER_OP_NOT_MATCHES
-#: Merge.rc:5413
+#: Merge.rc:5424
msgid "Not match (regex)"
msgstr ""
#. IDS_COLORMODE_LIGHT
-#: Merge.rc:5418
+#: Merge.rc:5429
msgid "Light"
msgstr ""
#. IDS_COLORMODE_DARK
-#: Merge.rc:5419
+#: Merge.rc:5430
msgid "Dark"
msgstr ""
#. IDS_COLORMODE_FOLLOWSYSTEM
-#: Merge.rc:5420
+#: Merge.rc:5431
msgid "Follow system"
msgstr ""
#. IDS_EXAMPLE
-#: Merge.rc:5425
+#: Merge.rc:5436
#, c-format
msgid "e.g. %1"
msgstr ""
#. IDS_DETECTED_PREVIOUS_CRASH
-#: Merge.rc:5430
+#: Merge.rc:5441
msgid "WinMerge detected a previous crash. Please report this if possible."
msgstr ""
#. IDS_REGEX_REPLACE_LIST_TEMPLATE
-#: Merge.rc:5435
+#: Merge.rc:5446
msgid "# Regex replacement list\r\n# Format: regexreplacement\r\n# Backreferences like $1, $2 are supported\r\n\r\n(\\d{4})-(\\d{2})-(\\d{2})\t$1_$2_$3\r\n"
msgstr ""
#. IDS_STRING_REPLACE_LIST_TEMPLATE
-#: Merge.rc:5436
+#: Merge.rc:5447
msgid "# Replacement list\r\n# Format: searchreplacement\r\n# Lines starting with # are ignored\r\n\r\nfrom1\tto1\r\nfrom2\tto2\r\n"
msgstr ""
diff --git a/Translations/WinMerge/ChineseSimplified.po b/Translations/WinMerge/ChineseSimplified.po
index 47c0e7becf1..0ab1758de18 100644
--- a/Translations/WinMerge/ChineseSimplified.po
+++ b/Translations/WinMerge/ChineseSimplified.po
@@ -27,7 +27,7 @@ msgstr ""
"X-Poedit-SearchPath-0: .\n"
#. LANGUAGE, SUBLANGUAGE
-#: Merge.rc:26 Merge.rc:59 Merge.rc:5453
+#: Merge.rc:26 Merge.rc:59 Merge.rc:5464
msgid "LANG_ENGLISH, SUBLANG_ENGLISH_US"
msgstr "LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED"
@@ -112,7 +112,7 @@ msgid "Copy Selected Diff (Right) to Clipboard\tCtrl+&3"
msgstr "复制选中差异(右)到剪贴板\tCtrl+&3"
#. IDR_MERGEDOCTYPE, ID_SELECTLINEDIFF
-#: Merge.rc:110 Merge.rc:673
+#: Merge.rc:110 Merge.rc:680
msgid "Select Line &Difference\tF4"
msgstr "选中行内差异(&D)\tF4"
@@ -142,7 +142,7 @@ msgid "Cu&t"
msgstr "剪切(&T)"
#. IDR_POPUP_DIRVIEW
-#: Merge.rc:118 Merge.rc:943
+#: Merge.rc:118 Merge.rc:951
msgid "&Copy"
msgstr "复制(&C)"
@@ -152,19 +152,19 @@ msgid "&Paste"
msgstr "粘贴(&P)"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:121 Merge.rc:875 Merge.rc:882
+#: Merge.rc:121 Merge.rc:882 Merge.rc:889
msgid "&Scripts"
msgstr "脚本(&S)"
#. IDS_NO_EDIT_SCRIPTS
-#: Merge.rc:123 Merge.rc:338 Merge.rc:447 Merge.rc:654 Merge.rc:659
-#: Merge.rc:865 Merge.rc:877 Merge.rc:884 Merge.rc:940 Merge.rc:1183
-#: Merge.rc:5028
+#: Merge.rc:123 Merge.rc:340 Merge.rc:451 Merge.rc:661 Merge.rc:666
+#: Merge.rc:872 Merge.rc:884 Merge.rc:891 Merge.rc:948 Merge.rc:1193
+#: Merge.rc:5038
msgid "< Empty >"
msgstr "< 空 >"
#. IDR_POPUP_LOCATIONBAR, ID_EDIT_WMGOTO
-#: Merge.rc:126 Merge.rc:691 Merge.rc:1081
+#: Merge.rc:126 Merge.rc:698 Merge.rc:1089
msgid "&Go to...\tCtrl+G"
msgstr "转到(&G)...\tCtrl+G"
@@ -184,27 +184,27 @@ msgid "Op&en"
msgstr "打开(&E)"
#. IDR_POPUP_DIRVIEW, ID_DIR_OPEN_RIGHT
-#: Merge.rc:132 Merge.rc:981 Merge.rc:988 Merge.rc:995
+#: Merge.rc:132 Merge.rc:989 Merge.rc:996 Merge.rc:1003
msgid "With &Registered Application"
msgstr "使用默认程序(&R)"
#. IDR_POPUP_DIRVIEW, ID_DIR_OPEN_RIGHT_WITHEDITOR
-#: Merge.rc:133 Merge.rc:982 Merge.rc:989 Merge.rc:996
+#: Merge.rc:133 Merge.rc:990 Merge.rc:997 Merge.rc:1004
msgid "With &External Editor\tCtrl+Alt+E"
msgstr "使用外部编辑器(&E)\tCtrl+Alt+E"
#. IDR_POPUP_DIRVIEW, ID_DIR_OPEN_RIGHT_WITH
-#: Merge.rc:134 Merge.rc:983 Merge.rc:990 Merge.rc:997
+#: Merge.rc:134 Merge.rc:991 Merge.rc:998 Merge.rc:1005
msgid "&With..."
msgstr "选择程序(&W)..."
#. IDR_POPUP_DIRVIEW, ID_DIR_OPEN_RIGHT_PARENT_FOLDER
-#: Merge.rc:135 Merge.rc:984 Merge.rc:991 Merge.rc:998
+#: Merge.rc:135 Merge.rc:992 Merge.rc:999 Merge.rc:1006
msgid "Open &Parent Folder..."
msgstr "打开上层文件夹(&P)..."
#. IDR_POPUP_IMG_CTXT, ID_FILE_SHELLMENU
-#: Merge.rc:137 Merge.rc:1239
+#: Merge.rc:137 Merge.rc:1249
msgid "S&hell Menu"
msgstr "系统外壳菜单(&S)"
@@ -239,8 +239,8 @@ msgid "Ins&ertion/Deletion Detection"
msgstr "增减检测(&E)"
#. IDR_MERGEDOCTYPE, ID_TOOLBAR_NONE
-#: Merge.rc:176 Merge.rc:209 Merge.rc:216 Merge.rc:358 Merge.rc:507
-#: Merge.rc:751
+#: Merge.rc:176 Merge.rc:209 Merge.rc:216 Merge.rc:360 Merge.rc:511
+#: Merge.rc:758
msgid "&None"
msgstr "无(&N)"
@@ -255,12 +255,12 @@ msgid "&Horizontal"
msgstr "横向(&H)"
#. IDR_POPUP_IMG_CTXT, ID_IMG_CURPANE_PREVPAGE
-#: Merge.rc:181 Merge.rc:189 Merge.rc:1230
+#: Merge.rc:181 Merge.rc:189 Merge.rc:1240
msgid "&Previous Page"
msgstr "上一页(&P)"
#. IDS_PREVIEWBAR_NEXTPAGE
-#: Merge.rc:182 Merge.rc:190 Merge.rc:1231 Merge.rc:5322
+#: Merge.rc:182 Merge.rc:190 Merge.rc:1241 Merge.rc:5333
msgid "&Next Page"
msgstr "下一页(&N)"
@@ -270,42 +270,42 @@ msgid "&Active Pane"
msgstr "活动窗格(&A)"
#. IDR_POPUP_IMG_CTXT, ID_IMG_CURPANE_ROTATE_RIGHT_90
-#: Merge.rc:185 Merge.rc:1225
+#: Merge.rc:185 Merge.rc:1235
msgid "Rotate &Right 90deg"
msgstr "右转90度(&R)"
#. IDR_POPUP_IMG_CTXT, ID_IMG_CURPANE_ROTATE_LEFT_90
-#: Merge.rc:186 Merge.rc:1226
+#: Merge.rc:186 Merge.rc:1236
msgid "Rotate &Left 90deg"
msgstr "左转90度(&L)"
#. IDR_POPUP_IMG_CTXT, ID_IMG_CURPANE_FLIP_VERTICALLY
-#: Merge.rc:187 Merge.rc:1227
+#: Merge.rc:187 Merge.rc:1237
msgid "Flip V&ertically"
msgstr "上下翻转(&E)"
#. IDR_POPUP_IMG_CTXT, ID_IMG_CURPANE_FLIP_HORIZONTALLY
-#: Merge.rc:188 Merge.rc:1228
+#: Merge.rc:188 Merge.rc:1238
msgid "Flip H&orizontally"
msgstr "左右翻转(&O)"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:193 Merge.rc:699
+#: Merge.rc:193 Merge.rc:706
msgid "&Zoom"
msgstr "缩放(&Z)"
#. IDR_MERGEDOCTYPE, ID_VIEW_ZOOMIN
-#: Merge.rc:202 Merge.rc:701
+#: Merge.rc:202 Merge.rc:708
msgid "Zoom &In\tCtrl++"
msgstr "放大(&I)\tCtrl++"
#. IDR_MERGEDOCTYPE, ID_VIEW_ZOOMOUT
-#: Merge.rc:203 Merge.rc:702
+#: Merge.rc:203 Merge.rc:709
msgid "Zoom &Out\tCtrl+-"
msgstr "缩小(&O)\tCtrl+-"
#. IDR_MERGEDOCTYPE, ID_VIEW_ZOOMNORMAL, Zoom to normal
-#: Merge.rc:205 Merge.rc:704
+#: Merge.rc:205 Merge.rc:711
msgid "&Normal\tCtrl+*"
msgstr "正常大小(&N)\tCtrl+*"
@@ -330,27 +330,27 @@ msgid "Dragging &Mode"
msgstr "拖放模式(&M)"
#. IDR_POPUP_IMG_CTXT, ID_IMG_DRAGGINGMODE_MOVE
-#: Merge.rc:217 Merge.rc:955 Merge.rc:1233
+#: Merge.rc:217 Merge.rc:963 Merge.rc:1243
msgid "&Move"
msgstr "移动(&M)"
#. IDR_POPUP_IMG_CTXT, ID_IMG_DRAGGINGMODE_ADJUST_OFFSET
-#: Merge.rc:218 Merge.rc:1234
+#: Merge.rc:218 Merge.rc:1244
msgid "&Adjust Offset"
msgstr "调整偏移(&A)"
#. IDR_POPUP_IMG_CTXT, ID_IMG_DRAGGINGMODE_VERTICAL_WIPE
-#: Merge.rc:219 Merge.rc:1235
+#: Merge.rc:219 Merge.rc:1245
msgid "&Vertical Wipe"
msgstr "垂直擦拭(&V)"
#. IDR_POPUP_IMG_CTXT, ID_IMG_DRAGGINGMODE_HORIZONTAL_WIPE
-#: Merge.rc:220 Merge.rc:1236
+#: Merge.rc:220 Merge.rc:1246
msgid "&Horizontal Wipe"
msgstr "水平擦拭(&H)"
#. IDR_POPUP_IMG_CTXT, ID_IMG_DRAGGINGMODE_RECTANGLE_SELECT
-#: Merge.rc:221 Merge.rc:1237
+#: Merge.rc:221 Merge.rc:1247
msgid "Rectangle &Select"
msgstr "矩形选择(&S)"
@@ -385,37 +385,37 @@ msgid "Compare Extracted &Text from Images"
msgstr "比较从图像中解析的文字(&T)"
#. IDD_OPEN, IDOK
-#: Merge.rc:272 Merge.rc:1980
+#: Merge.rc:272 Merge.rc:1990
msgid "Co&mpare"
msgstr "比较(&M)"
#. IDR_POPUP_WEBPAGE_COMPARE, ID_WEB_COMPARE_SCREENSHOTS
-#: Merge.rc:274 Merge.rc:1247
+#: Merge.rc:274 Merge.rc:1257
msgid "&Screenshots"
msgstr "截图(&S)"
#. IDR_POPUP_WEBPAGE_COMPARE, ID_WEB_COMPARE_FULLSIZE_SCREENSHOTS
-#: Merge.rc:275 Merge.rc:1248
+#: Merge.rc:275 Merge.rc:1258
msgid "&Full Size Screenshots"
msgstr "全尺寸截图(&F)"
#. IDR_POPUP_WEBPAGE_COMPARE, ID_WEB_COMPARE_HTMLS
-#: Merge.rc:276 Merge.rc:1249
+#: Merge.rc:276 Merge.rc:1259
msgid "&HTMLs"
msgstr "网页(&H)"
#. IDR_POPUP_WEBPAGE_COMPARE, ID_WEB_COMPARE_TEXTS
-#: Merge.rc:277 Merge.rc:1250
+#: Merge.rc:277 Merge.rc:1260
msgid "&Texts"
msgstr "纯文本(&T)"
#. IDR_POPUP_WEBPAGE_COMPARE, ID_WEB_COMPARE_RESOURCETREES
-#: Merge.rc:278 Merge.rc:1251
+#: Merge.rc:278 Merge.rc:1261
msgid "&Resource Trees"
msgstr "资源树(&R)"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_SIZE
-#: Merge.rc:280 Merge.rc:1775
+#: Merge.rc:280 Merge.rc:1785
msgid "&Size"
msgstr "大小(&S)"
@@ -430,27 +430,27 @@ msgid "&Event Sync"
msgstr "事件同步(&E)"
#. IDR_POPUP_WEBPAGE_SYNC_EVENTS, ID_WEB_SYNC_ENABLED
-#: Merge.rc:291 Merge.rc:1259
+#: Merge.rc:291 Merge.rc:1269
msgid "&Enabled"
msgstr "已启用(&E)"
#. IDR_POPUP_WEBPAGE_SYNC_EVENTS, ID_WEB_SYNC_SCROLL
-#: Merge.rc:293 Merge.rc:1261
+#: Merge.rc:293 Merge.rc:1271
msgid "&Scroll"
msgstr "滚动(&S)"
#. IDR_POPUP_WEBPAGE_SYNC_EVENTS, ID_WEB_SYNC_CLICK
-#: Merge.rc:294 Merge.rc:1262
+#: Merge.rc:294 Merge.rc:1272
msgid "&Click"
msgstr "点击(&C)"
#. IDR_POPUP_WEBPAGE_SYNC_EVENTS, ID_WEB_SYNC_INPUT
-#: Merge.rc:295 Merge.rc:1263
+#: Merge.rc:295 Merge.rc:1273
msgid "&Input"
msgstr "输入(&I)"
#. IDR_POPUP_WEBPAGE_SYNC_EVENTS, ID_WEB_SYNC_GOBACKFORWARD
-#: Merge.rc:296 Merge.rc:1264
+#: Merge.rc:296 Merge.rc:1274
msgid "&Go Back/Forward"
msgstr "返回/前进(&G)"
@@ -480,3607 +480,3618 @@ msgid "&All Profiles"
msgstr "所有配置文件(&A)"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:310 Merge.rc:411 Merge.rc:586
+#: Merge.rc:310 Merge.rc:413 Merge.rc:590
msgid "&File"
msgstr "文件(&F)"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:312 Merge.rc:413 Merge.rc:588
+#: Merge.rc:312 Merge.rc:415 Merge.rc:592
msgid "&New"
msgstr "新建(&N)"
#. IDR_POPUP_COMPARE, ID_MERGE_COMPARE_TEXT
-#: Merge.rc:314 Merge.rc:322 Merge.rc:415 Merge.rc:423 Merge.rc:590
-#: Merge.rc:598 Merge.rc:649 Merge.rc:935 Merge.rc:1159 Merge.rc:1171
+#: Merge.rc:314 Merge.rc:323 Merge.rc:417 Merge.rc:426 Merge.rc:594
+#: Merge.rc:603 Merge.rc:655 Merge.rc:942 Merge.rc:1167 Merge.rc:1180
msgid "&Text"
msgstr "文本(&T)"
#. IDR_POPUP_COMPARE, ID_MERGE_COMPARE_TABLE
-#: Merge.rc:315 Merge.rc:323 Merge.rc:416 Merge.rc:424 Merge.rc:591
-#: Merge.rc:599 Merge.rc:650 Merge.rc:936 Merge.rc:1160 Merge.rc:1172
+#: Merge.rc:315 Merge.rc:324 Merge.rc:418 Merge.rc:427 Merge.rc:595
+#: Merge.rc:604 Merge.rc:656 Merge.rc:943 Merge.rc:1168 Merge.rc:1181
msgid "T&able"
msgstr "表格(&A)"
#. IDR_POPUP_COMPARE, ID_MERGE_COMPARE_HEX
-#: Merge.rc:316 Merge.rc:324 Merge.rc:417 Merge.rc:425 Merge.rc:592
-#: Merge.rc:600 Merge.rc:651 Merge.rc:937 Merge.rc:1161 Merge.rc:1173
+#: Merge.rc:316 Merge.rc:325 Merge.rc:419 Merge.rc:428 Merge.rc:596
+#: Merge.rc:605 Merge.rc:657 Merge.rc:944 Merge.rc:1169 Merge.rc:1182
msgid "&Binary"
msgstr "二进制(&B)"
#. IDS_IMAGE_MENU
-#: Merge.rc:317 Merge.rc:325 Merge.rc:418 Merge.rc:426 Merge.rc:593
-#: Merge.rc:601 Merge.rc:652 Merge.rc:938 Merge.rc:1162 Merge.rc:1174
-#: Merge.rc:5123
+#: Merge.rc:317 Merge.rc:326 Merge.rc:420 Merge.rc:429 Merge.rc:597
+#: Merge.rc:606 Merge.rc:658 Merge.rc:945 Merge.rc:1170 Merge.rc:1183
+#: Merge.rc:5133
msgid "&Image"
msgstr "图像(&I)"
#. IDR_POPUP_COMPARE, ID_MERGE_COMPARE_WEBPAGE
-#: Merge.rc:318 Merge.rc:326 Merge.rc:419 Merge.rc:427 Merge.rc:594
-#: Merge.rc:602 Merge.rc:653 Merge.rc:939 Merge.rc:1163 Merge.rc:1175
+#: Merge.rc:318 Merge.rc:327 Merge.rc:421 Merge.rc:430 Merge.rc:598
+#: Merge.rc:607 Merge.rc:659 Merge.rc:946 Merge.rc:1171 Merge.rc:1184
msgid "&Webpage"
msgstr "网页(&W)"
+#. IDR_POPUP_NEW, ID_FILE_NEW_FOLDER
+#: Merge.rc:319 Merge.rc:328 Merge.rc:422 Merge.rc:431 Merge.rc:599
+#: Merge.rc:608 Merge.rc:1172
+msgid "&Folder"
+msgstr ""
+
#. IDR_MERGEDOCTYPE
-#: Merge.rc:320 Merge.rc:421 Merge.rc:596
+#: Merge.rc:321 Merge.rc:424 Merge.rc:601
msgid "New (&3 panes)"
msgstr "新建三路比较(&3)"
#. IDR_MERGEDOCTYPE, ID_FILE_OPEN
-#: Merge.rc:328 Merge.rc:429 Merge.rc:604
+#: Merge.rc:330 Merge.rc:433 Merge.rc:610
msgid "&Open...\tCtrl+O"
msgstr "打开(&O)...\tCtrl+O"
#. IDR_MERGEDOCTYPE, ID_FILE_OPENCONFLICT
-#: Merge.rc:329 Merge.rc:430 Merge.rc:605
+#: Merge.rc:331 Merge.rc:434 Merge.rc:611
msgid "Open Conflic&t File..."
msgstr "打开冲突文件(&T)..."
#. IDR_MERGEDOCTYPE, ID_FILE_OPENCLIPBOARD
-#: Merge.rc:330 Merge.rc:431 Merge.rc:606
+#: Merge.rc:332 Merge.rc:435 Merge.rc:612
msgid "Open C&lipboard"
msgstr "打开剪贴板(&L)"
#. IDR_POPUP_PROJECT, ID_FILE_OPENPROJECT
-#: Merge.rc:332 Merge.rc:433 Merge.rc:608 Merge.rc:1191
+#: Merge.rc:334 Merge.rc:437 Merge.rc:614 Merge.rc:1201
msgid "Open Pro&ject...\tCtrl+J"
msgstr "打开工程(&J)...\tCtrl+J"
#. IDD_OPEN, ID_SAVE_PROJECT
-#: Merge.rc:333 Merge.rc:434 Merge.rc:609 Merge.rc:1193 Merge.rc:1979
+#: Merge.rc:335 Merge.rc:438 Merge.rc:615 Merge.rc:1203 Merge.rc:1989
msgid "Sa&ve Project..."
msgstr "保存工程(&V)..."
#. IDR_MAINFRAME, ID_FILE_PROJECT_MRU_FIRST
-#: Merge.rc:335
+#: Merge.rc:337
msgid "Recent Projects"
msgstr "最近打开的工程"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:336 Merge.rc:445 Merge.rc:657
+#: Merge.rc:338 Merge.rc:449 Merge.rc:664
msgid "Recent F&iles or Folders"
msgstr "最近打开的文件或文件夹(&I)"
#. IDR_MERGEDOCTYPE, ID_APP_EXIT
-#: Merge.rc:341 Merge.rc:450 Merge.rc:662
+#: Merge.rc:343 Merge.rc:454 Merge.rc:669
msgid "E&xit\tCtrl+Q"
msgstr "退出(&X)\tCtrl+Q"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:343 Merge.rc:452 Merge.rc:664
+#: Merge.rc:345 Merge.rc:456 Merge.rc:671
msgid "&Edit"
msgstr "编辑(&E)"
#. IDR_MERGEDOCTYPE, ID_EDIT_PASTE
-#: Merge.rc:345 Merge.rc:671
+#: Merge.rc:347 Merge.rc:678
msgid "&Paste\tCtrl+V"
msgstr "粘贴(&P)\tCtrl+V"
#. IDR_MERGEDOCTYPE, ID_OPTIONS
-#: Merge.rc:347 Merge.rc:456 Merge.rc:693
+#: Merge.rc:349 Merge.rc:460 Merge.rc:700
msgid "&Options...\tCtrl+,"
msgstr "选项(&O)...\tCtrl+,"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:349 Merge.rc:458 Merge.rc:695
+#: Merge.rc:351 Merge.rc:462 Merge.rc:702
msgid "&View"
msgstr "视图(&V)"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:351 Merge.rc:500 Merge.rc:744
+#: Merge.rc:353 Merge.rc:504 Merge.rc:751
msgid "Ta&b Bar"
msgstr "标签栏(&B)"
#. IDR_MERGEDOCTYPE, ID_VIEW_TAB_BAR
-#: Merge.rc:353 Merge.rc:502 Merge.rc:746
+#: Merge.rc:355 Merge.rc:506 Merge.rc:753
msgid "&View Tab Bar"
msgstr "查看标签栏(&V)"
#. IDR_MERGEDOCTYPE, ID_VIEW_TAB_BAR_ON_TITLE_BAR
-#: Merge.rc:354 Merge.rc:503 Merge.rc:747
+#: Merge.rc:356 Merge.rc:507 Merge.rc:754
msgid "&On Title Bar"
msgstr "在标题栏之上(&O)"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:356 Merge.rc:505 Merge.rc:749
+#: Merge.rc:358 Merge.rc:509 Merge.rc:756
msgid "&Toolbar"
msgstr "工具栏(&T)"
#. IDR_MERGEDOCTYPE, ID_TOOLBAR_SMALL
-#: Merge.rc:359 Merge.rc:508 Merge.rc:752
+#: Merge.rc:361 Merge.rc:512 Merge.rc:759
msgid "&Small"
msgstr "小(&S)"
#. IDR_MERGEDOCTYPE, ID_TOOLBAR_MEDIUM
-#: Merge.rc:360 Merge.rc:509 Merge.rc:753
+#: Merge.rc:362 Merge.rc:513 Merge.rc:760
msgid "&Medium"
msgstr "中(&M)"
#. IDR_MERGEDOCTYPE, ID_TOOLBAR_BIG
-#: Merge.rc:361 Merge.rc:510 Merge.rc:754
+#: Merge.rc:363 Merge.rc:514 Merge.rc:761
msgid "&Big"
msgstr "大(&B)"
#. IDR_MERGEDOCTYPE, ID_TOOLBAR_HUGE
-#: Merge.rc:362 Merge.rc:511 Merge.rc:755
+#: Merge.rc:364 Merge.rc:515 Merge.rc:762
msgid "&Huge"
msgstr "特大(&H)"
#. IDS_VIEW_MENU_BAR
-#: Merge.rc:364 Merge.rc:513 Merge.rc:757 Merge.rc:5357
+#: Merge.rc:366 Merge.rc:517 Merge.rc:764 Merge.rc:5368
msgid "Men&u Bar"
msgstr "菜单栏(&U)"
#. IDR_DIRDOCTYPE, ID_VIEW_OUTPUT_BAR
-#: Merge.rc:365 Merge.rc:515
+#: Merge.rc:367 Merge.rc:519
msgid "&Output Pane"
msgstr "输出窗格(&O)"
#. IDR_MERGEDOCTYPE, ID_VIEW_STATUS_BAR
-#: Merge.rc:366 Merge.rc:516 Merge.rc:758
+#: Merge.rc:368 Merge.rc:520 Merge.rc:765
msgid "&Status Bar"
msgstr "状态栏(&S)"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:368 Merge.rc:539 Merge.rc:847
+#: Merge.rc:370 Merge.rc:543 Merge.rc:854
msgid "&Tools"
msgstr "工具(&T)"
#. IDR_MERGEDOCTYPE, ID_TOOLS_FILTERS
-#: Merge.rc:370 Merge.rc:542 Merge.rc:849
+#: Merge.rc:372 Merge.rc:546 Merge.rc:856
msgid "&Filters..."
msgstr "过滤器(&F)..."
#. IDR_MERGEDOCTYPE, ID_TOOLS_GENERATEPATCH
-#: Merge.rc:371 Merge.rc:543 Merge.rc:850
+#: Merge.rc:373 Merge.rc:547 Merge.rc:857
msgid "&Generate Patch..."
msgstr "生成补丁(&G)..."
#. IDR_MERGEDOCTYPE
-#: Merge.rc:373 Merge.rc:546 Merge.rc:853
+#: Merge.rc:375 Merge.rc:550 Merge.rc:860
msgid "&Plugins"
msgstr "插件(&P)"
#. IDD_PLUGINS_LIST, IDC_PLUGIN_SETTINGS
-#: Merge.rc:375 Merge.rc:548 Merge.rc:855 Merge.rc:2494 Merge.rc:2926
+#: Merge.rc:377 Merge.rc:552 Merge.rc:862 Merge.rc:2504 Merge.rc:2936
msgid "P&lugin Settings..."
msgstr "插件设置(&L)..."
#. IDR_MERGEDOCTYPE, ID_PREDIFFER_MANUAL
-#: Merge.rc:377 Merge.rc:550 Merge.rc:857
+#: Merge.rc:379 Merge.rc:554 Merge.rc:864
msgid "Ma&nual Prediffer"
msgstr "手动预比较(&N)"
#. IDR_MERGEDOCTYPE, ID_PREDIFFER_AUTO
-#: Merge.rc:378 Merge.rc:551 Merge.rc:858
+#: Merge.rc:380 Merge.rc:555 Merge.rc:865
msgid "A&utomatic Prediffer"
msgstr "自动预比较(&U)"
#. IDR_MERGEDOCTYPE, ID_UNPACK_MANUAL
-#: Merge.rc:380 Merge.rc:553 Merge.rc:860
+#: Merge.rc:382 Merge.rc:557 Merge.rc:867
msgid "&Manual Unpacking"
msgstr "手动解包(&M)"
#. IDR_MERGEDOCTYPE, ID_UNPACK_AUTO
-#: Merge.rc:381 Merge.rc:554 Merge.rc:861
+#: Merge.rc:383 Merge.rc:558 Merge.rc:868
msgid "&Automatic Unpacking"
msgstr "自动解包(&A)"
#. IDR_MERGEDOCTYPE, ID_RELOAD_PLUGINS
-#: Merge.rc:383 Merge.rc:558 Merge.rc:889
+#: Merge.rc:385 Merge.rc:562 Merge.rc:896
msgid "&Reload Plugins"
msgstr "重新加载插件(&R)"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:385 Merge.rc:560 Merge.rc:891
+#: Merge.rc:387 Merge.rc:564 Merge.rc:898
msgid "&Window"
msgstr "窗口(&W)"
#. IDR_MERGEDOCTYPE, ID_FILE_CLOSE
-#: Merge.rc:387 Merge.rc:562 Merge.rc:893
+#: Merge.rc:389 Merge.rc:566 Merge.rc:900
msgid "Cl&ose\tCtrl+W"
msgstr "关闭(&O)\tCtrl+W"
#. IDR_MERGEDOCTYPE, ID_WINDOW_CLOSEALL
-#: Merge.rc:388 Merge.rc:563 Merge.rc:894
+#: Merge.rc:390 Merge.rc:567 Merge.rc:901
msgid "Clo&se All"
msgstr "全部关闭(&S)"
#. IDR_MERGEDOCTYPE, ID_NEXT_PANE
-#: Merge.rc:390 Merge.rc:565 Merge.rc:896
+#: Merge.rc:392 Merge.rc:569 Merge.rc:903
msgid "Change &Pane\tF6"
msgstr "切换窗格(&P)\tF6"
#. IDR_MERGEDOCTYPE, ID_WINDOW_TILE_HORZ
-#: Merge.rc:392 Merge.rc:567 Merge.rc:900
+#: Merge.rc:394 Merge.rc:571 Merge.rc:907
msgid "Tile &Horizontally"
msgstr "水平平铺(&H)"
#. IDR_MERGEDOCTYPE, ID_WINDOW_TILE_VERT
-#: Merge.rc:393 Merge.rc:568 Merge.rc:901
+#: Merge.rc:395 Merge.rc:572 Merge.rc:908
msgid "Tile &Vertically"
msgstr "垂直平铺(&V)"
#. IDR_MERGEDOCTYPE, ID_WINDOW_CASCADE
-#: Merge.rc:394 Merge.rc:569 Merge.rc:902
+#: Merge.rc:396 Merge.rc:573 Merge.rc:909
msgid "&Cascade"
msgstr "层叠(&C)"
#. IDS_MESSAGEBOX_HELP
-#: Merge.rc:396 Merge.rc:571 Merge.rc:904 Merge.rc:3200 Merge.rc:4189
+#: Merge.rc:398 Merge.rc:575 Merge.rc:911 Merge.rc:3210 Merge.rc:4199
msgid "&Help"
msgstr "帮助(&H)"
#. IDR_MERGEDOCTYPE, ID_HELP_CONTENTS
-#: Merge.rc:398 Merge.rc:573 Merge.rc:906
+#: Merge.rc:400 Merge.rc:577 Merge.rc:913
msgid "&WinMerge Help\tF1"
msgstr "WinMerge 帮助(&W)\tF1"
#. IDR_MERGEDOCTYPE, ID_HELP_RELEASENOTES
-#: Merge.rc:400 Merge.rc:575 Merge.rc:908
+#: Merge.rc:402 Merge.rc:579 Merge.rc:915
msgid "R&elease Notes"
msgstr "发行说明(&E)"
#. IDR_MERGEDOCTYPE, ID_HELP_TRANSLATIONS
-#: Merge.rc:401 Merge.rc:576 Merge.rc:909
+#: Merge.rc:403 Merge.rc:580 Merge.rc:916
msgid "&Translations"
msgstr "翻译(&T)"
#. IDR_MERGEDOCTYPE, ID_HELP_GETCONFIG
-#: Merge.rc:402 Merge.rc:577 Merge.rc:910
+#: Merge.rc:404 Merge.rc:581 Merge.rc:917
msgid "C&onfiguration"
msgstr "配置(&O)"
#. IDR_MERGEDOCTYPE, ID_HELP_GNULICENSE
-#: Merge.rc:404 Merge.rc:579 Merge.rc:912
+#: Merge.rc:406 Merge.rc:583 Merge.rc:919
msgid "&GNU General Public License"
msgstr "GNU 通用公共许可证(&G)"
#. IDR_MERGEDOCTYPE, ID_APP_ABOUT
-#: Merge.rc:405 Merge.rc:580 Merge.rc:913
+#: Merge.rc:407 Merge.rc:584 Merge.rc:920
msgid "&About WinMerge..."
msgstr "关于 WinMerge(&A)..."
#. IDR_MERGEDOCTYPE
-#: Merge.rc:436 Merge.rc:629
+#: Merge.rc:440 Merge.rc:635
msgid "&Read-Only"
msgstr "只读(&R)"
#. IDR_MERGEDOCTYPE, ID_FILE_LEFT_READONLY
-#: Merge.rc:438 Merge.rc:631
+#: Merge.rc:442 Merge.rc:637
msgid "L&eft Read-Only"
msgstr "左侧只读(&E)"
#. IDR_MERGEDOCTYPE, ID_FILE_MIDDLE_READONLY
-#: Merge.rc:439 Merge.rc:632
+#: Merge.rc:443 Merge.rc:638
msgid "M&iddle Read-Only"
msgstr "中间只读(&I)"
#. IDR_MERGEDOCTYPE, ID_FILE_RIGHT_READONLY
-#: Merge.rc:440 Merge.rc:633
+#: Merge.rc:444 Merge.rc:639
msgid "Ri&ght Read-Only"
msgstr "右侧只读(&G)"
#. IDD_ENCODINGERROR, IDC_FILEENCODING
-#: Merge.rc:443 Merge.rc:646 Merge.rc:1038 Merge.rc:3063
+#: Merge.rc:447 Merge.rc:652 Merge.rc:1046 Merge.rc:3073
msgid "&File Encoding..."
msgstr "文件编码(&F)..."
#. IDR_POPUP_OUTPUTVIEW, ID_EDIT_SELECT_ALL
-#: Merge.rc:454 Merge.rc:674 Merge.rc:1343
+#: Merge.rc:458 Merge.rc:681 Merge.rc:1353
msgid "Select &All\tCtrl+A"
msgstr "全选(&A)\tCtrl+A"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWIDENTICAL
-#: Merge.rc:460
+#: Merge.rc:464
msgid "Show &Identical Items"
msgstr "显示相同项(&I)"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWDIFFERENT
-#: Merge.rc:461
+#: Merge.rc:465
msgid "Show &Different Items"
msgstr "显示不同项(&D)"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWUNIQUELEFT
-#: Merge.rc:462
+#: Merge.rc:466
msgid "Show L&eft Unique Items"
msgstr "显示仅左侧存在的项(&E)"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWUNIQUEMIDDLE
-#: Merge.rc:463
+#: Merge.rc:467
msgid "Show Midd&le Unique Items"
msgstr "显示仅中间存在的项(&L)"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWUNIQUERIGHT
-#: Merge.rc:464
+#: Merge.rc:468
msgid "Show Ri&ght Unique Items"
msgstr "显示仅右侧存在的项(&G)"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWSKIPPED
-#: Merge.rc:465
+#: Merge.rc:469
msgid "Show S&kipped Items"
msgstr "显示跳过的项(&K)"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWBINARIES
-#: Merge.rc:466
+#: Merge.rc:470
msgid "S&how Binary Files"
msgstr "显示二进制文件(&H)"
#. IDR_DIRDOCTYPE
-#: Merge.rc:467
+#: Merge.rc:471
msgid "&3-way Compare"
msgstr "三路比较(&3)"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWDIFFERENTLEFTONLY
-#: Merge.rc:469
+#: Merge.rc:473
msgid "Show &Left Only Different Items"
msgstr "显示仅在左侧不同的项(&L)"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWDIFFERENTMIDDLEONLY
-#: Merge.rc:470
+#: Merge.rc:474
msgid "Show &Middle Only Different Items"
msgstr "显示仅在中间不同的项(&M)"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWDIFFERENTRIGHTONLY
-#: Merge.rc:471
+#: Merge.rc:475
msgid "Show &Right Only Different Items"
msgstr "显示仅在右侧不同的项(&R)"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWMISSINGLEFTONLY
-#: Merge.rc:473
+#: Merge.rc:477
msgid "Show L&eft Only Missing Items"
msgstr "显示仅在左侧缺失的项(&E)"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWMISSINGMIDDLEONLY
-#: Merge.rc:474
+#: Merge.rc:478
msgid "Show Mi&ddle Only Missing Items"
msgstr "显示仅在中间缺失的项(&D)"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWMISSINGRIGHTONLY
-#: Merge.rc:475
+#: Merge.rc:479
msgid "Show Rig&ht Only Missing Items"
msgstr "显示仅在右侧缺失的项(&H)"
#. IDR_DIRDOCTYPE, ID_VIEW_SHOWHIDDENITEMS
-#: Merge.rc:478
+#: Merge.rc:482
msgid "Show Hidd&en Items"
msgstr "显示隐藏的项(&E)"
#. IDR_DIRDOCTYPE, ID_VIEW_TREEMODE
-#: Merge.rc:480
+#: Merge.rc:484
msgid "Tree &Mode"
msgstr "树状模式(&M)"
#. IDR_DIRDOCTYPE
-#: Merge.rc:481
+#: Merge.rc:485
msgid "E&xpand Subfolders"
msgstr "展开子文件夹(&X)"
#. IDR_DIRDOCTYPE, ID_VIEW_EXPAND_ALLSUBDIRS
-#: Merge.rc:483
+#: Merge.rc:487
msgid "&All Subfolders"
msgstr "所有子文件夹(&A)"
#. IDR_DIRDOCTYPE, ID_VIEW_EXPAND_DIFFERENT_SUBDIRS
-#: Merge.rc:484
+#: Merge.rc:488
msgid "&Different Subfolders"
msgstr "不同的子文件夹(&D)"
#. IDR_DIRDOCTYPE, ID_VIEW_EXPAND_IDENTICAL_SUBDIRS
-#: Merge.rc:485
+#: Merge.rc:489
msgid "&Identical Subfolders"
msgstr "相同的子文件夹(&I)"
#. IDR_DIRDOCTYPE, ID_VIEW_COLLAPSE_ALLSUBDIRS
-#: Merge.rc:487
+#: Merge.rc:491
msgid "&Collapse All Subfolders"
msgstr "折叠所有子目录(&C)"
#. IDR_DIRDOCTYPE, ID_VIEW_SHOW_EMPTY_FOLDERS
-#: Merge.rc:488
+#: Merge.rc:492
msgid "Show &Empty Folders"
msgstr "显示空文件夹(&E)"
#. IDR_MERGEDOCTYPE, ID_VIEW_SELECTFONT
-#: Merge.rc:490 Merge.rc:697
+#: Merge.rc:494 Merge.rc:704
msgid "Select &Font..."
msgstr "选择字体(&F)..."
#. IDR_MERGEDOCTYPE, ID_VIEW_USEDEFAULTFONT
-#: Merge.rc:491 Merge.rc:698
+#: Merge.rc:495 Merge.rc:705
msgid "Use Default Font"
msgstr "使用默认字体"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:493 Merge.rc:736
+#: Merge.rc:497 Merge.rc:743
msgid "Sw&ap Panes"
msgstr "交换左右窗格(&A)"
#. IDR_MERGEDOCTYPE, ID_SWAPPANES_SWAP12
-#: Merge.rc:495 Merge.rc:738
+#: Merge.rc:499 Merge.rc:745
msgid "Swap &1st | 2nd"
msgstr "交换组&1与组2"
#. IDR_MERGEDOCTYPE, ID_SWAPPANES_SWAP23
-#: Merge.rc:496 Merge.rc:739
+#: Merge.rc:500 Merge.rc:746
msgid "Swap &2nd | 3rd"
msgstr "交换组&2与组3"
#. IDR_MERGEDOCTYPE, ID_SWAPPANES_SWAP13
-#: Merge.rc:497 Merge.rc:740
+#: Merge.rc:501 Merge.rc:747
msgid "Swap 1st | &3rd"
msgstr "交换组1与组&3"
#. IDR_DIRDOCTYPE, ID_VIEW_DISPLAY_FILTER_BAR_MENU
-#: Merge.rc:514
+#: Merge.rc:518
msgid "Displa&y Filter Bar\tCtrl+Shift+L"
msgstr "显示过滤器栏(&Y)\tCtrl+Shift+L"
#. IDR_DIRDOCTYPE, ID_VIEW_DIR_STATISTICS
-#: Merge.rc:518
+#: Merge.rc:522
msgid "Com&pare Statistics..."
msgstr "比较结果统计(&P)..."
#. IDR_MERGEDOCTYPE, ID_REFRESH
-#: Merge.rc:520 Merge.rc:763
+#: Merge.rc:524 Merge.rc:770
msgid "Refresh\tF5"
msgstr "刷新\tF5"
#. IDR_POPUP_DIRVIEW, ID_RESCAN
-#: Merge.rc:521 Merge.rc:1030
+#: Merge.rc:525 Merge.rc:1038
msgid "&Refresh Selected\tCtrl+F5"
msgstr "刷新选中项(&R)\tCtrl+F5"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:523 Merge.rc:765
+#: Merge.rc:527 Merge.rc:772
msgid "&Merge"
msgstr "合并(&M)"
#. IDR_DIRDOCTYPE, ID_MERGE_COMPARE
-#: Merge.rc:525
+#: Merge.rc:529
msgid "Co&mpare\tEnter"
msgstr "比较(&M)\tEnter"
#. IDR_MERGEDOCTYPE, ID_NEXTDIFF
-#: Merge.rc:527 Merge.rc:767
+#: Merge.rc:531 Merge.rc:774
msgid "&Next Difference\tAlt+Down"
msgstr "下一处差异(&N)\tAlt+Down"
#. IDR_MERGEDOCTYPE, ID_PREVDIFF
-#: Merge.rc:528 Merge.rc:768
+#: Merge.rc:532 Merge.rc:775
msgid "&Previous Difference\tAlt+Up"
msgstr "上一处差异(&P)\tAlt+Up"
#. IDR_MERGEDOCTYPE, ID_FIRSTDIFF
-#: Merge.rc:530 Merge.rc:773
+#: Merge.rc:534 Merge.rc:780
msgid "&First Difference\tAlt+Home"
msgstr "第一处差异(&F)\tAlt+Home"
#. IDR_MERGEDOCTYPE, ID_CURDIFF
-#: Merge.rc:531 Merge.rc:774
+#: Merge.rc:535 Merge.rc:781
msgid "&Current Difference\tAlt+Enter"
msgstr "当前差异(&C)\tAlt+Enter"
#. IDR_MERGEDOCTYPE, ID_LASTDIFF
-#: Merge.rc:532 Merge.rc:775
+#: Merge.rc:536 Merge.rc:782
msgid "&Last Difference\tAlt+End"
msgstr "最后一处差异(&L)\tAlt+End"
#. IDR_MERGEDOCTYPE, ID_L2R
-#: Merge.rc:534 Merge.rc:830
+#: Merge.rc:538 Merge.rc:837
msgid "Copy to &Right\tAlt+Right"
msgstr "复制到右侧(&R)\tAlt+Right"
#. IDR_MERGEDOCTYPE, ID_R2L
-#: Merge.rc:535 Merge.rc:831
+#: Merge.rc:539 Merge.rc:838
msgid "Copy to L&eft\tAlt+Left"
msgstr "复制到左侧(&E)\tAlt+Left"
#. IDR_DIRDOCTYPE, ID_MERGE_DELETE
-#: Merge.rc:537
+#: Merge.rc:541
msgid "&Delete\tDel"
msgstr "删除(&D)\tDel"
#. IDR_POPUP_DIRVIEW, ID_TOOLS_CUSTOMIZECOLUMNS
-#: Merge.rc:541 Merge.rc:1042
+#: Merge.rc:545 Merge.rc:1050
msgid "&Customize Columns..."
msgstr "选择列(&C)..."
#. IDR_MERGEDOCTYPE, ID_TOOLS_GENERATEREPORT
-#: Merge.rc:544 Merge.rc:851
+#: Merge.rc:548 Merge.rc:858
msgid "Generate &Report..."
msgstr "生成报告(&R)..."
#. IDD_ENCODINGERROR, IDC_PLUGIN
-#: Merge.rc:556 Merge.rc:867 Merge.rc:3064
+#: Merge.rc:560 Merge.rc:874 Merge.rc:3074
msgid "&Edit with Unpacker..."
msgstr "用解包插件来编辑(&E)..."
#. IDR_MERGEDOCTYPE, ID_FILE_SAVE
-#: Merge.rc:611
+#: Merge.rc:617
msgid "&Save\tCtrl+S"
msgstr "保存(&S)\tCtrl+S"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:612
+#: Merge.rc:618
msgid "Sav&e"
msgstr "保存(&E)"
#. IDR_POPUP_SAVE, ID_FILE_SAVE_LEFT
-#: Merge.rc:614 Merge.rc:1201
+#: Merge.rc:620 Merge.rc:1211
msgid "Save &Left"
msgstr "保存左侧(&L)"
#. IDR_POPUP_SAVE, ID_FILE_SAVE_MIDDLE
-#: Merge.rc:615 Merge.rc:1202
+#: Merge.rc:621 Merge.rc:1212
msgid "Save &Middle"
msgstr "保存中间(&M)"
#. IDR_POPUP_SAVE, ID_FILE_SAVE_RIGHT
-#: Merge.rc:616 Merge.rc:1203
+#: Merge.rc:622 Merge.rc:1213
msgid "Save &Right"
msgstr "保存右侧(&R)"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:618
+#: Merge.rc:624
msgid "Save &As"
msgstr "另存为(&A)"
#. IDR_POPUP_SAVE, ID_FILE_SAVEAS_LEFT
-#: Merge.rc:620 Merge.rc:1205
+#: Merge.rc:626 Merge.rc:1215
msgid "Save &Left As..."
msgstr "另存为左侧(&L)..."
#. IDR_POPUP_SAVE, ID_FILE_SAVEAS_MIDDLE
-#: Merge.rc:621 Merge.rc:1206
+#: Merge.rc:627 Merge.rc:1216
msgid "Save &Middle As..."
msgstr "另存为中间(&L)..."
#. IDR_POPUP_SAVE, ID_FILE_SAVEAS_RIGHT
-#: Merge.rc:622 Merge.rc:1207
+#: Merge.rc:628 Merge.rc:1217
msgid "Save &Right As..."
msgstr "另存为右侧(&R)..."
#. IDR_MERGEDOCTYPE, ID_FILE_PRINT
-#: Merge.rc:625
+#: Merge.rc:631
msgid "&Print...\tCtrl+P"
msgstr "打印(&P)...\tCtrl+P"
#. IDR_MERGEDOCTYPE, ID_FILE_PAGE_SETUP
-#: Merge.rc:626
+#: Merge.rc:632
msgid "Page Set&up..."
msgstr "页面设置(&U)..."
#. IDR_MERGEDOCTYPE, ID_FILE_PRINT_PREVIEW
-#: Merge.rc:627
+#: Merge.rc:633
msgid "Print Previe&w..."
msgstr "打印预览(&W)..."
#. IDR_MERGEDOCTYPE
-#: Merge.rc:636
+#: Merge.rc:642
msgid "&Convert Line Endings to"
msgstr "将换行符转换为(&C)"
#. IDR_MERGEDOCTYPE, ID_FILE_MERGINGMODE
-#: Merge.rc:643
+#: Merge.rc:649
msgid "Mer&ge Mode\tF9"
msgstr "合并模式(&G)\tF9"
#. IDR_MERGEDOCTYPE, ID_RESCAN
-#: Merge.rc:645
+#: Merge.rc:651
msgid "Reloa&d\tCtrl+F5"
msgstr "重新加载(&D)\tCtrl+F5"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:647
+#: Merge.rc:653
msgid "Reco&mpare As"
msgstr "重新比较(&M)"
+#. IDR_POPUP_COMPARE, ID_MERGE_COMPARE_FOLDER
+#: Merge.rc:660 Merge.rc:947 Merge.rc:1185
+msgid "A&rchive"
+msgstr ""
+
#. IDR_MERGEDOCTYPE, ID_EDIT_UNDO
-#: Merge.rc:666
+#: Merge.rc:673
msgid "&Undo\tCtrl+Z"
msgstr "撤销(&U)\tCtrl+Z"
#. IDR_MERGEDOCTYPE, ID_EDIT_REDO
-#: Merge.rc:667
+#: Merge.rc:674
msgid "&Redo\tCtrl+Y"
msgstr "重作(&R)\tCtrl+Y"
#. IDR_MERGEDOCTYPE, ID_EDIT_CUT
-#: Merge.rc:669
+#: Merge.rc:676
msgid "Cu&t\tCtrl+X"
msgstr "剪切(&T)\tCtrl+X"
#. IDR_POPUP_OUTPUTVIEW, ID_EDIT_COPY
-#: Merge.rc:670 Merge.rc:1342
+#: Merge.rc:677 Merge.rc:1352
msgid "&Copy\tCtrl+C"
msgstr "复制(&C)\tCtrl+C"
#. IDR_MERGEDOCTYPE, ID_EDIT_FIND
-#: Merge.rc:676
+#: Merge.rc:683
msgid "F&ind...\tCtrl+F"
msgstr "查找(&I)...\tCtrl+F"
#. IDR_MERGEDOCTYPE, ID_EDIT_REPLACE
-#: Merge.rc:677
+#: Merge.rc:684
msgid "Repla&ce...\tCtrl+H"
msgstr "替换(&C)...\tCtrl+H"
#. IDR_MERGEDOCTYPE, ID_EDIT_MARK
-#: Merge.rc:678
+#: Merge.rc:685
msgid "&Marker...\tCtrl+Shift+M"
msgstr "标记(&M)...\tCtrl+Shift+M"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:680
+#: Merge.rc:687
msgid "Advanced"
msgstr "高级"
#. IDR_MERGEDOCTYPE, ID_EDIT_COPY_LINENUMBERS
-#: Merge.rc:682
+#: Merge.rc:689
msgid "&Copy With Line Numbers\tCtrl+Shift+C"
msgstr "带行号复制(&C)\tCtrl+Shift+C"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:684
+#: Merge.rc:691
msgid "&Bookmarks"
msgstr "书签(&B)"
#. IDR_MERGEDOCTYPE, ID_EDIT_TOGGLE_BOOKMARK
-#: Merge.rc:686
+#: Merge.rc:693
msgid "&Toggle Bookmark\tCtrl+F2"
msgstr "切换书签(&T)\tCtrl+F2"
#. IDR_MERGEDOCTYPE, ID_EDIT_GOTO_NEXT_BOOKMARK
-#: Merge.rc:687
+#: Merge.rc:694
msgid "&Next Bookmark\tF2"
msgstr "下一个书签(&N)\tF2"
#. IDR_MERGEDOCTYPE, ID_EDIT_GOTO_PREV_BOOKMARK
-#: Merge.rc:688
+#: Merge.rc:695
msgid "&Previous Bookmark\tShift+F2"
msgstr "上一个书签(&P)\tShift+F2"
#. IDR_MERGEDOCTYPE, ID_EDIT_CLEAR_ALL_BOOKMARKS
-#: Merge.rc:689
+#: Merge.rc:696
msgid "&Clear All Bookmarks"
msgstr "清除所有书签(&C)"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:706
+#: Merge.rc:713
msgid "Syntax Highlight"
msgstr "语法高亮"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:711
+#: Merge.rc:718
msgid "&Diff Context"
msgstr "差异的上下文(&D)"
#. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_ALL
-#: Merge.rc:713
+#: Merge.rc:720
msgid "&All Lines"
msgstr "显示所有行(&A)"
#. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_0
-#: Merge.rc:715
+#: Merge.rc:722
msgid "&0 Lines"
msgstr "0行(&0)"
#. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_1
-#: Merge.rc:716
+#: Merge.rc:723
msgid "&1 Line"
msgstr "1行(&1)"
#. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_3
-#: Merge.rc:717
+#: Merge.rc:724
msgid "&3 Lines"
msgstr "3行(&3)"
#. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_5
-#: Merge.rc:718
+#: Merge.rc:725
msgid "&5 Lines"
msgstr "5行(&5)"
#. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_7
-#: Merge.rc:719
+#: Merge.rc:726
msgid "&7 Lines"
msgstr "7行(&7)"
#. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_9
-#: Merge.rc:720
+#: Merge.rc:727
msgid "&9 Lines"
msgstr "9行(&9)"
#. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_TOGGLE
-#: Merge.rc:722
+#: Merge.rc:729
msgid "&Toggle All and 0-9 Lines\tCtrl+D"
msgstr "在所有行与 0-9 行之间切换\tCtrl+D"
#. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_INVERT
-#: Merge.rc:724
+#: Merge.rc:731
msgid "&Invert (Hide Different Lines)"
msgstr "反转(隐藏差异行)(&I)"
#. IDR_MERGEDOCTYPE, ID_VIEW_RESIZE_PANES
-#: Merge.rc:727
+#: Merge.rc:734
msgid "&Lock Panes"
msgstr "锁定窗格(&L)"
#. IDR_MERGEDOCTYPE, ID_VIEW_WHITESPACE
-#: Merge.rc:728
+#: Merge.rc:735
msgid "&View Whitespace"
msgstr "显示空白字符&V)"
#. IDR_MERGEDOCTYPE, ID_VIEW_EOL
-#: Merge.rc:729
+#: Merge.rc:736
msgid "View E&OL"
msgstr "显示换行字符(&O)"
#. IDR_MERGEDOCTYPE, ID_VIEW_LINEDIFFS
-#: Merge.rc:730
+#: Merge.rc:737
msgid "Vie&w Line Differences"
msgstr "显示行内差异(&W)"
#. IDR_MERGEDOCTYPE, ID_VIEW_LINENUMBERS
-#: Merge.rc:731
+#: Merge.rc:738
msgid "View Line &Numbers"
msgstr "显示行号(&N)"
#. IDR_MERGEDOCTYPE, ID_VIEW_SELMARGIN
-#: Merge.rc:732
+#: Merge.rc:739
msgid "View &Margins"
msgstr "显示页边距(&M)"
#. IDR_MERGEDOCTYPE, ID_VIEW_TOPMARGIN
-#: Merge.rc:733
+#: Merge.rc:740
msgid "View To&p Margins"
msgstr "显示列标尺(&P)"
#. IDR_MERGEDOCTYPE, ID_VIEW_WORDWRAP
-#: Merge.rc:734
+#: Merge.rc:741
msgid "W&rap Lines"
msgstr "自动换行(&R)"
#. IDR_MERGEDOCTYPE, ID_VIEW_SPLITVERTICALLY
-#: Merge.rc:742
+#: Merge.rc:749
msgid "Split V&ertically"
msgstr "垂直分隔(&E)"
#. IDR_MERGEDOCTYPE, ID_VIEW_DETAIL_BAR
-#: Merge.rc:759
+#: Merge.rc:766
msgid "Diff &Pane"
msgstr "对比窗格(&P)"
#. IDR_MERGEDOCTYPE, ID_VIEW_LOCATION_BAR
-#: Merge.rc:760
+#: Merge.rc:767
msgid "Lo&cation Pane"
msgstr "定位窗格(&C)"
#. IDS_OUTPUTBAR_CAPTION
-#: Merge.rc:761 Merge.rc:4902
+#: Merge.rc:768 Merge.rc:4912
msgid "Output Pane"
msgstr "输出窗格"
#. IDR_MERGEDOCTYPE, ID_NEXTCONFLICT
-#: Merge.rc:770
+#: Merge.rc:777
msgid "Ne&xt Conflict\tAlt+Shift+Down"
msgstr "下一处冲突(&X)\tAlt+Shift+Down"
#. IDR_MERGEDOCTYPE, ID_PREVCONFLICT
-#: Merge.rc:771
+#: Merge.rc:778
msgid "Pre&vious Conflict\tAlt+Shift+Up"
msgstr "上一处冲突(&V)\tAlt+Shift+Up"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:777
+#: Merge.rc:784
msgid "A&dvanced"
msgstr "高级(&D)"
#. IDR_MERGEDOCTYPE, ID_NEXTDIFFLM
-#: Merge.rc:779
+#: Merge.rc:786
msgid "Next Difference (Left/Middle)\tAlt+1"
msgstr "下一处左侧和中间的差异\tAlt+1"
#. IDR_MERGEDOCTYPE, ID_PREVDIFFLM
-#: Merge.rc:780
+#: Merge.rc:787
msgid "Previous Difference (Left/Middle)\tAlt+Shift+1"
msgstr "上一处左侧和中间的差异\tAlt+Shift+1"
#. IDR_MERGEDOCTYPE, ID_NEXTDIFFLR
-#: Merge.rc:782
+#: Merge.rc:789
msgid "Next Difference (Left/Right)\tAlt+2"
msgstr "下一处左侧和右侧的差异\tAlt+2"
#. IDR_MERGEDOCTYPE, ID_PREVDIFFLR
-#: Merge.rc:783
+#: Merge.rc:790
msgid "Previous Difference (Left/Right)\tAlt+Shift+2"
msgstr "上一处左侧和右侧的差异\tAlt+Shift+2"
#. IDR_MERGEDOCTYPE, ID_NEXTDIFFMR
-#: Merge.rc:785
+#: Merge.rc:792
msgid "Next Difference (Middle/Right)\tAlt+3"
msgstr "下一处中间和右侧的差异\tAlt+3"
#. IDR_MERGEDOCTYPE, ID_PREVDIFFMR
-#: Merge.rc:786
+#: Merge.rc:793
msgid "Previous Difference (Middle/Right)\tAlt+Shift+3"
msgstr "上一处中间和右侧的差异\tAlt+Shift+3"
#. IDR_MERGEDOCTYPE, ID_NEXTDIFFLO
-#: Merge.rc:788
+#: Merge.rc:795
msgid "Next Left-Only Difference\tAlt+7"
msgstr "下一处只有左边的差异\tAlt+7"
#. IDR_MERGEDOCTYPE, ID_PREVDIFFLO
-#: Merge.rc:789
+#: Merge.rc:796
msgid "Previous Left-Only Difference\tAlt+Shift+7"
msgstr "上一处只有左边的差异\tAlt+Shift+7"
#. IDR_MERGEDOCTYPE, ID_NEXTDIFFMO
-#: Merge.rc:791
+#: Merge.rc:798
msgid "Next Middle-Only Difference\tAlt+8"
msgstr "下一处只有中间的差异\tAlt+8"
#. IDR_MERGEDOCTYPE, ID_PREVDIFFMO
-#: Merge.rc:792
+#: Merge.rc:799
msgid "Previous Middle-Only Difference\tAlt+Shift+8"
msgstr "上一处只有中间的差异\tAlt+Shift+8"
#. IDR_MERGEDOCTYPE, ID_NEXTDIFFRO
-#: Merge.rc:794
+#: Merge.rc:801
msgid "Next Right-Only Difference\tAlt+9"
msgstr "下一处只有右边的差异\tAlt+9"
#. IDR_MERGEDOCTYPE, ID_PREVDIFFRO
-#: Merge.rc:795
+#: Merge.rc:802
msgid "Previous Right-Only Difference\tAlt+Shift+9"
msgstr "上一处只有右边的差异\tAlt+Shift+9"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:797
+#: Merge.rc:804
msgid "Copy from &Left to"
msgstr "从左侧复制到(&L)"
#. IDD_LOAD_SAVE_CODEPAGE, IDC_AFFECTS_MIDDLE_BTN
-#: Merge.rc:799 Merge.rc:810 Merge.rc:815 Merge.rc:826 Merge.rc:970
-#: Merge.rc:2545 Merge.rc:2817
+#: Merge.rc:806 Merge.rc:817 Merge.rc:822 Merge.rc:833 Merge.rc:978
+#: Merge.rc:2555 Merge.rc:2827
msgid "&Middle"
msgstr "中间(&M)"
#. IDD_LOAD_SAVE_CODEPAGE, IDC_AFFECTS_RIGHT_BTN
-#: Merge.rc:800 Merge.rc:805 Merge.rc:816 Merge.rc:821 Merge.rc:971
-#: Merge.rc:2546 Merge.rc:2819
+#: Merge.rc:807 Merge.rc:812 Merge.rc:823 Merge.rc:828 Merge.rc:979
+#: Merge.rc:2556 Merge.rc:2829
msgid "&Right"
msgstr "右侧(&R)"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:802
+#: Merge.rc:809
msgid "Copy from &Middle to"
msgstr "从中间复制到(&M)"
#. IDD_LOAD_SAVE_CODEPAGE, IDC_AFFECTS_LEFT_BTN
-#: Merge.rc:804 Merge.rc:809 Merge.rc:820 Merge.rc:825 Merge.rc:969
-#: Merge.rc:2544 Merge.rc:2815
+#: Merge.rc:811 Merge.rc:816 Merge.rc:827 Merge.rc:832 Merge.rc:977
+#: Merge.rc:2554 Merge.rc:2825
msgid "&Left"
msgstr "左侧(&L)"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:807
+#: Merge.rc:814
msgid "Copy from &Right to"
msgstr "从右侧复制到(&R)"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:813
+#: Merge.rc:820
msgid "Copy Selected Lines from Le&ft to"
msgstr "从左侧复制选中行到(&F)"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:818
+#: Merge.rc:825
msgid "Copy Selected Lines from Mi&ddle to"
msgstr "从中间复制选中行到(&D)"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:823
+#: Merge.rc:830
msgid "Copy Selected Lines from Ri&ght to"
msgstr "从右侧复制选中行到(&G)"
#. IDR_MERGEDOCTYPE, ID_COPY_FROM_LEFT
-#: Merge.rc:833
+#: Merge.rc:840
msgid "Copy from Left\tAlt+Shift+Right"
msgstr "从左侧复制\tAlt+Shift+Right"
#. IDR_MERGEDOCTYPE, ID_COPY_FROM_RIGHT
-#: Merge.rc:834
+#: Merge.rc:841
msgid "Copy from Right\tAlt+Shift+Left"
msgstr "从右侧复制\tAlt+Shift+Right"
#. IDR_MERGEDOCTYPE, ID_L2RNEXT
-#: Merge.rc:836
+#: Merge.rc:843
msgid "C&opy to Right and Advance\tCtrl+Alt+Right"
msgstr "复制到右侧并前进(&O)\tCtrl+Alt+Right"
#. IDR_MERGEDOCTYPE, ID_R2LNEXT
-#: Merge.rc:837
+#: Merge.rc:844
msgid "Copy &to Left and Advance\tCtrl+Alt+Left"
msgstr "复制到左侧并前进(&T)\tCtrl+Alt+Left"
#. IDR_MERGEDOCTYPE, ID_ALL_RIGHT
-#: Merge.rc:839
+#: Merge.rc:846
msgid "Copy &All to Right"
msgstr "全部复制到右侧(&A)"
#. IDR_MERGEDOCTYPE, ID_ALL_LEFT
-#: Merge.rc:840
+#: Merge.rc:847
msgid "Cop&y All to Left"
msgstr "全部复制到左侧(&Y)"
#. IDR_MERGEDOCTYPE, ID_AUTO_MERGE
-#: Merge.rc:842
+#: Merge.rc:849
msgid "A&uto Merge\tCtrl+Alt+M"
msgstr "自动合并(&U)\tCtrl+Alt+M"
#. IDR_MERGEDOCTYPE, ID_ADD_SYNCPOINT
-#: Merge.rc:844
+#: Merge.rc:851
msgid "Add &Synchronization Point\tAlt+S"
msgstr "添加同步点(&S)\tAlt+S"
#. IDR_MERGEDOCTYPE, ID_CLEAR_SYNCPOINTS
-#: Merge.rc:845
+#: Merge.rc:852
msgid "Clear Sync&hronization Points"
msgstr "清除同步点(&H)"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:863
+#: Merge.rc:870
msgid "Unpac&ker"
msgstr "解包插件(&K)"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:869
+#: Merge.rc:876
msgid "&Prediffer"
msgstr "预比较插件(&P)"
#. IDR_MERGEDOCTYPE, ID_APPLY_PREDIFFER
-#: Merge.rc:873
+#: Merge.rc:880
msgid "Apply Pre&differ..."
msgstr "使用预比较插件(&D)..."
#. IDR_MERGEDOCTYPE, ID_TRANSFORM_WITH_SCRIPT
-#: Merge.rc:879
+#: Merge.rc:886
msgid "&Transform with Editor Script..."
msgstr "用编辑器脚本转换(&T)..."
#. IDR_MERGEDOCTYPE
-#: Merge.rc:880
+#: Merge.rc:887
msgid "Scripts for &Copying"
msgstr "用于复制的脚本(&C)"
#. IDR_MERGEDOCTYPE, ID_SELECT_EDITOR_SCRIPT_FOR_COPYING
-#: Merge.rc:886
+#: Merge.rc:893
msgid "Select &Editor Script..."
msgstr "选择编辑器脚本(&E)..."
#. IDR_MERGEDOCTYPE, ID_WINDOW_SPLIT
-#: Merge.rc:898
+#: Merge.rc:905
msgid "Sp&lit"
msgstr "分隔(&L)"
#. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE
-#: Merge.rc:921
+#: Merge.rc:928
msgid "Comp&are"
msgstr "比较(&A)"
#. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE_WITH_MOVED_RENAMED
-#: Merge.rc:922
+#: Merge.rc:929
msgid "Compar&e with Renamed/Moved Items"
msgstr "与重命名/移动的条目比较(&E)"
#. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE_IN_NEW_WINDOW
-#: Merge.rc:923
+#: Merge.rc:930
msgid "Compare in New &Window"
msgstr "在新窗口比较(&W)"
#. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE_NONHORIZONTALLY
-#: Merge.rc:924 Merge.rc:931
+#: Merge.rc:931 Merge.rc:938
msgid "Compare Non-hor&izontally..."
msgstr "非横向比较(&I)..."
#. IDR_POPUP_DIRVIEW
-#: Merge.rc:925
+#: Merge.rc:932
msgid "Compare Non-hor&izontally"
msgstr "非横向比较(&I)"
#. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE_LEFT1_LEFT2
-#: Merge.rc:927
+#: Merge.rc:934
msgid "First &Left with Second Left"
msgstr "左侧第一个项目与左侧第二个项目(&L)"
#. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE_RIGHT1_RIGHT2
-#: Merge.rc:928
+#: Merge.rc:935
msgid "First &Right with Second Right"
msgstr "右侧第一个项目与右侧第二个项目(&R)"
#. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE_LEFT1_RIGHT2
-#: Merge.rc:929
+#: Merge.rc:936
msgid "&First Left with Second Right"
msgstr "左侧第一个项目与右侧第二个项目(&F)"
#. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE_LEFT2_RIGHT1
-#: Merge.rc:930
+#: Merge.rc:937
msgid "&Second Left with First Right"
msgstr "左侧第二个项目与右侧第一个项目(&S)"
#. IDR_POPUP_DIRVIEW
-#: Merge.rc:933
+#: Merge.rc:940
msgid "Co&mpare As"
msgstr "重新比较(&M)"
#. IDS_COPY_LEFT_TO_MIDDLE2
-#: Merge.rc:945 Merge.rc:957 Merge.rc:4502
+#: Merge.rc:953 Merge.rc:965 Merge.rc:4512
#, c-format
msgid "Left to Middle (%1 of %2)"
msgstr "左侧到中间 (%1 / %2)"
#. IDS_COPY_LEFT_TO_RIGHT2
-#: Merge.rc:946 Merge.rc:958 Merge.rc:4501
+#: Merge.rc:954 Merge.rc:966 Merge.rc:4511
#, c-format
msgid "Left to Right (%1 of %2)"
msgstr "左侧到右侧 (%1 / %2)"
#. IDS_MOVE_LEFT_TO2
-#: Merge.rc:947 Merge.rc:959 Merge.rc:1022 Merge.rc:4513 Merge.rc:4542
+#: Merge.rc:955 Merge.rc:967 Merge.rc:1030 Merge.rc:4523 Merge.rc:4552
#, c-format
msgid "Left to... (%1 of %2)"
msgstr "左侧到... (%1 / %2)"
#. IDS_COPY_MIDDLE_TO_LEFT2
-#: Merge.rc:948 Merge.rc:960 Merge.rc:4499
+#: Merge.rc:956 Merge.rc:968 Merge.rc:4509
#, c-format
msgid "Middle to Left (%1 of %2)"
msgstr "中间到左侧 (%1 / %2)"
#. IDS_COPY_MIDDLE_TO_RIGHT2
-#: Merge.rc:949 Merge.rc:961 Merge.rc:4500
+#: Merge.rc:957 Merge.rc:969 Merge.rc:4510
#, c-format
msgid "Middle to Right (%1 of %2)"
msgstr "中间到右侧 (%1 / %2)"
#. IDS_MOVE_MIDDLE_TO2
-#: Merge.rc:950 Merge.rc:962 Merge.rc:1023 Merge.rc:4514 Merge.rc:4543
+#: Merge.rc:958 Merge.rc:970 Merge.rc:1031 Merge.rc:4524 Merge.rc:4553
#, c-format
msgid "Middle to... (%1 of %2)"
msgstr "中间到... (%1 / %2)"
#. IDS_COPY_RIGHT_TO_MIDDLE2
-#: Merge.rc:951 Merge.rc:963 Merge.rc:4498
+#: Merge.rc:959 Merge.rc:971 Merge.rc:4508
#, c-format
msgid "Right to Middle (%1 of %2)"
msgstr "右侧到中间 (%1 / %2)"
#. IDS_COPY_RIGHT_TO_LEFT2
-#: Merge.rc:952 Merge.rc:964 Merge.rc:4497
+#: Merge.rc:960 Merge.rc:972 Merge.rc:4507
#, c-format
msgid "Right to Left (%1 of %2)"
msgstr "右侧到左侧 (%1 / %2)"
#. IDS_MOVE_RIGHT_TO2
-#: Merge.rc:953 Merge.rc:965 Merge.rc:1024 Merge.rc:4515 Merge.rc:4544
+#: Merge.rc:961 Merge.rc:973 Merge.rc:1032 Merge.rc:4525 Merge.rc:4554
#, c-format
msgid "Right to... (%1 of %2)"
msgstr "右侧到... (%1 / %2)"
#. IDD_EDIT_MARKER, IDC_EDIT_MARKER_DELETE
-#: Merge.rc:967 Merge.rc:2036
+#: Merge.rc:975 Merge.rc:2046
msgid "&Delete"
msgstr "删除(&D)"
#. IDR_POPUP_DIRVIEW, ID_DIR_DEL_BOTH
-#: Merge.rc:972
+#: Merge.rc:980
msgid "&Both"
msgstr "两侧(&B)"
#. IDR_POPUP_DIRVIEW, ID_DIR_DEL_ALL
-#: Merge.rc:973
+#: Merge.rc:981
msgid "&All"
msgstr "全部(&A)"
#. IDD_EDIT_REPLACE, IDC_EDIT_SCOPE_SELECTION
-#: Merge.rc:974 Merge.rc:2019
+#: Merge.rc:982 Merge.rc:2029
msgid "&Selection"
msgstr "选中内容(&S)"
#. IDR_POPUP_DIRVIEW, ID_DIR_ITEM_RENAME
-#: Merge.rc:976
+#: Merge.rc:984
msgid "Re&name"
msgstr "改名(&N)"
#. IDR_POPUP_DIRVIEW, ID_DIR_HIDE_FILENAMES
-#: Merge.rc:977
+#: Merge.rc:985
msgid "&Hide Items"
msgstr "隐藏条目(&H)"
#. IDR_POPUP_DIRVIEW
-#: Merge.rc:979
+#: Merge.rc:987
msgid "&Open Left"
msgstr "打开左侧(&O)"
#. IDR_POPUP_DIRVIEW
-#: Merge.rc:986
+#: Merge.rc:994
msgid "Open Midd&le"
msgstr "打开中间(&L)"
#. IDR_POPUP_DIRVIEW
-#: Merge.rc:993
+#: Merge.rc:1001
msgid "O&pen Right"
msgstr "打开右侧(&P)"
#. IDR_POPUP_DIRVIEW
-#: Merge.rc:1001
+#: Merge.rc:1009
msgid "Cop&y Paths"
msgstr "复制完整路径(&Y)"
#. IDS_DEL_LEFT_FMT2
-#: Merge.rc:1003 Merge.rc:1012 Merge.rc:4530
+#: Merge.rc:1011 Merge.rc:1020 Merge.rc:4540
#, c-format
msgid "Left (%1 of %2)"
msgstr "左侧 (%1 / %2)"
#. IDS_DEL_MIDDLE_FMT2
-#: Merge.rc:1004 Merge.rc:1013 Merge.rc:4531
+#: Merge.rc:1012 Merge.rc:1021 Merge.rc:4541
#, c-format
msgid "Middle (%1 of %2)"
msgstr "中间 (%1 / %2)"
#. IDS_DEL_RIGHT_FMT2
-#: Merge.rc:1005 Merge.rc:1014 Merge.rc:4532
+#: Merge.rc:1013 Merge.rc:1022 Merge.rc:4542
#, c-format
msgid "Right (%1 of %2)"
msgstr "右侧 (%1 / %2)"
#. IDS_DEL_BOTH_FMT2
-#: Merge.rc:1006 Merge.rc:1015 Merge.rc:4533
+#: Merge.rc:1014 Merge.rc:1023 Merge.rc:4543
#, c-format
msgid "Both (%1 of %2)"
msgstr "两侧 (%1 / %2)"
#. IDS_DEL_ALL_FMT2
-#: Merge.rc:1007 Merge.rc:1016 Merge.rc:4538
+#: Merge.rc:1015 Merge.rc:1024 Merge.rc:4548
#, c-format
msgid "All (%1 of %2)"
msgstr "全部 (%1 / %2)"
#. IDR_POPUP_DIRVIEW, ID_DIR_COPY_FILENAMES
-#: Merge.rc:1009
+#: Merge.rc:1017
msgid "Copy &Filenames"
msgstr "复制文件名(&F)"
#. IDR_POPUP_DIRVIEW
-#: Merge.rc:1010
+#: Merge.rc:1018
msgid "Copy Items to Clip&board"
msgstr "复制条目到剪贴板(&B)"
#. IDR_POPUP_DIRVIEW, ID_DIR_COPY_ALL_DISP_COLUMNS
-#: Merge.rc:1018
+#: Merge.rc:1026
msgid "Copy All Di&splayed Columns"
msgstr "复制所有显示的列(&S)"
#. IDR_POPUP_DIRVIEW
-#: Merge.rc:1020
+#: Merge.rc:1028
msgid "&Zip"
msgstr "Zip (&Z)"
#. IDS_COPY_BOTH_TO2
-#: Merge.rc:1025 Merge.rc:4516
+#: Merge.rc:1033 Merge.rc:4526
#, c-format
msgid "Both to... (%1 of %2)"
msgstr "两者到... (%1 / %2)"
#. IDS_COPY_ALL_TO2
-#: Merge.rc:1026 Merge.rc:4517
+#: Merge.rc:1034 Merge.rc:4527
#, c-format
msgid "All to... (%1 of %2)"
msgstr "全部到... (%1 / %2)"
#. IDS_COPY_DIFFERENCES_TO2
-#: Merge.rc:1027 Merge.rc:4518
+#: Merge.rc:1035 Merge.rc:4528
#, c-format
msgid "Differences to... (%1 of %2)"
msgstr "差异到... (%1 / %2)"
#. IDR_POPUP_DIRVIEW, ID_DIR_SHELL_CONTEXT_MENU_LEFT
-#: Merge.rc:1032
+#: Merge.rc:1040
msgid "Left Shell Menu"
msgstr "左侧系统外壳菜单"
#. IDR_POPUP_DIRVIEW, ID_DIR_SHELL_CONTEXT_MENU_MIDDLE
-#: Merge.rc:1033
+#: Merge.rc:1041
msgid "Middle Shell Menu"
msgstr "中间系统外壳菜单"
#. IDR_POPUP_DIRVIEW, ID_DIR_SHELL_CONTEXT_MENU_RIGHT
-#: Merge.rc:1034
+#: Merge.rc:1042
msgid "Right Shell Menu"
msgstr "右侧系统外壳菜单"
#. IDR_POPUP_DIRVIEW, ID_DIR_SHELL_CONTEXT_MENU_BOTH
-#: Merge.rc:1035
+#: Merge.rc:1043
msgid "Both Shell Menu"
msgstr "所有系统外壳菜单"
#. IDR_POPUP_DIRVIEW, ID_DIR_SHELL_CONTEXT_MENU_ALL
-#: Merge.rc:1036
+#: Merge.rc:1044
msgid "All Shell Menu"
msgstr "所有系统外壳菜单"
#. IDR_POPUP_EDITOR_HEADERBAR, ID_EDITOR_COPY
-#: Merge.rc:1050
+#: Merge.rc:1058
msgid "Copy"
msgstr "复制"
#. IDR_POPUP_EDITOR_HEADERBAR, ID_EDITOR_COPY_PATH
-#: Merge.rc:1051
+#: Merge.rc:1059
msgid "&Copy Full Path"
msgstr "复制完整路径(&C)"
#. IDR_POPUP_EDITOR_HEADERBAR, ID_EDITOR_COPY_FILENAME
-#: Merge.rc:1052
+#: Merge.rc:1060
msgid "Copy &Filename"
msgstr "复制文件名(&F)"
#. IDR_POPUP_EDITOR_HEADERBAR, ID_EDITOR_EDIT_CAPTION
-#: Merge.rc:1053
+#: Merge.rc:1061
msgid "&Edit Caption\tF2"
msgstr "编辑标题(&E)\tF2"
#. IDR_POPUP_EDITOR_HEADERBAR, ID_EDITOR_EDIT_PATH
-#: Merge.rc:1055
+#: Merge.rc:1063
msgid "Edit &Path\tCtrl+L"
msgstr "编辑路径(&P)\tCtrl+L"
#. IDR_POPUP_EDITOR_HEADERBAR, ID_EDITOR_SELECT_FILE
-#: Merge.rc:1056
+#: Merge.rc:1064
msgid "&Open..."
msgstr "打开(&O)..."
#. IDR_POPUP_PLUGINS_SETTINGS
-#: Merge.rc:1062
+#: Merge.rc:1070
msgid "Unpacker Settings"
msgstr "解包插件设置"
#. IDS_USERCHOICE_NONE
-#: Merge.rc:1064 Merge.rc:1070 Merge.rc:1789 Merge.rc:1793 Merge.rc:5030
+#: Merge.rc:1072 Merge.rc:1078 Merge.rc:1799 Merge.rc:1803 Merge.rc:5040
msgid ""
msgstr "<无>"
#. IDS_USERCHOICE_AUTOMATIC
-#: Merge.rc:1065 Merge.rc:1071 Merge.rc:5031
+#: Merge.rc:1073 Merge.rc:1079 Merge.rc:5041
msgid ""
msgstr "<自动>"
#. IDD_OPEN, IDC_SELECT_PREDIFFER
-#: Merge.rc:1066 Merge.rc:1072 Merge.rc:1970 Merge.rc:1974
+#: Merge.rc:1074 Merge.rc:1080 Merge.rc:1980 Merge.rc:1984
msgid "&Select..."
msgstr "选择(&S)..."
#. IDR_POPUP_PLUGINS_SETTINGS
-#: Merge.rc:1068
+#: Merge.rc:1076
msgid "Prediffer Settings"
msgstr "设置预比较插件"
#. IDR_POPUP_LOCATIONBAR, ID_LOCBAR_GOTODIFF
-#: Merge.rc:1080
+#: Merge.rc:1088
msgid "G&o to Diff"
msgstr "转到差异处(&O)"
#. IDR_POPUP_LOCATIONBAR, ID_LOCBAR_MOVECURSOR_ONCLICK
-#: Merge.rc:1083
+#: Merge.rc:1091
msgid "Move Cursor on &Click"
msgstr "在点击时移动光标(&C)"
#. IDR_POPUP_LOCATIONBAR, ID_DISPLAY_MOVED_NONE
-#: Merge.rc:1085
+#: Merge.rc:1093
msgid "&No Moved Blocks"
msgstr "不显示移动的区块(&N)"
#. IDR_POPUP_LOCATIONBAR, ID_DISPLAY_MOVED_ALL
-#: Merge.rc:1086
+#: Merge.rc:1094
msgid "&All Moved Blocks"
msgstr "所有移动的区块(&A)"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS
-#: Merge.rc:1094 Merge.rc:1127
+#: Merge.rc:1102 Merge.rc:1135
msgid "W&hitespaces"
msgstr "空白字符(&H)"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_WHITESPACE_COMPARE
-#: Merge.rc:1096 Merge.rc:1129
+#: Merge.rc:1104 Merge.rc:1137
msgid "Com&pare"
msgstr "比较空白字符(&P)"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_WHITESPACE_IGNORE
-#: Merge.rc:1097 Merge.rc:1130
+#: Merge.rc:1105 Merge.rc:1138
msgid "I&gnore Changes"
msgstr "忽略空白字符的变化(G)"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_WHITESPACE_IGNOREALL
-#: Merge.rc:1098 Merge.rc:1131
+#: Merge.rc:1106 Merge.rc:1139
msgid "Ig&nore All"
msgstr "忽略所有空白字符(&N)"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_IGNORE_BLANKLINES
-#: Merge.rc:1100 Merge.rc:1133
+#: Merge.rc:1108 Merge.rc:1141
msgid "Ignore Blan&k Lines"
msgstr "忽略空行(&K)"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_IGNORE_CASE
-#: Merge.rc:1101 Merge.rc:1134
+#: Merge.rc:1109 Merge.rc:1142
msgid "Ignore &Case"
msgstr "忽略大小写(&C)"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_IGNORE_EOL
-#: Merge.rc:1102 Merge.rc:1135
+#: Merge.rc:1110 Merge.rc:1143
msgid "Igno&re EOL Differences (Windows/Unix/Mac)"
msgstr "忽略换行符差异(Windows/Unix/Mac)(&R)"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_IGNORE_CODEPAGE
-#: Merge.rc:1103 Merge.rc:1136
+#: Merge.rc:1111 Merge.rc:1144
msgid "Ignore Codepage &Differences"
msgstr "忽略代码页差异(&D)"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_IGNORE_NUMBERS
-#: Merge.rc:1104 Merge.rc:1137
+#: Merge.rc:1112 Merge.rc:1145
msgid "Ignore Num&bers"
msgstr "忽略数字(&B)"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_IGNORE_COMMENTS
-#: Merge.rc:1105 Merge.rc:1138
+#: Merge.rc:1113 Merge.rc:1146
msgid "Ignore C&omment Differences"
msgstr "忽略注释行差异(&O)"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_IGNORE_MISSING_TRAILING_EOL
-#: Merge.rc:1106 Merge.rc:1139
+#: Merge.rc:1114 Merge.rc:1147
msgid "Ignore &Missing Trailing EOL"
msgstr "忽略缺失的尾部换行符(&M)"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_IGNORE_LINE_BREAKS
-#: Merge.rc:1107 Merge.rc:1140
+#: Merge.rc:1115 Merge.rc:1148
msgid "Ignore Line &Breaks (Treat as Spaces)"
msgstr "忽略换行符(视为空格)(&B)"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_RECURS_CHECK
-#: Merge.rc:1109 Merge.rc:2963
+#: Merge.rc:1117 Merge.rc:2973
msgid "&Include Subfolders"
msgstr "包含子目录(&I)"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS
-#: Merge.rc:1110 Merge.rc:1142
+#: Merge.rc:1118 Merge.rc:1150
msgid "&Compare Method"
msgstr "比较方法(&C)"
#. IDS_COMPMETHOD_FULL_CONTENTS
-#: Merge.rc:1112 Merge.rc:1144 Merge.rc:1328 Merge.rc:4282
+#: Merge.rc:1120 Merge.rc:1152 Merge.rc:1338 Merge.rc:4292
msgid "Full Contents"
msgstr "全部内容"
#. IDS_COMPMETHOD_QUICK_CONTENTS
-#: Merge.rc:1113 Merge.rc:1145 Merge.rc:1329 Merge.rc:4283
+#: Merge.rc:1121 Merge.rc:1153 Merge.rc:1339 Merge.rc:4293
msgid "Quick Contents"
msgstr "快速内容"
#. IDS_COMPMETHOD_BINARY_CONTENTS
-#: Merge.rc:1114 Merge.rc:1146 Merge.rc:1330 Merge.rc:4284
+#: Merge.rc:1122 Merge.rc:1154 Merge.rc:1340 Merge.rc:4294
msgid "Binary Contents"
msgstr "二进制内容"
#. IDS_COMPMETHOD_MODDATE
-#: Merge.rc:1115 Merge.rc:1147 Merge.rc:1331 Merge.rc:4285
+#: Merge.rc:1123 Merge.rc:1155 Merge.rc:1341 Merge.rc:4295
msgid "Modified Date"
msgstr "修改日期"
#. IDS_COMPMETHOD_DATESIZE
-#: Merge.rc:1116 Merge.rc:1148 Merge.rc:1332 Merge.rc:4286
+#: Merge.rc:1124 Merge.rc:1156 Merge.rc:1342 Merge.rc:4296
msgid "Modified Date and Size"
msgstr "修改日期和文件大小"
#. IDS_COMPMETHOD_SIZE
-#: Merge.rc:1117 Merge.rc:1149 Merge.rc:1333 Merge.rc:4287
+#: Merge.rc:1125 Merge.rc:1157 Merge.rc:1343 Merge.rc:4297
msgid "Size"
msgstr "文件大小"
#. IDS_COMPMETHOD_EXISTENCE
-#: Merge.rc:1118 Merge.rc:1150 Merge.rc:1334 Merge.rc:4288
+#: Merge.rc:1126 Merge.rc:1158 Merge.rc:1344 Merge.rc:4298
msgid "Existence"
msgstr "存在性"
#. IDR_POPUP_PROJECT, ID_LOAD_PROJECT
-#: Merge.rc:1192
+#: Merge.rc:1202
msgid "&Load Project..."
msgstr "加载工程(&L)..."
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARGALL
-#: Merge.rc:1272 Merge.rc:1301
+#: Merge.rc:1282 Merge.rc:1311
msgid "${*} - All Arguments"
msgstr "${*} - 所有参数"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARG1
-#: Merge.rc:1273 Merge.rc:1302
+#: Merge.rc:1283 Merge.rc:1312
msgid "${1} - First Argument"
msgstr "${1} - 第一个参数"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARG2
-#: Merge.rc:1274 Merge.rc:1303
+#: Merge.rc:1284 Merge.rc:1313
msgid "${2} - Second Argument"
msgstr "${2} - 第二个参数"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARG3
-#: Merge.rc:1275 Merge.rc:1304
+#: Merge.rc:1285 Merge.rc:1314
msgid "${3} - Third Argument"
msgstr "${3} - 第三个参数"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARG4
-#: Merge.rc:1276 Merge.rc:1305
+#: Merge.rc:1286 Merge.rc:1315
msgid "${4} - Fourth Argument"
msgstr "${4} - 第四个参数"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARG5
-#: Merge.rc:1277 Merge.rc:1306
+#: Merge.rc:1287 Merge.rc:1316
msgid "${5} - Fifth Argument"
msgstr "${5} - 第五个参数"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARG6
-#: Merge.rc:1278 Merge.rc:1307
+#: Merge.rc:1288 Merge.rc:1317
msgid "${6} - Sixth Argument"
msgstr "${6} - 第六个参数"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARG7
-#: Merge.rc:1279 Merge.rc:1308
+#: Merge.rc:1289 Merge.rc:1318
msgid "${7} - Seventh Argument"
msgstr "${7} - 第七个参数"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARG8
-#: Merge.rc:1280 Merge.rc:1309
+#: Merge.rc:1290 Merge.rc:1319
msgid "${8} - Eighth Argument"
msgstr "${8} - 第八个参数"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARG9
-#: Merge.rc:1281 Merge.rc:1310
+#: Merge.rc:1291 Merge.rc:1320
msgid "${9} - Ninth Argument"
msgstr "${9} - 第九个参数"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_SRC_FILE
-#: Merge.rc:1289
+#: Merge.rc:1299
msgid "${SRC_FILE} - Source File"
msgstr "${SRC_FILE} - 源文件"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_SRC_FOLDER
-#: Merge.rc:1290
+#: Merge.rc:1300
msgid "${SRC_FOLDER} - Source Folder"
msgstr "${SRC_FOLDER} - 源文件夹"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_SRC_URL
-#: Merge.rc:1291
+#: Merge.rc:1301
msgid "${SRC_URL} - Source URL"
msgstr "${SRC_URL} - 源网址"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_SRC_URL_PROTOCOL
-#: Merge.rc:1292
+#: Merge.rc:1302
msgid "${SRC_URL_PROTOCOL} - Source URL Protocol"
msgstr "${SRC_URL_PROTOCOL} - 源网址协议"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_SRC_URL_SUFFIX
-#: Merge.rc:1293
+#: Merge.rc:1303
msgid "${SRC_URL_SUFFIX} - Source URL Suffix"
msgstr "${SRC_URL_SUFFIX} - 源网址后缀"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_DST_FILE
-#: Merge.rc:1294
+#: Merge.rc:1304
msgid "${DST_FILE} - Destination File"
msgstr "${DST_FILE} - 目标文件"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_DST_FOLDER
-#: Merge.rc:1295
+#: Merge.rc:1305
msgid "${DST_FOLDER} - Destination Folder"
msgstr "${DST_FOLDER} - 目标文件夹"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_DST_URL
-#: Merge.rc:1296
+#: Merge.rc:1306
msgid "${DST_URL} - Destination URL"
msgstr "${DST_URL} - 目标网址"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_DST_URL_PROTOCOL
-#: Merge.rc:1297
+#: Merge.rc:1307
msgid "${DST_URL_PROTOCOL} - Destination URL Protocol"
msgstr "${DST_URL_PROTOCOL} - 目标网址协议"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_DST_URL_SUFFIX
-#: Merge.rc:1298
+#: Merge.rc:1308
msgid "${DST_URL_SUFFIX} - Destination URL Suffix"
msgstr "${DST_URL_SUFFIX} - 目标网址后缀"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_WINMERGE_HOME
-#: Merge.rc:1299
+#: Merge.rc:1309
msgid "${WINMERGE_HOME} - WinMerge Home Directory"
msgstr "${WINMERGE_HOME} - WinMerge 主目录"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_SCRIPT_FILE
-#: Merge.rc:1300
+#: Merge.rc:1310
msgid "${SCRIPT_FILE} - Script File"
msgstr "${SCRIPT_FILE} - 脚本文件"
#. IDR_POPUP_PLUGIN_ADD_MENU, ID_PLUGIN_ADD_UNPACKER
-#: Merge.rc:1318
+#: Merge.rc:1328
msgid "Add &Unpacker Plugin..."
msgstr "添加解包插件(&U)..."
#. IDR_POPUP_PLUGIN_ADD_MENU, ID_PLUGIN_ADD_PREDIFFER
-#: Merge.rc:1319
+#: Merge.rc:1329
msgid "Add &Prediffer Plugin..."
msgstr "添加预比较插件(&P)..."
#. IDR_POPUP_PLUGIN_ADD_MENU, ID_PLUGIN_DUPLICATE
-#: Merge.rc:1320
+#: Merge.rc:1330
msgid "&Duplicate Plugin..."
msgstr "复制插件(&D)..."
#. IDR_POPUP_OUTPUTVIEW, ID_EDIT_CLEAR_ALL
-#: Merge.rc:1344
+#: Merge.rc:1354
msgid "Clear &All"
msgstr "清除所有(&A)"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_MASK_CLEAR
-#: Merge.rc:1352
+#: Merge.rc:1362
msgid "&Clear All"
msgstr "清除所有(&C)"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_MASK_REMOVE_LAST
-#: Merge.rc:1353
+#: Merge.rc:1363
msgid "Remove Last Filter &Group"
msgstr "清除上一个过滤器分组(&G)"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_MASK_ALL
-#: Merge.rc:1354
+#: Merge.rc:1364
msgid "R&eset to Default (*.*)"
msgstr "重置为缺省值 (*.*) (&E)"
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1355
+#: Merge.rc:1365
msgid "Add E&xclude File"
msgstr "排除文件(&X)"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_SYS
-#: Merge.rc:1357
+#: Merge.rc:1367
msgid "&System Files"
msgstr "系统文件(&S)"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_BACKUP
-#: Merge.rc:1358
+#: Merge.rc:1368
msgid "&Editor Backup Files"
msgstr "编辑器备份文件(&E)"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_BIN
-#: Merge.rc:1359
+#: Merge.rc:1369
msgid "&Compiled Binary Files"
msgstr "已编译的二进制文件(&C)"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_LOG
-#: Merge.rc:1360
+#: Merge.rc:1370
msgid "&Log Files"
msgstr "日志文件(&L)"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_TEMP
-#: Merge.rc:1361
+#: Merge.rc:1371
msgid "&Temporary or Cache Files"
msgstr "临时或缓存文件(&T)"
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1363
+#: Merge.rc:1373
msgid "Add Excl&ude Folder"
msgstr "排除文件夹(&U)"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FOLDER_VCS
-#: Merge.rc:1365
+#: Merge.rc:1375
msgid "&Version Control"
msgstr "版本控制(&V)"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FOLDER_BUILD
-#: Merge.rc:1366
+#: Merge.rc:1376
msgid "&Build Artifacts"
msgstr "构建制品(&B)"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FOLDER_IDE
-#: Merge.rc:1367
+#: Merge.rc:1377
msgid "&IDE"
msgstr "集成开发环境(&I)"
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1370
+#: Merge.rc:1380
msgid "Add &File Condition"
msgstr "添加文件条件(&F)"
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1372 Merge.rc:1551
+#: Merge.rc:1382 Merge.rc:1561
msgid "File &Size"
msgstr "文件大小(&S)"
#. IDR_POPUP_FILTERMENU_DIFF_SIZE, ID_FILTERMENU_DIFF_SIZE_LT_1KB
-#: Merge.rc:1374 Merge.rc:1527 Merge.rc:1564 Merge.rc:1629 Merge.rc:1707
+#: Merge.rc:1384 Merge.rc:1537 Merge.rc:1574 Merge.rc:1639 Merge.rc:1717
msgid "Less than 1KB"
msgstr "小于 1KB"
#. IDR_POPUP_FILTERMENU_DIFF_SIZE, ID_FILTERMENU_DIFF_SIZE_GE_1KB
-#: Merge.rc:1375 Merge.rc:1528 Merge.rc:1565 Merge.rc:1630 Merge.rc:1708
+#: Merge.rc:1385 Merge.rc:1538 Merge.rc:1575 Merge.rc:1640 Merge.rc:1718
msgid "1KB or more"
msgstr "至少 1KB"
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_LT_10KB
-#: Merge.rc:1376 Merge.rc:1529 Merge.rc:1631
+#: Merge.rc:1386 Merge.rc:1539 Merge.rc:1641
msgid "Less than 10KB"
msgstr "小于 10KB"
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_GE_10KB
-#: Merge.rc:1377 Merge.rc:1530 Merge.rc:1632
+#: Merge.rc:1387 Merge.rc:1540 Merge.rc:1642
msgid "10KB or more"
msgstr "至少 10KB"
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_LT_100KB
-#: Merge.rc:1378 Merge.rc:1531 Merge.rc:1633
+#: Merge.rc:1388 Merge.rc:1541 Merge.rc:1643
msgid "Less than 100KB"
msgstr "小于 100KB"
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_GE_100KB
-#: Merge.rc:1379 Merge.rc:1532 Merge.rc:1634
+#: Merge.rc:1389 Merge.rc:1542 Merge.rc:1644
msgid "100KB or more"
msgstr "至少 100KB"
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_LT_1MB
-#: Merge.rc:1380 Merge.rc:1533 Merge.rc:1635
+#: Merge.rc:1390 Merge.rc:1543 Merge.rc:1645
msgid "Less than 1MB"
msgstr "小于 1MB"
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_GE_1MB
-#: Merge.rc:1381 Merge.rc:1534 Merge.rc:1636
+#: Merge.rc:1391 Merge.rc:1544 Merge.rc:1646
msgid "1MB or more"
msgstr "至少 1MB"
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_LT_10MB
-#: Merge.rc:1382 Merge.rc:1535 Merge.rc:1637
+#: Merge.rc:1392 Merge.rc:1545 Merge.rc:1647
msgid "Less than 10MB"
msgstr "小于 10MB"
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_GE_10MB
-#: Merge.rc:1383 Merge.rc:1536 Merge.rc:1638
+#: Merge.rc:1393 Merge.rc:1546 Merge.rc:1648
msgid "10MB or more"
msgstr "至少 10MB"
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_LT_100MB
-#: Merge.rc:1384 Merge.rc:1537 Merge.rc:1639
+#: Merge.rc:1394 Merge.rc:1547 Merge.rc:1649
msgid "Less than 100MB"
msgstr "小于 100MB"
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_GE_100MB
-#: Merge.rc:1385 Merge.rc:1538 Merge.rc:1640
+#: Merge.rc:1395 Merge.rc:1548 Merge.rc:1650
msgid "100MB or more"
msgstr "至少 100MB"
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_LT_1GB
-#: Merge.rc:1386 Merge.rc:1539 Merge.rc:1641
+#: Merge.rc:1396 Merge.rc:1549 Merge.rc:1651
msgid "Less than 1GB"
msgstr "小于 1GB"
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_GE_1GB
-#: Merge.rc:1387 Merge.rc:1642
+#: Merge.rc:1397 Merge.rc:1652
msgid "1GB or more"
msgstr "至少 1GB"
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_RANGE
-#: Merge.rc:1388 Merge.rc:1465 Merge.rc:1517 Merge.rc:1523 Merge.rc:1540
-#: Merge.rc:1566 Merge.rc:1587 Merge.rc:1643 Merge.rc:1709 Merge.rc:1734
+#: Merge.rc:1398 Merge.rc:1475 Merge.rc:1527 Merge.rc:1533 Merge.rc:1550
+#: Merge.rc:1576 Merge.rc:1597 Merge.rc:1653 Merge.rc:1719 Merge.rc:1744
msgid "Custom Range..."
msgstr "自定义范围..."
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1390 Merge.rc:1471 Merge.rc:1568
+#: Merge.rc:1400 Merge.rc:1481 Merge.rc:1578
msgid "&Last Modified"
msgstr "最近修改(&L)"
#. IDR_POPUP_FILTERMENU_DATE
-#: Merge.rc:1392 Merge.rc:1473 Merge.rc:1651
+#: Merge.rc:1402 Merge.rc:1483 Merge.rc:1661
msgid "&Hour"
msgstr "小时(&H)"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_HOUR_BEFORE_1
-#: Merge.rc:1394 Merge.rc:1475 Merge.rc:1653
+#: Merge.rc:1404 Merge.rc:1485 Merge.rc:1663
msgid "More than 1 hour ago"
msgstr "超过一小时"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_HOUR_WITHIN_1
-#: Merge.rc:1395 Merge.rc:1476 Merge.rc:1654
+#: Merge.rc:1405 Merge.rc:1486 Merge.rc:1664
msgid "Within 1 hour"
msgstr "一小时内"
#. IDR_POPUP_FILTERMENU_DATE
-#: Merge.rc:1397 Merge.rc:1478 Merge.rc:1656
+#: Merge.rc:1407 Merge.rc:1488 Merge.rc:1666
msgid "&Day"
msgstr "天(&D)"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_DAY_BEFORE_TODAY
-#: Merge.rc:1399 Merge.rc:1480 Merge.rc:1658
+#: Merge.rc:1409 Merge.rc:1490 Merge.rc:1668
msgid "Before today"
msgstr "今天之前"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_DAY_TODAY
-#: Merge.rc:1400 Merge.rc:1481 Merge.rc:1659
+#: Merge.rc:1410 Merge.rc:1491 Merge.rc:1669
msgid "Today"
msgstr "今天"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_DAY_BEFORE_YESTERDAY
-#: Merge.rc:1401 Merge.rc:1482 Merge.rc:1660
+#: Merge.rc:1411 Merge.rc:1492 Merge.rc:1670
msgid "Before yesterday"
msgstr "昨天之前"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_DAY_YESTERDAY
-#: Merge.rc:1402 Merge.rc:1483 Merge.rc:1661
+#: Merge.rc:1412 Merge.rc:1493 Merge.rc:1671
msgid "Yesterday"
msgstr "昨天"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_DAY_SINCE_YESTERDAY
-#: Merge.rc:1403 Merge.rc:1484 Merge.rc:1662
+#: Merge.rc:1413 Merge.rc:1494 Merge.rc:1672
msgid "Since yesterday"
msgstr "近两天"
#. IDR_POPUP_FILTERMENU_DATE
-#: Merge.rc:1405 Merge.rc:1486 Merge.rc:1664
+#: Merge.rc:1415 Merge.rc:1496 Merge.rc:1674
msgid "&Week"
msgstr "星期(&W)"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_WEEK_BEFORE_THIS
-#: Merge.rc:1407 Merge.rc:1488 Merge.rc:1666
+#: Merge.rc:1417 Merge.rc:1498 Merge.rc:1676
msgid "Before this week"
msgstr "本周之前"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_WEEK_THIS
-#: Merge.rc:1408 Merge.rc:1489 Merge.rc:1667
+#: Merge.rc:1418 Merge.rc:1499 Merge.rc:1677
msgid "This week"
msgstr "本周"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_WEEK_BEFORE_LAST
-#: Merge.rc:1409 Merge.rc:1490 Merge.rc:1668
+#: Merge.rc:1419 Merge.rc:1500 Merge.rc:1678
msgid "Before last week"
msgstr "上周之前"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_WEEK_LAST
-#: Merge.rc:1410 Merge.rc:1491 Merge.rc:1669
+#: Merge.rc:1420 Merge.rc:1501 Merge.rc:1679
msgid "Last week"
msgstr "上周"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_WEEK_SINCE_LAST
-#: Merge.rc:1411 Merge.rc:1492 Merge.rc:1670
+#: Merge.rc:1421 Merge.rc:1502 Merge.rc:1680
msgid "Since last week"
msgstr "近两周"
#. IDR_POPUP_FILTERMENU_DATE
-#: Merge.rc:1413 Merge.rc:1494 Merge.rc:1672
+#: Merge.rc:1423 Merge.rc:1504 Merge.rc:1682
msgid "&Month"
msgstr "月(&M)"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_MONTH_BEFORE_THIS
-#: Merge.rc:1415 Merge.rc:1496 Merge.rc:1674
+#: Merge.rc:1425 Merge.rc:1506 Merge.rc:1684
msgid "Before this month"
msgstr "本月之前"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_MONTH_THIS
-#: Merge.rc:1416 Merge.rc:1497 Merge.rc:1675
+#: Merge.rc:1426 Merge.rc:1507 Merge.rc:1685
msgid "This month"
msgstr "本月"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_MONTH_BEFORE_LAST
-#: Merge.rc:1417 Merge.rc:1498 Merge.rc:1676
+#: Merge.rc:1427 Merge.rc:1508 Merge.rc:1686
msgid "Before last month"
msgstr "上月之前"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_MONTH_LAST
-#: Merge.rc:1418 Merge.rc:1499 Merge.rc:1677
+#: Merge.rc:1428 Merge.rc:1509 Merge.rc:1687
msgid "Last month"
msgstr "上月"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_MONTH_SINCE_LAST
-#: Merge.rc:1419 Merge.rc:1500 Merge.rc:1678
+#: Merge.rc:1429 Merge.rc:1510 Merge.rc:1688
msgid "Since last month"
msgstr "近两月"
#. IDR_POPUP_FILTERMENU_DATE
-#: Merge.rc:1421 Merge.rc:1502 Merge.rc:1680
+#: Merge.rc:1431 Merge.rc:1512 Merge.rc:1690
msgid "&Year"
msgstr "年(&Y)"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_YEAR_BEFORE_THIS
-#: Merge.rc:1423 Merge.rc:1504 Merge.rc:1682
+#: Merge.rc:1433 Merge.rc:1514 Merge.rc:1692
msgid "Before this year"
msgstr "今年之前"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_YEAR_THIS
-#: Merge.rc:1424 Merge.rc:1505 Merge.rc:1683
+#: Merge.rc:1434 Merge.rc:1515 Merge.rc:1693
msgid "This year"
msgstr "今年"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_YEAR_BEFORE_LAST
-#: Merge.rc:1425 Merge.rc:1506 Merge.rc:1684
+#: Merge.rc:1435 Merge.rc:1516 Merge.rc:1694
msgid "Before last year"
msgstr "去年之前"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_YEAR_LAST
-#: Merge.rc:1426 Merge.rc:1507 Merge.rc:1685
+#: Merge.rc:1436 Merge.rc:1517 Merge.rc:1695
msgid "Last year"
msgstr "去年"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_YEAR_SINCE_LAST
-#: Merge.rc:1427 Merge.rc:1508 Merge.rc:1686
+#: Merge.rc:1437 Merge.rc:1518 Merge.rc:1696
msgid "Since last year"
msgstr "近两年"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_RANGE
-#: Merge.rc:1429 Merge.rc:1510 Merge.rc:1688
+#: Merge.rc:1439 Merge.rc:1520 Merge.rc:1698
msgid "&Custom Range..."
msgstr "自定义范围(&C)..."
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1431 Merge.rc:1589
+#: Merge.rc:1441 Merge.rc:1599
msgid "&Attributes"
msgstr "属性(&A)"
#. IDR_POPUP_FILTERMENU_ATTR, ID_FILTERMENU_ATTR_READONLY
-#: Merge.rc:1433 Merge.rc:1607
+#: Merge.rc:1443 Merge.rc:1617
msgid "Read-only files"
msgstr "只读文件"
#. IDR_POPUP_FILTERMENU_ATTR, ID_FILTERMENU_ATTR_NOT_READONLY
-#: Merge.rc:1434 Merge.rc:1608
+#: Merge.rc:1444 Merge.rc:1618
msgid "Not read-only files"
msgstr "非只读文件"
#. IDR_POPUP_FILTERMENU_ATTR, ID_FILTERMENU_ATTR_HIDDEN
-#: Merge.rc:1435 Merge.rc:1609
+#: Merge.rc:1445 Merge.rc:1619
msgid "Hidden files"
msgstr "隐藏文件"
#. IDR_POPUP_FILTERMENU_ATTR, ID_FILTERMENU_ATTR_NOT_HIDDEN
-#: Merge.rc:1436 Merge.rc:1610
+#: Merge.rc:1446 Merge.rc:1620
msgid "Not hidden files"
msgstr "非隐藏文件"
#. IDR_POPUP_FILTERMENU_ATTR, ID_FILTERMENU_ATTR_SYSTEM
-#: Merge.rc:1437 Merge.rc:1611
+#: Merge.rc:1447 Merge.rc:1621
msgid "System files"
msgstr "系统文件"
#. IDR_POPUP_FILTERMENU_ATTR, ID_FILTERMENU_ATTR_NOT_SYSTEM
-#: Merge.rc:1438 Merge.rc:1612
+#: Merge.rc:1448 Merge.rc:1622
msgid "Not system files"
msgstr "非系统文件"
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1440
+#: Merge.rc:1450
msgid "File &Content"
msgstr "文件内容(&C)"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_CONTAINS
-#: Merge.rc:1442
+#: Merge.rc:1452
msgid "Contains string..."
msgstr "包括字符串..."
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_NOT_CONTAINS
-#: Merge.rc:1443
+#: Merge.rc:1453
msgid "Does not contain string..."
msgstr "未包含字符串..."
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_FIRST_LINE_CONTAINS
-#: Merge.rc:1444
+#: Merge.rc:1454
msgid "First line contains string..."
msgstr "首行包含字符串..."
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_FIRST_LINE_NOT_CONTAINS
-#: Merge.rc:1445
+#: Merge.rc:1455
msgid "First line does not contain string..."
msgstr "首行未包含字符串..."
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_FIRST_10_CONTAINS
-#: Merge.rc:1446
+#: Merge.rc:1456
msgid "First 10 lines contain string..."
msgstr "前十行包含字符串..."
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_FIRST_10_NOT_CONTAINS
-#: Merge.rc:1447
+#: Merge.rc:1457
msgid "First 10 lines do not contain string..."
msgstr "前十行未包含字符串..."
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_LAST_10_CONTAINS
-#: Merge.rc:1448
+#: Merge.rc:1458
msgid "Last 10 lines contain string..."
msgstr "后十行包含字符串..."
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_LAST_10_NOT_CONTAINS
-#: Merge.rc:1449
+#: Merge.rc:1459
msgid "Last 10 lines do not contain string..."
msgstr "后十行未包含字符串..."
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_LAST_LINE_CONTAINS
-#: Merge.rc:1450
+#: Merge.rc:1460
msgid "Last line contains string..."
msgstr "最后一行包含字符串..."
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_LAST_LINE_NOT_CONTAINS
-#: Merge.rc:1451
+#: Merge.rc:1461
msgid "Last line does not contain string..."
msgstr "最后一行未包含字符串..."
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1453
+#: Merge.rc:1463
msgid "&Line Count"
msgstr "行数(&L)"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_LT_10
-#: Merge.rc:1455
+#: Merge.rc:1465
msgid "Less than 10"
msgstr "小于 10"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_GE_10
-#: Merge.rc:1456
+#: Merge.rc:1466
msgid "10 or more"
msgstr "至少 10"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_LT_100
-#: Merge.rc:1457
+#: Merge.rc:1467
msgid "Less than 100"
msgstr "小于 100"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_GE_100
-#: Merge.rc:1458
+#: Merge.rc:1468
msgid "100 or more"
msgstr "至少 100"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_LT_1000
-#: Merge.rc:1459
+#: Merge.rc:1469
msgid "Less than 1000"
msgstr "小于 1000"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_GE_1000
-#: Merge.rc:1460
+#: Merge.rc:1470
msgid "1000 or more"
msgstr "至少 1000"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_LT_10000
-#: Merge.rc:1461
+#: Merge.rc:1471
msgid "Less than 10000"
msgstr "小于 10000"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_GE_10000
-#: Merge.rc:1462
+#: Merge.rc:1472
msgid "10000 or more"
msgstr "至少 10000"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_LT_100000
-#: Merge.rc:1463
+#: Merge.rc:1473
msgid "Less than 100000"
msgstr "小于 100000"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_GE_100000
-#: Merge.rc:1464
+#: Merge.rc:1474
msgid "100000 or more"
msgstr "至少 100000"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_PROPS
-#: Merge.rc:1467 Merge.rc:1594 Merge.rc:1761 Merge.rc:1778
+#: Merge.rc:1477 Merge.rc:1604 Merge.rc:1771 Merge.rc:1788
msgid "Additional &Properties..."
msgstr "附加属性(&)..."
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1469
+#: Merge.rc:1479
msgid "Add F&older Condition"
msgstr "添加文件夹条件(&O)"
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1513
+#: Merge.rc:1523
msgid "&Files"
msgstr "文件(&F)"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FOLDER_FILES_EQ_0
-#: Merge.rc:1515
+#: Merge.rc:1525
msgid "0 files"
msgstr "0 个文件"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FOLDER_FILES_GE_1
-#: Merge.rc:1516
+#: Merge.rc:1526
msgid "1 file or more"
msgstr "1 个或更多文件"
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1519
+#: Merge.rc:1529
msgid "&Items"
msgstr "条目(&T)"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FOLDER_ITEMS_EQ_0
-#: Merge.rc:1521
+#: Merge.rc:1531
msgid "0 items"
msgstr "0 个条目"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FOLDER_ITEMS_GE_1
-#: Merge.rc:1522
+#: Merge.rc:1532
msgid "1 item or more"
msgstr "1 个或更多条目"
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1525
+#: Merge.rc:1535
msgid "&Total Size"
msgstr "总大小(&T)"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FOLDER_STATS_RECURSIVE
-#: Merge.rc:1542
+#: Merge.rc:1552
msgid "&Recursive"
msgstr "递归(&R)"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONDITION_ANY
-#: Merge.rc:1544
+#: Merge.rc:1554
msgid "Target: &Any (Left/Middle/Right)"
msgstr "目标:任意(左/中/右)(&A)"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONDITION_LEFT
-#: Merge.rc:1545
+#: Merge.rc:1555
msgid "Target: &Left"
msgstr "目标:左(&L)"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONDITION_MIDDLE
-#: Merge.rc:1546
+#: Merge.rc:1556
msgid "Target: &Middle"
msgstr "目标:中(&M)"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONDITION_RIGHT
-#: Merge.rc:1547
+#: Merge.rc:1557
msgid "Target: &Right"
msgstr "目标:右(&R)"
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1549
+#: Merge.rc:1559
msgid "Add &Difference Condition"
msgstr "添加差异条件(&D)"
#. IDR_POPUP_FILTERMENU_DIFF_PROP, ID_FILTERMENU_DIFF_PROP_EQUAL
-#: Merge.rc:1553 Merge.rc:1570 Merge.rc:1591 Merge.rc:1696 Merge.rc:1717
-#: Merge.rc:1742
+#: Merge.rc:1563 Merge.rc:1580 Merge.rc:1601 Merge.rc:1706 Merge.rc:1727
+#: Merge.rc:1752
msgid "Equal"
msgstr "相同"
#. IDR_POPUP_FILTERMENU_DIFF_PROP, ID_FILTERMENU_DIFF_PROP_NOT_EQUAL
-#: Merge.rc:1554 Merge.rc:1571 Merge.rc:1592 Merge.rc:1697 Merge.rc:1718
-#: Merge.rc:1743
+#: Merge.rc:1564 Merge.rc:1581 Merge.rc:1602 Merge.rc:1707 Merge.rc:1728
+#: Merge.rc:1753
msgid "Not Equal"
msgstr "不相同"
#. IDR_POPUP_FILTERMENU_DIFF_PROP, ID_FILTERMENU_DIFF_PROP_LESS
-#: Merge.rc:1555 Merge.rc:1572 Merge.rc:1698 Merge.rc:1719 Merge.rc:1744
+#: Merge.rc:1565 Merge.rc:1582 Merge.rc:1708 Merge.rc:1729 Merge.rc:1754
msgid "Less Than"
msgstr "小于"
#. IDR_POPUP_FILTERMENU_DIFF_PROP, ID_FILTERMENU_DIFF_PROP_LESS_EQUAL
-#: Merge.rc:1556 Merge.rc:1573 Merge.rc:1699 Merge.rc:1720 Merge.rc:1745
+#: Merge.rc:1566 Merge.rc:1583 Merge.rc:1709 Merge.rc:1730 Merge.rc:1755
msgid "Less Than or Equal to"
msgstr "小于等于"
#. IDR_POPUP_FILTERMENU_DIFF_PROP, ID_FILTERMENU_DIFF_PROP_GREATER
-#: Merge.rc:1557 Merge.rc:1574 Merge.rc:1700 Merge.rc:1721 Merge.rc:1746
+#: Merge.rc:1567 Merge.rc:1584 Merge.rc:1710 Merge.rc:1731 Merge.rc:1756
msgid "Greater Than"
msgstr "大于"
#. IDR_POPUP_FILTERMENU_DIFF_PROP, ID_FILTERMENU_DIFF_PROP_GREATER_EQUAL
-#: Merge.rc:1558 Merge.rc:1575 Merge.rc:1701 Merge.rc:1722 Merge.rc:1747
+#: Merge.rc:1568 Merge.rc:1585 Merge.rc:1711 Merge.rc:1732 Merge.rc:1757
msgid "Greater Than or Equal to"
msgstr "大于等于"
#. IDR_POPUP_FILTERMENU_DIFF_SIZE, ID_FILTERMENU_DIFF_SIZE_LT_10B
-#: Merge.rc:1560 Merge.rc:1703
+#: Merge.rc:1570 Merge.rc:1713
msgid "Less than 10B"
msgstr "小于 10 字节"
#. IDR_POPUP_FILTERMENU_DIFF_SIZE, ID_FILTERMENU_DIFF_SIZE_GE_10B
-#: Merge.rc:1561 Merge.rc:1704
+#: Merge.rc:1571 Merge.rc:1714
msgid "10B or more"
msgstr "至少 10 字节"
#. IDR_POPUP_FILTERMENU_DIFF_SIZE, ID_FILTERMENU_DIFF_SIZE_LT_100B
-#: Merge.rc:1562 Merge.rc:1705
+#: Merge.rc:1572 Merge.rc:1715
msgid "Less than 100B"
msgstr "小于 100 字节"
#. IDR_POPUP_FILTERMENU_DIFF_SIZE, ID_FILTERMENU_DIFF_SIZE_GE_100B
-#: Merge.rc:1563 Merge.rc:1706
+#: Merge.rc:1573 Merge.rc:1716
msgid "100B or more"
msgstr "至少 100 字节"
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_LT_1SECOND
-#: Merge.rc:1577 Merge.rc:1724
+#: Merge.rc:1587 Merge.rc:1734
msgid "Less than 1 second"
msgstr "小于 1 秒"
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_GE_1SECOND
-#: Merge.rc:1578 Merge.rc:1725
+#: Merge.rc:1588 Merge.rc:1735
msgid "1 second or more"
msgstr "至少 1 秒"
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_LT_1MINUTE
-#: Merge.rc:1579 Merge.rc:1726
+#: Merge.rc:1589 Merge.rc:1736
msgid "Less than 1 minute"
msgstr "小于 1 分钟"
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_GE_1MINUTE
-#: Merge.rc:1580 Merge.rc:1727
+#: Merge.rc:1590 Merge.rc:1737
msgid "1 minute or more"
msgstr "至少 1 分钟"
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_LT_1HOUR
-#: Merge.rc:1581 Merge.rc:1728
+#: Merge.rc:1591 Merge.rc:1738
msgid "Less than 1 hour"
msgstr "小于 1 小时"
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_GE_1HOUR
-#: Merge.rc:1582 Merge.rc:1729
+#: Merge.rc:1592 Merge.rc:1739
msgid "1 hour or more"
msgstr "至少 1 小时"
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_LT_1DAY
-#: Merge.rc:1583 Merge.rc:1730
+#: Merge.rc:1593 Merge.rc:1740
msgid "Less than 1 day"
msgstr "小于 1 天"
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_GE_1DAY
-#: Merge.rc:1584 Merge.rc:1731
+#: Merge.rc:1594 Merge.rc:1741
msgid "1 day or more"
msgstr "至少 1 天"
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_LT_1WEEK
-#: Merge.rc:1585 Merge.rc:1732
+#: Merge.rc:1595 Merge.rc:1742
msgid "Less than 1 week"
msgstr "小于 1 星期"
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_GE_1WEEK
-#: Merge.rc:1586 Merge.rc:1733
+#: Merge.rc:1596 Merge.rc:1743
msgid "1 week or more"
msgstr "至少 1 星期"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_CONDITION_DIFF_LEFT_RIGHT
-#: Merge.rc:1596
+#: Merge.rc:1606
msgid "Target: &Left and Right"
msgstr "目标:左和右(&L)"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_CONDITION_DIFF_LEFT_MIDDLE
-#: Merge.rc:1597
+#: Merge.rc:1607
msgid "Target: Left and &Middle"
msgstr "目标:左和中(&M)"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_CONDITION_DIFF_MIDDLE_RIGHT
-#: Merge.rc:1598
+#: Merge.rc:1608
msgid "Target: Middle and &Right"
msgstr "目标:中和右(&R)"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_CONDITION_DIFF_ALL
-#: Merge.rc:1599
+#: Merge.rc:1609
msgid "Target: &All"
msgstr "目标:全部(&A)"
#. IDR_POPUP_FILTERMENU_BINARY, ID_FILTERMENU_BINARY_ONLY
-#: Merge.rc:1620
+#: Merge.rc:1630
msgid "Binary files only"
msgstr "仅二进制文件"
#. IDR_POPUP_FILTERMENU_BINARY, ID_FILTERMENU_TEXT_ONLY
-#: Merge.rc:1621
+#: Merge.rc:1631
msgid "Text files only"
msgstr "仅文本文件"
#. IDR_POPUP_ADDCMPMENU, ID_ADDCMPMENU_CLEAR
-#: Merge.rc:1755
+#: Merge.rc:1765
msgid "&Clear conditions"
msgstr "清除条件(&C)"
#. IDR_POPUP_ADDCMPMENU, ID_ADDCMPMENU_CMP_SIZE
-#: Merge.rc:1757
+#: Merge.rc:1767
msgid "Compare &Size"
msgstr "比较大小(&S)"
#. IDR_POPUP_ADDCMPMENU, ID_ADDCMPMENU_CMP_DATE
-#: Merge.rc:1758
+#: Merge.rc:1768
msgid "Compare &Date"
msgstr "比较日期(&D)"
#. IDR_POPUP_ADDCMPMENU, ID_ADDCMPMENU_CMP_ATTR
-#: Merge.rc:1759
+#: Merge.rc:1769
msgid "Compare &Attributes"
msgstr "比较属性(&A)"
#. IDR_POPUP_ADDCMPMENU, ID_ADDCMPMENU_CMP_CONTENTS
-#: Merge.rc:1760
+#: Merge.rc:1770
msgid "Compare C&ontents"
msgstr "比较内容(&O)"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_CLEAR
-#: Merge.rc:1769
+#: Merge.rc:1779
msgid "&Clear Keys"
msgstr "清除键(&C)"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_NAME
-#: Merge.rc:1771
+#: Merge.rc:1781
msgid "&Name"
msgstr "名称(&N)"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_BASENAME
-#: Merge.rc:1772
+#: Merge.rc:1782
msgid "&Base name (without extension)"
msgstr "基础名称(不含扩展名)(&B)"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_NORMALIZED_NAME
-#: Merge.rc:1773
+#: Merge.rc:1783
msgid "Normalized &Unicode Name"
msgstr "规范化 Unicode 名称(&U)"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_RELPATH
-#: Merge.rc:1774
+#: Merge.rc:1784
msgid "&Relative Path"
msgstr "相对路径(&R)"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_DATE
-#: Merge.rc:1776
+#: Merge.rc:1786
msgid "&Date"
msgstr "日期(&D)"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_HASH_MD5
-#: Merge.rc:1777
+#: Merge.rc:1787
msgid "&Hash (MD5)"
msgstr "MD5 哈希值(&H)"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_REPLACE
-#: Merge.rc:1780
+#: Merge.rc:1790
msgid "Insert &replace() Function"
msgstr "插入 replace() 函数(&R)"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_REGEXREPLACE
-#: Merge.rc:1781
+#: Merge.rc:1791
msgid "Insert rege&xReplace() Function"
msgstr "插入 regexReplace() 函数(&X)"
#. IDR_POPUP_RENAMEMOVE_MENU
-#: Merge.rc:1782
+#: Merge.rc:1792
msgid "Replace &Lists"
msgstr "替换列表(&L)"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_CREATE_REPLACELIST
-#: Merge.rc:1784
+#: Merge.rc:1794
msgid "&Create String Replace List and Insert..."
msgstr "创建字符串替换列表并插入(&C)..."
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_CREATE_REGEXREPLACELIST
-#: Merge.rc:1785
+#: Merge.rc:1795
msgid "Create &Regex Replace List and Insert..."
msgstr "创建正则式替换列表并插入(&R)..."
#. IDR_POPUP_RENAMEMOVE_MENU
-#: Merge.rc:1787
+#: Merge.rc:1797
msgid "&String Replace Lists"
msgstr "字符串替换列表(&S)"
#. IDR_POPUP_RENAMEMOVE_MENU
-#: Merge.rc:1791
+#: Merge.rc:1801
msgid "Re&gex Replace Lists"
msgstr "正则式替换列表(&G)"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_STRING_REPLACE_LISTS_FOLDER
-#: Merge.rc:1796
+#: Merge.rc:1806
msgid "Open String Replace Lists Folder..."
msgstr "打开字符串替换列表文件夹..."
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_REGEX_REPLACE_LISTS_FOLDER
-#: Merge.rc:1797
+#: Merge.rc:1807
msgid "Open Regex Replace Lists Folder..."
msgstr "打开正则式替换列表文件夹..."
#. IDD_FILTERS_CONDITION, IDC_CONDITION_MATCHCASE
-#: Merge.rc:1799 Merge.rc:1995 Merge.rc:2014 Merge.rc:2042 Merge.rc:2585
+#: Merge.rc:1809 Merge.rc:2005 Merge.rc:2024 Merge.rc:2052 Merge.rc:2595
msgid "Match &case"
msgstr "区分大小写(&C)"
#. IDR_POPUP_RENAMEMOVE_MENU
-#: Merge.rc:1801
+#: Merge.rc:1811
msgid "Text &Normalization"
msgstr "文本规范化(&N)"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_TOLOWER
-#: Merge.rc:1803
+#: Merge.rc:1813
msgid "&Lowercase"
msgstr "小写(&L)"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_TOUPPER
-#: Merge.rc:1804
+#: Merge.rc:1814
msgid "&Uppercase"
msgstr "大写(&U)"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_TOHALFWIDTH
-#: Merge.rc:1805
+#: Merge.rc:1815
msgid "&Half-width"
msgstr "半宽(&H)"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_TOFULLWIDTH
-#: Merge.rc:1806
+#: Merge.rc:1816
msgid "&Full-width"
msgstr "全宽(&F)"
#. IDR_POPUP_RENAMEMOVE_MENU
-#: Merge.rc:1807
+#: Merge.rc:1817
msgid "&Chinese Conversion"
msgstr "中文转换(&C)"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_TOSIMPLIFIEDCHINESE
-#: Merge.rc:1809
+#: Merge.rc:1819
msgid "&Simplified Chinese"
msgstr "简体中文(&S)"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_TOTRADITIONALCHINESE
-#: Merge.rc:1810
+#: Merge.rc:1820
msgid "&Traditional Chinese"
msgstr "繁体中文(&T)"
#. IDR_POPUP_RENAMEMOVE_MENU
-#: Merge.rc:1812
+#: Merge.rc:1822
msgid "&Japanese Conversion"
msgstr "日文转换(&J)"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_TOHIRAGANA
-#: Merge.rc:1814
+#: Merge.rc:1824
msgid "&Hiragana"
msgstr "平假名(&H)"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_TOKATAKANA
-#: Merge.rc:1815
+#: Merge.rc:1825
msgid "&Katakana"
msgstr "片假名(&K)"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_NORMALIZEUNICODE
-#: Merge.rc:1817
+#: Merge.rc:1827
msgid "Normalize &Unicode"
msgstr "规范化 Unicode(&U)"
#. IDD_ABOUTBOX
-#: Merge.rc:1932
+#: Merge.rc:1942
msgid "About WinMerge"
msgstr "关于 WinMerge"
#. IDD_ABOUTBOX, IDC_WWW
-#: Merge.rc:1936
+#: Merge.rc:1946
msgid "Visit the WinMerge Homepage!"
msgstr "访问 WinMerge 首页!"
#. IDD_PLUGINS_EDITPLUGIN, IDOK
-#: Merge.rc:1938 Merge.rc:2080 Merge.rc:2431 Merge.rc:2455 Merge.rc:2469
-#: Merge.rc:2497 Merge.rc:2588 Merge.rc:2613 Merge.rc:2674 Merge.rc:2691
-#: Merge.rc:2703 Merge.rc:2867 Merge.rc:2927 Merge.rc:3062 Merge.rc:3104
-#: Merge.rc:3147 Merge.rc:3197
+#: Merge.rc:1948 Merge.rc:2090 Merge.rc:2441 Merge.rc:2465 Merge.rc:2479
+#: Merge.rc:2507 Merge.rc:2598 Merge.rc:2623 Merge.rc:2684 Merge.rc:2701
+#: Merge.rc:2713 Merge.rc:2877 Merge.rc:2937 Merge.rc:3072 Merge.rc:3114
+#: Merge.rc:3157 Merge.rc:3207
msgid "OK"
msgstr "确定"
#. IDD_ABOUTBOX, IDC_OPEN_CONTRIBUTORS
-#: Merge.rc:1939
+#: Merge.rc:1949
msgid "Contributors"
msgstr "贡献者"
#. IDD_SELECT_FILES_OR_FOLDERS
-#: Merge.rc:1945 Merge.rc:3070
+#: Merge.rc:1955 Merge.rc:3080
msgid "Select Files or Folders"
msgstr "选择文件或文件夹"
#. IDD_OPEN, IDC_FILES_DIRS_GROUP0
-#: Merge.rc:1949
+#: Merge.rc:1959
msgid "&1st File or Folder"
msgstr "第1组的文件或文件夹 (&1)"
#. IDD_OPEN, IDC_PATH0_READONLY
-#: Merge.rc:1951
+#: Merge.rc:1961
msgid "Re&ad-only"
msgstr "只读(&A)"
#. IDD_OPEN, IDC_SWAP01_STATIC
-#: Merge.rc:1953
+#: Merge.rc:1963
msgid "Swap 1st | 2nd"
msgstr "交换组1与组2"
#. IDD_GENERATE_PATCH, IDC_DIFF_BROWSE_FILE1
-#: Merge.rc:1954 Merge.rc:2310 Merge.rc:2413
+#: Merge.rc:1964 Merge.rc:2320 Merge.rc:2423
msgid "&Browse..."
msgstr "浏览(&B)..."
#. IDD_OPEN, IDC_FILES_DIRS_GROUP1
-#: Merge.rc:1955
+#: Merge.rc:1965
msgid "&2nd File or Folder"
msgstr "第2组的文件或文件夹 (&2)"
#. IDD_OPEN, IDC_PATH1_READONLY
-#: Merge.rc:1957
+#: Merge.rc:1967
msgid "Rea&d-only"
msgstr "只读(&D)"
#. IDD_OPEN, IDC_SWAP12_STATIC
-#: Merge.rc:1959
+#: Merge.rc:1969
msgid "Swap 2nd | 3rd"
msgstr "交换组2与组3"
#. IDD_PROPPAGE_SYSTEM, IDC_FILTER_USER_BROWSE
-#: Merge.rc:1960 Merge.rc:2315
+#: Merge.rc:1970 Merge.rc:2325
msgid "B&rowse..."
msgstr "浏览(&R)..."
#. IDD_OPEN, IDC_FILES_DIRS_GROUP2
-#: Merge.rc:1961
+#: Merge.rc:1971
msgid "&3rd File or Folder (Optional)"
msgstr "第3组的文件或文件夹 (可选) (&3)"
#. IDD_OPEN, IDC_PATH2_READONLY
-#: Merge.rc:1963
+#: Merge.rc:1973
msgid "Read-o&nly"
msgstr "只读(&N)"
#. IDD_OPEN, IDC_SWAP02_STATIC
-#: Merge.rc:1965
+#: Merge.rc:1975
msgid "Swap 1st | 3rd"
msgstr "交换组1与组3"
#. IDD_PROPPAGE_BACKUPS, IDC_BACKUP_BROWSE
-#: Merge.rc:1966 Merge.rc:2685 Merge.rc:2883
+#: Merge.rc:1976 Merge.rc:2695 Merge.rc:2893
msgid "Browse..."
msgstr "浏览..."
#. IDD_OPEN, IDC_FILES_DIRS_GROUP3
-#: Merge.rc:1968
+#: Merge.rc:1978
msgid " Folder: Filter"
msgstr " 文件夹:过滤器"
#. IDD_OPEN, IDC_RECURS_CHECK
-#: Merge.rc:1971
+#: Merge.rc:1981
msgid "&Include subfolders"
msgstr "包含子目录(&I)"
#. IDD_OPEN, IDC_FILES_DIRS_GROUP5
-#: Merge.rc:1972
+#: Merge.rc:1982
msgid " File: Prediffer Plugin"
msgstr " 文件:预比较插件"
#. IDD_OPEN, IDC_FILES_DIRS_GROUP4
-#: Merge.rc:1976
+#: Merge.rc:1986
msgid " File: Unpacker Plugin"
msgstr " 文件:解包插件"
#. IDD_OPEN, IDC_SELECT_UNPACKER
-#: Merge.rc:1978
+#: Merge.rc:1988
msgid "Se&lect..."
msgstr "选择(&L)..."
#. IDD_PLUGINS_EDITPLUGIN, IDCANCEL
-#: Merge.rc:1981 Merge.rc:2001 Merge.rc:2025 Merge.rc:2046 Merge.rc:2081
-#: Merge.rc:2432 Merge.rc:2456 Merge.rc:2470 Merge.rc:2498 Merge.rc:2551
-#: Merge.rc:2589 Merge.rc:2614 Merge.rc:2675 Merge.rc:2692 Merge.rc:2704
-#: Merge.rc:2868 Merge.rc:2928 Merge.rc:3087 Merge.rc:3105 Merge.rc:3148
-#: Merge.rc:3198
+#: Merge.rc:1991 Merge.rc:2011 Merge.rc:2035 Merge.rc:2056 Merge.rc:2091
+#: Merge.rc:2442 Merge.rc:2466 Merge.rc:2480 Merge.rc:2508 Merge.rc:2561
+#: Merge.rc:2599 Merge.rc:2624 Merge.rc:2685 Merge.rc:2702 Merge.rc:2714
+#: Merge.rc:2878 Merge.rc:2938 Merge.rc:3097 Merge.rc:3115 Merge.rc:3158
+#: Merge.rc:3208
msgid "Cancel"
msgstr "取消"
#. IDD_OPEN, IDC_OPEN_STATUS
-#: Merge.rc:1982
+#: Merge.rc:1992
msgid "Status:"
msgstr "状态:"
#. IDD_PLUGINS_LIST, ID_HELP
-#: Merge.rc:1983 Merge.rc:2082 Merge.rc:2929
+#: Merge.rc:1993 Merge.rc:2092 Merge.rc:2939
msgid "Help"
msgstr "帮助"
#. IDD_OPEN, IDC_OPTIONS
-#: Merge.rc:1984
+#: Merge.rc:1994
msgid "&Options..."
msgstr "选项(&O)..."
#. IDD_EDIT_FIND
-#: Merge.rc:1989
+#: Merge.rc:1999
msgid "Find"
msgstr "查找"
#. IDD_EDIT_MARKER, IDC_STATIC
-#: Merge.rc:1992 Merge.rc:2009 Merge.rc:2037
+#: Merge.rc:2002 Merge.rc:2019 Merge.rc:2047
msgid "Fi&nd what:"
msgstr "查找内容(&N):"
#. IDD_EDIT_MARKER, IDC_EDIT_WHOLE_WORD
-#: Merge.rc:1994 Merge.rc:2013 Merge.rc:2041
+#: Merge.rc:2004 Merge.rc:2023 Merge.rc:2051
msgid "Match &whole word only"
msgstr "全字匹配(&W)"
#. IDD_EDIT_MARKER, IDC_EDIT_REGEXP
-#: Merge.rc:1996 Merge.rc:2015 Merge.rc:2043
+#: Merge.rc:2006 Merge.rc:2025 Merge.rc:2053
msgid "Regular &expression"
msgstr "正则表达式(&E)"
#. IDD_EDIT_FIND, IDC_FINDDLG_DONTWRAP
-#: Merge.rc:1997
+#: Merge.rc:2007
msgid "D&on't wrap end of file"
msgstr "至文件末尾不从头查找(&O)"
#. IDD_EDIT_FIND, IDC_FINDDLG_DONTCLOSE
-#: Merge.rc:1998
+#: Merge.rc:2008
msgid "&Don't close this dialog"
msgstr "不自动关闭对话框(&D)"
#. IDD_EDIT_REPLACE, IDC_EDIT_SKIP
-#: Merge.rc:1999 Merge.rc:2021
+#: Merge.rc:2009 Merge.rc:2031
msgid "&Find Next"
msgstr "查找下一个(&F)"
#. IDD_EDIT_FIND, IDC_EDIT_FINDPREV
-#: Merge.rc:2000
+#: Merge.rc:2010
msgid "Find &Prev"
msgstr "查找上一个(&P)"
#. IDD_EDIT_REPLACE
-#: Merge.rc:2006
+#: Merge.rc:2016
msgid "Replace"
msgstr "替换"
#. IDD_EDIT_REPLACE, IDC_STATIC
-#: Merge.rc:2011
+#: Merge.rc:2021
msgid "Re&place with:"
msgstr "替换为(&P):"
#. IDD_EDIT_REPLACE, IDC_EDIT_SCOPE_DONT_WRAP
-#: Merge.rc:2016
+#: Merge.rc:2026
msgid "&Don't wrap at end of file"
msgstr "至文件末尾不从头查找(&D)"
#. IDD_EDIT_REPLACE, IDC_STATIC
-#: Merge.rc:2018
+#: Merge.rc:2028
msgid "Replace in"
msgstr "替换范围"
#. IDD_EDIT_REPLACE, IDC_EDIT_SCOPE_WHOLE_FILE
-#: Merge.rc:2020
+#: Merge.rc:2030
msgid "Wh&ole file"
msgstr "整个文件(&O)"
#. IDD_EDIT_REPLACE, IDC_EDIT_FINDPREV
-#: Merge.rc:2022
+#: Merge.rc:2032
msgid "Find Pre&v"
msgstr "查找上一个(&V)"
#. IDD_EDIT_REPLACE, IDC_EDIT_REPLACE
-#: Merge.rc:2023
+#: Merge.rc:2033
msgid "&Replace"
msgstr "替换(&R)"
#. IDD_EDIT_REPLACE, IDC_EDIT_REPLACE_ALL
-#: Merge.rc:2024
+#: Merge.rc:2034
msgid "Replace &All"
msgstr "全部替换(&A)"
#. IDS_OPTIONSPG_MARKERCOLORS
-#: Merge.rc:2030 Merge.rc:4209
+#: Merge.rc:2040 Merge.rc:4219
msgid "Markers"
msgstr "标记"
#. IDD_EDIT_MARKER, IDC_EDIT_MARKERS_ENABLED
-#: Merge.rc:2033
+#: Merge.rc:2043
msgid "Enable &markers"
msgstr "启用标记(&M)"
#. IDD_FILTERS_LINEFILTERS, IDC_LFILTER_ADDBTN
-#: Merge.rc:2035 Merge.rc:2057
+#: Merge.rc:2045 Merge.rc:2067
msgid "New"
msgstr "新建"
#. IDD_EDIT_MARKER, IDC_STATIC
-#: Merge.rc:2039
+#: Merge.rc:2049
msgid "&Background color:"
msgstr "背景颜色(&B)"
#. IDS_MESSAGEBOX_OK
-#: Merge.rc:2044 Merge.rc:2829 Merge.rc:3086 Merge.rc:4171
+#: Merge.rc:2054 Merge.rc:2839 Merge.rc:3096 Merge.rc:4181
msgid "&Ok"
msgstr "确定(&O)"
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:2045 Merge.rc:2525 Merge.rc:3199
+#: Merge.rc:2055 Merge.rc:2535 Merge.rc:3209
msgid "&Apply"
msgstr "应用(&A)"
#. IDD_FILTERS_LINEFILTERS
-#: Merge.rc:2051
+#: Merge.rc:2061
msgid "Line Filters"
msgstr "行过滤器"
#. IDD_FILTERS_LINEFILTERS, IDC_IGNOREREGEXP
-#: Merge.rc:2054
+#: Merge.rc:2064
msgid "Enable Line Filters"
msgstr "启用行过滤器"
#. IDD_FILTERS_LINEFILTERS, IDC_STATIC
-#: Merge.rc:2055
+#: Merge.rc:2065
msgid "Regular Expressions (one per line):"
msgstr "正则表达式 (每行一个):"
#. IDD_PLUGINS_LIST, IDC_PLUGIN_EDIT
-#: Merge.rc:2058 Merge.rc:2924
+#: Merge.rc:2068 Merge.rc:2934
msgid "Edit"
msgstr "编辑"
#. IDD_PLUGINS_LIST, IDC_PLUGIN_REMOVE
-#: Merge.rc:2059 Merge.rc:2071 Merge.rc:2925
+#: Merge.rc:2069 Merge.rc:2081 Merge.rc:2935
msgid "Remove"
msgstr "删除"
#. IDD_FILTERS_SUBSTITUTIONFILTERS
-#: Merge.rc:2064
+#: Merge.rc:2074
msgid "Substitution Filters"
msgstr "置换过滤器"
#. IDD_FILTERS_SUBSTITUTIONFILTERS, IDC_STATIC
-#: Merge.rc:2067
+#: Merge.rc:2077
msgid "Changes to the listed pairs below will be ignored or marked as insignificant. Patches are unaffected."
msgstr "面板中出现的下列变更组合将被忽略或视作无关紧要。补丁不受影响。"
#. IDD_FILTERS_SUBSTITUTIONFILTERS, IDC_IGNORED_SUSBSTITUTIONS_ENABLED
-#: Merge.rc:2068
+#: Merge.rc:2078
msgid "Enable"
msgstr "启用"
#. IDD_PLUGINS_LIST, IDC_PLUGIN_ADD
-#: Merge.rc:2070 Merge.rc:2923
+#: Merge.rc:2080 Merge.rc:2933
msgid "Add"
msgstr "添加"
#. IDD_FILTERS_SUBSTITUTIONFILTERS, IDC_LFILTER_CLEARBTN
-#: Merge.rc:2072
+#: Merge.rc:2082
msgid "Clear"
msgstr "清除"
#. IDD_PREFERENCES
-#: Merge.rc:2077
+#: Merge.rc:2087
msgid "Options"
msgstr "选项"
#. IDD_PREFERENCES, IDC_TREEOPT_IMPORT
-#: Merge.rc:2086
+#: Merge.rc:2096
msgid "Import..."
msgstr "导入..."
#. IDD_PREFERENCES, IDC_TREEOPT_EXPORT
-#: Merge.rc:2087
+#: Merge.rc:2097
msgid "Export..."
msgstr "导出..."
#. IDS_OPTIONSPG_GENCOMPARE
-#: Merge.rc:2092 Merge.rc:4199 Merge.rc:4202 Merge.rc:4219
+#: Merge.rc:2102 Merge.rc:4209 Merge.rc:4212 Merge.rc:4229
msgid "General"
msgstr "常规"
#. IDD_PROPPAGE_GENERAL, IDC_SCROLL_CHECK
-#: Merge.rc:2095
+#: Merge.rc:2105
msgid "Automatically &scroll to first difference"
msgstr "自动滚动到第一处差异(&S)"
#. IDD_PROPPAGE_GENERAL, IDC_SCROLL_TO_FIRST_INLINE_DIFF_CHECK
-#: Merge.rc:2097
+#: Merge.rc:2107
msgid "Automatically s&croll to first inline difference"
msgstr "自动滚动到第一处行内差异(&C)"
#. IDD_PROPPAGE_GENERAL, IDC_STATIC
-#: Merge.rc:2099
+#: Merge.rc:2109
msgid "Cl&ose windows with 'Esc':"
msgstr "按 'Esc' 关闭窗口(&O):"
#. IDD_PROPPAGE_GENERAL, IDC_VERIFY_OPEN_PATHS
-#: Merge.rc:2101
+#: Merge.rc:2111
msgid "&Automatically verify paths in Open dialog"
msgstr "“打开”对话框中自动验证路径(&A)"
#. IDD_PROPPAGE_GENERAL, IDC_STATIC
-#: Merge.rc:2103
+#: Merge.rc:2113
msgid "Single instance mode:"
msgstr "单一实例模式:"
#. IDD_PROPPAGE_GENERAL, IDC_ASK_MULTIWINDOW_CLOSE
-#: Merge.rc:2105
+#: Merge.rc:2115
msgid "As&k when closing multiple windows"
msgstr "关闭多个窗口时询问我(&K)"
#. IDD_PROPPAGE_GENERAL, IDC_PRESERVE_FILETIME
-#: Merge.rc:2107
+#: Merge.rc:2117
msgid "&Preserve file time in file compare"
msgstr "比较时保持文件时间不变(&P)"
#. IDD_PROPPAGE_GENERAL, IDC_STARTUP_FOLDER_SELECT
-#: Merge.rc:2109
+#: Merge.rc:2119
msgid "Show \"Select Files or Folders\" dialog on startup"
msgstr "启动时显示“选择文件或文件夹”对话框"
#. IDD_PROPPAGE_GENERAL, IDC_CLOSE_WITH_OK
-#: Merge.rc:2111
+#: Merge.rc:2121
msgid "Close \"Select Files or Folders\" dialog on clicking Compare button"
msgstr "在点击比较按钮时关闭“选择文件或文件夹”对话框"
#. IDD_PROPPAGE_GENERAL, IDC_STATIC
-#: Merge.rc:2113
+#: Merge.rc:2123
msgid "Op&en dialog Auto completion:"
msgstr "“打开”对话框的自动完成(&E):"
#. IDD_PROPPAGE_GENERAL, IDC_STATIC
-#: Merge.rc:2115
+#: Merge.rc:2125
msgid "Auto-&reload modified files:"
msgstr "自动重新加载修改过的文件(&R):"
#. IDD_PROPPAGE_GENERAL, IDC_STATIC
-#: Merge.rc:2117
+#: Merge.rc:2127
msgid "Language:"
msgstr "语言:"
#. IDD_PROPPAGE_COMPARE_WEBPAGE, IDC_COMPARE_DEFAULTS
-#: Merge.rc:2119 Merge.rc:2299 Merge.rc:2321 Merge.rc:2352 Merge.rc:2369
-#: Merge.rc:2386 Merge.rc:2394 Merge.rc:2430 Merge.rc:2454 Merge.rc:2633
-#: Merge.rc:2644 Merge.rc:2653 Merge.rc:2887 Merge.rc:2922 Merge.rc:2985
-#: Merge.rc:3010 Merge.rc:3024 Merge.rc:3038 Merge.rc:3054
+#: Merge.rc:2129 Merge.rc:2309 Merge.rc:2331 Merge.rc:2362 Merge.rc:2379
+#: Merge.rc:2396 Merge.rc:2404 Merge.rc:2440 Merge.rc:2464 Merge.rc:2643
+#: Merge.rc:2654 Merge.rc:2663 Merge.rc:2897 Merge.rc:2932 Merge.rc:2995
+#: Merge.rc:3020 Merge.rc:3034 Merge.rc:3048 Merge.rc:3064
msgid "Defaults"
msgstr "默认"
#. IDS_OPTIONSPG_COLORS
-#: Merge.rc:2124 Merge.rc:2140 Merge.rc:2267 Merge.rc:2292 Merge.rc:4205
+#: Merge.rc:2134 Merge.rc:2150 Merge.rc:2277 Merge.rc:2302 Merge.rc:4215
msgid "Colors"
msgstr "颜色"
#. IDD_PROPPAGE_COLOR_SCHEMES, IDC_STATIC
-#: Merge.rc:2127
+#: Merge.rc:2137
msgid "Color &mode:"
msgstr "色彩模式(&M):"
#. IDD_PROPPAGE_COLOR_SCHEMES, IDC_STATIC
-#: Merge.rc:2129
+#: Merge.rc:2139
msgid "&Light mode scheme:"
msgstr "浅色模式方案(&L):"
#. IDD_PROPPAGE_COLOR_SCHEMES, IDC_STATIC
-#: Merge.rc:2131
+#: Merge.rc:2141
msgid "&Dark mode scheme:"
msgstr "深色模式方案(&D):"
#. IDD_PROPPAGE_COLOR_SCHEMES, IDC_STATIC
-#: Merge.rc:2133
+#: Merge.rc:2143
msgid "Your custom schemes"
msgstr "你的定制方案"
#. IDD_PROPPAGE_COLOR_SCHEMES, IDC_COLOR_SCHEME_SAVE
-#: Merge.rc:2134
+#: Merge.rc:2144
msgid "&Save current scheme..."
msgstr "保存当前方案(&S)..."
#. IDD_PROPPAGE_COLOR_SCHEMES, IDC_COLOR_SCHEME_DELETE
-#: Merge.rc:2135
+#: Merge.rc:2145
msgid "Delete ¤t scheme..."
msgstr "删除当前方案(&C)..."
#. IDD_PROPPAGE_COLORS_DIR, IDC_BACKGROUND_COLUMN_LABEL
-#: Merge.rc:2143 Merge.rc:2238 Merge.rc:2258 Merge.rc:2272
+#: Merge.rc:2153 Merge.rc:2248 Merge.rc:2268 Merge.rc:2282
msgid "Background"
msgstr "背景"
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2144
+#: Merge.rc:2154
msgid "Deleted"
msgstr "已删除"
#. IDS_OPTIONSPG_TEXTCOLORS
-#: Merge.rc:2145 Merge.rc:2207 Merge.rc:2239 Merge.rc:2273 Merge.rc:4207
+#: Merge.rc:2155 Merge.rc:2217 Merge.rc:2249 Merge.rc:2283 Merge.rc:4217
msgid "Text"
msgstr "文字"
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2146
+#: Merge.rc:2156
msgid "Difference:"
msgstr "差异:"
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2151
+#: Merge.rc:2161
msgid "Selected Difference:"
msgstr "选中的差异:"
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2156
+#: Merge.rc:2166
msgid "Ignored Difference:"
msgstr "忽略的差异:"
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2161
+#: Merge.rc:2171
msgid "Moved:"
msgstr "移动的区块:"
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2166
+#: Merge.rc:2176
msgid "Selected Moved:"
msgstr "选中的已移动区块:"
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2171
+#: Merge.rc:2181
msgid "Same As Next (3 panes):"
msgstr "与附近相同(三路合并):"
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2176
+#: Merge.rc:2186
msgid "Same As Next (Selected):"
msgstr "与附近相同(选中状态):"
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2181
+#: Merge.rc:2191
msgid "Word Difference:"
msgstr "单词差异:"
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2186
+#: Merge.rc:2196
msgid "Selected Word Diff:"
msgstr "选中的单词差异:"
#. IDD_INPUTBOX
-#: Merge.rc:2195 Merge.rc:2230 Merge.rc:2251 Merge.rc:3099
+#: Merge.rc:2205 Merge.rc:2240 Merge.rc:2261 Merge.rc:3109
msgid "Dialog"
msgstr "对话框"
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC
-#: Merge.rc:2198
+#: Merge.rc:2208
msgid "Keywords:"
msgstr "关键字:"
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC
-#: Merge.rc:2199
+#: Merge.rc:2209
msgid "Function names:"
msgstr "函数名:"
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC
-#: Merge.rc:2200
+#: Merge.rc:2210
msgid "Comments:"
msgstr "注释:"
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC
-#: Merge.rc:2201
+#: Merge.rc:2211
msgid "Numbers:"
msgstr "数字:"
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC
-#: Merge.rc:2202
+#: Merge.rc:2212
msgid "Operators:"
msgstr "操作符:"
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC
-#: Merge.rc:2203
+#: Merge.rc:2213
msgid "Strings:"
msgstr "字符串:"
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC
-#: Merge.rc:2204
+#: Merge.rc:2214
msgid "Preprocessor:"
msgstr "预处理指令:"
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC
-#: Merge.rc:2205
+#: Merge.rc:2215
msgid "User 1:"
msgstr "用户定义 1:"
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC
-#: Merge.rc:2206
+#: Merge.rc:2216
msgid "User 2:"
msgstr "用户定义 2:"
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_SCOLOR_USER2_BOLD
-#: Merge.rc:2209 Merge.rc:2211 Merge.rc:2213 Merge.rc:2215 Merge.rc:2217
-#: Merge.rc:2219 Merge.rc:2221 Merge.rc:2223 Merge.rc:2225
+#: Merge.rc:2219 Merge.rc:2221 Merge.rc:2223 Merge.rc:2225 Merge.rc:2227
+#: Merge.rc:2229 Merge.rc:2231 Merge.rc:2233 Merge.rc:2235
msgid "Bold"
msgstr "加粗"
#. IDD_PROPPAGE_COLORS_TEXT, IDC_DEFAULT_STANDARD_COLORS
-#: Merge.rc:2233
+#: Merge.rc:2243
msgid "&Use customized text colors"
msgstr "使用自定义的文字颜色(&U)"
#. IDD_PROPPAGE_COLORS_TEXT, IDC_WHITESPACE_COLOR_LABEL
-#: Merge.rc:2235
+#: Merge.rc:2245
msgid "Whitespace:"
msgstr "空白:"
#. IDD_PROPPAGE_COLORS_TEXT, IDC_TEXT_COLOR_LABEL
-#: Merge.rc:2236
+#: Merge.rc:2246
msgid "Regular text:"
msgstr "普通文本:"
#. IDD_PROPPAGE_COLORS_TEXT, IDC_SELECTION_COLOR_LABEL
-#: Merge.rc:2237
+#: Merge.rc:2247
msgid "Selection:"
msgstr "选中区域:"
#. IDD_PROPPAGE_COLORS_DIR, IDC_STATIC
-#: Merge.rc:2245 Merge.rc:2286
+#: Merge.rc:2255 Merge.rc:2296
msgid "Margin:"
msgstr "边缘:"
#. IDD_PROPPAGE_COLORS_MARKER, IDC_MARKER0_COLOR_LABEL
-#: Merge.rc:2254
+#: Merge.rc:2264
msgid "Search Marker:"
msgstr "搜索标记:"
#. IDD_PROPPAGE_COLORS_MARKER, IDC_MARKER1_COLOR_LABEL
-#: Merge.rc:2255
+#: Merge.rc:2265
msgid "User Defined Marker 1:"
msgstr "用户定义的标记1:"
#. IDD_PROPPAGE_COLORS_MARKER, IDC_MARKER2_COLOR_LABEL
-#: Merge.rc:2256
+#: Merge.rc:2266
msgid "User Defined Marker 2:"
msgstr "用户定义的标记2:"
#. IDD_PROPPAGE_COLORS_MARKER, IDC_MARKER3_COLOR_LABEL
-#: Merge.rc:2257
+#: Merge.rc:2267
msgid "User Defined Marker 3:"
msgstr "用户定义的标记3:"
#. IDD_PROPPAGE_COLORS_DIR, IDC_USE_DIR_COMPARE_COLORS
-#: Merge.rc:2270
+#: Merge.rc:2280
msgid "&Use folder compare colors"
msgstr "使用文件夹比较颜色(&U)"
#. IDD_PROPPAGE_COLORS_DIR, IDC_STATIC
-#: Merge.rc:2274
+#: Merge.rc:2284
msgid "Items equal:"
msgstr "相同的条目:"
#. IDD_PROPPAGE_COLORS_DIR, IDC_STATIC
-#: Merge.rc:2277
+#: Merge.rc:2287
msgid "Items different:"
msgstr "不同的条目:"
#. IDD_PROPPAGE_COLORS_DIR, IDC_STATIC
-#: Merge.rc:2280
+#: Merge.rc:2290
msgid "Items missing:"
msgstr "不存在的条目:"
#. IDD_PROPPAGE_COLORS_DIR, IDC_STATIC
-#: Merge.rc:2283
+#: Merge.rc:2293
msgid "Items filtered:"
msgstr "过滤的条目:"
#. IDD_PROPPAGE_COLORS_SYSTEM, IDC_SYSCOLOR_HOOK_ENABLED
-#: Merge.rc:2295
+#: Merge.rc:2305
msgid "&Use custom system colors"
msgstr "使用自定义系统颜色(某些用户界面元素可能不适用)(&U)"
#. IDS_PRPCAT_SYSTEM
-#: Merge.rc:2304 Merge.rc:4211 Merge.rc:4212 Merge.rc:4657
+#: Merge.rc:2314 Merge.rc:4221 Merge.rc:4222 Merge.rc:4667
msgid "System"
msgstr "系统"
#. IDD_PROPPAGE_SYSTEM, IDC_USE_RECYCLE_BIN
-#: Merge.rc:2307
+#: Merge.rc:2317
msgid "&Use Recycle Bin"
msgstr "将删除的文件放入回收站(&S)"
#. IDD_PROPPAGE_SYSTEM, IDC_STATIC
-#: Merge.rc:2308
+#: Merge.rc:2318
msgid "&External editor:"
msgstr "外部编辑器(&E):"
#. IDD_PROPPAGE_SYSTEM, IDC_STATIC
-#: Merge.rc:2311
+#: Merge.rc:2321
msgid "&Store user data in:"
msgstr "用户数据存储(&S):"
#. IDD_PROPPAGE_SYSTEM, IDC_STATIC
-#: Merge.rc:2313
+#: Merge.rc:2323
msgid "&Filter folder:"
msgstr "过滤器路径(&F):"
#. IDD_PROPPAGE_SYSTEM, IDC_STATIC
-#: Merge.rc:2316
+#: Merge.rc:2326
msgid "Temporary files folder"
msgstr "临时文件夹"
#. IDD_PROPPAGE_SYSTEM, IDC_TMPFOLDER_SYSTEM
-#: Merge.rc:2317
+#: Merge.rc:2327
msgid "S&ystem temp folder"
msgstr "系统临时文件夹(&Y)"
#. IDD_PROPPAGE_SYSTEM, IDC_STATIC
-#: Merge.rc:2318
+#: Merge.rc:2328
msgid "C&ustom folder:"
msgstr "自定义文件夹(&U):"
#. IDD_GENERATE_PATCH, IDC_DIFF_BROWSE_FILE2
-#: Merge.rc:2320 Merge.rc:2416
+#: Merge.rc:2330 Merge.rc:2426
msgid "Br&owse..."
msgstr "浏览(&O)..."
#. IDS_OPTIONSPG_COMPARE
-#: Merge.rc:2326 Merge.rc:4200
+#: Merge.rc:2336 Merge.rc:4210
msgid "Compare"
msgstr "比较"
#. IDD_PROPPAGE_COMPARE, IDC_STATIC
-#: Merge.rc:2329
+#: Merge.rc:2339
msgid "Whitespaces"
msgstr "空白"
#. IDD_PROPPAGE_COMPARE, IDC_WHITESPACE
-#: Merge.rc:2330
+#: Merge.rc:2340
msgid "&Compare"
msgstr "比较空白字符(&C)"
#. IDD_PROPPAGE_COMPARE, IDC_WHITE_CHANGE
-#: Merge.rc:2331
+#: Merge.rc:2341
msgid "&Ignore change"
msgstr "忽略空白字符的变化(&I)"
#. IDD_PROPPAGE_COMPARE, IDC_ALL_WHITE
-#: Merge.rc:2332
+#: Merge.rc:2342
msgid "I&gnore all"
msgstr "忽略所有空白字符(&G)"
#. IDD_PROPPAGE_COMPARE, IDC_IGNBLANKS_CHECK
-#: Merge.rc:2333
+#: Merge.rc:2343
msgid "Ignore blan&k lines"
msgstr "忽略空行(&K)"
#. IDD_PROPPAGE_COMPARE, IDC_IGNCASE_CHECK
-#: Merge.rc:2334
+#: Merge.rc:2344
msgid "Ignore &case"
msgstr "忽略大小写(&C)"
#. IDD_PROPPAGE_COMPARE, IDC_EOL_SENSITIVE
-#: Merge.rc:2335
+#: Merge.rc:2345
msgid "Igno&re EOL differences (Windows/Unix/Mac)"
msgstr "忽略换行符差异(Windows/Unix/Mac)(&R)"
#. IDD_PROPPAGE_COMPARE, IDC_IGNORE_NUMBERS
-#: Merge.rc:2337
+#: Merge.rc:2347
msgid "Ignore num&bers"
msgstr "忽略数字(&B)"
#. IDD_PROPPAGE_COMPARE, IDC_CP_SENSITIVE
-#: Merge.rc:2338
+#: Merge.rc:2348
msgid "Ignore codepage &differences"
msgstr "忽略代码页差异(&D)"
#. IDD_PROPPAGE_COMPARE, IDC_FILTERCOMMENTS_CHECK
-#: Merge.rc:2339
+#: Merge.rc:2349
msgid "Ignore c&omment differences"
msgstr "忽略注释行差异(&O)"
#. IDD_PROPPAGE_COMPARE, IDC_IGNEOFEOL_CHECK
-#: Merge.rc:2341
+#: Merge.rc:2351
msgid "Ignore &missing trailing EOL"
msgstr "忽略缺失的尾部换行符(&M)"
#. IDD_PROPPAGE_COMPARE, IDC_IGNLBRKS_CHECK
-#: Merge.rc:2343
+#: Merge.rc:2353
msgid "Ignore line &breaks (treat as spaces)"
msgstr "忽略换行符(视为空格)(&B)"
#. IDD_PROPPAGE_COMPARE, IDC_MOVED_BLOCKS
-#: Merge.rc:2345
+#: Merge.rc:2355
msgid "E&nable moved block detection"
msgstr "启用块移动检测(&N)"
#. IDD_PROPPAGE_COMPARE, IDC_ALIGN_SIMILAR_LINES
-#: Merge.rc:2346
+#: Merge.rc:2356
msgid "Align &similar lines"
msgstr "对齐相似的行(&S)"
#. IDD_PROPPAGE_COMPARE, IDC_STATIC
-#: Merge.rc:2347
+#: Merge.rc:2357
msgid "Diff &algorithm:"
msgstr "比较算法(&A):"
#. IDD_PROPPAGE_COMPARE, IDC_INDENT_HEURISTIC
-#: Merge.rc:2349
+#: Merge.rc:2359
msgid "Enable indent &heuristic"
msgstr "启用启发式缩进(&H)"
#. IDD_PROPPAGE_COMPARE, IDC_COMPLETELY_BLANK_OUT_IGNORED_DIFFERENCES
-#: Merge.rc:2350
+#: Merge.rc:2360
msgid "Completely unhighlight the ignored differences"
msgstr "完全取消高亮忽略的差异"
#. IDS_OPTIONSPG_EDITOR
-#: Merge.rc:2357 Merge.rc:4201
+#: Merge.rc:2367 Merge.rc:4211
msgid "Editor"
msgstr "编辑器"
#. IDD_PROPPAGE_EDITOR, IDC_HILITE_CHECK
-#: Merge.rc:2360
+#: Merge.rc:2370
msgid "&Highlight syntax"
msgstr "语法高亮(&H)"
#. IDD_PROPPAGE_EDITOR, IDC_MIXED_EOL
-#: Merge.rc:2361
+#: Merge.rc:2371
msgid "&Preserve original EOL"
msgstr "保持换行符不变(&P)"
#. IDD_PROPPAGE_EDITOR, IDC_STATIC
-#: Merge.rc:2362
+#: Merge.rc:2372
msgid "Tabs"
msgstr "制表符"
#. IDD_PROPPAGE_EDITOR, IDC_STATIC
-#: Merge.rc:2363
+#: Merge.rc:2373
msgid "&Tab size:"
msgstr "制表符宽度(&T)"
#. IDD_PROPPAGE_EDITOR, IDC_PROP_INSERT_TABS
-#: Merge.rc:2365
+#: Merge.rc:2375
msgid "&Insert tabs"
msgstr "插入制表符(&I)"
#. IDD_PROPPAGE_EDITOR, IDC_PROP_INSERT_SPACES
-#: Merge.rc:2366
+#: Merge.rc:2376
msgid "Insert &spaces"
msgstr "插入空格(&S)"
#. IDD_PROPPAGE_EDITOR, IDC_STATIC
-#: Merge.rc:2367
+#: Merge.rc:2377
msgid "&Rendering mode:"
msgstr "渲染模式(&R)"
#. IDD_PROPPAGE_EDITOR_COMPAREMERGE, IDC_AUTOMRESCAN_CHECK
-#: Merge.rc:2376
+#: Merge.rc:2386
msgid "&Automatic rescan"
msgstr "自动重新扫描(&A)"
#. IDD_PROPPAGE_EDITOR_COMPAREMERGE, IDC_STATIC
-#: Merge.rc:2377
+#: Merge.rc:2387
msgid "Copy &granularity for selected differences:"
msgstr "选中差异的复制粒度(&G):"
#. IDD_PROPPAGE_EDITOR_COMPAREMERGE, IDC_LINE_COLORING_GROUP
-#: Merge.rc:2379
+#: Merge.rc:2389
msgid "Line Difference Coloring"
msgstr "行内差异着色"
#. IDD_PROPPAGE_EDITOR_COMPAREMERGE, IDC_VIEW_LINE_DIFFERENCES
-#: Merge.rc:2380
+#: Merge.rc:2390
msgid "View line differences"
msgstr "显示行内差异"
#. IDD_PROPPAGE_EDITOR_COMPAREMERGE, IDC_EDITOR_CHARLEVEL
-#: Merge.rc:2381
+#: Merge.rc:2391
msgid "&Character-level"
msgstr "字符级别(&C)"
#. IDD_PROPPAGE_EDITOR_COMPAREMERGE, IDC_EDITOR_WORDLEVEL
-#: Merge.rc:2382
+#: Merge.rc:2392
msgid "&Word-level:"
msgstr "单词级别(&W):"
#. IDD_PROPPAGE_EDITOR_COMPAREMERGE, IDC_STATIC
-#: Merge.rc:2384
+#: Merge.rc:2394
msgid "W&ord break characters:"
msgstr "单词分隔字符:"
#. IDD_PROPPAGE_MESSAGEBOXES, IDC_STATIC
-#: Merge.rc:2401
+#: Merge.rc:2411
msgid "Some messages can be hidden by the user. Press Reset to make all messages visible again."
msgstr "WinMerge 允许隐藏一些常见的提示框。点“重置”按钮可以恢复显示隐藏的消息框。"
#. IDD_SELECT_FILES_OR_FOLDERS, IDC_RESET
-#: Merge.rc:2402 Merge.rc:3085
+#: Merge.rc:2412 Merge.rc:3095
msgid "Reset"
msgstr "重置"
#. IDD_GENERATE_PATCH
-#: Merge.rc:2408
+#: Merge.rc:2418
msgid "Patch Generator"
msgstr "补丁生成器"
#. IDD_GENERATE_PATCH, IDC_STATIC
-#: Merge.rc:2411
+#: Merge.rc:2421
msgid "File&1:"
msgstr "文件 &1:"
#. IDD_GENERATE_PATCH, IDC_STATIC
-#: Merge.rc:2414
+#: Merge.rc:2424
msgid "File&2:"
msgstr "文件 &2:"
#. IDD_GENERATE_PATCH, IDC_DIFF_SWAPFILES
-#: Merge.rc:2417
+#: Merge.rc:2427
msgid "&Swap"
msgstr "上下交换(&S)"
#. IDD_DIRCMP_REPORT, IDC_REPORT_COPYCLIPBOARD
-#: Merge.rc:2418 Merge.rc:2690
+#: Merge.rc:2428 Merge.rc:2700
msgid "&Copy to clipboard"
msgstr "复制到剪贴板(&C)"
#. IDD_GENERATE_PATCH, IDC_DIFF_APPENDFILE
-#: Merge.rc:2419
+#: Merge.rc:2429
msgid "&Append to existing file"
msgstr "追加到现有文件末尾(&A)"
#. IDD_GENERATE_PATCH, IDC_STATIC
-#: Merge.rc:2420
+#: Merge.rc:2430
msgid "&Result:"
msgstr "结果(&R):"
#. IDD_GENERATE_PATCH, IDC_DIFF_BROWSE_RESULT
-#: Merge.rc:2422
+#: Merge.rc:2432
msgid "Bro&wse..."
msgstr "浏览(&W)..."
#. IDD_GENERATE_PATCH, IDC_STATIC
-#: Merge.rc:2423
+#: Merge.rc:2433
msgid "&Format"
msgstr "格式(&F)"
#. IDD_GENERATE_PATCH, IDC_STATIC
-#: Merge.rc:2424
+#: Merge.rc:2434
msgid "St&yle:"
msgstr "样式(&Y):"
#. IDD_GENERATE_PATCH, IDC_STATIC
-#: Merge.rc:2426
+#: Merge.rc:2436
msgid "&Context:"
msgstr "上下文(&C):"
#. IDD_GENERATE_PATCH, IDC_DIFF_INCLCMDLINE
-#: Merge.rc:2428
+#: Merge.rc:2438
msgid "Inclu&de command line"
msgstr "包含命令行(&D)"
#. IDD_GENERATE_PATCH, IDC_DIFF_OPENTOEDITOR
-#: Merge.rc:2429
+#: Merge.rc:2439
msgid "Open in e&xternal editor"
msgstr "用外部编辑器打开(&X)"
#. IDD_DIRCOLS
-#: Merge.rc:2446
+#: Merge.rc:2456
msgid "Display Columns"
msgstr "选择显示的列"
#. IDD_DIRCOLS, IDC_UP
-#: Merge.rc:2450
+#: Merge.rc:2460
msgid "Move &Up"
msgstr "上移(&U)"
#. IDD_DIRCOLS, IDC_DOWN
-#: Merge.rc:2451
+#: Merge.rc:2461
msgid "Move &Down"
msgstr "下移(&D)"
#. IDD_DIRCOLS, IDC_COLDLG_ADDITIONAL_PROPERTIES
-#: Merge.rc:2453
+#: Merge.rc:2463
msgid "&Additional Properties"
msgstr "附加属性(&A)"
#. IDD_DIRADDITIONALPROPS
-#: Merge.rc:2461
+#: Merge.rc:2471
msgid "Additional Properties"
msgstr "附加属性"
#. IDD_PLUGINS_SELECTPLUGIN
-#: Merge.rc:2475
+#: Merge.rc:2485
msgid "Select Plugin"
msgstr "选择插件"
#. IDD_PLUGINS_EDITPLUGIN, IDC_STATIC
-#: Merge.rc:2478 Merge.rc:3115
+#: Merge.rc:2488 Merge.rc:3125
msgid "Plugin &name:"
msgstr "插件名称(&N):"
#. IDD_PLUGINS_SELECTPLUGIN, IDC_STATIC
-#: Merge.rc:2480
+#: Merge.rc:2490
msgid "&Target files:"
msgstr "目标文件(&T):"
#. IDD_PLUGINS_EDITPLUGIN, IDC_STATIC
-#: Merge.rc:2482 Merge.rc:3117
+#: Merge.rc:2492 Merge.rc:3127
msgid "Extensions list:"
msgstr "扩展名列表:"
#. IDD_PLUGINS_EDITPLUGIN, IDC_STATIC
-#: Merge.rc:2484 Merge.rc:3119
+#: Merge.rc:2494 Merge.rc:3129
msgid "Description:"
msgstr "描述:"
#. IDD_PLUGINS_EDITPLUGIN, IDC_STATIC
-#: Merge.rc:2486 Merge.rc:3121
+#: Merge.rc:2496 Merge.rc:3131
msgid "Default arguments:"
msgstr "默认参数:"
#. IDD_PLUGINS_SELECTPLUGIN, IDC_PLUGIN_ALLOW_ALL
-#: Merge.rc:2488
+#: Merge.rc:2498
msgid "Display all plugins (Ignore extension)"
msgstr "显示所有插件, 不检查文件扩展名"
#. IDD_PLUGINS_SELECTPLUGIN, IDC_PLUGIN_OPEN_IN_SAME_FRAME_TYPE
-#: Merge.rc:2490
+#: Merge.rc:2500
msgid "&Open files in same window type after unpacking"
msgstr "解包后在同一窗口类型中打开文件(&O)"
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_PIPELINE_STATIC
-#: Merge.rc:2492 Merge.rc:3129
+#: Merge.rc:2502 Merge.rc:3139
msgid "&Plugin pipeline:"
msgstr "插件流水线(&P):"
#. IDD_PLUGINS_SELECTPLUGIN, IDC_PLUGIN_ALIAS
-#: Merge.rc:2495
+#: Merge.rc:2505
msgid "&Alias..."
msgstr "别名(&A)..."
#. IDD_DIRCOMP_PROGRESS, IDC_COMPARISON_STOP
-#: Merge.rc:2505
+#: Merge.rc:2515
msgid "Stop"
msgstr "停止"
#. IDD_DIRCOMP_PROGRESS, IDC_COMPARISON_PAUSE
-#: Merge.rc:2506
+#: Merge.rc:2516
msgid "Pause"
msgstr "暂停"
#. IDD_DIRCOMP_PROGRESS, IDC_COMPARISON_CONTINUE
-#: Merge.rc:2507
+#: Merge.rc:2517
msgid "Continue"
msgstr "继续"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC
-#: Merge.rc:2509 Merge.rc:2973
+#: Merge.rc:2519 Merge.rc:2983
msgid "C&PU cores to use:"
msgstr "可以使用的处理器核心数(&N):"
#. IDD_DIRCOMP_PROGRESS, IDC_STATIC
-#: Merge.rc:2510
+#: Merge.rc:2520
msgid "Items total:"
msgstr "条目总计:"
#. IDD_DIRCOMP_PROGRESS, IDC_STATIC
-#: Merge.rc:2511
+#: Merge.rc:2521
msgid "Items compared:"
msgstr "已比较条目:"
#. IDS_PREVIEWBAR_CLOSE
-#: Merge.rc:2526 Merge.rc:2846 Merge.rc:5328
+#: Merge.rc:2536 Merge.rc:2856 Merge.rc:5339
msgid "&Close"
msgstr "关闭(&C)"
#. IDD_WMGOTO
-#: Merge.rc:2537
+#: Merge.rc:2547
msgid "Go to"
msgstr "转到"
#. IDD_WMGOTO, IDC_STATIC
-#: Merge.rc:2540
+#: Merge.rc:2550
msgid "G&o to:"
msgstr "转到(&O):"
#. IDD_WMGOTO, IDC_STATIC
-#: Merge.rc:2543
+#: Merge.rc:2553
msgid "File"
msgstr "文件"
#. IDD_WMGOTO, IDC_STATIC
-#: Merge.rc:2547
+#: Merge.rc:2557
msgid "Go to what"
msgstr "转到类别"
#. IDD_WMGOTO, IDC_WMGOTO_TOLINE
-#: Merge.rc:2548
+#: Merge.rc:2558
msgid "Li&ne"
msgstr "行(&N)"
#. IDD_WMGOTO, IDC_WMGOTO_TODIFF
-#: Merge.rc:2549
+#: Merge.rc:2559
msgid "&Difference"
msgstr "差异(&D)"
#. IDD_WMGOTO, IDOK
-#: Merge.rc:2550
+#: Merge.rc:2560
msgid "&Go to"
msgstr "转到(&G)"
#. IDS_PROJECT_ITEM_FILE_FILTER
-#: Merge.rc:2556 Merge.rc:4321
+#: Merge.rc:2566 Merge.rc:4331
msgid "File Filters"
msgstr "文件过滤器"
#. IDD_FILTERS_FILEFILTERS, IDC_STATIC
-#: Merge.rc:2559
+#: Merge.rc:2569
msgid "&Mask / Filter Expression"
msgstr "掩码 / 过滤器表达式(&M)"
#. IDD_FILTERS_FILEFILTERS, IDC_STATIC
-#: Merge.rc:2562
+#: Merge.rc:2572
msgid "Preset &Filters"
msgstr "预设的过滤器(&F)"
#. IDD_FILTERS_FILEFILTERS, IDC_FILTERFILE_TEST_BTN
-#: Merge.rc:2564
+#: Merge.rc:2574
msgid "Test..."
msgstr "测试..."
#. IDD_FILTERS_FILEFILTERS, IDC_FILTERFILE_INSTALL
-#: Merge.rc:2565
+#: Merge.rc:2575
msgid "Install..."
msgstr "安装..."
#. IDD_FILTERS_FILEFILTERS, IDC_FILTERFILE_NEWBTN
-#: Merge.rc:2566
+#: Merge.rc:2576
msgid "New..."
msgstr "新建..."
#. IDD_FILTERS_FILEFILTERS, IDC_FILTERFILE_EDITBTN
-#: Merge.rc:2567
+#: Merge.rc:2577
msgid "Edit..."
msgstr "编辑..."
#. IDD_FILTERS_FILEFILTERS, IDC_FILTERFILE_DELETEBTN
-#: Merge.rc:2568
+#: Merge.rc:2578
msgid "Delete..."
msgstr "删除..."
#. IDD_FILTERS_CONDITION
-#: Merge.rc:2573
+#: Merge.rc:2583
msgid "Filter Condition"
msgstr "过滤器条件"
#. IDD_FILTERS_CONDITION, IDC_STATIC
-#: Merge.rc:2576
+#: Merge.rc:2586
msgid "&Left-hand side:"
msgstr "左手边(&L):"
#. IDD_FILTERS_CONDITION, IDC_STATIC
-#: Merge.rc:2578
+#: Merge.rc:2588
msgid "&Operator:"
msgstr "操作(&O):"
#. IDD_FILTERS_CONDITION, IDC_STATIC
-#: Merge.rc:2580
+#: Merge.rc:2590
msgid "&Right-hand side:"
msgstr "右手边(&R):"
#. IDD_FILTERS_CONDITION, IDC_STATIC
-#: Merge.rc:2586
+#: Merge.rc:2596
msgid "Expression:"
msgstr "表达式:"
#. IDD_COMPARISON_RESULT_FILTER
-#: Merge.rc:2595
+#: Merge.rc:2605
msgid "Filter by Comparison Result"
msgstr "按比较结果过滤"
#. IDD_COMPARISON_RESULT_FILTER, IDC_RADIO_INCLUDE
-#: Merge.rc:2598
+#: Merge.rc:2608
msgid "&Include"
msgstr "包含(&I)"
#. IDD_COMPARISON_RESULT_FILTER, IDC_RADIO_EXCLUDE
-#: Merge.rc:2599
+#: Merge.rc:2609
msgid "&Exclude"
msgstr "排除(&E)"
#. IDD_COMPARISON_RESULT_FILTER, IDC_STATIC
-#: Merge.rc:2600
+#: Merge.rc:2610
msgid "Comparison Results"
msgstr "比较结果"
#. IDS_IDENTICAL
-#: Merge.rc:2601 Merge.rc:2733 Merge.rc:2794 Merge.rc:4698
+#: Merge.rc:2611 Merge.rc:2743 Merge.rc:2804 Merge.rc:4708
msgid "Identical"
msgstr "完全相同"
#. IDS_DIFFERENT
-#: Merge.rc:2602 Merge.rc:2714 Merge.rc:2755 Merge.rc:4708
+#: Merge.rc:2612 Merge.rc:2724 Merge.rc:2765 Merge.rc:4718
msgid "Different"
msgstr "不同"
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_LEFT_ONLY
-#: Merge.rc:2603
+#: Merge.rc:2613
msgid "Left only"
msgstr "仅左侧"
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_RIGHT_ONLY
-#: Merge.rc:2604
+#: Merge.rc:2614
msgid "Right only"
msgstr "仅右侧"
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_SKIPPED
-#: Merge.rc:2605
+#: Merge.rc:2615
msgid "Skipped"
msgstr "跳过的"
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_MIDDLE_ONLY
-#: Merge.rc:2606
+#: Merge.rc:2616
msgid "Middle only"
msgstr "仅中间"
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_LEFT_ONLY_DIFFERENT
-#: Merge.rc:2607
+#: Merge.rc:2617
msgid "Left only (different)"
msgstr "仅左侧(不同的)"
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_MIDDLE_ONLY_DIFFERENT
-#: Merge.rc:2608
+#: Merge.rc:2618
msgid "Middle only (different)"
msgstr "仅中间(不同的)"
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_RIGHT_ONLY_DIFFERENT
-#: Merge.rc:2609
+#: Merge.rc:2619
msgid "Right only (different)"
msgstr "仅右侧(不同的)"
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_LEFT_ONLY_MISSING
-#: Merge.rc:2610
+#: Merge.rc:2620
msgid "Left only (missing)"
msgstr "仅左侧(缺失的)"
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_MIDDLE_ONLY_MISSING
-#: Merge.rc:2611
+#: Merge.rc:2621
msgid "Middle only (missing)"
msgstr "仅中间(缺失的)"
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_RIGHT_ONLY_MISSING
-#: Merge.rc:2612
+#: Merge.rc:2622
msgid "Right only (missing)"
msgstr "仅右侧(缺失的)"
#. IDS_OPTIONSPG_CODEPAGE
-#: Merge.rc:2619 Merge.rc:2811 Merge.rc:4213
+#: Merge.rc:2629 Merge.rc:2821 Merge.rc:4223
msgid "Codepage"
msgstr "代码页"
#. IDD_PROPPAGE_CODEPAGE, IDC_STATIC
-#: Merge.rc:2622
+#: Merge.rc:2632
msgid "Default Codepage"
msgstr "默认代码页"
#. IDD_PROPPAGE_CODEPAGE, IDC_STATIC
-#: Merge.rc:2623
+#: Merge.rc:2633
msgid "Select the default codepage for non-Unicode files:"
msgstr "请选择当加载“非 Unicode 文件”时默认假定的代码页:"
#. IDD_PROPPAGE_CODEPAGE, IDC_CP_SYSTEM
-#: Merge.rc:2624
+#: Merge.rc:2634
msgid "System codepage"
msgstr "系统代码页"
#. IDD_PROPPAGE_CODEPAGE, IDC_CP_UI
-#: Merge.rc:2625
+#: Merge.rc:2635
msgid "According to WinMerge User Interface"
msgstr "根据 WinMerge 用户界面"
#. IDD_PROPPAGE_CODEPAGE, IDC_CP_CUSTOM
-#: Merge.rc:2626
+#: Merge.rc:2636
msgid "Custom codepage:"
msgstr "自定义代码页:"
#. IDD_PROPPAGE_CODEPAGE, IDC_DETECT_CODEPAGE
-#: Merge.rc:2628
+#: Merge.rc:2638
msgid ""
"Detect codepage for: .html, .rc, .xml\n"
"Restart required."
@@ -4089,7 +4100,7 @@ msgstr ""
"需要重启会话。"
#. IDD_PROPPAGE_CODEPAGE, IDC_DETECT_CODEPAGE2
-#: Merge.rc:2630
+#: Merge.rc:2640
msgid ""
"Detect codepage for files with mlang.dll\n"
"Restart required."
@@ -4098,769 +4109,769 @@ msgstr ""
"需要重启会话。"
#. IDS_OPTIONSPG_ARCHIVE
-#: Merge.rc:2638 Merge.rc:4214
+#: Merge.rc:2648 Merge.rc:4224
msgid "Archive Support"
msgstr "压缩文件支持"
#. IDD_PROPPAGE_ARCHIVE, IDC_ARCHIVE_ENABLE
-#: Merge.rc:2641
+#: Merge.rc:2651
msgid "&Enable archive file support"
msgstr "启用压缩文件支持(&E)"
#. IDD_PROPPAGE_ARCHIVE, IDC_ARCHIVE_DETECTTYPE
-#: Merge.rc:2642
+#: Merge.rc:2652
msgid "&Detect archive type from file signature"
msgstr "根据文件头检测压缩文件类型(&D)"
#. IDD_PROPPAGE_PROJECT, IDC_STATIC
-#: Merge.rc:2651
+#: Merge.rc:2661
msgid "Items saved to or restored from the project file:"
msgstr "保存到项目文件或从项目文件还原的条目:"
#. IDD_SAVECLOSING
-#: Merge.rc:2658
+#: Merge.rc:2668
msgid "Save Modified Files?"
msgstr "保存修改的文件吗?"
#. IDD_SAVECLOSING, IDC_SAVECLOSING_LEFTFRAME
-#: Merge.rc:2661
+#: Merge.rc:2671
msgid "Left side file"
msgstr "左侧文件"
#. IDD_SAVECLOSING, IDC_SAVECLOSING_SAVELEFT
-#: Merge.rc:2663
+#: Merge.rc:2673
msgid "&Save changes"
msgstr "保存修改(&S)"
#. IDD_SAVECLOSING, IDC_SAVECLOSING_DISCARDLEFT
-#: Merge.rc:2664
+#: Merge.rc:2674
msgid "&Discard changes"
msgstr "放弃修改(&D)"
#. IDD_SAVECLOSING, IDC_SAVECLOSING_MIDDLEFRAME
-#: Merge.rc:2665
+#: Merge.rc:2675
msgid "Middle side file"
msgstr "中间文件"
#. IDD_SAVECLOSING, IDC_SAVECLOSING_SAVEMIDDLE
-#: Merge.rc:2667
+#: Merge.rc:2677
msgid "Sa&ve changes"
msgstr "保存修改(&V)"
#. IDD_SAVECLOSING, IDC_SAVECLOSING_DISCARDMIDDLE
-#: Merge.rc:2668
+#: Merge.rc:2678
msgid "Discard c&hanges"
msgstr "放弃修改(&H)"
#. IDD_SAVECLOSING, IDC_SAVECLOSING_RIGHTFRAME
-#: Merge.rc:2669
+#: Merge.rc:2679
msgid "Right side file"
msgstr "右侧文件"
#. IDD_SAVECLOSING, IDC_SAVECLOSING_SAVERIGHT
-#: Merge.rc:2671
+#: Merge.rc:2681
msgid "S&ave changes"
msgstr "保存修改(&A)"
#. IDD_SAVECLOSING, IDC_SAVECLOSING_DISCARDRIGHT
-#: Merge.rc:2672
+#: Merge.rc:2682
msgid "Dis&card changes"
msgstr "放弃修改(&C)"
#. IDD_SAVECLOSING, IDC_SAVECLOSING_DISCARDALL
-#: Merge.rc:2673
+#: Merge.rc:2683
msgid "Disca&rd All"
msgstr "全部放弃(&R)"
#. IDD_DIRCMP_REPORT
-#: Merge.rc:2680
+#: Merge.rc:2690
msgid "Folder Compare Report"
msgstr "文件夹比较报告"
#. IDD_DIRCMP_REPORT, IDC_STATIC
-#: Merge.rc:2683
+#: Merge.rc:2693
msgid "Report &file:"
msgstr "报告文件(&F):"
#. IDD_DIRCMP_REPORT, IDC_STATIC
-#: Merge.rc:2686
+#: Merge.rc:2696
msgid "&Style:"
msgstr "样式(&S):"
#. IDD_DIRCMP_REPORT, IDC_REPORT_INCLUDEFILECMPREPORT
-#: Merge.rc:2688
+#: Merge.rc:2698
msgid "&Include file compare report"
msgstr "包括文件比较报告(&I)"
#. IDD_FILTERS_FILEFILTERS_SHARED
-#: Merge.rc:2697
+#: Merge.rc:2707
msgid "Shared or Private Filter"
msgstr "共享或私有过滤器"
#. IDD_FILTERS_FILEFILTERS_SHARED, IDC_STATIC
-#: Merge.rc:2700
+#: Merge.rc:2710
msgid "What type of filter do you want?"
msgstr "您要创建哪种过滤器?"
#. IDD_FILTERS_FILEFILTERS_SHARED, IDC_SHARED
-#: Merge.rc:2701
+#: Merge.rc:2711
msgid "Shared Filter (for all users)"
msgstr "共享过滤器 (适用于本机所有用户)"
#. IDD_FILTERS_FILEFILTERS_SHARED, IDC_PRIVATE
-#: Merge.rc:2702
+#: Merge.rc:2712
msgid "Private Filter (current user only)"
msgstr "私有过滤器 (仅限当前用户)"
#. IDD_COMPARE_STATISTICS3
-#: Merge.rc:2709 Merge.rc:2750
+#: Merge.rc:2719 Merge.rc:2760
msgid "Compare Statistics"
msgstr "比较结果统计"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2712 Merge.rc:2753
+#: Merge.rc:2722 Merge.rc:2763
msgid "Folders:"
msgstr "文件夹:"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2713 Merge.rc:2754
+#: Merge.rc:2723 Merge.rc:2764
msgid "Files:"
msgstr "文件:"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2719 Merge.rc:2738 Merge.rc:2760 Merge.rc:2799
+#: Merge.rc:2729 Merge.rc:2748 Merge.rc:2770 Merge.rc:2809
msgid "Binary:"
msgstr "二进制:"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2722 Merge.rc:2763
+#: Merge.rc:2732 Merge.rc:2773
msgid "Unique"
msgstr "仅在单侧"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2723 Merge.rc:2764
+#: Merge.rc:2733 Merge.rc:2774
msgid "Left:"
msgstr "左侧:"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2728 Merge.rc:2774
+#: Merge.rc:2738 Merge.rc:2784
msgid "Right:"
msgstr "右侧:"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2742 Merge.rc:2803
+#: Merge.rc:2752 Merge.rc:2813
msgid "Total:"
msgstr "总计:"
#. IDD_COMPARE_STATISTICS3, IDOK
-#: Merge.rc:2745 Merge.rc:2806
+#: Merge.rc:2755 Merge.rc:2816
msgid "Close"
msgstr "关闭"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2769
+#: Merge.rc:2779
msgid "Middle:"
msgstr "中间:"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2779
+#: Merge.rc:2789
msgid "Missing Left:"
msgstr "左侧缺失:"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2784
+#: Merge.rc:2794
msgid "Missing Middle:"
msgstr "中间缺失:"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2789
+#: Merge.rc:2799
msgid "Missing Right:"
msgstr "右侧缺失:"
#. IDD_LOAD_SAVE_CODEPAGE, IDC_AFFECTS_GROUP
-#: Merge.rc:2814
+#: Merge.rc:2824
msgid "Affects"
msgstr "影响范围"
#. IDD_LOAD_SAVE_CODEPAGE, IDC_RIGHT_FILES_LABEL
-#: Merge.rc:2816 Merge.rc:2818 Merge.rc:2820
+#: Merge.rc:2826 Merge.rc:2828 Merge.rc:2830
msgid "(Affects)"
msgstr "(影响)"
#. IDD_LOAD_SAVE_CODEPAGE, IDC_LOADING_GROUP
-#: Merge.rc:2821
+#: Merge.rc:2831
msgid "Select Codepage for"
msgstr "选择要使用的代码页"
#. IDD_LOAD_SAVE_CODEPAGE, IDC_LOAD_FILES_LABEL
-#: Merge.rc:2822
+#: Merge.rc:2832
msgid "&File Loading:"
msgstr "打开文件(&F):"
#. IDD_LOAD_SAVE_CODEPAGE, IDC_SAVE_FILES_LABEL
-#: Merge.rc:2824
+#: Merge.rc:2834
msgid "File &Saving:"
msgstr "保存文件(&S):"
#. IDD_LOAD_SAVE_CODEPAGE, IDC_LOAD_SAVE_SAME_CODEPAGE
-#: Merge.rc:2827
+#: Merge.rc:2837
msgid "&Use same codepage for both"
msgstr "两边使用相同的代码页(&U)"
#. IDS_MESSAGEBOX_CANCEL
-#: Merge.rc:2830 Merge.rc:4172
+#: Merge.rc:2840 Merge.rc:4182
msgid "&Cancel"
msgstr "取消(&C)"
#. IDD_FILTERS_FILEFILTERS_TEST
-#: Merge.rc:2835
+#: Merge.rc:2845
msgid "Test Filter"
msgstr "测试过滤器"
#. IDD_FILTERS_FILEFILTERS_TEST, IDC_HEADER
-#: Merge.rc:2838
+#: Merge.rc:2848
msgid "Testing filter:"
msgstr "正在测试过滤器:"
#. IDD_FILTERS_FILEFILTERS_TEST, IDC_PROMPT_LABEL
-#: Merge.rc:2840
+#: Merge.rc:2850
msgid "&Enter text to test:"
msgstr "输入用以测试的文本(&E):"
#. IDD_FILTERS_FILEFILTERS_TEST, IDC_IS_DIRECTORY
-#: Merge.rc:2842
+#: Merge.rc:2852
msgid "&Folder Name"
msgstr "文件夹名(&F)"
#. IDD_FILTERS_FILEFILTERS_TEST, IDC_STATIC
-#: Merge.rc:2843
+#: Merge.rc:2853
msgid "Result:"
msgstr "结果:"
#. IDD_FILTERS_FILEFILTERS_TEST, IDC_TEST_BTN
-#: Merge.rc:2845
+#: Merge.rc:2855
msgid "&Test"
msgstr "测试(&T)"
#. IDS_OPTIONSPG_TABLECOMPARE
-#: Merge.rc:2851 Merge.rc:2990 Merge.rc:4228
+#: Merge.rc:2861 Merge.rc:3000 Merge.rc:4238
msgid "Table"
msgstr "表格"
#. IDD_OPEN_TABLE, IDC_STATIC
-#: Merge.rc:2854
+#: Merge.rc:2864
msgid "File type"
msgstr "文件类型"
#. IDD_OPEN_TABLE, IDC_COMPARETABLE_CSV
-#: Merge.rc:2855
+#: Merge.rc:2865
msgid "&CSV"
msgstr "&CSV"
#. IDD_OPEN_TABLE, IDC_COMPARETABLE_TSV
-#: Merge.rc:2856
+#: Merge.rc:2866
msgid "&TSV"
msgstr "&TSV"
#. IDD_OPEN_TABLE, IDC_COMPARETABLE_DSV
-#: Merge.rc:2857
+#: Merge.rc:2867
msgid "Custom &Delimiter-Separated Values"
msgstr "自定义分隔符的数值集(&D)"
#. IDD_PROPPAGE_COMPARE_TABLE, IDC_STATIC
-#: Merge.rc:2859 Merge.rc:2861 Merge.rc:2996 Merge.rc:3004
+#: Merge.rc:2869 Merge.rc:2871 Merge.rc:3006 Merge.rc:3014
msgid "D&elimiter character:"
msgstr "自定义分隔字符(&E):"
#. IDD_PROPPAGE_COMPARE_TABLE, IDC_COMPARETABLE_ALLOWNEWLINE
-#: Merge.rc:2863 Merge.rc:3006
+#: Merge.rc:2873 Merge.rc:3016
msgid "&Allow newlines in quotes"
msgstr "允许引号内换行(&A)"
#. IDD_PROPPAGE_COMPARE_TABLE, IDC_STATIC
-#: Merge.rc:2865 Merge.rc:3008
+#: Merge.rc:2875 Merge.rc:3018
msgid "&Quote character:"
msgstr "引号字符(&Q):"
#. IDS_OPTIONSPG_BACKUPS
-#: Merge.rc:2873 Merge.rc:4216
+#: Merge.rc:2883 Merge.rc:4226
msgid "Backup Files"
msgstr "备份文件"
#. IDD_PROPPAGE_BACKUPS, IDC_STATIC
-#: Merge.rc:2876
+#: Merge.rc:2886
msgid "Create backup files for:"
msgstr "在下列操作中创建备份文件:"
#. IDD_PROPPAGE_BACKUPS, IDC_BACKUP_FOLDERCMP
-#: Merge.rc:2877
+#: Merge.rc:2887
msgid "&Folder compare"
msgstr "文件夹比较(&F)"
#. IDD_PROPPAGE_BACKUPS, IDC_BACKUP_FILECMP
-#: Merge.rc:2878
+#: Merge.rc:2888
msgid "Fil&e compare"
msgstr "文件比较(&E)"
#. IDD_PROPPAGE_BACKUPS, IDC_STATIC
-#: Merge.rc:2879
+#: Merge.rc:2889
msgid "Create backup files in:"
msgstr "备份文件创建在:"
#. IDD_PROPPAGE_BACKUPS, IDC_BACKUP_ORIGFOLD
-#: Merge.rc:2880
+#: Merge.rc:2890
msgid "&Original file's folder"
msgstr "原文件所在文件夹(&O)"
#. IDD_PROPPAGE_BACKUPS, IDC_BACKUP_GLOBALFOLD
-#: Merge.rc:2881
+#: Merge.rc:2891
msgid "&Global backup folder:"
msgstr "全局备份文件夹(&G):"
#. IDD_PROPPAGE_BACKUPS, IDC_STATIC
-#: Merge.rc:2884
+#: Merge.rc:2894
msgid "Backup filename:"
msgstr "备份文件名:"
#. IDD_PROPPAGE_BACKUPS, IDC_BACKUP_APPEND_BAK
-#: Merge.rc:2885
+#: Merge.rc:2895
msgid "&Append .bak extension"
msgstr "追加 .bak 扩展名(&A)"
#. IDD_PROPPAGE_BACKUPS, IDC_BACKUP_APPEND_TIME
-#: Merge.rc:2886
+#: Merge.rc:2896
msgid "A&ppend timestamp"
msgstr "追加时间戳(&P)"
#. IDS_CONFIRM_COPY_CAPTION
-#: Merge.rc:2892 Merge.rc:4565
+#: Merge.rc:2902 Merge.rc:4575
msgid "Confirm Copy"
msgstr "确认复制"
#. IDD_CONFIRM_COPY, IDC_FLDCONFIRM_QUERY
-#: Merge.rc:2896
+#: Merge.rc:2906
msgid "Are you sure you want to copy XXX items?"
msgstr "您确定要复制 XXX 条目吗?"
#. IDD_CONFIRM_COPY, IDC_FLDCONFIRM_FROM_TEXT
-#: Merge.rc:2897
+#: Merge.rc:2907
msgid "From left"
msgstr "从左侧"
#. IDD_CONFIRM_COPY, IDC_FLDCONFIRM_TO_TEXT
-#: Merge.rc:2899
+#: Merge.rc:2909
msgid "To right"
msgstr "到右侧"
#. IDS_MESSAGEBOX_DONT_ASK_AGAIN
-#: Merge.rc:2901 Merge.rc:4191
+#: Merge.rc:2911 Merge.rc:4201
msgid "Don't ask this &question again."
msgstr "不再询问此问题(&Q)"
#. IDD_CONFIRM_COPY, IDYES
-#: Merge.rc:2903
+#: Merge.rc:2913
msgid "Yes"
msgstr "是"
#. IDD_CONFIRM_COPY, IDNO
-#: Merge.rc:2904
+#: Merge.rc:2914
msgid "No"
msgstr "否"
#. IDS_PROJECT_ITEM_PLUGIN
-#: Merge.rc:2909 Merge.rc:4323
+#: Merge.rc:2919 Merge.rc:4333
msgid "Plugins"
msgstr "插件"
#. IDD_PLUGINS_LIST, IDC_PLUGINS_ENABLE
-#: Merge.rc:2912
+#: Merge.rc:2922
msgid "&Enable plugins"
msgstr "启用插件(&E)"
#. IDD_PLUGINS_EDITPLUGIN, IDC_STATIC
-#: Merge.rc:2913 Merge.rc:3113
+#: Merge.rc:2923 Merge.rc:3123
msgid "Plugin &type:"
msgstr "插件类型(&T):"
#. IDD_PLUGINS_LIST, IDC_STATIC
-#: Merge.rc:2916
+#: Merge.rc:2926
msgid "File filters:"
msgstr "文件过滤器:"
#. IDD_PLUGINS_LIST, IDC_STATIC
-#: Merge.rc:2918
+#: Merge.rc:2928
msgid "&Plugin arguments:"
msgstr "插件参数(&P):"
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_AUTOMATIC
-#: Merge.rc:2920 Merge.rc:3134
+#: Merge.rc:2930 Merge.rc:3144
msgid "Enable &automatic unpacking/prediffing"
msgstr "启用自动解包或预比较插件(&A)"
#. IDS_OPTIONSPG_SHELL
-#: Merge.rc:2934 Merge.rc:4217
+#: Merge.rc:2944 Merge.rc:4227
msgid "Shell Integration"
msgstr "系统外壳集成"
#. IDD_PROPPAGE_SHELL, IDC_STATIC
-#: Merge.rc:2937
+#: Merge.rc:2947
msgid "Explorer"
msgstr "资源管理器"
#. IDD_PROPPAGE_SHELL, IDC_EXPLORER_CONTEXT
-#: Merge.rc:2938
+#: Merge.rc:2948
msgid "&Add to context menu"
msgstr "添加到上下文菜单(&A)"
#. IDD_PROPPAGE_SHELL, IDC_EXPLORER_ADVANCED
-#: Merge.rc:2939
+#: Merge.rc:2949
msgid "E&nable advanced menu"
msgstr "启用高级菜单(&N)"
#. IDD_PROPPAGE_SHELL, IDC_EXPLORER_COMPARE_AS
-#: Merge.rc:2940
+#: Merge.rc:2950
msgid "Enable &Compare As menu"
msgstr "启用比较方式菜单(&C)"
#. IDD_PROPPAGE_SHELL, IDC_REGISTER_SHELLEXTENSION
-#: Merge.rc:2941
+#: Merge.rc:2951
msgid "&Register Shell Extension"
msgstr "注册系统外壳扩展(&R)"
#. IDD_PROPPAGE_SHELL, IDC_UNREGISTER_SHELLEXTENSION
-#: Merge.rc:2942
+#: Merge.rc:2952
msgid "&Unregister Shell Extension"
msgstr "注销系统外壳扩展(&U)"
#. IDD_PROPPAGE_SHELL, IDC_REGISTER_SHELLEXTENSION_PERUSER
-#: Merge.rc:2943
+#: Merge.rc:2953
msgid "Register Shell Extension for Current User &Only"
msgstr "为当前用户注册系统外壳扩展(&O)"
#. IDD_PROPPAGE_SHELL, IDC_UNREGISTER_SHELLEXTENSION_PERUSER
-#: Merge.rc:2944
+#: Merge.rc:2954
msgid "Unregister Shell Extension for Current User On&ly"
msgstr "为当前用户注销系统外壳扩展(&L)"
#. IDD_PROPPAGE_SHELL, IDC_REGISTER_WINMERGECONTEXTMENU
-#: Merge.rc:2945
+#: Merge.rc:2955
msgid "Register Shell Extension for &Windows 11"
msgstr "注册系统外壳扩展(Windows 11 或更新的系统)(&W)"
#. IDD_PROPPAGE_SHELL, IDC_UNREGISTER_WINMERGECONTEXTMENU
-#: Merge.rc:2946
+#: Merge.rc:2956
msgid "Unregister Shell Extension for W&indows 11"
msgstr "注销系统外壳扩展(Windows 11 或更新的系统)(&I)"
#. IDD_PROPPAGE_SHELL, IDC_STATIC
-#: Merge.rc:2947
+#: Merge.rc:2957
msgid "Jump List"
msgstr "跳转列表"
#. IDD_PROPPAGE_SHELL, IDC_CLEAR_ALL_RECENT_ITEMS
-#: Merge.rc:2949
+#: Merge.rc:2959
msgid "Clear all recent items"
msgstr "清除所有最近的条目"
#. IDS_OPTIONSPG_FOLDERCOMPARE
-#: Merge.rc:2954 Merge.rc:4225
+#: Merge.rc:2964 Merge.rc:4235
msgctxt "Options dialog|Categories"
msgid "Folder"
msgstr "文件夹"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC
-#: Merge.rc:2957
+#: Merge.rc:2967
msgid "&Compare method:"
msgstr "比较方法(&C):"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_COMPARE_STOPFIRST
-#: Merge.rc:2959
+#: Merge.rc:2969
msgid "S&top after first difference"
msgstr "遇到第一个差异后停止(&T)"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_IGNORE_SMALLTIMEDIFF
-#: Merge.rc:2961
+#: Merge.rc:2971
msgid "Ign&ore time differences less than 3 seconds"
msgstr "忽略小于3秒的时间差异(&O)"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC
-#: Merge.rc:2964
+#: Merge.rc:2974
msgid "Expand subfolders &after comparison:"
msgstr "在比较后自动展开子文件夹(&A)"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_COMPARE_WALKSUBDIRS
-#: Merge.rc:2966
+#: Merge.rc:2976
msgid "Include &unique subfolders contents"
msgstr "包含仅在单侧的子文件夹内容(&U)"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_IGNORE_REPARSEPOINTS
-#: Merge.rc:2968
+#: Merge.rc:2978
msgid "Ignore &reparse points"
msgstr "忽略重新解析点(&R)"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC
-#: Merge.rc:2969
+#: Merge.rc:2979
msgid "Switch to &quick compare when size exceeds (MB):"
msgstr "切换到快速比较的最小值(&Q) (MB):"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC
-#: Merge.rc:2971
+#: Merge.rc:2981
msgid "Switch to &binary compare when size exceeds (MB):"
msgstr "切换到二进制比较的最小值(&B) (MB):"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC
-#: Merge.rc:2975
+#: Merge.rc:2985
msgid "Additional comparison condi&tions:"
msgstr "附加的比较条件(&T):"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC
-#: Merge.rc:2978
+#: Merge.rc:2988
msgid "&Rename/move detection:"
msgstr "重命名/移动检测(&R):"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC
-#: Merge.rc:2980
+#: Merge.rc:2990
msgid "Rename/move detection &keys:"
msgstr "重命名/移动检测键(&K):"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC
-#: Merge.rc:2983
+#: Merge.rc:2993
msgid "M&erge renames and moves:"
msgstr "合并重命名和被移动的文件(&E):"
#. IDD_PROPPAGE_COMPARE_TABLE, IDC_STATIC
-#: Merge.rc:2994 Merge.rc:2999 Merge.rc:3002
+#: Merge.rc:3004 Merge.rc:3009 Merge.rc:3012
msgid "File patterns:"
msgstr "文件模式:"
#. IDD_PROPPAGE_COMPARE_TABLE, IDC_STATIC
-#: Merge.rc:3001
+#: Merge.rc:3011
msgid "Custom Delimiter-Separated Values"
msgstr "自定义分隔符的数值集"
#. IDS_OPTIONSPG_BINARYCOMPARE
-#: Merge.rc:3015 Merge.rc:4227
+#: Merge.rc:3025 Merge.rc:4237
msgctxt "Options dialog|Categories"
msgid "Binary"
msgstr "二进制"
#. IDD_PROPPAGE_COMPARE_BINARY, IDC_STATIC
-#: Merge.rc:3018
+#: Merge.rc:3028
msgid "Binary file &patterns:"
msgstr "二进制文件模式(&P):"
#. IDD_PROPPAGE_COMPARE_BINARY, IDC_STATIC
-#: Merge.rc:3020
+#: Merge.rc:3030
msgid "Frhed settings"
msgstr "Frhed 设置"
#. IDD_PROPPAGE_COMPARE_BINARY, IDC_COMPAREBINARY_VIEWSETTINGS
-#: Merge.rc:3021
+#: Merge.rc:3031
msgid "View &Settings..."
msgstr "查看设置(&S)..."
#. IDD_PROPPAGE_COMPARE_BINARY, IDC_COMPAREBINARY_BINARYMODE
-#: Merge.rc:3022
+#: Merge.rc:3032
msgid "&Binary Mode..."
msgstr "二进制模式(&B)..."
#. IDD_PROPPAGE_COMPARE_BINARY, IDC_COMPAREBINARY_CHARACTERSET
-#: Merge.rc:3023
+#: Merge.rc:3033
msgid "&Character Set..."
msgstr "字符集(&C)..."
#. IDS_PRPCAT_IMAGE
-#: Merge.rc:3029 Merge.rc:4226 Merge.rc:4665
+#: Merge.rc:3039 Merge.rc:4236 Merge.rc:4675
msgid "Image"
msgstr "图像"
#. IDD_PROPPAGE_COMPARE_IMAGE, IDC_STATIC
-#: Merge.rc:3032
+#: Merge.rc:3042
msgid "Image file &patterns:"
msgstr "图像文件模式(&P):"
#. IDD_PROPPAGE_COMPARE_IMAGE, IDC_ENABLE_IMGCMP_IN_DIRCMP
-#: Merge.rc:3034
+#: Merge.rc:3044
msgid "&Enable image compare in folder compare"
msgstr "在文件夹比较中启用图像比较(&E)"
#. IDD_PROPPAGE_COMPARE_IMAGE, IDC_STATIC
-#: Merge.rc:3036
+#: Merge.rc:3046
msgid "OCR result:"
msgstr "字符识别结果:"
#. IDS_OPTIONSPG_WEBPAGECOMPARE
-#: Merge.rc:3043 Merge.rc:4229
+#: Merge.rc:3053 Merge.rc:4239
msgid "Webpage"
msgstr "网页"
#. IDD_PROPPAGE_COMPARE_WEBPAGE, IDC_STATIC
-#: Merge.rc:3046
+#: Merge.rc:3056
msgid "URL pattern to &include (Regular expression):"
msgstr "要包含的网址模式(正则表达式)(&I):"
#. IDD_PROPPAGE_COMPARE_WEBPAGE, IDC_STATIC
-#: Merge.rc:3048
+#: Merge.rc:3058
msgid "URL pattern to &exclude (Regular expression):"
msgstr "要排除的网址模式(正则表达式)(&E):"
#. IDD_PROPPAGE_COMPARE_WEBPAGE, IDC_STATIC
-#: Merge.rc:3050
+#: Merge.rc:3060
msgid "&User data folder location:"
msgstr "用户数据文件夹位置(&U)"
#. IDD_PROPPAGE_COMPARE_WEBPAGE, IDC_COMPAREWEBPAGE_USERDATAFOLDER_PERPANE
-#: Merge.rc:3052
+#: Merge.rc:3062
msgid "&Separate user data folders for each pane"
msgstr "每个窗格使用单独的用户数据文件夹(&S)"
#. IDD_ENCODINGERROR, IDC_HEXVIEW
-#: Merge.rc:3065
+#: Merge.rc:3075
msgid "&Hex View"
msgstr "十六进制查看(&H)"
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3110
+#: Merge.rc:3120
msgid "Edit Plugin"
msgstr "编辑插件"
#. IDD_PLUGINS_EDITPLUGIN, IDC_STATIC
-#: Merge.rc:3123
+#: Merge.rc:3133
msgid "&Category:"
msgstr "类别(&C):"
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_MENUCAPTION_STATIC
-#: Merge.rc:3125
+#: Merge.rc:3135
msgid "&Menu caption:"
msgstr "菜单标题(&M):"
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_WINDOWTYPE_STATIC
-#: Merge.rc:3127
+#: Merge.rc:3137
msgid "&Window type:"
msgstr "窗口类型(&W):"
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_UNPACKEDFILEEXTENSION_STATIC
-#: Merge.rc:3132
+#: Merge.rc:3142
msgid "&Unpacked file extension:"
msgstr "解包后的文件扩展名(&U):"
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_ARGUMENTSREQUIRED
-#: Merge.rc:3136
+#: Merge.rc:3146
msgid "&Require arguments"
msgstr "要求提供参数(&R)"
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_GENERATESCRIPT
-#: Merge.rc:3137
+#: Merge.rc:3147
msgid "&Generate editor script"
msgstr "生成编辑器脚本(&G)"
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_COMMAND_LINE_STATIC
-#: Merge.rc:3140
+#: Merge.rc:3150
msgid "Command &line:"
msgstr "命令行(&L):"
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_SCRIPT_FILEEXTENSION_STATIC
-#: Merge.rc:3143
+#: Merge.rc:3153
msgid "&Script file extension:"
msgstr "脚本文件扩展名(&S):"
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_SCRIPT_BODY_STATIC
-#: Merge.rc:3145
+#: Merge.rc:3155
msgid "Script &body:"
msgstr "脚本体(&B):"
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3154
+#: Merge.rc:3164
msgid "Font"
msgstr "字体"
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3157
+#: Merge.rc:3167
msgid "&Font:"
msgstr "字体(&F):"
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3163
+#: Merge.rc:3173
msgid "Font st&yle:"
msgstr "字体样式(&Y):"
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3169
+#: Merge.rc:3179
msgid "&Size:"
msgstr "字号(&S):"
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3175
+#: Merge.rc:3185
msgid "Effects"
msgstr "效果"
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3176
+#: Merge.rc:3186
msgid "Stri&keout"
msgstr "删除线(&K)"
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3177
+#: Merge.rc:3187
msgid "&Underline"
msgstr "上划线(&)"
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3179
+#: Merge.rc:3189
msgid "&Color:"
msgstr "色彩(&C):"
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3184
+#: Merge.rc:3194
msgid "Sample"
msgstr "示例"
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3185
+#: Merge.rc:3195
msgid "AaBbYyZz"
msgstr "AaBbYyZz"
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3189
+#: Merge.rc:3199
msgid "Sc&ript:"
msgstr "脚本(&R):"
#. IDD_PLUGINS_EDITPLUGIN, IDC_MANAGE_LINK
-#: Merge.rc:3194
+#: Merge.rc:3204
msgid "Show more fonts"
msgstr "显示更多字体"
#. ID_INDICATOR_EXT
-#: Merge.rc:4118
+#: Merge.rc:4128
msgid "EXT"
msgstr "EXT"
#. ID_INDICATOR_CAPS
-#: Merge.rc:4119
+#: Merge.rc:4129
msgid "CAP"
msgstr "CAP"
#. ID_INDICATOR_NUM
-#: Merge.rc:4120
+#: Merge.rc:4130
msgid "NUM"
msgstr "NUM"
#. ID_INDICATOR_SCRL
-#: Merge.rc:4121
+#: Merge.rc:4131
msgid "SCRL"
msgstr "SCRL"
#. ID_INDICATOR_OVR
-#: Merge.rc:4122
+#: Merge.rc:4132
msgid "OVR"
msgstr "OVR"
#. ID_INDICATOR_REC
-#: Merge.rc:4123
+#: Merge.rc:4133
msgid "REC"
msgstr "REC"
#. ID_FILE_NEW
-#: Merge.rc:4129
+#: Merge.rc:4139
msgid ""
"\n"
"New Documents (Ctrl+N)"
@@ -4869,7 +4880,7 @@ msgstr ""
"新建文档 (Ctrl+N)"
#. ID_FILE_OPEN
-#: Merge.rc:4130
+#: Merge.rc:4140
msgid ""
"\n"
"Open (Ctrl+O)"
@@ -4878,7 +4889,7 @@ msgstr ""
"打开 (Ctrl+O)"
#. ID_FILE_SAVE
-#: Merge.rc:4131
+#: Merge.rc:4141
msgid ""
"\n"
"Save (Ctrl+S)"
@@ -4887,27 +4898,27 @@ msgstr ""
"保存 (Ctrl+S)"
#. IDS_UNK_ERROR_READING_PROJECT
-#: Merge.rc:4137
+#: Merge.rc:4147
msgid "Unknown error opening project file."
msgstr "打开项目文件时发生未知错误。"
#. IDS_UNK_ERROR_SAVING_PROJECT
-#: Merge.rc:4138
+#: Merge.rc:4148
msgid "Unknown error saving project file."
msgstr "保存项目文件时发生未知错误。"
#. IDS_PROJFILE_LOAD_SUCCESS
-#: Merge.rc:4143
+#: Merge.rc:4153
msgid "Project file loaded."
msgstr "项目文件加载完成。"
#. IDS_PROJFILE_SAVE_SUCCESS
-#: Merge.rc:4144
+#: Merge.rc:4154
msgid "Project file saved."
msgstr "项目文件已保存。"
#. ID_EDIT_UNDO
-#: Merge.rc:4150
+#: Merge.rc:4160
msgid ""
"\n"
"Undo (Ctrl+Z)"
@@ -4916,7 +4927,7 @@ msgstr ""
"撤销 (Ctrl+Z)"
#. ID_EDIT_REDO
-#: Merge.rc:4151
+#: Merge.rc:4161
msgid ""
"\n"
"Redo (Ctrl+Y)"
@@ -4925,7 +4936,7 @@ msgstr ""
"重做 (Ctrl+Y)"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:4158
+#: Merge.rc:4168
msgid ""
"\n"
"FileCompare\n"
@@ -4944,7 +4955,7 @@ msgstr ""
"WinMerge 文件比较"
#. IDR_DIRDOCTYPE
-#: Merge.rc:4159
+#: Merge.rc:4169
msgid ""
"\n"
"FolderCompare\n"
@@ -4963,162 +4974,162 @@ msgstr ""
"WinMerge 文件夹比较"
#. IDS_SPLASH_GPLTEXT
-#: Merge.rc:4165
+#: Merge.rc:4175
msgid "WinMerge comes with ABSOLUTELY NO WARRANTY. It is free software and can be redistributed under the conditions of the GNU General Public License - see the Help menu for details."
msgstr "WinMerge 无任何担保。这是一款自由软件,可根据 GNU 通用公共许可证的条件重新分发,详情请查看帮助菜单。"
#. IDS_MESSAGEBOX_ABORT
-#: Merge.rc:4173
+#: Merge.rc:4183
msgid "&Abort"
msgstr "中止(&A)"
#. IDS_MESSAGEBOX_RETRY
-#: Merge.rc:4174
+#: Merge.rc:4184
msgid "&Retry"
msgstr "重试(&R)"
#. IDS_MESSAGEBOX_IGNORE
-#: Merge.rc:4175
+#: Merge.rc:4185
msgid "&Ignore"
msgstr "忽略(&I)"
#. IDS_MESSAGEBOX_IGNOREALL
-#: Merge.rc:4176
+#: Merge.rc:4186
msgid "Ignore &all"
msgstr "全部忽略(&A)"
#. IDS_MESSAGEBOX_YES
-#: Merge.rc:4177
+#: Merge.rc:4187
msgid "&Yes"
msgstr "是(&Y)"
#. IDS_MESSAGEBOX_YES_TO_ALL
-#: Merge.rc:4183
+#: Merge.rc:4193
msgid "Yes to &all"
msgstr "全是(&A)"
#. IDS_MESSAGEBOX_NO
-#: Merge.rc:4184
+#: Merge.rc:4194
msgid "&No"
msgstr "否(&N)"
#. IDS_MESSAGEBOX_NO_TO_ALL
-#: Merge.rc:4185
+#: Merge.rc:4195
msgid "No to a&ll"
msgstr "全否(&L)"
#. IDS_MESSAGEBOX_CONTINUE
-#: Merge.rc:4186
+#: Merge.rc:4196
msgid "&Continue"
msgstr "继续(&C)"
#. IDS_MESSAGEBOX_SKIP
-#: Merge.rc:4187
+#: Merge.rc:4197
msgid "&Skip"
msgstr "跳过(&S)"
#. IDS_MESSAGEBOX_SKIPALL
-#: Merge.rc:4188
+#: Merge.rc:4198
msgid "Skip &all"
msgstr "全部跳过(&A)"
#. IDS_MESSAGEBOX_DONT_DISPLAY_AGAIN
-#: Merge.rc:4190
+#: Merge.rc:4200
msgid "Don't display this &message again."
msgstr "不再显示此消息(&M)"
-#: Merge.rc:4193
+#: Merge.rc:4203
msgid "To make this message box visible, press Reset on the Message Boxes page in Options."
msgstr "要使该消息框可见,请在“选项”中的“消息框”页面点击重置。"
#. IDS_OPTIONSPG_EDITOR_COMPAREMERGE
-#: Merge.rc:4203
+#: Merge.rc:4213
msgid "Compare/Merge"
msgstr "比较/合并"
#. IDS_OPTIONSPG_SYNTAXCOLORS
-#: Merge.rc:4204 Merge.rc:4208
+#: Merge.rc:4214 Merge.rc:4218
msgid "Syntax"
msgstr "语法"
#. IDS_OPTIONSPG_COLOR_SCHEMES
-#: Merge.rc:4206
+#: Merge.rc:4216
msgid "Color Schemes"
msgstr "配色方案"
#. IDS_OPTIONSPG_DIRCOLORS
-#: Merge.rc:4210
+#: Merge.rc:4220
msgid "Folder Compare"
msgstr "文件夹比较"
#. IDS_OPTIONSPG_PROJECT
-#: Merge.rc:4215
+#: Merge.rc:4225
msgid "Project"
msgstr "项目"
#. IDS_COLHDR_NSDIFFS
-#: Merge.rc:4218 Merge.rc:4640
+#: Merge.rc:4228 Merge.rc:4650
msgid "Differences"
msgstr "差异"
#. IDS_OPTIONSPG_MESSAGEBOXES
-#: Merge.rc:4220
+#: Merge.rc:4230
msgid "Message Boxes"
msgstr "消息框"
#. IDS_TO
-#: Merge.rc:4235
+#: Merge.rc:4245
msgid "To:"
msgstr "到:"
#. IDS_FROM_LEFT
-#: Merge.rc:4236
+#: Merge.rc:4246
msgid "From left:"
msgstr "从左侧:"
#. IDS_TO_LEFT
-#: Merge.rc:4237
+#: Merge.rc:4247
msgid "To left:"
msgstr "到左侧:"
#. IDS_FROM_RIGHT
-#: Merge.rc:4238
+#: Merge.rc:4248
msgid "From right:"
msgstr "从右侧:"
#. IDS_TO_RIGHT
-#: Merge.rc:4239
+#: Merge.rc:4249
msgid "To right:"
msgstr "到右侧:"
#. IDS_FROM_MIDDLE
-#: Merge.rc:4240
+#: Merge.rc:4250
msgid "From middle:"
msgstr "从中间:"
#. IDS_TO_MIDDLE
-#: Merge.rc:4241
+#: Merge.rc:4251
msgid "To middle:"
msgstr "到中间:"
#. IDS_VERSION_FMT
-#: Merge.rc:4247
+#: Merge.rc:4257
#, c-format
msgid "Version %1"
msgstr "版本 %1"
#. IDS_OPTIONS_TITLE
-#: Merge.rc:4253
+#: Merge.rc:4263
#, c-format
msgid "Options (%1)"
msgstr "选项 (%1)"
#. IDS_MESSAGE_BOX_ARE_RESET
-#: Merge.rc:4254
+#: Merge.rc:4264
msgid "All message boxes are now displayed again."
msgstr "所有提示信息已经重设为显示。"
-#: Merge.rc:4256
+#: Merge.rc:4266
#, c-format
msgid "Tab size value is out of range. Please use 1 - %1."
msgstr ""
@@ -5127,156 +5138,156 @@ msgstr ""
"请使用 1 - %1 之间的值。"
#. IDS_PROJECT_OPEN
-#: Merge.rc:4262 Merge.rc:4318
+#: Merge.rc:4272 Merge.rc:4328
msgid "Open"
msgstr "打开"
#. IDS_PROGRAMFILES
-#: Merge.rc:4263
+#: Merge.rc:4273
msgid "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||"
msgstr "程序|*.exe;*.bat;*.cmd|所有文件 (*.*)|*.*||"
#. IDS_ALLFILES
-#: Merge.rc:4264
+#: Merge.rc:4274
msgid "All Files (*.*)|*.*||"
msgstr "所有文件 (*.*)|*.*||"
#. IDS_PROJECTFILES
-#: Merge.rc:4265
+#: Merge.rc:4275
msgid "WinMerge Project Files (*.WinMerge)|*.WinMerge||"
msgstr "WinMerge 工程文件 (*.WinMerge)|*.WinMerge||"
#. IDS_INIFILES
-#: Merge.rc:4267
+#: Merge.rc:4277
msgid "Options files (*.ini)|*.ini|All Files (*.*)|*.*||"
msgstr "配置文件 (*.ini)|*.ini|所有文件 (*.*)|*.*||"
#. IDS_REPLACELIST_FILES
-#: Merge.rc:4268
+#: Merge.rc:4278
msgid "Tab-Separated Values (*.tsv;*.txt)|*.tsv;*.txt|All Files (*.*)|*.*||"
msgstr "制表符分隔值 (*.tsv;*.txt)|*.tsv;*.txt|All Files (*.*)|*.*||"
#. IDS_TEXT_REPORT_FILES
-#: Merge.rc:4274
+#: Merge.rc:4284
msgid "Text Files (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|All Files (*.*)|*.*||"
msgstr "文本文件 (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|所有文件 (*.*)|*.*||"
#. IDS_HTML_REPORT_FILES
-#: Merge.rc:4275
+#: Merge.rc:4285
msgid "HTML Files (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||"
msgstr "HTML 文件 (*.htm,*.html)|*.htm;*.html|所有文件 (*.*)|*.*||"
#. IDS_XML_REPORT_FILES
-#: Merge.rc:4276
+#: Merge.rc:4286
msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||"
msgstr "XML 文件 (*.xml)|*.xml|所有文件 (*.*)|*.*||"
#. IDS_EXPANDSUBDIRS_DONOTEXPAND
-#: Merge.rc:4294
+#: Merge.rc:4304
msgid "Do not expand"
msgstr "不展开"
#. IDS_EXPANDSUBDIRS_ALL
-#: Merge.rc:4295
+#: Merge.rc:4305
msgid "Expand all subfolders"
msgstr "展开所有子文件夹"
#. IDS_EXPANDSUBDIRS_DIFFERENT
-#: Merge.rc:4296
+#: Merge.rc:4306
msgid "Expand different subfolders"
msgstr "展开不同的子文件夹"
#. IDS_EXPANDSUBDIRS_IDENTICAL
-#: Merge.rc:4297
+#: Merge.rc:4307
msgid "Expand identical subfolders"
msgstr "展开相同的子文件夹"
#. IDS_SYNTAXTABLE_FILETYPE
-#: Merge.rc:4303
+#: Merge.rc:4313
msgid "File Type"
msgstr "文件类型"
#. IDS_COLHDR_EXTENSION
-#: Merge.rc:4304 Merge.rc:4597
+#: Merge.rc:4314 Merge.rc:4607
msgid "Extension"
msgstr "扩展名"
#. IDS_PRPCAT_MESSAGE
-#: Merge.rc:4310 Merge.rc:4669
+#: Merge.rc:4320 Merge.rc:4679
msgid "Message"
msgstr "消息"
#. IDS_MESSAGEBOX_ANSWER
-#: Merge.rc:4311
+#: Merge.rc:4321
msgid "Answer"
msgstr "您的选择"
#. IDS_PROJECT_ITEM
-#: Merge.rc:4317
+#: Merge.rc:4327
msgid "Item"
msgstr "条目"
#. IDS_PROJECT_LOAD
-#: Merge.rc:4319
+#: Merge.rc:4329
msgid "Load"
msgstr "加载"
#. IDS_PROJECT_SAVE
-#: Merge.rc:4320
+#: Merge.rc:4330
msgid "Save"
msgstr "保存"
#. IDS_PROJECT_ITEM_INCLUDE_SUBFOLDERS
-#: Merge.rc:4322
+#: Merge.rc:4332
msgid "Include Subfolders"
msgstr "包含子目录"
#. IDS_PROJECT_ITEM_COMPARE_OPTIONS
-#: Merge.rc:4324
+#: Merge.rc:4334
msgid "Compare Options"
msgstr "比较选项"
#. IDS_PROJECT_ITEM_HIDDEN_ITEMS
-#: Merge.rc:4325
+#: Merge.rc:4335
msgid "Hidden Items"
msgstr "隐藏条目"
#. IDS_PLUGINSLIST_NAME
-#: Merge.rc:4331 Merge.rc:4956
+#: Merge.rc:4341 Merge.rc:4966
msgid "Name"
msgstr "名称"
#. IDS_FILTERFILE_PATHTITLE
-#: Merge.rc:4332
+#: Merge.rc:4342
msgid "Location"
msgstr "位置"
#. IDS_FILTER_TITLE
-#: Merge.rc:4333
+#: Merge.rc:4343
msgid "Filters"
msgstr "过滤器"
#. IDS_FILTER_PREFIX
-#: Merge.rc:4334
+#: Merge.rc:4344
msgid "[F] "
msgstr "[F] "
#. IDS_PLUGINSLIST_DESC
-#: Merge.rc:4335 Merge.rc:4958
+#: Merge.rc:4345 Merge.rc:4968
msgid "Description"
msgstr "描述"
#. IDS_FILEFILTER_SAVENEW
-#: Merge.rc:4336
+#: Merge.rc:4346
msgid "Select Filename for New Filter"
msgstr "选择新过滤器的文件名"
#. IDS_FILEFILTER_FILEMASK
-#: Merge.rc:4337
+#: Merge.rc:4347
msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||"
msgstr "过滤器文件 (*.flt)|*.flt|所有文件 (*.*)|*.*||"
-#: Merge.rc:4339
+#: Merge.rc:4349
#, c-format
msgid ""
"Cannot find filter template!\n"
@@ -5288,7 +5299,7 @@ msgstr ""
"\n"
"请将文件 %1 复制到 WinMerge/Filters 文件夹下。"
-#: Merge.rc:4341
+#: Merge.rc:4351
#, c-format
msgid ""
"Cannot copy filter template:\n"
@@ -5301,7 +5312,7 @@ msgstr ""
"\n"
"请确认此文件夹存在且可以写入。"
-#: Merge.rc:4343
+#: Merge.rc:4353
msgid ""
"User's filter folder is not defined!\n"
"\n"
@@ -5311,7 +5322,7 @@ msgstr ""
"\n"
"请在选项/系统中选择一个过滤器文件夹。"
-#: Merge.rc:4345
+#: Merge.rc:4355
#, c-format
msgid ""
"Failed to delete filter:\n"
@@ -5325,11 +5336,11 @@ msgstr ""
"文件可能是只读的。"
#. IDS_FILEFILTER_INSTALL
-#: Merge.rc:4346
+#: Merge.rc:4356
msgid "Locate Filter File to Install"
msgstr "选择要安装的过滤器文件"
-#: Merge.rc:4348
+#: Merge.rc:4358
msgid ""
"Installing filter file failed.\n"
"\n"
@@ -5340,17 +5351,17 @@ msgstr ""
"可能无法将新过滤器文件复制到过滤器目录。"
#. IDS_FILEFILTER_OVERWRITE
-#: Merge.rc:4349
+#: Merge.rc:4359
msgid "Filter file exists. Overwrite?"
msgstr "过滤器文件已存在。覆盖现有的过滤器?"
#. IDS_FILTERLINE_REGEXP
-#: Merge.rc:4355
+#: Merge.rc:4365
msgid "Regular expression"
msgstr "正则表达式"
#. IDS_FILTERCHANGED
-#: Merge.rc:4361
+#: Merge.rc:4371
msgid ""
"Filters updated. Refresh all open folder compares?\n"
"\n"
@@ -5361,217 +5372,217 @@ msgstr ""
"如果您暂时不想刷新所有比较,您可以选择“否”,并在之后刷新比较。"
#. IDS_DIRECTORY_WINDOW_TITLE
-#: Merge.rc:4367
+#: Merge.rc:4377
msgid "Folder Comparison Results"
msgstr "文件夹比较结果"
#. IDS_FILE_COMPARISON_TITLE
-#: Merge.rc:4368
+#: Merge.rc:4378
msgid "File Comparison"
msgstr "文件比较"
#. IDS_EMPTY_LEFT_FILE
-#: Merge.rc:4369
+#: Merge.rc:4379
msgid "Untitled Left"
msgstr "未命名 左"
#. IDS_EMPTY_MIDDLE_FILE
-#: Merge.rc:4370
+#: Merge.rc:4380
msgid "Untitled Middle"
msgstr "未命名 中"
#. IDS_EMPTY_RIGHT_FILE
-#: Merge.rc:4371
+#: Merge.rc:4381
msgid "Untitled Right"
msgstr "未命名 右"
#. IDS_CONFLICT_BASE_FILE
-#: Merge.rc:4372
+#: Merge.rc:4382
msgid "Base File"
msgstr "基准文件"
#. IDS_CONFLICT_THEIRS_FILE
-#: Merge.rc:4373
+#: Merge.rc:4383
msgid "Theirs File"
msgstr "他们的文件"
#. IDS_CONFLICT_MINE_FILE
-#: Merge.rc:4374
+#: Merge.rc:4384
msgid "Mine File"
msgstr "我的文件"
#. IDS_SELFCOMPARE_ORIGINAL_FILE
-#: Merge.rc:4375
+#: Merge.rc:4385
msgid "Original File"
msgstr "原始文件"
#. IDS_LINE_STATUS_INFO_EOL
-#: Merge.rc:4381
+#: Merge.rc:4391
#, c-format
msgid "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s"
msgstr "行:%s 列:%d/%d 字符:%d/%d 换行符:%s"
#. IDS_EMPTY_LINE_STATUS_INFO
-#: Merge.rc:4382
+#: Merge.rc:4392
#, c-format
msgid "Line: %s"
msgstr "行:%s"
#. IDS_LINE_STATUS_INFO
-#: Merge.rc:4383
+#: Merge.rc:4393
#, c-format
msgid "Ln: %s Col: %d/%d Ch: %d/%d"
msgstr "行:%s 列:%d/%d 字符:%d/%d"
#. IDS_LINE_STATUS_INFO_SEL
-#: Merge.rc:4384
+#: Merge.rc:4394
#, c-format
msgid " Sel: %d | %d"
msgstr " 选中:%d | %d"
#. IDS_MERGEMODE_MERGING
-#: Merge.rc:4385
+#: Merge.rc:4395
msgid "Merge"
msgstr "合并"
#. IDS_DIFF_NUMBER_STATUS_FMT
-#: Merge.rc:4386
+#: Merge.rc:4396
#, c-format
msgid "Difference %1 of %2"
msgstr "第 %1 处差异(共 %2 处)"
#. IDS_NO_DIFF_SEL_FMT
-#: Merge.rc:4387
+#: Merge.rc:4397
#, c-format
msgid "%1 Differences Found"
msgstr "共找到 %1 处差异"
#. IDS_1_DIFF_FOUND
-#: Merge.rc:4388
+#: Merge.rc:4398
msgid "1 Difference Found"
msgstr "找到 1 处差异"
#. IDS_NO_ERR_SEL_FMT
-#: Merge.rc:4389
+#: Merge.rc:4399
#, c-format
msgid "%1 Errors Found"
msgstr "找到 %1 个错误"
#. IDS_1_ERR_FOUND
-#: Merge.rc:4390
+#: Merge.rc:4400
msgid "1 Error Found"
msgstr "找到 1 个错误"
#. IDS_STATUSBAR_READONLY, Abbreviation from "Read Only"
-#: Merge.rc:4391
+#: Merge.rc:4401
msgid "RO"
msgstr "只读"
#. IDS_DIRVIEW_STATUS_FMT_FOCUS
-#: Merge.rc:4397
+#: Merge.rc:4407
#, c-format
msgid "Item %1 of %2"
msgstr "第 %1 项,共 %2 项"
#. IDS_DIRVIEW_STATUS_FMT_NOFOCUS
-#: Merge.rc:4398
+#: Merge.rc:4408
#, c-format
msgid "Items: %1"
msgstr "条目:%1"
#. IDS_DIRVIEW_STATUS_COMPARING
-#: Merge.rc:4399
+#: Merge.rc:4409
msgid "Comparing items..."
msgstr "正在比较条目..."
#. IDS_ITEMS_PER_SEC
-#: Merge.rc:4400
+#: Merge.rc:4410
#, c-format
msgid "%.1f[items/sec]"
msgstr "%.1f [条目/秒]"
#. IDS_ERROR_INCOMPARABLE
-#: Merge.rc:4406
+#: Merge.rc:4416
msgid "Select two existing folders/files to compare."
msgstr "选择两个现有的文件或文件夹来进行比较。"
#. IDS_DIRSEL_TAG
-#: Merge.rc:4407
+#: Merge.rc:4417
msgid "Folder Selection"
msgstr "选择文件夹"
#. IDS_OPEN_FILESDIRS
-#: Merge.rc:4408
+#: Merge.rc:4418
msgid "Select two (or three) folders/files to compare."
msgstr "选择两个或三个文件或文件夹来进行比较。"
#. IDS_OPEN_LEFTINVALID
-#: Merge.rc:4409
+#: Merge.rc:4419
msgid "Left (1st) path is invalid!"
msgstr "左侧(组1)路径无效!"
#. IDS_OPEN_MIDDLEINVALID
-#: Merge.rc:4410
+#: Merge.rc:4420
msgid "Middle (2nd) path is invalid!"
msgstr "中间(组2)路径无效!"
#. IDS_OPEN_RIGHTINVALID2
-#: Merge.rc:4411
+#: Merge.rc:4421
msgid "Right (2nd) path is invalid!"
msgstr "右侧(组3)路径无效!"
#. IDS_OPEN_RIGHTINVALID3
-#: Merge.rc:4412
+#: Merge.rc:4422
msgid "Right (3rd) path is invalid!"
msgstr "右侧(组3)路径无效!"
#. IDS_OPEN_BOTHINVALID
-#: Merge.rc:4413
+#: Merge.rc:4423
msgid "Both paths are invalid!"
msgstr "两个路径均无效!"
-#: Merge.rc:4415
+#: Merge.rc:4425
msgid "Left (1st) and Middle (2nd) paths are invalid!"
msgstr "左侧(组1)和中间(组2)路径无效!"
#. IDS_OPEN_LEFTRIGHTINVALID
-#: Merge.rc:4416
+#: Merge.rc:4426
msgid "Left (1st) and Right (3rd) paths are invalid!"
msgstr "左侧(组1)和右侧(组3)路径无效!"
-#: Merge.rc:4418
+#: Merge.rc:4428
msgid "Middle (2nd) and Right (3rd) paths are invalid!"
msgstr "中间(组2)和右侧(组3)路径无效!"
#. IDS_OPEN_ALLINVALID
-#: Merge.rc:4419
+#: Merge.rc:4429
msgid "All paths are invalid!"
msgstr "所有路径均无效!"
#. IDS_OPEN_UNPACKERDISABLED
-#: Merge.rc:4420
+#: Merge.rc:4430
msgid "Only enabled for file comparisons"
msgstr "仅启用文件比较"
#. IDS_OPEN_MISMATCH
-#: Merge.rc:4421
+#: Merge.rc:4431
msgid "Cannot compare file and folder!"
msgstr "不能比较一个文件与一个文件夹!"
#. IDS_ERROR_FILE_NOT_FOUND
-#: Merge.rc:4427
+#: Merge.rc:4437
#, c-format
msgid "File not found: %1"
msgstr "找不到文件:%1"
#. IDS_ERROR_FILE_NOT_UNPACKED
-#: Merge.rc:4428
+#: Merge.rc:4438
#, c-format
msgid "File not unpacked: %1"
msgstr "文件未解包:%1"
#. IDS_ERROR_FILEOPEN
-#: Merge.rc:4429
+#: Merge.rc:4439
#, c-format
msgid ""
"Cannot open file\n"
@@ -5585,12 +5596,12 @@ msgstr ""
"%2"
#. IDS_ERROR_CONF_RESOLVE
-#: Merge.rc:4430
+#: Merge.rc:4440
msgid "Failed to parse conflict file."
msgstr "解析冲突文件失败。"
#. IDS_NOT_CONFLICT_FILE
-#: Merge.rc:4431
+#: Merge.rc:4441
#, c-format
msgid ""
"The file\n"
@@ -5602,7 +5613,7 @@ msgstr ""
"不是一个冲突文件。"
#. IDS_COMPARE_LARGE_FILES
-#: Merge.rc:4432
+#: Merge.rc:4442
msgid ""
"Comparing large files requires significant memory.\n"
"Show only comparison results (not file contents)?"
@@ -5611,28 +5622,28 @@ msgstr ""
"是否只显示比较结果而不显示文件内容?"
#. IDS_SAVE_AS_TITLE
-#: Merge.rc:4438
+#: Merge.rc:4448
msgid "Save As"
msgstr "另存为"
#. IDS_SAVE_FMT
-#: Merge.rc:4439
+#: Merge.rc:4449
#, c-format
msgid "Save changes to %1?"
msgstr "保存更改到 %1?"
#. IDS_SAVEREADONLY_FMT
-#: Merge.rc:4440
+#: Merge.rc:4450
#, c-format
msgid "%1 is read-only. Override? Or 'No' to save as new filename?"
msgstr "%1 标记为只读。您希望覆盖只读文件吗?(选“否”使用新文件名保存)"
#. IDS_ERROR_BACKUP
-#: Merge.rc:4441
+#: Merge.rc:4451
msgid "Error backing up file"
msgstr "备份文件时出错"
-#: Merge.rc:4443
+#: Merge.rc:4453
#, c-format
msgid ""
"Unable to backup original file:\n"
@@ -5646,7 +5657,7 @@ msgstr ""
"仍要继续吗?"
#. IDS_FILESAVE_FAILED
-#: Merge.rc:4444
+#: Merge.rc:4454
#, c-format
msgid ""
"Saving file failed.\n"
@@ -5662,7 +5673,7 @@ msgstr ""
"\t- 使用其他文件名保存(点击“确定”)\n"
"\t- 中止当前操作 (点击“取消”)?"
-#: Merge.rc:4446
+#: Merge.rc:4456
#, c-format
msgid ""
"Plugin '%2' cannot pack changes to left file into '%1'.\n"
@@ -5675,7 +5686,7 @@ msgstr ""
"\n"
"是否将解包版本保存为另一文件?"
-#: Merge.rc:4448
+#: Merge.rc:4458
#, c-format
msgid ""
"Plugin '%2' cannot pack changes to middle file into '%1'.\n"
@@ -5688,7 +5699,7 @@ msgstr ""
"\n"
"是否将解包版本保存为另一文件?"
-#: Merge.rc:4450
+#: Merge.rc:4460
#, c-format
msgid ""
"Plugin '%2' cannot pack changes to right file into '%1'.\n"
@@ -5702,7 +5713,7 @@ msgstr ""
"是否将解包版本保存为另一文件?"
#. IDS_FILECHANGED_ONDISK
-#: Merge.rc:4451
+#: Merge.rc:4461
#, c-format
msgid ""
"Another application updated\n"
@@ -5718,7 +5729,7 @@ msgstr ""
"要覆盖已被修改的文件吗?"
#. IDS_SAVEREADONLY_MULTI
-#: Merge.rc:4452
+#: Merge.rc:4462
#, c-format
msgid ""
"%1\n"
@@ -5728,7 +5739,7 @@ msgstr ""
"文件标记为只读。您要覆盖只读的文件吗?"
#. IDS_FILECHANGED_RESCAN
-#: Merge.rc:4453
+#: Merge.rc:4463
#, c-format
msgid ""
"Another application updated\n"
@@ -5743,22 +5754,22 @@ msgstr ""
"是否重新加载该文件?"
#. IDS_SAVE_LEFT_AS
-#: Merge.rc:4454
+#: Merge.rc:4464
msgid "Save Left File As"
msgstr "左侧文件另存为"
#. IDS_SAVE_MIDDLE_AS
-#: Merge.rc:4455
+#: Merge.rc:4465
msgid "Save Middle File As"
msgstr "中间文件另存为"
#. IDS_SAVE_RIGHT_AS
-#: Merge.rc:4456
+#: Merge.rc:4466
msgid "Save Right File As"
msgstr "右侧文件另存为"
#. IDS_FILE_DISAPPEARED
-#: Merge.rc:4461
+#: Merge.rc:4471
#, c-format
msgid ""
"File\n"
@@ -5770,7 +5781,7 @@ msgstr ""
"已不存在。请保存文件的副本再继续。"
#. IDS_VIEWS_OUTOFSYNC
-#: Merge.rc:4467
+#: Merge.rc:4477
msgid ""
"Cannot merge unsynched documents.\n"
"\n"
@@ -5781,124 +5792,124 @@ msgstr ""
"请刷新文档后再继续。"
#. IDS_BREAK_ON_WHITESPACE
-#: Merge.rc:4472
+#: Merge.rc:4482
msgid "Break at whitespace"
msgstr "以空白分隔"
#. IDS_BREAK_ON_PUNCTUATION
-#: Merge.rc:4473
+#: Merge.rc:4483
msgid "Break at whitespace or punctuation"
msgstr "以空白或标点分隔"
#. IDS_L2M
-#: Merge.rc:4479
+#: Merge.rc:4489
msgid "Copy to &Middle\tAlt+Right"
msgstr "复制到中间(&M)\tAlt+Right"
#. IDS_R2M
-#: Merge.rc:4480
+#: Merge.rc:4490
msgid "Copy to &Middle\tAlt+Left"
msgstr "复制到中间(&M)\tAlt+Left"
#. IDS_COPY_FROM_MIDDLE_R
-#: Merge.rc:4481
+#: Merge.rc:4491
msgid "Copy from Middle\tAlt+Shift+Right"
msgstr "从中间复制\tAlt+Shift+Right"
#. IDS_COPY_FROM_MIDDLE_L
-#: Merge.rc:4482
+#: Merge.rc:4492
msgid "Copy from Middle\tAlt+Shift+Left"
msgstr "从中间复制\tAlt+Shift+Left"
#. IDS_L2MNEXT
-#: Merge.rc:4483
+#: Merge.rc:4493
msgid "Copy to Middle and Advance\tCtrl+Alt+Right"
msgstr "复制到中间并前进\tCtrl+Alt+Right"
#. IDS_R2MNEXT
-#: Merge.rc:4484
+#: Merge.rc:4494
msgid "Copy to Middle and Advance\tCtrl+Alt+Left"
msgstr "复制到中间并前进\tCtrl+Alt+Left"
#. IDS_ALL_MIDDLE
-#: Merge.rc:4485
+#: Merge.rc:4495
msgid "Copy All to Middle"
msgstr "全部复制到中间"
#. IDS_COPY_RIGHT_TO_LEFT
-#: Merge.rc:4491
+#: Merge.rc:4501
#, c-format
msgid "Right to Left (%1)"
msgstr "右侧到左侧 (%1)"
#. IDS_COPY_RIGHT_TO_MIDDLE
-#: Merge.rc:4492
+#: Merge.rc:4502
#, c-format
msgid "Right to Middle (%1)"
msgstr "右侧到中间 (%1)"
#. IDS_COPY_MIDDLE_TO_LEFT
-#: Merge.rc:4493
+#: Merge.rc:4503
#, c-format
msgid "Middle to Left (%1)"
msgstr "中间到左侧 (%1)"
#. IDS_COPY_MIDDLE_TO_RIGHT
-#: Merge.rc:4494
+#: Merge.rc:4504
#, c-format
msgid "Middle to Right (%1)"
msgstr "中间到右侧 (%1)"
#. IDS_COPY_LEFT_TO_RIGHT
-#: Merge.rc:4495
+#: Merge.rc:4505
#, c-format
msgid "Left to Right (%1)"
msgstr "左侧到右侧 (%1)"
#. IDS_COPY_LEFT_TO_MIDDLE
-#: Merge.rc:4496
+#: Merge.rc:4506
#, c-format
msgid "Left to Middle (%1)"
msgstr "左侧到中间 (%1)"
#. IDS_MOVE_LEFT_TO
-#: Merge.rc:4507 Merge.rc:4539
+#: Merge.rc:4517 Merge.rc:4549
#, c-format
msgid "Left to... (%1)"
msgstr "左侧到... (%1)"
#. IDS_MOVE_MIDDLE_TO
-#: Merge.rc:4508 Merge.rc:4540
+#: Merge.rc:4518 Merge.rc:4550
#, c-format
msgid "Middle to... (%1)"
msgstr "中间到... (%1)"
#. IDS_MOVE_RIGHT_TO
-#: Merge.rc:4509 Merge.rc:4541
+#: Merge.rc:4519 Merge.rc:4551
#, c-format
msgid "Right to... (%1)"
msgstr "右侧到... (%1)"
#. IDS_COPY_BOTH_TO
-#: Merge.rc:4510
+#: Merge.rc:4520
#, c-format
msgid "Both to... (%1)"
msgstr "两者到... (%1)"
#. IDS_COPY_ALL_TO
-#: Merge.rc:4511
+#: Merge.rc:4521
#, c-format
msgid "All to... (%1)"
msgstr "全部到... (%1)"
#. IDS_COPY_DIFFERENCES_TO
-#: Merge.rc:4512
+#: Merge.rc:4522
#, c-format
msgid "Differences to... (%1)"
msgstr "差异到... (%1)"
#. IDS_COPY_ONLYDIFFITEMS
-#: Merge.rc:4519
+#: Merge.rc:4529
msgid ""
"Some selected items are identical or skipped.\n"
"Copy only items with differences?"
@@ -5907,64 +5918,64 @@ msgstr ""
"您是否只想复制有差异的条目?"
#. IDS_DEL_LEFT_FMT
-#: Merge.rc:4525
+#: Merge.rc:4535
#, c-format
msgid "Left (%1)"
msgstr "左侧 (%1)"
#. IDS_DEL_MIDDLE_FMT
-#: Merge.rc:4526
+#: Merge.rc:4536
#, c-format
msgid "Middle (%1)"
msgstr "中间 (%1)"
#. IDS_DEL_RIGHT_FMT
-#: Merge.rc:4527
+#: Merge.rc:4537
#, c-format
msgid "Right (%1)"
msgstr "右侧 (%1)"
#. IDS_DEL_BOTH_FMT
-#: Merge.rc:4528
+#: Merge.rc:4538
#, c-format
msgid "Both (%1)"
msgstr "两侧 (%1)"
#. IDS_DEL_ALL_FMT
-#: Merge.rc:4529
+#: Merge.rc:4539
#, c-format
msgid "All (%1)"
msgstr "全部 (%1)"
#. IDS_SELECT_DEST_LEFT
-#: Merge.rc:4545
+#: Merge.rc:4555
msgid "Left Side - Select Destination Folder:"
msgstr "左侧 - 请选择目标文件夹:"
#. IDS_SELECT_DEST_MIDDLE
-#: Merge.rc:4546
+#: Merge.rc:4556
msgid "Middle Side - Select Destination Folder:"
msgstr "中间 - 请选择目标文件夹:"
#. IDS_SELECT_DEST_RIGHT
-#: Merge.rc:4547
+#: Merge.rc:4557
msgid "Right Side - Select Destination Folder:"
msgstr "右侧 - 请选择目标文件夹:"
#. IDS_FILES_AFFECTED_FMT
-#: Merge.rc:4548
+#: Merge.rc:4558
#, c-format
msgid "(%1 Files Affected)"
msgstr "(影响 %1 个文件)"
#. IDS_FILES_AFFECTED_FMT2
-#: Merge.rc:4549
+#: Merge.rc:4559
#, c-format
msgid "(%1 of %2 Files Affected)"
msgstr "(影响 %2 文件中的 %1 个)"
#. IDS_CONFIRM_DELETE_SINGLE
-#: Merge.rc:4555
+#: Merge.rc:4565
#, c-format
msgid ""
"Are you sure you want to delete\n"
@@ -5977,18 +5988,18 @@ msgstr ""
"吗?"
#. IDS_CONFIRM_SINGLE_COPY
-#: Merge.rc:4556
+#: Merge.rc:4566
msgid "Are you sure you want to copy?"
msgstr "您确定要复制?"
#. IDS_CONFIRM_MULTIPLE_COPY
-#: Merge.rc:4557
+#: Merge.rc:4567
#, c-format
msgid "Are you sure you want to copy %d items?"
msgstr "您确定要复制 %d 个条目?"
#. IDS_DIRCMP_NOTSYNC
-#: Merge.rc:4558
+#: Merge.rc:4568
#, c-format
msgid ""
"Operation aborted!\n"
@@ -6008,46 +6019,46 @@ msgstr ""
"请刷新比较窗口。"
#. IDS_CONFIRM_SINGLE_MOVE
-#: Merge.rc:4563
+#: Merge.rc:4573
msgid "Are you sure you want to move?"
msgstr "您确定要移动?"
#. IDS_CONFIRM_MULTIPLE_MOVE
-#: Merge.rc:4564
+#: Merge.rc:4574
#, c-format
msgid "Are you sure you want to move %d items?"
msgstr "您确定要移动 %d 个条目?"
#. IDS_CONFIRM_MOVE_CAPTION
-#: Merge.rc:4566
+#: Merge.rc:4576
msgid "Confirm Move"
msgstr "确认移动"
-#: Merge.rc:4568
+#: Merge.rc:4578
msgid "Close the folder comparison window?"
msgstr "您即将关闭文件夹比较窗口。确定要关闭该窗口吗?"
-#: Merge.rc:4570
+#: Merge.rc:4580
msgid "Close the folder comparison window, which took a long time?"
msgstr "关闭文件夹比较窗口,这需要很长时间?"
#. IDS_ERROR_INVALID_DIR_FILE_NAME
-#: Merge.rc:4571
+#: Merge.rc:4581
msgid "The file or folder name is invalid."
msgstr "文件或文件夹的名称无效。"
#. IDS_ERROR_EXECUTE_FILE
-#: Merge.rc:4577
+#: Merge.rc:4587
#, c-format
msgid "Failed to execute external editor: %1"
msgstr "外部编辑器运行失败:%1"
#. IDS_UNKNOWN_ARCHIVE_FORMAT
-#: Merge.rc:4583
+#: Merge.rc:4593
msgid "Unknown archive format"
msgstr "未知的压缩包格式"
-#: Merge.rc:4585
+#: Merge.rc:4595
msgid ""
"Failed to extract archive.\n"
"Compare as text file?"
@@ -6056,518 +6067,518 @@ msgstr ""
"是否按文本文件格式进行比较?"
#. IDS_COLHDR_FILENAME
-#: Merge.rc:4591
+#: Merge.rc:4601
msgid "Filename"
msgstr "文件名称"
#. IDS_COLHDR_DIR
-#: Merge.rc:4592
+#: Merge.rc:4602
msgctxt "DirView|ColumnHeader"
msgid "Folder"
msgstr "文件夹"
#. IDS_COLHDR_RESULT
-#: Merge.rc:4593
+#: Merge.rc:4603
msgid "Comparison Result"
msgstr "比较结果"
#. IDS_COLHDR_LTIMEM
-#: Merge.rc:4594
+#: Merge.rc:4604
msgid "Left Date"
msgstr "左侧日期"
#. IDS_COLHDR_RTIMEM
-#: Merge.rc:4595
+#: Merge.rc:4605
msgid "Right Date"
msgstr "右侧日期"
#. IDS_COLHDR_MTIMEM
-#: Merge.rc:4596
+#: Merge.rc:4606
msgid "Middle Date"
msgstr "中间日期"
#. IDS_COLHDR_LSIZE
-#: Merge.rc:4598
+#: Merge.rc:4608
msgid "Left Size"
msgstr "左侧大小"
#. IDS_COLHDR_RSIZE
-#: Merge.rc:4599
+#: Merge.rc:4609
msgid "Right Size"
msgstr "右侧大小"
#. IDS_COLHDR_MSIZE
-#: Merge.rc:4604
+#: Merge.rc:4614
msgid "Middle Size"
msgstr "中间大小"
#. IDS_COLHDR_RSIZE_SHORT
-#: Merge.rc:4605
+#: Merge.rc:4615
msgid "Right Size (Short)"
msgstr "右侧大小 (短)"
#. IDS_COLHDR_LSIZE_SHORT
-#: Merge.rc:4606
+#: Merge.rc:4616
msgid "Left Size (Short)"
msgstr "左侧大小 (短)"
#. IDS_COLHDR_MSIZE_SHORT
-#: Merge.rc:4607
+#: Merge.rc:4617
msgid "Middle Size (Short)"
msgstr "中间大小 (短)"
#. IDS_COLHDR_LTIMEC
-#: Merge.rc:4613
+#: Merge.rc:4623
msgid "Left Creation Time"
msgstr "左侧创建时间"
#. IDS_COLHDR_RTIMEC
-#: Merge.rc:4614
+#: Merge.rc:4624
msgid "Right Creation Time"
msgstr "右侧创建时间"
#. IDS_COLHDR_MTIMEC
-#: Merge.rc:4615
+#: Merge.rc:4625
msgid "Middle Creation Time"
msgstr "中间创建时间"
#. IDS_COLHDR_NEWER
-#: Merge.rc:4616
+#: Merge.rc:4626
msgid "Newer File"
msgstr "较新的文件"
#. IDS_COLHDR_LVERSION
-#: Merge.rc:4617
+#: Merge.rc:4627
msgid "Left File Version"
msgstr "左侧文件版本"
#. IDS_COLHDR_RVERSION
-#: Merge.rc:4618
+#: Merge.rc:4628
msgid "Right File Version"
msgstr "右侧文件版本"
#. IDS_COLHDR_MVERSION
-#: Merge.rc:4619
+#: Merge.rc:4629
msgid "Middle File Version"
msgstr "中间文件版本"
#. IDS_COLHDR_RESULT_ABBR
-#: Merge.rc:4620
+#: Merge.rc:4630
msgid "Short Result"
msgstr "简短结果"
#. IDS_COLHDR_LATTRIBUTES
-#: Merge.rc:4621
+#: Merge.rc:4631
msgid "Left Attributes"
msgstr "左侧属性"
#. IDS_COLHDR_RATTRIBUTES
-#: Merge.rc:4622
+#: Merge.rc:4632
msgid "Right Attributes"
msgstr "右侧属性"
#. IDS_COLHDR_MATTRIBUTES
-#: Merge.rc:4623
+#: Merge.rc:4633
msgid "Middle Attributes"
msgstr "中间属性"
#. IDS_COLHDR_LEOL_TYPE
-#: Merge.rc:4628
+#: Merge.rc:4638
msgid "Left EOL"
msgstr "左侧换行符"
#. IDS_COLHDR_MEOL_TYPE
-#: Merge.rc:4629
+#: Merge.rc:4639
msgid "Middle EOL"
msgstr "中间换行符"
#. IDS_COLHDR_REOL_TYPE
-#: Merge.rc:4630
+#: Merge.rc:4640
msgid "Right EOL"
msgstr "右侧换行符"
#. IDS_COLHDR_LENCODING
-#: Merge.rc:4636
+#: Merge.rc:4646
msgid "Left Encoding"
msgstr "左侧文件编码"
#. IDS_COLHDR_RENCODING
-#: Merge.rc:4637
+#: Merge.rc:4647
msgid "Right Encoding"
msgstr "右侧文件编码"
#. IDS_COLHDR_MENCODING
-#: Merge.rc:4638
+#: Merge.rc:4648
msgid "Middle Encoding"
msgstr "中间文件编码"
#. IDS_COLHDR_NIDIFFS
-#: Merge.rc:4639
+#: Merge.rc:4649
msgid "Ignored Diff"
msgstr "忽略的差异"
#. IDS_COLHDR_BINARY
-#: Merge.rc:4641
+#: Merge.rc:4651
msgctxt "DirView|ColumnHeader"
msgid "Binary"
msgstr "二进制"
#. IDS_PLUGINS_TYPE_UNPACKER
-#: Merge.rc:4642 Merge.rc:4959
+#: Merge.rc:4652 Merge.rc:4969
msgid "Unpacker"
msgstr "解包插件"
#. IDS_PLUGIN_TYPE4
-#: Merge.rc:4643 Merge.rc:4960 Merge.rc:5267
+#: Merge.rc:4653 Merge.rc:4970 Merge.rc:5277
msgid "Prediffer"
msgstr "预比较插件"
#. IDS_COLHDR_LEFT
-#: Merge.rc:4644
+#: Merge.rc:4654
msgid "Left"
msgstr "左侧"
#. IDS_COLHDR_MIDDLE
-#: Merge.rc:4645
+#: Merge.rc:4655
msgid "Middle"
msgstr "中间"
#. IDS_COLHDR_RIGHT
-#: Merge.rc:4646
+#: Merge.rc:4656
msgid "Right"
msgstr "右侧"
#. IDS_COLHDR_DIFF
-#: Merge.rc:4647
+#: Merge.rc:4657
msgid "Diff"
msgstr "差异"
#. IDS_COLHDR_LEFT_DUPLICATE
-#: Merge.rc:4648
+#: Merge.rc:4658
msgid "Left Duplicate Count"
msgstr "左侧重复计数"
#. IDS_COLHDR_RIGHT_DUPLICATE
-#: Merge.rc:4649
+#: Merge.rc:4659
msgid "Right Duplicate Count"
msgstr "右侧重复计数"
#. IDS_COLHDR_MIDDLE_DUPLICATE
-#: Merge.rc:4650
+#: Merge.rc:4660
msgid "Middle Duplicate Count"
msgstr "中间重复计数"
#. IDS_COLHDR_MOVE
-#: Merge.rc:4651
+#: Merge.rc:4661
msgid "Move"
msgstr "移动"
#. IDS_PRPCAT_AUDIO
-#: Merge.rc:4658
+#: Merge.rc:4668
msgid "Audio"
msgstr "音频"
#. IDS_PRPCAT_CALENDAR
-#: Merge.rc:4659
+#: Merge.rc:4669
msgid "Calendar"
msgstr "日历"
#. IDS_PRPCAT_COMMUNICATION
-#: Merge.rc:4660
+#: Merge.rc:4670
msgid "Communication"
msgstr "通讯"
#. IDS_PRPCAT_CONTACT
-#: Merge.rc:4661
+#: Merge.rc:4671
msgid "Contact"
msgstr "联系人"
#. IDS_PRPCAT_DEVICES
-#: Merge.rc:4662
+#: Merge.rc:4672
msgid "Devices"
msgstr "设备"
#. IDS_PRPCAT_DOCUMENT
-#: Merge.rc:4663
+#: Merge.rc:4673
msgid "Document"
msgstr "文档"
#. IDS_PRPCAT_HOME
-#: Merge.rc:4664
+#: Merge.rc:4674
msgid "Home"
msgstr "家"
#. IDS_PRPCAT_JOURNAL
-#: Merge.rc:4666
+#: Merge.rc:4676
msgid "Journal"
msgstr "日志"
#. IDS_PRPCAT_LINK
-#: Merge.rc:4667
+#: Merge.rc:4677
msgid "Link"
msgstr "链接"
#. IDS_PRPCAT_MEDIA
-#: Merge.rc:4668
+#: Merge.rc:4678
msgid "Media"
msgstr "媒体"
#. IDS_PRPCAT_MUSIC
-#: Merge.rc:4670
+#: Merge.rc:4680
msgid "Music"
msgstr "音乐"
#. IDS_PRPCAT_NOTE
-#: Merge.rc:4671
+#: Merge.rc:4681
msgid "Note"
msgstr "记事"
#. IDS_PRPCAT_PHOTO
-#: Merge.rc:4672
+#: Merge.rc:4682
msgid "Photo"
msgstr "照片"
#. IDS_PRPCAT_RECORDEDTV
-#: Merge.rc:4673
+#: Merge.rc:4683
msgid "RecordedTV"
msgstr "电视节目"
#. IDS_PRPCAT_SEARCH
-#: Merge.rc:4674
+#: Merge.rc:4684
msgid "Search"
msgstr "搜索"
#. IDS_PRPCAT_SECURITY
-#: Merge.rc:4675
+#: Merge.rc:4685
msgid "Security"
msgstr "安全"
#. IDS_PRPCAT_SOFTWARE
-#: Merge.rc:4676
+#: Merge.rc:4686
msgid "Software"
msgstr "软件"
#. IDS_PRPCAT_TASK
-#: Merge.rc:4677
+#: Merge.rc:4687
msgid "Task"
msgstr "任务"
#. IDS_PRPCAT_VIDEO
-#: Merge.rc:4678
+#: Merge.rc:4688
msgid "Video"
msgstr "视频"
#. IDS_PRPCAT_HASH
-#: Merge.rc:4679
+#: Merge.rc:4689
msgid "Hash"
msgstr "哈希值"
#. IDS_CANT_COMPARE_FILES
-#: Merge.rc:4685
+#: Merge.rc:4695
msgid "Unable to compare files"
msgstr "无法比较文件"
#. IDS_ABORTED_ITEM
-#: Merge.rc:4686
+#: Merge.rc:4696
msgid "Item aborted"
msgstr "条目已取消"
#. IDS_FILE_SKIPPED
-#: Merge.rc:4687
+#: Merge.rc:4697
msgid "File skipped"
msgstr "文件已跳过"
#. IDS_DIR_SKIPPED
-#: Merge.rc:4688
+#: Merge.rc:4698
msgid "Folder skipped"
msgstr "文件夹已跳过"
#. IDS_LEFT_ONLY_IN_FMT
-#: Merge.rc:4689
+#: Merge.rc:4699
#, c-format
msgid "Left only: %1"
msgstr "仅在左侧:%1"
#. IDS_MIDDLE_ONLY_IN_FMT
-#: Merge.rc:4690
+#: Merge.rc:4700
#, c-format
msgid "Middle only: %1"
msgstr "仅在中间:%1"
#. IDS_RIGHT_ONLY_IN_FMT
-#: Merge.rc:4691
+#: Merge.rc:4701
#, c-format
msgid "Right only: %1"
msgstr "仅在右侧:%1"
#. IDS_DOES_NOT_EXIST_IN_FMT
-#: Merge.rc:4692
+#: Merge.rc:4702
#, c-format
msgid "Does not exist in %1"
msgstr "%1 中不存在"
#. IDS_BIN_FILES_SAME
-#: Merge.rc:4693
+#: Merge.rc:4703
msgid "Binary files are identical"
msgstr "二进制文件完全相同"
#. IDS_BIN_FILES_DIFF
-#: Merge.rc:4699
+#: Merge.rc:4709
msgid "Binary files are different"
msgstr "二进制文件不同"
#. IDS_FILES_ARE_DIFFERENT
-#: Merge.rc:4700
+#: Merge.rc:4710
msgid "Files are different"
msgstr "文件不同"
#. IDS_FOLDERS_ARE_DIFFERENT
-#: Merge.rc:4701
+#: Merge.rc:4711
msgid "Folders are different"
msgstr "文件夹不同"
#. IDS_LEFTONLY
-#: Merge.rc:4702
+#: Merge.rc:4712
msgid "Left Only"
msgstr "只存在左侧"
#. IDS_RIGHTONLY
-#: Merge.rc:4703
+#: Merge.rc:4713
msgid "Right Only"
msgstr "只存在右侧"
#. IDS_MIDDLEONLY
-#: Merge.rc:4704
+#: Merge.rc:4714
msgid "Middle Only"
msgstr "只存在中间"
#. IDS_NOITEMLEFT
-#: Merge.rc:4705
+#: Merge.rc:4715
msgid "No item in left"
msgstr "左侧无条目"
#. IDS_NOITEMRIGHT
-#: Merge.rc:4706
+#: Merge.rc:4716
msgid "No item in right"
msgstr "右侧无条目"
#. IDS_NOITEMMIDDLE
-#: Merge.rc:4707
+#: Merge.rc:4717
msgid "No item in middle"
msgstr "中间无条目"
#. IDS_CMPRES_ERROR
-#: Merge.rc:4709
+#: Merge.rc:4719
msgid "Error"
msgstr "错误"
#. IDS_TEXT_FILES_SAME
-#: Merge.rc:4710
+#: Merge.rc:4720
msgid "Text files are identical"
msgstr "文本文件完全相同"
#. IDS_LEFTONLY_DIFF
-#: Merge.rc:4711
+#: Merge.rc:4721
msgid " (Middle and right are identical)"
msgstr " (中间和右侧完全相同)"
#. IDS_MIDDLEONLY_DIFF
-#: Merge.rc:4712
+#: Merge.rc:4722
msgid " (Left and right are identical)"
msgstr " (左侧和右侧完全相同)"
#. IDS_RIGHTONLY_DIFF
-#: Merge.rc:4713
+#: Merge.rc:4723
msgid " (Left and middle are identical)"
msgstr " (左侧和中间完全相同)"
#. IDS_PATH_MISMATCH
-#: Merge.rc:4714
+#: Merge.rc:4724
msgid " (paths differ)"
msgstr " (路径不同)"
#. IDS_TEXT_FILES_DIFF
-#: Merge.rc:4715
+#: Merge.rc:4725
msgid "Text files are different"
msgstr "文本文件不同"
#. IDS_IMAGE_FILES_SAME
-#: Merge.rc:4716
+#: Merge.rc:4726
msgid "Image files are identical"
msgstr "图像文件相同"
#. IDS_IMAGE_FILES_DIFF
-#: Merge.rc:4717
+#: Merge.rc:4727
msgid "Image files are different"
msgstr "图像文件有差异"
#. IDS_EXPR_DIFF
-#: Merge.rc:4718
+#: Merge.rc:4728
#, c-format
msgid "Files are different (expr: %1)"
msgstr "文件不同(表达式:%1)"
#. IDS_HASH_GROUP
-#: Merge.rc:4719
+#: Merge.rc:4729
#, c-format
msgid "Group%d"
msgstr "分组 %d"
#. IDS_RENAME_MOVE_DETECTION_DISALBED
-#: Merge.rc:4720
+#: Merge.rc:4730
msgctxt "Options dialog|Compare|Folder|Detect renames and moves"
msgid "Disabled"
msgstr "已禁用"
#. IDS_RENAME_MOVE_DETECTION_RENAME
-#: Merge.rc:4721
+#: Merge.rc:4731
msgid "Detect renames"
msgstr "检测重命名"
#. IDS_RENAME_MOVE_DETECTION_RENAME_MOVE
-#: Merge.rc:4722
+#: Merge.rc:4732
msgid "Detect renames and moves"
msgstr "检测重命名和移动"
#. IDS_RENAME_MOVE_MERGE_MODE_RENAME
-#: Merge.rc:4723
+#: Merge.rc:4733
msgid "Merge renames"
msgstr "合并重命名的文件"
#. IDS_RENAME_MOVE_MERGE_MODE_RENAME_MOVE
-#: Merge.rc:4724
+#: Merge.rc:4734
msgid "Merge renames and moves"
msgstr "合并重命名和被移动的文件"
#. IDS_RENAMED
-#: Merge.rc:4725
+#: Merge.rc:4735
msgid "Renamed"
msgstr "重命名的"
#. IDS_MOVED
-#: Merge.rc:4726
+#: Merge.rc:4736
msgid "Moved"
msgstr "移动的"
#. IDS_RENAMED_MOVED
-#: Merge.rc:4727
+#: Merge.rc:4737
msgid "Renamed/Moved"
msgstr "重命名的/移动的"
#. IDS_RENAMED_MOVED_ITEMS
-#: Merge.rc:4728
+#: Merge.rc:4738
#, c-format
msgid "(%1 items)"
msgstr "(%1 条目)"
#. IDS_RENAMED_MOVED_RESULT
-#: Merge.rc:4729
+#: Merge.rc:4739
#, c-format
msgid "%1 (set %2): "
msgstr "%1 (集合 %2):"
#. IDS_SWITCH_FLAT_MODE
-#: Merge.rc:4730
+#: Merge.rc:4740
msgid ""
"Some moved items have been merged.\n"
"In Tree Mode, these items may appear in positions that do not reflect the actual folder structure, which can be confusing.\n"
@@ -6578,235 +6589,235 @@ msgstr ""
"是否要切换到扁平模式?"
#. IDS_ELAPSED_TIME
-#: Merge.rc:4736
+#: Merge.rc:4746
#, c-format
msgid "Elapsed time: %ld ms"
msgstr "执行时间:%ld 毫秒"
#. IDS_STATUS_SELITEM1
-#: Merge.rc:4737
+#: Merge.rc:4747
msgid "1 item selected"
msgstr "选中了 1 个条目"
#. IDS_STATUS_SELITEMS
-#: Merge.rc:4738
+#: Merge.rc:4748
#, c-format
msgid "%1 items selected"
msgstr "选中了 %1 个条目"
#. IDS_COLDESC_FILENAME
-#: Merge.rc:4744
+#: Merge.rc:4754
msgid "Filename or folder name."
msgstr "文件名或文件夹名。"
#. IDS_COLDESC_DIR
-#: Merge.rc:4745
+#: Merge.rc:4755
msgid "Subfolder name when subfolders are included."
msgstr "所处子文件夹名称。"
#. IDS_COLDESC_RESULT
-#: Merge.rc:4746
+#: Merge.rc:4756
msgid "Comparison result, long form."
msgstr "比较结果,长格式。"
#. IDS_COLDESC_LTIMEM
-#: Merge.rc:4751
+#: Merge.rc:4761
msgid "Left side modification date."
msgstr "左侧的最后修改日期。"
#. IDS_COLDESC_RTIMEM
-#: Merge.rc:4752
+#: Merge.rc:4762
msgid "Right side modification date."
msgstr "右侧的最后修改日期。"
#. IDS_COLDESC_MTIMEM
-#: Merge.rc:4753
+#: Merge.rc:4763
msgid "Middle side modification date."
msgstr "中间的最后修改日期。"
#. IDS_COLDESC_EXTENSION
-#: Merge.rc:4754
+#: Merge.rc:4764
msgid "File's extension."
msgstr "文件的扩展名。"
#. IDS_COLDESC_LSIZE
-#: Merge.rc:4755
+#: Merge.rc:4765
msgid "Left file size in bytes."
msgstr "左侧的文件大小字节数。"
#. IDS_COLDESC_RSIZE
-#: Merge.rc:4756
+#: Merge.rc:4766
msgid "Right file size in bytes."
msgstr "右侧的文件大小字节数。"
#. IDS_COLDESC_MSIZE
-#: Merge.rc:4757
+#: Merge.rc:4767
msgid "Middle file size in bytes."
msgstr "中间的文件大小字节数。"
#. IDS_COLDESC_LSIZE_SHORT
-#: Merge.rc:4758
+#: Merge.rc:4768
msgid "Left file size abbreviated."
msgstr "左侧的文件大小简短表示。"
#. IDS_COLDESC_RSIZE_SHORT
-#: Merge.rc:4759
+#: Merge.rc:4769
msgid "Right file size abbreviated."
msgstr "右侧的文件大小简短表示。"
#. IDS_COLDESC_MSIZE_SHORT
-#: Merge.rc:4760
+#: Merge.rc:4770
msgid "Middle file size abbreviated."
msgstr "中间的文件大小简短表示。"
#. IDS_COLDESC_LTIMEC
-#: Merge.rc:4766
+#: Merge.rc:4776
msgid "Left side creation time."
msgstr "左侧的创建时间。"
#. IDS_COLDESC_RTIMEC
-#: Merge.rc:4767
+#: Merge.rc:4777
msgid "Right side creation time."
msgstr "右侧的创建时间。"
#. IDS_COLDESC_MTIMEC
-#: Merge.rc:4768
+#: Merge.rc:4778
msgid "Middle side creation time."
msgstr "中间的创建时间。"
#. IDS_COLDESC_NEWER
-#: Merge.rc:4769
+#: Merge.rc:4779
msgid "Tells which side has newer modification date."
msgstr "显示哪边是较晚才被修改。"
#. IDS_COLDESC_LVERSION
-#: Merge.rc:4770
+#: Merge.rc:4780
msgid "Left side file version, only for some file types."
msgstr "左侧的文件版本,只对部分文件类型有效。"
#. IDS_COLDESC_RVERSION
-#: Merge.rc:4771
+#: Merge.rc:4781
msgid "Right side file version, only for some file types."
msgstr "右侧的文件版本,只对部分文件类型有效。"
#. IDS_COLDESC_MVERSION
-#: Merge.rc:4776
+#: Merge.rc:4786
msgid "Middle side file version, only for some file types."
msgstr "中间的文件版本,只对部分文件类型有效。"
#. IDS_COLDESC_RESULT_ABBR
-#: Merge.rc:4777
+#: Merge.rc:4787
msgid "Short comparison result."
msgstr "简短格式的比较结果。"
#. IDS_COLDESC_LATTRIBUTES
-#: Merge.rc:4778
+#: Merge.rc:4788
msgid "Left side attributes."
msgstr "左侧的属性。"
#. IDS_COLDESC_RATTRIBUTES
-#: Merge.rc:4779
+#: Merge.rc:4789
msgid "Right side attributes."
msgstr "右侧的属性。"
#. IDS_COLDESC_MATTRIBUTES
-#: Merge.rc:4780
+#: Merge.rc:4790
msgid "Middle side attributes."
msgstr "中间的属性。"
#. IDS_COLDESC_LEOL_TYPE
-#: Merge.rc:4781
+#: Merge.rc:4791
msgid "Left side file EOL type."
msgstr "左侧文件的换行符类型。"
#. IDS_COLDESC_REOL_TYPE
-#: Merge.rc:4782
+#: Merge.rc:4792
msgid "Right side file EOL type."
msgstr "右侧文件的换行符类型。"
#. IDS_COLDESC_MEOL_TYPE
-#: Merge.rc:4783
+#: Merge.rc:4793
msgid "Middle side file EOL type."
msgstr "中间文件的换行符类型。"
#. IDS_COLDESC_LENCODING
-#: Merge.rc:4789
+#: Merge.rc:4799
msgid "Left side encoding."
msgstr "左侧文件的字符编码。"
#. IDS_COLDESC_RENCODING
-#: Merge.rc:4790
+#: Merge.rc:4800
msgid "Right side encoding."
msgstr "右侧文件的字符编码。"
#. IDS_COLDESC_MENCODING
-#: Merge.rc:4791
+#: Merge.rc:4801
msgid "Middle side encoding."
msgstr "中间文件的字符编码。"
#. IDS_COLDESC_NIDIFFS
-#: Merge.rc:4792
+#: Merge.rc:4802
msgid "Number of ignored differences in file. Ignored and cannot be merged."
msgstr "文件中已忽略的差异数。这些差异已被 WinMerge 忽略,无法合并它们。"
#. IDS_COLDESC_NSDIFFS
-#: Merge.rc:4793
+#: Merge.rc:4803
msgid "Number of differences in file (excluding ignored)."
msgstr "文件中的差异数。不包括忽略的差异。"
#. IDS_COLDESC_BINARY
-#: Merge.rc:4794
+#: Merge.rc:4804
msgid "Shows an asterisk (*) if the file is binary."
msgstr "在二进制文件处显示星号(*)。"
#. IDS_COLDESC_UNPACKER
-#: Merge.rc:4795
+#: Merge.rc:4805
msgid "Unpacker plugin name or pipeline."
msgstr "解包插件名称或流水线。"
#. IDS_COLDESC_PREDIFFER
-#: Merge.rc:4796
+#: Merge.rc:4806
msgid "Prediffer plugin name or pipeline."
msgstr "预比较插件名称或流水线。"
#. IDS_DIRECTORY_REPORT_TITLE
-#: Merge.rc:4802
+#: Merge.rc:4812
#, c-format
msgid "Compare %1 with %2"
msgstr "比较 %1 和 %2"
#. IDS_DIRECTORY_REPORT_TITLE3
-#: Merge.rc:4803
+#: Merge.rc:4813
#, c-format
msgid "Compare %1 with %2 and %3"
msgstr "比较 %1、%2 和 %3"
#. IDS_REPORT_COMMALIST
-#: Merge.rc:4804
+#: Merge.rc:4814
msgid "Comma-separated list"
msgstr "逗号分隔的列表"
#. IDS_REPORT_TABLIST
-#: Merge.rc:4805
+#: Merge.rc:4815
msgid "Tab-separated list"
msgstr "制表符分隔的列表"
#. IDS_REPORT_SIMPLEHTML
-#: Merge.rc:4806
+#: Merge.rc:4816
msgid "Simple HTML"
msgstr "简单 HTML"
#. IDS_REPORT_SIMPLEXML
-#: Merge.rc:4807
+#: Merge.rc:4817
msgid "Simple XML"
msgstr "简单 XML"
-#: Merge.rc:4809
+#: Merge.rc:4819
msgid "Report file already exists. Overwrite?"
msgstr "报告文件已经存在,是否要覆盖已存在的文件?"
#. IDS_REPORT_ERROR
-#: Merge.rc:4814
+#: Merge.rc:4824
#, c-format
msgid ""
"Error creating the report:\n"
@@ -6816,27 +6827,27 @@ msgstr ""
"%1"
#. IDS_REPORT_SUCCESS
-#: Merge.rc:4815
+#: Merge.rc:4825
msgid "Report created successfully."
msgstr "报告创建成功."
#. IDS_SYNCPOINT_LASTBLOCK
-#: Merge.rc:4821
+#: Merge.rc:4831
msgid "Cannot add a synchronization point at this line."
msgstr "无法在该行添加同步点。"
#. IDS_FILE_TO_ITSELF
-#: Merge.rc:4827
+#: Merge.rc:4837
msgid "Same file is opened in both panes."
msgstr "两侧打开的是同一个文件。"
#. IDS_FILESSAME
-#: Merge.rc:4828
+#: Merge.rc:4838
msgid "Selected files are identical."
msgstr "选中的文件完全相同。"
#. IDS_FILESSAME_CURCFG
-#: Merge.rc:4829
+#: Merge.rc:4839
msgid ""
"Selected files are identical (with current settings).\r\n"
"Checking binary identity..."
@@ -6845,7 +6856,7 @@ msgstr ""
"正在检查二进制的等同性..."
#. IDS_FILESSAME_BINERROR
-#: Merge.rc:4830
+#: Merge.rc:4840
msgid ""
"Selected files are identical (with current settings).\r\n"
"But binary comparison failed."
@@ -6854,12 +6865,12 @@ msgstr ""
"但二进制比较失败。"
#. IDS_FILESSAME_BINSAME
-#: Merge.rc:4831
+#: Merge.rc:4841
msgid "Selected files are identical (binary match)."
msgstr "所选的文件完全相同(且二进制匹配)。"
#. IDS_FILESSAME_BINDIFF
-#: Merge.rc:4832
+#: Merge.rc:4842
msgid ""
"Selected files are identical (with current settings).\r\n"
"But differ at the binary level."
@@ -6868,17 +6879,17 @@ msgstr ""
"但在二进制层面存在差异。"
#. IDS_FILEERROR
-#: Merge.rc:4833
+#: Merge.rc:4843
msgid "An error occurred while comparing files."
msgstr "比较文件时发生错误。"
#. IDS_TEMP_FILEERROR
-#: Merge.rc:4834
+#: Merge.rc:4844
msgid "Could not create temporary files. Check your temporary path settings."
msgstr "无法创建临时文件。请检查您的临时路径设置。"
#. IDS_SUGGEST_IGNOREEOL
-#: Merge.rc:4835
+#: Merge.rc:4845
msgid ""
"Files use different EOL.\n"
"\n"
@@ -6893,17 +6904,17 @@ msgstr ""
"在 \"选项 \"的 \"比较 \"部分设置 \"忽略换行符差异(Windows/Unix/Mac)\"。"
#. IDS_INVALID_DIRECTORY
-#: Merge.rc:4836
+#: Merge.rc:4846
msgid "Selected folder is invalid."
msgstr "所选的文件夹无效。"
#. IDS_CANNOT_OPEN_BINARYFILE
-#: Merge.rc:4837
+#: Merge.rc:4847
msgid "Cannot open a binary file in Editor."
msgstr "无法用编辑器打开二进制文件。"
#. IDS_CREATE_PAIR_FOLDER
-#: Merge.rc:4838
+#: Merge.rc:4848
#, c-format
msgid ""
"Create matching folder:\n"
@@ -6917,41 +6928,41 @@ msgstr ""
"并且打开这两个文件夹?"
#. IDS_CONFIRM_COPY_ALL_DIFFS
-#: Merge.rc:4839
+#: Merge.rc:4849
msgid "Copy all differences to other file?"
msgstr "您确定要把所有的差异复制到另一个文件吗?"
#. IDS_MOVE_TO_NEXTFILE
-#: Merge.rc:4844
+#: Merge.rc:4854
msgid "Move to next file?"
msgstr "您是否要跳转到下一个文件?"
#. IDS_MOVE_TO_PREVFILE
-#: Merge.rc:4845
+#: Merge.rc:4855
msgid "Move to previous file?"
msgstr "您是否要跳转到上一个文件?"
#. IDS_MOVE_TO_NEXTPAGE
-#: Merge.rc:4846
+#: Merge.rc:4856
msgid "Move to next page?"
msgstr "您是否要跳转到下一页?"
#. IDS_MOVE_TO_PREVPAGE
-#: Merge.rc:4847
+#: Merge.rc:4857
msgid "Move to previous page?"
msgstr "您是否要跳转到上一页?"
#. IDS_MOVE_TO_FIRSTFILE
-#: Merge.rc:4848
+#: Merge.rc:4858
msgid "Move to first file?"
msgstr "您是否要跳转到第一个文件?"
#. IDS_MOVE_TO_LASTFILE
-#: Merge.rc:4849
+#: Merge.rc:4859
msgid "Move to last file?"
msgstr "您是否要跳转到最后一个文件?"
-#: Merge.rc:4856
+#: Merge.rc:4866
#, c-format
msgid ""
"Different codepages: left (cp%d), right (cp%d).\n"
@@ -6962,51 +6973,51 @@ msgstr ""
"分别以不同代码页显示将会有较好的效果,但是合并/复制会有风险。\n"
"您要以 Windows 默认的代码页显示两个文件吗?(推荐)"
-#: Merge.rc:4858
+#: Merge.rc:4868
msgid "Information lost due to encoding errors: both files"
msgstr "由于文件的字符编码错误导致两个文件的信息丢失"
-#: Merge.rc:4860
+#: Merge.rc:4870
msgid "Information lost due to encoding errors: first file"
msgstr "由于文件的字符编码错误导致第一个文件的信息丢失"
-#: Merge.rc:4862
+#: Merge.rc:4872
msgid "Information lost due to encoding errors: second file"
msgstr "由于文件的字符编码错误导致第二个文件的信息丢失"
-#: Merge.rc:4864
+#: Merge.rc:4874
msgid "Information lost due to encoding errors: third file"
msgstr "由于文件的字符编码错误导致第三个文件的信息丢失"
#. IDS_LINEDIFF_NODIFF
-#: Merge.rc:4870
+#: Merge.rc:4880
msgid "No difference"
msgstr "没有差异"
#. IDS_LINEDIFF_NODIFF_CAPTION
-#: Merge.rc:4871
+#: Merge.rc:4881
msgid "Line difference"
msgstr "行内差异"
#. IDS_NUM_REPLACED
-#: Merge.rc:4877
+#: Merge.rc:4887
#, c-format
msgid "Replaced %1 string(s)."
msgstr "已替换 %1 个字符串。"
#. IDS_EDIT_TEXT_NOT_FOUND
-#: Merge.rc:4878
+#: Merge.rc:4888
#, c-format
msgid "Cannot find string \"%s\"."
msgstr "找不到字符串“%s”。"
#. IDS_MERGE_MODE
-#: Merge.rc:4884
+#: Merge.rc:4894
msgid "Entering Merge Mode. Press F9 to turn off."
msgstr "您正在进入合并模式。如果您想关闭合并模式,请按 F9 键。"
#. IDS_AUTO_MERGE
-#: Merge.rc:4890
+#: Merge.rc:4900
#, c-format
msgid ""
"Automatic merges: %1\n"
@@ -7016,99 +7027,99 @@ msgstr ""
"未解决的冲突数:%2"
#. IDS_CODEPAGE_MERGED
-#: Merge.rc:4891
+#: Merge.rc:4901
msgid "Codepage change merged."
msgstr "代码页的变更已被合并。"
#. IDS_CODEPAGE_CONFLICT
-#: Merge.rc:4892
+#: Merge.rc:4902
msgid "Codepage changes are conflicting."
msgstr "代码页的变更存在冲突。"
#. IDS_EOL_MERGED
-#: Merge.rc:4893
+#: Merge.rc:4903
msgid "EOL change merged."
msgstr "换行符的变更已被合并。"
#. IDS_EOL_CONFLICT
-#: Merge.rc:4894
+#: Merge.rc:4904
msgid "EOL changes are conflicting."
msgstr "换行符的变更存在冲突。"
#. IDS_LOCBAR_CAPTION
-#: Merge.rc:4900
+#: Merge.rc:4910
msgid "Location Pane"
msgstr "定位窗格"
#. IDS_DIFFBAR_CAPTION
-#: Merge.rc:4901
+#: Merge.rc:4911
msgid "Diff Pane"
msgstr "差异窗格"
#. IDS_DIFF_SUCCEEDED
-#: Merge.rc:4908
+#: Merge.rc:4918
msgid "Patch file written."
msgstr "补丁文件写入成功。"
#. IDS_DIFF_ITEM1NOTFOUND
-#: Merge.rc:4909
+#: Merge.rc:4919
msgid "First item not found!"
msgstr "找不到第一个条目!"
#. IDS_DIFF_ITEM2NOTFOUND
-#: Merge.rc:4910
+#: Merge.rc:4920
msgid "Second item not found!"
msgstr "找不到第二个条目!"
#. IDS_DIFF_FILEOVERWRITE
-#: Merge.rc:4911
+#: Merge.rc:4921
msgid "Patch file already exists. Overwrite?"
msgstr "补丁文件已经存在。是否覆盖?"
#. IDS_DIFF_SELECTEDFILES
-#: Merge.rc:4912
+#: Merge.rc:4922
#, c-format
msgid "[%1 files selected]"
msgstr "[选中 %1 个文件]"
#. IDS_DIFF_NORMAL
-#: Merge.rc:4913
+#: Merge.rc:4923
msgid "Normal"
msgstr "正常格式 (Normal)"
#. IDS_DIFF_CONTEXT
-#: Merge.rc:4914
+#: Merge.rc:4924
msgid "Context"
msgstr "上下文格式 (Context)"
#. IDS_DIFF_UNIFIED
-#: Merge.rc:4915
+#: Merge.rc:4925
msgid "Unified"
msgstr "合并格式 (Unified)"
#. IDS_FILEWRITE_ERROR
-#: Merge.rc:4917
+#: Merge.rc:4927
#, c-format
msgid "Could not write to file %1."
msgstr "未能写入文件 %1。"
#. IDS_PATH_NOT_ABSOLUTE
-#: Merge.rc:4918
+#: Merge.rc:4928
#, c-format
msgid "Output path is not absolute: %1"
msgstr "指定的路径不是绝对路径:%1"
#. IDS_MUST_SPECIFY_OUTPUT
-#: Merge.rc:4919
+#: Merge.rc:4929
msgid "Specify an output file."
msgstr "请指定输出文件。"
-#: Merge.rc:4921
+#: Merge.rc:4931
msgid "Cannot create patch from binary files."
msgstr "无法为二进制文件创建补丁。"
#. IDS_SAVEFILES_FORPATCH
-#: Merge.rc:4922
+#: Merge.rc:4932
msgid ""
"Save all files first.\n"
"\n"
@@ -7119,12 +7130,12 @@ msgstr ""
"创建补丁需要文件中没有未保存的变更。"
#. IDS_FOLDER_NOTEXIST
-#: Merge.rc:4923
+#: Merge.rc:4933
msgid "Folder does not exist."
msgstr "文件夹不存在。"
#. IDS_NO_ZIP_SUPPORT
-#: Merge.rc:4928
+#: Merge.rc:4938
msgid ""
"Archive support not enabled.\n"
"7-Zip and/or Merge7z*.dll not found.\n"
@@ -7135,37 +7146,37 @@ msgstr ""
"请查看手册获取有关压缩包支持及如何启用的更多信息。"
#. IDS_OPT_EXPORT_CAPTION
-#: Merge.rc:4929
+#: Merge.rc:4939
msgid "Select file for export"
msgstr "选择导出文件"
#. IDS_OPT_IMPORT_CAPTION
-#: Merge.rc:4930
+#: Merge.rc:4940
msgid "Select file for import"
msgstr "选择导入文件"
#. IDS_OPT_IMPORT_DONE
-#: Merge.rc:4931
+#: Merge.rc:4941
msgid "Options imported from file."
msgstr "已从该文件导入选项。"
#. IDS_OPT_EXPORT_DONE
-#: Merge.rc:4932
+#: Merge.rc:4942
msgid "Options exported to file."
msgstr "选项已导出到该文件。"
#. IDS_OPT_IMPORT_ERR
-#: Merge.rc:4933
+#: Merge.rc:4943
msgid "Failed to import options from file."
msgstr "选项导入失败。"
#. IDS_OPT_EXPORT_ERR
-#: Merge.rc:4934
+#: Merge.rc:4944
msgid "Failed to write options to file."
msgstr "选项导出失败。"
#. IDS_CLOSEALL_WINDOWS
-#: Merge.rc:4935
+#: Merge.rc:4945
msgid ""
"Close multiple compare windows?\n"
"\n"
@@ -7175,44 +7186,44 @@ msgstr ""
"是否继续?"
#. IDS_EOL_MIXED
-#: Merge.rc:4944
+#: Merge.rc:4954
msgid "Mixed"
msgstr "混合"
#. IDS_EOL_BIN
-#: Merge.rc:4945
+#: Merge.rc:4955
msgctxt "EOL Type"
msgid "Binary"
msgstr "二进制"
#. IDS_EOL_NONE
-#: Merge.rc:4949
+#: Merge.rc:4959
msgid "None"
msgstr "无"
#. IDS_MARKER_COLOR_FMT
-#: Merge.rc:4950
+#: Merge.rc:4960
#, c-format
msgid "Marker Color %d"
msgstr "标记颜色 %d"
#. IDS_MARKER_NEW_PATTERN
-#: Merge.rc:4951
+#: Merge.rc:4961
msgid "New Pattern"
msgstr "新模式"
#. IDS_PLUGINSLIST_TYPE
-#: Merge.rc:4957
+#: Merge.rc:4967
msgid "Type"
msgstr "类型"
#. IDS_PLUGINS_TYPE_EDITSCRIPT
-#: Merge.rc:4961
+#: Merge.rc:4971
msgid "Editor script"
msgstr "编辑器脚本"
#. ID_SELECTLINEDIFF
-#: Merge.rc:4967
+#: Merge.rc:4977
msgid ""
"\n"
"Difference in Current Line (F4)"
@@ -7221,7 +7232,7 @@ msgstr ""
"当前行中差异 (F4)"
#. ID_OPTIONS
-#: Merge.rc:4968
+#: Merge.rc:4978
msgid ""
"\n"
"Options"
@@ -7230,7 +7241,7 @@ msgstr ""
"选项"
#. ID_REFRESH
-#: Merge.rc:4969
+#: Merge.rc:4979
msgid ""
"\n"
"Refresh (F5)"
@@ -7239,7 +7250,7 @@ msgstr ""
"刷新 (F5)"
#. ID_PREVDIFF
-#: Merge.rc:4975
+#: Merge.rc:4985
msgid ""
"\n"
"Previous Difference (Alt+Up)"
@@ -7248,7 +7259,7 @@ msgstr ""
"上一处差异 (Alt+Up)"
#. ID_NEXTDIFF
-#: Merge.rc:4976
+#: Merge.rc:4986
msgid ""
"\n"
"Next Difference (Alt+Down)"
@@ -7257,7 +7268,7 @@ msgstr ""
"下一处差异 (Alt+Down)"
#. ID_PREVCONFLICT
-#: Merge.rc:4977
+#: Merge.rc:4987
msgid ""
"\n"
"Previous Conflict (Alt+Shift+Up)"
@@ -7266,7 +7277,7 @@ msgstr ""
"上一处冲突 (Alt+Shift+Up)"
#. ID_NEXTCONFLICT
-#: Merge.rc:4978
+#: Merge.rc:4988
msgid ""
"\n"
"Next Conflict (Alt+Shift+Down)"
@@ -7275,7 +7286,7 @@ msgstr ""
"下一处冲突 (Alt+Shift+Down)"
#. ID_FIRSTDIFF
-#: Merge.rc:4983
+#: Merge.rc:4993
msgid ""
"\n"
"First Difference (Alt+Home)"
@@ -7284,7 +7295,7 @@ msgstr ""
"首个差异 (Alt+Home)"
#. ID_CURDIFF
-#: Merge.rc:4984
+#: Merge.rc:4994
msgid ""
"\n"
"Current Difference (Alt+Enter)"
@@ -7293,7 +7304,7 @@ msgstr ""
"当前差异 (Alt+Enter)"
#. ID_LASTDIFF
-#: Merge.rc:4985
+#: Merge.rc:4995
msgid ""
"\n"
"Last Difference (Alt+End)"
@@ -7302,7 +7313,7 @@ msgstr ""
"末个差异 (Alt+End)"
#. ID_L2R
-#: Merge.rc:4986
+#: Merge.rc:4996
msgid ""
"\n"
"Copy to Right (Alt+Right)"
@@ -7311,7 +7322,7 @@ msgstr ""
"复制到右侧 (Alt+Right)"
#. ID_R2L
-#: Merge.rc:4987
+#: Merge.rc:4997
msgid ""
"\n"
"Copy to Left (Alt+Left)"
@@ -7320,7 +7331,7 @@ msgstr ""
"复制到左侧 (Alt+Left)"
#. ID_L2RNEXT
-#: Merge.rc:4988
+#: Merge.rc:4998
msgid ""
"\n"
"Copy to Right and Advance (Ctrl+Alt+Right)"
@@ -7329,7 +7340,7 @@ msgstr ""
"复制到右侧并前进 (Ctrl+Alt+Right)"
#. ID_R2LNEXT
-#: Merge.rc:4989
+#: Merge.rc:4999
msgid ""
"\n"
"Copy to Left and Advance (Ctrl+Alt+Left)"
@@ -7338,7 +7349,7 @@ msgstr ""
"复制到左侧并前进 (Ctrl+Alt+Left)"
#. ID_ALL_RIGHT
-#: Merge.rc:4990
+#: Merge.rc:5000
msgid ""
"\n"
"Copy All to Right"
@@ -7347,7 +7358,7 @@ msgstr ""
"全部复制到右侧"
#. ID_ALL_LEFT
-#: Merge.rc:4991
+#: Merge.rc:5001
msgid ""
"\n"
"Copy All to Left"
@@ -7356,7 +7367,7 @@ msgstr ""
"全部复制到左侧"
#. ID_AUTO_MERGE
-#: Merge.rc:4992
+#: Merge.rc:5002
msgid ""
"\n"
"Auto Merge (Ctrl+Alt+M)"
@@ -7365,7 +7376,7 @@ msgstr ""
"自动合并 (Ctrl+Alt+M)"
#. ID_FIRSTFILE
-#: Merge.rc:4993
+#: Merge.rc:5003
msgid ""
"\n"
"First File"
@@ -7374,7 +7385,7 @@ msgstr ""
"第一个文件"
#. ID_NEXTFILE
-#: Merge.rc:4994
+#: Merge.rc:5004
msgid ""
"\n"
"Next File (Ctrl+F8)"
@@ -7383,7 +7394,7 @@ msgstr ""
"下一个文件 (Ctrl+F8)"
#. ID_LASTFILE
-#: Merge.rc:4995
+#: Merge.rc:5005
msgid ""
"\n"
"Last File"
@@ -7392,7 +7403,7 @@ msgstr ""
"最后一个文件"
#. ID_PREVFILE
-#: Merge.rc:4996
+#: Merge.rc:5006
msgid ""
"\n"
"Previous File (Ctrl+F7)"
@@ -7401,37 +7412,37 @@ msgstr ""
"上一个文件 (Ctrl+F7)"
#. IDS_UNPACK_AUTO
-#: Merge.rc:5003
+#: Merge.rc:5013
msgid "Adapted unpacker applied to both files (one needs extension)."
msgstr "在两个文件上应用适当的解包程序 (文件只需要有适当的扩展名)。"
#. IDS_NO_PREDIFFER
-#: Merge.rc:5004
+#: Merge.rc:5014
msgid "No Prediffer (Normal)"
msgstr "不使用预比较插件(常规)"
#. IDS_SUGGESTED_PLUGINS
-#: Merge.rc:5005
+#: Merge.rc:5015
msgid "Suggested Plugins"
msgstr "推荐的插件"
#. IDS_NOT_SUGGESTED_PLUGINS
-#: Merge.rc:5006
+#: Merge.rc:5016
msgid "All Plugins"
msgstr "全部插件"
#. IDS_PRIVATEBUILD_FMT
-#: Merge.rc:5012
+#: Merge.rc:5022
#, c-format
msgid "Private Build: %1"
msgstr "定制版本:%1"
#. IDS_CHECKFORUPDATES_UPTODATE
-#: Merge.rc:5013
+#: Merge.rc:5023
msgid "Your software is up to date."
msgstr "您的软件是最新的。"
-#: Merge.rc:5015
+#: Merge.rc:5025
#, c-format
msgid ""
"WinMerge update available.\n"
@@ -7441,125 +7452,125 @@ msgstr ""
"当前最新版本为 %1,而您当前使用的是 %2。是否要立即下载?"
#. IDS_ALLRIGHTS_RESERVED
-#: Merge.rc:5016
+#: Merge.rc:5026
msgid " - All rights reserved."
msgstr " - 保留所有权利。"
#. IDS_CHECKFORUPDATES_FAILED
-#: Merge.rc:5021
+#: Merge.rc:5031
msgid "Failed to download latest version information"
msgstr "下载最新版本信息失败"
#. IDS_TITLE_PLUGINS_SETTINGS
-#: Merge.rc:5027
+#: Merge.rc:5037
msgid "Plugin Settings"
msgstr "插件设置"
#. IDS_NO_SCT_SCRIPTS
-#: Merge.rc:5029
+#: Merge.rc:5039
msgid "WSH not found - .sct scripts disabled"
msgstr "WSH 未找到 - .sct 脚本已禁用"
#. IDS_LOCBAR_GOTOLINE_FMT
-#: Merge.rc:5037
+#: Merge.rc:5047
#, c-format
msgid "G&o to Line %1"
msgstr "转到第 %1 行(&O)"
#. IDS_GOTO_MOVED_LINE
-#: Merge.rc:5043
+#: Merge.rc:5053
msgid "Go to Moved Line\tCtrl+Shift+G"
msgstr "转到被移动的行\tCtrl+Shift+G"
#. IDS_AUTOCOMPLETE_DISABLED
-#: Merge.rc:5049
+#: Merge.rc:5059
msgctxt "Options dialog|General|Open dialog Auto completion"
msgid "Disabled"
msgstr "已禁用"
#. IDS_AUTOCOMPLETE_FILE_SYS
-#: Merge.rc:5050
+#: Merge.rc:5060
msgid "From file system"
msgstr "由文件系统提供"
#. IDS_AUTOCOMPLETE_MRU
-#: Merge.rc:5051
+#: Merge.rc:5061
msgid "From Most Recently Used list"
msgstr "匹配最近使用记录"
#. IDS_COLORSCHEME_PLAIN
-#: Merge.rc:5057
+#: Merge.rc:5067
msgid "No Highlighting"
msgstr "无高亮"
#. IDS_COLORSCHEME_BATCH
-#: Merge.rc:5063
+#: Merge.rc:5073
msgid "Batch"
msgstr "批处理文件"
#. IDS_COLORSCHEME_PO
-#: Merge.rc:5090
+#: Merge.rc:5100
msgid "Portable Object"
msgstr "PO (可移植对象)"
#. IDS_COLORSCHEME_RSRC
-#: Merge.rc:5094
+#: Merge.rc:5104
msgid "Resources"
msgstr "资源文件"
#. IDS_COLORSCHEME_SH
-#: Merge.rc:5098
+#: Merge.rc:5108
msgid "Shell"
msgstr "Shell 脚本"
#. IDS_CLOSE_LEFT_TABS
-#: Merge.rc:5115
+#: Merge.rc:5125
msgid "Close &Left Tabs"
msgstr "关闭左侧标签页(&L)"
#. IDS_CLOSE_RIGHT_TABS
-#: Merge.rc:5116
+#: Merge.rc:5126
msgid "Close R&ight Tabs"
msgstr "关闭右侧标签页(&R)"
#. IDS_CLOSE_OTHER_TABS
-#: Merge.rc:5117
+#: Merge.rc:5127
msgid "Close &Other Tabs"
msgstr "关闭其他标签页(&O)"
#. IDS_TABBAR_AUTO_MAXWIDTH
-#: Merge.rc:5118
+#: Merge.rc:5128
msgid "Enable &Auto Max Width"
msgstr "启用自动最大宽度(&A)"
#. IDS_WEBPAGE_MENU
-#: Merge.rc:5128
+#: Merge.rc:5138
msgid "We&bpage"
msgstr "网页(&B)"
#. IDS_VIEW_WRAP_TEXT
-#: Merge.rc:5133
+#: Merge.rc:5143
msgid "W&rap Text"
msgstr "自动换行(&R)"
#. IDS_NOTINSTALLED
-#: Merge.rc:5138
+#: Merge.rc:5148
msgid "%1 is not installed."
msgstr "%1 未安装。"
#. IDS_CREATE_FOLDER
-#: Merge.rc:5143
+#: Merge.rc:5153
#, c-format
msgid "%1 does not exist. Create it?"
msgstr "%1 不存在。是否创建?"
#. IDS_CREATE_FOLDER_ERROR
-#: Merge.rc:5144
+#: Merge.rc:5154
msgid "Failed to create folder."
msgstr "创建文件夹失败。"
#. IDC_EXT_EDITOR_PATH
-#: Merge.rc:5149
+#: Merge.rc:5159
msgid ""
"Parameters:\n"
"$file: Current file path\n"
@@ -7570,486 +7581,486 @@ msgstr ""
"$linenum: 当前输入符位置的行号"
#. IDS_DIFF_ALGORITHM_DEFAULT
-#: Merge.rc:5154
+#: Merge.rc:5164
msgid "default"
msgstr "默认"
#. IDS_DIFF_ALGORITHM_MINIMAL
-#: Merge.rc:5155
+#: Merge.rc:5165
msgid "minimal"
msgstr "最少"
#. IDS_DIFF_ALGORITHM_PATIENCE
-#: Merge.rc:5156
+#: Merge.rc:5166
msgid "patience"
msgstr "耐心"
#. IDS_DIFF_ALGORITHM_HISTOGRAM
-#: Merge.rc:5157
+#: Merge.rc:5167
msgid "histogram"
msgstr "直方图"
#. IDS_DIFF_ALGORITHM_NONE
-#: Merge.rc:5158
+#: Merge.rc:5168
msgid "none"
msgstr "无"
#. IDS_RENDERING_MODE_GDI
-#: Merge.rc:5163
+#: Merge.rc:5173
msgid "GDI"
msgstr "GDI"
#. IDS_RENDERING_MODE_DIRECTWRITE_DEFAULT
-#: Merge.rc:5164
+#: Merge.rc:5174
msgid "DirectWrite Default"
msgstr "DirectWrite 默认"
#. IDS_RENDERING_MODE_DIRECTWRITE_ALIASED
-#: Merge.rc:5165
+#: Merge.rc:5175
msgid "DirectWrite Aliased"
msgstr "DirectWrite Aliased"
#. IDS_RENDERING_MODE_DIRECTWRITE_GDI_CLASSIC
-#: Merge.rc:5166
+#: Merge.rc:5176
msgid "DirectWrite GDI Classic"
msgstr "DirectWrite GDI Classic"
#. IDS_RENDERING_MODE_DIRECTWRITE_GDI_NATURAL
-#: Merge.rc:5167
+#: Merge.rc:5177
msgid "DirectWrite GDI Natural"
msgstr "DirectWrite GDI Natural"
#. IDS_RENDERING_MODE_DIRECTWRITE_NATURAL
-#: Merge.rc:5168
+#: Merge.rc:5178
msgid "DirectWrite Natural"
msgstr "DirectWrite Natural"
#. IDS_RENDERING_MODE_DIRECTWRITE_NATURAL_SYMMETRIC
-#: Merge.rc:5169
+#: Merge.rc:5179
msgid "DirectWrite Natural Symmetric"
msgstr "DirectWrite Natural Symmetric"
#. IDS_CLOSE_WINDOWS_WITH_ESC_DISABLED
-#: Merge.rc:5174
+#: Merge.rc:5184
msgctxt "Options dialog|General|Close windows with Esc"
msgid "Disabled"
msgstr "已禁用"
#. IDS_CLOSE_WINDOWS_WITH_ESC_1
-#: Merge.rc:5175
+#: Merge.rc:5185
msgid "MDI child window or main window"
msgstr "MDI 子窗口或主窗口"
#. IDS_CLOSE_WINDOWS_WITH_ESC_2
-#: Merge.rc:5176
+#: Merge.rc:5186
msgid "MDI child window only"
msgstr "仅 MDI 子窗口"
#. IDS_CLOSE_WINDOWS_WITH_ESC_3
-#: Merge.rc:5177
+#: Merge.rc:5187
msgid "Close main window if only one MDI child window"
msgstr "如果只有一个MDI子窗口,关闭主窗口"
#. IDS_DIFF_GROUP
-#: Merge.rc:5182
+#: Merge.rc:5192
msgctxt "ImgMergeFrame|LocationPane"
msgid "Diff"
msgstr "差异比较"
#. IDS_DIFF_HIGHLIGHT
-#: Merge.rc:5183
+#: Merge.rc:5193
msgctxt "ImgMergeFrame|LocationPane"
msgid "Highlight"
msgstr "高亮"
#. IDS_DIFF_BLINK
-#: Merge.rc:5184
+#: Merge.rc:5194
msgctxt "ImgMergeFrame|LocationPane"
msgid "Blink"
msgstr "闪动"
#. IDS_DIFF_BLOCKSIZE
-#: Merge.rc:5185
+#: Merge.rc:5195
msgctxt "ImgMergeFrame|LocationPane"
msgid "Block Size"
msgstr "块大小"
#. IDS_DIFF_BLOCKALPHA
-#: Merge.rc:5186
+#: Merge.rc:5196
msgctxt "ImgMergeFrame|LocationPane"
msgid "Block Alpha"
msgstr "块不透明度"
#. IDS_DIFF_CDTHRESHOLD
-#: Merge.rc:5187
+#: Merge.rc:5197
msgctxt "ImgMergeFrame|LocationPane"
msgid "CD Threshold"
msgstr "色距阈值"
#. IDS_DIFF_INSERTION_DELETION_DETECTION
-#: Merge.rc:5188
+#: Merge.rc:5198
msgctxt "ImgMergeFrame|LocationPane"
msgid "Ins/Del Detection"
msgstr "增删检测"
#. IDS_OVERLAY_MODE_NONE
-#: Merge.rc:5189 Merge.rc:5194
+#: Merge.rc:5199 Merge.rc:5204
msgctxt "ImgMergeFrame|LocationPane"
msgid "None"
msgstr "无"
#. IDS_DIFF_INSERTION_DELETION_DETECTION_VERTICAL
-#: Merge.rc:5190
+#: Merge.rc:5200
msgctxt "ImgMergeFrame|LocationPane"
msgid "Vertical"
msgstr "垂直"
#. IDS_DIFF_INSERTION_DELETION_DETECTION_HORIZONTAL
-#: Merge.rc:5191
+#: Merge.rc:5201
msgctxt "ImgMergeFrame|LocationPane"
msgid "Horizontal"
msgstr "水平"
#. IDS_OVERLAY_GROUP
-#: Merge.rc:5192
+#: Merge.rc:5202
msgctxt "ImgMergeFrame|LocationPane"
msgid "Overlay"
msgstr "遮罩层"
#. IDS_OVERLAY_ALPHA
-#: Merge.rc:5193
+#: Merge.rc:5203
msgctxt "ImgMergeFrame|LocationPane"
msgid "Alpha"
msgstr "透明度"
#. IDS_OVERLAY_MODE_XOR
-#: Merge.rc:5195
+#: Merge.rc:5205
msgctxt "ImgMergeFrame|LocationPane"
msgid "XOR"
msgstr "异或计算 (XOR)"
#. IDS_OVERLAY_MODE_ALPHA
-#: Merge.rc:5196
+#: Merge.rc:5206
msgctxt "ImgMergeFrame|LocationPane"
msgid "Alpha Blend"
msgstr "半透明混合"
#. IDS_OVERLAY_MODE_ALPHA_ANIMATION
-#: Merge.rc:5197
+#: Merge.rc:5207
msgctxt "ImgMergeFrame|LocationPane"
msgid "Alpha Animation"
msgstr "半透明闪动"
#. IDS_ZOOM
-#: Merge.rc:5198
+#: Merge.rc:5208
msgctxt "ImgMergeFrame|LocationPane"
msgid "Zoom"
msgstr "缩放"
#. IDS_PAGE
-#: Merge.rc:5199
+#: Merge.rc:5209
msgctxt "ImgMergeFrame|LocationPane"
msgid "Page:"
msgstr "页:"
#. IDS_IMGCMP_STATUS_PT_RGBA_FMT
-#: Merge.rc:5200
+#: Merge.rc:5210
#, c-format
msgid "Pt: (%d, %d) RGBA: (%d, %d, %d, %d) "
msgstr "像素:(%d, %d) RGBA:(%d, %d, %d, %d) "
#. IDS_IMGCMP_STATUS_DIST1_FMT
-#: Merge.rc:5201
+#: Merge.rc:5211
#, c-format
msgid "Dist: %g "
msgstr "色距:%g "
#. IDS_IMGCMP_STATUS_DIST2_FMT
-#: Merge.rc:5202
+#: Merge.rc:5212
#, c-format
msgid "Dist: %g, %g "
msgstr "色距:%g, %g "
#. IDS_IMGCMP_STATUS_PAGE_ZOOM_SIZE_BPP_FMT
-#: Merge.rc:5203
+#: Merge.rc:5213
#, c-format
msgid "Page: %d/%d Zoom: %d%% %dx%dpx %dbpp "
msgstr "页:%d/%d 缩放:%d%% %dx%d像素 %d比特/像素 "
#. IDS_IMGCMP_STATUS_RC_FMT
-#: Merge.rc:5204
+#: Merge.rc:5214
#, c-format
msgid "Rc: (%d, %d) "
msgstr "选中:(%d, %d) "
#. IDS_IMGCMP_STATUS_FLIPPED_FMT
-#: Merge.rc:5205
+#: Merge.rc:5215
#, c-format
msgid "Flipped: %s "
msgstr "翻转:%s "
#. IDS_IMGCMP_STATUS_ROTATED_FMT
-#: Merge.rc:5206
+#: Merge.rc:5216
#, c-format
msgid "Rotated: %d "
msgstr "旋转:%d "
#. IDS_IMGCMP_REPORT_ALLPAGES
-#: Merge.rc:5207
+#: Merge.rc:5217
msgid "All pages"
msgstr "所有页"
#. IDS_IGNSUB_STR1
-#: Merge.rc:5212
+#: Merge.rc:5222
msgid ""
msgstr "< 编辑这里 >"
#. IDS_IGNSUB_STR2
-#: Merge.rc:5213
+#: Merge.rc:5223
msgid "No differences found to select"
msgstr "未找到要选择的差异"
#. IDS_IGNSUB_STR3
-#: Merge.rc:5214
+#: Merge.rc:5224
msgid "No differences found to add as substitution filter"
msgstr "未找到要添加为置换过滤器的差异"
#. IDS_IGNSUB_STR4
-#: Merge.rc:5215
+#: Merge.rc:5225
msgid "The pair is already in the Substitution Filters list"
msgstr "这一对已存在于置换过滤器列表中"
#. IDS_IGNSUB_STR5
-#: Merge.rc:5216
+#: Merge.rc:5226
msgid "Add this change to Substitution Filters?"
msgstr "将此更改添加到置换过滤器?"
#. IDS_OCRRESULT_TEXTONLY
-#: Merge.rc:5221
+#: Merge.rc:5231
msgid "Text only"
msgstr "纯文本"
#. IDS_OCRRESULT_POS_LINE
-#: Merge.rc:5222
+#: Merge.rc:5232
msgid "Line-by-line position and text"
msgstr "逐行定位输入"
#. IDS_OCRRESULT_POS_WORD
-#: Merge.rc:5223
+#: Merge.rc:5233
msgid "Word-by-word position and text"
msgstr "逐字定位输入"
#. IDS_USERDATAFOLDER_APPDATA
-#: Merge.rc:5228
+#: Merge.rc:5238
msgid "AppData (Roaming) folder"
msgstr "AppData(Roaming)文件夹"
#. IDS_USERDATAFOLDER_INSTALL
-#: Merge.rc:5229
+#: Merge.rc:5239
msgid "Install folder"
msgstr "安装文件夹"
#. IDS_USERDATAFOLDER_DOCUMENTS
-#: Merge.rc:5230
+#: Merge.rc:5240
msgid "Documents folder"
msgstr "文档文件夹"
#. IDS_SINGLEINSTANCE_DISABLED
-#: Merge.rc:5235
+#: Merge.rc:5245
msgctxt "Options dialog|General|Single instance mode"
msgid "Disabled"
msgstr "已禁用"
#. IDS_SINGLEINSTANCE_STR1
-#: Merge.rc:5236
+#: Merge.rc:5246
msgid "Allow only one instance to run"
msgstr "只允许运行一个实例"
#. IDS_SINGLEINSTANCE_STR2
-#: Merge.rc:5237
+#: Merge.rc:5247
msgid "Allow only one instance; wait for termination"
msgstr "只允许运行一个实例并等待该实例结束"
#. IDS_AUTO_RELOAD_MODIFIED_FILES_DISABLED
-#: Merge.rc:5242
+#: Merge.rc:5252
msgctxt "Options dialog|General|Auto-reload modified files"
msgid "Disabled"
msgstr "已禁用"
#. IDS_AUTO_RELOAD_MODIFIED_FILES_STR1
-#: Merge.rc:5243
+#: Merge.rc:5253
msgid "Only on window activated"
msgstr "仅在窗口激活时"
#. IDS_AUTO_RELOAD_MODIFIED_FILES_STR2
-#: Merge.rc:5244
+#: Merge.rc:5254
msgid "Immediately"
msgstr "立即"
#. IDS_PLUGIN_ALL
-#: Merge.rc:5249
+#: Merge.rc:5259
msgid "Al&l"
msgstr "全部(&L)"
#. IDS_PLUGIN_OTHERS
-#: Merge.rc:5250
+#: Merge.rc:5260
msgid "&Others"
msgstr "其它(&O)"
-#: Merge.rc:5252
+#: Merge.rc:5262
#, c-format
msgid "Missing plugin name in pipeline: %1"
msgstr "插件流水线中缺少插件名称:%1"
-#: Merge.rc:5254
+#: Merge.rc:5264
#, c-format
msgid "Missing quote in plugin pipeline: %1"
msgstr "插件流水线中缺少引号:%1"
#. IDS_PLUGIN_NAME_ALREADY_EXISTS
-#: Merge.rc:5255
+#: Merge.rc:5265
#, c-format
msgid "Plugin name '%1' already exists."
msgstr "插件名称 '%1' 已存在。"
#. IDS_PLUGIN_TITLE1
-#: Merge.rc:5256
+#: Merge.rc:5266
msgid "Specify plugin arguments"
msgstr "指定插件参数"
-#: Merge.rc:5258
+#: Merge.rc:5268
#, c-format
msgid "Plugin not found or invalid: %1"
msgstr "插件不存在或无效:%1"
#. IDS_PLUGIN_NOT_UNPACK
-#: Merge.rc:5259
+#: Merge.rc:5269
#, c-format
msgid "'%1' is not an unpacker plugin"
msgstr "'%1' 不是解包插件"
#. IDS_PLUGIN_NOT_PREDIFF
-#: Merge.rc:5260
+#: Merge.rc:5270
#, c-format
msgid "'%1' is not a prediffer plugin"
msgstr "'%1' 不是预比较插件"
-#: Merge.rc:5262
+#: Merge.rc:5272
#, c-format
msgid "Error prediffing '%1' with '%2'. Prediffing disabled."
msgstr "预比较 '%1' 和 '%2' 时出错,已禁用预比较。"
#. IDS_PLUGIN_CIRCULAR_REFERENCE
-#: Merge.rc:5263
+#: Merge.rc:5273
#, c-format
msgid "Circular reference in plugin pipeline: %1"
msgstr "插件流水线中的循环引用:%1"
#. IDS_PLUGIN_TYPE1
-#: Merge.rc:5264
+#: Merge.rc:5274
msgid "URL Handler"
msgstr "网址处理器"
#. IDS_PLUGIN_TYPE2
-#: Merge.rc:5265
+#: Merge.rc:5275
msgid "File Unpacker"
msgstr "文件解包插件"
#. IDS_PLUGIN_TYPE3
-#: Merge.rc:5266
+#: Merge.rc:5276
msgid "File or Folder Unpacker"
msgstr "文件或文件夹解包插件"
#. IDS_PLUGIN_TYPE5
-#: Merge.rc:5268
+#: Merge.rc:5278
msgid "Alias for Unpacker"
msgstr "解包插件别名"
#. IDS_PLUGIN_TYPE6
-#: Merge.rc:5269
+#: Merge.rc:5279
msgid "Alias for Prediffer"
msgstr "预比较插件别名"
#. IDS_PLUGIN_TYPE7
-#: Merge.rc:5270
+#: Merge.rc:5280
msgid "Alias for Editor script"
msgstr "编辑器脚本别名"
#. IDS_PLUGIN_ALIAS_DESC
-#: Merge.rc:5271
+#: Merge.rc:5281
#, c-format
msgid "Alias for plugin pipeline '%1'"
msgstr "插件流水线 '%1' 别名"
#. IDS_PLUGIN_NEW_DESC
-#: Merge.rc:5272
+#: Merge.rc:5282
msgid "New plugin description"
msgstr "新的插件描述"
#. IDS_PLUGIN_TARGETS_ALL
-#: Merge.rc:5273
+#: Merge.rc:5283
msgid "All"
msgstr "全部"
#. IDS_PLUGIN_TARGETS_1ST
-#: Merge.rc:5274
+#: Merge.rc:5284
msgid "1st"
msgstr "第一个"
#. IDS_PLUGIN_TARGETS_2ND
-#: Merge.rc:5275
+#: Merge.rc:5285
msgid "2nd"
msgstr "第二个"
#. IDS_PLUGIN_TARGETS_3RD
-#: Merge.rc:5276
+#: Merge.rc:5286
msgid "3rd"
msgstr "第三个"
#. IDS_PLUGIN_TARGETS_1ST_2ND
-#: Merge.rc:5277
+#: Merge.rc:5287
msgid "1st and 2nd"
msgstr "第一个和第二个"
#. IDS_PLUGIN_TARGETS_1ST_3RD
-#: Merge.rc:5278
+#: Merge.rc:5288
msgid "1st and 3rd"
msgstr "第一个和第三个"
#. IDS_PLUGIN_TARGETS_2ND_3RD
-#: Merge.rc:5279
+#: Merge.rc:5289
msgid "2nd and 3rd"
msgstr "第二个和第三个"
#. IDS_FILTER_APPLIED
-#: Merge.rc:5284
+#: Merge.rc:5294
msgid "Filter applied"
msgstr "过滤器已应用"
#. IDS_FILTERMENU_COMPARE
-#: Merge.rc:5289
+#: Merge.rc:5299
#, c-format
msgid "Compare %1"
msgstr "比较 %1"
#. IDS_FILTERMENU_FILTER_BY_THIS_COLUMN
-#: Merge.rc:5290
+#: Merge.rc:5300
msgid "&Filter by This Column"
msgstr "按该列过滤(&F)"
#. IDS_FILTERMENU_FILTER_BY_THIS_COLUMN2
-#: Merge.rc:5291
+#: Merge.rc:5301
msgid "&Filter by This Column..."
msgstr "按该列过滤(&F)..."
#. IDS_CLIPBOARDHISTORY_TIME
-#: Merge.rc:5296
+#: Merge.rc:5306
#, c-format
msgid "Clipboard at %s"
msgstr "剪贴板位于 %s"
#. IDS_CLIPBOARDHISTORY_DISABLED
-#: Merge.rc:5297
+#: Merge.rc:5307
msgid ""
"Clipboard history disabled.\r\n"
"Enable: Windows logo key + V, then Turn on."
@@ -8057,110 +8068,115 @@ msgstr ""
"剪贴板历史记录被禁用了。\r\n"
"要启用剪贴板历史记录, 请按 Windows 徽标键 + V,然后单击“打开”按钮。"
-#: Merge.rc:5299
+#: Merge.rc:5309
msgid "This system does not support clipboard history."
msgstr "当前系统不支持剪贴板历史记录。"
-#: Merge.rc:5301
+#: Merge.rc:5311
msgid "32-bit WinMerge does not support Clipboard Compare"
msgstr "32 位的 WinMerge 不支持剪贴板比较"
#. IDS_WEBVIEW2_RUNTIME_NOT_INSTALLED
-#: Merge.rc:5306
+#: Merge.rc:5316
msgid "WebView2 runtime not installed. Download it?"
msgstr "未安装 WebView2 运行库。您想下载吗?"
#. IDS_JUMPLIST_NEW_TEXT_COMPARE
-#: Merge.rc:5311
+#: Merge.rc:5321
msgid "New Text Compare"
msgstr "新的文本比较"
#. IDS_JUMPLIST_NEW_TABLE_COMPARE
-#: Merge.rc:5312
+#: Merge.rc:5322
msgid "New Table Compare"
msgstr "新的表格比较"
#. IDS_JUMPLIST_NEW_BINARY_COMPARE
-#: Merge.rc:5313
+#: Merge.rc:5323
msgid "New Binary Compare"
msgstr "新的二进制比较"
#. IDS_JUMPLIST_NEW_IMAGE_COMPARE
-#: Merge.rc:5314
+#: Merge.rc:5324
msgid "New Image Compare"
msgstr "新的图像比较"
#. IDS_JUMPLIST_NEW_WEBPAGE_COMPARE
-#: Merge.rc:5315
+#: Merge.rc:5325
msgid "New Webpage Compare"
msgstr "新的网页比较"
+#. IDS_JUMPLIST_NEW_FOLDER_COMPARE
+#: Merge.rc:5326
+msgid "New Folder Compare"
+msgstr ""
+
#. IDS_JUMPLIST_CLIPBOARD_COMPARE
-#: Merge.rc:5316
+#: Merge.rc:5327
msgid "Clipboard Compare"
msgstr "剪贴板比较"
#. IDS_PREVIEWBAR_PRINT
-#: Merge.rc:5321
+#: Merge.rc:5332
msgid "&Print..."
msgstr "打印(&P)..."
#. IDS_PREVIEWBAR_PREVPAGE
-#: Merge.rc:5323
+#: Merge.rc:5334
msgid "Pre&v Page"
msgstr "上一页(&V)"
#. IDS_PREVIEWBAR_TWOPAGE
-#: Merge.rc:5324
+#: Merge.rc:5335
msgid "&Two Page"
msgstr "双页(&T)"
#. IDS_PREVIEWBAR_ONEPAGE
-#: Merge.rc:5325
+#: Merge.rc:5336
msgid "&One Page"
msgstr "单页(&O)"
#. IDS_PREVIEWBAR_ZOOMIN
-#: Merge.rc:5326
+#: Merge.rc:5337
msgid "Zoom &In"
msgstr "放大(&I)"
#. IDS_PREVIEWBAR_ZOOMOUT
-#: Merge.rc:5327
+#: Merge.rc:5338
msgid "Zoom &Out"
msgstr "缩小(&O)"
#. IDS_WEBPAGE_COMPARING
-#: Merge.rc:5333
+#: Merge.rc:5344
msgid "Comparing..."
msgstr "比较中..."
#. IDS_WEBPAGE_ZOOM
-#: Merge.rc:5334
+#: Merge.rc:5345
msgid "Zoom:"
msgstr "缩放:"
#. IDS_COPY_GRANULARITY_DIFFHUNK
-#: Merge.rc:5339
+#: Merge.rc:5350
msgid "Diff hunk"
msgstr "整个差异块"
#. IDS_COPY_GRANULARITY_INLINE
-#: Merge.rc:5340
+#: Merge.rc:5351
msgid "Inline diff"
msgstr "行内差异"
#. IDS_COPY_GRANULARITY_LINE
-#: Merge.rc:5341
+#: Merge.rc:5352
msgid "Line"
msgstr "整行"
-#: Merge.rc:5342
+#: Merge.rc:5353
msgid "Character"
msgstr "字符"
#. ID_MICE_PREVDIFF
-#: Merge.rc:5347
+#: Merge.rc:5358
msgid ""
"\n"
"Previous Difference (Alt+Up)\n"
@@ -8173,7 +8189,7 @@ msgstr ""
"(Alt+滚轮上滚)"
#. ID_MICE_NEXTDIFF
-#: Merge.rc:5348
+#: Merge.rc:5359
msgid ""
"\n"
"Next Difference (Alt+Down)\n"
@@ -8186,7 +8202,7 @@ msgstr ""
"(Alt+滚轮下滚)"
#. ID_MICE_L2R
-#: Merge.rc:5349
+#: Merge.rc:5360
msgid ""
"\n"
"Copy to Right (Alt+Right)\n"
@@ -8201,7 +8217,7 @@ msgstr ""
"(Alt+Shift+滚轮下滚)"
#. ID_MICE_R2L
-#: Merge.rc:5350
+#: Merge.rc:5361
msgid ""
"\n"
"Copy to Left (Alt+Left)\n"
@@ -8216,7 +8232,7 @@ msgstr ""
"(Alt+Shift+滚轮上滚)"
#. ID_MICE_L2RNEXT
-#: Merge.rc:5351
+#: Merge.rc:5362
msgid ""
"\n"
"Copy to Right and Advance (Ctrl+Alt+Right)\n"
@@ -8229,7 +8245,7 @@ msgstr ""
"(Ctrl+Alt+Shift+滚轮下滚)"
#. ID_MICE_R2LNEXT
-#: Merge.rc:5352
+#: Merge.rc:5363
msgid ""
"\n"
"Copy to Left and Advance (Ctrl+Alt+Left)\n"
@@ -8242,257 +8258,257 @@ msgstr ""
"(Ctrl+Alt+Shift+滚轮上滚)"
#. IDS_LOG_COMPARING_2
-#: Merge.rc:5362
+#: Merge.rc:5373
#, c-format
msgid "Comparing %1 with %2"
msgstr "比较 %1 和 %2"
#. IDS_LOG_COMPARING_3
-#: Merge.rc:5363
+#: Merge.rc:5374
#, c-format
msgid "Comparing %1 with %2 and %3"
msgstr "比较 %1、%2 和 %3"
#. IDS_LOG_COMPARE_COMPLETED
-#: Merge.rc:5364
+#: Merge.rc:5375
msgid "Comparison completed"
msgstr "比较已完成"
#. IDS_LOG_COMPARE_ERROR_2
-#: Merge.rc:5365
+#: Merge.rc:5376
#, c-format
msgid "Failed to compare %1 with %2: "
msgstr "比较 %1 和 %2 失败:"
#. IDS_LOG_COMPARE_ERROR_3
-#: Merge.rc:5366
+#: Merge.rc:5377
#, c-format
msgid "Failed to compare %1 with %2 and %3: "
msgstr "比较 %1 %2 和 %3 失败:"
#. IDS_LOG_FILE_SAVED
-#: Merge.rc:5367
+#: Merge.rc:5378
msgid "File saved"
msgstr "文件已保存"
#. IDS_LOG_COPYING_FILES
-#: Merge.rc:5368
+#: Merge.rc:5379
msgid "Copying files..."
msgstr "复制文件..."
#. IDS_LOG_MOVING_FILES
-#: Merge.rc:5369
+#: Merge.rc:5380
msgid "Moving files..."
msgstr "移动文件..."
#. IDS_LOG_DELETING_FILES
-#: Merge.rc:5370
+#: Merge.rc:5381
msgid "Deleting files..."
msgstr "删除文件..."
#. IDS_LOG_RECYCLEBIN
-#: Merge.rc:5371
+#: Merge.rc:5382
msgid "Recycle Bin"
msgstr "回收站"
#. IDS_LOG_PERMANENTLY_DELETED
-#: Merge.rc:5372
+#: Merge.rc:5383
msgid "Permanently deleted"
msgstr "已永久删除"
#. IDS_LOG_FILEOPERATION_COMPLETED
-#: Merge.rc:5373
+#: Merge.rc:5384
msgid "File operation completed successfully"
msgstr "文件操作已成功完成"
#. IDS_LOG_FILEOPERATION_CANCELED
-#: Merge.rc:5374
+#: Merge.rc:5385
msgid "File operation canceled"
msgstr "文件操作已取消"
#. IDS_FILTER_ERROR_NO_ERROR
-#: Merge.rc:5379
+#: Merge.rc:5390
msgid "No error"
msgstr "无错误"
#. IDS_FILTER_ERROR_EMPTY_EXPRESSION
-#: Merge.rc:5380
+#: Merge.rc:5391
msgid "Filter expression is empty"
msgstr "过滤器表达式为空"
#. IDS_FILTER_ERROR_UNKNOWN_CHAR
-#: Merge.rc:5381
+#: Merge.rc:5392
msgid "Unknown character in filter expression"
msgstr "过滤器表达式存在未知字符"
#. IDS_FILTER_ERROR_UNTERMINATED_STRING
-#: Merge.rc:5382
+#: Merge.rc:5393
msgid "Unterminated string literal"
msgstr "未终止的字符串字面量"
#. IDS_FILTER_ERROR_SYNTAX_ERROR
-#: Merge.rc:5383
+#: Merge.rc:5394
msgid "Syntax error in filter expression"
msgstr "过滤器表达式语法错误"
#. IDS_FILTER_ERROR_PARSE_FAILURE
-#: Merge.rc:5384
+#: Merge.rc:5395
msgid "Failed to parse filter expression"
msgstr "无法解析过滤器表达式"
#. IDS_FILTER_ERROR_INVALID_LITERAL
-#: Merge.rc:5385
+#: Merge.rc:5396
msgid "Invalid literal value"
msgstr "无效的字面量值"
#. IDS_FILTER_ERROR_INVALID_REGULAR_EXPRESSION
-#: Merge.rc:5386
+#: Merge.rc:5397
msgid "Invalid regular expression"
msgstr "无效的正则表达式"
#. IDS_FILTER_ERROR_UNDEFINED_IDENTIFIER
-#: Merge.rc:5387
+#: Merge.rc:5398
msgid "Undefined identifier"
msgstr "未定义的标识符"
#. IDS_FILTER_ERROR_INVALID_ARGUMENT_COUNT
-#: Merge.rc:5388
+#: Merge.rc:5399
msgid "Invalid number of arguments"
msgstr "无效的参数数量"
#. IDS_FILTER_ERROR_FILTER_NAME_NOT_FOUND
-#: Merge.rc:5389
+#: Merge.rc:5400
msgid "Filter name not found"
msgstr "过滤器名称不存在"
#. IDS_FILTER_ERROR_DIVIDE_BY_ZERO
-#: Merge.rc:5390
+#: Merge.rc:5401
msgid "Division by zero in filter expression"
msgstr "过滤器表达式存在除零错误"
#. IDS_FILTER_ERROR_UNKNOWN_ERROR
-#: Merge.rc:5391
+#: Merge.rc:5402
msgid "Unknown error"
msgstr "未知错误"
#. IDS_FILTER_ERROR_INVALID_PROPERTY_NAME
-#: Merge.rc:5392
+#: Merge.rc:5403
msgid "Invalid property name"
msgstr "无效的属性名称"
#. IDS_FILTER_ERROR_INVALID_DIRECTIVE
-#: Merge.rc:5393
+#: Merge.rc:5404
msgid "Invalid directive"
msgstr "无效的指示"
#. IDS_FILTER_OP_EQUALS
-#: Merge.rc:5398
+#: Merge.rc:5409
msgid "Equals"
msgstr "等于"
#. IDS_FILTER_OP_NOT_EQUALS
-#: Merge.rc:5399
+#: Merge.rc:5410
msgid "Does not equal"
msgstr "不等于"
#. IDS_FILTER_OP_LESS_THAN
-#: Merge.rc:5400
+#: Merge.rc:5411
msgid "Less than"
msgstr "小于"
#. IDS_FILTER_OP_LESS_EQUAL
-#: Merge.rc:5401
+#: Merge.rc:5412
msgid "Less than or equal to"
msgstr "小于等于"
#. IDS_FILTER_OP_GREATER_EQUAL
-#: Merge.rc:5402
+#: Merge.rc:5413
msgid "Greater than or equal to"
msgstr "大于等于"
#. IDS_FILTER_OP_GREATER_THAN
-#: Merge.rc:5403
+#: Merge.rc:5414
msgid "Greater than"
msgstr "大于"
#. IDS_FILTER_OP_BETWEEN
-#: Merge.rc:5404
+#: Merge.rc:5415
msgid "Between"
msgstr "在"
#. IDS_FILTER_OP_NOT_BETWEEN
-#: Merge.rc:5405
+#: Merge.rc:5416
msgid "Not Between"
msgstr "不在"
#. IDS_FILTER_OP_CONTAINS
-#: Merge.rc:5406
+#: Merge.rc:5417
msgid "Contains"
msgstr "包含"
#. IDS_FILTER_OP_NOT_CONTAINS
-#: Merge.rc:5407
+#: Merge.rc:5418
msgid "Not Contains"
msgstr "未包含"
#. IDS_FILTER_OP_RECONTAINS
-#: Merge.rc:5408
+#: Merge.rc:5419
msgid "Contains (regex)"
msgstr "包含(正则表达式)"
#. IDS_FILTER_OP_NOT_RECONTAINS
-#: Merge.rc:5409
+#: Merge.rc:5420
msgid "Not Contains (regex)"
msgstr "未包含(正则表达式)"
#. IDS_FILTER_OP_LIKE
-#: Merge.rc:5410
+#: Merge.rc:5421
msgid "Match (wildcard)"
msgstr "匹配(通配符)"
#. IDS_FILTER_OP_NOT_LIKE
-#: Merge.rc:5411
+#: Merge.rc:5422
msgid "Not match (wildcard)"
msgstr "未匹配(通配符)"
#. IDS_FILTER_OP_MATCHES
-#: Merge.rc:5412
+#: Merge.rc:5423
msgid "Match (regex)"
msgstr "匹配(正则式)"
#. IDS_FILTER_OP_NOT_MATCHES
-#: Merge.rc:5413
+#: Merge.rc:5424
msgid "Not match (regex)"
msgstr "未匹配(正则式)"
#. IDS_COLORMODE_LIGHT
-#: Merge.rc:5418
+#: Merge.rc:5429
msgid "Light"
msgstr "浅色"
#. IDS_COLORMODE_DARK
-#: Merge.rc:5419
+#: Merge.rc:5430
msgid "Dark"
msgstr "深色"
#. IDS_COLORMODE_FOLLOWSYSTEM
-#: Merge.rc:5420
+#: Merge.rc:5431
msgid "Follow system"
msgstr "跟随系统"
#. IDS_EXAMPLE
-#: Merge.rc:5425
+#: Merge.rc:5436
#, c-format
msgid "e.g. %1"
msgstr "例:%1"
#. IDS_DETECTED_PREVIOUS_CRASH
-#: Merge.rc:5430
+#: Merge.rc:5441
msgid "WinMerge detected a previous crash. Please report this if possible."
msgstr "WinMerge 检测到之前发生过崩溃。如有可能,请提交此问题报告。"
#. IDS_REGEX_REPLACE_LIST_TEMPLATE
-#: Merge.rc:5435
+#: Merge.rc:5446
msgid ""
"# Regex replacement list\r\n"
"# Format: regexreplacement\r\n"
@@ -8507,7 +8523,7 @@ msgstr ""
"(\\d{4})-(\\d{2})-(\\d{2})\t$1_$2_$3\n"
#. IDS_STRING_REPLACE_LIST_TEMPLATE
-#: Merge.rc:5436
+#: Merge.rc:5447
msgid ""
"# Replacement list\r\n"
"# Format: searchreplacement\r\n"
diff --git a/Translations/WinMerge/ChineseTraditional.po b/Translations/WinMerge/ChineseTraditional.po
index 08871202fbe..0e6c23cb714 100644
--- a/Translations/WinMerge/ChineseTraditional.po
+++ b/Translations/WinMerge/ChineseTraditional.po
@@ -23,7 +23,7 @@ msgstr ""
"X-Generator: Poedit 3.6\n"
#. LANGUAGE, SUBLANGUAGE
-#: Merge.rc:26 Merge.rc:59 Merge.rc:5453
+#: Merge.rc:26 Merge.rc:59 Merge.rc:5464
msgid "LANG_ENGLISH, SUBLANG_ENGLISH_US"
msgstr "LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL"
@@ -108,7 +108,7 @@ msgid "Copy Selected Diff (Right) to Clipboard\tCtrl+&3"
msgstr "複製(右側)已選取差異 到剪貼簿\tCtrl+&3"
#. IDR_MERGEDOCTYPE, ID_SELECTLINEDIFF
-#: Merge.rc:110 Merge.rc:673
+#: Merge.rc:110 Merge.rc:680
msgid "Select Line &Difference\tF4"
msgstr "選取行內差異 (&D)\tF4"
@@ -138,7 +138,7 @@ msgid "Cu&t"
msgstr "剪下 (&T)"
#. IDR_POPUP_DIRVIEW
-#: Merge.rc:118 Merge.rc:943
+#: Merge.rc:118 Merge.rc:951
msgid "&Copy"
msgstr "複製 (&C)"
@@ -148,19 +148,19 @@ msgid "&Paste"
msgstr "貼上 (&P)"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:121 Merge.rc:875 Merge.rc:882
+#: Merge.rc:121 Merge.rc:882 Merge.rc:889
msgid "&Scripts"
msgstr "隨譯即行碼 (&S)"
#. IDS_NO_EDIT_SCRIPTS
-#: Merge.rc:123 Merge.rc:338 Merge.rc:447 Merge.rc:654 Merge.rc:659
-#: Merge.rc:865 Merge.rc:877 Merge.rc:884 Merge.rc:940 Merge.rc:1183
-#: Merge.rc:5028
+#: Merge.rc:123 Merge.rc:340 Merge.rc:451 Merge.rc:661 Merge.rc:666
+#: Merge.rc:872 Merge.rc:884 Merge.rc:891 Merge.rc:948 Merge.rc:1193
+#: Merge.rc:5038
msgid "< Empty >"
msgstr "< 空 >"
#. IDR_POPUP_LOCATIONBAR, ID_EDIT_WMGOTO
-#: Merge.rc:126 Merge.rc:691 Merge.rc:1081
+#: Merge.rc:126 Merge.rc:698 Merge.rc:1089
msgid "&Go to...\tCtrl+G"
msgstr "跳至 (&G)...\tCtrl+G"
@@ -180,27 +180,27 @@ msgid "Op&en"
msgstr "開啟 (&E)"
#. IDR_POPUP_DIRVIEW, ID_DIR_OPEN_RIGHT
-#: Merge.rc:132 Merge.rc:981 Merge.rc:988 Merge.rc:995
+#: Merge.rc:132 Merge.rc:989 Merge.rc:996 Merge.rc:1003
msgid "With &Registered Application"
msgstr "用登錄的應用程式 (&R)"
#. IDR_POPUP_DIRVIEW, ID_DIR_OPEN_RIGHT_WITHEDITOR
-#: Merge.rc:133 Merge.rc:982 Merge.rc:989 Merge.rc:996
+#: Merge.rc:133 Merge.rc:990 Merge.rc:997 Merge.rc:1004
msgid "With &External Editor\tCtrl+Alt+E"
msgstr "用外部編輯器 (&E) \tCtrl+Alt+E"
#. IDR_POPUP_DIRVIEW, ID_DIR_OPEN_RIGHT_WITH
-#: Merge.rc:134 Merge.rc:983 Merge.rc:990 Merge.rc:997
+#: Merge.rc:134 Merge.rc:991 Merge.rc:998 Merge.rc:1005
msgid "&With..."
msgstr "用 (&W)..."
#. IDR_POPUP_DIRVIEW, ID_DIR_OPEN_RIGHT_PARENT_FOLDER
-#: Merge.rc:135 Merge.rc:984 Merge.rc:991 Merge.rc:998
+#: Merge.rc:135 Merge.rc:992 Merge.rc:999 Merge.rc:1006
msgid "Open &Parent Folder..."
msgstr "開啟父資料夾... (&P)"
#. IDR_POPUP_IMG_CTXT, ID_FILE_SHELLMENU
-#: Merge.rc:137 Merge.rc:1239
+#: Merge.rc:137 Merge.rc:1249
msgid "S&hell Menu"
msgstr "右鍵選單 (&H)"
@@ -235,8 +235,8 @@ msgid "Ins&ertion/Deletion Detection"
msgstr "插入/刪除 偵測 (&E)"
#. IDR_MERGEDOCTYPE, ID_TOOLBAR_NONE
-#: Merge.rc:176 Merge.rc:209 Merge.rc:216 Merge.rc:358 Merge.rc:507
-#: Merge.rc:751
+#: Merge.rc:176 Merge.rc:209 Merge.rc:216 Merge.rc:360 Merge.rc:511
+#: Merge.rc:758
msgid "&None"
msgstr "關閉 (&N)"
@@ -251,12 +251,12 @@ msgid "&Horizontal"
msgstr "水平 (&H)"
#. IDR_POPUP_IMG_CTXT, ID_IMG_CURPANE_PREVPAGE
-#: Merge.rc:181 Merge.rc:189 Merge.rc:1230
+#: Merge.rc:181 Merge.rc:189 Merge.rc:1240
msgid "&Previous Page"
msgstr "前一頁 (&P)"
#. IDS_PREVIEWBAR_NEXTPAGE
-#: Merge.rc:182 Merge.rc:190 Merge.rc:1231 Merge.rc:5322
+#: Merge.rc:182 Merge.rc:190 Merge.rc:1241 Merge.rc:5333
msgid "&Next Page"
msgstr "後一頁 (&N)"
@@ -266,42 +266,42 @@ msgid "&Active Pane"
msgstr "啟動框 (&A)"
#. IDR_POPUP_IMG_CTXT, ID_IMG_CURPANE_ROTATE_RIGHT_90
-#: Merge.rc:185 Merge.rc:1225
+#: Merge.rc:185 Merge.rc:1235
msgid "Rotate &Right 90deg"
msgstr "向右旋轉 90 度 (&R)"
#. IDR_POPUP_IMG_CTXT, ID_IMG_CURPANE_ROTATE_LEFT_90
-#: Merge.rc:186 Merge.rc:1226
+#: Merge.rc:186 Merge.rc:1236
msgid "Rotate &Left 90deg"
msgstr "向左旋轉 90 度 (&L)"
#. IDR_POPUP_IMG_CTXT, ID_IMG_CURPANE_FLIP_VERTICALLY
-#: Merge.rc:187 Merge.rc:1227
+#: Merge.rc:187 Merge.rc:1237
msgid "Flip V&ertically"
msgstr "垂直翻轉 (&E)"
#. IDR_POPUP_IMG_CTXT, ID_IMG_CURPANE_FLIP_HORIZONTALLY
-#: Merge.rc:188 Merge.rc:1228
+#: Merge.rc:188 Merge.rc:1238
msgid "Flip H&orizontally"
msgstr "水平翻轉 (&O)"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:193 Merge.rc:699
+#: Merge.rc:193 Merge.rc:706
msgid "&Zoom"
msgstr "縮放 (&Z)"
#. IDR_MERGEDOCTYPE, ID_VIEW_ZOOMIN
-#: Merge.rc:202 Merge.rc:701
+#: Merge.rc:202 Merge.rc:708
msgid "Zoom &In\tCtrl++"
msgstr "放大 (&I)\tCtrl++"
#. IDR_MERGEDOCTYPE, ID_VIEW_ZOOMOUT
-#: Merge.rc:203 Merge.rc:702
+#: Merge.rc:203 Merge.rc:709
msgid "Zoom &Out\tCtrl+-"
msgstr "縮小 (&O)\tCtrl+-"
#. IDR_MERGEDOCTYPE, ID_VIEW_ZOOMNORMAL, Zoom to normal
-#: Merge.rc:205 Merge.rc:704
+#: Merge.rc:205 Merge.rc:711
msgid "&Normal\tCtrl+*"
msgstr "恢復原始 (&N)\tCtrl+*"
@@ -326,27 +326,27 @@ msgid "Dragging &Mode"
msgstr "拖動模式 (&M)"
#. IDR_POPUP_IMG_CTXT, ID_IMG_DRAGGINGMODE_MOVE
-#: Merge.rc:217 Merge.rc:955 Merge.rc:1233
+#: Merge.rc:217 Merge.rc:963 Merge.rc:1243
msgid "&Move"
msgstr "移動 (&M)"
#. IDR_POPUP_IMG_CTXT, ID_IMG_DRAGGINGMODE_ADJUST_OFFSET
-#: Merge.rc:218 Merge.rc:1234
+#: Merge.rc:218 Merge.rc:1244
msgid "&Adjust Offset"
msgstr "調整誤差 (&A)"
#. IDR_POPUP_IMG_CTXT, ID_IMG_DRAGGINGMODE_VERTICAL_WIPE
-#: Merge.rc:219 Merge.rc:1235
+#: Merge.rc:219 Merge.rc:1245
msgid "&Vertical Wipe"
msgstr "垂直抹除 (&V)"
#. IDR_POPUP_IMG_CTXT, ID_IMG_DRAGGINGMODE_HORIZONTAL_WIPE
-#: Merge.rc:220 Merge.rc:1236
+#: Merge.rc:220 Merge.rc:1246
msgid "&Horizontal Wipe"
msgstr "水平抹除 (&H)"
#. IDR_POPUP_IMG_CTXT, ID_IMG_DRAGGINGMODE_RECTANGLE_SELECT
-#: Merge.rc:221 Merge.rc:1237
+#: Merge.rc:221 Merge.rc:1247
msgid "Rectangle &Select"
msgstr "矩形選取 (&S)"
@@ -381,37 +381,37 @@ msgid "Compare Extracted &Text from Images"
msgstr "比較從圖片中擷取的文字 (&T)"
#. IDD_OPEN, IDOK
-#: Merge.rc:272 Merge.rc:1980
+#: Merge.rc:272 Merge.rc:1990
msgid "Co&mpare"
msgstr "比較 (&M)"
#. IDR_POPUP_WEBPAGE_COMPARE, ID_WEB_COMPARE_SCREENSHOTS
-#: Merge.rc:274 Merge.rc:1247
+#: Merge.rc:274 Merge.rc:1257
msgid "&Screenshots"
msgstr "截圖 (&S)"
#. IDR_POPUP_WEBPAGE_COMPARE, ID_WEB_COMPARE_FULLSIZE_SCREENSHOTS
-#: Merge.rc:275 Merge.rc:1248
+#: Merge.rc:275 Merge.rc:1258
msgid "&Full Size Screenshots"
msgstr "完整尺寸截圖 (&F)"
#. IDR_POPUP_WEBPAGE_COMPARE, ID_WEB_COMPARE_HTMLS
-#: Merge.rc:276 Merge.rc:1249
+#: Merge.rc:276 Merge.rc:1259
msgid "&HTMLs"
msgstr "HTML檔案 (&H)"
#. IDR_POPUP_WEBPAGE_COMPARE, ID_WEB_COMPARE_TEXTS
-#: Merge.rc:277 Merge.rc:1250
+#: Merge.rc:277 Merge.rc:1260
msgid "&Texts"
msgstr "文字檔 (&T)"
#. IDR_POPUP_WEBPAGE_COMPARE, ID_WEB_COMPARE_RESOURCETREES
-#: Merge.rc:278 Merge.rc:1251
+#: Merge.rc:278 Merge.rc:1261
msgid "&Resource Trees"
msgstr "資源樹 (&R)"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_SIZE
-#: Merge.rc:280 Merge.rc:1775
+#: Merge.rc:280 Merge.rc:1785
msgid "&Size"
msgstr "大小 (&S)"
@@ -426,27 +426,27 @@ msgid "&Event Sync"
msgstr "事件同步 (&E)"
#. IDR_POPUP_WEBPAGE_SYNC_EVENTS, ID_WEB_SYNC_ENABLED
-#: Merge.rc:291 Merge.rc:1259
+#: Merge.rc:291 Merge.rc:1269
msgid "&Enabled"
msgstr "已啟用 (&E)"
#. IDR_POPUP_WEBPAGE_SYNC_EVENTS, ID_WEB_SYNC_SCROLL
-#: Merge.rc:293 Merge.rc:1261
+#: Merge.rc:293 Merge.rc:1271
msgid "&Scroll"
msgstr "捲動 (&S)"
#. IDR_POPUP_WEBPAGE_SYNC_EVENTS, ID_WEB_SYNC_CLICK
-#: Merge.rc:294 Merge.rc:1262
+#: Merge.rc:294 Merge.rc:1272
msgid "&Click"
msgstr "點擊 (&C)"
#. IDR_POPUP_WEBPAGE_SYNC_EVENTS, ID_WEB_SYNC_INPUT
-#: Merge.rc:295 Merge.rc:1263
+#: Merge.rc:295 Merge.rc:1273
msgid "&Input"
msgstr "輸入 (&I)"
#. IDR_POPUP_WEBPAGE_SYNC_EVENTS, ID_WEB_SYNC_GOBACKFORWARD
-#: Merge.rc:296 Merge.rc:1264
+#: Merge.rc:296 Merge.rc:1274
msgid "&Go Back/Forward"
msgstr "返回/前進 (&G)"
@@ -476,3616 +476,3627 @@ msgid "&All Profiles"
msgstr "所有配置檔 (&A)"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:310 Merge.rc:411 Merge.rc:586
+#: Merge.rc:310 Merge.rc:413 Merge.rc:590
msgid "&File"
msgstr "檔案 (&F)"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:312 Merge.rc:413 Merge.rc:588
+#: Merge.rc:312 Merge.rc:415 Merge.rc:592
msgid "&New"
msgstr "新增 (&N)"
#. IDR_POPUP_COMPARE, ID_MERGE_COMPARE_TEXT
-#: Merge.rc:314 Merge.rc:322 Merge.rc:415 Merge.rc:423 Merge.rc:590
-#: Merge.rc:598 Merge.rc:649 Merge.rc:935 Merge.rc:1159 Merge.rc:1171
+#: Merge.rc:314 Merge.rc:323 Merge.rc:417 Merge.rc:426 Merge.rc:594
+#: Merge.rc:603 Merge.rc:655 Merge.rc:942 Merge.rc:1167 Merge.rc:1180
msgid "&Text"
msgstr "文字 (&T)"
#. IDR_POPUP_COMPARE, ID_MERGE_COMPARE_TABLE
-#: Merge.rc:315 Merge.rc:323 Merge.rc:416 Merge.rc:424 Merge.rc:591
-#: Merge.rc:599 Merge.rc:650 Merge.rc:936 Merge.rc:1160 Merge.rc:1172
+#: Merge.rc:315 Merge.rc:324 Merge.rc:418 Merge.rc:427 Merge.rc:595
+#: Merge.rc:604 Merge.rc:656 Merge.rc:943 Merge.rc:1168 Merge.rc:1181
msgid "T&able"
msgstr "表格 (&A)"
#. IDR_POPUP_COMPARE, ID_MERGE_COMPARE_HEX
-#: Merge.rc:316 Merge.rc:324 Merge.rc:417 Merge.rc:425 Merge.rc:592
-#: Merge.rc:600 Merge.rc:651 Merge.rc:937 Merge.rc:1161 Merge.rc:1173
+#: Merge.rc:316 Merge.rc:325 Merge.rc:419 Merge.rc:428 Merge.rc:596
+#: Merge.rc:605 Merge.rc:657 Merge.rc:944 Merge.rc:1169 Merge.rc:1182
msgid "&Binary"
msgstr "二進制 (&B)"
#. IDS_IMAGE_MENU
-#: Merge.rc:317 Merge.rc:325 Merge.rc:418 Merge.rc:426 Merge.rc:593
-#: Merge.rc:601 Merge.rc:652 Merge.rc:938 Merge.rc:1162 Merge.rc:1174
-#: Merge.rc:5123
+#: Merge.rc:317 Merge.rc:326 Merge.rc:420 Merge.rc:429 Merge.rc:597
+#: Merge.rc:606 Merge.rc:658 Merge.rc:945 Merge.rc:1170 Merge.rc:1183
+#: Merge.rc:5133
msgid "&Image"
msgstr "圖片 (&I)"
#. IDR_POPUP_COMPARE, ID_MERGE_COMPARE_WEBPAGE
-#: Merge.rc:318 Merge.rc:326 Merge.rc:419 Merge.rc:427 Merge.rc:594
-#: Merge.rc:602 Merge.rc:653 Merge.rc:939 Merge.rc:1163 Merge.rc:1175
+#: Merge.rc:318 Merge.rc:327 Merge.rc:421 Merge.rc:430 Merge.rc:598
+#: Merge.rc:607 Merge.rc:659 Merge.rc:946 Merge.rc:1171 Merge.rc:1184
msgid "&Webpage"
msgstr "網頁 (&W)"
+#. IDR_POPUP_NEW, ID_FILE_NEW_FOLDER
+#: Merge.rc:319 Merge.rc:328 Merge.rc:422 Merge.rc:431 Merge.rc:599
+#: Merge.rc:608 Merge.rc:1172
+msgid "&Folder"
+msgstr ""
+
#. IDR_MERGEDOCTYPE
-#: Merge.rc:320 Merge.rc:421 Merge.rc:596
+#: Merge.rc:321 Merge.rc:424 Merge.rc:601
msgid "New (&3 panes)"
msgstr "新增三方比較 (&3)"
#. IDR_MERGEDOCTYPE, ID_FILE_OPEN
-#: Merge.rc:328 Merge.rc:429 Merge.rc:604
+#: Merge.rc:330 Merge.rc:433 Merge.rc:610
msgid "&Open...\tCtrl+O"
msgstr "開啟 (&O)...\tCtrl+O"
#. IDR_MERGEDOCTYPE, ID_FILE_OPENCONFLICT
-#: Merge.rc:329 Merge.rc:430 Merge.rc:605
+#: Merge.rc:331 Merge.rc:434 Merge.rc:611
msgid "Open Conflic&t File..."
msgstr "開啟衝突檔 (&T)..."
#. IDR_MERGEDOCTYPE, ID_FILE_OPENCLIPBOARD
-#: Merge.rc:330 Merge.rc:431 Merge.rc:606
+#: Merge.rc:332 Merge.rc:435 Merge.rc:612
msgid "Open C&lipboard"
msgstr "開啟剪貼簿 (&L)"
#. IDR_POPUP_PROJECT, ID_FILE_OPENPROJECT
-#: Merge.rc:332 Merge.rc:433 Merge.rc:608 Merge.rc:1191
+#: Merge.rc:334 Merge.rc:437 Merge.rc:614 Merge.rc:1201
msgid "Open Pro&ject...\tCtrl+J"
msgstr "開啟專案 (&J)...\tCtrl+J"
#. IDD_OPEN, ID_SAVE_PROJECT
-#: Merge.rc:333 Merge.rc:434 Merge.rc:609 Merge.rc:1193 Merge.rc:1979
+#: Merge.rc:335 Merge.rc:438 Merge.rc:615 Merge.rc:1203 Merge.rc:1989
msgid "Sa&ve Project..."
msgstr "儲存專案 (&V)..."
#. IDR_MAINFRAME, ID_FILE_PROJECT_MRU_FIRST
-#: Merge.rc:335
+#: Merge.rc:337
msgid "Recent Projects"
msgstr "最近開啟的專案"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:336 Merge.rc:445 Merge.rc:657
+#: Merge.rc:338 Merge.rc:449 Merge.rc:664
msgid "Recent F&iles or Folders"
msgstr "最近開啟檔案或資料夾 (&I)"
#. IDR_MERGEDOCTYPE, ID_APP_EXIT
-#: Merge.rc:341 Merge.rc:450 Merge.rc:662
+#: Merge.rc:343 Merge.rc:454 Merge.rc:669
msgid "E&xit\tCtrl+Q"
msgstr "結束 (&X)\tCtrl+Q"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:343 Merge.rc:452 Merge.rc:664
+#: Merge.rc:345 Merge.rc:456 Merge.rc:671
msgid "&Edit"
msgstr "編輯 (&E)"
#. IDR_MERGEDOCTYPE, ID_EDIT_PASTE
-#: Merge.rc:345 Merge.rc:671
+#: Merge.rc:347 Merge.rc:678
msgid "&Paste\tCtrl+V"
msgstr "貼上 (&P)\tCtrl+V"
#. IDR_MERGEDOCTYPE, ID_OPTIONS
-#: Merge.rc:347 Merge.rc:456 Merge.rc:693
+#: Merge.rc:349 Merge.rc:460 Merge.rc:700
msgid "&Options...\tCtrl+,"
msgstr "選項 (&O)...\tCtrl+,"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:349 Merge.rc:458 Merge.rc:695
+#: Merge.rc:351 Merge.rc:462 Merge.rc:702
msgid "&View"
msgstr "檢視 (&V)"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:351 Merge.rc:500 Merge.rc:744
+#: Merge.rc:353 Merge.rc:504 Merge.rc:751
msgid "Ta&b Bar"
msgstr "分頁欄 (&B)"
#. IDR_MERGEDOCTYPE, ID_VIEW_TAB_BAR
-#: Merge.rc:353 Merge.rc:502 Merge.rc:746
+#: Merge.rc:355 Merge.rc:506 Merge.rc:753
msgid "&View Tab Bar"
msgstr "檢視分頁欄 (&V)"
#. IDR_MERGEDOCTYPE, ID_VIEW_TAB_BAR_ON_TITLE_BAR
-#: Merge.rc:354 Merge.rc:503 Merge.rc:747
+#: Merge.rc:356 Merge.rc:507 Merge.rc:754
msgid "&On Title Bar"
msgstr "標題列置頂 (&O)"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:356 Merge.rc:505 Merge.rc:749
+#: Merge.rc:358 Merge.rc:509 Merge.rc:756
msgid "&Toolbar"
msgstr "工具列 (&T)"
#. IDR_MERGEDOCTYPE, ID_TOOLBAR_SMALL
-#: Merge.rc:359 Merge.rc:508 Merge.rc:752
+#: Merge.rc:361 Merge.rc:512 Merge.rc:759
msgid "&Small"
msgstr "小圖示 (&S)"
#. IDR_MERGEDOCTYPE, ID_TOOLBAR_MEDIUM
-#: Merge.rc:360 Merge.rc:509 Merge.rc:753
+#: Merge.rc:362 Merge.rc:513 Merge.rc:760
msgid "&Medium"
msgstr "中圖示 (&M)"
#. IDR_MERGEDOCTYPE, ID_TOOLBAR_BIG
-#: Merge.rc:361 Merge.rc:510 Merge.rc:754
+#: Merge.rc:363 Merge.rc:514 Merge.rc:761
msgid "&Big"
msgstr "大圖示 (&B)"
#. IDR_MERGEDOCTYPE, ID_TOOLBAR_HUGE
-#: Merge.rc:362 Merge.rc:511 Merge.rc:755
+#: Merge.rc:364 Merge.rc:515 Merge.rc:762
msgid "&Huge"
msgstr "超大圖示 (&H)"
#. IDS_VIEW_MENU_BAR
-#: Merge.rc:364 Merge.rc:513 Merge.rc:757 Merge.rc:5357
+#: Merge.rc:366 Merge.rc:517 Merge.rc:764 Merge.rc:5368
msgid "Men&u Bar"
msgstr "選單列 (&U)"
#. IDR_DIRDOCTYPE, ID_VIEW_OUTPUT_BAR
-#: Merge.rc:365 Merge.rc:515
+#: Merge.rc:367 Merge.rc:519
msgid "&Output Pane"
msgstr "輸出窗格 (&O)"
#. IDR_MERGEDOCTYPE, ID_VIEW_STATUS_BAR
-#: Merge.rc:366 Merge.rc:516 Merge.rc:758
+#: Merge.rc:368 Merge.rc:520 Merge.rc:765
msgid "&Status Bar"
msgstr "狀態列 (&S)"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:368 Merge.rc:539 Merge.rc:847
+#: Merge.rc:370 Merge.rc:543 Merge.rc:854
msgid "&Tools"
msgstr "工具 (&T)"
#. IDR_MERGEDOCTYPE, ID_TOOLS_FILTERS
-#: Merge.rc:370 Merge.rc:542 Merge.rc:849
+#: Merge.rc:372 Merge.rc:546 Merge.rc:856
msgid "&Filters..."
msgstr "篩選器 (&F)..."
#. IDR_MERGEDOCTYPE, ID_TOOLS_GENERATEPATCH
-#: Merge.rc:371 Merge.rc:543 Merge.rc:850
+#: Merge.rc:373 Merge.rc:547 Merge.rc:857
msgid "&Generate Patch..."
msgstr "產生補綴 (&G)..."
#. IDR_MERGEDOCTYPE
-#: Merge.rc:373 Merge.rc:546 Merge.rc:853
+#: Merge.rc:375 Merge.rc:550 Merge.rc:860
msgid "&Plugins"
msgstr "外掛 (&P)"
#. IDD_PLUGINS_LIST, IDC_PLUGIN_SETTINGS
-#: Merge.rc:375 Merge.rc:548 Merge.rc:855 Merge.rc:2494 Merge.rc:2926
+#: Merge.rc:377 Merge.rc:552 Merge.rc:862 Merge.rc:2504 Merge.rc:2936
msgid "P&lugin Settings..."
msgstr "外掛設定 (&L)..."
#. IDR_MERGEDOCTYPE, ID_PREDIFFER_MANUAL
-#: Merge.rc:377 Merge.rc:550 Merge.rc:857
+#: Merge.rc:379 Merge.rc:554 Merge.rc:864
msgid "Ma&nual Prediffer"
msgstr "手動預差異化 (&N)"
#. IDR_MERGEDOCTYPE, ID_PREDIFFER_AUTO
-#: Merge.rc:378 Merge.rc:551 Merge.rc:858
+#: Merge.rc:380 Merge.rc:555 Merge.rc:865
msgid "A&utomatic Prediffer"
msgstr "自動預差異化 (&U)"
#. IDR_MERGEDOCTYPE, ID_UNPACK_MANUAL
-#: Merge.rc:380 Merge.rc:553 Merge.rc:860
+#: Merge.rc:382 Merge.rc:557 Merge.rc:867
msgid "&Manual Unpacking"
msgstr "手動解壓縮 (&M)"
# "自動解壓縮 (&A)"
#. IDR_MERGEDOCTYPE, ID_UNPACK_AUTO
-#: Merge.rc:381 Merge.rc:554 Merge.rc:861
+#: Merge.rc:383 Merge.rc:558 Merge.rc:868
msgid "&Automatic Unpacking"
msgstr "自動解開非純文字檔 (&A)"
#. IDR_MERGEDOCTYPE, ID_RELOAD_PLUGINS
-#: Merge.rc:383 Merge.rc:558 Merge.rc:889
+#: Merge.rc:385 Merge.rc:562 Merge.rc:896
msgid "&Reload Plugins"
msgstr "重新載入外掛 (&R)"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:385 Merge.rc:560 Merge.rc:891
+#: Merge.rc:387 Merge.rc:564 Merge.rc:898
msgid "&Window"
msgstr "視窗 (&W)"
#. IDR_MERGEDOCTYPE, ID_FILE_CLOSE
-#: Merge.rc:387 Merge.rc:562 Merge.rc:893
+#: Merge.rc:389 Merge.rc:566 Merge.rc:900
msgid "Cl&ose\tCtrl+W"
msgstr "關閉 (&O)\tCtrl+W"
#. IDR_MERGEDOCTYPE, ID_WINDOW_CLOSEALL
-#: Merge.rc:388 Merge.rc:563 Merge.rc:894
+#: Merge.rc:390 Merge.rc:567 Merge.rc:901
msgid "Clo&se All"
msgstr "關閉全部 (&S)"
#. IDR_MERGEDOCTYPE, ID_NEXT_PANE
-#: Merge.rc:390 Merge.rc:565 Merge.rc:896
+#: Merge.rc:392 Merge.rc:569 Merge.rc:903
msgid "Change &Pane\tF6"
msgstr "切換窗格 (&P)\tF6"
#. IDR_MERGEDOCTYPE, ID_WINDOW_TILE_HORZ
-#: Merge.rc:392 Merge.rc:567 Merge.rc:900
+#: Merge.rc:394 Merge.rc:571 Merge.rc:907
msgid "Tile &Horizontally"
msgstr "水平並排 (&H)"
#. IDR_MERGEDOCTYPE, ID_WINDOW_TILE_VERT
-#: Merge.rc:393 Merge.rc:568 Merge.rc:901
+#: Merge.rc:395 Merge.rc:572 Merge.rc:908
msgid "Tile &Vertically"
msgstr "垂直並排 (&V)"
#. IDR_MERGEDOCTYPE, ID_WINDOW_CASCADE
-#: Merge.rc:394 Merge.rc:569 Merge.rc:902
+#: Merge.rc:396 Merge.rc:573 Merge.rc:909
msgid "&Cascade"
msgstr "前後疊放 (&C)"
#. IDS_MESSAGEBOX_HELP
-#: Merge.rc:396 Merge.rc:571 Merge.rc:904 Merge.rc:3200 Merge.rc:4189
+#: Merge.rc:398 Merge.rc:575 Merge.rc:911 Merge.rc:3210 Merge.rc:4199
msgid "&Help"
msgstr "說明 (&H)"
#. IDR_MERGEDOCTYPE, ID_HELP_CONTENTS
-#: Merge.rc:398 Merge.rc:573 Merge.rc:906
+#: Merge.rc:400 Merge.rc:577 Merge.rc:913
msgid "&WinMerge Help\tF1"
msgstr "WinMerge 說明 (&W)\tF1"
#. IDR_MERGEDOCTYPE, ID_HELP_RELEASENOTES
-#: Merge.rc:400 Merge.rc:575 Merge.rc:908
+#: Merge.rc:402 Merge.rc:579 Merge.rc:915
msgid "R&elease Notes"
msgstr "版本資訊 (&E)"
#. IDR_MERGEDOCTYPE, ID_HELP_TRANSLATIONS
-#: Merge.rc:401 Merge.rc:576 Merge.rc:909
+#: Merge.rc:403 Merge.rc:580 Merge.rc:916
msgid "&Translations"
msgstr "翻譯 (&T)"
#. IDR_MERGEDOCTYPE, ID_HELP_GETCONFIG
-#: Merge.rc:402 Merge.rc:577 Merge.rc:910
+#: Merge.rc:404 Merge.rc:581 Merge.rc:917
msgid "C&onfiguration"
msgstr "組態 (&O)"
#. IDR_MERGEDOCTYPE, ID_HELP_GNULICENSE
-#: Merge.rc:404 Merge.rc:579 Merge.rc:912
+#: Merge.rc:406 Merge.rc:583 Merge.rc:919
msgid "&GNU General Public License"
msgstr "GNU 公共授權證 (&G)"
#. IDR_MERGEDOCTYPE, ID_APP_ABOUT
-#: Merge.rc:405 Merge.rc:580 Merge.rc:913
+#: Merge.rc:407 Merge.rc:584 Merge.rc:920
msgid "&About WinMerge..."
msgstr "關於 WinMerge (&A)..."
#. IDR_MERGEDOCTYPE
-#: Merge.rc:436 Merge.rc:629
+#: Merge.rc:440 Merge.rc:635
msgid "&Read-Only"
msgstr "唯讀 (&R)"
#. IDR_MERGEDOCTYPE, ID_FILE_LEFT_READONLY
-#: Merge.rc:438 Merge.rc:631
+#: Merge.rc:442 Merge.rc:637
msgid "L&eft Read-Only"
msgstr "左側唯讀 (&E)"
#. IDR_MERGEDOCTYPE, ID_FILE_MIDDLE_READONLY
-#: Merge.rc:439 Merge.rc:632
+#: Merge.rc:443 Merge.rc:638
msgid "M&iddle Read-Only"
msgstr "中間唯讀 (&I)"
#. IDR_MERGEDOCTYPE, ID_FILE_RIGHT_READONLY
-#: Merge.rc:440 Merge.rc:633
+#: Merge.rc:444 Merge.rc:639
msgid "Ri&ght Read-Only"
msgstr "右側唯讀 (&G)"
#. IDD_ENCODINGERROR, IDC_FILEENCODING
-#: Merge.rc:443 Merge.rc:646 Merge.rc:1038 Merge.rc:3063
+#: Merge.rc:447 Merge.rc:652 Merge.rc:1046 Merge.rc:3073
msgid "&File Encoding..."
msgstr "檔案編碼 (&F)..."
#. IDR_POPUP_OUTPUTVIEW, ID_EDIT_SELECT_ALL
-#: Merge.rc:454 Merge.rc:674 Merge.rc:1343
+#: Merge.rc:458 Merge.rc:681 Merge.rc:1353
msgid "Select &All\tCtrl+A"
msgstr "全選 (&A)\tCtrl+A"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWIDENTICAL
-#: Merge.rc:460
+#: Merge.rc:464
msgid "Show &Identical Items"
msgstr "顯示相同項目 (&I)"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWDIFFERENT
-#: Merge.rc:461
+#: Merge.rc:465
msgid "Show &Different Items"
msgstr "顯示差異項目 (&D)"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWUNIQUELEFT
-#: Merge.rc:462
+#: Merge.rc:466
msgid "Show L&eft Unique Items"
msgstr "顯示左側獨有項目 (&E)"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWUNIQUEMIDDLE
-#: Merge.rc:463
+#: Merge.rc:467
msgid "Show Midd&le Unique Items"
msgstr "顯示中間獨有項目 (&L)"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWUNIQUERIGHT
-#: Merge.rc:464
+#: Merge.rc:468
msgid "Show Ri&ght Unique Items"
msgstr "顯示右側獨有項目 (&G)"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWSKIPPED
-#: Merge.rc:465
+#: Merge.rc:469
msgid "Show S&kipped Items"
msgstr "顯示略過的項目 (&K)"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWBINARIES
-#: Merge.rc:466
+#: Merge.rc:470
msgid "S&how Binary Files"
msgstr "顯示二進制檔案 (&H)"
#. IDR_DIRDOCTYPE
-#: Merge.rc:467
+#: Merge.rc:471
msgid "&3-way Compare"
msgstr "&3 向比較"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWDIFFERENTLEFTONLY
-#: Merge.rc:469
+#: Merge.rc:473
msgid "Show &Left Only Different Items"
msgstr "顯示僅在左側不同的項目 (&L)"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWDIFFERENTMIDDLEONLY
-#: Merge.rc:470
+#: Merge.rc:474
msgid "Show &Middle Only Different Items"
msgstr "顯示僅在中間不同的項目 (&M)"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWDIFFERENTRIGHTONLY
-#: Merge.rc:471
+#: Merge.rc:475
msgid "Show &Right Only Different Items"
msgstr "顯示僅在右側不同的項目 (&R)"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWMISSINGLEFTONLY
-#: Merge.rc:473
+#: Merge.rc:477
msgid "Show L&eft Only Missing Items"
msgstr "顯示僅在左側缺少的項目 (&L)"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWMISSINGMIDDLEONLY
-#: Merge.rc:474
+#: Merge.rc:478
msgid "Show Mi&ddle Only Missing Items"
msgstr "顯示僅在左側缺少的項目 (&M)"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWMISSINGRIGHTONLY
-#: Merge.rc:475
+#: Merge.rc:479
msgid "Show Rig&ht Only Missing Items"
msgstr "顯示僅在右側缺少的項目 (&R)"
#. IDR_DIRDOCTYPE, ID_VIEW_SHOWHIDDENITEMS
-#: Merge.rc:478
+#: Merge.rc:482
msgid "Show Hidd&en Items"
msgstr "顯示隱藏項目 (&E)"
#. IDR_DIRDOCTYPE, ID_VIEW_TREEMODE
-#: Merge.rc:480
+#: Merge.rc:484
msgid "Tree &Mode"
msgstr "樹狀模式 (&M)"
#. IDR_DIRDOCTYPE
-#: Merge.rc:481
+#: Merge.rc:485
msgid "E&xpand Subfolders"
msgstr "展開子資料夾 (&X)"
#. IDR_DIRDOCTYPE, ID_VIEW_EXPAND_ALLSUBDIRS
-#: Merge.rc:483
+#: Merge.rc:487
msgid "&All Subfolders"
msgstr "所有子資料夾 (&A)"
#. IDR_DIRDOCTYPE, ID_VIEW_EXPAND_DIFFERENT_SUBDIRS
-#: Merge.rc:484
+#: Merge.rc:488
msgid "&Different Subfolders"
msgstr "不同子資料夾 (&D)"
#. IDR_DIRDOCTYPE, ID_VIEW_EXPAND_IDENTICAL_SUBDIRS
-#: Merge.rc:485
+#: Merge.rc:489
msgid "&Identical Subfolders"
msgstr "相同子資料夾 (&I)"
#. IDR_DIRDOCTYPE, ID_VIEW_COLLAPSE_ALLSUBDIRS
-#: Merge.rc:487
+#: Merge.rc:491
msgid "&Collapse All Subfolders"
msgstr "收合所有子資料夾 (&C)"
#. IDR_DIRDOCTYPE, ID_VIEW_SHOW_EMPTY_FOLDERS
-#: Merge.rc:488
+#: Merge.rc:492
msgid "Show &Empty Folders"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_VIEW_SELECTFONT
-#: Merge.rc:490 Merge.rc:697
+#: Merge.rc:494 Merge.rc:704
msgid "Select &Font..."
msgstr "選取字型 (&F)..."
#. IDR_MERGEDOCTYPE, ID_VIEW_USEDEFAULTFONT
-#: Merge.rc:491 Merge.rc:698
+#: Merge.rc:495 Merge.rc:705
msgid "Use Default Font"
msgstr "使用預設字型"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:493 Merge.rc:736
+#: Merge.rc:497 Merge.rc:743
msgid "Sw&ap Panes"
msgstr "窗格對調 (&A)"
#. IDR_MERGEDOCTYPE, ID_SWAPPANES_SWAP12
-#: Merge.rc:495 Merge.rc:738
+#: Merge.rc:499 Merge.rc:745
msgid "Swap &1st | 2nd"
msgstr "將第 1 和第 2 對調 (&1)"
#. IDR_MERGEDOCTYPE, ID_SWAPPANES_SWAP23
-#: Merge.rc:496 Merge.rc:739
+#: Merge.rc:500 Merge.rc:746
msgid "Swap &2nd | 3rd"
msgstr "將第 2 和第 3 對調 (&2)"
#. IDR_MERGEDOCTYPE, ID_SWAPPANES_SWAP13
-#: Merge.rc:497 Merge.rc:740
+#: Merge.rc:501 Merge.rc:747
msgid "Swap 1st | &3rd"
msgstr "將第 1 和第 3 對調 (&3)"
#. IDR_DIRDOCTYPE, ID_VIEW_DISPLAY_FILTER_BAR_MENU
-#: Merge.rc:514
+#: Merge.rc:518
msgid "Displa&y Filter Bar\tCtrl+Shift+L"
msgstr "顯示篩選欄 (&Y)\tCtrl+Shift+L"
#. IDR_DIRDOCTYPE, ID_VIEW_DIR_STATISTICS
-#: Merge.rc:518
+#: Merge.rc:522
msgid "Com&pare Statistics..."
msgstr "統計比較結果 (&P)"
#. IDR_MERGEDOCTYPE, ID_REFRESH
-#: Merge.rc:520 Merge.rc:763
+#: Merge.rc:524 Merge.rc:770
msgid "Refresh\tF5"
msgstr "重整\tF5"
#. IDR_POPUP_DIRVIEW, ID_RESCAN
-#: Merge.rc:521 Merge.rc:1030
+#: Merge.rc:525 Merge.rc:1038
msgid "&Refresh Selected\tCtrl+F5"
msgstr "重整已選取項 (&R)\tCtrl+F5"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:523 Merge.rc:765
+#: Merge.rc:527 Merge.rc:772
msgid "&Merge"
msgstr "合併 (&M)"
#. IDR_DIRDOCTYPE, ID_MERGE_COMPARE
-#: Merge.rc:525
+#: Merge.rc:529
msgid "Co&mpare\tEnter"
msgstr "比較 (&M)\tEnter"
#. IDR_MERGEDOCTYPE, ID_NEXTDIFF
-#: Merge.rc:527 Merge.rc:767
+#: Merge.rc:531 Merge.rc:774
msgid "&Next Difference\tAlt+Down"
msgstr "下一個差異 (&N)\tAlt+Down"
#. IDR_MERGEDOCTYPE, ID_PREVDIFF
-#: Merge.rc:528 Merge.rc:768
+#: Merge.rc:532 Merge.rc:775
msgid "&Previous Difference\tAlt+Up"
msgstr "上一個差異 (&P)\tAlt+Up"
#. IDR_MERGEDOCTYPE, ID_FIRSTDIFF
-#: Merge.rc:530 Merge.rc:773
+#: Merge.rc:534 Merge.rc:780
msgid "&First Difference\tAlt+Home"
msgstr "首個差異 (&F)\tAlt+Home"
#. IDR_MERGEDOCTYPE, ID_CURDIFF
-#: Merge.rc:531 Merge.rc:774
+#: Merge.rc:535 Merge.rc:781
msgid "&Current Difference\tAlt+Enter"
msgstr "目前差異 (&C)\tAlt+Enter"
#. IDR_MERGEDOCTYPE, ID_LASTDIFF
-#: Merge.rc:532 Merge.rc:775
+#: Merge.rc:536 Merge.rc:782
msgid "&Last Difference\tAlt+End"
msgstr "最後一個差異 (&L)\tAlt+End"
#. IDR_MERGEDOCTYPE, ID_L2R
-#: Merge.rc:534 Merge.rc:830
+#: Merge.rc:538 Merge.rc:837
msgid "Copy to &Right\tAlt+Right"
msgstr "複製到右側 (&R)\tAlt+Right"
#. IDR_MERGEDOCTYPE, ID_R2L
-#: Merge.rc:535 Merge.rc:831
+#: Merge.rc:539 Merge.rc:838
msgid "Copy to L&eft\tAlt+Left"
msgstr "複製到左側 (&E)\tAlt+Left"
#. IDR_DIRDOCTYPE, ID_MERGE_DELETE
-#: Merge.rc:537
+#: Merge.rc:541
msgid "&Delete\tDel"
msgstr "刪除 (&D)\tDel"
#. IDR_POPUP_DIRVIEW, ID_TOOLS_CUSTOMIZECOLUMNS
-#: Merge.rc:541 Merge.rc:1042
+#: Merge.rc:545 Merge.rc:1050
msgid "&Customize Columns..."
msgstr "自訂欄位 (&C)..."
#. IDR_MERGEDOCTYPE, ID_TOOLS_GENERATEREPORT
-#: Merge.rc:544 Merge.rc:851
+#: Merge.rc:548 Merge.rc:858
msgid "Generate &Report..."
msgstr "產生報告 (&R)..."
#. IDD_ENCODINGERROR, IDC_PLUGIN
-#: Merge.rc:556 Merge.rc:867 Merge.rc:3064
+#: Merge.rc:560 Merge.rc:874 Merge.rc:3074
msgid "&Edit with Unpacker..."
msgstr "解壓縮編輯 (&E)"
#. IDR_MERGEDOCTYPE, ID_FILE_SAVE
-#: Merge.rc:611
+#: Merge.rc:617
msgid "&Save\tCtrl+S"
msgstr "儲存 (&S)\tCtrl+S"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:612
+#: Merge.rc:618
msgid "Sav&e"
msgstr "儲存 (&E)"
#. IDR_POPUP_SAVE, ID_FILE_SAVE_LEFT
-#: Merge.rc:614 Merge.rc:1201
+#: Merge.rc:620 Merge.rc:1211
msgid "Save &Left"
msgstr "儲存左側 (&L)"
#. IDR_POPUP_SAVE, ID_FILE_SAVE_MIDDLE
-#: Merge.rc:615 Merge.rc:1202
+#: Merge.rc:621 Merge.rc:1212
msgid "Save &Middle"
msgstr "儲存中間 (&M)"
#. IDR_POPUP_SAVE, ID_FILE_SAVE_RIGHT
-#: Merge.rc:616 Merge.rc:1203
+#: Merge.rc:622 Merge.rc:1213
msgid "Save &Right"
msgstr "儲存右側 (&R)"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:618
+#: Merge.rc:624
msgid "Save &As"
msgstr "儲存為 (&A)"
#. IDR_POPUP_SAVE, ID_FILE_SAVEAS_LEFT
-#: Merge.rc:620 Merge.rc:1205
+#: Merge.rc:626 Merge.rc:1215
msgid "Save &Left As..."
msgstr "儲存左側為 (&L)..."
#. IDR_POPUP_SAVE, ID_FILE_SAVEAS_MIDDLE
-#: Merge.rc:621 Merge.rc:1206
+#: Merge.rc:627 Merge.rc:1216
msgid "Save &Middle As..."
msgstr "儲存中間為 (&M)..."
#. IDR_POPUP_SAVE, ID_FILE_SAVEAS_RIGHT
-#: Merge.rc:622 Merge.rc:1207
+#: Merge.rc:628 Merge.rc:1217
msgid "Save &Right As..."
msgstr "儲存右側為 (&R)..."
#. IDR_MERGEDOCTYPE, ID_FILE_PRINT
-#: Merge.rc:625
+#: Merge.rc:631
msgid "&Print...\tCtrl+P"
msgstr "列印 (&P)...\tCtrl+P"
#. IDR_MERGEDOCTYPE, ID_FILE_PAGE_SETUP
-#: Merge.rc:626
+#: Merge.rc:632
msgid "Page Set&up..."
msgstr "設定列印格式 (&U)..."
#. IDR_MERGEDOCTYPE, ID_FILE_PRINT_PREVIEW
-#: Merge.rc:627
+#: Merge.rc:633
msgid "Print Previe&w..."
msgstr "預覽列印 (&R)..."
#. IDR_MERGEDOCTYPE
-#: Merge.rc:636
+#: Merge.rc:642
msgid "&Convert Line Endings to"
msgstr "轉換換行字元 (&C)"
#. IDR_MERGEDOCTYPE, ID_FILE_MERGINGMODE
-#: Merge.rc:643
+#: Merge.rc:649
msgid "Mer&ge Mode\tF9"
msgstr "開/關合併模式 (&G)\tF9"
#. IDR_MERGEDOCTYPE, ID_RESCAN
-#: Merge.rc:645
+#: Merge.rc:651
msgid "Reloa&d\tCtrl+F5"
msgstr "重新載入 (&D)\tCtrl+F5"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:647
+#: Merge.rc:653
msgid "Reco&mpare As"
msgstr "重新比較 (&M)"
+#. IDR_POPUP_COMPARE, ID_MERGE_COMPARE_FOLDER
+#: Merge.rc:660 Merge.rc:947 Merge.rc:1185
+msgid "A&rchive"
+msgstr ""
+
#. IDR_MERGEDOCTYPE, ID_EDIT_UNDO
-#: Merge.rc:666
+#: Merge.rc:673
msgid "&Undo\tCtrl+Z"
msgstr "復原 (&U)\tCtrl+Z"
#. IDR_MERGEDOCTYPE, ID_EDIT_REDO
-#: Merge.rc:667
+#: Merge.rc:674
msgid "&Redo\tCtrl+Y"
msgstr "取消復原 (&R)\tCtrl+Y"
#. IDR_MERGEDOCTYPE, ID_EDIT_CUT
-#: Merge.rc:669
+#: Merge.rc:676
msgid "Cu&t\tCtrl+X"
msgstr "剪下 (&U)\tCtrl+X"
#. IDR_POPUP_OUTPUTVIEW, ID_EDIT_COPY
-#: Merge.rc:670 Merge.rc:1342
+#: Merge.rc:677 Merge.rc:1352
msgid "&Copy\tCtrl+C"
msgstr "複製 (&C)\tCtrl+C"
#. IDR_MERGEDOCTYPE, ID_EDIT_FIND
-#: Merge.rc:676
+#: Merge.rc:683
msgid "F&ind...\tCtrl+F"
msgstr "尋找 (&I)...\tCtrl+F"
#. IDR_MERGEDOCTYPE, ID_EDIT_REPLACE
-#: Merge.rc:677
+#: Merge.rc:684
msgid "Repla&ce...\tCtrl+H"
msgstr "取代 (&C)...\tCtrl+H"
#. IDR_MERGEDOCTYPE, ID_EDIT_MARK
-#: Merge.rc:678
+#: Merge.rc:685
msgid "&Marker...\tCtrl+Shift+M"
msgstr "標記 (&M)...\tCtrl+Shift+M"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:680
+#: Merge.rc:687
msgid "Advanced"
msgstr "進階"
#. IDR_MERGEDOCTYPE, ID_EDIT_COPY_LINENUMBERS
-#: Merge.rc:682
+#: Merge.rc:689
msgid "&Copy With Line Numbers\tCtrl+Shift+C"
msgstr "連同行號複製 (&C)\tCtrl+Shift+C"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:684
+#: Merge.rc:691
msgid "&Bookmarks"
msgstr "書籤 (&B)"
#. IDR_MERGEDOCTYPE, ID_EDIT_TOGGLE_BOOKMARK
-#: Merge.rc:686
+#: Merge.rc:693
msgid "&Toggle Bookmark\tCtrl+F2"
msgstr "放置/清除書籤 (&T)\tCtrl+F2"
#. IDR_MERGEDOCTYPE, ID_EDIT_GOTO_NEXT_BOOKMARK
-#: Merge.rc:687
+#: Merge.rc:694
msgid "&Next Bookmark\tF2"
msgstr "下一書籤 (&N)\tF2"
#. IDR_MERGEDOCTYPE, ID_EDIT_GOTO_PREV_BOOKMARK
-#: Merge.rc:688
+#: Merge.rc:695
msgid "&Previous Bookmark\tShift+F2"
msgstr "上一書籤 (&P)\tShift+F2"
#. IDR_MERGEDOCTYPE, ID_EDIT_CLEAR_ALL_BOOKMARKS
-#: Merge.rc:689
+#: Merge.rc:696
msgid "&Clear All Bookmarks"
msgstr "清除全部書籤 (&C)"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:706
+#: Merge.rc:713
msgid "Syntax Highlight"
msgstr "語法高亮顯著色"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:711
+#: Merge.rc:718
msgid "&Diff Context"
msgstr "差異上下文 (&D)"
#. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_ALL
-#: Merge.rc:713
+#: Merge.rc:720
msgid "&All Lines"
msgstr "全部行 (&A)"
#. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_0
-#: Merge.rc:715
+#: Merge.rc:722
msgid "&0 Lines"
msgstr "0行 (&0)"
#. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_1
-#: Merge.rc:716
+#: Merge.rc:723
msgid "&1 Line"
msgstr "1行 (&1)"
#. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_3
-#: Merge.rc:717
+#: Merge.rc:724
msgid "&3 Lines"
msgstr "3行 (&3)"
#. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_5
-#: Merge.rc:718
+#: Merge.rc:725
msgid "&5 Lines"
msgstr "5行 (&5)"
#. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_7
-#: Merge.rc:719
+#: Merge.rc:726
msgid "&7 Lines"
msgstr "7行 (&7)"
#. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_9
-#: Merge.rc:720
+#: Merge.rc:727
msgid "&9 Lines"
msgstr "9行 (&9)"
#. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_TOGGLE
-#: Merge.rc:722
+#: Merge.rc:729
msgid "&Toggle All and 0-9 Lines\tCtrl+D"
msgstr "切換全部行和 0-9 行 (&T)\tCtrl+D"
#. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_INVERT
-#: Merge.rc:724
+#: Merge.rc:731
msgid "&Invert (Hide Different Lines)"
msgstr "隱藏相異行 (&I)"
#. IDR_MERGEDOCTYPE, ID_VIEW_RESIZE_PANES
-#: Merge.rc:727
+#: Merge.rc:734
msgid "&Lock Panes"
msgstr "鎖住窗格 (&L)"
#. IDR_MERGEDOCTYPE, ID_VIEW_WHITESPACE
-#: Merge.rc:728
+#: Merge.rc:735
msgid "&View Whitespace"
msgstr "檢視空白字元 (&V)"
#. IDR_MERGEDOCTYPE, ID_VIEW_EOL
-#: Merge.rc:729
+#: Merge.rc:736
msgid "View E&OL"
msgstr "檢視行尾符號 (&O)"
#. IDR_MERGEDOCTYPE, ID_VIEW_LINEDIFFS
-#: Merge.rc:730
+#: Merge.rc:737
msgid "Vie&w Line Differences"
msgstr "檢視行內差異 (&W)"
#. IDR_MERGEDOCTYPE, ID_VIEW_LINENUMBERS
-#: Merge.rc:731
+#: Merge.rc:738
msgid "View Line &Numbers"
msgstr "檢視行號 (&N)"
#. IDR_MERGEDOCTYPE, ID_VIEW_SELMARGIN
-#: Merge.rc:732
+#: Merge.rc:739
msgid "View &Margins"
msgstr "檢視頁邊 (&M)"
#. IDR_MERGEDOCTYPE, ID_VIEW_TOPMARGIN
-#: Merge.rc:733
+#: Merge.rc:740
msgid "View To&p Margins"
msgstr "檢視上邊界 (&p)"
#. IDR_MERGEDOCTYPE, ID_VIEW_WORDWRAP
-#: Merge.rc:734
+#: Merge.rc:741
msgid "W&rap Lines"
msgstr "自動換行 (&R)"
#. IDR_MERGEDOCTYPE, ID_VIEW_SPLITVERTICALLY
-#: Merge.rc:742
+#: Merge.rc:749
msgid "Split V&ertically"
msgstr "垂直分割 (&E)"
# I would suggest "Microview Pane"
# 差異窗格 (&P)
#. IDR_MERGEDOCTYPE, ID_VIEW_DETAIL_BAR
-#: Merge.rc:759
+#: Merge.rc:766
msgid "Diff &Pane"
msgstr "差異面板 (&P)"
# I would suggest "Macroview Pane".
#. IDR_MERGEDOCTYPE, ID_VIEW_LOCATION_BAR
-#: Merge.rc:760
+#: Merge.rc:767
msgid "Lo&cation Pane"
msgstr "位置窗格 (&P)"
#. IDS_OUTPUTBAR_CAPTION
-#: Merge.rc:761 Merge.rc:4902
+#: Merge.rc:768 Merge.rc:4912
msgid "Output Pane"
msgstr "輸出窗格"
#. IDR_MERGEDOCTYPE, ID_NEXTCONFLICT
-#: Merge.rc:770
+#: Merge.rc:777
msgid "Ne&xt Conflict\tAlt+Shift+Down"
msgstr "下一個衝突 (&X)\tAlt+Shift+Down"
#. IDR_MERGEDOCTYPE, ID_PREVCONFLICT
-#: Merge.rc:771
+#: Merge.rc:778
msgid "Pre&vious Conflict\tAlt+Shift+Up"
msgstr "上一個衝突 (&V)\tAlt+Shift+Up"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:777
+#: Merge.rc:784
msgid "A&dvanced"
msgstr "進階 (&D)"
#. IDR_MERGEDOCTYPE, ID_NEXTDIFFLM
-#: Merge.rc:779
+#: Merge.rc:786
msgid "Next Difference (Left/Middle)\tAlt+1"
msgstr "下一個左側和中間的差異\tAlt+1"
#. IDR_MERGEDOCTYPE, ID_PREVDIFFLM
-#: Merge.rc:780
+#: Merge.rc:787
msgid "Previous Difference (Left/Middle)\tAlt+Shift+1"
msgstr "上一個左側和中間的差異\tAlt+Shift+1"
#. IDR_MERGEDOCTYPE, ID_NEXTDIFFLR
-#: Merge.rc:782
+#: Merge.rc:789
msgid "Next Difference (Left/Right)\tAlt+2"
msgstr "下一個左側和右側的差異\tAlt+2"
#. IDR_MERGEDOCTYPE, ID_PREVDIFFLR
-#: Merge.rc:783
+#: Merge.rc:790
msgid "Previous Difference (Left/Right)\tAlt+Shift+2"
msgstr "上一個左側和右側的差異\tAlt+Shift+2"
#. IDR_MERGEDOCTYPE, ID_NEXTDIFFMR
-#: Merge.rc:785
+#: Merge.rc:792
msgid "Next Difference (Middle/Right)\tAlt+3"
msgstr "下一個中間和右側的差異\tAlt+3"
#. IDR_MERGEDOCTYPE, ID_PREVDIFFMR
-#: Merge.rc:786
+#: Merge.rc:793
msgid "Previous Difference (Middle/Right)\tAlt+Shift+3"
msgstr "上一個中間和右側的差異\tAlt+Shift+3"
#. IDR_MERGEDOCTYPE, ID_NEXTDIFFLO
-#: Merge.rc:788
+#: Merge.rc:795
msgid "Next Left-Only Difference\tAlt+7"
msgstr "下一個只存在左側的差異\tAlt+7"
#. IDR_MERGEDOCTYPE, ID_PREVDIFFLO
-#: Merge.rc:789
+#: Merge.rc:796
msgid "Previous Left-Only Difference\tAlt+Shift+7"
msgstr "上一個只存在左側的差異\tAlt+Shift+7"
#. IDR_MERGEDOCTYPE, ID_NEXTDIFFMO
-#: Merge.rc:791
+#: Merge.rc:798
msgid "Next Middle-Only Difference\tAlt+8"
msgstr "下一個只存在中間的差異\tAlt+8"
#. IDR_MERGEDOCTYPE, ID_PREVDIFFMO
-#: Merge.rc:792
+#: Merge.rc:799
msgid "Previous Middle-Only Difference\tAlt+Shift+8"
msgstr "上一個只存在中間的差異\tAlt+Shift+8"
#. IDR_MERGEDOCTYPE, ID_NEXTDIFFRO
-#: Merge.rc:794
+#: Merge.rc:801
msgid "Next Right-Only Difference\tAlt+9"
msgstr "下一個只存在右側的差異\tAlt+9"
#. IDR_MERGEDOCTYPE, ID_PREVDIFFRO
-#: Merge.rc:795
+#: Merge.rc:802
msgid "Previous Right-Only Difference\tAlt+Shift+9"
msgstr "上一個只存在右側的差異\tAlt+Shift+9"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:797
+#: Merge.rc:804
msgid "Copy from &Left to"
msgstr "從左側複製至 (&L)"
#. IDD_LOAD_SAVE_CODEPAGE, IDC_AFFECTS_MIDDLE_BTN
-#: Merge.rc:799 Merge.rc:810 Merge.rc:815 Merge.rc:826 Merge.rc:970
-#: Merge.rc:2545 Merge.rc:2817
+#: Merge.rc:806 Merge.rc:817 Merge.rc:822 Merge.rc:833 Merge.rc:978
+#: Merge.rc:2555 Merge.rc:2827
msgid "&Middle"
msgstr "中間 (&M)"
#. IDD_LOAD_SAVE_CODEPAGE, IDC_AFFECTS_RIGHT_BTN
-#: Merge.rc:800 Merge.rc:805 Merge.rc:816 Merge.rc:821 Merge.rc:971
-#: Merge.rc:2546 Merge.rc:2819
+#: Merge.rc:807 Merge.rc:812 Merge.rc:823 Merge.rc:828 Merge.rc:979
+#: Merge.rc:2556 Merge.rc:2829
msgid "&Right"
msgstr "右側 (&R)"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:802
+#: Merge.rc:809
msgid "Copy from &Middle to"
msgstr "從中間複製至 (&M)"
#. IDD_LOAD_SAVE_CODEPAGE, IDC_AFFECTS_LEFT_BTN
-#: Merge.rc:804 Merge.rc:809 Merge.rc:820 Merge.rc:825 Merge.rc:969
-#: Merge.rc:2544 Merge.rc:2815
+#: Merge.rc:811 Merge.rc:816 Merge.rc:827 Merge.rc:832 Merge.rc:977
+#: Merge.rc:2554 Merge.rc:2825
msgid "&Left"
msgstr "左側 (&L)"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:807
+#: Merge.rc:814
msgid "Copy from &Right to"
msgstr "從右側複製至 (&R)"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:813
+#: Merge.rc:820
msgid "Copy Selected Lines from Le&ft to"
msgstr "將左側所選行複製至 (&F)"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:818
+#: Merge.rc:825
msgid "Copy Selected Lines from Mi&ddle to"
msgstr "將中間所選行複製至 (&D)"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:823
+#: Merge.rc:830
msgid "Copy Selected Lines from Ri&ght to"
msgstr "將右側所選行複製至 (&G)"
#. IDR_MERGEDOCTYPE, ID_COPY_FROM_LEFT
-#: Merge.rc:833
+#: Merge.rc:840
msgid "Copy from Left\tAlt+Shift+Right"
msgstr "從左側複製\tAlt+Shift+Right"
#. IDR_MERGEDOCTYPE, ID_COPY_FROM_RIGHT
-#: Merge.rc:834
+#: Merge.rc:841
msgid "Copy from Right\tAlt+Shift+Left"
msgstr "從右側複製\tAlt+Shift+Right"
#. IDR_MERGEDOCTYPE, ID_L2RNEXT
-#: Merge.rc:836
+#: Merge.rc:843
msgid "C&opy to Right and Advance\tCtrl+Alt+Right"
msgstr "複製到右側後到下一個 (&O)\tCtrl+Alt+Right"
#. IDR_MERGEDOCTYPE, ID_R2LNEXT
-#: Merge.rc:837
+#: Merge.rc:844
msgid "Copy &to Left and Advance\tCtrl+Alt+Left"
msgstr "複製到左側後到下一個 (&T)\tCtrl+Alt+Left"
#. IDR_MERGEDOCTYPE, ID_ALL_RIGHT
-#: Merge.rc:839
+#: Merge.rc:846
msgid "Copy &All to Right"
msgstr "全部複製到右側 (&A)"
#. IDR_MERGEDOCTYPE, ID_ALL_LEFT
-#: Merge.rc:840
+#: Merge.rc:847
msgid "Cop&y All to Left"
msgstr "全部複製到左側 (&Y)"
#. IDR_MERGEDOCTYPE, ID_AUTO_MERGE
-#: Merge.rc:842
+#: Merge.rc:849
msgid "A&uto Merge\tCtrl+Alt+M"
msgstr "自動合併 (&U)\tCtrl+Alt+M"
#. IDR_MERGEDOCTYPE, ID_ADD_SYNCPOINT
-#: Merge.rc:844
+#: Merge.rc:851
msgid "Add &Synchronization Point\tAlt+S"
msgstr "新增同步點 (&S)\tAlt+S"
#. IDR_MERGEDOCTYPE, ID_CLEAR_SYNCPOINTS
-#: Merge.rc:845
+#: Merge.rc:852
msgid "Clear Sync&hronization Points"
msgstr "清除同步點 (&H)"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:863
+#: Merge.rc:870
msgid "Unpac&ker"
msgstr "解壓縮程式 (&K)"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:869
+#: Merge.rc:876
msgid "&Prediffer"
msgstr "預差異化 (&P)"
#. IDR_MERGEDOCTYPE, ID_APPLY_PREDIFFER
-#: Merge.rc:873
+#: Merge.rc:880
msgid "Apply Pre&differ..."
msgstr "套用預先差異 (&d)..."
#. IDR_MERGEDOCTYPE, ID_TRANSFORM_WITH_SCRIPT
-#: Merge.rc:879
+#: Merge.rc:886
msgid "&Transform with Editor Script..."
msgstr "使用編輯器指令腳本進行轉換 (&T)..."
#. IDR_MERGEDOCTYPE
-#: Merge.rc:880
+#: Merge.rc:887
msgid "Scripts for &Copying"
msgstr "複製指令碼 (&C)"
#. IDR_MERGEDOCTYPE, ID_SELECT_EDITOR_SCRIPT_FOR_COPYING
-#: Merge.rc:886
+#: Merge.rc:893
msgid "Select &Editor Script..."
msgstr "選取編輯器指令碼 (&E)..."
#. IDR_MERGEDOCTYPE, ID_WINDOW_SPLIT
-#: Merge.rc:898
+#: Merge.rc:905
msgid "Sp&lit"
msgstr "分割 (&L)"
#. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE
-#: Merge.rc:921
+#: Merge.rc:928
msgid "Comp&are"
msgstr "比較 (&A)"
#. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE_WITH_MOVED_RENAMED
-#: Merge.rc:922
+#: Merge.rc:929
msgid "Compar&e with Renamed/Moved Items"
msgstr "比較已重新命名/已移動之項目 (&E)"
#. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE_IN_NEW_WINDOW
-#: Merge.rc:923
+#: Merge.rc:930
msgid "Compare in New &Window"
msgstr "在新視窗中比較 (&W)"
#. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE_NONHORIZONTALLY
-#: Merge.rc:924 Merge.rc:931
+#: Merge.rc:931 Merge.rc:938
msgid "Compare Non-hor&izontally..."
msgstr "非水平比較 (&I)..."
#. IDR_POPUP_DIRVIEW
-#: Merge.rc:925
+#: Merge.rc:932
msgid "Compare Non-hor&izontally"
msgstr "非水平比較 (&I)"
#. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE_LEFT1_LEFT2
-#: Merge.rc:927
+#: Merge.rc:934
msgid "First &Left with Second Left"
msgstr "第一個左側項目和第二個左側項目 (&L)"
#. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE_RIGHT1_RIGHT2
-#: Merge.rc:928
+#: Merge.rc:935
msgid "First &Right with Second Right"
msgstr "第一個右側項目和第二個右側項目 (&R)"
#. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE_LEFT1_RIGHT2
-#: Merge.rc:929
+#: Merge.rc:936
msgid "&First Left with Second Right"
msgstr "第一個左側項目和第二個右側項目 (&F)"
#. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE_LEFT2_RIGHT1
-#: Merge.rc:930
+#: Merge.rc:937
msgid "&Second Left with First Right"
msgstr "第二個左側項目和第一個右側項目 (&S)"
#. IDR_POPUP_DIRVIEW
-#: Merge.rc:933
+#: Merge.rc:940
msgid "Co&mpare As"
msgstr "比較為 (&M)"
#. IDS_COPY_LEFT_TO_MIDDLE2
-#: Merge.rc:945 Merge.rc:957 Merge.rc:4502
+#: Merge.rc:953 Merge.rc:965 Merge.rc:4512
#, c-format
msgid "Left to Middle (%1 of %2)"
msgstr "左側到中間 (%1/%2)"
#. IDS_COPY_LEFT_TO_RIGHT2
-#: Merge.rc:946 Merge.rc:958 Merge.rc:4501
+#: Merge.rc:954 Merge.rc:966 Merge.rc:4511
#, c-format
msgid "Left to Right (%1 of %2)"
msgstr "左側到右側 (%1/%2)"
#. IDS_MOVE_LEFT_TO2
-#: Merge.rc:947 Merge.rc:959 Merge.rc:1022 Merge.rc:4513 Merge.rc:4542
+#: Merge.rc:955 Merge.rc:967 Merge.rc:1030 Merge.rc:4523 Merge.rc:4552
#, c-format
msgid "Left to... (%1 of %2)"
msgstr "左側到... (%1/%2)"
#. IDS_COPY_MIDDLE_TO_LEFT2
-#: Merge.rc:948 Merge.rc:960 Merge.rc:4499
+#: Merge.rc:956 Merge.rc:968 Merge.rc:4509
#, c-format
msgid "Middle to Left (%1 of %2)"
msgstr "中間到左側 (%1/%2)"
#. IDS_COPY_MIDDLE_TO_RIGHT2
-#: Merge.rc:949 Merge.rc:961 Merge.rc:4500
+#: Merge.rc:957 Merge.rc:969 Merge.rc:4510
#, c-format
msgid "Middle to Right (%1 of %2)"
msgstr "中間到右側 (%1/%2)"
#. IDS_MOVE_MIDDLE_TO2
-#: Merge.rc:950 Merge.rc:962 Merge.rc:1023 Merge.rc:4514 Merge.rc:4543
+#: Merge.rc:958 Merge.rc:970 Merge.rc:1031 Merge.rc:4524 Merge.rc:4553
#, c-format
msgid "Middle to... (%1 of %2)"
msgstr "中間到... (%1/%2)"
#. IDS_COPY_RIGHT_TO_MIDDLE2
-#: Merge.rc:951 Merge.rc:963 Merge.rc:4498
+#: Merge.rc:959 Merge.rc:971 Merge.rc:4508
#, c-format
msgid "Right to Middle (%1 of %2)"
msgstr "右側到中間 (%1/%2)"
#. IDS_COPY_RIGHT_TO_LEFT2
-#: Merge.rc:952 Merge.rc:964 Merge.rc:4497
+#: Merge.rc:960 Merge.rc:972 Merge.rc:4507
#, c-format
msgid "Right to Left (%1 of %2)"
msgstr "右側到左側 (%1/%2)"
#. IDS_MOVE_RIGHT_TO2
-#: Merge.rc:953 Merge.rc:965 Merge.rc:1024 Merge.rc:4515 Merge.rc:4544
+#: Merge.rc:961 Merge.rc:973 Merge.rc:1032 Merge.rc:4525 Merge.rc:4554
#, c-format
msgid "Right to... (%1 of %2)"
msgstr "右側到... (%1/%2)"
#. IDD_EDIT_MARKER, IDC_EDIT_MARKER_DELETE
-#: Merge.rc:967 Merge.rc:2036
+#: Merge.rc:975 Merge.rc:2046
msgid "&Delete"
msgstr "刪除 (&D)"
#. IDR_POPUP_DIRVIEW, ID_DIR_DEL_BOTH
-#: Merge.rc:972
+#: Merge.rc:980
msgid "&Both"
msgstr "兩邊 (&B)"
#. IDR_POPUP_DIRVIEW, ID_DIR_DEL_ALL
-#: Merge.rc:973
+#: Merge.rc:981
msgid "&All"
msgstr "全部 (&A)"
#. IDD_EDIT_REPLACE, IDC_EDIT_SCOPE_SELECTION
-#: Merge.rc:974 Merge.rc:2019
+#: Merge.rc:982 Merge.rc:2029
msgid "&Selection"
msgstr "選取區 (&S)"
#. IDR_POPUP_DIRVIEW, ID_DIR_ITEM_RENAME
-#: Merge.rc:976
+#: Merge.rc:984
msgid "Re&name"
msgstr "重新命名 (&N)"
#. IDR_POPUP_DIRVIEW, ID_DIR_HIDE_FILENAMES
-#: Merge.rc:977
+#: Merge.rc:985
msgid "&Hide Items"
msgstr "隱藏檔案 (&H)"
#. IDR_POPUP_DIRVIEW
-#: Merge.rc:979
+#: Merge.rc:987
msgid "&Open Left"
msgstr "開啟左側 (&O)"
#. IDR_POPUP_DIRVIEW
-#: Merge.rc:986
+#: Merge.rc:994
msgid "Open Midd&le"
msgstr "開啟中間 (&L)"
#. IDR_POPUP_DIRVIEW
-#: Merge.rc:993
+#: Merge.rc:1001
msgid "O&pen Right"
msgstr "開啟右側 (&P)"
#. IDR_POPUP_DIRVIEW
-#: Merge.rc:1001
+#: Merge.rc:1009
msgid "Cop&y Paths"
msgstr "複製徑名 (&Y)"
#. IDS_DEL_LEFT_FMT2
-#: Merge.rc:1003 Merge.rc:1012 Merge.rc:4530
+#: Merge.rc:1011 Merge.rc:1020 Merge.rc:4540
#, c-format
msgid "Left (%1 of %2)"
msgstr "左側 (%1/%2)"
#. IDS_DEL_MIDDLE_FMT2
-#: Merge.rc:1004 Merge.rc:1013 Merge.rc:4531
+#: Merge.rc:1012 Merge.rc:1021 Merge.rc:4541
#, c-format
msgid "Middle (%1 of %2)"
msgstr "中間 (%1/%2)"
#. IDS_DEL_RIGHT_FMT2
-#: Merge.rc:1005 Merge.rc:1014 Merge.rc:4532
+#: Merge.rc:1013 Merge.rc:1022 Merge.rc:4542
#, c-format
msgid "Right (%1 of %2)"
msgstr "右側 (%1/%2)"
#. IDS_DEL_BOTH_FMT2
-#: Merge.rc:1006 Merge.rc:1015 Merge.rc:4533
+#: Merge.rc:1014 Merge.rc:1023 Merge.rc:4543
#, c-format
msgid "Both (%1 of %2)"
msgstr "兩邊 (%1/%2)"
#. IDS_DEL_ALL_FMT2
-#: Merge.rc:1007 Merge.rc:1016 Merge.rc:4538
+#: Merge.rc:1015 Merge.rc:1024 Merge.rc:4548
#, c-format
msgid "All (%1 of %2)"
msgstr "全部 (%1/%2)"
#. IDR_POPUP_DIRVIEW, ID_DIR_COPY_FILENAMES
-#: Merge.rc:1009
+#: Merge.rc:1017
msgid "Copy &Filenames"
msgstr "複製檔名 (&F)"
#. IDR_POPUP_DIRVIEW
-#: Merge.rc:1010
+#: Merge.rc:1018
msgid "Copy Items to Clip&board"
msgstr "複製項目到剪貼簿 (&B)"
#. IDR_POPUP_DIRVIEW, ID_DIR_COPY_ALL_DISP_COLUMNS
-#: Merge.rc:1018
+#: Merge.rc:1026
msgid "Copy All Di&splayed Columns"
msgstr "複製所有顯示的欄位 (&s)"
#. IDR_POPUP_DIRVIEW
-#: Merge.rc:1020
+#: Merge.rc:1028
msgid "&Zip"
msgstr "Zip (&Z)"
#. IDS_COPY_BOTH_TO2
-#: Merge.rc:1025 Merge.rc:4516
+#: Merge.rc:1033 Merge.rc:4526
#, c-format
msgid "Both to... (%1 of %2)"
msgstr "兩邊到... (%1/%2)"
#. IDS_COPY_ALL_TO2
-#: Merge.rc:1026 Merge.rc:4517
+#: Merge.rc:1034 Merge.rc:4527
#, c-format
msgid "All to... (%1 of %2)"
msgstr "全部到... (%1/%2)"
#. IDS_COPY_DIFFERENCES_TO2
-#: Merge.rc:1027 Merge.rc:4518
+#: Merge.rc:1035 Merge.rc:4528
#, c-format
msgid "Differences to... (%1 of %2)"
msgstr "差異到... (%1/%2)"
#. IDR_POPUP_DIRVIEW, ID_DIR_SHELL_CONTEXT_MENU_LEFT
-#: Merge.rc:1032
+#: Merge.rc:1040
msgid "Left Shell Menu"
msgstr "左側介面選單"
#. IDR_POPUP_DIRVIEW, ID_DIR_SHELL_CONTEXT_MENU_MIDDLE
-#: Merge.rc:1033
+#: Merge.rc:1041
msgid "Middle Shell Menu"
msgstr "中間介面選單"
#. IDR_POPUP_DIRVIEW, ID_DIR_SHELL_CONTEXT_MENU_RIGHT
-#: Merge.rc:1034
+#: Merge.rc:1042
msgid "Right Shell Menu"
msgstr "右側介面選單"
#. IDR_POPUP_DIRVIEW, ID_DIR_SHELL_CONTEXT_MENU_BOTH
-#: Merge.rc:1035
+#: Merge.rc:1043
msgid "Both Shell Menu"
msgstr "雙邊右鍵選單"
#. IDR_POPUP_DIRVIEW, ID_DIR_SHELL_CONTEXT_MENU_ALL
-#: Merge.rc:1036
+#: Merge.rc:1044
msgid "All Shell Menu"
msgstr "所有右鍵選單"
#. IDR_POPUP_EDITOR_HEADERBAR, ID_EDITOR_COPY
-#: Merge.rc:1050
+#: Merge.rc:1058
msgid "Copy"
msgstr "複製"
#. IDR_POPUP_EDITOR_HEADERBAR, ID_EDITOR_COPY_PATH
-#: Merge.rc:1051
+#: Merge.rc:1059
msgid "&Copy Full Path"
msgstr "複製完整路徑 (&C)"
#. IDR_POPUP_EDITOR_HEADERBAR, ID_EDITOR_COPY_FILENAME
-#: Merge.rc:1052
+#: Merge.rc:1060
msgid "Copy &Filename"
msgstr "複製檔名 (&F)"
#. IDR_POPUP_EDITOR_HEADERBAR, ID_EDITOR_EDIT_CAPTION
-#: Merge.rc:1053
+#: Merge.rc:1061
msgid "&Edit Caption\tF2"
msgstr "編輯標題 (&E)\tF2"
#. IDR_POPUP_EDITOR_HEADERBAR, ID_EDITOR_EDIT_PATH
-#: Merge.rc:1055
+#: Merge.rc:1063
msgid "Edit &Path\tCtrl+L"
msgstr "編輯路徑 (&P)\tCtrl+L"
#. IDR_POPUP_EDITOR_HEADERBAR, ID_EDITOR_SELECT_FILE
-#: Merge.rc:1056
+#: Merge.rc:1064
msgid "&Open..."
msgstr "開啟 (&O)..."
#. IDR_POPUP_PLUGINS_SETTINGS
-#: Merge.rc:1062
+#: Merge.rc:1070
msgid "Unpacker Settings"
msgstr "解壓縮程式設定"
#. IDS_USERCHOICE_NONE
-#: Merge.rc:1064 Merge.rc:1070 Merge.rc:1789 Merge.rc:1793 Merge.rc:5030
+#: Merge.rc:1072 Merge.rc:1078 Merge.rc:1799 Merge.rc:1803 Merge.rc:5040
msgid ""
msgstr "<無>"
#. IDS_USERCHOICE_AUTOMATIC
-#: Merge.rc:1065 Merge.rc:1071 Merge.rc:5031
+#: Merge.rc:1073 Merge.rc:1079 Merge.rc:5041
msgid ""
msgstr "<自動>"
#. IDD_OPEN, IDC_SELECT_PREDIFFER
-#: Merge.rc:1066 Merge.rc:1072 Merge.rc:1970 Merge.rc:1974
+#: Merge.rc:1074 Merge.rc:1080 Merge.rc:1980 Merge.rc:1984
msgid "&Select..."
msgstr "選取 (&S)..."
#. IDR_POPUP_PLUGINS_SETTINGS
-#: Merge.rc:1068
+#: Merge.rc:1076
msgid "Prediffer Settings"
msgstr "預差異化設定"
#. IDR_POPUP_LOCATIONBAR, ID_LOCBAR_GOTODIFF
-#: Merge.rc:1080
+#: Merge.rc:1088
msgid "G&o to Diff"
msgstr "至差異區塊 (&O)"
#. IDR_POPUP_LOCATIONBAR, ID_LOCBAR_MOVECURSOR_ONCLICK
-#: Merge.rc:1083
+#: Merge.rc:1091
msgid "Move Cursor on &Click"
msgstr "點擊時移動游標 (&C)"
#. IDR_POPUP_LOCATIONBAR, ID_DISPLAY_MOVED_NONE
-#: Merge.rc:1085
+#: Merge.rc:1093
msgid "&No Moved Blocks"
msgstr "不顯示移位區塊 (&N)"
#. IDR_POPUP_LOCATIONBAR, ID_DISPLAY_MOVED_ALL
-#: Merge.rc:1086
+#: Merge.rc:1094
msgid "&All Moved Blocks"
msgstr "顯示移位區塊 (&A)"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS
-#: Merge.rc:1094 Merge.rc:1127
+#: Merge.rc:1102 Merge.rc:1135
msgid "W&hitespaces"
msgstr "空格 (&H)"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_WHITESPACE_COMPARE
-#: Merge.rc:1096 Merge.rc:1129
+#: Merge.rc:1104 Merge.rc:1137
msgid "Com&pare"
msgstr "比較之 (&P)"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_WHITESPACE_IGNORE
-#: Merge.rc:1097 Merge.rc:1130
+#: Merge.rc:1105 Merge.rc:1138
msgid "I&gnore Changes"
msgstr "忽略其變更 (&G)"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_WHITESPACE_IGNOREALL
-#: Merge.rc:1098 Merge.rc:1131
+#: Merge.rc:1106 Merge.rc:1139
msgid "Ig&nore All"
msgstr "忽略全部 (&N)"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_IGNORE_BLANKLINES
-#: Merge.rc:1100 Merge.rc:1133
+#: Merge.rc:1108 Merge.rc:1141
msgid "Ignore Blan&k Lines"
msgstr "忽略空白行 (&K)"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_IGNORE_CASE
-#: Merge.rc:1101 Merge.rc:1134
+#: Merge.rc:1109 Merge.rc:1142
msgid "Ignore &Case"
msgstr "忽略大小寫 (&C)"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_IGNORE_EOL
-#: Merge.rc:1102 Merge.rc:1135
+#: Merge.rc:1110 Merge.rc:1143
msgid "Igno&re EOL Differences (Windows/Unix/Mac)"
msgstr "忽略行尾差異(Windows/Unix/Mac)(&R)"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_IGNORE_CODEPAGE
-#: Merge.rc:1103 Merge.rc:1136
+#: Merge.rc:1111 Merge.rc:1144
msgid "Ignore Codepage &Differences"
msgstr "忽略字碼頁不同 (&D)"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_IGNORE_NUMBERS
-#: Merge.rc:1104 Merge.rc:1137
+#: Merge.rc:1112 Merge.rc:1145
msgid "Ignore Num&bers"
msgstr "忽略數字 (&B)"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_IGNORE_COMMENTS
-#: Merge.rc:1105 Merge.rc:1138
+#: Merge.rc:1113 Merge.rc:1146
msgid "Ignore C&omment Differences"
msgstr "忽略註解差異 (&O)"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_IGNORE_MISSING_TRAILING_EOL
-#: Merge.rc:1106 Merge.rc:1139
+#: Merge.rc:1114 Merge.rc:1147
msgid "Ignore &Missing Trailing EOL"
msgstr "忽略缺少結尾行尾換行符號 (&M)"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_IGNORE_LINE_BREAKS
-#: Merge.rc:1107 Merge.rc:1140
+#: Merge.rc:1115 Merge.rc:1148
msgid "Ignore Line &Breaks (Treat as Spaces)"
msgstr "忽略換行符號(視為空格) (&B)"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_RECURS_CHECK
-#: Merge.rc:1109 Merge.rc:2963
+#: Merge.rc:1117 Merge.rc:2973
msgid "&Include Subfolders"
msgstr "包括子資料夾 (&I)"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS
-#: Merge.rc:1110 Merge.rc:1142
+#: Merge.rc:1118 Merge.rc:1150
msgid "&Compare Method"
msgstr "檔案比較方式 (&C)"
#. IDS_COMPMETHOD_FULL_CONTENTS
-#: Merge.rc:1112 Merge.rc:1144 Merge.rc:1328 Merge.rc:4282
+#: Merge.rc:1120 Merge.rc:1152 Merge.rc:1338 Merge.rc:4292
msgid "Full Contents"
msgstr "完整內容"
#. IDS_COMPMETHOD_QUICK_CONTENTS
-#: Merge.rc:1113 Merge.rc:1145 Merge.rc:1329 Merge.rc:4283
+#: Merge.rc:1121 Merge.rc:1153 Merge.rc:1339 Merge.rc:4293
msgid "Quick Contents"
msgstr "快速內容"
#. IDS_COMPMETHOD_BINARY_CONTENTS
-#: Merge.rc:1114 Merge.rc:1146 Merge.rc:1330 Merge.rc:4284
+#: Merge.rc:1122 Merge.rc:1154 Merge.rc:1340 Merge.rc:4294
msgid "Binary Contents"
msgstr "二進制內容"
#. IDS_COMPMETHOD_MODDATE
-#: Merge.rc:1115 Merge.rc:1147 Merge.rc:1331 Merge.rc:4285
+#: Merge.rc:1123 Merge.rc:1155 Merge.rc:1341 Merge.rc:4295
msgid "Modified Date"
msgstr "修改日期"
#. IDS_COMPMETHOD_DATESIZE
-#: Merge.rc:1116 Merge.rc:1148 Merge.rc:1332 Merge.rc:4286
+#: Merge.rc:1124 Merge.rc:1156 Merge.rc:1342 Merge.rc:4296
msgid "Modified Date and Size"
msgstr "修改日期與大小"
#. IDS_COMPMETHOD_SIZE
-#: Merge.rc:1117 Merge.rc:1149 Merge.rc:1333 Merge.rc:4287
+#: Merge.rc:1125 Merge.rc:1157 Merge.rc:1343 Merge.rc:4297
msgid "Size"
msgstr "大小"
#. IDS_COMPMETHOD_EXISTENCE
-#: Merge.rc:1118 Merge.rc:1150 Merge.rc:1334 Merge.rc:4288
+#: Merge.rc:1126 Merge.rc:1158 Merge.rc:1344 Merge.rc:4298
msgid "Existence"
msgstr "存在"
#. IDR_POPUP_PROJECT, ID_LOAD_PROJECT
-#: Merge.rc:1192
+#: Merge.rc:1202
msgid "&Load Project..."
msgstr "載入專案... (&L)"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARGALL
-#: Merge.rc:1272 Merge.rc:1301
+#: Merge.rc:1282 Merge.rc:1311
msgid "${*} - All Arguments"
msgstr "${*} - 所有引數"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARG1
-#: Merge.rc:1273 Merge.rc:1302
+#: Merge.rc:1283 Merge.rc:1312
msgid "${1} - First Argument"
msgstr "${1} - 第一個引數"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARG2
-#: Merge.rc:1274 Merge.rc:1303
+#: Merge.rc:1284 Merge.rc:1313
msgid "${2} - Second Argument"
msgstr "${2} - 第二個引數"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARG3
-#: Merge.rc:1275 Merge.rc:1304
+#: Merge.rc:1285 Merge.rc:1314
msgid "${3} - Third Argument"
msgstr "${3} - 第三個引數"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARG4
-#: Merge.rc:1276 Merge.rc:1305
+#: Merge.rc:1286 Merge.rc:1315
msgid "${4} - Fourth Argument"
msgstr "${4} - 第四個引數"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARG5
-#: Merge.rc:1277 Merge.rc:1306
+#: Merge.rc:1287 Merge.rc:1316
msgid "${5} - Fifth Argument"
msgstr "${5} - 第五個引數"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARG6
-#: Merge.rc:1278 Merge.rc:1307
+#: Merge.rc:1288 Merge.rc:1317
msgid "${6} - Sixth Argument"
msgstr "${6} - 第六個引數"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARG7
-#: Merge.rc:1279 Merge.rc:1308
+#: Merge.rc:1289 Merge.rc:1318
msgid "${7} - Seventh Argument"
msgstr "${7} - 第七個引數"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARG8
-#: Merge.rc:1280 Merge.rc:1309
+#: Merge.rc:1290 Merge.rc:1319
msgid "${8} - Eighth Argument"
msgstr "${8} - 第八個引數"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARG9
-#: Merge.rc:1281 Merge.rc:1310
+#: Merge.rc:1291 Merge.rc:1320
msgid "${9} - Ninth Argument"
msgstr "${9} - 第九個引數"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_SRC_FILE
-#: Merge.rc:1289
+#: Merge.rc:1299
msgid "${SRC_FILE} - Source File"
msgstr "${SRC_FILE} - 來源檔案"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_SRC_FOLDER
-#: Merge.rc:1290
+#: Merge.rc:1300
msgid "${SRC_FOLDER} - Source Folder"
msgstr "${SRC_FOLDER} - 來源資料夾"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_SRC_URL
-#: Merge.rc:1291
+#: Merge.rc:1301
msgid "${SRC_URL} - Source URL"
msgstr "${SRC_URL} - 來源網址"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_SRC_URL_PROTOCOL
-#: Merge.rc:1292
+#: Merge.rc:1302
msgid "${SRC_URL_PROTOCOL} - Source URL Protocol"
msgstr "${SRC_URL_PROTOCOL} - 來源網址協定"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_SRC_URL_SUFFIX
-#: Merge.rc:1293
+#: Merge.rc:1303
msgid "${SRC_URL_SUFFIX} - Source URL Suffix"
msgstr "${SRC_URL_SUFFIX} - 來源網址尾碼"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_DST_FILE
-#: Merge.rc:1294
+#: Merge.rc:1304
msgid "${DST_FILE} - Destination File"
msgstr "${DST_FILE} - 目的檔案"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_DST_FOLDER
-#: Merge.rc:1295
+#: Merge.rc:1305
msgid "${DST_FOLDER} - Destination Folder"
msgstr "${DST_FOLDER} - 目的資料夾"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_DST_URL
-#: Merge.rc:1296
+#: Merge.rc:1306
msgid "${DST_URL} - Destination URL"
msgstr "${DST_URL} - 目的網址"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_DST_URL_PROTOCOL
-#: Merge.rc:1297
+#: Merge.rc:1307
msgid "${DST_URL_PROTOCOL} - Destination URL Protocol"
msgstr "${DST_URL_PROTOCOL} - 目的網址協定"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_DST_URL_SUFFIX
-#: Merge.rc:1298
+#: Merge.rc:1308
msgid "${DST_URL_SUFFIX} - Destination URL Suffix"
msgstr "${DST_URL_SUFFIX} - 目的網址尾碼"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_WINMERGE_HOME
-#: Merge.rc:1299
+#: Merge.rc:1309
msgid "${WINMERGE_HOME} - WinMerge Home Directory"
msgstr "${WINMERGE_HOME} - WinMerge 主目錄"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_SCRIPT_FILE
-#: Merge.rc:1300
+#: Merge.rc:1310
msgid "${SCRIPT_FILE} - Script File"
msgstr "${SCRIPT_FILE} - 指令碼檔案"
#. IDR_POPUP_PLUGIN_ADD_MENU, ID_PLUGIN_ADD_UNPACKER
-#: Merge.rc:1318
+#: Merge.rc:1328
msgid "Add &Unpacker Plugin..."
msgstr "新增解壓縮外掛 (&U)..."
#. IDR_POPUP_PLUGIN_ADD_MENU, ID_PLUGIN_ADD_PREDIFFER
-#: Merge.rc:1319
+#: Merge.rc:1329
msgid "Add &Prediffer Plugin..."
msgstr "新增預差異化外掛 (&P)..."
#. IDR_POPUP_PLUGIN_ADD_MENU, ID_PLUGIN_DUPLICATE
-#: Merge.rc:1320
+#: Merge.rc:1330
msgid "&Duplicate Plugin..."
msgstr "複製外掛 (&D)..."
#. IDR_POPUP_OUTPUTVIEW, ID_EDIT_CLEAR_ALL
-#: Merge.rc:1344
+#: Merge.rc:1354
msgid "Clear &All"
msgstr "全部清除 (&A)"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_MASK_CLEAR
-#: Merge.rc:1352
+#: Merge.rc:1362
msgid "&Clear All"
msgstr "全部清除 (&C)"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_MASK_REMOVE_LAST
-#: Merge.rc:1353
+#: Merge.rc:1363
msgid "Remove Last Filter &Group"
msgstr "刪除最後一個過濾器組 (&G)"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_MASK_ALL
-#: Merge.rc:1354
+#: Merge.rc:1364
msgid "R&eset to Default (*.*)"
msgstr "重設為預設值 (&E) (*.*)"
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1355
+#: Merge.rc:1365
msgid "Add E&xclude File"
msgstr "新增排除檔 (&X)"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_SYS
-#: Merge.rc:1357
+#: Merge.rc:1367
msgid "&System Files"
msgstr "系統檔案 (&S)"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_BACKUP
-#: Merge.rc:1358
+#: Merge.rc:1368
msgid "&Editor Backup Files"
msgstr "編輯器備份檔案 (&E)"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_BIN
-#: Merge.rc:1359
+#: Merge.rc:1369
msgid "&Compiled Binary Files"
msgstr "編譯後的二進制執行檔 (&C)"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_LOG
-#: Merge.rc:1360
+#: Merge.rc:1370
msgid "&Log Files"
msgstr "日誌檔 (&L)"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_TEMP
-#: Merge.rc:1361
+#: Merge.rc:1371
msgid "&Temporary or Cache Files"
msgstr "臨時檔案或快取檔案 (&T)"
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1363
+#: Merge.rc:1373
msgid "Add Excl&ude Folder"
msgstr "新增排除資料夾 (&U)"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FOLDER_VCS
-#: Merge.rc:1365
+#: Merge.rc:1375
msgid "&Version Control"
msgstr "版本控制 (&V)"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FOLDER_BUILD
-#: Merge.rc:1366
+#: Merge.rc:1376
msgid "&Build Artifacts"
msgstr "建構工件 (&B)"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FOLDER_IDE
-#: Merge.rc:1367
+#: Merge.rc:1377
msgid "&IDE"
msgstr "IDE (&I)"
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1370
+#: Merge.rc:1380
msgid "Add &File Condition"
msgstr "新增檔案條件 (&F)"
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1372 Merge.rc:1551
+#: Merge.rc:1382 Merge.rc:1561
msgid "File &Size"
msgstr "檔案大小 (&S)"
#. IDR_POPUP_FILTERMENU_DIFF_SIZE, ID_FILTERMENU_DIFF_SIZE_LT_1KB
-#: Merge.rc:1374 Merge.rc:1527 Merge.rc:1564 Merge.rc:1629 Merge.rc:1707
+#: Merge.rc:1384 Merge.rc:1537 Merge.rc:1574 Merge.rc:1639 Merge.rc:1717
msgid "Less than 1KB"
msgstr "小於1KB"
#. IDR_POPUP_FILTERMENU_DIFF_SIZE, ID_FILTERMENU_DIFF_SIZE_GE_1KB
-#: Merge.rc:1375 Merge.rc:1528 Merge.rc:1565 Merge.rc:1630 Merge.rc:1708
+#: Merge.rc:1385 Merge.rc:1538 Merge.rc:1575 Merge.rc:1640 Merge.rc:1718
msgid "1KB or more"
msgstr "1KB 以上"
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_LT_10KB
-#: Merge.rc:1376 Merge.rc:1529 Merge.rc:1631
+#: Merge.rc:1386 Merge.rc:1539 Merge.rc:1641
msgid "Less than 10KB"
msgstr "小於10KB"
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_GE_10KB
-#: Merge.rc:1377 Merge.rc:1530 Merge.rc:1632
+#: Merge.rc:1387 Merge.rc:1540 Merge.rc:1642
msgid "10KB or more"
msgstr "10KB 以上"
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_LT_100KB
-#: Merge.rc:1378 Merge.rc:1531 Merge.rc:1633
+#: Merge.rc:1388 Merge.rc:1541 Merge.rc:1643
msgid "Less than 100KB"
msgstr "小於100KB"
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_GE_100KB
-#: Merge.rc:1379 Merge.rc:1532 Merge.rc:1634
+#: Merge.rc:1389 Merge.rc:1542 Merge.rc:1644
msgid "100KB or more"
msgstr "100KB 以上"
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_LT_1MB
-#: Merge.rc:1380 Merge.rc:1533 Merge.rc:1635
+#: Merge.rc:1390 Merge.rc:1543 Merge.rc:1645
msgid "Less than 1MB"
msgstr "小於 1MB"
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_GE_1MB
-#: Merge.rc:1381 Merge.rc:1534 Merge.rc:1636
+#: Merge.rc:1391 Merge.rc:1544 Merge.rc:1646
msgid "1MB or more"
msgstr "1MB 以上"
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_LT_10MB
-#: Merge.rc:1382 Merge.rc:1535 Merge.rc:1637
+#: Merge.rc:1392 Merge.rc:1545 Merge.rc:1647
msgid "Less than 10MB"
msgstr "小於 10MB"
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_GE_10MB
-#: Merge.rc:1383 Merge.rc:1536 Merge.rc:1638
+#: Merge.rc:1393 Merge.rc:1546 Merge.rc:1648
msgid "10MB or more"
msgstr "10MB 以上"
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_LT_100MB
-#: Merge.rc:1384 Merge.rc:1537 Merge.rc:1639
+#: Merge.rc:1394 Merge.rc:1547 Merge.rc:1649
msgid "Less than 100MB"
msgstr "小於 100MB"
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_GE_100MB
-#: Merge.rc:1385 Merge.rc:1538 Merge.rc:1640
+#: Merge.rc:1395 Merge.rc:1548 Merge.rc:1650
msgid "100MB or more"
msgstr "100MB 以上"
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_LT_1GB
-#: Merge.rc:1386 Merge.rc:1539 Merge.rc:1641
+#: Merge.rc:1396 Merge.rc:1549 Merge.rc:1651
msgid "Less than 1GB"
msgstr "小於 1GB"
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_GE_1GB
-#: Merge.rc:1387 Merge.rc:1642
+#: Merge.rc:1397 Merge.rc:1652
msgid "1GB or more"
msgstr "1GB 以上"
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_RANGE
-#: Merge.rc:1388 Merge.rc:1465 Merge.rc:1517 Merge.rc:1523 Merge.rc:1540
-#: Merge.rc:1566 Merge.rc:1587 Merge.rc:1643 Merge.rc:1709 Merge.rc:1734
+#: Merge.rc:1398 Merge.rc:1475 Merge.rc:1527 Merge.rc:1533 Merge.rc:1550
+#: Merge.rc:1576 Merge.rc:1597 Merge.rc:1653 Merge.rc:1719 Merge.rc:1744
msgid "Custom Range..."
msgstr "自訂範圍..."
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1390 Merge.rc:1471 Merge.rc:1568
+#: Merge.rc:1400 Merge.rc:1481 Merge.rc:1578
msgid "&Last Modified"
msgstr "上次修改時間 (&L)"
#. IDR_POPUP_FILTERMENU_DATE
-#: Merge.rc:1392 Merge.rc:1473 Merge.rc:1651
+#: Merge.rc:1402 Merge.rc:1483 Merge.rc:1661
msgid "&Hour"
msgstr "小時 (&H)"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_HOUR_BEFORE_1
-#: Merge.rc:1394 Merge.rc:1475 Merge.rc:1653
+#: Merge.rc:1404 Merge.rc:1485 Merge.rc:1663
msgid "More than 1 hour ago"
msgstr "1個多小時前"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_HOUR_WITHIN_1
-#: Merge.rc:1395 Merge.rc:1476 Merge.rc:1654
+#: Merge.rc:1405 Merge.rc:1486 Merge.rc:1664
msgid "Within 1 hour"
msgstr "1小時內"
#. IDR_POPUP_FILTERMENU_DATE
-#: Merge.rc:1397 Merge.rc:1478 Merge.rc:1656
+#: Merge.rc:1407 Merge.rc:1488 Merge.rc:1666
msgid "&Day"
msgstr "日 (&D)"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_DAY_BEFORE_TODAY
-#: Merge.rc:1399 Merge.rc:1480 Merge.rc:1658
+#: Merge.rc:1409 Merge.rc:1490 Merge.rc:1668
msgid "Before today"
msgstr "今天之前"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_DAY_TODAY
-#: Merge.rc:1400 Merge.rc:1481 Merge.rc:1659
+#: Merge.rc:1410 Merge.rc:1491 Merge.rc:1669
msgid "Today"
msgstr "本日"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_DAY_BEFORE_YESTERDAY
-#: Merge.rc:1401 Merge.rc:1482 Merge.rc:1660
+#: Merge.rc:1411 Merge.rc:1492 Merge.rc:1670
msgid "Before yesterday"
msgstr "昨天之前"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_DAY_YESTERDAY
-#: Merge.rc:1402 Merge.rc:1483 Merge.rc:1661
+#: Merge.rc:1412 Merge.rc:1493 Merge.rc:1671
msgid "Yesterday"
msgstr "昨天"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_DAY_SINCE_YESTERDAY
-#: Merge.rc:1403 Merge.rc:1484 Merge.rc:1662
+#: Merge.rc:1413 Merge.rc:1494 Merge.rc:1672
msgid "Since yesterday"
msgstr "自昨天以來"
#. IDR_POPUP_FILTERMENU_DATE
-#: Merge.rc:1405 Merge.rc:1486 Merge.rc:1664
+#: Merge.rc:1415 Merge.rc:1496 Merge.rc:1674
msgid "&Week"
msgstr "星期 (&W)"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_WEEK_BEFORE_THIS
-#: Merge.rc:1407 Merge.rc:1488 Merge.rc:1666
+#: Merge.rc:1417 Merge.rc:1498 Merge.rc:1676
msgid "Before this week"
msgstr "本週之前"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_WEEK_THIS
-#: Merge.rc:1408 Merge.rc:1489 Merge.rc:1667
+#: Merge.rc:1418 Merge.rc:1499 Merge.rc:1677
msgid "This week"
msgstr "本週"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_WEEK_BEFORE_LAST
-#: Merge.rc:1409 Merge.rc:1490 Merge.rc:1668
+#: Merge.rc:1419 Merge.rc:1500 Merge.rc:1678
msgid "Before last week"
msgstr "上週之前"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_WEEK_LAST
-#: Merge.rc:1410 Merge.rc:1491 Merge.rc:1669
+#: Merge.rc:1420 Merge.rc:1501 Merge.rc:1679
msgid "Last week"
msgstr "上個星期"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_WEEK_SINCE_LAST
-#: Merge.rc:1411 Merge.rc:1492 Merge.rc:1670
+#: Merge.rc:1421 Merge.rc:1502 Merge.rc:1680
msgid "Since last week"
msgstr "自上週以來"
#. IDR_POPUP_FILTERMENU_DATE
-#: Merge.rc:1413 Merge.rc:1494 Merge.rc:1672
+#: Merge.rc:1423 Merge.rc:1504 Merge.rc:1682
msgid "&Month"
msgstr "月份 (&M)"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_MONTH_BEFORE_THIS
-#: Merge.rc:1415 Merge.rc:1496 Merge.rc:1674
+#: Merge.rc:1425 Merge.rc:1506 Merge.rc:1684
msgid "Before this month"
msgstr "本月之前"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_MONTH_THIS
-#: Merge.rc:1416 Merge.rc:1497 Merge.rc:1675
+#: Merge.rc:1426 Merge.rc:1507 Merge.rc:1685
msgid "This month"
msgstr "本月"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_MONTH_BEFORE_LAST
-#: Merge.rc:1417 Merge.rc:1498 Merge.rc:1676
+#: Merge.rc:1427 Merge.rc:1508 Merge.rc:1686
msgid "Before last month"
msgstr "上月之前"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_MONTH_LAST
-#: Merge.rc:1418 Merge.rc:1499 Merge.rc:1677
+#: Merge.rc:1428 Merge.rc:1509 Merge.rc:1687
msgid "Last month"
msgstr "上個月"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_MONTH_SINCE_LAST
-#: Merge.rc:1419 Merge.rc:1500 Merge.rc:1678
+#: Merge.rc:1429 Merge.rc:1510 Merge.rc:1688
msgid "Since last month"
msgstr "自上個月以來"
#. IDR_POPUP_FILTERMENU_DATE
-#: Merge.rc:1421 Merge.rc:1502 Merge.rc:1680
+#: Merge.rc:1431 Merge.rc:1512 Merge.rc:1690
msgid "&Year"
msgstr "年 (&Y)"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_YEAR_BEFORE_THIS
-#: Merge.rc:1423 Merge.rc:1504 Merge.rc:1682
+#: Merge.rc:1433 Merge.rc:1514 Merge.rc:1692
msgid "Before this year"
msgstr "今年之前"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_YEAR_THIS
-#: Merge.rc:1424 Merge.rc:1505 Merge.rc:1683
+#: Merge.rc:1434 Merge.rc:1515 Merge.rc:1693
msgid "This year"
msgstr "本年"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_YEAR_BEFORE_LAST
-#: Merge.rc:1425 Merge.rc:1506 Merge.rc:1684
+#: Merge.rc:1435 Merge.rc:1516 Merge.rc:1694
msgid "Before last year"
msgstr "去年之前"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_YEAR_LAST
-#: Merge.rc:1426 Merge.rc:1507 Merge.rc:1685
+#: Merge.rc:1436 Merge.rc:1517 Merge.rc:1695
msgid "Last year"
msgstr "去年"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_YEAR_SINCE_LAST
-#: Merge.rc:1427 Merge.rc:1508 Merge.rc:1686
+#: Merge.rc:1437 Merge.rc:1518 Merge.rc:1696
msgid "Since last year"
msgstr "自去年以來"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_RANGE
-#: Merge.rc:1429 Merge.rc:1510 Merge.rc:1688
+#: Merge.rc:1439 Merge.rc:1520 Merge.rc:1698
msgid "&Custom Range..."
msgstr "自訂範圍 (&C)..."
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1431 Merge.rc:1589
+#: Merge.rc:1441 Merge.rc:1599
msgid "&Attributes"
msgstr "屬性 (&A)"
#. IDR_POPUP_FILTERMENU_ATTR, ID_FILTERMENU_ATTR_READONLY
-#: Merge.rc:1433 Merge.rc:1607
+#: Merge.rc:1443 Merge.rc:1617
msgid "Read-only files"
msgstr "唯獨檔"
#. IDR_POPUP_FILTERMENU_ATTR, ID_FILTERMENU_ATTR_NOT_READONLY
-#: Merge.rc:1434 Merge.rc:1608
+#: Merge.rc:1444 Merge.rc:1618
msgid "Not read-only files"
msgstr "非唯讀檔"
#. IDR_POPUP_FILTERMENU_ATTR, ID_FILTERMENU_ATTR_HIDDEN
-#: Merge.rc:1435 Merge.rc:1609
+#: Merge.rc:1445 Merge.rc:1619
msgid "Hidden files"
msgstr "隱藏檔案"
#. IDR_POPUP_FILTERMENU_ATTR, ID_FILTERMENU_ATTR_NOT_HIDDEN
-#: Merge.rc:1436 Merge.rc:1610
+#: Merge.rc:1446 Merge.rc:1620
msgid "Not hidden files"
msgstr "非隱藏檔"
#. IDR_POPUP_FILTERMENU_ATTR, ID_FILTERMENU_ATTR_SYSTEM
-#: Merge.rc:1437 Merge.rc:1611
+#: Merge.rc:1447 Merge.rc:1621
msgid "System files"
msgstr "系統檔"
#. IDR_POPUP_FILTERMENU_ATTR, ID_FILTERMENU_ATTR_NOT_SYSTEM
-#: Merge.rc:1438 Merge.rc:1612
+#: Merge.rc:1448 Merge.rc:1622
msgid "Not system files"
msgstr "非系統檔"
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1440
+#: Merge.rc:1450
msgid "File &Content"
msgstr "檔案內容 (&C)"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_CONTAINS
-#: Merge.rc:1442
+#: Merge.rc:1452
msgid "Contains string..."
msgstr "包含字串..."
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_NOT_CONTAINS
-#: Merge.rc:1443
+#: Merge.rc:1453
msgid "Does not contain string..."
msgstr "不包含字串..."
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_FIRST_LINE_CONTAINS
-#: Merge.rc:1444
+#: Merge.rc:1454
msgid "First line contains string..."
msgstr "第一行包含字串..."
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_FIRST_LINE_NOT_CONTAINS
-#: Merge.rc:1445
+#: Merge.rc:1455
msgid "First line does not contain string..."
msgstr "第一行不包含字串..."
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_FIRST_10_CONTAINS
-#: Merge.rc:1446
+#: Merge.rc:1456
msgid "First 10 lines contain string..."
msgstr "前 10 行包含字串..."
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_FIRST_10_NOT_CONTAINS
-#: Merge.rc:1447
+#: Merge.rc:1457
msgid "First 10 lines do not contain string..."
msgstr "前 10 行不包含字串..."
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_LAST_10_CONTAINS
-#: Merge.rc:1448
+#: Merge.rc:1458
msgid "Last 10 lines contain string..."
msgstr "最後 10 行包含字串..."
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_LAST_10_NOT_CONTAINS
-#: Merge.rc:1449
+#: Merge.rc:1459
msgid "Last 10 lines do not contain string..."
msgstr "最後 10 行不包含字串..."
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_LAST_LINE_CONTAINS
-#: Merge.rc:1450
+#: Merge.rc:1460
msgid "Last line contains string..."
msgstr "最後一行包含字串..."
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_LAST_LINE_NOT_CONTAINS
-#: Merge.rc:1451
+#: Merge.rc:1461
msgid "Last line does not contain string..."
msgstr "最後一行不包含字串..."
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1453
+#: Merge.rc:1463
msgid "&Line Count"
msgstr "行數 (&L)"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_LT_10
-#: Merge.rc:1455
+#: Merge.rc:1465
msgid "Less than 10"
msgstr "小於 10"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_GE_10
-#: Merge.rc:1456
+#: Merge.rc:1466
msgid "10 or more"
msgstr "10 以上"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_LT_100
-#: Merge.rc:1457
+#: Merge.rc:1467
msgid "Less than 100"
msgstr "小於 100"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_GE_100
-#: Merge.rc:1458
+#: Merge.rc:1468
msgid "100 or more"
msgstr "100 以上"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_LT_1000
-#: Merge.rc:1459
+#: Merge.rc:1469
msgid "Less than 1000"
msgstr "小於 1000"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_GE_1000
-#: Merge.rc:1460
+#: Merge.rc:1470
msgid "1000 or more"
msgstr "1000 以上"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_LT_10000
-#: Merge.rc:1461
+#: Merge.rc:1471
msgid "Less than 10000"
msgstr "小於 10000"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_GE_10000
-#: Merge.rc:1462
+#: Merge.rc:1472
msgid "10000 or more"
msgstr "10000 以上"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_LT_100000
-#: Merge.rc:1463
+#: Merge.rc:1473
msgid "Less than 100000"
msgstr "小於 100000"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_GE_100000
-#: Merge.rc:1464
+#: Merge.rc:1474
msgid "100000 or more"
msgstr "100000 以上"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_PROPS
-#: Merge.rc:1467 Merge.rc:1594 Merge.rc:1761 Merge.rc:1778
+#: Merge.rc:1477 Merge.rc:1604 Merge.rc:1771 Merge.rc:1788
msgid "Additional &Properties..."
msgstr "額外屬性 (&P)..."
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1469
+#: Merge.rc:1479
msgid "Add F&older Condition"
msgstr "新增資料夾條件 (&O)"
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1513
+#: Merge.rc:1523
msgid "&Files"
msgstr "檔案 (&F)"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FOLDER_FILES_EQ_0
-#: Merge.rc:1515
+#: Merge.rc:1525
msgid "0 files"
msgstr "0 個檔案"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FOLDER_FILES_GE_1
-#: Merge.rc:1516
+#: Merge.rc:1526
msgid "1 file or more"
msgstr "1 個檔案以上"
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1519
+#: Merge.rc:1529
msgid "&Items"
msgstr "項目 (&I)"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FOLDER_ITEMS_EQ_0
-#: Merge.rc:1521
+#: Merge.rc:1531
msgid "0 items"
msgstr "0 個項目"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FOLDER_ITEMS_GE_1
-#: Merge.rc:1522
+#: Merge.rc:1532
msgid "1 item or more"
msgstr "1 個項目以上"
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1525
+#: Merge.rc:1535
msgid "&Total Size"
msgstr "總容量 (&T)"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FOLDER_STATS_RECURSIVE
-#: Merge.rc:1542
+#: Merge.rc:1552
msgid "&Recursive"
msgstr "遞迴 (&R)"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONDITION_ANY
-#: Merge.rc:1544
+#: Merge.rc:1554
msgid "Target: &Any (Left/Middle/Right)"
msgstr "目標:任意(左/中/右) (&A)"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONDITION_LEFT
-#: Merge.rc:1545
+#: Merge.rc:1555
msgid "Target: &Left"
msgstr "目標:左 (&L)"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONDITION_MIDDLE
-#: Merge.rc:1546
+#: Merge.rc:1556
msgid "Target: &Middle"
msgstr "目標:中 (&M)"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONDITION_RIGHT
-#: Merge.rc:1547
+#: Merge.rc:1557
msgid "Target: &Right"
msgstr "目標:右 (&R)"
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1549
+#: Merge.rc:1559
msgid "Add &Difference Condition"
msgstr "新增差異條件 (&D)"
#. IDR_POPUP_FILTERMENU_DIFF_PROP, ID_FILTERMENU_DIFF_PROP_EQUAL
-#: Merge.rc:1553 Merge.rc:1570 Merge.rc:1591 Merge.rc:1696 Merge.rc:1717
-#: Merge.rc:1742
+#: Merge.rc:1563 Merge.rc:1580 Merge.rc:1601 Merge.rc:1706 Merge.rc:1727
+#: Merge.rc:1752
msgid "Equal"
msgstr "相等"
#. IDR_POPUP_FILTERMENU_DIFF_PROP, ID_FILTERMENU_DIFF_PROP_NOT_EQUAL
-#: Merge.rc:1554 Merge.rc:1571 Merge.rc:1592 Merge.rc:1697 Merge.rc:1718
-#: Merge.rc:1743
+#: Merge.rc:1564 Merge.rc:1581 Merge.rc:1602 Merge.rc:1707 Merge.rc:1728
+#: Merge.rc:1753
msgid "Not Equal"
msgstr "不相等"
#. IDR_POPUP_FILTERMENU_DIFF_PROP, ID_FILTERMENU_DIFF_PROP_LESS
-#: Merge.rc:1555 Merge.rc:1572 Merge.rc:1698 Merge.rc:1719 Merge.rc:1744
+#: Merge.rc:1565 Merge.rc:1582 Merge.rc:1708 Merge.rc:1729 Merge.rc:1754
msgid "Less Than"
msgstr "小於"
#. IDR_POPUP_FILTERMENU_DIFF_PROP, ID_FILTERMENU_DIFF_PROP_LESS_EQUAL
-#: Merge.rc:1556 Merge.rc:1573 Merge.rc:1699 Merge.rc:1720 Merge.rc:1745
+#: Merge.rc:1566 Merge.rc:1583 Merge.rc:1709 Merge.rc:1730 Merge.rc:1755
msgid "Less Than or Equal to"
msgstr "小於或等於"
#. IDR_POPUP_FILTERMENU_DIFF_PROP, ID_FILTERMENU_DIFF_PROP_GREATER
-#: Merge.rc:1557 Merge.rc:1574 Merge.rc:1700 Merge.rc:1721 Merge.rc:1746
+#: Merge.rc:1567 Merge.rc:1584 Merge.rc:1710 Merge.rc:1731 Merge.rc:1756
msgid "Greater Than"
msgstr "大於"
#. IDR_POPUP_FILTERMENU_DIFF_PROP, ID_FILTERMENU_DIFF_PROP_GREATER_EQUAL
-#: Merge.rc:1558 Merge.rc:1575 Merge.rc:1701 Merge.rc:1722 Merge.rc:1747
+#: Merge.rc:1568 Merge.rc:1585 Merge.rc:1711 Merge.rc:1732 Merge.rc:1757
msgid "Greater Than or Equal to"
msgstr "大於或等於"
#. IDR_POPUP_FILTERMENU_DIFF_SIZE, ID_FILTERMENU_DIFF_SIZE_LT_10B
-#: Merge.rc:1560 Merge.rc:1703
+#: Merge.rc:1570 Merge.rc:1713
msgid "Less than 10B"
msgstr "小於 10B"
#. IDR_POPUP_FILTERMENU_DIFF_SIZE, ID_FILTERMENU_DIFF_SIZE_GE_10B
-#: Merge.rc:1561 Merge.rc:1704
+#: Merge.rc:1571 Merge.rc:1714
msgid "10B or more"
msgstr "10B 以上"
#. IDR_POPUP_FILTERMENU_DIFF_SIZE, ID_FILTERMENU_DIFF_SIZE_LT_100B
-#: Merge.rc:1562 Merge.rc:1705
+#: Merge.rc:1572 Merge.rc:1715
msgid "Less than 100B"
msgstr "小於 100B"
#. IDR_POPUP_FILTERMENU_DIFF_SIZE, ID_FILTERMENU_DIFF_SIZE_GE_100B
-#: Merge.rc:1563 Merge.rc:1706
+#: Merge.rc:1573 Merge.rc:1716
msgid "100B or more"
msgstr "100B 以上"
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_LT_1SECOND
-#: Merge.rc:1577 Merge.rc:1724
+#: Merge.rc:1587 Merge.rc:1734
msgid "Less than 1 second"
msgstr "小於 1秒"
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_GE_1SECOND
-#: Merge.rc:1578 Merge.rc:1725
+#: Merge.rc:1588 Merge.rc:1735
msgid "1 second or more"
msgstr "1秒或更久"
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_LT_1MINUTE
-#: Merge.rc:1579 Merge.rc:1726
+#: Merge.rc:1589 Merge.rc:1736
msgid "Less than 1 minute"
msgstr "小於 1分鐘"
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_GE_1MINUTE
-#: Merge.rc:1580 Merge.rc:1727
+#: Merge.rc:1590 Merge.rc:1737
msgid "1 minute or more"
msgstr "1分鐘或更久"
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_LT_1HOUR
-#: Merge.rc:1581 Merge.rc:1728
+#: Merge.rc:1591 Merge.rc:1738
msgid "Less than 1 hour"
msgstr "小於 1小時"
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_GE_1HOUR
-#: Merge.rc:1582 Merge.rc:1729
+#: Merge.rc:1592 Merge.rc:1739
msgid "1 hour or more"
msgstr "1小時或更久"
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_LT_1DAY
-#: Merge.rc:1583 Merge.rc:1730
+#: Merge.rc:1593 Merge.rc:1740
msgid "Less than 1 day"
msgstr "少於1天"
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_GE_1DAY
-#: Merge.rc:1584 Merge.rc:1731
+#: Merge.rc:1594 Merge.rc:1741
msgid "1 day or more"
msgstr "1天或以上"
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_LT_1WEEK
-#: Merge.rc:1585 Merge.rc:1732
+#: Merge.rc:1595 Merge.rc:1742
msgid "Less than 1 week"
msgstr "不到1週"
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_GE_1WEEK
-#: Merge.rc:1586 Merge.rc:1733
+#: Merge.rc:1596 Merge.rc:1743
msgid "1 week or more"
msgstr "1週或以上"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_CONDITION_DIFF_LEFT_RIGHT
-#: Merge.rc:1596
+#: Merge.rc:1606
msgid "Target: &Left and Right"
msgstr "目標:左側與右側 (&L)"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_CONDITION_DIFF_LEFT_MIDDLE
-#: Merge.rc:1597
+#: Merge.rc:1607
msgid "Target: Left and &Middle"
msgstr "目標:中間與左側 (&M)"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_CONDITION_DIFF_MIDDLE_RIGHT
-#: Merge.rc:1598
+#: Merge.rc:1608
msgid "Target: Middle and &Right"
msgstr "目標:中間與右側 (&R)"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_CONDITION_DIFF_ALL
-#: Merge.rc:1599
+#: Merge.rc:1609
msgid "Target: &All"
msgstr "目標:全部 (&A)"
#. IDR_POPUP_FILTERMENU_BINARY, ID_FILTERMENU_BINARY_ONLY
-#: Merge.rc:1620
+#: Merge.rc:1630
msgid "Binary files only"
msgstr ""
#. IDR_POPUP_FILTERMENU_BINARY, ID_FILTERMENU_TEXT_ONLY
-#: Merge.rc:1621
+#: Merge.rc:1631
msgid "Text files only"
msgstr ""
#. IDR_POPUP_ADDCMPMENU, ID_ADDCMPMENU_CLEAR
-#: Merge.rc:1755
+#: Merge.rc:1765
msgid "&Clear conditions"
msgstr "清除條件 (&C)"
#. IDR_POPUP_ADDCMPMENU, ID_ADDCMPMENU_CMP_SIZE
-#: Merge.rc:1757
+#: Merge.rc:1767
msgid "Compare &Size"
msgstr "比較大小 (&S)"
#. IDR_POPUP_ADDCMPMENU, ID_ADDCMPMENU_CMP_DATE
-#: Merge.rc:1758
+#: Merge.rc:1768
msgid "Compare &Date"
msgstr "比較日期 (&D)"
#. IDR_POPUP_ADDCMPMENU, ID_ADDCMPMENU_CMP_ATTR
-#: Merge.rc:1759
+#: Merge.rc:1769
msgid "Compare &Attributes"
msgstr "比較屬性 (&A)"
#. IDR_POPUP_ADDCMPMENU, ID_ADDCMPMENU_CMP_CONTENTS
-#: Merge.rc:1760
+#: Merge.rc:1770
msgid "Compare C&ontents"
msgstr "比較內容 (&O)"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_CLEAR
-#: Merge.rc:1769
+#: Merge.rc:1779
msgid "&Clear Keys"
msgstr "清除鍵 (&C)"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_NAME
-#: Merge.rc:1771
+#: Merge.rc:1781
msgid "&Name"
msgstr "名稱 (&N)"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_BASENAME
-#: Merge.rc:1772
+#: Merge.rc:1782
msgid "&Base name (without extension)"
msgstr "基本名稱(不含副檔名) (&B)"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_NORMALIZED_NAME
-#: Merge.rc:1773
+#: Merge.rc:1783
msgid "Normalized &Unicode Name"
msgstr "已規範化 Unicode 名稱 (&U)"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_RELPATH
-#: Merge.rc:1774
+#: Merge.rc:1784
msgid "&Relative Path"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_DATE
-#: Merge.rc:1776
+#: Merge.rc:1786
msgid "&Date"
msgstr "日期 (&D)"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_HASH_MD5
-#: Merge.rc:1777
+#: Merge.rc:1787
msgid "&Hash (MD5)"
msgstr "哈希(MD5) (&H)"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_REPLACE
-#: Merge.rc:1780
+#: Merge.rc:1790
msgid "Insert &replace() Function"
msgstr "插入 replace()函數 (&R)"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_REGEXREPLACE
-#: Merge.rc:1781
+#: Merge.rc:1791
msgid "Insert rege&xReplace() Function"
msgstr "插入 regexReplace()函數 (&X)"
#. IDR_POPUP_RENAMEMOVE_MENU
-#: Merge.rc:1782
+#: Merge.rc:1792
msgid "Replace &Lists"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_CREATE_REPLACELIST
-#: Merge.rc:1784
+#: Merge.rc:1794
msgid "&Create String Replace List and Insert..."
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_CREATE_REGEXREPLACELIST
-#: Merge.rc:1785
+#: Merge.rc:1795
msgid "Create &Regex Replace List and Insert..."
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU
-#: Merge.rc:1787
+#: Merge.rc:1797
msgid "&String Replace Lists"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU
-#: Merge.rc:1791
+#: Merge.rc:1801
msgid "Re&gex Replace Lists"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_STRING_REPLACE_LISTS_FOLDER
-#: Merge.rc:1796
+#: Merge.rc:1806
msgid "Open String Replace Lists Folder..."
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_REGEX_REPLACE_LISTS_FOLDER
-#: Merge.rc:1797
+#: Merge.rc:1807
msgid "Open Regex Replace Lists Folder..."
msgstr ""
#. IDD_FILTERS_CONDITION, IDC_CONDITION_MATCHCASE
-#: Merge.rc:1799 Merge.rc:1995 Merge.rc:2014 Merge.rc:2042 Merge.rc:2585
+#: Merge.rc:1809 Merge.rc:2005 Merge.rc:2024 Merge.rc:2052 Merge.rc:2595
msgid "Match &case"
msgstr "區分大小寫 (&C)"
#. IDR_POPUP_RENAMEMOVE_MENU
-#: Merge.rc:1801
+#: Merge.rc:1811
msgid "Text &Normalization"
msgstr "文本規範化 (&N)"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_TOLOWER
-#: Merge.rc:1803
+#: Merge.rc:1813
msgid "&Lowercase"
msgstr "小寫 (&L)"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_TOUPPER
-#: Merge.rc:1804
+#: Merge.rc:1814
msgid "&Uppercase"
msgstr "大寫 (&U)"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_TOHALFWIDTH
-#: Merge.rc:1805
+#: Merge.rc:1815
msgid "&Half-width"
msgstr "半寬 (&H)"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_TOFULLWIDTH
-#: Merge.rc:1806
+#: Merge.rc:1816
msgid "&Full-width"
msgstr "全寬 (&F)"
#. IDR_POPUP_RENAMEMOVE_MENU
-#: Merge.rc:1807
+#: Merge.rc:1817
msgid "&Chinese Conversion"
msgstr "中文轉換 (&C)"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_TOSIMPLIFIEDCHINESE
-#: Merge.rc:1809
+#: Merge.rc:1819
msgid "&Simplified Chinese"
msgstr "簡體中文 (&S)"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_TOTRADITIONALCHINESE
-#: Merge.rc:1810
+#: Merge.rc:1820
msgid "&Traditional Chinese"
msgstr "繁體中文 (&T)"
#. IDR_POPUP_RENAMEMOVE_MENU
-#: Merge.rc:1812
+#: Merge.rc:1822
msgid "&Japanese Conversion"
msgstr "日文轉換 (&J)"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_TOHIRAGANA
-#: Merge.rc:1814
+#: Merge.rc:1824
msgid "&Hiragana"
msgstr "平假名 (&H)"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_TOKATAKANA
-#: Merge.rc:1815
+#: Merge.rc:1825
msgid "&Katakana"
msgstr "片假名 (&K)"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_NORMALIZEUNICODE
-#: Merge.rc:1817
+#: Merge.rc:1827
msgid "Normalize &Unicode"
msgstr ""
#. IDD_ABOUTBOX
-#: Merge.rc:1932
+#: Merge.rc:1942
msgid "About WinMerge"
msgstr "關於 WinMerge"
#. IDD_ABOUTBOX, IDC_WWW
-#: Merge.rc:1936
+#: Merge.rc:1946
msgid "Visit the WinMerge Homepage!"
msgstr "拜訪 WinMerge 首頁!"
#. IDD_PLUGINS_EDITPLUGIN, IDOK
-#: Merge.rc:1938 Merge.rc:2080 Merge.rc:2431 Merge.rc:2455 Merge.rc:2469
-#: Merge.rc:2497 Merge.rc:2588 Merge.rc:2613 Merge.rc:2674 Merge.rc:2691
-#: Merge.rc:2703 Merge.rc:2867 Merge.rc:2927 Merge.rc:3062 Merge.rc:3104
-#: Merge.rc:3147 Merge.rc:3197
+#: Merge.rc:1948 Merge.rc:2090 Merge.rc:2441 Merge.rc:2465 Merge.rc:2479
+#: Merge.rc:2507 Merge.rc:2598 Merge.rc:2623 Merge.rc:2684 Merge.rc:2701
+#: Merge.rc:2713 Merge.rc:2877 Merge.rc:2937 Merge.rc:3072 Merge.rc:3114
+#: Merge.rc:3157 Merge.rc:3207
msgid "OK"
msgstr "確定"
#. IDD_ABOUTBOX, IDC_OPEN_CONTRIBUTORS
-#: Merge.rc:1939
+#: Merge.rc:1949
msgid "Contributors"
msgstr "貢獻者"
#. IDD_SELECT_FILES_OR_FOLDERS
-#: Merge.rc:1945 Merge.rc:3070
+#: Merge.rc:1955 Merge.rc:3080
msgid "Select Files or Folders"
msgstr "選取檔案或資料夾"
#. IDD_OPEN, IDC_FILES_DIRS_GROUP0
-#: Merge.rc:1949
+#: Merge.rc:1959
msgid "&1st File or Folder"
msgstr "第 &1 檔案或資料夾"
#. IDD_OPEN, IDC_PATH0_READONLY
-#: Merge.rc:1951
+#: Merge.rc:1961
msgid "Re&ad-only"
msgstr "唯讀 (&A)"
#. IDD_OPEN, IDC_SWAP01_STATIC
-#: Merge.rc:1953
+#: Merge.rc:1963
msgid "Swap 1st | 2nd"
msgstr "將第一和第二對調"
#. IDD_GENERATE_PATCH, IDC_DIFF_BROWSE_FILE1
-#: Merge.rc:1954 Merge.rc:2310 Merge.rc:2413
+#: Merge.rc:1964 Merge.rc:2320 Merge.rc:2423
msgid "&Browse..."
msgstr "瀏覽 (&B)..."
#. IDD_OPEN, IDC_FILES_DIRS_GROUP1
-#: Merge.rc:1955
+#: Merge.rc:1965
msgid "&2nd File or Folder"
msgstr "第 &2 檔案或資料夾"
#. IDD_OPEN, IDC_PATH1_READONLY
-#: Merge.rc:1957
+#: Merge.rc:1967
msgid "Rea&d-only"
msgstr "唯讀 (&D)"
#. IDD_OPEN, IDC_SWAP12_STATIC
-#: Merge.rc:1959
+#: Merge.rc:1969
msgid "Swap 2nd | 3rd"
msgstr "將第二和第三對調"
#. IDD_PROPPAGE_SYSTEM, IDC_FILTER_USER_BROWSE
-#: Merge.rc:1960 Merge.rc:2315
+#: Merge.rc:1970 Merge.rc:2325
msgid "B&rowse..."
msgstr "瀏覽 (&R)..."
#. IDD_OPEN, IDC_FILES_DIRS_GROUP2
-#: Merge.rc:1961
+#: Merge.rc:1971
msgid "&3rd File or Folder (Optional)"
msgstr "第 &3 檔案或資料夾 (可選)"
#. IDD_OPEN, IDC_PATH2_READONLY
-#: Merge.rc:1963
+#: Merge.rc:1973
msgid "Read-o&nly"
msgstr "唯讀 (&N)"
#. IDD_OPEN, IDC_SWAP02_STATIC
-#: Merge.rc:1965
+#: Merge.rc:1975
msgid "Swap 1st | 3rd"
msgstr "將第一和第三對調"
#. IDD_PROPPAGE_BACKUPS, IDC_BACKUP_BROWSE
-#: Merge.rc:1966 Merge.rc:2685 Merge.rc:2883
+#: Merge.rc:1976 Merge.rc:2695 Merge.rc:2893
msgid "Browse..."
msgstr "瀏覽..."
#. IDD_OPEN, IDC_FILES_DIRS_GROUP3
-#: Merge.rc:1968
+#: Merge.rc:1978
msgid " Folder: Filter"
msgstr "資料夾:篩選器"
#. IDD_OPEN, IDC_RECURS_CHECK
-#: Merge.rc:1971
+#: Merge.rc:1981
msgid "&Include subfolders"
msgstr "包括子資料夾 (&I)"
#. IDD_OPEN, IDC_FILES_DIRS_GROUP5
-#: Merge.rc:1972
+#: Merge.rc:1982
msgid " File: Prediffer Plugin"
msgstr "檔案: 預差異化外掛"
#. IDD_OPEN, IDC_FILES_DIRS_GROUP4
-#: Merge.rc:1976
+#: Merge.rc:1986
msgid " File: Unpacker Plugin"
msgstr "檔案: 解壓縮外掛"
#. IDD_OPEN, IDC_SELECT_UNPACKER
-#: Merge.rc:1978
+#: Merge.rc:1988
msgid "Se&lect..."
msgstr "選擇... (&L)"
#. IDD_PLUGINS_EDITPLUGIN, IDCANCEL
-#: Merge.rc:1981 Merge.rc:2001 Merge.rc:2025 Merge.rc:2046 Merge.rc:2081
-#: Merge.rc:2432 Merge.rc:2456 Merge.rc:2470 Merge.rc:2498 Merge.rc:2551
-#: Merge.rc:2589 Merge.rc:2614 Merge.rc:2675 Merge.rc:2692 Merge.rc:2704
-#: Merge.rc:2868 Merge.rc:2928 Merge.rc:3087 Merge.rc:3105 Merge.rc:3148
-#: Merge.rc:3198
+#: Merge.rc:1991 Merge.rc:2011 Merge.rc:2035 Merge.rc:2056 Merge.rc:2091
+#: Merge.rc:2442 Merge.rc:2466 Merge.rc:2480 Merge.rc:2508 Merge.rc:2561
+#: Merge.rc:2599 Merge.rc:2624 Merge.rc:2685 Merge.rc:2702 Merge.rc:2714
+#: Merge.rc:2878 Merge.rc:2938 Merge.rc:3097 Merge.rc:3115 Merge.rc:3158
+#: Merge.rc:3208
msgid "Cancel"
msgstr "取消"
#. IDD_OPEN, IDC_OPEN_STATUS
-#: Merge.rc:1982
+#: Merge.rc:1992
msgid "Status:"
msgstr "狀態:"
#. IDD_PLUGINS_LIST, ID_HELP
-#: Merge.rc:1983 Merge.rc:2082 Merge.rc:2929
+#: Merge.rc:1993 Merge.rc:2092 Merge.rc:2939
msgid "Help"
msgstr "說明"
#. IDD_OPEN, IDC_OPTIONS
-#: Merge.rc:1984
+#: Merge.rc:1994
msgid "&Options..."
msgstr "選項 (&O)..."
#. IDD_EDIT_FIND
-#: Merge.rc:1989
+#: Merge.rc:1999
msgid "Find"
msgstr "尋找"
#. IDD_EDIT_MARKER, IDC_STATIC
-#: Merge.rc:1992 Merge.rc:2009 Merge.rc:2037
+#: Merge.rc:2002 Merge.rc:2019 Merge.rc:2047
msgid "Fi&nd what:"
msgstr "尋找 (&N):"
#. IDD_EDIT_MARKER, IDC_EDIT_WHOLE_WORD
-#: Merge.rc:1994 Merge.rc:2013 Merge.rc:2041
+#: Merge.rc:2004 Merge.rc:2023 Merge.rc:2051
msgid "Match &whole word only"
msgstr "只匹配完整單詞 (&W)"
#. IDD_EDIT_MARKER, IDC_EDIT_REGEXP
-#: Merge.rc:1996 Merge.rc:2015 Merge.rc:2043
+#: Merge.rc:2006 Merge.rc:2025 Merge.rc:2053
msgid "Regular &expression"
msgstr "正規表達式 (&E)"
#. IDD_EDIT_FIND, IDC_FINDDLG_DONTWRAP
-#: Merge.rc:1997
+#: Merge.rc:2007
msgid "D&on't wrap end of file"
msgstr "至檔尾不折返 (&O)"
#. IDD_EDIT_FIND, IDC_FINDDLG_DONTCLOSE
-#: Merge.rc:1998
+#: Merge.rc:2008
msgid "&Don't close this dialog"
msgstr "不要關閉此對話框 (&D)"
#. IDD_EDIT_REPLACE, IDC_EDIT_SKIP
-#: Merge.rc:1999 Merge.rc:2021
+#: Merge.rc:2009 Merge.rc:2031
msgid "&Find Next"
msgstr "找下一個 (&F)"
#. IDD_EDIT_FIND, IDC_EDIT_FINDPREV
-#: Merge.rc:2000
+#: Merge.rc:2010
msgid "Find &Prev"
msgstr "找上一個 (&P)"
#. IDD_EDIT_REPLACE
-#: Merge.rc:2006
+#: Merge.rc:2016
msgid "Replace"
msgstr "取代"
#. IDD_EDIT_REPLACE, IDC_STATIC
-#: Merge.rc:2011
+#: Merge.rc:2021
msgid "Re&place with:"
msgstr "取代為 (&P):"
#. IDD_EDIT_REPLACE, IDC_EDIT_SCOPE_DONT_WRAP
-#: Merge.rc:2016
+#: Merge.rc:2026
msgid "&Don't wrap at end of file"
msgstr "至檔尾不折返 (&D)"
#. IDD_EDIT_REPLACE, IDC_STATIC
-#: Merge.rc:2018
+#: Merge.rc:2028
msgid "Replace in"
msgstr "替換於"
#. IDD_EDIT_REPLACE, IDC_EDIT_SCOPE_WHOLE_FILE
-#: Merge.rc:2020
+#: Merge.rc:2030
msgid "Wh&ole file"
msgstr "整個檔案 (&O)"
#. IDD_EDIT_REPLACE, IDC_EDIT_FINDPREV
-#: Merge.rc:2022
+#: Merge.rc:2032
msgid "Find Pre&v"
msgstr "找下一個 (&V)"
#. IDD_EDIT_REPLACE, IDC_EDIT_REPLACE
-#: Merge.rc:2023
+#: Merge.rc:2033
msgid "&Replace"
msgstr "取代 (&R)"
#. IDD_EDIT_REPLACE, IDC_EDIT_REPLACE_ALL
-#: Merge.rc:2024
+#: Merge.rc:2034
msgid "Replace &All"
msgstr "全部取代 (&A)"
#. IDS_OPTIONSPG_MARKERCOLORS
-#: Merge.rc:2030 Merge.rc:4209
+#: Merge.rc:2040 Merge.rc:4219
msgid "Markers"
msgstr "標記"
#. IDD_EDIT_MARKER, IDC_EDIT_MARKERS_ENABLED
-#: Merge.rc:2033
+#: Merge.rc:2043
msgid "Enable &markers"
msgstr "開啟標記 (&M)"
#. IDD_FILTERS_LINEFILTERS, IDC_LFILTER_ADDBTN
-#: Merge.rc:2035 Merge.rc:2057
+#: Merge.rc:2045 Merge.rc:2067
msgid "New"
msgstr "新增"
#. IDD_EDIT_MARKER, IDC_STATIC
-#: Merge.rc:2039
+#: Merge.rc:2049
msgid "&Background color:"
msgstr "背景顏色 (&B)"
#. IDS_MESSAGEBOX_OK
-#: Merge.rc:2044 Merge.rc:2829 Merge.rc:3086 Merge.rc:4171
+#: Merge.rc:2054 Merge.rc:2839 Merge.rc:3096 Merge.rc:4181
msgid "&Ok"
msgstr "確定 (&O)"
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:2045 Merge.rc:2525 Merge.rc:3199
+#: Merge.rc:2055 Merge.rc:2535 Merge.rc:3209
msgid "&Apply"
msgstr "套用 (&A)"
#. IDD_FILTERS_LINEFILTERS
-#: Merge.rc:2051
+#: Merge.rc:2061
msgid "Line Filters"
msgstr "行篩選器"
#. IDD_FILTERS_LINEFILTERS, IDC_IGNOREREGEXP
-#: Merge.rc:2054
+#: Merge.rc:2064
msgid "Enable Line Filters"
msgstr "啟用行篩選器"
#. IDD_FILTERS_LINEFILTERS, IDC_STATIC
-#: Merge.rc:2055
+#: Merge.rc:2065
msgid "Regular Expressions (one per line):"
msgstr "正規表達式 (每行一式):"
#. IDD_PLUGINS_LIST, IDC_PLUGIN_EDIT
-#: Merge.rc:2058 Merge.rc:2924
+#: Merge.rc:2068 Merge.rc:2934
msgid "Edit"
msgstr "編輯"
#. IDD_PLUGINS_LIST, IDC_PLUGIN_REMOVE
-#: Merge.rc:2059 Merge.rc:2071 Merge.rc:2925
+#: Merge.rc:2069 Merge.rc:2081 Merge.rc:2935
msgid "Remove"
msgstr "移除"
#. IDD_FILTERS_SUBSTITUTIONFILTERS
-#: Merge.rc:2064
+#: Merge.rc:2074
msgid "Substitution Filters"
msgstr "替代篩選器"
#. IDD_FILTERS_SUBSTITUTIONFILTERS, IDC_STATIC
-#: Merge.rc:2067
+#: Merge.rc:2077
msgid "Changes to the listed pairs below will be ignored or marked as insignificant. Patches are unaffected."
msgstr "列表中列出的配對將被忽略或標記為無關緊要的變更。修補程式不受影響。"
#. IDD_FILTERS_SUBSTITUTIONFILTERS, IDC_IGNORED_SUSBSTITUTIONS_ENABLED
-#: Merge.rc:2068
+#: Merge.rc:2078
msgid "Enable"
msgstr "啟用"
#. IDD_PLUGINS_LIST, IDC_PLUGIN_ADD
-#: Merge.rc:2070 Merge.rc:2923
+#: Merge.rc:2080 Merge.rc:2933
msgid "Add"
msgstr "新增"
#. IDD_FILTERS_SUBSTITUTIONFILTERS, IDC_LFILTER_CLEARBTN
-#: Merge.rc:2072
+#: Merge.rc:2082
msgid "Clear"
msgstr "清除"
#. IDD_PREFERENCES
-#: Merge.rc:2077
+#: Merge.rc:2087
msgid "Options"
msgstr "選項"
#. IDD_PREFERENCES, IDC_TREEOPT_IMPORT
-#: Merge.rc:2086
+#: Merge.rc:2096
msgid "Import..."
msgstr "匯入..."
#. IDD_PREFERENCES, IDC_TREEOPT_EXPORT
-#: Merge.rc:2087
+#: Merge.rc:2097
msgid "Export..."
msgstr "匯出..."
#. IDS_OPTIONSPG_GENCOMPARE
-#: Merge.rc:2092 Merge.rc:4199 Merge.rc:4202 Merge.rc:4219
+#: Merge.rc:2102 Merge.rc:4209 Merge.rc:4212 Merge.rc:4229
msgid "General"
msgstr "一般"
#. IDD_PROPPAGE_GENERAL, IDC_SCROLL_CHECK
-#: Merge.rc:2095
+#: Merge.rc:2105
msgid "Automatically &scroll to first difference"
msgstr "自動捲至首個差異 (&S)"
#. IDD_PROPPAGE_GENERAL, IDC_SCROLL_TO_FIRST_INLINE_DIFF_CHECK
-#: Merge.rc:2097
+#: Merge.rc:2107
msgid "Automatically s&croll to first inline difference"
msgstr "自動捲至首個行內差異 (&C)"
#. IDD_PROPPAGE_GENERAL, IDC_STATIC
-#: Merge.rc:2099
+#: Merge.rc:2109
msgid "Cl&ose windows with 'Esc':"
msgstr "按 'Esc' 關閉視窗 (&O):"
#. IDD_PROPPAGE_GENERAL, IDC_VERIFY_OPEN_PATHS
-#: Merge.rc:2101
+#: Merge.rc:2111
msgid "&Automatically verify paths in Open dialog"
msgstr "於「開啟」對話方塊自動檢驗路徑 (&A)"
#. IDD_PROPPAGE_GENERAL, IDC_STATIC
-#: Merge.rc:2103
+#: Merge.rc:2113
msgid "Single instance mode:"
msgstr "單一實例模式:"
#. IDD_PROPPAGE_GENERAL, IDC_ASK_MULTIWINDOW_CLOSE
-#: Merge.rc:2105
+#: Merge.rc:2115
msgid "As&k when closing multiple windows"
msgstr "關閉多重視窗時先詢問 (&K)"
# "比較時計入檔案時間 (&P)"
# Do you want with it to say "Include file time difference in comparing" or "Do not change file time in comparing"?
#. IDD_PROPPAGE_GENERAL, IDC_PRESERVE_FILETIME
-#: Merge.rc:2107
+#: Merge.rc:2117
msgid "&Preserve file time in file compare"
msgstr "比較檔案時保留檔案時間 (&P)"
#. IDD_PROPPAGE_GENERAL, IDC_STARTUP_FOLDER_SELECT
-#: Merge.rc:2109
+#: Merge.rc:2119
msgid "Show \"Select Files or Folders\" dialog on startup"
msgstr "啟動時顯示「選擇檔案或資料夾」對話方塊"
#. IDD_PROPPAGE_GENERAL, IDC_CLOSE_WITH_OK
-#: Merge.rc:2111
+#: Merge.rc:2121
msgid "Close \"Select Files or Folders\" dialog on clicking Compare button"
msgstr "點擊比較按鈕後關閉「選擇檔案或資料夾」對話框"
#. IDD_PROPPAGE_GENERAL, IDC_STATIC
-#: Merge.rc:2113
+#: Merge.rc:2123
msgid "Op&en dialog Auto completion:"
msgstr "「開啟」對話方塊之自動完成 (&E):"
#. IDD_PROPPAGE_GENERAL, IDC_STATIC
-#: Merge.rc:2115
+#: Merge.rc:2125
msgid "Auto-&reload modified files:"
msgstr "自動重新載入修改的檔案 (&R):"
#. IDD_PROPPAGE_GENERAL, IDC_STATIC
-#: Merge.rc:2117
+#: Merge.rc:2127
msgid "Language:"
msgstr "語言:"
#. IDD_PROPPAGE_COMPARE_WEBPAGE, IDC_COMPARE_DEFAULTS
-#: Merge.rc:2119 Merge.rc:2299 Merge.rc:2321 Merge.rc:2352 Merge.rc:2369
-#: Merge.rc:2386 Merge.rc:2394 Merge.rc:2430 Merge.rc:2454 Merge.rc:2633
-#: Merge.rc:2644 Merge.rc:2653 Merge.rc:2887 Merge.rc:2922 Merge.rc:2985
-#: Merge.rc:3010 Merge.rc:3024 Merge.rc:3038 Merge.rc:3054
+#: Merge.rc:2129 Merge.rc:2309 Merge.rc:2331 Merge.rc:2362 Merge.rc:2379
+#: Merge.rc:2396 Merge.rc:2404 Merge.rc:2440 Merge.rc:2464 Merge.rc:2643
+#: Merge.rc:2654 Merge.rc:2663 Merge.rc:2897 Merge.rc:2932 Merge.rc:2995
+#: Merge.rc:3020 Merge.rc:3034 Merge.rc:3048 Merge.rc:3064
msgid "Defaults"
msgstr "預設值"
#. IDS_OPTIONSPG_COLORS
-#: Merge.rc:2124 Merge.rc:2140 Merge.rc:2267 Merge.rc:2292 Merge.rc:4205
+#: Merge.rc:2134 Merge.rc:2150 Merge.rc:2277 Merge.rc:2302 Merge.rc:4215
msgid "Colors"
msgstr "色彩"
#. IDD_PROPPAGE_COLOR_SCHEMES, IDC_STATIC
-#: Merge.rc:2127
+#: Merge.rc:2137
msgid "Color &mode:"
msgstr "色彩配置 (&M):"
#. IDD_PROPPAGE_COLOR_SCHEMES, IDC_STATIC
-#: Merge.rc:2129
+#: Merge.rc:2139
msgid "&Light mode scheme:"
msgstr "亮色模式主題 (&L):"
#. IDD_PROPPAGE_COLOR_SCHEMES, IDC_STATIC
-#: Merge.rc:2131
+#: Merge.rc:2141
msgid "&Dark mode scheme:"
msgstr "暗色模式主題 (&D):"
#. IDD_PROPPAGE_COLOR_SCHEMES, IDC_STATIC
-#: Merge.rc:2133
+#: Merge.rc:2143
msgid "Your custom schemes"
msgstr "您的自訂主題"
#. IDD_PROPPAGE_COLOR_SCHEMES, IDC_COLOR_SCHEME_SAVE
-#: Merge.rc:2134
+#: Merge.rc:2144
msgid "&Save current scheme..."
msgstr "儲存目前主題 (&S)..."
#. IDD_PROPPAGE_COLOR_SCHEMES, IDC_COLOR_SCHEME_DELETE
-#: Merge.rc:2135
+#: Merge.rc:2145
msgid "Delete ¤t scheme..."
msgstr "刪除目前主題 (&C)..."
#. IDD_PROPPAGE_COLORS_DIR, IDC_BACKGROUND_COLUMN_LABEL
-#: Merge.rc:2143 Merge.rc:2238 Merge.rc:2258 Merge.rc:2272
+#: Merge.rc:2153 Merge.rc:2248 Merge.rc:2268 Merge.rc:2282
msgid "Background"
msgstr "背景"
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2144
+#: Merge.rc:2154
msgid "Deleted"
msgstr "被刪除"
#. IDS_OPTIONSPG_TEXTCOLORS
-#: Merge.rc:2145 Merge.rc:2207 Merge.rc:2239 Merge.rc:2273 Merge.rc:4207
+#: Merge.rc:2155 Merge.rc:2217 Merge.rc:2249 Merge.rc:2283 Merge.rc:4217
msgid "Text"
msgstr "文字色"
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2146
+#: Merge.rc:2156
msgid "Difference:"
msgstr "差異區塊:"
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2151
+#: Merge.rc:2161
msgid "Selected Difference:"
msgstr "已選取的差異區塊:"
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2156
+#: Merge.rc:2166
msgid "Ignored Difference:"
msgstr "忽略的差異區塊:"
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2161
+#: Merge.rc:2171
msgid "Moved:"
msgstr "移位區塊:"
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2166
+#: Merge.rc:2176
msgid "Selected Moved:"
msgstr "已選取的移位區塊:"
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2171
+#: Merge.rc:2181
msgid "Same As Next (3 panes):"
msgstr "和下一個相同 (3方比較):"
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2176
+#: Merge.rc:2186
msgid "Same As Next (Selected):"
msgstr "和下一個相同 (已選取):"
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2181
+#: Merge.rc:2191
msgid "Word Difference:"
msgstr "詞彙差異:"
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2186
+#: Merge.rc:2196
msgid "Selected Word Diff:"
msgstr "已選取的字的差異:"
#. IDD_INPUTBOX
-#: Merge.rc:2195 Merge.rc:2230 Merge.rc:2251 Merge.rc:3099
+#: Merge.rc:2205 Merge.rc:2240 Merge.rc:2261 Merge.rc:3109
msgid "Dialog"
msgstr "對話"
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC
-#: Merge.rc:2198
+#: Merge.rc:2208
msgid "Keywords:"
msgstr "關鍵字:"
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC
-#: Merge.rc:2199
+#: Merge.rc:2209
msgid "Function names:"
msgstr "函數名:"
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC
-#: Merge.rc:2200
+#: Merge.rc:2210
msgid "Comments:"
msgstr "註:"
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC
-#: Merge.rc:2201
+#: Merge.rc:2211
msgid "Numbers:"
msgstr "數字:"
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC
-#: Merge.rc:2202
+#: Merge.rc:2212
msgid "Operators:"
msgstr "運算子:"
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC
-#: Merge.rc:2203
+#: Merge.rc:2213
msgid "Strings:"
msgstr "字串:"
# What is preprocessor? Is it prediffer? The term "preprocessor" cannot be found elsewhere.
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC
-#: Merge.rc:2204
+#: Merge.rc:2214
msgid "Preprocessor:"
msgstr "預先處理器:"
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC
-#: Merge.rc:2205
+#: Merge.rc:2215
msgid "User 1:"
msgstr "使用者 1:"
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC
-#: Merge.rc:2206
+#: Merge.rc:2216
msgid "User 2:"
msgstr "使用者 2:"
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_SCOLOR_USER2_BOLD
-#: Merge.rc:2209 Merge.rc:2211 Merge.rc:2213 Merge.rc:2215 Merge.rc:2217
-#: Merge.rc:2219 Merge.rc:2221 Merge.rc:2223 Merge.rc:2225
+#: Merge.rc:2219 Merge.rc:2221 Merge.rc:2223 Merge.rc:2225 Merge.rc:2227
+#: Merge.rc:2229 Merge.rc:2231 Merge.rc:2233 Merge.rc:2235
msgid "Bold"
msgstr "粗體"
#. IDD_PROPPAGE_COLORS_TEXT, IDC_DEFAULT_STANDARD_COLORS
-#: Merge.rc:2233
+#: Merge.rc:2243
msgid "&Use customized text colors"
msgstr "使用自訂文字色彩 (&U)"
#. IDD_PROPPAGE_COLORS_TEXT, IDC_WHITESPACE_COLOR_LABEL
-#: Merge.rc:2235
+#: Merge.rc:2245
msgid "Whitespace:"
msgstr "空白字元:"
#. IDD_PROPPAGE_COLORS_TEXT, IDC_TEXT_COLOR_LABEL
-#: Merge.rc:2236
+#: Merge.rc:2246
msgid "Regular text:"
msgstr "一般文本:"
#. IDD_PROPPAGE_COLORS_TEXT, IDC_SELECTION_COLOR_LABEL
-#: Merge.rc:2237
+#: Merge.rc:2247
msgid "Selection:"
msgstr "選取:"
#. IDD_PROPPAGE_COLORS_DIR, IDC_STATIC
-#: Merge.rc:2245 Merge.rc:2286
+#: Merge.rc:2255 Merge.rc:2296
msgid "Margin:"
msgstr "邊距:"
#. IDD_PROPPAGE_COLORS_MARKER, IDC_MARKER0_COLOR_LABEL
-#: Merge.rc:2254
+#: Merge.rc:2264
msgid "Search Marker:"
msgstr "搜尋標記:"
#. IDD_PROPPAGE_COLORS_MARKER, IDC_MARKER1_COLOR_LABEL
-#: Merge.rc:2255
+#: Merge.rc:2265
msgid "User Defined Marker 1:"
msgstr "使用者自定義標記1:"
#. IDD_PROPPAGE_COLORS_MARKER, IDC_MARKER2_COLOR_LABEL
-#: Merge.rc:2256
+#: Merge.rc:2266
msgid "User Defined Marker 2:"
msgstr "使用者自定義標記2:"
#. IDD_PROPPAGE_COLORS_MARKER, IDC_MARKER3_COLOR_LABEL
-#: Merge.rc:2257
+#: Merge.rc:2267
msgid "User Defined Marker 3:"
msgstr "使用者自定義標記3:"
#. IDD_PROPPAGE_COLORS_DIR, IDC_USE_DIR_COMPARE_COLORS
-#: Merge.rc:2270
+#: Merge.rc:2280
msgid "&Use folder compare colors"
msgstr "使用資料夾比較顏色 (&U)"
#. IDD_PROPPAGE_COLORS_DIR, IDC_STATIC
-#: Merge.rc:2274
+#: Merge.rc:2284
msgid "Items equal:"
msgstr "相同項目:"
#. IDD_PROPPAGE_COLORS_DIR, IDC_STATIC
-#: Merge.rc:2277
+#: Merge.rc:2287
msgid "Items different:"
msgstr "相異項目:"
#. IDD_PROPPAGE_COLORS_DIR, IDC_STATIC
-#: Merge.rc:2280
+#: Merge.rc:2290
msgid "Items missing:"
msgstr "遺失的項目:"
#. IDD_PROPPAGE_COLORS_DIR, IDC_STATIC
-#: Merge.rc:2283
+#: Merge.rc:2293
msgid "Items filtered:"
msgstr "篩選項目:"
#. IDD_PROPPAGE_COLORS_SYSTEM, IDC_SYSCOLOR_HOOK_ENABLED
-#: Merge.rc:2295
+#: Merge.rc:2305
msgid "&Use custom system colors"
msgstr "使用自訂系統顏色 (&U)"
#. IDS_PRPCAT_SYSTEM
-#: Merge.rc:2304 Merge.rc:4211 Merge.rc:4212 Merge.rc:4657
+#: Merge.rc:2314 Merge.rc:4221 Merge.rc:4222 Merge.rc:4667
msgid "System"
msgstr "系統"
#. IDD_PROPPAGE_SYSTEM, IDC_USE_RECYCLE_BIN
-#: Merge.rc:2307
+#: Merge.rc:2317
msgid "&Use Recycle Bin"
msgstr "使用資源回收筒 (&U)"
#. IDD_PROPPAGE_SYSTEM, IDC_STATIC
-#: Merge.rc:2308
+#: Merge.rc:2318
msgid "&External editor:"
msgstr "外部編輯器 (&E):"
#. IDD_PROPPAGE_SYSTEM, IDC_STATIC
-#: Merge.rc:2311
+#: Merge.rc:2321
msgid "&Store user data in:"
msgstr "將使用者資料儲存在: (&S)"
#. IDD_PROPPAGE_SYSTEM, IDC_STATIC
-#: Merge.rc:2313
+#: Merge.rc:2323
msgid "&Filter folder:"
msgstr "資料夾篩選器 (&F):"
#. IDD_PROPPAGE_SYSTEM, IDC_STATIC
-#: Merge.rc:2316
+#: Merge.rc:2326
msgid "Temporary files folder"
msgstr "暫存檔資料夾"
#. IDD_PROPPAGE_SYSTEM, IDC_TMPFOLDER_SYSTEM
-#: Merge.rc:2317
+#: Merge.rc:2327
msgid "S&ystem temp folder"
msgstr "系統的暫存資料夾 (&Y)"
#. IDD_PROPPAGE_SYSTEM, IDC_STATIC
-#: Merge.rc:2318
+#: Merge.rc:2328
msgid "C&ustom folder:"
msgstr "自訂資料夾 (&U):"
#. IDD_GENERATE_PATCH, IDC_DIFF_BROWSE_FILE2
-#: Merge.rc:2320 Merge.rc:2416
+#: Merge.rc:2330 Merge.rc:2426
msgid "Br&owse..."
msgstr "瀏覽 (&O)..."
#. IDS_OPTIONSPG_COMPARE
-#: Merge.rc:2326 Merge.rc:4200
+#: Merge.rc:2336 Merge.rc:4210
msgid "Compare"
msgstr "比較"
#. IDD_PROPPAGE_COMPARE, IDC_STATIC
-#: Merge.rc:2329
+#: Merge.rc:2339
msgid "Whitespaces"
msgstr "空白字元"
#. IDD_PROPPAGE_COMPARE, IDC_WHITESPACE
-#: Merge.rc:2330
+#: Merge.rc:2340
msgid "&Compare"
msgstr "比較 (&C)"
#. IDD_PROPPAGE_COMPARE, IDC_WHITE_CHANGE
-#: Merge.rc:2331
+#: Merge.rc:2341
msgid "&Ignore change"
msgstr "忽略更改 (&I)"
#. IDD_PROPPAGE_COMPARE, IDC_ALL_WHITE
-#: Merge.rc:2332
+#: Merge.rc:2342
msgid "I&gnore all"
msgstr "全部忽略 (&G)"
#. IDD_PROPPAGE_COMPARE, IDC_IGNBLANKS_CHECK
-#: Merge.rc:2333
+#: Merge.rc:2343
msgid "Ignore blan&k lines"
msgstr "忽略空行 (&K)"
#. IDD_PROPPAGE_COMPARE, IDC_IGNCASE_CHECK
-#: Merge.rc:2334
+#: Merge.rc:2344
msgid "Ignore &case"
msgstr "忽略大小寫 (&C)"
#. IDD_PROPPAGE_COMPARE, IDC_EOL_SENSITIVE
-#: Merge.rc:2335
+#: Merge.rc:2345
msgid "Igno&re EOL differences (Windows/Unix/Mac)"
msgstr "忽略行尾差異(Windows/Unix/Mac)(&R)"
#. IDD_PROPPAGE_COMPARE, IDC_IGNORE_NUMBERS
-#: Merge.rc:2337
+#: Merge.rc:2347
msgid "Ignore num&bers"
msgstr "忽略數字 (&B)"
#. IDD_PROPPAGE_COMPARE, IDC_CP_SENSITIVE
-#: Merge.rc:2338
+#: Merge.rc:2348
msgid "Ignore codepage &differences"
msgstr "忽略字碼頁差異 (&D)"
#. IDD_PROPPAGE_COMPARE, IDC_FILTERCOMMENTS_CHECK
-#: Merge.rc:2339
+#: Merge.rc:2349
msgid "Ignore c&omment differences"
msgstr "忽略註解差異 (&O)"
#. IDD_PROPPAGE_COMPARE, IDC_IGNEOFEOL_CHECK
-#: Merge.rc:2341
+#: Merge.rc:2351
msgid "Ignore &missing trailing EOL"
msgstr "忽略缺失的行尾換行符號 (&M)"
#. IDD_PROPPAGE_COMPARE, IDC_IGNLBRKS_CHECK
-#: Merge.rc:2343
+#: Merge.rc:2353
msgid "Ignore line &breaks (treat as spaces)"
msgstr "忽略換行符號(視為空格) (&B)"
#. IDD_PROPPAGE_COMPARE, IDC_MOVED_BLOCKS
-#: Merge.rc:2345
+#: Merge.rc:2355
msgid "E&nable moved block detection"
msgstr "偵測移位的區塊 (&N)"
#. IDD_PROPPAGE_COMPARE, IDC_ALIGN_SIMILAR_LINES
-#: Merge.rc:2346
+#: Merge.rc:2356
msgid "Align &similar lines"
msgstr "相似行對齊 (&S)"
#. IDD_PROPPAGE_COMPARE, IDC_STATIC
-#: Merge.rc:2347
+#: Merge.rc:2357
msgid "Diff &algorithm:"
msgstr "差異比對演算法 (&A):"
#. IDD_PROPPAGE_COMPARE, IDC_INDENT_HEURISTIC
-#: Merge.rc:2349
+#: Merge.rc:2359
msgid "Enable indent &heuristic"
msgstr "啟用縮排啟發式演算法 (&H)"
#. IDD_PROPPAGE_COMPARE, IDC_COMPLETELY_BLANK_OUT_IGNORED_DIFFERENCES
-#: Merge.rc:2350
+#: Merge.rc:2360
msgid "Completely unhighlight the ignored differences"
msgstr "完全取消對忽略的差異的突顯顯示"
#. IDS_OPTIONSPG_EDITOR
-#: Merge.rc:2357 Merge.rc:4201
+#: Merge.rc:2367 Merge.rc:4211
msgid "Editor"
msgstr "編輯器"
#. IDD_PROPPAGE_EDITOR, IDC_HILITE_CHECK
-#: Merge.rc:2360
+#: Merge.rc:2370
msgid "&Highlight syntax"
msgstr "高亮度語法 (&H)"
#. IDD_PROPPAGE_EDITOR, IDC_MIXED_EOL
-#: Merge.rc:2361
+#: Merge.rc:2371
msgid "&Preserve original EOL"
msgstr "保留原始行尾 (&P)"
#. IDD_PROPPAGE_EDITOR, IDC_STATIC
-#: Merge.rc:2362
+#: Merge.rc:2372
msgid "Tabs"
msgstr "製表符(Tab)"
#. IDD_PROPPAGE_EDITOR, IDC_STATIC
-#: Merge.rc:2363
+#: Merge.rc:2373
msgid "&Tab size:"
msgstr "製表符(Tab)大小 (&T):"
#. IDD_PROPPAGE_EDITOR, IDC_PROP_INSERT_TABS
-#: Merge.rc:2365
+#: Merge.rc:2375
msgid "&Insert tabs"
msgstr "插入製表符(Tab) (&I)"
#. IDD_PROPPAGE_EDITOR, IDC_PROP_INSERT_SPACES
-#: Merge.rc:2366
+#: Merge.rc:2376
msgid "Insert &spaces"
msgstr "插入空格 (&S)"
#. IDD_PROPPAGE_EDITOR, IDC_STATIC
-#: Merge.rc:2367
+#: Merge.rc:2377
msgid "&Rendering mode:"
msgstr "渲染模式 (&R):"
#. IDD_PROPPAGE_EDITOR_COMPAREMERGE, IDC_AUTOMRESCAN_CHECK
-#: Merge.rc:2376
+#: Merge.rc:2386
msgid "&Automatic rescan"
msgstr "自動重新掃描 (&A)"
#. IDD_PROPPAGE_EDITOR_COMPAREMERGE, IDC_STATIC
-#: Merge.rc:2377
+#: Merge.rc:2387
msgid "Copy &granularity for selected differences:"
msgstr "複製所選差異的精細度 (&G):"
#. IDD_PROPPAGE_EDITOR_COMPAREMERGE, IDC_LINE_COLORING_GROUP
-#: Merge.rc:2379
+#: Merge.rc:2389
msgid "Line Difference Coloring"
msgstr "行內差異著色"
#. IDD_PROPPAGE_EDITOR_COMPAREMERGE, IDC_VIEW_LINE_DIFFERENCES
-#: Merge.rc:2380
+#: Merge.rc:2390
msgid "View line differences"
msgstr "檢視行內差異"
#. IDD_PROPPAGE_EDITOR_COMPAREMERGE, IDC_EDITOR_CHARLEVEL
-#: Merge.rc:2381
+#: Merge.rc:2391
msgid "&Character-level"
msgstr "字元階層 (&C)"
#. IDD_PROPPAGE_EDITOR_COMPAREMERGE, IDC_EDITOR_WORDLEVEL
-#: Merge.rc:2382
+#: Merge.rc:2392
msgid "&Word-level:"
msgstr "字階層 (&W):"
#. IDD_PROPPAGE_EDITOR_COMPAREMERGE, IDC_STATIC
-#: Merge.rc:2384
+#: Merge.rc:2394
msgid "W&ord break characters:"
msgstr "斷句字元 (&O):"
#. IDD_PROPPAGE_MESSAGEBOXES, IDC_STATIC
-#: Merge.rc:2401
+#: Merge.rc:2411
msgid "Some messages can be hidden by the user. Press Reset to make all messages visible again."
msgstr ""
"WinMerge 部分訊息可由使用者隱藏。\n"
"按下「重設」按鈕可使所有訊息再次可見。"
#. IDD_SELECT_FILES_OR_FOLDERS, IDC_RESET
-#: Merge.rc:2402 Merge.rc:3085
+#: Merge.rc:2412 Merge.rc:3095
msgid "Reset"
msgstr "重設"
#. IDD_GENERATE_PATCH
-#: Merge.rc:2408
+#: Merge.rc:2418
msgid "Patch Generator"
msgstr "補綴產生器"
#. IDD_GENERATE_PATCH, IDC_STATIC
-#: Merge.rc:2411
+#: Merge.rc:2421
msgid "File&1:"
msgstr "檔案1 (&1):"
#. IDD_GENERATE_PATCH, IDC_STATIC
-#: Merge.rc:2414
+#: Merge.rc:2424
msgid "File&2:"
msgstr "檔案2 (&2):"
#. IDD_GENERATE_PATCH, IDC_DIFF_SWAPFILES
-#: Merge.rc:2417
+#: Merge.rc:2427
msgid "&Swap"
msgstr "對調 (&S)"
#. IDD_DIRCMP_REPORT, IDC_REPORT_COPYCLIPBOARD
-#: Merge.rc:2418 Merge.rc:2690
+#: Merge.rc:2428 Merge.rc:2700
msgid "&Copy to clipboard"
msgstr "複製到剪貼簿 (&C)"
#. IDD_GENERATE_PATCH, IDC_DIFF_APPENDFILE
-#: Merge.rc:2419
+#: Merge.rc:2429
msgid "&Append to existing file"
msgstr "附加到現有檔案 (&A)"
#. IDD_GENERATE_PATCH, IDC_STATIC
-#: Merge.rc:2420
+#: Merge.rc:2430
msgid "&Result:"
msgstr "結果 (&R):"
#. IDD_GENERATE_PATCH, IDC_DIFF_BROWSE_RESULT
-#: Merge.rc:2422
+#: Merge.rc:2432
msgid "Bro&wse..."
msgstr "瀏覽 (&W)..."
#. IDD_GENERATE_PATCH, IDC_STATIC
-#: Merge.rc:2423
+#: Merge.rc:2433
msgid "&Format"
msgstr "格式 (&F)"
#. IDD_GENERATE_PATCH, IDC_STATIC
-#: Merge.rc:2424
+#: Merge.rc:2434
msgid "St&yle:"
msgstr "樣式 (&Y):"
#. IDD_GENERATE_PATCH, IDC_STATIC
-#: Merge.rc:2426
+#: Merge.rc:2436
msgid "&Context:"
msgstr "上下文 (&C):"
#. IDD_GENERATE_PATCH, IDC_DIFF_INCLCMDLINE
-#: Merge.rc:2428
+#: Merge.rc:2438
msgid "Inclu&de command line"
msgstr "包含命令列 (&D)"
#. IDD_GENERATE_PATCH, IDC_DIFF_OPENTOEDITOR
-#: Merge.rc:2429
+#: Merge.rc:2439
msgid "Open in e&xternal editor"
msgstr "開啟外部編輯器 (&X)"
#. IDD_DIRCOLS
-#: Merge.rc:2446
+#: Merge.rc:2456
msgid "Display Columns"
msgstr "顯示欄位"
#. IDD_DIRCOLS, IDC_UP
-#: Merge.rc:2450
+#: Merge.rc:2460
msgid "Move &Up"
msgstr "上移 (&U)"
#. IDD_DIRCOLS, IDC_DOWN
-#: Merge.rc:2451
+#: Merge.rc:2461
msgid "Move &Down"
msgstr "下移 (&D)"
#. IDD_DIRCOLS, IDC_COLDLG_ADDITIONAL_PROPERTIES
-#: Merge.rc:2453
+#: Merge.rc:2463
msgid "&Additional Properties"
msgstr "額外屬性 (&A)"
#. IDD_DIRADDITIONALPROPS
-#: Merge.rc:2461
+#: Merge.rc:2471
msgid "Additional Properties"
msgstr "額外屬性"
#. IDD_PLUGINS_SELECTPLUGIN
-#: Merge.rc:2475
+#: Merge.rc:2485
msgid "Select Plugin"
msgstr "選擇外掛程式"
#. IDD_PLUGINS_EDITPLUGIN, IDC_STATIC
-#: Merge.rc:2478 Merge.rc:3115
+#: Merge.rc:2488 Merge.rc:3125
msgid "Plugin &name:"
msgstr "外掛程式名稱 (&N):"
#. IDD_PLUGINS_SELECTPLUGIN, IDC_STATIC
-#: Merge.rc:2480
+#: Merge.rc:2490
msgid "&Target files:"
msgstr "目標檔案 (&T):"
#. IDD_PLUGINS_EDITPLUGIN, IDC_STATIC
-#: Merge.rc:2482 Merge.rc:3117
+#: Merge.rc:2492 Merge.rc:3127
msgid "Extensions list:"
msgstr "副檔名清單:"
#. IDD_PLUGINS_EDITPLUGIN, IDC_STATIC
-#: Merge.rc:2484 Merge.rc:3119
+#: Merge.rc:2494 Merge.rc:3129
msgid "Description:"
msgstr "描述:"
#. IDD_PLUGINS_EDITPLUGIN, IDC_STATIC
-#: Merge.rc:2486 Merge.rc:3121
+#: Merge.rc:2496 Merge.rc:3131
msgid "Default arguments:"
msgstr "預設引數:"
#. IDD_PLUGINS_SELECTPLUGIN, IDC_PLUGIN_ALLOW_ALL
-#: Merge.rc:2488
+#: Merge.rc:2498
msgid "Display all plugins (Ignore extension)"
msgstr "顯示所有外掛 (忽略副檔名)"
#. IDD_PLUGINS_SELECTPLUGIN, IDC_PLUGIN_OPEN_IN_SAME_FRAME_TYPE
-#: Merge.rc:2490
+#: Merge.rc:2500
msgid "&Open files in same window type after unpacking"
msgstr "解壓縮後以相同視窗類型開啟檔案 (&O)"
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_PIPELINE_STATIC
-#: Merge.rc:2492 Merge.rc:3129
+#: Merge.rc:2502 Merge.rc:3139
msgid "&Plugin pipeline:"
msgstr "外掛處理序 (&P):"
#. IDD_PLUGINS_SELECTPLUGIN, IDC_PLUGIN_ALIAS
-#: Merge.rc:2495
+#: Merge.rc:2505
msgid "&Alias..."
msgstr "別名 (&A)..."
#. IDD_DIRCOMP_PROGRESS, IDC_COMPARISON_STOP
-#: Merge.rc:2505
+#: Merge.rc:2515
msgid "Stop"
msgstr "停止"
#. IDD_DIRCOMP_PROGRESS, IDC_COMPARISON_PAUSE
-#: Merge.rc:2506
+#: Merge.rc:2516
msgid "Pause"
msgstr "暫停"
#. IDD_DIRCOMP_PROGRESS, IDC_COMPARISON_CONTINUE
-#: Merge.rc:2507
+#: Merge.rc:2517
msgid "Continue"
msgstr "繼續"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC
-#: Merge.rc:2509 Merge.rc:2973
+#: Merge.rc:2519 Merge.rc:2983
msgid "C&PU cores to use:"
msgstr "使用的 CPU 核心數量 (&N):"
#. IDD_DIRCOMP_PROGRESS, IDC_STATIC
-#: Merge.rc:2510
+#: Merge.rc:2520
msgid "Items total:"
msgstr "項目總數:"
#. IDD_DIRCOMP_PROGRESS, IDC_STATIC
-#: Merge.rc:2511
+#: Merge.rc:2521
msgid "Items compared:"
msgstr "比較過的項目:"
#. IDS_PREVIEWBAR_CLOSE
-#: Merge.rc:2526 Merge.rc:2846 Merge.rc:5328
+#: Merge.rc:2536 Merge.rc:2856 Merge.rc:5339
msgid "&Close"
msgstr "關閉 (&C)"
#. IDD_WMGOTO
-#: Merge.rc:2537
+#: Merge.rc:2547
msgid "Go to"
msgstr "移至"
#. IDD_WMGOTO, IDC_STATIC
-#: Merge.rc:2540
+#: Merge.rc:2550
msgid "G&o to:"
msgstr "移至 (&O):"
#. IDD_WMGOTO, IDC_STATIC
-#: Merge.rc:2543
+#: Merge.rc:2553
msgid "File"
msgstr "檔案"
#. IDD_WMGOTO, IDC_STATIC
-#: Merge.rc:2547
+#: Merge.rc:2557
msgid "Go to what"
msgstr "移至"
#. IDD_WMGOTO, IDC_WMGOTO_TOLINE
-#: Merge.rc:2548
+#: Merge.rc:2558
msgid "Li&ne"
msgstr "行 (&N)"
#. IDD_WMGOTO, IDC_WMGOTO_TODIFF
-#: Merge.rc:2549
+#: Merge.rc:2559
msgid "&Difference"
msgstr "差異區塊 (&D)"
#. IDD_WMGOTO, IDOK
-#: Merge.rc:2550
+#: Merge.rc:2560
msgid "&Go to"
msgstr "移至 (&G)"
#. IDS_PROJECT_ITEM_FILE_FILTER
-#: Merge.rc:2556 Merge.rc:4321
+#: Merge.rc:2566 Merge.rc:4331
msgid "File Filters"
msgstr "檔案篩選器"
#. IDD_FILTERS_FILEFILTERS, IDC_STATIC
-#: Merge.rc:2559
+#: Merge.rc:2569
msgid "&Mask / Filter Expression"
msgstr "遮罩/篩選條件 (&M)"
#. IDD_FILTERS_FILEFILTERS, IDC_STATIC
-#: Merge.rc:2562
+#: Merge.rc:2572
msgid "Preset &Filters"
msgstr "預設篩選器 (&F)"
#. IDD_FILTERS_FILEFILTERS, IDC_FILTERFILE_TEST_BTN
-#: Merge.rc:2564
+#: Merge.rc:2574
msgid "Test..."
msgstr "測試..."
#. IDD_FILTERS_FILEFILTERS, IDC_FILTERFILE_INSTALL
-#: Merge.rc:2565
+#: Merge.rc:2575
msgid "Install..."
msgstr "安裝..."
#. IDD_FILTERS_FILEFILTERS, IDC_FILTERFILE_NEWBTN
-#: Merge.rc:2566
+#: Merge.rc:2576
msgid "New..."
msgstr "新增..."
#. IDD_FILTERS_FILEFILTERS, IDC_FILTERFILE_EDITBTN
-#: Merge.rc:2567
+#: Merge.rc:2577
msgid "Edit..."
msgstr "編輯..."
#. IDD_FILTERS_FILEFILTERS, IDC_FILTERFILE_DELETEBTN
-#: Merge.rc:2568
+#: Merge.rc:2578
msgid "Delete..."
msgstr "刪除..."
#. IDD_FILTERS_CONDITION
-#: Merge.rc:2573
+#: Merge.rc:2583
msgid "Filter Condition"
msgstr "篩選條件"
#. IDD_FILTERS_CONDITION, IDC_STATIC
-#: Merge.rc:2576
+#: Merge.rc:2586
msgid "&Left-hand side:"
msgstr "左側 (&L):"
#. IDD_FILTERS_CONDITION, IDC_STATIC
-#: Merge.rc:2578
+#: Merge.rc:2588
msgid "&Operator:"
msgstr "運算子 (&O):"
#. IDD_FILTERS_CONDITION, IDC_STATIC
-#: Merge.rc:2580
+#: Merge.rc:2590
msgid "&Right-hand side:"
msgstr "右側 (&R):"
#. IDD_FILTERS_CONDITION, IDC_STATIC
-#: Merge.rc:2586
+#: Merge.rc:2596
msgid "Expression:"
msgstr "表達式:"
#. IDD_COMPARISON_RESULT_FILTER
-#: Merge.rc:2595
+#: Merge.rc:2605
msgid "Filter by Comparison Result"
msgstr ""
#. IDD_COMPARISON_RESULT_FILTER, IDC_RADIO_INCLUDE
-#: Merge.rc:2598
+#: Merge.rc:2608
msgid "&Include"
msgstr ""
#. IDD_COMPARISON_RESULT_FILTER, IDC_RADIO_EXCLUDE
-#: Merge.rc:2599
+#: Merge.rc:2609
msgid "&Exclude"
msgstr ""
#. IDD_COMPARISON_RESULT_FILTER, IDC_STATIC
-#: Merge.rc:2600
+#: Merge.rc:2610
msgid "Comparison Results"
msgstr ""
#. IDS_IDENTICAL
-#: Merge.rc:2601 Merge.rc:2733 Merge.rc:2794 Merge.rc:4698
+#: Merge.rc:2611 Merge.rc:2743 Merge.rc:2804 Merge.rc:4708
msgid "Identical"
msgstr "完全相同"
#. IDS_DIFFERENT
-#: Merge.rc:2602 Merge.rc:2714 Merge.rc:2755 Merge.rc:4708
+#: Merge.rc:2612 Merge.rc:2724 Merge.rc:2765 Merge.rc:4718
msgid "Different"
msgstr "不同"
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_LEFT_ONLY
-#: Merge.rc:2603
+#: Merge.rc:2613
msgid "Left only"
msgstr ""
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_RIGHT_ONLY
-#: Merge.rc:2604
+#: Merge.rc:2614
msgid "Right only"
msgstr ""
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_SKIPPED
-#: Merge.rc:2605
+#: Merge.rc:2615
msgid "Skipped"
msgstr ""
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_MIDDLE_ONLY
-#: Merge.rc:2606
+#: Merge.rc:2616
msgid "Middle only"
msgstr ""
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_LEFT_ONLY_DIFFERENT
-#: Merge.rc:2607
+#: Merge.rc:2617
msgid "Left only (different)"
msgstr ""
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_MIDDLE_ONLY_DIFFERENT
-#: Merge.rc:2608
+#: Merge.rc:2618
msgid "Middle only (different)"
msgstr ""
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_RIGHT_ONLY_DIFFERENT
-#: Merge.rc:2609
+#: Merge.rc:2619
msgid "Right only (different)"
msgstr ""
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_LEFT_ONLY_MISSING
-#: Merge.rc:2610
+#: Merge.rc:2620
msgid "Left only (missing)"
msgstr ""
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_MIDDLE_ONLY_MISSING
-#: Merge.rc:2611
+#: Merge.rc:2621
msgid "Middle only (missing)"
msgstr ""
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_RIGHT_ONLY_MISSING
-#: Merge.rc:2612
+#: Merge.rc:2622
msgid "Right only (missing)"
msgstr ""
#. IDS_OPTIONSPG_CODEPAGE
-#: Merge.rc:2619 Merge.rc:2811 Merge.rc:4213
+#: Merge.rc:2629 Merge.rc:2821 Merge.rc:4223
msgid "Codepage"
msgstr "字碼頁"
#. IDD_PROPPAGE_CODEPAGE, IDC_STATIC
-#: Merge.rc:2622
+#: Merge.rc:2632
msgid "Default Codepage"
msgstr "預設字碼頁"
#. IDD_PROPPAGE_CODEPAGE, IDC_STATIC
-#: Merge.rc:2623
+#: Merge.rc:2633
msgid "Select the default codepage for non-Unicode files:"
msgstr "選取非 Unicode 檔案的預設字碼頁:"
#. IDD_PROPPAGE_CODEPAGE, IDC_CP_SYSTEM
-#: Merge.rc:2624
+#: Merge.rc:2634
msgid "System codepage"
msgstr "系統用的字碼頁"
#. IDD_PROPPAGE_CODEPAGE, IDC_CP_UI
-#: Merge.rc:2625
+#: Merge.rc:2635
msgid "According to WinMerge User Interface"
msgstr "WinMerge 使用者介面用的字碼頁"
#. IDD_PROPPAGE_CODEPAGE, IDC_CP_CUSTOM
-#: Merge.rc:2626
+#: Merge.rc:2636
msgid "Custom codepage:"
msgstr "自訂字碼頁:"
#. IDD_PROPPAGE_CODEPAGE, IDC_DETECT_CODEPAGE
-#: Merge.rc:2628
+#: Merge.rc:2638
msgid ""
"Detect codepage for: .html, .rc, .xml\n"
"Restart required."
@@ -4094,7 +4105,7 @@ msgstr ""
"需要重新啟動程式。"
#. IDD_PROPPAGE_CODEPAGE, IDC_DETECT_CODEPAGE2
-#: Merge.rc:2630
+#: Merge.rc:2640
msgid ""
"Detect codepage for files with mlang.dll\n"
"Restart required."
@@ -4103,769 +4114,769 @@ msgstr ""
"需要重新啟動程式。"
#. IDS_OPTIONSPG_ARCHIVE
-#: Merge.rc:2638 Merge.rc:4214
+#: Merge.rc:2648 Merge.rc:4224
msgid "Archive Support"
msgstr "支援壓縮"
#. IDD_PROPPAGE_ARCHIVE, IDC_ARCHIVE_ENABLE
-#: Merge.rc:2641
+#: Merge.rc:2651
msgid "&Enable archive file support"
msgstr "壓縮檔支援 (&E)"
#. IDD_PROPPAGE_ARCHIVE, IDC_ARCHIVE_DETECTTYPE
-#: Merge.rc:2642
+#: Merge.rc:2652
msgid "&Detect archive type from file signature"
msgstr "偵測檔首資訊以決定壓縮檔類型 (&D)"
#. IDD_PROPPAGE_PROJECT, IDC_STATIC
-#: Merge.rc:2651
+#: Merge.rc:2661
msgid "Items saved to or restored from the project file:"
msgstr "已儲存至或從專案檔案還原的項目:"
#. IDD_SAVECLOSING
-#: Merge.rc:2658
+#: Merge.rc:2668
msgid "Save Modified Files?"
msgstr "儲存修改的檔案?"
#. IDD_SAVECLOSING, IDC_SAVECLOSING_LEFTFRAME
-#: Merge.rc:2661
+#: Merge.rc:2671
msgid "Left side file"
msgstr "左側檔案"
#. IDD_SAVECLOSING, IDC_SAVECLOSING_SAVELEFT
-#: Merge.rc:2663
+#: Merge.rc:2673
msgid "&Save changes"
msgstr "儲存變更 (&S)"
#. IDD_SAVECLOSING, IDC_SAVECLOSING_DISCARDLEFT
-#: Merge.rc:2664
+#: Merge.rc:2674
msgid "&Discard changes"
msgstr "放棄變更 (&D)"
#. IDD_SAVECLOSING, IDC_SAVECLOSING_MIDDLEFRAME
-#: Merge.rc:2665
+#: Merge.rc:2675
msgid "Middle side file"
msgstr "中間檔案"
#. IDD_SAVECLOSING, IDC_SAVECLOSING_SAVEMIDDLE
-#: Merge.rc:2667
+#: Merge.rc:2677
msgid "Sa&ve changes"
msgstr "儲存變更 (&V)"
#. IDD_SAVECLOSING, IDC_SAVECLOSING_DISCARDMIDDLE
-#: Merge.rc:2668
+#: Merge.rc:2678
msgid "Discard c&hanges"
msgstr "放棄變更 (&H)"
#. IDD_SAVECLOSING, IDC_SAVECLOSING_RIGHTFRAME
-#: Merge.rc:2669
+#: Merge.rc:2679
msgid "Right side file"
msgstr "右側檔案"
#. IDD_SAVECLOSING, IDC_SAVECLOSING_SAVERIGHT
-#: Merge.rc:2671
+#: Merge.rc:2681
msgid "S&ave changes"
msgstr "儲存變更 (&A)"
#. IDD_SAVECLOSING, IDC_SAVECLOSING_DISCARDRIGHT
-#: Merge.rc:2672
+#: Merge.rc:2682
msgid "Dis&card changes"
msgstr "放棄變更 (&C)"
#. IDD_SAVECLOSING, IDC_SAVECLOSING_DISCARDALL
-#: Merge.rc:2673
+#: Merge.rc:2683
msgid "Disca&rd All"
msgstr "放棄全部 (&R)"
#. IDD_DIRCMP_REPORT
-#: Merge.rc:2680
+#: Merge.rc:2690
msgid "Folder Compare Report"
msgstr "比較目錄後的報告"
#. IDD_DIRCMP_REPORT, IDC_STATIC
-#: Merge.rc:2683
+#: Merge.rc:2693
msgid "Report &file:"
msgstr "報告檔 (&F):"
#. IDD_DIRCMP_REPORT, IDC_STATIC
-#: Merge.rc:2686
+#: Merge.rc:2696
msgid "&Style:"
msgstr "樣式 (&S):"
#. IDD_DIRCMP_REPORT, IDC_REPORT_INCLUDEFILECMPREPORT
-#: Merge.rc:2688
+#: Merge.rc:2698
msgid "&Include file compare report"
msgstr "包括檔案比較報告 (&I)"
#. IDD_FILTERS_FILEFILTERS_SHARED
-#: Merge.rc:2697
+#: Merge.rc:2707
msgid "Shared or Private Filter"
msgstr "共用或個人篩選器"
#. IDD_FILTERS_FILEFILTERS_SHARED, IDC_STATIC
-#: Merge.rc:2700
+#: Merge.rc:2710
msgid "What type of filter do you want?"
msgstr "您要建立哪種篩選器?"
#. IDD_FILTERS_FILEFILTERS_SHARED, IDC_SHARED
-#: Merge.rc:2701
+#: Merge.rc:2711
msgid "Shared Filter (for all users)"
msgstr "共用篩選器 (適用所有使用者)"
#. IDD_FILTERS_FILEFILTERS_SHARED, IDC_PRIVATE
-#: Merge.rc:2702
+#: Merge.rc:2712
msgid "Private Filter (current user only)"
msgstr "個人篩選器(僅適用現在使用者)"
#. IDD_COMPARE_STATISTICS3
-#: Merge.rc:2709 Merge.rc:2750
+#: Merge.rc:2719 Merge.rc:2760
msgid "Compare Statistics"
msgstr "比較後的統計"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2712 Merge.rc:2753
+#: Merge.rc:2722 Merge.rc:2763
msgid "Folders:"
msgstr "資料夾:"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2713 Merge.rc:2754
+#: Merge.rc:2723 Merge.rc:2764
msgid "Files:"
msgstr "檔案:"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2719 Merge.rc:2738 Merge.rc:2760 Merge.rc:2799
+#: Merge.rc:2729 Merge.rc:2748 Merge.rc:2770 Merge.rc:2809
msgid "Binary:"
msgstr "二進制:"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2722 Merge.rc:2763
+#: Merge.rc:2732 Merge.rc:2773
msgid "Unique"
msgstr "獨有"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2723 Merge.rc:2764
+#: Merge.rc:2733 Merge.rc:2774
msgid "Left:"
msgstr "左側:"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2728 Merge.rc:2774
+#: Merge.rc:2738 Merge.rc:2784
msgid "Right:"
msgstr "右側:"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2742 Merge.rc:2803
+#: Merge.rc:2752 Merge.rc:2813
msgid "Total:"
msgstr "總計:"
#. IDD_COMPARE_STATISTICS3, IDOK
-#: Merge.rc:2745 Merge.rc:2806
+#: Merge.rc:2755 Merge.rc:2816
msgid "Close"
msgstr "關閉"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2769
+#: Merge.rc:2779
msgid "Middle:"
msgstr "中間:"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2779
+#: Merge.rc:2789
msgid "Missing Left:"
msgstr "遺失左側:"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2784
+#: Merge.rc:2794
msgid "Missing Middle:"
msgstr "遺失中間:"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2789
+#: Merge.rc:2799
msgid "Missing Right:"
msgstr "遺失右側:"
#. IDD_LOAD_SAVE_CODEPAGE, IDC_AFFECTS_GROUP
-#: Merge.rc:2814
+#: Merge.rc:2824
msgid "Affects"
msgstr "影響"
#. IDD_LOAD_SAVE_CODEPAGE, IDC_RIGHT_FILES_LABEL
-#: Merge.rc:2816 Merge.rc:2818 Merge.rc:2820
+#: Merge.rc:2826 Merge.rc:2828 Merge.rc:2830
msgid "(Affects)"
msgstr "(影響)"
#. IDD_LOAD_SAVE_CODEPAGE, IDC_LOADING_GROUP
-#: Merge.rc:2821
+#: Merge.rc:2831
msgid "Select Codepage for"
msgstr "選取以下項目的字碼頁"
#. IDD_LOAD_SAVE_CODEPAGE, IDC_LOAD_FILES_LABEL
-#: Merge.rc:2822
+#: Merge.rc:2832
msgid "&File Loading:"
msgstr "要載入的檔案 (&F):"
#. IDD_LOAD_SAVE_CODEPAGE, IDC_SAVE_FILES_LABEL
-#: Merge.rc:2824
+#: Merge.rc:2834
msgid "File &Saving:"
msgstr "要儲存的檔案 (&S):"
#. IDD_LOAD_SAVE_CODEPAGE, IDC_LOAD_SAVE_SAME_CODEPAGE
-#: Merge.rc:2827
+#: Merge.rc:2837
msgid "&Use same codepage for both"
msgstr "兩檔都用相同的字碼頁 (&U)"
#. IDS_MESSAGEBOX_CANCEL
-#: Merge.rc:2830 Merge.rc:4172
+#: Merge.rc:2840 Merge.rc:4182
msgid "&Cancel"
msgstr "取消 (&C)"
#. IDD_FILTERS_FILEFILTERS_TEST
-#: Merge.rc:2835
+#: Merge.rc:2845
msgid "Test Filter"
msgstr "測試篩選器"
#. IDD_FILTERS_FILEFILTERS_TEST, IDC_HEADER
-#: Merge.rc:2838
+#: Merge.rc:2848
msgid "Testing filter:"
msgstr "測試篩選器:"
#. IDD_FILTERS_FILEFILTERS_TEST, IDC_PROMPT_LABEL
-#: Merge.rc:2840
+#: Merge.rc:2850
msgid "&Enter text to test:"
msgstr "輸入文字以做測試 (&E):"
#. IDD_FILTERS_FILEFILTERS_TEST, IDC_IS_DIRECTORY
-#: Merge.rc:2842
+#: Merge.rc:2852
msgid "&Folder Name"
msgstr "資料夾名稱 (&F)"
#. IDD_FILTERS_FILEFILTERS_TEST, IDC_STATIC
-#: Merge.rc:2843
+#: Merge.rc:2853
msgid "Result:"
msgstr "結果:"
#. IDD_FILTERS_FILEFILTERS_TEST, IDC_TEST_BTN
-#: Merge.rc:2845
+#: Merge.rc:2855
msgid "&Test"
msgstr "測試 (&T)"
#. IDS_OPTIONSPG_TABLECOMPARE
-#: Merge.rc:2851 Merge.rc:2990 Merge.rc:4228
+#: Merge.rc:2861 Merge.rc:3000 Merge.rc:4238
msgid "Table"
msgstr "表格"
#. IDD_OPEN_TABLE, IDC_STATIC
-#: Merge.rc:2854
+#: Merge.rc:2864
msgid "File type"
msgstr "檔案類型"
#. IDD_OPEN_TABLE, IDC_COMPARETABLE_CSV
-#: Merge.rc:2855
+#: Merge.rc:2865
msgid "&CSV"
msgstr "&CSV"
#. IDD_OPEN_TABLE, IDC_COMPARETABLE_TSV
-#: Merge.rc:2856
+#: Merge.rc:2866
msgid "&TSV"
msgstr "&TSV"
#. IDD_OPEN_TABLE, IDC_COMPARETABLE_DSV
-#: Merge.rc:2857
+#: Merge.rc:2867
msgid "Custom &Delimiter-Separated Values"
msgstr "被分隔符號分隔的自訂數值 (&E)"
#. IDD_PROPPAGE_COMPARE_TABLE, IDC_STATIC
-#: Merge.rc:2859 Merge.rc:2861 Merge.rc:2996 Merge.rc:3004
+#: Merge.rc:2869 Merge.rc:2871 Merge.rc:3006 Merge.rc:3014
msgid "D&elimiter character:"
msgstr "分隔字元 (&E):"
#. IDD_PROPPAGE_COMPARE_TABLE, IDC_COMPARETABLE_ALLOWNEWLINE
-#: Merge.rc:2863 Merge.rc:3006
+#: Merge.rc:2873 Merge.rc:3016
msgid "&Allow newlines in quotes"
msgstr "允許引號中的新行字元 (&A)"
#. IDD_PROPPAGE_COMPARE_TABLE, IDC_STATIC
-#: Merge.rc:2865 Merge.rc:3008
+#: Merge.rc:2875 Merge.rc:3018
msgid "&Quote character:"
msgstr "引號字元 (&Q):"
#. IDS_OPTIONSPG_BACKUPS
-#: Merge.rc:2873 Merge.rc:4216
+#: Merge.rc:2883 Merge.rc:4226
msgid "Backup Files"
msgstr "備份檔案"
#. IDD_PROPPAGE_BACKUPS, IDC_STATIC
-#: Merge.rc:2876
+#: Merge.rc:2886
msgid "Create backup files for:"
msgstr "產生備份檔於:"
#. IDD_PROPPAGE_BACKUPS, IDC_BACKUP_FOLDERCMP
-#: Merge.rc:2877
+#: Merge.rc:2887
msgid "&Folder compare"
msgstr "比較資料夾時 (&F)"
#. IDD_PROPPAGE_BACKUPS, IDC_BACKUP_FILECMP
-#: Merge.rc:2878
+#: Merge.rc:2888
msgid "Fil&e compare"
msgstr "比較檔案時 (&E)"
#. IDD_PROPPAGE_BACKUPS, IDC_STATIC
-#: Merge.rc:2879
+#: Merge.rc:2889
msgid "Create backup files in:"
msgstr "產生備份檔至:"
#. IDD_PROPPAGE_BACKUPS, IDC_BACKUP_ORIGFOLD
-#: Merge.rc:2880
+#: Merge.rc:2890
msgid "&Original file's folder"
msgstr "原始檔的資料夾 (&O)"
#. IDD_PROPPAGE_BACKUPS, IDC_BACKUP_GLOBALFOLD
-#: Merge.rc:2881
+#: Merge.rc:2891
msgid "&Global backup folder:"
msgstr "總的備份資料夾 (&G):"
#. IDD_PROPPAGE_BACKUPS, IDC_STATIC
-#: Merge.rc:2884
+#: Merge.rc:2894
msgid "Backup filename:"
msgstr "備份檔檔名:"
#. IDD_PROPPAGE_BACKUPS, IDC_BACKUP_APPEND_BAK
-#: Merge.rc:2885
+#: Merge.rc:2895
msgid "&Append .bak extension"
msgstr "附上 .bak 副檔名 (&A)"
#. IDD_PROPPAGE_BACKUPS, IDC_BACKUP_APPEND_TIME
-#: Merge.rc:2886
+#: Merge.rc:2896
msgid "A&ppend timestamp"
msgstr "附上時間戳記 (&P)"
#. IDS_CONFIRM_COPY_CAPTION
-#: Merge.rc:2892 Merge.rc:4565
+#: Merge.rc:2902 Merge.rc:4575
msgid "Confirm Copy"
msgstr "確認複製"
#. IDD_CONFIRM_COPY, IDC_FLDCONFIRM_QUERY
-#: Merge.rc:2896
+#: Merge.rc:2906
msgid "Are you sure you want to copy XXX items?"
msgstr "確定要複製 XXX 項目?"
#. IDD_CONFIRM_COPY, IDC_FLDCONFIRM_FROM_TEXT
-#: Merge.rc:2897
+#: Merge.rc:2907
msgid "From left"
msgstr "從左側"
#. IDD_CONFIRM_COPY, IDC_FLDCONFIRM_TO_TEXT
-#: Merge.rc:2899
+#: Merge.rc:2909
msgid "To right"
msgstr "到右側"
#. IDS_MESSAGEBOX_DONT_ASK_AGAIN
-#: Merge.rc:2901 Merge.rc:4191
+#: Merge.rc:2911 Merge.rc:4201
msgid "Don't ask this &question again."
msgstr "不要再詢問此問題 (&Q)"
#. IDD_CONFIRM_COPY, IDYES
-#: Merge.rc:2903
+#: Merge.rc:2913
msgid "Yes"
msgstr "是"
#. IDD_CONFIRM_COPY, IDNO
-#: Merge.rc:2904
+#: Merge.rc:2914
msgid "No"
msgstr "否"
#. IDS_PROJECT_ITEM_PLUGIN
-#: Merge.rc:2909 Merge.rc:4323
+#: Merge.rc:2919 Merge.rc:4333
msgid "Plugins"
msgstr "外掛程式"
#. IDD_PLUGINS_LIST, IDC_PLUGINS_ENABLE
-#: Merge.rc:2912
+#: Merge.rc:2922
msgid "&Enable plugins"
msgstr "啟用外掛程式 (&E)"
#. IDD_PLUGINS_EDITPLUGIN, IDC_STATIC
-#: Merge.rc:2913 Merge.rc:3113
+#: Merge.rc:2923 Merge.rc:3123
msgid "Plugin &type:"
msgstr "外掛類型 (&T):"
#. IDD_PLUGINS_LIST, IDC_STATIC
-#: Merge.rc:2916
+#: Merge.rc:2926
msgid "File filters:"
msgstr "檔案篩選器:"
#. IDD_PLUGINS_LIST, IDC_STATIC
-#: Merge.rc:2918
+#: Merge.rc:2928
msgid "&Plugin arguments:"
msgstr "外掛程式參數 (&P):"
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_AUTOMATIC
-#: Merge.rc:2920 Merge.rc:3134
+#: Merge.rc:2930 Merge.rc:3144
msgid "Enable &automatic unpacking/prediffing"
msgstr "啟用外掛的自動解壓縮/預先差異功能 (&A)"
#. IDS_OPTIONSPG_SHELL
-#: Merge.rc:2934 Merge.rc:4217
+#: Merge.rc:2944 Merge.rc:4227
msgid "Shell Integration"
msgstr "併入檔案總管介面"
#. IDD_PROPPAGE_SHELL, IDC_STATIC
-#: Merge.rc:2937
+#: Merge.rc:2947
msgid "Explorer"
msgstr "檔案總管"
#. IDD_PROPPAGE_SHELL, IDC_EXPLORER_CONTEXT
-#: Merge.rc:2938
+#: Merge.rc:2948
msgid "&Add to context menu"
msgstr "加到右鍵選單 (&A)"
#. IDD_PROPPAGE_SHELL, IDC_EXPLORER_ADVANCED
-#: Merge.rc:2939
+#: Merge.rc:2949
msgid "E&nable advanced menu"
msgstr "啟用進階選單 (&N)"
#. IDD_PROPPAGE_SHELL, IDC_EXPLORER_COMPARE_AS
-#: Merge.rc:2940
+#: Merge.rc:2950
msgid "Enable &Compare As menu"
msgstr "啟用「作為比較」選單 (&C)"
#. IDD_PROPPAGE_SHELL, IDC_REGISTER_SHELLEXTENSION
-#: Merge.rc:2941
+#: Merge.rc:2951
msgid "&Register Shell Extension"
msgstr "註冊右鍵選單 (&R)"
#. IDD_PROPPAGE_SHELL, IDC_UNREGISTER_SHELLEXTENSION
-#: Merge.rc:2942
+#: Merge.rc:2952
msgid "&Unregister Shell Extension"
msgstr "註銷右鍵選單 (&U)"
#. IDD_PROPPAGE_SHELL, IDC_REGISTER_SHELLEXTENSION_PERUSER
-#: Merge.rc:2943
+#: Merge.rc:2953
msgid "Register Shell Extension for Current User &Only"
msgstr "僅為目前使用者註冊右鍵選單 (&O)"
#. IDD_PROPPAGE_SHELL, IDC_UNREGISTER_SHELLEXTENSION_PERUSER
-#: Merge.rc:2944
+#: Merge.rc:2954
msgid "Unregister Shell Extension for Current User On&ly"
msgstr "僅為目前使用者取消註冊右鍵選單 (&L)"
#. IDD_PROPPAGE_SHELL, IDC_REGISTER_WINMERGECONTEXTMENU
-#: Merge.rc:2945
+#: Merge.rc:2955
msgid "Register Shell Extension for &Windows 11"
msgstr "為 &Windows 11 及以上版本註冊右鍵選單"
#. IDD_PROPPAGE_SHELL, IDC_UNREGISTER_WINMERGECONTEXTMENU
-#: Merge.rc:2946
+#: Merge.rc:2956
msgid "Unregister Shell Extension for W&indows 11"
msgstr "為 &Windows 11 及以上版本取消註冊右鍵選單"
#. IDD_PROPPAGE_SHELL, IDC_STATIC
-#: Merge.rc:2947
+#: Merge.rc:2957
msgid "Jump List"
msgstr "跳轉列表"
#. IDD_PROPPAGE_SHELL, IDC_CLEAR_ALL_RECENT_ITEMS
-#: Merge.rc:2949
+#: Merge.rc:2959
msgid "Clear all recent items"
msgstr "清除所有最近的項目"
#. IDS_OPTIONSPG_FOLDERCOMPARE
-#: Merge.rc:2954 Merge.rc:4225
+#: Merge.rc:2964 Merge.rc:4235
msgctxt "Options dialog|Categories"
msgid "Folder"
msgstr "資料夾"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC
-#: Merge.rc:2957
+#: Merge.rc:2967
msgid "&Compare method:"
msgstr "檔案比較方式 (&C):"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_COMPARE_STOPFIRST
-#: Merge.rc:2959
+#: Merge.rc:2969
msgid "S&top after first difference"
msgstr "在首個差異停止 (&T)"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_IGNORE_SMALLTIMEDIFF
-#: Merge.rc:2961
+#: Merge.rc:2971
msgid "Ign&ore time differences less than 3 seconds"
msgstr "如兩檔案之修改時間間隔少於三秒,則忽略此差異 (&O)"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC
-#: Merge.rc:2964
+#: Merge.rc:2974
msgid "Expand subfolders &after comparison:"
msgstr "展開子資料夾並進行比較:"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_COMPARE_WALKSUBDIRS
-#: Merge.rc:2966
+#: Merge.rc:2976
msgid "Include &unique subfolders contents"
msgstr "包括獨一子資料夾 (&U)"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_IGNORE_REPARSEPOINTS
-#: Merge.rc:2968
+#: Merge.rc:2978
msgid "Ignore &reparse points"
msgstr "忽略重新分析點 (&R)"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC
-#: Merge.rc:2969
+#: Merge.rc:2979
msgid "Switch to &quick compare when size exceeds (MB):"
msgstr "當大小超過以下MB限制時,切換為快速比較 (&Q):"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC
-#: Merge.rc:2971
+#: Merge.rc:2981
msgid "Switch to &binary compare when size exceeds (MB):"
msgstr "當大小超過以下MB限制時,切換為二進制比較 (&B):"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC
-#: Merge.rc:2975
+#: Merge.rc:2985
msgid "Additional comparison condi&tions:"
msgstr "額外的比較條件 (&t):"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC
-#: Merge.rc:2978
+#: Merge.rc:2988
msgid "&Rename/move detection:"
msgstr "重新命名/移動 偵測: (&R)"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC
-#: Merge.rc:2980
+#: Merge.rc:2990
msgid "Rename/move detection &keys:"
msgstr "重新命名/移動 偵測鍵: (&K)"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC
-#: Merge.rc:2983
+#: Merge.rc:2993
msgid "M&erge renames and moves:"
msgstr ""
#. IDD_PROPPAGE_COMPARE_TABLE, IDC_STATIC
-#: Merge.rc:2994 Merge.rc:2999 Merge.rc:3002
+#: Merge.rc:3004 Merge.rc:3009 Merge.rc:3012
msgid "File patterns:"
msgstr "檔案模式:"
#. IDD_PROPPAGE_COMPARE_TABLE, IDC_STATIC
-#: Merge.rc:3001
+#: Merge.rc:3011
msgid "Custom Delimiter-Separated Values"
msgstr "被分隔符號分隔的自訂數值"
#. IDS_OPTIONSPG_BINARYCOMPARE
-#: Merge.rc:3015 Merge.rc:4227
+#: Merge.rc:3025 Merge.rc:4237
msgctxt "Options dialog|Categories"
msgid "Binary"
msgstr "二進制"
#. IDD_PROPPAGE_COMPARE_BINARY, IDC_STATIC
-#: Merge.rc:3018
+#: Merge.rc:3028
msgid "Binary file &patterns:"
msgstr "二進制檔案副檔名 (&P)"
#. IDD_PROPPAGE_COMPARE_BINARY, IDC_STATIC
-#: Merge.rc:3020
+#: Merge.rc:3030
msgid "Frhed settings"
msgstr "Frhed 設定"
#. IDD_PROPPAGE_COMPARE_BINARY, IDC_COMPAREBINARY_VIEWSETTINGS
-#: Merge.rc:3021
+#: Merge.rc:3031
msgid "View &Settings..."
msgstr "顯示設定 (&S)..."
#. IDD_PROPPAGE_COMPARE_BINARY, IDC_COMPAREBINARY_BINARYMODE
-#: Merge.rc:3022
+#: Merge.rc:3032
msgid "&Binary Mode..."
msgstr "二進制模式 (&B)..."
#. IDD_PROPPAGE_COMPARE_BINARY, IDC_COMPAREBINARY_CHARACTERSET
-#: Merge.rc:3023
+#: Merge.rc:3033
msgid "&Character Set..."
msgstr "字元設定 (&C)..."
#. IDS_PRPCAT_IMAGE
-#: Merge.rc:3029 Merge.rc:4226 Merge.rc:4665
+#: Merge.rc:3039 Merge.rc:4236 Merge.rc:4675
msgid "Image"
msgstr "圖片"
#. IDD_PROPPAGE_COMPARE_IMAGE, IDC_STATIC
-#: Merge.rc:3032
+#: Merge.rc:3042
msgid "Image file &patterns:"
msgstr "圖片檔案副檔名 (&P)"
#. IDD_PROPPAGE_COMPARE_IMAGE, IDC_ENABLE_IMGCMP_IN_DIRCMP
-#: Merge.rc:3034
+#: Merge.rc:3044
msgid "&Enable image compare in folder compare"
msgstr "在資料夾比較中啟用圖片比較 (&E)"
#. IDD_PROPPAGE_COMPARE_IMAGE, IDC_STATIC
-#: Merge.rc:3036
+#: Merge.rc:3046
msgid "OCR result:"
msgstr "OCR 結果:"
#. IDS_OPTIONSPG_WEBPAGECOMPARE
-#: Merge.rc:3043 Merge.rc:4229
+#: Merge.rc:3053 Merge.rc:4239
msgid "Webpage"
msgstr "網頁"
#. IDD_PROPPAGE_COMPARE_WEBPAGE, IDC_STATIC
-#: Merge.rc:3046
+#: Merge.rc:3056
msgid "URL pattern to &include (Regular expression):"
msgstr "要包含的 URL 模式(正則表示式) (&I):"
#. IDD_PROPPAGE_COMPARE_WEBPAGE, IDC_STATIC
-#: Merge.rc:3048
+#: Merge.rc:3058
msgid "URL pattern to &exclude (Regular expression):"
msgstr "要排除的 URL 模式(正則表示式) (&E):"
#. IDD_PROPPAGE_COMPARE_WEBPAGE, IDC_STATIC
-#: Merge.rc:3050
+#: Merge.rc:3060
msgid "&User data folder location:"
msgstr "使用者資料夾位置 (&U):"
#. IDD_PROPPAGE_COMPARE_WEBPAGE, IDC_COMPAREWEBPAGE_USERDATAFOLDER_PERPANE
-#: Merge.rc:3052
+#: Merge.rc:3062
msgid "&Separate user data folders for each pane"
msgstr "每個面板使用單獨的使用者資料夾 (&S)"
#. IDD_ENCODINGERROR, IDC_HEXVIEW
-#: Merge.rc:3065
+#: Merge.rc:3075
msgid "&Hex View"
msgstr "二進制顯示 (&H)"
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3110
+#: Merge.rc:3120
msgid "Edit Plugin"
msgstr "編輯外掛"
#. IDD_PLUGINS_EDITPLUGIN, IDC_STATIC
-#: Merge.rc:3123
+#: Merge.rc:3133
msgid "&Category:"
msgstr "類別 (&C):"
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_MENUCAPTION_STATIC
-#: Merge.rc:3125
+#: Merge.rc:3135
msgid "&Menu caption:"
msgstr "選單標題 (&M):"
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_WINDOWTYPE_STATIC
-#: Merge.rc:3127
+#: Merge.rc:3137
msgid "&Window type:"
msgstr "視窗類型 (&W):"
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_UNPACKEDFILEEXTENSION_STATIC
-#: Merge.rc:3132
+#: Merge.rc:3142
msgid "&Unpacked file extension:"
msgstr "解壓縮後的檔案副檔名 (&U):"
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_ARGUMENTSREQUIRED
-#: Merge.rc:3136
+#: Merge.rc:3146
msgid "&Require arguments"
msgstr "需要參數 (&R)"
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_GENERATESCRIPT
-#: Merge.rc:3137
+#: Merge.rc:3147
msgid "&Generate editor script"
msgstr "產生編輯器腳本 (&G)"
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_COMMAND_LINE_STATIC
-#: Merge.rc:3140
+#: Merge.rc:3150
msgid "Command &line:"
msgstr "命令列 (&L):"
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_SCRIPT_FILEEXTENSION_STATIC
-#: Merge.rc:3143
+#: Merge.rc:3153
msgid "&Script file extension:"
msgstr "腳本檔案副檔名 (&C):"
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_SCRIPT_BODY_STATIC
-#: Merge.rc:3145
+#: Merge.rc:3155
msgid "Script &body:"
msgstr "腳本主體 (&B):"
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3154
+#: Merge.rc:3164
msgid "Font"
msgstr "字型"
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3157
+#: Merge.rc:3167
msgid "&Font:"
msgstr "字型: (&F)"
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3163
+#: Merge.rc:3173
msgid "Font st&yle:"
msgstr "字型樣式 (&Y):"
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3169
+#: Merge.rc:3179
msgid "&Size:"
msgstr "大小 (&S):"
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3175
+#: Merge.rc:3185
msgid "Effects"
msgstr "影響"
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3176
+#: Merge.rc:3186
msgid "Stri&keout"
msgstr "刪除 (&k)"
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3177
+#: Merge.rc:3187
msgid "&Underline"
msgstr "加底線 (&U)"
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3179
+#: Merge.rc:3189
msgid "&Color:"
msgstr "色彩 (&C):"
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3184
+#: Merge.rc:3194
msgid "Sample"
msgstr "範例"
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3185
+#: Merge.rc:3195
msgid "AaBbYyZz"
msgstr "AaBbYyZz"
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3189
+#: Merge.rc:3199
msgid "Sc&ript:"
msgstr "隨譯即行碼 (&S):"
#. IDD_PLUGINS_EDITPLUGIN, IDC_MANAGE_LINK
-#: Merge.rc:3194
+#: Merge.rc:3204
msgid "Show more fonts"
msgstr "顯示更多字型"
#. ID_INDICATOR_EXT
-#: Merge.rc:4118
+#: Merge.rc:4128
msgid "EXT"
msgstr "EXT"
#. ID_INDICATOR_CAPS
-#: Merge.rc:4119
+#: Merge.rc:4129
msgid "CAP"
msgstr "CAP"
#. ID_INDICATOR_NUM
-#: Merge.rc:4120
+#: Merge.rc:4130
msgid "NUM"
msgstr "NUM"
#. ID_INDICATOR_SCRL
-#: Merge.rc:4121
+#: Merge.rc:4131
msgid "SCRL"
msgstr "SCRL"
#. ID_INDICATOR_OVR
-#: Merge.rc:4122
+#: Merge.rc:4132
msgid "OVR"
msgstr "OVR"
#. ID_INDICATOR_REC
-#: Merge.rc:4123
+#: Merge.rc:4133
msgid "REC"
msgstr "REC"
#. ID_FILE_NEW
-#: Merge.rc:4129
+#: Merge.rc:4139
msgid ""
"\n"
"New Documents (Ctrl+N)"
@@ -4874,7 +4885,7 @@ msgstr ""
"新增 (Ctrl+N)"
#. ID_FILE_OPEN
-#: Merge.rc:4130
+#: Merge.rc:4140
msgid ""
"\n"
"Open (Ctrl+O)"
@@ -4883,7 +4894,7 @@ msgstr ""
"開啟 (Ctrl+O)"
#. ID_FILE_SAVE
-#: Merge.rc:4131
+#: Merge.rc:4141
msgid ""
"\n"
"Save (Ctrl+S)"
@@ -4892,27 +4903,27 @@ msgstr ""
"儲存 (Ctrl+S)"
#. IDS_UNK_ERROR_READING_PROJECT
-#: Merge.rc:4137
+#: Merge.rc:4147
msgid "Unknown error opening project file."
msgstr "開啟專案檔時發生不明錯誤。"
#. IDS_UNK_ERROR_SAVING_PROJECT
-#: Merge.rc:4138
+#: Merge.rc:4148
msgid "Unknown error saving project file."
msgstr "儲存專案檔時發生不明錯誤。"
#. IDS_PROJFILE_LOAD_SUCCESS
-#: Merge.rc:4143
+#: Merge.rc:4153
msgid "Project file loaded."
msgstr "專案檔成功載入。"
#. IDS_PROJFILE_SAVE_SUCCESS
-#: Merge.rc:4144
+#: Merge.rc:4154
msgid "Project file saved."
msgstr "專案檔成功儲存。"
#. ID_EDIT_UNDO
-#: Merge.rc:4150
+#: Merge.rc:4160
msgid ""
"\n"
"Undo (Ctrl+Z)"
@@ -4921,7 +4932,7 @@ msgstr ""
"復原 (Ctrl+Z)"
#. ID_EDIT_REDO
-#: Merge.rc:4151
+#: Merge.rc:4161
msgid ""
"\n"
"Redo (Ctrl+Y)"
@@ -4930,7 +4941,7 @@ msgstr ""
"取消復原 (Ctrl+Y)"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:4158
+#: Merge.rc:4168
msgid ""
"\n"
"FileCompare\n"
@@ -4949,7 +4960,7 @@ msgstr ""
"WinMerge 檔案比較"
#. IDR_DIRDOCTYPE
-#: Merge.rc:4159
+#: Merge.rc:4169
msgid ""
"\n"
"FolderCompare\n"
@@ -4968,162 +4979,162 @@ msgstr ""
"WinMerge 資料夾比較"
#. IDS_SPLASH_GPLTEXT
-#: Merge.rc:4165
+#: Merge.rc:4175
msgid "WinMerge comes with ABSOLUTELY NO WARRANTY. It is free software and can be redistributed under the conditions of the GNU General Public License - see the Help menu for details."
msgstr "WinMerge 不附帶任何保證。這是一款自由軟體,可依照 GNU 通用公共授權條款(GPL)的條件進行再散佈。詳情請參閱「說明」選單。"
#. IDS_MESSAGEBOX_ABORT
-#: Merge.rc:4173
+#: Merge.rc:4183
msgid "&Abort"
msgstr "放棄 (&A)"
#. IDS_MESSAGEBOX_RETRY
-#: Merge.rc:4174
+#: Merge.rc:4184
msgid "&Retry"
msgstr "重試 (&R)"
#. IDS_MESSAGEBOX_IGNORE
-#: Merge.rc:4175
+#: Merge.rc:4185
msgid "&Ignore"
msgstr "忽略 (&I)"
#. IDS_MESSAGEBOX_IGNOREALL
-#: Merge.rc:4176
+#: Merge.rc:4186
msgid "Ignore &all"
msgstr "全部忽略 (&A)"
#. IDS_MESSAGEBOX_YES
-#: Merge.rc:4177
+#: Merge.rc:4187
msgid "&Yes"
msgstr "是 (&Y)"
#. IDS_MESSAGEBOX_YES_TO_ALL
-#: Merge.rc:4183
+#: Merge.rc:4193
msgid "Yes to &all"
msgstr "全部皆是 (&A)"
#. IDS_MESSAGEBOX_NO
-#: Merge.rc:4184
+#: Merge.rc:4194
msgid "&No"
msgstr "否 (&N)"
#. IDS_MESSAGEBOX_NO_TO_ALL
-#: Merge.rc:4185
+#: Merge.rc:4195
msgid "No to a&ll"
msgstr "全部皆否 (&L)"
#. IDS_MESSAGEBOX_CONTINUE
-#: Merge.rc:4186
+#: Merge.rc:4196
msgid "&Continue"
msgstr "繼續 (&C)"
#. IDS_MESSAGEBOX_SKIP
-#: Merge.rc:4187
+#: Merge.rc:4197
msgid "&Skip"
msgstr "略過 (&S)"
#. IDS_MESSAGEBOX_SKIPALL
-#: Merge.rc:4188
+#: Merge.rc:4198
msgid "Skip &all"
msgstr "全部略過 (&A)"
#. IDS_MESSAGEBOX_DONT_DISPLAY_AGAIN
-#: Merge.rc:4190
+#: Merge.rc:4200
msgid "Don't display this &message again."
msgstr "不要再顯示此訊息 (&M)"
-#: Merge.rc:4193
+#: Merge.rc:4203
msgid "To make this message box visible, press Reset on the Message Boxes page in Options."
msgstr "若要再次顯示此訊息方塊,請在「選項」對話框的「訊息方塊」頁面上按下重設按鈕。"
#. IDS_OPTIONSPG_EDITOR_COMPAREMERGE
-#: Merge.rc:4203
+#: Merge.rc:4213
msgid "Compare/Merge"
msgstr "比較/合併"
#. IDS_OPTIONSPG_SYNTAXCOLORS
-#: Merge.rc:4204 Merge.rc:4208
+#: Merge.rc:4214 Merge.rc:4218
msgid "Syntax"
msgstr "語法"
#. IDS_OPTIONSPG_COLOR_SCHEMES
-#: Merge.rc:4206
+#: Merge.rc:4216
msgid "Color Schemes"
msgstr "色彩主題"
#. IDS_OPTIONSPG_DIRCOLORS
-#: Merge.rc:4210
+#: Merge.rc:4220
msgid "Folder Compare"
msgstr "資料夾比較"
#. IDS_OPTIONSPG_PROJECT
-#: Merge.rc:4215
+#: Merge.rc:4225
msgid "Project"
msgstr "專案"
#. IDS_COLHDR_NSDIFFS
-#: Merge.rc:4218 Merge.rc:4640
+#: Merge.rc:4228 Merge.rc:4650
msgid "Differences"
msgstr "差異"
#. IDS_OPTIONSPG_MESSAGEBOXES
-#: Merge.rc:4220
+#: Merge.rc:4230
msgid "Message Boxes"
msgstr "訊息對話框"
#. IDS_TO
-#: Merge.rc:4235
+#: Merge.rc:4245
msgid "To:"
msgstr "到:"
#. IDS_FROM_LEFT
-#: Merge.rc:4236
+#: Merge.rc:4246
msgid "From left:"
msgstr "從左側:"
#. IDS_TO_LEFT
-#: Merge.rc:4237
+#: Merge.rc:4247
msgid "To left:"
msgstr "到左側:"
#. IDS_FROM_RIGHT
-#: Merge.rc:4238
+#: Merge.rc:4248
msgid "From right:"
msgstr "從右側:"
#. IDS_TO_RIGHT
-#: Merge.rc:4239
+#: Merge.rc:4249
msgid "To right:"
msgstr "到右側:"
#. IDS_FROM_MIDDLE
-#: Merge.rc:4240
+#: Merge.rc:4250
msgid "From middle:"
msgstr "從中間:"
#. IDS_TO_MIDDLE
-#: Merge.rc:4241
+#: Merge.rc:4251
msgid "To middle:"
msgstr "至中間:"
#. IDS_VERSION_FMT
-#: Merge.rc:4247
+#: Merge.rc:4257
#, c-format
msgid "Version %1"
msgstr "版本 %1"
#. IDS_OPTIONS_TITLE
-#: Merge.rc:4253
+#: Merge.rc:4263
#, c-format
msgid "Options (%1)"
msgstr "選項 (%1)"
#. IDS_MESSAGE_BOX_ARE_RESET
-#: Merge.rc:4254
+#: Merge.rc:4264
msgid "All message boxes are now displayed again."
msgstr "所有訊息對話框會重新再顯示。"
-#: Merge.rc:4256
+#: Merge.rc:4266
#, c-format
msgid "Tab size value is out of range. Please use 1 - %1."
msgstr ""
@@ -5131,157 +5142,157 @@ msgstr ""
"請使用 1 - %1。"
#. IDS_PROJECT_OPEN
-#: Merge.rc:4262 Merge.rc:4318
+#: Merge.rc:4272 Merge.rc:4328
msgid "Open"
msgstr "開啟"
#. IDS_PROGRAMFILES
-#: Merge.rc:4263
+#: Merge.rc:4273
msgid "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||"
msgstr "程式|*.exe;*.bat;*.cmd|所有檔案 (*.*)|*.*||"
#. IDS_ALLFILES
-#: Merge.rc:4264
+#: Merge.rc:4274
msgid "All Files (*.*)|*.*||"
msgstr "所有檔案 (*.*)|*.*||"
#. IDS_PROJECTFILES
-#: Merge.rc:4265
+#: Merge.rc:4275
msgid "WinMerge Project Files (*.WinMerge)|*.WinMerge||"
msgstr "WinMerge 專案檔 (*.WinMerge)|*.WinMerge||"
#. IDS_INIFILES
-#: Merge.rc:4267
+#: Merge.rc:4277
msgid "Options files (*.ini)|*.ini|All Files (*.*)|*.*||"
msgstr "選項檔 (*.ini)|*.ini|所有檔案 (*.*)|*.*||"
#. IDS_REPLACELIST_FILES
-#: Merge.rc:4268
+#: Merge.rc:4278
msgid "Tab-Separated Values (*.tsv;*.txt)|*.tsv;*.txt|All Files (*.*)|*.*||"
msgstr ""
#. IDS_TEXT_REPORT_FILES
-#: Merge.rc:4274
+#: Merge.rc:4284
msgid "Text Files (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|All Files (*.*)|*.*||"
msgstr "Text檔 (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|所有檔案 (*.*)|*.*||"
#. IDS_HTML_REPORT_FILES
-#: Merge.rc:4275
+#: Merge.rc:4285
msgid "HTML Files (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||"
msgstr "HTML檔 (*.htm,*.html)|*.htm;*.html|所有檔案 (*.*)|*.*||"
#. IDS_XML_REPORT_FILES
-#: Merge.rc:4276
+#: Merge.rc:4286
msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||"
msgstr "XML檔 (*.xml)|*.xml|所有檔案 (*.*)|*.*||"
#. IDS_EXPANDSUBDIRS_DONOTEXPAND
-#: Merge.rc:4294
+#: Merge.rc:4304
msgid "Do not expand"
msgstr "不要展開"
#. IDS_EXPANDSUBDIRS_ALL
-#: Merge.rc:4295
+#: Merge.rc:4305
msgid "Expand all subfolders"
msgstr "展開所有子資料夾"
#. IDS_EXPANDSUBDIRS_DIFFERENT
-#: Merge.rc:4296
+#: Merge.rc:4306
msgid "Expand different subfolders"
msgstr "展開不同的子資料夾"
#. IDS_EXPANDSUBDIRS_IDENTICAL
-#: Merge.rc:4297
+#: Merge.rc:4307
msgid "Expand identical subfolders"
msgstr "展開相同的子資料夾"
#. IDS_SYNTAXTABLE_FILETYPE
-#: Merge.rc:4303
+#: Merge.rc:4313
msgid "File Type"
msgstr "檔案類型"
#. IDS_COLHDR_EXTENSION
-#: Merge.rc:4304 Merge.rc:4597
+#: Merge.rc:4314 Merge.rc:4607
msgid "Extension"
msgstr "副檔名"
#. IDS_PRPCAT_MESSAGE
-#: Merge.rc:4310 Merge.rc:4669
+#: Merge.rc:4320 Merge.rc:4679
msgid "Message"
msgstr "訊息"
#. IDS_MESSAGEBOX_ANSWER
-#: Merge.rc:4311
+#: Merge.rc:4321
msgid "Answer"
msgstr "回答"
#. IDS_PROJECT_ITEM
-#: Merge.rc:4317
+#: Merge.rc:4327
msgid "Item"
msgstr "項目"
#. IDS_PROJECT_LOAD
-#: Merge.rc:4319
+#: Merge.rc:4329
msgid "Load"
msgstr "載入"
#. IDS_PROJECT_SAVE
-#: Merge.rc:4320
+#: Merge.rc:4330
msgid "Save"
msgstr "儲存"
#. IDS_PROJECT_ITEM_INCLUDE_SUBFOLDERS
-#: Merge.rc:4322
+#: Merge.rc:4332
msgid "Include Subfolders"
msgstr "包括子資料夾"
#. IDS_PROJECT_ITEM_COMPARE_OPTIONS
-#: Merge.rc:4324
+#: Merge.rc:4334
msgid "Compare Options"
msgstr "比較選項"
#. IDS_PROJECT_ITEM_HIDDEN_ITEMS
-#: Merge.rc:4325
+#: Merge.rc:4335
msgid "Hidden Items"
msgstr "隱藏的項目"
#. IDS_PLUGINSLIST_NAME
-#: Merge.rc:4331 Merge.rc:4956
+#: Merge.rc:4341 Merge.rc:4966
msgid "Name"
msgstr "名稱"
#. IDS_FILTERFILE_PATHTITLE
-#: Merge.rc:4332
+#: Merge.rc:4342
msgid "Location"
msgstr "位置"
#. IDS_FILTER_TITLE
-#: Merge.rc:4333
+#: Merge.rc:4343
msgid "Filters"
msgstr "篩選器"
#. IDS_FILTER_PREFIX
-#: Merge.rc:4334
+#: Merge.rc:4344
msgid "[F] "
msgstr "[F] "
#. IDS_PLUGINSLIST_DESC
-#: Merge.rc:4335 Merge.rc:4958
+#: Merge.rc:4345 Merge.rc:4968
msgid "Description"
msgstr "描述"
# I suggest "Add new filter filename" instead. For it must not select a name, rather give one.
#. IDS_FILEFILTER_SAVENEW
-#: Merge.rc:4336
+#: Merge.rc:4346
msgid "Select Filename for New Filter"
msgstr "建立新篩選器檔名"
#. IDS_FILEFILTER_FILEMASK
-#: Merge.rc:4337
+#: Merge.rc:4347
msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||"
msgstr "檔案篩選器 (*.flt)|*.flt|所有檔案 (*.*)|*.*||"
-#: Merge.rc:4339
+#: Merge.rc:4349
#, c-format
msgid ""
"Cannot find filter template!\n"
@@ -5294,7 +5305,7 @@ msgstr ""
"請複製檔案 %1 到 WinMerge/檔案篩選器-資料夾:\n"
"%2。"
-#: Merge.rc:4341
+#: Merge.rc:4351
#, c-format
msgid ""
"Cannot copy filter template:\n"
@@ -5307,7 +5318,7 @@ msgstr ""
"\n"
"請確定有該資料夾,而且允許寫入。"
-#: Merge.rc:4343
+#: Merge.rc:4353
msgid ""
"User's filter folder is not defined!\n"
"\n"
@@ -5317,7 +5328,7 @@ msgstr ""
"\n"
"請於「選項/系統」中選定檔案篩選器資料夾。"
-#: Merge.rc:4345
+#: Merge.rc:4355
#, c-format
msgid ""
"Failed to delete filter:\n"
@@ -5331,11 +5342,11 @@ msgstr ""
"它是唯讀檔。"
#. IDS_FILEFILTER_INSTALL
-#: Merge.rc:4346
+#: Merge.rc:4356
msgid "Locate Filter File to Install"
msgstr "找到檔案篩選器檔以安裝"
-#: Merge.rc:4348
+#: Merge.rc:4358
msgid ""
"Installing filter file failed.\n"
"\n"
@@ -5346,17 +5357,17 @@ msgstr ""
"不能複製新篩選器檔到檔案篩選器資料夾。"
#. IDS_FILEFILTER_OVERWRITE
-#: Merge.rc:4349
+#: Merge.rc:4359
msgid "Filter file exists. Overwrite?"
msgstr "檔案篩選器檔已存在。要覆蓋現有篩選器嗎?"
#. IDS_FILTERLINE_REGEXP
-#: Merge.rc:4355
+#: Merge.rc:4365
msgid "Regular expression"
msgstr "正規表示法"
#. IDS_FILTERCHANGED
-#: Merge.rc:4361
+#: Merge.rc:4371
msgid ""
"Filters updated. Refresh all open folder compares?\n"
"\n"
@@ -5367,217 +5378,217 @@ msgstr ""
"選擇『否』可稍後再重整。"
#. IDS_DIRECTORY_WINDOW_TITLE
-#: Merge.rc:4367
+#: Merge.rc:4377
msgid "Folder Comparison Results"
msgstr "資料夾比對結果"
#. IDS_FILE_COMPARISON_TITLE
-#: Merge.rc:4368
+#: Merge.rc:4378
msgid "File Comparison"
msgstr "檔案比對中"
#. IDS_EMPTY_LEFT_FILE
-#: Merge.rc:4369
+#: Merge.rc:4379
msgid "Untitled Left"
msgstr "未設標題的左側"
#. IDS_EMPTY_MIDDLE_FILE
-#: Merge.rc:4370
+#: Merge.rc:4380
msgid "Untitled Middle"
msgstr "未設標題的中間"
#. IDS_EMPTY_RIGHT_FILE
-#: Merge.rc:4371
+#: Merge.rc:4381
msgid "Untitled Right"
msgstr "未設標題的右側"
#. IDS_CONFLICT_BASE_FILE
-#: Merge.rc:4372
+#: Merge.rc:4382
msgid "Base File"
msgstr "基礎檔案"
#. IDS_CONFLICT_THEIRS_FILE
-#: Merge.rc:4373
+#: Merge.rc:4383
msgid "Theirs File"
msgstr "他們的檔案"
#. IDS_CONFLICT_MINE_FILE
-#: Merge.rc:4374
+#: Merge.rc:4384
msgid "Mine File"
msgstr "我的檔案"
#. IDS_SELFCOMPARE_ORIGINAL_FILE
-#: Merge.rc:4375
+#: Merge.rc:4385
msgid "Original File"
msgstr "原始檔案"
#. IDS_LINE_STATUS_INFO_EOL
-#: Merge.rc:4381
+#: Merge.rc:4391
#, c-format
msgid "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s"
msgstr "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s"
#. IDS_EMPTY_LINE_STATUS_INFO
-#: Merge.rc:4382
+#: Merge.rc:4392
#, c-format
msgid "Line: %s"
msgstr "行: %s"
#. IDS_LINE_STATUS_INFO
-#: Merge.rc:4383
+#: Merge.rc:4393
#, c-format
msgid "Ln: %s Col: %d/%d Ch: %d/%d"
msgstr "Ln: %s Col: %d/%d Ch: %d/%d"
#. IDS_LINE_STATUS_INFO_SEL
-#: Merge.rc:4384
+#: Merge.rc:4394
#, c-format
msgid " Sel: %d | %d"
msgstr "選取:%d | %d"
#. IDS_MERGEMODE_MERGING
-#: Merge.rc:4385
+#: Merge.rc:4395
msgid "Merge"
msgstr "合併"
#. IDS_DIFF_NUMBER_STATUS_FMT
-#: Merge.rc:4386
+#: Merge.rc:4396
#, c-format
msgid "Difference %1 of %2"
msgstr "%2 個差異中之第 %1"
#. IDS_NO_DIFF_SEL_FMT
-#: Merge.rc:4387
+#: Merge.rc:4397
#, c-format
msgid "%1 Differences Found"
msgstr "找到 %1 個差異"
#. IDS_1_DIFF_FOUND
-#: Merge.rc:4388
+#: Merge.rc:4398
msgid "1 Difference Found"
msgstr "找到 1 個差異"
#. IDS_NO_ERR_SEL_FMT
-#: Merge.rc:4389
+#: Merge.rc:4399
#, c-format
msgid "%1 Errors Found"
msgstr "發現 %1 個錯誤"
#. IDS_1_ERR_FOUND
-#: Merge.rc:4390
+#: Merge.rc:4400
msgid "1 Error Found"
msgstr "發現 1 個錯誤"
#. IDS_STATUSBAR_READONLY, Abbreviation from "Read Only"
-#: Merge.rc:4391
+#: Merge.rc:4401
msgid "RO"
msgstr "唯讀"
#. IDS_DIRVIEW_STATUS_FMT_FOCUS
-#: Merge.rc:4397
+#: Merge.rc:4407
#, c-format
msgid "Item %1 of %2"
msgstr "%2 個項目之第 %1"
#. IDS_DIRVIEW_STATUS_FMT_NOFOCUS
-#: Merge.rc:4398
+#: Merge.rc:4408
#, c-format
msgid "Items: %1"
msgstr "項目:%1"
#. IDS_DIRVIEW_STATUS_COMPARING
-#: Merge.rc:4399
+#: Merge.rc:4409
msgid "Comparing items..."
msgstr "比較項目中..."
#. IDS_ITEMS_PER_SEC
-#: Merge.rc:4400
+#: Merge.rc:4410
#, c-format
msgid "%.1f[items/sec]"
msgstr "%.1f[items/sec]"
#. IDS_ERROR_INCOMPARABLE
-#: Merge.rc:4406
+#: Merge.rc:4416
msgid "Select two existing folders/files to compare."
msgstr "選取兩個現存資料夾或檔案做比對。"
#. IDS_DIRSEL_TAG
-#: Merge.rc:4407
+#: Merge.rc:4417
msgid "Folder Selection"
msgstr "資料夾選取"
#. IDS_OPEN_FILESDIRS
-#: Merge.rc:4408
+#: Merge.rc:4418
msgid "Select two (or three) folders/files to compare."
msgstr "選取兩個 (或三個) 檔案或資料夾做比較。"
#. IDS_OPEN_LEFTINVALID
-#: Merge.rc:4409
+#: Merge.rc:4419
msgid "Left (1st) path is invalid!"
msgstr "左側 (第一) 路徑無效!"
#. IDS_OPEN_MIDDLEINVALID
-#: Merge.rc:4410
+#: Merge.rc:4420
msgid "Middle (2nd) path is invalid!"
msgstr "中間 (第二) 路徑無效!"
#. IDS_OPEN_RIGHTINVALID2
-#: Merge.rc:4411
+#: Merge.rc:4421
msgid "Right (2nd) path is invalid!"
msgstr "右側 (第二) 路徑無效!"
#. IDS_OPEN_RIGHTINVALID3
-#: Merge.rc:4412
+#: Merge.rc:4422
msgid "Right (3rd) path is invalid!"
msgstr "右側 (第三) 路徑無效!"
#. IDS_OPEN_BOTHINVALID
-#: Merge.rc:4413
+#: Merge.rc:4423
msgid "Both paths are invalid!"
msgstr "兩邊路徑無效!"
-#: Merge.rc:4415
+#: Merge.rc:4425
msgid "Left (1st) and Middle (2nd) paths are invalid!"
msgstr "左側 (第一) 及中間 (第二) 路徑無效!"
#. IDS_OPEN_LEFTRIGHTINVALID
-#: Merge.rc:4416
+#: Merge.rc:4426
msgid "Left (1st) and Right (3rd) paths are invalid!"
msgstr "左側 (第一) 及右側 (第三) 路徑無效!"
-#: Merge.rc:4418
+#: Merge.rc:4428
msgid "Middle (2nd) and Right (3rd) paths are invalid!"
msgstr "中間 (第二) 及右側 (第三) 路徑無效!"
#. IDS_OPEN_ALLINVALID
-#: Merge.rc:4419
+#: Merge.rc:4429
msgid "All paths are invalid!"
msgstr "所有路徑無效!"
#. IDS_OPEN_UNPACKERDISABLED
-#: Merge.rc:4420
+#: Merge.rc:4430
msgid "Only enabled for file comparisons"
msgstr "僅為檔案比較啟用"
#. IDS_OPEN_MISMATCH
-#: Merge.rc:4421
+#: Merge.rc:4431
msgid "Cannot compare file and folder!"
msgstr "無法比較檔案和資料夾!"
#. IDS_ERROR_FILE_NOT_FOUND
-#: Merge.rc:4427
+#: Merge.rc:4437
#, c-format
msgid "File not found: %1"
msgstr "找不到檔案:%1"
#. IDS_ERROR_FILE_NOT_UNPACKED
-#: Merge.rc:4428
+#: Merge.rc:4438
#, c-format
msgid "File not unpacked: %1"
msgstr "檔案為封裝檔:%1"
#. IDS_ERROR_FILEOPEN
-#: Merge.rc:4429
+#: Merge.rc:4439
#, c-format
msgid ""
"Cannot open file\n"
@@ -5591,12 +5602,12 @@ msgstr ""
"%2"
#. IDS_ERROR_CONF_RESOLVE
-#: Merge.rc:4430
+#: Merge.rc:4440
msgid "Failed to parse conflict file."
msgstr "無法解析衝突檔。"
#. IDS_NOT_CONFLICT_FILE
-#: Merge.rc:4431
+#: Merge.rc:4441
#, c-format
msgid ""
"The file\n"
@@ -5608,7 +5619,7 @@ msgstr ""
"不是衝突檔。"
#. IDS_COMPARE_LARGE_FILES
-#: Merge.rc:4432
+#: Merge.rc:4442
msgid ""
"Comparing large files requires significant memory.\n"
"Show only comparison results (not file contents)?"
@@ -5617,28 +5628,28 @@ msgstr ""
"是否僅顯示比較結果(不顯示文件內容)?"
#. IDS_SAVE_AS_TITLE
-#: Merge.rc:4438
+#: Merge.rc:4448
msgid "Save As"
msgstr "另存新檔"
#. IDS_SAVE_FMT
-#: Merge.rc:4439
+#: Merge.rc:4449
#, c-format
msgid "Save changes to %1?"
msgstr "儲存更改到 %1?"
#. IDS_SAVEREADONLY_FMT
-#: Merge.rc:4440
+#: Merge.rc:4450
#, c-format
msgid "%1 is read-only. Override? Or 'No' to save as new filename?"
msgstr "%1 已標記成唯讀。您要覆寫唯讀檔嗎? (選擇否將以新檔名儲存)"
#. IDS_ERROR_BACKUP
-#: Merge.rc:4441
+#: Merge.rc:4451
msgid "Error backing up file"
msgstr "備份檔案時發生錯誤"
-#: Merge.rc:4443
+#: Merge.rc:4453
#, c-format
msgid ""
"Unable to backup original file:\n"
@@ -5652,7 +5663,7 @@ msgstr ""
"仍舊繼續嗎?"
#. IDS_FILESAVE_FAILED
-#: Merge.rc:4444
+#: Merge.rc:4454
#, c-format
msgid ""
"Saving file failed.\n"
@@ -5668,7 +5679,7 @@ msgstr ""
"\t- 以不同名稱儲存檔案 (按「確定」)\n"
"\t- 放棄目前操作 (按「取消」)?"
-#: Merge.rc:4446
+#: Merge.rc:4456
#, c-format
msgid ""
"Plugin '%2' cannot pack changes to left file into '%1'.\n"
@@ -5681,7 +5692,7 @@ msgstr ""
"\n"
"您要將未封裝版本儲存成為另一檔案嗎?"
-#: Merge.rc:4448
+#: Merge.rc:4458
#, c-format
msgid ""
"Plugin '%2' cannot pack changes to middle file into '%1'.\n"
@@ -5694,7 +5705,7 @@ msgstr ""
"\n"
"您要將未封裝版本儲存成為另一檔案嗎?"
-#: Merge.rc:4450
+#: Merge.rc:4460
#, c-format
msgid ""
"Plugin '%2' cannot pack changes to right file into '%1'.\n"
@@ -5708,7 +5719,7 @@ msgstr ""
"您要將未封裝版本儲存成為另一檔案嗎?"
#. IDS_FILECHANGED_ONDISK
-#: Merge.rc:4451
+#: Merge.rc:4461
#, c-format
msgid ""
"Another application updated\n"
@@ -5724,7 +5735,7 @@ msgstr ""
"要覆寫更新過的檔案嗎?"
#. IDS_SAVEREADONLY_MULTI
-#: Merge.rc:4452
+#: Merge.rc:4462
#, c-format
msgid ""
"%1\n"
@@ -5734,7 +5745,7 @@ msgstr ""
"已標記成唯讀。仍要覆寫它嗎?"
#. IDS_FILECHANGED_RESCAN
-#: Merge.rc:4453
+#: Merge.rc:4463
#, c-format
msgid ""
"Another application updated\n"
@@ -5750,22 +5761,22 @@ msgstr ""
"要重新載入嗎?"
#. IDS_SAVE_LEFT_AS
-#: Merge.rc:4454
+#: Merge.rc:4464
msgid "Save Left File As"
msgstr "儲存左側檔案為"
#. IDS_SAVE_MIDDLE_AS
-#: Merge.rc:4455
+#: Merge.rc:4465
msgid "Save Middle File As"
msgstr "儲存中間檔案為"
#. IDS_SAVE_RIGHT_AS
-#: Merge.rc:4456
+#: Merge.rc:4466
msgid "Save Right File As"
msgstr "儲存右側檔案為"
#. IDS_FILE_DISAPPEARED
-#: Merge.rc:4461
+#: Merge.rc:4471
#, c-format
msgid ""
"File\n"
@@ -5777,7 +5788,7 @@ msgstr ""
"消失。請儲存檔案副本再繼續。"
#. IDS_VIEWS_OUTOFSYNC
-#: Merge.rc:4467
+#: Merge.rc:4477
msgid ""
"Cannot merge unsynched documents.\n"
"\n"
@@ -5785,188 +5796,188 @@ msgid ""
msgstr "無法合併未同步的文件,請在繼續前先重整。"
#. IDS_BREAK_ON_WHITESPACE
-#: Merge.rc:4472
+#: Merge.rc:4482
msgid "Break at whitespace"
msgstr "空白字元處斷行"
#. IDS_BREAK_ON_PUNCTUATION
-#: Merge.rc:4473
+#: Merge.rc:4483
msgid "Break at whitespace or punctuation"
msgstr "在空白字元或標點符號處斷行"
#. IDS_L2M
-#: Merge.rc:4479
+#: Merge.rc:4489
msgid "Copy to &Middle\tAlt+Right"
msgstr "複製到中間 (&M)\tAlt+Right"
#. IDS_R2M
-#: Merge.rc:4480
+#: Merge.rc:4490
msgid "Copy to &Middle\tAlt+Left"
msgstr "複製到中間 (&M)\tAlt+Left"
#. IDS_COPY_FROM_MIDDLE_R
-#: Merge.rc:4481
+#: Merge.rc:4491
msgid "Copy from Middle\tAlt+Shift+Right"
msgstr "從中間複製\tAlt+Shift+Right"
#. IDS_COPY_FROM_MIDDLE_L
-#: Merge.rc:4482
+#: Merge.rc:4492
msgid "Copy from Middle\tAlt+Shift+Left"
msgstr "從中間複製\tAlt+Shift+Left"
#. IDS_L2MNEXT
-#: Merge.rc:4483
+#: Merge.rc:4493
msgid "Copy to Middle and Advance\tCtrl+Alt+Right"
msgstr "複製至中間並前進\tCtrl+Alt+Right"
#. IDS_R2MNEXT
-#: Merge.rc:4484
+#: Merge.rc:4494
msgid "Copy to Middle and Advance\tCtrl+Alt+Left"
msgstr "複製至中間並前進\tCtrl+Alt+Left"
#. IDS_ALL_MIDDLE
-#: Merge.rc:4485
+#: Merge.rc:4495
msgid "Copy All to Middle"
msgstr "全部複製到中間"
#. IDS_COPY_RIGHT_TO_LEFT
-#: Merge.rc:4491
+#: Merge.rc:4501
#, c-format
msgid "Right to Left (%1)"
msgstr "右側到左側 (%1)"
#. IDS_COPY_RIGHT_TO_MIDDLE
-#: Merge.rc:4492
+#: Merge.rc:4502
#, c-format
msgid "Right to Middle (%1)"
msgstr "右側到中間 (%1)"
#. IDS_COPY_MIDDLE_TO_LEFT
-#: Merge.rc:4493
+#: Merge.rc:4503
#, c-format
msgid "Middle to Left (%1)"
msgstr "中間到左側 (%1)"
#. IDS_COPY_MIDDLE_TO_RIGHT
-#: Merge.rc:4494
+#: Merge.rc:4504
#, c-format
msgid "Middle to Right (%1)"
msgstr "中間到右側 (%1)"
#. IDS_COPY_LEFT_TO_RIGHT
-#: Merge.rc:4495
+#: Merge.rc:4505
#, c-format
msgid "Left to Right (%1)"
msgstr "左側到右側 (%1)"
#. IDS_COPY_LEFT_TO_MIDDLE
-#: Merge.rc:4496
+#: Merge.rc:4506
#, c-format
msgid "Left to Middle (%1)"
msgstr "左側到中間 (%1)"
#. IDS_MOVE_LEFT_TO
-#: Merge.rc:4507 Merge.rc:4539
+#: Merge.rc:4517 Merge.rc:4549
#, c-format
msgid "Left to... (%1)"
msgstr "左側到... (%1)"
#. IDS_MOVE_MIDDLE_TO
-#: Merge.rc:4508 Merge.rc:4540
+#: Merge.rc:4518 Merge.rc:4550
#, c-format
msgid "Middle to... (%1)"
msgstr "中間到... (%1)"
#. IDS_MOVE_RIGHT_TO
-#: Merge.rc:4509 Merge.rc:4541
+#: Merge.rc:4519 Merge.rc:4551
#, c-format
msgid "Right to... (%1)"
msgstr "右側到... (%1)"
#. IDS_COPY_BOTH_TO
-#: Merge.rc:4510
+#: Merge.rc:4520
#, c-format
msgid "Both to... (%1)"
msgstr "兩邊到... (%1)"
#. IDS_COPY_ALL_TO
-#: Merge.rc:4511
+#: Merge.rc:4521
#, c-format
msgid "All to... (%1)"
msgstr "全部到... (%1)"
#. IDS_COPY_DIFFERENCES_TO
-#: Merge.rc:4512
+#: Merge.rc:4522
#, c-format
msgid "Differences to... (%1)"
msgstr "差異到... (%1)"
#. IDS_COPY_ONLYDIFFITEMS
-#: Merge.rc:4519
+#: Merge.rc:4529
msgid ""
"Some selected items are identical or skipped.\n"
"Copy only items with differences?"
msgstr "僅複製有差異的項目?"
#. IDS_DEL_LEFT_FMT
-#: Merge.rc:4525
+#: Merge.rc:4535
#, c-format
msgid "Left (%1)"
msgstr "左側 (%1)"
#. IDS_DEL_MIDDLE_FMT
-#: Merge.rc:4526
+#: Merge.rc:4536
#, c-format
msgid "Middle (%1)"
msgstr "中間 (%1)"
#. IDS_DEL_RIGHT_FMT
-#: Merge.rc:4527
+#: Merge.rc:4537
#, c-format
msgid "Right (%1)"
msgstr "右側 (%1)"
#. IDS_DEL_BOTH_FMT
-#: Merge.rc:4528
+#: Merge.rc:4538
#, c-format
msgid "Both (%1)"
msgstr "兩邊 (%1)"
#. IDS_DEL_ALL_FMT
-#: Merge.rc:4529
+#: Merge.rc:4539
#, c-format
msgid "All (%1)"
msgstr "全部 (%1)"
#. IDS_SELECT_DEST_LEFT
-#: Merge.rc:4545
+#: Merge.rc:4555
msgid "Left Side - Select Destination Folder:"
msgstr "左側 - 選取目標資料夾:"
#. IDS_SELECT_DEST_MIDDLE
-#: Merge.rc:4546
+#: Merge.rc:4556
msgid "Middle Side - Select Destination Folder:"
msgstr "中間 - 選取目標資料夾:"
#. IDS_SELECT_DEST_RIGHT
-#: Merge.rc:4547
+#: Merge.rc:4557
msgid "Right Side - Select Destination Folder:"
msgstr "右側 - 選取目標資料夾:"
#. IDS_FILES_AFFECTED_FMT
-#: Merge.rc:4548
+#: Merge.rc:4558
#, c-format
msgid "(%1 Files Affected)"
msgstr "(%1 受影響檔案)"
#. IDS_FILES_AFFECTED_FMT2
-#: Merge.rc:4549
+#: Merge.rc:4559
#, c-format
msgid "(%1 of %2 Files Affected)"
msgstr "(%2 受影響檔案之 %1)"
#. IDS_CONFIRM_DELETE_SINGLE
-#: Merge.rc:4555
+#: Merge.rc:4565
#, c-format
msgid ""
"Are you sure you want to delete\n"
@@ -5978,18 +5989,18 @@ msgstr ""
"%1?"
#. IDS_CONFIRM_SINGLE_COPY
-#: Merge.rc:4556
+#: Merge.rc:4566
msgid "Are you sure you want to copy?"
msgstr "確定要複製?"
#. IDS_CONFIRM_MULTIPLE_COPY
-#: Merge.rc:4557
+#: Merge.rc:4567
#, c-format
msgid "Are you sure you want to copy %d items?"
msgstr "確定要複製 %d 項目?"
#. IDS_DIRCMP_NOTSYNC
-#: Merge.rc:4558
+#: Merge.rc:4568
#, c-format
msgid ""
"Operation aborted!\n"
@@ -6008,46 +6019,46 @@ msgstr ""
"請重整再比較。"
#. IDS_CONFIRM_SINGLE_MOVE
-#: Merge.rc:4563
+#: Merge.rc:4573
msgid "Are you sure you want to move?"
msgstr "確定要移除?"
#. IDS_CONFIRM_MULTIPLE_MOVE
-#: Merge.rc:4564
+#: Merge.rc:4574
#, c-format
msgid "Are you sure you want to move %d items?"
msgstr "確定要移除 %d 項目?"
#. IDS_CONFIRM_MOVE_CAPTION
-#: Merge.rc:4566
+#: Merge.rc:4576
msgid "Confirm Move"
msgstr "確認移除"
-#: Merge.rc:4568
+#: Merge.rc:4578
msgid "Close the folder comparison window?"
msgstr "您要關閉一個正在比較資料夾的視窗,您確定要關閉視窗嗎?"
-#: Merge.rc:4570
+#: Merge.rc:4580
msgid "Close the folder comparison window, which took a long time?"
msgstr "關閉資料夾比較視窗嗎?,花了很長時間哦!?"
#. IDS_ERROR_INVALID_DIR_FILE_NAME
-#: Merge.rc:4571
+#: Merge.rc:4581
msgid "The file or folder name is invalid."
msgstr "檔案或資料夾名稱無效。"
#. IDS_ERROR_EXECUTE_FILE
-#: Merge.rc:4577
+#: Merge.rc:4587
#, c-format
msgid "Failed to execute external editor: %1"
msgstr "無法執行外部編輯器 %1"
#. IDS_UNKNOWN_ARCHIVE_FORMAT
-#: Merge.rc:4583
+#: Merge.rc:4593
msgid "Unknown archive format"
msgstr "未知壓縮格式"
-#: Merge.rc:4585
+#: Merge.rc:4595
msgid ""
"Failed to extract archive.\n"
"Compare as text file?"
@@ -6056,518 +6067,518 @@ msgstr ""
"您是否要將封存檔案作為文字檔進行比較?"
#. IDS_COLHDR_FILENAME
-#: Merge.rc:4591
+#: Merge.rc:4601
msgid "Filename"
msgstr "檔案名稱"
#. IDS_COLHDR_DIR
-#: Merge.rc:4592
+#: Merge.rc:4602
msgctxt "DirView|ColumnHeader"
msgid "Folder"
msgstr "資料夾"
#. IDS_COLHDR_RESULT
-#: Merge.rc:4593
+#: Merge.rc:4603
msgid "Comparison Result"
msgstr "比對結果"
#. IDS_COLHDR_LTIMEM
-#: Merge.rc:4594
+#: Merge.rc:4604
msgid "Left Date"
msgstr "左側日期"
#. IDS_COLHDR_RTIMEM
-#: Merge.rc:4595
+#: Merge.rc:4605
msgid "Right Date"
msgstr "右側日期"
#. IDS_COLHDR_MTIMEM
-#: Merge.rc:4596
+#: Merge.rc:4606
msgid "Middle Date"
msgstr "中間日期"
#. IDS_COLHDR_LSIZE
-#: Merge.rc:4598
+#: Merge.rc:4608
msgid "Left Size"
msgstr "左側大小"
#. IDS_COLHDR_RSIZE
-#: Merge.rc:4599
+#: Merge.rc:4609
msgid "Right Size"
msgstr "右側大小"
#. IDS_COLHDR_MSIZE
-#: Merge.rc:4604
+#: Merge.rc:4614
msgid "Middle Size"
msgstr "中間大小"
#. IDS_COLHDR_RSIZE_SHORT
-#: Merge.rc:4605
+#: Merge.rc:4615
msgid "Right Size (Short)"
msgstr "右側大小 (簡式)"
#. IDS_COLHDR_LSIZE_SHORT
-#: Merge.rc:4606
+#: Merge.rc:4616
msgid "Left Size (Short)"
msgstr "左側大小 (簡式)"
#. IDS_COLHDR_MSIZE_SHORT
-#: Merge.rc:4607
+#: Merge.rc:4617
msgid "Middle Size (Short)"
msgstr "中間大小 (簡式)"
#. IDS_COLHDR_LTIMEC
-#: Merge.rc:4613
+#: Merge.rc:4623
msgid "Left Creation Time"
msgstr "左側建立時間"
#. IDS_COLHDR_RTIMEC
-#: Merge.rc:4614
+#: Merge.rc:4624
msgid "Right Creation Time"
msgstr "右側建立時間"
#. IDS_COLHDR_MTIMEC
-#: Merge.rc:4615
+#: Merge.rc:4625
msgid "Middle Creation Time"
msgstr "中間建立時間"
#. IDS_COLHDR_NEWER
-#: Merge.rc:4616
+#: Merge.rc:4626
msgid "Newer File"
msgstr "較新檔案"
#. IDS_COLHDR_LVERSION
-#: Merge.rc:4617
+#: Merge.rc:4627
msgid "Left File Version"
msgstr "左側檔案版本"
#. IDS_COLHDR_RVERSION
-#: Merge.rc:4618
+#: Merge.rc:4628
msgid "Right File Version"
msgstr "右側檔案版本"
#. IDS_COLHDR_MVERSION
-#: Merge.rc:4619
+#: Merge.rc:4629
msgid "Middle File Version"
msgstr "中間檔案版本"
#. IDS_COLHDR_RESULT_ABBR
-#: Merge.rc:4620
+#: Merge.rc:4630
msgid "Short Result"
msgstr "簡式結果"
#. IDS_COLHDR_LATTRIBUTES
-#: Merge.rc:4621
+#: Merge.rc:4631
msgid "Left Attributes"
msgstr "左側屬性"
#. IDS_COLHDR_RATTRIBUTES
-#: Merge.rc:4622
+#: Merge.rc:4632
msgid "Right Attributes"
msgstr "右側屬性"
#. IDS_COLHDR_MATTRIBUTES
-#: Merge.rc:4623
+#: Merge.rc:4633
msgid "Middle Attributes"
msgstr "中間屬性"
#. IDS_COLHDR_LEOL_TYPE
-#: Merge.rc:4628
+#: Merge.rc:4638
msgid "Left EOL"
msgstr "左側 EOL"
#. IDS_COLHDR_MEOL_TYPE
-#: Merge.rc:4629
+#: Merge.rc:4639
msgid "Middle EOL"
msgstr "中間 EOL"
#. IDS_COLHDR_REOL_TYPE
-#: Merge.rc:4630
+#: Merge.rc:4640
msgid "Right EOL"
msgstr "右側 EOL"
#. IDS_COLHDR_LENCODING
-#: Merge.rc:4636
+#: Merge.rc:4646
msgid "Left Encoding"
msgstr "左側編碼"
#. IDS_COLHDR_RENCODING
-#: Merge.rc:4637
+#: Merge.rc:4647
msgid "Right Encoding"
msgstr "右側編碼"
#. IDS_COLHDR_MENCODING
-#: Merge.rc:4638
+#: Merge.rc:4648
msgid "Middle Encoding"
msgstr "中間編碼"
#. IDS_COLHDR_NIDIFFS
-#: Merge.rc:4639
+#: Merge.rc:4649
msgid "Ignored Diff"
msgstr "忽略的差異"
#. IDS_COLHDR_BINARY
-#: Merge.rc:4641
+#: Merge.rc:4651
msgctxt "DirView|ColumnHeader"
msgid "Binary"
msgstr "二進制"
#. IDS_PLUGINS_TYPE_UNPACKER
-#: Merge.rc:4642 Merge.rc:4959
+#: Merge.rc:4652 Merge.rc:4969
msgid "Unpacker"
msgstr "解壓縮程式"
#. IDS_PLUGIN_TYPE4
-#: Merge.rc:4643 Merge.rc:4960 Merge.rc:5267
+#: Merge.rc:4653 Merge.rc:4970 Merge.rc:5277
msgid "Prediffer"
msgstr "預差異化"
#. IDS_COLHDR_LEFT
-#: Merge.rc:4644
+#: Merge.rc:4654
msgid "Left"
msgstr "左側"
#. IDS_COLHDR_MIDDLE
-#: Merge.rc:4645
+#: Merge.rc:4655
msgid "Middle"
msgstr "中間"
#. IDS_COLHDR_RIGHT
-#: Merge.rc:4646
+#: Merge.rc:4656
msgid "Right"
msgstr "右側"
#. IDS_COLHDR_DIFF
-#: Merge.rc:4647
+#: Merge.rc:4657
msgid "Diff"
msgstr "差異"
#. IDS_COLHDR_LEFT_DUPLICATE
-#: Merge.rc:4648
+#: Merge.rc:4658
msgid "Left Duplicate Count"
msgstr "左側重複數"
#. IDS_COLHDR_RIGHT_DUPLICATE
-#: Merge.rc:4649
+#: Merge.rc:4659
msgid "Right Duplicate Count"
msgstr "右側重複數"
#. IDS_COLHDR_MIDDLE_DUPLICATE
-#: Merge.rc:4650
+#: Merge.rc:4660
msgid "Middle Duplicate Count"
msgstr "中間重複數"
#. IDS_COLHDR_MOVE
-#: Merge.rc:4651
+#: Merge.rc:4661
msgid "Move"
msgstr "移動"
#. IDS_PRPCAT_AUDIO
-#: Merge.rc:4658
+#: Merge.rc:4668
msgid "Audio"
msgstr "音訊"
#. IDS_PRPCAT_CALENDAR
-#: Merge.rc:4659
+#: Merge.rc:4669
msgid "Calendar"
msgstr "日曆"
#. IDS_PRPCAT_COMMUNICATION
-#: Merge.rc:4660
+#: Merge.rc:4670
msgid "Communication"
msgstr "通訊"
#. IDS_PRPCAT_CONTACT
-#: Merge.rc:4661
+#: Merge.rc:4671
msgid "Contact"
msgstr "聯絡人"
#. IDS_PRPCAT_DEVICES
-#: Merge.rc:4662
+#: Merge.rc:4672
msgid "Devices"
msgstr "裝置"
#. IDS_PRPCAT_DOCUMENT
-#: Merge.rc:4663
+#: Merge.rc:4673
msgid "Document"
msgstr "文件"
#. IDS_PRPCAT_HOME
-#: Merge.rc:4664
+#: Merge.rc:4674
msgid "Home"
msgstr "主頁"
#. IDS_PRPCAT_JOURNAL
-#: Merge.rc:4666
+#: Merge.rc:4676
msgid "Journal"
msgstr "日誌"
#. IDS_PRPCAT_LINK
-#: Merge.rc:4667
+#: Merge.rc:4677
msgid "Link"
msgstr "連結"
#. IDS_PRPCAT_MEDIA
-#: Merge.rc:4668
+#: Merge.rc:4678
msgid "Media"
msgstr "媒體"
#. IDS_PRPCAT_MUSIC
-#: Merge.rc:4670
+#: Merge.rc:4680
msgid "Music"
msgstr "音樂"
#. IDS_PRPCAT_NOTE
-#: Merge.rc:4671
+#: Merge.rc:4681
msgid "Note"
msgstr "筆記"
#. IDS_PRPCAT_PHOTO
-#: Merge.rc:4672
+#: Merge.rc:4682
msgid "Photo"
msgstr "照片"
#. IDS_PRPCAT_RECORDEDTV
-#: Merge.rc:4673
+#: Merge.rc:4683
msgid "RecordedTV"
msgstr "RecordedTV"
#. IDS_PRPCAT_SEARCH
-#: Merge.rc:4674
+#: Merge.rc:4684
msgid "Search"
msgstr "搜尋"
#. IDS_PRPCAT_SECURITY
-#: Merge.rc:4675
+#: Merge.rc:4685
msgid "Security"
msgstr "安全性"
#. IDS_PRPCAT_SOFTWARE
-#: Merge.rc:4676
+#: Merge.rc:4686
msgid "Software"
msgstr "軟體"
#. IDS_PRPCAT_TASK
-#: Merge.rc:4677
+#: Merge.rc:4687
msgid "Task"
msgstr "工作"
#. IDS_PRPCAT_VIDEO
-#: Merge.rc:4678
+#: Merge.rc:4688
msgid "Video"
msgstr "影片"
#. IDS_PRPCAT_HASH
-#: Merge.rc:4679
+#: Merge.rc:4689
msgid "Hash"
msgstr "雜湊"
#. IDS_CANT_COMPARE_FILES
-#: Merge.rc:4685
+#: Merge.rc:4695
msgid "Unable to compare files"
msgstr "無法比較檔案"
#. IDS_ABORTED_ITEM
-#: Merge.rc:4686
+#: Merge.rc:4696
msgid "Item aborted"
msgstr "中斷的項目"
#. IDS_FILE_SKIPPED
-#: Merge.rc:4687
+#: Merge.rc:4697
msgid "File skipped"
msgstr "略過的檔案"
#. IDS_DIR_SKIPPED
-#: Merge.rc:4688
+#: Merge.rc:4698
msgid "Folder skipped"
msgstr "略過的資料夾"
#. IDS_LEFT_ONLY_IN_FMT
-#: Merge.rc:4689
+#: Merge.rc:4699
#, c-format
msgid "Left only: %1"
msgstr "僅左側:%1"
#. IDS_MIDDLE_ONLY_IN_FMT
-#: Merge.rc:4690
+#: Merge.rc:4700
#, c-format
msgid "Middle only: %1"
msgstr "僅中間:%1"
#. IDS_RIGHT_ONLY_IN_FMT
-#: Merge.rc:4691
+#: Merge.rc:4701
#, c-format
msgid "Right only: %1"
msgstr "僅右側:%1"
#. IDS_DOES_NOT_EXIST_IN_FMT
-#: Merge.rc:4692
+#: Merge.rc:4702
#, c-format
msgid "Does not exist in %1"
msgstr "在 %1 中不存在"
#. IDS_BIN_FILES_SAME
-#: Merge.rc:4693
+#: Merge.rc:4703
msgid "Binary files are identical"
msgstr "二進制檔完全相同"
#. IDS_BIN_FILES_DIFF
-#: Merge.rc:4699
+#: Merge.rc:4709
msgid "Binary files are different"
msgstr "二進制檔不同"
#. IDS_FILES_ARE_DIFFERENT
-#: Merge.rc:4700
+#: Merge.rc:4710
msgid "Files are different"
msgstr "檔案不同"
#. IDS_FOLDERS_ARE_DIFFERENT
-#: Merge.rc:4701
+#: Merge.rc:4711
msgid "Folders are different"
msgstr "兩資料夾不同"
#. IDS_LEFTONLY
-#: Merge.rc:4702
+#: Merge.rc:4712
msgid "Left Only"
msgstr "僅左側"
#. IDS_RIGHTONLY
-#: Merge.rc:4703
+#: Merge.rc:4713
msgid "Right Only"
msgstr "僅右側"
#. IDS_MIDDLEONLY
-#: Merge.rc:4704
+#: Merge.rc:4714
msgid "Middle Only"
msgstr "僅中間"
#. IDS_NOITEMLEFT
-#: Merge.rc:4705
+#: Merge.rc:4715
msgid "No item in left"
msgstr "左側無項目"
#. IDS_NOITEMRIGHT
-#: Merge.rc:4706
+#: Merge.rc:4716
msgid "No item in right"
msgstr "右側無項目"
#. IDS_NOITEMMIDDLE
-#: Merge.rc:4707
+#: Merge.rc:4717
msgid "No item in middle"
msgstr "中間無項目"
#. IDS_CMPRES_ERROR
-#: Merge.rc:4709
+#: Merge.rc:4719
msgid "Error"
msgstr "錯誤"
#. IDS_TEXT_FILES_SAME
-#: Merge.rc:4710
+#: Merge.rc:4720
msgid "Text files are identical"
msgstr "文字檔內容相同"
#. IDS_LEFTONLY_DIFF
-#: Merge.rc:4711
+#: Merge.rc:4721
msgid " (Middle and right are identical)"
msgstr " (中間和右側內容相同)"
#. IDS_MIDDLEONLY_DIFF
-#: Merge.rc:4712
+#: Merge.rc:4722
msgid " (Left and right are identical)"
msgstr " (左側和右側內容相同)"
#. IDS_RIGHTONLY_DIFF
-#: Merge.rc:4713
+#: Merge.rc:4723
msgid " (Left and middle are identical)"
msgstr " (左側和中間內容相同)"
#. IDS_PATH_MISMATCH
-#: Merge.rc:4714
+#: Merge.rc:4724
msgid " (paths differ)"
msgstr ""
#. IDS_TEXT_FILES_DIFF
-#: Merge.rc:4715
+#: Merge.rc:4725
msgid "Text files are different"
msgstr "文字檔內容不同"
#. IDS_IMAGE_FILES_SAME
-#: Merge.rc:4716
+#: Merge.rc:4726
msgid "Image files are identical"
msgstr "圖片檔相同"
#. IDS_IMAGE_FILES_DIFF
-#: Merge.rc:4717
+#: Merge.rc:4727
msgid "Image files are different"
msgstr "圖片檔不同"
#. IDS_EXPR_DIFF
-#: Merge.rc:4718
+#: Merge.rc:4728
#, c-format
msgid "Files are different (expr: %1)"
msgstr "檔案不同 (表達式:%1)"
#. IDS_HASH_GROUP
-#: Merge.rc:4719
+#: Merge.rc:4729
#, c-format
msgid "Group%d"
msgstr "群組%d"
#. IDS_RENAME_MOVE_DETECTION_DISALBED
-#: Merge.rc:4720
+#: Merge.rc:4730
msgctxt "Options dialog|Compare|Folder|Detect renames and moves"
msgid "Disabled"
msgstr "已停用"
#. IDS_RENAME_MOVE_DETECTION_RENAME
-#: Merge.rc:4721
+#: Merge.rc:4731
msgid "Detect renames"
msgstr "偵測重新命名"
#. IDS_RENAME_MOVE_DETECTION_RENAME_MOVE
-#: Merge.rc:4722
+#: Merge.rc:4732
msgid "Detect renames and moves"
msgstr "偵測重新命名與移動"
#. IDS_RENAME_MOVE_MERGE_MODE_RENAME
-#: Merge.rc:4723
+#: Merge.rc:4733
msgid "Merge renames"
msgstr ""
#. IDS_RENAME_MOVE_MERGE_MODE_RENAME_MOVE
-#: Merge.rc:4724
+#: Merge.rc:4734
msgid "Merge renames and moves"
msgstr ""
#. IDS_RENAMED
-#: Merge.rc:4725
+#: Merge.rc:4735
msgid "Renamed"
msgstr "已重新命名"
#. IDS_MOVED
-#: Merge.rc:4726
+#: Merge.rc:4736
msgid "Moved"
msgstr "已移動"
#. IDS_RENAMED_MOVED
-#: Merge.rc:4727
+#: Merge.rc:4737
msgid "Renamed/Moved"
msgstr "已重新命名/已移動"
#. IDS_RENAMED_MOVED_ITEMS
-#: Merge.rc:4728
+#: Merge.rc:4738
#, c-format
msgid "(%1 items)"
msgstr "(%1 個項目)"
#. IDS_RENAMED_MOVED_RESULT
-#: Merge.rc:4729
+#: Merge.rc:4739
#, c-format
msgid "%1 (set %2): "
msgstr "%1 (組合 %2):"
#. IDS_SWITCH_FLAT_MODE
-#: Merge.rc:4730
+#: Merge.rc:4740
msgid ""
"Some moved items have been merged.\n"
"In Tree Mode, these items may appear in positions that do not reflect the actual folder structure, which can be confusing.\n"
@@ -6575,235 +6586,235 @@ msgid ""
msgstr ""
#. IDS_ELAPSED_TIME
-#: Merge.rc:4736
+#: Merge.rc:4746
#, c-format
msgid "Elapsed time: %ld ms"
msgstr "經過時間: %ld 毫秒"
#. IDS_STATUS_SELITEM1
-#: Merge.rc:4737
+#: Merge.rc:4747
msgid "1 item selected"
msgstr "已選取 1 個項目"
#. IDS_STATUS_SELITEMS
-#: Merge.rc:4738
+#: Merge.rc:4748
#, c-format
msgid "%1 items selected"
msgstr "已選取 %1 個項目"
#. IDS_COLDESC_FILENAME
-#: Merge.rc:4744
+#: Merge.rc:4754
msgid "Filename or folder name."
msgstr "檔案名稱或資料夾名稱。"
#. IDS_COLDESC_DIR
-#: Merge.rc:4745
+#: Merge.rc:4755
msgid "Subfolder name when subfolders are included."
msgstr "包括子資料夾時之子資料夾名稱。"
#. IDS_COLDESC_RESULT
-#: Merge.rc:4746
+#: Merge.rc:4756
msgid "Comparison result, long form."
msgstr "比較結果,長式表單。"
#. IDS_COLDESC_LTIMEM
-#: Merge.rc:4751
+#: Merge.rc:4761
msgid "Left side modification date."
msgstr "左側修改日期。"
#. IDS_COLDESC_RTIMEM
-#: Merge.rc:4752
+#: Merge.rc:4762
msgid "Right side modification date."
msgstr "左側修改日期。"
#. IDS_COLDESC_MTIMEM
-#: Merge.rc:4753
+#: Merge.rc:4763
msgid "Middle side modification date."
msgstr "中間修改日期。"
#. IDS_COLDESC_EXTENSION
-#: Merge.rc:4754
+#: Merge.rc:4764
msgid "File's extension."
msgstr "副檔名。"
#. IDS_COLDESC_LSIZE
-#: Merge.rc:4755
+#: Merge.rc:4765
msgid "Left file size in bytes."
msgstr "左側檔案位元組大小。"
#. IDS_COLDESC_RSIZE
-#: Merge.rc:4756
+#: Merge.rc:4766
msgid "Right file size in bytes."
msgstr "右側檔案位元組大小。"
#. IDS_COLDESC_MSIZE
-#: Merge.rc:4757
+#: Merge.rc:4767
msgid "Middle file size in bytes."
msgstr "中間檔案位元組大小。"
#. IDS_COLDESC_LSIZE_SHORT
-#: Merge.rc:4758
+#: Merge.rc:4768
msgid "Left file size abbreviated."
msgstr "左側檔案簡式大小。"
#. IDS_COLDESC_RSIZE_SHORT
-#: Merge.rc:4759
+#: Merge.rc:4769
msgid "Right file size abbreviated."
msgstr "右側檔案簡式大小。"
#. IDS_COLDESC_MSIZE_SHORT
-#: Merge.rc:4760
+#: Merge.rc:4770
msgid "Middle file size abbreviated."
msgstr "中間檔案簡式大小。"
#. IDS_COLDESC_LTIMEC
-#: Merge.rc:4766
+#: Merge.rc:4776
msgid "Left side creation time."
msgstr "左側建立時間。"
#. IDS_COLDESC_RTIMEC
-#: Merge.rc:4767
+#: Merge.rc:4777
msgid "Right side creation time."
msgstr "右側建立時間。"
#. IDS_COLDESC_MTIMEC
-#: Merge.rc:4768
+#: Merge.rc:4778
msgid "Middle side creation time."
msgstr "中間建立時間。"
#. IDS_COLDESC_NEWER
-#: Merge.rc:4769
+#: Merge.rc:4779
msgid "Tells which side has newer modification date."
msgstr "告知哪邊有較新的修改日期。"
#. IDS_COLDESC_LVERSION
-#: Merge.rc:4770
+#: Merge.rc:4780
msgid "Left side file version, only for some file types."
msgstr "左側檔案版本,只某些檔案類型。"
#. IDS_COLDESC_RVERSION
-#: Merge.rc:4771
+#: Merge.rc:4781
msgid "Right side file version, only for some file types."
msgstr "右側檔案版本,只某些檔案類型。"
#. IDS_COLDESC_MVERSION
-#: Merge.rc:4776
+#: Merge.rc:4786
msgid "Middle side file version, only for some file types."
msgstr "中間檔案版本,只某些檔案類型。"
#. IDS_COLDESC_RESULT_ABBR
-#: Merge.rc:4777
+#: Merge.rc:4787
msgid "Short comparison result."
msgstr "短式比較結果。"
#. IDS_COLDESC_LATTRIBUTES
-#: Merge.rc:4778
+#: Merge.rc:4788
msgid "Left side attributes."
msgstr "左側屬性。"
#. IDS_COLDESC_RATTRIBUTES
-#: Merge.rc:4779
+#: Merge.rc:4789
msgid "Right side attributes."
msgstr "右側屬性。"
#. IDS_COLDESC_MATTRIBUTES
-#: Merge.rc:4780
+#: Merge.rc:4790
msgid "Middle side attributes."
msgstr "中間屬性。"
#. IDS_COLDESC_LEOL_TYPE
-#: Merge.rc:4781
+#: Merge.rc:4791
msgid "Left side file EOL type."
msgstr "左側檔案的行尾類型。"
#. IDS_COLDESC_REOL_TYPE
-#: Merge.rc:4782
+#: Merge.rc:4792
msgid "Right side file EOL type."
msgstr "右側檔案的行尾類型。"
#. IDS_COLDESC_MEOL_TYPE
-#: Merge.rc:4783
+#: Merge.rc:4793
msgid "Middle side file EOL type."
msgstr "中間檔案的行尾類型。"
#. IDS_COLDESC_LENCODING
-#: Merge.rc:4789
+#: Merge.rc:4799
msgid "Left side encoding."
msgstr "左側編碼。"
#. IDS_COLDESC_RENCODING
-#: Merge.rc:4790
+#: Merge.rc:4800
msgid "Right side encoding."
msgstr "右側編碼。"
#. IDS_COLDESC_MENCODING
-#: Merge.rc:4791
+#: Merge.rc:4801
msgid "Middle side encoding."
msgstr "中間編碼。"
#. IDS_COLDESC_NIDIFFS
-#: Merge.rc:4792
+#: Merge.rc:4802
msgid "Number of ignored differences in file. Ignored and cannot be merged."
msgstr "被忽略的檔案中的差異個數。既被忽略,就不能合併。"
#. IDS_COLDESC_NSDIFFS
-#: Merge.rc:4793
+#: Merge.rc:4803
msgid "Number of differences in file (excluding ignored)."
msgstr "檔案中的差異個數。此數不包括被忽略的差異。"
#. IDS_COLDESC_BINARY
-#: Merge.rc:4794
+#: Merge.rc:4804
msgid "Shows an asterisk (*) if the file is binary."
msgstr "是二進制檔,就顯示星號 (*)"
#. IDS_COLDESC_UNPACKER
-#: Merge.rc:4795
+#: Merge.rc:4805
msgid "Unpacker plugin name or pipeline."
msgstr "解包器外掛程式名稱或處理序。"
#. IDS_COLDESC_PREDIFFER
-#: Merge.rc:4796
+#: Merge.rc:4806
msgid "Prediffer plugin name or pipeline."
msgstr "預差異化外掛名稱或處理序。"
#. IDS_DIRECTORY_REPORT_TITLE
-#: Merge.rc:4802
+#: Merge.rc:4812
#, c-format
msgid "Compare %1 with %2"
msgstr "比較 %1 和 %2"
#. IDS_DIRECTORY_REPORT_TITLE3
-#: Merge.rc:4803
+#: Merge.rc:4813
#, c-format
msgid "Compare %1 with %2 and %3"
msgstr "比較 %1 和 %2 與 %3"
#. IDS_REPORT_COMMALIST
-#: Merge.rc:4804
+#: Merge.rc:4814
msgid "Comma-separated list"
msgstr "逗號分隔列表"
#. IDS_REPORT_TABLIST
-#: Merge.rc:4805
+#: Merge.rc:4815
msgid "Tab-separated list"
msgstr "製表符(Tab)分隔列表"
#. IDS_REPORT_SIMPLEHTML
-#: Merge.rc:4806
+#: Merge.rc:4816
msgid "Simple HTML"
msgstr "單純 HTML"
#. IDS_REPORT_SIMPLEXML
-#: Merge.rc:4807
+#: Merge.rc:4817
msgid "Simple XML"
msgstr "單純 XML"
-#: Merge.rc:4809
+#: Merge.rc:4819
msgid "Report file already exists. Overwrite?"
msgstr "報告檔已經存在。要覆蓋現有檔案嗎?"
#. IDS_REPORT_ERROR
-#: Merge.rc:4814
+#: Merge.rc:4824
#, c-format
msgid ""
"Error creating the report:\n"
@@ -6813,27 +6824,27 @@ msgstr ""
"%1"
#. IDS_REPORT_SUCCESS
-#: Merge.rc:4815
+#: Merge.rc:4825
msgid "Report created successfully."
msgstr "成功產生報告。"
#. IDS_SYNCPOINT_LASTBLOCK
-#: Merge.rc:4821
+#: Merge.rc:4831
msgid "Cannot add a synchronization point at this line."
msgstr "無法在此行新增同步點。"
#. IDS_FILE_TO_ITSELF
-#: Merge.rc:4827
+#: Merge.rc:4837
msgid "Same file is opened in both panes."
msgstr "相同檔案開啟到兩邊。"
#. IDS_FILESSAME
-#: Merge.rc:4828
+#: Merge.rc:4838
msgid "Selected files are identical."
msgstr "所選檔案完全相同。"
#. IDS_FILESSAME_CURCFG
-#: Merge.rc:4829
+#: Merge.rc:4839
msgid ""
"Selected files are identical (with current settings).\r\n"
"Checking binary identity..."
@@ -6842,7 +6853,7 @@ msgstr ""
"正在檢查二進制一致性..."
#. IDS_FILESSAME_BINERROR
-#: Merge.rc:4830
+#: Merge.rc:4840
msgid ""
"Selected files are identical (with current settings).\r\n"
"But binary comparison failed."
@@ -6851,12 +6862,12 @@ msgstr ""
"但二進制比較失敗。"
#. IDS_FILESSAME_BINSAME
-#: Merge.rc:4831
+#: Merge.rc:4841
msgid "Selected files are identical (binary match)."
msgstr "所選檔案相同(二進制符合)。"
#. IDS_FILESSAME_BINDIFF
-#: Merge.rc:4832
+#: Merge.rc:4842
msgid ""
"Selected files are identical (with current settings).\r\n"
"But differ at the binary level."
@@ -6865,17 +6876,17 @@ msgstr ""
"但在二進制層級上有差異。"
#. IDS_FILEERROR
-#: Merge.rc:4833
+#: Merge.rc:4843
msgid "An error occurred while comparing files."
msgstr "比對檔案時發生錯誤。"
#. IDS_TEMP_FILEERROR
-#: Merge.rc:4834
+#: Merge.rc:4844
msgid "Could not create temporary files. Check your temporary path settings."
msgstr "無法建立暫存檔案。請檢查暫存路徑之設定。"
#. IDS_SUGGEST_IGNOREEOL
-#: Merge.rc:4835
+#: Merge.rc:4845
msgid ""
"Files use different EOL.\n"
"\n"
@@ -6890,17 +6901,17 @@ msgstr ""
"請至選項的『比較』區段中,設定『忽略行尾差異(Windows/Unix/Mac)』。"
#. IDS_INVALID_DIRECTORY
-#: Merge.rc:4836
+#: Merge.rc:4846
msgid "Selected folder is invalid."
msgstr "所選的資料夾無效。"
#. IDS_CANNOT_OPEN_BINARYFILE
-#: Merge.rc:4837
+#: Merge.rc:4847
msgid "Cannot open a binary file in Editor."
msgstr "編輯器不能開啟二進制檔。"
#. IDS_CREATE_PAIR_FOLDER
-#: Merge.rc:4838
+#: Merge.rc:4848
#, c-format
msgid ""
"Create matching folder:\n"
@@ -6914,41 +6925,41 @@ msgstr ""
"到另一邊,然後開啟兩夾嗎?"
#. IDS_CONFIRM_COPY_ALL_DIFFS
-#: Merge.rc:4839
+#: Merge.rc:4849
msgid "Copy all differences to other file?"
msgstr "您確定要將所有差異複製到另一個檔案嗎?"
#. IDS_MOVE_TO_NEXTFILE
-#: Merge.rc:4844
+#: Merge.rc:4854
msgid "Move to next file?"
msgstr "您要移動到下一個檔案嗎?"
#. IDS_MOVE_TO_PREVFILE
-#: Merge.rc:4845
+#: Merge.rc:4855
msgid "Move to previous file?"
msgstr "您要移動到上一個檔案嗎?"
#. IDS_MOVE_TO_NEXTPAGE
-#: Merge.rc:4846
+#: Merge.rc:4856
msgid "Move to next page?"
msgstr "您要移動到下一頁嗎?"
#. IDS_MOVE_TO_PREVPAGE
-#: Merge.rc:4847
+#: Merge.rc:4857
msgid "Move to previous page?"
msgstr "您要移動到上一頁嗎?"
#. IDS_MOVE_TO_FIRSTFILE
-#: Merge.rc:4848
+#: Merge.rc:4858
msgid "Move to first file?"
msgstr "您要移動到首個檔案嗎?"
#. IDS_MOVE_TO_LASTFILE
-#: Merge.rc:4849
+#: Merge.rc:4859
msgid "Move to last file?"
msgstr "您要移動到最後一個檔案嗎?"
-#: Merge.rc:4856
+#: Merge.rc:4866
#, c-format
msgid ""
"Different codepages: left (cp%d), right (cp%d).\n"
@@ -6959,51 +6970,51 @@ msgstr ""
"要用個別字碼頁顯示 (顯示效果較佳)還是用預設的 Windows 字碼頁顯示 (合併較安全)?\n"
"要使用相同的預設 windows 字碼頁去看兩邊嗎?(建議)"
-#: Merge.rc:4858
+#: Merge.rc:4868
msgid "Information lost due to encoding errors: both files"
msgstr "因編碼問題導致內容無法正常呈現:兩個檔案皆如此"
-#: Merge.rc:4860
+#: Merge.rc:4870
msgid "Information lost due to encoding errors: first file"
msgstr "因編碼問題導致內容無法正常呈現:第一個檔案"
-#: Merge.rc:4862
+#: Merge.rc:4872
msgid "Information lost due to encoding errors: second file"
msgstr "因編碼問題導致內容無法正常呈現:第二個檔案"
-#: Merge.rc:4864
+#: Merge.rc:4874
msgid "Information lost due to encoding errors: third file"
msgstr "因編碼問題導致內容無法正常呈現:第三個檔案"
#. IDS_LINEDIFF_NODIFF
-#: Merge.rc:4870
+#: Merge.rc:4880
msgid "No difference"
msgstr "無差異"
#. IDS_LINEDIFF_NODIFF_CAPTION
-#: Merge.rc:4871
+#: Merge.rc:4881
msgid "Line difference"
msgstr "行內差異"
#. IDS_NUM_REPLACED
-#: Merge.rc:4877
+#: Merge.rc:4887
#, c-format
msgid "Replaced %1 string(s)."
msgstr "已取代 %1 個字串。"
#. IDS_EDIT_TEXT_NOT_FOUND
-#: Merge.rc:4878
+#: Merge.rc:4888
#, c-format
msgid "Cannot find string \"%s\"."
msgstr "找不到 \"%s\" 字串。"
#. IDS_MERGE_MODE
-#: Merge.rc:4884
+#: Merge.rc:4894
msgid "Entering Merge Mode. Press F9 to turn off."
msgstr "您已經進入合併模式。如果您想要關閉合併模式,請按 F9。"
#. IDS_AUTO_MERGE
-#: Merge.rc:4890
+#: Merge.rc:4900
#, c-format
msgid ""
"Automatic merges: %1\n"
@@ -7013,102 +7024,102 @@ msgstr ""
"未解決衝突數目: %2"
#. IDS_CODEPAGE_MERGED
-#: Merge.rc:4891
+#: Merge.rc:4901
msgid "Codepage change merged."
msgstr "字碼頁變更已合併。"
#. IDS_CODEPAGE_CONFLICT
-#: Merge.rc:4892
+#: Merge.rc:4902
msgid "Codepage changes are conflicting."
msgstr "字碼頁變更存在衝突。"
#. IDS_EOL_MERGED
-#: Merge.rc:4893
+#: Merge.rc:4903
msgid "EOL change merged."
msgstr "行尾格式變更已合併。"
#. IDS_EOL_CONFLICT
-#: Merge.rc:4894
+#: Merge.rc:4904
msgid "EOL changes are conflicting."
msgstr "行尾格式變更發生衝突。"
# also refer to line 5584
#. IDS_LOCBAR_CAPTION
-#: Merge.rc:4900
+#: Merge.rc:4910
msgid "Location Pane"
msgstr "位置窗格"
# also refer to line 5578
# 差異窗格
#. IDS_DIFFBAR_CAPTION
-#: Merge.rc:4901
+#: Merge.rc:4911
msgid "Diff Pane"
msgstr "差異面板"
#. IDS_DIFF_SUCCEEDED
-#: Merge.rc:4908
+#: Merge.rc:4918
msgid "Patch file written."
msgstr "修補檔案成功寫入。"
#. IDS_DIFF_ITEM1NOTFOUND
-#: Merge.rc:4909
+#: Merge.rc:4919
msgid "First item not found!"
msgstr "1. 找不到項目!"
#. IDS_DIFF_ITEM2NOTFOUND
-#: Merge.rc:4910
+#: Merge.rc:4920
msgid "Second item not found!"
msgstr "2. 找不到項目!"
#. IDS_DIFF_FILEOVERWRITE
-#: Merge.rc:4911
+#: Merge.rc:4921
msgid "Patch file already exists. Overwrite?"
msgstr "修補檔案已存在。要覆寫它嗎?"
#. IDS_DIFF_SELECTEDFILES
-#: Merge.rc:4912
+#: Merge.rc:4922
#, c-format
msgid "[%1 files selected]"
msgstr "[%1 個檔案已選取]"
#. IDS_DIFF_NORMAL
-#: Merge.rc:4913
+#: Merge.rc:4923
msgid "Normal"
msgstr "一般"
#. IDS_DIFF_CONTEXT
-#: Merge.rc:4914
+#: Merge.rc:4924
msgid "Context"
msgstr "脈絡"
#. IDS_DIFF_UNIFIED
-#: Merge.rc:4915
+#: Merge.rc:4925
msgid "Unified"
msgstr "同一化"
#. IDS_FILEWRITE_ERROR
-#: Merge.rc:4917
+#: Merge.rc:4927
#, c-format
msgid "Could not write to file %1."
msgstr "無法寫入到檔案 %1。"
#. IDS_PATH_NOT_ABSOLUTE
-#: Merge.rc:4918
+#: Merge.rc:4928
#, c-format
msgid "Output path is not absolute: %1"
msgstr "指定的輸出路徑不是絕對路徑:%1"
#. IDS_MUST_SPECIFY_OUTPUT
-#: Merge.rc:4919
+#: Merge.rc:4929
msgid "Specify an output file."
msgstr "指定一個輸出檔。"
-#: Merge.rc:4921
+#: Merge.rc:4931
msgid "Cannot create patch from binary files."
msgstr "無法從二進制檔建補綴檔。"
#. IDS_SAVEFILES_FORPATCH
-#: Merge.rc:4922
+#: Merge.rc:4932
msgid ""
"Save all files first.\n"
"\n"
@@ -7119,12 +7130,12 @@ msgstr ""
"建補綴檔前得先儲存檔內所有異動。"
#. IDS_FOLDER_NOTEXIST
-#: Merge.rc:4923
+#: Merge.rc:4933
msgid "Folder does not exist."
msgstr "資料夾不存在。"
#. IDS_NO_ZIP_SUPPORT
-#: Merge.rc:4928
+#: Merge.rc:4938
msgid ""
"Archive support not enabled.\n"
"7-Zip and/or Merge7z*.dll not found.\n"
@@ -7135,37 +7146,37 @@ msgstr ""
"請參考手冊取得更多有關壓縮支援和啟用壓縮的資訊。"
#. IDS_OPT_EXPORT_CAPTION
-#: Merge.rc:4929
+#: Merge.rc:4939
msgid "Select file for export"
msgstr "選取檔案以匯出"
#. IDS_OPT_IMPORT_CAPTION
-#: Merge.rc:4930
+#: Merge.rc:4940
msgid "Select file for import"
msgstr "選取檔案以匯入"
#. IDS_OPT_IMPORT_DONE
-#: Merge.rc:4931
+#: Merge.rc:4941
msgid "Options imported from file."
msgstr "從檔案匯入選項。"
#. IDS_OPT_EXPORT_DONE
-#: Merge.rc:4932
+#: Merge.rc:4942
msgid "Options exported to file."
msgstr "匯出選項到檔案。"
#. IDS_OPT_IMPORT_ERR
-#: Merge.rc:4933
+#: Merge.rc:4943
msgid "Failed to import options from file."
msgstr "無法從檔案匯入選項。"
#. IDS_OPT_EXPORT_ERR
-#: Merge.rc:4934
+#: Merge.rc:4944
msgid "Failed to write options to file."
msgstr "無法匯出選項到檔案。"
#. IDS_CLOSEALL_WINDOWS
-#: Merge.rc:4935
+#: Merge.rc:4945
msgid ""
"Close multiple compare windows?\n"
"\n"
@@ -7176,45 +7187,45 @@ msgstr ""
"要繼續嗎?"
#. IDS_EOL_MIXED
-#: Merge.rc:4944
+#: Merge.rc:4954
msgid "Mixed"
msgstr "混合"
#. IDS_EOL_BIN
-#: Merge.rc:4945
+#: Merge.rc:4955
msgctxt "EOL Type"
msgid "Binary"
msgstr "二進制"
#. IDS_EOL_NONE
-#: Merge.rc:4949
+#: Merge.rc:4959
msgid "None"
msgstr "無"
#. IDS_MARKER_COLOR_FMT
-#: Merge.rc:4950
+#: Merge.rc:4960
#, c-format
msgid "Marker Color %d"
msgstr "標記顏色 %d"
#. IDS_MARKER_NEW_PATTERN
-#: Merge.rc:4951
+#: Merge.rc:4961
msgid "New Pattern"
msgstr "新增模式"
#. IDS_PLUGINSLIST_TYPE
-#: Merge.rc:4957
+#: Merge.rc:4967
msgid "Type"
msgstr "類型"
# What does "Editor script" mean? Perhaps "editing scripts" or "scripts to edit"?
#. IDS_PLUGINS_TYPE_EDITSCRIPT
-#: Merge.rc:4961
+#: Merge.rc:4971
msgid "Editor script"
msgstr "編輯器隨譯即行碼"
#. ID_SELECTLINEDIFF
-#: Merge.rc:4967
+#: Merge.rc:4977
msgid ""
"\n"
"Difference in Current Line (F4)"
@@ -7223,7 +7234,7 @@ msgstr ""
"選取行內差異 (F4)"
#. ID_OPTIONS
-#: Merge.rc:4968
+#: Merge.rc:4978
msgid ""
"\n"
"Options"
@@ -7232,7 +7243,7 @@ msgstr ""
"選項"
#. ID_REFRESH
-#: Merge.rc:4969
+#: Merge.rc:4979
msgid ""
"\n"
"Refresh (F5)"
@@ -7241,7 +7252,7 @@ msgstr ""
"重整 (F5)"
#. ID_PREVDIFF
-#: Merge.rc:4975
+#: Merge.rc:4985
msgid ""
"\n"
"Previous Difference (Alt+Up)"
@@ -7250,7 +7261,7 @@ msgstr ""
"上一個差異 (Alt+Up)"
#. ID_NEXTDIFF
-#: Merge.rc:4976
+#: Merge.rc:4986
msgid ""
"\n"
"Next Difference (Alt+Down)"
@@ -7259,7 +7270,7 @@ msgstr ""
"下一個差異 (Alt+Down)"
#. ID_PREVCONFLICT
-#: Merge.rc:4977
+#: Merge.rc:4987
msgid ""
"\n"
"Previous Conflict (Alt+Shift+Up)"
@@ -7268,7 +7279,7 @@ msgstr ""
"上一個衝突 (Alt+Shift+Up)"
#. ID_NEXTCONFLICT
-#: Merge.rc:4978
+#: Merge.rc:4988
msgid ""
"\n"
"Next Conflict (Alt+Shift+Down)"
@@ -7277,7 +7288,7 @@ msgstr ""
"下一個衝突 (Alt+Shift+Down)"
#. ID_FIRSTDIFF
-#: Merge.rc:4983
+#: Merge.rc:4993
msgid ""
"\n"
"First Difference (Alt+Home)"
@@ -7286,7 +7297,7 @@ msgstr ""
"首個差異 (Alt+Home)"
#. ID_CURDIFF
-#: Merge.rc:4984
+#: Merge.rc:4994
msgid ""
"\n"
"Current Difference (Alt+Enter)"
@@ -7295,7 +7306,7 @@ msgstr ""
"目前差異 (Alt+Enter)"
#. ID_LASTDIFF
-#: Merge.rc:4985
+#: Merge.rc:4995
msgid ""
"\n"
"Last Difference (Alt+End)"
@@ -7304,7 +7315,7 @@ msgstr ""
"最後一個差異 (Alt+End)"
#. ID_L2R
-#: Merge.rc:4986
+#: Merge.rc:4996
msgid ""
"\n"
"Copy to Right (Alt+Right)"
@@ -7313,7 +7324,7 @@ msgstr ""
"複製到右側 (Alt+Right)"
#. ID_R2L
-#: Merge.rc:4987
+#: Merge.rc:4997
msgid ""
"\n"
"Copy to Left (Alt+Left)"
@@ -7322,7 +7333,7 @@ msgstr ""
"複製到左側 (Alt+Left)"
#. ID_L2RNEXT
-#: Merge.rc:4988
+#: Merge.rc:4998
msgid ""
"\n"
"Copy to Right and Advance (Ctrl+Alt+Right)"
@@ -7331,7 +7342,7 @@ msgstr ""
"複製到右側後到下一個 (Ctrl+Alt+Right)"
#. ID_R2LNEXT
-#: Merge.rc:4989
+#: Merge.rc:4999
msgid ""
"\n"
"Copy to Left and Advance (Ctrl+Alt+Left)"
@@ -7340,7 +7351,7 @@ msgstr ""
"複製到左側後到下一個 (Ctrl+Alt+Left)"
#. ID_ALL_RIGHT
-#: Merge.rc:4990
+#: Merge.rc:5000
msgid ""
"\n"
"Copy All to Right"
@@ -7349,7 +7360,7 @@ msgstr ""
"全部複製到右側"
#. ID_ALL_LEFT
-#: Merge.rc:4991
+#: Merge.rc:5001
msgid ""
"\n"
"Copy All to Left"
@@ -7358,7 +7369,7 @@ msgstr ""
"全部複製到左側"
#. ID_AUTO_MERGE
-#: Merge.rc:4992
+#: Merge.rc:5002
msgid ""
"\n"
"Auto Merge (Ctrl+Alt+M)"
@@ -7367,7 +7378,7 @@ msgstr ""
"自動合併 (Ctrl+Alt+M)"
#. ID_FIRSTFILE
-#: Merge.rc:4993
+#: Merge.rc:5003
msgid ""
"\n"
"First File"
@@ -7376,7 +7387,7 @@ msgstr ""
"首個檔案"
#. ID_NEXTFILE
-#: Merge.rc:4994
+#: Merge.rc:5004
msgid ""
"\n"
"Next File (Ctrl+F8)"
@@ -7385,7 +7396,7 @@ msgstr ""
"下個檔案 (Ctrl+F8)"
#. ID_LASTFILE
-#: Merge.rc:4995
+#: Merge.rc:5005
msgid ""
"\n"
"Last File"
@@ -7394,7 +7405,7 @@ msgstr ""
"最後一個檔案"
#. ID_PREVFILE
-#: Merge.rc:4996
+#: Merge.rc:5006
msgid ""
"\n"
"Previous File (Ctrl+F7)"
@@ -7403,37 +7414,37 @@ msgstr ""
"上個檔案 (Ctrl+F7)"
#. IDS_UNPACK_AUTO
-#: Merge.rc:5003
+#: Merge.rc:5013
msgid "Adapted unpacker applied to both files (one needs extension)."
msgstr "以選用的解壓縮程式至兩個檔案 (其中一個需要副檔名)。"
#. IDS_NO_PREDIFFER
-#: Merge.rc:5004
+#: Merge.rc:5014
msgid "No Prediffer (Normal)"
msgstr "不要預差異化 (常態)"
#. IDS_SUGGESTED_PLUGINS
-#: Merge.rc:5005
+#: Merge.rc:5015
msgid "Suggested Plugins"
msgstr "建議的外掛程式"
#. IDS_NOT_SUGGESTED_PLUGINS
-#: Merge.rc:5006
+#: Merge.rc:5016
msgid "All Plugins"
msgstr "所有外掛程式"
#. IDS_PRIVATEBUILD_FMT
-#: Merge.rc:5012
+#: Merge.rc:5022
#, c-format
msgid "Private Build: %1"
msgstr "私人編譯:%1"
#. IDS_CHECKFORUPDATES_UPTODATE
-#: Merge.rc:5013
+#: Merge.rc:5023
msgid "Your software is up to date."
msgstr "您的程式已經是最新版。"
-#: Merge.rc:5015
+#: Merge.rc:5025
#, c-format
msgid ""
"WinMerge update available.\n"
@@ -7443,126 +7454,126 @@ msgstr ""
"已可以更新到 %1 (現在是 %2)。您想要現在下載嗎?"
#. IDS_ALLRIGHTS_RESERVED
-#: Merge.rc:5016
+#: Merge.rc:5026
msgid " - All rights reserved."
msgstr "- 版權所有。"
#. IDS_CHECKFORUPDATES_FAILED
-#: Merge.rc:5021
+#: Merge.rc:5031
msgid "Failed to download latest version information"
msgstr "下載最新版本資訊失敗"
#. IDS_TITLE_PLUGINS_SETTINGS
-#: Merge.rc:5027
+#: Merge.rc:5037
msgid "Plugin Settings"
msgstr "外掛程式設定"
#. IDS_NO_SCT_SCRIPTS
-#: Merge.rc:5029
+#: Merge.rc:5039
msgid "WSH not found - .sct scripts disabled"
msgstr "找不到 WSH - 停用 .sct 指令碼"
#. IDS_LOCBAR_GOTOLINE_FMT
-#: Merge.rc:5037
+#: Merge.rc:5047
#, c-format
msgid "G&o to Line %1"
msgstr "至第 %1 行 (&O)"
#. IDS_GOTO_MOVED_LINE
-#: Merge.rc:5043
+#: Merge.rc:5053
msgid "Go to Moved Line\tCtrl+Shift+G"
msgstr "前往已移動的行\tCtrl+Shift+G"
#. IDS_AUTOCOMPLETE_DISABLED
-#: Merge.rc:5049
+#: Merge.rc:5059
msgctxt "Options dialog|General|Open dialog Auto completion"
msgid "Disabled"
msgstr "已停用"
#. IDS_AUTOCOMPLETE_FILE_SYS
-#: Merge.rc:5050
+#: Merge.rc:5060
msgid "From file system"
msgstr "從檔案系統"
#. IDS_AUTOCOMPLETE_MRU
-#: Merge.rc:5051
+#: Merge.rc:5061
msgid "From Most Recently Used list"
msgstr "從最近使用清單"
#. IDS_COLORSCHEME_PLAIN
-#: Merge.rc:5057
+#: Merge.rc:5067
msgid "No Highlighting"
msgstr "無高亮顯著色"
#. IDS_COLORSCHEME_BATCH
-#: Merge.rc:5063
+#: Merge.rc:5073
msgid "Batch"
msgstr "批次"
#. IDS_COLORSCHEME_PO
-#: Merge.rc:5090
+#: Merge.rc:5100
msgid "Portable Object"
msgstr ".PO"
#. IDS_COLORSCHEME_RSRC
-#: Merge.rc:5094
+#: Merge.rc:5104
msgid "Resources"
msgstr "資源檔"
#. IDS_COLORSCHEME_SH
-#: Merge.rc:5098
+#: Merge.rc:5108
msgid "Shell"
msgstr "Shell"
#. IDS_CLOSE_LEFT_TABS
-#: Merge.rc:5115
+#: Merge.rc:5125
msgid "Close &Left Tabs"
msgstr "關閉左側分頁 (&L)"
#. IDS_CLOSE_RIGHT_TABS
-#: Merge.rc:5116
+#: Merge.rc:5126
msgid "Close R&ight Tabs"
msgstr "關閉右側分頁 (&I)"
#. IDS_CLOSE_OTHER_TABS
-#: Merge.rc:5117
+#: Merge.rc:5127
msgid "Close &Other Tabs"
msgstr "關閉其他分頁 (&O)"
#. IDS_TABBAR_AUTO_MAXWIDTH
-#: Merge.rc:5118
+#: Merge.rc:5128
msgid "Enable &Auto Max Width"
msgstr "開啟自動最大寬度 (&A)"
#. IDS_WEBPAGE_MENU
-#: Merge.rc:5128
+#: Merge.rc:5138
msgid "We&bpage"
msgstr "網頁 (&B)"
#. IDS_VIEW_WRAP_TEXT
-#: Merge.rc:5133
+#: Merge.rc:5143
msgid "W&rap Text"
msgstr "自動換行 (&R)"
#. IDS_NOTINSTALLED
-#: Merge.rc:5138
+#: Merge.rc:5148
#, c-format
msgid "%1 is not installed."
msgstr "Frhed %1。"
#. IDS_CREATE_FOLDER
-#: Merge.rc:5143
+#: Merge.rc:5153
#, c-format
msgid "%1 does not exist. Create it?"
msgstr "%1不存在,您想要建立它嗎?"
#. IDS_CREATE_FOLDER_ERROR
-#: Merge.rc:5144
+#: Merge.rc:5154
msgid "Failed to create folder."
msgstr "建立資料夾失敗。"
#. IDC_EXT_EDITOR_PATH
-#: Merge.rc:5149
+#: Merge.rc:5159
msgid ""
"Parameters:\n"
"$file: Current file path\n"
@@ -7573,486 +7584,486 @@ msgstr ""
"$linenum: 現在游標行號"
#. IDS_DIFF_ALGORITHM_DEFAULT
-#: Merge.rc:5154
+#: Merge.rc:5164
msgid "default"
msgstr "預設"
#. IDS_DIFF_ALGORITHM_MINIMAL
-#: Merge.rc:5155
+#: Merge.rc:5165
msgid "minimal"
msgstr "極簡"
#. IDS_DIFF_ALGORITHM_PATIENCE
-#: Merge.rc:5156
+#: Merge.rc:5166
msgid "patience"
msgstr "耐心"
#. IDS_DIFF_ALGORITHM_HISTOGRAM
-#: Merge.rc:5157
+#: Merge.rc:5167
msgid "histogram"
msgstr "長條圖"
#. IDS_DIFF_ALGORITHM_NONE
-#: Merge.rc:5158
+#: Merge.rc:5168
msgid "none"
msgstr "無"
#. IDS_RENDERING_MODE_GDI
-#: Merge.rc:5163
+#: Merge.rc:5173
msgid "GDI"
msgstr "GDI"
#. IDS_RENDERING_MODE_DIRECTWRITE_DEFAULT
-#: Merge.rc:5164
+#: Merge.rc:5174
msgid "DirectWrite Default"
msgstr "DirectWrite 預設值"
#. IDS_RENDERING_MODE_DIRECTWRITE_ALIASED
-#: Merge.rc:5165
+#: Merge.rc:5175
msgid "DirectWrite Aliased"
msgstr "DirectWrite 鋸齒"
#. IDS_RENDERING_MODE_DIRECTWRITE_GDI_CLASSIC
-#: Merge.rc:5166
+#: Merge.rc:5176
msgid "DirectWrite GDI Classic"
msgstr "DirectWrite GDI 傳統"
#. IDS_RENDERING_MODE_DIRECTWRITE_GDI_NATURAL
-#: Merge.rc:5167
+#: Merge.rc:5177
msgid "DirectWrite GDI Natural"
msgstr "DirectWrite GDI 自然"
#. IDS_RENDERING_MODE_DIRECTWRITE_NATURAL
-#: Merge.rc:5168
+#: Merge.rc:5178
msgid "DirectWrite Natural"
msgstr "DirectWrite 自然"
#. IDS_RENDERING_MODE_DIRECTWRITE_NATURAL_SYMMETRIC
-#: Merge.rc:5169
+#: Merge.rc:5179
msgid "DirectWrite Natural Symmetric"
msgstr "DirectWrite 自然對稱"
#. IDS_CLOSE_WINDOWS_WITH_ESC_DISABLED
-#: Merge.rc:5174
+#: Merge.rc:5184
msgctxt "Options dialog|General|Close windows with Esc"
msgid "Disabled"
msgstr "已停用"
#. IDS_CLOSE_WINDOWS_WITH_ESC_1
-#: Merge.rc:5175
+#: Merge.rc:5185
msgid "MDI child window or main window"
msgstr "MDI 子視窗或主視窗"
#. IDS_CLOSE_WINDOWS_WITH_ESC_2
-#: Merge.rc:5176
+#: Merge.rc:5186
msgid "MDI child window only"
msgstr "僅 MDI 子視窗"
#. IDS_CLOSE_WINDOWS_WITH_ESC_3
-#: Merge.rc:5177
+#: Merge.rc:5187
msgid "Close main window if only one MDI child window"
msgstr "如果只剩下一個 MDI 子視窗,則關閉主視窗"
#. IDS_DIFF_GROUP
-#: Merge.rc:5182
+#: Merge.rc:5192
msgctxt "ImgMergeFrame|LocationPane"
msgid "Diff"
msgstr "差異"
#. IDS_DIFF_HIGHLIGHT
-#: Merge.rc:5183
+#: Merge.rc:5193
msgctxt "ImgMergeFrame|LocationPane"
msgid "Highlight"
msgstr "醒目提示"
#. IDS_DIFF_BLINK
-#: Merge.rc:5184
+#: Merge.rc:5194
msgctxt "ImgMergeFrame|LocationPane"
msgid "Blink"
msgstr "閃爍"
#. IDS_DIFF_BLOCKSIZE
-#: Merge.rc:5185
+#: Merge.rc:5195
msgctxt "ImgMergeFrame|LocationPane"
msgid "Block Size"
msgstr "區塊大小"
#. IDS_DIFF_BLOCKALPHA
-#: Merge.rc:5186
+#: Merge.rc:5196
msgctxt "ImgMergeFrame|LocationPane"
msgid "Block Alpha"
msgstr "區塊透明度"
#. IDS_DIFF_CDTHRESHOLD
-#: Merge.rc:5187
+#: Merge.rc:5197
msgctxt "ImgMergeFrame|LocationPane"
msgid "CD Threshold"
msgstr "顏色差異閾值"
#. IDS_DIFF_INSERTION_DELETION_DETECTION
-#: Merge.rc:5188
+#: Merge.rc:5198
msgctxt "ImgMergeFrame|LocationPane"
msgid "Ins/Del Detection"
msgstr "插入/刪除 偵測"
#. IDS_OVERLAY_MODE_NONE
-#: Merge.rc:5189 Merge.rc:5194
+#: Merge.rc:5199 Merge.rc:5204
msgctxt "ImgMergeFrame|LocationPane"
msgid "None"
msgstr "無"
#. IDS_DIFF_INSERTION_DELETION_DETECTION_VERTICAL
-#: Merge.rc:5190
+#: Merge.rc:5200
msgctxt "ImgMergeFrame|LocationPane"
msgid "Vertical"
msgstr "垂直"
#. IDS_DIFF_INSERTION_DELETION_DETECTION_HORIZONTAL
-#: Merge.rc:5191
+#: Merge.rc:5201
msgctxt "ImgMergeFrame|LocationPane"
msgid "Horizontal"
msgstr "水平"
#. IDS_OVERLAY_GROUP
-#: Merge.rc:5192
+#: Merge.rc:5202
msgctxt "ImgMergeFrame|LocationPane"
msgid "Overlay"
msgstr "重疊"
#. IDS_OVERLAY_ALPHA
-#: Merge.rc:5193
+#: Merge.rc:5203
msgctxt "ImgMergeFrame|LocationPane"
msgid "Alpha"
msgstr "透明度"
#. IDS_OVERLAY_MODE_XOR
-#: Merge.rc:5195
+#: Merge.rc:5205
msgctxt "ImgMergeFrame|LocationPane"
msgid "XOR"
msgstr "XOR"
#. IDS_OVERLAY_MODE_ALPHA
-#: Merge.rc:5196
+#: Merge.rc:5206
msgctxt "ImgMergeFrame|LocationPane"
msgid "Alpha Blend"
msgstr "透明合成"
#. IDS_OVERLAY_MODE_ALPHA_ANIMATION
-#: Merge.rc:5197
+#: Merge.rc:5207
msgctxt "ImgMergeFrame|LocationPane"
msgid "Alpha Animation"
msgstr "透明動畫"
#. IDS_ZOOM
-#: Merge.rc:5198
+#: Merge.rc:5208
msgctxt "ImgMergeFrame|LocationPane"
msgid "Zoom"
msgstr "縮放"
#. IDS_PAGE
-#: Merge.rc:5199
+#: Merge.rc:5209
msgctxt "ImgMergeFrame|LocationPane"
msgid "Page:"
msgstr "頁面:"
#. IDS_IMGCMP_STATUS_PT_RGBA_FMT
-#: Merge.rc:5200
+#: Merge.rc:5210
#, c-format
msgid "Pt: (%d, %d) RGBA: (%d, %d, %d, %d) "
msgstr "Pt: (%d, %d) RGBA: (%d, %d, %d, %d) "
#. IDS_IMGCMP_STATUS_DIST1_FMT
-#: Merge.rc:5201
+#: Merge.rc:5211
#, c-format
msgid "Dist: %g "
msgstr "距離:%g "
#. IDS_IMGCMP_STATUS_DIST2_FMT
-#: Merge.rc:5202
+#: Merge.rc:5212
#, c-format
msgid "Dist: %g, %g "
msgstr "距離:%g, %g "
#. IDS_IMGCMP_STATUS_PAGE_ZOOM_SIZE_BPP_FMT
-#: Merge.rc:5203
+#: Merge.rc:5213
#, c-format
msgid "Page: %d/%d Zoom: %d%% %dx%dpx %dbpp "
msgstr "頁面:%d/%d 縮放:%d%% %dx%dpx %dbpp "
#. IDS_IMGCMP_STATUS_RC_FMT
-#: Merge.rc:5204
+#: Merge.rc:5214
#, c-format
msgid "Rc: (%d, %d) "
msgstr "Rc: (%d, %d)"
#. IDS_IMGCMP_STATUS_FLIPPED_FMT
-#: Merge.rc:5205
+#: Merge.rc:5215
#, c-format
msgid "Flipped: %s "
msgstr "翻轉:%s"
#. IDS_IMGCMP_STATUS_ROTATED_FMT
-#: Merge.rc:5206
+#: Merge.rc:5216
#, c-format
msgid "Rotated: %d "
msgstr "旋轉:%d"
#. IDS_IMGCMP_REPORT_ALLPAGES
-#: Merge.rc:5207
+#: Merge.rc:5217
msgid "All pages"
msgstr "所有頁面"
#. IDS_IGNSUB_STR1
-#: Merge.rc:5212
+#: Merge.rc:5222
msgid ""
msgstr "<在此編輯>"
#. IDS_IGNSUB_STR2
-#: Merge.rc:5213
+#: Merge.rc:5223
msgid "No differences found to select"
msgstr "找不到要選擇的差異"
#. IDS_IGNSUB_STR3
-#: Merge.rc:5214
+#: Merge.rc:5224
msgid "No differences found to add as substitution filter"
msgstr "找不到要新增為替代篩選器的差異"
#. IDS_IGNSUB_STR4
-#: Merge.rc:5215
+#: Merge.rc:5225
msgid "The pair is already in the Substitution Filters list"
msgstr "該配對已存在於替代篩選器列表中"
#. IDS_IGNSUB_STR5
-#: Merge.rc:5216
+#: Merge.rc:5226
msgid "Add this change to Substitution Filters?"
msgstr "要將將此變動加入替代篩選器嗎?"
#. IDS_OCRRESULT_TEXTONLY
-#: Merge.rc:5221
+#: Merge.rc:5231
msgid "Text only"
msgstr "僅文字"
#. IDS_OCRRESULT_POS_LINE
-#: Merge.rc:5222
+#: Merge.rc:5232
msgid "Line-by-line position and text"
msgstr "逐行位置和文字"
#. IDS_OCRRESULT_POS_WORD
-#: Merge.rc:5223
+#: Merge.rc:5233
msgid "Word-by-word position and text"
msgstr "逐字位置和文字"
#. IDS_USERDATAFOLDER_APPDATA
-#: Merge.rc:5228
+#: Merge.rc:5238
msgid "AppData (Roaming) folder"
msgstr "AppData (Roaming) 資料夾"
#. IDS_USERDATAFOLDER_INSTALL
-#: Merge.rc:5229
+#: Merge.rc:5239
msgid "Install folder"
msgstr "安裝資料夾"
#. IDS_USERDATAFOLDER_DOCUMENTS
-#: Merge.rc:5230
+#: Merge.rc:5240
msgid "Documents folder"
msgstr "文件資料夾"
#. IDS_SINGLEINSTANCE_DISABLED
-#: Merge.rc:5235
+#: Merge.rc:5245
msgctxt "Options dialog|General|Single instance mode"
msgid "Disabled"
msgstr "已停用"
#. IDS_SINGLEINSTANCE_STR1
-#: Merge.rc:5236
+#: Merge.rc:5246
msgid "Allow only one instance to run"
msgstr "只允許執行唯一程式"
#. IDS_SINGLEINSTANCE_STR2
-#: Merge.rc:5237
+#: Merge.rc:5247
msgid "Allow only one instance; wait for termination"
msgstr "只允許執行唯一程式;並等待終止"
#. IDS_AUTO_RELOAD_MODIFIED_FILES_DISABLED
-#: Merge.rc:5242
+#: Merge.rc:5252
msgctxt "Options dialog|General|Auto-reload modified files"
msgid "Disabled"
msgstr "已停用"
#. IDS_AUTO_RELOAD_MODIFIED_FILES_STR1
-#: Merge.rc:5243
+#: Merge.rc:5253
msgid "Only on window activated"
msgstr "僅在視窗啟用時"
#. IDS_AUTO_RELOAD_MODIFIED_FILES_STR2
-#: Merge.rc:5244
+#: Merge.rc:5254
msgid "Immediately"
msgstr "立即"
#. IDS_PLUGIN_ALL
-#: Merge.rc:5249
+#: Merge.rc:5259
msgid "Al&l"
msgstr "全部 (&L)"
#. IDS_PLUGIN_OTHERS
-#: Merge.rc:5250
+#: Merge.rc:5260
msgid "&Others"
msgstr "其他 (&O)"
-#: Merge.rc:5252
+#: Merge.rc:5262
#, c-format
msgid "Missing plugin name in pipeline: %1"
msgstr "處理序缺少外掛名稱:%1"
-#: Merge.rc:5254
+#: Merge.rc:5264
#, c-format
msgid "Missing quote in plugin pipeline: %1"
msgstr "外掛處理序中缺少引號:%1"
#. IDS_PLUGIN_NAME_ALREADY_EXISTS
-#: Merge.rc:5255
+#: Merge.rc:5265
#, c-format
msgid "Plugin name '%1' already exists."
msgstr "外掛名稱 '%1' 已經存在。"
#. IDS_PLUGIN_TITLE1
-#: Merge.rc:5256
+#: Merge.rc:5266
msgid "Specify plugin arguments"
msgstr "指定外掛程式參數"
-#: Merge.rc:5258
+#: Merge.rc:5268
#, c-format
msgid "Plugin not found or invalid: %1"
msgstr "外掛未找到或無效:%1"
#. IDS_PLUGIN_NOT_UNPACK
-#: Merge.rc:5259
+#: Merge.rc:5269
#, c-format
msgid "'%1' is not an unpacker plugin"
msgstr "「%1」 不是解壓縮外掛"
#. IDS_PLUGIN_NOT_PREDIFF
-#: Merge.rc:5260
+#: Merge.rc:5270
#, c-format
msgid "'%1' is not a prediffer plugin"
msgstr "'%1' 不是預差異化外掛"
-#: Merge.rc:5262
+#: Merge.rc:5272
#, c-format
msgid "Error prediffing '%1' with '%2'. Prediffing disabled."
msgstr "使用外掛 '%2' 預先差異檔案 '%1' 時發生錯誤。預先差異將不再應用。"
#. IDS_PLUGIN_CIRCULAR_REFERENCE
-#: Merge.rc:5263
+#: Merge.rc:5273
#, c-format
msgid "Circular reference in plugin pipeline: %1"
msgstr "外掛處理序中出現循環參照:%1"
#. IDS_PLUGIN_TYPE1
-#: Merge.rc:5264
+#: Merge.rc:5274
msgid "URL Handler"
msgstr "URL 處理程序"
#. IDS_PLUGIN_TYPE2
-#: Merge.rc:5265
+#: Merge.rc:5275
msgid "File Unpacker"
msgstr "檔案解包器"
#. IDS_PLUGIN_TYPE3
-#: Merge.rc:5266
+#: Merge.rc:5276
msgid "File or Folder Unpacker"
msgstr "檔案或資料夾解包器"
#. IDS_PLUGIN_TYPE5
-#: Merge.rc:5268
+#: Merge.rc:5278
msgid "Alias for Unpacker"
msgstr "解包器的別名"
#. IDS_PLUGIN_TYPE6
-#: Merge.rc:5269
+#: Merge.rc:5279
msgid "Alias for Prediffer"
msgstr "預差異化的別名"
#. IDS_PLUGIN_TYPE7
-#: Merge.rc:5270
+#: Merge.rc:5280
msgid "Alias for Editor script"
msgstr "編輯器腳本的別名"
#. IDS_PLUGIN_ALIAS_DESC
-#: Merge.rc:5271
+#: Merge.rc:5281
#, c-format
msgid "Alias for plugin pipeline '%1'"
msgstr "外掛處理序 '%1' 的別名"
#. IDS_PLUGIN_NEW_DESC
-#: Merge.rc:5272
+#: Merge.rc:5282
msgid "New plugin description"
msgstr "新外掛描述"
#. IDS_PLUGIN_TARGETS_ALL
-#: Merge.rc:5273
+#: Merge.rc:5283
msgid "All"
msgstr "全"
#. IDS_PLUGIN_TARGETS_1ST
-#: Merge.rc:5274
+#: Merge.rc:5284
msgid "1st"
msgstr "第一"
#. IDS_PLUGIN_TARGETS_2ND
-#: Merge.rc:5275
+#: Merge.rc:5285
msgid "2nd"
msgstr "第二"
#. IDS_PLUGIN_TARGETS_3RD
-#: Merge.rc:5276
+#: Merge.rc:5286
msgid "3rd"
msgstr "第三"
#. IDS_PLUGIN_TARGETS_1ST_2ND
-#: Merge.rc:5277
+#: Merge.rc:5287
msgid "1st and 2nd"
msgstr "第一和第二"
#. IDS_PLUGIN_TARGETS_1ST_3RD
-#: Merge.rc:5278
+#: Merge.rc:5288
msgid "1st and 3rd"
msgstr "第一和第三"
#. IDS_PLUGIN_TARGETS_2ND_3RD
-#: Merge.rc:5279
+#: Merge.rc:5289
msgid "2nd and 3rd"
msgstr "第二和第三"
#. IDS_FILTER_APPLIED
-#: Merge.rc:5284
+#: Merge.rc:5294
msgid "Filter applied"
msgstr "已套用篩選器"
#. IDS_FILTERMENU_COMPARE
-#: Merge.rc:5289
+#: Merge.rc:5299
#, c-format
msgid "Compare %1"
msgstr "比較 %1"
#. IDS_FILTERMENU_FILTER_BY_THIS_COLUMN
-#: Merge.rc:5290
+#: Merge.rc:5300
msgid "&Filter by This Column"
msgstr ""
#. IDS_FILTERMENU_FILTER_BY_THIS_COLUMN2
-#: Merge.rc:5291
+#: Merge.rc:5301
msgid "&Filter by This Column..."
msgstr ""
#. IDS_CLIPBOARDHISTORY_TIME
-#: Merge.rc:5296
+#: Merge.rc:5306
#, c-format
msgid "Clipboard at %s"
msgstr "於 %s 的剪貼簿"
#. IDS_CLIPBOARDHISTORY_DISABLED
-#: Merge.rc:5297
+#: Merge.rc:5307
msgid ""
"Clipboard history disabled.\r\n"
"Enable: Windows logo key + V, then Turn on."
@@ -8060,110 +8071,115 @@ msgstr ""
"剪貼簿歷史記錄已停用。\r\n"
"要啟用剪貼簿歷史記錄,請按下 Windows 徽標鍵 + V,然後點選「開啟」按鈕。"
-#: Merge.rc:5299
+#: Merge.rc:5309
msgid "This system does not support clipboard history."
msgstr "此系統不支援剪貼簿歷史紀錄。"
-#: Merge.rc:5301
+#: Merge.rc:5311
msgid "32-bit WinMerge does not support Clipboard Compare"
msgstr "32 位元版本的 WinMerge 不支援剪貼簿比較"
#. IDS_WEBVIEW2_RUNTIME_NOT_INSTALLED
-#: Merge.rc:5306
+#: Merge.rc:5316
msgid "WebView2 runtime not installed. Download it?"
msgstr "尚未安裝 WebView2 執行階段。是否要下載安裝?"
#. IDS_JUMPLIST_NEW_TEXT_COMPARE
-#: Merge.rc:5311
+#: Merge.rc:5321
msgid "New Text Compare"
msgstr "新文字比較"
#. IDS_JUMPLIST_NEW_TABLE_COMPARE
-#: Merge.rc:5312
+#: Merge.rc:5322
msgid "New Table Compare"
msgstr "新表格比較"
#. IDS_JUMPLIST_NEW_BINARY_COMPARE
-#: Merge.rc:5313
+#: Merge.rc:5323
msgid "New Binary Compare"
msgstr "新二進制比較"
#. IDS_JUMPLIST_NEW_IMAGE_COMPARE
-#: Merge.rc:5314
+#: Merge.rc:5324
msgid "New Image Compare"
msgstr "新圖片比較"
#. IDS_JUMPLIST_NEW_WEBPAGE_COMPARE
-#: Merge.rc:5315
+#: Merge.rc:5325
msgid "New Webpage Compare"
msgstr "新網頁比較"
+#. IDS_JUMPLIST_NEW_FOLDER_COMPARE
+#: Merge.rc:5326
+msgid "New Folder Compare"
+msgstr ""
+
#. IDS_JUMPLIST_CLIPBOARD_COMPARE
-#: Merge.rc:5316
+#: Merge.rc:5327
msgid "Clipboard Compare"
msgstr "剪貼簿比較"
#. IDS_PREVIEWBAR_PRINT
-#: Merge.rc:5321
+#: Merge.rc:5332
msgid "&Print..."
msgstr "列印 (&P)..."
#. IDS_PREVIEWBAR_PREVPAGE
-#: Merge.rc:5323
+#: Merge.rc:5334
msgid "Pre&v Page"
msgstr "上一頁 (&V)"
#. IDS_PREVIEWBAR_TWOPAGE
-#: Merge.rc:5324
+#: Merge.rc:5335
msgid "&Two Page"
msgstr "雙頁 (&T)"
#. IDS_PREVIEWBAR_ONEPAGE
-#: Merge.rc:5325
+#: Merge.rc:5336
msgid "&One Page"
msgstr "單頁 (&O)"
#. IDS_PREVIEWBAR_ZOOMIN
-#: Merge.rc:5326
+#: Merge.rc:5337
msgid "Zoom &In"
msgstr "放大 (&I)"
#. IDS_PREVIEWBAR_ZOOMOUT
-#: Merge.rc:5327
+#: Merge.rc:5338
msgid "Zoom &Out"
msgstr "縮小 (&O)"
#. IDS_WEBPAGE_COMPARING
-#: Merge.rc:5333
+#: Merge.rc:5344
msgid "Comparing..."
msgstr "正在比對..."
#. IDS_WEBPAGE_ZOOM
-#: Merge.rc:5334
+#: Merge.rc:5345
msgid "Zoom:"
msgstr "縮放:"
#. IDS_COPY_GRANULARITY_DIFFHUNK
-#: Merge.rc:5339
+#: Merge.rc:5350
msgid "Diff hunk"
msgstr "差異區塊"
#. IDS_COPY_GRANULARITY_INLINE
-#: Merge.rc:5340
+#: Merge.rc:5351
msgid "Inline diff"
msgstr "行內差異"
#. IDS_COPY_GRANULARITY_LINE
-#: Merge.rc:5341
+#: Merge.rc:5352
msgid "Line"
msgstr "行"
-#: Merge.rc:5342
+#: Merge.rc:5353
msgid "Character"
msgstr "字元"
#. ID_MICE_PREVDIFF
-#: Merge.rc:5347
+#: Merge.rc:5358
msgid ""
"\n"
"Previous Difference (Alt+Up)\n"
@@ -8176,7 +8192,7 @@ msgstr ""
"(Alt+滾輪上滾)"
#. ID_MICE_NEXTDIFF
-#: Merge.rc:5348
+#: Merge.rc:5359
msgid ""
"\n"
"Next Difference (Alt+Down)\n"
@@ -8189,7 +8205,7 @@ msgstr ""
"(Alt+滾輪下滾)"
#. ID_MICE_L2R
-#: Merge.rc:5349
+#: Merge.rc:5360
msgid ""
"\n"
"Copy to Right (Alt+Right)\n"
@@ -8204,7 +8220,7 @@ msgstr ""
"(Alt+Shift+滾輪下滾)"
#. ID_MICE_R2L
-#: Merge.rc:5350
+#: Merge.rc:5361
msgid ""
"\n"
"Copy to Left (Alt+Left)\n"
@@ -8219,7 +8235,7 @@ msgstr ""
"(Alt+Shift+滾輪上滾)"
#. ID_MICE_L2RNEXT
-#: Merge.rc:5351
+#: Merge.rc:5362
msgid ""
"\n"
"Copy to Right and Advance (Ctrl+Alt+Right)\n"
@@ -8232,7 +8248,7 @@ msgstr ""
"(Ctrl+Alt+Shift+滾輪下滾)"
#. ID_MICE_R2LNEXT
-#: Merge.rc:5352
+#: Merge.rc:5363
msgid ""
"\n"
"Copy to Left and Advance (Ctrl+Alt+Left)\n"
@@ -8245,257 +8261,257 @@ msgstr ""
"(Ctrl+Alt+Shift+滾輪上滾)"
#. IDS_LOG_COMPARING_2
-#: Merge.rc:5362
+#: Merge.rc:5373
#, c-format
msgid "Comparing %1 with %2"
msgstr "正在比較 %1 與 %2"
#. IDS_LOG_COMPARING_3
-#: Merge.rc:5363
+#: Merge.rc:5374
#, c-format
msgid "Comparing %1 with %2 and %3"
msgstr "正在比較 %1 與 %2 及 %3"
#. IDS_LOG_COMPARE_COMPLETED
-#: Merge.rc:5364
+#: Merge.rc:5375
msgid "Comparison completed"
msgstr "比較完成"
#. IDS_LOG_COMPARE_ERROR_2
-#: Merge.rc:5365
+#: Merge.rc:5376
#, c-format
msgid "Failed to compare %1 with %2: "
msgstr "無法比較 %1 與 %2:"
#. IDS_LOG_COMPARE_ERROR_3
-#: Merge.rc:5366
+#: Merge.rc:5377
#, c-format
msgid "Failed to compare %1 with %2 and %3: "
msgstr "無法比較 %1 與 %2 及 %3:"
#. IDS_LOG_FILE_SAVED
-#: Merge.rc:5367
+#: Merge.rc:5378
msgid "File saved"
msgstr "檔案已儲存"
#. IDS_LOG_COPYING_FILES
-#: Merge.rc:5368
+#: Merge.rc:5379
msgid "Copying files..."
msgstr "正在複製檔案..."
#. IDS_LOG_MOVING_FILES
-#: Merge.rc:5369
+#: Merge.rc:5380
msgid "Moving files..."
msgstr "正在移動檔案..."
#. IDS_LOG_DELETING_FILES
-#: Merge.rc:5370
+#: Merge.rc:5381
msgid "Deleting files..."
msgstr "正在刪除檔案..."
#. IDS_LOG_RECYCLEBIN
-#: Merge.rc:5371
+#: Merge.rc:5382
msgid "Recycle Bin"
msgstr "回收站"
#. IDS_LOG_PERMANENTLY_DELETED
-#: Merge.rc:5372
+#: Merge.rc:5383
msgid "Permanently deleted"
msgstr "永久刪除"
#. IDS_LOG_FILEOPERATION_COMPLETED
-#: Merge.rc:5373
+#: Merge.rc:5384
msgid "File operation completed successfully"
msgstr "檔案操作已成功完成"
#. IDS_LOG_FILEOPERATION_CANCELED
-#: Merge.rc:5374
+#: Merge.rc:5385
msgid "File operation canceled"
msgstr "檔案操作已取消"
#. IDS_FILTER_ERROR_NO_ERROR
-#: Merge.rc:5379
+#: Merge.rc:5390
msgid "No error"
msgstr "無錯誤"
#. IDS_FILTER_ERROR_EMPTY_EXPRESSION
-#: Merge.rc:5380
+#: Merge.rc:5391
msgid "Filter expression is empty"
msgstr "過濾表達式為空"
#. IDS_FILTER_ERROR_UNKNOWN_CHAR
-#: Merge.rc:5381
+#: Merge.rc:5392
msgid "Unknown character in filter expression"
msgstr "過濾表達式中存在未知字符"
#. IDS_FILTER_ERROR_UNTERMINATED_STRING
-#: Merge.rc:5382
+#: Merge.rc:5393
msgid "Unterminated string literal"
msgstr "未終止的字串文字"
#. IDS_FILTER_ERROR_SYNTAX_ERROR
-#: Merge.rc:5383
+#: Merge.rc:5394
msgid "Syntax error in filter expression"
msgstr "過濾表達式中的語法錯誤"
#. IDS_FILTER_ERROR_PARSE_FAILURE
-#: Merge.rc:5384
+#: Merge.rc:5395
msgid "Failed to parse filter expression"
msgstr "解析過濾表達式失敗"
#. IDS_FILTER_ERROR_INVALID_LITERAL
-#: Merge.rc:5385
+#: Merge.rc:5396
msgid "Invalid literal value"
msgstr "無效的文字值"
#. IDS_FILTER_ERROR_INVALID_REGULAR_EXPRESSION
-#: Merge.rc:5386
+#: Merge.rc:5397
msgid "Invalid regular expression"
msgstr "無效的正規表示式"
#. IDS_FILTER_ERROR_UNDEFINED_IDENTIFIER
-#: Merge.rc:5387
+#: Merge.rc:5398
msgid "Undefined identifier"
msgstr "未定義標識符"
#. IDS_FILTER_ERROR_INVALID_ARGUMENT_COUNT
-#: Merge.rc:5388
+#: Merge.rc:5399
msgid "Invalid number of arguments"
msgstr "參數數量無效"
#. IDS_FILTER_ERROR_FILTER_NAME_NOT_FOUND
-#: Merge.rc:5389
+#: Merge.rc:5400
msgid "Filter name not found"
msgstr "未找到過濾器名稱"
#. IDS_FILTER_ERROR_DIVIDE_BY_ZERO
-#: Merge.rc:5390
+#: Merge.rc:5401
msgid "Division by zero in filter expression"
msgstr "過濾表達式中除以零"
#. IDS_FILTER_ERROR_UNKNOWN_ERROR
-#: Merge.rc:5391
+#: Merge.rc:5402
msgid "Unknown error"
msgstr "未知錯誤"
#. IDS_FILTER_ERROR_INVALID_PROPERTY_NAME
-#: Merge.rc:5392
+#: Merge.rc:5403
msgid "Invalid property name"
msgstr "無效的屬性名稱"
#. IDS_FILTER_ERROR_INVALID_DIRECTIVE
-#: Merge.rc:5393
+#: Merge.rc:5404
msgid "Invalid directive"
msgstr ""
#. IDS_FILTER_OP_EQUALS
-#: Merge.rc:5398
+#: Merge.rc:5409
msgid "Equals"
msgstr "等於"
#. IDS_FILTER_OP_NOT_EQUALS
-#: Merge.rc:5399
+#: Merge.rc:5410
msgid "Does not equal"
msgstr "不等於"
#. IDS_FILTER_OP_LESS_THAN
-#: Merge.rc:5400
+#: Merge.rc:5411
msgid "Less than"
msgstr "小於"
#. IDS_FILTER_OP_LESS_EQUAL
-#: Merge.rc:5401
+#: Merge.rc:5412
msgid "Less than or equal to"
msgstr "小於或等於"
#. IDS_FILTER_OP_GREATER_EQUAL
-#: Merge.rc:5402
+#: Merge.rc:5413
msgid "Greater than or equal to"
msgstr "大於或等於"
#. IDS_FILTER_OP_GREATER_THAN
-#: Merge.rc:5403
+#: Merge.rc:5414
msgid "Greater than"
msgstr "大於"
#. IDS_FILTER_OP_BETWEEN
-#: Merge.rc:5404
+#: Merge.rc:5415
msgid "Between"
msgstr "介於"
#. IDS_FILTER_OP_NOT_BETWEEN
-#: Merge.rc:5405
+#: Merge.rc:5416
msgid "Not Between"
msgstr "不介於"
#. IDS_FILTER_OP_CONTAINS
-#: Merge.rc:5406
+#: Merge.rc:5417
msgid "Contains"
msgstr "包含"
#. IDS_FILTER_OP_NOT_CONTAINS
-#: Merge.rc:5407
+#: Merge.rc:5418
msgid "Not Contains"
msgstr "不包含"
#. IDS_FILTER_OP_RECONTAINS
-#: Merge.rc:5408
+#: Merge.rc:5419
msgid "Contains (regex)"
msgstr "包含(正規表示法)"
#. IDS_FILTER_OP_NOT_RECONTAINS
-#: Merge.rc:5409
+#: Merge.rc:5420
msgid "Not Contains (regex)"
msgstr "不包含(正規表示法)"
#. IDS_FILTER_OP_LIKE
-#: Merge.rc:5410
+#: Merge.rc:5421
msgid "Match (wildcard)"
msgstr ""
#. IDS_FILTER_OP_NOT_LIKE
-#: Merge.rc:5411
+#: Merge.rc:5422
msgid "Not match (wildcard)"
msgstr ""
#. IDS_FILTER_OP_MATCHES
-#: Merge.rc:5412
+#: Merge.rc:5423
msgid "Match (regex)"
msgstr ""
#. IDS_FILTER_OP_NOT_MATCHES
-#: Merge.rc:5413
+#: Merge.rc:5424
msgid "Not match (regex)"
msgstr ""
#. IDS_COLORMODE_LIGHT
-#: Merge.rc:5418
+#: Merge.rc:5429
msgid "Light"
msgstr "亮色"
#. IDS_COLORMODE_DARK
-#: Merge.rc:5419
+#: Merge.rc:5430
msgid "Dark"
msgstr "暗色"
#. IDS_COLORMODE_FOLLOWSYSTEM
-#: Merge.rc:5420
+#: Merge.rc:5431
msgid "Follow system"
msgstr "遵循系統"
#. IDS_EXAMPLE
-#: Merge.rc:5425
+#: Merge.rc:5436
#, c-format
msgid "e.g. %1"
msgstr "例:%1"
#. IDS_DETECTED_PREVIOUS_CRASH
-#: Merge.rc:5430
+#: Merge.rc:5441
msgid "WinMerge detected a previous crash. Please report this if possible."
msgstr ""
#. IDS_REGEX_REPLACE_LIST_TEMPLATE
-#: Merge.rc:5435
+#: Merge.rc:5446
msgid ""
"# Regex replacement list\r\n"
"# Format: regexreplacement\r\n"
@@ -8505,7 +8521,7 @@ msgid ""
msgstr ""
#. IDS_STRING_REPLACE_LIST_TEMPLATE
-#: Merge.rc:5436
+#: Merge.rc:5447
msgid ""
"# Replacement list\r\n"
"# Format: searchreplacement\r\n"
diff --git a/Translations/WinMerge/Corsican.po b/Translations/WinMerge/Corsican.po
index a27c6c565b9..368e388332b 100644
--- a/Translations/WinMerge/Corsican.po
+++ b/Translations/WinMerge/Corsican.po
@@ -25,7 +25,7 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
#. LANGUAGE, SUBLANGUAGE
-#: Merge.rc:26 Merge.rc:59 Merge.rc:5453
+#: Merge.rc:26 Merge.rc:59 Merge.rc:5464
msgid "LANG_ENGLISH, SUBLANG_ENGLISH_US"
msgstr "LANG_CORSICAN, SUBLANG_DEFAULT"
@@ -110,7 +110,7 @@ msgid "Copy Selected Diff (Right) to Clipboard\tCtrl+&3"
msgstr "Cupià a sfarenza selezziunata (diritta) in u preme’papei\tCtrl+&3"
#. IDR_MERGEDOCTYPE, ID_SELECTLINEDIFF
-#: Merge.rc:110 Merge.rc:673
+#: Merge.rc:110 Merge.rc:680
msgid "Select Line &Difference\tF4"
msgstr "&Selezziunà a sfarenza di linea\tF4"
@@ -140,7 +140,7 @@ msgid "Cu&t"
msgstr "&Taglià"
#. IDR_POPUP_DIRVIEW
-#: Merge.rc:118 Merge.rc:943
+#: Merge.rc:118 Merge.rc:951
msgid "&Copy"
msgstr "&Cupià"
@@ -150,19 +150,19 @@ msgid "&Paste"
msgstr "&Incullà"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:121 Merge.rc:875 Merge.rc:882
+#: Merge.rc:121 Merge.rc:882 Merge.rc:889
msgid "&Scripts"
msgstr "S&cenarii"
#. IDS_NO_EDIT_SCRIPTS
-#: Merge.rc:123 Merge.rc:338 Merge.rc:447 Merge.rc:654 Merge.rc:659
-#: Merge.rc:865 Merge.rc:877 Merge.rc:884 Merge.rc:940 Merge.rc:1183
-#: Merge.rc:5028
+#: Merge.rc:123 Merge.rc:340 Merge.rc:451 Merge.rc:661 Merge.rc:666
+#: Merge.rc:872 Merge.rc:884 Merge.rc:891 Merge.rc:948 Merge.rc:1193
+#: Merge.rc:5038
msgid "< Empty >"
msgstr ""
#. IDR_POPUP_LOCATIONBAR, ID_EDIT_WMGOTO
-#: Merge.rc:126 Merge.rc:691 Merge.rc:1081
+#: Merge.rc:126 Merge.rc:698 Merge.rc:1089
msgid "&Go to...\tCtrl+G"
msgstr "&Andà à…\tCtrl+G"
@@ -182,27 +182,27 @@ msgid "Op&en"
msgstr "&Apre"
#. IDR_POPUP_DIRVIEW, ID_DIR_OPEN_RIGHT
-#: Merge.rc:132 Merge.rc:981 Merge.rc:988 Merge.rc:995
+#: Merge.rc:132 Merge.rc:989 Merge.rc:996 Merge.rc:1003
msgid "With &Registered Application"
msgstr "Cù l’&appiecazione assuciata"
#. IDR_POPUP_DIRVIEW, ID_DIR_OPEN_RIGHT_WITHEDITOR
-#: Merge.rc:133 Merge.rc:982 Merge.rc:989 Merge.rc:996
+#: Merge.rc:133 Merge.rc:990 Merge.rc:997 Merge.rc:1004
msgid "With &External Editor\tCtrl+Alt+E"
msgstr "Cù un &editore esternu\tCtrl+Alt+E"
#. IDR_POPUP_DIRVIEW, ID_DIR_OPEN_RIGHT_WITH
-#: Merge.rc:134 Merge.rc:983 Merge.rc:990 Merge.rc:997
+#: Merge.rc:134 Merge.rc:991 Merge.rc:998 Merge.rc:1005
msgid "&With..."
msgstr "&Cù…"
#. IDR_POPUP_DIRVIEW, ID_DIR_OPEN_RIGHT_PARENT_FOLDER
-#: Merge.rc:135 Merge.rc:984 Merge.rc:991 Merge.rc:998
+#: Merge.rc:135 Merge.rc:992 Merge.rc:999 Merge.rc:1006
msgid "Open &Parent Folder..."
msgstr "Apre u cartulare di &livellu superiore…"
#. IDR_POPUP_IMG_CTXT, ID_FILE_SHELLMENU
-#: Merge.rc:137 Merge.rc:1239
+#: Merge.rc:137 Merge.rc:1249
msgid "S&hell Menu"
msgstr "&Listinu Shell"
@@ -237,8 +237,8 @@ msgid "Ins&ertion/Deletion Detection"
msgstr "Avventata d’inserzione o di squassatura"
#. IDR_MERGEDOCTYPE, ID_TOOLBAR_NONE
-#: Merge.rc:176 Merge.rc:209 Merge.rc:216 Merge.rc:358 Merge.rc:507
-#: Merge.rc:751
+#: Merge.rc:176 Merge.rc:209 Merge.rc:216 Merge.rc:360 Merge.rc:511
+#: Merge.rc:758
msgid "&None"
msgstr "&Nisuna"
@@ -253,12 +253,12 @@ msgid "&Horizontal"
msgstr "&Orizuntale"
#. IDR_POPUP_IMG_CTXT, ID_IMG_CURPANE_PREVPAGE
-#: Merge.rc:181 Merge.rc:189 Merge.rc:1230
+#: Merge.rc:181 Merge.rc:189 Merge.rc:1240
msgid "&Previous Page"
msgstr "Pagina &precedente"
#. IDS_PREVIEWBAR_NEXTPAGE
-#: Merge.rc:182 Merge.rc:190 Merge.rc:1231 Merge.rc:5322
+#: Merge.rc:182 Merge.rc:190 Merge.rc:1241 Merge.rc:5333
msgid "&Next Page"
msgstr "Pagina &seguente"
@@ -268,42 +268,42 @@ msgid "&Active Pane"
msgstr "Pannellu &attivu"
#. IDR_POPUP_IMG_CTXT, ID_IMG_CURPANE_ROTATE_RIGHT_90
-#: Merge.rc:185 Merge.rc:1225
+#: Merge.rc:185 Merge.rc:1235
msgid "Rotate &Right 90deg"
msgstr "Girà à &diritta di 90°"
#. IDR_POPUP_IMG_CTXT, ID_IMG_CURPANE_ROTATE_LEFT_90
-#: Merge.rc:186 Merge.rc:1226
+#: Merge.rc:186 Merge.rc:1236
msgid "Rotate &Left 90deg"
msgstr "Girà à &manca di 90°"
#. IDR_POPUP_IMG_CTXT, ID_IMG_CURPANE_FLIP_VERTICALLY
-#: Merge.rc:187 Merge.rc:1227
+#: Merge.rc:187 Merge.rc:1237
msgid "Flip V&ertically"
msgstr "Rivultà v&erticalmente"
#. IDR_POPUP_IMG_CTXT, ID_IMG_CURPANE_FLIP_HORIZONTALLY
-#: Merge.rc:188 Merge.rc:1228
+#: Merge.rc:188 Merge.rc:1238
msgid "Flip H&orizontally"
msgstr "Rivultà o&rizuntalmente"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:193 Merge.rc:699
+#: Merge.rc:193 Merge.rc:706
msgid "&Zoom"
msgstr "&Ingrandamentu"
#. IDR_MERGEDOCTYPE, ID_VIEW_ZOOMIN
-#: Merge.rc:202 Merge.rc:701
+#: Merge.rc:202 Merge.rc:708
msgid "Zoom &In\tCtrl++"
msgstr "Ingrandamentu &più forte\tCtrl++"
#. IDR_MERGEDOCTYPE, ID_VIEW_ZOOMOUT
-#: Merge.rc:203 Merge.rc:702
+#: Merge.rc:203 Merge.rc:709
msgid "Zoom &Out\tCtrl+-"
msgstr "Ingrandamentu &menu forte\tCtrl+-"
#. IDR_MERGEDOCTYPE, ID_VIEW_ZOOMNORMAL, Zoom to normal
-#: Merge.rc:205 Merge.rc:704
+#: Merge.rc:205 Merge.rc:711
msgid "&Normal\tCtrl+*"
msgstr "&Nurmale\tCtrl+*"
@@ -328,27 +328,27 @@ msgid "Dragging &Mode"
msgstr "&Modu di trascinatura"
#. IDR_POPUP_IMG_CTXT, ID_IMG_DRAGGINGMODE_MOVE
-#: Merge.rc:217 Merge.rc:955 Merge.rc:1233
+#: Merge.rc:217 Merge.rc:963 Merge.rc:1243
msgid "&Move"
msgstr "&Dispiazzà"
#. IDR_POPUP_IMG_CTXT, ID_IMG_DRAGGINGMODE_ADJUST_OFFSET
-#: Merge.rc:218 Merge.rc:1234
+#: Merge.rc:218 Merge.rc:1244
msgid "&Adjust Offset"
msgstr "&Adattà u spustime"
#. IDR_POPUP_IMG_CTXT, ID_IMG_DRAGGINGMODE_VERTICAL_WIPE
-#: Merge.rc:219 Merge.rc:1235
+#: Merge.rc:219 Merge.rc:1245
msgid "&Vertical Wipe"
msgstr "Squassatura &verticale"
#. IDR_POPUP_IMG_CTXT, ID_IMG_DRAGGINGMODE_HORIZONTAL_WIPE
-#: Merge.rc:220 Merge.rc:1236
+#: Merge.rc:220 Merge.rc:1246
msgid "&Horizontal Wipe"
msgstr "Squassatura &orizuntale"
#. IDR_POPUP_IMG_CTXT, ID_IMG_DRAGGINGMODE_RECTANGLE_SELECT
-#: Merge.rc:221 Merge.rc:1237
+#: Merge.rc:221 Merge.rc:1247
msgid "Rectangle &Select"
msgstr "&Selezzione rettangulare"
@@ -383,37 +383,37 @@ msgid "Compare Extracted &Text from Images"
msgstr "Paragunà u &testu estrattu da e fiure"
#. IDD_OPEN, IDOK
-#: Merge.rc:272 Merge.rc:1980
+#: Merge.rc:272 Merge.rc:1990
msgid "Co&mpare"
msgstr "&Paragunà"
#. IDR_POPUP_WEBPAGE_COMPARE, ID_WEB_COMPARE_SCREENSHOTS
-#: Merge.rc:274 Merge.rc:1247
+#: Merge.rc:274 Merge.rc:1257
msgid "&Screenshots"
msgstr "Catture di &screnu"
#. IDR_POPUP_WEBPAGE_COMPARE, ID_WEB_COMPARE_FULLSIZE_SCREENSHOTS
-#: Merge.rc:275 Merge.rc:1248
+#: Merge.rc:275 Merge.rc:1258
msgid "&Full Size Screenshots"
msgstr "Cattu&re di screnu in dimensione sana"
#. IDR_POPUP_WEBPAGE_COMPARE, ID_WEB_COMPARE_HTMLS
-#: Merge.rc:276 Merge.rc:1249
+#: Merge.rc:276 Merge.rc:1259
msgid "&HTMLs"
msgstr "&HTML"
#. IDR_POPUP_WEBPAGE_COMPARE, ID_WEB_COMPARE_TEXTS
-#: Merge.rc:277 Merge.rc:1250
+#: Merge.rc:277 Merge.rc:1260
msgid "&Texts"
msgstr "&Testi"
#. IDR_POPUP_WEBPAGE_COMPARE, ID_WEB_COMPARE_RESOURCETREES
-#: Merge.rc:278 Merge.rc:1251
+#: Merge.rc:278 Merge.rc:1261
msgid "&Resource Trees"
msgstr "&Arburi di risorse"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_SIZE
-#: Merge.rc:280 Merge.rc:1775
+#: Merge.rc:280 Merge.rc:1785
msgid "&Size"
msgstr "&Dimensione"
@@ -428,27 +428,27 @@ msgid "&Event Sync"
msgstr "&Sincrunizazione d’evenimentu"
#. IDR_POPUP_WEBPAGE_SYNC_EVENTS, ID_WEB_SYNC_ENABLED
-#: Merge.rc:291 Merge.rc:1259
+#: Merge.rc:291 Merge.rc:1269
msgid "&Enabled"
msgstr "&Attivatu"
#. IDR_POPUP_WEBPAGE_SYNC_EVENTS, ID_WEB_SYNC_SCROLL
-#: Merge.rc:293 Merge.rc:1261
+#: Merge.rc:293 Merge.rc:1271
msgid "&Scroll"
msgstr "&Sfilà"
#. IDR_POPUP_WEBPAGE_SYNC_EVENTS, ID_WEB_SYNC_CLICK
-#: Merge.rc:294 Merge.rc:1262
+#: Merge.rc:294 Merge.rc:1272
msgid "&Click"
msgstr "&Cliccu"
#. IDR_POPUP_WEBPAGE_SYNC_EVENTS, ID_WEB_SYNC_INPUT
-#: Merge.rc:295 Merge.rc:1263
+#: Merge.rc:295 Merge.rc:1273
msgid "&Input"
msgstr "&Entrata"
#. IDR_POPUP_WEBPAGE_SYNC_EVENTS, ID_WEB_SYNC_GOBACKFORWARD
-#: Merge.rc:296 Merge.rc:1264
+#: Merge.rc:296 Merge.rc:1274
msgid "&Go Back/Forward"
msgstr "&Ritornu o in avanti"
@@ -478,3607 +478,3618 @@ msgid "&All Profiles"
msgstr "T&utti i prufili"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:310 Merge.rc:411 Merge.rc:586
+#: Merge.rc:310 Merge.rc:413 Merge.rc:590
msgid "&File"
msgstr "&Schedariu"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:312 Merge.rc:413 Merge.rc:588
+#: Merge.rc:312 Merge.rc:415 Merge.rc:592
msgid "&New"
msgstr "&Novu"
#. IDR_POPUP_COMPARE, ID_MERGE_COMPARE_TEXT
-#: Merge.rc:314 Merge.rc:322 Merge.rc:415 Merge.rc:423 Merge.rc:590
-#: Merge.rc:598 Merge.rc:649 Merge.rc:935 Merge.rc:1159 Merge.rc:1171
+#: Merge.rc:314 Merge.rc:323 Merge.rc:417 Merge.rc:426 Merge.rc:594
+#: Merge.rc:603 Merge.rc:655 Merge.rc:942 Merge.rc:1167 Merge.rc:1180
msgid "&Text"
msgstr "&Testu"
#. IDR_POPUP_COMPARE, ID_MERGE_COMPARE_TABLE
-#: Merge.rc:315 Merge.rc:323 Merge.rc:416 Merge.rc:424 Merge.rc:591
-#: Merge.rc:599 Merge.rc:650 Merge.rc:936 Merge.rc:1160 Merge.rc:1172
+#: Merge.rc:315 Merge.rc:324 Merge.rc:418 Merge.rc:427 Merge.rc:595
+#: Merge.rc:604 Merge.rc:656 Merge.rc:943 Merge.rc:1168 Merge.rc:1181
msgid "T&able"
msgstr "Ta&vulone"
#. IDR_POPUP_COMPARE, ID_MERGE_COMPARE_HEX
-#: Merge.rc:316 Merge.rc:324 Merge.rc:417 Merge.rc:425 Merge.rc:592
-#: Merge.rc:600 Merge.rc:651 Merge.rc:937 Merge.rc:1161 Merge.rc:1173
+#: Merge.rc:316 Merge.rc:325 Merge.rc:419 Merge.rc:428 Merge.rc:596
+#: Merge.rc:605 Merge.rc:657 Merge.rc:944 Merge.rc:1169 Merge.rc:1182
msgid "&Binary"
msgstr "&Binariu"
#. IDS_IMAGE_MENU
-#: Merge.rc:317 Merge.rc:325 Merge.rc:418 Merge.rc:426 Merge.rc:593
-#: Merge.rc:601 Merge.rc:652 Merge.rc:938 Merge.rc:1162 Merge.rc:1174
-#: Merge.rc:5123
+#: Merge.rc:317 Merge.rc:326 Merge.rc:420 Merge.rc:429 Merge.rc:597
+#: Merge.rc:606 Merge.rc:658 Merge.rc:945 Merge.rc:1170 Merge.rc:1183
+#: Merge.rc:5133
msgid "&Image"
msgstr "&Fiura"
#. IDR_POPUP_COMPARE, ID_MERGE_COMPARE_WEBPAGE
-#: Merge.rc:318 Merge.rc:326 Merge.rc:419 Merge.rc:427 Merge.rc:594
-#: Merge.rc:602 Merge.rc:653 Merge.rc:939 Merge.rc:1163 Merge.rc:1175
+#: Merge.rc:318 Merge.rc:327 Merge.rc:421 Merge.rc:430 Merge.rc:598
+#: Merge.rc:607 Merge.rc:659 Merge.rc:946 Merge.rc:1171 Merge.rc:1184
msgid "&Webpage"
msgstr "Pagina &web"
+#. IDR_POPUP_NEW, ID_FILE_NEW_FOLDER
+#: Merge.rc:319 Merge.rc:328 Merge.rc:422 Merge.rc:431 Merge.rc:599
+#: Merge.rc:608 Merge.rc:1172
+msgid "&Folder"
+msgstr ""
+
#. IDR_MERGEDOCTYPE
-#: Merge.rc:320 Merge.rc:421 Merge.rc:596
+#: Merge.rc:321 Merge.rc:424 Merge.rc:601
msgid "New (&3 panes)"
msgstr "Novu (&3 pannelli)"
#. IDR_MERGEDOCTYPE, ID_FILE_OPEN
-#: Merge.rc:328 Merge.rc:429 Merge.rc:604
+#: Merge.rc:330 Merge.rc:433 Merge.rc:610
msgid "&Open...\tCtrl+O"
msgstr "A&pre…\tCtrl+O"
#. IDR_MERGEDOCTYPE, ID_FILE_OPENCONFLICT
-#: Merge.rc:329 Merge.rc:430 Merge.rc:605
+#: Merge.rc:331 Merge.rc:434 Merge.rc:611
msgid "Open Conflic&t File..."
msgstr "Apre u schedariu in &cunflittu…"
#. IDR_MERGEDOCTYPE, ID_FILE_OPENCLIPBOARD
-#: Merge.rc:330 Merge.rc:431 Merge.rc:606
+#: Merge.rc:332 Merge.rc:435 Merge.rc:612
msgid "Open C&lipboard"
msgstr "Apre u preme’pape&i"
#. IDR_POPUP_PROJECT, ID_FILE_OPENPROJECT
-#: Merge.rc:332 Merge.rc:433 Merge.rc:608 Merge.rc:1191
+#: Merge.rc:334 Merge.rc:437 Merge.rc:614 Merge.rc:1201
msgid "Open Pro&ject...\tCtrl+J"
msgstr "Apre u prughje&ttu…\tCtrl+J"
#. IDD_OPEN, ID_SAVE_PROJECT
-#: Merge.rc:333 Merge.rc:434 Merge.rc:609 Merge.rc:1193 Merge.rc:1979
+#: Merge.rc:335 Merge.rc:438 Merge.rc:615 Merge.rc:1203 Merge.rc:1989
msgid "Sa&ve Project..."
msgstr "Arregistrà u prug&hjettu…"
#. IDR_MAINFRAME, ID_FILE_PROJECT_MRU_FIRST
-#: Merge.rc:335
+#: Merge.rc:337
msgid "Recent Projects"
msgstr "Prughjetti recenti"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:336 Merge.rc:445 Merge.rc:657
+#: Merge.rc:338 Merge.rc:449 Merge.rc:664
msgid "Recent F&iles or Folders"
msgstr "Sche&darii o cartulari recenti"
#. IDR_MERGEDOCTYPE, ID_APP_EXIT
-#: Merge.rc:341 Merge.rc:450 Merge.rc:662
+#: Merge.rc:343 Merge.rc:454 Merge.rc:669
msgid "E&xit\tCtrl+Q"
msgstr "&Esce\tCtrl+Q"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:343 Merge.rc:452 Merge.rc:664
+#: Merge.rc:345 Merge.rc:456 Merge.rc:671
msgid "&Edit"
msgstr "&Mudificà"
#. IDR_MERGEDOCTYPE, ID_EDIT_PASTE
-#: Merge.rc:345 Merge.rc:671
+#: Merge.rc:347 Merge.rc:678
msgid "&Paste\tCtrl+V"
msgstr "&Incullà\tCtrl+V"
#. IDR_MERGEDOCTYPE, ID_OPTIONS
-#: Merge.rc:347 Merge.rc:456 Merge.rc:693
+#: Merge.rc:349 Merge.rc:460 Merge.rc:700
msgid "&Options...\tCtrl+,"
msgstr "&Ozzioni…\tCtrl+,"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:349 Merge.rc:458 Merge.rc:695
+#: Merge.rc:351 Merge.rc:462 Merge.rc:702
msgid "&View"
msgstr "&Vista"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:351 Merge.rc:500 Merge.rc:744
+#: Merge.rc:353 Merge.rc:504 Merge.rc:751
msgid "Ta&b Bar"
msgstr "Barra d’&unghjette"
#. IDR_MERGEDOCTYPE, ID_VIEW_TAB_BAR
-#: Merge.rc:353 Merge.rc:502 Merge.rc:746
+#: Merge.rc:355 Merge.rc:506 Merge.rc:753
msgid "&View Tab Bar"
msgstr "&Affissà a barra d’unghjetta"
#. IDR_MERGEDOCTYPE, ID_VIEW_TAB_BAR_ON_TITLE_BAR
-#: Merge.rc:354 Merge.rc:503 Merge.rc:747
+#: Merge.rc:356 Merge.rc:507 Merge.rc:754
msgid "&On Title Bar"
msgstr "&Nant’à a barra di titulu"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:356 Merge.rc:505 Merge.rc:749
+#: Merge.rc:358 Merge.rc:509 Merge.rc:756
msgid "&Toolbar"
msgstr "Barra d’a&ttrezzi"
#. IDR_MERGEDOCTYPE, ID_TOOLBAR_SMALL
-#: Merge.rc:359 Merge.rc:508 Merge.rc:752
+#: Merge.rc:361 Merge.rc:512 Merge.rc:759
msgid "&Small"
msgstr "&Chjuca"
#. IDR_MERGEDOCTYPE, ID_TOOLBAR_MEDIUM
-#: Merge.rc:360 Merge.rc:509 Merge.rc:753
+#: Merge.rc:362 Merge.rc:513 Merge.rc:760
msgid "&Medium"
msgstr "Me&diana"
#. IDR_MERGEDOCTYPE, ID_TOOLBAR_BIG
-#: Merge.rc:361 Merge.rc:510 Merge.rc:754
+#: Merge.rc:363 Merge.rc:514 Merge.rc:761
msgid "&Big"
msgstr "&Maiò"
#. IDR_MERGEDOCTYPE, ID_TOOLBAR_HUGE
-#: Merge.rc:362 Merge.rc:511 Merge.rc:755
+#: Merge.rc:364 Merge.rc:515 Merge.rc:762
msgid "&Huge"
msgstr "&Tamanta"
#. IDS_VIEW_MENU_BAR
-#: Merge.rc:364 Merge.rc:513 Merge.rc:757 Merge.rc:5357
+#: Merge.rc:366 Merge.rc:517 Merge.rc:764 Merge.rc:5368
msgid "Men&u Bar"
msgstr "Barra di &listinu"
#. IDR_DIRDOCTYPE, ID_VIEW_OUTPUT_BAR
-#: Merge.rc:365 Merge.rc:515
+#: Merge.rc:367 Merge.rc:519
msgid "&Output Pane"
msgstr "Pannellu d’&esciuta"
#. IDR_MERGEDOCTYPE, ID_VIEW_STATUS_BAR
-#: Merge.rc:366 Merge.rc:516 Merge.rc:758
+#: Merge.rc:368 Merge.rc:520 Merge.rc:765
msgid "&Status Bar"
msgstr "&Barra di statu"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:368 Merge.rc:539 Merge.rc:847
+#: Merge.rc:370 Merge.rc:543 Merge.rc:854
msgid "&Tools"
msgstr "&Attrezzi"
#. IDR_MERGEDOCTYPE, ID_TOOLS_FILTERS
-#: Merge.rc:370 Merge.rc:542 Merge.rc:849
+#: Merge.rc:372 Merge.rc:546 Merge.rc:856
msgid "&Filters..."
msgstr "&Filtri…"
#. IDR_MERGEDOCTYPE, ID_TOOLS_GENERATEPATCH
-#: Merge.rc:371 Merge.rc:543 Merge.rc:850
+#: Merge.rc:373 Merge.rc:547 Merge.rc:857
msgid "&Generate Patch..."
msgstr "Ingenerà e &currezzioni…"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:373 Merge.rc:546 Merge.rc:853
+#: Merge.rc:375 Merge.rc:550 Merge.rc:860
msgid "&Plugins"
msgstr "&Estensioni"
#. IDD_PLUGINS_LIST, IDC_PLUGIN_SETTINGS
-#: Merge.rc:375 Merge.rc:548 Merge.rc:855 Merge.rc:2494 Merge.rc:2926
+#: Merge.rc:377 Merge.rc:552 Merge.rc:862 Merge.rc:2504 Merge.rc:2936
msgid "P&lugin Settings..."
msgstr "Parametri di l’&estensioni…"
#. IDR_MERGEDOCTYPE, ID_PREDIFFER_MANUAL
-#: Merge.rc:377 Merge.rc:550 Merge.rc:857
+#: Merge.rc:379 Merge.rc:554 Merge.rc:864
msgid "Ma&nual Prediffer"
msgstr "Preparagone &manuale"
#. IDR_MERGEDOCTYPE, ID_PREDIFFER_AUTO
-#: Merge.rc:378 Merge.rc:551 Merge.rc:858
+#: Merge.rc:380 Merge.rc:555 Merge.rc:865
msgid "A&utomatic Prediffer"
msgstr "Preparagone &autumaticu"
#. IDR_MERGEDOCTYPE, ID_UNPACK_MANUAL
-#: Merge.rc:380 Merge.rc:553 Merge.rc:860
+#: Merge.rc:382 Merge.rc:557 Merge.rc:867
msgid "&Manual Unpacking"
msgstr "Spacchittera ma&nuale"
#. IDR_MERGEDOCTYPE, ID_UNPACK_AUTO
-#: Merge.rc:381 Merge.rc:554 Merge.rc:861
+#: Merge.rc:383 Merge.rc:558 Merge.rc:868
msgid "&Automatic Unpacking"
msgstr "Spacchittera a&utumatica"
#. IDR_MERGEDOCTYPE, ID_RELOAD_PLUGINS
-#: Merge.rc:383 Merge.rc:558 Merge.rc:889
+#: Merge.rc:385 Merge.rc:562 Merge.rc:896
msgid "&Reload Plugins"
msgstr "&Ricaricà l’estensioni"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:385 Merge.rc:560 Merge.rc:891
+#: Merge.rc:387 Merge.rc:564 Merge.rc:898
msgid "&Window"
msgstr "F&inestra"
#. IDR_MERGEDOCTYPE, ID_FILE_CLOSE
-#: Merge.rc:387 Merge.rc:562 Merge.rc:893
+#: Merge.rc:389 Merge.rc:566 Merge.rc:900
msgid "Cl&ose\tCtrl+W"
msgstr "&Chjode\tCtrl+W"
#. IDR_MERGEDOCTYPE, ID_WINDOW_CLOSEALL
-#: Merge.rc:388 Merge.rc:563 Merge.rc:894
+#: Merge.rc:390 Merge.rc:567 Merge.rc:901
msgid "Clo&se All"
msgstr "&Tuttu chjode"
#. IDR_MERGEDOCTYPE, ID_NEXT_PANE
-#: Merge.rc:390 Merge.rc:565 Merge.rc:896
+#: Merge.rc:392 Merge.rc:569 Merge.rc:903
msgid "Change &Pane\tF6"
msgstr "Cambià di &pannellu\tF6"
#. IDR_MERGEDOCTYPE, ID_WINDOW_TILE_HORZ
-#: Merge.rc:392 Merge.rc:567 Merge.rc:900
+#: Merge.rc:394 Merge.rc:571 Merge.rc:907
msgid "Tile &Horizontally"
msgstr "Musaica &orizuntale"
#. IDR_MERGEDOCTYPE, ID_WINDOW_TILE_VERT
-#: Merge.rc:393 Merge.rc:568 Merge.rc:901
+#: Merge.rc:395 Merge.rc:572 Merge.rc:908
msgid "Tile &Vertically"
msgstr "Musaica &verticale"
#. IDR_MERGEDOCTYPE, ID_WINDOW_CASCADE
-#: Merge.rc:394 Merge.rc:569 Merge.rc:902
+#: Merge.rc:396 Merge.rc:573 Merge.rc:909
msgid "&Cascade"
msgstr "C&ascata"
#. IDS_MESSAGEBOX_HELP
-#: Merge.rc:396 Merge.rc:571 Merge.rc:904 Merge.rc:3200 Merge.rc:4189
+#: Merge.rc:398 Merge.rc:575 Merge.rc:911 Merge.rc:3210 Merge.rc:4199
msgid "&Help"
msgstr "Ai&utu"
#. IDR_MERGEDOCTYPE, ID_HELP_CONTENTS
-#: Merge.rc:398 Merge.rc:573 Merge.rc:906
+#: Merge.rc:400 Merge.rc:577 Merge.rc:913
msgid "&WinMerge Help\tF1"
msgstr "Aiutu &WinMerge\tF1"
#. IDR_MERGEDOCTYPE, ID_HELP_RELEASENOTES
-#: Merge.rc:400 Merge.rc:575 Merge.rc:908
+#: Merge.rc:402 Merge.rc:579 Merge.rc:915
msgid "R&elease Notes"
msgstr "&Note di versione"
#. IDR_MERGEDOCTYPE, ID_HELP_TRANSLATIONS
-#: Merge.rc:401 Merge.rc:576 Merge.rc:909
+#: Merge.rc:403 Merge.rc:580 Merge.rc:916
msgid "&Translations"
msgstr "&Traduzzioni"
#. IDR_MERGEDOCTYPE, ID_HELP_GETCONFIG
-#: Merge.rc:402 Merge.rc:577 Merge.rc:910
+#: Merge.rc:404 Merge.rc:581 Merge.rc:917
msgid "C&onfiguration"
msgstr "&Cunfigurazione"
#. IDR_MERGEDOCTYPE, ID_HELP_GNULICENSE
-#: Merge.rc:404 Merge.rc:579 Merge.rc:912
+#: Merge.rc:406 Merge.rc:583 Merge.rc:919
msgid "&GNU General Public License"
msgstr "&Licenza publica generale GNU"
#. IDR_MERGEDOCTYPE, ID_APP_ABOUT
-#: Merge.rc:405 Merge.rc:580 Merge.rc:913
+#: Merge.rc:407 Merge.rc:584 Merge.rc:920
msgid "&About WinMerge..."
msgstr "&Apprupositu di WinMerge…"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:436 Merge.rc:629
+#: Merge.rc:440 Merge.rc:635
msgid "&Read-Only"
msgstr "&Lettura sola"
#. IDR_MERGEDOCTYPE, ID_FILE_LEFT_READONLY
-#: Merge.rc:438 Merge.rc:631
+#: Merge.rc:442 Merge.rc:637
msgid "L&eft Read-Only"
msgstr "Schedariu à &manca in lettura sola"
#. IDR_MERGEDOCTYPE, ID_FILE_MIDDLE_READONLY
-#: Merge.rc:439 Merge.rc:632
+#: Merge.rc:443 Merge.rc:638
msgid "M&iddle Read-Only"
msgstr "Schedariu à u ¢ru in lettura sola"
#. IDR_MERGEDOCTYPE, ID_FILE_RIGHT_READONLY
-#: Merge.rc:440 Merge.rc:633
+#: Merge.rc:444 Merge.rc:639
msgid "Ri&ght Read-Only"
msgstr "Schedariu à &diritta in lettura sola"
#. IDD_ENCODINGERROR, IDC_FILEENCODING
-#: Merge.rc:443 Merge.rc:646 Merge.rc:1038 Merge.rc:3063
+#: Merge.rc:447 Merge.rc:652 Merge.rc:1046 Merge.rc:3073
msgid "&File Encoding..."
msgstr "Cudifica&zione di schedariu…"
#. IDR_POPUP_OUTPUTVIEW, ID_EDIT_SELECT_ALL
-#: Merge.rc:454 Merge.rc:674 Merge.rc:1343
+#: Merge.rc:458 Merge.rc:681 Merge.rc:1353
msgid "Select &All\tCtrl+A"
msgstr "T&uttu selezziunà\tCtrl+A"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWIDENTICAL
-#: Merge.rc:460
+#: Merge.rc:464
msgid "Show &Identical Items"
msgstr "Affissà l’elementi &identichi"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWDIFFERENT
-#: Merge.rc:461
+#: Merge.rc:465
msgid "Show &Different Items"
msgstr "Affissà l’elementi &sfarenti"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWUNIQUELEFT
-#: Merge.rc:462
+#: Merge.rc:466
msgid "Show L&eft Unique Items"
msgstr "Affissà l’elementi unichi à ma&nca"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWUNIQUEMIDDLE
-#: Merge.rc:463
+#: Merge.rc:467
msgid "Show Midd&le Unique Items"
msgstr "Affissà l’elementi unichi à u cen&tru"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWUNIQUERIGHT
-#: Merge.rc:464
+#: Merge.rc:468
msgid "Show Ri&ght Unique Items"
msgstr "Affissà l’elementi unichi à di&ritta"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWSKIPPED
-#: Merge.rc:465
+#: Merge.rc:469
msgid "Show S&kipped Items"
msgstr "Affissà l’elementi i&gnurati"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWBINARIES
-#: Merge.rc:466
+#: Merge.rc:470
msgid "S&how Binary Files"
msgstr "Affissà i schedarii &binarii"
#. IDR_DIRDOCTYPE
-#: Merge.rc:467
+#: Merge.rc:471
msgid "&3-way Compare"
msgstr "Paragone à &3"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWDIFFERENTLEFTONLY
-#: Merge.rc:469
+#: Merge.rc:473
msgid "Show &Left Only Different Items"
msgstr "Affissà l’elementi sfarenti solu à &manca"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWDIFFERENTMIDDLEONLY
-#: Merge.rc:470
+#: Merge.rc:474
msgid "Show &Middle Only Different Items"
msgstr "Affissà l’elementi sfarenti solu à u ¢ru"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWDIFFERENTRIGHTONLY
-#: Merge.rc:471
+#: Merge.rc:475
msgid "Show &Right Only Different Items"
msgstr "Affissà l’elementi sfarenti solu à &diritta"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWMISSINGLEFTONLY
-#: Merge.rc:473
+#: Merge.rc:477
msgid "Show L&eft Only Missing Items"
msgstr "Affissà l’elementi assenti solu à m&anca"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWMISSINGMIDDLEONLY
-#: Merge.rc:474
+#: Merge.rc:478
msgid "Show Mi&ddle Only Missing Items"
msgstr "Affissà l’elementi assenti solu à u c&entru"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWMISSINGRIGHTONLY
-#: Merge.rc:475
+#: Merge.rc:479
msgid "Show Rig&ht Only Missing Items"
msgstr "Affissà l’elementi assenti solu à d&iritta"
#. IDR_DIRDOCTYPE, ID_VIEW_SHOWHIDDENITEMS
-#: Merge.rc:478
+#: Merge.rc:482
msgid "Show Hidd&en Items"
msgstr "Affissà l’elementi &piattati"
#. IDR_DIRDOCTYPE, ID_VIEW_TREEMODE
-#: Merge.rc:480
+#: Merge.rc:484
msgid "Tree &Mode"
msgstr "&Modu in arburu"
#. IDR_DIRDOCTYPE
-#: Merge.rc:481
+#: Merge.rc:485
msgid "E&xpand Subfolders"
msgstr "&Allargà i sottucartulari"
#. IDR_DIRDOCTYPE, ID_VIEW_EXPAND_ALLSUBDIRS
-#: Merge.rc:483
+#: Merge.rc:487
msgid "&All Subfolders"
msgstr "&Tutti i sottucartulari"
#. IDR_DIRDOCTYPE, ID_VIEW_EXPAND_DIFFERENT_SUBDIRS
-#: Merge.rc:484
+#: Merge.rc:488
msgid "&Different Subfolders"
msgstr "I sottucartulari &sfarenti"
#. IDR_DIRDOCTYPE, ID_VIEW_EXPAND_IDENTICAL_SUBDIRS
-#: Merge.rc:485
+#: Merge.rc:489
msgid "&Identical Subfolders"
msgstr "I sottucartulari &uguali"
#. IDR_DIRDOCTYPE, ID_VIEW_COLLAPSE_ALLSUBDIRS
-#: Merge.rc:487
+#: Merge.rc:491
msgid "&Collapse All Subfolders"
msgstr "&Ripiegà tutti i sottucartulari"
#. IDR_DIRDOCTYPE, ID_VIEW_SHOW_EMPTY_FOLDERS
-#: Merge.rc:488
+#: Merge.rc:492
msgid "Show &Empty Folders"
msgstr "Affissà i cartulari &vioti"
#. IDR_MERGEDOCTYPE, ID_VIEW_SELECTFONT
-#: Merge.rc:490 Merge.rc:697
+#: Merge.rc:494 Merge.rc:704
msgid "Select &Font..."
msgstr "Selezziunà a &grafia…"
#. IDR_MERGEDOCTYPE, ID_VIEW_USEDEFAULTFONT
-#: Merge.rc:491 Merge.rc:698
+#: Merge.rc:495 Merge.rc:705
msgid "Use Default Font"
msgstr "Impiegà a grafia pre&definita"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:493 Merge.rc:736
+#: Merge.rc:497 Merge.rc:743
msgid "Sw&ap Panes"
msgstr "Scambià i &pannelli"
#. IDR_MERGEDOCTYPE, ID_SWAPPANES_SWAP12
-#: Merge.rc:495 Merge.rc:738
+#: Merge.rc:499 Merge.rc:745
msgid "Swap &1st | 2nd"
msgstr "Scambià &1ᵘ | 2ᵘ"
#. IDR_MERGEDOCTYPE, ID_SWAPPANES_SWAP23
-#: Merge.rc:496 Merge.rc:739
+#: Merge.rc:500 Merge.rc:746
msgid "Swap &2nd | 3rd"
msgstr "Scambià &2ᵘ | 3ᵘ"
#. IDR_MERGEDOCTYPE, ID_SWAPPANES_SWAP13
-#: Merge.rc:497 Merge.rc:740
+#: Merge.rc:501 Merge.rc:747
msgid "Swap 1st | &3rd"
msgstr "Scambià 1ᵘ | &3ᵘ"
#. IDR_DIRDOCTYPE, ID_VIEW_DISPLAY_FILTER_BAR_MENU
-#: Merge.rc:514
+#: Merge.rc:518
msgid "Displa&y Filter Bar\tCtrl+Shift+L"
msgstr "Affissà a barra di &filtru\tCtrl+Maius+L"
#. IDR_DIRDOCTYPE, ID_VIEW_DIR_STATISTICS
-#: Merge.rc:518
+#: Merge.rc:522
msgid "Com&pare Statistics..."
msgstr "Statistiche di ¶gone…"
#. IDR_MERGEDOCTYPE, ID_REFRESH
-#: Merge.rc:520 Merge.rc:763
+#: Merge.rc:524 Merge.rc:770
msgid "Refresh\tF5"
msgstr "Attualiz&à\tF5"
#. IDR_POPUP_DIRVIEW, ID_RESCAN
-#: Merge.rc:521 Merge.rc:1030
+#: Merge.rc:525 Merge.rc:1038
msgid "&Refresh Selected\tCtrl+F5"
msgstr "Attuali&zà a selezzione\tCtrl+F5"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:523 Merge.rc:765
+#: Merge.rc:527 Merge.rc:772
msgid "&Merge"
msgstr "&Fusione"
#. IDR_DIRDOCTYPE, ID_MERGE_COMPARE
-#: Merge.rc:525
+#: Merge.rc:529
msgid "Co&mpare\tEnter"
msgstr "Para&gunà\tEntrée"
#. IDR_MERGEDOCTYPE, ID_NEXTDIFF
-#: Merge.rc:527 Merge.rc:767
+#: Merge.rc:531 Merge.rc:774
msgid "&Next Difference\tAlt+Down"
msgstr "Sfarenza &seguente\tAlt+Inghjò"
#. IDR_MERGEDOCTYPE, ID_PREVDIFF
-#: Merge.rc:528 Merge.rc:768
+#: Merge.rc:532 Merge.rc:775
msgid "&Previous Difference\tAlt+Up"
msgstr "Sfarenza p&recedente\tAlt+Insù"
#. IDR_MERGEDOCTYPE, ID_FIRSTDIFF
-#: Merge.rc:530 Merge.rc:773
+#: Merge.rc:534 Merge.rc:780
msgid "&First Difference\tAlt+Home"
msgstr "&Prima sfarenza\tAlt+Accolta"
#. IDR_MERGEDOCTYPE, ID_CURDIFF
-#: Merge.rc:531 Merge.rc:774
+#: Merge.rc:535 Merge.rc:781
msgid "&Current Difference\tAlt+Enter"
msgstr "Sfaren&za currente\tAlt+Entre"
#. IDR_MERGEDOCTYPE, ID_LASTDIFF
-#: Merge.rc:532 Merge.rc:775
+#: Merge.rc:536 Merge.rc:782
msgid "&Last Difference\tAlt+End"
msgstr "&Ultima sfarenza\tAlt+Fine"
#. IDR_MERGEDOCTYPE, ID_L2R
-#: Merge.rc:534 Merge.rc:830
+#: Merge.rc:538 Merge.rc:837
msgid "Copy to &Right\tAlt+Right"
msgstr "Cupià versu a &diritta\tAlt+Diritta"
#. IDR_MERGEDOCTYPE, ID_R2L
-#: Merge.rc:535 Merge.rc:831
+#: Merge.rc:539 Merge.rc:838
msgid "Copy to L&eft\tAlt+Left"
msgstr "Cupià versu a &manca\tAlt+Manca"
#. IDR_DIRDOCTYPE, ID_MERGE_DELETE
-#: Merge.rc:537
+#: Merge.rc:541
msgid "&Delete\tDel"
msgstr "S&quassà\tSupp"
#. IDR_POPUP_DIRVIEW, ID_TOOLS_CUSTOMIZECOLUMNS
-#: Merge.rc:541 Merge.rc:1042
+#: Merge.rc:545 Merge.rc:1050
msgid "&Customize Columns..."
msgstr "&Persunalizà e culonne…"
#. IDR_MERGEDOCTYPE, ID_TOOLS_GENERATEREPORT
-#: Merge.rc:544 Merge.rc:851
+#: Merge.rc:548 Merge.rc:858
msgid "Generate &Report..."
msgstr "Ingenerà un &raportu…"
#. IDD_ENCODINGERROR, IDC_PLUGIN
-#: Merge.rc:556 Merge.rc:867 Merge.rc:3064
+#: Merge.rc:560 Merge.rc:874 Merge.rc:3074
msgid "&Edit with Unpacker..."
msgstr "Mu&dificà cù u spacchittadore…"
#. IDR_MERGEDOCTYPE, ID_FILE_SAVE
-#: Merge.rc:611
+#: Merge.rc:617
msgid "&Save\tCtrl+S"
msgstr "&Arregistrà\tCtrl+S"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:612
+#: Merge.rc:618
msgid "Sav&e"
msgstr "Arre&gistrà"
#. IDR_POPUP_SAVE, ID_FILE_SAVE_LEFT
-#: Merge.rc:614 Merge.rc:1201
+#: Merge.rc:620 Merge.rc:1211
msgid "Save &Left"
msgstr "Arregistrà à &manca"
#. IDR_POPUP_SAVE, ID_FILE_SAVE_MIDDLE
-#: Merge.rc:615 Merge.rc:1202
+#: Merge.rc:621 Merge.rc:1212
msgid "Save &Middle"
msgstr "Arregistrà à u ¢ru"
#. IDR_POPUP_SAVE, ID_FILE_SAVE_RIGHT
-#: Merge.rc:616 Merge.rc:1203
+#: Merge.rc:622 Merge.rc:1213
msgid "Save &Right"
msgstr "Arregistrà à &diritta"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:618
+#: Merge.rc:624
msgid "Save &As"
msgstr "Arregistrà cù u n&ome"
#. IDR_POPUP_SAVE, ID_FILE_SAVEAS_LEFT
-#: Merge.rc:620 Merge.rc:1205
+#: Merge.rc:626 Merge.rc:1215
msgid "Save &Left As..."
msgstr "Arregistrà à &manca cù u nome..."
#. IDR_POPUP_SAVE, ID_FILE_SAVEAS_MIDDLE
-#: Merge.rc:621 Merge.rc:1206
+#: Merge.rc:627 Merge.rc:1216
msgid "Save &Middle As..."
msgstr "Arregistrà à u ¢ru cù u nome…"
#. IDR_POPUP_SAVE, ID_FILE_SAVEAS_RIGHT
-#: Merge.rc:622 Merge.rc:1207
+#: Merge.rc:628 Merge.rc:1217
msgid "Save &Right As..."
msgstr "Arregistrà à &diritta cù u nome…"
#. IDR_MERGEDOCTYPE, ID_FILE_PRINT
-#: Merge.rc:625
+#: Merge.rc:631
msgid "&Print...\tCtrl+P"
msgstr "&Stampà…\tCtrl+P"
#. IDR_MERGEDOCTYPE, ID_FILE_PAGE_SETUP
-#: Merge.rc:626
+#: Merge.rc:632
msgid "Page Set&up..."
msgstr "&Messa in pagina…"
#. IDR_MERGEDOCTYPE, ID_FILE_PRINT_PREVIEW
-#: Merge.rc:627
+#: Merge.rc:633
msgid "Print Previe&w..."
msgstr "Fighj&ulata nanzu a stampa…"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:636
+#: Merge.rc:642
msgid "&Convert Line Endings to"
msgstr "Cun&vertisce i caratteri di fine di linea in"
#. IDR_MERGEDOCTYPE, ID_FILE_MERGINGMODE
-#: Merge.rc:643
+#: Merge.rc:649
msgid "Mer&ge Mode\tF9"
msgstr "Modu di &fusione\tF9"
#. IDR_MERGEDOCTYPE, ID_RESCAN
-#: Merge.rc:645
+#: Merge.rc:651
msgid "Reloa&d\tCtrl+F5"
msgstr "&Ricaricà\tCtrl+F5"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:647
+#: Merge.rc:653
msgid "Reco&mpare As"
msgstr "Riparagunà cum’&è"
+#. IDR_POPUP_COMPARE, ID_MERGE_COMPARE_FOLDER
+#: Merge.rc:660 Merge.rc:947 Merge.rc:1185
+msgid "A&rchive"
+msgstr ""
+
#. IDR_MERGEDOCTYPE, ID_EDIT_UNDO
-#: Merge.rc:666
+#: Merge.rc:673
msgid "&Undo\tCtrl+Z"
msgstr "&Disfà\tCtrl+Z"
#. IDR_MERGEDOCTYPE, ID_EDIT_REDO
-#: Merge.rc:667
+#: Merge.rc:674
msgid "&Redo\tCtrl+Y"
msgstr "&Rifà\tCtrl+Y"
#. IDR_MERGEDOCTYPE, ID_EDIT_CUT
-#: Merge.rc:669
+#: Merge.rc:676
msgid "Cu&t\tCtrl+X"
msgstr "&Taglià\tCtrl+X"
#. IDR_POPUP_OUTPUTVIEW, ID_EDIT_COPY
-#: Merge.rc:670 Merge.rc:1342
+#: Merge.rc:677 Merge.rc:1352
msgid "&Copy\tCtrl+C"
msgstr "&Cupià\tCtrl+C"
#. IDR_MERGEDOCTYPE, ID_EDIT_FIND
-#: Merge.rc:676
+#: Merge.rc:683
msgid "F&ind...\tCtrl+F"
msgstr "Ri&cercà…\tCtrl+F"
#. IDR_MERGEDOCTYPE, ID_EDIT_REPLACE
-#: Merge.rc:677
+#: Merge.rc:684
msgid "Repla&ce...\tCtrl+H"
msgstr "Rim&piazzà…\tCtrl+H"
#. IDR_MERGEDOCTYPE, ID_EDIT_MARK
-#: Merge.rc:678
+#: Merge.rc:685
msgid "&Marker...\tCtrl+Shift+M"
msgstr "&Marcatore…\tCtrl+Maius+M"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:680
+#: Merge.rc:687
msgid "Advanced"
msgstr "&Espertu"
#. IDR_MERGEDOCTYPE, ID_EDIT_COPY_LINENUMBERS
-#: Merge.rc:682
+#: Merge.rc:689
msgid "&Copy With Line Numbers\tCtrl+Shift+C"
msgstr "&Cupià cù i numeri di linea\tCtrl+Maius+C"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:684
+#: Merge.rc:691
msgid "&Bookmarks"
msgstr "&Indette"
#. IDR_MERGEDOCTYPE, ID_EDIT_TOGGLE_BOOKMARK
-#: Merge.rc:686
+#: Merge.rc:693
msgid "&Toggle Bookmark\tCtrl+F2"
msgstr "&Attivà o disattivà l’indetta\tCtrl+F2"
#. IDR_MERGEDOCTYPE, ID_EDIT_GOTO_NEXT_BOOKMARK
-#: Merge.rc:687
+#: Merge.rc:694
msgid "&Next Bookmark\tF2"
msgstr "Indetta &seguente\tF2"
#. IDR_MERGEDOCTYPE, ID_EDIT_GOTO_PREV_BOOKMARK
-#: Merge.rc:688
+#: Merge.rc:695
msgid "&Previous Bookmark\tShift+F2"
msgstr "Indetta &precedente\tMaius+F2"
#. IDR_MERGEDOCTYPE, ID_EDIT_CLEAR_ALL_BOOKMARKS
-#: Merge.rc:689
+#: Merge.rc:696
msgid "&Clear All Bookmarks"
msgstr "S&quassà tutte l’indette"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:706
+#: Merge.rc:713
msgid "Syntax Highlight"
msgstr "&Sopralineamentu di a sintassa"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:711
+#: Merge.rc:718
msgid "&Diff Context"
msgstr "&Cuntestu di sfarenza"
#. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_ALL
-#: Merge.rc:713
+#: Merge.rc:720
msgid "&All Lines"
msgstr "&Tutte e linee"
#. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_0
-#: Merge.rc:715
+#: Merge.rc:722
msgid "&0 Lines"
msgstr "&0 linea"
#. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_1
-#: Merge.rc:716
+#: Merge.rc:723
msgid "&1 Line"
msgstr "&1 linea"
#. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_3
-#: Merge.rc:717
+#: Merge.rc:724
msgid "&3 Lines"
msgstr "&3 linee"
#. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_5
-#: Merge.rc:718
+#: Merge.rc:725
msgid "&5 Lines"
msgstr "&5 linee"
#. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_7
-#: Merge.rc:719
+#: Merge.rc:726
msgid "&7 Lines"
msgstr "&7 linee"
#. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_9
-#: Merge.rc:720
+#: Merge.rc:727
msgid "&9 Lines"
msgstr "&9 linee"
#. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_TOGGLE
-#: Merge.rc:722
+#: Merge.rc:729
msgid "&Toggle All and 0-9 Lines\tCtrl+D"
msgstr "&Attivà o disattivà tutte o 0-9 linee\tCtrl+D"
#. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_INVERT
-#: Merge.rc:724
+#: Merge.rc:731
msgid "&Invert (Hide Different Lines)"
msgstr "&Invertisce (piattà e linee sfarente)"
#. IDR_MERGEDOCTYPE, ID_VIEW_RESIZE_PANES
-#: Merge.rc:727
+#: Merge.rc:734
msgid "&Lock Panes"
msgstr "Ammarc&hjunà i pannelli"
#. IDR_MERGEDOCTYPE, ID_VIEW_WHITESPACE
-#: Merge.rc:728
+#: Merge.rc:735
msgid "&View Whitespace"
msgstr "Affissà i spa&zii bianchi"
#. IDR_MERGEDOCTYPE, ID_VIEW_EOL
-#: Merge.rc:729
+#: Merge.rc:736
msgid "View E&OL"
msgstr "Affissà i caratteri di &fine di linea"
#. IDR_MERGEDOCTYPE, ID_VIEW_LINEDIFFS
-#: Merge.rc:730
+#: Merge.rc:737
msgid "Vie&w Line Differences"
msgstr "&Affissà e sfarenze di linea"
#. IDR_MERGEDOCTYPE, ID_VIEW_LINENUMBERS
-#: Merge.rc:731
+#: Merge.rc:738
msgid "View Line &Numbers"
msgstr "Affissà i &numeri di linea"
#. IDR_MERGEDOCTYPE, ID_VIEW_SELMARGIN
-#: Merge.rc:732
+#: Merge.rc:739
msgid "View &Margins"
msgstr "Affissà e &margine"
#. IDR_MERGEDOCTYPE, ID_VIEW_TOPMARGIN
-#: Merge.rc:733
+#: Merge.rc:740
msgid "View To&p Margins"
msgstr "Affissà e margine ins&ù"
#. IDR_MERGEDOCTYPE, ID_VIEW_WORDWRAP
-#: Merge.rc:734
+#: Merge.rc:741
msgid "W&rap Lines"
msgstr "&Ritornu autumaticu à a linea"
#. IDR_MERGEDOCTYPE, ID_VIEW_SPLITVERTICALLY
-#: Merge.rc:742
+#: Merge.rc:749
msgid "Split V&ertically"
msgstr "Frazziunà &verticalmente"
#. IDR_MERGEDOCTYPE, ID_VIEW_DETAIL_BAR
-#: Merge.rc:759
+#: Merge.rc:766
msgid "Diff &Pane"
msgstr "Pannellu di &e sfarenze"
#. IDR_MERGEDOCTYPE, ID_VIEW_LOCATION_BAR
-#: Merge.rc:760
+#: Merge.rc:767
msgid "Lo&cation Pane"
msgstr "Pannellu di pusizi&one"
#. IDS_OUTPUTBAR_CAPTION
-#: Merge.rc:761 Merge.rc:4902
+#: Merge.rc:768 Merge.rc:4912
msgid "Output Pane"
msgstr "Pannellu d’esciuta"
#. IDR_MERGEDOCTYPE, ID_NEXTCONFLICT
-#: Merge.rc:770
+#: Merge.rc:777
msgid "Ne&xt Conflict\tAlt+Shift+Down"
msgstr "&Cunflittu seguente\tAlt+Maius+Inghjò"
#. IDR_MERGEDOCTYPE, ID_PREVCONFLICT
-#: Merge.rc:771
+#: Merge.rc:778
msgid "Pre&vious Conflict\tAlt+Shift+Up"
msgstr "Cunf&littu precedente\tAlt+Maius+Insù"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:777
+#: Merge.rc:784
msgid "A&dvanced"
msgstr "&Espertu"
#. IDR_MERGEDOCTYPE, ID_NEXTDIFFLM
-#: Merge.rc:779
+#: Merge.rc:786
msgid "Next Difference (Left/Middle)\tAlt+1"
msgstr "Sfarenza seguente trà manca è centru\tAlt+1"
#. IDR_MERGEDOCTYPE, ID_PREVDIFFLM
-#: Merge.rc:780
+#: Merge.rc:787
msgid "Previous Difference (Left/Middle)\tAlt+Shift+1"
msgstr "Sfarenza precedente trà manca è centru\tAlt+Maius+1"
#. IDR_MERGEDOCTYPE, ID_NEXTDIFFLR
-#: Merge.rc:782
+#: Merge.rc:789
msgid "Next Difference (Left/Right)\tAlt+2"
msgstr "Sfarenza seguente trà manca è diritta\tAlt+2"
#. IDR_MERGEDOCTYPE, ID_PREVDIFFLR
-#: Merge.rc:783
+#: Merge.rc:790
msgid "Previous Difference (Left/Right)\tAlt+Shift+2"
msgstr "Sfarenza precedente trà manca è diritta\tAlt+Maius+2"
#. IDR_MERGEDOCTYPE, ID_NEXTDIFFMR
-#: Merge.rc:785
+#: Merge.rc:792
msgid "Next Difference (Middle/Right)\tAlt+3"
msgstr "Sfarenza seguente trà centru è diritta\tAlt+3"
#. IDR_MERGEDOCTYPE, ID_PREVDIFFMR
-#: Merge.rc:786
+#: Merge.rc:793
msgid "Previous Difference (Middle/Right)\tAlt+Shift+3"
msgstr "Sfarenza precedente trà centru è diritta\tAlt+Maius+3"
#. IDR_MERGEDOCTYPE, ID_NEXTDIFFLO
-#: Merge.rc:788
+#: Merge.rc:795
msgid "Next Left-Only Difference\tAlt+7"
msgstr "Sfarenza seguente solu à manca\tAlt+7"
#. IDR_MERGEDOCTYPE, ID_PREVDIFFLO
-#: Merge.rc:789
+#: Merge.rc:796
msgid "Previous Left-Only Difference\tAlt+Shift+7"
msgstr "Sfarenza precedente solu à manca\tAlt+Maius+7"
#. IDR_MERGEDOCTYPE, ID_NEXTDIFFMO
-#: Merge.rc:791
+#: Merge.rc:798
msgid "Next Middle-Only Difference\tAlt+8"
msgstr "Sfarenza seguente solu à u centru\tAlt+8"
#. IDR_MERGEDOCTYPE, ID_PREVDIFFMO
-#: Merge.rc:792
+#: Merge.rc:799
msgid "Previous Middle-Only Difference\tAlt+Shift+8"
msgstr "Sfarenza precedente solu à u centru\tAlt+Maius+8"
#. IDR_MERGEDOCTYPE, ID_NEXTDIFFRO
-#: Merge.rc:794
+#: Merge.rc:801
msgid "Next Right-Only Difference\tAlt+9"
msgstr "Sfarenza seguente solu à diritta\tAlt+9"
#. IDR_MERGEDOCTYPE, ID_PREVDIFFRO
-#: Merge.rc:795
+#: Merge.rc:802
msgid "Previous Right-Only Difference\tAlt+Shift+9"
msgstr "Sfarenza precedente solu à diritta\tAlt+Maius+9"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:797
+#: Merge.rc:804
msgid "Copy from &Left to"
msgstr "Cupià da a &manca versu"
#. IDD_LOAD_SAVE_CODEPAGE, IDC_AFFECTS_MIDDLE_BTN
-#: Merge.rc:799 Merge.rc:810 Merge.rc:815 Merge.rc:826 Merge.rc:970
-#: Merge.rc:2545 Merge.rc:2817
+#: Merge.rc:806 Merge.rc:817 Merge.rc:822 Merge.rc:833 Merge.rc:978
+#: Merge.rc:2555 Merge.rc:2827
msgid "&Middle"
msgstr "&Centru"
#. IDD_LOAD_SAVE_CODEPAGE, IDC_AFFECTS_RIGHT_BTN
-#: Merge.rc:800 Merge.rc:805 Merge.rc:816 Merge.rc:821 Merge.rc:971
-#: Merge.rc:2546 Merge.rc:2819
+#: Merge.rc:807 Merge.rc:812 Merge.rc:823 Merge.rc:828 Merge.rc:979
+#: Merge.rc:2556 Merge.rc:2829
msgid "&Right"
msgstr "&Diritta"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:802
+#: Merge.rc:809
msgid "Copy from &Middle to"
msgstr "Cupià da u ¢ru versu"
#. IDD_LOAD_SAVE_CODEPAGE, IDC_AFFECTS_LEFT_BTN
-#: Merge.rc:804 Merge.rc:809 Merge.rc:820 Merge.rc:825 Merge.rc:969
-#: Merge.rc:2544 Merge.rc:2815
+#: Merge.rc:811 Merge.rc:816 Merge.rc:827 Merge.rc:832 Merge.rc:977
+#: Merge.rc:2554 Merge.rc:2825
msgid "&Left"
msgstr "&Manca"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:807
+#: Merge.rc:814
msgid "Copy from &Right to"
msgstr "Cupià da a &diritta versu"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:813
+#: Merge.rc:820
msgid "Copy Selected Lines from Le&ft to"
msgstr "Cupià e linee selezziunate da a m&anca versu"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:818
+#: Merge.rc:825
msgid "Copy Selected Lines from Mi&ddle to"
msgstr "Cupià e linee selezziunate da u c&entru versu"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:823
+#: Merge.rc:830
msgid "Copy Selected Lines from Ri&ght to"
msgstr "Cupià e linee selezziunate da a d&iritta versu"
#. IDR_MERGEDOCTYPE, ID_COPY_FROM_LEFT
-#: Merge.rc:833
+#: Merge.rc:840
msgid "Copy from Left\tAlt+Shift+Right"
msgstr "Cupià da a manca\tAlt+Maius+Diritta"
#. IDR_MERGEDOCTYPE, ID_COPY_FROM_RIGHT
-#: Merge.rc:834
+#: Merge.rc:841
msgid "Copy from Right\tAlt+Shift+Left"
msgstr "Cupià da a diritta\tAlt+Maius+Manca"
#. IDR_MERGEDOCTYPE, ID_L2RNEXT
-#: Merge.rc:836
+#: Merge.rc:843
msgid "C&opy to Right and Advance\tCtrl+Alt+Right"
msgstr "Cupià versu a diri&tta è avanzà\tCtrl+Alt+Diritta"
#. IDR_MERGEDOCTYPE, ID_R2LNEXT
-#: Merge.rc:837
+#: Merge.rc:844
msgid "Copy &to Left and Advance\tCtrl+Alt+Left"
msgstr "Cupià versu a manca è a&vanzà\tCtrl+Alt+Manca"
#. IDR_MERGEDOCTYPE, ID_ALL_RIGHT
-#: Merge.rc:839
+#: Merge.rc:846
msgid "Copy &All to Right"
msgstr "Tuttu cupià versu a d&iritta"
#. IDR_MERGEDOCTYPE, ID_ALL_LEFT
-#: Merge.rc:840
+#: Merge.rc:847
msgid "Cop&y All to Left"
msgstr "Tuttu cupià versu a ma&nca"
#. IDR_MERGEDOCTYPE, ID_AUTO_MERGE
-#: Merge.rc:842
+#: Merge.rc:849
msgid "A&uto Merge\tCtrl+Alt+M"
msgstr "&Fusione autumatica\tCtrl+Alt+M"
#. IDR_MERGEDOCTYPE, ID_ADD_SYNCPOINT
-#: Merge.rc:844
+#: Merge.rc:851
msgid "Add &Synchronization Point\tAlt+S"
msgstr "&Aghjunghje un puntu di sincrunizazione\tAlt+S"
#. IDR_MERGEDOCTYPE, ID_CLEAR_SYNCPOINTS
-#: Merge.rc:845
+#: Merge.rc:852
msgid "Clear Sync&hronization Points"
msgstr "S&quassà i punti di sincrunizazione"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:863
+#: Merge.rc:870
msgid "Unpac&ker"
msgstr "&Spacchittadore"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:869
+#: Merge.rc:876
msgid "&Prediffer"
msgstr "&Preparagone"
#. IDR_MERGEDOCTYPE, ID_APPLY_PREDIFFER
-#: Merge.rc:873
+#: Merge.rc:880
msgid "Apply Pre&differ..."
msgstr "App&iecà u preparagone…"
#. IDR_MERGEDOCTYPE, ID_TRANSFORM_WITH_SCRIPT
-#: Merge.rc:879
+#: Merge.rc:886
msgid "&Transform with Editor Script..."
msgstr "&Trasfurmà cù un scenariu d’editore…"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:880
+#: Merge.rc:887
msgid "Scripts for &Copying"
msgstr "Scenarii per a c&opia"
#. IDR_MERGEDOCTYPE, ID_SELECT_EDITOR_SCRIPT_FOR_COPYING
-#: Merge.rc:886
+#: Merge.rc:893
msgid "Select &Editor Script..."
msgstr "Selezziunà un scenariu d’&editore…"
#. IDR_MERGEDOCTYPE, ID_WINDOW_SPLIT
-#: Merge.rc:898
+#: Merge.rc:905
msgid "Sp&lit"
msgstr "&Sparte"
#. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE
-#: Merge.rc:921
+#: Merge.rc:928
msgid "Comp&are"
msgstr "&Paragunà"
#. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE_WITH_MOVED_RENAMED
-#: Merge.rc:922
+#: Merge.rc:929
msgid "Compar&e with Renamed/Moved Items"
msgstr "Paragunà cù l’&elementi rinuminati o dispiazzati"
#. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE_IN_NEW_WINDOW
-#: Merge.rc:923
+#: Merge.rc:930
msgid "Compare in New &Window"
msgstr "Paragunà in una nova &finestra"
#. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE_NONHORIZONTALLY
-#: Merge.rc:924 Merge.rc:931
+#: Merge.rc:931 Merge.rc:938
msgid "Compare Non-hor&izontally..."
msgstr "Paragunà micca &orizuntalmente…"
#. IDR_POPUP_DIRVIEW
-#: Merge.rc:925
+#: Merge.rc:932
msgid "Compare Non-hor&izontally"
msgstr "Paragunà micca or&izuntalmente"
#. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE_LEFT1_LEFT2
-#: Merge.rc:927
+#: Merge.rc:934
msgid "First &Left with Second Left"
msgstr "Primu à &manca cù secondu à manca"
#. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE_RIGHT1_RIGHT2
-#: Merge.rc:928
+#: Merge.rc:935
msgid "First &Right with Second Right"
msgstr "Primu à &diritta cù secondu à diritta"
#. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE_LEFT1_RIGHT2
-#: Merge.rc:929
+#: Merge.rc:936
msgid "&First Left with Second Right"
msgstr "&Primu à manca cù secondu à diritta"
#. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE_LEFT2_RIGHT1
-#: Merge.rc:930
+#: Merge.rc:937
msgid "&Second Left with First Right"
msgstr "&Secondu à manca cù primu à diritta"
#. IDR_POPUP_DIRVIEW
-#: Merge.rc:933
+#: Merge.rc:940
msgid "Co&mpare As"
msgstr "Paragunà cum’&è"
#. IDS_COPY_LEFT_TO_MIDDLE2
-#: Merge.rc:945 Merge.rc:957 Merge.rc:4502
+#: Merge.rc:953 Merge.rc:965 Merge.rc:4512
#, c-format
msgid "Left to Middle (%1 of %2)"
msgstr "Da manca à centru (%1 nant’à %2)"
#. IDS_COPY_LEFT_TO_RIGHT2
-#: Merge.rc:946 Merge.rc:958 Merge.rc:4501
+#: Merge.rc:954 Merge.rc:966 Merge.rc:4511
#, c-format
msgid "Left to Right (%1 of %2)"
msgstr "Da manca à diritta (%1 nant’à %2)"
#. IDS_MOVE_LEFT_TO2
-#: Merge.rc:947 Merge.rc:959 Merge.rc:1022 Merge.rc:4513 Merge.rc:4542
+#: Merge.rc:955 Merge.rc:967 Merge.rc:1030 Merge.rc:4523 Merge.rc:4552
#, c-format
msgid "Left to... (%1 of %2)"
msgstr "Da manca à… (%1 nant’à %2)"
#. IDS_COPY_MIDDLE_TO_LEFT2
-#: Merge.rc:948 Merge.rc:960 Merge.rc:4499
+#: Merge.rc:956 Merge.rc:968 Merge.rc:4509
#, c-format
msgid "Middle to Left (%1 of %2)"
msgstr "Da centru à manca (%1 nant’à %2)"
#. IDS_COPY_MIDDLE_TO_RIGHT2
-#: Merge.rc:949 Merge.rc:961 Merge.rc:4500
+#: Merge.rc:957 Merge.rc:969 Merge.rc:4510
#, c-format
msgid "Middle to Right (%1 of %2)"
msgstr "Da centru à diritta (%1 nant’à %2)"
#. IDS_MOVE_MIDDLE_TO2
-#: Merge.rc:950 Merge.rc:962 Merge.rc:1023 Merge.rc:4514 Merge.rc:4543
+#: Merge.rc:958 Merge.rc:970 Merge.rc:1031 Merge.rc:4524 Merge.rc:4553
#, c-format
msgid "Middle to... (%1 of %2)"
msgstr "Da centru à… (%1 nant’à %2)"
#. IDS_COPY_RIGHT_TO_MIDDLE2
-#: Merge.rc:951 Merge.rc:963 Merge.rc:4498
+#: Merge.rc:959 Merge.rc:971 Merge.rc:4508
#, c-format
msgid "Right to Middle (%1 of %2)"
msgstr "Da diritta à centru (%1 nant’à %2)"
#. IDS_COPY_RIGHT_TO_LEFT2
-#: Merge.rc:952 Merge.rc:964 Merge.rc:4497
+#: Merge.rc:960 Merge.rc:972 Merge.rc:4507
#, c-format
msgid "Right to Left (%1 of %2)"
msgstr "Da diritta à manca (%1 nant’à %2)"
#. IDS_MOVE_RIGHT_TO2
-#: Merge.rc:953 Merge.rc:965 Merge.rc:1024 Merge.rc:4515 Merge.rc:4544
+#: Merge.rc:961 Merge.rc:973 Merge.rc:1032 Merge.rc:4525 Merge.rc:4554
#, c-format
msgid "Right to... (%1 of %2)"
msgstr "Da diritta à… (%1 nant’à %2)"
#. IDD_EDIT_MARKER, IDC_EDIT_MARKER_DELETE
-#: Merge.rc:967 Merge.rc:2036
+#: Merge.rc:975 Merge.rc:2046
msgid "&Delete"
msgstr "&Squassà"
#. IDR_POPUP_DIRVIEW, ID_DIR_DEL_BOTH
-#: Merge.rc:972
+#: Merge.rc:980
msgid "&Both"
msgstr "&Tramindui"
#. IDR_POPUP_DIRVIEW, ID_DIR_DEL_ALL
-#: Merge.rc:973
+#: Merge.rc:981
msgid "&All"
msgstr "T&uttu"
#. IDD_EDIT_REPLACE, IDC_EDIT_SCOPE_SELECTION
-#: Merge.rc:974 Merge.rc:2019
+#: Merge.rc:982 Merge.rc:2029
msgid "&Selection"
msgstr "Sele&zzione"
#. IDR_POPUP_DIRVIEW, ID_DIR_ITEM_RENAME
-#: Merge.rc:976
+#: Merge.rc:984
msgid "Re&name"
msgstr "Ri&numinà"
#. IDR_POPUP_DIRVIEW, ID_DIR_HIDE_FILENAMES
-#: Merge.rc:977
+#: Merge.rc:985
msgid "&Hide Items"
msgstr "Piattà &l’elementi"
#. IDR_POPUP_DIRVIEW
-#: Merge.rc:979
+#: Merge.rc:987
msgid "&Open Left"
msgstr "&Apre à manca"
#. IDR_POPUP_DIRVIEW
-#: Merge.rc:986
+#: Merge.rc:994
msgid "Open Midd&le"
msgstr "Apre à u c&entru"
#. IDR_POPUP_DIRVIEW
-#: Merge.rc:993
+#: Merge.rc:1001
msgid "O&pen Right"
msgstr "Apre à d&iritta"
#. IDR_POPUP_DIRVIEW
-#: Merge.rc:1001
+#: Merge.rc:1009
msgid "Cop&y Paths"
msgstr "Cupià i c&hjassi"
#. IDS_DEL_LEFT_FMT2
-#: Merge.rc:1003 Merge.rc:1012 Merge.rc:4530
+#: Merge.rc:1011 Merge.rc:1020 Merge.rc:4540
#, c-format
msgid "Left (%1 of %2)"
msgstr "Manca (%1 nant’à %2)"
#. IDS_DEL_MIDDLE_FMT2
-#: Merge.rc:1004 Merge.rc:1013 Merge.rc:4531
+#: Merge.rc:1012 Merge.rc:1021 Merge.rc:4541
#, c-format
msgid "Middle (%1 of %2)"
msgstr "Centru (%1 nant’à %2)"
#. IDS_DEL_RIGHT_FMT2
-#: Merge.rc:1005 Merge.rc:1014 Merge.rc:4532
+#: Merge.rc:1013 Merge.rc:1022 Merge.rc:4542
#, c-format
msgid "Right (%1 of %2)"
msgstr "Diritta (%1 nant’à %2)"
#. IDS_DEL_BOTH_FMT2
-#: Merge.rc:1006 Merge.rc:1015 Merge.rc:4533
+#: Merge.rc:1014 Merge.rc:1023 Merge.rc:4543
#, c-format
msgid "Both (%1 of %2)"
msgstr "Tramindui (%1 nant’à %2)"
#. IDS_DEL_ALL_FMT2
-#: Merge.rc:1007 Merge.rc:1016 Merge.rc:4538
+#: Merge.rc:1015 Merge.rc:1024 Merge.rc:4548
#, c-format
msgid "All (%1 of %2)"
msgstr "Tutti (%1 nant’à %2)"
#. IDR_POPUP_DIRVIEW, ID_DIR_COPY_FILENAMES
-#: Merge.rc:1009
+#: Merge.rc:1017
msgid "Copy &Filenames"
msgstr "Cupià i nomi di scheda&riu"
#. IDR_POPUP_DIRVIEW
-#: Merge.rc:1010
+#: Merge.rc:1018
msgid "Copy Items to Clip&board"
msgstr "Cupià l’ele&menti in u preme’papei"
#. IDR_POPUP_DIRVIEW, ID_DIR_COPY_ALL_DISP_COLUMNS
-#: Merge.rc:1018
+#: Merge.rc:1026
msgid "Copy All Di&splayed Columns"
msgstr "Cupià &tutte e culonne affissate"
#. IDR_POPUP_DIRVIEW
-#: Merge.rc:1020
+#: Merge.rc:1028
msgid "&Zip"
msgstr "C&umprime"
#. IDS_COPY_BOTH_TO2
-#: Merge.rc:1025 Merge.rc:4516
+#: Merge.rc:1033 Merge.rc:4526
#, c-format
msgid "Both to... (%1 of %2)"
msgstr "Tramindui versu… (%1 nant’à %2)"
#. IDS_COPY_ALL_TO2
-#: Merge.rc:1026 Merge.rc:4517
+#: Merge.rc:1034 Merge.rc:4527
#, c-format
msgid "All to... (%1 of %2)"
msgstr "Tutti versu… (%1 nant’à %2)"
#. IDS_COPY_DIFFERENCES_TO2
-#: Merge.rc:1027 Merge.rc:4518
+#: Merge.rc:1035 Merge.rc:4528
#, c-format
msgid "Differences to... (%1 of %2)"
msgstr "Sfarenze versu… (%1 nant’à %2)"
#. IDR_POPUP_DIRVIEW, ID_DIR_SHELL_CONTEXT_MENU_LEFT
-#: Merge.rc:1032
+#: Merge.rc:1040
msgid "Left Shell Menu"
msgstr "Listinu cuntestuale à manca"
#. IDR_POPUP_DIRVIEW, ID_DIR_SHELL_CONTEXT_MENU_MIDDLE
-#: Merge.rc:1033
+#: Merge.rc:1041
msgid "Middle Shell Menu"
msgstr "Listinu cuntestuale à u centru"
#. IDR_POPUP_DIRVIEW, ID_DIR_SHELL_CONTEXT_MENU_RIGHT
-#: Merge.rc:1034
+#: Merge.rc:1042
msgid "Right Shell Menu"
msgstr "Listinu cuntestuale à diritta"
#. IDR_POPUP_DIRVIEW, ID_DIR_SHELL_CONTEXT_MENU_BOTH
-#: Merge.rc:1035
+#: Merge.rc:1043
msgid "Both Shell Menu"
msgstr "I dui listini cuntestuali"
#. IDR_POPUP_DIRVIEW, ID_DIR_SHELL_CONTEXT_MENU_ALL
-#: Merge.rc:1036
+#: Merge.rc:1044
msgid "All Shell Menu"
msgstr "Tutti i listini cuntestuali"
#. IDR_POPUP_EDITOR_HEADERBAR, ID_EDITOR_COPY
-#: Merge.rc:1050
+#: Merge.rc:1058
msgid "Copy"
msgstr "Cupià"
#. IDR_POPUP_EDITOR_HEADERBAR, ID_EDITOR_COPY_PATH
-#: Merge.rc:1051
+#: Merge.rc:1059
msgid "&Copy Full Path"
msgstr "&Cupià u chjassu sanu"
#. IDR_POPUP_EDITOR_HEADERBAR, ID_EDITOR_COPY_FILENAME
-#: Merge.rc:1052
+#: Merge.rc:1060
msgid "Copy &Filename"
msgstr "Cupià u nome di &schedariu"
#. IDR_POPUP_EDITOR_HEADERBAR, ID_EDITOR_EDIT_CAPTION
-#: Merge.rc:1053
+#: Merge.rc:1061
msgid "&Edit Caption\tF2"
msgstr "&Mudificà a legenda\tF2"
#. IDR_POPUP_EDITOR_HEADERBAR, ID_EDITOR_EDIT_PATH
-#: Merge.rc:1055
+#: Merge.rc:1063
msgid "Edit &Path\tCtrl+L"
msgstr "Mudificà u &chjassu\tCtrl+L"
#. IDR_POPUP_EDITOR_HEADERBAR, ID_EDITOR_SELECT_FILE
-#: Merge.rc:1056
+#: Merge.rc:1064
msgid "&Open..."
msgstr "A&pre…"
#. IDR_POPUP_PLUGINS_SETTINGS
-#: Merge.rc:1062
+#: Merge.rc:1070
msgid "Unpacker Settings"
msgstr "Parametri di u spacchittadore"
#. IDS_USERCHOICE_NONE
-#: Merge.rc:1064 Merge.rc:1070 Merge.rc:1789 Merge.rc:1793 Merge.rc:5030
+#: Merge.rc:1072 Merge.rc:1078 Merge.rc:1799 Merge.rc:1803 Merge.rc:5040
msgid ""
msgstr ""
#. IDS_USERCHOICE_AUTOMATIC
-#: Merge.rc:1065 Merge.rc:1071 Merge.rc:5031
+#: Merge.rc:1073 Merge.rc:1079 Merge.rc:5041
msgid ""
msgstr ""
#. IDD_OPEN, IDC_SELECT_PREDIFFER
-#: Merge.rc:1066 Merge.rc:1072 Merge.rc:1970 Merge.rc:1974
+#: Merge.rc:1074 Merge.rc:1080 Merge.rc:1980 Merge.rc:1984
msgid "&Select..."
msgstr "&Selezziunà…"
#. IDR_POPUP_PLUGINS_SETTINGS
-#: Merge.rc:1068
+#: Merge.rc:1076
msgid "Prediffer Settings"
msgstr "Parametri di u preparagone"
#. IDR_POPUP_LOCATIONBAR, ID_LOCBAR_GOTODIFF
-#: Merge.rc:1080
+#: Merge.rc:1088
msgid "G&o to Diff"
msgstr "&Tuccà a sfarenza"
#. IDR_POPUP_LOCATIONBAR, ID_LOCBAR_MOVECURSOR_ONCLICK
-#: Merge.rc:1083
+#: Merge.rc:1091
msgid "Move Cursor on &Click"
msgstr "Dispiazzà u cursore cù u &cliccu"
#. IDR_POPUP_LOCATIONBAR, ID_DISPLAY_MOVED_NONE
-#: Merge.rc:1085
+#: Merge.rc:1093
msgid "&No Moved Blocks"
msgstr "&Nisunu bloccu dispiazzatu"
#. IDR_POPUP_LOCATIONBAR, ID_DISPLAY_MOVED_ALL
-#: Merge.rc:1086
+#: Merge.rc:1094
msgid "&All Moved Blocks"
msgstr "&Tutti i blocchi dispiazzati"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS
-#: Merge.rc:1094 Merge.rc:1127
+#: Merge.rc:1102 Merge.rc:1135
msgid "W&hitespaces"
msgstr "Spazii &bianchi"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_WHITESPACE_COMPARE
-#: Merge.rc:1096 Merge.rc:1129
+#: Merge.rc:1104 Merge.rc:1137
msgid "Com&pare"
msgstr "&Paragunà"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_WHITESPACE_IGNORE
-#: Merge.rc:1097 Merge.rc:1130
+#: Merge.rc:1105 Merge.rc:1138
msgid "I&gnore Changes"
msgstr "I&gnurà i cambiamenti"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_WHITESPACE_IGNOREALL
-#: Merge.rc:1098 Merge.rc:1131
+#: Merge.rc:1106 Merge.rc:1139
msgid "Ig&nore All"
msgstr "&Tuttu ignurà"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_IGNORE_BLANKLINES
-#: Merge.rc:1100 Merge.rc:1133
+#: Merge.rc:1108 Merge.rc:1141
msgid "Ignore Blan&k Lines"
msgstr "Ignurà e linee &bianche"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_IGNORE_CASE
-#: Merge.rc:1101 Merge.rc:1134
+#: Merge.rc:1109 Merge.rc:1142
msgid "Ignore &Case"
msgstr "Ignurà a &cassa"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_IGNORE_EOL
-#: Merge.rc:1102 Merge.rc:1135
+#: Merge.rc:1110 Merge.rc:1143
msgid "Igno&re EOL Differences (Windows/Unix/Mac)"
msgstr "Ignurà e sfarenze di &fine di linea (Windows/Unix/Mac)"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_IGNORE_CODEPAGE
-#: Merge.rc:1103 Merge.rc:1136
+#: Merge.rc:1111 Merge.rc:1144
msgid "Ignore Codepage &Differences"
msgstr "Ignurà e &sfarenze di pagina di codice"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_IGNORE_NUMBERS
-#: Merge.rc:1104 Merge.rc:1137
+#: Merge.rc:1112 Merge.rc:1145
msgid "Ignore Num&bers"
msgstr "Ignurà i &numeri"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_IGNORE_COMMENTS
-#: Merge.rc:1105 Merge.rc:1138
+#: Merge.rc:1113 Merge.rc:1146
msgid "Ignore C&omment Differences"
msgstr "Ignurà e sfarenze di c&ummentu"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_IGNORE_MISSING_TRAILING_EOL
-#: Merge.rc:1106 Merge.rc:1139
+#: Merge.rc:1114 Merge.rc:1147
msgid "Ignore &Missing Trailing EOL"
msgstr "Ignurà e fini di &linea assente"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_IGNORE_LINE_BREAKS
-#: Merge.rc:1107 Merge.rc:1140
+#: Merge.rc:1115 Merge.rc:1148
msgid "Ignore Line &Breaks (Treat as Spaces)"
msgstr "Ignurà i s&alti di linea (cunsideralli cum’è spazii)"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_RECURS_CHECK
-#: Merge.rc:1109 Merge.rc:2963
+#: Merge.rc:1117 Merge.rc:2973
msgid "&Include Subfolders"
msgstr "&Include i sottucartulari"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS
-#: Merge.rc:1110 Merge.rc:1142
+#: Merge.rc:1118 Merge.rc:1150
msgid "&Compare Method"
msgstr "&Metoda di paragone"
#. IDS_COMPMETHOD_FULL_CONTENTS
-#: Merge.rc:1112 Merge.rc:1144 Merge.rc:1328 Merge.rc:4282
+#: Merge.rc:1120 Merge.rc:1152 Merge.rc:1338 Merge.rc:4292
msgid "Full Contents"
msgstr "Cuntenutu sanu"
#. IDS_COMPMETHOD_QUICK_CONTENTS
-#: Merge.rc:1113 Merge.rc:1145 Merge.rc:1329 Merge.rc:4283
+#: Merge.rc:1121 Merge.rc:1153 Merge.rc:1339 Merge.rc:4293
msgid "Quick Contents"
msgstr "Cuntenutu rapidu"
#. IDS_COMPMETHOD_BINARY_CONTENTS
-#: Merge.rc:1114 Merge.rc:1146 Merge.rc:1330 Merge.rc:4284
+#: Merge.rc:1122 Merge.rc:1154 Merge.rc:1340 Merge.rc:4294
msgid "Binary Contents"
msgstr "Cuntenutu binariu"
#. IDS_COMPMETHOD_MODDATE
-#: Merge.rc:1115 Merge.rc:1147 Merge.rc:1331 Merge.rc:4285
+#: Merge.rc:1123 Merge.rc:1155 Merge.rc:1341 Merge.rc:4295
msgid "Modified Date"
msgstr "Data di mudificazione"
#. IDS_COMPMETHOD_DATESIZE
-#: Merge.rc:1116 Merge.rc:1148 Merge.rc:1332 Merge.rc:4286
+#: Merge.rc:1124 Merge.rc:1156 Merge.rc:1342 Merge.rc:4296
msgid "Modified Date and Size"
msgstr "Data di mudificazione è dimensione"
#. IDS_COMPMETHOD_SIZE
-#: Merge.rc:1117 Merge.rc:1149 Merge.rc:1333 Merge.rc:4287
+#: Merge.rc:1125 Merge.rc:1157 Merge.rc:1343 Merge.rc:4297
msgid "Size"
msgstr "Dimensione"
#. IDS_COMPMETHOD_EXISTENCE
-#: Merge.rc:1118 Merge.rc:1150 Merge.rc:1334 Merge.rc:4288
+#: Merge.rc:1126 Merge.rc:1158 Merge.rc:1344 Merge.rc:4298
msgid "Existence"
msgstr "Esistenza"
#. IDR_POPUP_PROJECT, ID_LOAD_PROJECT
-#: Merge.rc:1192
+#: Merge.rc:1202
msgid "&Load Project..."
msgstr "&Caricà u prughjettu…"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARGALL
-#: Merge.rc:1272 Merge.rc:1301
+#: Merge.rc:1282 Merge.rc:1311
msgid "${*} - All Arguments"
msgstr "${*} - Tutti i parametri"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARG1
-#: Merge.rc:1273 Merge.rc:1302
+#: Merge.rc:1283 Merge.rc:1312
msgid "${1} - First Argument"
msgstr "${1} - U primu parametru"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARG2
-#: Merge.rc:1274 Merge.rc:1303
+#: Merge.rc:1284 Merge.rc:1313
msgid "${2} - Second Argument"
msgstr "${2} - U secondu parametru"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARG3
-#: Merge.rc:1275 Merge.rc:1304
+#: Merge.rc:1285 Merge.rc:1314
msgid "${3} - Third Argument"
msgstr "${3} - U terzu parametru"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARG4
-#: Merge.rc:1276 Merge.rc:1305
+#: Merge.rc:1286 Merge.rc:1315
msgid "${4} - Fourth Argument"
msgstr "${4} - U quartu parametru"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARG5
-#: Merge.rc:1277 Merge.rc:1306
+#: Merge.rc:1287 Merge.rc:1316
msgid "${5} - Fifth Argument"
msgstr "${5} - U quintu parametru"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARG6
-#: Merge.rc:1278 Merge.rc:1307
+#: Merge.rc:1288 Merge.rc:1317
msgid "${6} - Sixth Argument"
msgstr "${6} - U sestu parametru"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARG7
-#: Merge.rc:1279 Merge.rc:1308
+#: Merge.rc:1289 Merge.rc:1318
msgid "${7} - Seventh Argument"
msgstr "${7} - U settimu parametru"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARG8
-#: Merge.rc:1280 Merge.rc:1309
+#: Merge.rc:1290 Merge.rc:1319
msgid "${8} - Eighth Argument"
msgstr "${8} - L’ottesimu parametru"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARG9
-#: Merge.rc:1281 Merge.rc:1310
+#: Merge.rc:1291 Merge.rc:1320
msgid "${9} - Ninth Argument"
msgstr "${9} - U novesimu parametru"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_SRC_FILE
-#: Merge.rc:1289
+#: Merge.rc:1299
msgid "${SRC_FILE} - Source File"
msgstr "${SRC_FILE} - Schedariu di fonte"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_SRC_FOLDER
-#: Merge.rc:1290
+#: Merge.rc:1300
msgid "${SRC_FOLDER} - Source Folder"
msgstr "${SRC_FOLDER} - Cartulare di fonte"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_SRC_URL
-#: Merge.rc:1291
+#: Merge.rc:1301
msgid "${SRC_URL} - Source URL"
msgstr "${SRC_URL} - Indirizzu web di fonte"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_SRC_URL_PROTOCOL
-#: Merge.rc:1292
+#: Merge.rc:1302
msgid "${SRC_URL_PROTOCOL} - Source URL Protocol"
msgstr "${SRC_URL_PROTOCOL} - Protocollu di l’indirizzu web di fonte"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_SRC_URL_SUFFIX
-#: Merge.rc:1293
+#: Merge.rc:1303
msgid "${SRC_URL_SUFFIX} - Source URL Suffix"
msgstr "${SRC_URL_SUFFIX} - Suffissu di l’indirizzu web di fonte"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_DST_FILE
-#: Merge.rc:1294
+#: Merge.rc:1304
msgid "${DST_FILE} - Destination File"
msgstr "${DST_FILE} - Schedariu di destinazione"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_DST_FOLDER
-#: Merge.rc:1295
+#: Merge.rc:1305
msgid "${DST_FOLDER} - Destination Folder"
msgstr "${DST_FOLDER} - Cartulare di destinazione"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_DST_URL
-#: Merge.rc:1296
+#: Merge.rc:1306
msgid "${DST_URL} - Destination URL"
msgstr "${DST_URL} - Indirizzu web di destinazione"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_DST_URL_PROTOCOL
-#: Merge.rc:1297
+#: Merge.rc:1307
msgid "${DST_URL_PROTOCOL} - Destination URL Protocol"
msgstr "${DST_URL_PROTOCOL} - Protocollu di l’indirizzu web di destinazione"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_DST_URL_SUFFIX
-#: Merge.rc:1298
+#: Merge.rc:1308
msgid "${DST_URL_SUFFIX} - Destination URL Suffix"
msgstr "${DST_URL_SUFFIX} - Suffissu di l’indirizzu web di destinazione"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_WINMERGE_HOME
-#: Merge.rc:1299
+#: Merge.rc:1309
msgid "${WINMERGE_HOME} - WinMerge Home Directory"
msgstr "${WINMERGE_HOME} - Cartulare d’accolta WinMerge"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_SCRIPT_FILE
-#: Merge.rc:1300
+#: Merge.rc:1310
msgid "${SCRIPT_FILE} - Script File"
msgstr "${SCRIPT_FILE} - Schedariu di scenariu"
#. IDR_POPUP_PLUGIN_ADD_MENU, ID_PLUGIN_ADD_UNPACKER
-#: Merge.rc:1318
+#: Merge.rc:1328
msgid "Add &Unpacker Plugin..."
msgstr "Aghjunghje u modulu d’estensione di u &spacchittadore…"
#. IDR_POPUP_PLUGIN_ADD_MENU, ID_PLUGIN_ADD_PREDIFFER
-#: Merge.rc:1319
+#: Merge.rc:1329
msgid "Add &Prediffer Plugin..."
msgstr "Aghjunghje u modulu d’estensione di u &preparagone…"
#. IDR_POPUP_PLUGIN_ADD_MENU, ID_PLUGIN_DUPLICATE
-#: Merge.rc:1320
+#: Merge.rc:1330
msgid "&Duplicate Plugin..."
msgstr "Modulu d’estensione in &doppiu…"
#. IDR_POPUP_OUTPUTVIEW, ID_EDIT_CLEAR_ALL
-#: Merge.rc:1344
+#: Merge.rc:1354
msgid "Clear &All"
msgstr "Tuttu squass&à"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_MASK_CLEAR
-#: Merge.rc:1352
+#: Merge.rc:1362
msgid "&Clear All"
msgstr "&Tuttu squassà"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_MASK_REMOVE_LAST
-#: Merge.rc:1353
+#: Merge.rc:1363
msgid "Remove Last Filter &Group"
msgstr "Caccià l’ultimu &gruppu di filtri"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_MASK_ALL
-#: Merge.rc:1354
+#: Merge.rc:1364
msgid "R&eset to Default (*.*)"
msgstr "Reinizià à i &valori predefiniti (*.*)"
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1355
+#: Merge.rc:1365
msgid "Add E&xclude File"
msgstr "Aghjunghje un schedariu d’&esclusione"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_SYS
-#: Merge.rc:1357
+#: Merge.rc:1367
msgid "&System Files"
msgstr "Schedarii di u &sistema"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_BACKUP
-#: Merge.rc:1358
+#: Merge.rc:1368
msgid "&Editor Backup Files"
msgstr "Schedarii di salvaguardia di l’&editore"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_BIN
-#: Merge.rc:1359
+#: Merge.rc:1369
msgid "&Compiled Binary Files"
msgstr "Schedarii &binarii cumpilati"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_LOG
-#: Merge.rc:1360
+#: Merge.rc:1370
msgid "&Log Files"
msgstr "Schedarii di &ghjurnale"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_TEMP
-#: Merge.rc:1361
+#: Merge.rc:1371
msgid "&Temporary or Cache Files"
msgstr "Schedarii &timpurarii o d’impiatta"
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1363
+#: Merge.rc:1373
msgid "Add Excl&ude Folder"
msgstr "Aghjunghje un cartulare d’e&sclusione"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FOLDER_VCS
-#: Merge.rc:1365
+#: Merge.rc:1375
msgid "&Version Control"
msgstr "Cuntrollu di &versione"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FOLDER_BUILD
-#: Merge.rc:1366
+#: Merge.rc:1376
msgid "&Build Artifacts"
msgstr "Custruzzione d’&artefatti"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FOLDER_IDE
-#: Merge.rc:1367
+#: Merge.rc:1377
msgid "&IDE"
msgstr "&IDE"
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1370
+#: Merge.rc:1380
msgid "Add &File Condition"
msgstr "Aghjunghje una cundizione di &schedariu"
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1372 Merge.rc:1551
+#: Merge.rc:1382 Merge.rc:1561
msgid "File &Size"
msgstr "&Dimensione di schedariu"
#. IDR_POPUP_FILTERMENU_DIFF_SIZE, ID_FILTERMENU_DIFF_SIZE_LT_1KB
-#: Merge.rc:1374 Merge.rc:1527 Merge.rc:1564 Merge.rc:1629 Merge.rc:1707
+#: Merge.rc:1384 Merge.rc:1537 Merge.rc:1574 Merge.rc:1639 Merge.rc:1717
msgid "Less than 1KB"
msgstr "Inferiore à 1 Ko"
#. IDR_POPUP_FILTERMENU_DIFF_SIZE, ID_FILTERMENU_DIFF_SIZE_GE_1KB
-#: Merge.rc:1375 Merge.rc:1528 Merge.rc:1565 Merge.rc:1630 Merge.rc:1708
+#: Merge.rc:1385 Merge.rc:1538 Merge.rc:1575 Merge.rc:1640 Merge.rc:1718
msgid "1KB or more"
msgstr "1 Ko è più"
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_LT_10KB
-#: Merge.rc:1376 Merge.rc:1529 Merge.rc:1631
+#: Merge.rc:1386 Merge.rc:1539 Merge.rc:1641
msgid "Less than 10KB"
msgstr "Inferiore à 10 Ko"
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_GE_10KB
-#: Merge.rc:1377 Merge.rc:1530 Merge.rc:1632
+#: Merge.rc:1387 Merge.rc:1540 Merge.rc:1642
msgid "10KB or more"
msgstr "10 Ko è più"
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_LT_100KB
-#: Merge.rc:1378 Merge.rc:1531 Merge.rc:1633
+#: Merge.rc:1388 Merge.rc:1541 Merge.rc:1643
msgid "Less than 100KB"
msgstr "Inferiore à 100 Ko"
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_GE_100KB
-#: Merge.rc:1379 Merge.rc:1532 Merge.rc:1634
+#: Merge.rc:1389 Merge.rc:1542 Merge.rc:1644
msgid "100KB or more"
msgstr "100 Ko è più"
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_LT_1MB
-#: Merge.rc:1380 Merge.rc:1533 Merge.rc:1635
+#: Merge.rc:1390 Merge.rc:1543 Merge.rc:1645
msgid "Less than 1MB"
msgstr "Inferiore à 1 Mo"
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_GE_1MB
-#: Merge.rc:1381 Merge.rc:1534 Merge.rc:1636
+#: Merge.rc:1391 Merge.rc:1544 Merge.rc:1646
msgid "1MB or more"
msgstr "1 Mo è più"
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_LT_10MB
-#: Merge.rc:1382 Merge.rc:1535 Merge.rc:1637
+#: Merge.rc:1392 Merge.rc:1545 Merge.rc:1647
msgid "Less than 10MB"
msgstr "Inferiore à 10 Mo"
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_GE_10MB
-#: Merge.rc:1383 Merge.rc:1536 Merge.rc:1638
+#: Merge.rc:1393 Merge.rc:1546 Merge.rc:1648
msgid "10MB or more"
msgstr "10 Mo è più"
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_LT_100MB
-#: Merge.rc:1384 Merge.rc:1537 Merge.rc:1639
+#: Merge.rc:1394 Merge.rc:1547 Merge.rc:1649
msgid "Less than 100MB"
msgstr "Inferiore à 100 Mo"
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_GE_100MB
-#: Merge.rc:1385 Merge.rc:1538 Merge.rc:1640
+#: Merge.rc:1395 Merge.rc:1548 Merge.rc:1650
msgid "100MB or more"
msgstr "100 Mo è più"
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_LT_1GB
-#: Merge.rc:1386 Merge.rc:1539 Merge.rc:1641
+#: Merge.rc:1396 Merge.rc:1549 Merge.rc:1651
msgid "Less than 1GB"
msgstr "Inferiore à 1 Go"
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_GE_1GB
-#: Merge.rc:1387 Merge.rc:1642
+#: Merge.rc:1397 Merge.rc:1652
msgid "1GB or more"
msgstr "1 Go è più"
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_RANGE
-#: Merge.rc:1388 Merge.rc:1465 Merge.rc:1517 Merge.rc:1523 Merge.rc:1540
-#: Merge.rc:1566 Merge.rc:1587 Merge.rc:1643 Merge.rc:1709 Merge.rc:1734
+#: Merge.rc:1398 Merge.rc:1475 Merge.rc:1527 Merge.rc:1533 Merge.rc:1550
+#: Merge.rc:1576 Merge.rc:1597 Merge.rc:1653 Merge.rc:1719 Merge.rc:1744
msgid "Custom Range..."
msgstr "Intervallu persunalizatu…"
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1390 Merge.rc:1471 Merge.rc:1568
+#: Merge.rc:1400 Merge.rc:1481 Merge.rc:1578
msgid "&Last Modified"
msgstr "&Ultima mudificazione"
#. IDR_POPUP_FILTERMENU_DATE
-#: Merge.rc:1392 Merge.rc:1473 Merge.rc:1651
+#: Merge.rc:1402 Merge.rc:1483 Merge.rc:1661
msgid "&Hour"
msgstr "&Ora"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_HOUR_BEFORE_1
-#: Merge.rc:1394 Merge.rc:1475 Merge.rc:1653
+#: Merge.rc:1404 Merge.rc:1485 Merge.rc:1663
msgid "More than 1 hour ago"
msgstr "Più di un’ora fà"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_HOUR_WITHIN_1
-#: Merge.rc:1395 Merge.rc:1476 Merge.rc:1654
+#: Merge.rc:1405 Merge.rc:1486 Merge.rc:1664
msgid "Within 1 hour"
msgstr "In l’ora"
#. IDR_POPUP_FILTERMENU_DATE
-#: Merge.rc:1397 Merge.rc:1478 Merge.rc:1656
+#: Merge.rc:1407 Merge.rc:1488 Merge.rc:1666
msgid "&Day"
msgstr "&Ghjornu"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_DAY_BEFORE_TODAY
-#: Merge.rc:1399 Merge.rc:1480 Merge.rc:1658
+#: Merge.rc:1409 Merge.rc:1490 Merge.rc:1668
msgid "Before today"
msgstr "Nanzu oghje"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_DAY_TODAY
-#: Merge.rc:1400 Merge.rc:1481 Merge.rc:1659
+#: Merge.rc:1410 Merge.rc:1491 Merge.rc:1669
msgid "Today"
msgstr "Oghje"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_DAY_BEFORE_YESTERDAY
-#: Merge.rc:1401 Merge.rc:1482 Merge.rc:1660
+#: Merge.rc:1411 Merge.rc:1492 Merge.rc:1670
msgid "Before yesterday"
msgstr "Nanzu à eri"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_DAY_YESTERDAY
-#: Merge.rc:1402 Merge.rc:1483 Merge.rc:1661
+#: Merge.rc:1412 Merge.rc:1493 Merge.rc:1671
msgid "Yesterday"
msgstr "Eri"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_DAY_SINCE_YESTERDAY
-#: Merge.rc:1403 Merge.rc:1484 Merge.rc:1662
+#: Merge.rc:1413 Merge.rc:1494 Merge.rc:1672
msgid "Since yesterday"
msgstr "Dapoi eri"
#. IDR_POPUP_FILTERMENU_DATE
-#: Merge.rc:1405 Merge.rc:1486 Merge.rc:1664
+#: Merge.rc:1415 Merge.rc:1496 Merge.rc:1674
msgid "&Week"
msgstr "&Settimana"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_WEEK_BEFORE_THIS
-#: Merge.rc:1407 Merge.rc:1488 Merge.rc:1666
+#: Merge.rc:1417 Merge.rc:1498 Merge.rc:1676
msgid "Before this week"
msgstr "Nanzu à quista settimana"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_WEEK_THIS
-#: Merge.rc:1408 Merge.rc:1489 Merge.rc:1667
+#: Merge.rc:1418 Merge.rc:1499 Merge.rc:1677
msgid "This week"
msgstr "Sta settimana"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_WEEK_BEFORE_LAST
-#: Merge.rc:1409 Merge.rc:1490 Merge.rc:1668
+#: Merge.rc:1419 Merge.rc:1500 Merge.rc:1678
msgid "Before last week"
msgstr "Nanzu à a settimana scorsa"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_WEEK_LAST
-#: Merge.rc:1410 Merge.rc:1491 Merge.rc:1669
+#: Merge.rc:1420 Merge.rc:1501 Merge.rc:1679
msgid "Last week"
msgstr "A settimana scorsa"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_WEEK_SINCE_LAST
-#: Merge.rc:1411 Merge.rc:1492 Merge.rc:1670
+#: Merge.rc:1421 Merge.rc:1502 Merge.rc:1680
msgid "Since last week"
msgstr "Dapoi a settimana scorsa"
#. IDR_POPUP_FILTERMENU_DATE
-#: Merge.rc:1413 Merge.rc:1494 Merge.rc:1672
+#: Merge.rc:1423 Merge.rc:1504 Merge.rc:1682
msgid "&Month"
msgstr "&Mese"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_MONTH_BEFORE_THIS
-#: Merge.rc:1415 Merge.rc:1496 Merge.rc:1674
+#: Merge.rc:1425 Merge.rc:1506 Merge.rc:1684
msgid "Before this month"
msgstr "Nanzu à quistu mese"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_MONTH_THIS
-#: Merge.rc:1416 Merge.rc:1497 Merge.rc:1675
+#: Merge.rc:1426 Merge.rc:1507 Merge.rc:1685
msgid "This month"
msgstr "Stu mese"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_MONTH_BEFORE_LAST
-#: Merge.rc:1417 Merge.rc:1498 Merge.rc:1676
+#: Merge.rc:1427 Merge.rc:1508 Merge.rc:1686
msgid "Before last month"
msgstr "Nanzu à u mese scorsu"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_MONTH_LAST
-#: Merge.rc:1418 Merge.rc:1499 Merge.rc:1677
+#: Merge.rc:1428 Merge.rc:1509 Merge.rc:1687
msgid "Last month"
msgstr "U mese scorsu"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_MONTH_SINCE_LAST
-#: Merge.rc:1419 Merge.rc:1500 Merge.rc:1678
+#: Merge.rc:1429 Merge.rc:1510 Merge.rc:1688
msgid "Since last month"
msgstr "Dapoi u mese scorsu"
#. IDR_POPUP_FILTERMENU_DATE
-#: Merge.rc:1421 Merge.rc:1502 Merge.rc:1680
+#: Merge.rc:1431 Merge.rc:1512 Merge.rc:1690
msgid "&Year"
msgstr "&Annu"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_YEAR_BEFORE_THIS
-#: Merge.rc:1423 Merge.rc:1504 Merge.rc:1682
+#: Merge.rc:1433 Merge.rc:1514 Merge.rc:1692
msgid "Before this year"
msgstr "Nanzu à quist’annu"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_YEAR_THIS
-#: Merge.rc:1424 Merge.rc:1505 Merge.rc:1683
+#: Merge.rc:1434 Merge.rc:1515 Merge.rc:1693
msgid "This year"
msgstr "Quist’annu"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_YEAR_BEFORE_LAST
-#: Merge.rc:1425 Merge.rc:1506 Merge.rc:1684
+#: Merge.rc:1435 Merge.rc:1516 Merge.rc:1694
msgid "Before last year"
msgstr "Nanzu à l’annu scorsu"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_YEAR_LAST
-#: Merge.rc:1426 Merge.rc:1507 Merge.rc:1685
+#: Merge.rc:1436 Merge.rc:1517 Merge.rc:1695
msgid "Last year"
msgstr "L’annu scorsu"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_YEAR_SINCE_LAST
-#: Merge.rc:1427 Merge.rc:1508 Merge.rc:1686
+#: Merge.rc:1437 Merge.rc:1518 Merge.rc:1696
msgid "Since last year"
msgstr "Dapoi l’annu scorsu"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_RANGE
-#: Merge.rc:1429 Merge.rc:1510 Merge.rc:1688
+#: Merge.rc:1439 Merge.rc:1520 Merge.rc:1698
msgid "&Custom Range..."
msgstr "Intervallu persunalizatu…"
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1431 Merge.rc:1589
+#: Merge.rc:1441 Merge.rc:1599
msgid "&Attributes"
msgstr "&Attributi"
#. IDR_POPUP_FILTERMENU_ATTR, ID_FILTERMENU_ATTR_READONLY
-#: Merge.rc:1433 Merge.rc:1607
+#: Merge.rc:1443 Merge.rc:1617
msgid "Read-only files"
msgstr "Schedarii in lettura sola"
#. IDR_POPUP_FILTERMENU_ATTR, ID_FILTERMENU_ATTR_NOT_READONLY
-#: Merge.rc:1434 Merge.rc:1608
+#: Merge.rc:1444 Merge.rc:1618
msgid "Not read-only files"
msgstr "Schedarii micca in lettura sola"
#. IDR_POPUP_FILTERMENU_ATTR, ID_FILTERMENU_ATTR_HIDDEN
-#: Merge.rc:1435 Merge.rc:1609
+#: Merge.rc:1445 Merge.rc:1619
msgid "Hidden files"
msgstr "Schedarii piattati"
#. IDR_POPUP_FILTERMENU_ATTR, ID_FILTERMENU_ATTR_NOT_HIDDEN
-#: Merge.rc:1436 Merge.rc:1610
+#: Merge.rc:1446 Merge.rc:1620
msgid "Not hidden files"
msgstr "Schedarii micca piattati"
#. IDR_POPUP_FILTERMENU_ATTR, ID_FILTERMENU_ATTR_SYSTEM
-#: Merge.rc:1437 Merge.rc:1611
+#: Merge.rc:1447 Merge.rc:1621
msgid "System files"
msgstr "Schedarii di u sistema"
#. IDR_POPUP_FILTERMENU_ATTR, ID_FILTERMENU_ATTR_NOT_SYSTEM
-#: Merge.rc:1438 Merge.rc:1612
+#: Merge.rc:1448 Merge.rc:1622
msgid "Not system files"
msgstr "Schedarii micca di u sistema"
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1440
+#: Merge.rc:1450
msgid "File &Content"
msgstr "&Cuntenutu di u schedariu"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_CONTAINS
-#: Merge.rc:1442
+#: Merge.rc:1452
msgid "Contains string..."
msgstr "Cuntene a catena…"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_NOT_CONTAINS
-#: Merge.rc:1443
+#: Merge.rc:1453
msgid "Does not contain string..."
msgstr "Ùn cuntene micca a catena…"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_FIRST_LINE_CONTAINS
-#: Merge.rc:1444
+#: Merge.rc:1454
msgid "First line contains string..."
msgstr "A prima linea cuntene a catena…"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_FIRST_LINE_NOT_CONTAINS
-#: Merge.rc:1445
+#: Merge.rc:1455
msgid "First line does not contain string..."
msgstr "A prima linea ùn cuntene micca a catena…"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_FIRST_10_CONTAINS
-#: Merge.rc:1446
+#: Merge.rc:1456
msgid "First 10 lines contain string..."
msgstr "E 10 prime linee cuntenenu a catena…"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_FIRST_10_NOT_CONTAINS
-#: Merge.rc:1447
+#: Merge.rc:1457
msgid "First 10 lines do not contain string..."
msgstr "E 10 prime linee ùn cuntenenu micca a catena…"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_LAST_10_CONTAINS
-#: Merge.rc:1448
+#: Merge.rc:1458
msgid "Last 10 lines contain string..."
msgstr "E 10 ultime linee cuntenenu a catena…"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_LAST_10_NOT_CONTAINS
-#: Merge.rc:1449
+#: Merge.rc:1459
msgid "Last 10 lines do not contain string..."
msgstr "E 10 ultime linee ùn cuntenenu micca a catena…"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_LAST_LINE_CONTAINS
-#: Merge.rc:1450
+#: Merge.rc:1460
msgid "Last line contains string..."
msgstr "L’ultima linea cuntene a catena…"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_LAST_LINE_NOT_CONTAINS
-#: Merge.rc:1451
+#: Merge.rc:1461
msgid "Last line does not contain string..."
msgstr "L’ultima linea ùn cuntene micca a catena…"
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1453
+#: Merge.rc:1463
msgid "&Line Count"
msgstr "&Numeru di linee"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_LT_10
-#: Merge.rc:1455
+#: Merge.rc:1465
msgid "Less than 10"
msgstr "Inferiore à 10"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_GE_10
-#: Merge.rc:1456
+#: Merge.rc:1466
msgid "10 or more"
msgstr "10 è più"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_LT_100
-#: Merge.rc:1457
+#: Merge.rc:1467
msgid "Less than 100"
msgstr "Inferiore à 100"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_GE_100
-#: Merge.rc:1458
+#: Merge.rc:1468
msgid "100 or more"
msgstr "100 è più"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_LT_1000
-#: Merge.rc:1459
+#: Merge.rc:1469
msgid "Less than 1000"
msgstr "Inferiore à 1000"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_GE_1000
-#: Merge.rc:1460
+#: Merge.rc:1470
msgid "1000 or more"
msgstr "1000 è più"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_LT_10000
-#: Merge.rc:1461
+#: Merge.rc:1471
msgid "Less than 10000"
msgstr "Inferiore à 10000"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_GE_10000
-#: Merge.rc:1462
+#: Merge.rc:1472
msgid "10000 or more"
msgstr "10000 è più"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_LT_100000
-#: Merge.rc:1463
+#: Merge.rc:1473
msgid "Less than 100000"
msgstr "Inferiore à 100000"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_GE_100000
-#: Merge.rc:1464
+#: Merge.rc:1474
msgid "100000 or more"
msgstr "100000 è più"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_PROPS
-#: Merge.rc:1467 Merge.rc:1594 Merge.rc:1761 Merge.rc:1778
+#: Merge.rc:1477 Merge.rc:1604 Merge.rc:1771 Merge.rc:1788
msgid "Additional &Properties..."
msgstr "&Pruprietà addiziunale…"
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1469
+#: Merge.rc:1479
msgid "Add F&older Condition"
msgstr "Aghjunghje una cundizione di &cartulare"
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1513
+#: Merge.rc:1523
msgid "&Files"
msgstr "&Schedarii"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FOLDER_FILES_EQ_0
-#: Merge.rc:1515
+#: Merge.rc:1525
msgid "0 files"
msgstr "0 schedariu"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FOLDER_FILES_GE_1
-#: Merge.rc:1516
+#: Merge.rc:1526
msgid "1 file or more"
msgstr "1 schedariu è più"
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1519
+#: Merge.rc:1529
msgid "&Items"
msgstr "&Elementi"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FOLDER_ITEMS_EQ_0
-#: Merge.rc:1521
+#: Merge.rc:1531
msgid "0 items"
msgstr "0 elementu"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FOLDER_ITEMS_GE_1
-#: Merge.rc:1522
+#: Merge.rc:1532
msgid "1 item or more"
msgstr "1 elementu è più"
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1525
+#: Merge.rc:1535
msgid "&Total Size"
msgstr "&Dimensione tutale"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FOLDER_STATS_RECURSIVE
-#: Merge.rc:1542
+#: Merge.rc:1552
msgid "&Recursive"
msgstr "&Recursiva"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONDITION_ANY
-#: Merge.rc:1544
+#: Merge.rc:1554
msgid "Target: &Any (Left/Middle/Right)"
msgstr "Destinazione : &Tuttu (Manca/Centru/Diritta"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONDITION_LEFT
-#: Merge.rc:1545
+#: Merge.rc:1555
msgid "Target: &Left"
msgstr "Destinazione : &Manca"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONDITION_MIDDLE
-#: Merge.rc:1546
+#: Merge.rc:1556
msgid "Target: &Middle"
msgstr "Destinazione : &Centru"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONDITION_RIGHT
-#: Merge.rc:1547
+#: Merge.rc:1557
msgid "Target: &Right"
msgstr "Destinazione : &Diritta"
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1549
+#: Merge.rc:1559
msgid "Add &Difference Condition"
msgstr "Aghjunghje una cundizione di s&farenza"
#. IDR_POPUP_FILTERMENU_DIFF_PROP, ID_FILTERMENU_DIFF_PROP_EQUAL
-#: Merge.rc:1553 Merge.rc:1570 Merge.rc:1591 Merge.rc:1696 Merge.rc:1717
-#: Merge.rc:1742
+#: Merge.rc:1563 Merge.rc:1580 Merge.rc:1601 Merge.rc:1706 Merge.rc:1727
+#: Merge.rc:1752
msgid "Equal"
msgstr "Uguale"
#. IDR_POPUP_FILTERMENU_DIFF_PROP, ID_FILTERMENU_DIFF_PROP_NOT_EQUAL
-#: Merge.rc:1554 Merge.rc:1571 Merge.rc:1592 Merge.rc:1697 Merge.rc:1718
-#: Merge.rc:1743
+#: Merge.rc:1564 Merge.rc:1581 Merge.rc:1602 Merge.rc:1707 Merge.rc:1728
+#: Merge.rc:1753
msgid "Not Equal"
msgstr "Micca uguale"
#. IDR_POPUP_FILTERMENU_DIFF_PROP, ID_FILTERMENU_DIFF_PROP_LESS
-#: Merge.rc:1555 Merge.rc:1572 Merge.rc:1698 Merge.rc:1719 Merge.rc:1744
+#: Merge.rc:1565 Merge.rc:1582 Merge.rc:1708 Merge.rc:1729 Merge.rc:1754
msgid "Less Than"
msgstr "Hè inferiore à"
#. IDR_POPUP_FILTERMENU_DIFF_PROP, ID_FILTERMENU_DIFF_PROP_LESS_EQUAL
-#: Merge.rc:1556 Merge.rc:1573 Merge.rc:1699 Merge.rc:1720 Merge.rc:1745
+#: Merge.rc:1566 Merge.rc:1583 Merge.rc:1709 Merge.rc:1730 Merge.rc:1755
msgid "Less Than or Equal to"
msgstr "Hè inferiore o uguale à"
#. IDR_POPUP_FILTERMENU_DIFF_PROP, ID_FILTERMENU_DIFF_PROP_GREATER
-#: Merge.rc:1557 Merge.rc:1574 Merge.rc:1700 Merge.rc:1721 Merge.rc:1746
+#: Merge.rc:1567 Merge.rc:1584 Merge.rc:1710 Merge.rc:1731 Merge.rc:1756
msgid "Greater Than"
msgstr "Hè superiore à"
#. IDR_POPUP_FILTERMENU_DIFF_PROP, ID_FILTERMENU_DIFF_PROP_GREATER_EQUAL
-#: Merge.rc:1558 Merge.rc:1575 Merge.rc:1701 Merge.rc:1722 Merge.rc:1747
+#: Merge.rc:1568 Merge.rc:1585 Merge.rc:1711 Merge.rc:1732 Merge.rc:1757
msgid "Greater Than or Equal to"
msgstr "Hè superiore o uguale à"
#. IDR_POPUP_FILTERMENU_DIFF_SIZE, ID_FILTERMENU_DIFF_SIZE_LT_10B
-#: Merge.rc:1560 Merge.rc:1703
+#: Merge.rc:1570 Merge.rc:1713
msgid "Less than 10B"
msgstr "Inferiore à 10 o"
#. IDR_POPUP_FILTERMENU_DIFF_SIZE, ID_FILTERMENU_DIFF_SIZE_GE_10B
-#: Merge.rc:1561 Merge.rc:1704
+#: Merge.rc:1571 Merge.rc:1714
msgid "10B or more"
msgstr "10 o è più"
#. IDR_POPUP_FILTERMENU_DIFF_SIZE, ID_FILTERMENU_DIFF_SIZE_LT_100B
-#: Merge.rc:1562 Merge.rc:1705
+#: Merge.rc:1572 Merge.rc:1715
msgid "Less than 100B"
msgstr "Inferiore à 100 o"
#. IDR_POPUP_FILTERMENU_DIFF_SIZE, ID_FILTERMENU_DIFF_SIZE_GE_100B
-#: Merge.rc:1563 Merge.rc:1706
+#: Merge.rc:1573 Merge.rc:1716
msgid "100B or more"
msgstr "100 o è più"
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_LT_1SECOND
-#: Merge.rc:1577 Merge.rc:1724
+#: Merge.rc:1587 Merge.rc:1734
msgid "Less than 1 second"
msgstr "Menu d’1 seconda"
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_GE_1SECOND
-#: Merge.rc:1578 Merge.rc:1725
+#: Merge.rc:1588 Merge.rc:1735
msgid "1 second or more"
msgstr "1 seconda è più"
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_LT_1MINUTE
-#: Merge.rc:1579 Merge.rc:1726
+#: Merge.rc:1589 Merge.rc:1736
msgid "Less than 1 minute"
msgstr "Menu d’1 minutu"
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_GE_1MINUTE
-#: Merge.rc:1580 Merge.rc:1727
+#: Merge.rc:1590 Merge.rc:1737
msgid "1 minute or more"
msgstr "1 minutu è più"
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_LT_1HOUR
-#: Merge.rc:1581 Merge.rc:1728
+#: Merge.rc:1591 Merge.rc:1738
msgid "Less than 1 hour"
msgstr "Menu d’1 ora"
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_GE_1HOUR
-#: Merge.rc:1582 Merge.rc:1729
+#: Merge.rc:1592 Merge.rc:1739
msgid "1 hour or more"
msgstr "1 ora è più"
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_LT_1DAY
-#: Merge.rc:1583 Merge.rc:1730
+#: Merge.rc:1593 Merge.rc:1740
msgid "Less than 1 day"
msgstr "Menu d’1 ghjornu"
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_GE_1DAY
-#: Merge.rc:1584 Merge.rc:1731
+#: Merge.rc:1594 Merge.rc:1741
msgid "1 day or more"
msgstr "1 ghjornu è più"
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_LT_1WEEK
-#: Merge.rc:1585 Merge.rc:1732
+#: Merge.rc:1595 Merge.rc:1742
msgid "Less than 1 week"
msgstr "Menu d’1 settimana"
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_GE_1WEEK
-#: Merge.rc:1586 Merge.rc:1733
+#: Merge.rc:1596 Merge.rc:1743
msgid "1 week or more"
msgstr "1 settimana è più"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_CONDITION_DIFF_LEFT_RIGHT
-#: Merge.rc:1596
+#: Merge.rc:1606
msgid "Target: &Left and Right"
msgstr "Destinazione : &Manca è Diritta"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_CONDITION_DIFF_LEFT_MIDDLE
-#: Merge.rc:1597
+#: Merge.rc:1607
msgid "Target: Left and &Middle"
msgstr "Destinazione : Manca è &Centru"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_CONDITION_DIFF_MIDDLE_RIGHT
-#: Merge.rc:1598
+#: Merge.rc:1608
msgid "Target: Middle and &Right"
msgstr "Destinazione : Centru è &Diritta"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_CONDITION_DIFF_ALL
-#: Merge.rc:1599
+#: Merge.rc:1609
msgid "Target: &All"
msgstr "Destinazione : &Tutte"
#. IDR_POPUP_FILTERMENU_BINARY, ID_FILTERMENU_BINARY_ONLY
-#: Merge.rc:1620
+#: Merge.rc:1630
msgid "Binary files only"
msgstr "Solu i schedarii binarii"
#. IDR_POPUP_FILTERMENU_BINARY, ID_FILTERMENU_TEXT_ONLY
-#: Merge.rc:1621
+#: Merge.rc:1631
msgid "Text files only"
msgstr "Solu i schedarii di testu"
#. IDR_POPUP_ADDCMPMENU, ID_ADDCMPMENU_CLEAR
-#: Merge.rc:1755
+#: Merge.rc:1765
msgid "&Clear conditions"
msgstr "&Squassà e cundizioni"
#. IDR_POPUP_ADDCMPMENU, ID_ADDCMPMENU_CMP_SIZE
-#: Merge.rc:1757
+#: Merge.rc:1767
msgid "Compare &Size"
msgstr "Paragunà a d&imensione"
#. IDR_POPUP_ADDCMPMENU, ID_ADDCMPMENU_CMP_DATE
-#: Merge.rc:1758
+#: Merge.rc:1768
msgid "Compare &Date"
msgstr "Paragunà a &data"
#. IDR_POPUP_ADDCMPMENU, ID_ADDCMPMENU_CMP_ATTR
-#: Merge.rc:1759
+#: Merge.rc:1769
msgid "Compare &Attributes"
msgstr "Paragunà l’&attributi"
#. IDR_POPUP_ADDCMPMENU, ID_ADDCMPMENU_CMP_CONTENTS
-#: Merge.rc:1760
+#: Merge.rc:1770
msgid "Compare C&ontents"
msgstr "Paragunà u &cuntenutu"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_CLEAR
-#: Merge.rc:1769
+#: Merge.rc:1779
msgid "&Clear Keys"
msgstr "&Squassà e chjavi"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_NAME
-#: Merge.rc:1771
+#: Merge.rc:1781
msgid "&Name"
msgstr "&Nome"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_BASENAME
-#: Merge.rc:1772
+#: Merge.rc:1782
msgid "&Base name (without extension)"
msgstr "Nome di &basa (senza estensione)"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_NORMALIZED_NAME
-#: Merge.rc:1773
+#: Merge.rc:1783
msgid "Normalized &Unicode Name"
msgstr "Nome &Unicode nurmalizatu"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_RELPATH
-#: Merge.rc:1774
+#: Merge.rc:1784
msgid "&Relative Path"
msgstr "Chjassu &relativu"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_DATE
-#: Merge.rc:1776
+#: Merge.rc:1786
msgid "&Date"
msgstr "&Data"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_HASH_MD5
-#: Merge.rc:1777
+#: Merge.rc:1787
msgid "&Hash (MD5)"
msgstr "&Tazzeghju (MD5)"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_REPLACE
-#: Merge.rc:1780
+#: Merge.rc:1790
msgid "Insert &replace() Function"
msgstr "Framette a funzione &replace()"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_REGEXREPLACE
-#: Merge.rc:1781
+#: Merge.rc:1791
msgid "Insert rege&xReplace() Function"
msgstr "Framette a funzione rege&xReplace()"
#. IDR_POPUP_RENAMEMOVE_MENU
-#: Merge.rc:1782
+#: Merge.rc:1792
msgid "Replace &Lists"
msgstr "&Liste di rimpiazzamentu"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_CREATE_REPLACELIST
-#: Merge.rc:1784
+#: Merge.rc:1794
msgid "&Create String Replace List and Insert..."
msgstr "&Creà una lista di rimpiazzamentu di catena è framette…"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_CREATE_REGEXREPLACELIST
-#: Merge.rc:1785
+#: Merge.rc:1795
msgid "Create &Regex Replace List and Insert..."
msgstr "Creà una lista di rimpiazzamentu ®ex è framette…"
#. IDR_POPUP_RENAMEMOVE_MENU
-#: Merge.rc:1787
+#: Merge.rc:1797
msgid "&String Replace Lists"
msgstr "Li&ste di rimpiazzamentu di catena"
#. IDR_POPUP_RENAMEMOVE_MENU
-#: Merge.rc:1791
+#: Merge.rc:1801
msgid "Re&gex Replace Lists"
msgstr "Liste di rimpiazzamentu re&gex"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_STRING_REPLACE_LISTS_FOLDER
-#: Merge.rc:1796
+#: Merge.rc:1806
msgid "Open String Replace Lists Folder..."
msgstr "Apre u cartulare di e liste di rimpiazzamentu di catena…"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_REGEX_REPLACE_LISTS_FOLDER
-#: Merge.rc:1797
+#: Merge.rc:1807
msgid "Open Regex Replace Lists Folder..."
msgstr "Apre u cartulare di e liste di rimpiazzamentu regex…"
#. IDD_FILTERS_CONDITION, IDC_CONDITION_MATCHCASE
-#: Merge.rc:1799 Merge.rc:1995 Merge.rc:2014 Merge.rc:2042 Merge.rc:2585
+#: Merge.rc:1809 Merge.rc:2005 Merge.rc:2024 Merge.rc:2052 Merge.rc:2595
msgid "Match &case"
msgstr "&Rispettà Maiuscule è minuscule"
#. IDR_POPUP_RENAMEMOVE_MENU
-#: Merge.rc:1801
+#: Merge.rc:1811
msgid "Text &Normalization"
msgstr "&Nurmalizazione di testu"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_TOLOWER
-#: Merge.rc:1803
+#: Merge.rc:1813
msgid "&Lowercase"
msgstr "Minuscu&la"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_TOUPPER
-#: Merge.rc:1804
+#: Merge.rc:1814
msgid "&Uppercase"
msgstr "&Maiuscula"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_TOHALFWIDTH
-#: Merge.rc:1805
+#: Merge.rc:1815
msgid "&Half-width"
msgstr "Me&za larghezza"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_TOFULLWIDTH
-#: Merge.rc:1806
+#: Merge.rc:1816
msgid "&Full-width"
msgstr "&Piena larghezza"
#. IDR_POPUP_RENAMEMOVE_MENU
-#: Merge.rc:1807
+#: Merge.rc:1817
msgid "&Chinese Conversion"
msgstr "&Cunversione chinese"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_TOSIMPLIFIEDCHINESE
-#: Merge.rc:1809
+#: Merge.rc:1819
msgid "&Simplified Chinese"
msgstr "Chinese &semplificatu"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_TOTRADITIONALCHINESE
-#: Merge.rc:1810
+#: Merge.rc:1820
msgid "&Traditional Chinese"
msgstr "Chinese &tradiziunale"
#. IDR_POPUP_RENAMEMOVE_MENU
-#: Merge.rc:1812
+#: Merge.rc:1822
msgid "&Japanese Conversion"
msgstr "Cunversione &giappunese"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_TOHIRAGANA
-#: Merge.rc:1814
+#: Merge.rc:1824
msgid "&Hiragana"
msgstr "&Hiragana"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_TOKATAKANA
-#: Merge.rc:1815
+#: Merge.rc:1825
msgid "&Katakana"
msgstr "&Katakana"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_NORMALIZEUNICODE
-#: Merge.rc:1817
+#: Merge.rc:1827
msgid "Normalize &Unicode"
msgstr "Nurmalizazione &Unicode"
#. IDD_ABOUTBOX
-#: Merge.rc:1932
+#: Merge.rc:1942
msgid "About WinMerge"
msgstr "Apprupositu di WinMerge"
#. IDD_ABOUTBOX, IDC_WWW
-#: Merge.rc:1936
+#: Merge.rc:1946
msgid "Visit the WinMerge Homepage!"
msgstr "Scuprite a pagina d’accolta di WinMerge !"
#. IDD_PLUGINS_EDITPLUGIN, IDOK
-#: Merge.rc:1938 Merge.rc:2080 Merge.rc:2431 Merge.rc:2455 Merge.rc:2469
-#: Merge.rc:2497 Merge.rc:2588 Merge.rc:2613 Merge.rc:2674 Merge.rc:2691
-#: Merge.rc:2703 Merge.rc:2867 Merge.rc:2927 Merge.rc:3062 Merge.rc:3104
-#: Merge.rc:3147 Merge.rc:3197
+#: Merge.rc:1948 Merge.rc:2090 Merge.rc:2441 Merge.rc:2465 Merge.rc:2479
+#: Merge.rc:2507 Merge.rc:2598 Merge.rc:2623 Merge.rc:2684 Merge.rc:2701
+#: Merge.rc:2713 Merge.rc:2877 Merge.rc:2937 Merge.rc:3072 Merge.rc:3114
+#: Merge.rc:3157 Merge.rc:3207
msgid "OK"
msgstr "Vai"
#. IDD_ABOUTBOX, IDC_OPEN_CONTRIBUTORS
-#: Merge.rc:1939
+#: Merge.rc:1949
msgid "Contributors"
msgstr "Cuntribuenti"
#. IDD_SELECT_FILES_OR_FOLDERS
-#: Merge.rc:1945 Merge.rc:3070
+#: Merge.rc:1955 Merge.rc:3080
msgid "Select Files or Folders"
msgstr "Selezziunà schedarii o cartulari"
#. IDD_OPEN, IDC_FILES_DIRS_GROUP0
-#: Merge.rc:1949
+#: Merge.rc:1959
msgid "&1st File or Folder"
msgstr "&1ᵘ schedariu o cartulare"
#. IDD_OPEN, IDC_PATH0_READONLY
-#: Merge.rc:1951
+#: Merge.rc:1961
msgid "Re&ad-only"
msgstr "&Lettura sola"
#. IDD_OPEN, IDC_SWAP01_STATIC
-#: Merge.rc:1953
+#: Merge.rc:1963
msgid "Swap 1st | 2nd"
msgstr "Scambià 1ᵘ | 2ᵘ"
#. IDD_GENERATE_PATCH, IDC_DIFF_BROWSE_FILE1
-#: Merge.rc:1954 Merge.rc:2310 Merge.rc:2413
+#: Merge.rc:1964 Merge.rc:2320 Merge.rc:2423
msgid "&Browse..."
msgstr "&Navigà…"
#. IDD_OPEN, IDC_FILES_DIRS_GROUP1
-#: Merge.rc:1955
+#: Merge.rc:1965
msgid "&2nd File or Folder"
msgstr "&2ᵘ schedariu o cartulare"
#. IDD_OPEN, IDC_PATH1_READONLY
-#: Merge.rc:1957
+#: Merge.rc:1967
msgid "Rea&d-only"
msgstr "L&ettura sola"
#. IDD_OPEN, IDC_SWAP12_STATIC
-#: Merge.rc:1959
+#: Merge.rc:1969
msgid "Swap 2nd | 3rd"
msgstr "Scambià 2ᵘ | 3ᵘ"
#. IDD_PROPPAGE_SYSTEM, IDC_FILTER_USER_BROWSE
-#: Merge.rc:1960 Merge.rc:2315
+#: Merge.rc:1970 Merge.rc:2325
msgid "B&rowse..."
msgstr "N&avigà…"
#. IDD_OPEN, IDC_FILES_DIRS_GROUP2
-#: Merge.rc:1961
+#: Merge.rc:1971
msgid "&3rd File or Folder (Optional)"
msgstr "&3ᵘ schedariu o cartulare (ozzionale)"
#. IDD_OPEN, IDC_PATH2_READONLY
-#: Merge.rc:1963
+#: Merge.rc:1973
msgid "Read-o&nly"
msgstr "Le&ttura sola"
#. IDD_OPEN, IDC_SWAP02_STATIC
-#: Merge.rc:1965
+#: Merge.rc:1975
msgid "Swap 1st | 3rd"
msgstr "Scambià 1ᵘ | 3ᵘ"
#. IDD_PROPPAGE_BACKUPS, IDC_BACKUP_BROWSE
-#: Merge.rc:1966 Merge.rc:2685 Merge.rc:2883
+#: Merge.rc:1976 Merge.rc:2695 Merge.rc:2893
msgid "Browse..."
msgstr "Na&vigà…"
#. IDD_OPEN, IDC_FILES_DIRS_GROUP3
-#: Merge.rc:1968
+#: Merge.rc:1978
msgid " Folder: Filter"
msgstr " Cartulare : Filtru"
#. IDD_OPEN, IDC_RECURS_CHECK
-#: Merge.rc:1971
+#: Merge.rc:1981
msgid "&Include subfolders"
msgstr "&Include i sottucartulari"
#. IDD_OPEN, IDC_FILES_DIRS_GROUP5
-#: Merge.rc:1972
+#: Merge.rc:1982
msgid " File: Prediffer Plugin"
msgstr " Schedariu : Modulu d’estensione di u preparagone"
#. IDD_OPEN, IDC_FILES_DIRS_GROUP4
-#: Merge.rc:1976
+#: Merge.rc:1986
msgid " File: Unpacker Plugin"
msgstr " Schedariu : Modulu d’estensione di u spacchittadore"
#. IDD_OPEN, IDC_SELECT_UNPACKER
-#: Merge.rc:1978
+#: Merge.rc:1988
msgid "Se&lect..."
msgstr "Sele&zziunà…"
#. IDD_PLUGINS_EDITPLUGIN, IDCANCEL
-#: Merge.rc:1981 Merge.rc:2001 Merge.rc:2025 Merge.rc:2046 Merge.rc:2081
-#: Merge.rc:2432 Merge.rc:2456 Merge.rc:2470 Merge.rc:2498 Merge.rc:2551
-#: Merge.rc:2589 Merge.rc:2614 Merge.rc:2675 Merge.rc:2692 Merge.rc:2704
-#: Merge.rc:2868 Merge.rc:2928 Merge.rc:3087 Merge.rc:3105 Merge.rc:3148
-#: Merge.rc:3198
+#: Merge.rc:1991 Merge.rc:2011 Merge.rc:2035 Merge.rc:2056 Merge.rc:2091
+#: Merge.rc:2442 Merge.rc:2466 Merge.rc:2480 Merge.rc:2508 Merge.rc:2561
+#: Merge.rc:2599 Merge.rc:2624 Merge.rc:2685 Merge.rc:2702 Merge.rc:2714
+#: Merge.rc:2878 Merge.rc:2938 Merge.rc:3097 Merge.rc:3115 Merge.rc:3158
+#: Merge.rc:3208
msgid "Cancel"
msgstr "Abbandunà"
#. IDD_OPEN, IDC_OPEN_STATUS
-#: Merge.rc:1982
+#: Merge.rc:1992
msgid "Status:"
msgstr "Statu :"
#. IDD_PLUGINS_LIST, ID_HELP
-#: Merge.rc:1983 Merge.rc:2082 Merge.rc:2929
+#: Merge.rc:1993 Merge.rc:2092 Merge.rc:2939
msgid "Help"
msgstr "Aiutu"
#. IDD_OPEN, IDC_OPTIONS
-#: Merge.rc:1984
+#: Merge.rc:1994
msgid "&Options..."
msgstr "&Ozzioni…"
#. IDD_EDIT_FIND
-#: Merge.rc:1989
+#: Merge.rc:1999
msgid "Find"
msgstr "Circà"
#. IDD_EDIT_MARKER, IDC_STATIC
-#: Merge.rc:1992 Merge.rc:2009 Merge.rc:2037
+#: Merge.rc:2002 Merge.rc:2019 Merge.rc:2047
msgid "Fi&nd what:"
msgstr "Cosa circà :"
#. IDD_EDIT_MARKER, IDC_EDIT_WHOLE_WORD
-#: Merge.rc:1994 Merge.rc:2013 Merge.rc:2041
+#: Merge.rc:2004 Merge.rc:2023 Merge.rc:2051
msgid "Match &whole word only"
msgstr "&Currispundenza di a parolla sana"
#. IDD_EDIT_MARKER, IDC_EDIT_REGEXP
-#: Merge.rc:1996 Merge.rc:2015 Merge.rc:2043
+#: Merge.rc:2006 Merge.rc:2025 Merge.rc:2053
msgid "Regular &expression"
msgstr "&Espressione regulare"
#. IDD_EDIT_FIND, IDC_FINDDLG_DONTWRAP
-#: Merge.rc:1997
+#: Merge.rc:2007
msgid "D&on't wrap end of file"
msgstr "Ù&n micca circunvoglie à a fine di u schedariu"
#. IDD_EDIT_FIND, IDC_FINDDLG_DONTCLOSE
-#: Merge.rc:1998
+#: Merge.rc:2008
msgid "&Don't close this dialog"
msgstr "Ùn chjode micca stu &dialogu"
#. IDD_EDIT_REPLACE, IDC_EDIT_SKIP
-#: Merge.rc:1999 Merge.rc:2021
+#: Merge.rc:2009 Merge.rc:2031
msgid "&Find Next"
msgstr "Circà &seguente"
#. IDD_EDIT_FIND, IDC_EDIT_FINDPREV
-#: Merge.rc:2000
+#: Merge.rc:2010
msgid "Find &Prev"
msgstr "Circà &precedente"
#. IDD_EDIT_REPLACE
-#: Merge.rc:2006
+#: Merge.rc:2016
msgid "Replace"
msgstr "Rimpiazzà"
#. IDD_EDIT_REPLACE, IDC_STATIC
-#: Merge.rc:2011
+#: Merge.rc:2021
msgid "Re&place with:"
msgstr "Rim&piazzà da :"
#. IDD_EDIT_REPLACE, IDC_EDIT_SCOPE_DONT_WRAP
-#: Merge.rc:2016
+#: Merge.rc:2026
msgid "&Don't wrap at end of file"
msgstr "Ùn micca circunvoglie à a &fine di u schedariu"
#. IDD_EDIT_REPLACE, IDC_STATIC
-#: Merge.rc:2018
+#: Merge.rc:2028
msgid "Replace in"
msgstr "Rimpiazzà in"
#. IDD_EDIT_REPLACE, IDC_EDIT_SCOPE_WHOLE_FILE
-#: Merge.rc:2020
+#: Merge.rc:2030
msgid "Wh&ole file"
msgstr "Sc&hedariu sanu"
#. IDD_EDIT_REPLACE, IDC_EDIT_FINDPREV
-#: Merge.rc:2022
+#: Merge.rc:2032
msgid "Find Pre&v"
msgstr "Circà prece&dente"
#. IDD_EDIT_REPLACE, IDC_EDIT_REPLACE
-#: Merge.rc:2023
+#: Merge.rc:2033
msgid "&Replace"
msgstr "Ri&mpiazzà"
#. IDD_EDIT_REPLACE, IDC_EDIT_REPLACE_ALL
-#: Merge.rc:2024
+#: Merge.rc:2034
msgid "Replace &All"
msgstr "&Tuttu rimpiazzà"
#. IDS_OPTIONSPG_MARKERCOLORS
-#: Merge.rc:2030 Merge.rc:4209
+#: Merge.rc:2040 Merge.rc:4219
msgid "Markers"
msgstr "Marcatori"
#. IDD_EDIT_MARKER, IDC_EDIT_MARKERS_ENABLED
-#: Merge.rc:2033
+#: Merge.rc:2043
msgid "Enable &markers"
msgstr "Attivà i &marcatori"
#. IDD_FILTERS_LINEFILTERS, IDC_LFILTER_ADDBTN
-#: Merge.rc:2035 Merge.rc:2057
+#: Merge.rc:2045 Merge.rc:2067
msgid "New"
msgstr "Novu"
#. IDD_EDIT_MARKER, IDC_STATIC
-#: Merge.rc:2039
+#: Merge.rc:2049
msgid "&Background color:"
msgstr "Culore di u &fondu :"
#. IDS_MESSAGEBOX_OK
-#: Merge.rc:2044 Merge.rc:2829 Merge.rc:3086 Merge.rc:4171
+#: Merge.rc:2054 Merge.rc:2839 Merge.rc:3096 Merge.rc:4181
msgid "&Ok"
msgstr "&Vai"
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:2045 Merge.rc:2525 Merge.rc:3199
+#: Merge.rc:2055 Merge.rc:2535 Merge.rc:3209
msgid "&Apply"
msgstr "&Appiecà"
#. IDD_FILTERS_LINEFILTERS
-#: Merge.rc:2051
+#: Merge.rc:2061
msgid "Line Filters"
msgstr "Filtri di linea"
#. IDD_FILTERS_LINEFILTERS, IDC_IGNOREREGEXP
-#: Merge.rc:2054
+#: Merge.rc:2064
msgid "Enable Line Filters"
msgstr "Attivà i filtri di linea"
#. IDD_FILTERS_LINEFILTERS, IDC_STATIC
-#: Merge.rc:2055
+#: Merge.rc:2065
msgid "Regular Expressions (one per line):"
msgstr "Espressioni regulare (una à a linea) :"
#. IDD_PLUGINS_LIST, IDC_PLUGIN_EDIT
-#: Merge.rc:2058 Merge.rc:2924
+#: Merge.rc:2068 Merge.rc:2934
msgid "Edit"
msgstr "Mudificà"
#. IDD_PLUGINS_LIST, IDC_PLUGIN_REMOVE
-#: Merge.rc:2059 Merge.rc:2071 Merge.rc:2925
+#: Merge.rc:2069 Merge.rc:2081 Merge.rc:2935
msgid "Remove"
msgstr "Caccià"
#. IDD_FILTERS_SUBSTITUTIONFILTERS
-#: Merge.rc:2064
+#: Merge.rc:2074
msgid "Substitution Filters"
msgstr "Filtri di sustituzione"
#. IDD_FILTERS_SUBSTITUTIONFILTERS, IDC_STATIC
-#: Merge.rc:2067
+#: Merge.rc:2077
msgid "Changes to the listed pairs below will be ignored or marked as insignificant. Patches are unaffected."
msgstr "I cambiamenti nant’à e coppii di a lista quì sottu seranu ignurati o marcati cum’è insignificanti. E currezzioni ùn sò micca affettate."
#. IDD_FILTERS_SUBSTITUTIONFILTERS, IDC_IGNORED_SUSBSTITUTIONS_ENABLED
-#: Merge.rc:2068
+#: Merge.rc:2078
msgid "Enable"
msgstr "Attivà"
#. IDD_PLUGINS_LIST, IDC_PLUGIN_ADD
-#: Merge.rc:2070 Merge.rc:2923
+#: Merge.rc:2080 Merge.rc:2933
msgid "Add"
msgstr "Aghjunghje"
#. IDD_FILTERS_SUBSTITUTIONFILTERS, IDC_LFILTER_CLEARBTN
-#: Merge.rc:2072
+#: Merge.rc:2082
msgid "Clear"
msgstr "Squassà"
#. IDD_PREFERENCES
-#: Merge.rc:2077
+#: Merge.rc:2087
msgid "Options"
msgstr "Ozzioni"
#. IDD_PREFERENCES, IDC_TREEOPT_IMPORT
-#: Merge.rc:2086
+#: Merge.rc:2096
msgid "Import..."
msgstr "Impurtà…"
#. IDD_PREFERENCES, IDC_TREEOPT_EXPORT
-#: Merge.rc:2087
+#: Merge.rc:2097
msgid "Export..."
msgstr "Espurtà…"
#. IDS_OPTIONSPG_GENCOMPARE
-#: Merge.rc:2092 Merge.rc:4199 Merge.rc:4202 Merge.rc:4219
+#: Merge.rc:2102 Merge.rc:4209 Merge.rc:4212 Merge.rc:4229
msgid "General"
msgstr "Generale"
#. IDD_PROPPAGE_GENERAL, IDC_SCROLL_CHECK
-#: Merge.rc:2095
+#: Merge.rc:2105
msgid "Automatically &scroll to first difference"
msgstr "&Sfilà autumaticamente sin’à a prima sfarenza"
#. IDD_PROPPAGE_GENERAL, IDC_SCROLL_TO_FIRST_INLINE_DIFF_CHECK
-#: Merge.rc:2097
+#: Merge.rc:2107
msgid "Automatically s&croll to first inline difference"
msgstr "Sfilà autumaticamente sin’à a prima sfarenza &in linea"
#. IDD_PROPPAGE_GENERAL, IDC_STATIC
-#: Merge.rc:2099
+#: Merge.rc:2109
msgid "Cl&ose windows with 'Esc':"
msgstr "Chj&ode e finestre cù u tastu « Scap. » :"
#. IDD_PROPPAGE_GENERAL, IDC_VERIFY_OPEN_PATHS
-#: Merge.rc:2101
+#: Merge.rc:2111
msgid "&Automatically verify paths in Open dialog"
msgstr "&Verificà autumaticamente i chjassi in a finestra d’apertura"
#. IDD_PROPPAGE_GENERAL, IDC_STATIC
-#: Merge.rc:2103
+#: Merge.rc:2113
msgid "Single instance mode:"
msgstr "Modu d’istanza unica :"
#. IDD_PROPPAGE_GENERAL, IDC_ASK_MULTIWINDOW_CLOSE
-#: Merge.rc:2105
+#: Merge.rc:2115
msgid "As&k when closing multiple windows"
msgstr "Cun&firmà a chjusura di parechje finestre"
#. IDD_PROPPAGE_GENERAL, IDC_PRESERVE_FILETIME
-#: Merge.rc:2107
+#: Merge.rc:2117
msgid "&Preserve file time in file compare"
msgstr "Cunservà &data è ora durante u paragone di schedariu"
#. IDD_PROPPAGE_GENERAL, IDC_STARTUP_FOLDER_SELECT
-#: Merge.rc:2109
+#: Merge.rc:2119
msgid "Show \"Select Files or Folders\" dialog on startup"
msgstr "Affissà a finestra « Selezziunà schedarii o cartulari » à l’avviu"
#. IDD_PROPPAGE_GENERAL, IDC_CLOSE_WITH_OK
-#: Merge.rc:2111
+#: Merge.rc:2121
msgid "Close \"Select Files or Folders\" dialog on clicking Compare button"
msgstr "Chjode a finestra « Selezziunà schedarii o cartulari » cù u buttone « Paragunà »"
#. IDD_PROPPAGE_GENERAL, IDC_STATIC
-#: Merge.rc:2113
+#: Merge.rc:2123
msgid "Op&en dialog Auto completion:"
msgstr "&Empiimentu autumaticu di a finestra d’apertura :"
#. IDD_PROPPAGE_GENERAL, IDC_STATIC
-#: Merge.rc:2115
+#: Merge.rc:2125
msgid "Auto-&reload modified files:"
msgstr "&Ricaricà autumaticamente i schedarii mudificati :"
#. IDD_PROPPAGE_GENERAL, IDC_STATIC
-#: Merge.rc:2117
+#: Merge.rc:2127
msgid "Language:"
msgstr "Lingua :"
#. IDD_PROPPAGE_COMPARE_WEBPAGE, IDC_COMPARE_DEFAULTS
-#: Merge.rc:2119 Merge.rc:2299 Merge.rc:2321 Merge.rc:2352 Merge.rc:2369
-#: Merge.rc:2386 Merge.rc:2394 Merge.rc:2430 Merge.rc:2454 Merge.rc:2633
-#: Merge.rc:2644 Merge.rc:2653 Merge.rc:2887 Merge.rc:2922 Merge.rc:2985
-#: Merge.rc:3010 Merge.rc:3024 Merge.rc:3038 Merge.rc:3054
+#: Merge.rc:2129 Merge.rc:2309 Merge.rc:2331 Merge.rc:2362 Merge.rc:2379
+#: Merge.rc:2396 Merge.rc:2404 Merge.rc:2440 Merge.rc:2464 Merge.rc:2643
+#: Merge.rc:2654 Merge.rc:2663 Merge.rc:2897 Merge.rc:2932 Merge.rc:2995
+#: Merge.rc:3020 Merge.rc:3034 Merge.rc:3048 Merge.rc:3064
msgid "Defaults"
msgstr "Predefinizioni"
#. IDS_OPTIONSPG_COLORS
-#: Merge.rc:2124 Merge.rc:2140 Merge.rc:2267 Merge.rc:2292 Merge.rc:4205
+#: Merge.rc:2134 Merge.rc:2150 Merge.rc:2277 Merge.rc:2302 Merge.rc:4215
msgid "Colors"
msgstr "Culori"
#. IDD_PROPPAGE_COLOR_SCHEMES, IDC_STATIC
-#: Merge.rc:2127
+#: Merge.rc:2137
msgid "Color &mode:"
msgstr "&Modu di culore :"
#. IDD_PROPPAGE_COLOR_SCHEMES, IDC_STATIC
-#: Merge.rc:2129
+#: Merge.rc:2139
msgid "&Light mode scheme:"
msgstr "Ghjocu di culori &chjari :"
#. IDD_PROPPAGE_COLOR_SCHEMES, IDC_STATIC
-#: Merge.rc:2131
+#: Merge.rc:2141
msgid "&Dark mode scheme:"
msgstr "Ghjocu di culori &scuri :"
#. IDD_PROPPAGE_COLOR_SCHEMES, IDC_STATIC
-#: Merge.rc:2133
+#: Merge.rc:2143
msgid "Your custom schemes"
msgstr "I vostri ghjochi persunalizati"
#. IDD_PROPPAGE_COLOR_SCHEMES, IDC_COLOR_SCHEME_SAVE
-#: Merge.rc:2134
+#: Merge.rc:2144
msgid "&Save current scheme..."
msgstr "&Arregistrà u ghjocu attuale…"
#. IDD_PROPPAGE_COLOR_SCHEMES, IDC_COLOR_SCHEME_DELETE
-#: Merge.rc:2135
+#: Merge.rc:2145
msgid "Delete ¤t scheme..."
msgstr "Sq&uassà u ghjocu attuale…"
#. IDD_PROPPAGE_COLORS_DIR, IDC_BACKGROUND_COLUMN_LABEL
-#: Merge.rc:2143 Merge.rc:2238 Merge.rc:2258 Merge.rc:2272
+#: Merge.rc:2153 Merge.rc:2248 Merge.rc:2268 Merge.rc:2282
msgid "Background"
msgstr "Sfondu"
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2144
+#: Merge.rc:2154
msgid "Deleted"
msgstr "Squassatu"
#. IDS_OPTIONSPG_TEXTCOLORS
-#: Merge.rc:2145 Merge.rc:2207 Merge.rc:2239 Merge.rc:2273 Merge.rc:4207
+#: Merge.rc:2155 Merge.rc:2217 Merge.rc:2249 Merge.rc:2283 Merge.rc:4217
msgid "Text"
msgstr "Testu"
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2146
+#: Merge.rc:2156
msgid "Difference:"
msgstr "Sfarenza :"
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2151
+#: Merge.rc:2161
msgid "Selected Difference:"
msgstr "Sfarenza selezziunata :"
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2156
+#: Merge.rc:2166
msgid "Ignored Difference:"
msgstr "Sfarenza ignurata :"
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2161
+#: Merge.rc:2171
msgid "Moved:"
msgstr "Dispiazzata :"
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2166
+#: Merge.rc:2176
msgid "Selected Moved:"
msgstr "Selezziunata dispiazzata :"
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2171
+#: Merge.rc:2181
msgid "Same As Next (3 panes):"
msgstr "Uguale à a seguente (3 pannelli) :"
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2176
+#: Merge.rc:2186
msgid "Same As Next (Selected):"
msgstr "Uguale à a seguente (selezziunata) :"
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2181
+#: Merge.rc:2191
msgid "Word Difference:"
msgstr "Sfarenza di parolla :"
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2186
+#: Merge.rc:2196
msgid "Selected Word Diff:"
msgstr "Sfarenza di parolla selezziunata :"
#. IDD_INPUTBOX
-#: Merge.rc:2195 Merge.rc:2230 Merge.rc:2251 Merge.rc:3099
+#: Merge.rc:2205 Merge.rc:2240 Merge.rc:2261 Merge.rc:3109
msgid "Dialog"
msgstr "Dialogu"
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC
-#: Merge.rc:2198
+#: Merge.rc:2208
msgid "Keywords:"
msgstr "Parolle chjave :"
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC
-#: Merge.rc:2199
+#: Merge.rc:2209
msgid "Function names:"
msgstr "Nomi di funzione :"
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC
-#: Merge.rc:2200
+#: Merge.rc:2210
msgid "Comments:"
msgstr "Cummenti :"
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC
-#: Merge.rc:2201
+#: Merge.rc:2211
msgid "Numbers:"
msgstr "Numeri :"
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC
-#: Merge.rc:2202
+#: Merge.rc:2212
msgid "Operators:"
msgstr "Operatori :"
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC
-#: Merge.rc:2203
+#: Merge.rc:2213
msgid "Strings:"
msgstr "Catene :"
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC
-#: Merge.rc:2204
+#: Merge.rc:2214
msgid "Preprocessor:"
msgstr "Preprucessore :"
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC
-#: Merge.rc:2205
+#: Merge.rc:2215
msgid "User 1:"
msgstr "Utilizatore 1 :"
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC
-#: Merge.rc:2206
+#: Merge.rc:2216
msgid "User 2:"
msgstr "Utilizatore 2 :"
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_SCOLOR_USER2_BOLD
-#: Merge.rc:2209 Merge.rc:2211 Merge.rc:2213 Merge.rc:2215 Merge.rc:2217
-#: Merge.rc:2219 Merge.rc:2221 Merge.rc:2223 Merge.rc:2225
+#: Merge.rc:2219 Merge.rc:2221 Merge.rc:2223 Merge.rc:2225 Merge.rc:2227
+#: Merge.rc:2229 Merge.rc:2231 Merge.rc:2233 Merge.rc:2235
msgid "Bold"
msgstr "Grassu"
#. IDD_PROPPAGE_COLORS_TEXT, IDC_DEFAULT_STANDARD_COLORS
-#: Merge.rc:2233
+#: Merge.rc:2243
msgid "&Use customized text colors"
msgstr "&Impiegà culori persunalizati per u testu"
#. IDD_PROPPAGE_COLORS_TEXT, IDC_WHITESPACE_COLOR_LABEL
-#: Merge.rc:2235
+#: Merge.rc:2245
msgid "Whitespace:"
msgstr "Spaziu biancu :"
#. IDD_PROPPAGE_COLORS_TEXT, IDC_TEXT_COLOR_LABEL
-#: Merge.rc:2236
+#: Merge.rc:2246
msgid "Regular text:"
msgstr "Testu nurmale :"
#. IDD_PROPPAGE_COLORS_TEXT, IDC_SELECTION_COLOR_LABEL
-#: Merge.rc:2237
+#: Merge.rc:2247
msgid "Selection:"
msgstr "Selezzione :"
#. IDD_PROPPAGE_COLORS_DIR, IDC_STATIC
-#: Merge.rc:2245 Merge.rc:2286
+#: Merge.rc:2255 Merge.rc:2296
msgid "Margin:"
msgstr "Margine :"
#. IDD_PROPPAGE_COLORS_MARKER, IDC_MARKER0_COLOR_LABEL
-#: Merge.rc:2254
+#: Merge.rc:2264
msgid "Search Marker:"
msgstr "Marcatore di ricerca :"
#. IDD_PROPPAGE_COLORS_MARKER, IDC_MARKER1_COLOR_LABEL
-#: Merge.rc:2255
+#: Merge.rc:2265
msgid "User Defined Marker 1:"
msgstr "Marcatore 1 definitu da l’utilizatore :"
#. IDD_PROPPAGE_COLORS_MARKER, IDC_MARKER2_COLOR_LABEL
-#: Merge.rc:2256
+#: Merge.rc:2266
msgid "User Defined Marker 2:"
msgstr "Marcatore 2 definitu da l’utilizatore :"
#. IDD_PROPPAGE_COLORS_MARKER, IDC_MARKER3_COLOR_LABEL
-#: Merge.rc:2257
+#: Merge.rc:2267
msgid "User Defined Marker 3:"
msgstr "Marcatore 3 definitu da l’utilizatore :"
#. IDD_PROPPAGE_COLORS_DIR, IDC_USE_DIR_COMPARE_COLORS
-#: Merge.rc:2270
+#: Merge.rc:2280
msgid "&Use folder compare colors"
msgstr "&Impiegà i culori di paragone di cartulare"
#. IDD_PROPPAGE_COLORS_DIR, IDC_STATIC
-#: Merge.rc:2274
+#: Merge.rc:2284
msgid "Items equal:"
msgstr "Elementi uguali :"
#. IDD_PROPPAGE_COLORS_DIR, IDC_STATIC
-#: Merge.rc:2277
+#: Merge.rc:2287
msgid "Items different:"
msgstr "Elementi sfarenti :"
#. IDD_PROPPAGE_COLORS_DIR, IDC_STATIC
-#: Merge.rc:2280
+#: Merge.rc:2290
msgid "Items missing:"
msgstr "Elementi inesistenti :"
#. IDD_PROPPAGE_COLORS_DIR, IDC_STATIC
-#: Merge.rc:2283
+#: Merge.rc:2293
msgid "Items filtered:"
msgstr "Elementi filtrati :"
#. IDD_PROPPAGE_COLORS_SYSTEM, IDC_SYSCOLOR_HOOK_ENABLED
-#: Merge.rc:2295
+#: Merge.rc:2305
msgid "&Use custom system colors"
msgstr "&Impiegà i culori persunalizati di u sistema (certi elementi di l’interfaccia grafica puderianu ùn esse appiecati)"
#. IDS_PRPCAT_SYSTEM
-#: Merge.rc:2304 Merge.rc:4211 Merge.rc:4212 Merge.rc:4657
+#: Merge.rc:2314 Merge.rc:4221 Merge.rc:4222 Merge.rc:4667
msgid "System"
msgstr "Sistema"
#. IDD_PROPPAGE_SYSTEM, IDC_USE_RECYCLE_BIN
-#: Merge.rc:2307
+#: Merge.rc:2317
msgid "&Use Recycle Bin"
msgstr "&Impiegà a curbella"
#. IDD_PROPPAGE_SYSTEM, IDC_STATIC
-#: Merge.rc:2308
+#: Merge.rc:2318
msgid "&External editor:"
msgstr "&Editore esternu :"
#. IDD_PROPPAGE_SYSTEM, IDC_STATIC
-#: Merge.rc:2311
+#: Merge.rc:2321
msgid "&Store user data in:"
msgstr "&Cunservà i dati d’utilizatore in :"
#. IDD_PROPPAGE_SYSTEM, IDC_STATIC
-#: Merge.rc:2313
+#: Merge.rc:2323
msgid "&Filter folder:"
msgstr "Cartulare di &filtri :"
#. IDD_PROPPAGE_SYSTEM, IDC_STATIC
-#: Merge.rc:2316
+#: Merge.rc:2326
msgid "Temporary files folder"
msgstr "Cartulare di i schedarii timpurarii"
#. IDD_PROPPAGE_SYSTEM, IDC_TMPFOLDER_SYSTEM
-#: Merge.rc:2317
+#: Merge.rc:2327
msgid "S&ystem temp folder"
msgstr "Cartulare &timpurariu di u sistema"
#. IDD_PROPPAGE_SYSTEM, IDC_STATIC
-#: Merge.rc:2318
+#: Merge.rc:2328
msgid "C&ustom folder:"
msgstr "Cartulare &persunalizatu :"
#. IDD_GENERATE_PATCH, IDC_DIFF_BROWSE_FILE2
-#: Merge.rc:2320 Merge.rc:2416
+#: Merge.rc:2330 Merge.rc:2426
msgid "Br&owse..."
msgstr "Na&vigà…"
#. IDS_OPTIONSPG_COMPARE
-#: Merge.rc:2326 Merge.rc:4200
+#: Merge.rc:2336 Merge.rc:4210
msgid "Compare"
msgstr "Paragunà"
#. IDD_PROPPAGE_COMPARE, IDC_STATIC
-#: Merge.rc:2329
+#: Merge.rc:2339
msgid "Whitespaces"
msgstr "Spazii bianchi"
#. IDD_PROPPAGE_COMPARE, IDC_WHITESPACE
-#: Merge.rc:2330
+#: Merge.rc:2340
msgid "&Compare"
msgstr "&Paragunà"
#. IDD_PROPPAGE_COMPARE, IDC_WHITE_CHANGE
-#: Merge.rc:2331
+#: Merge.rc:2341
msgid "&Ignore change"
msgstr "&Ignurà i cambiamenti"
#. IDD_PROPPAGE_COMPARE, IDC_ALL_WHITE
-#: Merge.rc:2332
+#: Merge.rc:2342
msgid "I&gnore all"
msgstr "&Tuttu ignurà"
#. IDD_PROPPAGE_COMPARE, IDC_IGNBLANKS_CHECK
-#: Merge.rc:2333
+#: Merge.rc:2343
msgid "Ignore blan&k lines"
msgstr "Ignurà e linee &bianche"
#. IDD_PROPPAGE_COMPARE, IDC_IGNCASE_CHECK
-#: Merge.rc:2334
+#: Merge.rc:2344
msgid "Ignore &case"
msgstr "Ignurà a &cassa"
#. IDD_PROPPAGE_COMPARE, IDC_EOL_SENSITIVE
-#: Merge.rc:2335
+#: Merge.rc:2345
msgid "Igno&re EOL differences (Windows/Unix/Mac)"
msgstr "Ignurà e sfarenze di &fine di linea (Windows/Unix/Mac)"
#. IDD_PROPPAGE_COMPARE, IDC_IGNORE_NUMBERS
-#: Merge.rc:2337
+#: Merge.rc:2347
msgid "Ignore num&bers"
msgstr "Ignurà i &numeri"
#. IDD_PROPPAGE_COMPARE, IDC_CP_SENSITIVE
-#: Merge.rc:2338
+#: Merge.rc:2348
msgid "Ignore codepage &differences"
msgstr "Ignurà e &sfarenze di pagina di codice"
#. IDD_PROPPAGE_COMPARE, IDC_FILTERCOMMENTS_CHECK
-#: Merge.rc:2339
+#: Merge.rc:2349
msgid "Ignore c&omment differences"
msgstr "Ignurà e sfarenze di c&ummentu"
#. IDD_PROPPAGE_COMPARE, IDC_IGNEOFEOL_CHECK
-#: Merge.rc:2341
+#: Merge.rc:2351
msgid "Ignore &missing trailing EOL"
msgstr "Ignurà e fini di &linea assente"
#. IDD_PROPPAGE_COMPARE, IDC_IGNLBRKS_CHECK
-#: Merge.rc:2343
+#: Merge.rc:2353
msgid "Ignore line &breaks (treat as spaces)"
msgstr "Ignurà i s&alti di linea (cunsideralli cum’è spazii)"
#. IDD_PROPPAGE_COMPARE, IDC_MOVED_BLOCKS
-#: Merge.rc:2345
+#: Merge.rc:2355
msgid "E&nable moved block detection"
msgstr "Attivà l’avventata di i blocchi &dispiazzati"
#. IDD_PROPPAGE_COMPARE, IDC_ALIGN_SIMILAR_LINES
-#: Merge.rc:2346
+#: Merge.rc:2356
msgid "Align &similar lines"
msgstr "&Alineà e linee simile"
#. IDD_PROPPAGE_COMPARE, IDC_STATIC
-#: Merge.rc:2347
+#: Merge.rc:2357
msgid "Diff &algorithm:"
msgstr "Cudificazione di sfarenza :"
#. IDD_PROPPAGE_COMPARE, IDC_INDENT_HEURISTIC
-#: Merge.rc:2349
+#: Merge.rc:2359
msgid "Enable indent &heuristic"
msgstr "Attivà l’indentazione &euristica"
#. IDD_PROPPAGE_COMPARE, IDC_COMPLETELY_BLANK_OUT_IGNORED_DIFFERENCES
-#: Merge.rc:2350
+#: Merge.rc:2360
msgid "Completely unhighlight the ignored differences"
msgstr "Caccià a messa in evidenza di e sfarenze ignurate"
#. IDS_OPTIONSPG_EDITOR
-#: Merge.rc:2357 Merge.rc:4201
+#: Merge.rc:2367 Merge.rc:4211
msgid "Editor"
msgstr "Editore"
#. IDD_PROPPAGE_EDITOR, IDC_HILITE_CHECK
-#: Merge.rc:2360
+#: Merge.rc:2370
msgid "&Highlight syntax"
msgstr "&Sopralineà a sintassa"
#. IDD_PROPPAGE_EDITOR, IDC_MIXED_EOL
-#: Merge.rc:2361
+#: Merge.rc:2371
msgid "&Preserve original EOL"
msgstr "&Cunservà e fine di linea d’originea"
#. IDD_PROPPAGE_EDITOR, IDC_STATIC
-#: Merge.rc:2362
+#: Merge.rc:2372
msgid "Tabs"
msgstr "Tabulazioni"
#. IDD_PROPPAGE_EDITOR, IDC_STATIC
-#: Merge.rc:2363
+#: Merge.rc:2373
msgid "&Tab size:"
msgstr "Dimensione di a tabulazione :"
#. IDD_PROPPAGE_EDITOR, IDC_PROP_INSERT_TABS
-#: Merge.rc:2365
+#: Merge.rc:2375
msgid "&Insert tabs"
msgstr "&Framette tabulazioni"
#. IDD_PROPPAGE_EDITOR, IDC_PROP_INSERT_SPACES
-#: Merge.rc:2366
+#: Merge.rc:2376
msgid "Insert &spaces"
msgstr "Framette &spazii"
#. IDD_PROPPAGE_EDITOR, IDC_STATIC
-#: Merge.rc:2367
+#: Merge.rc:2377
msgid "&Rendering mode:"
msgstr "&Modu di trasfurmazione :"
#. IDD_PROPPAGE_EDITOR_COMPAREMERGE, IDC_AUTOMRESCAN_CHECK
-#: Merge.rc:2376
+#: Merge.rc:2386
msgid "&Automatic rescan"
msgstr "&Rianalisa autumatica"
#. IDD_PROPPAGE_EDITOR_COMPAREMERGE, IDC_STATIC
-#: Merge.rc:2377
+#: Merge.rc:2387
msgid "Copy &granularity for selected differences:"
msgstr "Cupià a &granularità per e sfarenze selezziunate :"
#. IDD_PROPPAGE_EDITOR_COMPAREMERGE, IDC_LINE_COLORING_GROUP
-#: Merge.rc:2379
+#: Merge.rc:2389
msgid "Line Difference Coloring"
msgstr "Culurazione di sfarenza di linea"
#. IDD_PROPPAGE_EDITOR_COMPAREMERGE, IDC_VIEW_LINE_DIFFERENCES
-#: Merge.rc:2380
+#: Merge.rc:2390
msgid "View line differences"
msgstr "Affissà e sfarenze di linea"
#. IDD_PROPPAGE_EDITOR_COMPAREMERGE, IDC_EDITOR_CHARLEVEL
-#: Merge.rc:2381
+#: Merge.rc:2391
msgid "&Character-level"
msgstr "À u livellu di u &caratteru"
#. IDD_PROPPAGE_EDITOR_COMPAREMERGE, IDC_EDITOR_WORDLEVEL
-#: Merge.rc:2382
+#: Merge.rc:2392
msgid "&Word-level:"
msgstr "À u livellu di a &parolla :"
#. IDD_PROPPAGE_EDITOR_COMPAREMERGE, IDC_STATIC
-#: Merge.rc:2384
+#: Merge.rc:2394
msgid "W&ord break characters:"
msgstr "Caratteri di &distinzione di parolla :"
#. IDD_PROPPAGE_MESSAGEBOXES, IDC_STATIC
-#: Merge.rc:2401
+#: Merge.rc:2411
msgid "Some messages can be hidden by the user. Press Reset to make all messages visible again."
msgstr "Certi messaghji ponu esse piattati da l’utilizatore. Appughjate nant’à u buttone « Reinizià » per rendeli tutti torna videvule."
#. IDD_SELECT_FILES_OR_FOLDERS, IDC_RESET
-#: Merge.rc:2402 Merge.rc:3085
+#: Merge.rc:2412 Merge.rc:3095
msgid "Reset"
msgstr "Reinizià"
#. IDD_GENERATE_PATCH
-#: Merge.rc:2408
+#: Merge.rc:2418
msgid "Patch Generator"
msgstr "Generatore di currezzioni"
#. IDD_GENERATE_PATCH, IDC_STATIC
-#: Merge.rc:2411
+#: Merge.rc:2421
msgid "File&1:"
msgstr "Schedariu 1 :"
#. IDD_GENERATE_PATCH, IDC_STATIC
-#: Merge.rc:2414
+#: Merge.rc:2424
msgid "File&2:"
msgstr "Schedariu 2 :"
#. IDD_GENERATE_PATCH, IDC_DIFF_SWAPFILES
-#: Merge.rc:2417
+#: Merge.rc:2427
msgid "&Swap"
msgstr "&Scambià"
#. IDD_DIRCMP_REPORT, IDC_REPORT_COPYCLIPBOARD
-#: Merge.rc:2418 Merge.rc:2690
+#: Merge.rc:2428 Merge.rc:2700
msgid "&Copy to clipboard"
msgstr "&Cupià in u preme’papei"
#. IDD_GENERATE_PATCH, IDC_DIFF_APPENDFILE
-#: Merge.rc:2419
+#: Merge.rc:2429
msgid "&Append to existing file"
msgstr "&Aghjunghje à a fine di u schedariu esistente"
#. IDD_GENERATE_PATCH, IDC_STATIC
-#: Merge.rc:2420
+#: Merge.rc:2430
msgid "&Result:"
msgstr "&Risultatu :"
#. IDD_GENERATE_PATCH, IDC_DIFF_BROWSE_RESULT
-#: Merge.rc:2422
+#: Merge.rc:2432
msgid "Bro&wse..."
msgstr "Navi&gà…"
#. IDD_GENERATE_PATCH, IDC_STATIC
-#: Merge.rc:2423
+#: Merge.rc:2433
msgid "&Format"
msgstr "&Furmatu"
#. IDD_GENERATE_PATCH, IDC_STATIC
-#: Merge.rc:2424
+#: Merge.rc:2434
msgid "St&yle:"
msgstr "Stil&u :"
#. IDD_GENERATE_PATCH, IDC_STATIC
-#: Merge.rc:2426
+#: Merge.rc:2436
msgid "&Context:"
msgstr "&Cuntestu :"
#. IDD_GENERATE_PATCH, IDC_DIFF_INCLCMDLINE
-#: Merge.rc:2428
+#: Merge.rc:2438
msgid "Inclu&de command line"
msgstr "Inclu&de a linea di cumanda"
#. IDD_GENERATE_PATCH, IDC_DIFF_OPENTOEDITOR
-#: Merge.rc:2429
+#: Merge.rc:2439
msgid "Open in e&xternal editor"
msgstr "Apre cù l’&editore esternu"
#. IDD_DIRCOLS
-#: Merge.rc:2446
+#: Merge.rc:2456
msgid "Display Columns"
msgstr "Affissera di e culonne"
#. IDD_DIRCOLS, IDC_UP
-#: Merge.rc:2450
+#: Merge.rc:2460
msgid "Move &Up"
msgstr "Move in&sù"
#. IDD_DIRCOLS, IDC_DOWN
-#: Merge.rc:2451
+#: Merge.rc:2461
msgid "Move &Down"
msgstr "Move in&ghjò"
#. IDD_DIRCOLS, IDC_COLDLG_ADDITIONAL_PROPERTIES
-#: Merge.rc:2453
+#: Merge.rc:2463
msgid "&Additional Properties"
msgstr "&Pruprietà addiziunale"
#. IDD_DIRADDITIONALPROPS
-#: Merge.rc:2461
+#: Merge.rc:2471
msgid "Additional Properties"
msgstr "Pruprietà addiziunale"
#. IDD_PLUGINS_SELECTPLUGIN
-#: Merge.rc:2475
+#: Merge.rc:2485
msgid "Select Plugin"
msgstr "Selezziunà u modulu d’estensione"
#. IDD_PLUGINS_EDITPLUGIN, IDC_STATIC
-#: Merge.rc:2478 Merge.rc:3115
+#: Merge.rc:2488 Merge.rc:3125
msgid "Plugin &name:"
msgstr "Nome di u modulu :"
#. IDD_PLUGINS_SELECTPLUGIN, IDC_STATIC
-#: Merge.rc:2480
+#: Merge.rc:2490
msgid "&Target files:"
msgstr "Schedarii di destina&zione :"
#. IDD_PLUGINS_EDITPLUGIN, IDC_STATIC
-#: Merge.rc:2482 Merge.rc:3117
+#: Merge.rc:2492 Merge.rc:3127
msgid "Extensions list:"
msgstr "Lista di l’estensioni :"
#. IDD_PLUGINS_EDITPLUGIN, IDC_STATIC
-#: Merge.rc:2484 Merge.rc:3119
+#: Merge.rc:2494 Merge.rc:3129
msgid "Description:"
msgstr "Discrizzione :"
#. IDD_PLUGINS_EDITPLUGIN, IDC_STATIC
-#: Merge.rc:2486 Merge.rc:3121
+#: Merge.rc:2496 Merge.rc:3131
msgid "Default arguments:"
msgstr "Parametri predefiniti :"
#. IDD_PLUGINS_SELECTPLUGIN, IDC_PLUGIN_ALLOW_ALL
-#: Merge.rc:2488
+#: Merge.rc:2498
msgid "Display all plugins (Ignore extension)"
msgstr "Affissà tutti i moduli d’estensione (ignurà l’estensione)"
#. IDD_PLUGINS_SELECTPLUGIN, IDC_PLUGIN_OPEN_IN_SAME_FRAME_TYPE
-#: Merge.rc:2490
+#: Merge.rc:2500
msgid "&Open files in same window type after unpacking"
msgstr "&Apre i schedarii in u listessu tipu di finestra dopu à a spacchittera"
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_PIPELINE_STATIC
-#: Merge.rc:2492 Merge.rc:3129
+#: Merge.rc:2502 Merge.rc:3139
msgid "&Plugin pipeline:"
msgstr "&Cundottu di modulu :"
#. IDD_PLUGINS_SELECTPLUGIN, IDC_PLUGIN_ALIAS
-#: Merge.rc:2495
+#: Merge.rc:2505
msgid "&Alias..."
msgstr "&Cugnome…"
#. IDD_DIRCOMP_PROGRESS, IDC_COMPARISON_STOP
-#: Merge.rc:2505
+#: Merge.rc:2515
msgid "Stop"
msgstr "Piantà"
#. IDD_DIRCOMP_PROGRESS, IDC_COMPARISON_PAUSE
-#: Merge.rc:2506
+#: Merge.rc:2516
msgid "Pause"
msgstr "Pausa"
#. IDD_DIRCOMP_PROGRESS, IDC_COMPARISON_CONTINUE
-#: Merge.rc:2507
+#: Merge.rc:2517
msgid "Continue"
msgstr "Cuntinuà"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC
-#: Merge.rc:2509 Merge.rc:2973
+#: Merge.rc:2519 Merge.rc:2983
msgid "C&PU cores to use:"
msgstr "&N° di cori CPU à impiegà :"
#. IDD_DIRCOMP_PROGRESS, IDC_STATIC
-#: Merge.rc:2510
+#: Merge.rc:2520
msgid "Items total:"
msgstr "Tutale di l’elementi :"
#. IDD_DIRCOMP_PROGRESS, IDC_STATIC
-#: Merge.rc:2511
+#: Merge.rc:2521
msgid "Items compared:"
msgstr "Elementi paragunati :"
#. IDS_PREVIEWBAR_CLOSE
-#: Merge.rc:2526 Merge.rc:2846 Merge.rc:5328
+#: Merge.rc:2536 Merge.rc:2856 Merge.rc:5339
msgid "&Close"
msgstr "&Chjode"
#. IDD_WMGOTO
-#: Merge.rc:2537
+#: Merge.rc:2547
msgid "Go to"
msgstr "Andà à"
#. IDD_WMGOTO, IDC_STATIC
-#: Merge.rc:2540
+#: Merge.rc:2550
msgid "G&o to:"
msgstr "A&ndà à :"
#. IDD_WMGOTO, IDC_STATIC
-#: Merge.rc:2543
+#: Merge.rc:2553
msgid "File"
msgstr "Schedariu"
#. IDD_WMGOTO, IDC_STATIC
-#: Merge.rc:2547
+#: Merge.rc:2557
msgid "Go to what"
msgstr "Andà à cosa"
#. IDD_WMGOTO, IDC_WMGOTO_TOLINE
-#: Merge.rc:2548
+#: Merge.rc:2558
msgid "Li&ne"
msgstr "A &linea"
#. IDD_WMGOTO, IDC_WMGOTO_TODIFF
-#: Merge.rc:2549
+#: Merge.rc:2559
msgid "&Difference"
msgstr "A &sfarenza"
#. IDD_WMGOTO, IDOK
-#: Merge.rc:2550
+#: Merge.rc:2560
msgid "&Go to"
msgstr "&Andà à"
#. IDS_PROJECT_ITEM_FILE_FILTER
-#: Merge.rc:2556 Merge.rc:4321
+#: Merge.rc:2566 Merge.rc:4331
msgid "File Filters"
msgstr "Filtri di schedariu"
#. IDD_FILTERS_FILEFILTERS, IDC_STATIC
-#: Merge.rc:2559
+#: Merge.rc:2569
msgid "&Mask / Filter Expression"
msgstr "Espressione di &maschera o di filtru"
#. IDD_FILTERS_FILEFILTERS, IDC_STATIC
-#: Merge.rc:2562
+#: Merge.rc:2572
msgid "Preset &Filters"
msgstr "&Filtri predefiniti"
#. IDD_FILTERS_FILEFILTERS, IDC_FILTERFILE_TEST_BTN
-#: Merge.rc:2564
+#: Merge.rc:2574
msgid "Test..."
msgstr "Prova…"
#. IDD_FILTERS_FILEFILTERS, IDC_FILTERFILE_INSTALL
-#: Merge.rc:2565
+#: Merge.rc:2575
msgid "Install..."
msgstr "Installà…"
#. IDD_FILTERS_FILEFILTERS, IDC_FILTERFILE_NEWBTN
-#: Merge.rc:2566
+#: Merge.rc:2576
msgid "New..."
msgstr "Novu…"
#. IDD_FILTERS_FILEFILTERS, IDC_FILTERFILE_EDITBTN
-#: Merge.rc:2567
+#: Merge.rc:2577
msgid "Edit..."
msgstr "Mudificà…"
#. IDD_FILTERS_FILEFILTERS, IDC_FILTERFILE_DELETEBTN
-#: Merge.rc:2568
+#: Merge.rc:2578
msgid "Delete..."
msgstr "Squassà…"
#. IDD_FILTERS_CONDITION
-#: Merge.rc:2573
+#: Merge.rc:2583
msgid "Filter Condition"
msgstr "Cundizione di u filtru"
#. IDD_FILTERS_CONDITION, IDC_STATIC
-#: Merge.rc:2576
+#: Merge.rc:2586
msgid "&Left-hand side:"
msgstr "A manu &manca :"
#. IDD_FILTERS_CONDITION, IDC_STATIC
-#: Merge.rc:2578
+#: Merge.rc:2588
msgid "&Operator:"
msgstr "&Operatore :"
#. IDD_FILTERS_CONDITION, IDC_STATIC
-#: Merge.rc:2580
+#: Merge.rc:2590
msgid "&Right-hand side:"
msgstr "A manu &diritta :"
#. IDD_FILTERS_CONDITION, IDC_STATIC
-#: Merge.rc:2586
+#: Merge.rc:2596
msgid "Expression:"
msgstr "Spressione :"
#. IDD_COMPARISON_RESULT_FILTER
-#: Merge.rc:2595
+#: Merge.rc:2605
msgid "Filter by Comparison Result"
msgstr "Filtru da u risultatu di u paragone"
#. IDD_COMPARISON_RESULT_FILTER, IDC_RADIO_INCLUDE
-#: Merge.rc:2598
+#: Merge.rc:2608
msgid "&Include"
msgstr "&Include"
#. IDD_COMPARISON_RESULT_FILTER, IDC_RADIO_EXCLUDE
-#: Merge.rc:2599
+#: Merge.rc:2609
msgid "&Exclude"
msgstr "&Esclude"
#. IDD_COMPARISON_RESULT_FILTER, IDC_STATIC
-#: Merge.rc:2600
+#: Merge.rc:2610
msgid "Comparison Results"
msgstr "Risultati di paragone"
#. IDS_IDENTICAL
-#: Merge.rc:2601 Merge.rc:2733 Merge.rc:2794 Merge.rc:4698
+#: Merge.rc:2611 Merge.rc:2743 Merge.rc:2804 Merge.rc:4708
msgid "Identical"
msgstr "Identichi"
#. IDS_DIFFERENT
-#: Merge.rc:2602 Merge.rc:2714 Merge.rc:2755 Merge.rc:4708
+#: Merge.rc:2612 Merge.rc:2724 Merge.rc:2765 Merge.rc:4718
msgid "Different"
msgstr "Sfarente"
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_LEFT_ONLY
-#: Merge.rc:2603
+#: Merge.rc:2613
msgid "Left only"
msgstr "Solu à manca"
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_RIGHT_ONLY
-#: Merge.rc:2604
+#: Merge.rc:2614
msgid "Right only"
msgstr "Solu à diritta"
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_SKIPPED
-#: Merge.rc:2605
+#: Merge.rc:2615
msgid "Skipped"
msgstr "Tralasciatu"
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_MIDDLE_ONLY
-#: Merge.rc:2606
+#: Merge.rc:2616
msgid "Middle only"
msgstr "Solu à u centru"
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_LEFT_ONLY_DIFFERENT
-#: Merge.rc:2607
+#: Merge.rc:2617
msgid "Left only (different)"
msgstr "Solu à manca (sfarente)"
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_MIDDLE_ONLY_DIFFERENT
-#: Merge.rc:2608
+#: Merge.rc:2618
msgid "Middle only (different)"
msgstr "Solu à u centru (sfarente)"
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_RIGHT_ONLY_DIFFERENT
-#: Merge.rc:2609
+#: Merge.rc:2619
msgid "Right only (different)"
msgstr "Solu à diritta (sfarente)"
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_LEFT_ONLY_MISSING
-#: Merge.rc:2610
+#: Merge.rc:2620
msgid "Left only (missing)"
msgstr "Solu à manca (assente)"
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_MIDDLE_ONLY_MISSING
-#: Merge.rc:2611
+#: Merge.rc:2621
msgid "Middle only (missing)"
msgstr "Solu à u centru (assente)"
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_RIGHT_ONLY_MISSING
-#: Merge.rc:2612
+#: Merge.rc:2622
msgid "Right only (missing)"
msgstr "Solu à diritta (assente)"
#. IDS_OPTIONSPG_CODEPAGE
-#: Merge.rc:2619 Merge.rc:2811 Merge.rc:4213
+#: Merge.rc:2629 Merge.rc:2821 Merge.rc:4223
msgid "Codepage"
msgstr "Pagina di codice"
#. IDD_PROPPAGE_CODEPAGE, IDC_STATIC
-#: Merge.rc:2622
+#: Merge.rc:2632
msgid "Default Codepage"
msgstr "Pagina di codice predefinita"
#. IDD_PROPPAGE_CODEPAGE, IDC_STATIC
-#: Merge.rc:2623
+#: Merge.rc:2633
msgid "Select the default codepage for non-Unicode files:"
msgstr "Selezziunà a pagina di codice predefinita per i schedarii non-Unicode :"
#. IDD_PROPPAGE_CODEPAGE, IDC_CP_SYSTEM
-#: Merge.rc:2624
+#: Merge.rc:2634
msgid "System codepage"
msgstr "Pagina di codice di u sistema"
#. IDD_PROPPAGE_CODEPAGE, IDC_CP_UI
-#: Merge.rc:2625
+#: Merge.rc:2635
msgid "According to WinMerge User Interface"
msgstr "Secondu à l‘interfaccia utilizatore WinMerge"
#. IDD_PROPPAGE_CODEPAGE, IDC_CP_CUSTOM
-#: Merge.rc:2626
+#: Merge.rc:2636
msgid "Custom codepage:"
msgstr "Pagina di codice persunalizata :"
#. IDD_PROPPAGE_CODEPAGE, IDC_DETECT_CODEPAGE
-#: Merge.rc:2628
+#: Merge.rc:2638
msgid ""
"Detect codepage for: .html, .rc, .xml\n"
"Restart required."
@@ -4087,7 +4098,7 @@ msgstr ""
"Rilanciu richiestu."
#. IDD_PROPPAGE_CODEPAGE, IDC_DETECT_CODEPAGE2
-#: Merge.rc:2630
+#: Merge.rc:2640
msgid ""
"Detect codepage for files with mlang.dll\n"
"Restart required."
@@ -4096,769 +4107,769 @@ msgstr ""
"Rilanciu richiestu."
#. IDS_OPTIONSPG_ARCHIVE
-#: Merge.rc:2638 Merge.rc:4214
+#: Merge.rc:2648 Merge.rc:4224
msgid "Archive Support"
msgstr "Permette l’archiviera"
#. IDD_PROPPAGE_ARCHIVE, IDC_ARCHIVE_ENABLE
-#: Merge.rc:2641
+#: Merge.rc:2651
msgid "&Enable archive file support"
msgstr "&Permette l’impiegu di schedariu d’archiviu"
#. IDD_PROPPAGE_ARCHIVE, IDC_ARCHIVE_DETECTTYPE
-#: Merge.rc:2642
+#: Merge.rc:2652
msgid "&Detect archive type from file signature"
msgstr "&Avventà u tipu d’archiviu via a segnatura di u schedariu"
#. IDD_PROPPAGE_PROJECT, IDC_STATIC
-#: Merge.rc:2651
+#: Merge.rc:2661
msgid "Items saved to or restored from the project file:"
msgstr "Elementi arregistrati o risturati di u schedariu di prughjettu :"
#. IDD_SAVECLOSING
-#: Merge.rc:2658
+#: Merge.rc:2668
msgid "Save Modified Files?"
msgstr "Arregistrà i schedarii mudificati ?"
#. IDD_SAVECLOSING, IDC_SAVECLOSING_LEFTFRAME
-#: Merge.rc:2661
+#: Merge.rc:2671
msgid "Left side file"
msgstr "Schedariu à manca"
#. IDD_SAVECLOSING, IDC_SAVECLOSING_SAVELEFT
-#: Merge.rc:2663
+#: Merge.rc:2673
msgid "&Save changes"
msgstr "&Arregistrà i cambiamenti"
#. IDD_SAVECLOSING, IDC_SAVECLOSING_DISCARDLEFT
-#: Merge.rc:2664
+#: Merge.rc:2674
msgid "&Discard changes"
msgstr "&Scartà i cambiamenti"
#. IDD_SAVECLOSING, IDC_SAVECLOSING_MIDDLEFRAME
-#: Merge.rc:2665
+#: Merge.rc:2675
msgid "Middle side file"
msgstr "Schedariu à u centru"
#. IDD_SAVECLOSING, IDC_SAVECLOSING_SAVEMIDDLE
-#: Merge.rc:2667
+#: Merge.rc:2677
msgid "Sa&ve changes"
msgstr "A&rregistrà i cambiamenti"
#. IDD_SAVECLOSING, IDC_SAVECLOSING_DISCARDMIDDLE
-#: Merge.rc:2668
+#: Merge.rc:2678
msgid "Discard c&hanges"
msgstr "S&cartà i cambiamenti"
#. IDD_SAVECLOSING, IDC_SAVECLOSING_RIGHTFRAME
-#: Merge.rc:2669
+#: Merge.rc:2679
msgid "Right side file"
msgstr "Schedariu à diritta"
#. IDD_SAVECLOSING, IDC_SAVECLOSING_SAVERIGHT
-#: Merge.rc:2671
+#: Merge.rc:2681
msgid "S&ave changes"
msgstr "Arr&egistrà i cambiamenti"
#. IDD_SAVECLOSING, IDC_SAVECLOSING_DISCARDRIGHT
-#: Merge.rc:2672
+#: Merge.rc:2682
msgid "Dis&card changes"
msgstr "Scar&tà i cambiamenti"
#. IDD_SAVECLOSING, IDC_SAVECLOSING_DISCARDALL
-#: Merge.rc:2673
+#: Merge.rc:2683
msgid "Disca&rd All"
msgstr "T&uttu scartà"
#. IDD_DIRCMP_REPORT
-#: Merge.rc:2680
+#: Merge.rc:2690
msgid "Folder Compare Report"
msgstr "Raportu di paragone di cartulare"
#. IDD_DIRCMP_REPORT, IDC_STATIC
-#: Merge.rc:2683
+#: Merge.rc:2693
msgid "Report &file:"
msgstr "Schedariu di &raportu :"
#. IDD_DIRCMP_REPORT, IDC_STATIC
-#: Merge.rc:2686
+#: Merge.rc:2696
msgid "&Style:"
msgstr "&Stilu :"
#. IDD_DIRCMP_REPORT, IDC_REPORT_INCLUDEFILECMPREPORT
-#: Merge.rc:2688
+#: Merge.rc:2698
msgid "&Include file compare report"
msgstr "&Include u raportu di paragone di schedariu"
#. IDD_FILTERS_FILEFILTERS_SHARED
-#: Merge.rc:2697
+#: Merge.rc:2707
msgid "Shared or Private Filter"
msgstr "Filtru spartutu o privatu"
#. IDD_FILTERS_FILEFILTERS_SHARED, IDC_STATIC
-#: Merge.rc:2700
+#: Merge.rc:2710
msgid "What type of filter do you want?"
msgstr "Chì tipu di filtru vo vulete ?"
#. IDD_FILTERS_FILEFILTERS_SHARED, IDC_SHARED
-#: Merge.rc:2701
+#: Merge.rc:2711
msgid "Shared Filter (for all users)"
msgstr "Filtru spartutu (per tutti l’utilizatori)"
#. IDD_FILTERS_FILEFILTERS_SHARED, IDC_PRIVATE
-#: Merge.rc:2702
+#: Merge.rc:2712
msgid "Private Filter (current user only)"
msgstr "Filtru privatu (solu per l’utilizatore attuale)"
#. IDD_COMPARE_STATISTICS3
-#: Merge.rc:2709 Merge.rc:2750
+#: Merge.rc:2719 Merge.rc:2760
msgid "Compare Statistics"
msgstr "Statistiche di paragone"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2712 Merge.rc:2753
+#: Merge.rc:2722 Merge.rc:2763
msgid "Folders:"
msgstr "Cartulari :"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2713 Merge.rc:2754
+#: Merge.rc:2723 Merge.rc:2764
msgid "Files:"
msgstr "Schedarii :"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2719 Merge.rc:2738 Merge.rc:2760 Merge.rc:2799
+#: Merge.rc:2729 Merge.rc:2748 Merge.rc:2770 Merge.rc:2809
msgid "Binary:"
msgstr "Binariu :"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2722 Merge.rc:2763
+#: Merge.rc:2732 Merge.rc:2773
msgid "Unique"
msgstr "Unicu"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2723 Merge.rc:2764
+#: Merge.rc:2733 Merge.rc:2774
msgid "Left:"
msgstr "Manca :"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2728 Merge.rc:2774
+#: Merge.rc:2738 Merge.rc:2784
msgid "Right:"
msgstr "Diritta :"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2742 Merge.rc:2803
+#: Merge.rc:2752 Merge.rc:2813
msgid "Total:"
msgstr "Tutale :"
#. IDD_COMPARE_STATISTICS3, IDOK
-#: Merge.rc:2745 Merge.rc:2806
+#: Merge.rc:2755 Merge.rc:2816
msgid "Close"
msgstr "Chjode"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2769
+#: Merge.rc:2779
msgid "Middle:"
msgstr "Centru :"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2779
+#: Merge.rc:2789
msgid "Missing Left:"
msgstr "Manca assente :"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2784
+#: Merge.rc:2794
msgid "Missing Middle:"
msgstr "Centru assente :"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2789
+#: Merge.rc:2799
msgid "Missing Right:"
msgstr "Diritta assente :"
#. IDD_LOAD_SAVE_CODEPAGE, IDC_AFFECTS_GROUP
-#: Merge.rc:2814
+#: Merge.rc:2824
msgid "Affects"
msgstr "Tocchi"
#. IDD_LOAD_SAVE_CODEPAGE, IDC_RIGHT_FILES_LABEL
-#: Merge.rc:2816 Merge.rc:2818 Merge.rc:2820
+#: Merge.rc:2826 Merge.rc:2828 Merge.rc:2830
msgid "(Affects)"
msgstr "(Tocchi)"
#. IDD_LOAD_SAVE_CODEPAGE, IDC_LOADING_GROUP
-#: Merge.rc:2821
+#: Merge.rc:2831
msgid "Select Codepage for"
msgstr "Selezziunà a pagina di codice per l’azzione à effettuà nant’à u schedariu"
#. IDD_LOAD_SAVE_CODEPAGE, IDC_LOAD_FILES_LABEL
-#: Merge.rc:2822
+#: Merge.rc:2832
msgid "&File Loading:"
msgstr "Ca&ricamentu :"
#. IDD_LOAD_SAVE_CODEPAGE, IDC_SAVE_FILES_LABEL
-#: Merge.rc:2824
+#: Merge.rc:2834
msgid "File &Saving:"
msgstr "&Arregistramentu :"
#. IDD_LOAD_SAVE_CODEPAGE, IDC_LOAD_SAVE_SAME_CODEPAGE
-#: Merge.rc:2827
+#: Merge.rc:2837
msgid "&Use same codepage for both"
msgstr "&Impiegà a listessa pagina di codice per tramindui"
#. IDS_MESSAGEBOX_CANCEL
-#: Merge.rc:2830 Merge.rc:4172
+#: Merge.rc:2840 Merge.rc:4182
msgid "&Cancel"
msgstr "&Abbandunà"
#. IDD_FILTERS_FILEFILTERS_TEST
-#: Merge.rc:2835
+#: Merge.rc:2845
msgid "Test Filter"
msgstr "Pruvà u filtru"
#. IDD_FILTERS_FILEFILTERS_TEST, IDC_HEADER
-#: Merge.rc:2838
+#: Merge.rc:2848
msgid "Testing filter:"
msgstr "Prova di u filtru :"
#. IDD_FILTERS_FILEFILTERS_TEST, IDC_PROMPT_LABEL
-#: Merge.rc:2840
+#: Merge.rc:2850
msgid "&Enter text to test:"
msgstr "&Stampittà u testu à pruvà :"
#. IDD_FILTERS_FILEFILTERS_TEST, IDC_IS_DIRECTORY
-#: Merge.rc:2842
+#: Merge.rc:2852
msgid "&Folder Name"
msgstr "&Nome di u cartulare"
#. IDD_FILTERS_FILEFILTERS_TEST, IDC_STATIC
-#: Merge.rc:2843
+#: Merge.rc:2853
msgid "Result:"
msgstr "Risultatu :"
#. IDD_FILTERS_FILEFILTERS_TEST, IDC_TEST_BTN
-#: Merge.rc:2845
+#: Merge.rc:2855
msgid "&Test"
msgstr "&Pruvà"
#. IDS_OPTIONSPG_TABLECOMPARE
-#: Merge.rc:2851 Merge.rc:2990 Merge.rc:4228
+#: Merge.rc:2861 Merge.rc:3000 Merge.rc:4238
msgid "Table"
msgstr "Tavulone"
#. IDD_OPEN_TABLE, IDC_STATIC
-#: Merge.rc:2854
+#: Merge.rc:2864
msgid "File type"
msgstr "Tipu di schedariu"
#. IDD_OPEN_TABLE, IDC_COMPARETABLE_CSV
-#: Merge.rc:2855
+#: Merge.rc:2865
msgid "&CSV"
msgstr "&CSV"
#. IDD_OPEN_TABLE, IDC_COMPARETABLE_TSV
-#: Merge.rc:2856
+#: Merge.rc:2866
msgid "&TSV"
msgstr "&TSV"
#. IDD_OPEN_TABLE, IDC_COMPARETABLE_DSV
-#: Merge.rc:2857
+#: Merge.rc:2867
msgid "Custom &Delimiter-Separated Values"
msgstr "Persunalizà delimitatore è &staccamentu"
#. IDD_PROPPAGE_COMPARE_TABLE, IDC_STATIC
-#: Merge.rc:2859 Merge.rc:2861 Merge.rc:2996 Merge.rc:3004
+#: Merge.rc:2869 Merge.rc:2871 Merge.rc:3006 Merge.rc:3014
msgid "D&elimiter character:"
msgstr "Caratteru &delimitatore :"
#. IDD_PROPPAGE_COMPARE_TABLE, IDC_COMPARETABLE_ALLOWNEWLINE
-#: Merge.rc:2863 Merge.rc:3006
+#: Merge.rc:2873 Merge.rc:3016
msgid "&Allow newlines in quotes"
msgstr "&Permette i salti di linea in e citazioni"
#. IDD_PROPPAGE_COMPARE_TABLE, IDC_STATIC
-#: Merge.rc:2865 Merge.rc:3008
+#: Merge.rc:2875 Merge.rc:3018
msgid "&Quote character:"
msgstr "&Caratteru di citazione :"
#. IDS_OPTIONSPG_BACKUPS
-#: Merge.rc:2873 Merge.rc:4216
+#: Merge.rc:2883 Merge.rc:4226
msgid "Backup Files"
msgstr "Schedarii di salvaguardia"
#. IDD_PROPPAGE_BACKUPS, IDC_STATIC
-#: Merge.rc:2876
+#: Merge.rc:2886
msgid "Create backup files for:"
msgstr "Creà i schedarii di salvaguardia per :"
#. IDD_PROPPAGE_BACKUPS, IDC_BACKUP_FOLDERCMP
-#: Merge.rc:2877
+#: Merge.rc:2887
msgid "&Folder compare"
msgstr "Paragone di &cartulare"
#. IDD_PROPPAGE_BACKUPS, IDC_BACKUP_FILECMP
-#: Merge.rc:2878
+#: Merge.rc:2888
msgid "Fil&e compare"
msgstr "Paragone di &schedariu"
#. IDD_PROPPAGE_BACKUPS, IDC_STATIC
-#: Merge.rc:2879
+#: Merge.rc:2889
msgid "Create backup files in:"
msgstr "Creà i schedarii di salvaguardia in :"
#. IDD_PROPPAGE_BACKUPS, IDC_BACKUP_ORIGFOLD
-#: Merge.rc:2880
+#: Merge.rc:2890
msgid "&Original file's folder"
msgstr "Cartulare d’&origine di u schedariu"
#. IDD_PROPPAGE_BACKUPS, IDC_BACKUP_GLOBALFOLD
-#: Merge.rc:2881
+#: Merge.rc:2891
msgid "&Global backup folder:"
msgstr "Cartulare &glubale di salvaguardia :"
#. IDD_PROPPAGE_BACKUPS, IDC_STATIC
-#: Merge.rc:2884
+#: Merge.rc:2894
msgid "Backup filename:"
msgstr "Nome di schedariu di salvaguardia :"
#. IDD_PROPPAGE_BACKUPS, IDC_BACKUP_APPEND_BAK
-#: Merge.rc:2885
+#: Merge.rc:2895
msgid "&Append .bak extension"
msgstr "&Aghjunghje un’estensione .bak"
#. IDD_PROPPAGE_BACKUPS, IDC_BACKUP_APPEND_TIME
-#: Merge.rc:2886
+#: Merge.rc:2896
msgid "A&ppend timestamp"
msgstr "Aghjunghje una stampiglia di &tempu"
#. IDS_CONFIRM_COPY_CAPTION
-#: Merge.rc:2892 Merge.rc:4565
+#: Merge.rc:2902 Merge.rc:4575
msgid "Confirm Copy"
msgstr "Cunfirmazione di copia"
#. IDD_CONFIRM_COPY, IDC_FLDCONFIRM_QUERY
-#: Merge.rc:2896
+#: Merge.rc:2906
msgid "Are you sure you want to copy XXX items?"
msgstr "Da veru vulete cupià XXX elementi ?"
#. IDD_CONFIRM_COPY, IDC_FLDCONFIRM_FROM_TEXT
-#: Merge.rc:2897
+#: Merge.rc:2907
msgid "From left"
msgstr "Da a manca"
#. IDD_CONFIRM_COPY, IDC_FLDCONFIRM_TO_TEXT
-#: Merge.rc:2899
+#: Merge.rc:2909
msgid "To right"
msgstr "Da a diritta"
#. IDS_MESSAGEBOX_DONT_ASK_AGAIN
-#: Merge.rc:2901 Merge.rc:4191
+#: Merge.rc:2911 Merge.rc:4201
msgid "Don't ask this &question again."
msgstr "Ùn mi &dumandà più."
#. IDD_CONFIRM_COPY, IDYES
-#: Merge.rc:2903
+#: Merge.rc:2913
msgid "Yes"
msgstr "Sì"
#. IDD_CONFIRM_COPY, IDNO
-#: Merge.rc:2904
+#: Merge.rc:2914
msgid "No"
msgstr "Nò"
#. IDS_PROJECT_ITEM_PLUGIN
-#: Merge.rc:2909 Merge.rc:4323
+#: Merge.rc:2919 Merge.rc:4333
msgid "Plugins"
msgstr "Moduli d’estensione"
#. IDD_PLUGINS_LIST, IDC_PLUGINS_ENABLE
-#: Merge.rc:2912
+#: Merge.rc:2922
msgid "&Enable plugins"
msgstr "&Attivà i moduli d’estensione"
#. IDD_PLUGINS_EDITPLUGIN, IDC_STATIC
-#: Merge.rc:2913 Merge.rc:3113
+#: Merge.rc:2923 Merge.rc:3123
msgid "Plugin &type:"
msgstr "Tipu di &modulu d’estensione :"
#. IDD_PLUGINS_LIST, IDC_STATIC
-#: Merge.rc:2916
+#: Merge.rc:2926
msgid "File filters:"
msgstr "Filtri di schedariu :"
#. IDD_PLUGINS_LIST, IDC_STATIC
-#: Merge.rc:2918
+#: Merge.rc:2928
msgid "&Plugin arguments:"
msgstr "Parametri di u modulu d’estensione :"
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_AUTOMATIC
-#: Merge.rc:2920 Merge.rc:3134
+#: Merge.rc:2930 Merge.rc:3144
msgid "Enable &automatic unpacking/prediffing"
msgstr "Attivà spacchittera è preparagone &autumatichi"
#. IDS_OPTIONSPG_SHELL
-#: Merge.rc:2934 Merge.rc:4217
+#: Merge.rc:2944 Merge.rc:4227
msgid "Shell Integration"
msgstr "Integrazione à u listinu cuntestuale"
#. IDD_PROPPAGE_SHELL, IDC_STATIC
-#: Merge.rc:2937
+#: Merge.rc:2947
msgid "Explorer"
msgstr "Espluratore"
#. IDD_PROPPAGE_SHELL, IDC_EXPLORER_CONTEXT
-#: Merge.rc:2938
+#: Merge.rc:2948
msgid "&Add to context menu"
msgstr "&Aghjunghje à u listinu cuntestuale"
#. IDD_PROPPAGE_SHELL, IDC_EXPLORER_ADVANCED
-#: Merge.rc:2939
+#: Merge.rc:2949
msgid "E&nable advanced menu"
msgstr "Attivà u listinu &espertu"
#. IDD_PROPPAGE_SHELL, IDC_EXPLORER_COMPARE_AS
-#: Merge.rc:2940
+#: Merge.rc:2950
msgid "Enable &Compare As menu"
msgstr "Attivà l’ozzione Paragunà &cum’è"
#. IDD_PROPPAGE_SHELL, IDC_REGISTER_SHELLEXTENSION
-#: Merge.rc:2941
+#: Merge.rc:2951
msgid "&Register Shell Extension"
msgstr "A&rregistramentu di l’estensione Shell"
#. IDD_PROPPAGE_SHELL, IDC_UNREGISTER_SHELLEXTENSION
-#: Merge.rc:2942
+#: Merge.rc:2952
msgid "&Unregister Shell Extension"
msgstr "&Disarregistramentu di l’estensione Shell"
#. IDD_PROPPAGE_SHELL, IDC_REGISTER_SHELLEXTENSION_PERUSER
-#: Merge.rc:2943
+#: Merge.rc:2953
msgid "Register Shell Extension for Current User &Only"
msgstr "Arregistramentu di l’estensione Shell solu per l’&utilizatore attuale"
#. IDD_PROPPAGE_SHELL, IDC_UNREGISTER_SHELLEXTENSION_PERUSER
-#: Merge.rc:2944
+#: Merge.rc:2954
msgid "Unregister Shell Extension for Current User On&ly"
msgstr "Disarregistramentu di l’estensione Shell solu per l’utili&zatore attuale"
#. IDD_PROPPAGE_SHELL, IDC_REGISTER_WINMERGECONTEXTMENU
-#: Merge.rc:2945
+#: Merge.rc:2955
msgid "Register Shell Extension for &Windows 11"
msgstr "Arregistramentu di l’estensione Shell per &Windows 11"
#. IDD_PROPPAGE_SHELL, IDC_UNREGISTER_WINMERGECONTEXTMENU
-#: Merge.rc:2946
+#: Merge.rc:2956
msgid "Unregister Shell Extension for W&indows 11"
msgstr "Disarregistramentu di l’estensione Shell per W&indows 11"
#. IDD_PROPPAGE_SHELL, IDC_STATIC
-#: Merge.rc:2947
+#: Merge.rc:2957
msgid "Jump List"
msgstr "Lista d’accurtatoghji"
#. IDD_PROPPAGE_SHELL, IDC_CLEAR_ALL_RECENT_ITEMS
-#: Merge.rc:2949
+#: Merge.rc:2959
msgid "Clear all recent items"
msgstr "Squassà tutti l’elementi recenti"
#. IDS_OPTIONSPG_FOLDERCOMPARE
-#: Merge.rc:2954 Merge.rc:4225
+#: Merge.rc:2964 Merge.rc:4235
msgctxt "Options dialog|Categories"
msgid "Folder"
msgstr "Cartulare"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC
-#: Merge.rc:2957
+#: Merge.rc:2967
msgid "&Compare method:"
msgstr "&Metoda di paragone :"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_COMPARE_STOPFIRST
-#: Merge.rc:2959
+#: Merge.rc:2969
msgid "S&top after first difference"
msgstr "Pian&tà dopu à a prima sfarenza"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_IGNORE_SMALLTIMEDIFF
-#: Merge.rc:2961
+#: Merge.rc:2971
msgid "Ign&ore time differences less than 3 seconds"
msgstr "Ignurà e sfarenze di tempu di menu di &3 seconde"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC
-#: Merge.rc:2964
+#: Merge.rc:2974
msgid "Expand subfolders &after comparison:"
msgstr "&Allargà i sottucartulari dopu à u paragone :"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_COMPARE_WALKSUBDIRS
-#: Merge.rc:2966
+#: Merge.rc:2976
msgid "Include &unique subfolders contents"
msgstr "Include u cuntenutu &unicu di i sottucartulari"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_IGNORE_REPARSEPOINTS
-#: Merge.rc:2968
+#: Merge.rc:2978
msgid "Ignore &reparse points"
msgstr "Ignurà i punti di riana&lisa"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC
-#: Merge.rc:2969
+#: Merge.rc:2979
msgid "Switch to &quick compare when size exceeds (MB):"
msgstr "Passà à u paragone &rapidu quandu a dimensione (in Mo) eccede :"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC
-#: Merge.rc:2971
+#: Merge.rc:2981
msgid "Switch to &binary compare when size exceeds (MB):"
msgstr "Passà à u paragone &binariu quandu a dimensione (in Mo) eccede :"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC
-#: Merge.rc:2975
+#: Merge.rc:2985
msgid "Additional comparison condi&tions:"
msgstr "Cundizioni addiziunale di parag&one :"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC
-#: Merge.rc:2978
+#: Merge.rc:2988
msgid "&Rename/move detection:"
msgstr "&Scuperta di rinuminazione o dispiazzamentu :"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC
-#: Merge.rc:2980
+#: Merge.rc:2990
msgid "Rename/move detection &keys:"
msgstr "&Chjavi di a scuperta di rinuminazione o dispiazzamentu :"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC
-#: Merge.rc:2983
+#: Merge.rc:2993
msgid "M&erge renames and moves:"
msgstr "&Fusione di e rinuminazioni è i dispiazzamenti :"
#. IDD_PROPPAGE_COMPARE_TABLE, IDC_STATIC
-#: Merge.rc:2994 Merge.rc:2999 Merge.rc:3002
+#: Merge.rc:3004 Merge.rc:3009 Merge.rc:3012
msgid "File patterns:"
msgstr "Mudelli di schedariu :"
#. IDD_PROPPAGE_COMPARE_TABLE, IDC_STATIC
-#: Merge.rc:3001
+#: Merge.rc:3011
msgid "Custom Delimiter-Separated Values"
msgstr "Persunalizà delimitatore è &staccamentu"
#. IDS_OPTIONSPG_BINARYCOMPARE
-#: Merge.rc:3015 Merge.rc:4227
+#: Merge.rc:3025 Merge.rc:4237
msgctxt "Options dialog|Categories"
msgid "Binary"
msgstr "Binariu"
#. IDD_PROPPAGE_COMPARE_BINARY, IDC_STATIC
-#: Merge.rc:3018
+#: Merge.rc:3028
msgid "Binary file &patterns:"
msgstr "Mudelli di schedariu &binarii :"
#. IDD_PROPPAGE_COMPARE_BINARY, IDC_STATIC
-#: Merge.rc:3020
+#: Merge.rc:3030
msgid "Frhed settings"
msgstr "Parametri Frhed"
#. IDD_PROPPAGE_COMPARE_BINARY, IDC_COMPAREBINARY_VIEWSETTINGS
-#: Merge.rc:3021
+#: Merge.rc:3031
msgid "View &Settings..."
msgstr "Affissà i ¶metri…"
#. IDD_PROPPAGE_COMPARE_BINARY, IDC_COMPAREBINARY_BINARYMODE
-#: Merge.rc:3022
+#: Merge.rc:3032
msgid "&Binary Mode..."
msgstr "Modu &binariu…"
#. IDD_PROPPAGE_COMPARE_BINARY, IDC_COMPAREBINARY_CHARACTERSET
-#: Merge.rc:3023
+#: Merge.rc:3033
msgid "&Character Set..."
msgstr "Inseme di &caratteri…"
#. IDS_PRPCAT_IMAGE
-#: Merge.rc:3029 Merge.rc:4226 Merge.rc:4665
+#: Merge.rc:3039 Merge.rc:4236 Merge.rc:4675
msgid "Image"
msgstr "Fiura"
#. IDD_PROPPAGE_COMPARE_IMAGE, IDC_STATIC
-#: Merge.rc:3032
+#: Merge.rc:3042
msgid "Image file &patterns:"
msgstr "Mudelli di schedariu di &fiura :"
#. IDD_PROPPAGE_COMPARE_IMAGE, IDC_ENABLE_IMGCMP_IN_DIRCMP
-#: Merge.rc:3034
+#: Merge.rc:3044
msgid "&Enable image compare in folder compare"
msgstr "&Permette di paragunà e fiure in u paragone di cartulare"
#. IDD_PROPPAGE_COMPARE_IMAGE, IDC_STATIC
-#: Merge.rc:3036
+#: Merge.rc:3046
msgid "OCR result:"
msgstr "Risultatu OCR :"
#. IDS_OPTIONSPG_WEBPAGECOMPARE
-#: Merge.rc:3043 Merge.rc:4229
+#: Merge.rc:3053 Merge.rc:4239
msgid "Webpage"
msgstr "Pagina web"
#. IDD_PROPPAGE_COMPARE_WEBPAGE, IDC_STATIC
-#: Merge.rc:3046
+#: Merge.rc:3056
msgid "URL pattern to &include (Regular expression):"
msgstr "Mudellu d’indirizzu web à include (espressione regulare) :"
#. IDD_PROPPAGE_COMPARE_WEBPAGE, IDC_STATIC
-#: Merge.rc:3048
+#: Merge.rc:3058
msgid "URL pattern to &exclude (Regular expression):"
msgstr "Mudellu d’indirizzu web à esclude (espressione regulare) :"
#. IDD_PROPPAGE_COMPARE_WEBPAGE, IDC_STATIC
-#: Merge.rc:3050
+#: Merge.rc:3060
msgid "&User data folder location:"
msgstr "&Piazza di u cartulare di dati di l’utilizatore :"
#. IDD_PROPPAGE_COMPARE_WEBPAGE, IDC_COMPAREWEBPAGE_USERDATAFOLDER_PERPANE
-#: Merge.rc:3052
+#: Merge.rc:3062
msgid "&Separate user data folders for each pane"
msgstr "&Cartulare di dati di l’utilizatore sfarente per ogni pannellu"
#. IDD_ENCODINGERROR, IDC_HEXVIEW
-#: Merge.rc:3065
+#: Merge.rc:3075
msgid "&Hex View"
msgstr "Vista &esadecimale"
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3110
+#: Merge.rc:3120
msgid "Edit Plugin"
msgstr "Mudificà u modulu d’estensione"
#. IDD_PLUGINS_EDITPLUGIN, IDC_STATIC
-#: Merge.rc:3123
+#: Merge.rc:3133
msgid "&Category:"
msgstr "&Categuria :"
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_MENUCAPTION_STATIC
-#: Merge.rc:3125
+#: Merge.rc:3135
msgid "&Menu caption:"
msgstr "&Legenda di listinu :"
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_WINDOWTYPE_STATIC
-#: Merge.rc:3127
+#: Merge.rc:3137
msgid "&Window type:"
msgstr "Tipu di &finestra :"
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_UNPACKEDFILEEXTENSION_STATIC
-#: Merge.rc:3132
+#: Merge.rc:3142
msgid "&Unpacked file extension:"
msgstr "&Estensione di u schedariu spacchittatu :"
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_ARGUMENTSREQUIRED
-#: Merge.rc:3136
+#: Merge.rc:3146
msgid "&Require arguments"
msgstr "&Parametri richiesti"
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_GENERATESCRIPT
-#: Merge.rc:3137
+#: Merge.rc:3147
msgid "&Generate editor script"
msgstr "&Ingenerà u scenariu d’editore"
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_COMMAND_LINE_STATIC
-#: Merge.rc:3140
+#: Merge.rc:3150
msgid "Command &line:"
msgstr "&Linea di cumanda :"
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_SCRIPT_FILEEXTENSION_STATIC
-#: Merge.rc:3143
+#: Merge.rc:3153
msgid "&Script file extension:"
msgstr "Estensione di u schedariu di &scenariu :"
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_SCRIPT_BODY_STATIC
-#: Merge.rc:3145
+#: Merge.rc:3155
msgid "Script &body:"
msgstr "&Testu di u scenariu :"
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3154
+#: Merge.rc:3164
msgid "Font"
msgstr "Grafia"
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3157
+#: Merge.rc:3167
msgid "&Font:"
msgstr "&Grafia :"
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3163
+#: Merge.rc:3173
msgid "Font st&yle:"
msgstr "St&ilu di a grafia :"
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3169
+#: Merge.rc:3179
msgid "&Size:"
msgstr "&Dimensione :"
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3175
+#: Merge.rc:3185
msgid "Effects"
msgstr "Effetti"
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3176
+#: Merge.rc:3186
msgid "Stri&keout"
msgstr "&Rigatu"
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3177
+#: Merge.rc:3187
msgid "&Underline"
msgstr "&Sottulineatu"
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3179
+#: Merge.rc:3189
msgid "&Color:"
msgstr "&Culore :"
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3184
+#: Merge.rc:3194
msgid "Sample"
msgstr "Esempiu"
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3185
+#: Merge.rc:3195
msgid "AaBbYyZz"
msgstr "AaBbYyZz"
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3189
+#: Merge.rc:3199
msgid "Sc&ript:"
msgstr "Sc&enariu :"
#. IDD_PLUGINS_EDITPLUGIN, IDC_MANAGE_LINK
-#: Merge.rc:3194
+#: Merge.rc:3204
msgid "Show more fonts"
msgstr "Affissà d’altre grafie"
#. ID_INDICATOR_EXT
-#: Merge.rc:4118
+#: Merge.rc:4128
msgid "EXT"
msgstr "EST"
#. ID_INDICATOR_CAPS
-#: Merge.rc:4119
+#: Merge.rc:4129
msgid "CAP"
msgstr "MAIU"
#. ID_INDICATOR_NUM
-#: Merge.rc:4120
+#: Merge.rc:4130
msgid "NUM"
msgstr "NUM"
#. ID_INDICATOR_SCRL
-#: Merge.rc:4121
+#: Merge.rc:4131
msgid "SCRL"
msgstr "SFIL"
#. ID_INDICATOR_OVR
-#: Merge.rc:4122
+#: Merge.rc:4132
msgid "OVR"
msgstr "RIMP"
#. ID_INDICATOR_REC
-#: Merge.rc:4123
+#: Merge.rc:4133
msgid "REC"
msgstr "ARRE"
#. ID_FILE_NEW
-#: Merge.rc:4129
+#: Merge.rc:4139
msgid ""
"\n"
"New Documents (Ctrl+N)"
@@ -4867,7 +4878,7 @@ msgstr ""
"Novi ducumenti (Ctrl+N)"
#. ID_FILE_OPEN
-#: Merge.rc:4130
+#: Merge.rc:4140
msgid ""
"\n"
"Open (Ctrl+O)"
@@ -4876,7 +4887,7 @@ msgstr ""
"Apre (Ctrl+O)"
#. ID_FILE_SAVE
-#: Merge.rc:4131
+#: Merge.rc:4141
msgid ""
"\n"
"Save (Ctrl+S)"
@@ -4885,27 +4896,27 @@ msgstr ""
"Arregistrà (Ctrl+S)"
#. IDS_UNK_ERROR_READING_PROJECT
-#: Merge.rc:4137
+#: Merge.rc:4147
msgid "Unknown error opening project file."
msgstr "Sbagliu scunnisciutu à l’apertura di u schedariu di prughjettu."
#. IDS_UNK_ERROR_SAVING_PROJECT
-#: Merge.rc:4138
+#: Merge.rc:4148
msgid "Unknown error saving project file."
msgstr "Sbagliu scunnisciutu à l’arregistramentu di u schedariu di prughjettu."
#. IDS_PROJFILE_LOAD_SUCCESS
-#: Merge.rc:4143
+#: Merge.rc:4153
msgid "Project file loaded."
msgstr "Caricamentu di u schedariu di prughjettu."
#. IDS_PROJFILE_SAVE_SUCCESS
-#: Merge.rc:4144
+#: Merge.rc:4154
msgid "Project file saved."
msgstr "Arregistramentu di u schedariu di prughjettu."
#. ID_EDIT_UNDO
-#: Merge.rc:4150
+#: Merge.rc:4160
msgid ""
"\n"
"Undo (Ctrl+Z)"
@@ -4914,7 +4925,7 @@ msgstr ""
"Disfà (Ctrl+Z)"
#. ID_EDIT_REDO
-#: Merge.rc:4151
+#: Merge.rc:4161
msgid ""
"\n"
"Redo (Ctrl+Y)"
@@ -4923,7 +4934,7 @@ msgstr ""
"Rifà (Ctrl+Y)"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:4158
+#: Merge.rc:4168
msgid ""
"\n"
"FileCompare\n"
@@ -4942,7 +4953,7 @@ msgstr ""
"Paragone WinMerge di schedariu"
#. IDR_DIRDOCTYPE
-#: Merge.rc:4159
+#: Merge.rc:4169
msgid ""
"\n"
"FolderCompare\n"
@@ -4961,164 +4972,164 @@ msgstr ""
"Paragone WinMerge di cartulare"
#. IDS_SPLASH_GPLTEXT
-#: Merge.rc:4165
+#: Merge.rc:4175
msgid "WinMerge comes with ABSOLUTELY NO WARRANTY. It is free software and can be redistributed under the conditions of the GNU General Public License - see the Help menu for details."
msgstr ""
"WinMerge hè furnitu senza ALCUNA GUARANTIA. Ghjè un prugramma liberu ch’ellu si pò ridistribuisce secondu à e cundizioni di a Licenza Publica Generale GNU ; fighjate i detaglii in u "
"listinu d’aiutu."
#. IDS_MESSAGEBOX_ABORT
-#: Merge.rc:4173
+#: Merge.rc:4183
msgid "&Abort"
msgstr "Inte&rrompe"
#. IDS_MESSAGEBOX_RETRY
-#: Merge.rc:4174
+#: Merge.rc:4184
msgid "&Retry"
msgstr "&Torna"
#. IDS_MESSAGEBOX_IGNORE
-#: Merge.rc:4175
+#: Merge.rc:4185
msgid "&Ignore"
msgstr "&Ignurà"
#. IDS_MESSAGEBOX_IGNOREALL
-#: Merge.rc:4176
+#: Merge.rc:4186
msgid "Ignore &all"
msgstr "&Tuttu ignurà"
#. IDS_MESSAGEBOX_YES
-#: Merge.rc:4177
+#: Merge.rc:4187
msgid "&Yes"
msgstr "&Sì"
#. IDS_MESSAGEBOX_YES_TO_ALL
-#: Merge.rc:4183
+#: Merge.rc:4193
msgid "Yes to &all"
msgstr "Sì per t&utti"
#. IDS_MESSAGEBOX_NO
-#: Merge.rc:4184
+#: Merge.rc:4194
msgid "&No"
msgstr "&Nò"
#. IDS_MESSAGEBOX_NO_TO_ALL
-#: Merge.rc:4185
+#: Merge.rc:4195
msgid "No to a&ll"
msgstr "Nò &per tutti"
#. IDS_MESSAGEBOX_CONTINUE
-#: Merge.rc:4186
+#: Merge.rc:4196
msgid "&Continue"
msgstr "&Cuntinuà"
#. IDS_MESSAGEBOX_SKIP
-#: Merge.rc:4187
+#: Merge.rc:4197
msgid "&Skip"
msgstr "&Tralascià"
#. IDS_MESSAGEBOX_SKIPALL
-#: Merge.rc:4188
+#: Merge.rc:4198
msgid "Skip &all"
msgstr "T&uttu tralascià"
#. IDS_MESSAGEBOX_DONT_DISPLAY_AGAIN
-#: Merge.rc:4190
+#: Merge.rc:4200
msgid "Don't display this &message again."
msgstr "Ùn affissà più stu &messaghju torna."
-#: Merge.rc:4193
+#: Merge.rc:4203
msgid "To make this message box visible, press Reset on the Message Boxes page in Options."
msgstr "Per rende stu messaghju torna videvule, appughjate nant’à « Reinizià » di a pagina « Scatule di messaghju » di l’ozzioni."
#. IDS_OPTIONSPG_EDITOR_COMPAREMERGE
-#: Merge.rc:4203
+#: Merge.rc:4213
msgid "Compare/Merge"
msgstr "Paragunà/Fusione"
#. IDS_OPTIONSPG_SYNTAXCOLORS
-#: Merge.rc:4204 Merge.rc:4208
+#: Merge.rc:4214 Merge.rc:4218
msgid "Syntax"
msgstr "Sintassa"
#. IDS_OPTIONSPG_COLOR_SCHEMES
-#: Merge.rc:4206
+#: Merge.rc:4216
msgid "Color Schemes"
msgstr "Ghjochi di culori"
#. IDS_OPTIONSPG_DIRCOLORS
-#: Merge.rc:4210
+#: Merge.rc:4220
msgid "Folder Compare"
msgstr "Paragone di cartulare"
#. IDS_OPTIONSPG_PROJECT
-#: Merge.rc:4215
+#: Merge.rc:4225
msgid "Project"
msgstr "Prughjettu"
#. IDS_COLHDR_NSDIFFS
-#: Merge.rc:4218 Merge.rc:4640
+#: Merge.rc:4228 Merge.rc:4650
msgid "Differences"
msgstr "Sfarenze"
#. IDS_OPTIONSPG_MESSAGEBOXES
-#: Merge.rc:4220
+#: Merge.rc:4230
msgid "Message Boxes"
msgstr "Scatule di messaghju"
#. IDS_TO
-#: Merge.rc:4235
+#: Merge.rc:4245
msgid "To:"
msgstr "À :"
#. IDS_FROM_LEFT
-#: Merge.rc:4236
+#: Merge.rc:4246
msgid "From left:"
msgstr "Da a manca :"
#. IDS_TO_LEFT
-#: Merge.rc:4237
+#: Merge.rc:4247
msgid "To left:"
msgstr "À a manca :"
#. IDS_FROM_RIGHT
-#: Merge.rc:4238
+#: Merge.rc:4248
msgid "From right:"
msgstr "Da a diritta :"
#. IDS_TO_RIGHT
-#: Merge.rc:4239
+#: Merge.rc:4249
msgid "To right:"
msgstr "À a diritta :"
#. IDS_FROM_MIDDLE
-#: Merge.rc:4240
+#: Merge.rc:4250
msgid "From middle:"
msgstr "Da u centru :"
#. IDS_TO_MIDDLE
-#: Merge.rc:4241
+#: Merge.rc:4251
msgid "To middle:"
msgstr "À u centru :"
#. IDS_VERSION_FMT
-#: Merge.rc:4247
+#: Merge.rc:4257
#, c-format
msgid "Version %1"
msgstr "Versione %1"
#. IDS_OPTIONS_TITLE
-#: Merge.rc:4253
+#: Merge.rc:4263
#, c-format
msgid "Options (%1)"
msgstr "Ozzioni (%1)"
#. IDS_MESSAGE_BOX_ARE_RESET
-#: Merge.rc:4254
+#: Merge.rc:4264
msgid "All message boxes are now displayed again."
msgstr "Tutte e scatule di messaghju sò torna affissate."
-#: Merge.rc:4256
+#: Merge.rc:4266
#, c-format
msgid "Tab size value is out of range. Please use 1 - %1."
msgstr ""
@@ -5127,156 +5138,156 @@ msgstr ""
"Ci vole à impiegà da 1 à %1."
#. IDS_PROJECT_OPEN
-#: Merge.rc:4262 Merge.rc:4318
+#: Merge.rc:4272 Merge.rc:4328
msgid "Open"
msgstr "Apre"
#. IDS_PROGRAMFILES
-#: Merge.rc:4263
+#: Merge.rc:4273
msgid "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||"
msgstr "Prugrammi|*.exe;*.bat;*.cmd|Tutti i schedarii (*.*)|*.*||"
#. IDS_ALLFILES
-#: Merge.rc:4264
+#: Merge.rc:4274
msgid "All Files (*.*)|*.*||"
msgstr "Tutti i schedarii (*.*)|*.*||"
#. IDS_PROJECTFILES
-#: Merge.rc:4265
+#: Merge.rc:4275
msgid "WinMerge Project Files (*.WinMerge)|*.WinMerge||"
msgstr "Schedarii di prughjettu WinMerge (*.WinMerge)|*.WinMerge||"
#. IDS_INIFILES
-#: Merge.rc:4267
+#: Merge.rc:4277
msgid "Options files (*.ini)|*.ini|All Files (*.*)|*.*||"
msgstr "Schedarii d’ozzioni (*.ini)|*.ini|Tutti i schedarii (*.*)|*.*||"
#. IDS_REPLACELIST_FILES
-#: Merge.rc:4268
+#: Merge.rc:4278
msgid "Tab-Separated Values (*.tsv;*.txt)|*.tsv;*.txt|All Files (*.*)|*.*||"
msgstr "Valori staccati da tabulazioni (*.tsv;*.txt)|*.tsv;*.txt|Tutti i schedarii (*.*)|*.*||"
#. IDS_TEXT_REPORT_FILES
-#: Merge.rc:4274
+#: Merge.rc:4284
msgid "Text Files (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|All Files (*.*)|*.*||"
msgstr "Schedarii di testu (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|Tutti i schedarii (*.*)|*.*||"
#. IDS_HTML_REPORT_FILES
-#: Merge.rc:4275
+#: Merge.rc:4285
msgid "HTML Files (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||"
msgstr "Schedarii HTML (*.htm,*.html)|*.htm;*.html|Tutti i schedarii (*.*)|*.*||"
#. IDS_XML_REPORT_FILES
-#: Merge.rc:4276
+#: Merge.rc:4286
msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||"
msgstr "Schedarii XML (*.xml)|*.xml|Tutti i schedarii (*.*)|*.*||"
#. IDS_EXPANDSUBDIRS_DONOTEXPAND
-#: Merge.rc:4294
+#: Merge.rc:4304
msgid "Do not expand"
msgstr "Ùn allargà micca"
#. IDS_EXPANDSUBDIRS_ALL
-#: Merge.rc:4295
+#: Merge.rc:4305
msgid "Expand all subfolders"
msgstr "Allargà tutti i sottucartulari"
#. IDS_EXPANDSUBDIRS_DIFFERENT
-#: Merge.rc:4296
+#: Merge.rc:4306
msgid "Expand different subfolders"
msgstr "Allargà i sottucartulari sfarenti"
#. IDS_EXPANDSUBDIRS_IDENTICAL
-#: Merge.rc:4297
+#: Merge.rc:4307
msgid "Expand identical subfolders"
msgstr "Allargà i sottucartulari uguali"
#. IDS_SYNTAXTABLE_FILETYPE
-#: Merge.rc:4303
+#: Merge.rc:4313
msgid "File Type"
msgstr "Tipu di schedariu"
#. IDS_COLHDR_EXTENSION
-#: Merge.rc:4304 Merge.rc:4597
+#: Merge.rc:4314 Merge.rc:4607
msgid "Extension"
msgstr "Estensione"
#. IDS_PRPCAT_MESSAGE
-#: Merge.rc:4310 Merge.rc:4669
+#: Merge.rc:4320 Merge.rc:4679
msgid "Message"
msgstr "Messaghju"
#. IDS_MESSAGEBOX_ANSWER
-#: Merge.rc:4311
+#: Merge.rc:4321
msgid "Answer"
msgstr "Risposta"
#. IDS_PROJECT_ITEM
-#: Merge.rc:4317
+#: Merge.rc:4327
msgid "Item"
msgstr "Elementu"
#. IDS_PROJECT_LOAD
-#: Merge.rc:4319
+#: Merge.rc:4329
msgid "Load"
msgstr "Caricà"
#. IDS_PROJECT_SAVE
-#: Merge.rc:4320
+#: Merge.rc:4330
msgid "Save"
msgstr "Arregistrà"
#. IDS_PROJECT_ITEM_INCLUDE_SUBFOLDERS
-#: Merge.rc:4322
+#: Merge.rc:4332
msgid "Include Subfolders"
msgstr "Include i sottucartulari"
#. IDS_PROJECT_ITEM_COMPARE_OPTIONS
-#: Merge.rc:4324
+#: Merge.rc:4334
msgid "Compare Options"
msgstr "Ozzioni di paragone"
#. IDS_PROJECT_ITEM_HIDDEN_ITEMS
-#: Merge.rc:4325
+#: Merge.rc:4335
msgid "Hidden Items"
msgstr "Elementi piattati"
#. IDS_PLUGINSLIST_NAME
-#: Merge.rc:4331 Merge.rc:4956
+#: Merge.rc:4341 Merge.rc:4966
msgid "Name"
msgstr "Nome"
#. IDS_FILTERFILE_PATHTITLE
-#: Merge.rc:4332
+#: Merge.rc:4342
msgid "Location"
msgstr "Piazza"
#. IDS_FILTER_TITLE
-#: Merge.rc:4333
+#: Merge.rc:4343
msgid "Filters"
msgstr "Filtri"
#. IDS_FILTER_PREFIX
-#: Merge.rc:4334
+#: Merge.rc:4344
msgid "[F] "
msgstr "[F] "
#. IDS_PLUGINSLIST_DESC
-#: Merge.rc:4335 Merge.rc:4958
+#: Merge.rc:4345 Merge.rc:4968
msgid "Description"
msgstr "Discrizzione"
#. IDS_FILEFILTER_SAVENEW
-#: Merge.rc:4336
+#: Merge.rc:4346
msgid "Select Filename for New Filter"
msgstr "Selezziunà un nome di schedariu per u novu filtru"
#. IDS_FILEFILTER_FILEMASK
-#: Merge.rc:4337
+#: Merge.rc:4347
msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||"
msgstr "Schedarii di filtru (*.flt)|*.flt|Tutti i schedarii (*.*)|*.*||"
-#: Merge.rc:4339
+#: Merge.rc:4349
#, c-format
msgid ""
"Cannot find filter template!\n"
@@ -5289,7 +5300,7 @@ msgstr ""
"Ci vole à cupià %1 in u cartulare « WinMerge/Filters » :\n"
"%2."
-#: Merge.rc:4341
+#: Merge.rc:4351
#, c-format
msgid ""
"Cannot copy filter template:\n"
@@ -5302,7 +5313,7 @@ msgstr ""
"\n"
"Assicuratevi chì u cartulare esisti bè è sia scrivibile."
-#: Merge.rc:4343
+#: Merge.rc:4353
msgid ""
"User's filter folder is not defined!\n"
"\n"
@@ -5312,7 +5323,7 @@ msgstr ""
"\n"
"Selezziunà un cartulare di filtri in Ozzioni > Sistema."
-#: Merge.rc:4345
+#: Merge.rc:4355
#, c-format
msgid ""
"Failed to delete filter:\n"
@@ -5326,11 +5337,11 @@ msgstr ""
"U schedariu puderia esse in lettura sola."
#. IDS_FILEFILTER_INSTALL
-#: Merge.rc:4346
+#: Merge.rc:4356
msgid "Locate Filter File to Install"
msgstr "Lucalizà u schedariu di filtru à installà"
-#: Merge.rc:4348
+#: Merge.rc:4358
msgid ""
"Installing filter file failed.\n"
"\n"
@@ -5341,17 +5352,17 @@ msgstr ""
"Ùn si pò cupià u filtru novu in u cartulare di filtru."
#. IDS_FILEFILTER_OVERWRITE
-#: Merge.rc:4349
+#: Merge.rc:4359
msgid "Filter file exists. Overwrite?"
msgstr "U schedariu di filtru esiste. Vulete rimpiazzallu ?"
#. IDS_FILTERLINE_REGEXP
-#: Merge.rc:4355
+#: Merge.rc:4365
msgid "Regular expression"
msgstr "Espressione regulare"
#. IDS_FILTERCHANGED
-#: Merge.rc:4361
+#: Merge.rc:4371
msgid ""
"Filters updated. Refresh all open folder compares?\n"
"\n"
@@ -5362,217 +5373,217 @@ msgstr ""
"Selezziunate « Innò » per attualizà un’altra volta."
#. IDS_DIRECTORY_WINDOW_TITLE
-#: Merge.rc:4367
+#: Merge.rc:4377
msgid "Folder Comparison Results"
msgstr "Risultati di paragone di cartulare"
#. IDS_FILE_COMPARISON_TITLE
-#: Merge.rc:4368
+#: Merge.rc:4378
msgid "File Comparison"
msgstr "Paragone di schedariu"
#. IDS_EMPTY_LEFT_FILE
-#: Merge.rc:4369
+#: Merge.rc:4379
msgid "Untitled Left"
msgstr "Schedariu à manca senza titulu"
#. IDS_EMPTY_MIDDLE_FILE
-#: Merge.rc:4370
+#: Merge.rc:4380
msgid "Untitled Middle"
msgstr "Schedariu à u centru senza titulu"
#. IDS_EMPTY_RIGHT_FILE
-#: Merge.rc:4371
+#: Merge.rc:4381
msgid "Untitled Right"
msgstr "Schedariu à diritta senza titulu"
#. IDS_CONFLICT_BASE_FILE
-#: Merge.rc:4372
+#: Merge.rc:4382
msgid "Base File"
msgstr "Schedariu di basa"
#. IDS_CONFLICT_THEIRS_FILE
-#: Merge.rc:4373
+#: Merge.rc:4383
msgid "Theirs File"
msgstr "I so schedarii"
#. IDS_CONFLICT_MINE_FILE
-#: Merge.rc:4374
+#: Merge.rc:4384
msgid "Mine File"
msgstr "I mo schedarii"
#. IDS_SELFCOMPARE_ORIGINAL_FILE
-#: Merge.rc:4375
+#: Merge.rc:4385
msgid "Original File"
msgstr "Schedariu d’origine"
#. IDS_LINE_STATUS_INFO_EOL
-#: Merge.rc:4381
+#: Merge.rc:4391
#, c-format
msgid "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s"
msgstr "Lin : %s Col : %d/%d Car : %d/%d FdL : %s"
#. IDS_EMPTY_LINE_STATUS_INFO
-#: Merge.rc:4382
+#: Merge.rc:4392
#, c-format
msgid "Line: %s"
msgstr "Linea : %s"
#. IDS_LINE_STATUS_INFO
-#: Merge.rc:4383
+#: Merge.rc:4393
#, c-format
msgid "Ln: %s Col: %d/%d Ch: %d/%d"
msgstr "Lin : %s Col : %d/%d Car : %d/%d"
#. IDS_LINE_STATUS_INFO_SEL
-#: Merge.rc:4384
+#: Merge.rc:4394
#, c-format
msgid " Sel: %d | %d"
msgstr " Sel : %d | %d"
#. IDS_MERGEMODE_MERGING
-#: Merge.rc:4385
+#: Merge.rc:4395
msgid "Merge"
msgstr "Fusione"
#. IDS_DIFF_NUMBER_STATUS_FMT
-#: Merge.rc:4386
+#: Merge.rc:4396
#, c-format
msgid "Difference %1 of %2"
msgstr "Sfarenza %1 nant’à %2"
#. IDS_NO_DIFF_SEL_FMT
-#: Merge.rc:4387
+#: Merge.rc:4397
#, c-format
msgid "%1 Differences Found"
msgstr "%1 sfarenze trove"
#. IDS_1_DIFF_FOUND
-#: Merge.rc:4388
+#: Merge.rc:4398
msgid "1 Difference Found"
msgstr "1 sfarenza trova"
#. IDS_NO_ERR_SEL_FMT
-#: Merge.rc:4389
+#: Merge.rc:4399
#, c-format
msgid "%1 Errors Found"
msgstr "%1 sbaglii trovi"
#. IDS_1_ERR_FOUND
-#: Merge.rc:4390
+#: Merge.rc:4400
msgid "1 Error Found"
msgstr "1 sbagliu trovu"
#. IDS_STATUSBAR_READONLY, Abbreviation from "Read Only"
-#: Merge.rc:4391
+#: Merge.rc:4401
msgid "RO"
msgstr "LS"
#. IDS_DIRVIEW_STATUS_FMT_FOCUS
-#: Merge.rc:4397
+#: Merge.rc:4407
#, c-format
msgid "Item %1 of %2"
msgstr "Elementu %1 nant’à %2"
#. IDS_DIRVIEW_STATUS_FMT_NOFOCUS
-#: Merge.rc:4398
+#: Merge.rc:4408
#, c-format
msgid "Items: %1"
msgstr "Elementi : %1"
#. IDS_DIRVIEW_STATUS_COMPARING
-#: Merge.rc:4399
+#: Merge.rc:4409
msgid "Comparing items..."
msgstr "Paragone di l’elementi…"
#. IDS_ITEMS_PER_SEC
-#: Merge.rc:4400
+#: Merge.rc:4410
#, c-format
msgid "%.1f[items/sec]"
msgstr "%.1f[elementi/sec]"
#. IDS_ERROR_INCOMPARABLE
-#: Merge.rc:4406
+#: Merge.rc:4416
msgid "Select two existing folders/files to compare."
msgstr "Selezziunà dui cartulari o schedarii esistente à paragunà."
#. IDS_DIRSEL_TAG
-#: Merge.rc:4407
+#: Merge.rc:4417
msgid "Folder Selection"
msgstr "Selezzione di cartulare"
#. IDS_OPEN_FILESDIRS
-#: Merge.rc:4408
+#: Merge.rc:4418
msgid "Select two (or three) folders/files to compare."
msgstr "Selezziunà dui (o trè) cartulari o schedarii à paragunà."
#. IDS_OPEN_LEFTINVALID
-#: Merge.rc:4409
+#: Merge.rc:4419
msgid "Left (1st) path is invalid!"
msgstr "U chjassu à manca (1ᵘ) hè inaccettevule !"
#. IDS_OPEN_MIDDLEINVALID
-#: Merge.rc:4410
+#: Merge.rc:4420
msgid "Middle (2nd) path is invalid!"
msgstr "U chjassu à u centru (2ᵘ) hè inaccettevule !"
#. IDS_OPEN_RIGHTINVALID2
-#: Merge.rc:4411
+#: Merge.rc:4421
msgid "Right (2nd) path is invalid!"
msgstr "U chjassu à diritta (2ᵘ) hè inaccettevule !"
#. IDS_OPEN_RIGHTINVALID3
-#: Merge.rc:4412
+#: Merge.rc:4422
msgid "Right (3rd) path is invalid!"
msgstr "U chjassu à diritta (3ᵘ) hè inaccettevule !"
#. IDS_OPEN_BOTHINVALID
-#: Merge.rc:4413
+#: Merge.rc:4423
msgid "Both paths are invalid!"
msgstr "I dui chjassi sò inaccettevule !"
-#: Merge.rc:4415
+#: Merge.rc:4425
msgid "Left (1st) and Middle (2nd) paths are invalid!"
msgstr "I chjassi à manca (1ᵘ) è à u centru (2ᵘ) sò inaccettevule !"
#. IDS_OPEN_LEFTRIGHTINVALID
-#: Merge.rc:4416
+#: Merge.rc:4426
msgid "Left (1st) and Right (3rd) paths are invalid!"
msgstr "I chjassi à manca (1ᵘ) è à diritta (3ᵘ) sò inaccettevule !"
-#: Merge.rc:4418
+#: Merge.rc:4428
msgid "Middle (2nd) and Right (3rd) paths are invalid!"
msgstr "I chjassi à u centru (2ᵘ) è à diritta (3ᵘ) sò inaccettevule !"
#. IDS_OPEN_ALLINVALID
-#: Merge.rc:4419
+#: Merge.rc:4429
msgid "All paths are invalid!"
msgstr "Tutti i chjassi sò inaccettevule !"
#. IDS_OPEN_UNPACKERDISABLED
-#: Merge.rc:4420
+#: Merge.rc:4430
msgid "Only enabled for file comparisons"
msgstr "Attivatu solu per i paragoni di schedariu"
#. IDS_OPEN_MISMATCH
-#: Merge.rc:4421
+#: Merge.rc:4431
msgid "Cannot compare file and folder!"
msgstr "Ùn si pò micca paragunà schedariu è cartulare !"
#. IDS_ERROR_FILE_NOT_FOUND
-#: Merge.rc:4427
+#: Merge.rc:4437
#, c-format
msgid "File not found: %1"
msgstr "Schedariu micca trovu : %1"
#. IDS_ERROR_FILE_NOT_UNPACKED
-#: Merge.rc:4428
+#: Merge.rc:4438
#, c-format
msgid "File not unpacked: %1"
msgstr "Schedariu micca spacchittatu : %1"
#. IDS_ERROR_FILEOPEN
-#: Merge.rc:4429
+#: Merge.rc:4439
#, c-format
msgid ""
"Cannot open file\n"
@@ -5586,12 +5597,12 @@ msgstr ""
"%2"
#. IDS_ERROR_CONF_RESOLVE
-#: Merge.rc:4430
+#: Merge.rc:4440
msgid "Failed to parse conflict file."
msgstr "Fiascu per analizà u schedariu di u cunflittu."
#. IDS_NOT_CONFLICT_FILE
-#: Merge.rc:4431
+#: Merge.rc:4441
#, c-format
msgid ""
"The file\n"
@@ -5603,7 +5614,7 @@ msgstr ""
"ùn hè micca un schedariu di cunflittu."
#. IDS_COMPARE_LARGE_FILES
-#: Merge.rc:4432
+#: Merge.rc:4442
msgid ""
"Comparing large files requires significant memory.\n"
"Show only comparison results (not file contents)?"
@@ -5612,28 +5623,28 @@ msgstr ""
"Vulete affissà solu i risultati di u paragone (micca i cuntenuti di schedariu) ?"
#. IDS_SAVE_AS_TITLE
-#: Merge.rc:4438
+#: Merge.rc:4448
msgid "Save As"
msgstr "Arregistrà cù u nome"
#. IDS_SAVE_FMT
-#: Merge.rc:4439
+#: Merge.rc:4449
#, c-format
msgid "Save changes to %1?"
msgstr "Arregistrà i cambiamenti in %1 ?"
#. IDS_SAVEREADONLY_FMT
-#: Merge.rc:4440
+#: Merge.rc:4450
#, c-format
msgid "%1 is read-only. Override? Or 'No' to save as new filename?"
msgstr "%1 hè in lettura sola. Vulete rimpiazzallu ? O « Nò » per arregistrallu cù un nome di schedariu novu ?"
#. IDS_ERROR_BACKUP
-#: Merge.rc:4441
+#: Merge.rc:4451
msgid "Error backing up file"
msgstr "Sbagliu di salvaguardia di u schedariu"
-#: Merge.rc:4443
+#: Merge.rc:4453
#, c-format
msgid ""
"Unable to backup original file:\n"
@@ -5647,7 +5658,7 @@ msgstr ""
"Cuntinuà quantunque ?"
#. IDS_FILESAVE_FAILED
-#: Merge.rc:4444
+#: Merge.rc:4454
#, c-format
msgid ""
"Saving file failed.\n"
@@ -5662,7 +5673,7 @@ msgstr ""
"\t- impiegà un altru nome di schedariu (Vai)\n"
"\t- interrompe (Abbandunà)?"
-#: Merge.rc:4446
+#: Merge.rc:4456
#, c-format
msgid ""
"Plugin '%2' cannot pack changes to left file into '%1'.\n"
@@ -5673,7 +5684,7 @@ msgstr ""
"\n"
"Schedariu d’origine micca cambiatu. Arregistrà a versione spacchittata ?"
-#: Merge.rc:4448
+#: Merge.rc:4458
#, c-format
msgid ""
"Plugin '%2' cannot pack changes to middle file into '%1'.\n"
@@ -5684,7 +5695,7 @@ msgstr ""
"\n"
"Schedariu d’origine micca cambiatu. Arregistrà a versione spacchittata ?"
-#: Merge.rc:4450
+#: Merge.rc:4460
#, c-format
msgid ""
"Plugin '%2' cannot pack changes to right file into '%1'.\n"
@@ -5696,7 +5707,7 @@ msgstr ""
"Schedariu d’origine micca cambiatu. Arregistrà a versione spacchittata ?"
#. IDS_FILECHANGED_ONDISK
-#: Merge.rc:4451
+#: Merge.rc:4461
#, c-format
msgid ""
"Another application updated\n"
@@ -5712,7 +5723,7 @@ msgstr ""
"Vulete rimpiazzallu ?"
#. IDS_SAVEREADONLY_MULTI
-#: Merge.rc:4452
+#: Merge.rc:4462
#, c-format
msgid ""
"%1\n"
@@ -5722,7 +5733,7 @@ msgstr ""
"hè in lettura sola. Vulete rimpiazzallu ?"
#. IDS_FILECHANGED_RESCAN
-#: Merge.rc:4453
+#: Merge.rc:4463
#, c-format
msgid ""
"Another application updated\n"
@@ -5738,22 +5749,22 @@ msgstr ""
"Vulete ricaricallu ?"
#. IDS_SAVE_LEFT_AS
-#: Merge.rc:4454
+#: Merge.rc:4464
msgid "Save Left File As"
msgstr "Arregistrà u schedariu à manca cù u nome"
#. IDS_SAVE_MIDDLE_AS
-#: Merge.rc:4455
+#: Merge.rc:4465
msgid "Save Middle File As"
msgstr "Arregistrà u schedariu à u centru cù u nome"
#. IDS_SAVE_RIGHT_AS
-#: Merge.rc:4456
+#: Merge.rc:4466
msgid "Save Right File As"
msgstr "Arregistrà u schedariu à diritta cù u nome"
#. IDS_FILE_DISAPPEARED
-#: Merge.rc:4461
+#: Merge.rc:4471
#, c-format
msgid ""
"File\n"
@@ -5765,7 +5776,7 @@ msgstr ""
"ùn si truva micca. Arregistrà una copia per cuntinuà."
#. IDS_VIEWS_OUTOFSYNC
-#: Merge.rc:4467
+#: Merge.rc:4477
msgid ""
"Cannot merge unsynched documents.\n"
"\n"
@@ -5776,124 +5787,124 @@ msgstr ""
"Attualizà prima di cuntinuà."
#. IDS_BREAK_ON_WHITESPACE
-#: Merge.rc:4472
+#: Merge.rc:4482
msgid "Break at whitespace"
msgstr "Interrompe à i spazii bianchi"
#. IDS_BREAK_ON_PUNCTUATION
-#: Merge.rc:4473
+#: Merge.rc:4483
msgid "Break at whitespace or punctuation"
msgstr "Interrompe à i spazii bianchi o à a puntuazione"
#. IDS_L2M
-#: Merge.rc:4479
+#: Merge.rc:4489
msgid "Copy to &Middle\tAlt+Right"
msgstr "Cupià versu u ¢ru\tAlt+Diritta"
#. IDS_R2M
-#: Merge.rc:4480
+#: Merge.rc:4490
msgid "Copy to &Middle\tAlt+Left"
msgstr "Cupià versu u ¢ru\tAlt+Manca"
#. IDS_COPY_FROM_MIDDLE_R
-#: Merge.rc:4481
+#: Merge.rc:4491
msgid "Copy from Middle\tAlt+Shift+Right"
msgstr "Cupià da u centru\tAlt+Maius+Diritta"
#. IDS_COPY_FROM_MIDDLE_L
-#: Merge.rc:4482
+#: Merge.rc:4492
msgid "Copy from Middle\tAlt+Shift+Left"
msgstr "Cupià da u centru\tAlt+Maius+Manca"
#. IDS_L2MNEXT
-#: Merge.rc:4483
+#: Merge.rc:4493
msgid "Copy to Middle and Advance\tCtrl+Alt+Right"
msgstr "Cupià versu u centru è avanzà\t(Ctrl+Alt+Diritta)"
#. IDS_R2MNEXT
-#: Merge.rc:4484
+#: Merge.rc:4494
msgid "Copy to Middle and Advance\tCtrl+Alt+Left"
msgstr "Cupià versu u centru è avanzà\tCtrl+Alt+Manca"
#. IDS_ALL_MIDDLE
-#: Merge.rc:4485
+#: Merge.rc:4495
msgid "Copy All to Middle"
msgstr "Tuttu cupià versu u centru"
#. IDS_COPY_RIGHT_TO_LEFT
-#: Merge.rc:4491
+#: Merge.rc:4501
#, c-format
msgid "Right to Left (%1)"
msgstr "Da diritta à manca (%1)"
#. IDS_COPY_RIGHT_TO_MIDDLE
-#: Merge.rc:4492
+#: Merge.rc:4502
#, c-format
msgid "Right to Middle (%1)"
msgstr "Da diritta à centru (%1)"
#. IDS_COPY_MIDDLE_TO_LEFT
-#: Merge.rc:4493
+#: Merge.rc:4503
#, c-format
msgid "Middle to Left (%1)"
msgstr "Da centru à manca (%1)"
#. IDS_COPY_MIDDLE_TO_RIGHT
-#: Merge.rc:4494
+#: Merge.rc:4504
#, c-format
msgid "Middle to Right (%1)"
msgstr "Da centru à diritta (%1)"
#. IDS_COPY_LEFT_TO_RIGHT
-#: Merge.rc:4495
+#: Merge.rc:4505
#, c-format
msgid "Left to Right (%1)"
msgstr "Da manca à diritta (%1)"
#. IDS_COPY_LEFT_TO_MIDDLE
-#: Merge.rc:4496
+#: Merge.rc:4506
#, c-format
msgid "Left to Middle (%1)"
msgstr "Da manca à centru (%1)"
#. IDS_MOVE_LEFT_TO
-#: Merge.rc:4507 Merge.rc:4539
+#: Merge.rc:4517 Merge.rc:4549
#, c-format
msgid "Left to... (%1)"
msgstr "Da manca à… (%1)"
#. IDS_MOVE_MIDDLE_TO
-#: Merge.rc:4508 Merge.rc:4540
+#: Merge.rc:4518 Merge.rc:4550
#, c-format
msgid "Middle to... (%1)"
msgstr "Da centru à… (%1)"
#. IDS_MOVE_RIGHT_TO
-#: Merge.rc:4509 Merge.rc:4541
+#: Merge.rc:4519 Merge.rc:4551
#, c-format
msgid "Right to... (%1)"
msgstr "Da diritta à… (%1)"
#. IDS_COPY_BOTH_TO
-#: Merge.rc:4510
+#: Merge.rc:4520
#, c-format
msgid "Both to... (%1)"
msgstr "Tramindui versu… (%1)"
#. IDS_COPY_ALL_TO
-#: Merge.rc:4511
+#: Merge.rc:4521
#, c-format
msgid "All to... (%1)"
msgstr "Tutti versu… (%1)"
#. IDS_COPY_DIFFERENCES_TO
-#: Merge.rc:4512
+#: Merge.rc:4522
#, c-format
msgid "Differences to... (%1)"
msgstr "Sfarenze versu… (%1)"
#. IDS_COPY_ONLYDIFFITEMS
-#: Merge.rc:4519
+#: Merge.rc:4529
msgid ""
"Some selected items are identical or skipped.\n"
"Copy only items with differences?"
@@ -5902,64 +5913,64 @@ msgstr ""
"Vulete cupià solu l’elementi cù sfarenze ?"
#. IDS_DEL_LEFT_FMT
-#: Merge.rc:4525
+#: Merge.rc:4535
#, c-format
msgid "Left (%1)"
msgstr "À manca (%1)"
#. IDS_DEL_MIDDLE_FMT
-#: Merge.rc:4526
+#: Merge.rc:4536
#, c-format
msgid "Middle (%1)"
msgstr "À u centru (%1)"
#. IDS_DEL_RIGHT_FMT
-#: Merge.rc:4527
+#: Merge.rc:4537
#, c-format
msgid "Right (%1)"
msgstr "À diritta (%1)"
#. IDS_DEL_BOTH_FMT
-#: Merge.rc:4528
+#: Merge.rc:4538
#, c-format
msgid "Both (%1)"
msgstr "Tramindui (%1)"
#. IDS_DEL_ALL_FMT
-#: Merge.rc:4529
+#: Merge.rc:4539
#, c-format
msgid "All (%1)"
msgstr "Tutti (%1)"
#. IDS_SELECT_DEST_LEFT
-#: Merge.rc:4545
+#: Merge.rc:4555
msgid "Left Side - Select Destination Folder:"
msgstr "À manu manca - selezziunà u cartulare di destinazione :"
#. IDS_SELECT_DEST_MIDDLE
-#: Merge.rc:4546
+#: Merge.rc:4556
msgid "Middle Side - Select Destination Folder:"
msgstr "À u centru - selezziunà u cartulare di destinazione :"
#. IDS_SELECT_DEST_RIGHT
-#: Merge.rc:4547
+#: Merge.rc:4557
msgid "Right Side - Select Destination Folder:"
msgstr "À manu diritta - selezziunà u cartulare di destinazione :"
#. IDS_FILES_AFFECTED_FMT
-#: Merge.rc:4548
+#: Merge.rc:4558
#, c-format
msgid "(%1 Files Affected)"
msgstr "(%1 schedarii tocchi)"
#. IDS_FILES_AFFECTED_FMT2
-#: Merge.rc:4549
+#: Merge.rc:4559
#, c-format
msgid "(%1 of %2 Files Affected)"
msgstr "(%1 schedarii tocchi nant’à %2)"
#. IDS_CONFIRM_DELETE_SINGLE
-#: Merge.rc:4555
+#: Merge.rc:4565
#, c-format
msgid ""
"Are you sure you want to delete\n"
@@ -5971,18 +5982,18 @@ msgstr ""
"%1 ?"
#. IDS_CONFIRM_SINGLE_COPY
-#: Merge.rc:4556
+#: Merge.rc:4566
msgid "Are you sure you want to copy?"
msgstr "Da veru vulete cupià ?"
#. IDS_CONFIRM_MULTIPLE_COPY
-#: Merge.rc:4557
+#: Merge.rc:4567
#, c-format
msgid "Are you sure you want to copy %d items?"
msgstr "Da veru vulete cupià %d elementi ?"
#. IDS_DIRCMP_NOTSYNC
-#: Merge.rc:4558
+#: Merge.rc:4568
#, c-format
msgid ""
"Operation aborted!\n"
@@ -6002,46 +6013,46 @@ msgstr ""
"Attualizà u paragone."
#. IDS_CONFIRM_SINGLE_MOVE
-#: Merge.rc:4563
+#: Merge.rc:4573
msgid "Are you sure you want to move?"
msgstr "Da veru vulete dispiazzà ?"
#. IDS_CONFIRM_MULTIPLE_MOVE
-#: Merge.rc:4564
+#: Merge.rc:4574
#, c-format
msgid "Are you sure you want to move %d items?"
msgstr "Da veru vulete dispiazzà %d elementi ?"
#. IDS_CONFIRM_MOVE_CAPTION
-#: Merge.rc:4566
+#: Merge.rc:4576
msgid "Confirm Move"
msgstr "Cunfirmà u dispiazzamentu"
-#: Merge.rc:4568
+#: Merge.rc:4578
msgid "Close the folder comparison window?"
msgstr "Chjode a finestra di paragone di i cartulari ?"
-#: Merge.rc:4570
+#: Merge.rc:4580
msgid "Close the folder comparison window, which took a long time?"
msgstr "Chjode a finestra di paragone di i cartulari, chì hà pigliatu un bellu pezzu ?"
#. IDS_ERROR_INVALID_DIR_FILE_NAME
-#: Merge.rc:4571
+#: Merge.rc:4581
msgid "The file or folder name is invalid."
msgstr "U nome di u schedariu o di u cartulare hè inaccettevule."
#. IDS_ERROR_EXECUTE_FILE
-#: Merge.rc:4577
+#: Merge.rc:4587
#, c-format
msgid "Failed to execute external editor: %1"
msgstr "Impussibule di lancià l’editore esternu : %1"
#. IDS_UNKNOWN_ARCHIVE_FORMAT
-#: Merge.rc:4583
+#: Merge.rc:4593
msgid "Unknown archive format"
msgstr "Furmatu scunnisciutu d’archiviu"
-#: Merge.rc:4585
+#: Merge.rc:4595
msgid ""
"Failed to extract archive.\n"
"Compare as text file?"
@@ -6050,518 +6061,518 @@ msgstr ""
"Vulete paragunà cum’è schedarii di testu ?"
#. IDS_COLHDR_FILENAME
-#: Merge.rc:4591
+#: Merge.rc:4601
msgid "Filename"
msgstr "Nome di schedariu"
#. IDS_COLHDR_DIR
-#: Merge.rc:4592
+#: Merge.rc:4602
msgctxt "DirView|ColumnHeader"
msgid "Folder"
msgstr "Cartulare"
#. IDS_COLHDR_RESULT
-#: Merge.rc:4593
+#: Merge.rc:4603
msgid "Comparison Result"
msgstr "Risultatu di u paragone"
#. IDS_COLHDR_LTIMEM
-#: Merge.rc:4594
+#: Merge.rc:4604
msgid "Left Date"
msgstr "Data à manca"
#. IDS_COLHDR_RTIMEM
-#: Merge.rc:4595
+#: Merge.rc:4605
msgid "Right Date"
msgstr "Data à diritta"
#. IDS_COLHDR_MTIMEM
-#: Merge.rc:4596
+#: Merge.rc:4606
msgid "Middle Date"
msgstr "Data à u centru"
#. IDS_COLHDR_LSIZE
-#: Merge.rc:4598
+#: Merge.rc:4608
msgid "Left Size"
msgstr "Dimensione à manca"
#. IDS_COLHDR_RSIZE
-#: Merge.rc:4599
+#: Merge.rc:4609
msgid "Right Size"
msgstr "Dimensione à diritta"
#. IDS_COLHDR_MSIZE
-#: Merge.rc:4604
+#: Merge.rc:4614
msgid "Middle Size"
msgstr "Dimensione à u centru"
#. IDS_COLHDR_RSIZE_SHORT
-#: Merge.rc:4605
+#: Merge.rc:4615
msgid "Right Size (Short)"
msgstr "Dimensione à diritta (corta)"
#. IDS_COLHDR_LSIZE_SHORT
-#: Merge.rc:4606
+#: Merge.rc:4616
msgid "Left Size (Short)"
msgstr "Dimensione à manca (corta)"
#. IDS_COLHDR_MSIZE_SHORT
-#: Merge.rc:4607
+#: Merge.rc:4617
msgid "Middle Size (Short)"
msgstr "Dimensione à u centru (corta)"
#. IDS_COLHDR_LTIMEC
-#: Merge.rc:4613
+#: Merge.rc:4623
msgid "Left Creation Time"
msgstr "Ora di creazione à manca"
#. IDS_COLHDR_RTIMEC
-#: Merge.rc:4614
+#: Merge.rc:4624
msgid "Right Creation Time"
msgstr "Ora di creazione à diritta"
#. IDS_COLHDR_MTIMEC
-#: Merge.rc:4615
+#: Merge.rc:4625
msgid "Middle Creation Time"
msgstr "Ora di creazione à u centru"
#. IDS_COLHDR_NEWER
-#: Merge.rc:4616
+#: Merge.rc:4626
msgid "Newer File"
msgstr "Schedariu più recente"
#. IDS_COLHDR_LVERSION
-#: Merge.rc:4617
+#: Merge.rc:4627
msgid "Left File Version"
msgstr "Versione di schedariu à manca"
#. IDS_COLHDR_RVERSION
-#: Merge.rc:4618
+#: Merge.rc:4628
msgid "Right File Version"
msgstr "Versione di schedariu à diritta"
#. IDS_COLHDR_MVERSION
-#: Merge.rc:4619
+#: Merge.rc:4629
msgid "Middle File Version"
msgstr "Versione di schedariu à u centru"
#. IDS_COLHDR_RESULT_ABBR
-#: Merge.rc:4620
+#: Merge.rc:4630
msgid "Short Result"
msgstr "Risultatu cortu"
#. IDS_COLHDR_LATTRIBUTES
-#: Merge.rc:4621
+#: Merge.rc:4631
msgid "Left Attributes"
msgstr "Attributi à manca"
#. IDS_COLHDR_RATTRIBUTES
-#: Merge.rc:4622
+#: Merge.rc:4632
msgid "Right Attributes"
msgstr "Attributi à diritta"
#. IDS_COLHDR_MATTRIBUTES
-#: Merge.rc:4623
+#: Merge.rc:4633
msgid "Middle Attributes"
msgstr "Attributi à u centru"
#. IDS_COLHDR_LEOL_TYPE
-#: Merge.rc:4628
+#: Merge.rc:4638
msgid "Left EOL"
msgstr "Fine di linea à manca"
#. IDS_COLHDR_MEOL_TYPE
-#: Merge.rc:4629
+#: Merge.rc:4639
msgid "Middle EOL"
msgstr "Fine di linea à u centru"
#. IDS_COLHDR_REOL_TYPE
-#: Merge.rc:4630
+#: Merge.rc:4640
msgid "Right EOL"
msgstr "Fine di linea à diritta"
#. IDS_COLHDR_LENCODING
-#: Merge.rc:4636
+#: Merge.rc:4646
msgid "Left Encoding"
msgstr "Cudificazione à manca"
#. IDS_COLHDR_RENCODING
-#: Merge.rc:4637
+#: Merge.rc:4647
msgid "Right Encoding"
msgstr "Cudificazione à diritta"
#. IDS_COLHDR_MENCODING
-#: Merge.rc:4638
+#: Merge.rc:4648
msgid "Middle Encoding"
msgstr "Cudificazione à u centru"
#. IDS_COLHDR_NIDIFFS
-#: Merge.rc:4639
+#: Merge.rc:4649
msgid "Ignored Diff"
msgstr "Sfarenze ignurate"
#. IDS_COLHDR_BINARY
-#: Merge.rc:4641
+#: Merge.rc:4651
msgctxt "DirView|ColumnHeader"
msgid "Binary"
msgstr "Binariu"
#. IDS_PLUGINS_TYPE_UNPACKER
-#: Merge.rc:4642 Merge.rc:4959
+#: Merge.rc:4652 Merge.rc:4969
msgid "Unpacker"
msgstr "Spacchittadore"
#. IDS_PLUGIN_TYPE4
-#: Merge.rc:4643 Merge.rc:4960 Merge.rc:5267
+#: Merge.rc:4653 Merge.rc:4970 Merge.rc:5277
msgid "Prediffer"
msgstr "Preparagone"
#. IDS_COLHDR_LEFT
-#: Merge.rc:4644
+#: Merge.rc:4654
msgid "Left"
msgstr "Manca"
#. IDS_COLHDR_MIDDLE
-#: Merge.rc:4645
+#: Merge.rc:4655
msgid "Middle"
msgstr "Centru"
#. IDS_COLHDR_RIGHT
-#: Merge.rc:4646
+#: Merge.rc:4656
msgid "Right"
msgstr "Diritta"
#. IDS_COLHDR_DIFF
-#: Merge.rc:4647
+#: Merge.rc:4657
msgid "Diff"
msgstr "Sfarenze"
#. IDS_COLHDR_LEFT_DUPLICATE
-#: Merge.rc:4648
+#: Merge.rc:4658
msgid "Left Duplicate Count"
msgstr "Numeru di doppiatura à manca"
#. IDS_COLHDR_RIGHT_DUPLICATE
-#: Merge.rc:4649
+#: Merge.rc:4659
msgid "Right Duplicate Count"
msgstr "Numeru di doppiatura à diritta"
#. IDS_COLHDR_MIDDLE_DUPLICATE
-#: Merge.rc:4650
+#: Merge.rc:4660
msgid "Middle Duplicate Count"
msgstr "Numeru di doppiatura à u centru"
#. IDS_COLHDR_MOVE
-#: Merge.rc:4651
+#: Merge.rc:4661
msgid "Move"
msgstr "Dispiazzà"
#. IDS_PRPCAT_AUDIO
-#: Merge.rc:4658
+#: Merge.rc:4668
msgid "Audio"
msgstr "Audio"
#. IDS_PRPCAT_CALENDAR
-#: Merge.rc:4659
+#: Merge.rc:4669
msgid "Calendar"
msgstr "Calendariu"
#. IDS_PRPCAT_COMMUNICATION
-#: Merge.rc:4660
+#: Merge.rc:4670
msgid "Communication"
msgstr "Cumunicazione"
#. IDS_PRPCAT_CONTACT
-#: Merge.rc:4661
+#: Merge.rc:4671
msgid "Contact"
msgstr "Cuntattu"
#. IDS_PRPCAT_DEVICES
-#: Merge.rc:4662
+#: Merge.rc:4672
msgid "Devices"
msgstr "Apparechji"
#. IDS_PRPCAT_DOCUMENT
-#: Merge.rc:4663
+#: Merge.rc:4673
msgid "Document"
msgstr "Ducumentu"
#. IDS_PRPCAT_HOME
-#: Merge.rc:4664
+#: Merge.rc:4674
msgid "Home"
msgstr "Accolta"
#. IDS_PRPCAT_JOURNAL
-#: Merge.rc:4666
+#: Merge.rc:4676
msgid "Journal"
msgstr "Ghjurnale"
#. IDS_PRPCAT_LINK
-#: Merge.rc:4667
+#: Merge.rc:4677
msgid "Link"
msgstr "Liame"
#. IDS_PRPCAT_MEDIA
-#: Merge.rc:4668
+#: Merge.rc:4678
msgid "Media"
msgstr "Multimedià"
#. IDS_PRPCAT_MUSIC
-#: Merge.rc:4670
+#: Merge.rc:4680
msgid "Music"
msgstr "Musica"
#. IDS_PRPCAT_NOTE
-#: Merge.rc:4671
+#: Merge.rc:4681
msgid "Note"
msgstr "Nota"
#. IDS_PRPCAT_PHOTO
-#: Merge.rc:4672
+#: Merge.rc:4682
msgid "Photo"
msgstr "Fotò"
#. IDS_PRPCAT_RECORDEDTV
-#: Merge.rc:4673
+#: Merge.rc:4683
msgid "RecordedTV"
msgstr "TV arregistrata"
#. IDS_PRPCAT_SEARCH
-#: Merge.rc:4674
+#: Merge.rc:4684
msgid "Search"
msgstr "Ricercà"
#. IDS_PRPCAT_SECURITY
-#: Merge.rc:4675
+#: Merge.rc:4685
msgid "Security"
msgstr "Sicurità"
#. IDS_PRPCAT_SOFTWARE
-#: Merge.rc:4676
+#: Merge.rc:4686
msgid "Software"
msgstr "Prugramma"
#. IDS_PRPCAT_TASK
-#: Merge.rc:4677
+#: Merge.rc:4687
msgid "Task"
msgstr "Tacca"
#. IDS_PRPCAT_VIDEO
-#: Merge.rc:4678
+#: Merge.rc:4688
msgid "Video"
msgstr "Video"
#. IDS_PRPCAT_HASH
-#: Merge.rc:4679
+#: Merge.rc:4689
msgid "Hash"
msgstr "Tazzeghju"
#. IDS_CANT_COMPARE_FILES
-#: Merge.rc:4685
+#: Merge.rc:4695
msgid "Unable to compare files"
msgstr "Impussibule di paragunà i schedarii"
#. IDS_ABORTED_ITEM
-#: Merge.rc:4686
+#: Merge.rc:4696
msgid "Item aborted"
msgstr "Elementu interrottu"
#. IDS_FILE_SKIPPED
-#: Merge.rc:4687
+#: Merge.rc:4697
msgid "File skipped"
msgstr "Schedariu tralasciatu"
#. IDS_DIR_SKIPPED
-#: Merge.rc:4688
+#: Merge.rc:4698
msgid "Folder skipped"
msgstr "Cartulare tralasciatu"
#. IDS_LEFT_ONLY_IN_FMT
-#: Merge.rc:4689
+#: Merge.rc:4699
#, c-format
msgid "Left only: %1"
msgstr "Solu à manca : %1"
#. IDS_MIDDLE_ONLY_IN_FMT
-#: Merge.rc:4690
+#: Merge.rc:4700
#, c-format
msgid "Middle only: %1"
msgstr "Solu à u centru : %1"
#. IDS_RIGHT_ONLY_IN_FMT
-#: Merge.rc:4691
+#: Merge.rc:4701
#, c-format
msgid "Right only: %1"
msgstr "Solu à diritta : %1"
#. IDS_DOES_NOT_EXIST_IN_FMT
-#: Merge.rc:4692
+#: Merge.rc:4702
#, c-format
msgid "Does not exist in %1"
msgstr "Ùn esiste micca in %1"
#. IDS_BIN_FILES_SAME
-#: Merge.rc:4693
+#: Merge.rc:4703
msgid "Binary files are identical"
msgstr "I schedarii binarii sò identichi"
#. IDS_BIN_FILES_DIFF
-#: Merge.rc:4699
+#: Merge.rc:4709
msgid "Binary files are different"
msgstr "I schedarii binarii sò sfarenti"
#. IDS_FILES_ARE_DIFFERENT
-#: Merge.rc:4700
+#: Merge.rc:4710
msgid "Files are different"
msgstr "I schedarii sò sfarenti"
#. IDS_FOLDERS_ARE_DIFFERENT
-#: Merge.rc:4701
+#: Merge.rc:4711
msgid "Folders are different"
msgstr "I cartulari sò sfarenti"
#. IDS_LEFTONLY
-#: Merge.rc:4702
+#: Merge.rc:4712
msgid "Left Only"
msgstr "Solu à manca"
#. IDS_RIGHTONLY
-#: Merge.rc:4703
+#: Merge.rc:4713
msgid "Right Only"
msgstr "Solu à diritta"
#. IDS_MIDDLEONLY
-#: Merge.rc:4704
+#: Merge.rc:4714
msgid "Middle Only"
msgstr "Solu à u centru"
#. IDS_NOITEMLEFT
-#: Merge.rc:4705
+#: Merge.rc:4715
msgid "No item in left"
msgstr "Nisunu elementu à manca"
#. IDS_NOITEMRIGHT
-#: Merge.rc:4706
+#: Merge.rc:4716
msgid "No item in right"
msgstr "Nisunu elementu à diritta"
#. IDS_NOITEMMIDDLE
-#: Merge.rc:4707
+#: Merge.rc:4717
msgid "No item in middle"
msgstr "Nisunu elementu à u centru"
#. IDS_CMPRES_ERROR
-#: Merge.rc:4709
+#: Merge.rc:4719
msgid "Error"
msgstr "Sbagliu"
#. IDS_TEXT_FILES_SAME
-#: Merge.rc:4710
+#: Merge.rc:4720
msgid "Text files are identical"
msgstr "I schedarii di testu sò identichi"
#. IDS_LEFTONLY_DIFF
-#: Merge.rc:4711
+#: Merge.rc:4721
msgid " (Middle and right are identical)"
msgstr " (centru è diritta sò identichi)"
#. IDS_MIDDLEONLY_DIFF
-#: Merge.rc:4712
+#: Merge.rc:4722
msgid " (Left and right are identical)"
msgstr " (manca è diritta sò identichi)"
#. IDS_RIGHTONLY_DIFF
-#: Merge.rc:4713
+#: Merge.rc:4723
msgid " (Left and middle are identical)"
msgstr " (manca è centru sò identichi)"
#. IDS_PATH_MISMATCH
-#: Merge.rc:4714
+#: Merge.rc:4724
msgid " (paths differ)"
msgstr " (sfarenza di i chjassi)"
#. IDS_TEXT_FILES_DIFF
-#: Merge.rc:4715
+#: Merge.rc:4725
msgid "Text files are different"
msgstr "I schedarii di testu sò sfarenti"
#. IDS_IMAGE_FILES_SAME
-#: Merge.rc:4716
+#: Merge.rc:4726
msgid "Image files are identical"
msgstr "I schedarii di fiura sò identichi"
#. IDS_IMAGE_FILES_DIFF
-#: Merge.rc:4717
+#: Merge.rc:4727
msgid "Image files are different"
msgstr "I schedarii di fiura sò sfarenti"
#. IDS_EXPR_DIFF
-#: Merge.rc:4718
+#: Merge.rc:4728
#, c-format
msgid "Files are different (expr: %1)"
msgstr "I schedarii sò sfarenti (espr : %1)"
#. IDS_HASH_GROUP
-#: Merge.rc:4719
+#: Merge.rc:4729
#, c-format
msgid "Group%d"
msgstr "Gruppu %d"
#. IDS_RENAME_MOVE_DETECTION_DISALBED
-#: Merge.rc:4720
+#: Merge.rc:4730
msgctxt "Options dialog|Compare|Folder|Detect renames and moves"
msgid "Disabled"
msgstr "Disattivata"
#. IDS_RENAME_MOVE_DETECTION_RENAME
-#: Merge.rc:4721
+#: Merge.rc:4731
msgid "Detect renames"
msgstr "Scopre e rinuminazioni"
#. IDS_RENAME_MOVE_DETECTION_RENAME_MOVE
-#: Merge.rc:4722
+#: Merge.rc:4732
msgid "Detect renames and moves"
msgstr "Scopre e rinuminazioni è i dispiazzamenti"
#. IDS_RENAME_MOVE_MERGE_MODE_RENAME
-#: Merge.rc:4723
+#: Merge.rc:4733
msgid "Merge renames"
msgstr "Fusione di e rinuminazioni"
#. IDS_RENAME_MOVE_MERGE_MODE_RENAME_MOVE
-#: Merge.rc:4724
+#: Merge.rc:4734
msgid "Merge renames and moves"
msgstr "Fusione di e rinuminazioni è i dispiazzamenti"
#. IDS_RENAMED
-#: Merge.rc:4725
+#: Merge.rc:4735
msgid "Renamed"
msgstr "Rinuminatu"
#. IDS_MOVED
-#: Merge.rc:4726
+#: Merge.rc:4736
msgid "Moved"
msgstr "Dispiazzatu"
#. IDS_RENAMED_MOVED
-#: Merge.rc:4727
+#: Merge.rc:4737
msgid "Renamed/Moved"
msgstr "Rinuminatu è dispiazzatu"
#. IDS_RENAMED_MOVED_ITEMS
-#: Merge.rc:4728
+#: Merge.rc:4738
#, c-format
msgid "(%1 items)"
msgstr "(%1 elementi)"
#. IDS_RENAMED_MOVED_RESULT
-#: Merge.rc:4729
+#: Merge.rc:4739
#, c-format
msgid "%1 (set %2): "
msgstr "%1 (inseme %2) : "
#. IDS_SWITCH_FLAT_MODE
-#: Merge.rc:4730
+#: Merge.rc:4740
msgid ""
"Some moved items have been merged.\n"
"In Tree Mode, these items may appear in positions that do not reflect the actual folder structure, which can be confusing.\n"
@@ -6572,235 +6583,235 @@ msgstr ""
"Passà à u modu pianu ?"
#. IDS_ELAPSED_TIME
-#: Merge.rc:4736
+#: Merge.rc:4746
#, c-format
msgid "Elapsed time: %ld ms"
msgstr "Tempu scorsu : %ld ms"
#. IDS_STATUS_SELITEM1
-#: Merge.rc:4737
+#: Merge.rc:4747
msgid "1 item selected"
msgstr "1 elementu selezziunatu"
#. IDS_STATUS_SELITEMS
-#: Merge.rc:4738
+#: Merge.rc:4748
#, c-format
msgid "%1 items selected"
msgstr "%1 elementi selezziunati"
#. IDS_COLDESC_FILENAME
-#: Merge.rc:4744
+#: Merge.rc:4754
msgid "Filename or folder name."
msgstr "Nome di schedariu o di cartulare."
#. IDS_COLDESC_DIR
-#: Merge.rc:4745
+#: Merge.rc:4755
msgid "Subfolder name when subfolders are included."
msgstr "Nome di sottucartulare quandu i sottucartulari sò inclusi."
#. IDS_COLDESC_RESULT
-#: Merge.rc:4746
+#: Merge.rc:4756
msgid "Comparison result, long form."
msgstr "Risultatu di u paragone, forma longa."
#. IDS_COLDESC_LTIMEM
-#: Merge.rc:4751
+#: Merge.rc:4761
msgid "Left side modification date."
msgstr "Data di l’ultima mudificazione à manu manca."
#. IDS_COLDESC_RTIMEM
-#: Merge.rc:4752
+#: Merge.rc:4762
msgid "Right side modification date."
msgstr "Data di l’ultima mudificazione à manu diritta."
#. IDS_COLDESC_MTIMEM
-#: Merge.rc:4753
+#: Merge.rc:4763
msgid "Middle side modification date."
msgstr "Data di l’ultima mudificazione à u centru."
#. IDS_COLDESC_EXTENSION
-#: Merge.rc:4754
+#: Merge.rc:4764
msgid "File's extension."
msgstr "Estensione di u schedariu."
#. IDS_COLDESC_LSIZE
-#: Merge.rc:4755
+#: Merge.rc:4765
msgid "Left file size in bytes."
msgstr "Dimensione in ottetti di u schedariu à manu manca."
#. IDS_COLDESC_RSIZE
-#: Merge.rc:4756
+#: Merge.rc:4766
msgid "Right file size in bytes."
msgstr "Dimensione in ottetti di u schedariu à manu diritta."
#. IDS_COLDESC_MSIZE
-#: Merge.rc:4757
+#: Merge.rc:4767
msgid "Middle file size in bytes."
msgstr "Dimensione in ottetti di u schedariu à u centru."
#. IDS_COLDESC_LSIZE_SHORT
-#: Merge.rc:4758
+#: Merge.rc:4768
msgid "Left file size abbreviated."
msgstr "Dimensione corta di u schedariu à manu manca."
#. IDS_COLDESC_RSIZE_SHORT
-#: Merge.rc:4759
+#: Merge.rc:4769
msgid "Right file size abbreviated."
msgstr "Dimensione corta di u schedariu à manu diritta."
#. IDS_COLDESC_MSIZE_SHORT
-#: Merge.rc:4760
+#: Merge.rc:4770
msgid "Middle file size abbreviated."
msgstr "Dimensione corta di u schedariu à u centru."
#. IDS_COLDESC_LTIMEC
-#: Merge.rc:4766
+#: Merge.rc:4776
msgid "Left side creation time."
msgstr "Ora di creazione à manu manca."
#. IDS_COLDESC_RTIMEC
-#: Merge.rc:4767
+#: Merge.rc:4777
msgid "Right side creation time."
msgstr "Ora di creazione à manu diritta."
#. IDS_COLDESC_MTIMEC
-#: Merge.rc:4768
+#: Merge.rc:4778
msgid "Middle side creation time."
msgstr "Ora di creazione à u centru."
#. IDS_COLDESC_NEWER
-#: Merge.rc:4769
+#: Merge.rc:4779
msgid "Tells which side has newer modification date."
msgstr "Indicheghja u latu chì hà a data di mudificazione à più recente."
#. IDS_COLDESC_LVERSION
-#: Merge.rc:4770
+#: Merge.rc:4780
msgid "Left side file version, only for some file types."
msgstr "Versione di schedariu à manu manca, solu per certi tipi di schedariu."
#. IDS_COLDESC_RVERSION
-#: Merge.rc:4771
+#: Merge.rc:4781
msgid "Right side file version, only for some file types."
msgstr "Versione di schedariu à manu diritta, solu per certi tipi di schedariu."
#. IDS_COLDESC_MVERSION
-#: Merge.rc:4776
+#: Merge.rc:4786
msgid "Middle side file version, only for some file types."
msgstr "Versione di schedariu à u centru, solu per certi tipi di schedariu."
#. IDS_COLDESC_RESULT_ABBR
-#: Merge.rc:4777
+#: Merge.rc:4787
msgid "Short comparison result."
msgstr "Risultatu di u paragone, forma corta."
#. IDS_COLDESC_LATTRIBUTES
-#: Merge.rc:4778
+#: Merge.rc:4788
msgid "Left side attributes."
msgstr "Attributi à manu manca."
#. IDS_COLDESC_RATTRIBUTES
-#: Merge.rc:4779
+#: Merge.rc:4789
msgid "Right side attributes."
msgstr "Attributi à manu diritta."
#. IDS_COLDESC_MATTRIBUTES
-#: Merge.rc:4780
+#: Merge.rc:4790
msgid "Middle side attributes."
msgstr "Attributi à u centru."
#. IDS_COLDESC_LEOL_TYPE
-#: Merge.rc:4781
+#: Merge.rc:4791
msgid "Left side file EOL type."
msgstr "Tipu di fine di linea à manu manca."
#. IDS_COLDESC_REOL_TYPE
-#: Merge.rc:4782
+#: Merge.rc:4792
msgid "Right side file EOL type."
msgstr "Tipu di fine di linea à manu diritta."
#. IDS_COLDESC_MEOL_TYPE
-#: Merge.rc:4783
+#: Merge.rc:4793
msgid "Middle side file EOL type."
msgstr "Tipu di fine di linea à u centru."
#. IDS_COLDESC_LENCODING
-#: Merge.rc:4789
+#: Merge.rc:4799
msgid "Left side encoding."
msgstr "Cudificazione à manu manca."
#. IDS_COLDESC_RENCODING
-#: Merge.rc:4790
+#: Merge.rc:4800
msgid "Right side encoding."
msgstr "Cudificazione à manu diritta."
#. IDS_COLDESC_MENCODING
-#: Merge.rc:4791
+#: Merge.rc:4801
msgid "Middle side encoding."
msgstr "Cudificazione à u centru."
#. IDS_COLDESC_NIDIFFS
-#: Merge.rc:4792
+#: Merge.rc:4802
msgid "Number of ignored differences in file. Ignored and cannot be merged."
msgstr "Numeru di sfarenze ignurate in u schedariu. Ignurate è ùn ponu micca fà parte d’una fusione."
#. IDS_COLDESC_NSDIFFS
-#: Merge.rc:4793
+#: Merge.rc:4803
msgid "Number of differences in file (excluding ignored)."
msgstr "Numeru di sfarenze in u schedariu (escluendu quelle ignurate)."
#. IDS_COLDESC_BINARY
-#: Merge.rc:4794
+#: Merge.rc:4804
msgid "Shows an asterisk (*) if the file is binary."
msgstr "Affisseghja un asteriscu (*) s’è u schedariu hè binariu."
#. IDS_COLDESC_UNPACKER
-#: Merge.rc:4795
+#: Merge.rc:4805
msgid "Unpacker plugin name or pipeline."
msgstr "Nome o cundottu di u modulu d’estensione di u spacchittadore."
#. IDS_COLDESC_PREDIFFER
-#: Merge.rc:4796
+#: Merge.rc:4806
msgid "Prediffer plugin name or pipeline."
msgstr "Nome o cundottu di u modulu d’estensione di u preparagone."
#. IDS_DIRECTORY_REPORT_TITLE
-#: Merge.rc:4802
+#: Merge.rc:4812
#, c-format
msgid "Compare %1 with %2"
msgstr "Paragunà %1 cù %2"
#. IDS_DIRECTORY_REPORT_TITLE3
-#: Merge.rc:4803
+#: Merge.rc:4813
#, c-format
msgid "Compare %1 with %2 and %3"
msgstr "Paragunà %1 cù %2 è %3"
#. IDS_REPORT_COMMALIST
-#: Merge.rc:4804
+#: Merge.rc:4814
msgid "Comma-separated list"
msgstr "Lista staccata da virgule"
#. IDS_REPORT_TABLIST
-#: Merge.rc:4805
+#: Merge.rc:4815
msgid "Tab-separated list"
msgstr "Lista staccata da tabulazioni"
#. IDS_REPORT_SIMPLEHTML
-#: Merge.rc:4806
+#: Merge.rc:4816
msgid "Simple HTML"
msgstr "HTML simplice"
#. IDS_REPORT_SIMPLEXML
-#: Merge.rc:4807
+#: Merge.rc:4817
msgid "Simple XML"
msgstr "XML simplice"
-#: Merge.rc:4809
+#: Merge.rc:4819
msgid "Report file already exists. Overwrite?"
msgstr "U schedariu di raportu esiste dighjà. Vulete rimpiazzà u schedariu esistente ?"
#. IDS_REPORT_ERROR
-#: Merge.rc:4814
+#: Merge.rc:4824
#, c-format
msgid ""
"Error creating the report:\n"
@@ -6810,27 +6821,27 @@ msgstr ""
"%1"
#. IDS_REPORT_SUCCESS
-#: Merge.rc:4815
+#: Merge.rc:4825
msgid "Report created successfully."
msgstr "U raportu hè statu creatu currettamente."
#. IDS_SYNCPOINT_LASTBLOCK
-#: Merge.rc:4821
+#: Merge.rc:4831
msgid "Cannot add a synchronization point at this line."
msgstr "Ùn si pò micca aghjughje un puntu di sincrunizazione à sta linea."
#. IDS_FILE_TO_ITSELF
-#: Merge.rc:4827
+#: Merge.rc:4837
msgid "Same file is opened in both panes."
msgstr "U listessu schedariu hè apertu in i dui pannelli."
#. IDS_FILESSAME
-#: Merge.rc:4828
+#: Merge.rc:4838
msgid "Selected files are identical."
msgstr "I schedarii selezziunati sò identichi."
#. IDS_FILESSAME_CURCFG
-#: Merge.rc:4829
+#: Merge.rc:4839
msgid ""
"Selected files are identical (with current settings).\r\n"
"Checking binary identity..."
@@ -6839,7 +6850,7 @@ msgstr ""
"Verificazione di l’identità binaria…"
#. IDS_FILESSAME_BINERROR
-#: Merge.rc:4830
+#: Merge.rc:4840
msgid ""
"Selected files are identical (with current settings).\r\n"
"But binary comparison failed."
@@ -6848,12 +6859,12 @@ msgstr ""
"Ma u paragone binariu hè fiascatu."
#. IDS_FILESSAME_BINSAME
-#: Merge.rc:4831
+#: Merge.rc:4841
msgid "Selected files are identical (binary match)."
msgstr "I schedarii selezziunati sò identichi (currispundenza binaria)."
#. IDS_FILESSAME_BINDIFF
-#: Merge.rc:4832
+#: Merge.rc:4842
msgid ""
"Selected files are identical (with current settings).\r\n"
"But differ at the binary level."
@@ -6862,17 +6873,17 @@ msgstr ""
"Ma sò sfarenti à u livellu binariu."
#. IDS_FILEERROR
-#: Merge.rc:4833
+#: Merge.rc:4843
msgid "An error occurred while comparing files."
msgstr "Un sbagliu hè accadutu durante u paragone di i schedarii."
#. IDS_TEMP_FILEERROR
-#: Merge.rc:4834
+#: Merge.rc:4844
msgid "Could not create temporary files. Check your temporary path settings."
msgstr "Ùn si pò micca creà schedarii timpurarii. Verificate i vostri parametri di chjassu timpurariu."
#. IDS_SUGGEST_IGNOREEOL
-#: Merge.rc:4835
+#: Merge.rc:4845
msgid ""
"Files use different EOL.\n"
"\n"
@@ -6887,17 +6898,17 @@ msgstr ""
"Attivà « Ignurà e sfarenze di fine di linea (Windows/Unix/Mac) » in a sezzione Paragunà di l’ozzioni."
#. IDS_INVALID_DIRECTORY
-#: Merge.rc:4836
+#: Merge.rc:4846
msgid "Selected folder is invalid."
msgstr "U cartulare selezziunatu hè inaccettevule."
#. IDS_CANNOT_OPEN_BINARYFILE
-#: Merge.rc:4837
+#: Merge.rc:4847
msgid "Cannot open a binary file in Editor."
msgstr "Ùn si pò micca apre un schedariu binariu in l’editore."
#. IDS_CREATE_PAIR_FOLDER
-#: Merge.rc:4838
+#: Merge.rc:4848
#, c-format
msgid ""
"Create matching folder:\n"
@@ -6909,41 +6920,41 @@ msgstr ""
"di l’altru latu è aprelu ?"
#. IDS_CONFIRM_COPY_ALL_DIFFS
-#: Merge.rc:4839
+#: Merge.rc:4849
msgid "Copy all differences to other file?"
msgstr "Vulete cupià tutte e sfarenze in l’altru schedariu ?"
#. IDS_MOVE_TO_NEXTFILE
-#: Merge.rc:4844
+#: Merge.rc:4854
msgid "Move to next file?"
msgstr "Vulete passà à u schedariu seguente ?"
#. IDS_MOVE_TO_PREVFILE
-#: Merge.rc:4845
+#: Merge.rc:4855
msgid "Move to previous file?"
msgstr "Vulete passà à u schedariu precedente ?"
#. IDS_MOVE_TO_NEXTPAGE
-#: Merge.rc:4846
+#: Merge.rc:4856
msgid "Move to next page?"
msgstr "Vulete passà à a pagina seguente ?"
#. IDS_MOVE_TO_PREVPAGE
-#: Merge.rc:4847
+#: Merge.rc:4857
msgid "Move to previous page?"
msgstr "Vulete passà à a pagina precedente ?"
#. IDS_MOVE_TO_FIRSTFILE
-#: Merge.rc:4848
+#: Merge.rc:4858
msgid "Move to first file?"
msgstr "Vulete passà à u primu schedariu ?"
#. IDS_MOVE_TO_LASTFILE
-#: Merge.rc:4849
+#: Merge.rc:4859
msgid "Move to last file?"
msgstr "Vulete passà à l’ultimu schedariu ?"
-#: Merge.rc:4856
+#: Merge.rc:4866
#, c-format
msgid ""
"Different codepages: left (cp%d), right (cp%d).\n"
@@ -6954,51 +6965,51 @@ msgstr ""
"Affissera d’ogni pagina di codice (più bella) o cù quella predefinita da Windows (fusione più sicura) ?\n"
"(Ricumandatu : pagina di codice predefinita da Windows)"
-#: Merge.rc:4858
+#: Merge.rc:4868
msgid "Information lost due to encoding errors: both files"
msgstr "Infurmazione persa per via di sbaglii di cudificazione : i dui schedarii"
-#: Merge.rc:4860
+#: Merge.rc:4870
msgid "Information lost due to encoding errors: first file"
msgstr "Infurmazione persa per via di sbaglii di cudificazione : primu schedariu"
-#: Merge.rc:4862
+#: Merge.rc:4872
msgid "Information lost due to encoding errors: second file"
msgstr "Infurmazione persa per via di sbaglii di cudificazione : secondu schedariu"
-#: Merge.rc:4864
+#: Merge.rc:4874
msgid "Information lost due to encoding errors: third file"
msgstr "Infurmazione persa per via di sbaglii di cudificazione : terzu schedariu"
#. IDS_LINEDIFF_NODIFF
-#: Merge.rc:4870
+#: Merge.rc:4880
msgid "No difference"
msgstr "Nisuna sfarenza"
#. IDS_LINEDIFF_NODIFF_CAPTION
-#: Merge.rc:4871
+#: Merge.rc:4881
msgid "Line difference"
msgstr "Sfarenza di linea"
#. IDS_NUM_REPLACED
-#: Merge.rc:4877
+#: Merge.rc:4887
#, c-format
msgid "Replaced %1 string(s)."
msgstr "%1 catena(e) rimpiazzata(e)."
#. IDS_EDIT_TEXT_NOT_FOUND
-#: Merge.rc:4878
+#: Merge.rc:4888
#, c-format
msgid "Cannot find string \"%s\"."
msgstr "Ùn si pò micca truvà a catena « %s »."
#. IDS_MERGE_MODE
-#: Merge.rc:4884
+#: Merge.rc:4894
msgid "Entering Merge Mode. Press F9 to turn off."
msgstr "Entrata in u modu di fusione. Appughjate nant’à F9 per disattivallu."
#. IDS_AUTO_MERGE
-#: Merge.rc:4890
+#: Merge.rc:4900
#, c-format
msgid ""
"Automatic merges: %1\n"
@@ -7008,99 +7019,99 @@ msgstr ""
"Cunflitti micca disciuplicati : %2"
#. IDS_CODEPAGE_MERGED
-#: Merge.rc:4891
+#: Merge.rc:4901
msgid "Codepage change merged."
msgstr "Cambiamentu di pagina di codice pigliatu in contu in a fusione."
#. IDS_CODEPAGE_CONFLICT
-#: Merge.rc:4892
+#: Merge.rc:4902
msgid "Codepage changes are conflicting."
msgstr "I cambiamenti di pagina di codice sò in cunflittu."
#. IDS_EOL_MERGED
-#: Merge.rc:4893
+#: Merge.rc:4903
msgid "EOL change merged."
msgstr "Cambiamentu di fine di linea pigliatu in contu in a fusione."
#. IDS_EOL_CONFLICT
-#: Merge.rc:4894
+#: Merge.rc:4904
msgid "EOL changes are conflicting."
msgstr "I cambiamenti di fine di linea sò in cunflittu."
#. IDS_LOCBAR_CAPTION
-#: Merge.rc:4900
+#: Merge.rc:4910
msgid "Location Pane"
msgstr "Pannellu di pusizione"
#. IDS_DIFFBAR_CAPTION
-#: Merge.rc:4901
+#: Merge.rc:4911
msgid "Diff Pane"
msgstr "Pannellu di e sfarenze"
#. IDS_DIFF_SUCCEEDED
-#: Merge.rc:4908
+#: Merge.rc:4918
msgid "Patch file written."
msgstr "U schedariu di currezzioni hè statu scrittu."
#. IDS_DIFF_ITEM1NOTFOUND
-#: Merge.rc:4909
+#: Merge.rc:4919
msgid "First item not found!"
msgstr "U primu elementu ùn si trova micca !"
#. IDS_DIFF_ITEM2NOTFOUND
-#: Merge.rc:4910
+#: Merge.rc:4920
msgid "Second item not found!"
msgstr "U secondu elementu ùn si trova micca !"
#. IDS_DIFF_FILEOVERWRITE
-#: Merge.rc:4911
+#: Merge.rc:4921
msgid "Patch file already exists. Overwrite?"
msgstr "U schedariu di currezzioni esiste dighjà. Vulete rimpiazzallu ?"
#. IDS_DIFF_SELECTEDFILES
-#: Merge.rc:4912
+#: Merge.rc:4922
#, c-format
msgid "[%1 files selected]"
msgstr "[%1 schedarii selezziunati]"
#. IDS_DIFF_NORMAL
-#: Merge.rc:4913
+#: Merge.rc:4923
msgid "Normal"
msgstr "Nurmale"
#. IDS_DIFF_CONTEXT
-#: Merge.rc:4914
+#: Merge.rc:4924
msgid "Context"
msgstr "Cuntestu"
#. IDS_DIFF_UNIFIED
-#: Merge.rc:4915
+#: Merge.rc:4925
msgid "Unified"
msgstr "Unificatu"
#. IDS_FILEWRITE_ERROR
-#: Merge.rc:4917
+#: Merge.rc:4927
#, c-format
msgid "Could not write to file %1."
msgstr "Ùn si pò micca scrive in u schedariu %1."
#. IDS_PATH_NOT_ABSOLUTE
-#: Merge.rc:4918
+#: Merge.rc:4928
#, c-format
msgid "Output path is not absolute: %1"
msgstr "U chjassu d’esciuta ùn hè micca assulutu : %1"
#. IDS_MUST_SPECIFY_OUTPUT
-#: Merge.rc:4919
+#: Merge.rc:4929
msgid "Specify an output file."
msgstr "Indicate un schedariu d’esciuta."
-#: Merge.rc:4921
+#: Merge.rc:4931
msgid "Cannot create patch from binary files."
msgstr "Ùn si pò creà un schedariu di currezzioni per i schedarii binarii."
#. IDS_SAVEFILES_FORPATCH
-#: Merge.rc:4922
+#: Merge.rc:4932
msgid ""
"Save all files first.\n"
"\n"
@@ -7111,12 +7122,12 @@ msgstr ""
"A creazione d’un schedariu di currezzioni richiede ch’ella ùn ci sia micca cambiamenti non arregistrati."
#. IDS_FOLDER_NOTEXIST
-#: Merge.rc:4923
+#: Merge.rc:4933
msgid "Folder does not exist."
msgstr "U cartulare ùn esiste micca."
#. IDS_NO_ZIP_SUPPORT
-#: Merge.rc:4928
+#: Merge.rc:4938
msgid ""
"Archive support not enabled.\n"
"7-Zip and/or Merge7z*.dll not found.\n"
@@ -7127,37 +7138,37 @@ msgstr ""
"Lighjite u manuale d’assistenza di l’archiviera."
#. IDS_OPT_EXPORT_CAPTION
-#: Merge.rc:4929
+#: Merge.rc:4939
msgid "Select file for export"
msgstr "Selezziunà u schedariu per l’espurtazione"
#. IDS_OPT_IMPORT_CAPTION
-#: Merge.rc:4930
+#: Merge.rc:4940
msgid "Select file for import"
msgstr "Selezziunà u schedariu per l’impurtazione"
#. IDS_OPT_IMPORT_DONE
-#: Merge.rc:4931
+#: Merge.rc:4941
msgid "Options imported from file."
msgstr "L’ozzioni sò state impurtate da u schedariu."
#. IDS_OPT_EXPORT_DONE
-#: Merge.rc:4932
+#: Merge.rc:4942
msgid "Options exported to file."
msgstr "L’ozzioni sò state espurtate in u schedariu."
#. IDS_OPT_IMPORT_ERR
-#: Merge.rc:4933
+#: Merge.rc:4943
msgid "Failed to import options from file."
msgstr "Fiascu per impurtà (leghje) l’ozzioni da u schedariu."
#. IDS_OPT_EXPORT_ERR
-#: Merge.rc:4934
+#: Merge.rc:4944
msgid "Failed to write options to file."
msgstr "Fiascu per espurtà (scrive) l’ozzioni in u schedariu."
#. IDS_CLOSEALL_WINDOWS
-#: Merge.rc:4935
+#: Merge.rc:4945
msgid ""
"Close multiple compare windows?\n"
"\n"
@@ -7168,44 +7179,44 @@ msgstr ""
"Cuntinuà ?"
#. IDS_EOL_MIXED
-#: Merge.rc:4944
+#: Merge.rc:4954
msgid "Mixed"
msgstr "Mistu"
#. IDS_EOL_BIN
-#: Merge.rc:4945
+#: Merge.rc:4955
msgctxt "EOL Type"
msgid "Binary"
msgstr "Binariu"
#. IDS_EOL_NONE
-#: Merge.rc:4949
+#: Merge.rc:4959
msgid "None"
msgstr "Nisunu"
#. IDS_MARKER_COLOR_FMT
-#: Merge.rc:4950
+#: Merge.rc:4960
#, c-format
msgid "Marker Color %d"
msgstr "Culore di u marcatore %d"
#. IDS_MARKER_NEW_PATTERN
-#: Merge.rc:4951
+#: Merge.rc:4961
msgid "New Pattern"
msgstr "Novu mudellu"
#. IDS_PLUGINSLIST_TYPE
-#: Merge.rc:4957
+#: Merge.rc:4967
msgid "Type"
msgstr "Tipu"
#. IDS_PLUGINS_TYPE_EDITSCRIPT
-#: Merge.rc:4961
+#: Merge.rc:4971
msgid "Editor script"
msgstr "Scenariu d’editore"
#. ID_SELECTLINEDIFF
-#: Merge.rc:4967
+#: Merge.rc:4977
msgid ""
"\n"
"Difference in Current Line (F4)"
@@ -7214,7 +7225,7 @@ msgstr ""
"Sfarenza nant’à a linea attuale (F4)"
#. ID_OPTIONS
-#: Merge.rc:4968
+#: Merge.rc:4978
msgid ""
"\n"
"Options"
@@ -7223,7 +7234,7 @@ msgstr ""
"Ozzioni"
#. ID_REFRESH
-#: Merge.rc:4969
+#: Merge.rc:4979
msgid ""
"\n"
"Refresh (F5)"
@@ -7232,7 +7243,7 @@ msgstr ""
"Attualizà (F5)"
#. ID_PREVDIFF
-#: Merge.rc:4975
+#: Merge.rc:4985
msgid ""
"\n"
"Previous Difference (Alt+Up)"
@@ -7241,7 +7252,7 @@ msgstr ""
"Sfarenza precedente (Alt+Insù)"
#. ID_NEXTDIFF
-#: Merge.rc:4976
+#: Merge.rc:4986
msgid ""
"\n"
"Next Difference (Alt+Down)"
@@ -7250,7 +7261,7 @@ msgstr ""
"Sfarenza seguente (Alt+Inghjò)"
#. ID_PREVCONFLICT
-#: Merge.rc:4977
+#: Merge.rc:4987
msgid ""
"\n"
"Previous Conflict (Alt+Shift+Up)"
@@ -7259,7 +7270,7 @@ msgstr ""
"Cunflittu precedente (Alt+Maius+Insù)"
#. ID_NEXTCONFLICT
-#: Merge.rc:4978
+#: Merge.rc:4988
msgid ""
"\n"
"Next Conflict (Alt+Shift+Down)"
@@ -7268,7 +7279,7 @@ msgstr ""
"Cunflittu seguente (Alt+Maius+Inghjò)"
#. ID_FIRSTDIFF
-#: Merge.rc:4983
+#: Merge.rc:4993
msgid ""
"\n"
"First Difference (Alt+Home)"
@@ -7277,7 +7288,7 @@ msgstr ""
"Prima sfarenza (Alt+Accolta)"
#. ID_CURDIFF
-#: Merge.rc:4984
+#: Merge.rc:4994
msgid ""
"\n"
"Current Difference (Alt+Enter)"
@@ -7286,7 +7297,7 @@ msgstr ""
"Sfarenza currente (Alt+Entr.)"
#. ID_LASTDIFF
-#: Merge.rc:4985
+#: Merge.rc:4995
msgid ""
"\n"
"Last Difference (Alt+End)"
@@ -7295,7 +7306,7 @@ msgstr ""
"Ultima sfarenza (Alt+Fine)"
#. ID_L2R
-#: Merge.rc:4986
+#: Merge.rc:4996
msgid ""
"\n"
"Copy to Right (Alt+Right)"
@@ -7304,7 +7315,7 @@ msgstr ""
"Cupià versu a diritta (Alt+Diritta)"
#. ID_R2L
-#: Merge.rc:4987
+#: Merge.rc:4997
msgid ""
"\n"
"Copy to Left (Alt+Left)"
@@ -7313,7 +7324,7 @@ msgstr ""
"Cupià versu a manca (Alt+Manca)"
#. ID_L2RNEXT
-#: Merge.rc:4988
+#: Merge.rc:4998
msgid ""
"\n"
"Copy to Right and Advance (Ctrl+Alt+Right)"
@@ -7322,7 +7333,7 @@ msgstr ""
"Cupià versu a diritta è avanzà (Ctrl+Alt+Diritta)"
#. ID_R2LNEXT
-#: Merge.rc:4989
+#: Merge.rc:4999
msgid ""
"\n"
"Copy to Left and Advance (Ctrl+Alt+Left)"
@@ -7331,7 +7342,7 @@ msgstr ""
"Cupià versu a manca è avanzà (Ctrl+Alt+Manca)"
#. ID_ALL_RIGHT
-#: Merge.rc:4990
+#: Merge.rc:5000
msgid ""
"\n"
"Copy All to Right"
@@ -7340,7 +7351,7 @@ msgstr ""
"Tuttu cupià versu a diritta"
#. ID_ALL_LEFT
-#: Merge.rc:4991
+#: Merge.rc:5001
msgid ""
"\n"
"Copy All to Left"
@@ -7349,7 +7360,7 @@ msgstr ""
"Tuttu cupià versu a manca"
#. ID_AUTO_MERGE
-#: Merge.rc:4992
+#: Merge.rc:5002
msgid ""
"\n"
"Auto Merge (Ctrl+Alt+M)"
@@ -7358,7 +7369,7 @@ msgstr ""
"Fusione autumatica (Ctrl+Alt+M)"
#. ID_FIRSTFILE
-#: Merge.rc:4993
+#: Merge.rc:5003
msgid ""
"\n"
"First File"
@@ -7367,7 +7378,7 @@ msgstr ""
"Primu schedariu"
#. ID_NEXTFILE
-#: Merge.rc:4994
+#: Merge.rc:5004
msgid ""
"\n"
"Next File (Ctrl+F8)"
@@ -7376,7 +7387,7 @@ msgstr ""
"Schedariu seguente (Ctrl+F8)"
#. ID_LASTFILE
-#: Merge.rc:4995
+#: Merge.rc:5005
msgid ""
"\n"
"Last File"
@@ -7385,7 +7396,7 @@ msgstr ""
"Ultimu schedariu"
#. ID_PREVFILE
-#: Merge.rc:4996
+#: Merge.rc:5006
msgid ""
"\n"
"Previous File (Ctrl+F7)"
@@ -7394,37 +7405,37 @@ msgstr ""
"Schedariu precedente (Ctrl+F7)"
#. IDS_UNPACK_AUTO
-#: Merge.rc:5003
+#: Merge.rc:5013
msgid "Adapted unpacker applied to both files (one needs extension)."
msgstr "U spacchittadore adattatu hè appiecatu à i dui schedarii (solu unu richiede l’estensione)."
#. IDS_NO_PREDIFFER
-#: Merge.rc:5004
+#: Merge.rc:5014
msgid "No Prediffer (Normal)"
msgstr "Nisunu preparagone (nurmale)"
#. IDS_SUGGESTED_PLUGINS
-#: Merge.rc:5005
+#: Merge.rc:5015
msgid "Suggested Plugins"
msgstr "Moduli d’estensione cunsigliati"
#. IDS_NOT_SUGGESTED_PLUGINS
-#: Merge.rc:5006
+#: Merge.rc:5016
msgid "All Plugins"
msgstr "Tutti i moduli d’estensione"
#. IDS_PRIVATEBUILD_FMT
-#: Merge.rc:5012
+#: Merge.rc:5022
#, c-format
msgid "Private Build: %1"
msgstr "Custruzzione privata : %1"
#. IDS_CHECKFORUPDATES_UPTODATE
-#: Merge.rc:5013
+#: Merge.rc:5023
msgid "Your software is up to date."
msgstr "U vostru prugramma hè à l’ultimu livellu."
-#: Merge.rc:5015
+#: Merge.rc:5025
#, c-format
msgid ""
"WinMerge update available.\n"
@@ -7434,126 +7445,126 @@ msgstr ""
"%1 hè dispunibule (avete %2). Vulete scaricalla subitu ?"
#. IDS_ALLRIGHTS_RESERVED
-#: Merge.rc:5016
+#: Merge.rc:5026
msgid " - All rights reserved."
msgstr " - Tutti i diritti riservati."
#. IDS_CHECKFORUPDATES_FAILED
-#: Merge.rc:5021
+#: Merge.rc:5031
msgid "Failed to download latest version information"
msgstr "Fiascu per scaricà l’infurmazione di l’ultima versione"
#. IDS_TITLE_PLUGINS_SETTINGS
-#: Merge.rc:5027
+#: Merge.rc:5037
msgid "Plugin Settings"
msgstr "Parametri di l’estensione"
#. IDS_NO_SCT_SCRIPTS
-#: Merge.rc:5029
+#: Merge.rc:5039
msgid "WSH not found - .sct scripts disabled"
msgstr "Ùn si pò truvà WSH ; i scenarii .sct sò disattivati"
#. IDS_LOCBAR_GOTOLINE_FMT
-#: Merge.rc:5037
+#: Merge.rc:5047
#, c-format
msgid "G&o to Line %1"
msgstr "An&dà à a linea %1"
#. IDS_GOTO_MOVED_LINE
-#: Merge.rc:5043
+#: Merge.rc:5053
msgid "Go to Moved Line\tCtrl+Shift+G"
msgstr "Andà à a linea dispiazzata\tCtrl+Maius+G"
#. IDS_AUTOCOMPLETE_DISABLED
-#: Merge.rc:5049
+#: Merge.rc:5059
msgctxt "Options dialog|General|Open dialog Auto completion"
msgid "Disabled"
msgstr "Disattivata"
#. IDS_AUTOCOMPLETE_FILE_SYS
-#: Merge.rc:5050
+#: Merge.rc:5060
msgid "From file system"
msgstr "Da u sistema di schedariu"
#. IDS_AUTOCOMPLETE_MRU
-#: Merge.rc:5051
+#: Merge.rc:5061
msgid "From Most Recently Used list"
msgstr "Da a lista di i schedarii recente"
#. IDS_COLORSCHEME_PLAIN
-#: Merge.rc:5057
+#: Merge.rc:5067
msgid "No Highlighting"
msgstr "Nisunu sopralineamentu"
#. IDS_COLORSCHEME_BATCH
-#: Merge.rc:5063
+#: Merge.rc:5073
msgid "Batch"
msgstr "Trattamentu da lottu"
#. IDS_COLORSCHEME_PO
-#: Merge.rc:5090
+#: Merge.rc:5100
msgid "Portable Object"
msgstr "Oggettu purtavule"
#. IDS_COLORSCHEME_RSRC
-#: Merge.rc:5094
+#: Merge.rc:5104
msgid "Resources"
msgstr "Risorse"
#. IDS_COLORSCHEME_SH
-#: Merge.rc:5098
+#: Merge.rc:5108
msgid "Shell"
msgstr "Shell"
#. IDS_CLOSE_LEFT_TABS
-#: Merge.rc:5115
+#: Merge.rc:5125
msgid "Close &Left Tabs"
msgstr "Chjode l’unghjette à &manca"
#. IDS_CLOSE_RIGHT_TABS
-#: Merge.rc:5116
+#: Merge.rc:5126
msgid "Close R&ight Tabs"
msgstr "Chjode l’unghjette à &diritta"
#. IDS_CLOSE_OTHER_TABS
-#: Merge.rc:5117
+#: Merge.rc:5127
msgid "Close &Other Tabs"
msgstr "Chjode l’&altre unghjette"
#. IDS_TABBAR_AUTO_MAXWIDTH
-#: Merge.rc:5118
+#: Merge.rc:5128
msgid "Enable &Auto Max Width"
msgstr "&Attivà a larghezza massima autumatica"
#. IDS_WEBPAGE_MENU
-#: Merge.rc:5128
+#: Merge.rc:5138
msgid "We&bpage"
msgstr "Pagina we&b"
#. IDS_VIEW_WRAP_TEXT
-#: Merge.rc:5133
+#: Merge.rc:5143
msgid "W&rap Text"
msgstr "&Ritornu autumaticu à a linea"
#. IDS_NOTINSTALLED
-#: Merge.rc:5138
+#: Merge.rc:5148
#, c-format
msgid "%1 is not installed."
msgstr "%1 ùn hè micca installatu."
#. IDS_CREATE_FOLDER
-#: Merge.rc:5143
+#: Merge.rc:5153
#, c-format
msgid "%1 does not exist. Create it?"
msgstr "%& ùn esiste micca. Vulete creallu ?"
#. IDS_CREATE_FOLDER_ERROR
-#: Merge.rc:5144
+#: Merge.rc:5154
msgid "Failed to create folder."
msgstr "Impussibule di creà u cartulare."
#. IDC_EXT_EDITOR_PATH
-#: Merge.rc:5149
+#: Merge.rc:5159
msgid ""
"Parameters:\n"
"$file: Current file path\n"
@@ -7564,486 +7575,486 @@ msgstr ""
"$linenum: numeru di linea attuale di u cursore"
#. IDS_DIFF_ALGORITHM_DEFAULT
-#: Merge.rc:5154
+#: Merge.rc:5164
msgid "default"
msgstr "predefinita"
#. IDS_DIFF_ALGORITHM_MINIMAL
-#: Merge.rc:5155
+#: Merge.rc:5165
msgid "minimal"
msgstr "minimale"
#. IDS_DIFF_ALGORITHM_PATIENCE
-#: Merge.rc:5156
+#: Merge.rc:5166
msgid "patience"
msgstr "pazienza"
#. IDS_DIFF_ALGORITHM_HISTOGRAM
-#: Merge.rc:5157
+#: Merge.rc:5167
msgid "histogram"
msgstr "graficu à barre"
#. IDS_DIFF_ALGORITHM_NONE
-#: Merge.rc:5158
+#: Merge.rc:5168
msgid "none"
msgstr "nisuna"
#. IDS_RENDERING_MODE_GDI
-#: Merge.rc:5163
+#: Merge.rc:5173
msgid "GDI"
msgstr "GDI"
#. IDS_RENDERING_MODE_DIRECTWRITE_DEFAULT
-#: Merge.rc:5164
+#: Merge.rc:5174
msgid "DirectWrite Default"
msgstr "DirectWrite predefinitu"
#. IDS_RENDERING_MODE_DIRECTWRITE_ALIASED
-#: Merge.rc:5165
+#: Merge.rc:5175
msgid "DirectWrite Aliased"
msgstr "DirectWrite merlatu"
#. IDS_RENDERING_MODE_DIRECTWRITE_GDI_CLASSIC
-#: Merge.rc:5166
+#: Merge.rc:5176
msgid "DirectWrite GDI Classic"
msgstr "DirectWrite GDI classicu"
#. IDS_RENDERING_MODE_DIRECTWRITE_GDI_NATURAL
-#: Merge.rc:5167
+#: Merge.rc:5177
msgid "DirectWrite GDI Natural"
msgstr "DirectWrite GDI naturale"
#. IDS_RENDERING_MODE_DIRECTWRITE_NATURAL
-#: Merge.rc:5168
+#: Merge.rc:5178
msgid "DirectWrite Natural"
msgstr "DirectWrite naturale"
#. IDS_RENDERING_MODE_DIRECTWRITE_NATURAL_SYMMETRIC
-#: Merge.rc:5169
+#: Merge.rc:5179
msgid "DirectWrite Natural Symmetric"
msgstr "DirectWrite naturale simetricu"
#. IDS_CLOSE_WINDOWS_WITH_ESC_DISABLED
-#: Merge.rc:5174
+#: Merge.rc:5184
msgctxt "Options dialog|General|Close windows with Esc"
msgid "Disabled"
msgstr "Disattivata"
#. IDS_CLOSE_WINDOWS_WITH_ESC_1
-#: Merge.rc:5175
+#: Merge.rc:5185
msgid "MDI child window or main window"
msgstr "Finestra zitella o finestra principale MDI"
#. IDS_CLOSE_WINDOWS_WITH_ESC_2
-#: Merge.rc:5176
+#: Merge.rc:5186
msgid "MDI child window only"
msgstr "Finestra zitella MDI solu"
#. IDS_CLOSE_WINDOWS_WITH_ESC_3
-#: Merge.rc:5177
+#: Merge.rc:5187
msgid "Close main window if only one MDI child window"
msgstr "Chjode a finestra principale s’ella ci hè solu una finestra zitella MDI"
#. IDS_DIFF_GROUP
-#: Merge.rc:5182
+#: Merge.rc:5192
msgctxt "ImgMergeFrame|LocationPane"
msgid "Diff"
msgstr "Sfarenze"
#. IDS_DIFF_HIGHLIGHT
-#: Merge.rc:5183
+#: Merge.rc:5193
msgctxt "ImgMergeFrame|LocationPane"
msgid "Highlight"
msgstr "Sopralineamentu"
#. IDS_DIFF_BLINK
-#: Merge.rc:5184
+#: Merge.rc:5194
msgctxt "ImgMergeFrame|LocationPane"
msgid "Blink"
msgstr "Cinnulamentu"
#. IDS_DIFF_BLOCKSIZE
-#: Merge.rc:5185
+#: Merge.rc:5195
msgctxt "ImgMergeFrame|LocationPane"
msgid "Block Size"
msgstr "Dimensione di bloccu"
#. IDS_DIFF_BLOCKALPHA
-#: Merge.rc:5186
+#: Merge.rc:5196
msgctxt "ImgMergeFrame|LocationPane"
msgid "Block Alpha"
msgstr "Trasparenza di bloccu"
#. IDS_DIFF_CDTHRESHOLD
-#: Merge.rc:5187
+#: Merge.rc:5197
msgctxt "ImgMergeFrame|LocationPane"
msgid "CD Threshold"
msgstr "Sogliu CD"
#. IDS_DIFF_INSERTION_DELETION_DETECTION
-#: Merge.rc:5188
+#: Merge.rc:5198
msgctxt "ImgMergeFrame|LocationPane"
msgid "Ins/Del Detection"
msgstr "Avventata d’inserzione è di squassatura"
#. IDS_OVERLAY_MODE_NONE
-#: Merge.rc:5189 Merge.rc:5194
+#: Merge.rc:5199 Merge.rc:5204
msgctxt "ImgMergeFrame|LocationPane"
msgid "None"
msgstr "Nisunu"
#. IDS_DIFF_INSERTION_DELETION_DETECTION_VERTICAL
-#: Merge.rc:5190
+#: Merge.rc:5200
msgctxt "ImgMergeFrame|LocationPane"
msgid "Vertical"
msgstr "Verticale"
#. IDS_DIFF_INSERTION_DELETION_DETECTION_HORIZONTAL
-#: Merge.rc:5191
+#: Merge.rc:5201
msgctxt "ImgMergeFrame|LocationPane"
msgid "Horizontal"
msgstr "Orizuntale"
#. IDS_OVERLAY_GROUP
-#: Merge.rc:5192
+#: Merge.rc:5202
msgctxt "ImgMergeFrame|LocationPane"
msgid "Overlay"
msgstr "Accavalcatura"
#. IDS_OVERLAY_ALPHA
-#: Merge.rc:5193
+#: Merge.rc:5203
msgctxt "ImgMergeFrame|LocationPane"
msgid "Alpha"
msgstr "Trasparenza alfa"
#. IDS_OVERLAY_MODE_XOR
-#: Merge.rc:5195
+#: Merge.rc:5205
msgctxt "ImgMergeFrame|LocationPane"
msgid "XOR"
msgstr "O esclusivu (Xor)"
#. IDS_OVERLAY_MODE_ALPHA
-#: Merge.rc:5196
+#: Merge.rc:5206
msgctxt "ImgMergeFrame|LocationPane"
msgid "Alpha Blend"
msgstr "Simulazione di trasparenza"
#. IDS_OVERLAY_MODE_ALPHA_ANIMATION
-#: Merge.rc:5197
+#: Merge.rc:5207
msgctxt "ImgMergeFrame|LocationPane"
msgid "Alpha Animation"
msgstr "Simulazione di trasparenza animata"
#. IDS_ZOOM
-#: Merge.rc:5198
+#: Merge.rc:5208
msgctxt "ImgMergeFrame|LocationPane"
msgid "Zoom"
msgstr "Ingrandamentu"
#. IDS_PAGE
-#: Merge.rc:5199
+#: Merge.rc:5209
msgctxt "ImgMergeFrame|LocationPane"
msgid "Page:"
msgstr "Pagina :"
#. IDS_IMGCMP_STATUS_PT_RGBA_FMT
-#: Merge.rc:5200
+#: Merge.rc:5210
#, c-format
msgid "Pt: (%d, %d) RGBA: (%d, %d, %d, %d) "
msgstr "Pt : (%d, %d) RGBA : (%d, %d, %d, %d) "
#. IDS_IMGCMP_STATUS_DIST1_FMT
-#: Merge.rc:5201
+#: Merge.rc:5211
#, c-format
msgid "Dist: %g "
msgstr "Dist : %g "
#. IDS_IMGCMP_STATUS_DIST2_FMT
-#: Merge.rc:5202
+#: Merge.rc:5212
#, c-format
msgid "Dist: %g, %g "
msgstr "Dist : %g, %g "
#. IDS_IMGCMP_STATUS_PAGE_ZOOM_SIZE_BPP_FMT
-#: Merge.rc:5203
+#: Merge.rc:5213
#, c-format
msgid "Page: %d/%d Zoom: %d%% %dx%dpx %dbpp "
msgstr "Pagina : %d/%d Ingrandamentu : %d%% %dx%dpx %dbpp "
#. IDS_IMGCMP_STATUS_RC_FMT
-#: Merge.rc:5204
+#: Merge.rc:5214
#, c-format
msgid "Rc: (%d, %d) "
msgstr "Rc : (%d, %d) "
#. IDS_IMGCMP_STATUS_FLIPPED_FMT
-#: Merge.rc:5205
+#: Merge.rc:5215
#, c-format
msgid "Flipped: %s "
msgstr "Rivultatu : %s "
#. IDS_IMGCMP_STATUS_ROTATED_FMT
-#: Merge.rc:5206
+#: Merge.rc:5216
#, c-format
msgid "Rotated: %d "
msgstr "Giratu : %d "
#. IDS_IMGCMP_REPORT_ALLPAGES
-#: Merge.rc:5207
+#: Merge.rc:5217
msgid "All pages"
msgstr "Tutte e pagine"
#. IDS_IGNSUB_STR1
-#: Merge.rc:5212
+#: Merge.rc:5222
msgid ""
msgstr ""
#. IDS_IGNSUB_STR2
-#: Merge.rc:5213
+#: Merge.rc:5223
msgid "No differences found to select"
msgstr "Ùn si pò truvà alcuna sfarenza à selezziunà"
#. IDS_IGNSUB_STR3
-#: Merge.rc:5214
+#: Merge.rc:5224
msgid "No differences found to add as substitution filter"
msgstr "Ùn si pò truvà alcuna sfarenza à aghjunghje cum¹è filtru di sustituzione"
#. IDS_IGNSUB_STR4
-#: Merge.rc:5215
+#: Merge.rc:5225
msgid "The pair is already in the Substitution Filters list"
msgstr "U coppiu si trova dighjà in a lista di i filtri di sustituzione"
#. IDS_IGNSUB_STR5
-#: Merge.rc:5216
+#: Merge.rc:5226
msgid "Add this change to Substitution Filters?"
msgstr "Aghjunghje stu cambiamentu à i filtri di sustituzione ?"
#. IDS_OCRRESULT_TEXTONLY
-#: Merge.rc:5221
+#: Merge.rc:5231
msgid "Text only"
msgstr "Testu solu"
#. IDS_OCRRESULT_POS_LINE
-#: Merge.rc:5222
+#: Merge.rc:5232
msgid "Line-by-line position and text"
msgstr "Pusizione è testu linea à a linea"
#. IDS_OCRRESULT_POS_WORD
-#: Merge.rc:5223
+#: Merge.rc:5233
msgid "Word-by-word position and text"
msgstr "Pusizione è testu parolla à a parolla"
#. IDS_USERDATAFOLDER_APPDATA
-#: Merge.rc:5228
+#: Merge.rc:5238
msgid "AppData (Roaming) folder"
msgstr "Cartulare AppData (Roaming)"
#. IDS_USERDATAFOLDER_INSTALL
-#: Merge.rc:5229
+#: Merge.rc:5239
msgid "Install folder"
msgstr "Cartulare d’installazione"
#. IDS_USERDATAFOLDER_DOCUMENTS
-#: Merge.rc:5230
+#: Merge.rc:5240
msgid "Documents folder"
msgstr "Cartulare di i ducumenti"
#. IDS_SINGLEINSTANCE_DISABLED
-#: Merge.rc:5235
+#: Merge.rc:5245
msgctxt "Options dialog|General|Single instance mode"
msgid "Disabled"
msgstr "Disattivata"
#. IDS_SINGLEINSTANCE_STR1
-#: Merge.rc:5236
+#: Merge.rc:5246
msgid "Allow only one instance to run"
msgstr "Permette l’esecuzione d’una instanza unica di u prugramma"
#. IDS_SINGLEINSTANCE_STR2
-#: Merge.rc:5237
+#: Merge.rc:5247
msgid "Allow only one instance; wait for termination"
msgstr "Permette una instanza unica ; aspettà ch’ella si compii"
#. IDS_AUTO_RELOAD_MODIFIED_FILES_DISABLED
-#: Merge.rc:5242
+#: Merge.rc:5252
msgctxt "Options dialog|General|Auto-reload modified files"
msgid "Disabled"
msgstr "Disattivatu"
#. IDS_AUTO_RELOAD_MODIFIED_FILES_STR1
-#: Merge.rc:5243
+#: Merge.rc:5253
msgid "Only on window activated"
msgstr "Solu quandu a finestra hè attivata"
#. IDS_AUTO_RELOAD_MODIFIED_FILES_STR2
-#: Merge.rc:5244
+#: Merge.rc:5254
msgid "Immediately"
msgstr "Subitu subitu"
#. IDS_PLUGIN_ALL
-#: Merge.rc:5249
+#: Merge.rc:5259
msgid "Al&l"
msgstr "T&utti"
#. IDS_PLUGIN_OTHERS
-#: Merge.rc:5250
+#: Merge.rc:5260
msgid "&Others"
msgstr "&L’altri moduli"
-#: Merge.rc:5252
+#: Merge.rc:5262
#, c-format
msgid "Missing plugin name in pipeline: %1"
msgstr "Nome di modulu d’estensione assente in u cundottu : %1"
-#: Merge.rc:5254
+#: Merge.rc:5264
#, c-format
msgid "Missing quote in plugin pipeline: %1"
msgstr "Marca di citazione assente in u cundottu di u modulu d’estensione : %1"
#. IDS_PLUGIN_NAME_ALREADY_EXISTS
-#: Merge.rc:5255
+#: Merge.rc:5265
#, c-format
msgid "Plugin name '%1' already exists."
msgstr "U nome di modulu d’estensione « %1 » esiste dighjà."
#. IDS_PLUGIN_TITLE1
-#: Merge.rc:5256
+#: Merge.rc:5266
msgid "Specify plugin arguments"
msgstr "Indicate i parametri di u modulu d’estensione"
-#: Merge.rc:5258
+#: Merge.rc:5268
#, c-format
msgid "Plugin not found or invalid: %1"
msgstr "U modulu d’estensione ùn si trova micca o hè inaccettevule : %1"
#. IDS_PLUGIN_NOT_UNPACK
-#: Merge.rc:5259
+#: Merge.rc:5269
#, c-format
msgid "'%1' is not an unpacker plugin"
msgstr "« %1 » ùn hè micca un modulu d’estensione di spacchittadore"
#. IDS_PLUGIN_NOT_PREDIFF
-#: Merge.rc:5260
+#: Merge.rc:5270
#, c-format
msgid "'%1' is not a prediffer plugin"
msgstr "« %1 » ùn hè micca un modulu d’estensione di preparagone"
-#: Merge.rc:5262
+#: Merge.rc:5272
#, c-format
msgid "Error prediffing '%1' with '%2'. Prediffing disabled."
msgstr "Un sbagliu hè accadutu durante u preparagone di u schedariu « %1 » cù « %2 ». U preparagone hè disattivatu."
#. IDS_PLUGIN_CIRCULAR_REFERENCE
-#: Merge.rc:5263
+#: Merge.rc:5273
#, c-format
msgid "Circular reference in plugin pipeline: %1"
msgstr "Referenza circulare in u cundottu di modulu d’estensione : %1"
#. IDS_PLUGIN_TYPE1
-#: Merge.rc:5264
+#: Merge.rc:5274
msgid "URL Handler"
msgstr "Ghjestiunariu d’indirizzu web"
#. IDS_PLUGIN_TYPE2
-#: Merge.rc:5265
+#: Merge.rc:5275
msgid "File Unpacker"
msgstr "Spacchittadore di schedariu"
#. IDS_PLUGIN_TYPE3
-#: Merge.rc:5266
+#: Merge.rc:5276
msgid "File or Folder Unpacker"
msgstr "Spacchittadore di schedariu o di cartulare"
#. IDS_PLUGIN_TYPE5
-#: Merge.rc:5268
+#: Merge.rc:5278
msgid "Alias for Unpacker"
msgstr "Cugnome di u spacchittadore"
#. IDS_PLUGIN_TYPE6
-#: Merge.rc:5269
+#: Merge.rc:5279
msgid "Alias for Prediffer"
msgstr "Cugnome di u preparagone"
#. IDS_PLUGIN_TYPE7
-#: Merge.rc:5270
+#: Merge.rc:5280
msgid "Alias for Editor script"
msgstr "Cugnome di u scenariu d’editore"
#. IDS_PLUGIN_ALIAS_DESC
-#: Merge.rc:5271
+#: Merge.rc:5281
#, c-format
msgid "Alias for plugin pipeline '%1'"
msgstr "Cugnome di u cundottu di modulu d’estensione « %1 »"
#. IDS_PLUGIN_NEW_DESC
-#: Merge.rc:5272
+#: Merge.rc:5282
msgid "New plugin description"
msgstr "Discrizzione nova di u modulu d’estensione"
#. IDS_PLUGIN_TARGETS_ALL
-#: Merge.rc:5273
+#: Merge.rc:5283
msgid "All"
msgstr "Tutti"
#. IDS_PLUGIN_TARGETS_1ST
-#: Merge.rc:5274
+#: Merge.rc:5284
msgid "1st"
msgstr "1ᵘ"
#. IDS_PLUGIN_TARGETS_2ND
-#: Merge.rc:5275
+#: Merge.rc:5285
msgid "2nd"
msgstr "2ᵘ"
#. IDS_PLUGIN_TARGETS_3RD
-#: Merge.rc:5276
+#: Merge.rc:5286
msgid "3rd"
msgstr "3ᵘ"
#. IDS_PLUGIN_TARGETS_1ST_2ND
-#: Merge.rc:5277
+#: Merge.rc:5287
msgid "1st and 2nd"
msgstr "1ᵘ è 2ᵘ"
#. IDS_PLUGIN_TARGETS_1ST_3RD
-#: Merge.rc:5278
+#: Merge.rc:5288
msgid "1st and 3rd"
msgstr "1ᵘ è 3ᵘ"
#. IDS_PLUGIN_TARGETS_2ND_3RD
-#: Merge.rc:5279
+#: Merge.rc:5289
msgid "2nd and 3rd"
msgstr "2ᵘ è 3ᵘ"
#. IDS_FILTER_APPLIED
-#: Merge.rc:5284
+#: Merge.rc:5294
msgid "Filter applied"
msgstr "Filtru appiecatu"
#. IDS_FILTERMENU_COMPARE
-#: Merge.rc:5289
+#: Merge.rc:5299
#, c-format
msgid "Compare %1"
msgstr "Paragunà %1"
#. IDS_FILTERMENU_FILTER_BY_THIS_COLUMN
-#: Merge.rc:5290
+#: Merge.rc:5300
msgid "&Filter by This Column"
msgstr "&Filtru da sta culonna"
#. IDS_FILTERMENU_FILTER_BY_THIS_COLUMN2
-#: Merge.rc:5291
+#: Merge.rc:5301
msgid "&Filter by This Column..."
msgstr "&Filtru da sta culonna…"
#. IDS_CLIPBOARDHISTORY_TIME
-#: Merge.rc:5296
+#: Merge.rc:5306
#, c-format
msgid "Clipboard at %s"
msgstr "Preme’papei di u %s"
#. IDS_CLIPBOARDHISTORY_DISABLED
-#: Merge.rc:5297
+#: Merge.rc:5307
msgid ""
"Clipboard history disabled.\r\n"
"Enable: Windows logo key + V, then Turn on."
@@ -8051,110 +8062,115 @@ msgstr ""
"A cronolugia di u preme’papei hè disattivata.\r\n"
"Per attivalla, appughjate nant’à i tasti Windows + V è tandu cliccu nant’à « Attivà »."
-#: Merge.rc:5299
+#: Merge.rc:5309
msgid "This system does not support clipboard history."
msgstr "Stu sistema ùn accetta micca a cronolugia di u preme’papei."
-#: Merge.rc:5301
+#: Merge.rc:5311
msgid "32-bit WinMerge does not support Clipboard Compare"
msgstr "A versione 32-bit di WinMerge ùn accetta micca u paragone di preme’papei"
#. IDS_WEBVIEW2_RUNTIME_NOT_INSTALLED
-#: Merge.rc:5306
+#: Merge.rc:5316
msgid "WebView2 runtime not installed. Download it?"
msgstr "L’ambiente d’esecuzione WebView2 ùn hè micca installatu. Vulete scaricallu ?"
#. IDS_JUMPLIST_NEW_TEXT_COMPARE
-#: Merge.rc:5311
+#: Merge.rc:5321
msgid "New Text Compare"
msgstr "Paragone novu di testu"
#. IDS_JUMPLIST_NEW_TABLE_COMPARE
-#: Merge.rc:5312
+#: Merge.rc:5322
msgid "New Table Compare"
msgstr "Paragone novu di tavulone"
#. IDS_JUMPLIST_NEW_BINARY_COMPARE
-#: Merge.rc:5313
+#: Merge.rc:5323
msgid "New Binary Compare"
msgstr "Paragone binariu novu"
#. IDS_JUMPLIST_NEW_IMAGE_COMPARE
-#: Merge.rc:5314
+#: Merge.rc:5324
msgid "New Image Compare"
msgstr "Paragone novu di fiura"
#. IDS_JUMPLIST_NEW_WEBPAGE_COMPARE
-#: Merge.rc:5315
+#: Merge.rc:5325
msgid "New Webpage Compare"
msgstr "Paragone novu di pagina web"
+#. IDS_JUMPLIST_NEW_FOLDER_COMPARE
+#: Merge.rc:5326
+msgid "New Folder Compare"
+msgstr ""
+
#. IDS_JUMPLIST_CLIPBOARD_COMPARE
-#: Merge.rc:5316
+#: Merge.rc:5327
msgid "Clipboard Compare"
msgstr "Paragone di preme’papei"
#. IDS_PREVIEWBAR_PRINT
-#: Merge.rc:5321
+#: Merge.rc:5332
msgid "&Print..."
msgstr "&Stampà…"
#. IDS_PREVIEWBAR_PREVPAGE
-#: Merge.rc:5323
+#: Merge.rc:5334
msgid "Pre&v Page"
msgstr "&Pagina precedente"
#. IDS_PREVIEWBAR_TWOPAGE
-#: Merge.rc:5324
+#: Merge.rc:5335
msgid "&Two Page"
msgstr "&Duie pagine"
#. IDS_PREVIEWBAR_ONEPAGE
-#: Merge.rc:5325
+#: Merge.rc:5336
msgid "&One Page"
msgstr "&Una pagina"
#. IDS_PREVIEWBAR_ZOOMIN
-#: Merge.rc:5326
+#: Merge.rc:5337
msgid "Zoom &In"
msgstr "Ingrandamentu più &forte"
#. IDS_PREVIEWBAR_ZOOMOUT
-#: Merge.rc:5327
+#: Merge.rc:5338
msgid "Zoom &Out"
msgstr "Ingrandamentu &menu forte"
#. IDS_WEBPAGE_COMPARING
-#: Merge.rc:5333
+#: Merge.rc:5344
msgid "Comparing..."
msgstr "Paragone…"
#. IDS_WEBPAGE_ZOOM
-#: Merge.rc:5334
+#: Merge.rc:5345
msgid "Zoom:"
msgstr "Ingrandamentu :"
#. IDS_COPY_GRANULARITY_DIFFHUNK
-#: Merge.rc:5339
+#: Merge.rc:5350
msgid "Diff hunk"
msgstr "Gruppu di sfarenze"
#. IDS_COPY_GRANULARITY_INLINE
-#: Merge.rc:5340
+#: Merge.rc:5351
msgid "Inline diff"
msgstr "Sfarenza framessa"
#. IDS_COPY_GRANULARITY_LINE
-#: Merge.rc:5341
+#: Merge.rc:5352
msgid "Line"
msgstr "Linea"
-#: Merge.rc:5342
+#: Merge.rc:5353
msgid "Character"
msgstr "Caratteru"
#. ID_MICE_PREVDIFF
-#: Merge.rc:5347
+#: Merge.rc:5358
msgid ""
"\n"
"Previous Difference (Alt+Up)\n"
@@ -8167,7 +8183,7 @@ msgstr ""
"(Alt+Rutulella di u topu insù)"
#. ID_MICE_NEXTDIFF
-#: Merge.rc:5348
+#: Merge.rc:5359
msgid ""
"\n"
"Next Difference (Alt+Down)\n"
@@ -8180,7 +8196,7 @@ msgstr ""
"(Alt+Rutulella di u topu inghjò)"
#. ID_MICE_L2R
-#: Merge.rc:5349
+#: Merge.rc:5360
msgid ""
"\n"
"Copy to Right (Alt+Right)\n"
@@ -8194,7 +8210,7 @@ msgstr ""
"(Alt+Maiusc+Rutulella inghjò)"
#. ID_MICE_R2L
-#: Merge.rc:5350
+#: Merge.rc:5361
msgid ""
"\n"
"Copy to Left (Alt+Left)\n"
@@ -8208,7 +8224,7 @@ msgstr ""
"(Alt+Maiusc+Rutulella insù)"
#. ID_MICE_L2RNEXT
-#: Merge.rc:5351
+#: Merge.rc:5362
msgid ""
"\n"
"Copy to Right and Advance (Ctrl+Alt+Right)\n"
@@ -8221,7 +8237,7 @@ msgstr ""
"(Ctrl+Alt+Maiusc+Rutulella inghjò)"
#. ID_MICE_R2LNEXT
-#: Merge.rc:5352
+#: Merge.rc:5363
msgid ""
"\n"
"Copy to Left and Advance (Ctrl+Alt+Left)\n"
@@ -8234,257 +8250,257 @@ msgstr ""
"(Ctrl+Alt+Maiusc+Rutulella insù)"
#. IDS_LOG_COMPARING_2
-#: Merge.rc:5362
+#: Merge.rc:5373
#, c-format
msgid "Comparing %1 with %2"
msgstr "Paragone di %1 cù %2"
#. IDS_LOG_COMPARING_3
-#: Merge.rc:5363
+#: Merge.rc:5374
#, c-format
msgid "Comparing %1 with %2 and %3"
msgstr "Paragone di %1 cù %2 è %3"
#. IDS_LOG_COMPARE_COMPLETED
-#: Merge.rc:5364
+#: Merge.rc:5375
msgid "Comparison completed"
msgstr "U paragone hè compiu"
#. IDS_LOG_COMPARE_ERROR_2
-#: Merge.rc:5365
+#: Merge.rc:5376
#, c-format
msgid "Failed to compare %1 with %2: "
msgstr "Fiascu per paragunà %1 cù %2 : "
#. IDS_LOG_COMPARE_ERROR_3
-#: Merge.rc:5366
+#: Merge.rc:5377
#, c-format
msgid "Failed to compare %1 with %2 and %3: "
msgstr "Fiascu per paragunà %1 cù %2 è %3 : "
#. IDS_LOG_FILE_SAVED
-#: Merge.rc:5367
+#: Merge.rc:5378
msgid "File saved"
msgstr "U schedariu hè arregistratu"
#. IDS_LOG_COPYING_FILES
-#: Merge.rc:5368
+#: Merge.rc:5379
msgid "Copying files..."
msgstr "Copia di i schedarii…"
#. IDS_LOG_MOVING_FILES
-#: Merge.rc:5369
+#: Merge.rc:5380
msgid "Moving files..."
msgstr "Dispiazzamentu di i schedarii…"
#. IDS_LOG_DELETING_FILES
-#: Merge.rc:5370
+#: Merge.rc:5381
msgid "Deleting files..."
msgstr "Squassatura di schedarii…"
#. IDS_LOG_RECYCLEBIN
-#: Merge.rc:5371
+#: Merge.rc:5382
msgid "Recycle Bin"
msgstr "Curbella"
#. IDS_LOG_PERMANENTLY_DELETED
-#: Merge.rc:5372
+#: Merge.rc:5383
msgid "Permanently deleted"
msgstr "Squassatu ab’eternu"
#. IDS_LOG_FILEOPERATION_COMPLETED
-#: Merge.rc:5373
+#: Merge.rc:5384
msgid "File operation completed successfully"
msgstr "Operazione di schedariu compia currettamente"
#. IDS_LOG_FILEOPERATION_CANCELED
-#: Merge.rc:5374
+#: Merge.rc:5385
msgid "File operation canceled"
msgstr "Operazione di schedariu abbandunata"
#. IDS_FILTER_ERROR_NO_ERROR
-#: Merge.rc:5379
+#: Merge.rc:5390
msgid "No error"
msgstr "Nisunu sbagliu"
#. IDS_FILTER_ERROR_EMPTY_EXPRESSION
-#: Merge.rc:5380
+#: Merge.rc:5391
msgid "Filter expression is empty"
msgstr "L’espressione di filtru hè viota"
#. IDS_FILTER_ERROR_UNKNOWN_CHAR
-#: Merge.rc:5381
+#: Merge.rc:5392
msgid "Unknown character in filter expression"
msgstr "Caratteru scunnisciutu in l’espressione di filtru"
#. IDS_FILTER_ERROR_UNTERMINATED_STRING
-#: Merge.rc:5382
+#: Merge.rc:5393
msgid "Unterminated string literal"
msgstr "Litterale di catena micca compia"
#. IDS_FILTER_ERROR_SYNTAX_ERROR
-#: Merge.rc:5383
+#: Merge.rc:5394
msgid "Syntax error in filter expression"
msgstr "Sbagliu di sintassa in l’espressione di filtru"
#. IDS_FILTER_ERROR_PARSE_FAILURE
-#: Merge.rc:5384
+#: Merge.rc:5395
msgid "Failed to parse filter expression"
msgstr "Fiascu per analizà l’espressione di filtru"
#. IDS_FILTER_ERROR_INVALID_LITERAL
-#: Merge.rc:5385
+#: Merge.rc:5396
msgid "Invalid literal value"
msgstr "Valore litterale inaccettevule"
#. IDS_FILTER_ERROR_INVALID_REGULAR_EXPRESSION
-#: Merge.rc:5386
+#: Merge.rc:5397
msgid "Invalid regular expression"
msgstr "Espressione regulare inaccettevule"
#. IDS_FILTER_ERROR_UNDEFINED_IDENTIFIER
-#: Merge.rc:5387
+#: Merge.rc:5398
msgid "Undefined identifier"
msgstr "Identificatore indefinitu"
#. IDS_FILTER_ERROR_INVALID_ARGUMENT_COUNT
-#: Merge.rc:5388
+#: Merge.rc:5399
msgid "Invalid number of arguments"
msgstr "Numeru inaccettevule di parametri"
#. IDS_FILTER_ERROR_FILTER_NAME_NOT_FOUND
-#: Merge.rc:5389
+#: Merge.rc:5400
msgid "Filter name not found"
msgstr "Nome di filtru intruvevule"
#. IDS_FILTER_ERROR_DIVIDE_BY_ZERO
-#: Merge.rc:5390
+#: Merge.rc:5401
msgid "Division by zero in filter expression"
msgstr "Divisione da zeru in l’espressione di filtru"
#. IDS_FILTER_ERROR_UNKNOWN_ERROR
-#: Merge.rc:5391
+#: Merge.rc:5402
msgid "Unknown error"
msgstr "Sbagliu scunnisciutu"
#. IDS_FILTER_ERROR_INVALID_PROPERTY_NAME
-#: Merge.rc:5392
+#: Merge.rc:5403
msgid "Invalid property name"
msgstr "Nome di pruprietà inaccettevule"
#. IDS_FILTER_ERROR_INVALID_DIRECTIVE
-#: Merge.rc:5393
+#: Merge.rc:5404
msgid "Invalid directive"
msgstr "Direttiva inaccettevule"
#. IDS_FILTER_OP_EQUALS
-#: Merge.rc:5398
+#: Merge.rc:5409
msgid "Equals"
msgstr "Hè uguale à"
#. IDS_FILTER_OP_NOT_EQUALS
-#: Merge.rc:5399
+#: Merge.rc:5410
msgid "Does not equal"
msgstr "Ùn hè micca uguale à"
#. IDS_FILTER_OP_LESS_THAN
-#: Merge.rc:5400
+#: Merge.rc:5411
msgid "Less than"
msgstr "Hè inferiore à"
#. IDS_FILTER_OP_LESS_EQUAL
-#: Merge.rc:5401
+#: Merge.rc:5412
msgid "Less than or equal to"
msgstr "Hè inferiore o uguale à"
#. IDS_FILTER_OP_GREATER_EQUAL
-#: Merge.rc:5402
+#: Merge.rc:5413
msgid "Greater than or equal to"
msgstr "Hè superiore o uguale à"
#. IDS_FILTER_OP_GREATER_THAN
-#: Merge.rc:5403
+#: Merge.rc:5414
msgid "Greater than"
msgstr "Hè superiore à"
#. IDS_FILTER_OP_BETWEEN
-#: Merge.rc:5404
+#: Merge.rc:5415
msgid "Between"
msgstr "Trà"
#. IDS_FILTER_OP_NOT_BETWEEN
-#: Merge.rc:5405
+#: Merge.rc:5416
msgid "Not Between"
msgstr "Micca trà"
#. IDS_FILTER_OP_CONTAINS
-#: Merge.rc:5406
+#: Merge.rc:5417
msgid "Contains"
msgstr "Cuntene"
#. IDS_FILTER_OP_NOT_CONTAINS
-#: Merge.rc:5407
+#: Merge.rc:5418
msgid "Not Contains"
msgstr "Ùn cuntene micca"
#. IDS_FILTER_OP_RECONTAINS
-#: Merge.rc:5408
+#: Merge.rc:5419
msgid "Contains (regex)"
msgstr "Cuntene (regex)"
#. IDS_FILTER_OP_NOT_RECONTAINS
-#: Merge.rc:5409
+#: Merge.rc:5420
msgid "Not Contains (regex)"
msgstr "Ùn cuntene micca (regex)"
#. IDS_FILTER_OP_LIKE
-#: Merge.rc:5410
+#: Merge.rc:5421
msgid "Match (wildcard)"
msgstr "Currisponde (caratteru genericu)"
#. IDS_FILTER_OP_NOT_LIKE
-#: Merge.rc:5411
+#: Merge.rc:5422
msgid "Not match (wildcard)"
msgstr "Ùn currisponde (caratteru genericu)"
#. IDS_FILTER_OP_MATCHES
-#: Merge.rc:5412
+#: Merge.rc:5423
msgid "Match (regex)"
msgstr "Currisponde (espressione regex)"
#. IDS_FILTER_OP_NOT_MATCHES
-#: Merge.rc:5413
+#: Merge.rc:5424
msgid "Not match (regex)"
msgstr "Ùn currisponde (espressione regex)"
#. IDS_COLORMODE_LIGHT
-#: Merge.rc:5418
+#: Merge.rc:5429
msgid "Light"
msgstr "Chjaru"
#. IDS_COLORMODE_DARK
-#: Merge.rc:5419
+#: Merge.rc:5430
msgid "Dark"
msgstr "Scuru"
#. IDS_COLORMODE_FOLLOWSYSTEM
-#: Merge.rc:5420
+#: Merge.rc:5431
msgid "Follow system"
msgstr "Seguità u sistema"
#. IDS_EXAMPLE
-#: Merge.rc:5425
+#: Merge.rc:5436
#, c-format
msgid "e.g. %1"
msgstr "p.i. %1"
#. IDS_DETECTED_PREVIOUS_CRASH
-#: Merge.rc:5430
+#: Merge.rc:5441
msgid "WinMerge detected a previous crash. Please report this if possible."
msgstr "WinMerge hà scupertu un accidente scorsu. S’ella hè pussibule, ci vole à riferiscelu."
#. IDS_REGEX_REPLACE_LIST_TEMPLATE
-#: Merge.rc:5435
+#: Merge.rc:5446
msgid ""
"# Regex replacement list\r\n"
"# Format: regexreplacement\r\n"
@@ -8499,7 +8515,7 @@ msgstr ""
"(\\d{4})-(\\d{2})-(\\d{2})\t$1_$2_$3\\r\n"
#. IDS_STRING_REPLACE_LIST_TEMPLATE
-#: Merge.rc:5436
+#: Merge.rc:5447
msgid ""
"# Replacement list\r\n"
"# Format: searchreplacement\r\n"
diff --git a/Translations/WinMerge/Croatian.po b/Translations/WinMerge/Croatian.po
index 9859f1b1bd8..136b50f2345 100644
--- a/Translations/WinMerge/Croatian.po
+++ b/Translations/WinMerge/Croatian.po
@@ -21,7 +21,7 @@ msgstr ""
"X-Poedit-Country: CROATIA\n"
#. LANGUAGE, SUBLANGUAGE
-#: Merge.rc:26 Merge.rc:59 Merge.rc:5453
+#: Merge.rc:26 Merge.rc:59 Merge.rc:5464
#, c-format
msgid "LANG_ENGLISH, SUBLANG_ENGLISH_US"
msgstr "LANG_CROATIAN, SUBLANG_DEFAULT"
@@ -107,7 +107,7 @@ msgid "Copy Selected Diff (Right) to Clipboard\tCtrl+&3"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_SELECTLINEDIFF
-#: Merge.rc:110 Merge.rc:673
+#: Merge.rc:110 Merge.rc:680
#, c-format
msgid "Select Line &Difference\tF4"
msgstr "Istakni &razliku\tF4"
@@ -141,7 +141,7 @@ msgid "Cu&t"
msgstr "Od&reži"
#. IDR_POPUP_DIRVIEW
-#: Merge.rc:118 Merge.rc:943
+#: Merge.rc:118 Merge.rc:951
#, c-format
msgid "&Copy"
msgstr "&Kopiraj"
@@ -153,21 +153,21 @@ msgid "&Paste"
msgstr "&Zalijepi"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:121 Merge.rc:875 Merge.rc:882
+#: Merge.rc:121 Merge.rc:882 Merge.rc:889
#, c-format
msgid "&Scripts"
msgstr "&Skripte"
#. IDS_NO_EDIT_SCRIPTS
-#: Merge.rc:123 Merge.rc:338 Merge.rc:447 Merge.rc:654 Merge.rc:659
-#: Merge.rc:865 Merge.rc:877 Merge.rc:884 Merge.rc:940 Merge.rc:1183
-#: Merge.rc:5028
+#: Merge.rc:123 Merge.rc:340 Merge.rc:451 Merge.rc:661 Merge.rc:666
+#: Merge.rc:872 Merge.rc:884 Merge.rc:891 Merge.rc:948 Merge.rc:1193
+#: Merge.rc:5038
#, c-format
msgid "< Empty >"
msgstr "< ništa >"
#. IDR_POPUP_LOCATIONBAR, ID_EDIT_WMGOTO
-#: Merge.rc:126 Merge.rc:691 Merge.rc:1081
+#: Merge.rc:126 Merge.rc:698 Merge.rc:1089
msgid "&Go to...\tCtrl+G"
msgstr "Idi &na redak\tCtrl+G"
@@ -188,27 +188,27 @@ msgid "Op&en"
msgstr "&Otvori"
#. IDR_POPUP_DIRVIEW, ID_DIR_OPEN_RIGHT
-#: Merge.rc:132 Merge.rc:981 Merge.rc:988 Merge.rc:995
+#: Merge.rc:132 Merge.rc:989 Merge.rc:996 Merge.rc:1003
msgid "With &Registered Application"
msgstr "In&staliranim programom"
#. IDR_POPUP_DIRVIEW, ID_DIR_OPEN_RIGHT_WITHEDITOR
-#: Merge.rc:133 Merge.rc:982 Merge.rc:989 Merge.rc:996
+#: Merge.rc:133 Merge.rc:990 Merge.rc:997 Merge.rc:1004
msgid "With &External Editor\tCtrl+Alt+E"
msgstr ""
#. IDR_POPUP_DIRVIEW, ID_DIR_OPEN_RIGHT_WITH
-#: Merge.rc:134 Merge.rc:983 Merge.rc:990 Merge.rc:997
+#: Merge.rc:134 Merge.rc:991 Merge.rc:998 Merge.rc:1005
msgid "&With..."
msgstr "&S..."
#. IDR_POPUP_DIRVIEW, ID_DIR_OPEN_RIGHT_PARENT_FOLDER
-#: Merge.rc:135 Merge.rc:984 Merge.rc:991 Merge.rc:998
+#: Merge.rc:135 Merge.rc:992 Merge.rc:999 Merge.rc:1006
msgid "Open &Parent Folder..."
msgstr ""
#. IDR_POPUP_IMG_CTXT, ID_FILE_SHELLMENU
-#: Merge.rc:137 Merge.rc:1239
+#: Merge.rc:137 Merge.rc:1249
msgid "S&hell Menu"
msgstr ""
@@ -246,8 +246,8 @@ msgid "Ins&ertion/Deletion Detection"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_TOOLBAR_NONE
-#: Merge.rc:176 Merge.rc:209 Merge.rc:216 Merge.rc:358 Merge.rc:507
-#: Merge.rc:751
+#: Merge.rc:176 Merge.rc:209 Merge.rc:216 Merge.rc:360 Merge.rc:511
+#: Merge.rc:758
#, c-format
msgid "&None"
msgstr "&Nevidljiva"
@@ -263,13 +263,13 @@ msgid "&Horizontal"
msgstr ""
#. IDR_POPUP_IMG_CTXT, ID_IMG_CURPANE_PREVPAGE
-#: Merge.rc:181 Merge.rc:189 Merge.rc:1230
+#: Merge.rc:181 Merge.rc:189 Merge.rc:1240
#, c-format
msgid "&Previous Page"
msgstr ""
#. IDS_PREVIEWBAR_NEXTPAGE
-#: Merge.rc:182 Merge.rc:190 Merge.rc:1231 Merge.rc:5322
+#: Merge.rc:182 Merge.rc:190 Merge.rc:1241 Merge.rc:5333
#, c-format
msgid "&Next Page"
msgstr ""
@@ -281,45 +281,45 @@ msgid "&Active Pane"
msgstr ""
#. IDR_POPUP_IMG_CTXT, ID_IMG_CURPANE_ROTATE_RIGHT_90
-#: Merge.rc:185 Merge.rc:1225
+#: Merge.rc:185 Merge.rc:1235
msgid "Rotate &Right 90deg"
msgstr ""
#. IDR_POPUP_IMG_CTXT, ID_IMG_CURPANE_ROTATE_LEFT_90
-#: Merge.rc:186 Merge.rc:1226
+#: Merge.rc:186 Merge.rc:1236
msgid "Rotate &Left 90deg"
msgstr ""
#. IDR_POPUP_IMG_CTXT, ID_IMG_CURPANE_FLIP_VERTICALLY
-#: Merge.rc:187 Merge.rc:1227
+#: Merge.rc:187 Merge.rc:1237
msgid "Flip V&ertically"
msgstr ""
#. IDR_POPUP_IMG_CTXT, ID_IMG_CURPANE_FLIP_HORIZONTALLY
-#: Merge.rc:188 Merge.rc:1228
+#: Merge.rc:188 Merge.rc:1238
msgid "Flip H&orizontally"
msgstr ""
#. IDR_MERGEDOCTYPE
-#: Merge.rc:193 Merge.rc:699
+#: Merge.rc:193 Merge.rc:706
#, c-format
msgid "&Zoom"
msgstr "Po&većaj"
#. IDR_MERGEDOCTYPE, ID_VIEW_ZOOMIN
-#: Merge.rc:202 Merge.rc:701
+#: Merge.rc:202 Merge.rc:708
#, c-format
msgid "Zoom &In\tCtrl++"
msgstr "Po&većaj\tCtrl++"
#. IDR_MERGEDOCTYPE, ID_VIEW_ZOOMOUT
-#: Merge.rc:203 Merge.rc:702
+#: Merge.rc:203 Merge.rc:709
#, c-format
msgid "Zoom &Out\tCtrl+-"
msgstr "&Smanji\tCtrl+-"
#. IDR_MERGEDOCTYPE, ID_VIEW_ZOOMNORMAL, Zoom to normal
-#: Merge.rc:205 Merge.rc:704
+#: Merge.rc:205 Merge.rc:711
#, c-format
msgid "&Normal\tCtrl+*"
msgstr "&Izvorna veličina\tCtrl+*"
@@ -349,29 +349,29 @@ msgid "Dragging &Mode"
msgstr ""
#. IDR_POPUP_IMG_CTXT, ID_IMG_DRAGGINGMODE_MOVE
-#: Merge.rc:217 Merge.rc:955 Merge.rc:1233
+#: Merge.rc:217 Merge.rc:963 Merge.rc:1243
#, c-format
msgid "&Move"
msgstr "&Pre&mjesti"
#. IDR_POPUP_IMG_CTXT, ID_IMG_DRAGGINGMODE_ADJUST_OFFSET
-#: Merge.rc:218 Merge.rc:1234
+#: Merge.rc:218 Merge.rc:1244
#, c-format
msgid "&Adjust Offset"
msgstr ""
#. IDR_POPUP_IMG_CTXT, ID_IMG_DRAGGINGMODE_VERTICAL_WIPE
-#: Merge.rc:219 Merge.rc:1235
+#: Merge.rc:219 Merge.rc:1245
msgid "&Vertical Wipe"
msgstr ""
#. IDR_POPUP_IMG_CTXT, ID_IMG_DRAGGINGMODE_HORIZONTAL_WIPE
-#: Merge.rc:220 Merge.rc:1236
+#: Merge.rc:220 Merge.rc:1246
msgid "&Horizontal Wipe"
msgstr ""
#. IDR_POPUP_IMG_CTXT, ID_IMG_DRAGGINGMODE_RECTANGLE_SELECT
-#: Merge.rc:221 Merge.rc:1237
+#: Merge.rc:221 Merge.rc:1247
msgid "Rectangle &Select"
msgstr ""
@@ -407,37 +407,37 @@ msgid "Compare Extracted &Text from Images"
msgstr ""
#. IDD_OPEN, IDOK
-#: Merge.rc:272 Merge.rc:1980
+#: Merge.rc:272 Merge.rc:1990
msgid "Co&mpare"
msgstr ""
#. IDR_POPUP_WEBPAGE_COMPARE, ID_WEB_COMPARE_SCREENSHOTS
-#: Merge.rc:274 Merge.rc:1247
+#: Merge.rc:274 Merge.rc:1257
msgid "&Screenshots"
msgstr ""
#. IDR_POPUP_WEBPAGE_COMPARE, ID_WEB_COMPARE_FULLSIZE_SCREENSHOTS
-#: Merge.rc:275 Merge.rc:1248
+#: Merge.rc:275 Merge.rc:1258
msgid "&Full Size Screenshots"
msgstr ""
#. IDR_POPUP_WEBPAGE_COMPARE, ID_WEB_COMPARE_HTMLS
-#: Merge.rc:276 Merge.rc:1249
+#: Merge.rc:276 Merge.rc:1259
msgid "&HTMLs"
msgstr ""
#. IDR_POPUP_WEBPAGE_COMPARE, ID_WEB_COMPARE_TEXTS
-#: Merge.rc:277 Merge.rc:1250
+#: Merge.rc:277 Merge.rc:1260
msgid "&Texts"
msgstr ""
#. IDR_POPUP_WEBPAGE_COMPARE, ID_WEB_COMPARE_RESOURCETREES
-#: Merge.rc:278 Merge.rc:1251
+#: Merge.rc:278 Merge.rc:1261
msgid "&Resource Trees"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_SIZE
-#: Merge.rc:280 Merge.rc:1775
+#: Merge.rc:280 Merge.rc:1785
msgid "&Size"
msgstr ""
@@ -452,27 +452,27 @@ msgid "&Event Sync"
msgstr ""
#. IDR_POPUP_WEBPAGE_SYNC_EVENTS, ID_WEB_SYNC_ENABLED
-#: Merge.rc:291 Merge.rc:1259
+#: Merge.rc:291 Merge.rc:1269
msgid "&Enabled"
msgstr ""
#. IDR_POPUP_WEBPAGE_SYNC_EVENTS, ID_WEB_SYNC_SCROLL
-#: Merge.rc:293 Merge.rc:1261
+#: Merge.rc:293 Merge.rc:1271
msgid "&Scroll"
msgstr ""
#. IDR_POPUP_WEBPAGE_SYNC_EVENTS, ID_WEB_SYNC_CLICK
-#: Merge.rc:294 Merge.rc:1262
+#: Merge.rc:294 Merge.rc:1272
msgid "&Click"
msgstr ""
#. IDR_POPUP_WEBPAGE_SYNC_EVENTS, ID_WEB_SYNC_INPUT
-#: Merge.rc:295 Merge.rc:1263
+#: Merge.rc:295 Merge.rc:1273
msgid "&Input"
msgstr ""
#. IDR_POPUP_WEBPAGE_SYNC_EVENTS, ID_WEB_SYNC_GOBACKFORWARD
-#: Merge.rc:296 Merge.rc:1264
+#: Merge.rc:296 Merge.rc:1274
msgid "&Go Back/Forward"
msgstr ""
@@ -502,4884 +502,4895 @@ msgid "&All Profiles"
msgstr ""
#. IDR_MERGEDOCTYPE
-#: Merge.rc:310 Merge.rc:411 Merge.rc:586
+#: Merge.rc:310 Merge.rc:413 Merge.rc:590
#, c-format
msgid "&File"
msgstr "&Datoteka"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:312 Merge.rc:413 Merge.rc:588
+#: Merge.rc:312 Merge.rc:415 Merge.rc:592
#, c-format
msgid "&New"
msgstr "&Nova usporedba"
#. IDR_POPUP_COMPARE, ID_MERGE_COMPARE_TEXT
-#: Merge.rc:314 Merge.rc:322 Merge.rc:415 Merge.rc:423 Merge.rc:590
-#: Merge.rc:598 Merge.rc:649 Merge.rc:935 Merge.rc:1159 Merge.rc:1171
+#: Merge.rc:314 Merge.rc:323 Merge.rc:417 Merge.rc:426 Merge.rc:594
+#: Merge.rc:603 Merge.rc:655 Merge.rc:942 Merge.rc:1167 Merge.rc:1180
#, c-format
msgid "&Text"
msgstr ""
#. IDR_POPUP_COMPARE, ID_MERGE_COMPARE_TABLE
-#: Merge.rc:315 Merge.rc:323 Merge.rc:416 Merge.rc:424 Merge.rc:591
-#: Merge.rc:599 Merge.rc:650 Merge.rc:936 Merge.rc:1160 Merge.rc:1172
+#: Merge.rc:315 Merge.rc:324 Merge.rc:418 Merge.rc:427 Merge.rc:595
+#: Merge.rc:604 Merge.rc:656 Merge.rc:943 Merge.rc:1168 Merge.rc:1181
msgid "T&able"
msgstr ""
#. IDR_POPUP_COMPARE, ID_MERGE_COMPARE_HEX
-#: Merge.rc:316 Merge.rc:324 Merge.rc:417 Merge.rc:425 Merge.rc:592
-#: Merge.rc:600 Merge.rc:651 Merge.rc:937 Merge.rc:1161 Merge.rc:1173
+#: Merge.rc:316 Merge.rc:325 Merge.rc:419 Merge.rc:428 Merge.rc:596
+#: Merge.rc:605 Merge.rc:657 Merge.rc:944 Merge.rc:1169 Merge.rc:1182
#, c-format
msgid "&Binary"
msgstr ""
#. IDS_IMAGE_MENU
-#: Merge.rc:317 Merge.rc:325 Merge.rc:418 Merge.rc:426 Merge.rc:593
-#: Merge.rc:601 Merge.rc:652 Merge.rc:938 Merge.rc:1162 Merge.rc:1174
-#: Merge.rc:5123
+#: Merge.rc:317 Merge.rc:326 Merge.rc:420 Merge.rc:429 Merge.rc:597
+#: Merge.rc:606 Merge.rc:658 Merge.rc:945 Merge.rc:1170 Merge.rc:1183
+#: Merge.rc:5133
#, c-format
msgid "&Image"
msgstr ""
#. IDR_POPUP_COMPARE, ID_MERGE_COMPARE_WEBPAGE
-#: Merge.rc:318 Merge.rc:326 Merge.rc:419 Merge.rc:427 Merge.rc:594
-#: Merge.rc:602 Merge.rc:653 Merge.rc:939 Merge.rc:1163 Merge.rc:1175
+#: Merge.rc:318 Merge.rc:327 Merge.rc:421 Merge.rc:430 Merge.rc:598
+#: Merge.rc:607 Merge.rc:659 Merge.rc:946 Merge.rc:1171 Merge.rc:1184
msgid "&Webpage"
msgstr ""
+#. IDR_POPUP_NEW, ID_FILE_NEW_FOLDER
+#: Merge.rc:319 Merge.rc:328 Merge.rc:422 Merge.rc:431 Merge.rc:599
+#: Merge.rc:608 Merge.rc:1172
+msgid "&Folder"
+msgstr ""
+
#. IDR_MERGEDOCTYPE
-#: Merge.rc:320 Merge.rc:421 Merge.rc:596
+#: Merge.rc:321 Merge.rc:424 Merge.rc:601
#, c-format
msgid "New (&3 panes)"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_FILE_OPEN
-#: Merge.rc:328 Merge.rc:429 Merge.rc:604
+#: Merge.rc:330 Merge.rc:433 Merge.rc:610
#, c-format
msgid "&Open...\tCtrl+O"
msgstr "&Usporedi...\tCtrl+O"
#. IDR_MERGEDOCTYPE, ID_FILE_OPENCONFLICT
-#: Merge.rc:329 Merge.rc:430 Merge.rc:605
+#: Merge.rc:331 Merge.rc:434 Merge.rc:611
msgid "Open Conflic&t File..."
msgstr "Otvori &konfliktne..."
#. IDR_MERGEDOCTYPE, ID_FILE_OPENCLIPBOARD
-#: Merge.rc:330 Merge.rc:431 Merge.rc:606
+#: Merge.rc:332 Merge.rc:435 Merge.rc:612
msgid "Open C&lipboard"
msgstr ""
#. IDR_POPUP_PROJECT, ID_FILE_OPENPROJECT
-#: Merge.rc:332 Merge.rc:433 Merge.rc:608 Merge.rc:1191
+#: Merge.rc:334 Merge.rc:437 Merge.rc:614 Merge.rc:1201
#, c-format
msgid "Open Pro&ject...\tCtrl+J"
msgstr "Otvori &usporedbu...\tCtrl+J"
#. IDD_OPEN, ID_SAVE_PROJECT
-#: Merge.rc:333 Merge.rc:434 Merge.rc:609 Merge.rc:1193 Merge.rc:1979
+#: Merge.rc:335 Merge.rc:438 Merge.rc:615 Merge.rc:1203 Merge.rc:1989
#, c-format
msgid "Sa&ve Project..."
msgstr "Po&hrani usporedbu..."
#. IDR_MAINFRAME, ID_FILE_PROJECT_MRU_FIRST
-#: Merge.rc:335
+#: Merge.rc:337
#, c-format
msgid "Recent Projects"
msgstr "Zadnje usporedbe"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:336 Merge.rc:445 Merge.rc:657
+#: Merge.rc:338 Merge.rc:449 Merge.rc:664
#, c-format
msgid "Recent F&iles or Folders"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_APP_EXIT
-#: Merge.rc:341 Merge.rc:450 Merge.rc:662
+#: Merge.rc:343 Merge.rc:454 Merge.rc:669
msgid "E&xit\tCtrl+Q"
msgstr "I&zlaz\tCtrl+Q"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:343 Merge.rc:452 Merge.rc:664
+#: Merge.rc:345 Merge.rc:456 Merge.rc:671
#, c-format
msgid "&Edit"
msgstr "&Uređivanje"
#. IDR_MERGEDOCTYPE, ID_EDIT_PASTE
-#: Merge.rc:345 Merge.rc:671
+#: Merge.rc:347 Merge.rc:678
#, c-format
msgid "&Paste\tCtrl+V"
msgstr "&Zalijepi\tCtrl+V"
#. IDR_MERGEDOCTYPE, ID_OPTIONS
-#: Merge.rc:347 Merge.rc:456 Merge.rc:693
+#: Merge.rc:349 Merge.rc:460 Merge.rc:700
#, c-format
msgid "&Options...\tCtrl+,"
msgstr "Pos&tavke...\tCtrl+,"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:349 Merge.rc:458 Merge.rc:695
+#: Merge.rc:351 Merge.rc:462 Merge.rc:702
#, c-format
msgid "&View"
msgstr "&Izgled"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:351 Merge.rc:500 Merge.rc:744
+#: Merge.rc:353 Merge.rc:504 Merge.rc:751
#, c-format
msgid "Ta&b Bar"
msgstr "Traka &oznaka panela"
#. IDR_MERGEDOCTYPE, ID_VIEW_TAB_BAR
-#: Merge.rc:353 Merge.rc:502 Merge.rc:746
+#: Merge.rc:355 Merge.rc:506 Merge.rc:753
msgid "&View Tab Bar"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_VIEW_TAB_BAR_ON_TITLE_BAR
-#: Merge.rc:354 Merge.rc:503 Merge.rc:747
+#: Merge.rc:356 Merge.rc:507 Merge.rc:754
msgid "&On Title Bar"
msgstr ""
#. IDR_MERGEDOCTYPE
-#: Merge.rc:356 Merge.rc:505 Merge.rc:749
+#: Merge.rc:358 Merge.rc:509 Merge.rc:756
#, c-format
msgid "&Toolbar"
msgstr "Traka &alata"
#. IDR_MERGEDOCTYPE, ID_TOOLBAR_SMALL
-#: Merge.rc:359 Merge.rc:508 Merge.rc:752
+#: Merge.rc:361 Merge.rc:512 Merge.rc:759
#, c-format
msgid "&Small"
msgstr "&Male ikone"
#. IDR_MERGEDOCTYPE, ID_TOOLBAR_MEDIUM
-#: Merge.rc:360 Merge.rc:509 Merge.rc:753
+#: Merge.rc:362 Merge.rc:513 Merge.rc:760
msgid "&Medium"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_TOOLBAR_BIG
-#: Merge.rc:361 Merge.rc:510 Merge.rc:754
+#: Merge.rc:363 Merge.rc:514 Merge.rc:761
#, c-format
msgid "&Big"
msgstr "&Velike ikone"
#. IDR_MERGEDOCTYPE, ID_TOOLBAR_HUGE
-#: Merge.rc:362 Merge.rc:511 Merge.rc:755
+#: Merge.rc:364 Merge.rc:515 Merge.rc:762
#, c-format
msgid "&Huge"
msgstr ""
#. IDS_VIEW_MENU_BAR
-#: Merge.rc:364 Merge.rc:513 Merge.rc:757 Merge.rc:5357
+#: Merge.rc:366 Merge.rc:517 Merge.rc:764 Merge.rc:5368
msgid "Men&u Bar"
msgstr ""
#. IDR_DIRDOCTYPE, ID_VIEW_OUTPUT_BAR
-#: Merge.rc:365 Merge.rc:515
+#: Merge.rc:367 Merge.rc:519
msgid "&Output Pane"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_VIEW_STATUS_BAR
-#: Merge.rc:366 Merge.rc:516 Merge.rc:758
+#: Merge.rc:368 Merge.rc:520 Merge.rc:765
#, c-format
msgid "&Status Bar"
msgstr "Traka &statusa"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:368 Merge.rc:539 Merge.rc:847
+#: Merge.rc:370 Merge.rc:543 Merge.rc:854
#, c-format
msgid "&Tools"
msgstr "&Alati"
#. IDR_MERGEDOCTYPE, ID_TOOLS_FILTERS
-#: Merge.rc:370 Merge.rc:542 Merge.rc:849
+#: Merge.rc:372 Merge.rc:546 Merge.rc:856
#, c-format
msgid "&Filters..."
msgstr "&Filtri..."
#. IDR_MERGEDOCTYPE, ID_TOOLS_GENERATEPATCH
-#: Merge.rc:371 Merge.rc:543 Merge.rc:850
+#: Merge.rc:373 Merge.rc:547 Merge.rc:857
#, c-format
msgid "&Generate Patch..."
msgstr "&Pohrani razlike (Patch)..."
#. IDR_MERGEDOCTYPE
-#: Merge.rc:373 Merge.rc:546 Merge.rc:853
+#: Merge.rc:375 Merge.rc:550 Merge.rc:860
#, c-format
msgid "&Plugins"
msgstr "Doda&ci"
#. IDD_PLUGINS_LIST, IDC_PLUGIN_SETTINGS
-#: Merge.rc:375 Merge.rc:548 Merge.rc:855 Merge.rc:2494 Merge.rc:2926
+#: Merge.rc:377 Merge.rc:552 Merge.rc:862 Merge.rc:2504 Merge.rc:2936
#, c-format
msgid "P&lugin Settings..."
msgstr ""
#. IDR_MERGEDOCTYPE, ID_PREDIFFER_MANUAL
-#: Merge.rc:377 Merge.rc:550 Merge.rc:857
+#: Merge.rc:379 Merge.rc:554 Merge.rc:864
#, c-format
msgid "Ma&nual Prediffer"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_PREDIFFER_AUTO
-#: Merge.rc:378 Merge.rc:551 Merge.rc:858
+#: Merge.rc:380 Merge.rc:555 Merge.rc:865
#, c-format
msgid "A&utomatic Prediffer"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_UNPACK_MANUAL
-#: Merge.rc:380 Merge.rc:553 Merge.rc:860
+#: Merge.rc:382 Merge.rc:557 Merge.rc:867
#, c-format
msgid "&Manual Unpacking"
msgstr "&Ručno raspakiravanje"
#. IDR_MERGEDOCTYPE, ID_UNPACK_AUTO
-#: Merge.rc:381 Merge.rc:554 Merge.rc:861
+#: Merge.rc:383 Merge.rc:558 Merge.rc:868
#, c-format
msgid "&Automatic Unpacking"
msgstr "&Automatsko raspakiravanje"
#. IDR_MERGEDOCTYPE, ID_RELOAD_PLUGINS
-#: Merge.rc:383 Merge.rc:558 Merge.rc:889
+#: Merge.rc:385 Merge.rc:562 Merge.rc:896
#, c-format
msgid "&Reload Plugins"
msgstr "&Učitaj dodatke ponovo"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:385 Merge.rc:560 Merge.rc:891
+#: Merge.rc:387 Merge.rc:564 Merge.rc:898
#, c-format
msgid "&Window"
msgstr "Paneli i &okna"
#. IDR_MERGEDOCTYPE, ID_FILE_CLOSE
-#: Merge.rc:387 Merge.rc:562 Merge.rc:893
+#: Merge.rc:389 Merge.rc:566 Merge.rc:900
msgid "Cl&ose\tCtrl+W"
msgstr "&Zatvori panele\tCtrl+W"
#. IDR_MERGEDOCTYPE, ID_WINDOW_CLOSEALL
-#: Merge.rc:388 Merge.rc:563 Merge.rc:894
+#: Merge.rc:390 Merge.rc:567 Merge.rc:901
#, c-format
msgid "Clo&se All"
msgstr "Zatvori &sve panele"
#. IDR_MERGEDOCTYPE, ID_NEXT_PANE
-#: Merge.rc:390 Merge.rc:565 Merge.rc:896
+#: Merge.rc:392 Merge.rc:569 Merge.rc:903
#, c-format
msgid "Change &Pane\tF6"
msgstr "&Drugi panel\tF6"
#. IDR_MERGEDOCTYPE, ID_WINDOW_TILE_HORZ
-#: Merge.rc:392 Merge.rc:567 Merge.rc:900
+#: Merge.rc:394 Merge.rc:571 Merge.rc:907
#, c-format
msgid "Tile &Horizontally"
msgstr "Okna &vodoravno"
#. IDR_MERGEDOCTYPE, ID_WINDOW_TILE_VERT
-#: Merge.rc:393 Merge.rc:568 Merge.rc:901
+#: Merge.rc:395 Merge.rc:572 Merge.rc:908
#, c-format
msgid "Tile &Vertically"
msgstr "Okna &okomito"
#. IDR_MERGEDOCTYPE, ID_WINDOW_CASCADE
-#: Merge.rc:394 Merge.rc:569 Merge.rc:902
+#: Merge.rc:396 Merge.rc:573 Merge.rc:909
#, c-format
msgid "&Cascade"
msgstr "Okna &kaskadno"
#. IDS_MESSAGEBOX_HELP
-#: Merge.rc:396 Merge.rc:571 Merge.rc:904 Merge.rc:3200 Merge.rc:4189
+#: Merge.rc:398 Merge.rc:575 Merge.rc:911 Merge.rc:3210 Merge.rc:4199
#, c-format
msgid "&Help"
msgstr "&Pomoć"
#. IDR_MERGEDOCTYPE, ID_HELP_CONTENTS
-#: Merge.rc:398 Merge.rc:573 Merge.rc:906
+#: Merge.rc:400 Merge.rc:577 Merge.rc:913
#, c-format
msgid "&WinMerge Help\tF1"
msgstr "&WinMerge Pomoć\tF1"
#. IDR_MERGEDOCTYPE, ID_HELP_RELEASENOTES
-#: Merge.rc:400 Merge.rc:575 Merge.rc:908
+#: Merge.rc:402 Merge.rc:579 Merge.rc:915
#, c-format
msgid "R&elease Notes"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_HELP_TRANSLATIONS
-#: Merge.rc:401 Merge.rc:576 Merge.rc:909
+#: Merge.rc:403 Merge.rc:580 Merge.rc:916
#, c-format
msgid "&Translations"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_HELP_GETCONFIG
-#: Merge.rc:402 Merge.rc:577 Merge.rc:910
+#: Merge.rc:404 Merge.rc:581 Merge.rc:917
#, c-format
msgid "C&onfiguration"
msgstr "Po&dešenost"
#. IDR_MERGEDOCTYPE, ID_HELP_GNULICENSE
-#: Merge.rc:404 Merge.rc:579 Merge.rc:912
+#: Merge.rc:406 Merge.rc:583 Merge.rc:919
#, c-format
msgid "&GNU General Public License"
msgstr "&GNU javna licenca"
#. IDR_MERGEDOCTYPE, ID_APP_ABOUT
-#: Merge.rc:405 Merge.rc:580 Merge.rc:913
+#: Merge.rc:407 Merge.rc:584 Merge.rc:920
#, c-format
msgid "&About WinMerge..."
msgstr "&O WinMerge..."
#. IDR_MERGEDOCTYPE
-#: Merge.rc:436 Merge.rc:629
+#: Merge.rc:440 Merge.rc:635
#, c-format
msgid "&Read-Only"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_FILE_LEFT_READONLY
-#: Merge.rc:438 Merge.rc:631
+#: Merge.rc:442 Merge.rc:637
#, c-format
msgid "L&eft Read-Only"
msgstr "Samo za čitanje - l&ijeva"
#. IDR_MERGEDOCTYPE, ID_FILE_MIDDLE_READONLY
-#: Merge.rc:439 Merge.rc:632
+#: Merge.rc:443 Merge.rc:638
#, c-format
msgid "M&iddle Read-Only"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_FILE_RIGHT_READONLY
-#: Merge.rc:440 Merge.rc:633
+#: Merge.rc:444 Merge.rc:639
#, c-format
msgid "Ri&ght Read-Only"
msgstr "Samo za čitanje - d&esna"
#. IDD_ENCODINGERROR, IDC_FILEENCODING
-#: Merge.rc:443 Merge.rc:646 Merge.rc:1038 Merge.rc:3063
+#: Merge.rc:447 Merge.rc:652 Merge.rc:1046 Merge.rc:3073
#, c-format
msgid "&File Encoding..."
msgstr "De&kodiranje datoteke..."
#. IDR_POPUP_OUTPUTVIEW, ID_EDIT_SELECT_ALL
-#: Merge.rc:454 Merge.rc:674 Merge.rc:1343
+#: Merge.rc:458 Merge.rc:681 Merge.rc:1353
#, c-format
msgid "Select &All\tCtrl+A"
msgstr "Označi &sve\tCtrl+A"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWIDENTICAL
-#: Merge.rc:460
+#: Merge.rc:464
#, c-format
msgid "Show &Identical Items"
msgstr "Prikaži &identične stavke"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWDIFFERENT
-#: Merge.rc:461
+#: Merge.rc:465
#, c-format
msgid "Show &Different Items"
msgstr "Prikaži &različite stavke"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWUNIQUELEFT
-#: Merge.rc:462
+#: Merge.rc:466
#, c-format
msgid "Show L&eft Unique Items"
msgstr "Prikaži l&ijeve unikatne stavke"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWUNIQUEMIDDLE
-#: Merge.rc:463
+#: Merge.rc:467
#, c-format
msgid "Show Midd&le Unique Items"
msgstr ""
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWUNIQUERIGHT
-#: Merge.rc:464
+#: Merge.rc:468
#, c-format
msgid "Show Ri&ght Unique Items"
msgstr "Prikaži d&esne unikatne stavke"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWSKIPPED
-#: Merge.rc:465
+#: Merge.rc:469
#, c-format
msgid "Show S&kipped Items"
msgstr "Prikaži &izostavljene stavke"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWBINARIES
-#: Merge.rc:466
+#: Merge.rc:470
#, c-format
msgid "S&how Binary Files"
msgstr "Prikaži &binarne datoteke"
#. IDR_DIRDOCTYPE
-#: Merge.rc:467
+#: Merge.rc:471
#, c-format
msgid "&3-way Compare"
msgstr ""
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWDIFFERENTLEFTONLY
-#: Merge.rc:469
+#: Merge.rc:473
#, c-format
msgid "Show &Left Only Different Items"
msgstr ""
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWDIFFERENTMIDDLEONLY
-#: Merge.rc:470
+#: Merge.rc:474
#, c-format
msgid "Show &Middle Only Different Items"
msgstr ""
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWDIFFERENTRIGHTONLY
-#: Merge.rc:471
+#: Merge.rc:475
#, c-format
msgid "Show &Right Only Different Items"
msgstr ""
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWMISSINGLEFTONLY
-#: Merge.rc:473
+#: Merge.rc:477
msgid "Show L&eft Only Missing Items"
msgstr ""
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWMISSINGMIDDLEONLY
-#: Merge.rc:474
+#: Merge.rc:478
msgid "Show Mi&ddle Only Missing Items"
msgstr ""
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWMISSINGRIGHTONLY
-#: Merge.rc:475
+#: Merge.rc:479
msgid "Show Rig&ht Only Missing Items"
msgstr ""
#. IDR_DIRDOCTYPE, ID_VIEW_SHOWHIDDENITEMS
-#: Merge.rc:478
+#: Merge.rc:482
#, c-format
msgid "Show Hidd&en Items"
msgstr "Prikaži skri&vene stavke"
#. IDR_DIRDOCTYPE, ID_VIEW_TREEMODE
-#: Merge.rc:480
+#: Merge.rc:484
#, c-format
msgid "Tree &Mode"
msgstr "Prikaz &stabla"
#. IDR_DIRDOCTYPE
-#: Merge.rc:481
+#: Merge.rc:485
msgid "E&xpand Subfolders"
msgstr ""
#. IDR_DIRDOCTYPE, ID_VIEW_EXPAND_ALLSUBDIRS
-#: Merge.rc:483
+#: Merge.rc:487
msgid "&All Subfolders"
msgstr ""
#. IDR_DIRDOCTYPE, ID_VIEW_EXPAND_DIFFERENT_SUBDIRS
-#: Merge.rc:484
+#: Merge.rc:488
msgid "&Different Subfolders"
msgstr ""
#. IDR_DIRDOCTYPE, ID_VIEW_EXPAND_IDENTICAL_SUBDIRS
-#: Merge.rc:485
+#: Merge.rc:489
msgid "&Identical Subfolders"
msgstr ""
#. IDR_DIRDOCTYPE, ID_VIEW_COLLAPSE_ALLSUBDIRS
-#: Merge.rc:487
+#: Merge.rc:491
#, c-format
msgid "&Collapse All Subfolders"
msgstr "&Zatvori sve podmape"
#. IDR_DIRDOCTYPE, ID_VIEW_SHOW_EMPTY_FOLDERS
-#: Merge.rc:488
+#: Merge.rc:492
msgid "Show &Empty Folders"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_VIEW_SELECTFONT
-#: Merge.rc:490 Merge.rc:697
+#: Merge.rc:494 Merge.rc:704
#, c-format
msgid "Select &Font..."
msgstr "Izbor &fonta..."
#. IDR_MERGEDOCTYPE, ID_VIEW_USEDEFAULTFONT
-#: Merge.rc:491 Merge.rc:698
+#: Merge.rc:495 Merge.rc:705
#, c-format
msgid "Use Default Font"
msgstr "Koristi standardni f&ont"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:493 Merge.rc:736
+#: Merge.rc:497 Merge.rc:743
#, c-format
msgid "Sw&ap Panes"
msgstr "&Zamijeni panele"
#. IDR_MERGEDOCTYPE, ID_SWAPPANES_SWAP12
-#: Merge.rc:495 Merge.rc:738
+#: Merge.rc:499 Merge.rc:745
msgid "Swap &1st | 2nd"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_SWAPPANES_SWAP23
-#: Merge.rc:496 Merge.rc:739
+#: Merge.rc:500 Merge.rc:746
msgid "Swap &2nd | 3rd"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_SWAPPANES_SWAP13
-#: Merge.rc:497 Merge.rc:740
+#: Merge.rc:501 Merge.rc:747
msgid "Swap 1st | &3rd"
msgstr ""
#. IDR_DIRDOCTYPE, ID_VIEW_DISPLAY_FILTER_BAR_MENU
-#: Merge.rc:514
+#: Merge.rc:518
msgid "Displa&y Filter Bar\tCtrl+Shift+L"
msgstr ""
#. IDR_DIRDOCTYPE, ID_VIEW_DIR_STATISTICS
-#: Merge.rc:518
+#: Merge.rc:522
#, c-format
msgid "Com&pare Statistics..."
msgstr "Usporedbena &statistika..."
#. IDR_MERGEDOCTYPE, ID_REFRESH
-#: Merge.rc:520 Merge.rc:763
+#: Merge.rc:524 Merge.rc:770
#, c-format
msgid "Refresh\tF5"
msgstr "Osv&ježi\tF5"
#. IDR_POPUP_DIRVIEW, ID_RESCAN
-#: Merge.rc:521 Merge.rc:1030
+#: Merge.rc:525 Merge.rc:1038
#, c-format
msgid "&Refresh Selected\tCtrl+F5"
msgstr "&Osvježi odabir\tCtrl+F5"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:523 Merge.rc:765
+#: Merge.rc:527 Merge.rc:772
#, c-format
msgid "&Merge"
msgstr "U&sporedo"
#. IDR_DIRDOCTYPE, ID_MERGE_COMPARE
-#: Merge.rc:525
+#: Merge.rc:529
#, c-format
msgid "Co&mpare\tEnter"
msgstr "Us&poredi\tEnter"
#. IDR_MERGEDOCTYPE, ID_NEXTDIFF
-#: Merge.rc:527 Merge.rc:767
+#: Merge.rc:531 Merge.rc:774
#, c-format
msgid "&Next Difference\tAlt+Down"
msgstr "&Slijedeća razlika\tAlt+Down"
#. IDR_MERGEDOCTYPE, ID_PREVDIFF
-#: Merge.rc:528 Merge.rc:768
+#: Merge.rc:532 Merge.rc:775
#, c-format
msgid "&Previous Difference\tAlt+Up"
msgstr "&Prethodna razlika\tAlt+Up"
#. IDR_MERGEDOCTYPE, ID_FIRSTDIFF
-#: Merge.rc:530 Merge.rc:773
+#: Merge.rc:534 Merge.rc:780
#, c-format
msgid "&First Difference\tAlt+Home"
msgstr "&Prva razlika\tAlt+Home"
#. IDR_MERGEDOCTYPE, ID_CURDIFF
-#: Merge.rc:531 Merge.rc:774
+#: Merge.rc:535 Merge.rc:781
#, c-format
msgid "&Current Difference\tAlt+Enter"
msgstr "&Aktivna razlika\tAlt+Enter"
#. IDR_MERGEDOCTYPE, ID_LASTDIFF
-#: Merge.rc:532 Merge.rc:775
+#: Merge.rc:536 Merge.rc:782
#, c-format
msgid "&Last Difference\tAlt+End"
msgstr "&Zadnja razlika\tAlt+End"
#. IDR_MERGEDOCTYPE, ID_L2R
-#: Merge.rc:534 Merge.rc:830
+#: Merge.rc:538 Merge.rc:837
#, c-format
msgid "Copy to &Right\tAlt+Right"
msgstr "Kopiraj u &desno\tAlt+Right"
#. IDR_MERGEDOCTYPE, ID_R2L
-#: Merge.rc:535 Merge.rc:831
+#: Merge.rc:539 Merge.rc:838
#, c-format
msgid "Copy to L&eft\tAlt+Left"
msgstr "Kopiraj u &lijevo\tAlt+Left"
#. IDR_DIRDOCTYPE, ID_MERGE_DELETE
-#: Merge.rc:537
+#: Merge.rc:541
#, c-format
msgid "&Delete\tDel"
msgstr "&Obriši\tDel"
#. IDR_POPUP_DIRVIEW, ID_TOOLS_CUSTOMIZECOLUMNS
-#: Merge.rc:541 Merge.rc:1042
+#: Merge.rc:545 Merge.rc:1050
#, c-format
msgid "&Customize Columns..."
msgstr "&Prilagodba kolona..."
#. IDR_MERGEDOCTYPE, ID_TOOLS_GENERATEREPORT
-#: Merge.rc:544 Merge.rc:851
+#: Merge.rc:548 Merge.rc:858
#, c-format
msgid "Generate &Report..."
msgstr "Pohrani &izvještaj..."
#. IDD_ENCODINGERROR, IDC_PLUGIN
-#: Merge.rc:556 Merge.rc:867 Merge.rc:3064
+#: Merge.rc:560 Merge.rc:874 Merge.rc:3074
#, c-format
msgid "&Edit with Unpacker..."
msgstr ""
#. IDR_MERGEDOCTYPE, ID_FILE_SAVE
-#: Merge.rc:611
+#: Merge.rc:617
#, c-format
msgid "&Save\tCtrl+S"
msgstr "&Pohrani\tCtrl+S"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:612
+#: Merge.rc:618
#, c-format
msgid "Sav&e"
msgstr ""
#. IDR_POPUP_SAVE, ID_FILE_SAVE_LEFT
-#: Merge.rc:614 Merge.rc:1201
+#: Merge.rc:620 Merge.rc:1211
#, c-format
msgid "Save &Left"
msgstr "&Lijevu datoteku"
#. IDR_POPUP_SAVE, ID_FILE_SAVE_MIDDLE
-#: Merge.rc:615 Merge.rc:1202
+#: Merge.rc:621 Merge.rc:1212
#, c-format
msgid "Save &Middle"
msgstr ""
#. IDR_POPUP_SAVE, ID_FILE_SAVE_RIGHT
-#: Merge.rc:616 Merge.rc:1203
+#: Merge.rc:622 Merge.rc:1213
#, c-format
msgid "Save &Right"
msgstr "&Desnu datoteku"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:618
+#: Merge.rc:624
#, c-format
msgid "Save &As"
msgstr ""
#. IDR_POPUP_SAVE, ID_FILE_SAVEAS_LEFT
-#: Merge.rc:620 Merge.rc:1205
+#: Merge.rc:626 Merge.rc:1215
#, c-format
msgid "Save &Left As..."
msgstr ""
#. IDR_POPUP_SAVE, ID_FILE_SAVEAS_MIDDLE
-#: Merge.rc:621 Merge.rc:1206
+#: Merge.rc:627 Merge.rc:1216
#, c-format
msgid "Save &Middle As..."
msgstr ""
#. IDR_POPUP_SAVE, ID_FILE_SAVEAS_RIGHT
-#: Merge.rc:622 Merge.rc:1207
+#: Merge.rc:628 Merge.rc:1217
#, c-format
msgid "Save &Right As..."
msgstr ""
#. IDR_MERGEDOCTYPE, ID_FILE_PRINT
-#: Merge.rc:625
+#: Merge.rc:631
msgid "&Print...\tCtrl+P"
msgstr "&Ispis\tCtrl+P"
#. IDR_MERGEDOCTYPE, ID_FILE_PAGE_SETUP
-#: Merge.rc:626
+#: Merge.rc:632
msgid "Page Set&up..."
msgstr "Postava &stranice..."
#. IDR_MERGEDOCTYPE, ID_FILE_PRINT_PREVIEW
-#: Merge.rc:627
+#: Merge.rc:633
msgid "Print Previe&w..."
msgstr "&Pregled ispisa..."
#. IDR_MERGEDOCTYPE
-#: Merge.rc:636
+#: Merge.rc:642
#, c-format
msgid "&Convert Line Endings to"
msgstr "&Završi retke prema"
#. IDR_MERGEDOCTYPE, ID_FILE_MERGINGMODE
-#: Merge.rc:643
+#: Merge.rc:649
#, c-format
msgid "Mer&ge Mode\tF9"
msgstr "Usporedni način"
#. IDR_MERGEDOCTYPE, ID_RESCAN
-#: Merge.rc:645
+#: Merge.rc:651
msgid "Reloa&d\tCtrl+F5"
msgstr ""
#. IDR_MERGEDOCTYPE
-#: Merge.rc:647
+#: Merge.rc:653
#, c-format
msgid "Reco&mpare As"
msgstr ""
+#. IDR_POPUP_COMPARE, ID_MERGE_COMPARE_FOLDER
+#: Merge.rc:660 Merge.rc:947 Merge.rc:1185
+msgid "A&rchive"
+msgstr ""
+
#. IDR_MERGEDOCTYPE, ID_EDIT_UNDO
-#: Merge.rc:666
+#: Merge.rc:673
#, c-format
msgid "&Undo\tCtrl+Z"
msgstr "&Poništi\tCtrl+Z"
#. IDR_MERGEDOCTYPE, ID_EDIT_REDO
-#: Merge.rc:667
+#: Merge.rc:674
#, c-format
msgid "&Redo\tCtrl+Y"
msgstr "&Vrati\tCtrl+Y"
#. IDR_MERGEDOCTYPE, ID_EDIT_CUT
-#: Merge.rc:669
+#: Merge.rc:676
#, c-format
msgid "Cu&t\tCtrl+X"
msgstr "Od&reži\tCtrl+X"
#. IDR_POPUP_OUTPUTVIEW, ID_EDIT_COPY
-#: Merge.rc:670 Merge.rc:1342
+#: Merge.rc:677 Merge.rc:1352
#, c-format
msgid "&Copy\tCtrl+C"
msgstr "&Kopiraj\tCtrl+C"
#. IDR_MERGEDOCTYPE, ID_EDIT_FIND
-#: Merge.rc:676
+#: Merge.rc:683
#, c-format
msgid "F&ind...\tCtrl+F"
msgstr "&Nađi...\tCtrl+F"
#. IDR_MERGEDOCTYPE, ID_EDIT_REPLACE
-#: Merge.rc:677
+#: Merge.rc:684
#, c-format
msgid "Repla&ce...\tCtrl+H"
msgstr "Za&mijeni...\tCtrl+H"
#. IDR_MERGEDOCTYPE, ID_EDIT_MARK
-#: Merge.rc:678
+#: Merge.rc:685
#, c-format
msgid "&Marker...\tCtrl+Shift+M"
msgstr ""
#. IDR_MERGEDOCTYPE
-#: Merge.rc:680
+#: Merge.rc:687
#, c-format
msgid "Advanced"
msgstr "Dodatno"
#. IDR_MERGEDOCTYPE, ID_EDIT_COPY_LINENUMBERS
-#: Merge.rc:682
+#: Merge.rc:689
#, c-format
msgid "&Copy With Line Numbers\tCtrl+Shift+C"
msgstr "&Kopiraj s brojevima redaka\tCtrl+Shift+C"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:684
+#: Merge.rc:691
#, c-format
msgid "&Bookmarks"
msgstr "&Oznake"
#. IDR_MERGEDOCTYPE, ID_EDIT_TOGGLE_BOOKMARK
-#: Merge.rc:686
+#: Merge.rc:693
#, c-format
msgid "&Toggle Bookmark\tCtrl+F2"
msgstr "Zamijeni oznake\tCtrl+F2"
#. IDR_MERGEDOCTYPE, ID_EDIT_GOTO_NEXT_BOOKMARK
-#: Merge.rc:687
+#: Merge.rc:694
#, c-format
msgid "&Next Bookmark\tF2"
msgstr "&Slijedeća oznaka\tF2"
#. IDR_MERGEDOCTYPE, ID_EDIT_GOTO_PREV_BOOKMARK
-#: Merge.rc:688
+#: Merge.rc:695
#, c-format
msgid "&Previous Bookmark\tShift+F2"
msgstr "&Prethodna oznaka\tShift+F2"
#. IDR_MERGEDOCTYPE, ID_EDIT_CLEAR_ALL_BOOKMARKS
-#: Merge.rc:689
+#: Merge.rc:696
#, c-format
msgid "&Clear All Bookmarks"
msgstr "Ukloni sve oznake"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:706
+#: Merge.rc:713
#, c-format
msgid "Syntax Highlight"
msgstr "Označavanje sintakse"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:711
+#: Merge.rc:718
#, c-format
msgid "&Diff Context"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_ALL
-#: Merge.rc:713
+#: Merge.rc:720
#, c-format
msgid "&All Lines"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_0
-#: Merge.rc:715
+#: Merge.rc:722
#, c-format
msgid "&0 Lines"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_1
-#: Merge.rc:716
+#: Merge.rc:723
#, c-format
msgid "&1 Line"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_3
-#: Merge.rc:717
+#: Merge.rc:724
#, c-format
msgid "&3 Lines"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_5
-#: Merge.rc:718
+#: Merge.rc:725
#, c-format
msgid "&5 Lines"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_7
-#: Merge.rc:719
+#: Merge.rc:726
#, c-format
msgid "&7 Lines"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_9
-#: Merge.rc:720
+#: Merge.rc:727
#, c-format
msgid "&9 Lines"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_TOGGLE
-#: Merge.rc:722
+#: Merge.rc:729
#, c-format
msgid "&Toggle All and 0-9 Lines\tCtrl+D"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_INVERT
-#: Merge.rc:724
+#: Merge.rc:731
msgid "&Invert (Hide Different Lines)"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_VIEW_RESIZE_PANES
-#: Merge.rc:727
+#: Merge.rc:734
#, c-format
msgid "&Lock Panes"
msgstr "Za&ključaj panele"
#. IDR_MERGEDOCTYPE, ID_VIEW_WHITESPACE
-#: Merge.rc:728
+#: Merge.rc:735
#, c-format
msgid "&View Whitespace"
msgstr "Skriv&eni znaci i razmaci"
#. IDR_MERGEDOCTYPE, ID_VIEW_EOL
-#: Merge.rc:729
+#: Merge.rc:736
msgid "View E&OL"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_VIEW_LINEDIFFS
-#: Merge.rc:730
+#: Merge.rc:737
#, c-format
msgid "Vie&w Line Differences"
msgstr "Prikaži razli&čitost redaka"
#. IDR_MERGEDOCTYPE, ID_VIEW_LINENUMBERS
-#: Merge.rc:731
+#: Merge.rc:738
#, c-format
msgid "View Line &Numbers"
msgstr "Prikaži &brojeve redaka"
#. IDR_MERGEDOCTYPE, ID_VIEW_SELMARGIN
-#: Merge.rc:732
+#: Merge.rc:739
#, c-format
msgid "View &Margins"
msgstr "Prikaži &margine"
#. IDR_MERGEDOCTYPE, ID_VIEW_TOPMARGIN
-#: Merge.rc:733
+#: Merge.rc:740
msgid "View To&p Margins"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_VIEW_WORDWRAP
-#: Merge.rc:734
+#: Merge.rc:741
#, c-format
msgid "W&rap Lines"
msgstr "Pre&lomi retke"
#. IDR_MERGEDOCTYPE, ID_VIEW_SPLITVERTICALLY
-#: Merge.rc:742
+#: Merge.rc:749
#, c-format
msgid "Split V&ertically"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_VIEW_DETAIL_BAR
-#: Merge.rc:759
+#: Merge.rc:766
#, c-format
msgid "Diff &Pane"
msgstr "Panel &razlika"
#. IDR_MERGEDOCTYPE, ID_VIEW_LOCATION_BAR
-#: Merge.rc:760
+#: Merge.rc:767
#, c-format
msgid "Lo&cation Pane"
msgstr "Panel &položaja"
#. IDS_OUTPUTBAR_CAPTION
-#: Merge.rc:761 Merge.rc:4902
+#: Merge.rc:768 Merge.rc:4912
msgid "Output Pane"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_NEXTCONFLICT
-#: Merge.rc:770
+#: Merge.rc:777
#, c-format
msgid "Ne&xt Conflict\tAlt+Shift+Down"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_PREVCONFLICT
-#: Merge.rc:771
+#: Merge.rc:778
#, c-format
msgid "Pre&vious Conflict\tAlt+Shift+Up"
msgstr ""
#. IDR_MERGEDOCTYPE
-#: Merge.rc:777
+#: Merge.rc:784
#, c-format
msgid "A&dvanced"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_NEXTDIFFLM
-#: Merge.rc:779
+#: Merge.rc:786
#, c-format
msgid "Next Difference (Left/Middle)\tAlt+1"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_PREVDIFFLM
-#: Merge.rc:780
+#: Merge.rc:787
#, c-format
msgid "Previous Difference (Left/Middle)\tAlt+Shift+1"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_NEXTDIFFLR
-#: Merge.rc:782
+#: Merge.rc:789
#, c-format
msgid "Next Difference (Left/Right)\tAlt+2"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_PREVDIFFLR
-#: Merge.rc:783
+#: Merge.rc:790
#, c-format
msgid "Previous Difference (Left/Right)\tAlt+Shift+2"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_NEXTDIFFMR
-#: Merge.rc:785
+#: Merge.rc:792
#, c-format
msgid "Next Difference (Middle/Right)\tAlt+3"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_PREVDIFFMR
-#: Merge.rc:786
+#: Merge.rc:793
#, c-format
msgid "Previous Difference (Middle/Right)\tAlt+Shift+3"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_NEXTDIFFLO
-#: Merge.rc:788
+#: Merge.rc:795
#, c-format
msgid "Next Left-Only Difference\tAlt+7"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_PREVDIFFLO
-#: Merge.rc:789
+#: Merge.rc:796
#, c-format
msgid "Previous Left-Only Difference\tAlt+Shift+7"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_NEXTDIFFMO
-#: Merge.rc:791
+#: Merge.rc:798
#, c-format
msgid "Next Middle-Only Difference\tAlt+8"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_PREVDIFFMO
-#: Merge.rc:792
+#: Merge.rc:799
#, c-format
msgid "Previous Middle-Only Difference\tAlt+Shift+8"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_NEXTDIFFRO
-#: Merge.rc:794
+#: Merge.rc:801
#, c-format
msgid "Next Right-Only Difference\tAlt+9"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_PREVDIFFRO
-#: Merge.rc:795
+#: Merge.rc:802
#, c-format
msgid "Previous Right-Only Difference\tAlt+Shift+9"
msgstr ""
#. IDR_MERGEDOCTYPE
-#: Merge.rc:797
+#: Merge.rc:804
msgid "Copy from &Left to"
msgstr ""
#. IDD_LOAD_SAVE_CODEPAGE, IDC_AFFECTS_MIDDLE_BTN
-#: Merge.rc:799 Merge.rc:810 Merge.rc:815 Merge.rc:826 Merge.rc:970
-#: Merge.rc:2545 Merge.rc:2817
+#: Merge.rc:806 Merge.rc:817 Merge.rc:822 Merge.rc:833 Merge.rc:978
+#: Merge.rc:2555 Merge.rc:2827
#, c-format
msgid "&Middle"
msgstr ""
#. IDD_LOAD_SAVE_CODEPAGE, IDC_AFFECTS_RIGHT_BTN
-#: Merge.rc:800 Merge.rc:805 Merge.rc:816 Merge.rc:821 Merge.rc:971
-#: Merge.rc:2546 Merge.rc:2819
+#: Merge.rc:807 Merge.rc:812 Merge.rc:823 Merge.rc:828 Merge.rc:979
+#: Merge.rc:2556 Merge.rc:2829
#, c-format
msgid "&Right"
msgstr "&desnu datoteku"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:802
+#: Merge.rc:809
msgid "Copy from &Middle to"
msgstr ""
#. IDD_LOAD_SAVE_CODEPAGE, IDC_AFFECTS_LEFT_BTN
-#: Merge.rc:804 Merge.rc:809 Merge.rc:820 Merge.rc:825 Merge.rc:969
-#: Merge.rc:2544 Merge.rc:2815
+#: Merge.rc:811 Merge.rc:816 Merge.rc:827 Merge.rc:832 Merge.rc:977
+#: Merge.rc:2554 Merge.rc:2825
#, c-format
msgid "&Left"
msgstr "&lijevu datoteku"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:807
+#: Merge.rc:814
msgid "Copy from &Right to"
msgstr ""
#. IDR_MERGEDOCTYPE
-#: Merge.rc:813
+#: Merge.rc:820
msgid "Copy Selected Lines from Le&ft to"
msgstr ""
#. IDR_MERGEDOCTYPE
-#: Merge.rc:818
+#: Merge.rc:825
msgid "Copy Selected Lines from Mi&ddle to"
msgstr ""
#. IDR_MERGEDOCTYPE
-#: Merge.rc:823
+#: Merge.rc:830
msgid "Copy Selected Lines from Ri&ght to"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_COPY_FROM_LEFT
-#: Merge.rc:833
+#: Merge.rc:840
#, c-format
msgid "Copy from Left\tAlt+Shift+Right"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_COPY_FROM_RIGHT
-#: Merge.rc:834
+#: Merge.rc:841
#, c-format
msgid "Copy from Right\tAlt+Shift+Left"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_L2RNEXT
-#: Merge.rc:836
+#: Merge.rc:843
msgid "C&opy to Right and Advance\tCtrl+Alt+Right"
msgstr "Kopiraj u de&sno i nastavi\tCtrl+Alt+desno"
#. IDR_MERGEDOCTYPE, ID_R2LNEXT
-#: Merge.rc:837
+#: Merge.rc:844
msgid "Copy &to Left and Advance\tCtrl+Alt+Left"
msgstr "Kopiraj u lije&vo i nastavi\tCtrl+Alt+lijevo"
#. IDR_MERGEDOCTYPE, ID_ALL_RIGHT
-#: Merge.rc:839
+#: Merge.rc:846
#, c-format
msgid "Copy &All to Right"
msgstr "Kopiraj sve u des&no"
#. IDR_MERGEDOCTYPE, ID_ALL_LEFT
-#: Merge.rc:840
+#: Merge.rc:847
#, c-format
msgid "Cop&y All to Left"
msgstr "Kopiraj sve u &lijevo"
#. IDR_MERGEDOCTYPE, ID_AUTO_MERGE
-#: Merge.rc:842
+#: Merge.rc:849
msgid "A&uto Merge\tCtrl+Alt+M"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_ADD_SYNCPOINT
-#: Merge.rc:844
+#: Merge.rc:851
#, c-format
msgid "Add &Synchronization Point\tAlt+S"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_CLEAR_SYNCPOINTS
-#: Merge.rc:845
+#: Merge.rc:852
#, c-format
msgid "Clear Sync&hronization Points"
msgstr ""
#. IDR_MERGEDOCTYPE
-#: Merge.rc:863
+#: Merge.rc:870
msgid "Unpac&ker"
msgstr ""
#. IDR_MERGEDOCTYPE
-#: Merge.rc:869
+#: Merge.rc:876
#, c-format
msgid "&Prediffer"
msgstr "&Dodaci"
#. IDR_MERGEDOCTYPE, ID_APPLY_PREDIFFER
-#: Merge.rc:873
+#: Merge.rc:880
msgid "Apply Pre&differ..."
msgstr ""
#. IDR_MERGEDOCTYPE, ID_TRANSFORM_WITH_SCRIPT
-#: Merge.rc:879
+#: Merge.rc:886
msgid "&Transform with Editor Script..."
msgstr ""
#. IDR_MERGEDOCTYPE
-#: Merge.rc:880
+#: Merge.rc:887
msgid "Scripts for &Copying"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_SELECT_EDITOR_SCRIPT_FOR_COPYING
-#: Merge.rc:886
+#: Merge.rc:893
msgid "Select &Editor Script..."
msgstr ""
#. IDR_MERGEDOCTYPE, ID_WINDOW_SPLIT
-#: Merge.rc:898
+#: Merge.rc:905
#, c-format
msgid "Sp&lit"
msgstr ""
#. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE
-#: Merge.rc:921
+#: Merge.rc:928
#, c-format
msgid "Comp&are"
msgstr "&Usporedba"
#. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE_WITH_MOVED_RENAMED
-#: Merge.rc:922
+#: Merge.rc:929
msgid "Compar&e with Renamed/Moved Items"
msgstr ""
#. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE_IN_NEW_WINDOW
-#: Merge.rc:923
+#: Merge.rc:930
msgid "Compare in New &Window"
msgstr ""
#. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE_NONHORIZONTALLY
-#: Merge.rc:924 Merge.rc:931
+#: Merge.rc:931 Merge.rc:938
msgid "Compare Non-hor&izontally..."
msgstr ""
#. IDR_POPUP_DIRVIEW
-#: Merge.rc:925
+#: Merge.rc:932
#, c-format
msgid "Compare Non-hor&izontally"
msgstr ""
#. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE_LEFT1_LEFT2
-#: Merge.rc:927
+#: Merge.rc:934
#, c-format
msgid "First &Left with Second Left"
msgstr ""
#. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE_RIGHT1_RIGHT2
-#: Merge.rc:928
+#: Merge.rc:935
#, c-format
msgid "First &Right with Second Right"
msgstr ""
#. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE_LEFT1_RIGHT2
-#: Merge.rc:929
+#: Merge.rc:936
#, c-format
msgid "&First Left with Second Right"
msgstr ""
#. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE_LEFT2_RIGHT1
-#: Merge.rc:930
+#: Merge.rc:937
#, c-format
msgid "&Second Left with First Right"
msgstr ""
#. IDR_POPUP_DIRVIEW
-#: Merge.rc:933
+#: Merge.rc:940
#, c-format
msgid "Co&mpare As"
msgstr ""
#. IDS_COPY_LEFT_TO_MIDDLE2
-#: Merge.rc:945 Merge.rc:957 Merge.rc:4502
+#: Merge.rc:953 Merge.rc:965 Merge.rc:4512
#, c-format
msgid "Left to Middle (%1 of %2)"
msgstr ""
#. IDS_COPY_LEFT_TO_RIGHT2
-#: Merge.rc:946 Merge.rc:958 Merge.rc:4501
+#: Merge.rc:954 Merge.rc:966 Merge.rc:4511
#, c-format
msgid "Left to Right (%1 of %2)"
msgstr "Lijevo do desno (%1 od %2)"
#. IDS_MOVE_LEFT_TO2
-#: Merge.rc:947 Merge.rc:959 Merge.rc:1022 Merge.rc:4513 Merge.rc:4542
+#: Merge.rc:955 Merge.rc:967 Merge.rc:1030 Merge.rc:4523 Merge.rc:4552
#, c-format
msgid "Left to... (%1 of %2)"
msgstr "Lijevo do... (%1 od %2)"
#. IDS_COPY_MIDDLE_TO_LEFT2
-#: Merge.rc:948 Merge.rc:960 Merge.rc:4499
+#: Merge.rc:956 Merge.rc:968 Merge.rc:4509
#, c-format
msgid "Middle to Left (%1 of %2)"
msgstr ""
#. IDS_COPY_MIDDLE_TO_RIGHT2
-#: Merge.rc:949 Merge.rc:961 Merge.rc:4500
+#: Merge.rc:957 Merge.rc:969 Merge.rc:4510
#, c-format
msgid "Middle to Right (%1 of %2)"
msgstr ""
#. IDS_MOVE_MIDDLE_TO2
-#: Merge.rc:950 Merge.rc:962 Merge.rc:1023 Merge.rc:4514 Merge.rc:4543
+#: Merge.rc:958 Merge.rc:970 Merge.rc:1031 Merge.rc:4524 Merge.rc:4553
#, c-format
msgid "Middle to... (%1 of %2)"
msgstr ""
#. IDS_COPY_RIGHT_TO_MIDDLE2
-#: Merge.rc:951 Merge.rc:963 Merge.rc:4498
+#: Merge.rc:959 Merge.rc:971 Merge.rc:4508
#, c-format
msgid "Right to Middle (%1 of %2)"
msgstr ""
#. IDS_COPY_RIGHT_TO_LEFT2
-#: Merge.rc:952 Merge.rc:964 Merge.rc:4497
+#: Merge.rc:960 Merge.rc:972 Merge.rc:4507
#, c-format
msgid "Right to Left (%1 of %2)"
msgstr "Desno do lijevo (%1 od %2)"
#. IDS_MOVE_RIGHT_TO2
-#: Merge.rc:953 Merge.rc:965 Merge.rc:1024 Merge.rc:4515 Merge.rc:4544
+#: Merge.rc:961 Merge.rc:973 Merge.rc:1032 Merge.rc:4525 Merge.rc:4554
#, c-format
msgid "Right to... (%1 of %2)"
msgstr "Desno do... (%1 od %2)"
#. IDD_EDIT_MARKER, IDC_EDIT_MARKER_DELETE
-#: Merge.rc:967 Merge.rc:2036
+#: Merge.rc:975 Merge.rc:2046
#, c-format
msgid "&Delete"
msgstr "&Obriši"
#. IDR_POPUP_DIRVIEW, ID_DIR_DEL_BOTH
-#: Merge.rc:972
+#: Merge.rc:980
#, c-format
msgid "&Both"
msgstr "&Obje"
#. IDR_POPUP_DIRVIEW, ID_DIR_DEL_ALL
-#: Merge.rc:973
+#: Merge.rc:981
#, c-format
msgid "&All"
msgstr ""
#. IDD_EDIT_REPLACE, IDC_EDIT_SCOPE_SELECTION
-#: Merge.rc:974 Merge.rc:2019
+#: Merge.rc:982 Merge.rc:2029
#, c-format
msgid "&Selection"
msgstr "označenom"
#. IDR_POPUP_DIRVIEW, ID_DIR_ITEM_RENAME
-#: Merge.rc:976
+#: Merge.rc:984
#, c-format
msgid "Re&name"
msgstr "P&reimenuj"
#. IDR_POPUP_DIRVIEW, ID_DIR_HIDE_FILENAMES
-#: Merge.rc:977
+#: Merge.rc:985
#, c-format
msgid "&Hide Items"
msgstr "&Sakrij stavke"
#. IDR_POPUP_DIRVIEW
-#: Merge.rc:979
+#: Merge.rc:987
#, c-format
msgid "&Open Left"
msgstr "&Otvori lijevi"
#. IDR_POPUP_DIRVIEW
-#: Merge.rc:986
+#: Merge.rc:994
#, c-format
msgid "Open Midd&le"
msgstr ""
#. IDR_POPUP_DIRVIEW
-#: Merge.rc:993
+#: Merge.rc:1001
#, c-format
msgid "O&pen Right"
msgstr "Otvori &desni"
#. IDR_POPUP_DIRVIEW
-#: Merge.rc:1001
+#: Merge.rc:1009
#, c-format
msgid "Cop&y Paths"
msgstr "Kopiraj &stazu"
#. IDS_DEL_LEFT_FMT2
-#: Merge.rc:1003 Merge.rc:1012 Merge.rc:4530
+#: Merge.rc:1011 Merge.rc:1020 Merge.rc:4540
#, c-format
msgid "Left (%1 of %2)"
msgstr "Lijevo (%1 od %2)"
#. IDS_DEL_MIDDLE_FMT2
-#: Merge.rc:1004 Merge.rc:1013 Merge.rc:4531
+#: Merge.rc:1012 Merge.rc:1021 Merge.rc:4541
#, c-format
msgid "Middle (%1 of %2)"
msgstr ""
#. IDS_DEL_RIGHT_FMT2
-#: Merge.rc:1005 Merge.rc:1014 Merge.rc:4532
+#: Merge.rc:1013 Merge.rc:1022 Merge.rc:4542
#, c-format
msgid "Right (%1 of %2)"
msgstr "Desno (%1 od %2)"
#. IDS_DEL_BOTH_FMT2
-#: Merge.rc:1006 Merge.rc:1015 Merge.rc:4533
+#: Merge.rc:1014 Merge.rc:1023 Merge.rc:4543
#, c-format
msgid "Both (%1 of %2)"
msgstr "Oba panela (%1 od %2)"
#. IDS_DEL_ALL_FMT2
-#: Merge.rc:1007 Merge.rc:1016 Merge.rc:4538
+#: Merge.rc:1015 Merge.rc:1024 Merge.rc:4548
#, c-format
msgid "All (%1 of %2)"
msgstr ""
#. IDR_POPUP_DIRVIEW, ID_DIR_COPY_FILENAMES
-#: Merge.rc:1009
+#: Merge.rc:1017
#, c-format
msgid "Copy &Filenames"
msgstr "Kopiraj &nazive datoteka"
#. IDR_POPUP_DIRVIEW
-#: Merge.rc:1010
+#: Merge.rc:1018
#, c-format
msgid "Copy Items to Clip&board"
msgstr ""
#. IDR_POPUP_DIRVIEW, ID_DIR_COPY_ALL_DISP_COLUMNS
-#: Merge.rc:1018
+#: Merge.rc:1026
msgid "Copy All Di&splayed Columns"
msgstr ""
#. IDR_POPUP_DIRVIEW
-#: Merge.rc:1020
+#: Merge.rc:1028
#, c-format
msgid "&Zip"
msgstr "&Zip"
#. IDS_COPY_BOTH_TO2
-#: Merge.rc:1025 Merge.rc:4516
+#: Merge.rc:1033 Merge.rc:4526
#, c-format
msgid "Both to... (%1 of %2)"
msgstr ""
#. IDS_COPY_ALL_TO2
-#: Merge.rc:1026 Merge.rc:4517
+#: Merge.rc:1034 Merge.rc:4527
#, c-format
msgid "All to... (%1 of %2)"
msgstr ""
#. IDS_COPY_DIFFERENCES_TO2
-#: Merge.rc:1027 Merge.rc:4518
+#: Merge.rc:1035 Merge.rc:4528
#, c-format
msgid "Differences to... (%1 of %2)"
msgstr ""
#. IDR_POPUP_DIRVIEW, ID_DIR_SHELL_CONTEXT_MENU_LEFT
-#: Merge.rc:1032
+#: Merge.rc:1040
#, c-format
msgid "Left Shell Menu"
msgstr "Lijevi Shell izbornik"
#. IDR_POPUP_DIRVIEW, ID_DIR_SHELL_CONTEXT_MENU_MIDDLE
-#: Merge.rc:1033
+#: Merge.rc:1041
#, c-format
msgid "Middle Shell Menu"
msgstr ""
#. IDR_POPUP_DIRVIEW, ID_DIR_SHELL_CONTEXT_MENU_RIGHT
-#: Merge.rc:1034
+#: Merge.rc:1042
#, c-format
msgid "Right Shell Menu"
msgstr "Desni Shell izbornik"
#. IDR_POPUP_DIRVIEW, ID_DIR_SHELL_CONTEXT_MENU_BOTH
-#: Merge.rc:1035
+#: Merge.rc:1043
msgid "Both Shell Menu"
msgstr ""
#. IDR_POPUP_DIRVIEW, ID_DIR_SHELL_CONTEXT_MENU_ALL
-#: Merge.rc:1036
+#: Merge.rc:1044
msgid "All Shell Menu"
msgstr ""
#. IDR_POPUP_EDITOR_HEADERBAR, ID_EDITOR_COPY
-#: Merge.rc:1050
+#: Merge.rc:1058
#, c-format
msgid "Copy"
msgstr ""
#. IDR_POPUP_EDITOR_HEADERBAR, ID_EDITOR_COPY_PATH
-#: Merge.rc:1051
+#: Merge.rc:1059
#, c-format
msgid "&Copy Full Path"
msgstr "&Kopiraj stazu"
#. IDR_POPUP_EDITOR_HEADERBAR, ID_EDITOR_COPY_FILENAME
-#: Merge.rc:1052
+#: Merge.rc:1060
#, c-format
msgid "Copy &Filename"
msgstr "Kopiraj &naziv datoteke"
#. IDR_POPUP_EDITOR_HEADERBAR, ID_EDITOR_EDIT_CAPTION
-#: Merge.rc:1053
+#: Merge.rc:1061
msgid "&Edit Caption\tF2"
msgstr ""
#. IDR_POPUP_EDITOR_HEADERBAR, ID_EDITOR_EDIT_PATH
-#: Merge.rc:1055
+#: Merge.rc:1063
msgid "Edit &Path\tCtrl+L"
msgstr ""
#. IDR_POPUP_EDITOR_HEADERBAR, ID_EDITOR_SELECT_FILE
-#: Merge.rc:1056
+#: Merge.rc:1064
msgid "&Open..."
msgstr ""
#. IDR_POPUP_PLUGINS_SETTINGS
-#: Merge.rc:1062
+#: Merge.rc:1070
msgid "Unpacker Settings"
msgstr ""
#. IDS_USERCHOICE_NONE
-#: Merge.rc:1064 Merge.rc:1070 Merge.rc:1789 Merge.rc:1793 Merge.rc:5030
+#: Merge.rc:1072 Merge.rc:1078 Merge.rc:1799 Merge.rc:1803 Merge.rc:5040
#, c-format
msgid ""
msgstr "Ništa"
#. IDS_USERCHOICE_AUTOMATIC
-#: Merge.rc:1065 Merge.rc:1071 Merge.rc:5031
+#: Merge.rc:1073 Merge.rc:1079 Merge.rc:5041
#, c-format
msgid ""
msgstr "Automatski"
#. IDD_OPEN, IDC_SELECT_PREDIFFER
-#: Merge.rc:1066 Merge.rc:1072 Merge.rc:1970 Merge.rc:1974
+#: Merge.rc:1074 Merge.rc:1080 Merge.rc:1980 Merge.rc:1984
#, c-format
msgid "&Select..."
msgstr "Oda&bir..."
#. IDR_POPUP_PLUGINS_SETTINGS
-#: Merge.rc:1068
+#: Merge.rc:1076
#, c-format
msgid "Prediffer Settings"
msgstr "Dodaci - postavke "
#. IDR_POPUP_LOCATIONBAR, ID_LOCBAR_GOTODIFF
-#: Merge.rc:1080
+#: Merge.rc:1088
msgid "G&o to Diff"
msgstr "Idi &na razliku"
#. IDR_POPUP_LOCATIONBAR, ID_LOCBAR_MOVECURSOR_ONCLICK
-#: Merge.rc:1083
+#: Merge.rc:1091
msgid "Move Cursor on &Click"
msgstr ""
#. IDR_POPUP_LOCATIONBAR, ID_DISPLAY_MOVED_NONE
-#: Merge.rc:1085
+#: Merge.rc:1093
#, c-format
msgid "&No Moved Blocks"
msgstr "&Ne premještaj blokove"
#. IDR_POPUP_LOCATIONBAR, ID_DISPLAY_MOVED_ALL
-#: Merge.rc:1086
+#: Merge.rc:1094
#, c-format
msgid "&All Moved Blocks"
msgstr "Premještaj &svih blokova"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS
-#: Merge.rc:1094 Merge.rc:1127
+#: Merge.rc:1102 Merge.rc:1135
#, c-format
msgid "W&hitespaces"
msgstr "&Razmaci prema"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_WHITESPACE_COMPARE
-#: Merge.rc:1096 Merge.rc:1129
+#: Merge.rc:1104 Merge.rc:1137
#, c-format
msgid "Com&pare"
msgstr "&Usporedi"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_WHITESPACE_IGNORE
-#: Merge.rc:1097 Merge.rc:1130
+#: Merge.rc:1105 Merge.rc:1138
#, c-format
msgid "I&gnore Changes"
msgstr "Zanemari &izmjene"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_WHITESPACE_IGNOREALL
-#: Merge.rc:1098 Merge.rc:1131
+#: Merge.rc:1106 Merge.rc:1139
#, c-format
msgid "Ig&nore All"
msgstr "Zanemari &sve"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_IGNORE_BLANKLINES
-#: Merge.rc:1100 Merge.rc:1133
+#: Merge.rc:1108 Merge.rc:1141
#, c-format
msgid "Ignore Blan&k Lines"
msgstr "Zanemari prazne &retke"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_IGNORE_CASE
-#: Merge.rc:1101 Merge.rc:1134
+#: Merge.rc:1109 Merge.rc:1142
#, c-format
msgid "Ignore &Case"
msgstr "Zanemari V/m &slova"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_IGNORE_EOL
-#: Merge.rc:1102 Merge.rc:1135
+#: Merge.rc:1110 Merge.rc:1143
#, c-format
msgid "Igno&re EOL Differences (Windows/Unix/Mac)"
msgstr "&Zanemari različitost oznaka završetka retka (Windows/Unix/Mac)"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_IGNORE_CODEPAGE
-#: Merge.rc:1103 Merge.rc:1136
+#: Merge.rc:1111 Merge.rc:1144
#, c-format
msgid "Ignore Codepage &Differences"
msgstr ""
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_IGNORE_NUMBERS
-#: Merge.rc:1104 Merge.rc:1137
+#: Merge.rc:1112 Merge.rc:1145
msgid "Ignore Num&bers"
msgstr ""
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_IGNORE_COMMENTS
-#: Merge.rc:1105 Merge.rc:1138
+#: Merge.rc:1113 Merge.rc:1146
msgid "Ignore C&omment Differences"
msgstr ""
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_IGNORE_MISSING_TRAILING_EOL
-#: Merge.rc:1106 Merge.rc:1139
+#: Merge.rc:1114 Merge.rc:1147
msgid "Ignore &Missing Trailing EOL"
msgstr ""
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_IGNORE_LINE_BREAKS
-#: Merge.rc:1107 Merge.rc:1140
+#: Merge.rc:1115 Merge.rc:1148
msgid "Ignore Line &Breaks (Treat as Spaces)"
msgstr ""
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_RECURS_CHECK
-#: Merge.rc:1109 Merge.rc:2963
+#: Merge.rc:1117 Merge.rc:2973
#, c-format
msgid "&Include Subfolders"
msgstr "Uključi i &podmape"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS
-#: Merge.rc:1110 Merge.rc:1142
+#: Merge.rc:1118 Merge.rc:1150
#, c-format
msgid "&Compare Method"
msgstr ""
#. IDS_COMPMETHOD_FULL_CONTENTS
-#: Merge.rc:1112 Merge.rc:1144 Merge.rc:1328 Merge.rc:4282
+#: Merge.rc:1120 Merge.rc:1152 Merge.rc:1338 Merge.rc:4292
#, c-format
msgid "Full Contents"
msgstr "Potpun sadržaj"
#. IDS_COMPMETHOD_QUICK_CONTENTS
-#: Merge.rc:1113 Merge.rc:1145 Merge.rc:1329 Merge.rc:4283
+#: Merge.rc:1121 Merge.rc:1153 Merge.rc:1339 Merge.rc:4293
#, c-format
msgid "Quick Contents"
msgstr "Skraćeni sadržaj"
#. IDS_COMPMETHOD_BINARY_CONTENTS
-#: Merge.rc:1114 Merge.rc:1146 Merge.rc:1330 Merge.rc:4284
+#: Merge.rc:1122 Merge.rc:1154 Merge.rc:1340 Merge.rc:4294
#, c-format
msgid "Binary Contents"
msgstr ""
#. IDS_COMPMETHOD_MODDATE
-#: Merge.rc:1115 Merge.rc:1147 Merge.rc:1331 Merge.rc:4285
+#: Merge.rc:1123 Merge.rc:1155 Merge.rc:1341 Merge.rc:4295
#, c-format
msgid "Modified Date"
msgstr "Datum promjene"
#. IDS_COMPMETHOD_DATESIZE
-#: Merge.rc:1116 Merge.rc:1148 Merge.rc:1332 Merge.rc:4286
+#: Merge.rc:1124 Merge.rc:1156 Merge.rc:1342 Merge.rc:4296
#, c-format
msgid "Modified Date and Size"
msgstr "Datum promjene i veličina"
#. IDS_COMPMETHOD_SIZE
-#: Merge.rc:1117 Merge.rc:1149 Merge.rc:1333 Merge.rc:4287
+#: Merge.rc:1125 Merge.rc:1157 Merge.rc:1343 Merge.rc:4297
#, c-format
msgid "Size"
msgstr "Veličina"
#. IDS_COMPMETHOD_EXISTENCE
-#: Merge.rc:1118 Merge.rc:1150 Merge.rc:1334 Merge.rc:4288
+#: Merge.rc:1126 Merge.rc:1158 Merge.rc:1344 Merge.rc:4298
msgid "Existence"
msgstr ""
#. IDR_POPUP_PROJECT, ID_LOAD_PROJECT
-#: Merge.rc:1192
+#: Merge.rc:1202
#, c-format
msgid "&Load Project..."
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARGALL
-#: Merge.rc:1272 Merge.rc:1301
+#: Merge.rc:1282 Merge.rc:1311
msgid "${*} - All Arguments"
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARG1
-#: Merge.rc:1273 Merge.rc:1302
+#: Merge.rc:1283 Merge.rc:1312
msgid "${1} - First Argument"
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARG2
-#: Merge.rc:1274 Merge.rc:1303
+#: Merge.rc:1284 Merge.rc:1313
msgid "${2} - Second Argument"
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARG3
-#: Merge.rc:1275 Merge.rc:1304
+#: Merge.rc:1285 Merge.rc:1314
msgid "${3} - Third Argument"
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARG4
-#: Merge.rc:1276 Merge.rc:1305
+#: Merge.rc:1286 Merge.rc:1315
msgid "${4} - Fourth Argument"
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARG5
-#: Merge.rc:1277 Merge.rc:1306
+#: Merge.rc:1287 Merge.rc:1316
msgid "${5} - Fifth Argument"
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARG6
-#: Merge.rc:1278 Merge.rc:1307
+#: Merge.rc:1288 Merge.rc:1317
msgid "${6} - Sixth Argument"
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARG7
-#: Merge.rc:1279 Merge.rc:1308
+#: Merge.rc:1289 Merge.rc:1318
msgid "${7} - Seventh Argument"
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARG8
-#: Merge.rc:1280 Merge.rc:1309
+#: Merge.rc:1290 Merge.rc:1319
msgid "${8} - Eighth Argument"
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARG9
-#: Merge.rc:1281 Merge.rc:1310
+#: Merge.rc:1291 Merge.rc:1320
msgid "${9} - Ninth Argument"
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_SRC_FILE
-#: Merge.rc:1289
+#: Merge.rc:1299
msgid "${SRC_FILE} - Source File"
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_SRC_FOLDER
-#: Merge.rc:1290
+#: Merge.rc:1300
msgid "${SRC_FOLDER} - Source Folder"
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_SRC_URL
-#: Merge.rc:1291
+#: Merge.rc:1301
msgid "${SRC_URL} - Source URL"
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_SRC_URL_PROTOCOL
-#: Merge.rc:1292
+#: Merge.rc:1302
msgid "${SRC_URL_PROTOCOL} - Source URL Protocol"
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_SRC_URL_SUFFIX
-#: Merge.rc:1293
+#: Merge.rc:1303
msgid "${SRC_URL_SUFFIX} - Source URL Suffix"
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_DST_FILE
-#: Merge.rc:1294
+#: Merge.rc:1304
msgid "${DST_FILE} - Destination File"
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_DST_FOLDER
-#: Merge.rc:1295
+#: Merge.rc:1305
msgid "${DST_FOLDER} - Destination Folder"
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_DST_URL
-#: Merge.rc:1296
+#: Merge.rc:1306
msgid "${DST_URL} - Destination URL"
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_DST_URL_PROTOCOL
-#: Merge.rc:1297
+#: Merge.rc:1307
msgid "${DST_URL_PROTOCOL} - Destination URL Protocol"
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_DST_URL_SUFFIX
-#: Merge.rc:1298
+#: Merge.rc:1308
msgid "${DST_URL_SUFFIX} - Destination URL Suffix"
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_WINMERGE_HOME
-#: Merge.rc:1299
+#: Merge.rc:1309
msgid "${WINMERGE_HOME} - WinMerge Home Directory"
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_SCRIPT_FILE
-#: Merge.rc:1300
+#: Merge.rc:1310
msgid "${SCRIPT_FILE} - Script File"
msgstr ""
#. IDR_POPUP_PLUGIN_ADD_MENU, ID_PLUGIN_ADD_UNPACKER
-#: Merge.rc:1318
+#: Merge.rc:1328
msgid "Add &Unpacker Plugin..."
msgstr ""
#. IDR_POPUP_PLUGIN_ADD_MENU, ID_PLUGIN_ADD_PREDIFFER
-#: Merge.rc:1319
+#: Merge.rc:1329
msgid "Add &Prediffer Plugin..."
msgstr ""
#. IDR_POPUP_PLUGIN_ADD_MENU, ID_PLUGIN_DUPLICATE
-#: Merge.rc:1320
+#: Merge.rc:1330
msgid "&Duplicate Plugin..."
msgstr ""
#. IDR_POPUP_OUTPUTVIEW, ID_EDIT_CLEAR_ALL
-#: Merge.rc:1344
+#: Merge.rc:1354
msgid "Clear &All"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_MASK_CLEAR
-#: Merge.rc:1352
+#: Merge.rc:1362
msgid "&Clear All"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_MASK_REMOVE_LAST
-#: Merge.rc:1353
+#: Merge.rc:1363
msgid "Remove Last Filter &Group"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_MASK_ALL
-#: Merge.rc:1354
+#: Merge.rc:1364
msgid "R&eset to Default (*.*)"
msgstr ""
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1355
+#: Merge.rc:1365
msgid "Add E&xclude File"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_SYS
-#: Merge.rc:1357
+#: Merge.rc:1367
msgid "&System Files"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_BACKUP
-#: Merge.rc:1358
+#: Merge.rc:1368
msgid "&Editor Backup Files"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_BIN
-#: Merge.rc:1359
+#: Merge.rc:1369
msgid "&Compiled Binary Files"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_LOG
-#: Merge.rc:1360
+#: Merge.rc:1370
msgid "&Log Files"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_TEMP
-#: Merge.rc:1361
+#: Merge.rc:1371
msgid "&Temporary or Cache Files"
msgstr ""
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1363
+#: Merge.rc:1373
msgid "Add Excl&ude Folder"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FOLDER_VCS
-#: Merge.rc:1365
+#: Merge.rc:1375
msgid "&Version Control"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FOLDER_BUILD
-#: Merge.rc:1366
+#: Merge.rc:1376
msgid "&Build Artifacts"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FOLDER_IDE
-#: Merge.rc:1367
+#: Merge.rc:1377
msgid "&IDE"
msgstr ""
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1370
+#: Merge.rc:1380
msgid "Add &File Condition"
msgstr ""
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1372 Merge.rc:1551
+#: Merge.rc:1382 Merge.rc:1561
msgid "File &Size"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_SIZE, ID_FILTERMENU_DIFF_SIZE_LT_1KB
-#: Merge.rc:1374 Merge.rc:1527 Merge.rc:1564 Merge.rc:1629 Merge.rc:1707
+#: Merge.rc:1384 Merge.rc:1537 Merge.rc:1574 Merge.rc:1639 Merge.rc:1717
msgid "Less than 1KB"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_SIZE, ID_FILTERMENU_DIFF_SIZE_GE_1KB
-#: Merge.rc:1375 Merge.rc:1528 Merge.rc:1565 Merge.rc:1630 Merge.rc:1708
+#: Merge.rc:1385 Merge.rc:1538 Merge.rc:1575 Merge.rc:1640 Merge.rc:1718
msgid "1KB or more"
msgstr ""
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_LT_10KB
-#: Merge.rc:1376 Merge.rc:1529 Merge.rc:1631
+#: Merge.rc:1386 Merge.rc:1539 Merge.rc:1641
msgid "Less than 10KB"
msgstr ""
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_GE_10KB
-#: Merge.rc:1377 Merge.rc:1530 Merge.rc:1632
+#: Merge.rc:1387 Merge.rc:1540 Merge.rc:1642
msgid "10KB or more"
msgstr ""
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_LT_100KB
-#: Merge.rc:1378 Merge.rc:1531 Merge.rc:1633
+#: Merge.rc:1388 Merge.rc:1541 Merge.rc:1643
msgid "Less than 100KB"
msgstr ""
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_GE_100KB
-#: Merge.rc:1379 Merge.rc:1532 Merge.rc:1634
+#: Merge.rc:1389 Merge.rc:1542 Merge.rc:1644
msgid "100KB or more"
msgstr ""
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_LT_1MB
-#: Merge.rc:1380 Merge.rc:1533 Merge.rc:1635
+#: Merge.rc:1390 Merge.rc:1543 Merge.rc:1645
msgid "Less than 1MB"
msgstr ""
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_GE_1MB
-#: Merge.rc:1381 Merge.rc:1534 Merge.rc:1636
+#: Merge.rc:1391 Merge.rc:1544 Merge.rc:1646
msgid "1MB or more"
msgstr ""
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_LT_10MB
-#: Merge.rc:1382 Merge.rc:1535 Merge.rc:1637
+#: Merge.rc:1392 Merge.rc:1545 Merge.rc:1647
msgid "Less than 10MB"
msgstr ""
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_GE_10MB
-#: Merge.rc:1383 Merge.rc:1536 Merge.rc:1638
+#: Merge.rc:1393 Merge.rc:1546 Merge.rc:1648
msgid "10MB or more"
msgstr ""
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_LT_100MB
-#: Merge.rc:1384 Merge.rc:1537 Merge.rc:1639
+#: Merge.rc:1394 Merge.rc:1547 Merge.rc:1649
msgid "Less than 100MB"
msgstr ""
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_GE_100MB
-#: Merge.rc:1385 Merge.rc:1538 Merge.rc:1640
+#: Merge.rc:1395 Merge.rc:1548 Merge.rc:1650
msgid "100MB or more"
msgstr ""
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_LT_1GB
-#: Merge.rc:1386 Merge.rc:1539 Merge.rc:1641
+#: Merge.rc:1396 Merge.rc:1549 Merge.rc:1651
msgid "Less than 1GB"
msgstr ""
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_GE_1GB
-#: Merge.rc:1387 Merge.rc:1642
+#: Merge.rc:1397 Merge.rc:1652
msgid "1GB or more"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_RANGE
-#: Merge.rc:1388 Merge.rc:1465 Merge.rc:1517 Merge.rc:1523 Merge.rc:1540
-#: Merge.rc:1566 Merge.rc:1587 Merge.rc:1643 Merge.rc:1709 Merge.rc:1734
+#: Merge.rc:1398 Merge.rc:1475 Merge.rc:1527 Merge.rc:1533 Merge.rc:1550
+#: Merge.rc:1576 Merge.rc:1597 Merge.rc:1653 Merge.rc:1719 Merge.rc:1744
msgid "Custom Range..."
msgstr ""
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1390 Merge.rc:1471 Merge.rc:1568
+#: Merge.rc:1400 Merge.rc:1481 Merge.rc:1578
msgid "&Last Modified"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE
-#: Merge.rc:1392 Merge.rc:1473 Merge.rc:1651
+#: Merge.rc:1402 Merge.rc:1483 Merge.rc:1661
msgid "&Hour"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_HOUR_BEFORE_1
-#: Merge.rc:1394 Merge.rc:1475 Merge.rc:1653
+#: Merge.rc:1404 Merge.rc:1485 Merge.rc:1663
msgid "More than 1 hour ago"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_HOUR_WITHIN_1
-#: Merge.rc:1395 Merge.rc:1476 Merge.rc:1654
+#: Merge.rc:1405 Merge.rc:1486 Merge.rc:1664
msgid "Within 1 hour"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE
-#: Merge.rc:1397 Merge.rc:1478 Merge.rc:1656
+#: Merge.rc:1407 Merge.rc:1488 Merge.rc:1666
msgid "&Day"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_DAY_BEFORE_TODAY
-#: Merge.rc:1399 Merge.rc:1480 Merge.rc:1658
+#: Merge.rc:1409 Merge.rc:1490 Merge.rc:1668
msgid "Before today"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_DAY_TODAY
-#: Merge.rc:1400 Merge.rc:1481 Merge.rc:1659
+#: Merge.rc:1410 Merge.rc:1491 Merge.rc:1669
msgid "Today"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_DAY_BEFORE_YESTERDAY
-#: Merge.rc:1401 Merge.rc:1482 Merge.rc:1660
+#: Merge.rc:1411 Merge.rc:1492 Merge.rc:1670
msgid "Before yesterday"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_DAY_YESTERDAY
-#: Merge.rc:1402 Merge.rc:1483 Merge.rc:1661
+#: Merge.rc:1412 Merge.rc:1493 Merge.rc:1671
msgid "Yesterday"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_DAY_SINCE_YESTERDAY
-#: Merge.rc:1403 Merge.rc:1484 Merge.rc:1662
+#: Merge.rc:1413 Merge.rc:1494 Merge.rc:1672
msgid "Since yesterday"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE
-#: Merge.rc:1405 Merge.rc:1486 Merge.rc:1664
+#: Merge.rc:1415 Merge.rc:1496 Merge.rc:1674
msgid "&Week"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_WEEK_BEFORE_THIS
-#: Merge.rc:1407 Merge.rc:1488 Merge.rc:1666
+#: Merge.rc:1417 Merge.rc:1498 Merge.rc:1676
msgid "Before this week"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_WEEK_THIS
-#: Merge.rc:1408 Merge.rc:1489 Merge.rc:1667
+#: Merge.rc:1418 Merge.rc:1499 Merge.rc:1677
msgid "This week"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_WEEK_BEFORE_LAST
-#: Merge.rc:1409 Merge.rc:1490 Merge.rc:1668
+#: Merge.rc:1419 Merge.rc:1500 Merge.rc:1678
msgid "Before last week"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_WEEK_LAST
-#: Merge.rc:1410 Merge.rc:1491 Merge.rc:1669
+#: Merge.rc:1420 Merge.rc:1501 Merge.rc:1679
msgid "Last week"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_WEEK_SINCE_LAST
-#: Merge.rc:1411 Merge.rc:1492 Merge.rc:1670
+#: Merge.rc:1421 Merge.rc:1502 Merge.rc:1680
msgid "Since last week"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE
-#: Merge.rc:1413 Merge.rc:1494 Merge.rc:1672
+#: Merge.rc:1423 Merge.rc:1504 Merge.rc:1682
msgid "&Month"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_MONTH_BEFORE_THIS
-#: Merge.rc:1415 Merge.rc:1496 Merge.rc:1674
+#: Merge.rc:1425 Merge.rc:1506 Merge.rc:1684
msgid "Before this month"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_MONTH_THIS
-#: Merge.rc:1416 Merge.rc:1497 Merge.rc:1675
+#: Merge.rc:1426 Merge.rc:1507 Merge.rc:1685
msgid "This month"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_MONTH_BEFORE_LAST
-#: Merge.rc:1417 Merge.rc:1498 Merge.rc:1676
+#: Merge.rc:1427 Merge.rc:1508 Merge.rc:1686
msgid "Before last month"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_MONTH_LAST
-#: Merge.rc:1418 Merge.rc:1499 Merge.rc:1677
+#: Merge.rc:1428 Merge.rc:1509 Merge.rc:1687
msgid "Last month"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_MONTH_SINCE_LAST
-#: Merge.rc:1419 Merge.rc:1500 Merge.rc:1678
+#: Merge.rc:1429 Merge.rc:1510 Merge.rc:1688
msgid "Since last month"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE
-#: Merge.rc:1421 Merge.rc:1502 Merge.rc:1680
+#: Merge.rc:1431 Merge.rc:1512 Merge.rc:1690
msgid "&Year"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_YEAR_BEFORE_THIS
-#: Merge.rc:1423 Merge.rc:1504 Merge.rc:1682
+#: Merge.rc:1433 Merge.rc:1514 Merge.rc:1692
msgid "Before this year"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_YEAR_THIS
-#: Merge.rc:1424 Merge.rc:1505 Merge.rc:1683
+#: Merge.rc:1434 Merge.rc:1515 Merge.rc:1693
msgid "This year"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_YEAR_BEFORE_LAST
-#: Merge.rc:1425 Merge.rc:1506 Merge.rc:1684
+#: Merge.rc:1435 Merge.rc:1516 Merge.rc:1694
msgid "Before last year"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_YEAR_LAST
-#: Merge.rc:1426 Merge.rc:1507 Merge.rc:1685
+#: Merge.rc:1436 Merge.rc:1517 Merge.rc:1695
msgid "Last year"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_YEAR_SINCE_LAST
-#: Merge.rc:1427 Merge.rc:1508 Merge.rc:1686
+#: Merge.rc:1437 Merge.rc:1518 Merge.rc:1696
msgid "Since last year"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_RANGE
-#: Merge.rc:1429 Merge.rc:1510 Merge.rc:1688
+#: Merge.rc:1439 Merge.rc:1520 Merge.rc:1698
msgid "&Custom Range..."
msgstr ""
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1431 Merge.rc:1589
+#: Merge.rc:1441 Merge.rc:1599
msgid "&Attributes"
msgstr ""
#. IDR_POPUP_FILTERMENU_ATTR, ID_FILTERMENU_ATTR_READONLY
-#: Merge.rc:1433 Merge.rc:1607
+#: Merge.rc:1443 Merge.rc:1617
msgid "Read-only files"
msgstr ""
#. IDR_POPUP_FILTERMENU_ATTR, ID_FILTERMENU_ATTR_NOT_READONLY
-#: Merge.rc:1434 Merge.rc:1608
+#: Merge.rc:1444 Merge.rc:1618
msgid "Not read-only files"
msgstr ""
#. IDR_POPUP_FILTERMENU_ATTR, ID_FILTERMENU_ATTR_HIDDEN
-#: Merge.rc:1435 Merge.rc:1609
+#: Merge.rc:1445 Merge.rc:1619
msgid "Hidden files"
msgstr ""
#. IDR_POPUP_FILTERMENU_ATTR, ID_FILTERMENU_ATTR_NOT_HIDDEN
-#: Merge.rc:1436 Merge.rc:1610
+#: Merge.rc:1446 Merge.rc:1620
msgid "Not hidden files"
msgstr ""
#. IDR_POPUP_FILTERMENU_ATTR, ID_FILTERMENU_ATTR_SYSTEM
-#: Merge.rc:1437 Merge.rc:1611
+#: Merge.rc:1447 Merge.rc:1621
msgid "System files"
msgstr ""
#. IDR_POPUP_FILTERMENU_ATTR, ID_FILTERMENU_ATTR_NOT_SYSTEM
-#: Merge.rc:1438 Merge.rc:1612
+#: Merge.rc:1448 Merge.rc:1622
msgid "Not system files"
msgstr ""
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1440
+#: Merge.rc:1450
msgid "File &Content"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_CONTAINS
-#: Merge.rc:1442
+#: Merge.rc:1452
msgid "Contains string..."
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_NOT_CONTAINS
-#: Merge.rc:1443
+#: Merge.rc:1453
msgid "Does not contain string..."
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_FIRST_LINE_CONTAINS
-#: Merge.rc:1444
+#: Merge.rc:1454
msgid "First line contains string..."
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_FIRST_LINE_NOT_CONTAINS
-#: Merge.rc:1445
+#: Merge.rc:1455
msgid "First line does not contain string..."
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_FIRST_10_CONTAINS
-#: Merge.rc:1446
+#: Merge.rc:1456
msgid "First 10 lines contain string..."
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_FIRST_10_NOT_CONTAINS
-#: Merge.rc:1447
+#: Merge.rc:1457
msgid "First 10 lines do not contain string..."
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_LAST_10_CONTAINS
-#: Merge.rc:1448
+#: Merge.rc:1458
msgid "Last 10 lines contain string..."
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_LAST_10_NOT_CONTAINS
-#: Merge.rc:1449
+#: Merge.rc:1459
msgid "Last 10 lines do not contain string..."
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_LAST_LINE_CONTAINS
-#: Merge.rc:1450
+#: Merge.rc:1460
msgid "Last line contains string..."
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_LAST_LINE_NOT_CONTAINS
-#: Merge.rc:1451
+#: Merge.rc:1461
msgid "Last line does not contain string..."
msgstr ""
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1453
+#: Merge.rc:1463
msgid "&Line Count"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_LT_10
-#: Merge.rc:1455
+#: Merge.rc:1465
msgid "Less than 10"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_GE_10
-#: Merge.rc:1456
+#: Merge.rc:1466
msgid "10 or more"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_LT_100
-#: Merge.rc:1457
+#: Merge.rc:1467
msgid "Less than 100"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_GE_100
-#: Merge.rc:1458
+#: Merge.rc:1468
msgid "100 or more"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_LT_1000
-#: Merge.rc:1459
+#: Merge.rc:1469
msgid "Less than 1000"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_GE_1000
-#: Merge.rc:1460
+#: Merge.rc:1470
msgid "1000 or more"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_LT_10000
-#: Merge.rc:1461
+#: Merge.rc:1471
msgid "Less than 10000"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_GE_10000
-#: Merge.rc:1462
+#: Merge.rc:1472
msgid "10000 or more"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_LT_100000
-#: Merge.rc:1463
+#: Merge.rc:1473
msgid "Less than 100000"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_GE_100000
-#: Merge.rc:1464
+#: Merge.rc:1474
msgid "100000 or more"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_PROPS
-#: Merge.rc:1467 Merge.rc:1594 Merge.rc:1761 Merge.rc:1778
+#: Merge.rc:1477 Merge.rc:1604 Merge.rc:1771 Merge.rc:1788
msgid "Additional &Properties..."
msgstr ""
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1469
+#: Merge.rc:1479
msgid "Add F&older Condition"
msgstr ""
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1513
+#: Merge.rc:1523
msgid "&Files"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FOLDER_FILES_EQ_0
-#: Merge.rc:1515
+#: Merge.rc:1525
msgid "0 files"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FOLDER_FILES_GE_1
-#: Merge.rc:1516
+#: Merge.rc:1526
msgid "1 file or more"
msgstr ""
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1519
+#: Merge.rc:1529
msgid "&Items"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FOLDER_ITEMS_EQ_0
-#: Merge.rc:1521
+#: Merge.rc:1531
msgid "0 items"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FOLDER_ITEMS_GE_1
-#: Merge.rc:1522
+#: Merge.rc:1532
msgid "1 item or more"
msgstr ""
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1525
+#: Merge.rc:1535
msgid "&Total Size"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FOLDER_STATS_RECURSIVE
-#: Merge.rc:1542
+#: Merge.rc:1552
msgid "&Recursive"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONDITION_ANY
-#: Merge.rc:1544
+#: Merge.rc:1554
msgid "Target: &Any (Left/Middle/Right)"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONDITION_LEFT
-#: Merge.rc:1545
+#: Merge.rc:1555
msgid "Target: &Left"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONDITION_MIDDLE
-#: Merge.rc:1546
+#: Merge.rc:1556
msgid "Target: &Middle"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONDITION_RIGHT
-#: Merge.rc:1547
+#: Merge.rc:1557
msgid "Target: &Right"
msgstr ""
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1549
+#: Merge.rc:1559
msgid "Add &Difference Condition"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_PROP, ID_FILTERMENU_DIFF_PROP_EQUAL
-#: Merge.rc:1553 Merge.rc:1570 Merge.rc:1591 Merge.rc:1696 Merge.rc:1717
-#: Merge.rc:1742
+#: Merge.rc:1563 Merge.rc:1580 Merge.rc:1601 Merge.rc:1706 Merge.rc:1727
+#: Merge.rc:1752
msgid "Equal"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_PROP, ID_FILTERMENU_DIFF_PROP_NOT_EQUAL
-#: Merge.rc:1554 Merge.rc:1571 Merge.rc:1592 Merge.rc:1697 Merge.rc:1718
-#: Merge.rc:1743
+#: Merge.rc:1564 Merge.rc:1581 Merge.rc:1602 Merge.rc:1707 Merge.rc:1728
+#: Merge.rc:1753
msgid "Not Equal"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_PROP, ID_FILTERMENU_DIFF_PROP_LESS
-#: Merge.rc:1555 Merge.rc:1572 Merge.rc:1698 Merge.rc:1719 Merge.rc:1744
+#: Merge.rc:1565 Merge.rc:1582 Merge.rc:1708 Merge.rc:1729 Merge.rc:1754
msgid "Less Than"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_PROP, ID_FILTERMENU_DIFF_PROP_LESS_EQUAL
-#: Merge.rc:1556 Merge.rc:1573 Merge.rc:1699 Merge.rc:1720 Merge.rc:1745
+#: Merge.rc:1566 Merge.rc:1583 Merge.rc:1709 Merge.rc:1730 Merge.rc:1755
msgid "Less Than or Equal to"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_PROP, ID_FILTERMENU_DIFF_PROP_GREATER
-#: Merge.rc:1557 Merge.rc:1574 Merge.rc:1700 Merge.rc:1721 Merge.rc:1746
+#: Merge.rc:1567 Merge.rc:1584 Merge.rc:1710 Merge.rc:1731 Merge.rc:1756
msgid "Greater Than"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_PROP, ID_FILTERMENU_DIFF_PROP_GREATER_EQUAL
-#: Merge.rc:1558 Merge.rc:1575 Merge.rc:1701 Merge.rc:1722 Merge.rc:1747
+#: Merge.rc:1568 Merge.rc:1585 Merge.rc:1711 Merge.rc:1732 Merge.rc:1757
msgid "Greater Than or Equal to"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_SIZE, ID_FILTERMENU_DIFF_SIZE_LT_10B
-#: Merge.rc:1560 Merge.rc:1703
+#: Merge.rc:1570 Merge.rc:1713
msgid "Less than 10B"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_SIZE, ID_FILTERMENU_DIFF_SIZE_GE_10B
-#: Merge.rc:1561 Merge.rc:1704
+#: Merge.rc:1571 Merge.rc:1714
msgid "10B or more"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_SIZE, ID_FILTERMENU_DIFF_SIZE_LT_100B
-#: Merge.rc:1562 Merge.rc:1705
+#: Merge.rc:1572 Merge.rc:1715
msgid "Less than 100B"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_SIZE, ID_FILTERMENU_DIFF_SIZE_GE_100B
-#: Merge.rc:1563 Merge.rc:1706
+#: Merge.rc:1573 Merge.rc:1716
msgid "100B or more"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_LT_1SECOND
-#: Merge.rc:1577 Merge.rc:1724
+#: Merge.rc:1587 Merge.rc:1734
msgid "Less than 1 second"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_GE_1SECOND
-#: Merge.rc:1578 Merge.rc:1725
+#: Merge.rc:1588 Merge.rc:1735
msgid "1 second or more"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_LT_1MINUTE
-#: Merge.rc:1579 Merge.rc:1726
+#: Merge.rc:1589 Merge.rc:1736
msgid "Less than 1 minute"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_GE_1MINUTE
-#: Merge.rc:1580 Merge.rc:1727
+#: Merge.rc:1590 Merge.rc:1737
msgid "1 minute or more"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_LT_1HOUR
-#: Merge.rc:1581 Merge.rc:1728
+#: Merge.rc:1591 Merge.rc:1738
msgid "Less than 1 hour"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_GE_1HOUR
-#: Merge.rc:1582 Merge.rc:1729
+#: Merge.rc:1592 Merge.rc:1739
msgid "1 hour or more"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_LT_1DAY
-#: Merge.rc:1583 Merge.rc:1730
+#: Merge.rc:1593 Merge.rc:1740
msgid "Less than 1 day"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_GE_1DAY
-#: Merge.rc:1584 Merge.rc:1731
+#: Merge.rc:1594 Merge.rc:1741
msgid "1 day or more"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_LT_1WEEK
-#: Merge.rc:1585 Merge.rc:1732
+#: Merge.rc:1595 Merge.rc:1742
msgid "Less than 1 week"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_GE_1WEEK
-#: Merge.rc:1586 Merge.rc:1733
+#: Merge.rc:1596 Merge.rc:1743
msgid "1 week or more"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_CONDITION_DIFF_LEFT_RIGHT
-#: Merge.rc:1596
+#: Merge.rc:1606
msgid "Target: &Left and Right"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_CONDITION_DIFF_LEFT_MIDDLE
-#: Merge.rc:1597
+#: Merge.rc:1607
msgid "Target: Left and &Middle"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_CONDITION_DIFF_MIDDLE_RIGHT
-#: Merge.rc:1598
+#: Merge.rc:1608
msgid "Target: Middle and &Right"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_CONDITION_DIFF_ALL
-#: Merge.rc:1599
+#: Merge.rc:1609
msgid "Target: &All"
msgstr ""
#. IDR_POPUP_FILTERMENU_BINARY, ID_FILTERMENU_BINARY_ONLY
-#: Merge.rc:1620
+#: Merge.rc:1630
msgid "Binary files only"
msgstr ""
#. IDR_POPUP_FILTERMENU_BINARY, ID_FILTERMENU_TEXT_ONLY
-#: Merge.rc:1621
+#: Merge.rc:1631
msgid "Text files only"
msgstr ""
#. IDR_POPUP_ADDCMPMENU, ID_ADDCMPMENU_CLEAR
-#: Merge.rc:1755
+#: Merge.rc:1765
msgid "&Clear conditions"
msgstr ""
#. IDR_POPUP_ADDCMPMENU, ID_ADDCMPMENU_CMP_SIZE
-#: Merge.rc:1757
+#: Merge.rc:1767
msgid "Compare &Size"
msgstr ""
#. IDR_POPUP_ADDCMPMENU, ID_ADDCMPMENU_CMP_DATE
-#: Merge.rc:1758
+#: Merge.rc:1768
msgid "Compare &Date"
msgstr ""
#. IDR_POPUP_ADDCMPMENU, ID_ADDCMPMENU_CMP_ATTR
-#: Merge.rc:1759
+#: Merge.rc:1769
msgid "Compare &Attributes"
msgstr ""
#. IDR_POPUP_ADDCMPMENU, ID_ADDCMPMENU_CMP_CONTENTS
-#: Merge.rc:1760
+#: Merge.rc:1770
msgid "Compare C&ontents"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_CLEAR
-#: Merge.rc:1769
+#: Merge.rc:1779
msgid "&Clear Keys"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_NAME
-#: Merge.rc:1771
+#: Merge.rc:1781
msgid "&Name"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_BASENAME
-#: Merge.rc:1772
+#: Merge.rc:1782
msgid "&Base name (without extension)"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_NORMALIZED_NAME
-#: Merge.rc:1773
+#: Merge.rc:1783
msgid "Normalized &Unicode Name"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_RELPATH
-#: Merge.rc:1774
+#: Merge.rc:1784
msgid "&Relative Path"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_DATE
-#: Merge.rc:1776
+#: Merge.rc:1786
msgid "&Date"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_HASH_MD5
-#: Merge.rc:1777
+#: Merge.rc:1787
msgid "&Hash (MD5)"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_REPLACE
-#: Merge.rc:1780
+#: Merge.rc:1790
msgid "Insert &replace() Function"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_REGEXREPLACE
-#: Merge.rc:1781
+#: Merge.rc:1791
msgid "Insert rege&xReplace() Function"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU
-#: Merge.rc:1782
+#: Merge.rc:1792
msgid "Replace &Lists"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_CREATE_REPLACELIST
-#: Merge.rc:1784
+#: Merge.rc:1794
msgid "&Create String Replace List and Insert..."
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_CREATE_REGEXREPLACELIST
-#: Merge.rc:1785
+#: Merge.rc:1795
msgid "Create &Regex Replace List and Insert..."
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU
-#: Merge.rc:1787
+#: Merge.rc:1797
msgid "&String Replace Lists"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU
-#: Merge.rc:1791
+#: Merge.rc:1801
msgid "Re&gex Replace Lists"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_STRING_REPLACE_LISTS_FOLDER
-#: Merge.rc:1796
+#: Merge.rc:1806
msgid "Open String Replace Lists Folder..."
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_REGEX_REPLACE_LISTS_FOLDER
-#: Merge.rc:1797
+#: Merge.rc:1807
msgid "Open Regex Replace Lists Folder..."
msgstr ""
#. IDD_FILTERS_CONDITION, IDC_CONDITION_MATCHCASE
-#: Merge.rc:1799 Merge.rc:1995 Merge.rc:2014 Merge.rc:2042 Merge.rc:2585
+#: Merge.rc:1809 Merge.rc:2005 Merge.rc:2024 Merge.rc:2052 Merge.rc:2595
#, c-format
msgid "Match &case"
msgstr "Osjetljivost na &V/m slova"
#. IDR_POPUP_RENAMEMOVE_MENU
-#: Merge.rc:1801
+#: Merge.rc:1811
msgid "Text &Normalization"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_TOLOWER
-#: Merge.rc:1803
+#: Merge.rc:1813
msgid "&Lowercase"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_TOUPPER
-#: Merge.rc:1804
+#: Merge.rc:1814
msgid "&Uppercase"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_TOHALFWIDTH
-#: Merge.rc:1805
+#: Merge.rc:1815
msgid "&Half-width"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_TOFULLWIDTH
-#: Merge.rc:1806
+#: Merge.rc:1816
msgid "&Full-width"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU
-#: Merge.rc:1807
+#: Merge.rc:1817
msgid "&Chinese Conversion"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_TOSIMPLIFIEDCHINESE
-#: Merge.rc:1809
+#: Merge.rc:1819
msgid "&Simplified Chinese"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_TOTRADITIONALCHINESE
-#: Merge.rc:1810
+#: Merge.rc:1820
msgid "&Traditional Chinese"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU
-#: Merge.rc:1812
+#: Merge.rc:1822
msgid "&Japanese Conversion"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_TOHIRAGANA
-#: Merge.rc:1814
+#: Merge.rc:1824
msgid "&Hiragana"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_TOKATAKANA
-#: Merge.rc:1815
+#: Merge.rc:1825
msgid "&Katakana"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_NORMALIZEUNICODE
-#: Merge.rc:1817
+#: Merge.rc:1827
msgid "Normalize &Unicode"
msgstr ""
#. IDD_ABOUTBOX
-#: Merge.rc:1932
+#: Merge.rc:1942
#, c-format
msgid "About WinMerge"
msgstr "O WinMerge"
#. IDD_ABOUTBOX, IDC_WWW
-#: Merge.rc:1936
+#: Merge.rc:1946
msgid "Visit the WinMerge Homepage!"
msgstr "WinMerge stranica na Web-u"
#. IDD_PLUGINS_EDITPLUGIN, IDOK
-#: Merge.rc:1938 Merge.rc:2080 Merge.rc:2431 Merge.rc:2455 Merge.rc:2469
-#: Merge.rc:2497 Merge.rc:2588 Merge.rc:2613 Merge.rc:2674 Merge.rc:2691
-#: Merge.rc:2703 Merge.rc:2867 Merge.rc:2927 Merge.rc:3062 Merge.rc:3104
-#: Merge.rc:3147 Merge.rc:3197
+#: Merge.rc:1948 Merge.rc:2090 Merge.rc:2441 Merge.rc:2465 Merge.rc:2479
+#: Merge.rc:2507 Merge.rc:2598 Merge.rc:2623 Merge.rc:2684 Merge.rc:2701
+#: Merge.rc:2713 Merge.rc:2877 Merge.rc:2937 Merge.rc:3072 Merge.rc:3114
+#: Merge.rc:3157 Merge.rc:3207
#, c-format
msgid "OK"
msgstr "U redu"
#. IDD_ABOUTBOX, IDC_OPEN_CONTRIBUTORS
-#: Merge.rc:1939
+#: Merge.rc:1949
#, c-format
msgid "Contributors"
msgstr "Suradnici"
#. IDD_SELECT_FILES_OR_FOLDERS
-#: Merge.rc:1945 Merge.rc:3070
+#: Merge.rc:1955 Merge.rc:3080
#, c-format
msgid "Select Files or Folders"
msgstr "Odabir datoteke ili mape"
#. IDD_OPEN, IDC_FILES_DIRS_GROUP0
-#: Merge.rc:1949
+#: Merge.rc:1959
#, c-format
msgid "&1st File or Folder"
msgstr ""
#. IDD_OPEN, IDC_PATH0_READONLY
-#: Merge.rc:1951
+#: Merge.rc:1961
#, c-format
msgid "Re&ad-only"
msgstr "Samo za čitanje"
#. IDD_OPEN, IDC_SWAP01_STATIC
-#: Merge.rc:1953
+#: Merge.rc:1963
#, c-format
msgid "Swap 1st | 2nd"
msgstr ""
#. IDD_GENERATE_PATCH, IDC_DIFF_BROWSE_FILE1
-#: Merge.rc:1954 Merge.rc:2310 Merge.rc:2413
+#: Merge.rc:1964 Merge.rc:2320 Merge.rc:2423
#, c-format
msgid "&Browse..."
msgstr "&Odabir..."
#. IDD_OPEN, IDC_FILES_DIRS_GROUP1
-#: Merge.rc:1955
+#: Merge.rc:1965
#, c-format
msgid "&2nd File or Folder"
msgstr ""
#. IDD_OPEN, IDC_PATH1_READONLY
-#: Merge.rc:1957
+#: Merge.rc:1967
#, c-format
msgid "Rea&d-only"
msgstr ""
#. IDD_OPEN, IDC_SWAP12_STATIC
-#: Merge.rc:1959
+#: Merge.rc:1969
#, c-format
msgid "Swap 2nd | 3rd"
msgstr ""
#. IDD_PROPPAGE_SYSTEM, IDC_FILTER_USER_BROWSE
-#: Merge.rc:1960 Merge.rc:2315
+#: Merge.rc:1970 Merge.rc:2325
#, c-format
msgid "B&rowse..."
msgstr "&Odabir..."
#. IDD_OPEN, IDC_FILES_DIRS_GROUP2
-#: Merge.rc:1961
+#: Merge.rc:1971
#, c-format
msgid "&3rd File or Folder (Optional)"
msgstr ""
#. IDD_OPEN, IDC_PATH2_READONLY
-#: Merge.rc:1963
+#: Merge.rc:1973
#, c-format
msgid "Read-o&nly"
msgstr ""
#. IDD_OPEN, IDC_SWAP02_STATIC
-#: Merge.rc:1965
+#: Merge.rc:1975
#, c-format
msgid "Swap 1st | 3rd"
msgstr ""
#. IDD_PROPPAGE_BACKUPS, IDC_BACKUP_BROWSE
-#: Merge.rc:1966 Merge.rc:2685 Merge.rc:2883
+#: Merge.rc:1976 Merge.rc:2695 Merge.rc:2893
#, c-format
msgid "Browse..."
msgstr "Odabir..."
#. IDD_OPEN, IDC_FILES_DIRS_GROUP3
-#: Merge.rc:1968
+#: Merge.rc:1978
#, c-format
msgid " Folder: Filter"
msgstr ""
#. IDD_OPEN, IDC_RECURS_CHECK
-#: Merge.rc:1971
+#: Merge.rc:1981
msgid "&Include subfolders"
msgstr "Uključi i &podmape"
#. IDD_OPEN, IDC_FILES_DIRS_GROUP5
-#: Merge.rc:1972
+#: Merge.rc:1982
msgid " File: Prediffer Plugin"
msgstr ""
#. IDD_OPEN, IDC_FILES_DIRS_GROUP4
-#: Merge.rc:1976
+#: Merge.rc:1986
#, c-format
msgid " File: Unpacker Plugin"
msgstr ""
#. IDD_OPEN, IDC_SELECT_UNPACKER
-#: Merge.rc:1978
+#: Merge.rc:1988
#, c-format
msgid "Se&lect..."
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN, IDCANCEL
-#: Merge.rc:1981 Merge.rc:2001 Merge.rc:2025 Merge.rc:2046 Merge.rc:2081
-#: Merge.rc:2432 Merge.rc:2456 Merge.rc:2470 Merge.rc:2498 Merge.rc:2551
-#: Merge.rc:2589 Merge.rc:2614 Merge.rc:2675 Merge.rc:2692 Merge.rc:2704
-#: Merge.rc:2868 Merge.rc:2928 Merge.rc:3087 Merge.rc:3105 Merge.rc:3148
-#: Merge.rc:3198
+#: Merge.rc:1991 Merge.rc:2011 Merge.rc:2035 Merge.rc:2056 Merge.rc:2091
+#: Merge.rc:2442 Merge.rc:2466 Merge.rc:2480 Merge.rc:2508 Merge.rc:2561
+#: Merge.rc:2599 Merge.rc:2624 Merge.rc:2685 Merge.rc:2702 Merge.rc:2714
+#: Merge.rc:2878 Merge.rc:2938 Merge.rc:3097 Merge.rc:3115 Merge.rc:3158
+#: Merge.rc:3208
#, c-format
msgid "Cancel"
msgstr "Odustajem"
#. IDD_OPEN, IDC_OPEN_STATUS
-#: Merge.rc:1982
+#: Merge.rc:1992
#, c-format
msgid "Status:"
msgstr "Status:"
#. IDD_PLUGINS_LIST, ID_HELP
-#: Merge.rc:1983 Merge.rc:2082 Merge.rc:2929
+#: Merge.rc:1993 Merge.rc:2092 Merge.rc:2939
#, c-format
msgid "Help"
msgstr "Pomoć"
#. IDD_OPEN, IDC_OPTIONS
-#: Merge.rc:1984
+#: Merge.rc:1994
msgid "&Options..."
msgstr "Pos&tavke..."
#. IDD_EDIT_FIND
-#: Merge.rc:1989
+#: Merge.rc:1999
#, c-format
msgid "Find"
msgstr "Nađi"
#. IDD_EDIT_MARKER, IDC_STATIC
-#: Merge.rc:1992 Merge.rc:2009 Merge.rc:2037
+#: Merge.rc:2002 Merge.rc:2019 Merge.rc:2047
#, c-format
msgid "Fi&nd what:"
msgstr "&Pojam:"
#. IDD_EDIT_MARKER, IDC_EDIT_WHOLE_WORD
-#: Merge.rc:1994 Merge.rc:2013 Merge.rc:2041
+#: Merge.rc:2004 Merge.rc:2023 Merge.rc:2051
#, c-format
msgid "Match &whole word only"
msgstr "Poklapanje &cijele riječi"
#. IDD_EDIT_MARKER, IDC_EDIT_REGEXP
-#: Merge.rc:1996 Merge.rc:2015 Merge.rc:2043
+#: Merge.rc:2006 Merge.rc:2025 Merge.rc:2053
#, c-format
msgid "Regular &expression"
msgstr "&Algoritam"
#. IDD_EDIT_FIND, IDC_FINDDLG_DONTWRAP
-#: Merge.rc:1997
+#: Merge.rc:2007
#, c-format
msgid "D&on't wrap end of file"
msgstr "Ne pre&lamaj završetak datoteke"
#. IDD_EDIT_FIND, IDC_FINDDLG_DONTCLOSE
-#: Merge.rc:1998
+#: Merge.rc:2008
#, c-format
msgid "&Don't close this dialog"
msgstr ""
#. IDD_EDIT_REPLACE, IDC_EDIT_SKIP
-#: Merge.rc:1999 Merge.rc:2021
+#: Merge.rc:2009 Merge.rc:2031
#, c-format
msgid "&Find Next"
msgstr "Traži &slijedeći"
#. IDD_EDIT_FIND, IDC_EDIT_FINDPREV
-#: Merge.rc:2000
+#: Merge.rc:2010
#, c-format
msgid "Find &Prev"
msgstr ""
#. IDD_EDIT_REPLACE
-#: Merge.rc:2006
+#: Merge.rc:2016
#, c-format
msgid "Replace"
msgstr "Zamijeni"
#. IDD_EDIT_REPLACE, IDC_STATIC
-#: Merge.rc:2011
+#: Merge.rc:2021
#, c-format
msgid "Re&place with:"
msgstr "Zamijeni s:"
#. IDD_EDIT_REPLACE, IDC_EDIT_SCOPE_DONT_WRAP
-#: Merge.rc:2016
+#: Merge.rc:2026
#, c-format
msgid "&Don't wrap at end of file"
msgstr "&Bez preloma teksta"
#. IDD_EDIT_REPLACE, IDC_STATIC
-#: Merge.rc:2018
+#: Merge.rc:2028
#, c-format
msgid "Replace in"
msgstr "Zamijeni u"
#. IDD_EDIT_REPLACE, IDC_EDIT_SCOPE_WHOLE_FILE
-#: Merge.rc:2020
+#: Merge.rc:2030
#, c-format
msgid "Wh&ole file"
msgstr "&cijeloj datoteci"
#. IDD_EDIT_REPLACE, IDC_EDIT_FINDPREV
-#: Merge.rc:2022
+#: Merge.rc:2032
msgid "Find Pre&v"
msgstr ""
#. IDD_EDIT_REPLACE, IDC_EDIT_REPLACE
-#: Merge.rc:2023
+#: Merge.rc:2033
#, c-format
msgid "&Replace"
msgstr "&Zamijeni"
#. IDD_EDIT_REPLACE, IDC_EDIT_REPLACE_ALL
-#: Merge.rc:2024
+#: Merge.rc:2034
#, c-format
msgid "Replace &All"
msgstr "Zamijeni &sve"
#. IDS_OPTIONSPG_MARKERCOLORS
-#: Merge.rc:2030 Merge.rc:4209
+#: Merge.rc:2040 Merge.rc:4219
#, c-format
msgid "Markers"
msgstr ""
#. IDD_EDIT_MARKER, IDC_EDIT_MARKERS_ENABLED
-#: Merge.rc:2033
+#: Merge.rc:2043
#, c-format
msgid "Enable &markers"
msgstr ""
#. IDD_FILTERS_LINEFILTERS, IDC_LFILTER_ADDBTN
-#: Merge.rc:2035 Merge.rc:2057
+#: Merge.rc:2045 Merge.rc:2067
#, c-format
msgid "New"
msgstr "Novi"
#. IDD_EDIT_MARKER, IDC_STATIC
-#: Merge.rc:2039
+#: Merge.rc:2049
#, c-format
msgid "&Background color:"
msgstr ""
#. IDS_MESSAGEBOX_OK
-#: Merge.rc:2044 Merge.rc:2829 Merge.rc:3086 Merge.rc:4171
+#: Merge.rc:2054 Merge.rc:2839 Merge.rc:3096 Merge.rc:4181
#, c-format
msgid "&Ok"
msgstr "&U redu"
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:2045 Merge.rc:2525 Merge.rc:3199
+#: Merge.rc:2055 Merge.rc:2535 Merge.rc:3209
#, c-format
msgid "&Apply"
msgstr "&Primjeni"
#. IDD_FILTERS_LINEFILTERS
-#: Merge.rc:2051
+#: Merge.rc:2061
msgid "Line Filters"
msgstr ""
#. IDD_FILTERS_LINEFILTERS, IDC_IGNOREREGEXP
-#: Merge.rc:2054
+#: Merge.rc:2064
#, c-format
msgid "Enable Line Filters"
msgstr "Omogući filtriranje redaka"
#. IDD_FILTERS_LINEFILTERS, IDC_STATIC
-#: Merge.rc:2055
+#: Merge.rc:2065
#, c-format
msgid "Regular Expressions (one per line):"
msgstr "Ispravan algoritam (jedan po retku):"
#. IDD_PLUGINS_LIST, IDC_PLUGIN_EDIT
-#: Merge.rc:2058 Merge.rc:2924
+#: Merge.rc:2068 Merge.rc:2934
#, c-format
msgid "Edit"
msgstr "Uređivanje"
#. IDD_PLUGINS_LIST, IDC_PLUGIN_REMOVE
-#: Merge.rc:2059 Merge.rc:2071 Merge.rc:2925
+#: Merge.rc:2069 Merge.rc:2081 Merge.rc:2935
#, c-format
msgid "Remove"
msgstr "Ukloni"
#. IDD_FILTERS_SUBSTITUTIONFILTERS
-#: Merge.rc:2064
+#: Merge.rc:2074
msgid "Substitution Filters"
msgstr ""
#. IDD_FILTERS_SUBSTITUTIONFILTERS, IDC_STATIC
-#: Merge.rc:2067
+#: Merge.rc:2077
msgid "Changes to the listed pairs below will be ignored or marked as insignificant. Patches are unaffected."
msgstr ""
#. IDD_FILTERS_SUBSTITUTIONFILTERS, IDC_IGNORED_SUSBSTITUTIONS_ENABLED
-#: Merge.rc:2068
+#: Merge.rc:2078
msgid "Enable"
msgstr ""
#. IDD_PLUGINS_LIST, IDC_PLUGIN_ADD
-#: Merge.rc:2070 Merge.rc:2923
+#: Merge.rc:2080 Merge.rc:2933
msgid "Add"
msgstr ""
#. IDD_FILTERS_SUBSTITUTIONFILTERS, IDC_LFILTER_CLEARBTN
-#: Merge.rc:2072
+#: Merge.rc:2082
msgid "Clear"
msgstr ""
#. IDD_PREFERENCES
-#: Merge.rc:2077
+#: Merge.rc:2087
#, c-format
msgid "Options"
msgstr "Postavke"
#. IDD_PREFERENCES, IDC_TREEOPT_IMPORT
-#: Merge.rc:2086
+#: Merge.rc:2096
#, c-format
msgid "Import..."
msgstr "Uvoz..."
#. IDD_PREFERENCES, IDC_TREEOPT_EXPORT
-#: Merge.rc:2087
+#: Merge.rc:2097
#, c-format
msgid "Export..."
msgstr "Izvoz..."
#. IDS_OPTIONSPG_GENCOMPARE
-#: Merge.rc:2092 Merge.rc:4199 Merge.rc:4202 Merge.rc:4219
+#: Merge.rc:2102 Merge.rc:4209 Merge.rc:4212 Merge.rc:4229
#, c-format
msgid "General"
msgstr "Opće"
#. IDD_PROPPAGE_GENERAL, IDC_SCROLL_CHECK
-#: Merge.rc:2095
+#: Merge.rc:2105
#, c-format
msgid "Automatically &scroll to first difference"
msgstr "Uvijek kreni od &prve razlike"
#. IDD_PROPPAGE_GENERAL, IDC_SCROLL_TO_FIRST_INLINE_DIFF_CHECK
-#: Merge.rc:2097
+#: Merge.rc:2107
msgid "Automatically s&croll to first inline difference"
msgstr ""
#. IDD_PROPPAGE_GENERAL, IDC_STATIC
-#: Merge.rc:2099
+#: Merge.rc:2109
msgid "Cl&ose windows with 'Esc':"
msgstr "Zatvori usporedbu tipkom '&Esc':"
#. IDD_PROPPAGE_GENERAL, IDC_VERIFY_OPEN_PATHS
-#: Merge.rc:2101
+#: Merge.rc:2111
#, c-format
msgid "&Automatically verify paths in Open dialog"
msgstr "&Prethodno provjeri stazu u dijalogu odabira"
#. IDD_PROPPAGE_GENERAL, IDC_STATIC
-#: Merge.rc:2103
+#: Merge.rc:2113
msgid "Single instance mode:"
msgstr ""
#. IDD_PROPPAGE_GENERAL, IDC_ASK_MULTIWINDOW_CLOSE
-#: Merge.rc:2105
+#: Merge.rc:2115
#, c-format
msgid "As&k when closing multiple windows"
msgstr "&Upitaj prije zatvaranja višestrukih usporedbi"
#. IDD_PROPPAGE_GENERAL, IDC_PRESERVE_FILETIME
-#: Merge.rc:2107
+#: Merge.rc:2117
#, c-format
msgid "&Preserve file time in file compare"
msgstr "&Zadrži oznake vremena i datuma u usporedbi"
#. IDD_PROPPAGE_GENERAL, IDC_STARTUP_FOLDER_SELECT
-#: Merge.rc:2109
+#: Merge.rc:2119
#, c-format
msgid "Show \"Select Files or Folders\" dialog on startup"
msgstr "Pri pokretanju prikaži dijalog\"Odabir datoteke ili mape\""
#. IDD_PROPPAGE_GENERAL, IDC_CLOSE_WITH_OK
-#: Merge.rc:2111
+#: Merge.rc:2121
msgid "Close \"Select Files or Folders\" dialog on clicking Compare button"
msgstr ""
#. IDD_PROPPAGE_GENERAL, IDC_STATIC
-#: Merge.rc:2113
+#: Merge.rc:2123
#, c-format
msgid "Op&en dialog Auto completion:"
msgstr "Otvori dijalog &samodovršenja"
#. IDD_PROPPAGE_GENERAL, IDC_STATIC
-#: Merge.rc:2115
+#: Merge.rc:2125
msgid "Auto-&reload modified files:"
msgstr ""
#. IDD_PROPPAGE_GENERAL, IDC_STATIC
-#: Merge.rc:2117
+#: Merge.rc:2127
#, c-format
msgid "Language:"
msgstr ""
#. IDD_PROPPAGE_COMPARE_WEBPAGE, IDC_COMPARE_DEFAULTS
-#: Merge.rc:2119 Merge.rc:2299 Merge.rc:2321 Merge.rc:2352 Merge.rc:2369
-#: Merge.rc:2386 Merge.rc:2394 Merge.rc:2430 Merge.rc:2454 Merge.rc:2633
-#: Merge.rc:2644 Merge.rc:2653 Merge.rc:2887 Merge.rc:2922 Merge.rc:2985
-#: Merge.rc:3010 Merge.rc:3024 Merge.rc:3038 Merge.rc:3054
+#: Merge.rc:2129 Merge.rc:2309 Merge.rc:2331 Merge.rc:2362 Merge.rc:2379
+#: Merge.rc:2396 Merge.rc:2404 Merge.rc:2440 Merge.rc:2464 Merge.rc:2643
+#: Merge.rc:2654 Merge.rc:2663 Merge.rc:2897 Merge.rc:2932 Merge.rc:2995
+#: Merge.rc:3020 Merge.rc:3034 Merge.rc:3048 Merge.rc:3064
#, c-format
msgid "Defaults"
msgstr "Predpodešeno"
#. IDS_OPTIONSPG_COLORS
-#: Merge.rc:2124 Merge.rc:2140 Merge.rc:2267 Merge.rc:2292 Merge.rc:4205
+#: Merge.rc:2134 Merge.rc:2150 Merge.rc:2277 Merge.rc:2302 Merge.rc:4215
#, c-format
msgid "Colors"
msgstr "Boje"
#. IDD_PROPPAGE_COLOR_SCHEMES, IDC_STATIC
-#: Merge.rc:2127
+#: Merge.rc:2137
msgid "Color &mode:"
msgstr ""
#. IDD_PROPPAGE_COLOR_SCHEMES, IDC_STATIC
-#: Merge.rc:2129
+#: Merge.rc:2139
msgid "&Light mode scheme:"
msgstr ""
#. IDD_PROPPAGE_COLOR_SCHEMES, IDC_STATIC
-#: Merge.rc:2131
+#: Merge.rc:2141
msgid "&Dark mode scheme:"
msgstr ""
#. IDD_PROPPAGE_COLOR_SCHEMES, IDC_STATIC
-#: Merge.rc:2133
+#: Merge.rc:2143
msgid "Your custom schemes"
msgstr ""
#. IDD_PROPPAGE_COLOR_SCHEMES, IDC_COLOR_SCHEME_SAVE
-#: Merge.rc:2134
+#: Merge.rc:2144
msgid "&Save current scheme..."
msgstr ""
#. IDD_PROPPAGE_COLOR_SCHEMES, IDC_COLOR_SCHEME_DELETE
-#: Merge.rc:2135
+#: Merge.rc:2145
msgid "Delete ¤t scheme..."
msgstr ""
#. IDD_PROPPAGE_COLORS_DIR, IDC_BACKGROUND_COLUMN_LABEL
-#: Merge.rc:2143 Merge.rc:2238 Merge.rc:2258 Merge.rc:2272
+#: Merge.rc:2153 Merge.rc:2248 Merge.rc:2268 Merge.rc:2282
#, c-format
msgid "Background"
msgstr "Pozadina"
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2144
+#: Merge.rc:2154
#, c-format
msgid "Deleted"
msgstr "Obrisano"
#. IDS_OPTIONSPG_TEXTCOLORS
-#: Merge.rc:2145 Merge.rc:2207 Merge.rc:2239 Merge.rc:2273 Merge.rc:4207
+#: Merge.rc:2155 Merge.rc:2217 Merge.rc:2249 Merge.rc:2283 Merge.rc:4217
#, c-format
msgid "Text"
msgstr "Tekst"
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2146
+#: Merge.rc:2156
#, c-format
msgid "Difference:"
msgstr "Razlike:"
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2151
+#: Merge.rc:2161
#, c-format
msgid "Selected Difference:"
msgstr "Označena razlika:"
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2156
+#: Merge.rc:2166
#, c-format
msgid "Ignored Difference:"
msgstr "Zanemarene razlike:"
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2161
+#: Merge.rc:2171
#, c-format
msgid "Moved:"
msgstr "Premješteno:"
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2166
+#: Merge.rc:2176
#, c-format
msgid "Selected Moved:"
msgstr "Premještaj označenog:"
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2171
+#: Merge.rc:2181
#, c-format
msgid "Same As Next (3 panes):"
msgstr ""
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2176
+#: Merge.rc:2186
#, c-format
msgid "Same As Next (Selected):"
msgstr ""
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2181
+#: Merge.rc:2191
#, c-format
msgid "Word Difference:"
msgstr "Različite riječi:"
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2186
+#: Merge.rc:2196
#, c-format
msgid "Selected Word Diff:"
msgstr "Razlike označene riječi:"
#. IDD_INPUTBOX
-#: Merge.rc:2195 Merge.rc:2230 Merge.rc:2251 Merge.rc:3099
+#: Merge.rc:2205 Merge.rc:2240 Merge.rc:2261 Merge.rc:3109
#, c-format
msgid "Dialog"
msgstr "Dijalog"
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC
-#: Merge.rc:2198
+#: Merge.rc:2208
#, c-format
msgid "Keywords:"
msgstr "Ključne riječi:"
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC
-#: Merge.rc:2199
+#: Merge.rc:2209
#, c-format
msgid "Function names:"
msgstr "Nazivi funkcija:"
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC
-#: Merge.rc:2200
+#: Merge.rc:2210
#, c-format
msgid "Comments:"
msgstr "Komentari:"
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC
-#: Merge.rc:2201
+#: Merge.rc:2211
#, c-format
msgid "Numbers:"
msgstr "Brojevi:"
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC
-#: Merge.rc:2202
+#: Merge.rc:2212
#, c-format
msgid "Operators:"
msgstr "Operatori:"
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC
-#: Merge.rc:2203
+#: Merge.rc:2213
#, c-format
msgid "Strings:"
msgstr "Pojmovi:"
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC
-#: Merge.rc:2204
+#: Merge.rc:2214
#, c-format
msgid "Preprocessor:"
msgstr "Predobrađeno:"
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC
-#: Merge.rc:2205
+#: Merge.rc:2215
#, c-format
msgid "User 1:"
msgstr "Korisnik 1:"
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC
-#: Merge.rc:2206
+#: Merge.rc:2216
#, c-format
msgid "User 2:"
msgstr "Korisnik 2:"
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_SCOLOR_USER2_BOLD
-#: Merge.rc:2209 Merge.rc:2211 Merge.rc:2213 Merge.rc:2215 Merge.rc:2217
-#: Merge.rc:2219 Merge.rc:2221 Merge.rc:2223 Merge.rc:2225
+#: Merge.rc:2219 Merge.rc:2221 Merge.rc:2223 Merge.rc:2225 Merge.rc:2227
+#: Merge.rc:2229 Merge.rc:2231 Merge.rc:2233 Merge.rc:2235
#, c-format
msgid "Bold"
msgstr "Podebljano"
#. IDD_PROPPAGE_COLORS_TEXT, IDC_DEFAULT_STANDARD_COLORS
-#: Merge.rc:2233
+#: Merge.rc:2243
#, c-format
msgid "&Use customized text colors"
msgstr "&Koristi odabrane boje"
#. IDD_PROPPAGE_COLORS_TEXT, IDC_WHITESPACE_COLOR_LABEL
-#: Merge.rc:2235
+#: Merge.rc:2245
#, c-format
msgid "Whitespace:"
msgstr "Skriveni znaci i razmaci:"
#. IDD_PROPPAGE_COLORS_TEXT, IDC_TEXT_COLOR_LABEL
-#: Merge.rc:2236
+#: Merge.rc:2246
#, c-format
msgid "Regular text:"
msgstr "Pravilan tekst"
#. IDD_PROPPAGE_COLORS_TEXT, IDC_SELECTION_COLOR_LABEL
-#: Merge.rc:2237
+#: Merge.rc:2247
#, c-format
msgid "Selection:"
msgstr "Odabir:"
#. IDD_PROPPAGE_COLORS_DIR, IDC_STATIC
-#: Merge.rc:2245 Merge.rc:2286
+#: Merge.rc:2255 Merge.rc:2296
#, c-format
msgid "Margin:"
msgstr ""
#. IDD_PROPPAGE_COLORS_MARKER, IDC_MARKER0_COLOR_LABEL
-#: Merge.rc:2254
+#: Merge.rc:2264
#, c-format
msgid "Search Marker:"
msgstr ""
#. IDD_PROPPAGE_COLORS_MARKER, IDC_MARKER1_COLOR_LABEL
-#: Merge.rc:2255
+#: Merge.rc:2265
#, c-format
msgid "User Defined Marker 1:"
msgstr ""
#. IDD_PROPPAGE_COLORS_MARKER, IDC_MARKER2_COLOR_LABEL
-#: Merge.rc:2256
+#: Merge.rc:2266
#, c-format
msgid "User Defined Marker 2:"
msgstr ""
#. IDD_PROPPAGE_COLORS_MARKER, IDC_MARKER3_COLOR_LABEL
-#: Merge.rc:2257
+#: Merge.rc:2267
#, c-format
msgid "User Defined Marker 3:"
msgstr ""
#. IDD_PROPPAGE_COLORS_DIR, IDC_USE_DIR_COMPARE_COLORS
-#: Merge.rc:2270
+#: Merge.rc:2280
msgid "&Use folder compare colors"
msgstr ""
#. IDD_PROPPAGE_COLORS_DIR, IDC_STATIC
-#: Merge.rc:2274
+#: Merge.rc:2284
msgid "Items equal:"
msgstr ""
#. IDD_PROPPAGE_COLORS_DIR, IDC_STATIC
-#: Merge.rc:2277
+#: Merge.rc:2287
msgid "Items different:"
msgstr ""
#. IDD_PROPPAGE_COLORS_DIR, IDC_STATIC
-#: Merge.rc:2280
+#: Merge.rc:2290
msgid "Items missing:"
msgstr ""
#. IDD_PROPPAGE_COLORS_DIR, IDC_STATIC
-#: Merge.rc:2283
+#: Merge.rc:2293
msgid "Items filtered:"
msgstr ""
#. IDD_PROPPAGE_COLORS_SYSTEM, IDC_SYSCOLOR_HOOK_ENABLED
-#: Merge.rc:2295
+#: Merge.rc:2305
msgid "&Use custom system colors"
msgstr ""
#. IDS_PRPCAT_SYSTEM
-#: Merge.rc:2304 Merge.rc:4211 Merge.rc:4212 Merge.rc:4657
+#: Merge.rc:2314 Merge.rc:4221 Merge.rc:4222 Merge.rc:4667
#, c-format
msgid "System"
msgstr "Sistem"
#. IDD_PROPPAGE_SYSTEM, IDC_USE_RECYCLE_BIN
-#: Merge.rc:2307
+#: Merge.rc:2317
#, c-format
msgid "&Use Recycle Bin"
msgstr "&Premjesti obrisano u koš?"
#. IDD_PROPPAGE_SYSTEM, IDC_STATIC
-#: Merge.rc:2308
+#: Merge.rc:2318
#, c-format
msgid "&External editor:"
msgstr "&Vanjski uređivač:"
#. IDD_PROPPAGE_SYSTEM, IDC_STATIC
-#: Merge.rc:2311
+#: Merge.rc:2321
msgid "&Store user data in:"
msgstr ""
#. IDD_PROPPAGE_SYSTEM, IDC_STATIC
-#: Merge.rc:2313
+#: Merge.rc:2323
#, c-format
msgid "&Filter folder:"
msgstr "&Naziv mape filtara:"
#. IDD_PROPPAGE_SYSTEM, IDC_STATIC
-#: Merge.rc:2316
+#: Merge.rc:2326
#, c-format
msgid "Temporary files folder"
msgstr "Mapa privremenih datoteka"
#. IDD_PROPPAGE_SYSTEM, IDC_TMPFOLDER_SYSTEM
-#: Merge.rc:2317
+#: Merge.rc:2327
#, c-format
msgid "S&ystem temp folder"
msgstr "Mapa s&istemska, privremena"
#. IDD_PROPPAGE_SYSTEM, IDC_STATIC
-#: Merge.rc:2318
+#: Merge.rc:2328
#, c-format
msgid "C&ustom folder:"
msgstr "Ko&risnikova mapa"
#. IDD_GENERATE_PATCH, IDC_DIFF_BROWSE_FILE2
-#: Merge.rc:2320 Merge.rc:2416
+#: Merge.rc:2330 Merge.rc:2426
#, c-format
msgid "Br&owse..."
msgstr "&Odabir..."
#. IDS_OPTIONSPG_COMPARE
-#: Merge.rc:2326 Merge.rc:4200
+#: Merge.rc:2336 Merge.rc:4210
#, c-format
msgid "Compare"
msgstr "Usporedba"
#. IDD_PROPPAGE_COMPARE, IDC_STATIC
-#: Merge.rc:2329
+#: Merge.rc:2339
#, c-format
msgid "Whitespaces"
msgstr "Skriveni znaci i razmaci"
#. IDD_PROPPAGE_COMPARE, IDC_WHITESPACE
-#: Merge.rc:2330
+#: Merge.rc:2340
#, c-format
msgid "&Compare"
msgstr "&Usporedi"
#. IDD_PROPPAGE_COMPARE, IDC_WHITE_CHANGE
-#: Merge.rc:2331
+#: Merge.rc:2341
#, c-format
msgid "&Ignore change"
msgstr "Zanemari &izmjene"
#. IDD_PROPPAGE_COMPARE, IDC_ALL_WHITE
-#: Merge.rc:2332
+#: Merge.rc:2342
#, c-format
msgid "I&gnore all"
msgstr "Zanemari &sve"
#. IDD_PROPPAGE_COMPARE, IDC_IGNBLANKS_CHECK
-#: Merge.rc:2333
+#: Merge.rc:2343
msgid "Ignore blan&k lines"
msgstr "Zanemari prazne &retke"
#. IDD_PROPPAGE_COMPARE, IDC_IGNCASE_CHECK
-#: Merge.rc:2334
+#: Merge.rc:2344
msgid "Ignore &case"
msgstr "Zanemari V/m &slova"
#. IDD_PROPPAGE_COMPARE, IDC_EOL_SENSITIVE
-#: Merge.rc:2335
+#: Merge.rc:2345
msgid "Igno&re EOL differences (Windows/Unix/Mac)"
msgstr ""
#. IDD_PROPPAGE_COMPARE, IDC_IGNORE_NUMBERS
-#: Merge.rc:2337
+#: Merge.rc:2347
msgid "Ignore num&bers"
msgstr ""
#. IDD_PROPPAGE_COMPARE, IDC_CP_SENSITIVE
-#: Merge.rc:2338
+#: Merge.rc:2348
msgid "Ignore codepage &differences"
msgstr ""
#. IDD_PROPPAGE_COMPARE, IDC_FILTERCOMMENTS_CHECK
-#: Merge.rc:2339
+#: Merge.rc:2349
msgid "Ignore c&omment differences"
msgstr ""
#. IDD_PROPPAGE_COMPARE, IDC_IGNEOFEOL_CHECK
-#: Merge.rc:2341
+#: Merge.rc:2351
msgid "Ignore &missing trailing EOL"
msgstr ""
#. IDD_PROPPAGE_COMPARE, IDC_IGNLBRKS_CHECK
-#: Merge.rc:2343
+#: Merge.rc:2353
msgid "Ignore line &breaks (treat as spaces)"
msgstr ""
#. IDD_PROPPAGE_COMPARE, IDC_MOVED_BLOCKS
-#: Merge.rc:2345
+#: Merge.rc:2355
#, c-format
msgid "E&nable moved block detection"
msgstr "Omogući &razlikovanje premještenih blokova"
#. IDD_PROPPAGE_COMPARE, IDC_ALIGN_SIMILAR_LINES
-#: Merge.rc:2346
+#: Merge.rc:2356
msgid "Align &similar lines"
msgstr ""
#. IDD_PROPPAGE_COMPARE, IDC_STATIC
-#: Merge.rc:2347
+#: Merge.rc:2357
msgid "Diff &algorithm:"
msgstr ""
#. IDD_PROPPAGE_COMPARE, IDC_INDENT_HEURISTIC
-#: Merge.rc:2349
+#: Merge.rc:2359
msgid "Enable indent &heuristic"
msgstr ""
#. IDD_PROPPAGE_COMPARE, IDC_COMPLETELY_BLANK_OUT_IGNORED_DIFFERENCES
-#: Merge.rc:2350
+#: Merge.rc:2360
msgid "Completely unhighlight the ignored differences"
msgstr ""
#. IDS_OPTIONSPG_EDITOR
-#: Merge.rc:2357 Merge.rc:4201
+#: Merge.rc:2367 Merge.rc:4211
#, c-format
msgid "Editor"
msgstr "Uređivanje"
#. IDD_PROPPAGE_EDITOR, IDC_HILITE_CHECK
-#: Merge.rc:2360
+#: Merge.rc:2370
#, c-format
msgid "&Highlight syntax"
msgstr "&Istakni sintaksu"
#. IDD_PROPPAGE_EDITOR, IDC_MIXED_EOL
-#: Merge.rc:2361
+#: Merge.rc:2371
#, c-format
msgid "&Preserve original EOL"
msgstr "Zadrži izvorni način označavanja kraja redaka"
#. IDD_PROPPAGE_EDITOR, IDC_STATIC
-#: Merge.rc:2362
+#: Merge.rc:2372
#, c-format
msgid "Tabs"
msgstr "Tabulatori"
#. IDD_PROPPAGE_EDITOR, IDC_STATIC
-#: Merge.rc:2363
+#: Merge.rc:2373
#, c-format
msgid "&Tab size:"
msgstr "&Veličina tabulatora"
#. IDD_PROPPAGE_EDITOR, IDC_PROP_INSERT_TABS
-#: Merge.rc:2365
+#: Merge.rc:2375
#, c-format
msgid "&Insert tabs"
msgstr "&Umetni tabulator"
#. IDD_PROPPAGE_EDITOR, IDC_PROP_INSERT_SPACES
-#: Merge.rc:2366
+#: Merge.rc:2376
#, c-format
msgid "Insert &spaces"
msgstr "&Umetni razmak"
#. IDD_PROPPAGE_EDITOR, IDC_STATIC
-#: Merge.rc:2367
+#: Merge.rc:2377
msgid "&Rendering mode:"
msgstr ""
#. IDD_PROPPAGE_EDITOR_COMPAREMERGE, IDC_AUTOMRESCAN_CHECK
-#: Merge.rc:2376
+#: Merge.rc:2386
#, c-format
msgid "&Automatic rescan"
msgstr "&Automatski ponovo pretraži"
#. IDD_PROPPAGE_EDITOR_COMPAREMERGE, IDC_STATIC
-#: Merge.rc:2377
+#: Merge.rc:2387
msgid "Copy &granularity for selected differences:"
msgstr ""
#. IDD_PROPPAGE_EDITOR_COMPAREMERGE, IDC_LINE_COLORING_GROUP
-#: Merge.rc:2379
+#: Merge.rc:2389
#, c-format
msgid "Line Difference Coloring"
msgstr "Isticanje različitosti"
#. IDD_PROPPAGE_EDITOR_COMPAREMERGE, IDC_VIEW_LINE_DIFFERENCES
-#: Merge.rc:2380
+#: Merge.rc:2390
#, c-format
msgid "View line differences"
msgstr "Unutar retka"
#. IDD_PROPPAGE_EDITOR_COMPAREMERGE, IDC_EDITOR_CHARLEVEL
-#: Merge.rc:2381
+#: Merge.rc:2391
#, c-format
msgid "&Character-level"
msgstr "Svaki &znak"
#. IDD_PROPPAGE_EDITOR_COMPAREMERGE, IDC_EDITOR_WORDLEVEL
-#: Merge.rc:2382
+#: Merge.rc:2392
#, c-format
msgid "&Word-level:"
msgstr "&Rijeć:"
#. IDD_PROPPAGE_EDITOR_COMPAREMERGE, IDC_STATIC
-#: Merge.rc:2384
+#: Merge.rc:2394
#, c-format
msgid "W&ord break characters:"
msgstr ""
#. IDD_PROPPAGE_MESSAGEBOXES, IDC_STATIC
-#: Merge.rc:2401
+#: Merge.rc:2411
msgid "Some messages can be hidden by the user. Press Reset to make all messages visible again."
msgstr "WinMerge omogućuje skrivanje uobičajenih poruka. Pritisnite 'Poništi' da poruke opet budu vidljive."
#. IDD_SELECT_FILES_OR_FOLDERS, IDC_RESET
-#: Merge.rc:2402 Merge.rc:3085
+#: Merge.rc:2412 Merge.rc:3095
#, c-format
msgid "Reset"
msgstr "Poništi"
#. IDD_GENERATE_PATCH
-#: Merge.rc:2408
+#: Merge.rc:2418
#, c-format
msgid "Patch Generator"
msgstr "Pohrana razlika (Patch)"
#. IDD_GENERATE_PATCH, IDC_STATIC
-#: Merge.rc:2411
+#: Merge.rc:2421
#, c-format
msgid "File&1:"
msgstr "&Lijeva dat."
#. IDD_GENERATE_PATCH, IDC_STATIC
-#: Merge.rc:2414
+#: Merge.rc:2424
#, c-format
msgid "File&2:"
msgstr "&Desna dat."
#. IDD_GENERATE_PATCH, IDC_DIFF_SWAPFILES
-#: Merge.rc:2417
+#: Merge.rc:2427
#, c-format
msgid "&Swap"
msgstr "&Obrni D<->L"
#. IDD_DIRCMP_REPORT, IDC_REPORT_COPYCLIPBOARD
-#: Merge.rc:2418 Merge.rc:2690
+#: Merge.rc:2428 Merge.rc:2700
#, c-format
msgid "&Copy to clipboard"
msgstr "&Kopiraj u međumemoriju"
#. IDD_GENERATE_PATCH, IDC_DIFF_APPENDFILE
-#: Merge.rc:2419
+#: Merge.rc:2429
#, c-format
msgid "&Append to existing file"
msgstr "&Priključi postojećoj datoteci"
#. IDD_GENERATE_PATCH, IDC_STATIC
-#: Merge.rc:2420
+#: Merge.rc:2430
#, c-format
msgid "&Result:"
msgstr "&Pohranu u:"
#. IDD_GENERATE_PATCH, IDC_DIFF_BROWSE_RESULT
-#: Merge.rc:2422
+#: Merge.rc:2432
#, c-format
msgid "Bro&wse..."
msgstr "O&dabir..."
#. IDD_GENERATE_PATCH, IDC_STATIC
-#: Merge.rc:2423
+#: Merge.rc:2433
#, c-format
msgid "&Format"
msgstr "&Način prikaza"
#. IDD_GENERATE_PATCH, IDC_STATIC
-#: Merge.rc:2424
+#: Merge.rc:2434
#, c-format
msgid "St&yle:"
msgstr "St&il"
#. IDD_GENERATE_PATCH, IDC_STATIC
-#: Merge.rc:2426
+#: Merge.rc:2436
#, c-format
msgid "&Context:"
msgstr "&Dubina:"
#. IDD_GENERATE_PATCH, IDC_DIFF_INCLCMDLINE
-#: Merge.rc:2428
+#: Merge.rc:2438
#, c-format
msgid "Inclu&de command line"
msgstr "&Uključi naredbeni redak"
#. IDD_GENERATE_PATCH, IDC_DIFF_OPENTOEDITOR
-#: Merge.rc:2429
+#: Merge.rc:2439
#, c-format
msgid "Open in e&xternal editor"
msgstr "Otvori u vanjskom pregledniku."
#. IDD_DIRCOLS
-#: Merge.rc:2446
+#: Merge.rc:2456
#, c-format
msgid "Display Columns"
msgstr "Prikaži kolone"
#. IDD_DIRCOLS, IDC_UP
-#: Merge.rc:2450
+#: Merge.rc:2460
#, c-format
msgid "Move &Up"
msgstr "Pomakni &gore"
#. IDD_DIRCOLS, IDC_DOWN
-#: Merge.rc:2451
+#: Merge.rc:2461
#, c-format
msgid "Move &Down"
msgstr "Pomakni &dole"
#. IDD_DIRCOLS, IDC_COLDLG_ADDITIONAL_PROPERTIES
-#: Merge.rc:2453
+#: Merge.rc:2463
msgid "&Additional Properties"
msgstr ""
#. IDD_DIRADDITIONALPROPS
-#: Merge.rc:2461
+#: Merge.rc:2471
msgid "Additional Properties"
msgstr ""
#. IDD_PLUGINS_SELECTPLUGIN
-#: Merge.rc:2475
+#: Merge.rc:2485
msgid "Select Plugin"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN, IDC_STATIC
-#: Merge.rc:2478 Merge.rc:3115
+#: Merge.rc:2488 Merge.rc:3125
msgid "Plugin &name:"
msgstr ""
#. IDD_PLUGINS_SELECTPLUGIN, IDC_STATIC
-#: Merge.rc:2480
+#: Merge.rc:2490
msgid "&Target files:"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN, IDC_STATIC
-#: Merge.rc:2482 Merge.rc:3117
+#: Merge.rc:2492 Merge.rc:3127
#, c-format
msgid "Extensions list:"
msgstr "Popis ekstenzija"
#. IDD_PLUGINS_EDITPLUGIN, IDC_STATIC
-#: Merge.rc:2484 Merge.rc:3119
+#: Merge.rc:2494 Merge.rc:3129
#, c-format
msgid "Description:"
msgstr "Opis:"
#. IDD_PLUGINS_EDITPLUGIN, IDC_STATIC
-#: Merge.rc:2486 Merge.rc:3121
+#: Merge.rc:2496 Merge.rc:3131
msgid "Default arguments:"
msgstr ""
#. IDD_PLUGINS_SELECTPLUGIN, IDC_PLUGIN_ALLOW_ALL
-#: Merge.rc:2488
+#: Merge.rc:2498
msgid "Display all plugins (Ignore extension)"
msgstr ""
#. IDD_PLUGINS_SELECTPLUGIN, IDC_PLUGIN_OPEN_IN_SAME_FRAME_TYPE
-#: Merge.rc:2490
+#: Merge.rc:2500
msgid "&Open files in same window type after unpacking"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_PIPELINE_STATIC
-#: Merge.rc:2492 Merge.rc:3129
+#: Merge.rc:2502 Merge.rc:3139
msgid "&Plugin pipeline:"
msgstr ""
#. IDD_PLUGINS_SELECTPLUGIN, IDC_PLUGIN_ALIAS
-#: Merge.rc:2495
+#: Merge.rc:2505
msgid "&Alias..."
msgstr ""
#. IDD_DIRCOMP_PROGRESS, IDC_COMPARISON_STOP
-#: Merge.rc:2505
+#: Merge.rc:2515
#, c-format
msgid "Stop"
msgstr "Stani"
#. IDD_DIRCOMP_PROGRESS, IDC_COMPARISON_PAUSE
-#: Merge.rc:2506
+#: Merge.rc:2516
#, c-format
msgid "Pause"
msgstr ""
#. IDD_DIRCOMP_PROGRESS, IDC_COMPARISON_CONTINUE
-#: Merge.rc:2507
+#: Merge.rc:2517
#, c-format
msgid "Continue"
msgstr ""
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC
-#: Merge.rc:2509 Merge.rc:2973
+#: Merge.rc:2519 Merge.rc:2983
msgid "C&PU cores to use:"
msgstr ""
#. IDD_DIRCOMP_PROGRESS, IDC_STATIC
-#: Merge.rc:2510
+#: Merge.rc:2520
#, c-format
msgid "Items total:"
msgstr "Stavki ukupno:"
#. IDD_DIRCOMP_PROGRESS, IDC_STATIC
-#: Merge.rc:2511
+#: Merge.rc:2521
#, c-format
msgid "Items compared:"
msgstr "Stavki uspoređeno:"
#. IDS_PREVIEWBAR_CLOSE
-#: Merge.rc:2526 Merge.rc:2846 Merge.rc:5328
+#: Merge.rc:2536 Merge.rc:2856 Merge.rc:5339
#, c-format
msgid "&Close"
msgstr "&Zatvori"
#. IDD_WMGOTO
-#: Merge.rc:2537
+#: Merge.rc:2547
msgid "Go to"
msgstr "Idi na"
#. IDD_WMGOTO, IDC_STATIC
-#: Merge.rc:2540
+#: Merge.rc:2550
msgid "G&o to:"
msgstr "Redak &br:"
#. IDD_WMGOTO, IDC_STATIC
-#: Merge.rc:2543
+#: Merge.rc:2553
#, c-format
msgid "File"
msgstr "datoteku"
#. IDD_WMGOTO, IDC_STATIC
-#: Merge.rc:2547
+#: Merge.rc:2557
msgid "Go to what"
msgstr "u datoteci"
#. IDD_WMGOTO, IDC_WMGOTO_TOLINE
-#: Merge.rc:2548
+#: Merge.rc:2558
#, c-format
msgid "Li&ne"
msgstr "&redak"
#. IDD_WMGOTO, IDC_WMGOTO_TODIFF
-#: Merge.rc:2549
+#: Merge.rc:2559
#, c-format
msgid "&Difference"
msgstr "&razliku"
#. IDD_WMGOTO, IDOK
-#: Merge.rc:2550
+#: Merge.rc:2560
msgid "&Go to"
msgstr "Idi &na"
#. IDS_PROJECT_ITEM_FILE_FILTER
-#: Merge.rc:2556 Merge.rc:4321
+#: Merge.rc:2566 Merge.rc:4331
msgid "File Filters"
msgstr ""
#. IDD_FILTERS_FILEFILTERS, IDC_STATIC
-#: Merge.rc:2559
+#: Merge.rc:2569
msgid "&Mask / Filter Expression"
msgstr ""
#. IDD_FILTERS_FILEFILTERS, IDC_STATIC
-#: Merge.rc:2562
+#: Merge.rc:2572
msgid "Preset &Filters"
msgstr ""
#. IDD_FILTERS_FILEFILTERS, IDC_FILTERFILE_TEST_BTN
-#: Merge.rc:2564
+#: Merge.rc:2574
msgid "Test..."
msgstr "Test..."
#. IDD_FILTERS_FILEFILTERS, IDC_FILTERFILE_INSTALL
-#: Merge.rc:2565
+#: Merge.rc:2575
#, c-format
msgid "Install..."
msgstr "Instaliraj..."
#. IDD_FILTERS_FILEFILTERS, IDC_FILTERFILE_NEWBTN
-#: Merge.rc:2566
+#: Merge.rc:2576
#, c-format
msgid "New..."
msgstr "Novi..."
#. IDD_FILTERS_FILEFILTERS, IDC_FILTERFILE_EDITBTN
-#: Merge.rc:2567
+#: Merge.rc:2577
#, c-format
msgid "Edit..."
msgstr "Uređivanje..."
#. IDD_FILTERS_FILEFILTERS, IDC_FILTERFILE_DELETEBTN
-#: Merge.rc:2568
+#: Merge.rc:2578
#, c-format
msgid "Delete..."
msgstr "Brisanje..."
#. IDD_FILTERS_CONDITION
-#: Merge.rc:2573
+#: Merge.rc:2583
msgid "Filter Condition"
msgstr ""
#. IDD_FILTERS_CONDITION, IDC_STATIC
-#: Merge.rc:2576
+#: Merge.rc:2586
msgid "&Left-hand side:"
msgstr ""
#. IDD_FILTERS_CONDITION, IDC_STATIC
-#: Merge.rc:2578
+#: Merge.rc:2588
msgid "&Operator:"
msgstr ""
#. IDD_FILTERS_CONDITION, IDC_STATIC
-#: Merge.rc:2580
+#: Merge.rc:2590
msgid "&Right-hand side:"
msgstr ""
#. IDD_FILTERS_CONDITION, IDC_STATIC
-#: Merge.rc:2586
+#: Merge.rc:2596
msgid "Expression:"
msgstr ""
#. IDD_COMPARISON_RESULT_FILTER
-#: Merge.rc:2595
+#: Merge.rc:2605
msgid "Filter by Comparison Result"
msgstr ""
#. IDD_COMPARISON_RESULT_FILTER, IDC_RADIO_INCLUDE
-#: Merge.rc:2598
+#: Merge.rc:2608
msgid "&Include"
msgstr ""
#. IDD_COMPARISON_RESULT_FILTER, IDC_RADIO_EXCLUDE
-#: Merge.rc:2599
+#: Merge.rc:2609
msgid "&Exclude"
msgstr ""
#. IDD_COMPARISON_RESULT_FILTER, IDC_STATIC
-#: Merge.rc:2600
+#: Merge.rc:2610
msgid "Comparison Results"
msgstr ""
#. IDS_IDENTICAL
-#: Merge.rc:2601 Merge.rc:2733 Merge.rc:2794 Merge.rc:4698
+#: Merge.rc:2611 Merge.rc:2743 Merge.rc:2804 Merge.rc:4708
#, c-format
msgid "Identical"
msgstr "Identično"
#. IDS_DIFFERENT
-#: Merge.rc:2602 Merge.rc:2714 Merge.rc:2755 Merge.rc:4708
+#: Merge.rc:2612 Merge.rc:2724 Merge.rc:2765 Merge.rc:4718
#, c-format
msgid "Different"
msgstr "Razlika"
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_LEFT_ONLY
-#: Merge.rc:2603
+#: Merge.rc:2613
msgid "Left only"
msgstr ""
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_RIGHT_ONLY
-#: Merge.rc:2604
+#: Merge.rc:2614
msgid "Right only"
msgstr ""
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_SKIPPED
-#: Merge.rc:2605
+#: Merge.rc:2615
msgid "Skipped"
msgstr ""
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_MIDDLE_ONLY
-#: Merge.rc:2606
+#: Merge.rc:2616
msgid "Middle only"
msgstr ""
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_LEFT_ONLY_DIFFERENT
-#: Merge.rc:2607
+#: Merge.rc:2617
msgid "Left only (different)"
msgstr ""
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_MIDDLE_ONLY_DIFFERENT
-#: Merge.rc:2608
+#: Merge.rc:2618
msgid "Middle only (different)"
msgstr ""
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_RIGHT_ONLY_DIFFERENT
-#: Merge.rc:2609
+#: Merge.rc:2619
msgid "Right only (different)"
msgstr ""
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_LEFT_ONLY_MISSING
-#: Merge.rc:2610
+#: Merge.rc:2620
msgid "Left only (missing)"
msgstr ""
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_MIDDLE_ONLY_MISSING
-#: Merge.rc:2611
+#: Merge.rc:2621
msgid "Middle only (missing)"
msgstr ""
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_RIGHT_ONLY_MISSING
-#: Merge.rc:2612
+#: Merge.rc:2622
msgid "Right only (missing)"
msgstr ""
#. IDS_OPTIONSPG_CODEPAGE
-#: Merge.rc:2619 Merge.rc:2811 Merge.rc:4213
+#: Merge.rc:2629 Merge.rc:2821 Merge.rc:4223
#, c-format
msgid "Codepage"
msgstr "Kodna stranica"
#. IDD_PROPPAGE_CODEPAGE, IDC_STATIC
-#: Merge.rc:2622
+#: Merge.rc:2632
#, c-format
msgid "Default Codepage"
msgstr "Standardna kodna stranica"
#. IDD_PROPPAGE_CODEPAGE, IDC_STATIC
-#: Merge.rc:2623
+#: Merge.rc:2633
#, c-format
msgid "Select the default codepage for non-Unicode files:"
msgstr "Odaberite standardnu kodnu stranicu za učitanje ne-Unicode datoteka:"
#. IDD_PROPPAGE_CODEPAGE, IDC_CP_SYSTEM
-#: Merge.rc:2624
+#: Merge.rc:2634
#, c-format
msgid "System codepage"
msgstr "Standardna kodna stranica sistema"
#. IDD_PROPPAGE_CODEPAGE, IDC_CP_UI
-#: Merge.rc:2625
+#: Merge.rc:2635
#, c-format
msgid "According to WinMerge User Interface"
msgstr "Prema korisnikovom sučelju WinMerge-a"
#. IDD_PROPPAGE_CODEPAGE, IDC_CP_CUSTOM
-#: Merge.rc:2626
+#: Merge.rc:2636
#, c-format
msgid "Custom codepage:"
msgstr "Kodna stranica prema želji:"
#. IDD_PROPPAGE_CODEPAGE, IDC_DETECT_CODEPAGE
-#: Merge.rc:2628
+#: Merge.rc:2638
msgid "Detect codepage for: .html, .rc, .xml\nRestart required."
msgstr ""
"Odredi info kodne stranice za datoteke: .html, .rc, .xml\n"
"Nije potrebno ponovno pokretanje."
#. IDD_PROPPAGE_CODEPAGE, IDC_DETECT_CODEPAGE2
-#: Merge.rc:2630
+#: Merge.rc:2640
msgid "Detect codepage for files with mlang.dll\nRestart required."
msgstr ""
#. IDS_OPTIONSPG_ARCHIVE
-#: Merge.rc:2638 Merge.rc:4214
+#: Merge.rc:2648 Merge.rc:4224
#, c-format
msgid "Archive Support"
msgstr "Rad s arhivima"
#. IDD_PROPPAGE_ARCHIVE, IDC_ARCHIVE_ENABLE
-#: Merge.rc:2641
+#: Merge.rc:2651
#, c-format
msgid "&Enable archive file support"
msgstr "Omogući rad s &arhivima"
#. IDD_PROPPAGE_ARCHIVE, IDC_ARCHIVE_DETECTTYPE
-#: Merge.rc:2642
+#: Merge.rc:2652
#, c-format
msgid "&Detect archive type from file signature"
msgstr "&Očitaj tip arhiva iz zaglavlja datoteke"
#. IDD_PROPPAGE_PROJECT, IDC_STATIC
-#: Merge.rc:2651
+#: Merge.rc:2661
msgid "Items saved to or restored from the project file:"
msgstr ""
#. IDD_SAVECLOSING
-#: Merge.rc:2658
+#: Merge.rc:2668
#, c-format
msgid "Save Modified Files?"
msgstr "Pohraniti izmijenjenu datoteku?"
#. IDD_SAVECLOSING, IDC_SAVECLOSING_LEFTFRAME
-#: Merge.rc:2661
+#: Merge.rc:2671
#, c-format
msgid "Left side file"
msgstr "Datoteka s lijeva"
#. IDD_SAVECLOSING, IDC_SAVECLOSING_SAVELEFT
-#: Merge.rc:2663
+#: Merge.rc:2673
#, c-format
msgid "&Save changes"
msgstr "&Pohrani promjene"
#. IDD_SAVECLOSING, IDC_SAVECLOSING_DISCARDLEFT
-#: Merge.rc:2664
+#: Merge.rc:2674
#, c-format
msgid "&Discard changes"
msgstr "&Odustajem od izmjena"
#. IDD_SAVECLOSING, IDC_SAVECLOSING_MIDDLEFRAME
-#: Merge.rc:2665
+#: Merge.rc:2675
#, c-format
msgid "Middle side file"
msgstr ""
#. IDD_SAVECLOSING, IDC_SAVECLOSING_SAVEMIDDLE
-#: Merge.rc:2667
+#: Merge.rc:2677
#, c-format
msgid "Sa&ve changes"
msgstr ""
#. IDD_SAVECLOSING, IDC_SAVECLOSING_DISCARDMIDDLE
-#: Merge.rc:2668
+#: Merge.rc:2678
#, c-format
msgid "Discard c&hanges"
msgstr ""
#. IDD_SAVECLOSING, IDC_SAVECLOSING_RIGHTFRAME
-#: Merge.rc:2669
+#: Merge.rc:2679
#, c-format
msgid "Right side file"
msgstr "Datoteka s desna"
#. IDD_SAVECLOSING, IDC_SAVECLOSING_SAVERIGHT
-#: Merge.rc:2671
+#: Merge.rc:2681
#, c-format
msgid "S&ave changes"
msgstr "Pohrani promjene"
#. IDD_SAVECLOSING, IDC_SAVECLOSING_DISCARDRIGHT
-#: Merge.rc:2672
+#: Merge.rc:2682
#, c-format
msgid "Dis&card changes"
msgstr "Odustajem od izmjena"
#. IDD_SAVECLOSING, IDC_SAVECLOSING_DISCARDALL
-#: Merge.rc:2673
+#: Merge.rc:2683
#, c-format
msgid "Disca&rd All"
msgstr ""
#. IDD_DIRCMP_REPORT
-#: Merge.rc:2680
+#: Merge.rc:2690
#, c-format
msgid "Folder Compare Report"
msgstr "Izvještaj usporedbe mapa"
#. IDD_DIRCMP_REPORT, IDC_STATIC
-#: Merge.rc:2683
+#: Merge.rc:2693
#, c-format
msgid "Report &file:"
msgstr "Datoteka izvještaja:"
#. IDD_DIRCMP_REPORT, IDC_STATIC
-#: Merge.rc:2686
+#: Merge.rc:2696
#, c-format
msgid "&Style:"
msgstr "&Stil:"
#. IDD_DIRCMP_REPORT, IDC_REPORT_INCLUDEFILECMPREPORT
-#: Merge.rc:2688
+#: Merge.rc:2698
#, c-format
msgid "&Include file compare report"
msgstr ""
#. IDD_FILTERS_FILEFILTERS_SHARED
-#: Merge.rc:2697
+#: Merge.rc:2707
#, c-format
msgid "Shared or Private Filter"
msgstr "Zajednički ili osobni filtar"
#. IDD_FILTERS_FILEFILTERS_SHARED, IDC_STATIC
-#: Merge.rc:2700
+#: Merge.rc:2710
#, c-format
msgid "What type of filter do you want?"
msgstr "Koji tip filtra želite stvoriti?"
#. IDD_FILTERS_FILEFILTERS_SHARED, IDC_SHARED
-#: Merge.rc:2701
+#: Merge.rc:2711
#, c-format
msgid "Shared Filter (for all users)"
msgstr "Zajednički Filtar (za sve korisnike računala)"
#. IDD_FILTERS_FILEFILTERS_SHARED, IDC_PRIVATE
-#: Merge.rc:2702
+#: Merge.rc:2712
#, c-format
msgid "Private Filter (current user only)"
msgstr "Osobni filtar (samo za trenutnog korisnika)"
#. IDD_COMPARE_STATISTICS3
-#: Merge.rc:2709 Merge.rc:2750
+#: Merge.rc:2719 Merge.rc:2760
#, c-format
msgid "Compare Statistics"
msgstr "Usporedba statistike"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2712 Merge.rc:2753
+#: Merge.rc:2722 Merge.rc:2763
#, c-format
msgid "Folders:"
msgstr "Mape:"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2713 Merge.rc:2754
+#: Merge.rc:2723 Merge.rc:2764
#, c-format
msgid "Files:"
msgstr "Datoteke:"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2719 Merge.rc:2738 Merge.rc:2760 Merge.rc:2799
+#: Merge.rc:2729 Merge.rc:2748 Merge.rc:2770 Merge.rc:2809
#, c-format
msgid "Binary:"
msgstr "Binarno:"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2722 Merge.rc:2763
+#: Merge.rc:2732 Merge.rc:2773
#, c-format
msgid "Unique"
msgstr "Unikat"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2723 Merge.rc:2764
+#: Merge.rc:2733 Merge.rc:2774
#, c-format
msgid "Left:"
msgstr "Lijevo:"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2728 Merge.rc:2774
+#: Merge.rc:2738 Merge.rc:2784
#, c-format
msgid "Right:"
msgstr "Desno:"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2742 Merge.rc:2803
+#: Merge.rc:2752 Merge.rc:2813
#, c-format
msgid "Total:"
msgstr "Ukupno:"
#. IDD_COMPARE_STATISTICS3, IDOK
-#: Merge.rc:2745 Merge.rc:2806
+#: Merge.rc:2755 Merge.rc:2816
#, c-format
msgid "Close"
msgstr "Zatvori"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2769
+#: Merge.rc:2779
#, c-format
msgid "Middle:"
msgstr ""
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2779
+#: Merge.rc:2789
#, c-format
msgid "Missing Left:"
msgstr ""
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2784
+#: Merge.rc:2794
#, c-format
msgid "Missing Middle:"
msgstr ""
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2789
+#: Merge.rc:2799
#, c-format
msgid "Missing Right:"
msgstr ""
#. IDD_LOAD_SAVE_CODEPAGE, IDC_AFFECTS_GROUP
-#: Merge.rc:2814
+#: Merge.rc:2824
#, c-format
msgid "Affects"
msgstr "Primjeni na"
#. IDD_LOAD_SAVE_CODEPAGE, IDC_RIGHT_FILES_LABEL
-#: Merge.rc:2816 Merge.rc:2818 Merge.rc:2820
+#: Merge.rc:2826 Merge.rc:2828 Merge.rc:2830
#, c-format
msgid "(Affects)"
msgstr "(Primjeni na)"
#. IDD_LOAD_SAVE_CODEPAGE, IDC_LOADING_GROUP
-#: Merge.rc:2821
+#: Merge.rc:2831
#, c-format
msgid "Select Codepage for"
msgstr "Odabir kodne stranice za"
#. IDD_LOAD_SAVE_CODEPAGE, IDC_LOAD_FILES_LABEL
-#: Merge.rc:2822
+#: Merge.rc:2832
#, c-format
msgid "&File Loading:"
msgstr "&Učitavanje datoteke:"
#. IDD_LOAD_SAVE_CODEPAGE, IDC_SAVE_FILES_LABEL
-#: Merge.rc:2824
+#: Merge.rc:2834
#, c-format
msgid "File &Saving:"
msgstr "&Pohrana datoteke:"
#. IDD_LOAD_SAVE_CODEPAGE, IDC_LOAD_SAVE_SAME_CODEPAGE
-#: Merge.rc:2827
+#: Merge.rc:2837
#, c-format
msgid "&Use same codepage for both"
msgstr "&Ista kodna stranica za obje"
#. IDS_MESSAGEBOX_CANCEL
-#: Merge.rc:2830 Merge.rc:4172
+#: Merge.rc:2840 Merge.rc:4182
#, c-format
msgid "&Cancel"
msgstr "&Odustajem"
#. IDD_FILTERS_FILEFILTERS_TEST
-#: Merge.rc:2835
+#: Merge.rc:2845
#, c-format
msgid "Test Filter"
msgstr "Test filtar"
#. IDD_FILTERS_FILEFILTERS_TEST, IDC_HEADER
-#: Merge.rc:2838
+#: Merge.rc:2848
msgid "Testing filter:"
msgstr "Testiranje filtra:"
#. IDD_FILTERS_FILEFILTERS_TEST, IDC_PROMPT_LABEL
-#: Merge.rc:2840
+#: Merge.rc:2850
#, c-format
msgid "&Enter text to test:"
msgstr "&Unos teksta za provjeru"
#. IDD_FILTERS_FILEFILTERS_TEST, IDC_IS_DIRECTORY
-#: Merge.rc:2842
+#: Merge.rc:2852
#, c-format
msgid "&Folder Name"
msgstr "&Naziv mape"
#. IDD_FILTERS_FILEFILTERS_TEST, IDC_STATIC
-#: Merge.rc:2843
+#: Merge.rc:2853
#, c-format
msgid "Result:"
msgstr "Rezultat:"
#. IDD_FILTERS_FILEFILTERS_TEST, IDC_TEST_BTN
-#: Merge.rc:2845
+#: Merge.rc:2855
#, c-format
msgid "&Test"
msgstr "&Test"
#. IDS_OPTIONSPG_TABLECOMPARE
-#: Merge.rc:2851 Merge.rc:2990 Merge.rc:4228
+#: Merge.rc:2861 Merge.rc:3000 Merge.rc:4238
msgid "Table"
msgstr ""
#. IDD_OPEN_TABLE, IDC_STATIC
-#: Merge.rc:2854
+#: Merge.rc:2864
msgid "File type"
msgstr ""
#. IDD_OPEN_TABLE, IDC_COMPARETABLE_CSV
-#: Merge.rc:2855
+#: Merge.rc:2865
msgid "&CSV"
msgstr ""
#. IDD_OPEN_TABLE, IDC_COMPARETABLE_TSV
-#: Merge.rc:2856
+#: Merge.rc:2866
msgid "&TSV"
msgstr ""
#. IDD_OPEN_TABLE, IDC_COMPARETABLE_DSV
-#: Merge.rc:2857
+#: Merge.rc:2867
msgid "Custom &Delimiter-Separated Values"
msgstr ""
#. IDD_PROPPAGE_COMPARE_TABLE, IDC_STATIC
-#: Merge.rc:2859 Merge.rc:2861 Merge.rc:2996 Merge.rc:3004
+#: Merge.rc:2869 Merge.rc:2871 Merge.rc:3006 Merge.rc:3014
msgid "D&elimiter character:"
msgstr ""
#. IDD_PROPPAGE_COMPARE_TABLE, IDC_COMPARETABLE_ALLOWNEWLINE
-#: Merge.rc:2863 Merge.rc:3006
+#: Merge.rc:2873 Merge.rc:3016
msgid "&Allow newlines in quotes"
msgstr ""
#. IDD_PROPPAGE_COMPARE_TABLE, IDC_STATIC
-#: Merge.rc:2865 Merge.rc:3008
+#: Merge.rc:2875 Merge.rc:3018
msgid "&Quote character:"
msgstr ""
#. IDS_OPTIONSPG_BACKUPS
-#: Merge.rc:2873 Merge.rc:4216
+#: Merge.rc:2883 Merge.rc:4226
#, c-format
msgid "Backup Files"
msgstr "Sigurnost"
#. IDD_PROPPAGE_BACKUPS, IDC_STATIC
-#: Merge.rc:2876
+#: Merge.rc:2886
#, c-format
msgid "Create backup files for:"
msgstr "Pohrani rezervnu datoteku pri:"
#. IDD_PROPPAGE_BACKUPS, IDC_BACKUP_FOLDERCMP
-#: Merge.rc:2877
+#: Merge.rc:2887
#, c-format
msgid "&Folder compare"
msgstr "Usporedbi &mapa"
#. IDD_PROPPAGE_BACKUPS, IDC_BACKUP_FILECMP
-#: Merge.rc:2878
+#: Merge.rc:2888
#, c-format
msgid "Fil&e compare"
msgstr "Usporedbi &datoteka"
#. IDD_PROPPAGE_BACKUPS, IDC_STATIC
-#: Merge.rc:2879
+#: Merge.rc:2889
#, c-format
msgid "Create backup files in:"
msgstr "Pohrani rezervnu datoteku u:"
#. IDD_PROPPAGE_BACKUPS, IDC_BACKUP_ORIGFOLD
-#: Merge.rc:2880
+#: Merge.rc:2890
#, c-format
msgid "&Original file's folder"
msgstr "&Izvornu mapu datoteke"
#. IDD_PROPPAGE_BACKUPS, IDC_BACKUP_GLOBALFOLD
-#: Merge.rc:2881
+#: Merge.rc:2891
#, c-format
msgid "&Global backup folder:"
msgstr "&Standardnu mapu rezervnih kopija"
#. IDD_PROPPAGE_BACKUPS, IDC_STATIC
-#: Merge.rc:2884
+#: Merge.rc:2894
#, c-format
msgid "Backup filename:"
msgstr "Naziv rezervne datoteke"
#. IDD_PROPPAGE_BACKUPS, IDC_BACKUP_APPEND_BAK
-#: Merge.rc:2885
+#: Merge.rc:2895
msgid "&Append .bak extension"
msgstr "&Dodaj .bak ekstenziju"
#. IDD_PROPPAGE_BACKUPS, IDC_BACKUP_APPEND_TIME
-#: Merge.rc:2886
+#: Merge.rc:2896
#, c-format
msgid "A&ppend timestamp"
msgstr "&Dodaj datum i vrijeme"
#. IDS_CONFIRM_COPY_CAPTION
-#: Merge.rc:2892 Merge.rc:4565
+#: Merge.rc:2902 Merge.rc:4575
#, c-format
msgid "Confirm Copy"
msgstr "Potvrdite kopiranje"
#. IDD_CONFIRM_COPY, IDC_FLDCONFIRM_QUERY
-#: Merge.rc:2896
+#: Merge.rc:2906
#, c-format
msgid "Are you sure you want to copy XXX items?"
msgstr "Kopirati XXX stavku?"
#. IDD_CONFIRM_COPY, IDC_FLDCONFIRM_FROM_TEXT
-#: Merge.rc:2897
+#: Merge.rc:2907
#, c-format
msgid "From left"
msgstr "S lijeva"
#. IDD_CONFIRM_COPY, IDC_FLDCONFIRM_TO_TEXT
-#: Merge.rc:2899
+#: Merge.rc:2909
#, c-format
msgid "To right"
msgstr "U desno"
#. IDS_MESSAGEBOX_DONT_ASK_AGAIN
-#: Merge.rc:2901 Merge.rc:4191
+#: Merge.rc:2911 Merge.rc:4201
#, c-format
msgid "Don't ask this &question again."
msgstr "Ne &pitaj ponovo."
#. IDD_CONFIRM_COPY, IDYES
-#: Merge.rc:2903
+#: Merge.rc:2913
#, c-format
msgid "Yes"
msgstr "Da"
#. IDD_CONFIRM_COPY, IDNO
-#: Merge.rc:2904
+#: Merge.rc:2914
#, c-format
msgid "No"
msgstr "Ne"
#. IDS_PROJECT_ITEM_PLUGIN
-#: Merge.rc:2909 Merge.rc:4323
+#: Merge.rc:2919 Merge.rc:4333
#, c-format
msgid "Plugins"
msgstr "Dodaci"
#. IDD_PLUGINS_LIST, IDC_PLUGINS_ENABLE
-#: Merge.rc:2912
+#: Merge.rc:2922
#, c-format
msgid "&Enable plugins"
msgstr "&Omogući dodatke"
#. IDD_PLUGINS_EDITPLUGIN, IDC_STATIC
-#: Merge.rc:2913 Merge.rc:3113
+#: Merge.rc:2923 Merge.rc:3123
msgid "Plugin &type:"
msgstr ""
#. IDD_PLUGINS_LIST, IDC_STATIC
-#: Merge.rc:2916
+#: Merge.rc:2926
msgid "File filters:"
msgstr ""
#. IDD_PLUGINS_LIST, IDC_STATIC
-#: Merge.rc:2918
+#: Merge.rc:2928
msgid "&Plugin arguments:"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_AUTOMATIC
-#: Merge.rc:2920 Merge.rc:3134
+#: Merge.rc:2930 Merge.rc:3144
msgid "Enable &automatic unpacking/prediffing"
msgstr ""
#. IDS_OPTIONSPG_SHELL
-#: Merge.rc:2934 Merge.rc:4217
+#: Merge.rc:2944 Merge.rc:4227
#, c-format
msgid "Shell Integration"
msgstr "Shell integracija"
#. IDD_PROPPAGE_SHELL, IDC_STATIC
-#: Merge.rc:2937
+#: Merge.rc:2947
#, c-format
msgid "Explorer"
msgstr "Explorer"
#. IDD_PROPPAGE_SHELL, IDC_EXPLORER_CONTEXT
-#: Merge.rc:2938
+#: Merge.rc:2948
#, c-format
msgid "&Add to context menu"
msgstr "&Dodaj u kontekstni izbornik"
#. IDD_PROPPAGE_SHELL, IDC_EXPLORER_ADVANCED
-#: Merge.rc:2939
+#: Merge.rc:2949
#, c-format
msgid "E&nable advanced menu"
msgstr "Omogući &napredni izbornik."
#. IDD_PROPPAGE_SHELL, IDC_EXPLORER_COMPARE_AS
-#: Merge.rc:2940
+#: Merge.rc:2950
msgid "Enable &Compare As menu"
msgstr ""
#. IDD_PROPPAGE_SHELL, IDC_REGISTER_SHELLEXTENSION
-#: Merge.rc:2941
+#: Merge.rc:2951
#, c-format
msgid "&Register Shell Extension"
msgstr ""
#. IDD_PROPPAGE_SHELL, IDC_UNREGISTER_SHELLEXTENSION
-#: Merge.rc:2942
+#: Merge.rc:2952
#, c-format
msgid "&Unregister Shell Extension"
msgstr ""
#. IDD_PROPPAGE_SHELL, IDC_REGISTER_SHELLEXTENSION_PERUSER
-#: Merge.rc:2943
+#: Merge.rc:2953
msgid "Register Shell Extension for Current User &Only"
msgstr ""
#. IDD_PROPPAGE_SHELL, IDC_UNREGISTER_SHELLEXTENSION_PERUSER
-#: Merge.rc:2944
+#: Merge.rc:2954
msgid "Unregister Shell Extension for Current User On&ly"
msgstr ""
#. IDD_PROPPAGE_SHELL, IDC_REGISTER_WINMERGECONTEXTMENU
-#: Merge.rc:2945
+#: Merge.rc:2955
msgid "Register Shell Extension for &Windows 11"
msgstr ""
#. IDD_PROPPAGE_SHELL, IDC_UNREGISTER_WINMERGECONTEXTMENU
-#: Merge.rc:2946
+#: Merge.rc:2956
msgid "Unregister Shell Extension for W&indows 11"
msgstr ""
#. IDD_PROPPAGE_SHELL, IDC_STATIC
-#: Merge.rc:2947
+#: Merge.rc:2957
msgid "Jump List"
msgstr ""
#. IDD_PROPPAGE_SHELL, IDC_CLEAR_ALL_RECENT_ITEMS
-#: Merge.rc:2949
+#: Merge.rc:2959
msgid "Clear all recent items"
msgstr ""
#. IDS_OPTIONSPG_FOLDERCOMPARE
-#: Merge.rc:2954 Merge.rc:4225
+#: Merge.rc:2964 Merge.rc:4235
msgctxt "Options dialog|Categories"
msgid "Folder"
msgstr "Mapa"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC
-#: Merge.rc:2957
+#: Merge.rc:2967
msgid "&Compare method:"
msgstr ""
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_COMPARE_STOPFIRST
-#: Merge.rc:2959
+#: Merge.rc:2969
#, c-format
msgid "S&top after first difference"
msgstr "&Zastani na prvoj razlici"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_IGNORE_SMALLTIMEDIFF
-#: Merge.rc:2961
+#: Merge.rc:2971
#, c-format
msgid "Ign&ore time differences less than 3 seconds"
msgstr "&Zanemari razlike manje od 3 sekunde"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC
-#: Merge.rc:2964
+#: Merge.rc:2974
msgid "Expand subfolders &after comparison:"
msgstr ""
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_COMPARE_WALKSUBDIRS
-#: Merge.rc:2966
+#: Merge.rc:2976
#, c-format
msgid "Include &unique subfolders contents"
msgstr ""
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_IGNORE_REPARSEPOINTS
-#: Merge.rc:2968
+#: Merge.rc:2978
#, c-format
msgid "Ignore &reparse points"
msgstr ""
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC
-#: Merge.rc:2969
+#: Merge.rc:2979
msgid "Switch to &quick compare when size exceeds (MB):"
msgstr ""
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC
-#: Merge.rc:2971
+#: Merge.rc:2981
msgid "Switch to &binary compare when size exceeds (MB):"
msgstr ""
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC
-#: Merge.rc:2975
+#: Merge.rc:2985
msgid "Additional comparison condi&tions:"
msgstr ""
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC
-#: Merge.rc:2978
+#: Merge.rc:2988
msgid "&Rename/move detection:"
msgstr ""
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC
-#: Merge.rc:2980
+#: Merge.rc:2990
msgid "Rename/move detection &keys:"
msgstr ""
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC
-#: Merge.rc:2983
+#: Merge.rc:2993
msgid "M&erge renames and moves:"
msgstr ""
#. IDD_PROPPAGE_COMPARE_TABLE, IDC_STATIC
-#: Merge.rc:2994 Merge.rc:2999 Merge.rc:3002
+#: Merge.rc:3004 Merge.rc:3009 Merge.rc:3012
msgid "File patterns:"
msgstr ""
#. IDD_PROPPAGE_COMPARE_TABLE, IDC_STATIC
-#: Merge.rc:3001
+#: Merge.rc:3011
msgid "Custom Delimiter-Separated Values"
msgstr ""
#. IDS_OPTIONSPG_BINARYCOMPARE
-#: Merge.rc:3015 Merge.rc:4227
+#: Merge.rc:3025 Merge.rc:4237
msgctxt "Options dialog|Categories"
msgid "Binary"
msgstr "Binarno"
#. IDD_PROPPAGE_COMPARE_BINARY, IDC_STATIC
-#: Merge.rc:3018
+#: Merge.rc:3028
#, c-format
msgid "Binary file &patterns:"
msgstr ""
#. IDD_PROPPAGE_COMPARE_BINARY, IDC_STATIC
-#: Merge.rc:3020
+#: Merge.rc:3030
#, c-format
msgid "Frhed settings"
msgstr ""
#. IDD_PROPPAGE_COMPARE_BINARY, IDC_COMPAREBINARY_VIEWSETTINGS
-#: Merge.rc:3021
+#: Merge.rc:3031
#, c-format
msgid "View &Settings..."
msgstr ""
#. IDD_PROPPAGE_COMPARE_BINARY, IDC_COMPAREBINARY_BINARYMODE
-#: Merge.rc:3022
+#: Merge.rc:3032
#, c-format
msgid "&Binary Mode..."
msgstr ""
#. IDD_PROPPAGE_COMPARE_BINARY, IDC_COMPAREBINARY_CHARACTERSET
-#: Merge.rc:3023
+#: Merge.rc:3033
#, c-format
msgid "&Character Set..."
msgstr ""
#. IDS_PRPCAT_IMAGE
-#: Merge.rc:3029 Merge.rc:4226 Merge.rc:4665
+#: Merge.rc:3039 Merge.rc:4236 Merge.rc:4675
msgid "Image"
msgstr ""
#. IDD_PROPPAGE_COMPARE_IMAGE, IDC_STATIC
-#: Merge.rc:3032
+#: Merge.rc:3042
#, c-format
msgid "Image file &patterns:"
msgstr ""
#. IDD_PROPPAGE_COMPARE_IMAGE, IDC_ENABLE_IMGCMP_IN_DIRCMP
-#: Merge.rc:3034
+#: Merge.rc:3044
msgid "&Enable image compare in folder compare"
msgstr ""
#. IDD_PROPPAGE_COMPARE_IMAGE, IDC_STATIC
-#: Merge.rc:3036
+#: Merge.rc:3046
msgid "OCR result:"
msgstr ""
#. IDS_OPTIONSPG_WEBPAGECOMPARE
-#: Merge.rc:3043 Merge.rc:4229
+#: Merge.rc:3053 Merge.rc:4239
msgid "Webpage"
msgstr ""
#. IDD_PROPPAGE_COMPARE_WEBPAGE, IDC_STATIC
-#: Merge.rc:3046
+#: Merge.rc:3056
msgid "URL pattern to &include (Regular expression):"
msgstr ""
#. IDD_PROPPAGE_COMPARE_WEBPAGE, IDC_STATIC
-#: Merge.rc:3048
+#: Merge.rc:3058
msgid "URL pattern to &exclude (Regular expression):"
msgstr ""
#. IDD_PROPPAGE_COMPARE_WEBPAGE, IDC_STATIC
-#: Merge.rc:3050
+#: Merge.rc:3060
msgid "&User data folder location:"
msgstr ""
#. IDD_PROPPAGE_COMPARE_WEBPAGE, IDC_COMPAREWEBPAGE_USERDATAFOLDER_PERPANE
-#: Merge.rc:3052
+#: Merge.rc:3062
msgid "&Separate user data folders for each pane"
msgstr ""
#. IDD_ENCODINGERROR, IDC_HEXVIEW
-#: Merge.rc:3065
+#: Merge.rc:3075
#, c-format
msgid "&Hex View"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3110
+#: Merge.rc:3120
msgid "Edit Plugin"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN, IDC_STATIC
-#: Merge.rc:3123
+#: Merge.rc:3133
msgid "&Category:"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_MENUCAPTION_STATIC
-#: Merge.rc:3125
+#: Merge.rc:3135
msgid "&Menu caption:"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_WINDOWTYPE_STATIC
-#: Merge.rc:3127
+#: Merge.rc:3137
msgid "&Window type:"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_UNPACKEDFILEEXTENSION_STATIC
-#: Merge.rc:3132
+#: Merge.rc:3142
msgid "&Unpacked file extension:"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_ARGUMENTSREQUIRED
-#: Merge.rc:3136
+#: Merge.rc:3146
msgid "&Require arguments"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_GENERATESCRIPT
-#: Merge.rc:3137
+#: Merge.rc:3147
msgid "&Generate editor script"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_COMMAND_LINE_STATIC
-#: Merge.rc:3140
+#: Merge.rc:3150
msgid "Command &line:"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_SCRIPT_FILEEXTENSION_STATIC
-#: Merge.rc:3143
+#: Merge.rc:3153
msgid "&Script file extension:"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_SCRIPT_BODY_STATIC
-#: Merge.rc:3145
+#: Merge.rc:3155
msgid "Script &body:"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3154
+#: Merge.rc:3164
msgid "Font"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3157
+#: Merge.rc:3167
msgid "&Font:"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3163
+#: Merge.rc:3173
msgid "Font st&yle:"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3169
+#: Merge.rc:3179
msgid "&Size:"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3175
+#: Merge.rc:3185
msgid "Effects"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3176
+#: Merge.rc:3186
msgid "Stri&keout"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3177
+#: Merge.rc:3187
msgid "&Underline"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3179
+#: Merge.rc:3189
msgid "&Color:"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3184
+#: Merge.rc:3194
msgid "Sample"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3185
+#: Merge.rc:3195
msgid "AaBbYyZz"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3189
+#: Merge.rc:3199
msgid "Sc&ript:"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN, IDC_MANAGE_LINK
-#: Merge.rc:3194
+#: Merge.rc:3204
msgid "Show more fonts"
msgstr ""
#. ID_INDICATOR_EXT
-#: Merge.rc:4118
+#: Merge.rc:4128
#, c-format
msgid "EXT"
msgstr "EXT"
#. ID_INDICATOR_CAPS
-#: Merge.rc:4119
+#: Merge.rc:4129
#, c-format
msgid "CAP"
msgstr "CAP"
#. ID_INDICATOR_NUM
-#: Merge.rc:4120
+#: Merge.rc:4130
#, c-format
msgid "NUM"
msgstr "NUM"
#. ID_INDICATOR_SCRL
-#: Merge.rc:4121
+#: Merge.rc:4131
#, c-format
msgid "SCRL"
msgstr "SCRL"
#. ID_INDICATOR_OVR
-#: Merge.rc:4122
+#: Merge.rc:4132
#, c-format
msgid "OVR"
msgstr "OVR"
#. ID_INDICATOR_REC
-#: Merge.rc:4123
+#: Merge.rc:4133
#, c-format
msgid "REC"
msgstr "REC"
#. ID_FILE_NEW
-#: Merge.rc:4129
+#: Merge.rc:4139
#, c-format
msgid "\nNew Documents (Ctrl+N)"
msgstr ""
#. ID_FILE_OPEN
-#: Merge.rc:4130
+#: Merge.rc:4140
#, c-format
msgid "\nOpen (Ctrl+O)"
msgstr ""
#. ID_FILE_SAVE
-#: Merge.rc:4131
+#: Merge.rc:4141
#, c-format
msgid "\nSave (Ctrl+S)"
msgstr ""
#. IDS_UNK_ERROR_READING_PROJECT
-#: Merge.rc:4137
+#: Merge.rc:4147
msgid "Unknown error opening project file."
msgstr "Nepoznata greška pri otvaranju usporedbe."
#. IDS_UNK_ERROR_SAVING_PROJECT
-#: Merge.rc:4138
+#: Merge.rc:4148
msgid "Unknown error saving project file."
msgstr "Nepoznata greška pri pohrani usporedbe."
#. IDS_PROJFILE_LOAD_SUCCESS
-#: Merge.rc:4143
+#: Merge.rc:4153
#, c-format
msgid "Project file loaded."
msgstr "Usporedba je učitana."
#. IDS_PROJFILE_SAVE_SUCCESS
-#: Merge.rc:4144
+#: Merge.rc:4154
#, c-format
msgid "Project file saved."
msgstr "Usporedba je pohranjena."
#. ID_EDIT_UNDO
-#: Merge.rc:4150
+#: Merge.rc:4160
#, c-format
msgid "\nUndo (Ctrl+Z)"
msgstr ""
#. ID_EDIT_REDO
-#: Merge.rc:4151
+#: Merge.rc:4161
#, c-format
msgid "\nRedo (Ctrl+Y)"
msgstr ""
#. IDR_MERGEDOCTYPE
-#: Merge.rc:4158
+#: Merge.rc:4168
#, c-format
msgid ""
"\n"
@@ -5399,7 +5410,7 @@ msgstr ""
"WinMerge Usporedba datoteka"
#. IDR_DIRDOCTYPE
-#: Merge.rc:4159
+#: Merge.rc:4169
#, c-format
msgid ""
"\n"
@@ -5419,183 +5430,183 @@ msgstr ""
"WinMerge Usporedba mapa"
#. IDS_SPLASH_GPLTEXT
-#: Merge.rc:4165
+#: Merge.rc:4175
#, fuzzy, c-format
msgid "WinMerge comes with ABSOLUTELY NO WARRANTY. It is free software and can be redistributed under the conditions of the GNU General Public License - see the Help menu for details."
msgstr "WinMerge je program BEZ IKAKVE GARANCIJE. To je besplatan softver koji možete dalje distribuirati pod određenim okolnostima prema GNU javnoj licenci koju pogledajte u datoteci pomoći."
#. IDS_MESSAGEBOX_ABORT
-#: Merge.rc:4173
+#: Merge.rc:4183
#, c-format
msgid "&Abort"
msgstr "&Prekini"
#. IDS_MESSAGEBOX_RETRY
-#: Merge.rc:4174
+#: Merge.rc:4184
#, c-format
msgid "&Retry"
msgstr "&Ponovi"
#. IDS_MESSAGEBOX_IGNORE
-#: Merge.rc:4175
+#: Merge.rc:4185
#, c-format
msgid "&Ignore"
msgstr "&Zanemari"
#. IDS_MESSAGEBOX_IGNOREALL
-#: Merge.rc:4176
+#: Merge.rc:4186
#, c-format
msgid "Ignore &all"
msgstr "Zanemari &sve"
#. IDS_MESSAGEBOX_YES
-#: Merge.rc:4177
+#: Merge.rc:4187
#, c-format
msgid "&Yes"
msgstr "&Da"
#. IDS_MESSAGEBOX_YES_TO_ALL
-#: Merge.rc:4183
+#: Merge.rc:4193
#, c-format
msgid "Yes to &all"
msgstr "Da za &sve"
#. IDS_MESSAGEBOX_NO
-#: Merge.rc:4184
+#: Merge.rc:4194
#, c-format
msgid "&No"
msgstr "&Ne"
#. IDS_MESSAGEBOX_NO_TO_ALL
-#: Merge.rc:4185
+#: Merge.rc:4195
#, c-format
msgid "No to a&ll"
msgstr "Ne za s&ve"
#. IDS_MESSAGEBOX_CONTINUE
-#: Merge.rc:4186
+#: Merge.rc:4196
#, c-format
msgid "&Continue"
msgstr "&Nastavi"
#. IDS_MESSAGEBOX_SKIP
-#: Merge.rc:4187
+#: Merge.rc:4197
#, c-format
msgid "&Skip"
msgstr "&Izostavi"
#. IDS_MESSAGEBOX_SKIPALL
-#: Merge.rc:4188
+#: Merge.rc:4198
#, c-format
msgid "Skip &all"
msgstr "Izostavi &sve"
#. IDS_MESSAGEBOX_DONT_DISPLAY_AGAIN
-#: Merge.rc:4190
+#: Merge.rc:4200
#, c-format
msgid "Don't display this &message again."
msgstr "Ne prikazuj više ovu poruku."
-#: Merge.rc:4193
+#: Merge.rc:4203
msgid "To make this message box visible, press Reset on the Message Boxes page in Options."
msgstr ""
#. IDS_OPTIONSPG_EDITOR_COMPAREMERGE
-#: Merge.rc:4203
+#: Merge.rc:4213
msgid "Compare/Merge"
msgstr ""
#. IDS_OPTIONSPG_SYNTAXCOLORS
-#: Merge.rc:4204 Merge.rc:4208
+#: Merge.rc:4214 Merge.rc:4218
#, c-format
msgid "Syntax"
msgstr ""
#. IDS_OPTIONSPG_COLOR_SCHEMES
-#: Merge.rc:4206
+#: Merge.rc:4216
msgid "Color Schemes"
msgstr ""
#. IDS_OPTIONSPG_DIRCOLORS
-#: Merge.rc:4210
+#: Merge.rc:4220
msgid "Folder Compare"
msgstr ""
#. IDS_OPTIONSPG_PROJECT
-#: Merge.rc:4215
+#: Merge.rc:4225
msgid "Project"
msgstr ""
#. IDS_COLHDR_NSDIFFS
-#: Merge.rc:4218 Merge.rc:4640
+#: Merge.rc:4228 Merge.rc:4650
#, c-format
msgid "Differences"
msgstr "Razlike"
#. IDS_OPTIONSPG_MESSAGEBOXES
-#: Merge.rc:4220
+#: Merge.rc:4230
msgid "Message Boxes"
msgstr ""
#. IDS_TO
-#: Merge.rc:4235
+#: Merge.rc:4245
#, c-format
msgid "To:"
msgstr "Do:"
#. IDS_FROM_LEFT
-#: Merge.rc:4236
+#: Merge.rc:4246
#, c-format
msgid "From left:"
msgstr "S lijeva:"
#. IDS_TO_LEFT
-#: Merge.rc:4237
+#: Merge.rc:4247
#, c-format
msgid "To left:"
msgstr "U lijevo:"
#. IDS_FROM_RIGHT
-#: Merge.rc:4238
+#: Merge.rc:4248
#, c-format
msgid "From right:"
msgstr "S desna:"
#. IDS_TO_RIGHT
-#: Merge.rc:4239
+#: Merge.rc:4249
#, c-format
msgid "To right:"
msgstr "U desno:"
#. IDS_FROM_MIDDLE
-#: Merge.rc:4240
+#: Merge.rc:4250
msgid "From middle:"
msgstr ""
#. IDS_TO_MIDDLE
-#: Merge.rc:4241
+#: Merge.rc:4251
msgid "To middle:"
msgstr ""
#. IDS_VERSION_FMT
-#: Merge.rc:4247
+#: Merge.rc:4257
#, c-format
msgid "Version %1"
msgstr "inačica %1"
#. IDS_OPTIONS_TITLE
-#: Merge.rc:4253
+#: Merge.rc:4263
#, c-format
msgid "Options (%1)"
msgstr "Postavke"
#. IDS_MESSAGE_BOX_ARE_RESET
-#: Merge.rc:4254
+#: Merge.rc:4264
#, c-format
msgid "All message boxes are now displayed again."
msgstr "Ponovni prikaz svih poruka"
-#: Merge.rc:4256
+#: Merge.rc:4266
#, c-format
msgid "Tab size value is out of range. Please use 1 - %1."
msgstr ""
@@ -5604,177 +5615,177 @@ msgstr ""
"Molimo koristite vrijednosti 1 - %1."
#. IDS_PROJECT_OPEN
-#: Merge.rc:4262 Merge.rc:4318
+#: Merge.rc:4272 Merge.rc:4328
#, c-format
msgid "Open"
msgstr "Otvori"
#. IDS_PROGRAMFILES
-#: Merge.rc:4263
+#: Merge.rc:4273
#, c-format
msgid "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||"
msgstr "Programi |*.exe;*.bat;*.cmd|Sve datoteke (*.*)|*.*||"
#. IDS_ALLFILES
-#: Merge.rc:4264
+#: Merge.rc:4274
#, c-format
msgid "All Files (*.*)|*.*||"
msgstr "Sve datoteke (*.*)|*.*||"
#. IDS_PROJECTFILES
-#: Merge.rc:4265
+#: Merge.rc:4275
#, c-format
msgid "WinMerge Project Files (*.WinMerge)|*.WinMerge||"
msgstr "WinMerge datoteke (*.WinMerge)|*.WinMerge||"
#. IDS_INIFILES
-#: Merge.rc:4267
+#: Merge.rc:4277
#, c-format
msgid "Options files (*.ini)|*.ini|All Files (*.*)|*.*||"
msgstr "INI datoteke (*.ini)|*.ini|Sve datoteke (*.*)|*.*||"
#. IDS_REPLACELIST_FILES
-#: Merge.rc:4268
+#: Merge.rc:4278
msgid "Tab-Separated Values (*.tsv;*.txt)|*.tsv;*.txt|All Files (*.*)|*.*||"
msgstr ""
#. IDS_TEXT_REPORT_FILES
-#: Merge.rc:4274
+#: Merge.rc:4284
#, c-format
msgid "Text Files (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|All Files (*.*)|*.*||"
msgstr "Tekst datoteke (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|Sve datoteke (*.*)|*.*||"
#. IDS_HTML_REPORT_FILES
-#: Merge.rc:4275
+#: Merge.rc:4285
#, c-format
msgid "HTML Files (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||"
msgstr "HTML datoteke (*.htm,*.html)|*.htm;*.html|Sve datoteke (*.*)|*.*||"
#. IDS_XML_REPORT_FILES
-#: Merge.rc:4276
+#: Merge.rc:4286
#, c-format
msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||"
msgstr "XML datoteke (*.xml)|*.xml|Sve datoteke (*.*)|*.*||"
#. IDS_EXPANDSUBDIRS_DONOTEXPAND
-#: Merge.rc:4294
+#: Merge.rc:4304
msgid "Do not expand"
msgstr ""
#. IDS_EXPANDSUBDIRS_ALL
-#: Merge.rc:4295
+#: Merge.rc:4305
msgid "Expand all subfolders"
msgstr ""
#. IDS_EXPANDSUBDIRS_DIFFERENT
-#: Merge.rc:4296
+#: Merge.rc:4306
msgid "Expand different subfolders"
msgstr ""
#. IDS_EXPANDSUBDIRS_IDENTICAL
-#: Merge.rc:4297
+#: Merge.rc:4307
msgid "Expand identical subfolders"
msgstr ""
#. IDS_SYNTAXTABLE_FILETYPE
-#: Merge.rc:4303
+#: Merge.rc:4313
msgid "File Type"
msgstr ""
#. IDS_COLHDR_EXTENSION
-#: Merge.rc:4304 Merge.rc:4597
+#: Merge.rc:4314 Merge.rc:4607
#, c-format
msgid "Extension"
msgstr "Tip"
#. IDS_PRPCAT_MESSAGE
-#: Merge.rc:4310 Merge.rc:4669
+#: Merge.rc:4320 Merge.rc:4679
msgid "Message"
msgstr ""
#. IDS_MESSAGEBOX_ANSWER
-#: Merge.rc:4311
+#: Merge.rc:4321
msgid "Answer"
msgstr ""
#. IDS_PROJECT_ITEM
-#: Merge.rc:4317
+#: Merge.rc:4327
msgid "Item"
msgstr ""
#. IDS_PROJECT_LOAD
-#: Merge.rc:4319
+#: Merge.rc:4329
msgid "Load"
msgstr ""
#. IDS_PROJECT_SAVE
-#: Merge.rc:4320
+#: Merge.rc:4330
msgid "Save"
msgstr ""
#. IDS_PROJECT_ITEM_INCLUDE_SUBFOLDERS
-#: Merge.rc:4322
+#: Merge.rc:4332
msgid "Include Subfolders"
msgstr ""
#. IDS_PROJECT_ITEM_COMPARE_OPTIONS
-#: Merge.rc:4324
+#: Merge.rc:4334
msgid "Compare Options"
msgstr ""
#. IDS_PROJECT_ITEM_HIDDEN_ITEMS
-#: Merge.rc:4325
+#: Merge.rc:4335
msgid "Hidden Items"
msgstr ""
#. IDS_PLUGINSLIST_NAME
-#: Merge.rc:4331 Merge.rc:4956
+#: Merge.rc:4341 Merge.rc:4966
#, c-format
msgid "Name"
msgstr "Naziv"
#. IDS_FILTERFILE_PATHTITLE
-#: Merge.rc:4332
+#: Merge.rc:4342
#, c-format
msgid "Location"
msgstr "Položaj"
#. IDS_FILTER_TITLE
-#: Merge.rc:4333
+#: Merge.rc:4343
#, c-format
msgid "Filters"
msgstr "Filtri..."
#. IDS_FILTER_PREFIX
-#: Merge.rc:4334
+#: Merge.rc:4344
#, c-format
msgid "[F] "
msgstr "[F] "
#. IDS_PLUGINSLIST_DESC
-#: Merge.rc:4335 Merge.rc:4958
+#: Merge.rc:4345 Merge.rc:4968
#, c-format
msgid "Description"
msgstr "Opis"
#. IDS_FILEFILTER_SAVENEW
-#: Merge.rc:4336
+#: Merge.rc:4346
#, c-format
msgid "Select Filename for New Filter"
msgstr "Izaberite datoteku kao novi filtar"
#. IDS_FILEFILTER_FILEMASK
-#: Merge.rc:4337
+#: Merge.rc:4347
#, c-format
msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||"
msgstr "FLT datoteke (*.flt)|*.flt|Sve datoteke (*.*)|*.*||"
-#: Merge.rc:4339
+#: Merge.rc:4349
#, c-format
msgid "Cannot find filter template!\n\nCopy %1 to WinMerge/Filters Folder:\n%2."
msgstr "Nema predloška filtracije datoteke!\n\nMolimo, kopirajte datoteku %1 u WinMerge/Filters mapu:\n%2."
-#: Merge.rc:4341
+#: Merge.rc:4351
#, c-format
msgid ""
"Cannot copy filter template:\n"
@@ -5787,7 +5798,7 @@ msgstr ""
"\n"
"Provjerite postoji li mapa i njenu dostupnost."
-#: Merge.rc:4343
+#: Merge.rc:4353
#, c-format
msgid ""
"User's filter folder is not defined!\n"
@@ -5798,7 +5809,7 @@ msgstr ""
"\n"
"Molimo, odredite ju u 'Postavke/Sistem'."
-#: Merge.rc:4345
+#: Merge.rc:4355
#, c-format
msgid ""
"Failed to delete filter:\n"
@@ -5812,12 +5823,12 @@ msgstr ""
"Možda je zaštićena - samo za čitanje?"
#. IDS_FILEFILTER_INSTALL
-#: Merge.rc:4346
+#: Merge.rc:4356
#, c-format
msgid "Locate Filter File to Install"
msgstr "Locirajte datoteku filtriranja za instalaciju"
-#: Merge.rc:4348
+#: Merge.rc:4358
#, c-format
msgid ""
"Installing filter file failed.\n"
@@ -5829,19 +5840,19 @@ msgstr ""
"Ne mogu je pohraniti u mapu filtara."
#. IDS_FILEFILTER_OVERWRITE
-#: Merge.rc:4349
+#: Merge.rc:4359
#, c-format
msgid "Filter file exists. Overwrite?"
msgstr "Filtar već postoji. Natpisati ga?"
#. IDS_FILTERLINE_REGEXP
-#: Merge.rc:4355
+#: Merge.rc:4365
#, c-format
msgid "Regular expression"
msgstr "Algoritam"
#. IDS_FILTERCHANGED
-#: Merge.rc:4361
+#: Merge.rc:4371
msgid "Filters updated. Refresh all open folder compares?\n\nSelect 'No' to refresh later."
msgstr ""
"Filtari su dograđeni. Želite li osvježiti sve otvorene usporedbe?\n"
@@ -5849,240 +5860,240 @@ msgstr ""
"Ako odaberete 'Ne', to možete ućiniti i kasnije.."
#. IDS_DIRECTORY_WINDOW_TITLE
-#: Merge.rc:4367
+#: Merge.rc:4377
#, c-format
msgid "Folder Comparison Results"
msgstr "Rezultati usporedbe mapa"
#. IDS_FILE_COMPARISON_TITLE
-#: Merge.rc:4368
+#: Merge.rc:4378
#, c-format
msgid "File Comparison"
msgstr "Usporedba datoteka"
#. IDS_EMPTY_LEFT_FILE
-#: Merge.rc:4369
+#: Merge.rc:4379
#, c-format
msgid "Untitled Left"
msgstr "Neimenovan"
#. IDS_EMPTY_MIDDLE_FILE
-#: Merge.rc:4370
+#: Merge.rc:4380
#, c-format
msgid "Untitled Middle"
msgstr ""
#. IDS_EMPTY_RIGHT_FILE
-#: Merge.rc:4371
+#: Merge.rc:4381
#, c-format
msgid "Untitled Right"
msgstr "Neimenovan"
#. IDS_CONFLICT_BASE_FILE
-#: Merge.rc:4372
+#: Merge.rc:4382
msgid "Base File"
msgstr ""
#. IDS_CONFLICT_THEIRS_FILE
-#: Merge.rc:4373
+#: Merge.rc:4383
#, c-format
msgid "Theirs File"
msgstr "Tuđe datoteke"
#. IDS_CONFLICT_MINE_FILE
-#: Merge.rc:4374
+#: Merge.rc:4384
#, c-format
msgid "Mine File"
msgstr "Moje datoteke"
#. IDS_SELFCOMPARE_ORIGINAL_FILE
-#: Merge.rc:4375
+#: Merge.rc:4385
msgid "Original File"
msgstr ""
#. IDS_LINE_STATUS_INFO_EOL
-#: Merge.rc:4381
+#: Merge.rc:4391
#, c-format
msgid "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s"
msgstr ""
#. IDS_EMPTY_LINE_STATUS_INFO
-#: Merge.rc:4382
+#: Merge.rc:4392
#, c-format
msgid "Line: %s"
msgstr "Redak: %s"
#. IDS_LINE_STATUS_INFO
-#: Merge.rc:4383
+#: Merge.rc:4393
#, c-format
msgid "Ln: %s Col: %d/%d Ch: %d/%d"
msgstr ""
#. IDS_LINE_STATUS_INFO_SEL
-#: Merge.rc:4384
+#: Merge.rc:4394
#, c-format
msgid " Sel: %d | %d"
msgstr ""
#. IDS_MERGEMODE_MERGING
-#: Merge.rc:4385
+#: Merge.rc:4395
#, c-format
msgid "Merge"
msgstr "Usporedo"
#. IDS_DIFF_NUMBER_STATUS_FMT
-#: Merge.rc:4386
+#: Merge.rc:4396
#, c-format
msgid "Difference %1 of %2"
msgstr "Razlika: %1 od %2"
#. IDS_NO_DIFF_SEL_FMT
-#: Merge.rc:4387
+#: Merge.rc:4397
#, c-format
msgid "%1 Differences Found"
msgstr "Nađeno razlika: %1"
#. IDS_1_DIFF_FOUND
-#: Merge.rc:4388
+#: Merge.rc:4398
#, c-format
msgid "1 Difference Found"
msgstr "Nađeno razlika: 1"
#. IDS_NO_ERR_SEL_FMT
-#: Merge.rc:4389
+#: Merge.rc:4399
#, c-format
msgid "%1 Errors Found"
msgstr ""
#. IDS_1_ERR_FOUND
-#: Merge.rc:4390
+#: Merge.rc:4400
msgid "1 Error Found"
msgstr ""
#. IDS_STATUSBAR_READONLY, Abbreviation from "Read Only"
-#: Merge.rc:4391
+#: Merge.rc:4401
#, c-format
msgid "RO"
msgstr "SČ"
#. IDS_DIRVIEW_STATUS_FMT_FOCUS
-#: Merge.rc:4397
+#: Merge.rc:4407
#, c-format
msgid "Item %1 of %2"
msgstr "Stavka %1 od %2"
#. IDS_DIRVIEW_STATUS_FMT_NOFOCUS
-#: Merge.rc:4398
+#: Merge.rc:4408
#, c-format
msgid "Items: %1"
msgstr "Stavke: %1"
#. IDS_DIRVIEW_STATUS_COMPARING
-#: Merge.rc:4399
+#: Merge.rc:4409
#, c-format
msgid "Comparing items..."
msgstr "Usporedba stavki..."
#. IDS_ITEMS_PER_SEC
-#: Merge.rc:4400
+#: Merge.rc:4410
#, c-format
msgid "%.1f[items/sec]"
msgstr ""
#. IDS_ERROR_INCOMPARABLE
-#: Merge.rc:4406
+#: Merge.rc:4416
msgid "Select two existing folders/files to compare."
msgstr "Odaberite dvije datoteke ili mape za usporedbu."
#. IDS_DIRSEL_TAG
-#: Merge.rc:4407
+#: Merge.rc:4417
#, c-format
msgid "Folder Selection"
msgstr "Izbor mape"
#. IDS_OPEN_FILESDIRS
-#: Merge.rc:4408
+#: Merge.rc:4418
#, c-format
msgid "Select two (or three) folders/files to compare."
msgstr ""
#. IDS_OPEN_LEFTINVALID
-#: Merge.rc:4409
+#: Merge.rc:4419
#, c-format
msgid "Left (1st) path is invalid!"
msgstr ""
#. IDS_OPEN_MIDDLEINVALID
-#: Merge.rc:4410
+#: Merge.rc:4420
#, c-format
msgid "Middle (2nd) path is invalid!"
msgstr ""
#. IDS_OPEN_RIGHTINVALID2
-#: Merge.rc:4411
+#: Merge.rc:4421
#, c-format
msgid "Right (2nd) path is invalid!"
msgstr ""
#. IDS_OPEN_RIGHTINVALID3
-#: Merge.rc:4412
+#: Merge.rc:4422
#, c-format
msgid "Right (3rd) path is invalid!"
msgstr ""
#. IDS_OPEN_BOTHINVALID
-#: Merge.rc:4413
+#: Merge.rc:4423
#, c-format
msgid "Both paths are invalid!"
msgstr "Obje staze su krive!"
-#: Merge.rc:4415
+#: Merge.rc:4425
#, c-format
msgid "Left (1st) and Middle (2nd) paths are invalid!"
msgstr ""
#. IDS_OPEN_LEFTRIGHTINVALID
-#: Merge.rc:4416
+#: Merge.rc:4426
#, c-format
msgid "Left (1st) and Right (3rd) paths are invalid!"
msgstr ""
-#: Merge.rc:4418
+#: Merge.rc:4428
#, c-format
msgid "Middle (2nd) and Right (3rd) paths are invalid!"
msgstr ""
#. IDS_OPEN_ALLINVALID
-#: Merge.rc:4419
+#: Merge.rc:4429
#, c-format
msgid "All paths are invalid!"
msgstr ""
#. IDS_OPEN_UNPACKERDISABLED
-#: Merge.rc:4420
+#: Merge.rc:4430
msgid "Only enabled for file comparisons"
msgstr ""
#. IDS_OPEN_MISMATCH
-#: Merge.rc:4421
+#: Merge.rc:4431
#, c-format
msgid "Cannot compare file and folder!"
msgstr "Ne mogu usporediti datoteku i mapu."
#. IDS_ERROR_FILE_NOT_FOUND
-#: Merge.rc:4427
+#: Merge.rc:4437
#, c-format
msgid "File not found: %1"
msgstr "Nema datoteke: %1"
#. IDS_ERROR_FILE_NOT_UNPACKED
-#: Merge.rc:4428
+#: Merge.rc:4438
#, c-format
msgid "File not unpacked: %1"
msgstr "Datoteka nije raspakirana: %1"
#. IDS_ERROR_FILEOPEN
-#: Merge.rc:4429
+#: Merge.rc:4439
#, c-format
msgid ""
"Cannot open file\n"
@@ -6096,13 +6107,13 @@ msgstr ""
"%2"
#. IDS_ERROR_CONF_RESOLVE
-#: Merge.rc:4430
+#: Merge.rc:4440
#, c-format
msgid "Failed to parse conflict file."
msgstr "Ne mogu podjeliti konfliktnu datoteku."
#. IDS_NOT_CONFLICT_FILE
-#: Merge.rc:4431
+#: Merge.rc:4441
#, c-format
msgid "The file\n%1\nis not a conflict file."
msgstr ""
@@ -6111,35 +6122,35 @@ msgstr ""
"nije konfliktna."
#. IDS_COMPARE_LARGE_FILES
-#: Merge.rc:4432
+#: Merge.rc:4442
msgid "Comparing large files requires significant memory.\nShow only comparison results (not file contents)?"
msgstr ""
#. IDS_SAVE_AS_TITLE
-#: Merge.rc:4438
+#: Merge.rc:4448
#, c-format
msgid "Save As"
msgstr "Pohrani kao"
#. IDS_SAVE_FMT
-#: Merge.rc:4439
+#: Merge.rc:4449
#, c-format
msgid "Save changes to %1?"
msgstr "Pohraniti izmjene %1?"
#. IDS_SAVEREADONLY_FMT
-#: Merge.rc:4440
+#: Merge.rc:4450
#, c-format
msgid "%1 is read-only. Override? Or 'No' to save as new filename?"
msgstr "%1 je označena smo za čitanje. Natpisati zaštićenu datoteku? (Stisnite 'Ne', za pohranu pod novim nazivom.)"
#. IDS_ERROR_BACKUP
-#: Merge.rc:4441
+#: Merge.rc:4451
#, c-format
msgid "Error backing up file"
msgstr "Greška pri stvaranju rezervne datoteke"
-#: Merge.rc:4443
+#: Merge.rc:4453
#, c-format
msgid ""
"Unable to backup original file:\n"
@@ -6153,7 +6164,7 @@ msgstr ""
"Nastaviti?"
#. IDS_FILESAVE_FAILED
-#: Merge.rc:4444
+#: Merge.rc:4454
#, c-format
msgid "Saving file failed.\n%1\n%2\n\t- Use different filename (OK)\n\t- Abort (Cancel)?"
msgstr ""
@@ -6164,7 +6175,7 @@ msgstr ""
"\t- Pritisnite 'U redu' za pohranu pod drugim nazivom\n"
"\t- ili pritisnite 'Odustajem' za prekid postupka."
-#: Merge.rc:4446
+#: Merge.rc:4456
#, c-format
msgid "Plugin '%2' cannot pack changes to left file into '%1'.\n\nOriginal unchanged. Save unpacked version?"
msgstr ""
@@ -6174,12 +6185,12 @@ msgstr ""
"\n"
"Pohraniti nespakiranu verziju kao datoteku?"
-#: Merge.rc:4448
+#: Merge.rc:4458
#, c-format
msgid "Plugin '%2' cannot pack changes to middle file into '%1'.\n\nOriginal unchanged. Save unpacked version?"
msgstr ""
-#: Merge.rc:4450
+#: Merge.rc:4460
#, c-format
msgid "Plugin '%2' cannot pack changes to right file into '%1'.\n\nOriginal unchanged. Save unpacked version?"
msgstr ""
@@ -6190,7 +6201,7 @@ msgstr ""
"Pohraniti nespakiranu verziju kao datoteku?"
#. IDS_FILECHANGED_ONDISK
-#: Merge.rc:4451
+#: Merge.rc:4461
#, c-format
msgid ""
"Another application updated\n"
@@ -6206,7 +6217,7 @@ msgstr ""
"Natpisati datoteku?"
#. IDS_SAVEREADONLY_MULTI
-#: Merge.rc:4452
+#: Merge.rc:4462
#, c-format
msgid ""
"%1\n"
@@ -6216,7 +6227,7 @@ msgstr ""
"je označena samo za čitanje. Natpisati zaštićenu stavku?"
#. IDS_FILECHANGED_RESCAN
-#: Merge.rc:4453
+#: Merge.rc:4463
#, c-format
msgid "Another application updated\n%1\nsince last scan.\n\nReload?"
msgstr ""
@@ -6227,25 +6238,25 @@ msgstr ""
"Želite li ponovno učitanje datoteke?"
#. IDS_SAVE_LEFT_AS
-#: Merge.rc:4454
+#: Merge.rc:4464
#, c-format
msgid "Save Left File As"
msgstr "Pohrani lijevu datoteku kao"
#. IDS_SAVE_MIDDLE_AS
-#: Merge.rc:4455
+#: Merge.rc:4465
#, c-format
msgid "Save Middle File As"
msgstr ""
#. IDS_SAVE_RIGHT_AS
-#: Merge.rc:4456
+#: Merge.rc:4466
#, c-format
msgid "Save Right File As"
msgstr "Pohrani desnu datoteku kao"
#. IDS_FILE_DISAPPEARED
-#: Merge.rc:4461
+#: Merge.rc:4471
#, c-format
msgid ""
"File\n"
@@ -6257,7 +6268,7 @@ msgstr ""
"je nestala. Za nastavak, pohranite kopiju."
#. IDS_VIEWS_OUTOFSYNC
-#: Merge.rc:4467
+#: Merge.rc:4477
#, c-format
msgid ""
"Cannot merge unsynched documents.\n"
@@ -6269,189 +6280,189 @@ msgstr ""
"Osvježite dokumente prije nastavka."
#. IDS_BREAK_ON_WHITESPACE
-#: Merge.rc:4472
+#: Merge.rc:4482
msgid "Break at whitespace"
msgstr "Stani na razmaku"
#. IDS_BREAK_ON_PUNCTUATION
-#: Merge.rc:4473
+#: Merge.rc:4483
msgid "Break at whitespace or punctuation"
msgstr "Stani na razmaku ili interpunkciji"
#. IDS_L2M
-#: Merge.rc:4479
+#: Merge.rc:4489
msgid "Copy to &Middle\tAlt+Right"
msgstr ""
#. IDS_R2M
-#: Merge.rc:4480
+#: Merge.rc:4490
msgid "Copy to &Middle\tAlt+Left"
msgstr ""
#. IDS_COPY_FROM_MIDDLE_R
-#: Merge.rc:4481
+#: Merge.rc:4491
msgid "Copy from Middle\tAlt+Shift+Right"
msgstr ""
#. IDS_COPY_FROM_MIDDLE_L
-#: Merge.rc:4482
+#: Merge.rc:4492
msgid "Copy from Middle\tAlt+Shift+Left"
msgstr ""
#. IDS_L2MNEXT
-#: Merge.rc:4483
+#: Merge.rc:4493
msgid "Copy to Middle and Advance\tCtrl+Alt+Right"
msgstr ""
#. IDS_R2MNEXT
-#: Merge.rc:4484
+#: Merge.rc:4494
msgid "Copy to Middle and Advance\tCtrl+Alt+Left"
msgstr ""
#. IDS_ALL_MIDDLE
-#: Merge.rc:4485
+#: Merge.rc:4495
msgid "Copy All to Middle"
msgstr ""
#. IDS_COPY_RIGHT_TO_LEFT
-#: Merge.rc:4491
+#: Merge.rc:4501
#, c-format
msgid "Right to Left (%1)"
msgstr "Desno do lijevo (%1)"
#. IDS_COPY_RIGHT_TO_MIDDLE
-#: Merge.rc:4492
+#: Merge.rc:4502
#, c-format
msgid "Right to Middle (%1)"
msgstr ""
#. IDS_COPY_MIDDLE_TO_LEFT
-#: Merge.rc:4493
+#: Merge.rc:4503
#, c-format
msgid "Middle to Left (%1)"
msgstr ""
#. IDS_COPY_MIDDLE_TO_RIGHT
-#: Merge.rc:4494
+#: Merge.rc:4504
#, c-format
msgid "Middle to Right (%1)"
msgstr ""
#. IDS_COPY_LEFT_TO_RIGHT
-#: Merge.rc:4495
+#: Merge.rc:4505
#, c-format
msgid "Left to Right (%1)"
msgstr "Lijevo do desno (%1)"
#. IDS_COPY_LEFT_TO_MIDDLE
-#: Merge.rc:4496
+#: Merge.rc:4506
#, c-format
msgid "Left to Middle (%1)"
msgstr ""
#. IDS_MOVE_LEFT_TO
-#: Merge.rc:4507 Merge.rc:4539
+#: Merge.rc:4517 Merge.rc:4549
#, c-format
msgid "Left to... (%1)"
msgstr "Lijevo do... (%1)"
#. IDS_MOVE_MIDDLE_TO
-#: Merge.rc:4508 Merge.rc:4540
+#: Merge.rc:4518 Merge.rc:4550
#, c-format
msgid "Middle to... (%1)"
msgstr ""
#. IDS_MOVE_RIGHT_TO
-#: Merge.rc:4509 Merge.rc:4541
+#: Merge.rc:4519 Merge.rc:4551
#, c-format
msgid "Right to... (%1)"
msgstr "Desno do... (%1)"
#. IDS_COPY_BOTH_TO
-#: Merge.rc:4510
+#: Merge.rc:4520
#, c-format
msgid "Both to... (%1)"
msgstr ""
#. IDS_COPY_ALL_TO
-#: Merge.rc:4511
+#: Merge.rc:4521
#, c-format
msgid "All to... (%1)"
msgstr ""
#. IDS_COPY_DIFFERENCES_TO
-#: Merge.rc:4512
+#: Merge.rc:4522
#, c-format
msgid "Differences to... (%1)"
msgstr ""
#. IDS_COPY_ONLYDIFFITEMS
-#: Merge.rc:4519
+#: Merge.rc:4529
msgid "Some selected items are identical or skipped.\nCopy only items with differences?"
msgstr ""
#. IDS_DEL_LEFT_FMT
-#: Merge.rc:4525
+#: Merge.rc:4535
#, c-format
msgid "Left (%1)"
msgstr "Lijevo (%1)"
#. IDS_DEL_MIDDLE_FMT
-#: Merge.rc:4526
+#: Merge.rc:4536
#, c-format
msgid "Middle (%1)"
msgstr ""
#. IDS_DEL_RIGHT_FMT
-#: Merge.rc:4527
+#: Merge.rc:4537
#, c-format
msgid "Right (%1)"
msgstr "Desno (%1)"
#. IDS_DEL_BOTH_FMT
-#: Merge.rc:4528
+#: Merge.rc:4538
#, c-format
msgid "Both (%1)"
msgstr "Oba panela (%1)"
#. IDS_DEL_ALL_FMT
-#: Merge.rc:4529
+#: Merge.rc:4539
#, c-format
msgid "All (%1)"
msgstr ""
#. IDS_SELECT_DEST_LEFT
-#: Merge.rc:4545
+#: Merge.rc:4555
#, c-format
msgid "Left Side - Select Destination Folder:"
msgstr "Lijeva strana - odaberite odredišnu mapu:"
#. IDS_SELECT_DEST_MIDDLE
-#: Merge.rc:4546
+#: Merge.rc:4556
#, c-format
msgid "Middle Side - Select Destination Folder:"
msgstr ""
#. IDS_SELECT_DEST_RIGHT
-#: Merge.rc:4547
+#: Merge.rc:4557
#, c-format
msgid "Right Side - Select Destination Folder:"
msgstr "Desna strana - odaberite odredišnu mapu:"
#. IDS_FILES_AFFECTED_FMT
-#: Merge.rc:4548
+#: Merge.rc:4558
#, c-format
msgid "(%1 Files Affected)"
msgstr "(%1 datoteka dorađeno)"
#. IDS_FILES_AFFECTED_FMT2
-#: Merge.rc:4549
+#: Merge.rc:4559
#, c-format
msgid "(%1 of %2 Files Affected)"
msgstr "(%1 od %2 datoteka dorađeno)"
#. IDS_CONFIRM_DELETE_SINGLE
-#: Merge.rc:4555
+#: Merge.rc:4565
#, c-format
msgid ""
"Are you sure you want to delete\n"
@@ -6463,18 +6474,18 @@ msgstr ""
"%1 ?"
#. IDS_CONFIRM_SINGLE_COPY
-#: Merge.rc:4556
+#: Merge.rc:4566
msgid "Are you sure you want to copy?"
msgstr "Kopirati? -"
#. IDS_CONFIRM_MULTIPLE_COPY
-#: Merge.rc:4557
+#: Merge.rc:4567
#, c-format
msgid "Are you sure you want to copy %d items?"
msgstr ""
#. IDS_DIRCMP_NOTSYNC
-#: Merge.rc:4558
+#: Merge.rc:4568
#, c-format
msgid ""
"Operation aborted!\n"
@@ -6494,878 +6505,878 @@ msgstr ""
"Osvježite usporedbu."
#. IDS_CONFIRM_SINGLE_MOVE
-#: Merge.rc:4563
+#: Merge.rc:4573
msgid "Are you sure you want to move?"
msgstr "Premjestiti?"
#. IDS_CONFIRM_MULTIPLE_MOVE
-#: Merge.rc:4564
+#: Merge.rc:4574
#, c-format
msgid "Are you sure you want to move %d items?"
msgstr "Premjestiti %d stavku?"
#. IDS_CONFIRM_MOVE_CAPTION
-#: Merge.rc:4566
+#: Merge.rc:4576
#, c-format
msgid "Confirm Move"
msgstr "Potvrdite premještanje"
-#: Merge.rc:4568
+#: Merge.rc:4578
#, c-format
msgid "Close the folder comparison window?"
msgstr ""
-#: Merge.rc:4570
+#: Merge.rc:4580
msgid "Close the folder comparison window, which took a long time?"
msgstr ""
#. IDS_ERROR_INVALID_DIR_FILE_NAME
-#: Merge.rc:4571
+#: Merge.rc:4581
msgid "The file or folder name is invalid."
msgstr ""
#. IDS_ERROR_EXECUTE_FILE
-#: Merge.rc:4577
+#: Merge.rc:4587
#, c-format
msgid "Failed to execute external editor: %1"
msgstr "Greška pri pokretanju vanjskog editora: %1"
#. IDS_UNKNOWN_ARCHIVE_FORMAT
-#: Merge.rc:4583
+#: Merge.rc:4593
#, c-format
msgid "Unknown archive format"
msgstr "Nepoznat oblik arhiva"
-#: Merge.rc:4585
+#: Merge.rc:4595
msgid "Failed to extract archive.\nCompare as text file?"
msgstr ""
#. IDS_COLHDR_FILENAME
-#: Merge.rc:4591
+#: Merge.rc:4601
#, c-format
msgid "Filename"
msgstr "Naziv datoteke"
#. IDS_COLHDR_DIR
-#: Merge.rc:4592
+#: Merge.rc:4602
msgctxt "DirView|ColumnHeader"
msgid "Folder"
msgstr "Mapa"
#. IDS_COLHDR_RESULT
-#: Merge.rc:4593
+#: Merge.rc:4603
#, c-format
msgid "Comparison Result"
msgstr "Rezultat usporedbe"
#. IDS_COLHDR_LTIMEM
-#: Merge.rc:4594
+#: Merge.rc:4604
#, c-format
msgid "Left Date"
msgstr "Datum lijevo"
#. IDS_COLHDR_RTIMEM
-#: Merge.rc:4595
+#: Merge.rc:4605
#, c-format
msgid "Right Date"
msgstr "Datum sadašnji"
#. IDS_COLHDR_MTIMEM
-#: Merge.rc:4596
+#: Merge.rc:4606
#, c-format
msgid "Middle Date"
msgstr ""
#. IDS_COLHDR_LSIZE
-#: Merge.rc:4598
+#: Merge.rc:4608
#, c-format
msgid "Left Size"
msgstr "Veličina lijevo"
#. IDS_COLHDR_RSIZE
-#: Merge.rc:4599
+#: Merge.rc:4609
#, c-format
msgid "Right Size"
msgstr "Veličina desno"
#. IDS_COLHDR_MSIZE
-#: Merge.rc:4604
+#: Merge.rc:4614
#, c-format
msgid "Middle Size"
msgstr ""
#. IDS_COLHDR_RSIZE_SHORT
-#: Merge.rc:4605
+#: Merge.rc:4615
#, c-format
msgid "Right Size (Short)"
msgstr "Veličina desno (skraćeno)"
#. IDS_COLHDR_LSIZE_SHORT
-#: Merge.rc:4606
+#: Merge.rc:4616
#, c-format
msgid "Left Size (Short)"
msgstr "Veličina lijevo (skraćeno)"
#. IDS_COLHDR_MSIZE_SHORT
-#: Merge.rc:4607
+#: Merge.rc:4617
#, c-format
msgid "Middle Size (Short)"
msgstr ""
#. IDS_COLHDR_LTIMEC
-#: Merge.rc:4613
+#: Merge.rc:4623
#, c-format
msgid "Left Creation Time"
msgstr "Tim lijeve datoteke"
#. IDS_COLHDR_RTIMEC
-#: Merge.rc:4614
+#: Merge.rc:4624
#, c-format
msgid "Right Creation Time"
msgstr "Tim desne datoteke"
#. IDS_COLHDR_MTIMEC
-#: Merge.rc:4615
+#: Merge.rc:4625
#, c-format
msgid "Middle Creation Time"
msgstr ""
#. IDS_COLHDR_NEWER
-#: Merge.rc:4616
+#: Merge.rc:4626
#, c-format
msgid "Newer File"
msgstr "Novija datoteka"
#. IDS_COLHDR_LVERSION
-#: Merge.rc:4617
+#: Merge.rc:4627
#, c-format
msgid "Left File Version"
msgstr "Verzija lijeve datoteke"
#. IDS_COLHDR_RVERSION
-#: Merge.rc:4618
+#: Merge.rc:4628
#, c-format
msgid "Right File Version"
msgstr "Verzija desne datoteke"
#. IDS_COLHDR_MVERSION
-#: Merge.rc:4619
+#: Merge.rc:4629
#, c-format
msgid "Middle File Version"
msgstr ""
#. IDS_COLHDR_RESULT_ABBR
-#: Merge.rc:4620
+#: Merge.rc:4630
#, c-format
msgid "Short Result"
msgstr "Rezultat skraćeno"
#. IDS_COLHDR_LATTRIBUTES
-#: Merge.rc:4621
+#: Merge.rc:4631
#, c-format
msgid "Left Attributes"
msgstr "Atributi lijevo"
#. IDS_COLHDR_RATTRIBUTES
-#: Merge.rc:4622
+#: Merge.rc:4632
#, c-format
msgid "Right Attributes"
msgstr "Atributi desno"
#. IDS_COLHDR_MATTRIBUTES
-#: Merge.rc:4623
+#: Merge.rc:4633
#, c-format
msgid "Middle Attributes"
msgstr ""
#. IDS_COLHDR_LEOL_TYPE
-#: Merge.rc:4628
+#: Merge.rc:4638
#, c-format
msgid "Left EOL"
msgstr "Završetak reda lijevo"
#. IDS_COLHDR_MEOL_TYPE
-#: Merge.rc:4629
+#: Merge.rc:4639
#, c-format
msgid "Middle EOL"
msgstr ""
#. IDS_COLHDR_REOL_TYPE
-#: Merge.rc:4630
+#: Merge.rc:4640
#, c-format
msgid "Right EOL"
msgstr "Završetak retka desne datoteke."
#. IDS_COLHDR_LENCODING
-#: Merge.rc:4636
+#: Merge.rc:4646
#, c-format
msgid "Left Encoding"
msgstr "Kodiranje lijevo"
#. IDS_COLHDR_RENCODING
-#: Merge.rc:4637
+#: Merge.rc:4647
#, c-format
msgid "Right Encoding"
msgstr "Kodiranje desno"
#. IDS_COLHDR_MENCODING
-#: Merge.rc:4638
+#: Merge.rc:4648
#, c-format
msgid "Middle Encoding"
msgstr ""
#. IDS_COLHDR_NIDIFFS
-#: Merge.rc:4639
+#: Merge.rc:4649
msgid "Ignored Diff"
msgstr "Zanemari razlike"
#. IDS_COLHDR_BINARY
-#: Merge.rc:4641
+#: Merge.rc:4651
msgctxt "DirView|ColumnHeader"
msgid "Binary"
msgstr "Binarno"
#. IDS_PLUGINS_TYPE_UNPACKER
-#: Merge.rc:4642 Merge.rc:4959
+#: Merge.rc:4652 Merge.rc:4969
#, c-format
msgid "Unpacker"
msgstr "Raspakiravač"
#. IDS_PLUGIN_TYPE4
-#: Merge.rc:4643 Merge.rc:4960 Merge.rc:5267
+#: Merge.rc:4653 Merge.rc:4970 Merge.rc:5277
#, c-format
msgid "Prediffer"
msgstr "Prediffer"
#. IDS_COLHDR_LEFT
-#: Merge.rc:4644
+#: Merge.rc:4654
msgid "Left"
msgstr ""
#. IDS_COLHDR_MIDDLE
-#: Merge.rc:4645
+#: Merge.rc:4655
msgid "Middle"
msgstr ""
#. IDS_COLHDR_RIGHT
-#: Merge.rc:4646
+#: Merge.rc:4656
msgid "Right"
msgstr ""
#. IDS_COLHDR_DIFF
-#: Merge.rc:4647
+#: Merge.rc:4657
msgid "Diff"
msgstr ""
#. IDS_COLHDR_LEFT_DUPLICATE
-#: Merge.rc:4648
+#: Merge.rc:4658
msgid "Left Duplicate Count"
msgstr ""
#. IDS_COLHDR_RIGHT_DUPLICATE
-#: Merge.rc:4649
+#: Merge.rc:4659
msgid "Right Duplicate Count"
msgstr ""
#. IDS_COLHDR_MIDDLE_DUPLICATE
-#: Merge.rc:4650
+#: Merge.rc:4660
msgid "Middle Duplicate Count"
msgstr ""
#. IDS_COLHDR_MOVE
-#: Merge.rc:4651
+#: Merge.rc:4661
msgid "Move"
msgstr ""
#. IDS_PRPCAT_AUDIO
-#: Merge.rc:4658
+#: Merge.rc:4668
msgid "Audio"
msgstr ""
#. IDS_PRPCAT_CALENDAR
-#: Merge.rc:4659
+#: Merge.rc:4669
msgid "Calendar"
msgstr ""
#. IDS_PRPCAT_COMMUNICATION
-#: Merge.rc:4660
+#: Merge.rc:4670
msgid "Communication"
msgstr ""
#. IDS_PRPCAT_CONTACT
-#: Merge.rc:4661
+#: Merge.rc:4671
msgid "Contact"
msgstr ""
#. IDS_PRPCAT_DEVICES
-#: Merge.rc:4662
+#: Merge.rc:4672
msgid "Devices"
msgstr ""
#. IDS_PRPCAT_DOCUMENT
-#: Merge.rc:4663
+#: Merge.rc:4673
msgid "Document"
msgstr ""
#. IDS_PRPCAT_HOME
-#: Merge.rc:4664
+#: Merge.rc:4674
msgid "Home"
msgstr ""
#. IDS_PRPCAT_JOURNAL
-#: Merge.rc:4666
+#: Merge.rc:4676
msgid "Journal"
msgstr ""
#. IDS_PRPCAT_LINK
-#: Merge.rc:4667
+#: Merge.rc:4677
msgid "Link"
msgstr ""
#. IDS_PRPCAT_MEDIA
-#: Merge.rc:4668
+#: Merge.rc:4678
msgid "Media"
msgstr ""
#. IDS_PRPCAT_MUSIC
-#: Merge.rc:4670
+#: Merge.rc:4680
msgid "Music"
msgstr ""
#. IDS_PRPCAT_NOTE
-#: Merge.rc:4671
+#: Merge.rc:4681
msgid "Note"
msgstr ""
#. IDS_PRPCAT_PHOTO
-#: Merge.rc:4672
+#: Merge.rc:4682
msgid "Photo"
msgstr ""
#. IDS_PRPCAT_RECORDEDTV
-#: Merge.rc:4673
+#: Merge.rc:4683
msgid "RecordedTV"
msgstr ""
#. IDS_PRPCAT_SEARCH
-#: Merge.rc:4674
+#: Merge.rc:4684
msgid "Search"
msgstr ""
#. IDS_PRPCAT_SECURITY
-#: Merge.rc:4675
+#: Merge.rc:4685
msgid "Security"
msgstr ""
#. IDS_PRPCAT_SOFTWARE
-#: Merge.rc:4676
+#: Merge.rc:4686
msgid "Software"
msgstr ""
#. IDS_PRPCAT_TASK
-#: Merge.rc:4677
+#: Merge.rc:4687
msgid "Task"
msgstr ""
#. IDS_PRPCAT_VIDEO
-#: Merge.rc:4678
+#: Merge.rc:4688
msgid "Video"
msgstr ""
#. IDS_PRPCAT_HASH
-#: Merge.rc:4679
+#: Merge.rc:4689
msgid "Hash"
msgstr ""
#. IDS_CANT_COMPARE_FILES
-#: Merge.rc:4685
+#: Merge.rc:4695
#, c-format
msgid "Unable to compare files"
msgstr "Ne mogu usporediti datoteke"
#. IDS_ABORTED_ITEM
-#: Merge.rc:4686
+#: Merge.rc:4696
#, c-format
msgid "Item aborted"
msgstr "Odbačena stavka"
#. IDS_FILE_SKIPPED
-#: Merge.rc:4687
+#: Merge.rc:4697
#, c-format
msgid "File skipped"
msgstr "Izostavljene datoteke"
#. IDS_DIR_SKIPPED
-#: Merge.rc:4688
+#: Merge.rc:4698
#, c-format
msgid "Folder skipped"
msgstr "Izostavljene mape"
#. IDS_LEFT_ONLY_IN_FMT
-#: Merge.rc:4689
+#: Merge.rc:4699
#, c-format
msgid "Left only: %1"
msgstr "Samo lijevi: %1"
#. IDS_MIDDLE_ONLY_IN_FMT
-#: Merge.rc:4690
+#: Merge.rc:4700
#, c-format
msgid "Middle only: %1"
msgstr ""
#. IDS_RIGHT_ONLY_IN_FMT
-#: Merge.rc:4691
+#: Merge.rc:4701
#, c-format
msgid "Right only: %1"
msgstr "Samo desni: %1"
#. IDS_DOES_NOT_EXIST_IN_FMT
-#: Merge.rc:4692
+#: Merge.rc:4702
#, c-format
msgid "Does not exist in %1"
msgstr ""
#. IDS_BIN_FILES_SAME
-#: Merge.rc:4693
+#: Merge.rc:4703
#, c-format
msgid "Binary files are identical"
msgstr "Binarne datoteke su identične"
#. IDS_BIN_FILES_DIFF
-#: Merge.rc:4699
+#: Merge.rc:4709
#, c-format
msgid "Binary files are different"
msgstr "Binarne datoteke su različite"
#. IDS_FILES_ARE_DIFFERENT
-#: Merge.rc:4700
+#: Merge.rc:4710
#, c-format
msgid "Files are different"
msgstr "Datoteke su različite"
#. IDS_FOLDERS_ARE_DIFFERENT
-#: Merge.rc:4701
+#: Merge.rc:4711
#, c-format
msgid "Folders are different"
msgstr "Mape su različite"
#. IDS_LEFTONLY
-#: Merge.rc:4702
+#: Merge.rc:4712
#, c-format
msgid "Left Only"
msgstr "Samo lijevo"
#. IDS_RIGHTONLY
-#: Merge.rc:4703
+#: Merge.rc:4713
#, c-format
msgid "Right Only"
msgstr "Samo desno"
#. IDS_MIDDLEONLY
-#: Merge.rc:4704
+#: Merge.rc:4714
#, c-format
msgid "Middle Only"
msgstr ""
#. IDS_NOITEMLEFT
-#: Merge.rc:4705
+#: Merge.rc:4715
#, c-format
msgid "No item in left"
msgstr ""
#. IDS_NOITEMRIGHT
-#: Merge.rc:4706
+#: Merge.rc:4716
#, c-format
msgid "No item in right"
msgstr ""
#. IDS_NOITEMMIDDLE
-#: Merge.rc:4707
+#: Merge.rc:4717
#, c-format
msgid "No item in middle"
msgstr ""
#. IDS_CMPRES_ERROR
-#: Merge.rc:4709
+#: Merge.rc:4719
#, c-format
msgid "Error"
msgstr "Greška"
#. IDS_TEXT_FILES_SAME
-#: Merge.rc:4710
+#: Merge.rc:4720
#, c-format
msgid "Text files are identical"
msgstr "Tekstovi su identični"
#. IDS_LEFTONLY_DIFF
-#: Merge.rc:4711
+#: Merge.rc:4721
msgid " (Middle and right are identical)"
msgstr ""
#. IDS_MIDDLEONLY_DIFF
-#: Merge.rc:4712
+#: Merge.rc:4722
msgid " (Left and right are identical)"
msgstr ""
#. IDS_RIGHTONLY_DIFF
-#: Merge.rc:4713
+#: Merge.rc:4723
msgid " (Left and middle are identical)"
msgstr ""
#. IDS_PATH_MISMATCH
-#: Merge.rc:4714
+#: Merge.rc:4724
msgid " (paths differ)"
msgstr ""
#. IDS_TEXT_FILES_DIFF
-#: Merge.rc:4715
+#: Merge.rc:4725
#, c-format
msgid "Text files are different"
msgstr "Tekstovi su različiti"
#. IDS_IMAGE_FILES_SAME
-#: Merge.rc:4716
+#: Merge.rc:4726
msgid "Image files are identical"
msgstr ""
#. IDS_IMAGE_FILES_DIFF
-#: Merge.rc:4717
+#: Merge.rc:4727
msgid "Image files are different"
msgstr ""
#. IDS_EXPR_DIFF
-#: Merge.rc:4718
+#: Merge.rc:4728
#, c-format
msgid "Files are different (expr: %1)"
msgstr ""
#. IDS_HASH_GROUP
-#: Merge.rc:4719
+#: Merge.rc:4729
#, c-format
msgid "Group%d"
msgstr ""
#. IDS_RENAME_MOVE_DETECTION_DISALBED
-#: Merge.rc:4720
+#: Merge.rc:4730
msgctxt "Options dialog|Compare|Folder|Detect renames and moves"
msgid "Disabled"
msgstr ""
#. IDS_RENAME_MOVE_DETECTION_RENAME
-#: Merge.rc:4721
+#: Merge.rc:4731
msgid "Detect renames"
msgstr ""
#. IDS_RENAME_MOVE_DETECTION_RENAME_MOVE
-#: Merge.rc:4722
+#: Merge.rc:4732
msgid "Detect renames and moves"
msgstr ""
#. IDS_RENAME_MOVE_MERGE_MODE_RENAME
-#: Merge.rc:4723
+#: Merge.rc:4733
msgid "Merge renames"
msgstr ""
#. IDS_RENAME_MOVE_MERGE_MODE_RENAME_MOVE
-#: Merge.rc:4724
+#: Merge.rc:4734
msgid "Merge renames and moves"
msgstr ""
#. IDS_RENAMED
-#: Merge.rc:4725
+#: Merge.rc:4735
msgid "Renamed"
msgstr ""
#. IDS_MOVED
-#: Merge.rc:4726
+#: Merge.rc:4736
msgid "Moved"
msgstr ""
#. IDS_RENAMED_MOVED
-#: Merge.rc:4727
+#: Merge.rc:4737
msgid "Renamed/Moved"
msgstr ""
#. IDS_RENAMED_MOVED_ITEMS
-#: Merge.rc:4728
+#: Merge.rc:4738
#, c-format
msgid "(%1 items)"
msgstr ""
#. IDS_RENAMED_MOVED_RESULT
-#: Merge.rc:4729
+#: Merge.rc:4739
#, c-format
msgid "%1 (set %2): "
msgstr ""
#. IDS_SWITCH_FLAT_MODE
-#: Merge.rc:4730
+#: Merge.rc:4740
msgid "Some moved items have been merged.\nIn Tree Mode, these items may appear in positions that do not reflect the actual folder structure, which can be confusing.\nSwitch to Flat Mode?"
msgstr ""
#. IDS_ELAPSED_TIME
-#: Merge.rc:4736
+#: Merge.rc:4746
#, c-format
msgid "Elapsed time: %ld ms"
msgstr "Proteklo vrijeme: %ld ms"
#. IDS_STATUS_SELITEM1
-#: Merge.rc:4737
+#: Merge.rc:4747
#, c-format
msgid "1 item selected"
msgstr "1 stavka označena"
#. IDS_STATUS_SELITEMS
-#: Merge.rc:4738
+#: Merge.rc:4748
#, c-format
msgid "%1 items selected"
msgstr "%1 stavki označeno"
#. IDS_COLDESC_FILENAME
-#: Merge.rc:4744
+#: Merge.rc:4754
#, c-format
msgid "Filename or folder name."
msgstr "Naziv datoteke ili mape."
#. IDS_COLDESC_DIR
-#: Merge.rc:4745
+#: Merge.rc:4755
#, c-format
msgid "Subfolder name when subfolders are included."
msgstr "Nazivi podmapa ako su podmape uključene."
#. IDS_COLDESC_RESULT
-#: Merge.rc:4746
+#: Merge.rc:4756
#, c-format
msgid "Comparison result, long form."
msgstr "Rezultat usporedbe, duži oblik."
#. IDS_COLDESC_LTIMEM
-#: Merge.rc:4751
+#: Merge.rc:4761
#, c-format
msgid "Left side modification date."
msgstr "Lijeva strana - datum promjene."
#. IDS_COLDESC_RTIMEM
-#: Merge.rc:4752
+#: Merge.rc:4762
#, c-format
msgid "Right side modification date."
msgstr "Desna strana - datum promjene."
#. IDS_COLDESC_MTIMEM
-#: Merge.rc:4753
+#: Merge.rc:4763
#, c-format
msgid "Middle side modification date."
msgstr ""
#. IDS_COLDESC_EXTENSION
-#: Merge.rc:4754
+#: Merge.rc:4764
#, c-format
msgid "File's extension."
msgstr "Tip (ekstenzija) datoteke"
#. IDS_COLDESC_LSIZE
-#: Merge.rc:4755
+#: Merge.rc:4765
#, c-format
msgid "Left file size in bytes."
msgstr "Veličina u bajtima, lijeve datoteke."
#. IDS_COLDESC_RSIZE
-#: Merge.rc:4756
+#: Merge.rc:4766
#, c-format
msgid "Right file size in bytes."
msgstr "Veličina u bajtima, desne datoteke."
#. IDS_COLDESC_MSIZE
-#: Merge.rc:4757
+#: Merge.rc:4767
#, c-format
msgid "Middle file size in bytes."
msgstr ""
#. IDS_COLDESC_LSIZE_SHORT
-#: Merge.rc:4758
+#: Merge.rc:4768
#, c-format
msgid "Left file size abbreviated."
msgstr "Skraćenice lijeve datoteke"
#. IDS_COLDESC_RSIZE_SHORT
-#: Merge.rc:4759
+#: Merge.rc:4769
#, c-format
msgid "Right file size abbreviated."
msgstr "Skraćenice desne datoteke"
#. IDS_COLDESC_MSIZE_SHORT
-#: Merge.rc:4760
+#: Merge.rc:4770
#, c-format
msgid "Middle file size abbreviated."
msgstr ""
#. IDS_COLDESC_LTIMEC
-#: Merge.rc:4766
+#: Merge.rc:4776
#, c-format
msgid "Left side creation time."
msgstr "Lijeva strana - vrijeme stvaranja."
#. IDS_COLDESC_RTIMEC
-#: Merge.rc:4767
+#: Merge.rc:4777
#, c-format
msgid "Right side creation time."
msgstr "Desna strana - vrijeme stvaranja."
#. IDS_COLDESC_MTIMEC
-#: Merge.rc:4768
+#: Merge.rc:4778
#, c-format
msgid "Middle side creation time."
msgstr ""
#. IDS_COLDESC_NEWER
-#: Merge.rc:4769
+#: Merge.rc:4779
#, c-format
msgid "Tells which side has newer modification date."
msgstr "Koja strana je promijenjena ranije?"
#. IDS_COLDESC_LVERSION
-#: Merge.rc:4770
+#: Merge.rc:4780
msgid "Left side file version, only for some file types."
msgstr "Verzija na lijevoj strani, samo za neke tipove."
#. IDS_COLDESC_RVERSION
-#: Merge.rc:4771
+#: Merge.rc:4781
msgid "Right side file version, only for some file types."
msgstr "Verzija na desnoj strani, samo za neke tipove."
#. IDS_COLDESC_MVERSION
-#: Merge.rc:4776
+#: Merge.rc:4786
msgid "Middle side file version, only for some file types."
msgstr ""
#. IDS_COLDESC_RESULT_ABBR
-#: Merge.rc:4777
+#: Merge.rc:4787
#, c-format
msgid "Short comparison result."
msgstr "Rezultat usporedbe, kraći oblik."
#. IDS_COLDESC_LATTRIBUTES
-#: Merge.rc:4778
+#: Merge.rc:4788
#, c-format
msgid "Left side attributes."
msgstr "Atributi lijeve datoteke"
#. IDS_COLDESC_RATTRIBUTES
-#: Merge.rc:4779
+#: Merge.rc:4789
#, c-format
msgid "Right side attributes."
msgstr "Atributi desne strane"
#. IDS_COLDESC_MATTRIBUTES
-#: Merge.rc:4780
+#: Merge.rc:4790
#, c-format
msgid "Middle side attributes."
msgstr ""
#. IDS_COLDESC_LEOL_TYPE
-#: Merge.rc:4781
+#: Merge.rc:4791
msgid "Left side file EOL type."
msgstr "Način završetka retka lijeve datoteke."
#. IDS_COLDESC_REOL_TYPE
-#: Merge.rc:4782
+#: Merge.rc:4792
msgid "Right side file EOL type."
msgstr "Način završetka retka desne datoteke."
#. IDS_COLDESC_MEOL_TYPE
-#: Merge.rc:4783
+#: Merge.rc:4793
msgid "Middle side file EOL type."
msgstr ""
#. IDS_COLDESC_LENCODING
-#: Merge.rc:4789
+#: Merge.rc:4799
#, c-format
msgid "Left side encoding."
msgstr "Kodirana lijeva strana"
#. IDS_COLDESC_RENCODING
-#: Merge.rc:4790
+#: Merge.rc:4800
#, c-format
msgid "Right side encoding."
msgstr "Kodiranje desne strane"
#. IDS_COLDESC_MENCODING
-#: Merge.rc:4791
+#: Merge.rc:4801
#, c-format
msgid "Middle side encoding."
msgstr ""
#. IDS_COLDESC_NIDIFFS
-#: Merge.rc:4792
+#: Merge.rc:4802
#, c-format
msgid "Number of ignored differences in file. Ignored and cannot be merged."
msgstr "Broj zanemarenih razlika u datoteci. Zanemarene razlike ne mogu biti spajane u WinMergeu."
#. IDS_COLDESC_NSDIFFS
-#: Merge.rc:4793
+#: Merge.rc:4803
#, c-format
msgid "Number of differences in file (excluding ignored)."
msgstr "Broj razlika u datoteci. Zanemarene razlike nisu uključene."
#. IDS_COLDESC_BINARY
-#: Merge.rc:4794
+#: Merge.rc:4804
#, c-format
msgid "Shows an asterisk (*) if the file is binary."
msgstr "Prikaži zvjezdicu (*) uz binarnu datoteku."
#. IDS_COLDESC_UNPACKER
-#: Merge.rc:4795
+#: Merge.rc:4805
msgid "Unpacker plugin name or pipeline."
msgstr ""
#. IDS_COLDESC_PREDIFFER
-#: Merge.rc:4796
+#: Merge.rc:4806
msgid "Prediffer plugin name or pipeline."
msgstr ""
#. IDS_DIRECTORY_REPORT_TITLE
-#: Merge.rc:4802
+#: Merge.rc:4812
#, c-format
msgid "Compare %1 with %2"
msgstr "Usporedi %1 s %2"
#. IDS_DIRECTORY_REPORT_TITLE3
-#: Merge.rc:4803
+#: Merge.rc:4813
#, c-format
msgid "Compare %1 with %2 and %3"
msgstr ""
#. IDS_REPORT_COMMALIST
-#: Merge.rc:4804
+#: Merge.rc:4814
#, c-format
msgid "Comma-separated list"
msgstr "Popis odvojen zarezom"
#. IDS_REPORT_TABLIST
-#: Merge.rc:4805
+#: Merge.rc:4815
#, c-format
msgid "Tab-separated list"
msgstr "Popis odvojen tabulatorom"
#. IDS_REPORT_SIMPLEHTML
-#: Merge.rc:4806
+#: Merge.rc:4816
#, c-format
msgid "Simple HTML"
msgstr "Jednostavni HTML"
#. IDS_REPORT_SIMPLEXML
-#: Merge.rc:4807
+#: Merge.rc:4817
#, c-format
msgid "Simple XML"
msgstr "Jednostavni HTML"
-#: Merge.rc:4809
+#: Merge.rc:4819
#, c-format
msgid "Report file already exists. Overwrite?"
msgstr "Datoteka izvještaja već postoji. Natpisati?"
#. IDS_REPORT_ERROR
-#: Merge.rc:4814
+#: Merge.rc:4824
#, c-format
msgid ""
"Error creating the report:\n"
@@ -7375,62 +7386,62 @@ msgstr ""
"%1"
#. IDS_REPORT_SUCCESS
-#: Merge.rc:4815
+#: Merge.rc:4825
#, c-format
msgid "Report created successfully."
msgstr "Izvještaj je uspješno stvoren."
#. IDS_SYNCPOINT_LASTBLOCK
-#: Merge.rc:4821
+#: Merge.rc:4831
msgid "Cannot add a synchronization point at this line."
msgstr ""
#. IDS_FILE_TO_ITSELF
-#: Merge.rc:4827
+#: Merge.rc:4837
#, c-format
msgid "Same file is opened in both panes."
msgstr "Ista datoteka je otvorena u oba panela."
#. IDS_FILESSAME
-#: Merge.rc:4828
+#: Merge.rc:4838
#, c-format
msgid "Selected files are identical."
msgstr "Datoteke su identične."
#. IDS_FILESSAME_CURCFG
-#: Merge.rc:4829
+#: Merge.rc:4839
msgid "Selected files are identical (with current settings).\r\nChecking binary identity..."
msgstr ""
#. IDS_FILESSAME_BINERROR
-#: Merge.rc:4830
+#: Merge.rc:4840
msgid "Selected files are identical (with current settings).\r\nBut binary comparison failed."
msgstr ""
#. IDS_FILESSAME_BINSAME
-#: Merge.rc:4831
+#: Merge.rc:4841
msgid "Selected files are identical (binary match)."
msgstr ""
#. IDS_FILESSAME_BINDIFF
-#: Merge.rc:4832
+#: Merge.rc:4842
msgid "Selected files are identical (with current settings).\r\nBut differ at the binary level."
msgstr ""
#. IDS_FILEERROR
-#: Merge.rc:4833
+#: Merge.rc:4843
#, c-format
msgid "An error occurred while comparing files."
msgstr "Greška pri usporedbi datoteka."
#. IDS_TEMP_FILEERROR
-#: Merge.rc:4834
+#: Merge.rc:4844
#, c-format
msgid "Could not create temporary files. Check your temporary path settings."
msgstr "Ne mogu stvoriti privremenu datoteku. Provjerite postavke staze."
#. IDS_SUGGEST_IGNOREEOL
-#: Merge.rc:4835
+#: Merge.rc:4845
msgid "Files use different EOL.\n\nTreat all EOL as equivalent?\n\nSet 'Ignore EOL differences (Windows/Unix/Mac)' in Compare section of Options."
msgstr ""
"Datoteke se razlikuju prema prelazu u drugi redak.\n"
@@ -7440,19 +7451,19 @@ msgstr ""
"Napomena: Želite li uvijek zadržati li različitost prijelaza u drugi redak, odaberite 'Zanemari različitost prijelaza u drugi redak (Windows/Unix/Mac)' u kartici usporedbi u oknu dijaloga 'Uređivanje/Postavke."
#. IDS_INVALID_DIRECTORY
-#: Merge.rc:4836
+#: Merge.rc:4846
#, c-format
msgid "Selected folder is invalid."
msgstr "Odabrana mapa je pogrešna."
#. IDS_CANNOT_OPEN_BINARYFILE
-#: Merge.rc:4837
+#: Merge.rc:4847
#, c-format
msgid "Cannot open a binary file in Editor."
msgstr "Ne mogu otvoriti binarnu datoteku u uređivaču"
#. IDS_CREATE_PAIR_FOLDER
-#: Merge.rc:4838
+#: Merge.rc:4848
#, c-format
msgid "Create matching folder:\n%1\non the other side and open?"
msgstr ""
@@ -7463,45 +7474,45 @@ msgstr ""
"na drugoj strani i otvoriti je?"
#. IDS_CONFIRM_COPY_ALL_DIFFS
-#: Merge.rc:4839
+#: Merge.rc:4849
msgid "Copy all differences to other file?"
msgstr ""
#. IDS_MOVE_TO_NEXTFILE
-#: Merge.rc:4844
+#: Merge.rc:4854
#, c-format
msgid "Move to next file?"
msgstr ""
#. IDS_MOVE_TO_PREVFILE
-#: Merge.rc:4845
+#: Merge.rc:4855
#, c-format
msgid "Move to previous file?"
msgstr ""
#. IDS_MOVE_TO_NEXTPAGE
-#: Merge.rc:4846
+#: Merge.rc:4856
#, c-format
msgid "Move to next page?"
msgstr ""
#. IDS_MOVE_TO_PREVPAGE
-#: Merge.rc:4847
+#: Merge.rc:4857
#, c-format
msgid "Move to previous page?"
msgstr ""
#. IDS_MOVE_TO_FIRSTFILE
-#: Merge.rc:4848
+#: Merge.rc:4858
msgid "Move to first file?"
msgstr ""
#. IDS_MOVE_TO_LASTFILE
-#: Merge.rc:4849
+#: Merge.rc:4859
msgid "Move to last file?"
msgstr ""
-#: Merge.rc:4856
+#: Merge.rc:4866
#, c-format
msgid "Different codepages: left (cp%d), right (cp%d).\nDisplay in codepage (better display) or default Windows codepage (safer merging)?\n(Recommended: default Windows codepage)"
msgstr ""
@@ -7509,163 +7520,163 @@ msgstr ""
"Prikaz svake datoteke u vlastitoj ks je ljepši, ali dovodi do teškoća prilikom spajanja ili kopiranja.\n"
"Preporučamo obje datoteke prikazati u Windows prednamještenoj kodnoj stranici?"
-#: Merge.rc:4858
+#: Merge.rc:4868
#, c-format
msgid "Information lost due to encoding errors: both files"
msgstr "Greškom pri kodiranju izgubljena je informacija: obje datoteke"
-#: Merge.rc:4860
+#: Merge.rc:4870
#, c-format
msgid "Information lost due to encoding errors: first file"
msgstr ""
-#: Merge.rc:4862
+#: Merge.rc:4872
#, c-format
msgid "Information lost due to encoding errors: second file"
msgstr ""
-#: Merge.rc:4864
+#: Merge.rc:4874
#, c-format
msgid "Information lost due to encoding errors: third file"
msgstr ""
#. IDS_LINEDIFF_NODIFF
-#: Merge.rc:4870
+#: Merge.rc:4880
#, c-format
msgid "No difference"
msgstr "Nema razlike"
#. IDS_LINEDIFF_NODIFF_CAPTION
-#: Merge.rc:4871
+#: Merge.rc:4881
#, c-format
msgid "Line difference"
msgstr "Različiti redak"
#. IDS_NUM_REPLACED
-#: Merge.rc:4877
+#: Merge.rc:4887
#, c-format
msgid "Replaced %1 string(s)."
msgstr "Zamijenjeno %1 pojam (pojmova)."
#. IDS_EDIT_TEXT_NOT_FOUND
-#: Merge.rc:4878
+#: Merge.rc:4888
#, c-format
msgid "Cannot find string \"%s\"."
msgstr "Ne mogu naći pojam \"%s\"."
#. IDS_MERGE_MODE
-#: Merge.rc:4884
+#: Merge.rc:4894
msgid "Entering Merge Mode. Press F9 to turn off."
msgstr ""
#. IDS_AUTO_MERGE
-#: Merge.rc:4890
+#: Merge.rc:4900
#, c-format
msgid "Automatic merges: %1\nUnresolved conflicts: %2"
msgstr ""
#. IDS_CODEPAGE_MERGED
-#: Merge.rc:4891
+#: Merge.rc:4901
msgid "Codepage change merged."
msgstr ""
#. IDS_CODEPAGE_CONFLICT
-#: Merge.rc:4892
+#: Merge.rc:4902
msgid "Codepage changes are conflicting."
msgstr ""
#. IDS_EOL_MERGED
-#: Merge.rc:4893
+#: Merge.rc:4903
msgid "EOL change merged."
msgstr ""
#. IDS_EOL_CONFLICT
-#: Merge.rc:4894
+#: Merge.rc:4904
msgid "EOL changes are conflicting."
msgstr ""
#. IDS_LOCBAR_CAPTION
-#: Merge.rc:4900
+#: Merge.rc:4910
#, c-format
msgid "Location Pane"
msgstr "Položaj panela"
#. IDS_DIFFBAR_CAPTION
-#: Merge.rc:4901
+#: Merge.rc:4911
#, c-format
msgid "Diff Pane"
msgstr "Panel razlika"
#. IDS_DIFF_SUCCEEDED
-#: Merge.rc:4908
+#: Merge.rc:4918
#, c-format
msgid "Patch file written."
msgstr "Datoteka razlika je pohranjena."
#. IDS_DIFF_ITEM1NOTFOUND
-#: Merge.rc:4909
+#: Merge.rc:4919
msgid "First item not found!"
msgstr ""
#. IDS_DIFF_ITEM2NOTFOUND
-#: Merge.rc:4910
+#: Merge.rc:4920
msgid "Second item not found!"
msgstr ""
#. IDS_DIFF_FILEOVERWRITE
-#: Merge.rc:4911
+#: Merge.rc:4921
#, c-format
msgid "Patch file already exists. Overwrite?"
msgstr "Datoteka razlika već postoji. Natpisati?"
#. IDS_DIFF_SELECTEDFILES
-#: Merge.rc:4912
+#: Merge.rc:4922
#, c-format
msgid "[%1 files selected]"
msgstr "[%1 datoteka odabrano]"
#. IDS_DIFF_NORMAL
-#: Merge.rc:4913
+#: Merge.rc:4923
#, c-format
msgid "Normal"
msgstr "Uobičajeno"
#. IDS_DIFF_CONTEXT
-#: Merge.rc:4914
+#: Merge.rc:4924
#, c-format
msgid "Context"
msgstr "Detaljnije"
#. IDS_DIFF_UNIFIED
-#: Merge.rc:4915
+#: Merge.rc:4925
#, c-format
msgid "Unified"
msgstr "Združeno"
#. IDS_FILEWRITE_ERROR
-#: Merge.rc:4917
+#: Merge.rc:4927
#, c-format
msgid "Could not write to file %1."
msgstr "Ne mogu pohraniti u datoteku"
#. IDS_PATH_NOT_ABSOLUTE
-#: Merge.rc:4918
+#: Merge.rc:4928
#, c-format
msgid "Output path is not absolute: %1"
msgstr "Dana staza ne odgovara: %1"
#. IDS_MUST_SPECIFY_OUTPUT
-#: Merge.rc:4919
+#: Merge.rc:4929
msgid "Specify an output file."
msgstr "Odredite izlaznu datoteku."
-#: Merge.rc:4921
+#: Merge.rc:4931
#, c-format
msgid "Cannot create patch from binary files."
msgstr "Ne mogu stvoriti datoteku razlika iz binarnih datoteka"
#. IDS_SAVEFILES_FORPATCH
-#: Merge.rc:4922
+#: Merge.rc:4932
#, c-format
msgid ""
"Save all files first.\n"
@@ -7677,13 +7688,13 @@ msgstr ""
"Prije stvaranja datoteke razlika, sve datoteke trebaju biti pohranjene."
#. IDS_FOLDER_NOTEXIST
-#: Merge.rc:4923
+#: Merge.rc:4933
#, c-format
msgid "Folder does not exist."
msgstr "Mapa ne postoji"
#. IDS_NO_ZIP_SUPPORT
-#: Merge.rc:4928
+#: Merge.rc:4938
msgid "Archive support not enabled.\n7-Zip and/or Merge7z*.dll not found.\nSee manual for archive support."
msgstr ""
"Rad s arhivama nije omogućen.\n"
@@ -7691,43 +7702,43 @@ msgstr ""
"Pregledajte upute kako omogućiti rad s arhivama."
#. IDS_OPT_EXPORT_CAPTION
-#: Merge.rc:4929
+#: Merge.rc:4939
#, c-format
msgid "Select file for export"
msgstr "Odabir datoteke za izvoz"
#. IDS_OPT_IMPORT_CAPTION
-#: Merge.rc:4930
+#: Merge.rc:4940
#, c-format
msgid "Select file for import"
msgstr "Odabir datoteke za uvoz"
#. IDS_OPT_IMPORT_DONE
-#: Merge.rc:4931
+#: Merge.rc:4941
#, c-format
msgid "Options imported from file."
msgstr "Uvoz postavki u datoteku"
#. IDS_OPT_EXPORT_DONE
-#: Merge.rc:4932
+#: Merge.rc:4942
#, c-format
msgid "Options exported to file."
msgstr "Izvoz postavki u datoteku"
#. IDS_OPT_IMPORT_ERR
-#: Merge.rc:4933
+#: Merge.rc:4943
#, c-format
msgid "Failed to import options from file."
msgstr "Greška pri učitanju postavki"
#. IDS_OPT_EXPORT_ERR
-#: Merge.rc:4934
+#: Merge.rc:4944
#, c-format
msgid "Failed to write options to file."
msgstr "Greška pri pohrani odabranih postavki."
#. IDS_CLOSEALL_WINDOWS
-#: Merge.rc:4935
+#: Merge.rc:4945
#, c-format
msgid ""
"Close multiple compare windows?\n"
@@ -7739,1213 +7750,1218 @@ msgstr ""
"Nastaviti?"
#. IDS_EOL_MIXED
-#: Merge.rc:4944
+#: Merge.rc:4954
#, c-format
msgid "Mixed"
msgstr "Mixed"
#. IDS_EOL_BIN
-#: Merge.rc:4945
+#: Merge.rc:4955
msgctxt "EOL Type"
msgid "Binary"
msgstr "Binarno"
#. IDS_EOL_NONE
-#: Merge.rc:4949
+#: Merge.rc:4959
#, c-format
msgid "None"
msgstr "Ništa"
#. IDS_MARKER_COLOR_FMT
-#: Merge.rc:4950
+#: Merge.rc:4960
#, c-format
msgid "Marker Color %d"
msgstr ""
#. IDS_MARKER_NEW_PATTERN
-#: Merge.rc:4951
+#: Merge.rc:4961
msgid "New Pattern"
msgstr ""
#. IDS_PLUGINSLIST_TYPE
-#: Merge.rc:4957
+#: Merge.rc:4967
#, c-format
msgid "Type"
msgstr "Tip"
#. IDS_PLUGINS_TYPE_EDITSCRIPT
-#: Merge.rc:4961
+#: Merge.rc:4971
#, c-format
msgid "Editor script"
msgstr "Uređivač skripti"
#. ID_SELECTLINEDIFF
-#: Merge.rc:4967
+#: Merge.rc:4977
#, c-format
msgid "\nDifference in Current Line (F4)"
msgstr ""
#. ID_OPTIONS
-#: Merge.rc:4968
+#: Merge.rc:4978
#, c-format
msgid "\nOptions"
msgstr ""
#. ID_REFRESH
-#: Merge.rc:4969
+#: Merge.rc:4979
#, c-format
msgid "\nRefresh (F5)"
msgstr ""
#. ID_PREVDIFF
-#: Merge.rc:4975
+#: Merge.rc:4985
#, c-format
msgid "\nPrevious Difference (Alt+Up)"
msgstr ""
#. ID_NEXTDIFF
-#: Merge.rc:4976
+#: Merge.rc:4986
#, c-format
msgid "\nNext Difference (Alt+Down)"
msgstr ""
#. ID_PREVCONFLICT
-#: Merge.rc:4977
+#: Merge.rc:4987
#, c-format
msgid "\nPrevious Conflict (Alt+Shift+Up)"
msgstr ""
#. ID_NEXTCONFLICT
-#: Merge.rc:4978
+#: Merge.rc:4988
#, c-format
msgid "\nNext Conflict (Alt+Shift+Down)"
msgstr ""
#. ID_FIRSTDIFF
-#: Merge.rc:4983
+#: Merge.rc:4993
#, c-format
msgid "\nFirst Difference (Alt+Home)"
msgstr ""
#. ID_CURDIFF
-#: Merge.rc:4984
+#: Merge.rc:4994
#, c-format
msgid "\nCurrent Difference (Alt+Enter)"
msgstr ""
#. ID_LASTDIFF
-#: Merge.rc:4985
+#: Merge.rc:4995
#, c-format
msgid "\nLast Difference (Alt+End)"
msgstr ""
#. ID_L2R
-#: Merge.rc:4986
+#: Merge.rc:4996
msgid "\nCopy to Right (Alt+Right)"
msgstr ""
#. ID_R2L
-#: Merge.rc:4987
+#: Merge.rc:4997
msgid "\nCopy to Left (Alt+Left)"
msgstr ""
#. ID_L2RNEXT
-#: Merge.rc:4988
+#: Merge.rc:4998
msgid "\nCopy to Right and Advance (Ctrl+Alt+Right)"
msgstr ""
#. ID_R2LNEXT
-#: Merge.rc:4989
+#: Merge.rc:4999
msgid "\nCopy to Left and Advance (Ctrl+Alt+Left)"
msgstr ""
#. ID_ALL_RIGHT
-#: Merge.rc:4990
+#: Merge.rc:5000
msgid "\nCopy All to Right"
msgstr "\nKopiraj sve u desno"
#. ID_ALL_LEFT
-#: Merge.rc:4991
+#: Merge.rc:5001
msgid "\nCopy All to Left"
msgstr "\nKopiraj sve u lijevo"
#. ID_AUTO_MERGE
-#: Merge.rc:4992
+#: Merge.rc:5002
#, c-format
msgid "\nAuto Merge (Ctrl+Alt+M)"
msgstr ""
#. ID_FIRSTFILE
-#: Merge.rc:4993
+#: Merge.rc:5003
msgid "\nFirst File"
msgstr ""
#. ID_NEXTFILE
-#: Merge.rc:4994
+#: Merge.rc:5004
msgid "\nNext File (Ctrl+F8)"
msgstr ""
#. ID_LASTFILE
-#: Merge.rc:4995
+#: Merge.rc:5005
msgid "\nLast File"
msgstr ""
#. ID_PREVFILE
-#: Merge.rc:4996
+#: Merge.rc:5006
msgid "\nPrevious File (Ctrl+F7)"
msgstr ""
#. IDS_UNPACK_AUTO
-#: Merge.rc:5003
+#: Merge.rc:5013
msgid "Adapted unpacker applied to both files (one needs extension)."
msgstr "Arhiver će se koristiti za obje datoteke (jedna treba samo ekstenziju)."
#. IDS_NO_PREDIFFER
-#: Merge.rc:5004
+#: Merge.rc:5014
#, c-format
msgid "No Prediffer (Normal)"
msgstr "Bez dodataka (uobičajeno)"
#. IDS_SUGGESTED_PLUGINS
-#: Merge.rc:5005
+#: Merge.rc:5015
#, c-format
msgid "Suggested Plugins"
msgstr "Preporučljivi dodaci"
#. IDS_NOT_SUGGESTED_PLUGINS
-#: Merge.rc:5006
+#: Merge.rc:5016
msgid "All Plugins"
msgstr ""
#. IDS_PRIVATEBUILD_FMT
-#: Merge.rc:5012
+#: Merge.rc:5022
#, c-format
msgid "Private Build: %1"
msgstr "Osobni uradak: %1"
#. IDS_CHECKFORUPDATES_UPTODATE
-#: Merge.rc:5013
+#: Merge.rc:5023
msgid "Your software is up to date."
msgstr ""
-#: Merge.rc:5015
+#: Merge.rc:5025
#, c-format
msgid "WinMerge update available.\n%1 available (you have %2). Download now?"
msgstr ""
#. IDS_ALLRIGHTS_RESERVED
-#: Merge.rc:5016
+#: Merge.rc:5026
msgid " - All rights reserved."
msgstr ""
#. IDS_CHECKFORUPDATES_FAILED
-#: Merge.rc:5021
+#: Merge.rc:5031
#, c-format
msgid "Failed to download latest version information"
msgstr ""
#. IDS_TITLE_PLUGINS_SETTINGS
-#: Merge.rc:5027
+#: Merge.rc:5037
#, c-format
msgid "Plugin Settings"
msgstr "Postavke dodataka"
#. IDS_NO_SCT_SCRIPTS
-#: Merge.rc:5029
+#: Merge.rc:5039
#, c-format
msgid "WSH not found - .sct scripts disabled"
msgstr "WSH dodatak nije nađen! - .sct skripte su onemogućene"
#. IDS_LOCBAR_GOTOLINE_FMT
-#: Merge.rc:5037
+#: Merge.rc:5047
#, c-format
msgid "G&o to Line %1"
msgstr "Idi &na redak"
#. IDS_GOTO_MOVED_LINE
-#: Merge.rc:5043
+#: Merge.rc:5053
msgid "Go to Moved Line\tCtrl+Shift+G"
msgstr ""
#. IDS_AUTOCOMPLETE_DISABLED
-#: Merge.rc:5049
+#: Merge.rc:5059
msgctxt "Options dialog|General|Open dialog Auto completion"
msgid "Disabled"
msgstr ""
#. IDS_AUTOCOMPLETE_FILE_SYS
-#: Merge.rc:5050
+#: Merge.rc:5060
#, c-format
msgid "From file system"
msgstr "Sistem datoteka"
#. IDS_AUTOCOMPLETE_MRU
-#: Merge.rc:5051
+#: Merge.rc:5061
#, c-format
msgid "From Most Recently Used list"
msgstr "Popis zadnje korištenih"
#. IDS_COLORSCHEME_PLAIN
-#: Merge.rc:5057
+#: Merge.rc:5067
#, c-format
msgid "No Highlighting"
msgstr "Nije označeno"
#. IDS_COLORSCHEME_BATCH
-#: Merge.rc:5063
+#: Merge.rc:5073
#, c-format
msgid "Batch"
msgstr "Batch"
#. IDS_COLORSCHEME_PO
-#: Merge.rc:5090
+#: Merge.rc:5100
#, c-format
msgid "Portable Object"
msgstr "Prenosni objekt"
#. IDS_COLORSCHEME_RSRC
-#: Merge.rc:5094
+#: Merge.rc:5104
#, c-format
msgid "Resources"
msgstr "Resursi"
#. IDS_COLORSCHEME_SH
-#: Merge.rc:5098
+#: Merge.rc:5108
#, c-format
msgid "Shell"
msgstr "Shell"
#. IDS_CLOSE_LEFT_TABS
-#: Merge.rc:5115
+#: Merge.rc:5125
#, c-format
msgid "Close &Left Tabs"
msgstr ""
#. IDS_CLOSE_RIGHT_TABS
-#: Merge.rc:5116
+#: Merge.rc:5126
#, c-format
msgid "Close R&ight Tabs"
msgstr ""
#. IDS_CLOSE_OTHER_TABS
-#: Merge.rc:5117
+#: Merge.rc:5127
#, c-format
msgid "Close &Other Tabs"
msgstr ""
#. IDS_TABBAR_AUTO_MAXWIDTH
-#: Merge.rc:5118
+#: Merge.rc:5128
#, c-format
msgid "Enable &Auto Max Width"
msgstr ""
#. IDS_WEBPAGE_MENU
-#: Merge.rc:5128
+#: Merge.rc:5138
msgid "We&bpage"
msgstr ""
#. IDS_VIEW_WRAP_TEXT
-#: Merge.rc:5133
+#: Merge.rc:5143
msgid "W&rap Text"
msgstr ""
#. IDS_NOTINSTALLED
-#: Merge.rc:5138
+#: Merge.rc:5148
msgid "%1 is not installed."
msgstr ""
#. IDS_CREATE_FOLDER
-#: Merge.rc:5143
+#: Merge.rc:5153
#, c-format
msgid "%1 does not exist. Create it?"
msgstr ""
#. IDS_CREATE_FOLDER_ERROR
-#: Merge.rc:5144
+#: Merge.rc:5154
#, c-format
msgid "Failed to create folder."
msgstr ""
#. IDC_EXT_EDITOR_PATH
-#: Merge.rc:5149
+#: Merge.rc:5159
#, c-format
msgid "Parameters:\n$file: Current file path\n$linenum: Current cursor line number"
msgstr ""
#. IDS_DIFF_ALGORITHM_DEFAULT
-#: Merge.rc:5154
+#: Merge.rc:5164
msgid "default"
msgstr ""
#. IDS_DIFF_ALGORITHM_MINIMAL
-#: Merge.rc:5155
+#: Merge.rc:5165
msgid "minimal"
msgstr ""
#. IDS_DIFF_ALGORITHM_PATIENCE
-#: Merge.rc:5156
+#: Merge.rc:5166
msgid "patience"
msgstr ""
#. IDS_DIFF_ALGORITHM_HISTOGRAM
-#: Merge.rc:5157
+#: Merge.rc:5167
msgid "histogram"
msgstr ""
#. IDS_DIFF_ALGORITHM_NONE
-#: Merge.rc:5158
+#: Merge.rc:5168
msgid "none"
msgstr ""
#. IDS_RENDERING_MODE_GDI
-#: Merge.rc:5163
+#: Merge.rc:5173
msgid "GDI"
msgstr ""
#. IDS_RENDERING_MODE_DIRECTWRITE_DEFAULT
-#: Merge.rc:5164
+#: Merge.rc:5174
msgid "DirectWrite Default"
msgstr ""
#. IDS_RENDERING_MODE_DIRECTWRITE_ALIASED
-#: Merge.rc:5165
+#: Merge.rc:5175
msgid "DirectWrite Aliased"
msgstr ""
#. IDS_RENDERING_MODE_DIRECTWRITE_GDI_CLASSIC
-#: Merge.rc:5166
+#: Merge.rc:5176
msgid "DirectWrite GDI Classic"
msgstr ""
#. IDS_RENDERING_MODE_DIRECTWRITE_GDI_NATURAL
-#: Merge.rc:5167
+#: Merge.rc:5177
msgid "DirectWrite GDI Natural"
msgstr ""
#. IDS_RENDERING_MODE_DIRECTWRITE_NATURAL
-#: Merge.rc:5168
+#: Merge.rc:5178
msgid "DirectWrite Natural"
msgstr ""
#. IDS_RENDERING_MODE_DIRECTWRITE_NATURAL_SYMMETRIC
-#: Merge.rc:5169
+#: Merge.rc:5179
msgid "DirectWrite Natural Symmetric"
msgstr ""
#. IDS_CLOSE_WINDOWS_WITH_ESC_DISABLED
-#: Merge.rc:5174
+#: Merge.rc:5184
msgctxt "Options dialog|General|Close windows with Esc"
msgid "Disabled"
msgstr ""
#. IDS_CLOSE_WINDOWS_WITH_ESC_1
-#: Merge.rc:5175
+#: Merge.rc:5185
msgid "MDI child window or main window"
msgstr ""
#. IDS_CLOSE_WINDOWS_WITH_ESC_2
-#: Merge.rc:5176
+#: Merge.rc:5186
msgid "MDI child window only"
msgstr ""
#. IDS_CLOSE_WINDOWS_WITH_ESC_3
-#: Merge.rc:5177
+#: Merge.rc:5187
msgid "Close main window if only one MDI child window"
msgstr ""
#. IDS_DIFF_GROUP
-#: Merge.rc:5182
+#: Merge.rc:5192
msgctxt "ImgMergeFrame|LocationPane"
msgid "Diff"
msgstr ""
#. IDS_DIFF_HIGHLIGHT
-#: Merge.rc:5183
+#: Merge.rc:5193
msgctxt "ImgMergeFrame|LocationPane"
msgid "Highlight"
msgstr ""
#. IDS_DIFF_BLINK
-#: Merge.rc:5184
+#: Merge.rc:5194
msgctxt "ImgMergeFrame|LocationPane"
msgid "Blink"
msgstr ""
#. IDS_DIFF_BLOCKSIZE
-#: Merge.rc:5185
+#: Merge.rc:5195
msgctxt "ImgMergeFrame|LocationPane"
msgid "Block Size"
msgstr ""
#. IDS_DIFF_BLOCKALPHA
-#: Merge.rc:5186
+#: Merge.rc:5196
msgctxt "ImgMergeFrame|LocationPane"
msgid "Block Alpha"
msgstr ""
#. IDS_DIFF_CDTHRESHOLD
-#: Merge.rc:5187
+#: Merge.rc:5197
msgctxt "ImgMergeFrame|LocationPane"
msgid "CD Threshold"
msgstr ""
#. IDS_DIFF_INSERTION_DELETION_DETECTION
-#: Merge.rc:5188
+#: Merge.rc:5198
msgctxt "ImgMergeFrame|LocationPane"
msgid "Ins/Del Detection"
msgstr ""
#. IDS_OVERLAY_MODE_NONE
-#: Merge.rc:5189 Merge.rc:5194
+#: Merge.rc:5199 Merge.rc:5204
msgctxt "ImgMergeFrame|LocationPane"
msgid "None"
msgstr ""
#. IDS_DIFF_INSERTION_DELETION_DETECTION_VERTICAL
-#: Merge.rc:5190
+#: Merge.rc:5200
msgctxt "ImgMergeFrame|LocationPane"
msgid "Vertical"
msgstr ""
#. IDS_DIFF_INSERTION_DELETION_DETECTION_HORIZONTAL
-#: Merge.rc:5191
+#: Merge.rc:5201
msgctxt "ImgMergeFrame|LocationPane"
msgid "Horizontal"
msgstr ""
#. IDS_OVERLAY_GROUP
-#: Merge.rc:5192
+#: Merge.rc:5202
msgctxt "ImgMergeFrame|LocationPane"
msgid "Overlay"
msgstr ""
#. IDS_OVERLAY_ALPHA
-#: Merge.rc:5193
+#: Merge.rc:5203
msgctxt "ImgMergeFrame|LocationPane"
msgid "Alpha"
msgstr ""
#. IDS_OVERLAY_MODE_XOR
-#: Merge.rc:5195
+#: Merge.rc:5205
msgctxt "ImgMergeFrame|LocationPane"
msgid "XOR"
msgstr ""
#. IDS_OVERLAY_MODE_ALPHA
-#: Merge.rc:5196
+#: Merge.rc:5206
msgctxt "ImgMergeFrame|LocationPane"
msgid "Alpha Blend"
msgstr ""
#. IDS_OVERLAY_MODE_ALPHA_ANIMATION
-#: Merge.rc:5197
+#: Merge.rc:5207
msgctxt "ImgMergeFrame|LocationPane"
msgid "Alpha Animation"
msgstr ""
#. IDS_ZOOM
-#: Merge.rc:5198
+#: Merge.rc:5208
msgctxt "ImgMergeFrame|LocationPane"
msgid "Zoom"
msgstr ""
#. IDS_PAGE
-#: Merge.rc:5199
+#: Merge.rc:5209
msgctxt "ImgMergeFrame|LocationPane"
msgid "Page:"
msgstr ""
#. IDS_IMGCMP_STATUS_PT_RGBA_FMT
-#: Merge.rc:5200
+#: Merge.rc:5210
#, c-format
msgid "Pt: (%d, %d) RGBA: (%d, %d, %d, %d) "
msgstr ""
#. IDS_IMGCMP_STATUS_DIST1_FMT
-#: Merge.rc:5201
+#: Merge.rc:5211
#, c-format
msgid "Dist: %g "
msgstr ""
#. IDS_IMGCMP_STATUS_DIST2_FMT
-#: Merge.rc:5202
+#: Merge.rc:5212
#, c-format
msgid "Dist: %g, %g "
msgstr ""
#. IDS_IMGCMP_STATUS_PAGE_ZOOM_SIZE_BPP_FMT
-#: Merge.rc:5203
+#: Merge.rc:5213
#, c-format
msgid "Page: %d/%d Zoom: %d%% %dx%dpx %dbpp "
msgstr ""
#. IDS_IMGCMP_STATUS_RC_FMT
-#: Merge.rc:5204
+#: Merge.rc:5214
#, c-format
msgid "Rc: (%d, %d) "
msgstr ""
#. IDS_IMGCMP_STATUS_FLIPPED_FMT
-#: Merge.rc:5205
+#: Merge.rc:5215
#, c-format
msgid "Flipped: %s "
msgstr ""
#. IDS_IMGCMP_STATUS_ROTATED_FMT
-#: Merge.rc:5206
+#: Merge.rc:5216
#, c-format
msgid "Rotated: %d "
msgstr ""
#. IDS_IMGCMP_REPORT_ALLPAGES
-#: Merge.rc:5207
+#: Merge.rc:5217
msgid "All pages"
msgstr ""
#. IDS_IGNSUB_STR1
-#: Merge.rc:5212
+#: Merge.rc:5222
msgid ""
msgstr ""
#. IDS_IGNSUB_STR2
-#: Merge.rc:5213
+#: Merge.rc:5223
msgid "No differences found to select"
msgstr ""
#. IDS_IGNSUB_STR3
-#: Merge.rc:5214
+#: Merge.rc:5224
msgid "No differences found to add as substitution filter"
msgstr ""
#. IDS_IGNSUB_STR4
-#: Merge.rc:5215
+#: Merge.rc:5225
msgid "The pair is already in the Substitution Filters list"
msgstr ""
#. IDS_IGNSUB_STR5
-#: Merge.rc:5216
+#: Merge.rc:5226
msgid "Add this change to Substitution Filters?"
msgstr ""
#. IDS_OCRRESULT_TEXTONLY
-#: Merge.rc:5221
+#: Merge.rc:5231
msgid "Text only"
msgstr ""
#. IDS_OCRRESULT_POS_LINE
-#: Merge.rc:5222
+#: Merge.rc:5232
msgid "Line-by-line position and text"
msgstr ""
#. IDS_OCRRESULT_POS_WORD
-#: Merge.rc:5223
+#: Merge.rc:5233
msgid "Word-by-word position and text"
msgstr ""
#. IDS_USERDATAFOLDER_APPDATA
-#: Merge.rc:5228
+#: Merge.rc:5238
msgid "AppData (Roaming) folder"
msgstr ""
#. IDS_USERDATAFOLDER_INSTALL
-#: Merge.rc:5229
+#: Merge.rc:5239
msgid "Install folder"
msgstr ""
#. IDS_USERDATAFOLDER_DOCUMENTS
-#: Merge.rc:5230
+#: Merge.rc:5240
msgid "Documents folder"
msgstr ""
#. IDS_SINGLEINSTANCE_DISABLED
-#: Merge.rc:5235
+#: Merge.rc:5245
msgctxt "Options dialog|General|Single instance mode"
msgid "Disabled"
msgstr ""
#. IDS_SINGLEINSTANCE_STR1
-#: Merge.rc:5236
+#: Merge.rc:5246
#, c-format
msgid "Allow only one instance to run"
msgstr "Samo jedna instanca WinMerge-a"
#. IDS_SINGLEINSTANCE_STR2
-#: Merge.rc:5237
+#: Merge.rc:5247
msgid "Allow only one instance; wait for termination"
msgstr ""
#. IDS_AUTO_RELOAD_MODIFIED_FILES_DISABLED
-#: Merge.rc:5242
+#: Merge.rc:5252
msgctxt "Options dialog|General|Auto-reload modified files"
msgid "Disabled"
msgstr ""
#. IDS_AUTO_RELOAD_MODIFIED_FILES_STR1
-#: Merge.rc:5243
+#: Merge.rc:5253
msgid "Only on window activated"
msgstr ""
#. IDS_AUTO_RELOAD_MODIFIED_FILES_STR2
-#: Merge.rc:5244
+#: Merge.rc:5254
msgid "Immediately"
msgstr ""
#. IDS_PLUGIN_ALL
-#: Merge.rc:5249
+#: Merge.rc:5259
msgid "Al&l"
msgstr ""
#. IDS_PLUGIN_OTHERS
-#: Merge.rc:5250
+#: Merge.rc:5260
msgid "&Others"
msgstr ""
-#: Merge.rc:5252
+#: Merge.rc:5262
#, c-format
msgid "Missing plugin name in pipeline: %1"
msgstr ""
-#: Merge.rc:5254
+#: Merge.rc:5264
#, c-format
msgid "Missing quote in plugin pipeline: %1"
msgstr ""
#. IDS_PLUGIN_NAME_ALREADY_EXISTS
-#: Merge.rc:5255
+#: Merge.rc:5265
#, c-format
msgid "Plugin name '%1' already exists."
msgstr ""
#. IDS_PLUGIN_TITLE1
-#: Merge.rc:5256
+#: Merge.rc:5266
msgid "Specify plugin arguments"
msgstr ""
-#: Merge.rc:5258
+#: Merge.rc:5268
#, c-format
msgid "Plugin not found or invalid: %1"
msgstr ""
#. IDS_PLUGIN_NOT_UNPACK
-#: Merge.rc:5259
+#: Merge.rc:5269
#, c-format
msgid "'%1' is not an unpacker plugin"
msgstr ""
#. IDS_PLUGIN_NOT_PREDIFF
-#: Merge.rc:5260
+#: Merge.rc:5270
#, c-format
msgid "'%1' is not a prediffer plugin"
msgstr ""
-#: Merge.rc:5262
+#: Merge.rc:5272
#, c-format
msgid "Error prediffing '%1' with '%2'. Prediffing disabled."
msgstr ""
#. IDS_PLUGIN_CIRCULAR_REFERENCE
-#: Merge.rc:5263
+#: Merge.rc:5273
#, c-format
msgid "Circular reference in plugin pipeline: %1"
msgstr ""
#. IDS_PLUGIN_TYPE1
-#: Merge.rc:5264
+#: Merge.rc:5274
msgid "URL Handler"
msgstr ""
#. IDS_PLUGIN_TYPE2
-#: Merge.rc:5265
+#: Merge.rc:5275
msgid "File Unpacker"
msgstr ""
#. IDS_PLUGIN_TYPE3
-#: Merge.rc:5266
+#: Merge.rc:5276
msgid "File or Folder Unpacker"
msgstr ""
#. IDS_PLUGIN_TYPE5
-#: Merge.rc:5268
+#: Merge.rc:5278
msgid "Alias for Unpacker"
msgstr ""
#. IDS_PLUGIN_TYPE6
-#: Merge.rc:5269
+#: Merge.rc:5279
msgid "Alias for Prediffer"
msgstr ""
#. IDS_PLUGIN_TYPE7
-#: Merge.rc:5270
+#: Merge.rc:5280
msgid "Alias for Editor script"
msgstr ""
#. IDS_PLUGIN_ALIAS_DESC
-#: Merge.rc:5271
+#: Merge.rc:5281
#, c-format
msgid "Alias for plugin pipeline '%1'"
msgstr ""
#. IDS_PLUGIN_NEW_DESC
-#: Merge.rc:5272
+#: Merge.rc:5282
msgid "New plugin description"
msgstr ""
#. IDS_PLUGIN_TARGETS_ALL
-#: Merge.rc:5273
+#: Merge.rc:5283
msgid "All"
msgstr ""
#. IDS_PLUGIN_TARGETS_1ST
-#: Merge.rc:5274
+#: Merge.rc:5284
msgid "1st"
msgstr ""
#. IDS_PLUGIN_TARGETS_2ND
-#: Merge.rc:5275
+#: Merge.rc:5285
msgid "2nd"
msgstr ""
#. IDS_PLUGIN_TARGETS_3RD
-#: Merge.rc:5276
+#: Merge.rc:5286
msgid "3rd"
msgstr ""
#. IDS_PLUGIN_TARGETS_1ST_2ND
-#: Merge.rc:5277
+#: Merge.rc:5287
msgid "1st and 2nd"
msgstr ""
#. IDS_PLUGIN_TARGETS_1ST_3RD
-#: Merge.rc:5278
+#: Merge.rc:5288
msgid "1st and 3rd"
msgstr ""
#. IDS_PLUGIN_TARGETS_2ND_3RD
-#: Merge.rc:5279
+#: Merge.rc:5289
msgid "2nd and 3rd"
msgstr ""
#. IDS_FILTER_APPLIED
-#: Merge.rc:5284
+#: Merge.rc:5294
msgid "Filter applied"
msgstr ""
#. IDS_FILTERMENU_COMPARE
-#: Merge.rc:5289
+#: Merge.rc:5299
#, c-format
msgid "Compare %1"
msgstr ""
#. IDS_FILTERMENU_FILTER_BY_THIS_COLUMN
-#: Merge.rc:5290
+#: Merge.rc:5300
msgid "&Filter by This Column"
msgstr ""
#. IDS_FILTERMENU_FILTER_BY_THIS_COLUMN2
-#: Merge.rc:5291
+#: Merge.rc:5301
msgid "&Filter by This Column..."
msgstr ""
#. IDS_CLIPBOARDHISTORY_TIME
-#: Merge.rc:5296
+#: Merge.rc:5306
#, c-format
msgid "Clipboard at %s"
msgstr ""
#. IDS_CLIPBOARDHISTORY_DISABLED
-#: Merge.rc:5297
+#: Merge.rc:5307
msgid "Clipboard history disabled.\r\nEnable: Windows logo key + V, then Turn on."
msgstr ""
-#: Merge.rc:5299
+#: Merge.rc:5309
msgid "This system does not support clipboard history."
msgstr ""
-#: Merge.rc:5301
+#: Merge.rc:5311
msgid "32-bit WinMerge does not support Clipboard Compare"
msgstr ""
#. IDS_WEBVIEW2_RUNTIME_NOT_INSTALLED
-#: Merge.rc:5306
+#: Merge.rc:5316
msgid "WebView2 runtime not installed. Download it?"
msgstr ""
#. IDS_JUMPLIST_NEW_TEXT_COMPARE
-#: Merge.rc:5311
+#: Merge.rc:5321
msgid "New Text Compare"
msgstr ""
#. IDS_JUMPLIST_NEW_TABLE_COMPARE
-#: Merge.rc:5312
+#: Merge.rc:5322
msgid "New Table Compare"
msgstr ""
#. IDS_JUMPLIST_NEW_BINARY_COMPARE
-#: Merge.rc:5313
+#: Merge.rc:5323
msgid "New Binary Compare"
msgstr ""
#. IDS_JUMPLIST_NEW_IMAGE_COMPARE
-#: Merge.rc:5314
+#: Merge.rc:5324
msgid "New Image Compare"
msgstr ""
#. IDS_JUMPLIST_NEW_WEBPAGE_COMPARE
-#: Merge.rc:5315
+#: Merge.rc:5325
msgid "New Webpage Compare"
msgstr ""
+#. IDS_JUMPLIST_NEW_FOLDER_COMPARE
+#: Merge.rc:5326
+msgid "New Folder Compare"
+msgstr ""
+
#. IDS_JUMPLIST_CLIPBOARD_COMPARE
-#: Merge.rc:5316
+#: Merge.rc:5327
msgid "Clipboard Compare"
msgstr ""
#. IDS_PREVIEWBAR_PRINT
-#: Merge.rc:5321
+#: Merge.rc:5332
msgid "&Print..."
msgstr ""
#. IDS_PREVIEWBAR_PREVPAGE
-#: Merge.rc:5323
+#: Merge.rc:5334
msgid "Pre&v Page"
msgstr ""
#. IDS_PREVIEWBAR_TWOPAGE
-#: Merge.rc:5324
+#: Merge.rc:5335
msgid "&Two Page"
msgstr ""
#. IDS_PREVIEWBAR_ONEPAGE
-#: Merge.rc:5325
+#: Merge.rc:5336
msgid "&One Page"
msgstr ""
#. IDS_PREVIEWBAR_ZOOMIN
-#: Merge.rc:5326
+#: Merge.rc:5337
msgid "Zoom &In"
msgstr ""
#. IDS_PREVIEWBAR_ZOOMOUT
-#: Merge.rc:5327
+#: Merge.rc:5338
msgid "Zoom &Out"
msgstr ""
#. IDS_WEBPAGE_COMPARING
-#: Merge.rc:5333
+#: Merge.rc:5344
msgid "Comparing..."
msgstr ""
#. IDS_WEBPAGE_ZOOM
-#: Merge.rc:5334
+#: Merge.rc:5345
msgid "Zoom:"
msgstr ""
#. IDS_COPY_GRANULARITY_DIFFHUNK
-#: Merge.rc:5339
+#: Merge.rc:5350
msgid "Diff hunk"
msgstr ""
#. IDS_COPY_GRANULARITY_INLINE
-#: Merge.rc:5340
+#: Merge.rc:5351
msgid "Inline diff"
msgstr ""
#. IDS_COPY_GRANULARITY_LINE
-#: Merge.rc:5341
+#: Merge.rc:5352
msgid "Line"
msgstr ""
-#: Merge.rc:5342
+#: Merge.rc:5353
msgid "Character"
msgstr ""
#. ID_MICE_PREVDIFF
-#: Merge.rc:5347
+#: Merge.rc:5358
msgid "\nPrevious Difference (Alt+Up)\n(Right Button+Wheel Up)\n(Alt+Wheel Up)"
msgstr ""
#. ID_MICE_NEXTDIFF
-#: Merge.rc:5348
+#: Merge.rc:5359
msgid "\nNext Difference (Alt+Down)\n(Right Button+Wheel Down)\n(Alt+Wheel Down)"
msgstr ""
#. ID_MICE_L2R
-#: Merge.rc:5349
+#: Merge.rc:5360
msgid "\nCopy to Right (Alt+Right)\n(Right Button+Wheel Right)\n(Alt+Wheel Right)\n(Alt+Shift+Wheel Down)"
msgstr ""
#. ID_MICE_R2L
-#: Merge.rc:5350
+#: Merge.rc:5361
msgid "\nCopy to Left (Alt+Left)\n(Right Button+Wheel Left)\n(Alt+Wheel Left)\n(Alt+Shift+Wheel Up)"
msgstr ""
#. ID_MICE_L2RNEXT
-#: Merge.rc:5351
+#: Merge.rc:5362
msgid "\nCopy to Right and Advance (Ctrl+Alt+Right)\n(Ctrl+Alt+Wheel Right)\n(Ctrl+Alt+Shift+Wheel Down)"
msgstr ""
#. ID_MICE_R2LNEXT
-#: Merge.rc:5352
+#: Merge.rc:5363
msgid "\nCopy to Left and Advance (Ctrl+Alt+Left)\n(Ctrl+Alt+Wheel Left)\n(Ctrl+Alt+Shift+Wheel Up)"
msgstr ""
#. IDS_LOG_COMPARING_2
-#: Merge.rc:5362
+#: Merge.rc:5373
#, c-format
msgid "Comparing %1 with %2"
msgstr ""
#. IDS_LOG_COMPARING_3
-#: Merge.rc:5363
+#: Merge.rc:5374
#, c-format
msgid "Comparing %1 with %2 and %3"
msgstr ""
#. IDS_LOG_COMPARE_COMPLETED
-#: Merge.rc:5364
+#: Merge.rc:5375
msgid "Comparison completed"
msgstr ""
#. IDS_LOG_COMPARE_ERROR_2
-#: Merge.rc:5365
+#: Merge.rc:5376
#, c-format
msgid "Failed to compare %1 with %2: "
msgstr ""
#. IDS_LOG_COMPARE_ERROR_3
-#: Merge.rc:5366
+#: Merge.rc:5377
#, c-format
msgid "Failed to compare %1 with %2 and %3: "
msgstr ""
#. IDS_LOG_FILE_SAVED
-#: Merge.rc:5367
+#: Merge.rc:5378
msgid "File saved"
msgstr ""
#. IDS_LOG_COPYING_FILES
-#: Merge.rc:5368
+#: Merge.rc:5379
msgid "Copying files..."
msgstr ""
#. IDS_LOG_MOVING_FILES
-#: Merge.rc:5369
+#: Merge.rc:5380
msgid "Moving files..."
msgstr ""
#. IDS_LOG_DELETING_FILES
-#: Merge.rc:5370
+#: Merge.rc:5381
msgid "Deleting files..."
msgstr ""
#. IDS_LOG_RECYCLEBIN
-#: Merge.rc:5371
+#: Merge.rc:5382
msgid "Recycle Bin"
msgstr ""
#. IDS_LOG_PERMANENTLY_DELETED
-#: Merge.rc:5372
+#: Merge.rc:5383
msgid "Permanently deleted"
msgstr ""
#. IDS_LOG_FILEOPERATION_COMPLETED
-#: Merge.rc:5373
+#: Merge.rc:5384
msgid "File operation completed successfully"
msgstr ""
#. IDS_LOG_FILEOPERATION_CANCELED
-#: Merge.rc:5374
+#: Merge.rc:5385
msgid "File operation canceled"
msgstr ""
#. IDS_FILTER_ERROR_NO_ERROR
-#: Merge.rc:5379
+#: Merge.rc:5390
msgid "No error"
msgstr ""
#. IDS_FILTER_ERROR_EMPTY_EXPRESSION
-#: Merge.rc:5380
+#: Merge.rc:5391
msgid "Filter expression is empty"
msgstr ""
#. IDS_FILTER_ERROR_UNKNOWN_CHAR
-#: Merge.rc:5381
+#: Merge.rc:5392
msgid "Unknown character in filter expression"
msgstr ""
#. IDS_FILTER_ERROR_UNTERMINATED_STRING
-#: Merge.rc:5382
+#: Merge.rc:5393
msgid "Unterminated string literal"
msgstr ""
#. IDS_FILTER_ERROR_SYNTAX_ERROR
-#: Merge.rc:5383
+#: Merge.rc:5394
msgid "Syntax error in filter expression"
msgstr ""
#. IDS_FILTER_ERROR_PARSE_FAILURE
-#: Merge.rc:5384
+#: Merge.rc:5395
msgid "Failed to parse filter expression"
msgstr ""
#. IDS_FILTER_ERROR_INVALID_LITERAL
-#: Merge.rc:5385
+#: Merge.rc:5396
msgid "Invalid literal value"
msgstr ""
#. IDS_FILTER_ERROR_INVALID_REGULAR_EXPRESSION
-#: Merge.rc:5386
+#: Merge.rc:5397
msgid "Invalid regular expression"
msgstr ""
#. IDS_FILTER_ERROR_UNDEFINED_IDENTIFIER
-#: Merge.rc:5387
+#: Merge.rc:5398
msgid "Undefined identifier"
msgstr ""
#. IDS_FILTER_ERROR_INVALID_ARGUMENT_COUNT
-#: Merge.rc:5388
+#: Merge.rc:5399
msgid "Invalid number of arguments"
msgstr ""
#. IDS_FILTER_ERROR_FILTER_NAME_NOT_FOUND
-#: Merge.rc:5389
+#: Merge.rc:5400
msgid "Filter name not found"
msgstr ""
#. IDS_FILTER_ERROR_DIVIDE_BY_ZERO
-#: Merge.rc:5390
+#: Merge.rc:5401
msgid "Division by zero in filter expression"
msgstr ""
#. IDS_FILTER_ERROR_UNKNOWN_ERROR
-#: Merge.rc:5391
+#: Merge.rc:5402
msgid "Unknown error"
msgstr ""
#. IDS_FILTER_ERROR_INVALID_PROPERTY_NAME
-#: Merge.rc:5392
+#: Merge.rc:5403
msgid "Invalid property name"
msgstr ""
#. IDS_FILTER_ERROR_INVALID_DIRECTIVE
-#: Merge.rc:5393
+#: Merge.rc:5404
msgid "Invalid directive"
msgstr ""
#. IDS_FILTER_OP_EQUALS
-#: Merge.rc:5398
+#: Merge.rc:5409
msgid "Equals"
msgstr ""
#. IDS_FILTER_OP_NOT_EQUALS
-#: Merge.rc:5399
+#: Merge.rc:5410
msgid "Does not equal"
msgstr ""
#. IDS_FILTER_OP_LESS_THAN
-#: Merge.rc:5400
+#: Merge.rc:5411
msgid "Less than"
msgstr ""
#. IDS_FILTER_OP_LESS_EQUAL
-#: Merge.rc:5401
+#: Merge.rc:5412
msgid "Less than or equal to"
msgstr ""
#. IDS_FILTER_OP_GREATER_EQUAL
-#: Merge.rc:5402
+#: Merge.rc:5413
msgid "Greater than or equal to"
msgstr ""
#. IDS_FILTER_OP_GREATER_THAN
-#: Merge.rc:5403
+#: Merge.rc:5414
msgid "Greater than"
msgstr ""
#. IDS_FILTER_OP_BETWEEN
-#: Merge.rc:5404
+#: Merge.rc:5415
msgid "Between"
msgstr ""
#. IDS_FILTER_OP_NOT_BETWEEN
-#: Merge.rc:5405
+#: Merge.rc:5416
msgid "Not Between"
msgstr ""
#. IDS_FILTER_OP_CONTAINS
-#: Merge.rc:5406
+#: Merge.rc:5417
msgid "Contains"
msgstr ""
#. IDS_FILTER_OP_NOT_CONTAINS
-#: Merge.rc:5407
+#: Merge.rc:5418
msgid "Not Contains"
msgstr ""
#. IDS_FILTER_OP_RECONTAINS
-#: Merge.rc:5408
+#: Merge.rc:5419
msgid "Contains (regex)"
msgstr ""
#. IDS_FILTER_OP_NOT_RECONTAINS
-#: Merge.rc:5409
+#: Merge.rc:5420
msgid "Not Contains (regex)"
msgstr ""
#. IDS_FILTER_OP_LIKE
-#: Merge.rc:5410
+#: Merge.rc:5421
msgid "Match (wildcard)"
msgstr ""
#. IDS_FILTER_OP_NOT_LIKE
-#: Merge.rc:5411
+#: Merge.rc:5422
msgid "Not match (wildcard)"
msgstr ""
#. IDS_FILTER_OP_MATCHES
-#: Merge.rc:5412
+#: Merge.rc:5423
msgid "Match (regex)"
msgstr ""
#. IDS_FILTER_OP_NOT_MATCHES
-#: Merge.rc:5413
+#: Merge.rc:5424
msgid "Not match (regex)"
msgstr ""
#. IDS_COLORMODE_LIGHT
-#: Merge.rc:5418
+#: Merge.rc:5429
msgid "Light"
msgstr ""
#. IDS_COLORMODE_DARK
-#: Merge.rc:5419
+#: Merge.rc:5430
msgid "Dark"
msgstr ""
#. IDS_COLORMODE_FOLLOWSYSTEM
-#: Merge.rc:5420
+#: Merge.rc:5431
msgid "Follow system"
msgstr ""
#. IDS_EXAMPLE
-#: Merge.rc:5425
+#: Merge.rc:5436
#, c-format
msgid "e.g. %1"
msgstr ""
#. IDS_DETECTED_PREVIOUS_CRASH
-#: Merge.rc:5430
+#: Merge.rc:5441
msgid "WinMerge detected a previous crash. Please report this if possible."
msgstr ""
#. IDS_REGEX_REPLACE_LIST_TEMPLATE
-#: Merge.rc:5435
+#: Merge.rc:5446
msgid "# Regex replacement list\r\n# Format: regexreplacement\r\n# Backreferences like $1, $2 are supported\r\n\r\n(\\d{4})-(\\d{2})-(\\d{2})\t$1_$2_$3\r\n"
msgstr ""
#. IDS_STRING_REPLACE_LIST_TEMPLATE
-#: Merge.rc:5436
+#: Merge.rc:5447
msgid "# Replacement list\r\n# Format: searchreplacement\r\n# Lines starting with # are ignored\r\n\r\nfrom1\tto1\r\nfrom2\tto2\r\n"
msgstr ""
diff --git a/Translations/WinMerge/Czech.po b/Translations/WinMerge/Czech.po
index 601d38390e1..f2624df6ad1 100644
--- a/Translations/WinMerge/Czech.po
+++ b/Translations/WinMerge/Czech.po
@@ -21,7 +21,7 @@ msgstr ""
"X-Poedit-Basepath: ../../Src/\n"
#. LANGUAGE, SUBLANGUAGE
-#: Merge.rc:26 Merge.rc:59 Merge.rc:5453
+#: Merge.rc:26 Merge.rc:59 Merge.rc:5464
#, c-format
msgid "LANG_ENGLISH, SUBLANG_ENGLISH_US"
msgstr "LANG_CZECH, SUBLANG_DEFAULT"
@@ -107,7 +107,7 @@ msgid "Copy Selected Diff (Right) to Clipboard\tCtrl+&3"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_SELECTLINEDIFF
-#: Merge.rc:110 Merge.rc:673
+#: Merge.rc:110 Merge.rc:680
#, c-format
msgid "Select Line &Difference\tF4"
msgstr "Vybrat roz&díl v řádku\tF4"
@@ -141,7 +141,7 @@ msgid "Cu&t"
msgstr "Vyj&mout"
#. IDR_POPUP_DIRVIEW
-#: Merge.rc:118 Merge.rc:943
+#: Merge.rc:118 Merge.rc:951
#, c-format
msgid "&Copy"
msgstr "&Kopírovat"
@@ -153,21 +153,21 @@ msgid "&Paste"
msgstr "&Vložit"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:121 Merge.rc:875 Merge.rc:882
+#: Merge.rc:121 Merge.rc:882 Merge.rc:889
#, c-format
msgid "&Scripts"
msgstr "Skrip&ty"
#. IDS_NO_EDIT_SCRIPTS
-#: Merge.rc:123 Merge.rc:338 Merge.rc:447 Merge.rc:654 Merge.rc:659
-#: Merge.rc:865 Merge.rc:877 Merge.rc:884 Merge.rc:940 Merge.rc:1183
-#: Merge.rc:5028
+#: Merge.rc:123 Merge.rc:340 Merge.rc:451 Merge.rc:661 Merge.rc:666
+#: Merge.rc:872 Merge.rc:884 Merge.rc:891 Merge.rc:948 Merge.rc:1193
+#: Merge.rc:5038
#, c-format
msgid "< Empty >"
msgstr "< žádné >"
#. IDR_POPUP_LOCATIONBAR, ID_EDIT_WMGOTO
-#: Merge.rc:126 Merge.rc:691 Merge.rc:1081
+#: Merge.rc:126 Merge.rc:698 Merge.rc:1089
msgid "&Go to...\tCtrl+G"
msgstr "Př&ejít na...\tCtrl+G"
@@ -188,27 +188,27 @@ msgid "Op&en"
msgstr "&Otevřít"
#. IDR_POPUP_DIRVIEW, ID_DIR_OPEN_RIGHT
-#: Merge.rc:132 Merge.rc:981 Merge.rc:988 Merge.rc:995
+#: Merge.rc:132 Merge.rc:989 Merge.rc:996 Merge.rc:1003
msgid "With &Registered Application"
msgstr "Přidruženou &aplikací"
#. IDR_POPUP_DIRVIEW, ID_DIR_OPEN_RIGHT_WITHEDITOR
-#: Merge.rc:133 Merge.rc:982 Merge.rc:989 Merge.rc:996
+#: Merge.rc:133 Merge.rc:990 Merge.rc:997 Merge.rc:1004
msgid "With &External Editor\tCtrl+Alt+E"
msgstr "Externím &editorem\tCtrl+Alt+E"
#. IDR_POPUP_DIRVIEW, ID_DIR_OPEN_RIGHT_WITH
-#: Merge.rc:134 Merge.rc:983 Merge.rc:990 Merge.rc:997
+#: Merge.rc:134 Merge.rc:991 Merge.rc:998 Merge.rc:1005
msgid "&With..."
msgstr "&Zvolit..."
#. IDR_POPUP_DIRVIEW, ID_DIR_OPEN_RIGHT_PARENT_FOLDER
-#: Merge.rc:135 Merge.rc:984 Merge.rc:991 Merge.rc:998
+#: Merge.rc:135 Merge.rc:992 Merge.rc:999 Merge.rc:1006
msgid "Open &Parent Folder..."
msgstr ""
#. IDR_POPUP_IMG_CTXT, ID_FILE_SHELLMENU
-#: Merge.rc:137 Merge.rc:1239
+#: Merge.rc:137 Merge.rc:1249
msgid "S&hell Menu"
msgstr ""
@@ -246,8 +246,8 @@ msgid "Ins&ertion/Deletion Detection"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_TOOLBAR_NONE
-#: Merge.rc:176 Merge.rc:209 Merge.rc:216 Merge.rc:358 Merge.rc:507
-#: Merge.rc:751
+#: Merge.rc:176 Merge.rc:209 Merge.rc:216 Merge.rc:360 Merge.rc:511
+#: Merge.rc:758
#, c-format
msgid "&None"
msgstr "&Skrýt"
@@ -263,13 +263,13 @@ msgid "&Horizontal"
msgstr ""
#. IDR_POPUP_IMG_CTXT, ID_IMG_CURPANE_PREVPAGE
-#: Merge.rc:181 Merge.rc:189 Merge.rc:1230
+#: Merge.rc:181 Merge.rc:189 Merge.rc:1240
#, c-format
msgid "&Previous Page"
msgstr ""
#. IDS_PREVIEWBAR_NEXTPAGE
-#: Merge.rc:182 Merge.rc:190 Merge.rc:1231 Merge.rc:5322
+#: Merge.rc:182 Merge.rc:190 Merge.rc:1241 Merge.rc:5333
#, c-format
msgid "&Next Page"
msgstr ""
@@ -281,45 +281,45 @@ msgid "&Active Pane"
msgstr ""
#. IDR_POPUP_IMG_CTXT, ID_IMG_CURPANE_ROTATE_RIGHT_90
-#: Merge.rc:185 Merge.rc:1225
+#: Merge.rc:185 Merge.rc:1235
msgid "Rotate &Right 90deg"
msgstr ""
#. IDR_POPUP_IMG_CTXT, ID_IMG_CURPANE_ROTATE_LEFT_90
-#: Merge.rc:186 Merge.rc:1226
+#: Merge.rc:186 Merge.rc:1236
msgid "Rotate &Left 90deg"
msgstr ""
#. IDR_POPUP_IMG_CTXT, ID_IMG_CURPANE_FLIP_VERTICALLY
-#: Merge.rc:187 Merge.rc:1227
+#: Merge.rc:187 Merge.rc:1237
msgid "Flip V&ertically"
msgstr ""
#. IDR_POPUP_IMG_CTXT, ID_IMG_CURPANE_FLIP_HORIZONTALLY
-#: Merge.rc:188 Merge.rc:1228
+#: Merge.rc:188 Merge.rc:1238
msgid "Flip H&orizontally"
msgstr ""
#. IDR_MERGEDOCTYPE
-#: Merge.rc:193 Merge.rc:699
+#: Merge.rc:193 Merge.rc:706
#, c-format
msgid "&Zoom"
msgstr "&Velikost písma"
#. IDR_MERGEDOCTYPE, ID_VIEW_ZOOMIN
-#: Merge.rc:202 Merge.rc:701
+#: Merge.rc:202 Merge.rc:708
#, c-format
msgid "Zoom &In\tCtrl++"
msgstr "Z&většit\tCtrl++"
#. IDR_MERGEDOCTYPE, ID_VIEW_ZOOMOUT
-#: Merge.rc:203 Merge.rc:702
+#: Merge.rc:203 Merge.rc:709
#, c-format
msgid "Zoom &Out\tCtrl+-"
msgstr "Z&menšit\tCtrl+-"
#. IDR_MERGEDOCTYPE, ID_VIEW_ZOOMNORMAL, Zoom to normal
-#: Merge.rc:205 Merge.rc:704
+#: Merge.rc:205 Merge.rc:711
#, c-format
msgid "&Normal\tCtrl+*"
msgstr "&Normální\tCtrl+*"
@@ -349,29 +349,29 @@ msgid "Dragging &Mode"
msgstr ""
#. IDR_POPUP_IMG_CTXT, ID_IMG_DRAGGINGMODE_MOVE
-#: Merge.rc:217 Merge.rc:955 Merge.rc:1233
+#: Merge.rc:217 Merge.rc:963 Merge.rc:1243
#, c-format
msgid "&Move"
msgstr "Př&esunout"
#. IDR_POPUP_IMG_CTXT, ID_IMG_DRAGGINGMODE_ADJUST_OFFSET
-#: Merge.rc:218 Merge.rc:1234
+#: Merge.rc:218 Merge.rc:1244
#, c-format
msgid "&Adjust Offset"
msgstr ""
#. IDR_POPUP_IMG_CTXT, ID_IMG_DRAGGINGMODE_VERTICAL_WIPE
-#: Merge.rc:219 Merge.rc:1235
+#: Merge.rc:219 Merge.rc:1245
msgid "&Vertical Wipe"
msgstr ""
#. IDR_POPUP_IMG_CTXT, ID_IMG_DRAGGINGMODE_HORIZONTAL_WIPE
-#: Merge.rc:220 Merge.rc:1236
+#: Merge.rc:220 Merge.rc:1246
msgid "&Horizontal Wipe"
msgstr ""
#. IDR_POPUP_IMG_CTXT, ID_IMG_DRAGGINGMODE_RECTANGLE_SELECT
-#: Merge.rc:221 Merge.rc:1237
+#: Merge.rc:221 Merge.rc:1247
msgid "Rectangle &Select"
msgstr ""
@@ -407,37 +407,37 @@ msgid "Compare Extracted &Text from Images"
msgstr ""
#. IDD_OPEN, IDOK
-#: Merge.rc:272 Merge.rc:1980
+#: Merge.rc:272 Merge.rc:1990
msgid "Co&mpare"
msgstr ""
#. IDR_POPUP_WEBPAGE_COMPARE, ID_WEB_COMPARE_SCREENSHOTS
-#: Merge.rc:274 Merge.rc:1247
+#: Merge.rc:274 Merge.rc:1257
msgid "&Screenshots"
msgstr ""
#. IDR_POPUP_WEBPAGE_COMPARE, ID_WEB_COMPARE_FULLSIZE_SCREENSHOTS
-#: Merge.rc:275 Merge.rc:1248
+#: Merge.rc:275 Merge.rc:1258
msgid "&Full Size Screenshots"
msgstr ""
#. IDR_POPUP_WEBPAGE_COMPARE, ID_WEB_COMPARE_HTMLS
-#: Merge.rc:276 Merge.rc:1249
+#: Merge.rc:276 Merge.rc:1259
msgid "&HTMLs"
msgstr ""
#. IDR_POPUP_WEBPAGE_COMPARE, ID_WEB_COMPARE_TEXTS
-#: Merge.rc:277 Merge.rc:1250
+#: Merge.rc:277 Merge.rc:1260
msgid "&Texts"
msgstr ""
#. IDR_POPUP_WEBPAGE_COMPARE, ID_WEB_COMPARE_RESOURCETREES
-#: Merge.rc:278 Merge.rc:1251
+#: Merge.rc:278 Merge.rc:1261
msgid "&Resource Trees"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_SIZE
-#: Merge.rc:280 Merge.rc:1775
+#: Merge.rc:280 Merge.rc:1785
msgid "&Size"
msgstr ""
@@ -452,27 +452,27 @@ msgid "&Event Sync"
msgstr ""
#. IDR_POPUP_WEBPAGE_SYNC_EVENTS, ID_WEB_SYNC_ENABLED
-#: Merge.rc:291 Merge.rc:1259
+#: Merge.rc:291 Merge.rc:1269
msgid "&Enabled"
msgstr ""
#. IDR_POPUP_WEBPAGE_SYNC_EVENTS, ID_WEB_SYNC_SCROLL
-#: Merge.rc:293 Merge.rc:1261
+#: Merge.rc:293 Merge.rc:1271
msgid "&Scroll"
msgstr ""
#. IDR_POPUP_WEBPAGE_SYNC_EVENTS, ID_WEB_SYNC_CLICK
-#: Merge.rc:294 Merge.rc:1262
+#: Merge.rc:294 Merge.rc:1272
msgid "&Click"
msgstr ""
#. IDR_POPUP_WEBPAGE_SYNC_EVENTS, ID_WEB_SYNC_INPUT
-#: Merge.rc:295 Merge.rc:1263
+#: Merge.rc:295 Merge.rc:1273
msgid "&Input"
msgstr ""
#. IDR_POPUP_WEBPAGE_SYNC_EVENTS, ID_WEB_SYNC_GOBACKFORWARD
-#: Merge.rc:296 Merge.rc:1264
+#: Merge.rc:296 Merge.rc:1274
msgid "&Go Back/Forward"
msgstr ""
@@ -502,5072 +502,5083 @@ msgid "&All Profiles"
msgstr ""
#. IDR_MERGEDOCTYPE
-#: Merge.rc:310 Merge.rc:411 Merge.rc:586
+#: Merge.rc:310 Merge.rc:413 Merge.rc:590
#, c-format
msgid "&File"
msgstr "&Soubor"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:312 Merge.rc:413 Merge.rc:588
+#: Merge.rc:312 Merge.rc:415 Merge.rc:592
#, c-format
msgid "&New"
msgstr "&Nové"
#. IDR_POPUP_COMPARE, ID_MERGE_COMPARE_TEXT
-#: Merge.rc:314 Merge.rc:322 Merge.rc:415 Merge.rc:423 Merge.rc:590
-#: Merge.rc:598 Merge.rc:649 Merge.rc:935 Merge.rc:1159 Merge.rc:1171
+#: Merge.rc:314 Merge.rc:323 Merge.rc:417 Merge.rc:426 Merge.rc:594
+#: Merge.rc:603 Merge.rc:655 Merge.rc:942 Merge.rc:1167 Merge.rc:1180
#, c-format
msgid "&Text"
msgstr ""
#. IDR_POPUP_COMPARE, ID_MERGE_COMPARE_TABLE
-#: Merge.rc:315 Merge.rc:323 Merge.rc:416 Merge.rc:424 Merge.rc:591
-#: Merge.rc:599 Merge.rc:650 Merge.rc:936 Merge.rc:1160 Merge.rc:1172
+#: Merge.rc:315 Merge.rc:324 Merge.rc:418 Merge.rc:427 Merge.rc:595
+#: Merge.rc:604 Merge.rc:656 Merge.rc:943 Merge.rc:1168 Merge.rc:1181
msgid "T&able"
msgstr ""
#. IDR_POPUP_COMPARE, ID_MERGE_COMPARE_HEX
-#: Merge.rc:316 Merge.rc:324 Merge.rc:417 Merge.rc:425 Merge.rc:592
-#: Merge.rc:600 Merge.rc:651 Merge.rc:937 Merge.rc:1161 Merge.rc:1173
+#: Merge.rc:316 Merge.rc:325 Merge.rc:419 Merge.rc:428 Merge.rc:596
+#: Merge.rc:605 Merge.rc:657 Merge.rc:944 Merge.rc:1169 Merge.rc:1182
#, c-format
msgid "&Binary"
msgstr ""
#. IDS_IMAGE_MENU
-#: Merge.rc:317 Merge.rc:325 Merge.rc:418 Merge.rc:426 Merge.rc:593
-#: Merge.rc:601 Merge.rc:652 Merge.rc:938 Merge.rc:1162 Merge.rc:1174
-#: Merge.rc:5123
+#: Merge.rc:317 Merge.rc:326 Merge.rc:420 Merge.rc:429 Merge.rc:597
+#: Merge.rc:606 Merge.rc:658 Merge.rc:945 Merge.rc:1170 Merge.rc:1183
+#: Merge.rc:5133
#, c-format
msgid "&Image"
msgstr ""
#. IDR_POPUP_COMPARE, ID_MERGE_COMPARE_WEBPAGE
-#: Merge.rc:318 Merge.rc:326 Merge.rc:419 Merge.rc:427 Merge.rc:594
-#: Merge.rc:602 Merge.rc:653 Merge.rc:939 Merge.rc:1163 Merge.rc:1175
+#: Merge.rc:318 Merge.rc:327 Merge.rc:421 Merge.rc:430 Merge.rc:598
+#: Merge.rc:607 Merge.rc:659 Merge.rc:946 Merge.rc:1171 Merge.rc:1184
msgid "&Webpage"
msgstr ""
+#. IDR_POPUP_NEW, ID_FILE_NEW_FOLDER
+#: Merge.rc:319 Merge.rc:328 Merge.rc:422 Merge.rc:431 Merge.rc:599
+#: Merge.rc:608 Merge.rc:1172
+msgid "&Folder"
+msgstr ""
+
#. IDR_MERGEDOCTYPE
-#: Merge.rc:320 Merge.rc:421 Merge.rc:596
+#: Merge.rc:321 Merge.rc:424 Merge.rc:601
#, c-format
msgid "New (&3 panes)"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_FILE_OPEN
-#: Merge.rc:328 Merge.rc:429 Merge.rc:604
+#: Merge.rc:330 Merge.rc:433 Merge.rc:610
#, c-format
msgid "&Open...\tCtrl+O"
msgstr "&Otevřít...\tCtrl+O"
#. IDR_MERGEDOCTYPE, ID_FILE_OPENCONFLICT
-#: Merge.rc:329 Merge.rc:430 Merge.rc:605
+#: Merge.rc:331 Merge.rc:434 Merge.rc:611
msgid "Open Conflic&t File..."
msgstr ""
#. IDR_MERGEDOCTYPE, ID_FILE_OPENCLIPBOARD
-#: Merge.rc:330 Merge.rc:431 Merge.rc:606
+#: Merge.rc:332 Merge.rc:435 Merge.rc:612
msgid "Open C&lipboard"
msgstr ""
#. IDR_POPUP_PROJECT, ID_FILE_OPENPROJECT
-#: Merge.rc:332 Merge.rc:433 Merge.rc:608 Merge.rc:1191
+#: Merge.rc:334 Merge.rc:437 Merge.rc:614 Merge.rc:1201
#, c-format
msgid "Open Pro&ject...\tCtrl+J"
msgstr "Otevřít pro&jekt...\tCtrl+J"
#. IDD_OPEN, ID_SAVE_PROJECT
-#: Merge.rc:333 Merge.rc:434 Merge.rc:609 Merge.rc:1193 Merge.rc:1979
+#: Merge.rc:335 Merge.rc:438 Merge.rc:615 Merge.rc:1203 Merge.rc:1989
#, c-format
msgid "Sa&ve Project..."
msgstr "Uložit &projekt..."
#. IDR_MAINFRAME, ID_FILE_PROJECT_MRU_FIRST
-#: Merge.rc:335
+#: Merge.rc:337
#, c-format
msgid "Recent Projects"
msgstr "Naposledy použité"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:336 Merge.rc:445 Merge.rc:657
+#: Merge.rc:338 Merge.rc:449 Merge.rc:664
#, c-format
msgid "Recent F&iles or Folders"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_APP_EXIT
-#: Merge.rc:341 Merge.rc:450 Merge.rc:662
+#: Merge.rc:343 Merge.rc:454 Merge.rc:669
msgid "E&xit\tCtrl+Q"
msgstr "&Konec\tCtrl+Q"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:343 Merge.rc:452 Merge.rc:664
+#: Merge.rc:345 Merge.rc:456 Merge.rc:671
#, c-format
msgid "&Edit"
msgstr "Úpr&avy"
#. IDR_MERGEDOCTYPE, ID_EDIT_PASTE
-#: Merge.rc:345 Merge.rc:671
+#: Merge.rc:347 Merge.rc:678
#, c-format
msgid "&Paste\tCtrl+V"
msgstr "&Vložit\tCtrl+V"
#. IDR_MERGEDOCTYPE, ID_OPTIONS
-#: Merge.rc:347 Merge.rc:456 Merge.rc:693
+#: Merge.rc:349 Merge.rc:460 Merge.rc:700
#, c-format
msgid "&Options...\tCtrl+,"
msgstr "Možnost&i...\tCtrl+,"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:349 Merge.rc:458 Merge.rc:695
+#: Merge.rc:351 Merge.rc:462 Merge.rc:702
#, c-format
msgid "&View"
msgstr "&Zobrazit"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:351 Merge.rc:500 Merge.rc:744
+#: Merge.rc:353 Merge.rc:504 Merge.rc:751
#, c-format
msgid "Ta&b Bar"
msgstr "Panel &záložek"
#. IDR_MERGEDOCTYPE, ID_VIEW_TAB_BAR
-#: Merge.rc:353 Merge.rc:502 Merge.rc:746
+#: Merge.rc:355 Merge.rc:506 Merge.rc:753
msgid "&View Tab Bar"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_VIEW_TAB_BAR_ON_TITLE_BAR
-#: Merge.rc:354 Merge.rc:503 Merge.rc:747
+#: Merge.rc:356 Merge.rc:507 Merge.rc:754
msgid "&On Title Bar"
msgstr ""
#. IDR_MERGEDOCTYPE
-#: Merge.rc:356 Merge.rc:505 Merge.rc:749
+#: Merge.rc:358 Merge.rc:509 Merge.rc:756
#, c-format
msgid "&Toolbar"
msgstr "Panel &nástrojů"
#. IDR_MERGEDOCTYPE, ID_TOOLBAR_SMALL
-#: Merge.rc:359 Merge.rc:508 Merge.rc:752
+#: Merge.rc:361 Merge.rc:512 Merge.rc:759
#, c-format
msgid "&Small"
msgstr "&Malý"
#. IDR_MERGEDOCTYPE, ID_TOOLBAR_MEDIUM
-#: Merge.rc:360 Merge.rc:509 Merge.rc:753
+#: Merge.rc:362 Merge.rc:513 Merge.rc:760
msgid "&Medium"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_TOOLBAR_BIG
-#: Merge.rc:361 Merge.rc:510 Merge.rc:754
+#: Merge.rc:363 Merge.rc:514 Merge.rc:761
#, c-format
msgid "&Big"
msgstr "&Velký"
#. IDR_MERGEDOCTYPE, ID_TOOLBAR_HUGE
-#: Merge.rc:362 Merge.rc:511 Merge.rc:755
+#: Merge.rc:364 Merge.rc:515 Merge.rc:762
#, c-format
msgid "&Huge"
msgstr ""
#. IDS_VIEW_MENU_BAR
-#: Merge.rc:364 Merge.rc:513 Merge.rc:757 Merge.rc:5357
+#: Merge.rc:366 Merge.rc:517 Merge.rc:764 Merge.rc:5368
msgid "Men&u Bar"
msgstr ""
#. IDR_DIRDOCTYPE, ID_VIEW_OUTPUT_BAR
-#: Merge.rc:365 Merge.rc:515
+#: Merge.rc:367 Merge.rc:519
msgid "&Output Pane"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_VIEW_STATUS_BAR
-#: Merge.rc:366 Merge.rc:516 Merge.rc:758
+#: Merge.rc:368 Merge.rc:520 Merge.rc:765
#, c-format
msgid "&Status Bar"
msgstr "&Stavový řádek"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:368 Merge.rc:539 Merge.rc:847
+#: Merge.rc:370 Merge.rc:543 Merge.rc:854
#, c-format
msgid "&Tools"
msgstr "&Nástroje"
#. IDR_MERGEDOCTYPE, ID_TOOLS_FILTERS
-#: Merge.rc:370 Merge.rc:542 Merge.rc:849
+#: Merge.rc:372 Merge.rc:546 Merge.rc:856
#, c-format
msgid "&Filters..."
msgstr "&Filtry..."
#. IDR_MERGEDOCTYPE, ID_TOOLS_GENERATEPATCH
-#: Merge.rc:371 Merge.rc:543 Merge.rc:850
+#: Merge.rc:373 Merge.rc:547 Merge.rc:857
#, c-format
msgid "&Generate Patch..."
msgstr "&Opravný soubor..."
#. IDR_MERGEDOCTYPE
-#: Merge.rc:373 Merge.rc:546 Merge.rc:853
+#: Merge.rc:375 Merge.rc:550 Merge.rc:860
#, c-format
msgid "&Plugins"
msgstr "&Pluginy"
#. IDD_PLUGINS_LIST, IDC_PLUGIN_SETTINGS
-#: Merge.rc:375 Merge.rc:548 Merge.rc:855 Merge.rc:2494 Merge.rc:2926
+#: Merge.rc:377 Merge.rc:552 Merge.rc:862 Merge.rc:2504 Merge.rc:2936
#, c-format
msgid "P&lugin Settings..."
msgstr ""
#. IDR_MERGEDOCTYPE, ID_PREDIFFER_MANUAL
-#: Merge.rc:377 Merge.rc:550 Merge.rc:857
+#: Merge.rc:379 Merge.rc:554 Merge.rc:864
#, c-format
msgid "Ma&nual Prediffer"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_PREDIFFER_AUTO
-#: Merge.rc:378 Merge.rc:551 Merge.rc:858
+#: Merge.rc:380 Merge.rc:555 Merge.rc:865
#, c-format
msgid "A&utomatic Prediffer"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_UNPACK_MANUAL
-#: Merge.rc:380 Merge.rc:553 Merge.rc:860
+#: Merge.rc:382 Merge.rc:557 Merge.rc:867
#, c-format
msgid "&Manual Unpacking"
msgstr "Převádět &ručně"
#. IDR_MERGEDOCTYPE, ID_UNPACK_AUTO
-#: Merge.rc:381 Merge.rc:554 Merge.rc:861
+#: Merge.rc:383 Merge.rc:558 Merge.rc:868
#, c-format
msgid "&Automatic Unpacking"
msgstr "Převádět &automaticky"
#. IDR_MERGEDOCTYPE, ID_RELOAD_PLUGINS
-#: Merge.rc:383 Merge.rc:558 Merge.rc:889
+#: Merge.rc:385 Merge.rc:562 Merge.rc:896
#, c-format
msgid "&Reload Plugins"
msgstr "Znovu &načíst"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:385 Merge.rc:560 Merge.rc:891
+#: Merge.rc:387 Merge.rc:564 Merge.rc:898
#, c-format
msgid "&Window"
msgstr "&Okno"
#. IDR_MERGEDOCTYPE, ID_FILE_CLOSE
-#: Merge.rc:387 Merge.rc:562 Merge.rc:893
+#: Merge.rc:389 Merge.rc:566 Merge.rc:900
msgid "Cl&ose\tCtrl+W"
msgstr "&Zavřít\tCtrl+W"
#. IDR_MERGEDOCTYPE, ID_WINDOW_CLOSEALL
-#: Merge.rc:388 Merge.rc:563 Merge.rc:894
+#: Merge.rc:390 Merge.rc:567 Merge.rc:901
#, c-format
msgid "Clo&se All"
msgstr "Z&avřít vše"
#. IDR_MERGEDOCTYPE, ID_NEXT_PANE
-#: Merge.rc:390 Merge.rc:565 Merge.rc:896
+#: Merge.rc:392 Merge.rc:569 Merge.rc:903
#, c-format
msgid "Change &Pane\tF6"
msgstr "Z&měnit panel\tF6"
#. IDR_MERGEDOCTYPE, ID_WINDOW_TILE_HORZ
-#: Merge.rc:392 Merge.rc:567 Merge.rc:900
+#: Merge.rc:394 Merge.rc:571 Merge.rc:907
#, c-format
msgid "Tile &Horizontally"
msgstr "Vedle sebe &vodorovně"
#. IDR_MERGEDOCTYPE, ID_WINDOW_TILE_VERT
-#: Merge.rc:393 Merge.rc:568 Merge.rc:901
+#: Merge.rc:395 Merge.rc:572 Merge.rc:908
#, c-format
msgid "Tile &Vertically"
msgstr "Vedle sebe &svisle"
#. IDR_MERGEDOCTYPE, ID_WINDOW_CASCADE
-#: Merge.rc:394 Merge.rc:569 Merge.rc:902
+#: Merge.rc:396 Merge.rc:573 Merge.rc:909
#, c-format
msgid "&Cascade"
msgstr "&Na sebe"
#. IDS_MESSAGEBOX_HELP
-#: Merge.rc:396 Merge.rc:571 Merge.rc:904 Merge.rc:3200 Merge.rc:4189
+#: Merge.rc:398 Merge.rc:575 Merge.rc:911 Merge.rc:3210 Merge.rc:4199
#, c-format
msgid "&Help"
msgstr "Nápo&věda"
#. IDR_MERGEDOCTYPE, ID_HELP_CONTENTS
-#: Merge.rc:398 Merge.rc:573 Merge.rc:906
+#: Merge.rc:400 Merge.rc:577 Merge.rc:913
#, c-format
msgid "&WinMerge Help\tF1"
msgstr "&Obsah a rejstřík\tF1"
#. IDR_MERGEDOCTYPE, ID_HELP_RELEASENOTES
-#: Merge.rc:400 Merge.rc:575 Merge.rc:908
+#: Merge.rc:402 Merge.rc:579 Merge.rc:915
#, c-format
msgid "R&elease Notes"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_HELP_TRANSLATIONS
-#: Merge.rc:401 Merge.rc:576 Merge.rc:909
+#: Merge.rc:403 Merge.rc:580 Merge.rc:916
#, c-format
msgid "&Translations"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_HELP_GETCONFIG
-#: Merge.rc:402 Merge.rc:577 Merge.rc:910
+#: Merge.rc:404 Merge.rc:581 Merge.rc:917
#, c-format
msgid "C&onfiguration"
msgstr "&Nastavení"
#. IDR_MERGEDOCTYPE, ID_HELP_GNULICENSE
-#: Merge.rc:404 Merge.rc:579 Merge.rc:912
+#: Merge.rc:406 Merge.rc:583 Merge.rc:919
#, c-format
msgid "&GNU General Public License"
msgstr "Obecná veřejná licence &GNU"
#. IDR_MERGEDOCTYPE, ID_APP_ABOUT
-#: Merge.rc:405 Merge.rc:580 Merge.rc:913
+#: Merge.rc:407 Merge.rc:584 Merge.rc:920
#, c-format
msgid "&About WinMerge..."
msgstr "O &aplikaci WinMerge..."
#. IDR_MERGEDOCTYPE
-#: Merge.rc:436 Merge.rc:629
+#: Merge.rc:440 Merge.rc:635
#, c-format
msgid "&Read-Only"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_FILE_LEFT_READONLY
-#: Merge.rc:438 Merge.rc:631
+#: Merge.rc:442 Merge.rc:637
#, c-format
msgid "L&eft Read-Only"
msgstr "L&evý pouze pro čtení"
#. IDR_MERGEDOCTYPE, ID_FILE_MIDDLE_READONLY
-#: Merge.rc:439 Merge.rc:632
+#: Merge.rc:443 Merge.rc:638
#, c-format
msgid "M&iddle Read-Only"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_FILE_RIGHT_READONLY
-#: Merge.rc:440 Merge.rc:633
+#: Merge.rc:444 Merge.rc:639
#, c-format
msgid "Ri&ght Read-Only"
msgstr "Pr&avý pouze pro čtení"
#. IDD_ENCODINGERROR, IDC_FILEENCODING
-#: Merge.rc:443 Merge.rc:646 Merge.rc:1038 Merge.rc:3063
+#: Merge.rc:447 Merge.rc:652 Merge.rc:1046 Merge.rc:3073
#, c-format
msgid "&File Encoding..."
msgstr "Kódo&vání souborů"
#. IDR_POPUP_OUTPUTVIEW, ID_EDIT_SELECT_ALL
-#: Merge.rc:454 Merge.rc:674 Merge.rc:1343
+#: Merge.rc:458 Merge.rc:681 Merge.rc:1353
#, c-format
msgid "Select &All\tCtrl+A"
msgstr "Vybr&at vše\tCtrl+A"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWIDENTICAL
-#: Merge.rc:460
+#: Merge.rc:464
#, c-format
msgid "Show &Identical Items"
msgstr "Ukázat s&hodné položky"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWDIFFERENT
-#: Merge.rc:461
+#: Merge.rc:465
#, c-format
msgid "Show &Different Items"
msgstr "Ukázat roz&dílné položky"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWUNIQUELEFT
-#: Merge.rc:462
+#: Merge.rc:466
#, c-format
msgid "Show L&eft Unique Items"
msgstr "Ukázat &levé jedinečné položky"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWUNIQUEMIDDLE
-#: Merge.rc:463
+#: Merge.rc:467
#, c-format
msgid "Show Midd&le Unique Items"
msgstr ""
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWUNIQUERIGHT
-#: Merge.rc:464
+#: Merge.rc:468
#, c-format
msgid "Show Ri&ght Unique Items"
msgstr "Ukázat p&ravé jedinečné položky"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWSKIPPED
-#: Merge.rc:465
+#: Merge.rc:469
#, c-format
msgid "Show S&kipped Items"
msgstr "Ukázat př&eskočené položky"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWBINARIES
-#: Merge.rc:466
+#: Merge.rc:470
#, c-format
msgid "S&how Binary Files"
msgstr "Ukázat &binární soubory"
#. IDR_DIRDOCTYPE
-#: Merge.rc:467
+#: Merge.rc:471
#, c-format
msgid "&3-way Compare"
msgstr ""
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWDIFFERENTLEFTONLY
-#: Merge.rc:469
+#: Merge.rc:473
#, c-format
msgid "Show &Left Only Different Items"
msgstr ""
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWDIFFERENTMIDDLEONLY
-#: Merge.rc:470
+#: Merge.rc:474
#, c-format
msgid "Show &Middle Only Different Items"
msgstr ""
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWDIFFERENTRIGHTONLY
-#: Merge.rc:471
+#: Merge.rc:475
#, c-format
msgid "Show &Right Only Different Items"
msgstr ""
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWMISSINGLEFTONLY
-#: Merge.rc:473
+#: Merge.rc:477
msgid "Show L&eft Only Missing Items"
msgstr ""
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWMISSINGMIDDLEONLY
-#: Merge.rc:474
+#: Merge.rc:478
msgid "Show Mi&ddle Only Missing Items"
msgstr ""
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWMISSINGRIGHTONLY
-#: Merge.rc:475
+#: Merge.rc:479
msgid "Show Rig&ht Only Missing Items"
msgstr ""
#. IDR_DIRDOCTYPE, ID_VIEW_SHOWHIDDENITEMS
-#: Merge.rc:478
+#: Merge.rc:482
#, c-format
msgid "Show Hidd&en Items"
msgstr "Ukázat s&kryté položky"
#. IDR_DIRDOCTYPE, ID_VIEW_TREEMODE
-#: Merge.rc:480
+#: Merge.rc:484
#, c-format
msgid "Tree &Mode"
msgstr "Stro&mová struktura"
#. IDR_DIRDOCTYPE
-#: Merge.rc:481
+#: Merge.rc:485
msgid "E&xpand Subfolders"
msgstr ""
#. IDR_DIRDOCTYPE, ID_VIEW_EXPAND_ALLSUBDIRS
-#: Merge.rc:483
+#: Merge.rc:487
msgid "&All Subfolders"
msgstr ""
#. IDR_DIRDOCTYPE, ID_VIEW_EXPAND_DIFFERENT_SUBDIRS
-#: Merge.rc:484
+#: Merge.rc:488
msgid "&Different Subfolders"
msgstr ""
#. IDR_DIRDOCTYPE, ID_VIEW_EXPAND_IDENTICAL_SUBDIRS
-#: Merge.rc:485
+#: Merge.rc:489
msgid "&Identical Subfolders"
msgstr ""
#. IDR_DIRDOCTYPE, ID_VIEW_COLLAPSE_ALLSUBDIRS
-#: Merge.rc:487
+#: Merge.rc:491
#, c-format
msgid "&Collapse All Subfolders"
msgstr "Sbali&t všechny podsložky"
#. IDR_DIRDOCTYPE, ID_VIEW_SHOW_EMPTY_FOLDERS
-#: Merge.rc:488
+#: Merge.rc:492
msgid "Show &Empty Folders"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_VIEW_SELECTFONT
-#: Merge.rc:490 Merge.rc:697
+#: Merge.rc:494 Merge.rc:704
#, c-format
msgid "Select &Font..."
msgstr "Vybrat písmo..."
#. IDR_MERGEDOCTYPE, ID_VIEW_USEDEFAULTFONT
-#: Merge.rc:491 Merge.rc:698
+#: Merge.rc:495 Merge.rc:705
#, c-format
msgid "Use Default Font"
msgstr "Použít výchozí písmo"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:493 Merge.rc:736
+#: Merge.rc:497 Merge.rc:743
#, c-format
msgid "Sw&ap Panes"
msgstr "Z&aměnit panely"
#. IDR_MERGEDOCTYPE, ID_SWAPPANES_SWAP12
-#: Merge.rc:495 Merge.rc:738
+#: Merge.rc:499 Merge.rc:745
msgid "Swap &1st | 2nd"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_SWAPPANES_SWAP23
-#: Merge.rc:496 Merge.rc:739
+#: Merge.rc:500 Merge.rc:746
msgid "Swap &2nd | 3rd"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_SWAPPANES_SWAP13
-#: Merge.rc:497 Merge.rc:740
+#: Merge.rc:501 Merge.rc:747
msgid "Swap 1st | &3rd"
msgstr ""
#. IDR_DIRDOCTYPE, ID_VIEW_DISPLAY_FILTER_BAR_MENU
-#: Merge.rc:514
+#: Merge.rc:518
msgid "Displa&y Filter Bar\tCtrl+Shift+L"
msgstr ""
#. IDR_DIRDOCTYPE, ID_VIEW_DIR_STATISTICS
-#: Merge.rc:518
+#: Merge.rc:522
#, c-format
msgid "Com&pare Statistics..."
msgstr "St&atistika porovnání..."
#. IDR_MERGEDOCTYPE, ID_REFRESH
-#: Merge.rc:520 Merge.rc:763
+#: Merge.rc:524 Merge.rc:770
#, c-format
msgid "Refresh\tF5"
msgstr "&Obnovit\tF5"
#. IDR_POPUP_DIRVIEW, ID_RESCAN
-#: Merge.rc:521 Merge.rc:1030
+#: Merge.rc:525 Merge.rc:1038
#, c-format
msgid "&Refresh Selected\tCtrl+F5"
msgstr "Obnovit &vybrané\tCtrl+F5"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:523 Merge.rc:765
+#: Merge.rc:527 Merge.rc:772
#, c-format
msgid "&Merge"
msgstr "Slo&učit"
#. IDR_DIRDOCTYPE, ID_MERGE_COMPARE
-#: Merge.rc:525
+#: Merge.rc:529
#, c-format
msgid "Co&mpare\tEnter"
msgstr "Porov&nat\tEnter"
#. IDR_MERGEDOCTYPE, ID_NEXTDIFF
-#: Merge.rc:527 Merge.rc:767
+#: Merge.rc:531 Merge.rc:774
#, c-format
msgid "&Next Difference\tAlt+Down"
msgstr "&Další rozdíl\tAlt+Down"
#. IDR_MERGEDOCTYPE, ID_PREVDIFF
-#: Merge.rc:528 Merge.rc:768
+#: Merge.rc:532 Merge.rc:775
#, c-format
msgid "&Previous Difference\tAlt+Up"
msgstr "&Předchozí rozdíl\tAlt+Up"
#. IDR_MERGEDOCTYPE, ID_FIRSTDIFF
-#: Merge.rc:530 Merge.rc:773
+#: Merge.rc:534 Merge.rc:780
#, c-format
msgid "&First Difference\tAlt+Home"
msgstr "Pr&vní rozdíl\tAlt+Home"
#. IDR_MERGEDOCTYPE, ID_CURDIFF
-#: Merge.rc:531 Merge.rc:774
+#: Merge.rc:535 Merge.rc:781
#, c-format
msgid "&Current Difference\tAlt+Enter"
msgstr "Ak&tuální rozdíl\tAlt+Enter"
#. IDR_MERGEDOCTYPE, ID_LASTDIFF
-#: Merge.rc:532 Merge.rc:775
+#: Merge.rc:536 Merge.rc:782
#, c-format
msgid "&Last Difference\tAlt+End"
msgstr "Po&slední rozdíl\tAlt+End"
#. IDR_MERGEDOCTYPE, ID_L2R
-#: Merge.rc:534 Merge.rc:830
+#: Merge.rc:538 Merge.rc:837
#, c-format
msgid "Copy to &Right\tAlt+Right"
msgstr "Kopírovat dop&rava\tAlt+Right"
#. IDR_MERGEDOCTYPE, ID_R2L
-#: Merge.rc:535 Merge.rc:831
+#: Merge.rc:539 Merge.rc:838
#, c-format
msgid "Copy to L&eft\tAlt+Left"
msgstr "Kopírovat do&leva\tAlt+Left"
#. IDR_DIRDOCTYPE, ID_MERGE_DELETE
-#: Merge.rc:537
+#: Merge.rc:541
#, c-format
msgid "&Delete\tDel"
msgstr "Odstran&it\tDel"
#. IDR_POPUP_DIRVIEW, ID_TOOLS_CUSTOMIZECOLUMNS
-#: Merge.rc:541 Merge.rc:1042
+#: Merge.rc:545 Merge.rc:1050
#, c-format
msgid "&Customize Columns..."
msgstr "Vlastní &sloupce..."
#. IDR_MERGEDOCTYPE, ID_TOOLS_GENERATEREPORT
-#: Merge.rc:544 Merge.rc:851
+#: Merge.rc:548 Merge.rc:858
#, c-format
msgid "Generate &Report..."
msgstr "&Protokol porovnání..."
#. IDD_ENCODINGERROR, IDC_PLUGIN
-#: Merge.rc:556 Merge.rc:867 Merge.rc:3064
+#: Merge.rc:560 Merge.rc:874 Merge.rc:3074
#, c-format
msgid "&Edit with Unpacker..."
msgstr ""
#. IDR_MERGEDOCTYPE, ID_FILE_SAVE
-#: Merge.rc:611
+#: Merge.rc:617
#, c-format
msgid "&Save\tCtrl+S"
msgstr "&Uložit\tCtrl+S"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:612
+#: Merge.rc:618
#, c-format
msgid "Sav&e"
msgstr ""
#. IDR_POPUP_SAVE, ID_FILE_SAVE_LEFT
-#: Merge.rc:614 Merge.rc:1201
+#: Merge.rc:620 Merge.rc:1211
#, c-format
msgid "Save &Left"
msgstr "Uložit &levý"
#. IDR_POPUP_SAVE, ID_FILE_SAVE_MIDDLE
-#: Merge.rc:615 Merge.rc:1202
+#: Merge.rc:621 Merge.rc:1212
#, c-format
msgid "Save &Middle"
msgstr ""
#. IDR_POPUP_SAVE, ID_FILE_SAVE_RIGHT
-#: Merge.rc:616 Merge.rc:1203
+#: Merge.rc:622 Merge.rc:1213
#, c-format
msgid "Save &Right"
msgstr "Uložit p&ravý"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:618
+#: Merge.rc:624
#, c-format
msgid "Save &As"
msgstr ""
#. IDR_POPUP_SAVE, ID_FILE_SAVEAS_LEFT
-#: Merge.rc:620 Merge.rc:1205
+#: Merge.rc:626 Merge.rc:1215
#, c-format
msgid "Save &Left As..."
msgstr ""
#. IDR_POPUP_SAVE, ID_FILE_SAVEAS_MIDDLE
-#: Merge.rc:621 Merge.rc:1206
+#: Merge.rc:627 Merge.rc:1216
#, c-format
msgid "Save &Middle As..."
msgstr ""
#. IDR_POPUP_SAVE, ID_FILE_SAVEAS_RIGHT
-#: Merge.rc:622 Merge.rc:1207
+#: Merge.rc:628 Merge.rc:1217
#, c-format
msgid "Save &Right As..."
msgstr ""
#. IDR_MERGEDOCTYPE, ID_FILE_PRINT
-#: Merge.rc:625
+#: Merge.rc:631
msgid "&Print...\tCtrl+P"
msgstr "&Tisk...\tCtrl+P"
#. IDR_MERGEDOCTYPE, ID_FILE_PAGE_SETUP
-#: Merge.rc:626
+#: Merge.rc:632
msgid "Page Set&up..."
msgstr "V&zhled stránky..."
#. IDR_MERGEDOCTYPE, ID_FILE_PRINT_PREVIEW
-#: Merge.rc:627
+#: Merge.rc:633
msgid "Print Previe&w..."
msgstr "Ná&hled..."
#. IDR_MERGEDOCTYPE
-#: Merge.rc:636
+#: Merge.rc:642
#, c-format
msgid "&Convert Line Endings to"
msgstr "Převést konce řá&dků"
#. IDR_MERGEDOCTYPE, ID_FILE_MERGINGMODE
-#: Merge.rc:643
+#: Merge.rc:649
#, c-format
msgid "Mer&ge Mode\tF9"
msgstr "Režim sl&učování\tF9"
#. IDR_MERGEDOCTYPE, ID_RESCAN
-#: Merge.rc:645
+#: Merge.rc:651
msgid "Reloa&d\tCtrl+F5"
msgstr ""
#. IDR_MERGEDOCTYPE
-#: Merge.rc:647
+#: Merge.rc:653
#, c-format
msgid "Reco&mpare As"
msgstr ""
+#. IDR_POPUP_COMPARE, ID_MERGE_COMPARE_FOLDER
+#: Merge.rc:660 Merge.rc:947 Merge.rc:1185
+msgid "A&rchive"
+msgstr ""
+
#. IDR_MERGEDOCTYPE, ID_EDIT_UNDO
-#: Merge.rc:666
+#: Merge.rc:673
#, c-format
msgid "&Undo\tCtrl+Z"
msgstr "&Zpět\tCtrl+Z"
#. IDR_MERGEDOCTYPE, ID_EDIT_REDO
-#: Merge.rc:667
+#: Merge.rc:674
#, c-format
msgid "&Redo\tCtrl+Y"
msgstr "Znov&u\tCtrl+Y"
#. IDR_MERGEDOCTYPE, ID_EDIT_CUT
-#: Merge.rc:669
+#: Merge.rc:676
#, c-format
msgid "Cu&t\tCtrl+X"
msgstr "Vyj&mout\tCtrl+X"
#. IDR_POPUP_OUTPUTVIEW, ID_EDIT_COPY
-#: Merge.rc:670 Merge.rc:1342
+#: Merge.rc:677 Merge.rc:1352
#, c-format
msgid "&Copy\tCtrl+C"
msgstr "&Kopírovat\tCtrl+C"
#. IDR_MERGEDOCTYPE, ID_EDIT_FIND
-#: Merge.rc:676
+#: Merge.rc:683
#, c-format
msgid "F&ind...\tCtrl+F"
msgstr "&Najít...\tCtrl+F"
#. IDR_MERGEDOCTYPE, ID_EDIT_REPLACE
-#: Merge.rc:677
+#: Merge.rc:684
#, c-format
msgid "Repla&ce...\tCtrl+H"
msgstr "Na&hradit...\tCtrl+H"
#. IDR_MERGEDOCTYPE, ID_EDIT_MARK
-#: Merge.rc:678
+#: Merge.rc:685
#, c-format
msgid "&Marker...\tCtrl+Shift+M"
msgstr ""
#. IDR_MERGEDOCTYPE
-#: Merge.rc:680
+#: Merge.rc:687
#, c-format
msgid "Advanced"
msgstr "&Rozšířené"
#. IDR_MERGEDOCTYPE, ID_EDIT_COPY_LINENUMBERS
-#: Merge.rc:682
+#: Merge.rc:689
#, c-format
msgid "&Copy With Line Numbers\tCtrl+Shift+C"
msgstr "&Kopírovat s čísly řádků\tCtrl+Shift+C"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:684
+#: Merge.rc:691
#, c-format
msgid "&Bookmarks"
msgstr "Zá&ložky"
#. IDR_MERGEDOCTYPE, ID_EDIT_TOGGLE_BOOKMARK
-#: Merge.rc:686
+#: Merge.rc:693
#, c-format
msgid "&Toggle Bookmark\tCtrl+F2"
msgstr "Přepnout &záložku\tCtrl+F2"
#. IDR_MERGEDOCTYPE, ID_EDIT_GOTO_NEXT_BOOKMARK
-#: Merge.rc:687
+#: Merge.rc:694
#, c-format
msgid "&Next Bookmark\tF2"
msgstr "&Další záložka\tF2"
#. IDR_MERGEDOCTYPE, ID_EDIT_GOTO_PREV_BOOKMARK
-#: Merge.rc:688
+#: Merge.rc:695
#, c-format
msgid "&Previous Bookmark\tShift+F2"
msgstr "&Předchozí záložka\tShift+F2"
#. IDR_MERGEDOCTYPE, ID_EDIT_CLEAR_ALL_BOOKMARKS
-#: Merge.rc:689
+#: Merge.rc:696
#, c-format
msgid "&Clear All Bookmarks"
msgstr "Zrušit &všechny záložky"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:706
+#: Merge.rc:713
#, c-format
msgid "Syntax Highlight"
msgstr "Zvýraznění syntaxe"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:711
+#: Merge.rc:718
#, c-format
msgid "&Diff Context"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_ALL
-#: Merge.rc:713
+#: Merge.rc:720
#, c-format
msgid "&All Lines"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_0
-#: Merge.rc:715
+#: Merge.rc:722
#, c-format
msgid "&0 Lines"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_1
-#: Merge.rc:716
+#: Merge.rc:723
#, c-format
msgid "&1 Line"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_3
-#: Merge.rc:717
+#: Merge.rc:724
#, c-format
msgid "&3 Lines"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_5
-#: Merge.rc:718
+#: Merge.rc:725
#, c-format
msgid "&5 Lines"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_7
-#: Merge.rc:719
+#: Merge.rc:726
#, c-format
msgid "&7 Lines"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_9
-#: Merge.rc:720
+#: Merge.rc:727
#, c-format
msgid "&9 Lines"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_TOGGLE
-#: Merge.rc:722
+#: Merge.rc:729
#, c-format
msgid "&Toggle All and 0-9 Lines\tCtrl+D"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_INVERT
-#: Merge.rc:724
+#: Merge.rc:731
msgid "&Invert (Hide Different Lines)"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_VIEW_RESIZE_PANES
-#: Merge.rc:727
+#: Merge.rc:734
#, c-format
msgid "&Lock Panes"
msgstr "&Uzamknout panely"
#. IDR_MERGEDOCTYPE, ID_VIEW_WHITESPACE
-#: Merge.rc:728
+#: Merge.rc:735
#, c-format
msgid "&View Whitespace"
msgstr "Zobrazit ne&tisknutelné znaky"
#. IDR_MERGEDOCTYPE, ID_VIEW_EOL
-#: Merge.rc:729
+#: Merge.rc:736
msgid "View E&OL"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_VIEW_LINEDIFFS
-#: Merge.rc:730
+#: Merge.rc:737
#, c-format
msgid "Vie&w Line Differences"
msgstr "Zobrazit rozdíly v řá&dcích"
#. IDR_MERGEDOCTYPE, ID_VIEW_LINENUMBERS
-#: Merge.rc:731
+#: Merge.rc:738
#, c-format
msgid "View Line &Numbers"
msgstr "Zobrazit čísla řád&ků"
#. IDR_MERGEDOCTYPE, ID_VIEW_SELMARGIN
-#: Merge.rc:732
+#: Merge.rc:739
#, c-format
msgid "View &Margins"
msgstr "Zobrazit &levé okraje"
#. IDR_MERGEDOCTYPE, ID_VIEW_TOPMARGIN
-#: Merge.rc:733
+#: Merge.rc:740
msgid "View To&p Margins"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_VIEW_WORDWRAP
-#: Merge.rc:734
+#: Merge.rc:741
#, c-format
msgid "W&rap Lines"
msgstr "Zala&movat řádky"
#. IDR_MERGEDOCTYPE, ID_VIEW_SPLITVERTICALLY
-#: Merge.rc:742
+#: Merge.rc:749
#, c-format
msgid "Split V&ertically"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_VIEW_DETAIL_BAR
-#: Merge.rc:759
+#: Merge.rc:766
#, c-format
msgid "Diff &Pane"
msgstr "&Rozdílový panel"
#. IDR_MERGEDOCTYPE, ID_VIEW_LOCATION_BAR
-#: Merge.rc:760
+#: Merge.rc:767
#, c-format
msgid "Lo&cation Pane"
msgstr "&Polohový panel"
#. IDS_OUTPUTBAR_CAPTION
-#: Merge.rc:761 Merge.rc:4902
+#: Merge.rc:768 Merge.rc:4912
msgid "Output Pane"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_NEXTCONFLICT
-#: Merge.rc:770
+#: Merge.rc:777
#, c-format
msgid "Ne&xt Conflict\tAlt+Shift+Down"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_PREVCONFLICT
-#: Merge.rc:771
+#: Merge.rc:778
#, c-format
msgid "Pre&vious Conflict\tAlt+Shift+Up"
msgstr ""
#. IDR_MERGEDOCTYPE
-#: Merge.rc:777
+#: Merge.rc:784
#, c-format
msgid "A&dvanced"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_NEXTDIFFLM
-#: Merge.rc:779
+#: Merge.rc:786
#, c-format
msgid "Next Difference (Left/Middle)\tAlt+1"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_PREVDIFFLM
-#: Merge.rc:780
+#: Merge.rc:787
#, c-format
msgid "Previous Difference (Left/Middle)\tAlt+Shift+1"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_NEXTDIFFLR
-#: Merge.rc:782
+#: Merge.rc:789
#, c-format
msgid "Next Difference (Left/Right)\tAlt+2"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_PREVDIFFLR
-#: Merge.rc:783
+#: Merge.rc:790
#, c-format
msgid "Previous Difference (Left/Right)\tAlt+Shift+2"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_NEXTDIFFMR
-#: Merge.rc:785
+#: Merge.rc:792
#, c-format
msgid "Next Difference (Middle/Right)\tAlt+3"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_PREVDIFFMR
-#: Merge.rc:786
+#: Merge.rc:793
#, c-format
msgid "Previous Difference (Middle/Right)\tAlt+Shift+3"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_NEXTDIFFLO
-#: Merge.rc:788
+#: Merge.rc:795
#, c-format
msgid "Next Left-Only Difference\tAlt+7"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_PREVDIFFLO
-#: Merge.rc:789
+#: Merge.rc:796
#, c-format
msgid "Previous Left-Only Difference\tAlt+Shift+7"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_NEXTDIFFMO
-#: Merge.rc:791
+#: Merge.rc:798
#, c-format
msgid "Next Middle-Only Difference\tAlt+8"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_PREVDIFFMO
-#: Merge.rc:792
+#: Merge.rc:799
#, c-format
msgid "Previous Middle-Only Difference\tAlt+Shift+8"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_NEXTDIFFRO
-#: Merge.rc:794
+#: Merge.rc:801
#, c-format
msgid "Next Right-Only Difference\tAlt+9"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_PREVDIFFRO
-#: Merge.rc:795
+#: Merge.rc:802
#, c-format
msgid "Previous Right-Only Difference\tAlt+Shift+9"
msgstr ""
#. IDR_MERGEDOCTYPE
-#: Merge.rc:797
+#: Merge.rc:804
msgid "Copy from &Left to"
msgstr ""
#. IDD_LOAD_SAVE_CODEPAGE, IDC_AFFECTS_MIDDLE_BTN
-#: Merge.rc:799 Merge.rc:810 Merge.rc:815 Merge.rc:826 Merge.rc:970
-#: Merge.rc:2545 Merge.rc:2817
+#: Merge.rc:806 Merge.rc:817 Merge.rc:822 Merge.rc:833 Merge.rc:978
+#: Merge.rc:2555 Merge.rc:2827
#, c-format
msgid "&Middle"
msgstr ""
#. IDD_LOAD_SAVE_CODEPAGE, IDC_AFFECTS_RIGHT_BTN
-#: Merge.rc:800 Merge.rc:805 Merge.rc:816 Merge.rc:821 Merge.rc:971
-#: Merge.rc:2546 Merge.rc:2819
+#: Merge.rc:807 Merge.rc:812 Merge.rc:823 Merge.rc:828 Merge.rc:979
+#: Merge.rc:2556 Merge.rc:2829
#, c-format
msgid "&Right"
msgstr "P&ravé"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:802
+#: Merge.rc:809
msgid "Copy from &Middle to"
msgstr ""
#. IDD_LOAD_SAVE_CODEPAGE, IDC_AFFECTS_LEFT_BTN
-#: Merge.rc:804 Merge.rc:809 Merge.rc:820 Merge.rc:825 Merge.rc:969
-#: Merge.rc:2544 Merge.rc:2815
+#: Merge.rc:811 Merge.rc:816 Merge.rc:827 Merge.rc:832 Merge.rc:977
+#: Merge.rc:2554 Merge.rc:2825
#, c-format
msgid "&Left"
msgstr "&Levé"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:807
+#: Merge.rc:814
msgid "Copy from &Right to"
msgstr ""
#. IDR_MERGEDOCTYPE
-#: Merge.rc:813
+#: Merge.rc:820
msgid "Copy Selected Lines from Le&ft to"
msgstr ""
#. IDR_MERGEDOCTYPE
-#: Merge.rc:818
+#: Merge.rc:825
msgid "Copy Selected Lines from Mi&ddle to"
msgstr ""
#. IDR_MERGEDOCTYPE
-#: Merge.rc:823
+#: Merge.rc:830
msgid "Copy Selected Lines from Ri&ght to"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_COPY_FROM_LEFT
-#: Merge.rc:833
+#: Merge.rc:840
#, c-format
msgid "Copy from Left\tAlt+Shift+Right"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_COPY_FROM_RIGHT
-#: Merge.rc:834
+#: Merge.rc:841
#, c-format
msgid "Copy from Right\tAlt+Shift+Left"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_L2RNEXT
-#: Merge.rc:836
+#: Merge.rc:843
msgid "C&opy to Right and Advance\tCtrl+Alt+Right"
msgstr "Kopírovat dopr&ava a na další\tCtrl+Alt+Right"
#. IDR_MERGEDOCTYPE, ID_R2LNEXT
-#: Merge.rc:837
+#: Merge.rc:844
msgid "Copy &to Left and Advance\tCtrl+Alt+Left"
msgstr "Kopírovat dol&eva a na další\tCtrl+Alt+Left"
#. IDR_MERGEDOCTYPE, ID_ALL_RIGHT
-#: Merge.rc:839
+#: Merge.rc:846
#, c-format
msgid "Copy &All to Right"
msgstr "&Kopírovat vše doprava"
#. IDR_MERGEDOCTYPE, ID_ALL_LEFT
-#: Merge.rc:840
+#: Merge.rc:847
#, c-format
msgid "Cop&y All to Left"
msgstr "K&opírovat vše doleva"
#. IDR_MERGEDOCTYPE, ID_AUTO_MERGE
-#: Merge.rc:842
+#: Merge.rc:849
msgid "A&uto Merge\tCtrl+Alt+M"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_ADD_SYNCPOINT
-#: Merge.rc:844
+#: Merge.rc:851
#, c-format
msgid "Add &Synchronization Point\tAlt+S"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_CLEAR_SYNCPOINTS
-#: Merge.rc:845
+#: Merge.rc:852
#, c-format
msgid "Clear Sync&hronization Points"
msgstr ""
#. IDR_MERGEDOCTYPE
-#: Merge.rc:863
+#: Merge.rc:870
msgid "Unpac&ker"
msgstr ""
#. IDR_MERGEDOCTYPE
-#: Merge.rc:869
+#: Merge.rc:876
#, c-format
msgid "&Prediffer"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_APPLY_PREDIFFER
-#: Merge.rc:873
+#: Merge.rc:880
msgid "Apply Pre&differ..."
msgstr ""
#. IDR_MERGEDOCTYPE, ID_TRANSFORM_WITH_SCRIPT
-#: Merge.rc:879
+#: Merge.rc:886
msgid "&Transform with Editor Script..."
msgstr ""
#. IDR_MERGEDOCTYPE
-#: Merge.rc:880
+#: Merge.rc:887
msgid "Scripts for &Copying"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_SELECT_EDITOR_SCRIPT_FOR_COPYING
-#: Merge.rc:886
+#: Merge.rc:893
msgid "Select &Editor Script..."
msgstr ""
#. IDR_MERGEDOCTYPE, ID_WINDOW_SPLIT
-#: Merge.rc:898
+#: Merge.rc:905
#, c-format
msgid "Sp&lit"
msgstr ""
#. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE
-#: Merge.rc:921
+#: Merge.rc:928
#, c-format
msgid "Comp&are"
msgstr "&Porovnat"
#. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE_WITH_MOVED_RENAMED
-#: Merge.rc:922
+#: Merge.rc:929
msgid "Compar&e with Renamed/Moved Items"
msgstr ""
#. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE_IN_NEW_WINDOW
-#: Merge.rc:923
+#: Merge.rc:930
msgid "Compare in New &Window"
msgstr ""
#. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE_NONHORIZONTALLY
-#: Merge.rc:924 Merge.rc:931
+#: Merge.rc:931 Merge.rc:938
msgid "Compare Non-hor&izontally..."
msgstr ""
#. IDR_POPUP_DIRVIEW
-#: Merge.rc:925
+#: Merge.rc:932
#, c-format
msgid "Compare Non-hor&izontally"
msgstr ""
#. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE_LEFT1_LEFT2
-#: Merge.rc:927
+#: Merge.rc:934
#, c-format
msgid "First &Left with Second Left"
msgstr ""
#. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE_RIGHT1_RIGHT2
-#: Merge.rc:928
+#: Merge.rc:935
#, c-format
msgid "First &Right with Second Right"
msgstr ""
#. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE_LEFT1_RIGHT2
-#: Merge.rc:929
+#: Merge.rc:936
#, c-format
msgid "&First Left with Second Right"
msgstr ""
#. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE_LEFT2_RIGHT1
-#: Merge.rc:930
+#: Merge.rc:937
#, c-format
msgid "&Second Left with First Right"
msgstr ""
#. IDR_POPUP_DIRVIEW
-#: Merge.rc:933
+#: Merge.rc:940
#, c-format
msgid "Co&mpare As"
msgstr ""
#. IDS_COPY_LEFT_TO_MIDDLE2
-#: Merge.rc:945 Merge.rc:957 Merge.rc:4502
+#: Merge.rc:953 Merge.rc:965 Merge.rc:4512
#, c-format
msgid "Left to Middle (%1 of %2)"
msgstr ""
#. IDS_COPY_LEFT_TO_RIGHT2
-#: Merge.rc:946 Merge.rc:958 Merge.rc:4501
+#: Merge.rc:954 Merge.rc:966 Merge.rc:4511
#, c-format
msgid "Left to Right (%1 of %2)"
msgstr "&Levé doprava (%1 z %2)"
#. IDS_MOVE_LEFT_TO2
-#: Merge.rc:947 Merge.rc:959 Merge.rc:1022 Merge.rc:4513 Merge.rc:4542
+#: Merge.rc:955 Merge.rc:967 Merge.rc:1030 Merge.rc:4523 Merge.rc:4552
#, c-format
msgid "Left to... (%1 of %2)"
msgstr "L&evé do... (%1 z %2)"
#. IDS_COPY_MIDDLE_TO_LEFT2
-#: Merge.rc:948 Merge.rc:960 Merge.rc:4499
+#: Merge.rc:956 Merge.rc:968 Merge.rc:4509
#, c-format
msgid "Middle to Left (%1 of %2)"
msgstr ""
#. IDS_COPY_MIDDLE_TO_RIGHT2
-#: Merge.rc:949 Merge.rc:961 Merge.rc:4500
+#: Merge.rc:957 Merge.rc:969 Merge.rc:4510
#, c-format
msgid "Middle to Right (%1 of %2)"
msgstr ""
#. IDS_MOVE_MIDDLE_TO2
-#: Merge.rc:950 Merge.rc:962 Merge.rc:1023 Merge.rc:4514 Merge.rc:4543
+#: Merge.rc:958 Merge.rc:970 Merge.rc:1031 Merge.rc:4524 Merge.rc:4553
#, c-format
msgid "Middle to... (%1 of %2)"
msgstr ""
#. IDS_COPY_RIGHT_TO_MIDDLE2
-#: Merge.rc:951 Merge.rc:963 Merge.rc:4498
+#: Merge.rc:959 Merge.rc:971 Merge.rc:4508
#, c-format
msgid "Right to Middle (%1 of %2)"
msgstr ""
#. IDS_COPY_RIGHT_TO_LEFT2
-#: Merge.rc:952 Merge.rc:964 Merge.rc:4497
+#: Merge.rc:960 Merge.rc:972 Merge.rc:4507
#, c-format
msgid "Right to Left (%1 of %2)"
msgstr "P&ravé doleva (%1 z %2)"
#. IDS_MOVE_RIGHT_TO2
-#: Merge.rc:953 Merge.rc:965 Merge.rc:1024 Merge.rc:4515 Merge.rc:4544
+#: Merge.rc:961 Merge.rc:973 Merge.rc:1032 Merge.rc:4525 Merge.rc:4554
#, c-format
msgid "Right to... (%1 of %2)"
msgstr "Pr&avé do... (%1 z %2)"
#. IDD_EDIT_MARKER, IDC_EDIT_MARKER_DELETE
-#: Merge.rc:967 Merge.rc:2036
+#: Merge.rc:975 Merge.rc:2046
#, c-format
msgid "&Delete"
msgstr "Odstran&it"
#. IDR_POPUP_DIRVIEW, ID_DIR_DEL_BOTH
-#: Merge.rc:972
+#: Merge.rc:980
#, c-format
msgid "&Both"
msgstr "O&boje"
#. IDR_POPUP_DIRVIEW, ID_DIR_DEL_ALL
-#: Merge.rc:973
+#: Merge.rc:981
#, c-format
msgid "&All"
msgstr ""
#. IDD_EDIT_REPLACE, IDC_EDIT_SCOPE_SELECTION
-#: Merge.rc:974 Merge.rc:2019
+#: Merge.rc:982 Merge.rc:2029
#, c-format
msgid "&Selection"
msgstr "ve vý&běru"
#. IDR_POPUP_DIRVIEW, ID_DIR_ITEM_RENAME
-#: Merge.rc:976
+#: Merge.rc:984
#, c-format
msgid "Re&name"
msgstr "Přej&menovat"
#. IDR_POPUP_DIRVIEW, ID_DIR_HIDE_FILENAMES
-#: Merge.rc:977
+#: Merge.rc:985
#, c-format
msgid "&Hide Items"
msgstr "&Skrýt položky"
#. IDR_POPUP_DIRVIEW
-#: Merge.rc:979
+#: Merge.rc:987
#, c-format
msgid "&Open Left"
msgstr "Otevřít &levé"
#. IDR_POPUP_DIRVIEW
-#: Merge.rc:986
+#: Merge.rc:994
#, c-format
msgid "Open Midd&le"
msgstr ""
#. IDR_POPUP_DIRVIEW
-#: Merge.rc:993
+#: Merge.rc:1001
#, c-format
msgid "O&pen Right"
msgstr "Otevřít p&ravé"
#. IDR_POPUP_DIRVIEW
-#: Merge.rc:1001
+#: Merge.rc:1009
#, c-format
msgid "Cop&y Paths"
msgstr "Kopírovat &umístění souborů"
#. IDS_DEL_LEFT_FMT2
-#: Merge.rc:1003 Merge.rc:1012 Merge.rc:4530
+#: Merge.rc:1011 Merge.rc:1020 Merge.rc:4540
#, c-format
msgid "Left (%1 of %2)"
msgstr "&Levé (%1 z %2)"
#. IDS_DEL_MIDDLE_FMT2
-#: Merge.rc:1004 Merge.rc:1013 Merge.rc:4531
+#: Merge.rc:1012 Merge.rc:1021 Merge.rc:4541
#, c-format
msgid "Middle (%1 of %2)"
msgstr ""
#. IDS_DEL_RIGHT_FMT2
-#: Merge.rc:1005 Merge.rc:1014 Merge.rc:4532
+#: Merge.rc:1013 Merge.rc:1022 Merge.rc:4542
#, c-format
msgid "Right (%1 of %2)"
msgstr "P&ravé (%1 z %2)"
#. IDS_DEL_BOTH_FMT2
-#: Merge.rc:1006 Merge.rc:1015 Merge.rc:4533
+#: Merge.rc:1014 Merge.rc:1023 Merge.rc:4543
#, c-format
msgid "Both (%1 of %2)"
msgstr "O&boje (%1 z %2)"
#. IDS_DEL_ALL_FMT2
-#: Merge.rc:1007 Merge.rc:1016 Merge.rc:4538
+#: Merge.rc:1015 Merge.rc:1024 Merge.rc:4548
#, c-format
msgid "All (%1 of %2)"
msgstr ""
#. IDR_POPUP_DIRVIEW, ID_DIR_COPY_FILENAMES
-#: Merge.rc:1009
+#: Merge.rc:1017
#, c-format
msgid "Copy &Filenames"
msgstr "Kopírovat &název souboru"
#. IDR_POPUP_DIRVIEW
-#: Merge.rc:1010
+#: Merge.rc:1018
#, c-format
msgid "Copy Items to Clip&board"
msgstr ""
#. IDR_POPUP_DIRVIEW, ID_DIR_COPY_ALL_DISP_COLUMNS
-#: Merge.rc:1018
+#: Merge.rc:1026
msgid "Copy All Di&splayed Columns"
msgstr ""
#. IDR_POPUP_DIRVIEW
-#: Merge.rc:1020
+#: Merge.rc:1028
#, c-format
msgid "&Zip"
msgstr "&Archivovat"
#. IDS_COPY_BOTH_TO2
-#: Merge.rc:1025 Merge.rc:4516
+#: Merge.rc:1033 Merge.rc:4526
#, c-format
msgid "Both to... (%1 of %2)"
msgstr ""
#. IDS_COPY_ALL_TO2
-#: Merge.rc:1026 Merge.rc:4517
+#: Merge.rc:1034 Merge.rc:4527
#, c-format
msgid "All to... (%1 of %2)"
msgstr ""
#. IDS_COPY_DIFFERENCES_TO2
-#: Merge.rc:1027 Merge.rc:4518
+#: Merge.rc:1035 Merge.rc:4528
#, c-format
msgid "Differences to... (%1 of %2)"
msgstr ""
#. IDR_POPUP_DIRVIEW, ID_DIR_SHELL_CONTEXT_MENU_LEFT
-#: Merge.rc:1032
+#: Merge.rc:1040
#, c-format
msgid "Left Shell Menu"
msgstr "Levá systémová nabídka"
#. IDR_POPUP_DIRVIEW, ID_DIR_SHELL_CONTEXT_MENU_MIDDLE
-#: Merge.rc:1033
+#: Merge.rc:1041
#, c-format
msgid "Middle Shell Menu"
msgstr ""
#. IDR_POPUP_DIRVIEW, ID_DIR_SHELL_CONTEXT_MENU_RIGHT
-#: Merge.rc:1034
+#: Merge.rc:1042
#, c-format
msgid "Right Shell Menu"
msgstr "Pravá systémová nabídka"
#. IDR_POPUP_DIRVIEW, ID_DIR_SHELL_CONTEXT_MENU_BOTH
-#: Merge.rc:1035
+#: Merge.rc:1043
msgid "Both Shell Menu"
msgstr ""
#. IDR_POPUP_DIRVIEW, ID_DIR_SHELL_CONTEXT_MENU_ALL
-#: Merge.rc:1036
+#: Merge.rc:1044
msgid "All Shell Menu"
msgstr ""
#. IDR_POPUP_EDITOR_HEADERBAR, ID_EDITOR_COPY
-#: Merge.rc:1050
+#: Merge.rc:1058
#, c-format
msgid "Copy"
msgstr ""
#. IDR_POPUP_EDITOR_HEADERBAR, ID_EDITOR_COPY_PATH
-#: Merge.rc:1051
+#: Merge.rc:1059
#, c-format
msgid "&Copy Full Path"
msgstr "Kopírovat celé &umístění"
#. IDR_POPUP_EDITOR_HEADERBAR, ID_EDITOR_COPY_FILENAME
-#: Merge.rc:1052
+#: Merge.rc:1060
#, c-format
msgid "Copy &Filename"
msgstr "Kopírovat &název souboru"
#. IDR_POPUP_EDITOR_HEADERBAR, ID_EDITOR_EDIT_CAPTION
-#: Merge.rc:1053
+#: Merge.rc:1061
msgid "&Edit Caption\tF2"
msgstr ""
#. IDR_POPUP_EDITOR_HEADERBAR, ID_EDITOR_EDIT_PATH
-#: Merge.rc:1055
+#: Merge.rc:1063
msgid "Edit &Path\tCtrl+L"
msgstr ""
#. IDR_POPUP_EDITOR_HEADERBAR, ID_EDITOR_SELECT_FILE
-#: Merge.rc:1056
+#: Merge.rc:1064
msgid "&Open..."
msgstr ""
#. IDR_POPUP_PLUGINS_SETTINGS
-#: Merge.rc:1062
+#: Merge.rc:1070
msgid "Unpacker Settings"
msgstr ""
#. IDS_USERCHOICE_NONE
-#: Merge.rc:1064 Merge.rc:1070 Merge.rc:1789 Merge.rc:1793 Merge.rc:5030
+#: Merge.rc:1072 Merge.rc:1078 Merge.rc:1799 Merge.rc:1803 Merge.rc:5040
#, c-format
msgid ""
msgstr "<žádný>"
#. IDS_USERCHOICE_AUTOMATIC
-#: Merge.rc:1065 Merge.rc:1071 Merge.rc:5031
+#: Merge.rc:1073 Merge.rc:1079 Merge.rc:5041
#, c-format
msgid ""
msgstr ""
#. IDD_OPEN, IDC_SELECT_PREDIFFER
-#: Merge.rc:1066 Merge.rc:1072 Merge.rc:1970 Merge.rc:1974
+#: Merge.rc:1074 Merge.rc:1080 Merge.rc:1980 Merge.rc:1984
#, c-format
msgid "&Select..."
msgstr "Vy&brat..."
#. IDR_POPUP_PLUGINS_SETTINGS
-#: Merge.rc:1068
+#: Merge.rc:1076
#, c-format
msgid "Prediffer Settings"
msgstr ""
#. IDR_POPUP_LOCATIONBAR, ID_LOCBAR_GOTODIFF
-#: Merge.rc:1080
+#: Merge.rc:1088
msgid "G&o to Diff"
msgstr "&Přejít na řádek"
#. IDR_POPUP_LOCATIONBAR, ID_LOCBAR_MOVECURSOR_ONCLICK
-#: Merge.rc:1083
+#: Merge.rc:1091
msgid "Move Cursor on &Click"
msgstr ""
#. IDR_POPUP_LOCATIONBAR, ID_DISPLAY_MOVED_NONE
-#: Merge.rc:1085
+#: Merge.rc:1093
#, c-format
msgid "&No Moved Blocks"
msgstr "&Nezobrazovat přesunuté bloky"
#. IDR_POPUP_LOCATIONBAR, ID_DISPLAY_MOVED_ALL
-#: Merge.rc:1086
+#: Merge.rc:1094
#, c-format
msgid "&All Moved Blocks"
msgstr "&Všechny přesunuté bloky"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS
-#: Merge.rc:1094 Merge.rc:1127
+#: Merge.rc:1102 Merge.rc:1135
#, c-format
msgid "W&hitespaces"
msgstr "Prázdná místa"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_WHITESPACE_COMPARE
-#: Merge.rc:1096 Merge.rc:1129
+#: Merge.rc:1104 Merge.rc:1137
#, c-format
msgid "Com&pare"
msgstr "P&orovnávat"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_WHITESPACE_IGNORE
-#: Merge.rc:1097 Merge.rc:1130
+#: Merge.rc:1105 Merge.rc:1138
#, c-format
msgid "I&gnore Changes"
msgstr "Ignorovat &změny"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_WHITESPACE_IGNOREALL
-#: Merge.rc:1098 Merge.rc:1131
+#: Merge.rc:1106 Merge.rc:1139
#, c-format
msgid "Ig&nore All"
msgstr "Ignorovat &všechny"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_IGNORE_BLANKLINES
-#: Merge.rc:1100 Merge.rc:1133
+#: Merge.rc:1108 Merge.rc:1141
#, c-format
msgid "Ignore Blan&k Lines"
msgstr "Ignorovat prázdné řá&dky"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_IGNORE_CASE
-#: Merge.rc:1101 Merge.rc:1134
+#: Merge.rc:1109 Merge.rc:1142
#, c-format
msgid "Ignore &Case"
msgstr "Ignorovat &malá a velká písmena"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_IGNORE_EOL
-#: Merge.rc:1102 Merge.rc:1135
+#: Merge.rc:1110 Merge.rc:1143
#, c-format
msgid "Igno&re EOL Differences (Windows/Unix/Mac)"
msgstr "Ignorovat rozdíly v &koncích řádků (Windows/Unix/Mac)"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_IGNORE_CODEPAGE
-#: Merge.rc:1103 Merge.rc:1136
+#: Merge.rc:1111 Merge.rc:1144
#, c-format
msgid "Ignore Codepage &Differences"
msgstr ""
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_IGNORE_NUMBERS
-#: Merge.rc:1104 Merge.rc:1137
+#: Merge.rc:1112 Merge.rc:1145
msgid "Ignore Num&bers"
msgstr ""
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_IGNORE_COMMENTS
-#: Merge.rc:1105 Merge.rc:1138
+#: Merge.rc:1113 Merge.rc:1146
msgid "Ignore C&omment Differences"
msgstr ""
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_IGNORE_MISSING_TRAILING_EOL
-#: Merge.rc:1106 Merge.rc:1139
+#: Merge.rc:1114 Merge.rc:1147
msgid "Ignore &Missing Trailing EOL"
msgstr ""
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_IGNORE_LINE_BREAKS
-#: Merge.rc:1107 Merge.rc:1140
+#: Merge.rc:1115 Merge.rc:1148
msgid "Ignore Line &Breaks (Treat as Spaces)"
msgstr ""
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_RECURS_CHECK
-#: Merge.rc:1109 Merge.rc:2963
+#: Merge.rc:1117 Merge.rc:2973
#, c-format
msgid "&Include Subfolders"
msgstr "Včetně pod&složek"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS
-#: Merge.rc:1110 Merge.rc:1142
+#: Merge.rc:1118 Merge.rc:1150
#, c-format
msgid "&Compare Method"
msgstr "&Způsob porovnání"
#. IDS_COMPMETHOD_FULL_CONTENTS
-#: Merge.rc:1112 Merge.rc:1144 Merge.rc:1328 Merge.rc:4282
+#: Merge.rc:1120 Merge.rc:1152 Merge.rc:1338 Merge.rc:4292
#, c-format
msgid "Full Contents"
msgstr "Plný obsah"
#. IDS_COMPMETHOD_QUICK_CONTENTS
-#: Merge.rc:1113 Merge.rc:1145 Merge.rc:1329 Merge.rc:4283
+#: Merge.rc:1121 Merge.rc:1153 Merge.rc:1339 Merge.rc:4293
#, c-format
msgid "Quick Contents"
msgstr "Rychlý obsah"
#. IDS_COMPMETHOD_BINARY_CONTENTS
-#: Merge.rc:1114 Merge.rc:1146 Merge.rc:1330 Merge.rc:4284
+#: Merge.rc:1122 Merge.rc:1154 Merge.rc:1340 Merge.rc:4294
#, c-format
msgid "Binary Contents"
msgstr ""
#. IDS_COMPMETHOD_MODDATE
-#: Merge.rc:1115 Merge.rc:1147 Merge.rc:1331 Merge.rc:4285
+#: Merge.rc:1123 Merge.rc:1155 Merge.rc:1341 Merge.rc:4295
#, c-format
msgid "Modified Date"
msgstr "Datum změny"
#. IDS_COMPMETHOD_DATESIZE
-#: Merge.rc:1116 Merge.rc:1148 Merge.rc:1332 Merge.rc:4286
+#: Merge.rc:1124 Merge.rc:1156 Merge.rc:1342 Merge.rc:4296
#, c-format
msgid "Modified Date and Size"
msgstr "Datum změny a velikost"
#. IDS_COMPMETHOD_SIZE
-#: Merge.rc:1117 Merge.rc:1149 Merge.rc:1333 Merge.rc:4287
+#: Merge.rc:1125 Merge.rc:1157 Merge.rc:1343 Merge.rc:4297
#, c-format
msgid "Size"
msgstr "Velikost"
#. IDS_COMPMETHOD_EXISTENCE
-#: Merge.rc:1118 Merge.rc:1150 Merge.rc:1334 Merge.rc:4288
+#: Merge.rc:1126 Merge.rc:1158 Merge.rc:1344 Merge.rc:4298
msgid "Existence"
msgstr ""
#. IDR_POPUP_PROJECT, ID_LOAD_PROJECT
-#: Merge.rc:1192
+#: Merge.rc:1202
#, c-format
msgid "&Load Project..."
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARGALL
-#: Merge.rc:1272 Merge.rc:1301
+#: Merge.rc:1282 Merge.rc:1311
msgid "${*} - All Arguments"
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARG1
-#: Merge.rc:1273 Merge.rc:1302
+#: Merge.rc:1283 Merge.rc:1312
msgid "${1} - First Argument"
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARG2
-#: Merge.rc:1274 Merge.rc:1303
+#: Merge.rc:1284 Merge.rc:1313
msgid "${2} - Second Argument"
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARG3
-#: Merge.rc:1275 Merge.rc:1304
+#: Merge.rc:1285 Merge.rc:1314
msgid "${3} - Third Argument"
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARG4
-#: Merge.rc:1276 Merge.rc:1305
+#: Merge.rc:1286 Merge.rc:1315
msgid "${4} - Fourth Argument"
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARG5
-#: Merge.rc:1277 Merge.rc:1306
+#: Merge.rc:1287 Merge.rc:1316
msgid "${5} - Fifth Argument"
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARG6
-#: Merge.rc:1278 Merge.rc:1307
+#: Merge.rc:1288 Merge.rc:1317
msgid "${6} - Sixth Argument"
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARG7
-#: Merge.rc:1279 Merge.rc:1308
+#: Merge.rc:1289 Merge.rc:1318
msgid "${7} - Seventh Argument"
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARG8
-#: Merge.rc:1280 Merge.rc:1309
+#: Merge.rc:1290 Merge.rc:1319
msgid "${8} - Eighth Argument"
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARG9
-#: Merge.rc:1281 Merge.rc:1310
+#: Merge.rc:1291 Merge.rc:1320
msgid "${9} - Ninth Argument"
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_SRC_FILE
-#: Merge.rc:1289
+#: Merge.rc:1299
msgid "${SRC_FILE} - Source File"
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_SRC_FOLDER
-#: Merge.rc:1290
+#: Merge.rc:1300
msgid "${SRC_FOLDER} - Source Folder"
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_SRC_URL
-#: Merge.rc:1291
+#: Merge.rc:1301
msgid "${SRC_URL} - Source URL"
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_SRC_URL_PROTOCOL
-#: Merge.rc:1292
+#: Merge.rc:1302
msgid "${SRC_URL_PROTOCOL} - Source URL Protocol"
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_SRC_URL_SUFFIX
-#: Merge.rc:1293
+#: Merge.rc:1303
msgid "${SRC_URL_SUFFIX} - Source URL Suffix"
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_DST_FILE
-#: Merge.rc:1294
+#: Merge.rc:1304
msgid "${DST_FILE} - Destination File"
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_DST_FOLDER
-#: Merge.rc:1295
+#: Merge.rc:1305
msgid "${DST_FOLDER} - Destination Folder"
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_DST_URL
-#: Merge.rc:1296
+#: Merge.rc:1306
msgid "${DST_URL} - Destination URL"
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_DST_URL_PROTOCOL
-#: Merge.rc:1297
+#: Merge.rc:1307
msgid "${DST_URL_PROTOCOL} - Destination URL Protocol"
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_DST_URL_SUFFIX
-#: Merge.rc:1298
+#: Merge.rc:1308
msgid "${DST_URL_SUFFIX} - Destination URL Suffix"
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_WINMERGE_HOME
-#: Merge.rc:1299
+#: Merge.rc:1309
msgid "${WINMERGE_HOME} - WinMerge Home Directory"
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_SCRIPT_FILE
-#: Merge.rc:1300
+#: Merge.rc:1310
msgid "${SCRIPT_FILE} - Script File"
msgstr ""
#. IDR_POPUP_PLUGIN_ADD_MENU, ID_PLUGIN_ADD_UNPACKER
-#: Merge.rc:1318
+#: Merge.rc:1328
msgid "Add &Unpacker Plugin..."
msgstr ""
#. IDR_POPUP_PLUGIN_ADD_MENU, ID_PLUGIN_ADD_PREDIFFER
-#: Merge.rc:1319
+#: Merge.rc:1329
msgid "Add &Prediffer Plugin..."
msgstr ""
#. IDR_POPUP_PLUGIN_ADD_MENU, ID_PLUGIN_DUPLICATE
-#: Merge.rc:1320
+#: Merge.rc:1330
msgid "&Duplicate Plugin..."
msgstr ""
#. IDR_POPUP_OUTPUTVIEW, ID_EDIT_CLEAR_ALL
-#: Merge.rc:1344
+#: Merge.rc:1354
msgid "Clear &All"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_MASK_CLEAR
-#: Merge.rc:1352
+#: Merge.rc:1362
msgid "&Clear All"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_MASK_REMOVE_LAST
-#: Merge.rc:1353
+#: Merge.rc:1363
msgid "Remove Last Filter &Group"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_MASK_ALL
-#: Merge.rc:1354
+#: Merge.rc:1364
msgid "R&eset to Default (*.*)"
msgstr ""
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1355
+#: Merge.rc:1365
msgid "Add E&xclude File"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_SYS
-#: Merge.rc:1357
+#: Merge.rc:1367
msgid "&System Files"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_BACKUP
-#: Merge.rc:1358
+#: Merge.rc:1368
msgid "&Editor Backup Files"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_BIN
-#: Merge.rc:1359
+#: Merge.rc:1369
msgid "&Compiled Binary Files"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_LOG
-#: Merge.rc:1360
+#: Merge.rc:1370
msgid "&Log Files"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_TEMP
-#: Merge.rc:1361
+#: Merge.rc:1371
msgid "&Temporary or Cache Files"
msgstr ""
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1363
+#: Merge.rc:1373
msgid "Add Excl&ude Folder"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FOLDER_VCS
-#: Merge.rc:1365
+#: Merge.rc:1375
msgid "&Version Control"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FOLDER_BUILD
-#: Merge.rc:1366
+#: Merge.rc:1376
msgid "&Build Artifacts"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FOLDER_IDE
-#: Merge.rc:1367
+#: Merge.rc:1377
msgid "&IDE"
msgstr ""
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1370
+#: Merge.rc:1380
msgid "Add &File Condition"
msgstr ""
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1372 Merge.rc:1551
+#: Merge.rc:1382 Merge.rc:1561
msgid "File &Size"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_SIZE, ID_FILTERMENU_DIFF_SIZE_LT_1KB
-#: Merge.rc:1374 Merge.rc:1527 Merge.rc:1564 Merge.rc:1629 Merge.rc:1707
+#: Merge.rc:1384 Merge.rc:1537 Merge.rc:1574 Merge.rc:1639 Merge.rc:1717
msgid "Less than 1KB"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_SIZE, ID_FILTERMENU_DIFF_SIZE_GE_1KB
-#: Merge.rc:1375 Merge.rc:1528 Merge.rc:1565 Merge.rc:1630 Merge.rc:1708
+#: Merge.rc:1385 Merge.rc:1538 Merge.rc:1575 Merge.rc:1640 Merge.rc:1718
msgid "1KB or more"
msgstr ""
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_LT_10KB
-#: Merge.rc:1376 Merge.rc:1529 Merge.rc:1631
+#: Merge.rc:1386 Merge.rc:1539 Merge.rc:1641
msgid "Less than 10KB"
msgstr ""
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_GE_10KB
-#: Merge.rc:1377 Merge.rc:1530 Merge.rc:1632
+#: Merge.rc:1387 Merge.rc:1540 Merge.rc:1642
msgid "10KB or more"
msgstr ""
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_LT_100KB
-#: Merge.rc:1378 Merge.rc:1531 Merge.rc:1633
+#: Merge.rc:1388 Merge.rc:1541 Merge.rc:1643
msgid "Less than 100KB"
msgstr ""
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_GE_100KB
-#: Merge.rc:1379 Merge.rc:1532 Merge.rc:1634
+#: Merge.rc:1389 Merge.rc:1542 Merge.rc:1644
msgid "100KB or more"
msgstr ""
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_LT_1MB
-#: Merge.rc:1380 Merge.rc:1533 Merge.rc:1635
+#: Merge.rc:1390 Merge.rc:1543 Merge.rc:1645
msgid "Less than 1MB"
msgstr ""
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_GE_1MB
-#: Merge.rc:1381 Merge.rc:1534 Merge.rc:1636
+#: Merge.rc:1391 Merge.rc:1544 Merge.rc:1646
msgid "1MB or more"
msgstr ""
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_LT_10MB
-#: Merge.rc:1382 Merge.rc:1535 Merge.rc:1637
+#: Merge.rc:1392 Merge.rc:1545 Merge.rc:1647
msgid "Less than 10MB"
msgstr ""
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_GE_10MB
-#: Merge.rc:1383 Merge.rc:1536 Merge.rc:1638
+#: Merge.rc:1393 Merge.rc:1546 Merge.rc:1648
msgid "10MB or more"
msgstr ""
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_LT_100MB
-#: Merge.rc:1384 Merge.rc:1537 Merge.rc:1639
+#: Merge.rc:1394 Merge.rc:1547 Merge.rc:1649
msgid "Less than 100MB"
msgstr ""
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_GE_100MB
-#: Merge.rc:1385 Merge.rc:1538 Merge.rc:1640
+#: Merge.rc:1395 Merge.rc:1548 Merge.rc:1650
msgid "100MB or more"
msgstr ""
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_LT_1GB
-#: Merge.rc:1386 Merge.rc:1539 Merge.rc:1641
+#: Merge.rc:1396 Merge.rc:1549 Merge.rc:1651
msgid "Less than 1GB"
msgstr ""
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_GE_1GB
-#: Merge.rc:1387 Merge.rc:1642
+#: Merge.rc:1397 Merge.rc:1652
msgid "1GB or more"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_RANGE
-#: Merge.rc:1388 Merge.rc:1465 Merge.rc:1517 Merge.rc:1523 Merge.rc:1540
-#: Merge.rc:1566 Merge.rc:1587 Merge.rc:1643 Merge.rc:1709 Merge.rc:1734
+#: Merge.rc:1398 Merge.rc:1475 Merge.rc:1527 Merge.rc:1533 Merge.rc:1550
+#: Merge.rc:1576 Merge.rc:1597 Merge.rc:1653 Merge.rc:1719 Merge.rc:1744
msgid "Custom Range..."
msgstr ""
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1390 Merge.rc:1471 Merge.rc:1568
+#: Merge.rc:1400 Merge.rc:1481 Merge.rc:1578
msgid "&Last Modified"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE
-#: Merge.rc:1392 Merge.rc:1473 Merge.rc:1651
+#: Merge.rc:1402 Merge.rc:1483 Merge.rc:1661
msgid "&Hour"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_HOUR_BEFORE_1
-#: Merge.rc:1394 Merge.rc:1475 Merge.rc:1653
+#: Merge.rc:1404 Merge.rc:1485 Merge.rc:1663
msgid "More than 1 hour ago"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_HOUR_WITHIN_1
-#: Merge.rc:1395 Merge.rc:1476 Merge.rc:1654
+#: Merge.rc:1405 Merge.rc:1486 Merge.rc:1664
msgid "Within 1 hour"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE
-#: Merge.rc:1397 Merge.rc:1478 Merge.rc:1656
+#: Merge.rc:1407 Merge.rc:1488 Merge.rc:1666
msgid "&Day"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_DAY_BEFORE_TODAY
-#: Merge.rc:1399 Merge.rc:1480 Merge.rc:1658
+#: Merge.rc:1409 Merge.rc:1490 Merge.rc:1668
msgid "Before today"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_DAY_TODAY
-#: Merge.rc:1400 Merge.rc:1481 Merge.rc:1659
+#: Merge.rc:1410 Merge.rc:1491 Merge.rc:1669
msgid "Today"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_DAY_BEFORE_YESTERDAY
-#: Merge.rc:1401 Merge.rc:1482 Merge.rc:1660
+#: Merge.rc:1411 Merge.rc:1492 Merge.rc:1670
msgid "Before yesterday"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_DAY_YESTERDAY
-#: Merge.rc:1402 Merge.rc:1483 Merge.rc:1661
+#: Merge.rc:1412 Merge.rc:1493 Merge.rc:1671
msgid "Yesterday"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_DAY_SINCE_YESTERDAY
-#: Merge.rc:1403 Merge.rc:1484 Merge.rc:1662
+#: Merge.rc:1413 Merge.rc:1494 Merge.rc:1672
msgid "Since yesterday"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE
-#: Merge.rc:1405 Merge.rc:1486 Merge.rc:1664
+#: Merge.rc:1415 Merge.rc:1496 Merge.rc:1674
msgid "&Week"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_WEEK_BEFORE_THIS
-#: Merge.rc:1407 Merge.rc:1488 Merge.rc:1666
+#: Merge.rc:1417 Merge.rc:1498 Merge.rc:1676
msgid "Before this week"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_WEEK_THIS
-#: Merge.rc:1408 Merge.rc:1489 Merge.rc:1667
+#: Merge.rc:1418 Merge.rc:1499 Merge.rc:1677
msgid "This week"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_WEEK_BEFORE_LAST
-#: Merge.rc:1409 Merge.rc:1490 Merge.rc:1668
+#: Merge.rc:1419 Merge.rc:1500 Merge.rc:1678
msgid "Before last week"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_WEEK_LAST
-#: Merge.rc:1410 Merge.rc:1491 Merge.rc:1669
+#: Merge.rc:1420 Merge.rc:1501 Merge.rc:1679
msgid "Last week"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_WEEK_SINCE_LAST
-#: Merge.rc:1411 Merge.rc:1492 Merge.rc:1670
+#: Merge.rc:1421 Merge.rc:1502 Merge.rc:1680
msgid "Since last week"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE
-#: Merge.rc:1413 Merge.rc:1494 Merge.rc:1672
+#: Merge.rc:1423 Merge.rc:1504 Merge.rc:1682
msgid "&Month"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_MONTH_BEFORE_THIS
-#: Merge.rc:1415 Merge.rc:1496 Merge.rc:1674
+#: Merge.rc:1425 Merge.rc:1506 Merge.rc:1684
msgid "Before this month"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_MONTH_THIS
-#: Merge.rc:1416 Merge.rc:1497 Merge.rc:1675
+#: Merge.rc:1426 Merge.rc:1507 Merge.rc:1685
msgid "This month"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_MONTH_BEFORE_LAST
-#: Merge.rc:1417 Merge.rc:1498 Merge.rc:1676
+#: Merge.rc:1427 Merge.rc:1508 Merge.rc:1686
msgid "Before last month"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_MONTH_LAST
-#: Merge.rc:1418 Merge.rc:1499 Merge.rc:1677
+#: Merge.rc:1428 Merge.rc:1509 Merge.rc:1687
msgid "Last month"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_MONTH_SINCE_LAST
-#: Merge.rc:1419 Merge.rc:1500 Merge.rc:1678
+#: Merge.rc:1429 Merge.rc:1510 Merge.rc:1688
msgid "Since last month"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE
-#: Merge.rc:1421 Merge.rc:1502 Merge.rc:1680
+#: Merge.rc:1431 Merge.rc:1512 Merge.rc:1690
msgid "&Year"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_YEAR_BEFORE_THIS
-#: Merge.rc:1423 Merge.rc:1504 Merge.rc:1682
+#: Merge.rc:1433 Merge.rc:1514 Merge.rc:1692
msgid "Before this year"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_YEAR_THIS
-#: Merge.rc:1424 Merge.rc:1505 Merge.rc:1683
+#: Merge.rc:1434 Merge.rc:1515 Merge.rc:1693
msgid "This year"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_YEAR_BEFORE_LAST
-#: Merge.rc:1425 Merge.rc:1506 Merge.rc:1684
+#: Merge.rc:1435 Merge.rc:1516 Merge.rc:1694
msgid "Before last year"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_YEAR_LAST
-#: Merge.rc:1426 Merge.rc:1507 Merge.rc:1685
+#: Merge.rc:1436 Merge.rc:1517 Merge.rc:1695
msgid "Last year"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_YEAR_SINCE_LAST
-#: Merge.rc:1427 Merge.rc:1508 Merge.rc:1686
+#: Merge.rc:1437 Merge.rc:1518 Merge.rc:1696
msgid "Since last year"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_RANGE
-#: Merge.rc:1429 Merge.rc:1510 Merge.rc:1688
+#: Merge.rc:1439 Merge.rc:1520 Merge.rc:1698
msgid "&Custom Range..."
msgstr ""
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1431 Merge.rc:1589
+#: Merge.rc:1441 Merge.rc:1599
msgid "&Attributes"
msgstr ""
#. IDR_POPUP_FILTERMENU_ATTR, ID_FILTERMENU_ATTR_READONLY
-#: Merge.rc:1433 Merge.rc:1607
+#: Merge.rc:1443 Merge.rc:1617
msgid "Read-only files"
msgstr ""
#. IDR_POPUP_FILTERMENU_ATTR, ID_FILTERMENU_ATTR_NOT_READONLY
-#: Merge.rc:1434 Merge.rc:1608
+#: Merge.rc:1444 Merge.rc:1618
msgid "Not read-only files"
msgstr ""
#. IDR_POPUP_FILTERMENU_ATTR, ID_FILTERMENU_ATTR_HIDDEN
-#: Merge.rc:1435 Merge.rc:1609
+#: Merge.rc:1445 Merge.rc:1619
msgid "Hidden files"
msgstr ""
#. IDR_POPUP_FILTERMENU_ATTR, ID_FILTERMENU_ATTR_NOT_HIDDEN
-#: Merge.rc:1436 Merge.rc:1610
+#: Merge.rc:1446 Merge.rc:1620
msgid "Not hidden files"
msgstr ""
#. IDR_POPUP_FILTERMENU_ATTR, ID_FILTERMENU_ATTR_SYSTEM
-#: Merge.rc:1437 Merge.rc:1611
+#: Merge.rc:1447 Merge.rc:1621
msgid "System files"
msgstr ""
#. IDR_POPUP_FILTERMENU_ATTR, ID_FILTERMENU_ATTR_NOT_SYSTEM
-#: Merge.rc:1438 Merge.rc:1612
+#: Merge.rc:1448 Merge.rc:1622
msgid "Not system files"
msgstr ""
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1440
+#: Merge.rc:1450
msgid "File &Content"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_CONTAINS
-#: Merge.rc:1442
+#: Merge.rc:1452
msgid "Contains string..."
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_NOT_CONTAINS
-#: Merge.rc:1443
+#: Merge.rc:1453
msgid "Does not contain string..."
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_FIRST_LINE_CONTAINS
-#: Merge.rc:1444
+#: Merge.rc:1454
msgid "First line contains string..."
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_FIRST_LINE_NOT_CONTAINS
-#: Merge.rc:1445
+#: Merge.rc:1455
msgid "First line does not contain string..."
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_FIRST_10_CONTAINS
-#: Merge.rc:1446
+#: Merge.rc:1456
msgid "First 10 lines contain string..."
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_FIRST_10_NOT_CONTAINS
-#: Merge.rc:1447
+#: Merge.rc:1457
msgid "First 10 lines do not contain string..."
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_LAST_10_CONTAINS
-#: Merge.rc:1448
+#: Merge.rc:1458
msgid "Last 10 lines contain string..."
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_LAST_10_NOT_CONTAINS
-#: Merge.rc:1449
+#: Merge.rc:1459
msgid "Last 10 lines do not contain string..."
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_LAST_LINE_CONTAINS
-#: Merge.rc:1450
+#: Merge.rc:1460
msgid "Last line contains string..."
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_LAST_LINE_NOT_CONTAINS
-#: Merge.rc:1451
+#: Merge.rc:1461
msgid "Last line does not contain string..."
msgstr ""
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1453
+#: Merge.rc:1463
msgid "&Line Count"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_LT_10
-#: Merge.rc:1455
+#: Merge.rc:1465
msgid "Less than 10"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_GE_10
-#: Merge.rc:1456
+#: Merge.rc:1466
msgid "10 or more"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_LT_100
-#: Merge.rc:1457
+#: Merge.rc:1467
msgid "Less than 100"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_GE_100
-#: Merge.rc:1458
+#: Merge.rc:1468
msgid "100 or more"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_LT_1000
-#: Merge.rc:1459
+#: Merge.rc:1469
msgid "Less than 1000"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_GE_1000
-#: Merge.rc:1460
+#: Merge.rc:1470
msgid "1000 or more"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_LT_10000
-#: Merge.rc:1461
+#: Merge.rc:1471
msgid "Less than 10000"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_GE_10000
-#: Merge.rc:1462
+#: Merge.rc:1472
msgid "10000 or more"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_LT_100000
-#: Merge.rc:1463
+#: Merge.rc:1473
msgid "Less than 100000"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_GE_100000
-#: Merge.rc:1464
+#: Merge.rc:1474
msgid "100000 or more"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_PROPS
-#: Merge.rc:1467 Merge.rc:1594 Merge.rc:1761 Merge.rc:1778
+#: Merge.rc:1477 Merge.rc:1604 Merge.rc:1771 Merge.rc:1788
msgid "Additional &Properties..."
msgstr ""
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1469
+#: Merge.rc:1479
msgid "Add F&older Condition"
msgstr ""
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1513
+#: Merge.rc:1523
msgid "&Files"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FOLDER_FILES_EQ_0
-#: Merge.rc:1515
+#: Merge.rc:1525
msgid "0 files"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FOLDER_FILES_GE_1
-#: Merge.rc:1516
+#: Merge.rc:1526
msgid "1 file or more"
msgstr ""
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1519
+#: Merge.rc:1529
msgid "&Items"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FOLDER_ITEMS_EQ_0
-#: Merge.rc:1521
+#: Merge.rc:1531
msgid "0 items"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FOLDER_ITEMS_GE_1
-#: Merge.rc:1522
+#: Merge.rc:1532
msgid "1 item or more"
msgstr ""
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1525
+#: Merge.rc:1535
msgid "&Total Size"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FOLDER_STATS_RECURSIVE
-#: Merge.rc:1542
+#: Merge.rc:1552
msgid "&Recursive"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONDITION_ANY
-#: Merge.rc:1544
+#: Merge.rc:1554
msgid "Target: &Any (Left/Middle/Right)"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONDITION_LEFT
-#: Merge.rc:1545
+#: Merge.rc:1555
msgid "Target: &Left"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONDITION_MIDDLE
-#: Merge.rc:1546
+#: Merge.rc:1556
msgid "Target: &Middle"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONDITION_RIGHT
-#: Merge.rc:1547
+#: Merge.rc:1557
msgid "Target: &Right"
msgstr ""
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1549
+#: Merge.rc:1559
msgid "Add &Difference Condition"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_PROP, ID_FILTERMENU_DIFF_PROP_EQUAL
-#: Merge.rc:1553 Merge.rc:1570 Merge.rc:1591 Merge.rc:1696 Merge.rc:1717
-#: Merge.rc:1742
+#: Merge.rc:1563 Merge.rc:1580 Merge.rc:1601 Merge.rc:1706 Merge.rc:1727
+#: Merge.rc:1752
msgid "Equal"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_PROP, ID_FILTERMENU_DIFF_PROP_NOT_EQUAL
-#: Merge.rc:1554 Merge.rc:1571 Merge.rc:1592 Merge.rc:1697 Merge.rc:1718
-#: Merge.rc:1743
+#: Merge.rc:1564 Merge.rc:1581 Merge.rc:1602 Merge.rc:1707 Merge.rc:1728
+#: Merge.rc:1753
msgid "Not Equal"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_PROP, ID_FILTERMENU_DIFF_PROP_LESS
-#: Merge.rc:1555 Merge.rc:1572 Merge.rc:1698 Merge.rc:1719 Merge.rc:1744
+#: Merge.rc:1565 Merge.rc:1582 Merge.rc:1708 Merge.rc:1729 Merge.rc:1754
msgid "Less Than"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_PROP, ID_FILTERMENU_DIFF_PROP_LESS_EQUAL
-#: Merge.rc:1556 Merge.rc:1573 Merge.rc:1699 Merge.rc:1720 Merge.rc:1745
+#: Merge.rc:1566 Merge.rc:1583 Merge.rc:1709 Merge.rc:1730 Merge.rc:1755
msgid "Less Than or Equal to"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_PROP, ID_FILTERMENU_DIFF_PROP_GREATER
-#: Merge.rc:1557 Merge.rc:1574 Merge.rc:1700 Merge.rc:1721 Merge.rc:1746
+#: Merge.rc:1567 Merge.rc:1584 Merge.rc:1710 Merge.rc:1731 Merge.rc:1756
msgid "Greater Than"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_PROP, ID_FILTERMENU_DIFF_PROP_GREATER_EQUAL
-#: Merge.rc:1558 Merge.rc:1575 Merge.rc:1701 Merge.rc:1722 Merge.rc:1747
+#: Merge.rc:1568 Merge.rc:1585 Merge.rc:1711 Merge.rc:1732 Merge.rc:1757
msgid "Greater Than or Equal to"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_SIZE, ID_FILTERMENU_DIFF_SIZE_LT_10B
-#: Merge.rc:1560 Merge.rc:1703
+#: Merge.rc:1570 Merge.rc:1713
msgid "Less than 10B"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_SIZE, ID_FILTERMENU_DIFF_SIZE_GE_10B
-#: Merge.rc:1561 Merge.rc:1704
+#: Merge.rc:1571 Merge.rc:1714
msgid "10B or more"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_SIZE, ID_FILTERMENU_DIFF_SIZE_LT_100B
-#: Merge.rc:1562 Merge.rc:1705
+#: Merge.rc:1572 Merge.rc:1715
msgid "Less than 100B"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_SIZE, ID_FILTERMENU_DIFF_SIZE_GE_100B
-#: Merge.rc:1563 Merge.rc:1706
+#: Merge.rc:1573 Merge.rc:1716
msgid "100B or more"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_LT_1SECOND
-#: Merge.rc:1577 Merge.rc:1724
+#: Merge.rc:1587 Merge.rc:1734
msgid "Less than 1 second"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_GE_1SECOND
-#: Merge.rc:1578 Merge.rc:1725
+#: Merge.rc:1588 Merge.rc:1735
msgid "1 second or more"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_LT_1MINUTE
-#: Merge.rc:1579 Merge.rc:1726
+#: Merge.rc:1589 Merge.rc:1736
msgid "Less than 1 minute"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_GE_1MINUTE
-#: Merge.rc:1580 Merge.rc:1727
+#: Merge.rc:1590 Merge.rc:1737
msgid "1 minute or more"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_LT_1HOUR
-#: Merge.rc:1581 Merge.rc:1728
+#: Merge.rc:1591 Merge.rc:1738
msgid "Less than 1 hour"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_GE_1HOUR
-#: Merge.rc:1582 Merge.rc:1729
+#: Merge.rc:1592 Merge.rc:1739
msgid "1 hour or more"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_LT_1DAY
-#: Merge.rc:1583 Merge.rc:1730
+#: Merge.rc:1593 Merge.rc:1740
msgid "Less than 1 day"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_GE_1DAY
-#: Merge.rc:1584 Merge.rc:1731
+#: Merge.rc:1594 Merge.rc:1741
msgid "1 day or more"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_LT_1WEEK
-#: Merge.rc:1585 Merge.rc:1732
+#: Merge.rc:1595 Merge.rc:1742
msgid "Less than 1 week"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_GE_1WEEK
-#: Merge.rc:1586 Merge.rc:1733
+#: Merge.rc:1596 Merge.rc:1743
msgid "1 week or more"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_CONDITION_DIFF_LEFT_RIGHT
-#: Merge.rc:1596
+#: Merge.rc:1606
msgid "Target: &Left and Right"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_CONDITION_DIFF_LEFT_MIDDLE
-#: Merge.rc:1597
+#: Merge.rc:1607
msgid "Target: Left and &Middle"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_CONDITION_DIFF_MIDDLE_RIGHT
-#: Merge.rc:1598
+#: Merge.rc:1608
msgid "Target: Middle and &Right"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_CONDITION_DIFF_ALL
-#: Merge.rc:1599
+#: Merge.rc:1609
msgid "Target: &All"
msgstr ""
#. IDR_POPUP_FILTERMENU_BINARY, ID_FILTERMENU_BINARY_ONLY
-#: Merge.rc:1620
+#: Merge.rc:1630
msgid "Binary files only"
msgstr ""
#. IDR_POPUP_FILTERMENU_BINARY, ID_FILTERMENU_TEXT_ONLY
-#: Merge.rc:1621
+#: Merge.rc:1631
msgid "Text files only"
msgstr ""
#. IDR_POPUP_ADDCMPMENU, ID_ADDCMPMENU_CLEAR
-#: Merge.rc:1755
+#: Merge.rc:1765
msgid "&Clear conditions"
msgstr ""
#. IDR_POPUP_ADDCMPMENU, ID_ADDCMPMENU_CMP_SIZE
-#: Merge.rc:1757
+#: Merge.rc:1767
msgid "Compare &Size"
msgstr ""
#. IDR_POPUP_ADDCMPMENU, ID_ADDCMPMENU_CMP_DATE
-#: Merge.rc:1758
+#: Merge.rc:1768
msgid "Compare &Date"
msgstr ""
#. IDR_POPUP_ADDCMPMENU, ID_ADDCMPMENU_CMP_ATTR
-#: Merge.rc:1759
+#: Merge.rc:1769
msgid "Compare &Attributes"
msgstr ""
#. IDR_POPUP_ADDCMPMENU, ID_ADDCMPMENU_CMP_CONTENTS
-#: Merge.rc:1760
+#: Merge.rc:1770
msgid "Compare C&ontents"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_CLEAR
-#: Merge.rc:1769
+#: Merge.rc:1779
msgid "&Clear Keys"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_NAME
-#: Merge.rc:1771
+#: Merge.rc:1781
msgid "&Name"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_BASENAME
-#: Merge.rc:1772
+#: Merge.rc:1782
msgid "&Base name (without extension)"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_NORMALIZED_NAME
-#: Merge.rc:1773
+#: Merge.rc:1783
msgid "Normalized &Unicode Name"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_RELPATH
-#: Merge.rc:1774
+#: Merge.rc:1784
msgid "&Relative Path"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_DATE
-#: Merge.rc:1776
+#: Merge.rc:1786
msgid "&Date"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_HASH_MD5
-#: Merge.rc:1777
+#: Merge.rc:1787
msgid "&Hash (MD5)"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_REPLACE
-#: Merge.rc:1780
+#: Merge.rc:1790
msgid "Insert &replace() Function"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_REGEXREPLACE
-#: Merge.rc:1781
+#: Merge.rc:1791
msgid "Insert rege&xReplace() Function"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU
-#: Merge.rc:1782
+#: Merge.rc:1792
msgid "Replace &Lists"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_CREATE_REPLACELIST
-#: Merge.rc:1784
+#: Merge.rc:1794
msgid "&Create String Replace List and Insert..."
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_CREATE_REGEXREPLACELIST
-#: Merge.rc:1785
+#: Merge.rc:1795
msgid "Create &Regex Replace List and Insert..."
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU
-#: Merge.rc:1787
+#: Merge.rc:1797
msgid "&String Replace Lists"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU
-#: Merge.rc:1791
+#: Merge.rc:1801
msgid "Re&gex Replace Lists"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_STRING_REPLACE_LISTS_FOLDER
-#: Merge.rc:1796
+#: Merge.rc:1806
msgid "Open String Replace Lists Folder..."
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_REGEX_REPLACE_LISTS_FOLDER
-#: Merge.rc:1797
+#: Merge.rc:1807
msgid "Open Regex Replace Lists Folder..."
msgstr ""
#. IDD_FILTERS_CONDITION, IDC_CONDITION_MATCHCASE
-#: Merge.rc:1799 Merge.rc:1995 Merge.rc:2014 Merge.rc:2042 Merge.rc:2585
+#: Merge.rc:1809 Merge.rc:2005 Merge.rc:2024 Merge.rc:2052 Merge.rc:2595
#, c-format
msgid "Match &case"
msgstr "&Rozlišovat malá a velká písmena"
#. IDR_POPUP_RENAMEMOVE_MENU
-#: Merge.rc:1801
+#: Merge.rc:1811
msgid "Text &Normalization"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_TOLOWER
-#: Merge.rc:1803
+#: Merge.rc:1813
msgid "&Lowercase"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_TOUPPER
-#: Merge.rc:1804
+#: Merge.rc:1814
msgid "&Uppercase"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_TOHALFWIDTH
-#: Merge.rc:1805
+#: Merge.rc:1815
msgid "&Half-width"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_TOFULLWIDTH
-#: Merge.rc:1806
+#: Merge.rc:1816
msgid "&Full-width"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU
-#: Merge.rc:1807
+#: Merge.rc:1817
msgid "&Chinese Conversion"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_TOSIMPLIFIEDCHINESE
-#: Merge.rc:1809
+#: Merge.rc:1819
msgid "&Simplified Chinese"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_TOTRADITIONALCHINESE
-#: Merge.rc:1810
+#: Merge.rc:1820
msgid "&Traditional Chinese"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU
-#: Merge.rc:1812
+#: Merge.rc:1822
msgid "&Japanese Conversion"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_TOHIRAGANA
-#: Merge.rc:1814
+#: Merge.rc:1824
msgid "&Hiragana"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_TOKATAKANA
-#: Merge.rc:1815
+#: Merge.rc:1825
msgid "&Katakana"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_NORMALIZEUNICODE
-#: Merge.rc:1817
+#: Merge.rc:1827
msgid "Normalize &Unicode"
msgstr ""
#. IDD_ABOUTBOX
-#: Merge.rc:1932
+#: Merge.rc:1942
#, c-format
msgid "About WinMerge"
msgstr "O aplikaci WinMerge"
#. IDD_ABOUTBOX, IDC_WWW
-#: Merge.rc:1936
+#: Merge.rc:1946
msgid "Visit the WinMerge Homepage!"
msgstr "Navštivte domovskou stránku WinMerge!"
#. IDD_PLUGINS_EDITPLUGIN, IDOK
-#: Merge.rc:1938 Merge.rc:2080 Merge.rc:2431 Merge.rc:2455 Merge.rc:2469
-#: Merge.rc:2497 Merge.rc:2588 Merge.rc:2613 Merge.rc:2674 Merge.rc:2691
-#: Merge.rc:2703 Merge.rc:2867 Merge.rc:2927 Merge.rc:3062 Merge.rc:3104
-#: Merge.rc:3147 Merge.rc:3197
+#: Merge.rc:1948 Merge.rc:2090 Merge.rc:2441 Merge.rc:2465 Merge.rc:2479
+#: Merge.rc:2507 Merge.rc:2598 Merge.rc:2623 Merge.rc:2684 Merge.rc:2701
+#: Merge.rc:2713 Merge.rc:2877 Merge.rc:2937 Merge.rc:3072 Merge.rc:3114
+#: Merge.rc:3157 Merge.rc:3207
#, c-format
msgid "OK"
msgstr ""
#. IDD_ABOUTBOX, IDC_OPEN_CONTRIBUTORS
-#: Merge.rc:1939
+#: Merge.rc:1949
#, c-format
msgid "Contributors"
msgstr "Přispěvatelé"
#. IDD_SELECT_FILES_OR_FOLDERS
-#: Merge.rc:1945 Merge.rc:3070
+#: Merge.rc:1955 Merge.rc:3080
#, c-format
msgid "Select Files or Folders"
msgstr "Vybrat soubory nebo složky..."
#. IDD_OPEN, IDC_FILES_DIRS_GROUP0
-#: Merge.rc:1949
+#: Merge.rc:1959
#, c-format
msgid "&1st File or Folder"
msgstr ""
#. IDD_OPEN, IDC_PATH0_READONLY
-#: Merge.rc:1951
+#: Merge.rc:1961
#, c-format
msgid "Re&ad-only"
msgstr "Pouze pro čt&ení"
#. IDD_OPEN, IDC_SWAP01_STATIC
-#: Merge.rc:1953
+#: Merge.rc:1963
#, c-format
msgid "Swap 1st | 2nd"
msgstr ""
#. IDD_GENERATE_PATCH, IDC_DIFF_BROWSE_FILE1
-#: Merge.rc:1954 Merge.rc:2310 Merge.rc:2413
+#: Merge.rc:1964 Merge.rc:2320 Merge.rc:2423
#, c-format
msgid "&Browse..."
msgstr "&Procházet..."
#. IDD_OPEN, IDC_FILES_DIRS_GROUP1
-#: Merge.rc:1955
+#: Merge.rc:1965
#, c-format
msgid "&2nd File or Folder"
msgstr ""
#. IDD_OPEN, IDC_PATH1_READONLY
-#: Merge.rc:1957
+#: Merge.rc:1967
#, c-format
msgid "Rea&d-only"
msgstr ""
#. IDD_OPEN, IDC_SWAP12_STATIC
-#: Merge.rc:1959
+#: Merge.rc:1969
#, c-format
msgid "Swap 2nd | 3rd"
msgstr ""
#. IDD_PROPPAGE_SYSTEM, IDC_FILTER_USER_BROWSE
-#: Merge.rc:1960 Merge.rc:2315
+#: Merge.rc:1970 Merge.rc:2325
#, c-format
msgid "B&rowse..."
msgstr "Pr&ocházet..."
#. IDD_OPEN, IDC_FILES_DIRS_GROUP2
-#: Merge.rc:1961
+#: Merge.rc:1971
#, c-format
msgid "&3rd File or Folder (Optional)"
msgstr ""
#. IDD_OPEN, IDC_PATH2_READONLY
-#: Merge.rc:1963
+#: Merge.rc:1973
#, c-format
msgid "Read-o&nly"
msgstr ""
#. IDD_OPEN, IDC_SWAP02_STATIC
-#: Merge.rc:1965
+#: Merge.rc:1975
#, c-format
msgid "Swap 1st | 3rd"
msgstr ""
#. IDD_PROPPAGE_BACKUPS, IDC_BACKUP_BROWSE
-#: Merge.rc:1966 Merge.rc:2685 Merge.rc:2883
+#: Merge.rc:1976 Merge.rc:2695 Merge.rc:2893
#, c-format
msgid "Browse..."
msgstr "Pr&ocházet..."
#. IDD_OPEN, IDC_FILES_DIRS_GROUP3
-#: Merge.rc:1968
+#: Merge.rc:1978
#, c-format
msgid " Folder: Filter"
msgstr ""
#. IDD_OPEN, IDC_RECURS_CHECK
-#: Merge.rc:1971
+#: Merge.rc:1981
msgid "&Include subfolders"
msgstr "Včetně pod&složek"
#. IDD_OPEN, IDC_FILES_DIRS_GROUP5
-#: Merge.rc:1972
+#: Merge.rc:1982
msgid " File: Prediffer Plugin"
msgstr ""
#. IDD_OPEN, IDC_FILES_DIRS_GROUP4
-#: Merge.rc:1976
+#: Merge.rc:1986
#, c-format
msgid " File: Unpacker Plugin"
msgstr ""
#. IDD_OPEN, IDC_SELECT_UNPACKER
-#: Merge.rc:1978
+#: Merge.rc:1988
#, c-format
msgid "Se&lect..."
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN, IDCANCEL
-#: Merge.rc:1981 Merge.rc:2001 Merge.rc:2025 Merge.rc:2046 Merge.rc:2081
-#: Merge.rc:2432 Merge.rc:2456 Merge.rc:2470 Merge.rc:2498 Merge.rc:2551
-#: Merge.rc:2589 Merge.rc:2614 Merge.rc:2675 Merge.rc:2692 Merge.rc:2704
-#: Merge.rc:2868 Merge.rc:2928 Merge.rc:3087 Merge.rc:3105 Merge.rc:3148
-#: Merge.rc:3198
+#: Merge.rc:1991 Merge.rc:2011 Merge.rc:2035 Merge.rc:2056 Merge.rc:2091
+#: Merge.rc:2442 Merge.rc:2466 Merge.rc:2480 Merge.rc:2508 Merge.rc:2561
+#: Merge.rc:2599 Merge.rc:2624 Merge.rc:2685 Merge.rc:2702 Merge.rc:2714
+#: Merge.rc:2878 Merge.rc:2938 Merge.rc:3097 Merge.rc:3115 Merge.rc:3158
+#: Merge.rc:3208
#, c-format
msgid "Cancel"
msgstr "Storno"
#. IDD_OPEN, IDC_OPEN_STATUS
-#: Merge.rc:1982
+#: Merge.rc:1992
#, c-format
msgid "Status:"
msgstr ""
#. IDD_PLUGINS_LIST, ID_HELP
-#: Merge.rc:1983 Merge.rc:2082 Merge.rc:2929
+#: Merge.rc:1993 Merge.rc:2092 Merge.rc:2939
#, c-format
msgid "Help"
msgstr "Nápověda"
#. IDD_OPEN, IDC_OPTIONS
-#: Merge.rc:1984
+#: Merge.rc:1994
msgid "&Options..."
msgstr "Možnost&i..."
#. IDD_EDIT_FIND
-#: Merge.rc:1989
+#: Merge.rc:1999
#, c-format
msgid "Find"
msgstr "Najít"
#. IDD_EDIT_MARKER, IDC_STATIC
-#: Merge.rc:1992 Merge.rc:2009 Merge.rc:2037
+#: Merge.rc:2002 Merge.rc:2019 Merge.rc:2047
#, c-format
msgid "Fi&nd what:"
msgstr "C&o hledat:"
#. IDD_EDIT_MARKER, IDC_EDIT_WHOLE_WORD
-#: Merge.rc:1994 Merge.rc:2013 Merge.rc:2041
+#: Merge.rc:2004 Merge.rc:2023 Merge.rc:2051
#, c-format
msgid "Match &whole word only"
msgstr "Pouze &celá slova"
#. IDD_EDIT_MARKER, IDC_EDIT_REGEXP
-#: Merge.rc:1996 Merge.rc:2015 Merge.rc:2043
+#: Merge.rc:2006 Merge.rc:2025 Merge.rc:2053
#, c-format
msgid "Regular &expression"
msgstr "R&egulérní výraz"
#. IDD_EDIT_FIND, IDC_FINDDLG_DONTWRAP
-#: Merge.rc:1997
+#: Merge.rc:2007
#, c-format
msgid "D&on't wrap end of file"
msgstr "Zastavit na &konci souboru"
#. IDD_EDIT_FIND, IDC_FINDDLG_DONTCLOSE
-#: Merge.rc:1998
+#: Merge.rc:2008
#, c-format
msgid "&Don't close this dialog"
msgstr ""
#. IDD_EDIT_REPLACE, IDC_EDIT_SKIP
-#: Merge.rc:1999 Merge.rc:2021
+#: Merge.rc:2009 Merge.rc:2031
#, c-format
msgid "&Find Next"
msgstr "&Najít další"
#. IDD_EDIT_FIND, IDC_EDIT_FINDPREV
-#: Merge.rc:2000
+#: Merge.rc:2010
#, c-format
msgid "Find &Prev"
msgstr ""
#. IDD_EDIT_REPLACE
-#: Merge.rc:2006
+#: Merge.rc:2016
#, c-format
msgid "Replace"
msgstr "Nahradit"
#. IDD_EDIT_REPLACE, IDC_STATIC
-#: Merge.rc:2011
+#: Merge.rc:2021
#, c-format
msgid "Re&place with:"
msgstr "Čí&m nahradit:"
#. IDD_EDIT_REPLACE, IDC_EDIT_SCOPE_DONT_WRAP
-#: Merge.rc:2016
+#: Merge.rc:2026
#, c-format
msgid "&Don't wrap at end of file"
msgstr "Zastavit na &konci souboru"
#. IDD_EDIT_REPLACE, IDC_STATIC
-#: Merge.rc:2018
+#: Merge.rc:2028
#, c-format
msgid "Replace in"
msgstr "Nahrazovat"
#. IDD_EDIT_REPLACE, IDC_EDIT_SCOPE_WHOLE_FILE
-#: Merge.rc:2020
+#: Merge.rc:2030
#, c-format
msgid "Wh&ole file"
msgstr "v ce&lém souboru"
#. IDD_EDIT_REPLACE, IDC_EDIT_FINDPREV
-#: Merge.rc:2022
+#: Merge.rc:2032
msgid "Find Pre&v"
msgstr ""
#. IDD_EDIT_REPLACE, IDC_EDIT_REPLACE
-#: Merge.rc:2023
+#: Merge.rc:2033
#, c-format
msgid "&Replace"
msgstr "Na&hradit"
#. IDD_EDIT_REPLACE, IDC_EDIT_REPLACE_ALL
-#: Merge.rc:2024
+#: Merge.rc:2034
#, c-format
msgid "Replace &All"
msgstr "Nahradit &vše"
#. IDS_OPTIONSPG_MARKERCOLORS
-#: Merge.rc:2030 Merge.rc:4209
+#: Merge.rc:2040 Merge.rc:4219
#, c-format
msgid "Markers"
msgstr ""
#. IDD_EDIT_MARKER, IDC_EDIT_MARKERS_ENABLED
-#: Merge.rc:2033
+#: Merge.rc:2043
#, c-format
msgid "Enable &markers"
msgstr ""
#. IDD_FILTERS_LINEFILTERS, IDC_LFILTER_ADDBTN
-#: Merge.rc:2035 Merge.rc:2057
+#: Merge.rc:2045 Merge.rc:2067
#, c-format
msgid "New"
msgstr "&Nový"
#. IDD_EDIT_MARKER, IDC_STATIC
-#: Merge.rc:2039
+#: Merge.rc:2049
#, c-format
msgid "&Background color:"
msgstr ""
#. IDS_MESSAGEBOX_OK
-#: Merge.rc:2044 Merge.rc:2829 Merge.rc:3086 Merge.rc:4171
+#: Merge.rc:2054 Merge.rc:2839 Merge.rc:3096 Merge.rc:4181
#, c-format
msgid "&Ok"
msgstr "&OK"
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:2045 Merge.rc:2525 Merge.rc:3199
+#: Merge.rc:2055 Merge.rc:2535 Merge.rc:3209
#, c-format
msgid "&Apply"
msgstr "P&oužít"
#. IDD_FILTERS_LINEFILTERS
-#: Merge.rc:2051
+#: Merge.rc:2061
msgid "Line Filters"
msgstr ""
#. IDD_FILTERS_LINEFILTERS, IDC_IGNOREREGEXP
-#: Merge.rc:2054
+#: Merge.rc:2064
#, c-format
msgid "Enable Line Filters"
msgstr "Povolit filtrování řádků"
#. IDD_FILTERS_LINEFILTERS, IDC_STATIC
-#: Merge.rc:2055
+#: Merge.rc:2065
#, c-format
msgid "Regular Expressions (one per line):"
msgstr "Regulérní výrazy (jeden na řádek):"
#. IDD_PLUGINS_LIST, IDC_PLUGIN_EDIT
-#: Merge.rc:2058 Merge.rc:2924
+#: Merge.rc:2068 Merge.rc:2934
#, c-format
msgid "Edit"
msgstr "Upr&avit"
#. IDD_PLUGINS_LIST, IDC_PLUGIN_REMOVE
-#: Merge.rc:2059 Merge.rc:2071 Merge.rc:2925
+#: Merge.rc:2069 Merge.rc:2081 Merge.rc:2935
#, c-format
msgid "Remove"
msgstr "O&dstranit"
#. IDD_FILTERS_SUBSTITUTIONFILTERS
-#: Merge.rc:2064
+#: Merge.rc:2074
msgid "Substitution Filters"
msgstr ""
#. IDD_FILTERS_SUBSTITUTIONFILTERS, IDC_STATIC
-#: Merge.rc:2067
+#: Merge.rc:2077
msgid "Changes to the listed pairs below will be ignored or marked as insignificant. Patches are unaffected."
msgstr ""
#. IDD_FILTERS_SUBSTITUTIONFILTERS, IDC_IGNORED_SUSBSTITUTIONS_ENABLED
-#: Merge.rc:2068
+#: Merge.rc:2078
msgid "Enable"
msgstr ""
#. IDD_PLUGINS_LIST, IDC_PLUGIN_ADD
-#: Merge.rc:2070 Merge.rc:2923
+#: Merge.rc:2080 Merge.rc:2933
msgid "Add"
msgstr ""
#. IDD_FILTERS_SUBSTITUTIONFILTERS, IDC_LFILTER_CLEARBTN
-#: Merge.rc:2072
+#: Merge.rc:2082
msgid "Clear"
msgstr ""
#. IDD_PREFERENCES
-#: Merge.rc:2077
+#: Merge.rc:2087
#, c-format
msgid "Options"
msgstr "Možnosti"
#. IDD_PREFERENCES, IDC_TREEOPT_IMPORT
-#: Merge.rc:2086
+#: Merge.rc:2096
#, c-format
msgid "Import..."
msgstr "&Načíst..."
#. IDD_PREFERENCES, IDC_TREEOPT_EXPORT
-#: Merge.rc:2087
+#: Merge.rc:2097
#, c-format
msgid "Export..."
msgstr "&Uložit..."
#. IDS_OPTIONSPG_GENCOMPARE
-#: Merge.rc:2092 Merge.rc:4199 Merge.rc:4202 Merge.rc:4219
+#: Merge.rc:2102 Merge.rc:4209 Merge.rc:4212 Merge.rc:4229
#, c-format
msgid "General"
msgstr "Obecné"
#. IDD_PROPPAGE_GENERAL, IDC_SCROLL_CHECK
-#: Merge.rc:2095
+#: Merge.rc:2105
#, c-format
msgid "Automatically &scroll to first difference"
msgstr "Automaticky posunout na pr&vní rozdíl"
#. IDD_PROPPAGE_GENERAL, IDC_SCROLL_TO_FIRST_INLINE_DIFF_CHECK
-#: Merge.rc:2097
+#: Merge.rc:2107
msgid "Automatically s&croll to first inline difference"
msgstr ""
#. IDD_PROPPAGE_GENERAL, IDC_STATIC
-#: Merge.rc:2099
+#: Merge.rc:2109
msgid "Cl&ose windows with 'Esc':"
msgstr "Zavírat okna klávesou '&Esc':"
#. IDD_PROPPAGE_GENERAL, IDC_VERIFY_OPEN_PATHS
-#: Merge.rc:2101
+#: Merge.rc:2111
#, c-format
msgid "&Automatically verify paths in Open dialog"
msgstr "Automaticky &ověřovat cesty v dialogu Otevřít"
#. IDD_PROPPAGE_GENERAL, IDC_STATIC
-#: Merge.rc:2103
+#: Merge.rc:2113
msgid "Single instance mode:"
msgstr ""
#. IDD_PROPPAGE_GENERAL, IDC_ASK_MULTIWINDOW_CLOSE
-#: Merge.rc:2105
+#: Merge.rc:2115
#, c-format
msgid "As&k when closing multiple windows"
msgstr "Dotázat se na &zavření více oken"
#. IDD_PROPPAGE_GENERAL, IDC_PRESERVE_FILETIME
-#: Merge.rc:2107
+#: Merge.rc:2117
#, c-format
msgid "&Preserve file time in file compare"
msgstr "Z&achovávat původní čas souboru"
#. IDD_PROPPAGE_GENERAL, IDC_STARTUP_FOLDER_SELECT
-#: Merge.rc:2109
+#: Merge.rc:2119
#, c-format
msgid "Show \"Select Files or Folders\" dialog on startup"
msgstr "&Po spuštění vybrat soubory nebo složky"
#. IDD_PROPPAGE_GENERAL, IDC_CLOSE_WITH_OK
-#: Merge.rc:2111
+#: Merge.rc:2121
msgid "Close \"Select Files or Folders\" dialog on clicking Compare button"
msgstr ""
#. IDD_PROPPAGE_GENERAL, IDC_STATIC
-#: Merge.rc:2113
+#: Merge.rc:2123
#, c-format
msgid "Op&en dialog Auto completion:"
msgstr "Automatické &dokončování:"
#. IDD_PROPPAGE_GENERAL, IDC_STATIC
-#: Merge.rc:2115
+#: Merge.rc:2125
msgid "Auto-&reload modified files:"
msgstr ""
#. IDD_PROPPAGE_GENERAL, IDC_STATIC
-#: Merge.rc:2117
+#: Merge.rc:2127
#, c-format
msgid "Language:"
msgstr ""
#. IDD_PROPPAGE_COMPARE_WEBPAGE, IDC_COMPARE_DEFAULTS
-#: Merge.rc:2119 Merge.rc:2299 Merge.rc:2321 Merge.rc:2352 Merge.rc:2369
-#: Merge.rc:2386 Merge.rc:2394 Merge.rc:2430 Merge.rc:2454 Merge.rc:2633
-#: Merge.rc:2644 Merge.rc:2653 Merge.rc:2887 Merge.rc:2922 Merge.rc:2985
-#: Merge.rc:3010 Merge.rc:3024 Merge.rc:3038 Merge.rc:3054
+#: Merge.rc:2129 Merge.rc:2309 Merge.rc:2331 Merge.rc:2362 Merge.rc:2379
+#: Merge.rc:2396 Merge.rc:2404 Merge.rc:2440 Merge.rc:2464 Merge.rc:2643
+#: Merge.rc:2654 Merge.rc:2663 Merge.rc:2897 Merge.rc:2932 Merge.rc:2995
+#: Merge.rc:3020 Merge.rc:3034 Merge.rc:3048 Merge.rc:3064
#, c-format
msgid "Defaults"
msgstr "&Původní"
#. IDS_OPTIONSPG_COLORS
-#: Merge.rc:2124 Merge.rc:2140 Merge.rc:2267 Merge.rc:2292 Merge.rc:4205
+#: Merge.rc:2134 Merge.rc:2150 Merge.rc:2277 Merge.rc:2302 Merge.rc:4215
#, c-format
msgid "Colors"
msgstr "Barvy"
#. IDD_PROPPAGE_COLOR_SCHEMES, IDC_STATIC
-#: Merge.rc:2127
+#: Merge.rc:2137
msgid "Color &mode:"
msgstr ""
#. IDD_PROPPAGE_COLOR_SCHEMES, IDC_STATIC
-#: Merge.rc:2129
+#: Merge.rc:2139
msgid "&Light mode scheme:"
msgstr ""
#. IDD_PROPPAGE_COLOR_SCHEMES, IDC_STATIC
-#: Merge.rc:2131
+#: Merge.rc:2141
msgid "&Dark mode scheme:"
msgstr ""
#. IDD_PROPPAGE_COLOR_SCHEMES, IDC_STATIC
-#: Merge.rc:2133
+#: Merge.rc:2143
msgid "Your custom schemes"
msgstr ""
#. IDD_PROPPAGE_COLOR_SCHEMES, IDC_COLOR_SCHEME_SAVE
-#: Merge.rc:2134
+#: Merge.rc:2144
msgid "&Save current scheme..."
msgstr ""
#. IDD_PROPPAGE_COLOR_SCHEMES, IDC_COLOR_SCHEME_DELETE
-#: Merge.rc:2135
+#: Merge.rc:2145
msgid "Delete ¤t scheme..."
msgstr ""
#. IDD_PROPPAGE_COLORS_DIR, IDC_BACKGROUND_COLUMN_LABEL
-#: Merge.rc:2143 Merge.rc:2238 Merge.rc:2258 Merge.rc:2272
+#: Merge.rc:2153 Merge.rc:2248 Merge.rc:2268 Merge.rc:2282
#, c-format
msgid "Background"
msgstr "Pozadí"
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2144
+#: Merge.rc:2154
#, c-format
msgid "Deleted"
msgstr "Chybějící"
#. IDS_OPTIONSPG_TEXTCOLORS
-#: Merge.rc:2145 Merge.rc:2207 Merge.rc:2239 Merge.rc:2273 Merge.rc:4207
+#: Merge.rc:2155 Merge.rc:2217 Merge.rc:2249 Merge.rc:2283 Merge.rc:4217
#, c-format
msgid "Text"
msgstr "Text"
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2146
+#: Merge.rc:2156
#, c-format
msgid "Difference:"
msgstr "Rozdíl:"
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2151
+#: Merge.rc:2161
#, c-format
msgid "Selected Difference:"
msgstr "Vybraný rozdíl:"
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2156
+#: Merge.rc:2166
#, c-format
msgid "Ignored Difference:"
msgstr "Ignorovaný rozdíl:"
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2161
+#: Merge.rc:2171
#, c-format
msgid "Moved:"
msgstr "Přesunutý blok:"
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2166
+#: Merge.rc:2176
#, c-format
msgid "Selected Moved:"
msgstr "Vybraný přesunutý blok:"
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2171
+#: Merge.rc:2181
#, c-format
msgid "Same As Next (3 panes):"
msgstr ""
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2176
+#: Merge.rc:2186
#, c-format
msgid "Same As Next (Selected):"
msgstr ""
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2181
+#: Merge.rc:2191
#, c-format
msgid "Word Difference:"
msgstr "Rozdílné slovo:"
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2186
+#: Merge.rc:2196
#, c-format
msgid "Selected Word Diff:"
msgstr "Vybrané rozdílné slovo:"
#. IDD_INPUTBOX
-#: Merge.rc:2195 Merge.rc:2230 Merge.rc:2251 Merge.rc:3099
+#: Merge.rc:2205 Merge.rc:2240 Merge.rc:2261 Merge.rc:3109
#, c-format
msgid "Dialog"
msgstr "Syntaxe"
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC
-#: Merge.rc:2198
+#: Merge.rc:2208
#, c-format
msgid "Keywords:"
msgstr "Klíčová slova:"
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC
-#: Merge.rc:2199
+#: Merge.rc:2209
#, c-format
msgid "Function names:"
msgstr "Názvy funkcí:"
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC
-#: Merge.rc:2200
+#: Merge.rc:2210
#, c-format
msgid "Comments:"
msgstr "Komentáře:"
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC
-#: Merge.rc:2201
+#: Merge.rc:2211
#, c-format
msgid "Numbers:"
msgstr "Čísla:"
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC
-#: Merge.rc:2202
+#: Merge.rc:2212
#, c-format
msgid "Operators:"
msgstr "Operátory:"
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC
-#: Merge.rc:2203
+#: Merge.rc:2213
#, c-format
msgid "Strings:"
msgstr "Řetězce:"
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC
-#: Merge.rc:2204
+#: Merge.rc:2214
#, c-format
msgid "Preprocessor:"
msgstr "Preprocesor:"
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC
-#: Merge.rc:2205
+#: Merge.rc:2215
#, c-format
msgid "User 1:"
msgstr "Uživatelská 1:"
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC
-#: Merge.rc:2206
+#: Merge.rc:2216
#, c-format
msgid "User 2:"
msgstr "Uživatelská 2:"
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_SCOLOR_USER2_BOLD
-#: Merge.rc:2209 Merge.rc:2211 Merge.rc:2213 Merge.rc:2215 Merge.rc:2217
-#: Merge.rc:2219 Merge.rc:2221 Merge.rc:2223 Merge.rc:2225
+#: Merge.rc:2219 Merge.rc:2221 Merge.rc:2223 Merge.rc:2225 Merge.rc:2227
+#: Merge.rc:2229 Merge.rc:2231 Merge.rc:2233 Merge.rc:2235
#, c-format
msgid "Bold"
msgstr "Tučné"
#. IDD_PROPPAGE_COLORS_TEXT, IDC_DEFAULT_STANDARD_COLORS
-#: Merge.rc:2233
+#: Merge.rc:2243
#, c-format
msgid "&Use customized text colors"
msgstr "Po&užít vlastní barvy textu"
#. IDD_PROPPAGE_COLORS_TEXT, IDC_WHITESPACE_COLOR_LABEL
-#: Merge.rc:2235
+#: Merge.rc:2245
#, c-format
msgid "Whitespace:"
msgstr "Okolí textu:"
#. IDD_PROPPAGE_COLORS_TEXT, IDC_TEXT_COLOR_LABEL
-#: Merge.rc:2236
+#: Merge.rc:2246
#, c-format
msgid "Regular text:"
msgstr "Řádný text:"
#. IDD_PROPPAGE_COLORS_TEXT, IDC_SELECTION_COLOR_LABEL
-#: Merge.rc:2237
+#: Merge.rc:2247
#, c-format
msgid "Selection:"
msgstr "Výběr:"
#. IDD_PROPPAGE_COLORS_DIR, IDC_STATIC
-#: Merge.rc:2245 Merge.rc:2286
+#: Merge.rc:2255 Merge.rc:2296
#, c-format
msgid "Margin:"
msgstr ""
#. IDD_PROPPAGE_COLORS_MARKER, IDC_MARKER0_COLOR_LABEL
-#: Merge.rc:2254
+#: Merge.rc:2264
#, c-format
msgid "Search Marker:"
msgstr ""
#. IDD_PROPPAGE_COLORS_MARKER, IDC_MARKER1_COLOR_LABEL
-#: Merge.rc:2255
+#: Merge.rc:2265
#, c-format
msgid "User Defined Marker 1:"
msgstr ""
#. IDD_PROPPAGE_COLORS_MARKER, IDC_MARKER2_COLOR_LABEL
-#: Merge.rc:2256
+#: Merge.rc:2266
#, c-format
msgid "User Defined Marker 2:"
msgstr ""
#. IDD_PROPPAGE_COLORS_MARKER, IDC_MARKER3_COLOR_LABEL
-#: Merge.rc:2257
+#: Merge.rc:2267
#, c-format
msgid "User Defined Marker 3:"
msgstr ""
#. IDD_PROPPAGE_COLORS_DIR, IDC_USE_DIR_COMPARE_COLORS
-#: Merge.rc:2270
+#: Merge.rc:2280
msgid "&Use folder compare colors"
msgstr ""
#. IDD_PROPPAGE_COLORS_DIR, IDC_STATIC
-#: Merge.rc:2274
+#: Merge.rc:2284
msgid "Items equal:"
msgstr ""
#. IDD_PROPPAGE_COLORS_DIR, IDC_STATIC
-#: Merge.rc:2277
+#: Merge.rc:2287
msgid "Items different:"
msgstr ""
#. IDD_PROPPAGE_COLORS_DIR, IDC_STATIC
-#: Merge.rc:2280
+#: Merge.rc:2290
msgid "Items missing:"
msgstr ""
#. IDD_PROPPAGE_COLORS_DIR, IDC_STATIC
-#: Merge.rc:2283
+#: Merge.rc:2293
msgid "Items filtered:"
msgstr ""
#. IDD_PROPPAGE_COLORS_SYSTEM, IDC_SYSCOLOR_HOOK_ENABLED
-#: Merge.rc:2295
+#: Merge.rc:2305
msgid "&Use custom system colors"
msgstr ""
#. IDS_PRPCAT_SYSTEM
-#: Merge.rc:2304 Merge.rc:4211 Merge.rc:4212 Merge.rc:4657
+#: Merge.rc:2314 Merge.rc:4221 Merge.rc:4222 Merge.rc:4667
#, c-format
msgid "System"
msgstr "Systém"
#. IDD_PROPPAGE_SYSTEM, IDC_USE_RECYCLE_BIN
-#: Merge.rc:2307
+#: Merge.rc:2317
#, c-format
msgid "&Use Recycle Bin"
msgstr "Odeslat odstraněné soubory do &koše"
#. IDD_PROPPAGE_SYSTEM, IDC_STATIC
-#: Merge.rc:2308
+#: Merge.rc:2318
#, c-format
msgid "&External editor:"
msgstr "&Externí editor:"
#. IDD_PROPPAGE_SYSTEM, IDC_STATIC
-#: Merge.rc:2311
+#: Merge.rc:2321
msgid "&Store user data in:"
msgstr ""
#. IDD_PROPPAGE_SYSTEM, IDC_STATIC
-#: Merge.rc:2313
+#: Merge.rc:2323
#, c-format
msgid "&Filter folder:"
msgstr "Složka vlastních &filtrů:"
#. IDD_PROPPAGE_SYSTEM, IDC_STATIC
-#: Merge.rc:2316
+#: Merge.rc:2326
#, c-format
msgid "Temporary files folder"
msgstr "Složka &dočasných souborů"
#. IDD_PROPPAGE_SYSTEM, IDC_TMPFOLDER_SYSTEM
-#: Merge.rc:2317
+#: Merge.rc:2327
#, c-format
msgid "S&ystem temp folder"
msgstr "Sys&témová složka dočasných souborů"
#. IDD_PROPPAGE_SYSTEM, IDC_STATIC
-#: Merge.rc:2318
+#: Merge.rc:2328
#, c-format
msgid "C&ustom folder:"
msgstr "&Vlastní složka:"
#. IDD_GENERATE_PATCH, IDC_DIFF_BROWSE_FILE2
-#: Merge.rc:2320 Merge.rc:2416
+#: Merge.rc:2330 Merge.rc:2426
#, c-format
msgid "Br&owse..."
msgstr "Procházet..."
#. IDS_OPTIONSPG_COMPARE
-#: Merge.rc:2326 Merge.rc:4200
+#: Merge.rc:2336 Merge.rc:4210
#, c-format
msgid "Compare"
msgstr "Porovnávání"
#. IDD_PROPPAGE_COMPARE, IDC_STATIC
-#: Merge.rc:2329
+#: Merge.rc:2339
#, c-format
msgid "Whitespaces"
msgstr "Prázdná místa"
#. IDD_PROPPAGE_COMPARE, IDC_WHITESPACE
-#: Merge.rc:2330
+#: Merge.rc:2340
#, c-format
msgid "&Compare"
msgstr "P&orovnávat"
#. IDD_PROPPAGE_COMPARE, IDC_WHITE_CHANGE
-#: Merge.rc:2331
+#: Merge.rc:2341
#, c-format
msgid "&Ignore change"
msgstr "Ignorovat &změny"
#. IDD_PROPPAGE_COMPARE, IDC_ALL_WHITE
-#: Merge.rc:2332
+#: Merge.rc:2342
#, c-format
msgid "I&gnore all"
msgstr "Ignorovat &všechny"
#. IDD_PROPPAGE_COMPARE, IDC_IGNBLANKS_CHECK
-#: Merge.rc:2333
+#: Merge.rc:2343
msgid "Ignore blan&k lines"
msgstr "Ignorovat prázdné řá&dky"
#. IDD_PROPPAGE_COMPARE, IDC_IGNCASE_CHECK
-#: Merge.rc:2334
+#: Merge.rc:2344
msgid "Ignore &case"
msgstr "Ignorovat &malá a velká písmena"
#. IDD_PROPPAGE_COMPARE, IDC_EOL_SENSITIVE
-#: Merge.rc:2335
+#: Merge.rc:2345
msgid "Igno&re EOL differences (Windows/Unix/Mac)"
msgstr ""
#. IDD_PROPPAGE_COMPARE, IDC_IGNORE_NUMBERS
-#: Merge.rc:2337
+#: Merge.rc:2347
msgid "Ignore num&bers"
msgstr ""
#. IDD_PROPPAGE_COMPARE, IDC_CP_SENSITIVE
-#: Merge.rc:2338
+#: Merge.rc:2348
msgid "Ignore codepage &differences"
msgstr ""
#. IDD_PROPPAGE_COMPARE, IDC_FILTERCOMMENTS_CHECK
-#: Merge.rc:2339
+#: Merge.rc:2349
msgid "Ignore c&omment differences"
msgstr ""
#. IDD_PROPPAGE_COMPARE, IDC_IGNEOFEOL_CHECK
-#: Merge.rc:2341
+#: Merge.rc:2351
msgid "Ignore &missing trailing EOL"
msgstr ""
#. IDD_PROPPAGE_COMPARE, IDC_IGNLBRKS_CHECK
-#: Merge.rc:2343
+#: Merge.rc:2353
msgid "Ignore line &breaks (treat as spaces)"
msgstr ""
#. IDD_PROPPAGE_COMPARE, IDC_MOVED_BLOCKS
-#: Merge.rc:2345
+#: Merge.rc:2355
#, c-format
msgid "E&nable moved block detection"
msgstr "Povolit zjišťování přesunutých &bloků"
#. IDD_PROPPAGE_COMPARE, IDC_ALIGN_SIMILAR_LINES
-#: Merge.rc:2346
+#: Merge.rc:2356
msgid "Align &similar lines"
msgstr ""
#. IDD_PROPPAGE_COMPARE, IDC_STATIC
-#: Merge.rc:2347
+#: Merge.rc:2357
msgid "Diff &algorithm:"
msgstr ""
#. IDD_PROPPAGE_COMPARE, IDC_INDENT_HEURISTIC
-#: Merge.rc:2349
+#: Merge.rc:2359
msgid "Enable indent &heuristic"
msgstr ""
#. IDD_PROPPAGE_COMPARE, IDC_COMPLETELY_BLANK_OUT_IGNORED_DIFFERENCES
-#: Merge.rc:2350
+#: Merge.rc:2360
msgid "Completely unhighlight the ignored differences"
msgstr ""
#. IDS_OPTIONSPG_EDITOR
-#: Merge.rc:2357 Merge.rc:4201
+#: Merge.rc:2367 Merge.rc:4211
#, c-format
msgid "Editor"
msgstr ""
#. IDD_PROPPAGE_EDITOR, IDC_HILITE_CHECK
-#: Merge.rc:2360
+#: Merge.rc:2370
#, c-format
msgid "&Highlight syntax"
msgstr "Zvýraznit sy&ntaxi"
#. IDD_PROPPAGE_EDITOR, IDC_MIXED_EOL
-#: Merge.rc:2361
+#: Merge.rc:2371
#, c-format
msgid "&Preserve original EOL"
msgstr "Zachovat původní znaky na &koncích řádků"
#. IDD_PROPPAGE_EDITOR, IDC_STATIC
-#: Merge.rc:2362
+#: Merge.rc:2372
#, c-format
msgid "Tabs"
msgstr "Tabelátory"
#. IDD_PROPPAGE_EDITOR, IDC_STATIC
-#: Merge.rc:2363
+#: Merge.rc:2373
#, c-format
msgid "&Tab size:"
msgstr "&Velikost:"
#. IDD_PROPPAGE_EDITOR, IDC_PROP_INSERT_TABS
-#: Merge.rc:2365
+#: Merge.rc:2375
#, c-format
msgid "&Insert tabs"
msgstr "Vkládat &tabelátory"
#. IDD_PROPPAGE_EDITOR, IDC_PROP_INSERT_SPACES
-#: Merge.rc:2366
+#: Merge.rc:2376
#, c-format
msgid "Insert &spaces"
msgstr "Vkládat &mezery"
#. IDD_PROPPAGE_EDITOR, IDC_STATIC
-#: Merge.rc:2367
+#: Merge.rc:2377
msgid "&Rendering mode:"
msgstr ""
#. IDD_PROPPAGE_EDITOR_COMPAREMERGE, IDC_AUTOMRESCAN_CHECK
-#: Merge.rc:2376
+#: Merge.rc:2386
#, c-format
msgid "&Automatic rescan"
msgstr "Automaticky &opětovně porovnávat"
#. IDD_PROPPAGE_EDITOR_COMPAREMERGE, IDC_STATIC
-#: Merge.rc:2377
+#: Merge.rc:2387
msgid "Copy &granularity for selected differences:"
msgstr ""
#. IDD_PROPPAGE_EDITOR_COMPAREMERGE, IDC_LINE_COLORING_GROUP
-#: Merge.rc:2379
+#: Merge.rc:2389
#, c-format
msgid "Line Difference Coloring"
msgstr "Obarvit rozdíly v řádku"
#. IDD_PROPPAGE_EDITOR_COMPAREMERGE, IDC_VIEW_LINE_DIFFERENCES
-#: Merge.rc:2380
+#: Merge.rc:2390
#, c-format
msgid "View line differences"
msgstr "Zobrazit rozdíly v řá&dku"
#. IDD_PROPPAGE_EDITOR_COMPAREMERGE, IDC_EDITOR_CHARLEVEL
-#: Merge.rc:2381
+#: Merge.rc:2391
#, c-format
msgid "&Character-level"
msgstr "Na úrovni &znaků"
#. IDD_PROPPAGE_EDITOR_COMPAREMERGE, IDC_EDITOR_WORDLEVEL
-#: Merge.rc:2382
+#: Merge.rc:2392
#, c-format
msgid "&Word-level:"
msgstr "Na úrovni &slov:"
#. IDD_PROPPAGE_EDITOR_COMPAREMERGE, IDC_STATIC
-#: Merge.rc:2384
+#: Merge.rc:2394
#, c-format
msgid "W&ord break characters:"
msgstr "Zn&aky oddělující slova:"
#. IDD_PROPPAGE_MESSAGEBOXES, IDC_STATIC
-#: Merge.rc:2401
+#: Merge.rc:2411
msgid "Some messages can be hidden by the user. Press Reset to make all messages visible again."
msgstr ""
"Některá obecná okna se zprávami je možno skrýt.\n"
"Po stisknutí tlačítka Vrátit se všechna tato okna opět budou objevovat."
#. IDD_SELECT_FILES_OR_FOLDERS, IDC_RESET
-#: Merge.rc:2402 Merge.rc:3085
+#: Merge.rc:2412 Merge.rc:3095
#, c-format
msgid "Reset"
msgstr "V&rátit"
#. IDD_GENERATE_PATCH
-#: Merge.rc:2408
+#: Merge.rc:2418
#, c-format
msgid "Patch Generator"
msgstr "Vytvoření opravného souboru"
#. IDD_GENERATE_PATCH, IDC_STATIC
-#: Merge.rc:2411
+#: Merge.rc:2421
#, c-format
msgid "File&1:"
msgstr "Soubor &1:"
#. IDD_GENERATE_PATCH, IDC_STATIC
-#: Merge.rc:2414
+#: Merge.rc:2424
#, c-format
msgid "File&2:"
msgstr "Soubor &2:"
#. IDD_GENERATE_PATCH, IDC_DIFF_SWAPFILES
-#: Merge.rc:2417
+#: Merge.rc:2427
#, c-format
msgid "&Swap"
msgstr "Z&aměnit"
#. IDD_DIRCMP_REPORT, IDC_REPORT_COPYCLIPBOARD
-#: Merge.rc:2418 Merge.rc:2690
+#: Merge.rc:2428 Merge.rc:2700
#, c-format
msgid "&Copy to clipboard"
msgstr "&Kopírovat do schránky"
#. IDD_GENERATE_PATCH, IDC_DIFF_APPENDFILE
-#: Merge.rc:2419
+#: Merge.rc:2429
#, c-format
msgid "&Append to existing file"
msgstr "Př&ipojit ke stávajícímu souboru"
#. IDD_GENERATE_PATCH, IDC_STATIC
-#: Merge.rc:2420
+#: Merge.rc:2430
#, c-format
msgid "&Result:"
msgstr "Vý&sledek:"
#. IDD_GENERATE_PATCH, IDC_DIFF_BROWSE_RESULT
-#: Merge.rc:2422
+#: Merge.rc:2432
#, c-format
msgid "Bro&wse..."
msgstr "Pr&ocházet..."
#. IDD_GENERATE_PATCH, IDC_STATIC
-#: Merge.rc:2423
+#: Merge.rc:2433
#, c-format
msgid "&Format"
msgstr "Formát"
#. IDD_GENERATE_PATCH, IDC_STATIC
-#: Merge.rc:2424
+#: Merge.rc:2434
#, c-format
msgid "St&yle:"
msgstr "Me&toda:"
#. IDD_GENERATE_PATCH, IDC_STATIC
-#: Merge.rc:2426
+#: Merge.rc:2436
#, c-format
msgid "&Context:"
msgstr "O&bsah:"
#. IDD_GENERATE_PATCH, IDC_DIFF_INCLCMDLINE
-#: Merge.rc:2428
+#: Merge.rc:2438
#, c-format
msgid "Inclu&de command line"
msgstr "Vložit pří&kazový řádek"
#. IDD_GENERATE_PATCH, IDC_DIFF_OPENTOEDITOR
-#: Merge.rc:2429
+#: Merge.rc:2439
#, c-format
msgid "Open in e&xternal editor"
msgstr "Otevřít v &externím editoru"
#. IDD_DIRCOLS
-#: Merge.rc:2446
+#: Merge.rc:2456
#, c-format
msgid "Display Columns"
msgstr "Zobrazit sloupce"
#. IDD_DIRCOLS, IDC_UP
-#: Merge.rc:2450
+#: Merge.rc:2460
#, c-format
msgid "Move &Up"
msgstr "&Nahoru"
#. IDD_DIRCOLS, IDC_DOWN
-#: Merge.rc:2451
+#: Merge.rc:2461
#, c-format
msgid "Move &Down"
msgstr "&Dolů"
#. IDD_DIRCOLS, IDC_COLDLG_ADDITIONAL_PROPERTIES
-#: Merge.rc:2453
+#: Merge.rc:2463
msgid "&Additional Properties"
msgstr ""
#. IDD_DIRADDITIONALPROPS
-#: Merge.rc:2461
+#: Merge.rc:2471
msgid "Additional Properties"
msgstr ""
#. IDD_PLUGINS_SELECTPLUGIN
-#: Merge.rc:2475
+#: Merge.rc:2485
msgid "Select Plugin"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN, IDC_STATIC
-#: Merge.rc:2478 Merge.rc:3115
+#: Merge.rc:2488 Merge.rc:3125
msgid "Plugin &name:"
msgstr ""
#. IDD_PLUGINS_SELECTPLUGIN, IDC_STATIC
-#: Merge.rc:2480
+#: Merge.rc:2490
msgid "&Target files:"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN, IDC_STATIC
-#: Merge.rc:2482 Merge.rc:3117
+#: Merge.rc:2492 Merge.rc:3127
#, c-format
msgid "Extensions list:"
msgstr "Seznam přípon:"
#. IDD_PLUGINS_EDITPLUGIN, IDC_STATIC
-#: Merge.rc:2484 Merge.rc:3119
+#: Merge.rc:2494 Merge.rc:3129
#, c-format
msgid "Description:"
msgstr "Popis:"
#. IDD_PLUGINS_EDITPLUGIN, IDC_STATIC
-#: Merge.rc:2486 Merge.rc:3121
+#: Merge.rc:2496 Merge.rc:3131
msgid "Default arguments:"
msgstr ""
#. IDD_PLUGINS_SELECTPLUGIN, IDC_PLUGIN_ALLOW_ALL
-#: Merge.rc:2488
+#: Merge.rc:2498
msgid "Display all plugins (Ignore extension)"
msgstr ""
#. IDD_PLUGINS_SELECTPLUGIN, IDC_PLUGIN_OPEN_IN_SAME_FRAME_TYPE
-#: Merge.rc:2490
+#: Merge.rc:2500
msgid "&Open files in same window type after unpacking"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_PIPELINE_STATIC
-#: Merge.rc:2492 Merge.rc:3129
+#: Merge.rc:2502 Merge.rc:3139
msgid "&Plugin pipeline:"
msgstr ""
#. IDD_PLUGINS_SELECTPLUGIN, IDC_PLUGIN_ALIAS
-#: Merge.rc:2495
+#: Merge.rc:2505
msgid "&Alias..."
msgstr ""
#. IDD_DIRCOMP_PROGRESS, IDC_COMPARISON_STOP
-#: Merge.rc:2505
+#: Merge.rc:2515
#, c-format
msgid "Stop"
msgstr "Zastavit"
#. IDD_DIRCOMP_PROGRESS, IDC_COMPARISON_PAUSE
-#: Merge.rc:2506
+#: Merge.rc:2516
#, c-format
msgid "Pause"
msgstr ""
#. IDD_DIRCOMP_PROGRESS, IDC_COMPARISON_CONTINUE
-#: Merge.rc:2507
+#: Merge.rc:2517
#, c-format
msgid "Continue"
msgstr ""
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC
-#: Merge.rc:2509 Merge.rc:2973
+#: Merge.rc:2519 Merge.rc:2983
msgid "C&PU cores to use:"
msgstr ""
#. IDD_DIRCOMP_PROGRESS, IDC_STATIC
-#: Merge.rc:2510
+#: Merge.rc:2520
#, c-format
msgid "Items total:"
msgstr "Celkem:"
#. IDD_DIRCOMP_PROGRESS, IDC_STATIC
-#: Merge.rc:2511
+#: Merge.rc:2521
#, c-format
msgid "Items compared:"
msgstr "Porovnáno:"
#. IDS_PREVIEWBAR_CLOSE
-#: Merge.rc:2526 Merge.rc:2846 Merge.rc:5328
+#: Merge.rc:2536 Merge.rc:2856 Merge.rc:5339
#, c-format
msgid "&Close"
msgstr "&Zavřít"
#. IDD_WMGOTO
-#: Merge.rc:2537
+#: Merge.rc:2547
msgid "Go to"
msgstr "Přejít"
#. IDD_WMGOTO, IDC_STATIC
-#: Merge.rc:2540
+#: Merge.rc:2550
msgid "G&o to:"
msgstr "Přejít &na:"
#. IDD_WMGOTO, IDC_STATIC
-#: Merge.rc:2543
+#: Merge.rc:2553
#, c-format
msgid "File"
msgstr "Soubor"
#. IDD_WMGOTO, IDC_STATIC
-#: Merge.rc:2547
+#: Merge.rc:2557
msgid "Go to what"
msgstr "Přejít na co"
#. IDD_WMGOTO, IDC_WMGOTO_TOLINE
-#: Merge.rc:2548
+#: Merge.rc:2558
#, c-format
msgid "Li&ne"
msgstr "Řá&dek"
#. IDD_WMGOTO, IDC_WMGOTO_TODIFF
-#: Merge.rc:2549
+#: Merge.rc:2559
#, c-format
msgid "&Difference"
msgstr "Ro&zdíl"
#. IDD_WMGOTO, IDOK
-#: Merge.rc:2550
+#: Merge.rc:2560
msgid "&Go to"
msgstr "&Přejít"
#. IDS_PROJECT_ITEM_FILE_FILTER
-#: Merge.rc:2556 Merge.rc:4321
+#: Merge.rc:2566 Merge.rc:4331
msgid "File Filters"
msgstr ""
#. IDD_FILTERS_FILEFILTERS, IDC_STATIC
-#: Merge.rc:2559
+#: Merge.rc:2569
msgid "&Mask / Filter Expression"
msgstr ""
#. IDD_FILTERS_FILEFILTERS, IDC_STATIC
-#: Merge.rc:2562
+#: Merge.rc:2572
msgid "Preset &Filters"
msgstr ""
#. IDD_FILTERS_FILEFILTERS, IDC_FILTERFILE_TEST_BTN
-#: Merge.rc:2564
+#: Merge.rc:2574
msgid "Test..."
msgstr "Z&kouška..."
#. IDD_FILTERS_FILEFILTERS, IDC_FILTERFILE_INSTALL
-#: Merge.rc:2565
+#: Merge.rc:2575
#, c-format
msgid "Install..."
msgstr "&Instalovat..."
#. IDD_FILTERS_FILEFILTERS, IDC_FILTERFILE_NEWBTN
-#: Merge.rc:2566
+#: Merge.rc:2576
#, c-format
msgid "New..."
msgstr "&Nový..."
#. IDD_FILTERS_FILEFILTERS, IDC_FILTERFILE_EDITBTN
-#: Merge.rc:2567
+#: Merge.rc:2577
#, c-format
msgid "Edit..."
msgstr "&Upravit..."
#. IDD_FILTERS_FILEFILTERS, IDC_FILTERFILE_DELETEBTN
-#: Merge.rc:2568
+#: Merge.rc:2578
#, c-format
msgid "Delete..."
msgstr "O&dstranit..."
#. IDD_FILTERS_CONDITION
-#: Merge.rc:2573
+#: Merge.rc:2583
msgid "Filter Condition"
msgstr ""
#. IDD_FILTERS_CONDITION, IDC_STATIC
-#: Merge.rc:2576
+#: Merge.rc:2586
msgid "&Left-hand side:"
msgstr ""
#. IDD_FILTERS_CONDITION, IDC_STATIC
-#: Merge.rc:2578
+#: Merge.rc:2588
msgid "&Operator:"
msgstr ""
#. IDD_FILTERS_CONDITION, IDC_STATIC
-#: Merge.rc:2580
+#: Merge.rc:2590
msgid "&Right-hand side:"
msgstr ""
#. IDD_FILTERS_CONDITION, IDC_STATIC
-#: Merge.rc:2586
+#: Merge.rc:2596
msgid "Expression:"
msgstr ""
#. IDD_COMPARISON_RESULT_FILTER
-#: Merge.rc:2595
+#: Merge.rc:2605
msgid "Filter by Comparison Result"
msgstr ""
#. IDD_COMPARISON_RESULT_FILTER, IDC_RADIO_INCLUDE
-#: Merge.rc:2598
+#: Merge.rc:2608
msgid "&Include"
msgstr ""
#. IDD_COMPARISON_RESULT_FILTER, IDC_RADIO_EXCLUDE
-#: Merge.rc:2599
+#: Merge.rc:2609
msgid "&Exclude"
msgstr ""
#. IDD_COMPARISON_RESULT_FILTER, IDC_STATIC
-#: Merge.rc:2600
+#: Merge.rc:2610
msgid "Comparison Results"
msgstr ""
#. IDS_IDENTICAL
-#: Merge.rc:2601 Merge.rc:2733 Merge.rc:2794 Merge.rc:4698
+#: Merge.rc:2611 Merge.rc:2743 Merge.rc:2804 Merge.rc:4708
#, c-format
msgid "Identical"
msgstr "Shodné"
#. IDS_DIFFERENT
-#: Merge.rc:2602 Merge.rc:2714 Merge.rc:2755 Merge.rc:4708
+#: Merge.rc:2612 Merge.rc:2724 Merge.rc:2765 Merge.rc:4718
#, c-format
msgid "Different"
msgstr "Rozdílné"
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_LEFT_ONLY
-#: Merge.rc:2603
+#: Merge.rc:2613
msgid "Left only"
msgstr ""
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_RIGHT_ONLY
-#: Merge.rc:2604
+#: Merge.rc:2614
msgid "Right only"
msgstr ""
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_SKIPPED
-#: Merge.rc:2605
+#: Merge.rc:2615
msgid "Skipped"
msgstr ""
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_MIDDLE_ONLY
-#: Merge.rc:2606
+#: Merge.rc:2616
msgid "Middle only"
msgstr ""
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_LEFT_ONLY_DIFFERENT
-#: Merge.rc:2607
+#: Merge.rc:2617
msgid "Left only (different)"
msgstr ""
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_MIDDLE_ONLY_DIFFERENT
-#: Merge.rc:2608
+#: Merge.rc:2618
msgid "Middle only (different)"
msgstr ""
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_RIGHT_ONLY_DIFFERENT
-#: Merge.rc:2609
+#: Merge.rc:2619
msgid "Right only (different)"
msgstr ""
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_LEFT_ONLY_MISSING
-#: Merge.rc:2610
+#: Merge.rc:2620
msgid "Left only (missing)"
msgstr ""
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_MIDDLE_ONLY_MISSING
-#: Merge.rc:2611
+#: Merge.rc:2621
msgid "Middle only (missing)"
msgstr ""
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_RIGHT_ONLY_MISSING
-#: Merge.rc:2612
+#: Merge.rc:2622
msgid "Right only (missing)"
msgstr ""
#. IDS_OPTIONSPG_CODEPAGE
-#: Merge.rc:2619 Merge.rc:2811 Merge.rc:4213
+#: Merge.rc:2629 Merge.rc:2821 Merge.rc:4223
#, c-format
msgid "Codepage"
msgstr "Kódování"
#. IDD_PROPPAGE_CODEPAGE, IDC_STATIC
-#: Merge.rc:2622
+#: Merge.rc:2632
#, c-format
msgid "Default Codepage"
msgstr "Výchozí kódování"
#. IDD_PROPPAGE_CODEPAGE, IDC_STATIC
-#: Merge.rc:2623
+#: Merge.rc:2633
#, c-format
msgid "Select the default codepage for non-Unicode files:"
msgstr "Zvolte výchozí znakovou stránku, která se použije v případě načtení souborů, které nejsou v kódování Unicode:"
#. IDD_PROPPAGE_CODEPAGE, IDC_CP_SYSTEM
-#: Merge.rc:2624
+#: Merge.rc:2634
#, c-format
msgid "System codepage"
msgstr "&Systémové kódování"
#. IDD_PROPPAGE_CODEPAGE, IDC_CP_UI
-#: Merge.rc:2625
+#: Merge.rc:2635
#, c-format
msgid "According to WinMerge User Interface"
msgstr "&Podle uživatelského prostředí WinMerge"
#. IDD_PROPPAGE_CODEPAGE, IDC_CP_CUSTOM
-#: Merge.rc:2626
+#: Merge.rc:2636
#, c-format
msgid "Custom codepage:"
msgstr "&Vlastní znaková stránka:"
#. IDD_PROPPAGE_CODEPAGE, IDC_DETECT_CODEPAGE
-#: Merge.rc:2628
+#: Merge.rc:2638
msgid "Detect codepage for: .html, .rc, .xml\nRestart required."
msgstr "&Zjistit informaci o kódování u těchto souborů: .html, .rc, .xml\n(vyžaduje opětovné spuštění programu)."
#. IDD_PROPPAGE_CODEPAGE, IDC_DETECT_CODEPAGE2
-#: Merge.rc:2630
+#: Merge.rc:2640
msgid "Detect codepage for files with mlang.dll\nRestart required."
msgstr ""
#. IDS_OPTIONSPG_ARCHIVE
-#: Merge.rc:2638 Merge.rc:4214
+#: Merge.rc:2648 Merge.rc:4224
#, c-format
msgid "Archive Support"
msgstr "Podpora archivace"
#. IDD_PROPPAGE_ARCHIVE, IDC_ARCHIVE_ENABLE
-#: Merge.rc:2641
+#: Merge.rc:2651
#, c-format
msgid "&Enable archive file support"
msgstr "&Zapnout podporu archivních souborů"
#. IDD_PROPPAGE_ARCHIVE, IDC_ARCHIVE_DETECTTYPE
-#: Merge.rc:2642
+#: Merge.rc:2652
#, c-format
msgid "&Detect archive type from file signature"
msgstr "Zjistit &automaticky typ archivu"
#. IDD_PROPPAGE_PROJECT, IDC_STATIC
-#: Merge.rc:2651
+#: Merge.rc:2661
msgid "Items saved to or restored from the project file:"
msgstr ""
#. IDD_SAVECLOSING
-#: Merge.rc:2658
+#: Merge.rc:2668
#, c-format
msgid "Save Modified Files?"
msgstr "Uložit změněné soubory?"
#. IDD_SAVECLOSING, IDC_SAVECLOSING_LEFTFRAME
-#: Merge.rc:2661
+#: Merge.rc:2671
#, c-format
msgid "Left side file"
msgstr "Soubor na levé straně"
#. IDD_SAVECLOSING, IDC_SAVECLOSING_SAVELEFT
-#: Merge.rc:2663
+#: Merge.rc:2673
#, c-format
msgid "&Save changes"
msgstr "Ulož&it změny"
#. IDD_SAVECLOSING, IDC_SAVECLOSING_DISCARDLEFT
-#: Merge.rc:2664
+#: Merge.rc:2674
#, c-format
msgid "&Discard changes"
msgstr "&Zrušit změny"
#. IDD_SAVECLOSING, IDC_SAVECLOSING_MIDDLEFRAME
-#: Merge.rc:2665
+#: Merge.rc:2675
#, c-format
msgid "Middle side file"
msgstr ""
#. IDD_SAVECLOSING, IDC_SAVECLOSING_SAVEMIDDLE
-#: Merge.rc:2667
+#: Merge.rc:2677
#, c-format
msgid "Sa&ve changes"
msgstr ""
#. IDD_SAVECLOSING, IDC_SAVECLOSING_DISCARDMIDDLE
-#: Merge.rc:2668
+#: Merge.rc:2678
#, c-format
msgid "Discard c&hanges"
msgstr ""
#. IDD_SAVECLOSING, IDC_SAVECLOSING_RIGHTFRAME
-#: Merge.rc:2669
+#: Merge.rc:2679
#, c-format
msgid "Right side file"
msgstr "Soubor na pravé straně"
#. IDD_SAVECLOSING, IDC_SAVECLOSING_SAVERIGHT
-#: Merge.rc:2671
+#: Merge.rc:2681
#, c-format
msgid "S&ave changes"
msgstr "Ul&ožit změny"
#. IDD_SAVECLOSING, IDC_SAVECLOSING_DISCARDRIGHT
-#: Merge.rc:2672
+#: Merge.rc:2682
#, c-format
msgid "Dis&card changes"
msgstr "Zr&ušit změny"
#. IDD_SAVECLOSING, IDC_SAVECLOSING_DISCARDALL
-#: Merge.rc:2673
+#: Merge.rc:2683
#, c-format
msgid "Disca&rd All"
msgstr "Zrušit &vše"
#. IDD_DIRCMP_REPORT
-#: Merge.rc:2680
+#: Merge.rc:2690
#, c-format
msgid "Folder Compare Report"
msgstr "Protokol o porovnání složek"
#. IDD_DIRCMP_REPORT, IDC_STATIC
-#: Merge.rc:2683
+#: Merge.rc:2693
#, c-format
msgid "Report &file:"
msgstr "&Soubor protokolu:"
#. IDD_DIRCMP_REPORT, IDC_STATIC
-#: Merge.rc:2686
+#: Merge.rc:2696
#, c-format
msgid "&Style:"
msgstr "Uložit jako &typ:"
#. IDD_DIRCMP_REPORT, IDC_REPORT_INCLUDEFILECMPREPORT
-#: Merge.rc:2688
+#: Merge.rc:2698
#, c-format
msgid "&Include file compare report"
msgstr ""
#. IDD_FILTERS_FILEFILTERS_SHARED
-#: Merge.rc:2697
+#: Merge.rc:2707
#, c-format
msgid "Shared or Private Filter"
msgstr "Typ filtru"
#. IDD_FILTERS_FILEFILTERS_SHARED, IDC_STATIC
-#: Merge.rc:2700
+#: Merge.rc:2710
#, c-format
msgid "What type of filter do you want?"
msgstr "Jaký typ filtru chcete vytvořit?"
#. IDD_FILTERS_FILEFILTERS_SHARED, IDC_SHARED
-#: Merge.rc:2701
+#: Merge.rc:2711
#, c-format
msgid "Shared Filter (for all users)"
msgstr "Společný filtr (pro všechny uživatele tohoto počítače)"
#. IDD_FILTERS_FILEFILTERS_SHARED, IDC_PRIVATE
-#: Merge.rc:2702
+#: Merge.rc:2712
#, c-format
msgid "Private Filter (current user only)"
msgstr "Vlastní filtr (pouze pro současného uživatele)"
#. IDD_COMPARE_STATISTICS3
-#: Merge.rc:2709 Merge.rc:2750
+#: Merge.rc:2719 Merge.rc:2760
#, c-format
msgid "Compare Statistics"
msgstr "Statistika porovnání"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2712 Merge.rc:2753
+#: Merge.rc:2722 Merge.rc:2763
#, c-format
msgid "Folders:"
msgstr "Složky:"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2713 Merge.rc:2754
+#: Merge.rc:2723 Merge.rc:2764
#, c-format
msgid "Files:"
msgstr "Soubory:"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2719 Merge.rc:2738 Merge.rc:2760 Merge.rc:2799
+#: Merge.rc:2729 Merge.rc:2748 Merge.rc:2770 Merge.rc:2809
#, c-format
msgid "Binary:"
msgstr "Binární:"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2722 Merge.rc:2763
+#: Merge.rc:2732 Merge.rc:2773
#, c-format
msgid "Unique"
msgstr "Jedinečné"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2723 Merge.rc:2764
+#: Merge.rc:2733 Merge.rc:2774
#, c-format
msgid "Left:"
msgstr "Vlevo:"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2728 Merge.rc:2774
+#: Merge.rc:2738 Merge.rc:2784
#, c-format
msgid "Right:"
msgstr "Vpravo:"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2742 Merge.rc:2803
+#: Merge.rc:2752 Merge.rc:2813
#, c-format
msgid "Total:"
msgstr "Celkem:"
#. IDD_COMPARE_STATISTICS3, IDOK
-#: Merge.rc:2745 Merge.rc:2806
+#: Merge.rc:2755 Merge.rc:2816
#, c-format
msgid "Close"
msgstr "Zavřít"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2769
+#: Merge.rc:2779
#, c-format
msgid "Middle:"
msgstr ""
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2779
+#: Merge.rc:2789
#, c-format
msgid "Missing Left:"
msgstr ""
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2784
+#: Merge.rc:2794
#, c-format
msgid "Missing Middle:"
msgstr ""
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2789
+#: Merge.rc:2799
#, c-format
msgid "Missing Right:"
msgstr ""
#. IDD_LOAD_SAVE_CODEPAGE, IDC_AFFECTS_GROUP
-#: Merge.rc:2814
+#: Merge.rc:2824
#, c-format
msgid "Affects"
msgstr "Vliv"
#. IDD_LOAD_SAVE_CODEPAGE, IDC_RIGHT_FILES_LABEL
-#: Merge.rc:2816 Merge.rc:2818 Merge.rc:2820
+#: Merge.rc:2826 Merge.rc:2828 Merge.rc:2830
#, c-format
msgid "(Affects)"
msgstr "(ovlivněno)"
#. IDD_LOAD_SAVE_CODEPAGE, IDC_LOADING_GROUP
-#: Merge.rc:2821
+#: Merge.rc:2831
#, c-format
msgid "Select Codepage for"
msgstr "Zvolte kódování pro"
#. IDD_LOAD_SAVE_CODEPAGE, IDC_LOAD_FILES_LABEL
-#: Merge.rc:2822
+#: Merge.rc:2832
#, c-format
msgid "&File Loading:"
msgstr "&Načtení souboru:"
#. IDD_LOAD_SAVE_CODEPAGE, IDC_SAVE_FILES_LABEL
-#: Merge.rc:2824
+#: Merge.rc:2834
#, c-format
msgid "File &Saving:"
msgstr "&Uložení souboru:"
#. IDD_LOAD_SAVE_CODEPAGE, IDC_LOAD_SAVE_SAME_CODEPAGE
-#: Merge.rc:2827
+#: Merge.rc:2837
#, c-format
msgid "&Use same codepage for both"
msgstr "Použít &stejnou znakovou stránku pro oba"
#. IDS_MESSAGEBOX_CANCEL
-#: Merge.rc:2830 Merge.rc:4172
+#: Merge.rc:2840 Merge.rc:4182
#, c-format
msgid "&Cancel"
msgstr "Storno"
#. IDD_FILTERS_FILEFILTERS_TEST
-#: Merge.rc:2835
+#: Merge.rc:2845
#, c-format
msgid "Test Filter"
msgstr "Zkouška filtru"
#. IDD_FILTERS_FILEFILTERS_TEST, IDC_HEADER
-#: Merge.rc:2838
+#: Merge.rc:2848
msgid "Testing filter:"
msgstr "Zkouška filtru:"
#. IDD_FILTERS_FILEFILTERS_TEST, IDC_PROMPT_LABEL
-#: Merge.rc:2840
+#: Merge.rc:2850
#, c-format
msgid "&Enter text to test:"
msgstr "&Vložte text ke zkoušce:"
#. IDD_FILTERS_FILEFILTERS_TEST, IDC_IS_DIRECTORY
-#: Merge.rc:2842
+#: Merge.rc:2852
#, c-format
msgid "&Folder Name"
msgstr "&Název složky"
#. IDD_FILTERS_FILEFILTERS_TEST, IDC_STATIC
-#: Merge.rc:2843
+#: Merge.rc:2853
#, c-format
msgid "Result:"
msgstr "Výsledek:"
#. IDD_FILTERS_FILEFILTERS_TEST, IDC_TEST_BTN
-#: Merge.rc:2845
+#: Merge.rc:2855
#, c-format
msgid "&Test"
msgstr "Z&kusit"
#. IDS_OPTIONSPG_TABLECOMPARE
-#: Merge.rc:2851 Merge.rc:2990 Merge.rc:4228
+#: Merge.rc:2861 Merge.rc:3000 Merge.rc:4238
msgid "Table"
msgstr ""
#. IDD_OPEN_TABLE, IDC_STATIC
-#: Merge.rc:2854
+#: Merge.rc:2864
msgid "File type"
msgstr ""
#. IDD_OPEN_TABLE, IDC_COMPARETABLE_CSV
-#: Merge.rc:2855
+#: Merge.rc:2865
msgid "&CSV"
msgstr ""
#. IDD_OPEN_TABLE, IDC_COMPARETABLE_TSV
-#: Merge.rc:2856
+#: Merge.rc:2866
msgid "&TSV"
msgstr ""
#. IDD_OPEN_TABLE, IDC_COMPARETABLE_DSV
-#: Merge.rc:2857
+#: Merge.rc:2867
msgid "Custom &Delimiter-Separated Values"
msgstr ""
#. IDD_PROPPAGE_COMPARE_TABLE, IDC_STATIC
-#: Merge.rc:2859 Merge.rc:2861 Merge.rc:2996 Merge.rc:3004
+#: Merge.rc:2869 Merge.rc:2871 Merge.rc:3006 Merge.rc:3014
msgid "D&elimiter character:"
msgstr ""
#. IDD_PROPPAGE_COMPARE_TABLE, IDC_COMPARETABLE_ALLOWNEWLINE
-#: Merge.rc:2863 Merge.rc:3006
+#: Merge.rc:2873 Merge.rc:3016
msgid "&Allow newlines in quotes"
msgstr ""
#. IDD_PROPPAGE_COMPARE_TABLE, IDC_STATIC
-#: Merge.rc:2865 Merge.rc:3008
+#: Merge.rc:2875 Merge.rc:3018
msgid "&Quote character:"
msgstr ""
#. IDS_OPTIONSPG_BACKUPS
-#: Merge.rc:2873 Merge.rc:4216
+#: Merge.rc:2883 Merge.rc:4226
#, c-format
msgid "Backup Files"
msgstr "Zálohování souborů"
#. IDD_PROPPAGE_BACKUPS, IDC_STATIC
-#: Merge.rc:2876
+#: Merge.rc:2886
#, c-format
msgid "Create backup files for:"
msgstr "Vytvářet záložní soubory pro:"
#. IDD_PROPPAGE_BACKUPS, IDC_BACKUP_FOLDERCMP
-#: Merge.rc:2877
+#: Merge.rc:2887
#, c-format
msgid "&Folder compare"
msgstr "s&ložek"
#. IDD_PROPPAGE_BACKUPS, IDC_BACKUP_FILECMP
-#: Merge.rc:2878
+#: Merge.rc:2888
#, c-format
msgid "Fil&e compare"
msgstr "&souborů"
#. IDD_PROPPAGE_BACKUPS, IDC_STATIC
-#: Merge.rc:2879
+#: Merge.rc:2889
#, c-format
msgid "Create backup files in:"
msgstr "Umístění záložních souborů:"
#. IDD_PROPPAGE_BACKUPS, IDC_BACKUP_ORIGFOLD
-#: Merge.rc:2880
+#: Merge.rc:2890
#, c-format
msgid "&Original file's folder"
msgstr "&Původní složka souborů"
#. IDD_PROPPAGE_BACKUPS, IDC_BACKUP_GLOBALFOLD
-#: Merge.rc:2881
+#: Merge.rc:2891
#, c-format
msgid "&Global backup folder:"
msgstr "&Jednotná záložní složka:"
#. IDD_PROPPAGE_BACKUPS, IDC_STATIC
-#: Merge.rc:2884
+#: Merge.rc:2894
#, c-format
msgid "Backup filename:"
msgstr "Název záložního souboru:"
#. IDD_PROPPAGE_BACKUPS, IDC_BACKUP_APPEND_BAK
-#: Merge.rc:2885
+#: Merge.rc:2895
msgid "&Append .bak extension"
msgstr "Připojit příponu .&bak"
#. IDD_PROPPAGE_BACKUPS, IDC_BACKUP_APPEND_TIME
-#: Merge.rc:2886
+#: Merge.rc:2896
#, c-format
msgid "A&ppend timestamp"
msgstr "Připojit č&asové razítko"
#. IDS_CONFIRM_COPY_CAPTION
-#: Merge.rc:2892 Merge.rc:4565
+#: Merge.rc:2902 Merge.rc:4575
#, c-format
msgid "Confirm Copy"
msgstr "Potvrdit kopírování"
#. IDD_CONFIRM_COPY, IDC_FLDCONFIRM_QUERY
-#: Merge.rc:2896
+#: Merge.rc:2906
#, c-format
msgid "Are you sure you want to copy XXX items?"
msgstr "Opravdu chcete zkopírovat XXX položek?"
#. IDD_CONFIRM_COPY, IDC_FLDCONFIRM_FROM_TEXT
-#: Merge.rc:2897
+#: Merge.rc:2907
#, c-format
msgid "From left"
msgstr "Zleva"
#. IDD_CONFIRM_COPY, IDC_FLDCONFIRM_TO_TEXT
-#: Merge.rc:2899
+#: Merge.rc:2909
#, c-format
msgid "To right"
msgstr "Doprava"
#. IDS_MESSAGEBOX_DONT_ASK_AGAIN
-#: Merge.rc:2901 Merge.rc:4191
+#: Merge.rc:2911 Merge.rc:4201
#, c-format
msgid "Don't ask this &question again."
msgstr "Na t&uto otázku se již příště nedotazovat."
#. IDD_CONFIRM_COPY, IDYES
-#: Merge.rc:2903
+#: Merge.rc:2913
#, c-format
msgid "Yes"
msgstr "Ano"
#. IDD_CONFIRM_COPY, IDNO
-#: Merge.rc:2904
+#: Merge.rc:2914
#, c-format
msgid "No"
msgstr "Ne"
#. IDS_PROJECT_ITEM_PLUGIN
-#: Merge.rc:2909 Merge.rc:4323
+#: Merge.rc:2919 Merge.rc:4333
#, c-format
msgid "Plugins"
msgstr "Pluginy"
#. IDD_PLUGINS_LIST, IDC_PLUGINS_ENABLE
-#: Merge.rc:2912
+#: Merge.rc:2922
#, c-format
msgid "&Enable plugins"
msgstr "&Povolit pluginy"
#. IDD_PLUGINS_EDITPLUGIN, IDC_STATIC
-#: Merge.rc:2913 Merge.rc:3113
+#: Merge.rc:2923 Merge.rc:3123
msgid "Plugin &type:"
msgstr ""
#. IDD_PLUGINS_LIST, IDC_STATIC
-#: Merge.rc:2916
+#: Merge.rc:2926
msgid "File filters:"
msgstr ""
#. IDD_PLUGINS_LIST, IDC_STATIC
-#: Merge.rc:2918
+#: Merge.rc:2928
msgid "&Plugin arguments:"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_AUTOMATIC
-#: Merge.rc:2920 Merge.rc:3134
+#: Merge.rc:2930 Merge.rc:3144
msgid "Enable &automatic unpacking/prediffing"
msgstr ""
#. IDS_OPTIONSPG_SHELL
-#: Merge.rc:2934 Merge.rc:4217
+#: Merge.rc:2944 Merge.rc:4227
#, c-format
msgid "Shell Integration"
msgstr "Systémová integrace"
#. IDD_PROPPAGE_SHELL, IDC_STATIC
-#: Merge.rc:2937
+#: Merge.rc:2947
#, c-format
msgid "Explorer"
msgstr "Průzkumník"
#. IDD_PROPPAGE_SHELL, IDC_EXPLORER_CONTEXT
-#: Merge.rc:2938
+#: Merge.rc:2948
#, c-format
msgid "&Add to context menu"
msgstr "Přidat do &systémové místní nabídky"
#. IDD_PROPPAGE_SHELL, IDC_EXPLORER_ADVANCED
-#: Merge.rc:2939
+#: Merge.rc:2949
#, c-format
msgid "E&nable advanced menu"
msgstr "Povolit &rozšířenou nabídku"
#. IDD_PROPPAGE_SHELL, IDC_EXPLORER_COMPARE_AS
-#: Merge.rc:2940
+#: Merge.rc:2950
msgid "Enable &Compare As menu"
msgstr ""
#. IDD_PROPPAGE_SHELL, IDC_REGISTER_SHELLEXTENSION
-#: Merge.rc:2941
+#: Merge.rc:2951
#, c-format
msgid "&Register Shell Extension"
msgstr ""
#. IDD_PROPPAGE_SHELL, IDC_UNREGISTER_SHELLEXTENSION
-#: Merge.rc:2942
+#: Merge.rc:2952
#, c-format
msgid "&Unregister Shell Extension"
msgstr ""
#. IDD_PROPPAGE_SHELL, IDC_REGISTER_SHELLEXTENSION_PERUSER
-#: Merge.rc:2943
+#: Merge.rc:2953
msgid "Register Shell Extension for Current User &Only"
msgstr ""
#. IDD_PROPPAGE_SHELL, IDC_UNREGISTER_SHELLEXTENSION_PERUSER
-#: Merge.rc:2944
+#: Merge.rc:2954
msgid "Unregister Shell Extension for Current User On&ly"
msgstr ""
#. IDD_PROPPAGE_SHELL, IDC_REGISTER_WINMERGECONTEXTMENU
-#: Merge.rc:2945
+#: Merge.rc:2955
msgid "Register Shell Extension for &Windows 11"
msgstr ""
#. IDD_PROPPAGE_SHELL, IDC_UNREGISTER_WINMERGECONTEXTMENU
-#: Merge.rc:2946
+#: Merge.rc:2956
msgid "Unregister Shell Extension for W&indows 11"
msgstr ""
#. IDD_PROPPAGE_SHELL, IDC_STATIC
-#: Merge.rc:2947
+#: Merge.rc:2957
msgid "Jump List"
msgstr ""
#. IDD_PROPPAGE_SHELL, IDC_CLEAR_ALL_RECENT_ITEMS
-#: Merge.rc:2949
+#: Merge.rc:2959
msgid "Clear all recent items"
msgstr ""
#. IDS_OPTIONSPG_FOLDERCOMPARE
-#: Merge.rc:2954 Merge.rc:4225
+#: Merge.rc:2964 Merge.rc:4235
msgctxt "Options dialog|Categories"
msgid "Folder"
msgstr "Složky"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC
-#: Merge.rc:2957
+#: Merge.rc:2967
msgid "&Compare method:"
msgstr "&Způsob porovnání:"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_COMPARE_STOPFIRST
-#: Merge.rc:2959
+#: Merge.rc:2969
#, c-format
msgid "S&top after first difference"
msgstr "Zastavit po prvním &rozdílu"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_IGNORE_SMALLTIMEDIFF
-#: Merge.rc:2961
+#: Merge.rc:2971
#, c-format
msgid "Ign&ore time differences less than 3 seconds"
msgstr "&Ignorovat časové rozdíly menší než 3 sekundy"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC
-#: Merge.rc:2964
+#: Merge.rc:2974
msgid "Expand subfolders &after comparison:"
msgstr ""
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_COMPARE_WALKSUBDIRS
-#: Merge.rc:2966
+#: Merge.rc:2976
#, c-format
msgid "Include &unique subfolders contents"
msgstr "Zahrnout obsah jedinečných podsložek"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_IGNORE_REPARSEPOINTS
-#: Merge.rc:2968
+#: Merge.rc:2978
#, c-format
msgid "Ignore &reparse points"
msgstr ""
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC
-#: Merge.rc:2969
+#: Merge.rc:2979
msgid "Switch to &quick compare when size exceeds (MB):"
msgstr ""
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC
-#: Merge.rc:2971
+#: Merge.rc:2981
msgid "Switch to &binary compare when size exceeds (MB):"
msgstr ""
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC
-#: Merge.rc:2975
+#: Merge.rc:2985
msgid "Additional comparison condi&tions:"
msgstr ""
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC
-#: Merge.rc:2978
+#: Merge.rc:2988
msgid "&Rename/move detection:"
msgstr ""
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC
-#: Merge.rc:2980
+#: Merge.rc:2990
msgid "Rename/move detection &keys:"
msgstr ""
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC
-#: Merge.rc:2983
+#: Merge.rc:2993
msgid "M&erge renames and moves:"
msgstr ""
#. IDD_PROPPAGE_COMPARE_TABLE, IDC_STATIC
-#: Merge.rc:2994 Merge.rc:2999 Merge.rc:3002
+#: Merge.rc:3004 Merge.rc:3009 Merge.rc:3012
msgid "File patterns:"
msgstr ""
#. IDD_PROPPAGE_COMPARE_TABLE, IDC_STATIC
-#: Merge.rc:3001
+#: Merge.rc:3011
msgid "Custom Delimiter-Separated Values"
msgstr ""
#. IDS_OPTIONSPG_BINARYCOMPARE
-#: Merge.rc:3015 Merge.rc:4227
+#: Merge.rc:3025 Merge.rc:4237
msgctxt "Options dialog|Categories"
msgid "Binary"
msgstr "Binární"
#. IDD_PROPPAGE_COMPARE_BINARY, IDC_STATIC
-#: Merge.rc:3018
+#: Merge.rc:3028
#, c-format
msgid "Binary file &patterns:"
msgstr ""
#. IDD_PROPPAGE_COMPARE_BINARY, IDC_STATIC
-#: Merge.rc:3020
+#: Merge.rc:3030
#, c-format
msgid "Frhed settings"
msgstr ""
#. IDD_PROPPAGE_COMPARE_BINARY, IDC_COMPAREBINARY_VIEWSETTINGS
-#: Merge.rc:3021
+#: Merge.rc:3031
#, c-format
msgid "View &Settings..."
msgstr ""
#. IDD_PROPPAGE_COMPARE_BINARY, IDC_COMPAREBINARY_BINARYMODE
-#: Merge.rc:3022
+#: Merge.rc:3032
#, c-format
msgid "&Binary Mode..."
msgstr ""
#. IDD_PROPPAGE_COMPARE_BINARY, IDC_COMPAREBINARY_CHARACTERSET
-#: Merge.rc:3023
+#: Merge.rc:3033
#, c-format
msgid "&Character Set..."
msgstr ""
#. IDS_PRPCAT_IMAGE
-#: Merge.rc:3029 Merge.rc:4226 Merge.rc:4665
+#: Merge.rc:3039 Merge.rc:4236 Merge.rc:4675
msgid "Image"
msgstr ""
#. IDD_PROPPAGE_COMPARE_IMAGE, IDC_STATIC
-#: Merge.rc:3032
+#: Merge.rc:3042
#, c-format
msgid "Image file &patterns:"
msgstr ""
#. IDD_PROPPAGE_COMPARE_IMAGE, IDC_ENABLE_IMGCMP_IN_DIRCMP
-#: Merge.rc:3034
+#: Merge.rc:3044
msgid "&Enable image compare in folder compare"
msgstr ""
#. IDD_PROPPAGE_COMPARE_IMAGE, IDC_STATIC
-#: Merge.rc:3036
+#: Merge.rc:3046
msgid "OCR result:"
msgstr ""
#. IDS_OPTIONSPG_WEBPAGECOMPARE
-#: Merge.rc:3043 Merge.rc:4229
+#: Merge.rc:3053 Merge.rc:4239
msgid "Webpage"
msgstr ""
#. IDD_PROPPAGE_COMPARE_WEBPAGE, IDC_STATIC
-#: Merge.rc:3046
+#: Merge.rc:3056
msgid "URL pattern to &include (Regular expression):"
msgstr ""
#. IDD_PROPPAGE_COMPARE_WEBPAGE, IDC_STATIC
-#: Merge.rc:3048
+#: Merge.rc:3058
msgid "URL pattern to &exclude (Regular expression):"
msgstr ""
#. IDD_PROPPAGE_COMPARE_WEBPAGE, IDC_STATIC
-#: Merge.rc:3050
+#: Merge.rc:3060
msgid "&User data folder location:"
msgstr ""
#. IDD_PROPPAGE_COMPARE_WEBPAGE, IDC_COMPAREWEBPAGE_USERDATAFOLDER_PERPANE
-#: Merge.rc:3052
+#: Merge.rc:3062
msgid "&Separate user data folders for each pane"
msgstr ""
#. IDD_ENCODINGERROR, IDC_HEXVIEW
-#: Merge.rc:3065
+#: Merge.rc:3075
#, c-format
msgid "&Hex View"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3110
+#: Merge.rc:3120
msgid "Edit Plugin"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN, IDC_STATIC
-#: Merge.rc:3123
+#: Merge.rc:3133
msgid "&Category:"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_MENUCAPTION_STATIC
-#: Merge.rc:3125
+#: Merge.rc:3135
msgid "&Menu caption:"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_WINDOWTYPE_STATIC
-#: Merge.rc:3127
+#: Merge.rc:3137
msgid "&Window type:"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_UNPACKEDFILEEXTENSION_STATIC
-#: Merge.rc:3132
+#: Merge.rc:3142
msgid "&Unpacked file extension:"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_ARGUMENTSREQUIRED
-#: Merge.rc:3136
+#: Merge.rc:3146
msgid "&Require arguments"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_GENERATESCRIPT
-#: Merge.rc:3137
+#: Merge.rc:3147
msgid "&Generate editor script"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_COMMAND_LINE_STATIC
-#: Merge.rc:3140
+#: Merge.rc:3150
msgid "Command &line:"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_SCRIPT_FILEEXTENSION_STATIC
-#: Merge.rc:3143
+#: Merge.rc:3153
msgid "&Script file extension:"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_SCRIPT_BODY_STATIC
-#: Merge.rc:3145
+#: Merge.rc:3155
msgid "Script &body:"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3154
+#: Merge.rc:3164
msgid "Font"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3157
+#: Merge.rc:3167
msgid "&Font:"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3163
+#: Merge.rc:3173
msgid "Font st&yle:"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3169
+#: Merge.rc:3179
msgid "&Size:"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3175
+#: Merge.rc:3185
msgid "Effects"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3176
+#: Merge.rc:3186
msgid "Stri&keout"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3177
+#: Merge.rc:3187
msgid "&Underline"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3179
+#: Merge.rc:3189
msgid "&Color:"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3184
+#: Merge.rc:3194
msgid "Sample"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3185
+#: Merge.rc:3195
msgid "AaBbYyZz"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3189
+#: Merge.rc:3199
msgid "Sc&ript:"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN, IDC_MANAGE_LINK
-#: Merge.rc:3194
+#: Merge.rc:3204
msgid "Show more fonts"
msgstr ""
#. ID_INDICATOR_EXT
-#: Merge.rc:4118
+#: Merge.rc:4128
#, c-format
msgid "EXT"
msgstr ""
#. ID_INDICATOR_CAPS
-#: Merge.rc:4119
+#: Merge.rc:4129
#, c-format
msgid "CAP"
msgstr ""
#. ID_INDICATOR_NUM
-#: Merge.rc:4120
+#: Merge.rc:4130
#, c-format
msgid "NUM"
msgstr ""
#. ID_INDICATOR_SCRL
-#: Merge.rc:4121
+#: Merge.rc:4131
#, c-format
msgid "SCRL"
msgstr ""
#. ID_INDICATOR_OVR
-#: Merge.rc:4122
+#: Merge.rc:4132
#, c-format
msgid "OVR"
msgstr ""
#. ID_INDICATOR_REC
-#: Merge.rc:4123
+#: Merge.rc:4133
#, c-format
msgid "REC"
msgstr ""
#. ID_FILE_NEW
-#: Merge.rc:4129
+#: Merge.rc:4139
#, c-format
msgid "\nNew Documents (Ctrl+N)"
msgstr ""
#. ID_FILE_OPEN
-#: Merge.rc:4130
+#: Merge.rc:4140
#, c-format
msgid "\nOpen (Ctrl+O)"
msgstr ""
#. ID_FILE_SAVE
-#: Merge.rc:4131
+#: Merge.rc:4141
#, c-format
msgid "\nSave (Ctrl+S)"
msgstr ""
#. IDS_UNK_ERROR_READING_PROJECT
-#: Merge.rc:4137
+#: Merge.rc:4147
msgid "Unknown error opening project file."
msgstr "Neznámá chyba při pokusu o otevření souboru projektu."
#. IDS_UNK_ERROR_SAVING_PROJECT
-#: Merge.rc:4138
+#: Merge.rc:4148
msgid "Unknown error saving project file."
msgstr "Neznámá chyba při pokusu o uložení souboru projektu."
#. IDS_PROJFILE_LOAD_SUCCESS
-#: Merge.rc:4143
+#: Merge.rc:4153
#, c-format
msgid "Project file loaded."
msgstr "Soubor s projektem byl úspěšně načten."
#. IDS_PROJFILE_SAVE_SUCCESS
-#: Merge.rc:4144
+#: Merge.rc:4154
#, c-format
msgid "Project file saved."
msgstr "Soubor s projektem byl úspěšně uložen."
#. ID_EDIT_UNDO
-#: Merge.rc:4150
+#: Merge.rc:4160
#, c-format
msgid "\nUndo (Ctrl+Z)"
msgstr ""
#. ID_EDIT_REDO
-#: Merge.rc:4151
+#: Merge.rc:4161
#, c-format
msgid "\nRedo (Ctrl+Y)"
msgstr ""
#. IDR_MERGEDOCTYPE
-#: Merge.rc:4158
+#: Merge.rc:4168
#, c-format
msgid "\nFileCompare\n\n\n\nWinMerge.FileCompare\nWinMerge File Compare"
msgstr ""
#. IDR_DIRDOCTYPE
-#: Merge.rc:4159
+#: Merge.rc:4169
#, c-format
msgid "\nFolderCompare\n\n\n\nWinMerge.FolderCompare\nWinMerge Folder Compare"
msgstr ""
#. IDS_SPLASH_GPLTEXT
-#: Merge.rc:4165
+#: Merge.rc:4175
#, c-format
msgid "WinMerge comes with ABSOLUTELY NO WARRANTY. It is free software and can be redistributed under the conditions of the GNU General Public License - see the Help menu for details."
msgstr ""
#. IDS_MESSAGEBOX_ABORT
-#: Merge.rc:4173
+#: Merge.rc:4183
#, c-format
msgid "&Abort"
msgstr "&Přerušit"
#. IDS_MESSAGEBOX_RETRY
-#: Merge.rc:4174
+#: Merge.rc:4184
#, c-format
msgid "&Retry"
msgstr "&Zkusit znovu"
#. IDS_MESSAGEBOX_IGNORE
-#: Merge.rc:4175
+#: Merge.rc:4185
#, c-format
msgid "&Ignore"
msgstr "&Ignorovat"
#. IDS_MESSAGEBOX_IGNOREALL
-#: Merge.rc:4176
+#: Merge.rc:4186
#, c-format
msgid "Ignore &all"
msgstr "I&gnorovat vše"
#. IDS_MESSAGEBOX_YES
-#: Merge.rc:4177
+#: Merge.rc:4187
#, c-format
msgid "&Yes"
msgstr "&Ano"
#. IDS_MESSAGEBOX_YES_TO_ALL
-#: Merge.rc:4183
+#: Merge.rc:4193
#, c-format
msgid "Yes to &all"
msgstr "Ano &všem"
#. IDS_MESSAGEBOX_NO
-#: Merge.rc:4184
+#: Merge.rc:4194
#, c-format
msgid "&No"
msgstr "&Ne"
#. IDS_MESSAGEBOX_NO_TO_ALL
-#: Merge.rc:4185
+#: Merge.rc:4195
#, c-format
msgid "No to a&ll"
msgstr "Ne vš&em"
#. IDS_MESSAGEBOX_CONTINUE
-#: Merge.rc:4186
+#: Merge.rc:4196
#, c-format
msgid "&Continue"
msgstr "Pok&račovat"
#. IDS_MESSAGEBOX_SKIP
-#: Merge.rc:4187
+#: Merge.rc:4197
#, c-format
msgid "&Skip"
msgstr "Pře&skočit"
#. IDS_MESSAGEBOX_SKIPALL
-#: Merge.rc:4188
+#: Merge.rc:4198
#, c-format
msgid "Skip &all"
msgstr "Přes&kočit vše"
#. IDS_MESSAGEBOX_DONT_DISPLAY_AGAIN
-#: Merge.rc:4190
+#: Merge.rc:4200
#, c-format
msgid "Don't display this &message again."
msgstr "T&uto zprávu již příště nezobrazovat."
-#: Merge.rc:4193
+#: Merge.rc:4203
msgid "To make this message box visible, press Reset on the Message Boxes page in Options."
msgstr ""
#. IDS_OPTIONSPG_EDITOR_COMPAREMERGE
-#: Merge.rc:4203
+#: Merge.rc:4213
msgid "Compare/Merge"
msgstr ""
#. IDS_OPTIONSPG_SYNTAXCOLORS
-#: Merge.rc:4204 Merge.rc:4208
+#: Merge.rc:4214 Merge.rc:4218
#, c-format
msgid "Syntax"
msgstr "Syntaxe"
#. IDS_OPTIONSPG_COLOR_SCHEMES
-#: Merge.rc:4206
+#: Merge.rc:4216
msgid "Color Schemes"
msgstr ""
#. IDS_OPTIONSPG_DIRCOLORS
-#: Merge.rc:4210
+#: Merge.rc:4220
msgid "Folder Compare"
msgstr ""
#. IDS_OPTIONSPG_PROJECT
-#: Merge.rc:4215
+#: Merge.rc:4225
msgid "Project"
msgstr ""
#. IDS_COLHDR_NSDIFFS
-#: Merge.rc:4218 Merge.rc:4640
+#: Merge.rc:4228 Merge.rc:4650
#, c-format
msgid "Differences"
msgstr "Rozdíly"
#. IDS_OPTIONSPG_MESSAGEBOXES
-#: Merge.rc:4220
+#: Merge.rc:4230
msgid "Message Boxes"
msgstr ""
#. IDS_TO
-#: Merge.rc:4235
+#: Merge.rc:4245
#, c-format
msgid "To:"
msgstr "Do:"
#. IDS_FROM_LEFT
-#: Merge.rc:4236
+#: Merge.rc:4246
#, c-format
msgid "From left:"
msgstr "Zleva:"
#. IDS_TO_LEFT
-#: Merge.rc:4237
+#: Merge.rc:4247
#, c-format
msgid "To left:"
msgstr "Doleva:"
#. IDS_FROM_RIGHT
-#: Merge.rc:4238
+#: Merge.rc:4248
#, c-format
msgid "From right:"
msgstr "Zprava:"
#. IDS_TO_RIGHT
-#: Merge.rc:4239
+#: Merge.rc:4249
#, c-format
msgid "To right:"
msgstr "Doprava:"
#. IDS_FROM_MIDDLE
-#: Merge.rc:4240
+#: Merge.rc:4250
msgid "From middle:"
msgstr ""
#. IDS_TO_MIDDLE
-#: Merge.rc:4241
+#: Merge.rc:4251
msgid "To middle:"
msgstr ""
#. IDS_VERSION_FMT
-#: Merge.rc:4247
+#: Merge.rc:4257
#, c-format
msgid "Version %1"
msgstr "Verze %1"
#. IDS_OPTIONS_TITLE
-#: Merge.rc:4253
+#: Merge.rc:4263
#, c-format
msgid "Options (%1)"
msgstr "Možnosti (%1)"
#. IDS_MESSAGE_BOX_ARE_RESET
-#: Merge.rc:4254
+#: Merge.rc:4264
#, c-format
msgid "All message boxes are now displayed again."
msgstr "Všechna okna se zprávami budou nyní opět zobrazována."
-#: Merge.rc:4256
+#: Merge.rc:4266
#, c-format
msgid "Tab size value is out of range. Please use 1 - %1."
msgstr ""
@@ -5576,177 +5587,177 @@ msgstr ""
"Použijte prosím hodnoty mezi 1 - %1."
#. IDS_PROJECT_OPEN
-#: Merge.rc:4262 Merge.rc:4318
+#: Merge.rc:4272 Merge.rc:4328
#, c-format
msgid "Open"
msgstr "Otevřít"
#. IDS_PROGRAMFILES
-#: Merge.rc:4263
+#: Merge.rc:4273
#, c-format
msgid "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||"
msgstr "Programy|*.exe;*.bat;*.cmd|Všechny soubory (*.*)|*.*||"
#. IDS_ALLFILES
-#: Merge.rc:4264
+#: Merge.rc:4274
#, c-format
msgid "All Files (*.*)|*.*||"
msgstr "Všechny soubory (*.*)|*.*||"
#. IDS_PROJECTFILES
-#: Merge.rc:4265
+#: Merge.rc:4275
#, c-format
msgid "WinMerge Project Files (*.WinMerge)|*.WinMerge||"
msgstr "Projekty WinMerge (*.WinMerge)|*.WinMerge||"
#. IDS_INIFILES
-#: Merge.rc:4267
+#: Merge.rc:4277
#, c-format
msgid "Options files (*.ini)|*.ini|All Files (*.*)|*.*||"
msgstr "Soubory nastavení (*.ini)|*.ini|Všechny soubory (*.*)|*.*||"
#. IDS_REPLACELIST_FILES
-#: Merge.rc:4268
+#: Merge.rc:4278
msgid "Tab-Separated Values (*.tsv;*.txt)|*.tsv;*.txt|All Files (*.*)|*.*||"
msgstr ""
#. IDS_TEXT_REPORT_FILES
-#: Merge.rc:4274
+#: Merge.rc:4284
#, c-format
msgid "Text Files (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|All Files (*.*)|*.*||"
msgstr "Textové soubory (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|Všechny soubory (*.*)|*.*||"
#. IDS_HTML_REPORT_FILES
-#: Merge.rc:4275
+#: Merge.rc:4285
#, c-format
msgid "HTML Files (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||"
msgstr "Soubory HTML (*.htm,*.html)|*.htm;*.html|Všechny soubory (*.*)|*.*||"
#. IDS_XML_REPORT_FILES
-#: Merge.rc:4276
+#: Merge.rc:4286
#, c-format
msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||"
msgstr "Soubory XML (*.xml)|*.xml|Všechny soubory (*.*)|*.*||"
#. IDS_EXPANDSUBDIRS_DONOTEXPAND
-#: Merge.rc:4294
+#: Merge.rc:4304
msgid "Do not expand"
msgstr ""
#. IDS_EXPANDSUBDIRS_ALL
-#: Merge.rc:4295
+#: Merge.rc:4305
msgid "Expand all subfolders"
msgstr ""
#. IDS_EXPANDSUBDIRS_DIFFERENT
-#: Merge.rc:4296
+#: Merge.rc:4306
msgid "Expand different subfolders"
msgstr ""
#. IDS_EXPANDSUBDIRS_IDENTICAL
-#: Merge.rc:4297
+#: Merge.rc:4307
msgid "Expand identical subfolders"
msgstr ""
#. IDS_SYNTAXTABLE_FILETYPE
-#: Merge.rc:4303
+#: Merge.rc:4313
msgid "File Type"
msgstr ""
#. IDS_COLHDR_EXTENSION
-#: Merge.rc:4304 Merge.rc:4597
+#: Merge.rc:4314 Merge.rc:4607
#, c-format
msgid "Extension"
msgstr "Přípona"
#. IDS_PRPCAT_MESSAGE
-#: Merge.rc:4310 Merge.rc:4669
+#: Merge.rc:4320 Merge.rc:4679
msgid "Message"
msgstr ""
#. IDS_MESSAGEBOX_ANSWER
-#: Merge.rc:4311
+#: Merge.rc:4321
msgid "Answer"
msgstr ""
#. IDS_PROJECT_ITEM
-#: Merge.rc:4317
+#: Merge.rc:4327
msgid "Item"
msgstr ""
#. IDS_PROJECT_LOAD
-#: Merge.rc:4319
+#: Merge.rc:4329
msgid "Load"
msgstr ""
#. IDS_PROJECT_SAVE
-#: Merge.rc:4320
+#: Merge.rc:4330
msgid "Save"
msgstr ""
#. IDS_PROJECT_ITEM_INCLUDE_SUBFOLDERS
-#: Merge.rc:4322
+#: Merge.rc:4332
msgid "Include Subfolders"
msgstr ""
#. IDS_PROJECT_ITEM_COMPARE_OPTIONS
-#: Merge.rc:4324
+#: Merge.rc:4334
msgid "Compare Options"
msgstr ""
#. IDS_PROJECT_ITEM_HIDDEN_ITEMS
-#: Merge.rc:4325
+#: Merge.rc:4335
msgid "Hidden Items"
msgstr ""
#. IDS_PLUGINSLIST_NAME
-#: Merge.rc:4331 Merge.rc:4956
+#: Merge.rc:4341 Merge.rc:4966
#, c-format
msgid "Name"
msgstr "Název"
#. IDS_FILTERFILE_PATHTITLE
-#: Merge.rc:4332
+#: Merge.rc:4342
#, c-format
msgid "Location"
msgstr "Umístění"
#. IDS_FILTER_TITLE
-#: Merge.rc:4333
+#: Merge.rc:4343
#, c-format
msgid "Filters"
msgstr "Filtry"
#. IDS_FILTER_PREFIX
-#: Merge.rc:4334
+#: Merge.rc:4344
#, c-format
msgid "[F] "
msgstr ""
#. IDS_PLUGINSLIST_DESC
-#: Merge.rc:4335 Merge.rc:4958
+#: Merge.rc:4345 Merge.rc:4968
#, c-format
msgid "Description"
msgstr "Popis"
#. IDS_FILEFILTER_SAVENEW
-#: Merge.rc:4336
+#: Merge.rc:4346
#, c-format
msgid "Select Filename for New Filter"
msgstr "Zvolte název souboru pro nový filtr"
#. IDS_FILEFILTER_FILEMASK
-#: Merge.rc:4337
+#: Merge.rc:4347
#, c-format
msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||"
msgstr "Filtry (*.flt)|*.flt|Všechny soubory (*.*)|*.*||"
-#: Merge.rc:4339
+#: Merge.rc:4349
#, c-format
msgid "Cannot find filter template!\n\nCopy %1 to WinMerge/Filters Folder:\n%2."
msgstr "Nelze nalézt soubor s filtrem!\n\nZkopírujte prosím soubor %1 do složky s filtry pro aplikaci WinMerge:\n%2."
-#: Merge.rc:4341
+#: Merge.rc:4351
#, c-format
msgid ""
"Cannot copy filter template:\n"
@@ -5759,7 +5770,7 @@ msgstr ""
"\n"
"Ujistěte se prosím, že složka existuje a je možné do ní zapisovat."
-#: Merge.rc:4343
+#: Merge.rc:4353
#, c-format
msgid ""
"User's filter folder is not defined!\n"
@@ -5770,7 +5781,7 @@ msgstr ""
"\n"
"Zvolte prosím složku v dialogovém okně Možnosti, v kategorii Systém."
-#: Merge.rc:4345
+#: Merge.rc:4355
#, c-format
msgid ""
"Failed to delete filter:\n"
@@ -5784,12 +5795,12 @@ msgstr ""
"Možná je soubor označen pouze pro čtení?"
#. IDS_FILEFILTER_INSTALL
-#: Merge.rc:4346
+#: Merge.rc:4356
#, c-format
msgid "Locate Filter File to Install"
msgstr "Vyhledat soubor s filtrem k instalaci"
-#: Merge.rc:4348
+#: Merge.rc:4358
#, c-format
msgid ""
"Installing filter file failed.\n"
@@ -5801,257 +5812,257 @@ msgstr ""
"Nový soubor nelze zkopírovat do složky filtrů."
#. IDS_FILEFILTER_OVERWRITE
-#: Merge.rc:4349
+#: Merge.rc:4359
#, c-format
msgid "Filter file exists. Overwrite?"
msgstr "Soubor s filtrem již existuje. Chcete nahradit stávající filtr?"
#. IDS_FILTERLINE_REGEXP
-#: Merge.rc:4355
+#: Merge.rc:4365
#, c-format
msgid "Regular expression"
msgstr "Regulérní výraz"
#. IDS_FILTERCHANGED
-#: Merge.rc:4361
+#: Merge.rc:4371
msgid "Filters updated. Refresh all open folder compares?\n\nSelect 'No' to refresh later."
msgstr "Filtry byly aktualizovány. Chcete obnovit všechna porovnání složek?\n\nPokud nechcete obnovit všechna porovnání teď, zvolte 'Ne' a obnovte porovnání později."
#. IDS_DIRECTORY_WINDOW_TITLE
-#: Merge.rc:4367
+#: Merge.rc:4377
#, c-format
msgid "Folder Comparison Results"
msgstr "Výsledky porovnání složek"
#. IDS_FILE_COMPARISON_TITLE
-#: Merge.rc:4368
+#: Merge.rc:4378
#, c-format
msgid "File Comparison"
msgstr "Porovnání souborů"
#. IDS_EMPTY_LEFT_FILE
-#: Merge.rc:4369
+#: Merge.rc:4379
#, c-format
msgid "Untitled Left"
msgstr "Bez názvu vlevo"
#. IDS_EMPTY_MIDDLE_FILE
-#: Merge.rc:4370
+#: Merge.rc:4380
#, c-format
msgid "Untitled Middle"
msgstr ""
#. IDS_EMPTY_RIGHT_FILE
-#: Merge.rc:4371
+#: Merge.rc:4381
#, c-format
msgid "Untitled Right"
msgstr "Bez názvu vpravo"
#. IDS_CONFLICT_BASE_FILE
-#: Merge.rc:4372
+#: Merge.rc:4382
msgid "Base File"
msgstr ""
#. IDS_CONFLICT_THEIRS_FILE
-#: Merge.rc:4373
+#: Merge.rc:4383
#, c-format
msgid "Theirs File"
msgstr ""
#. IDS_CONFLICT_MINE_FILE
-#: Merge.rc:4374
+#: Merge.rc:4384
#, c-format
msgid "Mine File"
msgstr ""
#. IDS_SELFCOMPARE_ORIGINAL_FILE
-#: Merge.rc:4375
+#: Merge.rc:4385
msgid "Original File"
msgstr ""
#. IDS_LINE_STATUS_INFO_EOL
-#: Merge.rc:4381
+#: Merge.rc:4391
#, c-format
msgid "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s"
msgstr ""
#. IDS_EMPTY_LINE_STATUS_INFO
-#: Merge.rc:4382
+#: Merge.rc:4392
#, c-format
msgid "Line: %s"
msgstr "Řádek: %s"
#. IDS_LINE_STATUS_INFO
-#: Merge.rc:4383
+#: Merge.rc:4393
#, c-format
msgid "Ln: %s Col: %d/%d Ch: %d/%d"
msgstr ""
#. IDS_LINE_STATUS_INFO_SEL
-#: Merge.rc:4384
+#: Merge.rc:4394
#, c-format
msgid " Sel: %d | %d"
msgstr ""
#. IDS_MERGEMODE_MERGING
-#: Merge.rc:4385
+#: Merge.rc:4395
#, c-format
msgid "Merge"
msgstr "Sloučit"
#. IDS_DIFF_NUMBER_STATUS_FMT
-#: Merge.rc:4386
+#: Merge.rc:4396
#, c-format
msgid "Difference %1 of %2"
msgstr "Rozdíl %1 z %2"
#. IDS_NO_DIFF_SEL_FMT
-#: Merge.rc:4387
+#: Merge.rc:4397
#, c-format
msgid "%1 Differences Found"
msgstr "Nalezeno %1 rozdílů"
#. IDS_1_DIFF_FOUND
-#: Merge.rc:4388
+#: Merge.rc:4398
#, c-format
msgid "1 Difference Found"
msgstr "Nalezen 1 rozdíl"
#. IDS_NO_ERR_SEL_FMT
-#: Merge.rc:4389
+#: Merge.rc:4399
#, c-format
msgid "%1 Errors Found"
msgstr ""
#. IDS_1_ERR_FOUND
-#: Merge.rc:4390
+#: Merge.rc:4400
msgid "1 Error Found"
msgstr ""
#. IDS_STATUSBAR_READONLY, Abbreviation from "Read Only"
-#: Merge.rc:4391
+#: Merge.rc:4401
#, c-format
msgid "RO"
msgstr "Pro čtení"
#. IDS_DIRVIEW_STATUS_FMT_FOCUS
-#: Merge.rc:4397
+#: Merge.rc:4407
#, c-format
msgid "Item %1 of %2"
msgstr "Položka %1 z %2"
#. IDS_DIRVIEW_STATUS_FMT_NOFOCUS
-#: Merge.rc:4398
+#: Merge.rc:4408
#, c-format
msgid "Items: %1"
msgstr "Položek: %1"
#. IDS_DIRVIEW_STATUS_COMPARING
-#: Merge.rc:4399
+#: Merge.rc:4409
#, c-format
msgid "Comparing items..."
msgstr "Porovnávají se položky..."
#. IDS_ITEMS_PER_SEC
-#: Merge.rc:4400
+#: Merge.rc:4410
#, c-format
msgid "%.1f[items/sec]"
msgstr ""
#. IDS_ERROR_INCOMPARABLE
-#: Merge.rc:4406
+#: Merge.rc:4416
msgid "Select two existing folders/files to compare."
msgstr "Vyberte dvě existující složky nebo soubory k porovnání."
#. IDS_DIRSEL_TAG
-#: Merge.rc:4407
+#: Merge.rc:4417
#, c-format
msgid "Folder Selection"
msgstr "Vybrat složku"
#. IDS_OPEN_FILESDIRS
-#: Merge.rc:4408
+#: Merge.rc:4418
#, c-format
msgid "Select two (or three) folders/files to compare."
msgstr ""
#. IDS_OPEN_LEFTINVALID
-#: Merge.rc:4409
+#: Merge.rc:4419
#, c-format
msgid "Left (1st) path is invalid!"
msgstr ""
#. IDS_OPEN_MIDDLEINVALID
-#: Merge.rc:4410
+#: Merge.rc:4420
#, c-format
msgid "Middle (2nd) path is invalid!"
msgstr ""
#. IDS_OPEN_RIGHTINVALID2
-#: Merge.rc:4411
+#: Merge.rc:4421
#, c-format
msgid "Right (2nd) path is invalid!"
msgstr ""
#. IDS_OPEN_RIGHTINVALID3
-#: Merge.rc:4412
+#: Merge.rc:4422
#, c-format
msgid "Right (3rd) path is invalid!"
msgstr ""
#. IDS_OPEN_BOTHINVALID
-#: Merge.rc:4413
+#: Merge.rc:4423
#, c-format
msgid "Both paths are invalid!"
msgstr "Obě cesty jsou chybné!"
-#: Merge.rc:4415
+#: Merge.rc:4425
#, c-format
msgid "Left (1st) and Middle (2nd) paths are invalid!"
msgstr ""
#. IDS_OPEN_LEFTRIGHTINVALID
-#: Merge.rc:4416
+#: Merge.rc:4426
#, c-format
msgid "Left (1st) and Right (3rd) paths are invalid!"
msgstr ""
-#: Merge.rc:4418
+#: Merge.rc:4428
#, c-format
msgid "Middle (2nd) and Right (3rd) paths are invalid!"
msgstr ""
#. IDS_OPEN_ALLINVALID
-#: Merge.rc:4419
+#: Merge.rc:4429
#, c-format
msgid "All paths are invalid!"
msgstr ""
#. IDS_OPEN_UNPACKERDISABLED
-#: Merge.rc:4420
+#: Merge.rc:4430
msgid "Only enabled for file comparisons"
msgstr ""
#. IDS_OPEN_MISMATCH
-#: Merge.rc:4421
+#: Merge.rc:4431
#, c-format
msgid "Cannot compare file and folder!"
msgstr "Nelze porovnat soubor a složku!"
#. IDS_ERROR_FILE_NOT_FOUND
-#: Merge.rc:4427
+#: Merge.rc:4437
#, c-format
msgid "File not found: %1"
msgstr "Soubor nebyl nalezen: %1"
#. IDS_ERROR_FILE_NOT_UNPACKED
-#: Merge.rc:4428
+#: Merge.rc:4438
#, c-format
msgid "File not unpacked: %1"
msgstr "Soubor nebyl převeden: %1"
#. IDS_ERROR_FILEOPEN
-#: Merge.rc:4429
+#: Merge.rc:4439
#, c-format
msgid ""
"Cannot open file\n"
@@ -6065,47 +6076,47 @@ msgstr ""
"%2"
#. IDS_ERROR_CONF_RESOLVE
-#: Merge.rc:4430
+#: Merge.rc:4440
#, c-format
msgid "Failed to parse conflict file."
msgstr ""
#. IDS_NOT_CONFLICT_FILE
-#: Merge.rc:4431
+#: Merge.rc:4441
#, c-format
msgid "The file\n%1\nis not a conflict file."
msgstr ""
#. IDS_COMPARE_LARGE_FILES
-#: Merge.rc:4432
+#: Merge.rc:4442
msgid "Comparing large files requires significant memory.\nShow only comparison results (not file contents)?"
msgstr ""
#. IDS_SAVE_AS_TITLE
-#: Merge.rc:4438
+#: Merge.rc:4448
#, c-format
msgid "Save As"
msgstr "Uložit jako"
#. IDS_SAVE_FMT
-#: Merge.rc:4439
+#: Merge.rc:4449
#, c-format
msgid "Save changes to %1?"
msgstr "Uložit změny do %1?"
#. IDS_SAVEREADONLY_FMT
-#: Merge.rc:4440
+#: Merge.rc:4450
#, c-format
msgid "%1 is read-only. Override? Or '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.)"
#. IDS_ERROR_BACKUP
-#: Merge.rc:4441
+#: Merge.rc:4451
#, c-format
msgid "Error backing up file"
msgstr "Chyba při zálohování souboru"
-#: Merge.rc:4443
+#: Merge.rc:4453
#, c-format
msgid ""
"Unable to backup original file:\n"
@@ -6119,7 +6130,7 @@ msgstr ""
"Chcete pokračovat?"
#. IDS_FILESAVE_FAILED
-#: Merge.rc:4444
+#: Merge.rc:4454
#, c-format
msgid "Saving file failed.\n%1\n%2\n\t- Use different filename (OK)\n\t- Abort (Cancel)?"
msgstr ""
@@ -6130,7 +6141,7 @@ msgstr ""
"\t- použít jiný název souboru (stiskněte OK)\n"
"\t- přerušit současnou operaci (stiskněte Storno)"
-#: Merge.rc:4446
+#: Merge.rc:4456
#, c-format
msgid "Plugin '%2' cannot pack changes to left file into '%1'.\n\nOriginal unchanged. Save unpacked version?"
msgstr ""
@@ -6140,12 +6151,12 @@ msgstr ""
"\n"
"Chcete uložit převedenou verzi do jiného souboru?"
-#: Merge.rc:4448
+#: Merge.rc:4458
#, c-format
msgid "Plugin '%2' cannot pack changes to middle file into '%1'.\n\nOriginal unchanged. Save unpacked version?"
msgstr ""
-#: Merge.rc:4450
+#: Merge.rc:4460
#, c-format
msgid "Plugin '%2' cannot pack changes to right file into '%1'.\n\nOriginal unchanged. Save unpacked version?"
msgstr ""
@@ -6156,7 +6167,7 @@ msgstr ""
"Chcete uložit převedenou verzi do jiného souboru?"
#. IDS_FILECHANGED_ONDISK
-#: Merge.rc:4451
+#: Merge.rc:4461
#, c-format
msgid ""
"Another application updated\n"
@@ -6172,7 +6183,7 @@ msgstr ""
"Přepsat změněný soubor?"
#. IDS_SAVEREADONLY_MULTI
-#: Merge.rc:4452
+#: Merge.rc:4462
#, c-format
msgid ""
"%1\n"
@@ -6182,37 +6193,37 @@ msgstr ""
"je označen pouze pro čtení. Chcete nahradit tuto položku?"
#. IDS_FILECHANGED_RESCAN
-#: Merge.rc:4453
+#: Merge.rc:4463
#, c-format
msgid "Another application updated\n%1\nsince last scan.\n\nReload?"
msgstr "Jiná aplikace provedla změny v souboru\n%1\nod jeho posledního prozkoumání aplikací WinMerge.\n\nChcete soubor načíst znovu?"
#. IDS_SAVE_LEFT_AS
-#: Merge.rc:4454
+#: Merge.rc:4464
#, c-format
msgid "Save Left File As"
msgstr "Uložit levý soubor jako"
#. IDS_SAVE_MIDDLE_AS
-#: Merge.rc:4455
+#: Merge.rc:4465
#, c-format
msgid "Save Middle File As"
msgstr ""
#. IDS_SAVE_RIGHT_AS
-#: Merge.rc:4456
+#: Merge.rc:4466
#, c-format
msgid "Save Right File As"
msgstr "Uložit pravý soubor jako"
#. IDS_FILE_DISAPPEARED
-#: Merge.rc:4461
+#: Merge.rc:4471
#, c-format
msgid "File\n%1\nnot found. Save a copy to continue."
msgstr "Soubor\n%1\nse ztratil. Pro pokračování prosím uložte kopii souboru."
#. IDS_VIEWS_OUTOFSYNC
-#: Merge.rc:4467
+#: Merge.rc:4477
#, c-format
msgid ""
"Cannot merge unsynched documents.\n"
@@ -6224,189 +6235,189 @@ msgstr ""
"Před dalším pokračováním dokumenty obnovte."
#. IDS_BREAK_ON_WHITESPACE
-#: Merge.rc:4472
+#: Merge.rc:4482
msgid "Break at whitespace"
msgstr "Přerušit v mezerách"
#. IDS_BREAK_ON_PUNCTUATION
-#: Merge.rc:4473
+#: Merge.rc:4483
msgid "Break at whitespace or punctuation"
msgstr "Přerušit v mezerách nebo v interpunkci"
#. IDS_L2M
-#: Merge.rc:4479
+#: Merge.rc:4489
msgid "Copy to &Middle\tAlt+Right"
msgstr ""
#. IDS_R2M
-#: Merge.rc:4480
+#: Merge.rc:4490
msgid "Copy to &Middle\tAlt+Left"
msgstr ""
#. IDS_COPY_FROM_MIDDLE_R
-#: Merge.rc:4481
+#: Merge.rc:4491
msgid "Copy from Middle\tAlt+Shift+Right"
msgstr ""
#. IDS_COPY_FROM_MIDDLE_L
-#: Merge.rc:4482
+#: Merge.rc:4492
msgid "Copy from Middle\tAlt+Shift+Left"
msgstr ""
#. IDS_L2MNEXT
-#: Merge.rc:4483
+#: Merge.rc:4493
msgid "Copy to Middle and Advance\tCtrl+Alt+Right"
msgstr ""
#. IDS_R2MNEXT
-#: Merge.rc:4484
+#: Merge.rc:4494
msgid "Copy to Middle and Advance\tCtrl+Alt+Left"
msgstr ""
#. IDS_ALL_MIDDLE
-#: Merge.rc:4485
+#: Merge.rc:4495
msgid "Copy All to Middle"
msgstr ""
#. IDS_COPY_RIGHT_TO_LEFT
-#: Merge.rc:4491
+#: Merge.rc:4501
#, c-format
msgid "Right to Left (%1)"
msgstr "P&ravé doleva (%1)"
#. IDS_COPY_RIGHT_TO_MIDDLE
-#: Merge.rc:4492
+#: Merge.rc:4502
#, c-format
msgid "Right to Middle (%1)"
msgstr ""
#. IDS_COPY_MIDDLE_TO_LEFT
-#: Merge.rc:4493
+#: Merge.rc:4503
#, c-format
msgid "Middle to Left (%1)"
msgstr ""
#. IDS_COPY_MIDDLE_TO_RIGHT
-#: Merge.rc:4494
+#: Merge.rc:4504
#, c-format
msgid "Middle to Right (%1)"
msgstr ""
#. IDS_COPY_LEFT_TO_RIGHT
-#: Merge.rc:4495
+#: Merge.rc:4505
#, c-format
msgid "Left to Right (%1)"
msgstr "&Levé doprava (%1)"
#. IDS_COPY_LEFT_TO_MIDDLE
-#: Merge.rc:4496
+#: Merge.rc:4506
#, c-format
msgid "Left to Middle (%1)"
msgstr ""
#. IDS_MOVE_LEFT_TO
-#: Merge.rc:4507 Merge.rc:4539
+#: Merge.rc:4517 Merge.rc:4549
#, c-format
msgid "Left to... (%1)"
msgstr "L&evé do... (%1)"
#. IDS_MOVE_MIDDLE_TO
-#: Merge.rc:4508 Merge.rc:4540
+#: Merge.rc:4518 Merge.rc:4550
#, c-format
msgid "Middle to... (%1)"
msgstr ""
#. IDS_MOVE_RIGHT_TO
-#: Merge.rc:4509 Merge.rc:4541
+#: Merge.rc:4519 Merge.rc:4551
#, c-format
msgid "Right to... (%1)"
msgstr "Pr&avé do... (%1)"
#. IDS_COPY_BOTH_TO
-#: Merge.rc:4510
+#: Merge.rc:4520
#, c-format
msgid "Both to... (%1)"
msgstr ""
#. IDS_COPY_ALL_TO
-#: Merge.rc:4511
+#: Merge.rc:4521
#, c-format
msgid "All to... (%1)"
msgstr ""
#. IDS_COPY_DIFFERENCES_TO
-#: Merge.rc:4512
+#: Merge.rc:4522
#, c-format
msgid "Differences to... (%1)"
msgstr ""
#. IDS_COPY_ONLYDIFFITEMS
-#: Merge.rc:4519
+#: Merge.rc:4529
msgid "Some selected items are identical or skipped.\nCopy only items with differences?"
msgstr ""
#. IDS_DEL_LEFT_FMT
-#: Merge.rc:4525
+#: Merge.rc:4535
#, c-format
msgid "Left (%1)"
msgstr "&Levé (%1)"
#. IDS_DEL_MIDDLE_FMT
-#: Merge.rc:4526
+#: Merge.rc:4536
#, c-format
msgid "Middle (%1)"
msgstr ""
#. IDS_DEL_RIGHT_FMT
-#: Merge.rc:4527
+#: Merge.rc:4537
#, c-format
msgid "Right (%1)"
msgstr "P&ravé (%1)"
#. IDS_DEL_BOTH_FMT
-#: Merge.rc:4528
+#: Merge.rc:4538
#, c-format
msgid "Both (%1)"
msgstr "O&boje (%1)"
#. IDS_DEL_ALL_FMT
-#: Merge.rc:4529
+#: Merge.rc:4539
#, c-format
msgid "All (%1)"
msgstr ""
#. IDS_SELECT_DEST_LEFT
-#: Merge.rc:4545
+#: Merge.rc:4555
#, c-format
msgid "Left Side - Select Destination Folder:"
msgstr "Zvolte cílovou složku pro položky z levé strany:"
#. IDS_SELECT_DEST_MIDDLE
-#: Merge.rc:4546
+#: Merge.rc:4556
#, c-format
msgid "Middle Side - Select Destination Folder:"
msgstr ""
#. IDS_SELECT_DEST_RIGHT
-#: Merge.rc:4547
+#: Merge.rc:4557
#, c-format
msgid "Right Side - Select Destination Folder:"
msgstr "Zvolte cílovou složku pro položky z pravé strany:"
#. IDS_FILES_AFFECTED_FMT
-#: Merge.rc:4548
+#: Merge.rc:4558
#, c-format
msgid "(%1 Files Affected)"
msgstr "(ovlivněno souborů: %1)"
#. IDS_FILES_AFFECTED_FMT2
-#: Merge.rc:4549
+#: Merge.rc:4559
#, c-format
msgid "(%1 of %2 Files Affected)"
msgstr "(ovlivněno souborů: %1 z %2)"
#. IDS_CONFIRM_DELETE_SINGLE
-#: Merge.rc:4555
+#: Merge.rc:4565
#, c-format
msgid ""
"Are you sure you want to delete\n"
@@ -6418,18 +6429,18 @@ msgstr ""
"%1 ?"
#. IDS_CONFIRM_SINGLE_COPY
-#: Merge.rc:4556
+#: Merge.rc:4566
msgid "Are you sure you want to copy?"
msgstr "Opravdu chcete zkopírovat?"
#. IDS_CONFIRM_MULTIPLE_COPY
-#: Merge.rc:4557
+#: Merge.rc:4567
#, c-format
msgid "Are you sure you want to copy %d items?"
msgstr "Opravdu chcete zkopírovat %d položek?"
#. IDS_DIRCMP_NOTSYNC
-#: Merge.rc:4558
+#: Merge.rc:4568
#, c-format
msgid ""
"Operation aborted!\n"
@@ -6449,878 +6460,878 @@ msgstr ""
"Obnovte prosím porovnání."
#. IDS_CONFIRM_SINGLE_MOVE
-#: Merge.rc:4563
+#: Merge.rc:4573
msgid "Are you sure you want to move?"
msgstr "Opravdu chcete přesunout?"
#. IDS_CONFIRM_MULTIPLE_MOVE
-#: Merge.rc:4564
+#: Merge.rc:4574
#, c-format
msgid "Are you sure you want to move %d items?"
msgstr "Opravdu chcete přesunout %d položek?"
#. IDS_CONFIRM_MOVE_CAPTION
-#: Merge.rc:4566
+#: Merge.rc:4576
#, c-format
msgid "Confirm Move"
msgstr "Potvrdit přesunutí"
-#: Merge.rc:4568
+#: Merge.rc:4578
#, c-format
msgid "Close the folder comparison window?"
msgstr ""
-#: Merge.rc:4570
+#: Merge.rc:4580
msgid "Close the folder comparison window, which took a long time?"
msgstr ""
#. IDS_ERROR_INVALID_DIR_FILE_NAME
-#: Merge.rc:4571
+#: Merge.rc:4581
msgid "The file or folder name is invalid."
msgstr ""
#. IDS_ERROR_EXECUTE_FILE
-#: Merge.rc:4577
+#: Merge.rc:4587
#, c-format
msgid "Failed to execute external editor: %1"
msgstr "Nelze spustit externí editor: %1"
#. IDS_UNKNOWN_ARCHIVE_FORMAT
-#: Merge.rc:4583
+#: Merge.rc:4593
#, c-format
msgid "Unknown archive format"
msgstr "Neznámý formát archivu"
-#: Merge.rc:4585
+#: Merge.rc:4595
msgid "Failed to extract archive.\nCompare as text file?"
msgstr ""
#. IDS_COLHDR_FILENAME
-#: Merge.rc:4591
+#: Merge.rc:4601
#, c-format
msgid "Filename"
msgstr "Název souboru"
#. IDS_COLHDR_DIR
-#: Merge.rc:4592
+#: Merge.rc:4602
msgctxt "DirView|ColumnHeader"
msgid "Folder"
msgstr "Složky"
#. IDS_COLHDR_RESULT
-#: Merge.rc:4593
+#: Merge.rc:4603
#, c-format
msgid "Comparison Result"
msgstr "Výsledek porovnání"
#. IDS_COLHDR_LTIMEM
-#: Merge.rc:4594
+#: Merge.rc:4604
#, c-format
msgid "Left Date"
msgstr "Datum vlevo"
#. IDS_COLHDR_RTIMEM
-#: Merge.rc:4595
+#: Merge.rc:4605
#, c-format
msgid "Right Date"
msgstr "Datum vpravo"
#. IDS_COLHDR_MTIMEM
-#: Merge.rc:4596
+#: Merge.rc:4606
#, c-format
msgid "Middle Date"
msgstr ""
#. IDS_COLHDR_LSIZE
-#: Merge.rc:4598
+#: Merge.rc:4608
#, c-format
msgid "Left Size"
msgstr "Velikost vlevo"
#. IDS_COLHDR_RSIZE
-#: Merge.rc:4599
+#: Merge.rc:4609
#, c-format
msgid "Right Size"
msgstr "Velikost vpravo"
#. IDS_COLHDR_MSIZE
-#: Merge.rc:4604
+#: Merge.rc:4614
#, c-format
msgid "Middle Size"
msgstr ""
#. IDS_COLHDR_RSIZE_SHORT
-#: Merge.rc:4605
+#: Merge.rc:4615
#, c-format
msgid "Right Size (Short)"
msgstr "Velikost vpravo (krátce)"
#. IDS_COLHDR_LSIZE_SHORT
-#: Merge.rc:4606
+#: Merge.rc:4616
#, c-format
msgid "Left Size (Short)"
msgstr "Velikost vlevo (krátce)"
#. IDS_COLHDR_MSIZE_SHORT
-#: Merge.rc:4607
+#: Merge.rc:4617
#, c-format
msgid "Middle Size (Short)"
msgstr ""
#. IDS_COLHDR_LTIMEC
-#: Merge.rc:4613
+#: Merge.rc:4623
#, c-format
msgid "Left Creation Time"
msgstr "Datum vytvoření vlevo"
#. IDS_COLHDR_RTIMEC
-#: Merge.rc:4614
+#: Merge.rc:4624
#, c-format
msgid "Right Creation Time"
msgstr "Datum vytvoření vpravo"
#. IDS_COLHDR_MTIMEC
-#: Merge.rc:4615
+#: Merge.rc:4625
#, c-format
msgid "Middle Creation Time"
msgstr ""
#. IDS_COLHDR_NEWER
-#: Merge.rc:4616
+#: Merge.rc:4626
#, c-format
msgid "Newer File"
msgstr "Novější soubor"
#. IDS_COLHDR_LVERSION
-#: Merge.rc:4617
+#: Merge.rc:4627
#, c-format
msgid "Left File Version"
msgstr "Verze souboru vlevo"
#. IDS_COLHDR_RVERSION
-#: Merge.rc:4618
+#: Merge.rc:4628
#, c-format
msgid "Right File Version"
msgstr "Verze souboru vpravo"
#. IDS_COLHDR_MVERSION
-#: Merge.rc:4619
+#: Merge.rc:4629
#, c-format
msgid "Middle File Version"
msgstr ""
#. IDS_COLHDR_RESULT_ABBR
-#: Merge.rc:4620
+#: Merge.rc:4630
#, c-format
msgid "Short Result"
msgstr "Stručný výsledek"
#. IDS_COLHDR_LATTRIBUTES
-#: Merge.rc:4621
+#: Merge.rc:4631
#, c-format
msgid "Left Attributes"
msgstr "Atributy vlevo"
#. IDS_COLHDR_RATTRIBUTES
-#: Merge.rc:4622
+#: Merge.rc:4632
#, c-format
msgid "Right Attributes"
msgstr "Atributy vpravo"
#. IDS_COLHDR_MATTRIBUTES
-#: Merge.rc:4623
+#: Merge.rc:4633
#, c-format
msgid "Middle Attributes"
msgstr ""
#. IDS_COLHDR_LEOL_TYPE
-#: Merge.rc:4628
+#: Merge.rc:4638
#, c-format
msgid "Left EOL"
msgstr "Konce řádků vlevo"
#. IDS_COLHDR_MEOL_TYPE
-#: Merge.rc:4629
+#: Merge.rc:4639
#, c-format
msgid "Middle EOL"
msgstr ""
#. IDS_COLHDR_REOL_TYPE
-#: Merge.rc:4630
+#: Merge.rc:4640
#, c-format
msgid "Right EOL"
msgstr "Konce řádků vpravo"
#. IDS_COLHDR_LENCODING
-#: Merge.rc:4636
+#: Merge.rc:4646
#, c-format
msgid "Left Encoding"
msgstr "Kódování vlevo"
#. IDS_COLHDR_RENCODING
-#: Merge.rc:4637
+#: Merge.rc:4647
#, c-format
msgid "Right Encoding"
msgstr "Kódování vpravo"
#. IDS_COLHDR_MENCODING
-#: Merge.rc:4638
+#: Merge.rc:4648
#, c-format
msgid "Middle Encoding"
msgstr ""
#. IDS_COLHDR_NIDIFFS
-#: Merge.rc:4639
+#: Merge.rc:4649
msgid "Ignored Diff"
msgstr "Ignor. rozdílů"
#. IDS_COLHDR_BINARY
-#: Merge.rc:4641
+#: Merge.rc:4651
msgctxt "DirView|ColumnHeader"
msgid "Binary"
msgstr "Binární"
#. IDS_PLUGINS_TYPE_UNPACKER
-#: Merge.rc:4642 Merge.rc:4959
+#: Merge.rc:4652 Merge.rc:4969
#, c-format
msgid "Unpacker"
msgstr "Převaděč"
#. IDS_PLUGIN_TYPE4
-#: Merge.rc:4643 Merge.rc:4960 Merge.rc:5267
+#: Merge.rc:4653 Merge.rc:4970 Merge.rc:5277
#, c-format
msgid "Prediffer"
msgstr ""
#. IDS_COLHDR_LEFT
-#: Merge.rc:4644
+#: Merge.rc:4654
msgid "Left"
msgstr ""
#. IDS_COLHDR_MIDDLE
-#: Merge.rc:4645
+#: Merge.rc:4655
msgid "Middle"
msgstr ""
#. IDS_COLHDR_RIGHT
-#: Merge.rc:4646
+#: Merge.rc:4656
msgid "Right"
msgstr ""
#. IDS_COLHDR_DIFF
-#: Merge.rc:4647
+#: Merge.rc:4657
msgid "Diff"
msgstr ""
#. IDS_COLHDR_LEFT_DUPLICATE
-#: Merge.rc:4648
+#: Merge.rc:4658
msgid "Left Duplicate Count"
msgstr ""
#. IDS_COLHDR_RIGHT_DUPLICATE
-#: Merge.rc:4649
+#: Merge.rc:4659
msgid "Right Duplicate Count"
msgstr ""
#. IDS_COLHDR_MIDDLE_DUPLICATE
-#: Merge.rc:4650
+#: Merge.rc:4660
msgid "Middle Duplicate Count"
msgstr ""
#. IDS_COLHDR_MOVE
-#: Merge.rc:4651
+#: Merge.rc:4661
msgid "Move"
msgstr ""
#. IDS_PRPCAT_AUDIO
-#: Merge.rc:4658
+#: Merge.rc:4668
msgid "Audio"
msgstr ""
#. IDS_PRPCAT_CALENDAR
-#: Merge.rc:4659
+#: Merge.rc:4669
msgid "Calendar"
msgstr ""
#. IDS_PRPCAT_COMMUNICATION
-#: Merge.rc:4660
+#: Merge.rc:4670
msgid "Communication"
msgstr ""
#. IDS_PRPCAT_CONTACT
-#: Merge.rc:4661
+#: Merge.rc:4671
msgid "Contact"
msgstr ""
#. IDS_PRPCAT_DEVICES
-#: Merge.rc:4662
+#: Merge.rc:4672
msgid "Devices"
msgstr ""
#. IDS_PRPCAT_DOCUMENT
-#: Merge.rc:4663
+#: Merge.rc:4673
msgid "Document"
msgstr ""
#. IDS_PRPCAT_HOME
-#: Merge.rc:4664
+#: Merge.rc:4674
msgid "Home"
msgstr ""
#. IDS_PRPCAT_JOURNAL
-#: Merge.rc:4666
+#: Merge.rc:4676
msgid "Journal"
msgstr ""
#. IDS_PRPCAT_LINK
-#: Merge.rc:4667
+#: Merge.rc:4677
msgid "Link"
msgstr ""
#. IDS_PRPCAT_MEDIA
-#: Merge.rc:4668
+#: Merge.rc:4678
msgid "Media"
msgstr ""
#. IDS_PRPCAT_MUSIC
-#: Merge.rc:4670
+#: Merge.rc:4680
msgid "Music"
msgstr ""
#. IDS_PRPCAT_NOTE
-#: Merge.rc:4671
+#: Merge.rc:4681
msgid "Note"
msgstr ""
#. IDS_PRPCAT_PHOTO
-#: Merge.rc:4672
+#: Merge.rc:4682
msgid "Photo"
msgstr ""
#. IDS_PRPCAT_RECORDEDTV
-#: Merge.rc:4673
+#: Merge.rc:4683
msgid "RecordedTV"
msgstr ""
#. IDS_PRPCAT_SEARCH
-#: Merge.rc:4674
+#: Merge.rc:4684
msgid "Search"
msgstr ""
#. IDS_PRPCAT_SECURITY
-#: Merge.rc:4675
+#: Merge.rc:4685
msgid "Security"
msgstr ""
#. IDS_PRPCAT_SOFTWARE
-#: Merge.rc:4676
+#: Merge.rc:4686
msgid "Software"
msgstr ""
#. IDS_PRPCAT_TASK
-#: Merge.rc:4677
+#: Merge.rc:4687
msgid "Task"
msgstr ""
#. IDS_PRPCAT_VIDEO
-#: Merge.rc:4678
+#: Merge.rc:4688
msgid "Video"
msgstr ""
#. IDS_PRPCAT_HASH
-#: Merge.rc:4679
+#: Merge.rc:4689
msgid "Hash"
msgstr ""
#. IDS_CANT_COMPARE_FILES
-#: Merge.rc:4685
+#: Merge.rc:4695
#, c-format
msgid "Unable to compare files"
msgstr "Soubory nelze porovnat"
#. IDS_ABORTED_ITEM
-#: Merge.rc:4686
+#: Merge.rc:4696
#, c-format
msgid "Item aborted"
msgstr "Přerušeno"
#. IDS_FILE_SKIPPED
-#: Merge.rc:4687
+#: Merge.rc:4697
#, c-format
msgid "File skipped"
msgstr "Soubor přeskočen"
#. IDS_DIR_SKIPPED
-#: Merge.rc:4688
+#: Merge.rc:4698
#, c-format
msgid "Folder skipped"
msgstr "Složka přeskočena"
#. IDS_LEFT_ONLY_IN_FMT
-#: Merge.rc:4689
+#: Merge.rc:4699
#, c-format
msgid "Left only: %1"
msgstr "Pouze vlevo: %1"
#. IDS_MIDDLE_ONLY_IN_FMT
-#: Merge.rc:4690
+#: Merge.rc:4700
#, c-format
msgid "Middle only: %1"
msgstr ""
#. IDS_RIGHT_ONLY_IN_FMT
-#: Merge.rc:4691
+#: Merge.rc:4701
#, c-format
msgid "Right only: %1"
msgstr "Pouze vpravo: %1"
#. IDS_DOES_NOT_EXIST_IN_FMT
-#: Merge.rc:4692
+#: Merge.rc:4702
#, c-format
msgid "Does not exist in %1"
msgstr ""
#. IDS_BIN_FILES_SAME
-#: Merge.rc:4693
+#: Merge.rc:4703
#, c-format
msgid "Binary files are identical"
msgstr "Binární soubory jsou shodné"
#. IDS_BIN_FILES_DIFF
-#: Merge.rc:4699
+#: Merge.rc:4709
#, c-format
msgid "Binary files are different"
msgstr "Binární soubory jsou rozdílné"
#. IDS_FILES_ARE_DIFFERENT
-#: Merge.rc:4700
+#: Merge.rc:4710
#, c-format
msgid "Files are different"
msgstr "Soubory jsou rozdílné"
#. IDS_FOLDERS_ARE_DIFFERENT
-#: Merge.rc:4701
+#: Merge.rc:4711
#, c-format
msgid "Folders are different"
msgstr "Složky jsou rozdílné"
#. IDS_LEFTONLY
-#: Merge.rc:4702
+#: Merge.rc:4712
#, c-format
msgid "Left Only"
msgstr "Pouze vlevo"
#. IDS_RIGHTONLY
-#: Merge.rc:4703
+#: Merge.rc:4713
#, c-format
msgid "Right Only"
msgstr "Pouze vpravo"
#. IDS_MIDDLEONLY
-#: Merge.rc:4704
+#: Merge.rc:4714
#, c-format
msgid "Middle Only"
msgstr ""
#. IDS_NOITEMLEFT
-#: Merge.rc:4705
+#: Merge.rc:4715
#, c-format
msgid "No item in left"
msgstr ""
#. IDS_NOITEMRIGHT
-#: Merge.rc:4706
+#: Merge.rc:4716
#, c-format
msgid "No item in right"
msgstr ""
#. IDS_NOITEMMIDDLE
-#: Merge.rc:4707
+#: Merge.rc:4717
#, c-format
msgid "No item in middle"
msgstr ""
#. IDS_CMPRES_ERROR
-#: Merge.rc:4709
+#: Merge.rc:4719
#, c-format
msgid "Error"
msgstr "Chyba"
#. IDS_TEXT_FILES_SAME
-#: Merge.rc:4710
+#: Merge.rc:4720
#, c-format
msgid "Text files are identical"
msgstr "Textové soubory jsou shodné"
#. IDS_LEFTONLY_DIFF
-#: Merge.rc:4711
+#: Merge.rc:4721
msgid " (Middle and right are identical)"
msgstr ""
#. IDS_MIDDLEONLY_DIFF
-#: Merge.rc:4712
+#: Merge.rc:4722
msgid " (Left and right are identical)"
msgstr ""
#. IDS_RIGHTONLY_DIFF
-#: Merge.rc:4713
+#: Merge.rc:4723
msgid " (Left and middle are identical)"
msgstr ""
#. IDS_PATH_MISMATCH
-#: Merge.rc:4714
+#: Merge.rc:4724
msgid " (paths differ)"
msgstr ""
#. IDS_TEXT_FILES_DIFF
-#: Merge.rc:4715
+#: Merge.rc:4725
#, c-format
msgid "Text files are different"
msgstr "Textové soubory jsou rozdílné"
#. IDS_IMAGE_FILES_SAME
-#: Merge.rc:4716
+#: Merge.rc:4726
msgid "Image files are identical"
msgstr ""
#. IDS_IMAGE_FILES_DIFF
-#: Merge.rc:4717
+#: Merge.rc:4727
msgid "Image files are different"
msgstr ""
#. IDS_EXPR_DIFF
-#: Merge.rc:4718
+#: Merge.rc:4728
#, c-format
msgid "Files are different (expr: %1)"
msgstr ""
#. IDS_HASH_GROUP
-#: Merge.rc:4719
+#: Merge.rc:4729
#, c-format
msgid "Group%d"
msgstr ""
#. IDS_RENAME_MOVE_DETECTION_DISALBED
-#: Merge.rc:4720
+#: Merge.rc:4730
msgctxt "Options dialog|Compare|Folder|Detect renames and moves"
msgid "Disabled"
msgstr ""
#. IDS_RENAME_MOVE_DETECTION_RENAME
-#: Merge.rc:4721
+#: Merge.rc:4731
msgid "Detect renames"
msgstr ""
#. IDS_RENAME_MOVE_DETECTION_RENAME_MOVE
-#: Merge.rc:4722
+#: Merge.rc:4732
msgid "Detect renames and moves"
msgstr ""
#. IDS_RENAME_MOVE_MERGE_MODE_RENAME
-#: Merge.rc:4723
+#: Merge.rc:4733
msgid "Merge renames"
msgstr ""
#. IDS_RENAME_MOVE_MERGE_MODE_RENAME_MOVE
-#: Merge.rc:4724
+#: Merge.rc:4734
msgid "Merge renames and moves"
msgstr ""
#. IDS_RENAMED
-#: Merge.rc:4725
+#: Merge.rc:4735
msgid "Renamed"
msgstr ""
#. IDS_MOVED
-#: Merge.rc:4726
+#: Merge.rc:4736
msgid "Moved"
msgstr ""
#. IDS_RENAMED_MOVED
-#: Merge.rc:4727
+#: Merge.rc:4737
msgid "Renamed/Moved"
msgstr ""
#. IDS_RENAMED_MOVED_ITEMS
-#: Merge.rc:4728
+#: Merge.rc:4738
#, c-format
msgid "(%1 items)"
msgstr ""
#. IDS_RENAMED_MOVED_RESULT
-#: Merge.rc:4729
+#: Merge.rc:4739
#, c-format
msgid "%1 (set %2): "
msgstr ""
#. IDS_SWITCH_FLAT_MODE
-#: Merge.rc:4730
+#: Merge.rc:4740
msgid "Some moved items have been merged.\nIn Tree Mode, these items may appear in positions that do not reflect the actual folder structure, which can be confusing.\nSwitch to Flat Mode?"
msgstr ""
#. IDS_ELAPSED_TIME
-#: Merge.rc:4736
+#: Merge.rc:4746
#, c-format
msgid "Elapsed time: %ld ms"
msgstr "Uplynulý čas: %ld ms"
#. IDS_STATUS_SELITEM1
-#: Merge.rc:4737
+#: Merge.rc:4747
#, c-format
msgid "1 item selected"
msgstr "Vybrána 1 položka"
#. IDS_STATUS_SELITEMS
-#: Merge.rc:4738
+#: Merge.rc:4748
#, c-format
msgid "%1 items selected"
msgstr "Vybráno %1 položek"
#. IDS_COLDESC_FILENAME
-#: Merge.rc:4744
+#: Merge.rc:4754
#, c-format
msgid "Filename or folder name."
msgstr "Název souboru nebo složky"
#. IDS_COLDESC_DIR
-#: Merge.rc:4745
+#: Merge.rc:4755
#, c-format
msgid "Subfolder name when subfolders are included."
msgstr "Název podsložky, pokud jsou porovnávány i soubory v podsložkách"
#. IDS_COLDESC_RESULT
-#: Merge.rc:4746
+#: Merge.rc:4756
#, c-format
msgid "Comparison result, long form."
msgstr "Výsledek porovnání, dlouhý popis"
#. IDS_COLDESC_LTIMEM
-#: Merge.rc:4751
+#: Merge.rc:4761
#, c-format
msgid "Left side modification date."
msgstr "Datum změny souboru na levé straně"
#. IDS_COLDESC_RTIMEM
-#: Merge.rc:4752
+#: Merge.rc:4762
#, c-format
msgid "Right side modification date."
msgstr "Datum změny souboru na pravé straně"
#. IDS_COLDESC_MTIMEM
-#: Merge.rc:4753
+#: Merge.rc:4763
#, c-format
msgid "Middle side modification date."
msgstr ""
#. IDS_COLDESC_EXTENSION
-#: Merge.rc:4754
+#: Merge.rc:4764
#, c-format
msgid "File's extension."
msgstr "Přípona souboru"
#. IDS_COLDESC_LSIZE
-#: Merge.rc:4755
+#: Merge.rc:4765
#, c-format
msgid "Left file size in bytes."
msgstr "Velikost souboru na levé straně v bytech"
#. IDS_COLDESC_RSIZE
-#: Merge.rc:4756
+#: Merge.rc:4766
#, c-format
msgid "Right file size in bytes."
msgstr "Velikost souboru na pravé straně v bytech"
#. IDS_COLDESC_MSIZE
-#: Merge.rc:4757
+#: Merge.rc:4767
#, c-format
msgid "Middle file size in bytes."
msgstr ""
#. IDS_COLDESC_LSIZE_SHORT
-#: Merge.rc:4758
+#: Merge.rc:4768
#, c-format
msgid "Left file size abbreviated."
msgstr "Velikost souboru na levé straně zkráceně"
#. IDS_COLDESC_RSIZE_SHORT
-#: Merge.rc:4759
+#: Merge.rc:4769
#, c-format
msgid "Right file size abbreviated."
msgstr "Velikost souboru na pravé straně zkráceně"
#. IDS_COLDESC_MSIZE_SHORT
-#: Merge.rc:4760
+#: Merge.rc:4770
#, c-format
msgid "Middle file size abbreviated."
msgstr ""
#. IDS_COLDESC_LTIMEC
-#: Merge.rc:4766
+#: Merge.rc:4776
#, c-format
msgid "Left side creation time."
msgstr "Datum vytvoření souboru na levé straně"
#. IDS_COLDESC_RTIMEC
-#: Merge.rc:4767
+#: Merge.rc:4777
#, c-format
msgid "Right side creation time."
msgstr "Datum vytvoření souboru na pravé straně"
#. IDS_COLDESC_MTIMEC
-#: Merge.rc:4768
+#: Merge.rc:4778
#, c-format
msgid "Middle side creation time."
msgstr ""
#. IDS_COLDESC_NEWER
-#: Merge.rc:4769
+#: Merge.rc:4779
#, c-format
msgid "Tells which side has newer modification date."
msgstr "Ukáže, na které straně je novější datum změny"
#. IDS_COLDESC_LVERSION
-#: Merge.rc:4770
+#: Merge.rc:4780
msgid "Left side file version, only for some file types."
msgstr "Verze souboru na levé straně, pouze pro některé typy souborů"
#. IDS_COLDESC_RVERSION
-#: Merge.rc:4771
+#: Merge.rc:4781
msgid "Right side file version, only for some file types."
msgstr "Verze souboru na pravé straně, pouze pro některé typy souborů"
#. IDS_COLDESC_MVERSION
-#: Merge.rc:4776
+#: Merge.rc:4786
msgid "Middle side file version, only for some file types."
msgstr ""
#. IDS_COLDESC_RESULT_ABBR
-#: Merge.rc:4777
+#: Merge.rc:4787
#, c-format
msgid "Short comparison result."
msgstr "Stručný výsledek porovnání"
#. IDS_COLDESC_LATTRIBUTES
-#: Merge.rc:4778
+#: Merge.rc:4788
#, c-format
msgid "Left side attributes."
msgstr "Atributy souboru na levé straně"
#. IDS_COLDESC_RATTRIBUTES
-#: Merge.rc:4779
+#: Merge.rc:4789
#, c-format
msgid "Right side attributes."
msgstr "Atributy souboru na pravé straně"
#. IDS_COLDESC_MATTRIBUTES
-#: Merge.rc:4780
+#: Merge.rc:4790
#, c-format
msgid "Middle side attributes."
msgstr ""
#. IDS_COLDESC_LEOL_TYPE
-#: Merge.rc:4781
+#: Merge.rc:4791
msgid "Left side file EOL type."
msgstr "Typ konce řádků v souboru na levé straně."
#. IDS_COLDESC_REOL_TYPE
-#: Merge.rc:4782
+#: Merge.rc:4792
msgid "Right side file EOL type."
msgstr "Typ konce řádků v souboru na pravé straně."
#. IDS_COLDESC_MEOL_TYPE
-#: Merge.rc:4783
+#: Merge.rc:4793
msgid "Middle side file EOL type."
msgstr ""
#. IDS_COLDESC_LENCODING
-#: Merge.rc:4789
+#: Merge.rc:4799
#, c-format
msgid "Left side encoding."
msgstr "Kódování souboru na levé straně"
#. IDS_COLDESC_RENCODING
-#: Merge.rc:4790
+#: Merge.rc:4800
#, c-format
msgid "Right side encoding."
msgstr "Kódování souboru na pravé straně"
#. IDS_COLDESC_MENCODING
-#: Merge.rc:4791
+#: Merge.rc:4801
#, c-format
msgid "Middle side encoding."
msgstr ""
#. IDS_COLDESC_NIDIFFS
-#: Merge.rc:4792
+#: Merge.rc:4802
#, c-format
msgid "Number of ignored differences in file. Ignored and cannot be merged."
msgstr "Počet ignorovaných rozdílů v souboru. Tyto rozdíly nelze sloučit."
#. IDS_COLDESC_NSDIFFS
-#: Merge.rc:4793
+#: Merge.rc:4803
#, c-format
msgid "Number of differences in file (excluding ignored)."
msgstr "Počet rozdílů v souboru. Neobsahuje ignorované rozdíly."
#. IDS_COLDESC_BINARY
-#: Merge.rc:4794
+#: Merge.rc:4804
#, c-format
msgid "Shows an asterisk (*) if the file is binary."
msgstr "Ukáže hvězdičku (*), pokud je soubor binární"
#. IDS_COLDESC_UNPACKER
-#: Merge.rc:4795
+#: Merge.rc:4805
msgid "Unpacker plugin name or pipeline."
msgstr ""
#. IDS_COLDESC_PREDIFFER
-#: Merge.rc:4796
+#: Merge.rc:4806
msgid "Prediffer plugin name or pipeline."
msgstr ""
#. IDS_DIRECTORY_REPORT_TITLE
-#: Merge.rc:4802
+#: Merge.rc:4812
#, c-format
msgid "Compare %1 with %2"
msgstr "Porovnání %1 s %2"
#. IDS_DIRECTORY_REPORT_TITLE3
-#: Merge.rc:4803
+#: Merge.rc:4813
#, c-format
msgid "Compare %1 with %2 and %3"
msgstr ""
#. IDS_REPORT_COMMALIST
-#: Merge.rc:4804
+#: Merge.rc:4814
#, c-format
msgid "Comma-separated list"
msgstr "Seznam oddělený čárkami"
#. IDS_REPORT_TABLIST
-#: Merge.rc:4805
+#: Merge.rc:4815
#, c-format
msgid "Tab-separated list"
msgstr "Seznam oddělený tabelátory"
#. IDS_REPORT_SIMPLEHTML
-#: Merge.rc:4806
+#: Merge.rc:4816
#, c-format
msgid "Simple HTML"
msgstr "Soubor HTML"
#. IDS_REPORT_SIMPLEXML
-#: Merge.rc:4807
+#: Merge.rc:4817
#, c-format
msgid "Simple XML"
msgstr "Soubor XML"
-#: Merge.rc:4809
+#: Merge.rc:4819
#, c-format
msgid "Report file already exists. Overwrite?"
msgstr "Soubor protokolu již existuje. Chcete ho přepsat?"
#. IDS_REPORT_ERROR
-#: Merge.rc:4814
+#: Merge.rc:4824
#, c-format
msgid ""
"Error creating the report:\n"
@@ -7330,123 +7341,123 @@ msgstr ""
"%1"
#. IDS_REPORT_SUCCESS
-#: Merge.rc:4815
+#: Merge.rc:4825
#, c-format
msgid "Report created successfully."
msgstr "Protokol byl úspěšně vytvořen."
#. IDS_SYNCPOINT_LASTBLOCK
-#: Merge.rc:4821
+#: Merge.rc:4831
msgid "Cannot add a synchronization point at this line."
msgstr ""
#. IDS_FILE_TO_ITSELF
-#: Merge.rc:4827
+#: Merge.rc:4837
#, c-format
msgid "Same file is opened in both panes."
msgstr "V obou panelech je otevřen stejný soubor."
#. IDS_FILESSAME
-#: Merge.rc:4828
+#: Merge.rc:4838
#, c-format
msgid "Selected files are identical."
msgstr "Vybrané soubory jsou shodné."
#. IDS_FILESSAME_CURCFG
-#: Merge.rc:4829
+#: Merge.rc:4839
msgid "Selected files are identical (with current settings).\r\nChecking binary identity..."
msgstr ""
#. IDS_FILESSAME_BINERROR
-#: Merge.rc:4830
+#: Merge.rc:4840
msgid "Selected files are identical (with current settings).\r\nBut binary comparison failed."
msgstr ""
#. IDS_FILESSAME_BINSAME
-#: Merge.rc:4831
+#: Merge.rc:4841
msgid "Selected files are identical (binary match)."
msgstr ""
#. IDS_FILESSAME_BINDIFF
-#: Merge.rc:4832
+#: Merge.rc:4842
msgid "Selected files are identical (with current settings).\r\nBut differ at the binary level."
msgstr ""
#. IDS_FILEERROR
-#: Merge.rc:4833
+#: Merge.rc:4843
#, c-format
msgid "An error occurred while comparing files."
msgstr "Během porovnání souborů se vyskytla chyba."
#. IDS_TEMP_FILEERROR
-#: Merge.rc:4834
+#: Merge.rc:4844
#, c-format
msgid "Could not create temporary files. Check your temporary path settings."
msgstr "Nelze vytvořit dočasné soubory. Zkontrolujte nastavení cesty k dočasným souborům."
#. IDS_SUGGEST_IGNOREEOL
-#: Merge.rc:4835
+#: Merge.rc:4845
msgid "Files use different EOL.\n\nTreat all EOL as equivalent?\n\nSet 'Ignore EOL differences (Windows/Unix/Mac)' in Compare section of Options."
msgstr ""
#. IDS_INVALID_DIRECTORY
-#: Merge.rc:4836
+#: Merge.rc:4846
#, c-format
msgid "Selected folder is invalid."
msgstr "Zvolená složka je chybná."
#. IDS_CANNOT_OPEN_BINARYFILE
-#: Merge.rc:4837
+#: Merge.rc:4847
#, c-format
msgid "Cannot open a binary file in Editor."
msgstr "Binární soubor nelze otevřít pro úpravy."
#. IDS_CREATE_PAIR_FOLDER
-#: Merge.rc:4838
+#: Merge.rc:4848
#, c-format
msgid "Create matching folder:\n%1\non the other side and open?"
msgstr "Složka existuje pouze na jedné straně a nelze ji otevřít.\n\nChcete vytvořit odpovídající složku na druhé straně a otevřít ji?"
#. IDS_CONFIRM_COPY_ALL_DIFFS
-#: Merge.rc:4839
+#: Merge.rc:4849
msgid "Copy all differences to other file?"
msgstr ""
#. IDS_MOVE_TO_NEXTFILE
-#: Merge.rc:4844
+#: Merge.rc:4854
#, c-format
msgid "Move to next file?"
msgstr ""
#. IDS_MOVE_TO_PREVFILE
-#: Merge.rc:4845
+#: Merge.rc:4855
#, c-format
msgid "Move to previous file?"
msgstr ""
#. IDS_MOVE_TO_NEXTPAGE
-#: Merge.rc:4846
+#: Merge.rc:4856
#, c-format
msgid "Move to next page?"
msgstr ""
#. IDS_MOVE_TO_PREVPAGE
-#: Merge.rc:4847
+#: Merge.rc:4857
#, c-format
msgid "Move to previous page?"
msgstr ""
#. IDS_MOVE_TO_FIRSTFILE
-#: Merge.rc:4848
+#: Merge.rc:4858
msgid "Move to first file?"
msgstr ""
#. IDS_MOVE_TO_LASTFILE
-#: Merge.rc:4849
+#: Merge.rc:4859
msgid "Move to last file?"
msgstr ""
-#: Merge.rc:4856
+#: Merge.rc:4866
#, c-format
msgid "Different codepages: left (cp%d), right (cp%d).\nDisplay in codepage (better display) or default Windows codepage (safer merging)?\n(Recommended: default Windows codepage)"
msgstr ""
@@ -7454,163 +7465,163 @@ msgstr ""
"Zobrazení každého souboru v jeho znakové stránce poskytne lepší 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:4858
+#: Merge.rc:4868
#, c-format
msgid "Information lost due to encoding errors: both files"
msgstr "Došlo ke ztrátě informací způsobené chybami kódování u obou souborů."
-#: Merge.rc:4860
+#: Merge.rc:4870
#, c-format
msgid "Information lost due to encoding errors: first file"
msgstr ""
-#: Merge.rc:4862
+#: Merge.rc:4872
#, c-format
msgid "Information lost due to encoding errors: second file"
msgstr ""
-#: Merge.rc:4864
+#: Merge.rc:4874
#, c-format
msgid "Information lost due to encoding errors: third file"
msgstr ""
#. IDS_LINEDIFF_NODIFF
-#: Merge.rc:4870
+#: Merge.rc:4880
#, c-format
msgid "No difference"
msgstr "Žádný rozdíl"
#. IDS_LINEDIFF_NODIFF_CAPTION
-#: Merge.rc:4871
+#: Merge.rc:4881
#, c-format
msgid "Line difference"
msgstr "Rozdíl v řádku"
#. IDS_NUM_REPLACED
-#: Merge.rc:4877
+#: Merge.rc:4887
#, c-format
msgid "Replaced %1 string(s)."
msgstr "Nahrazeno %1 řetězců."
#. IDS_EDIT_TEXT_NOT_FOUND
-#: Merge.rc:4878
+#: Merge.rc:4888
#, c-format
msgid "Cannot find string \"%s\"."
msgstr "Nelze najít řetězec \"%s\"."
#. IDS_MERGE_MODE
-#: Merge.rc:4884
+#: Merge.rc:4894
msgid "Entering Merge Mode. Press F9 to turn off."
msgstr ""
#. IDS_AUTO_MERGE
-#: Merge.rc:4890
+#: Merge.rc:4900
#, c-format
msgid "Automatic merges: %1\nUnresolved conflicts: %2"
msgstr ""
#. IDS_CODEPAGE_MERGED
-#: Merge.rc:4891
+#: Merge.rc:4901
msgid "Codepage change merged."
msgstr ""
#. IDS_CODEPAGE_CONFLICT
-#: Merge.rc:4892
+#: Merge.rc:4902
msgid "Codepage changes are conflicting."
msgstr ""
#. IDS_EOL_MERGED
-#: Merge.rc:4893
+#: Merge.rc:4903
msgid "EOL change merged."
msgstr ""
#. IDS_EOL_CONFLICT
-#: Merge.rc:4894
+#: Merge.rc:4904
msgid "EOL changes are conflicting."
msgstr ""
#. IDS_LOCBAR_CAPTION
-#: Merge.rc:4900
+#: Merge.rc:4910
#, c-format
msgid "Location Pane"
msgstr "Poloha"
#. IDS_DIFFBAR_CAPTION
-#: Merge.rc:4901
+#: Merge.rc:4911
#, c-format
msgid "Diff Pane"
msgstr "Rozdíly"
#. IDS_DIFF_SUCCEEDED
-#: Merge.rc:4908
+#: Merge.rc:4918
#, c-format
msgid "Patch file written."
msgstr "Opravný soubor byl úspěšně vytvořen."
#. IDS_DIFF_ITEM1NOTFOUND
-#: Merge.rc:4909
+#: Merge.rc:4919
msgid "First item not found!"
msgstr ""
#. IDS_DIFF_ITEM2NOTFOUND
-#: Merge.rc:4910
+#: Merge.rc:4920
msgid "Second item not found!"
msgstr ""
#. IDS_DIFF_FILEOVERWRITE
-#: Merge.rc:4911
+#: Merge.rc:4921
#, c-format
msgid "Patch file already exists. Overwrite?"
msgstr "Opravný soubor již existuje. Chcete ho přepsat?"
#. IDS_DIFF_SELECTEDFILES
-#: Merge.rc:4912
+#: Merge.rc:4922
#, c-format
msgid "[%1 files selected]"
msgstr "[vybráno %1 souborů]"
#. IDS_DIFF_NORMAL
-#: Merge.rc:4913
+#: Merge.rc:4923
#, c-format
msgid "Normal"
msgstr ""
#. IDS_DIFF_CONTEXT
-#: Merge.rc:4914
+#: Merge.rc:4924
#, c-format
msgid "Context"
msgstr ""
#. IDS_DIFF_UNIFIED
-#: Merge.rc:4915
+#: Merge.rc:4925
#, c-format
msgid "Unified"
msgstr ""
#. IDS_FILEWRITE_ERROR
-#: Merge.rc:4917
+#: Merge.rc:4927
#, c-format
msgid "Could not write to file %1."
msgstr "Nelze zapisovat do souboru %1."
#. IDS_PATH_NOT_ABSOLUTE
-#: Merge.rc:4918
+#: Merge.rc:4928
#, c-format
msgid "Output path is not absolute: %1"
msgstr "Zadaná cesta pro výstup není cesta k souboru: %1"
#. IDS_MUST_SPECIFY_OUTPUT
-#: Merge.rc:4919
+#: Merge.rc:4929
msgid "Specify an output file."
msgstr "Zadejte výstupní soubor."
-#: Merge.rc:4921
+#: Merge.rc:4931
#, c-format
msgid "Cannot create patch from binary files."
msgstr "Nelze vytvořit opravný soubor z binárních souborů."
#. IDS_SAVEFILES_FORPATCH
-#: Merge.rc:4922
+#: Merge.rc:4932
#, c-format
msgid ""
"Save all files first.\n"
@@ -7622,13 +7633,13 @@ msgstr ""
"Vytvoření opravného souboru vyžaduje, aby v souborech nebyly žádné neuložené změny."
#. IDS_FOLDER_NOTEXIST
-#: Merge.rc:4923
+#: Merge.rc:4933
#, c-format
msgid "Folder does not exist."
msgstr "Složka neexistuje."
#. IDS_NO_ZIP_SUPPORT
-#: Merge.rc:4928
+#: Merge.rc:4938
msgid "Archive support not enabled.\n7-Zip and/or Merge7z*.dll not found.\nSee manual for archive support."
msgstr ""
"Podpora archivace není dostupná.\n"
@@ -7637,43 +7648,43 @@ msgstr ""
"Podívejte se do uživatelské příručky, kde najdete další informace o podpoře archivace a jak ji zpřístupnit."
#. IDS_OPT_EXPORT_CAPTION
-#: Merge.rc:4929
+#: Merge.rc:4939
#, c-format
msgid "Select file for export"
msgstr "Uložit nastavení"
#. IDS_OPT_IMPORT_CAPTION
-#: Merge.rc:4930
+#: Merge.rc:4940
#, c-format
msgid "Select file for import"
msgstr "Načíst nastavení"
#. IDS_OPT_IMPORT_DONE
-#: Merge.rc:4931
+#: Merge.rc:4941
#, c-format
msgid "Options imported from file."
msgstr "Nastavení bylo načteno ze souboru."
#. IDS_OPT_EXPORT_DONE
-#: Merge.rc:4932
+#: Merge.rc:4942
#, c-format
msgid "Options exported to file."
msgstr "Nastavení bylo uloženo do souboru."
#. IDS_OPT_IMPORT_ERR
-#: Merge.rc:4933
+#: Merge.rc:4943
#, c-format
msgid "Failed to import options from file."
msgstr "Načtení nastavení ze souboru se nezdařilo."
#. IDS_OPT_EXPORT_ERR
-#: Merge.rc:4934
+#: Merge.rc:4944
#, c-format
msgid "Failed to write options to file."
msgstr "Uložení nastavení do souboru se nezdařilo."
#. IDS_CLOSEALL_WINDOWS
-#: Merge.rc:4935
+#: Merge.rc:4945
#, c-format
msgid ""
"Close multiple compare windows?\n"
@@ -7685,1213 +7696,1218 @@ msgstr ""
"Chcete pokračovat?"
#. IDS_EOL_MIXED
-#: Merge.rc:4944
+#: Merge.rc:4954
#, c-format
msgid "Mixed"
msgstr "Různé"
#. IDS_EOL_BIN
-#: Merge.rc:4945
+#: Merge.rc:4955
msgctxt "EOL Type"
msgid "Binary"
msgstr "Binární"
#. IDS_EOL_NONE
-#: Merge.rc:4949
+#: Merge.rc:4959
#, c-format
msgid "None"
msgstr "Žádný"
#. IDS_MARKER_COLOR_FMT
-#: Merge.rc:4950
+#: Merge.rc:4960
#, c-format
msgid "Marker Color %d"
msgstr ""
#. IDS_MARKER_NEW_PATTERN
-#: Merge.rc:4951
+#: Merge.rc:4961
msgid "New Pattern"
msgstr ""
#. IDS_PLUGINSLIST_TYPE
-#: Merge.rc:4957
+#: Merge.rc:4967
#, c-format
msgid "Type"
msgstr "Typ"
#. IDS_PLUGINS_TYPE_EDITSCRIPT
-#: Merge.rc:4961
+#: Merge.rc:4971
#, c-format
msgid "Editor script"
msgstr ""
#. ID_SELECTLINEDIFF
-#: Merge.rc:4967
+#: Merge.rc:4977
#, c-format
msgid "\nDifference in Current Line (F4)"
msgstr ""
#. ID_OPTIONS
-#: Merge.rc:4968
+#: Merge.rc:4978
#, c-format
msgid "\nOptions"
msgstr ""
#. ID_REFRESH
-#: Merge.rc:4969
+#: Merge.rc:4979
#, c-format
msgid "\nRefresh (F5)"
msgstr ""
#. ID_PREVDIFF
-#: Merge.rc:4975
+#: Merge.rc:4985
#, c-format
msgid "\nPrevious Difference (Alt+Up)"
msgstr ""
#. ID_NEXTDIFF
-#: Merge.rc:4976
+#: Merge.rc:4986
#, c-format
msgid "\nNext Difference (Alt+Down)"
msgstr ""
#. ID_PREVCONFLICT
-#: Merge.rc:4977
+#: Merge.rc:4987
#, c-format
msgid "\nPrevious Conflict (Alt+Shift+Up)"
msgstr ""
#. ID_NEXTCONFLICT
-#: Merge.rc:4978
+#: Merge.rc:4988
#, c-format
msgid "\nNext Conflict (Alt+Shift+Down)"
msgstr ""
#. ID_FIRSTDIFF
-#: Merge.rc:4983
+#: Merge.rc:4993
#, c-format
msgid "\nFirst Difference (Alt+Home)"
msgstr ""
#. ID_CURDIFF
-#: Merge.rc:4984
+#: Merge.rc:4994
#, c-format
msgid "\nCurrent Difference (Alt+Enter)"
msgstr ""
#. ID_LASTDIFF
-#: Merge.rc:4985
+#: Merge.rc:4995
#, c-format
msgid "\nLast Difference (Alt+End)"
msgstr ""
#. ID_L2R
-#: Merge.rc:4986
+#: Merge.rc:4996
msgid "\nCopy to Right (Alt+Right)"
msgstr ""
#. ID_R2L
-#: Merge.rc:4987
+#: Merge.rc:4997
msgid "\nCopy to Left (Alt+Left)"
msgstr ""
#. ID_L2RNEXT
-#: Merge.rc:4988
+#: Merge.rc:4998
msgid "\nCopy to Right and Advance (Ctrl+Alt+Right)"
msgstr ""
#. ID_R2LNEXT
-#: Merge.rc:4989
+#: Merge.rc:4999
msgid "\nCopy to Left and Advance (Ctrl+Alt+Left)"
msgstr ""
#. ID_ALL_RIGHT
-#: Merge.rc:4990
+#: Merge.rc:5000
msgid "\nCopy All to Right"
msgstr "\nKopírovat vše doprava"
#. ID_ALL_LEFT
-#: Merge.rc:4991
+#: Merge.rc:5001
msgid "\nCopy All to Left"
msgstr "\nKopírovat vše doleva"
#. ID_AUTO_MERGE
-#: Merge.rc:4992
+#: Merge.rc:5002
#, c-format
msgid "\nAuto Merge (Ctrl+Alt+M)"
msgstr ""
#. ID_FIRSTFILE
-#: Merge.rc:4993
+#: Merge.rc:5003
msgid "\nFirst File"
msgstr ""
#. ID_NEXTFILE
-#: Merge.rc:4994
+#: Merge.rc:5004
msgid "\nNext File (Ctrl+F8)"
msgstr ""
#. ID_LASTFILE
-#: Merge.rc:4995
+#: Merge.rc:5005
msgid "\nLast File"
msgstr ""
#. ID_PREVFILE
-#: Merge.rc:4996
+#: Merge.rc:5006
msgid "\nPrevious File (Ctrl+F7)"
msgstr ""
#. IDS_UNPACK_AUTO
-#: Merge.rc:5003
+#: Merge.rc:5013
msgid "Adapted unpacker applied to both files (one needs extension)."
msgstr "Přizpůsobený převaděč bude použit pro oba soubory (podle přípony jednoho ze souborů)."
#. IDS_NO_PREDIFFER
-#: Merge.rc:5004
+#: Merge.rc:5014
#, c-format
msgid "No Prediffer (Normal)"
msgstr ""
#. IDS_SUGGESTED_PLUGINS
-#: Merge.rc:5005
+#: Merge.rc:5015
#, c-format
msgid "Suggested Plugins"
msgstr "Navržené pluginy"
#. IDS_NOT_SUGGESTED_PLUGINS
-#: Merge.rc:5006
+#: Merge.rc:5016
msgid "All Plugins"
msgstr ""
#. IDS_PRIVATEBUILD_FMT
-#: Merge.rc:5012
+#: Merge.rc:5022
#, c-format
msgid "Private Build: %1"
msgstr ""
#. IDS_CHECKFORUPDATES_UPTODATE
-#: Merge.rc:5013
+#: Merge.rc:5023
msgid "Your software is up to date."
msgstr ""
-#: Merge.rc:5015
+#: Merge.rc:5025
#, c-format
msgid "WinMerge update available.\n%1 available (you have %2). Download now?"
msgstr ""
#. IDS_ALLRIGHTS_RESERVED
-#: Merge.rc:5016
+#: Merge.rc:5026
msgid " - All rights reserved."
msgstr ""
#. IDS_CHECKFORUPDATES_FAILED
-#: Merge.rc:5021
+#: Merge.rc:5031
#, c-format
msgid "Failed to download latest version information"
msgstr ""
#. IDS_TITLE_PLUGINS_SETTINGS
-#: Merge.rc:5027
+#: Merge.rc:5037
#, c-format
msgid "Plugin Settings"
msgstr "Nastavení pluginů"
#. IDS_NO_SCT_SCRIPTS
-#: Merge.rc:5029
+#: Merge.rc:5039
#, c-format
msgid "WSH not found - .sct scripts disabled"
msgstr "Program Windows Script Host nebyl nalezen - skripty .sct jsou vypnuté"
#. IDS_LOCBAR_GOTOLINE_FMT
-#: Merge.rc:5037
+#: Merge.rc:5047
#, c-format
msgid "G&o to Line %1"
msgstr "&Přejít na řádek %1"
#. IDS_GOTO_MOVED_LINE
-#: Merge.rc:5043
+#: Merge.rc:5053
msgid "Go to Moved Line\tCtrl+Shift+G"
msgstr ""
#. IDS_AUTOCOMPLETE_DISABLED
-#: Merge.rc:5049
+#: Merge.rc:5059
msgctxt "Options dialog|General|Open dialog Auto completion"
msgid "Disabled"
msgstr ""
#. IDS_AUTOCOMPLETE_FILE_SYS
-#: Merge.rc:5050
+#: Merge.rc:5060
#, c-format
msgid "From file system"
msgstr "Systém souborů"
#. IDS_AUTOCOMPLETE_MRU
-#: Merge.rc:5051
+#: Merge.rc:5061
#, c-format
msgid "From Most Recently Used list"
msgstr "Naposledy použité"
#. IDS_COLORSCHEME_PLAIN
-#: Merge.rc:5057
+#: Merge.rc:5067
#, c-format
msgid "No Highlighting"
msgstr "Žádné zvýraznění"
#. IDS_COLORSCHEME_BATCH
-#: Merge.rc:5063
+#: Merge.rc:5073
#, c-format
msgid "Batch"
msgstr ""
#. IDS_COLORSCHEME_PO
-#: Merge.rc:5090
+#: Merge.rc:5100
#, c-format
msgid "Portable Object"
msgstr ""
#. IDS_COLORSCHEME_RSRC
-#: Merge.rc:5094
+#: Merge.rc:5104
#, c-format
msgid "Resources"
msgstr ""
#. IDS_COLORSCHEME_SH
-#: Merge.rc:5098
+#: Merge.rc:5108
#, c-format
msgid "Shell"
msgstr ""
#. IDS_CLOSE_LEFT_TABS
-#: Merge.rc:5115
+#: Merge.rc:5125
#, c-format
msgid "Close &Left Tabs"
msgstr ""
#. IDS_CLOSE_RIGHT_TABS
-#: Merge.rc:5116
+#: Merge.rc:5126
#, c-format
msgid "Close R&ight Tabs"
msgstr ""
#. IDS_CLOSE_OTHER_TABS
-#: Merge.rc:5117
+#: Merge.rc:5127
#, c-format
msgid "Close &Other Tabs"
msgstr ""
#. IDS_TABBAR_AUTO_MAXWIDTH
-#: Merge.rc:5118
+#: Merge.rc:5128
#, c-format
msgid "Enable &Auto Max Width"
msgstr ""
#. IDS_WEBPAGE_MENU
-#: Merge.rc:5128
+#: Merge.rc:5138
msgid "We&bpage"
msgstr ""
#. IDS_VIEW_WRAP_TEXT
-#: Merge.rc:5133
+#: Merge.rc:5143
msgid "W&rap Text"
msgstr ""
#. IDS_NOTINSTALLED
-#: Merge.rc:5138
+#: Merge.rc:5148
msgid "%1 is not installed."
msgstr ""
#. IDS_CREATE_FOLDER
-#: Merge.rc:5143
+#: Merge.rc:5153
#, c-format
msgid "%1 does not exist. Create it?"
msgstr ""
#. IDS_CREATE_FOLDER_ERROR
-#: Merge.rc:5144
+#: Merge.rc:5154
#, c-format
msgid "Failed to create folder."
msgstr ""
#. IDC_EXT_EDITOR_PATH
-#: Merge.rc:5149
+#: Merge.rc:5159
#, c-format
msgid "Parameters:\n$file: Current file path\n$linenum: Current cursor line number"
msgstr ""
#. IDS_DIFF_ALGORITHM_DEFAULT
-#: Merge.rc:5154
+#: Merge.rc:5164
msgid "default"
msgstr ""
#. IDS_DIFF_ALGORITHM_MINIMAL
-#: Merge.rc:5155
+#: Merge.rc:5165
msgid "minimal"
msgstr ""
#. IDS_DIFF_ALGORITHM_PATIENCE
-#: Merge.rc:5156
+#: Merge.rc:5166
msgid "patience"
msgstr ""
#. IDS_DIFF_ALGORITHM_HISTOGRAM
-#: Merge.rc:5157
+#: Merge.rc:5167
msgid "histogram"
msgstr ""
#. IDS_DIFF_ALGORITHM_NONE
-#: Merge.rc:5158
+#: Merge.rc:5168
msgid "none"
msgstr ""
#. IDS_RENDERING_MODE_GDI
-#: Merge.rc:5163
+#: Merge.rc:5173
msgid "GDI"
msgstr ""
#. IDS_RENDERING_MODE_DIRECTWRITE_DEFAULT
-#: Merge.rc:5164
+#: Merge.rc:5174
msgid "DirectWrite Default"
msgstr ""
#. IDS_RENDERING_MODE_DIRECTWRITE_ALIASED
-#: Merge.rc:5165
+#: Merge.rc:5175
msgid "DirectWrite Aliased"
msgstr ""
#. IDS_RENDERING_MODE_DIRECTWRITE_GDI_CLASSIC
-#: Merge.rc:5166
+#: Merge.rc:5176
msgid "DirectWrite GDI Classic"
msgstr ""
#. IDS_RENDERING_MODE_DIRECTWRITE_GDI_NATURAL
-#: Merge.rc:5167
+#: Merge.rc:5177
msgid "DirectWrite GDI Natural"
msgstr ""
#. IDS_RENDERING_MODE_DIRECTWRITE_NATURAL
-#: Merge.rc:5168
+#: Merge.rc:5178
msgid "DirectWrite Natural"
msgstr ""
#. IDS_RENDERING_MODE_DIRECTWRITE_NATURAL_SYMMETRIC
-#: Merge.rc:5169
+#: Merge.rc:5179
msgid "DirectWrite Natural Symmetric"
msgstr ""
#. IDS_CLOSE_WINDOWS_WITH_ESC_DISABLED
-#: Merge.rc:5174
+#: Merge.rc:5184
msgctxt "Options dialog|General|Close windows with Esc"
msgid "Disabled"
msgstr ""
#. IDS_CLOSE_WINDOWS_WITH_ESC_1
-#: Merge.rc:5175
+#: Merge.rc:5185
msgid "MDI child window or main window"
msgstr ""
#. IDS_CLOSE_WINDOWS_WITH_ESC_2
-#: Merge.rc:5176
+#: Merge.rc:5186
msgid "MDI child window only"
msgstr ""
#. IDS_CLOSE_WINDOWS_WITH_ESC_3
-#: Merge.rc:5177
+#: Merge.rc:5187
msgid "Close main window if only one MDI child window"
msgstr ""
#. IDS_DIFF_GROUP
-#: Merge.rc:5182
+#: Merge.rc:5192
msgctxt "ImgMergeFrame|LocationPane"
msgid "Diff"
msgstr ""
#. IDS_DIFF_HIGHLIGHT
-#: Merge.rc:5183
+#: Merge.rc:5193
msgctxt "ImgMergeFrame|LocationPane"
msgid "Highlight"
msgstr ""
#. IDS_DIFF_BLINK
-#: Merge.rc:5184
+#: Merge.rc:5194
msgctxt "ImgMergeFrame|LocationPane"
msgid "Blink"
msgstr ""
#. IDS_DIFF_BLOCKSIZE
-#: Merge.rc:5185
+#: Merge.rc:5195
msgctxt "ImgMergeFrame|LocationPane"
msgid "Block Size"
msgstr ""
#. IDS_DIFF_BLOCKALPHA
-#: Merge.rc:5186
+#: Merge.rc:5196
msgctxt "ImgMergeFrame|LocationPane"
msgid "Block Alpha"
msgstr ""
#. IDS_DIFF_CDTHRESHOLD
-#: Merge.rc:5187
+#: Merge.rc:5197
msgctxt "ImgMergeFrame|LocationPane"
msgid "CD Threshold"
msgstr ""
#. IDS_DIFF_INSERTION_DELETION_DETECTION
-#: Merge.rc:5188
+#: Merge.rc:5198
msgctxt "ImgMergeFrame|LocationPane"
msgid "Ins/Del Detection"
msgstr ""
#. IDS_OVERLAY_MODE_NONE
-#: Merge.rc:5189 Merge.rc:5194
+#: Merge.rc:5199 Merge.rc:5204
msgctxt "ImgMergeFrame|LocationPane"
msgid "None"
msgstr ""
#. IDS_DIFF_INSERTION_DELETION_DETECTION_VERTICAL
-#: Merge.rc:5190
+#: Merge.rc:5200
msgctxt "ImgMergeFrame|LocationPane"
msgid "Vertical"
msgstr ""
#. IDS_DIFF_INSERTION_DELETION_DETECTION_HORIZONTAL
-#: Merge.rc:5191
+#: Merge.rc:5201
msgctxt "ImgMergeFrame|LocationPane"
msgid "Horizontal"
msgstr ""
#. IDS_OVERLAY_GROUP
-#: Merge.rc:5192
+#: Merge.rc:5202
msgctxt "ImgMergeFrame|LocationPane"
msgid "Overlay"
msgstr ""
#. IDS_OVERLAY_ALPHA
-#: Merge.rc:5193
+#: Merge.rc:5203
msgctxt "ImgMergeFrame|LocationPane"
msgid "Alpha"
msgstr ""
#. IDS_OVERLAY_MODE_XOR
-#: Merge.rc:5195
+#: Merge.rc:5205
msgctxt "ImgMergeFrame|LocationPane"
msgid "XOR"
msgstr ""
#. IDS_OVERLAY_MODE_ALPHA
-#: Merge.rc:5196
+#: Merge.rc:5206
msgctxt "ImgMergeFrame|LocationPane"
msgid "Alpha Blend"
msgstr ""
#. IDS_OVERLAY_MODE_ALPHA_ANIMATION
-#: Merge.rc:5197
+#: Merge.rc:5207
msgctxt "ImgMergeFrame|LocationPane"
msgid "Alpha Animation"
msgstr ""
#. IDS_ZOOM
-#: Merge.rc:5198
+#: Merge.rc:5208
msgctxt "ImgMergeFrame|LocationPane"
msgid "Zoom"
msgstr ""
#. IDS_PAGE
-#: Merge.rc:5199
+#: Merge.rc:5209
msgctxt "ImgMergeFrame|LocationPane"
msgid "Page:"
msgstr ""
#. IDS_IMGCMP_STATUS_PT_RGBA_FMT
-#: Merge.rc:5200
+#: Merge.rc:5210
#, c-format
msgid "Pt: (%d, %d) RGBA: (%d, %d, %d, %d) "
msgstr ""
#. IDS_IMGCMP_STATUS_DIST1_FMT
-#: Merge.rc:5201
+#: Merge.rc:5211
#, c-format
msgid "Dist: %g "
msgstr ""
#. IDS_IMGCMP_STATUS_DIST2_FMT
-#: Merge.rc:5202
+#: Merge.rc:5212
#, c-format
msgid "Dist: %g, %g "
msgstr ""
#. IDS_IMGCMP_STATUS_PAGE_ZOOM_SIZE_BPP_FMT
-#: Merge.rc:5203
+#: Merge.rc:5213
#, c-format
msgid "Page: %d/%d Zoom: %d%% %dx%dpx %dbpp "
msgstr ""
#. IDS_IMGCMP_STATUS_RC_FMT
-#: Merge.rc:5204
+#: Merge.rc:5214
#, c-format
msgid "Rc: (%d, %d) "
msgstr ""
#. IDS_IMGCMP_STATUS_FLIPPED_FMT
-#: Merge.rc:5205
+#: Merge.rc:5215
#, c-format
msgid "Flipped: %s "
msgstr ""
#. IDS_IMGCMP_STATUS_ROTATED_FMT
-#: Merge.rc:5206
+#: Merge.rc:5216
#, c-format
msgid "Rotated: %d "
msgstr ""
#. IDS_IMGCMP_REPORT_ALLPAGES
-#: Merge.rc:5207
+#: Merge.rc:5217
msgid "All pages"
msgstr ""
#. IDS_IGNSUB_STR1
-#: Merge.rc:5212
+#: Merge.rc:5222
msgid ""
msgstr ""
#. IDS_IGNSUB_STR2
-#: Merge.rc:5213
+#: Merge.rc:5223
msgid "No differences found to select"
msgstr ""
#. IDS_IGNSUB_STR3
-#: Merge.rc:5214
+#: Merge.rc:5224
msgid "No differences found to add as substitution filter"
msgstr ""
#. IDS_IGNSUB_STR4
-#: Merge.rc:5215
+#: Merge.rc:5225
msgid "The pair is already in the Substitution Filters list"
msgstr ""
#. IDS_IGNSUB_STR5
-#: Merge.rc:5216
+#: Merge.rc:5226
msgid "Add this change to Substitution Filters?"
msgstr ""
#. IDS_OCRRESULT_TEXTONLY
-#: Merge.rc:5221
+#: Merge.rc:5231
msgid "Text only"
msgstr ""
#. IDS_OCRRESULT_POS_LINE
-#: Merge.rc:5222
+#: Merge.rc:5232
msgid "Line-by-line position and text"
msgstr ""
#. IDS_OCRRESULT_POS_WORD
-#: Merge.rc:5223
+#: Merge.rc:5233
msgid "Word-by-word position and text"
msgstr ""
#. IDS_USERDATAFOLDER_APPDATA
-#: Merge.rc:5228
+#: Merge.rc:5238
msgid "AppData (Roaming) folder"
msgstr ""
#. IDS_USERDATAFOLDER_INSTALL
-#: Merge.rc:5229
+#: Merge.rc:5239
msgid "Install folder"
msgstr ""
#. IDS_USERDATAFOLDER_DOCUMENTS
-#: Merge.rc:5230
+#: Merge.rc:5240
msgid "Documents folder"
msgstr ""
#. IDS_SINGLEINSTANCE_DISABLED
-#: Merge.rc:5235
+#: Merge.rc:5245
msgctxt "Options dialog|General|Single instance mode"
msgid "Disabled"
msgstr ""
#. IDS_SINGLEINSTANCE_STR1
-#: Merge.rc:5236
+#: Merge.rc:5246
#, c-format
msgid "Allow only one instance to run"
msgstr "Povolit pouze jedno hlavní okno aplikace"
#. IDS_SINGLEINSTANCE_STR2
-#: Merge.rc:5237
+#: Merge.rc:5247
msgid "Allow only one instance; wait for termination"
msgstr ""
#. IDS_AUTO_RELOAD_MODIFIED_FILES_DISABLED
-#: Merge.rc:5242
+#: Merge.rc:5252
msgctxt "Options dialog|General|Auto-reload modified files"
msgid "Disabled"
msgstr ""
#. IDS_AUTO_RELOAD_MODIFIED_FILES_STR1
-#: Merge.rc:5243
+#: Merge.rc:5253
msgid "Only on window activated"
msgstr ""
#. IDS_AUTO_RELOAD_MODIFIED_FILES_STR2
-#: Merge.rc:5244
+#: Merge.rc:5254
msgid "Immediately"
msgstr ""
#. IDS_PLUGIN_ALL
-#: Merge.rc:5249
+#: Merge.rc:5259
msgid "Al&l"
msgstr ""
#. IDS_PLUGIN_OTHERS
-#: Merge.rc:5250
+#: Merge.rc:5260
msgid "&Others"
msgstr ""
-#: Merge.rc:5252
+#: Merge.rc:5262
#, c-format
msgid "Missing plugin name in pipeline: %1"
msgstr ""
-#: Merge.rc:5254
+#: Merge.rc:5264
#, c-format
msgid "Missing quote in plugin pipeline: %1"
msgstr ""
#. IDS_PLUGIN_NAME_ALREADY_EXISTS
-#: Merge.rc:5255
+#: Merge.rc:5265
#, c-format
msgid "Plugin name '%1' already exists."
msgstr ""
#. IDS_PLUGIN_TITLE1
-#: Merge.rc:5256
+#: Merge.rc:5266
msgid "Specify plugin arguments"
msgstr ""
-#: Merge.rc:5258
+#: Merge.rc:5268
#, c-format
msgid "Plugin not found or invalid: %1"
msgstr ""
#. IDS_PLUGIN_NOT_UNPACK
-#: Merge.rc:5259
+#: Merge.rc:5269
#, c-format
msgid "'%1' is not an unpacker plugin"
msgstr ""
#. IDS_PLUGIN_NOT_PREDIFF
-#: Merge.rc:5260
+#: Merge.rc:5270
#, c-format
msgid "'%1' is not a prediffer plugin"
msgstr ""
-#: Merge.rc:5262
+#: Merge.rc:5272
#, c-format
msgid "Error prediffing '%1' with '%2'. Prediffing disabled."
msgstr ""
#. IDS_PLUGIN_CIRCULAR_REFERENCE
-#: Merge.rc:5263
+#: Merge.rc:5273
#, c-format
msgid "Circular reference in plugin pipeline: %1"
msgstr ""
#. IDS_PLUGIN_TYPE1
-#: Merge.rc:5264
+#: Merge.rc:5274
msgid "URL Handler"
msgstr ""
#. IDS_PLUGIN_TYPE2
-#: Merge.rc:5265
+#: Merge.rc:5275
msgid "File Unpacker"
msgstr ""
#. IDS_PLUGIN_TYPE3
-#: Merge.rc:5266
+#: Merge.rc:5276
msgid "File or Folder Unpacker"
msgstr ""
#. IDS_PLUGIN_TYPE5
-#: Merge.rc:5268
+#: Merge.rc:5278
msgid "Alias for Unpacker"
msgstr ""
#. IDS_PLUGIN_TYPE6
-#: Merge.rc:5269
+#: Merge.rc:5279
msgid "Alias for Prediffer"
msgstr ""
#. IDS_PLUGIN_TYPE7
-#: Merge.rc:5270
+#: Merge.rc:5280
msgid "Alias for Editor script"
msgstr ""
#. IDS_PLUGIN_ALIAS_DESC
-#: Merge.rc:5271
+#: Merge.rc:5281
#, c-format
msgid "Alias for plugin pipeline '%1'"
msgstr ""
#. IDS_PLUGIN_NEW_DESC
-#: Merge.rc:5272
+#: Merge.rc:5282
msgid "New plugin description"
msgstr ""
#. IDS_PLUGIN_TARGETS_ALL
-#: Merge.rc:5273
+#: Merge.rc:5283
msgid "All"
msgstr ""
#. IDS_PLUGIN_TARGETS_1ST
-#: Merge.rc:5274
+#: Merge.rc:5284
msgid "1st"
msgstr ""
#. IDS_PLUGIN_TARGETS_2ND
-#: Merge.rc:5275
+#: Merge.rc:5285
msgid "2nd"
msgstr ""
#. IDS_PLUGIN_TARGETS_3RD
-#: Merge.rc:5276
+#: Merge.rc:5286
msgid "3rd"
msgstr ""
#. IDS_PLUGIN_TARGETS_1ST_2ND
-#: Merge.rc:5277
+#: Merge.rc:5287
msgid "1st and 2nd"
msgstr ""
#. IDS_PLUGIN_TARGETS_1ST_3RD
-#: Merge.rc:5278
+#: Merge.rc:5288
msgid "1st and 3rd"
msgstr ""
#. IDS_PLUGIN_TARGETS_2ND_3RD
-#: Merge.rc:5279
+#: Merge.rc:5289
msgid "2nd and 3rd"
msgstr ""
#. IDS_FILTER_APPLIED
-#: Merge.rc:5284
+#: Merge.rc:5294
msgid "Filter applied"
msgstr ""
#. IDS_FILTERMENU_COMPARE
-#: Merge.rc:5289
+#: Merge.rc:5299
#, c-format
msgid "Compare %1"
msgstr ""
#. IDS_FILTERMENU_FILTER_BY_THIS_COLUMN
-#: Merge.rc:5290
+#: Merge.rc:5300
msgid "&Filter by This Column"
msgstr ""
#. IDS_FILTERMENU_FILTER_BY_THIS_COLUMN2
-#: Merge.rc:5291
+#: Merge.rc:5301
msgid "&Filter by This Column..."
msgstr ""
#. IDS_CLIPBOARDHISTORY_TIME
-#: Merge.rc:5296
+#: Merge.rc:5306
#, c-format
msgid "Clipboard at %s"
msgstr ""
#. IDS_CLIPBOARDHISTORY_DISABLED
-#: Merge.rc:5297
+#: Merge.rc:5307
msgid "Clipboard history disabled.\r\nEnable: Windows logo key + V, then Turn on."
msgstr ""
-#: Merge.rc:5299
+#: Merge.rc:5309
msgid "This system does not support clipboard history."
msgstr ""
-#: Merge.rc:5301
+#: Merge.rc:5311
msgid "32-bit WinMerge does not support Clipboard Compare"
msgstr ""
#. IDS_WEBVIEW2_RUNTIME_NOT_INSTALLED
-#: Merge.rc:5306
+#: Merge.rc:5316
msgid "WebView2 runtime not installed. Download it?"
msgstr ""
#. IDS_JUMPLIST_NEW_TEXT_COMPARE
-#: Merge.rc:5311
+#: Merge.rc:5321
msgid "New Text Compare"
msgstr ""
#. IDS_JUMPLIST_NEW_TABLE_COMPARE
-#: Merge.rc:5312
+#: Merge.rc:5322
msgid "New Table Compare"
msgstr ""
#. IDS_JUMPLIST_NEW_BINARY_COMPARE
-#: Merge.rc:5313
+#: Merge.rc:5323
msgid "New Binary Compare"
msgstr ""
#. IDS_JUMPLIST_NEW_IMAGE_COMPARE
-#: Merge.rc:5314
+#: Merge.rc:5324
msgid "New Image Compare"
msgstr ""
#. IDS_JUMPLIST_NEW_WEBPAGE_COMPARE
-#: Merge.rc:5315
+#: Merge.rc:5325
msgid "New Webpage Compare"
msgstr ""
+#. IDS_JUMPLIST_NEW_FOLDER_COMPARE
+#: Merge.rc:5326
+msgid "New Folder Compare"
+msgstr ""
+
#. IDS_JUMPLIST_CLIPBOARD_COMPARE
-#: Merge.rc:5316
+#: Merge.rc:5327
msgid "Clipboard Compare"
msgstr ""
#. IDS_PREVIEWBAR_PRINT
-#: Merge.rc:5321
+#: Merge.rc:5332
msgid "&Print..."
msgstr ""
#. IDS_PREVIEWBAR_PREVPAGE
-#: Merge.rc:5323
+#: Merge.rc:5334
msgid "Pre&v Page"
msgstr ""
#. IDS_PREVIEWBAR_TWOPAGE
-#: Merge.rc:5324
+#: Merge.rc:5335
msgid "&Two Page"
msgstr ""
#. IDS_PREVIEWBAR_ONEPAGE
-#: Merge.rc:5325
+#: Merge.rc:5336
msgid "&One Page"
msgstr ""
#. IDS_PREVIEWBAR_ZOOMIN
-#: Merge.rc:5326
+#: Merge.rc:5337
msgid "Zoom &In"
msgstr ""
#. IDS_PREVIEWBAR_ZOOMOUT
-#: Merge.rc:5327
+#: Merge.rc:5338
msgid "Zoom &Out"
msgstr ""
#. IDS_WEBPAGE_COMPARING
-#: Merge.rc:5333
+#: Merge.rc:5344
msgid "Comparing..."
msgstr ""
#. IDS_WEBPAGE_ZOOM
-#: Merge.rc:5334
+#: Merge.rc:5345
msgid "Zoom:"
msgstr ""
#. IDS_COPY_GRANULARITY_DIFFHUNK
-#: Merge.rc:5339
+#: Merge.rc:5350
msgid "Diff hunk"
msgstr ""
#. IDS_COPY_GRANULARITY_INLINE
-#: Merge.rc:5340
+#: Merge.rc:5351
msgid "Inline diff"
msgstr ""
#. IDS_COPY_GRANULARITY_LINE
-#: Merge.rc:5341
+#: Merge.rc:5352
msgid "Line"
msgstr ""
-#: Merge.rc:5342
+#: Merge.rc:5353
msgid "Character"
msgstr ""
#. ID_MICE_PREVDIFF
-#: Merge.rc:5347
+#: Merge.rc:5358
msgid "\nPrevious Difference (Alt+Up)\n(Right Button+Wheel Up)\n(Alt+Wheel Up)"
msgstr ""
#. ID_MICE_NEXTDIFF
-#: Merge.rc:5348
+#: Merge.rc:5359
msgid "\nNext Difference (Alt+Down)\n(Right Button+Wheel Down)\n(Alt+Wheel Down)"
msgstr ""
#. ID_MICE_L2R
-#: Merge.rc:5349
+#: Merge.rc:5360
msgid "\nCopy to Right (Alt+Right)\n(Right Button+Wheel Right)\n(Alt+Wheel Right)\n(Alt+Shift+Wheel Down)"
msgstr ""
#. ID_MICE_R2L
-#: Merge.rc:5350
+#: Merge.rc:5361
msgid "\nCopy to Left (Alt+Left)\n(Right Button+Wheel Left)\n(Alt+Wheel Left)\n(Alt+Shift+Wheel Up)"
msgstr ""
#. ID_MICE_L2RNEXT
-#: Merge.rc:5351
+#: Merge.rc:5362
msgid "\nCopy to Right and Advance (Ctrl+Alt+Right)\n(Ctrl+Alt+Wheel Right)\n(Ctrl+Alt+Shift+Wheel Down)"
msgstr ""
#. ID_MICE_R2LNEXT
-#: Merge.rc:5352
+#: Merge.rc:5363
msgid "\nCopy to Left and Advance (Ctrl+Alt+Left)\n(Ctrl+Alt+Wheel Left)\n(Ctrl+Alt+Shift+Wheel Up)"
msgstr ""
#. IDS_LOG_COMPARING_2
-#: Merge.rc:5362
+#: Merge.rc:5373
#, c-format
msgid "Comparing %1 with %2"
msgstr ""
#. IDS_LOG_COMPARING_3
-#: Merge.rc:5363
+#: Merge.rc:5374
#, c-format
msgid "Comparing %1 with %2 and %3"
msgstr ""
#. IDS_LOG_COMPARE_COMPLETED
-#: Merge.rc:5364
+#: Merge.rc:5375
msgid "Comparison completed"
msgstr ""
#. IDS_LOG_COMPARE_ERROR_2
-#: Merge.rc:5365
+#: Merge.rc:5376
#, c-format
msgid "Failed to compare %1 with %2: "
msgstr ""
#. IDS_LOG_COMPARE_ERROR_3
-#: Merge.rc:5366
+#: Merge.rc:5377
#, c-format
msgid "Failed to compare %1 with %2 and %3: "
msgstr ""
#. IDS_LOG_FILE_SAVED
-#: Merge.rc:5367
+#: Merge.rc:5378
msgid "File saved"
msgstr ""
#. IDS_LOG_COPYING_FILES
-#: Merge.rc:5368
+#: Merge.rc:5379
msgid "Copying files..."
msgstr ""
#. IDS_LOG_MOVING_FILES
-#: Merge.rc:5369
+#: Merge.rc:5380
msgid "Moving files..."
msgstr ""
#. IDS_LOG_DELETING_FILES
-#: Merge.rc:5370
+#: Merge.rc:5381
msgid "Deleting files..."
msgstr ""
#. IDS_LOG_RECYCLEBIN
-#: Merge.rc:5371
+#: Merge.rc:5382
msgid "Recycle Bin"
msgstr ""
#. IDS_LOG_PERMANENTLY_DELETED
-#: Merge.rc:5372
+#: Merge.rc:5383
msgid "Permanently deleted"
msgstr ""
#. IDS_LOG_FILEOPERATION_COMPLETED
-#: Merge.rc:5373
+#: Merge.rc:5384
msgid "File operation completed successfully"
msgstr ""
#. IDS_LOG_FILEOPERATION_CANCELED
-#: Merge.rc:5374
+#: Merge.rc:5385
msgid "File operation canceled"
msgstr ""
#. IDS_FILTER_ERROR_NO_ERROR
-#: Merge.rc:5379
+#: Merge.rc:5390
msgid "No error"
msgstr ""
#. IDS_FILTER_ERROR_EMPTY_EXPRESSION
-#: Merge.rc:5380
+#: Merge.rc:5391
msgid "Filter expression is empty"
msgstr ""
#. IDS_FILTER_ERROR_UNKNOWN_CHAR
-#: Merge.rc:5381
+#: Merge.rc:5392
msgid "Unknown character in filter expression"
msgstr ""
#. IDS_FILTER_ERROR_UNTERMINATED_STRING
-#: Merge.rc:5382
+#: Merge.rc:5393
msgid "Unterminated string literal"
msgstr ""
#. IDS_FILTER_ERROR_SYNTAX_ERROR
-#: Merge.rc:5383
+#: Merge.rc:5394
msgid "Syntax error in filter expression"
msgstr ""
#. IDS_FILTER_ERROR_PARSE_FAILURE
-#: Merge.rc:5384
+#: Merge.rc:5395
msgid "Failed to parse filter expression"
msgstr ""
#. IDS_FILTER_ERROR_INVALID_LITERAL
-#: Merge.rc:5385
+#: Merge.rc:5396
msgid "Invalid literal value"
msgstr ""
#. IDS_FILTER_ERROR_INVALID_REGULAR_EXPRESSION
-#: Merge.rc:5386
+#: Merge.rc:5397
msgid "Invalid regular expression"
msgstr ""
#. IDS_FILTER_ERROR_UNDEFINED_IDENTIFIER
-#: Merge.rc:5387
+#: Merge.rc:5398
msgid "Undefined identifier"
msgstr ""
#. IDS_FILTER_ERROR_INVALID_ARGUMENT_COUNT
-#: Merge.rc:5388
+#: Merge.rc:5399
msgid "Invalid number of arguments"
msgstr ""
#. IDS_FILTER_ERROR_FILTER_NAME_NOT_FOUND
-#: Merge.rc:5389
+#: Merge.rc:5400
msgid "Filter name not found"
msgstr ""
#. IDS_FILTER_ERROR_DIVIDE_BY_ZERO
-#: Merge.rc:5390
+#: Merge.rc:5401
msgid "Division by zero in filter expression"
msgstr ""
#. IDS_FILTER_ERROR_UNKNOWN_ERROR
-#: Merge.rc:5391
+#: Merge.rc:5402
msgid "Unknown error"
msgstr ""
#. IDS_FILTER_ERROR_INVALID_PROPERTY_NAME
-#: Merge.rc:5392
+#: Merge.rc:5403
msgid "Invalid property name"
msgstr ""
#. IDS_FILTER_ERROR_INVALID_DIRECTIVE
-#: Merge.rc:5393
+#: Merge.rc:5404
msgid "Invalid directive"
msgstr ""
#. IDS_FILTER_OP_EQUALS
-#: Merge.rc:5398
+#: Merge.rc:5409
msgid "Equals"
msgstr ""
#. IDS_FILTER_OP_NOT_EQUALS
-#: Merge.rc:5399
+#: Merge.rc:5410
msgid "Does not equal"
msgstr ""
#. IDS_FILTER_OP_LESS_THAN
-#: Merge.rc:5400
+#: Merge.rc:5411
msgid "Less than"
msgstr ""
#. IDS_FILTER_OP_LESS_EQUAL
-#: Merge.rc:5401
+#: Merge.rc:5412
msgid "Less than or equal to"
msgstr ""
#. IDS_FILTER_OP_GREATER_EQUAL
-#: Merge.rc:5402
+#: Merge.rc:5413
msgid "Greater than or equal to"
msgstr ""
#. IDS_FILTER_OP_GREATER_THAN
-#: Merge.rc:5403
+#: Merge.rc:5414
msgid "Greater than"
msgstr ""
#. IDS_FILTER_OP_BETWEEN
-#: Merge.rc:5404
+#: Merge.rc:5415
msgid "Between"
msgstr ""
#. IDS_FILTER_OP_NOT_BETWEEN
-#: Merge.rc:5405
+#: Merge.rc:5416
msgid "Not Between"
msgstr ""
#. IDS_FILTER_OP_CONTAINS
-#: Merge.rc:5406
+#: Merge.rc:5417
msgid "Contains"
msgstr ""
#. IDS_FILTER_OP_NOT_CONTAINS
-#: Merge.rc:5407
+#: Merge.rc:5418
msgid "Not Contains"
msgstr ""
#. IDS_FILTER_OP_RECONTAINS
-#: Merge.rc:5408
+#: Merge.rc:5419
msgid "Contains (regex)"
msgstr ""
#. IDS_FILTER_OP_NOT_RECONTAINS
-#: Merge.rc:5409
+#: Merge.rc:5420
msgid "Not Contains (regex)"
msgstr ""
#. IDS_FILTER_OP_LIKE
-#: Merge.rc:5410
+#: Merge.rc:5421
msgid "Match (wildcard)"
msgstr ""
#. IDS_FILTER_OP_NOT_LIKE
-#: Merge.rc:5411
+#: Merge.rc:5422
msgid "Not match (wildcard)"
msgstr ""
#. IDS_FILTER_OP_MATCHES
-#: Merge.rc:5412
+#: Merge.rc:5423
msgid "Match (regex)"
msgstr ""
#. IDS_FILTER_OP_NOT_MATCHES
-#: Merge.rc:5413
+#: Merge.rc:5424
msgid "Not match (regex)"
msgstr ""
#. IDS_COLORMODE_LIGHT
-#: Merge.rc:5418
+#: Merge.rc:5429
msgid "Light"
msgstr ""
#. IDS_COLORMODE_DARK
-#: Merge.rc:5419
+#: Merge.rc:5430
msgid "Dark"
msgstr ""
#. IDS_COLORMODE_FOLLOWSYSTEM
-#: Merge.rc:5420
+#: Merge.rc:5431
msgid "Follow system"
msgstr ""
#. IDS_EXAMPLE
-#: Merge.rc:5425
+#: Merge.rc:5436
#, c-format
msgid "e.g. %1"
msgstr ""
#. IDS_DETECTED_PREVIOUS_CRASH
-#: Merge.rc:5430
+#: Merge.rc:5441
msgid "WinMerge detected a previous crash. Please report this if possible."
msgstr ""
#. IDS_REGEX_REPLACE_LIST_TEMPLATE
-#: Merge.rc:5435
+#: Merge.rc:5446
msgid "# Regex replacement list\r\n# Format: regexreplacement\r\n# Backreferences like $1, $2 are supported\r\n\r\n(\\d{4})-(\\d{2})-(\\d{2})\t$1_$2_$3\r\n"
msgstr ""
#. IDS_STRING_REPLACE_LIST_TEMPLATE
-#: Merge.rc:5436
+#: Merge.rc:5447
msgid "# Replacement list\r\n# Format: searchreplacement\r\n# Lines starting with # are ignored\r\n\r\nfrom1\tto1\r\nfrom2\tto2\r\n"
msgstr ""
diff --git a/Translations/WinMerge/Danish.po b/Translations/WinMerge/Danish.po
index 0ffe3b0e779..441870fe7f4 100644
--- a/Translations/WinMerge/Danish.po
+++ b/Translations/WinMerge/Danish.po
@@ -22,7 +22,7 @@ msgstr ""
"X-Generator: Poedit 1.5.4\n"
#. LANGUAGE, SUBLANGUAGE
-#: Merge.rc:26 Merge.rc:59 Merge.rc:5453
+#: Merge.rc:26 Merge.rc:59 Merge.rc:5464
#, c-format
msgid "LANG_ENGLISH, SUBLANG_ENGLISH_US"
msgstr "LANG_DANISH, SUBLANG_DEFAULT"
@@ -108,7 +108,7 @@ msgid "Copy Selected Diff (Right) to Clipboard\tCtrl+&3"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_SELECTLINEDIFF
-#: Merge.rc:110 Merge.rc:673
+#: Merge.rc:110 Merge.rc:680
#, c-format
msgid "Select Line &Difference\tF4"
msgstr "Vælg &linjeforskel\tF4"
@@ -142,7 +142,7 @@ msgid "Cu&t"
msgstr "&Klip"
#. IDR_POPUP_DIRVIEW
-#: Merge.rc:118 Merge.rc:943
+#: Merge.rc:118 Merge.rc:951
#, c-format
msgid "&Copy"
msgstr "Ko&pier"
@@ -154,21 +154,21 @@ msgid "&Paste"
msgstr "&Indsæt"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:121 Merge.rc:875 Merge.rc:882
+#: Merge.rc:121 Merge.rc:882 Merge.rc:889
#, c-format
msgid "&Scripts"
msgstr "&Scripts"
#. IDS_NO_EDIT_SCRIPTS
-#: Merge.rc:123 Merge.rc:338 Merge.rc:447 Merge.rc:654 Merge.rc:659
-#: Merge.rc:865 Merge.rc:877 Merge.rc:884 Merge.rc:940 Merge.rc:1183
-#: Merge.rc:5028
+#: Merge.rc:123 Merge.rc:340 Merge.rc:451 Merge.rc:661 Merge.rc:666
+#: Merge.rc:872 Merge.rc:884 Merge.rc:891 Merge.rc:948 Merge.rc:1193
+#: Merge.rc:5038
#, c-format
msgid "< Empty >"
msgstr "< Tom >"
#. IDR_POPUP_LOCATIONBAR, ID_EDIT_WMGOTO
-#: Merge.rc:126 Merge.rc:691 Merge.rc:1081
+#: Merge.rc:126 Merge.rc:698 Merge.rc:1089
msgid "&Go to...\tCtrl+G"
msgstr "Gå &til...\tCtrl+G"
@@ -189,27 +189,27 @@ msgid "Op&en"
msgstr "Åb&en"
#. IDR_POPUP_DIRVIEW, ID_DIR_OPEN_RIGHT
-#: Merge.rc:132 Merge.rc:981 Merge.rc:988 Merge.rc:995
+#: Merge.rc:132 Merge.rc:989 Merge.rc:996 Merge.rc:1003
msgid "With &Registered Application"
msgstr "Med det ®istrerede program"
#. IDR_POPUP_DIRVIEW, ID_DIR_OPEN_RIGHT_WITHEDITOR
-#: Merge.rc:133 Merge.rc:982 Merge.rc:989 Merge.rc:996
+#: Merge.rc:133 Merge.rc:990 Merge.rc:997 Merge.rc:1004
msgid "With &External Editor\tCtrl+Alt+E"
msgstr "Med en &ekstern editor\tCtrl+Alt+E"
#. IDR_POPUP_DIRVIEW, ID_DIR_OPEN_RIGHT_WITH
-#: Merge.rc:134 Merge.rc:983 Merge.rc:990 Merge.rc:997
+#: Merge.rc:134 Merge.rc:991 Merge.rc:998 Merge.rc:1005
msgid "&With..."
msgstr "&Med..."
#. IDR_POPUP_DIRVIEW, ID_DIR_OPEN_RIGHT_PARENT_FOLDER
-#: Merge.rc:135 Merge.rc:984 Merge.rc:991 Merge.rc:998
+#: Merge.rc:135 Merge.rc:992 Merge.rc:999 Merge.rc:1006
msgid "Open &Parent Folder..."
msgstr ""
#. IDR_POPUP_IMG_CTXT, ID_FILE_SHELLMENU
-#: Merge.rc:137 Merge.rc:1239
+#: Merge.rc:137 Merge.rc:1249
msgid "S&hell Menu"
msgstr ""
@@ -247,8 +247,8 @@ msgid "Ins&ertion/Deletion Detection"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_TOOLBAR_NONE
-#: Merge.rc:176 Merge.rc:209 Merge.rc:216 Merge.rc:358 Merge.rc:507
-#: Merge.rc:751
+#: Merge.rc:176 Merge.rc:209 Merge.rc:216 Merge.rc:360 Merge.rc:511
+#: Merge.rc:758
#, c-format
msgid "&None"
msgstr "&Ingen"
@@ -264,13 +264,13 @@ msgid "&Horizontal"
msgstr ""
#. IDR_POPUP_IMG_CTXT, ID_IMG_CURPANE_PREVPAGE
-#: Merge.rc:181 Merge.rc:189 Merge.rc:1230
+#: Merge.rc:181 Merge.rc:189 Merge.rc:1240
#, c-format
msgid "&Previous Page"
msgstr ""
#. IDS_PREVIEWBAR_NEXTPAGE
-#: Merge.rc:182 Merge.rc:190 Merge.rc:1231 Merge.rc:5322
+#: Merge.rc:182 Merge.rc:190 Merge.rc:1241 Merge.rc:5333
#, c-format
msgid "&Next Page"
msgstr ""
@@ -282,45 +282,45 @@ msgid "&Active Pane"
msgstr ""
#. IDR_POPUP_IMG_CTXT, ID_IMG_CURPANE_ROTATE_RIGHT_90
-#: Merge.rc:185 Merge.rc:1225
+#: Merge.rc:185 Merge.rc:1235
msgid "Rotate &Right 90deg"
msgstr ""
#. IDR_POPUP_IMG_CTXT, ID_IMG_CURPANE_ROTATE_LEFT_90
-#: Merge.rc:186 Merge.rc:1226
+#: Merge.rc:186 Merge.rc:1236
msgid "Rotate &Left 90deg"
msgstr ""
#. IDR_POPUP_IMG_CTXT, ID_IMG_CURPANE_FLIP_VERTICALLY
-#: Merge.rc:187 Merge.rc:1227
+#: Merge.rc:187 Merge.rc:1237
msgid "Flip V&ertically"
msgstr ""
#. IDR_POPUP_IMG_CTXT, ID_IMG_CURPANE_FLIP_HORIZONTALLY
-#: Merge.rc:188 Merge.rc:1228
+#: Merge.rc:188 Merge.rc:1238
msgid "Flip H&orizontally"
msgstr ""
#. IDR_MERGEDOCTYPE
-#: Merge.rc:193 Merge.rc:699
+#: Merge.rc:193 Merge.rc:706
#, c-format
msgid "&Zoom"
msgstr "&Zoom"
#. IDR_MERGEDOCTYPE, ID_VIEW_ZOOMIN
-#: Merge.rc:202 Merge.rc:701
+#: Merge.rc:202 Merge.rc:708
#, c-format
msgid "Zoom &In\tCtrl++"
msgstr "Zoom &ind\tCtrl++"
#. IDR_MERGEDOCTYPE, ID_VIEW_ZOOMOUT
-#: Merge.rc:203 Merge.rc:702
+#: Merge.rc:203 Merge.rc:709
#, c-format
msgid "Zoom &Out\tCtrl+-"
msgstr "Zoom &ud\tCtrl+-"
#. IDR_MERGEDOCTYPE, ID_VIEW_ZOOMNORMAL, Zoom to normal
-#: Merge.rc:205 Merge.rc:704
+#: Merge.rc:205 Merge.rc:711
#, c-format
msgid "&Normal\tCtrl+*"
msgstr "&Normal\tCtrl+*"
@@ -350,29 +350,29 @@ msgid "Dragging &Mode"
msgstr ""
#. IDR_POPUP_IMG_CTXT, ID_IMG_DRAGGINGMODE_MOVE
-#: Merge.rc:217 Merge.rc:955 Merge.rc:1233
+#: Merge.rc:217 Merge.rc:963 Merge.rc:1243
#, c-format
msgid "&Move"
msgstr "&Flyt"
#. IDR_POPUP_IMG_CTXT, ID_IMG_DRAGGINGMODE_ADJUST_OFFSET
-#: Merge.rc:218 Merge.rc:1234
+#: Merge.rc:218 Merge.rc:1244
#, c-format
msgid "&Adjust Offset"
msgstr ""
#. IDR_POPUP_IMG_CTXT, ID_IMG_DRAGGINGMODE_VERTICAL_WIPE
-#: Merge.rc:219 Merge.rc:1235
+#: Merge.rc:219 Merge.rc:1245
msgid "&Vertical Wipe"
msgstr ""
#. IDR_POPUP_IMG_CTXT, ID_IMG_DRAGGINGMODE_HORIZONTAL_WIPE
-#: Merge.rc:220 Merge.rc:1236
+#: Merge.rc:220 Merge.rc:1246
msgid "&Horizontal Wipe"
msgstr ""
#. IDR_POPUP_IMG_CTXT, ID_IMG_DRAGGINGMODE_RECTANGLE_SELECT
-#: Merge.rc:221 Merge.rc:1237
+#: Merge.rc:221 Merge.rc:1247
msgid "Rectangle &Select"
msgstr ""
@@ -408,37 +408,37 @@ msgid "Compare Extracted &Text from Images"
msgstr ""
#. IDD_OPEN, IDOK
-#: Merge.rc:272 Merge.rc:1980
+#: Merge.rc:272 Merge.rc:1990
msgid "Co&mpare"
msgstr ""
#. IDR_POPUP_WEBPAGE_COMPARE, ID_WEB_COMPARE_SCREENSHOTS
-#: Merge.rc:274 Merge.rc:1247
+#: Merge.rc:274 Merge.rc:1257
msgid "&Screenshots"
msgstr ""
#. IDR_POPUP_WEBPAGE_COMPARE, ID_WEB_COMPARE_FULLSIZE_SCREENSHOTS
-#: Merge.rc:275 Merge.rc:1248
+#: Merge.rc:275 Merge.rc:1258
msgid "&Full Size Screenshots"
msgstr ""
#. IDR_POPUP_WEBPAGE_COMPARE, ID_WEB_COMPARE_HTMLS
-#: Merge.rc:276 Merge.rc:1249
+#: Merge.rc:276 Merge.rc:1259
msgid "&HTMLs"
msgstr ""
#. IDR_POPUP_WEBPAGE_COMPARE, ID_WEB_COMPARE_TEXTS
-#: Merge.rc:277 Merge.rc:1250
+#: Merge.rc:277 Merge.rc:1260
msgid "&Texts"
msgstr ""
#. IDR_POPUP_WEBPAGE_COMPARE, ID_WEB_COMPARE_RESOURCETREES
-#: Merge.rc:278 Merge.rc:1251
+#: Merge.rc:278 Merge.rc:1261
msgid "&Resource Trees"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_SIZE
-#: Merge.rc:280 Merge.rc:1775
+#: Merge.rc:280 Merge.rc:1785
msgid "&Size"
msgstr ""
@@ -453,27 +453,27 @@ msgid "&Event Sync"
msgstr ""
#. IDR_POPUP_WEBPAGE_SYNC_EVENTS, ID_WEB_SYNC_ENABLED
-#: Merge.rc:291 Merge.rc:1259
+#: Merge.rc:291 Merge.rc:1269
msgid "&Enabled"
msgstr ""
#. IDR_POPUP_WEBPAGE_SYNC_EVENTS, ID_WEB_SYNC_SCROLL
-#: Merge.rc:293 Merge.rc:1261
+#: Merge.rc:293 Merge.rc:1271
msgid "&Scroll"
msgstr ""
#. IDR_POPUP_WEBPAGE_SYNC_EVENTS, ID_WEB_SYNC_CLICK
-#: Merge.rc:294 Merge.rc:1262
+#: Merge.rc:294 Merge.rc:1272
msgid "&Click"
msgstr ""
#. IDR_POPUP_WEBPAGE_SYNC_EVENTS, ID_WEB_SYNC_INPUT
-#: Merge.rc:295 Merge.rc:1263
+#: Merge.rc:295 Merge.rc:1273
msgid "&Input"
msgstr ""
#. IDR_POPUP_WEBPAGE_SYNC_EVENTS, ID_WEB_SYNC_GOBACKFORWARD
-#: Merge.rc:296 Merge.rc:1264
+#: Merge.rc:296 Merge.rc:1274
msgid "&Go Back/Forward"
msgstr ""
@@ -503,3948 +503,3959 @@ msgid "&All Profiles"
msgstr ""
#. IDR_MERGEDOCTYPE
-#: Merge.rc:310 Merge.rc:411 Merge.rc:586
+#: Merge.rc:310 Merge.rc:413 Merge.rc:590
#, c-format
msgid "&File"
msgstr "&Filer"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:312 Merge.rc:413 Merge.rc:588
+#: Merge.rc:312 Merge.rc:415 Merge.rc:592
#, c-format
msgid "&New"
msgstr "&Ny"
#. IDR_POPUP_COMPARE, ID_MERGE_COMPARE_TEXT
-#: Merge.rc:314 Merge.rc:322 Merge.rc:415 Merge.rc:423 Merge.rc:590
-#: Merge.rc:598 Merge.rc:649 Merge.rc:935 Merge.rc:1159 Merge.rc:1171
+#: Merge.rc:314 Merge.rc:323 Merge.rc:417 Merge.rc:426 Merge.rc:594
+#: Merge.rc:603 Merge.rc:655 Merge.rc:942 Merge.rc:1167 Merge.rc:1180
#, c-format
msgid "&Text"
msgstr ""
#. IDR_POPUP_COMPARE, ID_MERGE_COMPARE_TABLE
-#: Merge.rc:315 Merge.rc:323 Merge.rc:416 Merge.rc:424 Merge.rc:591
-#: Merge.rc:599 Merge.rc:650 Merge.rc:936 Merge.rc:1160 Merge.rc:1172
+#: Merge.rc:315 Merge.rc:324 Merge.rc:418 Merge.rc:427 Merge.rc:595
+#: Merge.rc:604 Merge.rc:656 Merge.rc:943 Merge.rc:1168 Merge.rc:1181
msgid "T&able"
msgstr ""
#. IDR_POPUP_COMPARE, ID_MERGE_COMPARE_HEX
-#: Merge.rc:316 Merge.rc:324 Merge.rc:417 Merge.rc:425 Merge.rc:592
-#: Merge.rc:600 Merge.rc:651 Merge.rc:937 Merge.rc:1161 Merge.rc:1173
+#: Merge.rc:316 Merge.rc:325 Merge.rc:419 Merge.rc:428 Merge.rc:596
+#: Merge.rc:605 Merge.rc:657 Merge.rc:944 Merge.rc:1169 Merge.rc:1182
#, c-format
msgid "&Binary"
msgstr "&Binær"
#. IDS_IMAGE_MENU
-#: Merge.rc:317 Merge.rc:325 Merge.rc:418 Merge.rc:426 Merge.rc:593
-#: Merge.rc:601 Merge.rc:652 Merge.rc:938 Merge.rc:1162 Merge.rc:1174
-#: Merge.rc:5123
+#: Merge.rc:317 Merge.rc:326 Merge.rc:420 Merge.rc:429 Merge.rc:597
+#: Merge.rc:606 Merge.rc:658 Merge.rc:945 Merge.rc:1170 Merge.rc:1183
+#: Merge.rc:5133
#, c-format
msgid "&Image"
msgstr ""
#. IDR_POPUP_COMPARE, ID_MERGE_COMPARE_WEBPAGE
-#: Merge.rc:318 Merge.rc:326 Merge.rc:419 Merge.rc:427 Merge.rc:594
-#: Merge.rc:602 Merge.rc:653 Merge.rc:939 Merge.rc:1163 Merge.rc:1175
+#: Merge.rc:318 Merge.rc:327 Merge.rc:421 Merge.rc:430 Merge.rc:598
+#: Merge.rc:607 Merge.rc:659 Merge.rc:946 Merge.rc:1171 Merge.rc:1184
msgid "&Webpage"
msgstr ""
+#. IDR_POPUP_NEW, ID_FILE_NEW_FOLDER
+#: Merge.rc:319 Merge.rc:328 Merge.rc:422 Merge.rc:431 Merge.rc:599
+#: Merge.rc:608 Merge.rc:1172
+msgid "&Folder"
+msgstr ""
+
#. IDR_MERGEDOCTYPE
-#: Merge.rc:320 Merge.rc:421 Merge.rc:596
+#: Merge.rc:321 Merge.rc:424 Merge.rc:601
#, c-format
msgid "New (&3 panes)"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_FILE_OPEN
-#: Merge.rc:328 Merge.rc:429 Merge.rc:604
+#: Merge.rc:330 Merge.rc:433 Merge.rc:610
#, c-format
msgid "&Open...\tCtrl+O"
msgstr "&Åben...\tCtrl+O"
#. IDR_MERGEDOCTYPE, ID_FILE_OPENCONFLICT
-#: Merge.rc:329 Merge.rc:430 Merge.rc:605
+#: Merge.rc:331 Merge.rc:434 Merge.rc:611
msgid "Open Conflic&t File..."
msgstr "Åben konflik&tfil..."
#. IDR_MERGEDOCTYPE, ID_FILE_OPENCLIPBOARD
-#: Merge.rc:330 Merge.rc:431 Merge.rc:606
+#: Merge.rc:332 Merge.rc:435 Merge.rc:612
msgid "Open C&lipboard"
msgstr ""
#. IDR_POPUP_PROJECT, ID_FILE_OPENPROJECT
-#: Merge.rc:332 Merge.rc:433 Merge.rc:608 Merge.rc:1191
+#: Merge.rc:334 Merge.rc:437 Merge.rc:614 Merge.rc:1201
#, c-format
msgid "Open Pro&ject...\tCtrl+J"
msgstr "Åben pro&jekt...\tCtrl+J"
#. IDD_OPEN, ID_SAVE_PROJECT
-#: Merge.rc:333 Merge.rc:434 Merge.rc:609 Merge.rc:1193 Merge.rc:1979
+#: Merge.rc:335 Merge.rc:438 Merge.rc:615 Merge.rc:1203 Merge.rc:1989
#, c-format
msgid "Sa&ve Project..."
msgstr "Gem &projekt..."
#. IDR_MAINFRAME, ID_FILE_PROJECT_MRU_FIRST
-#: Merge.rc:335
+#: Merge.rc:337
#, c-format
msgid "Recent Projects"
msgstr "Seneste Projekt"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:336 Merge.rc:445 Merge.rc:657
+#: Merge.rc:338 Merge.rc:449 Merge.rc:664
#, c-format
msgid "Recent F&iles or Folders"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_APP_EXIT
-#: Merge.rc:341 Merge.rc:450 Merge.rc:662
+#: Merge.rc:343 Merge.rc:454 Merge.rc:669
msgid "E&xit\tCtrl+Q"
msgstr "&Afslut\tCtrl+Q"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:343 Merge.rc:452 Merge.rc:664
+#: Merge.rc:345 Merge.rc:456 Merge.rc:671
#, c-format
msgid "&Edit"
msgstr "&Rediger"
#. IDR_MERGEDOCTYPE, ID_EDIT_PASTE
-#: Merge.rc:345 Merge.rc:671
+#: Merge.rc:347 Merge.rc:678
#, c-format
msgid "&Paste\tCtrl+V"
msgstr "&Indsæt\tCtrl+V"
#. IDR_MERGEDOCTYPE, ID_OPTIONS
-#: Merge.rc:347 Merge.rc:456 Merge.rc:693
+#: Merge.rc:349 Merge.rc:460 Merge.rc:700
#, c-format
msgid "&Options...\tCtrl+,"
msgstr "I&ndstillinger...\tCtrl+,"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:349 Merge.rc:458 Merge.rc:695
+#: Merge.rc:351 Merge.rc:462 Merge.rc:702
#, c-format
msgid "&View"
msgstr "&Vis"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:351 Merge.rc:500 Merge.rc:744
+#: Merge.rc:353 Merge.rc:504 Merge.rc:751
#, c-format
msgid "Ta&b Bar"
msgstr "Fa&nelinje"
#. IDR_MERGEDOCTYPE, ID_VIEW_TAB_BAR
-#: Merge.rc:353 Merge.rc:502 Merge.rc:746
+#: Merge.rc:355 Merge.rc:506 Merge.rc:753
msgid "&View Tab Bar"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_VIEW_TAB_BAR_ON_TITLE_BAR
-#: Merge.rc:354 Merge.rc:503 Merge.rc:747
+#: Merge.rc:356 Merge.rc:507 Merge.rc:754
msgid "&On Title Bar"
msgstr ""
#. IDR_MERGEDOCTYPE
-#: Merge.rc:356 Merge.rc:505 Merge.rc:749
+#: Merge.rc:358 Merge.rc:509 Merge.rc:756
#, c-format
msgid "&Toolbar"
msgstr "&Værktøjslinje"
#. IDR_MERGEDOCTYPE, ID_TOOLBAR_SMALL
-#: Merge.rc:359 Merge.rc:508 Merge.rc:752
+#: Merge.rc:361 Merge.rc:512 Merge.rc:759
#, c-format
msgid "&Small"
msgstr "&Lille"
#. IDR_MERGEDOCTYPE, ID_TOOLBAR_MEDIUM
-#: Merge.rc:360 Merge.rc:509 Merge.rc:753
+#: Merge.rc:362 Merge.rc:513 Merge.rc:760
msgid "&Medium"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_TOOLBAR_BIG
-#: Merge.rc:361 Merge.rc:510 Merge.rc:754
+#: Merge.rc:363 Merge.rc:514 Merge.rc:761
#, c-format
msgid "&Big"
msgstr "&Stor"
#. IDR_MERGEDOCTYPE, ID_TOOLBAR_HUGE
-#: Merge.rc:362 Merge.rc:511 Merge.rc:755
+#: Merge.rc:364 Merge.rc:515 Merge.rc:762
#, c-format
msgid "&Huge"
msgstr ""
#. IDS_VIEW_MENU_BAR
-#: Merge.rc:364 Merge.rc:513 Merge.rc:757 Merge.rc:5357
+#: Merge.rc:366 Merge.rc:517 Merge.rc:764 Merge.rc:5368
msgid "Men&u Bar"
msgstr ""
#. IDR_DIRDOCTYPE, ID_VIEW_OUTPUT_BAR
-#: Merge.rc:365 Merge.rc:515
+#: Merge.rc:367 Merge.rc:519
msgid "&Output Pane"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_VIEW_STATUS_BAR
-#: Merge.rc:366 Merge.rc:516 Merge.rc:758
+#: Merge.rc:368 Merge.rc:520 Merge.rc:765
#, c-format
msgid "&Status Bar"
msgstr "S&tatuslinje"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:368 Merge.rc:539 Merge.rc:847
+#: Merge.rc:370 Merge.rc:543 Merge.rc:854
#, c-format
msgid "&Tools"
msgstr "Værk&tøjer"
#. IDR_MERGEDOCTYPE, ID_TOOLS_FILTERS
-#: Merge.rc:370 Merge.rc:542 Merge.rc:849
+#: Merge.rc:372 Merge.rc:546 Merge.rc:856
#, c-format
msgid "&Filters..."
msgstr "&Filtre..."
#. IDR_MERGEDOCTYPE, ID_TOOLS_GENERATEPATCH
-#: Merge.rc:371 Merge.rc:543 Merge.rc:850
+#: Merge.rc:373 Merge.rc:547 Merge.rc:857
#, c-format
msgid "&Generate Patch..."
msgstr "&Generer en Patch..."
#. IDR_MERGEDOCTYPE
-#: Merge.rc:373 Merge.rc:546 Merge.rc:853
+#: Merge.rc:375 Merge.rc:550 Merge.rc:860
#, c-format
msgid "&Plugins"
msgstr "&Plugins"
#. IDD_PLUGINS_LIST, IDC_PLUGIN_SETTINGS
-#: Merge.rc:375 Merge.rc:548 Merge.rc:855 Merge.rc:2494 Merge.rc:2926
+#: Merge.rc:377 Merge.rc:552 Merge.rc:862 Merge.rc:2504 Merge.rc:2936
#, c-format
msgid "P&lugin Settings..."
msgstr ""
#. IDR_MERGEDOCTYPE, ID_PREDIFFER_MANUAL
-#: Merge.rc:377 Merge.rc:550 Merge.rc:857
+#: Merge.rc:379 Merge.rc:554 Merge.rc:864
#, c-format
msgid "Ma&nual Prediffer"
msgstr "Ma&nuel Prediffer"
#. IDR_MERGEDOCTYPE, ID_PREDIFFER_AUTO
-#: Merge.rc:378 Merge.rc:551 Merge.rc:858
+#: Merge.rc:380 Merge.rc:555 Merge.rc:865
#, c-format
msgid "A&utomatic Prediffer"
msgstr "A&utomatisk Prediffer"
#. IDR_MERGEDOCTYPE, ID_UNPACK_MANUAL
-#: Merge.rc:380 Merge.rc:553 Merge.rc:860
+#: Merge.rc:382 Merge.rc:557 Merge.rc:867
#, c-format
msgid "&Manual Unpacking"
msgstr "&Manuel Udpakning"
#. IDR_MERGEDOCTYPE, ID_UNPACK_AUTO
-#: Merge.rc:381 Merge.rc:554 Merge.rc:861
+#: Merge.rc:383 Merge.rc:558 Merge.rc:868
#, c-format
msgid "&Automatic Unpacking"
msgstr "&Automatisk Udpakning"
#. IDR_MERGEDOCTYPE, ID_RELOAD_PLUGINS
-#: Merge.rc:383 Merge.rc:558 Merge.rc:889
+#: Merge.rc:385 Merge.rc:562 Merge.rc:896
#, c-format
msgid "&Reload Plugins"
msgstr "&Genindlæs plugins"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:385 Merge.rc:560 Merge.rc:891
+#: Merge.rc:387 Merge.rc:564 Merge.rc:898
#, c-format
msgid "&Window"
msgstr "Vind&ue"
#. IDR_MERGEDOCTYPE, ID_FILE_CLOSE
-#: Merge.rc:387 Merge.rc:562 Merge.rc:893
+#: Merge.rc:389 Merge.rc:566 Merge.rc:900
msgid "Cl&ose\tCtrl+W"
msgstr "&Luk\tCtrl+W"
#. IDR_MERGEDOCTYPE, ID_WINDOW_CLOSEALL
-#: Merge.rc:388 Merge.rc:563 Merge.rc:894
+#: Merge.rc:390 Merge.rc:567 Merge.rc:901
#, c-format
msgid "Clo&se All"
msgstr "Luk &alle"
#. IDR_MERGEDOCTYPE, ID_NEXT_PANE
-#: Merge.rc:390 Merge.rc:565 Merge.rc:896
+#: Merge.rc:392 Merge.rc:569 Merge.rc:903
#, c-format
msgid "Change &Pane\tF6"
msgstr "&Skift panel\tF6"
#. IDR_MERGEDOCTYPE, ID_WINDOW_TILE_HORZ
-#: Merge.rc:392 Merge.rc:567 Merge.rc:900
+#: Merge.rc:394 Merge.rc:571 Merge.rc:907
#, c-format
msgid "Tile &Horizontally"
msgstr "&Horisontale vinduer"
#. IDR_MERGEDOCTYPE, ID_WINDOW_TILE_VERT
-#: Merge.rc:393 Merge.rc:568 Merge.rc:901
+#: Merge.rc:395 Merge.rc:572 Merge.rc:908
#, c-format
msgid "Tile &Vertically"
msgstr "&Vertikale vinduer"
#. IDR_MERGEDOCTYPE, ID_WINDOW_CASCADE
-#: Merge.rc:394 Merge.rc:569 Merge.rc:902
+#: Merge.rc:396 Merge.rc:573 Merge.rc:909
#, c-format
msgid "&Cascade"
msgstr "&Kaskade"
#. IDS_MESSAGEBOX_HELP
-#: Merge.rc:396 Merge.rc:571 Merge.rc:904 Merge.rc:3200 Merge.rc:4189
+#: Merge.rc:398 Merge.rc:575 Merge.rc:911 Merge.rc:3210 Merge.rc:4199
#, c-format
msgid "&Help"
msgstr "&Hjælp"
#. IDR_MERGEDOCTYPE, ID_HELP_CONTENTS
-#: Merge.rc:398 Merge.rc:573 Merge.rc:906
+#: Merge.rc:400 Merge.rc:577 Merge.rc:913
#, c-format
msgid "&WinMerge Help\tF1"
msgstr "&WinMerge hjælp\tF1"
#. IDR_MERGEDOCTYPE, ID_HELP_RELEASENOTES
-#: Merge.rc:400 Merge.rc:575 Merge.rc:908
+#: Merge.rc:402 Merge.rc:579 Merge.rc:915
#, c-format
msgid "R&elease Notes"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_HELP_TRANSLATIONS
-#: Merge.rc:401 Merge.rc:576 Merge.rc:909
+#: Merge.rc:403 Merge.rc:580 Merge.rc:916
#, c-format
msgid "&Translations"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_HELP_GETCONFIG
-#: Merge.rc:402 Merge.rc:577 Merge.rc:910
+#: Merge.rc:404 Merge.rc:581 Merge.rc:917
#, c-format
msgid "C&onfiguration"
msgstr "K&onfiguration"
#. IDR_MERGEDOCTYPE, ID_HELP_GNULICENSE
-#: Merge.rc:404 Merge.rc:579 Merge.rc:912
+#: Merge.rc:406 Merge.rc:583 Merge.rc:919
#, c-format
msgid "&GNU General Public License"
msgstr "&GNU General Public License"
#. IDR_MERGEDOCTYPE, ID_APP_ABOUT
-#: Merge.rc:405 Merge.rc:580 Merge.rc:913
+#: Merge.rc:407 Merge.rc:584 Merge.rc:920
#, c-format
msgid "&About WinMerge..."
msgstr "&Om WinMerge..."
#. IDR_MERGEDOCTYPE
-#: Merge.rc:436 Merge.rc:629
+#: Merge.rc:440 Merge.rc:635
#, c-format
msgid "&Read-Only"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_FILE_LEFT_READONLY
-#: Merge.rc:438 Merge.rc:631
+#: Merge.rc:442 Merge.rc:637
#, c-format
msgid "L&eft Read-Only"
msgstr "V&enstre skrivebeskyttet"
#. IDR_MERGEDOCTYPE, ID_FILE_MIDDLE_READONLY
-#: Merge.rc:439 Merge.rc:632
+#: Merge.rc:443 Merge.rc:638
#, c-format
msgid "M&iddle Read-Only"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_FILE_RIGHT_READONLY
-#: Merge.rc:440 Merge.rc:633
+#: Merge.rc:444 Merge.rc:639
#, c-format
msgid "Ri&ght Read-Only"
msgstr "&Højre skrivebeskyttet"
#. IDD_ENCODINGERROR, IDC_FILEENCODING
-#: Merge.rc:443 Merge.rc:646 Merge.rc:1038 Merge.rc:3063
+#: Merge.rc:447 Merge.rc:652 Merge.rc:1046 Merge.rc:3073
#, c-format
msgid "&File Encoding..."
msgstr "&Fil Kodning..."
#. IDR_POPUP_OUTPUTVIEW, ID_EDIT_SELECT_ALL
-#: Merge.rc:454 Merge.rc:674 Merge.rc:1343
+#: Merge.rc:458 Merge.rc:681 Merge.rc:1353
#, c-format
msgid "Select &All\tCtrl+A"
msgstr "Vælg &alt\tCtrl+A"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWIDENTICAL
-#: Merge.rc:460
+#: Merge.rc:464
#, c-format
msgid "Show &Identical Items"
msgstr "Vis &identiske"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWDIFFERENT
-#: Merge.rc:461
+#: Merge.rc:465
#, c-format
msgid "Show &Different Items"
msgstr "Vis &forskellige"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWUNIQUELEFT
-#: Merge.rc:462
+#: Merge.rc:466
#, c-format
msgid "Show L&eft Unique Items"
msgstr "Vis &venstre unikke"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWUNIQUEMIDDLE
-#: Merge.rc:463
+#: Merge.rc:467
#, c-format
msgid "Show Midd&le Unique Items"
msgstr ""
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWUNIQUERIGHT
-#: Merge.rc:464
+#: Merge.rc:468
#, c-format
msgid "Show Ri&ght Unique Items"
msgstr "Vis &højre unikke"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWSKIPPED
-#: Merge.rc:465
+#: Merge.rc:469
#, c-format
msgid "Show S&kipped Items"
msgstr "Vis &oversprungne"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWBINARIES
-#: Merge.rc:466
+#: Merge.rc:470
#, c-format
msgid "S&how Binary Files"
msgstr "Vis &binære filer"
#. IDR_DIRDOCTYPE
-#: Merge.rc:467
+#: Merge.rc:471
#, c-format
msgid "&3-way Compare"
msgstr ""
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWDIFFERENTLEFTONLY
-#: Merge.rc:469
+#: Merge.rc:473
#, c-format
msgid "Show &Left Only Different Items"
msgstr ""
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWDIFFERENTMIDDLEONLY
-#: Merge.rc:470
+#: Merge.rc:474
#, c-format
msgid "Show &Middle Only Different Items"
msgstr ""
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWDIFFERENTRIGHTONLY
-#: Merge.rc:471
+#: Merge.rc:475
#, c-format
msgid "Show &Right Only Different Items"
msgstr ""
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWMISSINGLEFTONLY
-#: Merge.rc:473
+#: Merge.rc:477
msgid "Show L&eft Only Missing Items"
msgstr ""
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWMISSINGMIDDLEONLY
-#: Merge.rc:474
+#: Merge.rc:478
msgid "Show Mi&ddle Only Missing Items"
msgstr ""
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWMISSINGRIGHTONLY
-#: Merge.rc:475
+#: Merge.rc:479
msgid "Show Rig&ht Only Missing Items"
msgstr ""
#. IDR_DIRDOCTYPE, ID_VIEW_SHOWHIDDENITEMS
-#: Merge.rc:478
+#: Merge.rc:482
#, c-format
msgid "Show Hidd&en Items"
msgstr "V&is skjulte"
#. IDR_DIRDOCTYPE, ID_VIEW_TREEMODE
-#: Merge.rc:480
+#: Merge.rc:484
#, c-format
msgid "Tree &Mode"
msgstr "Vis i et &træ"
#. IDR_DIRDOCTYPE
-#: Merge.rc:481
+#: Merge.rc:485
msgid "E&xpand Subfolders"
msgstr ""
#. IDR_DIRDOCTYPE, ID_VIEW_EXPAND_ALLSUBDIRS
-#: Merge.rc:483
+#: Merge.rc:487
msgid "&All Subfolders"
msgstr ""
#. IDR_DIRDOCTYPE, ID_VIEW_EXPAND_DIFFERENT_SUBDIRS
-#: Merge.rc:484
+#: Merge.rc:488
msgid "&Different Subfolders"
msgstr ""
#. IDR_DIRDOCTYPE, ID_VIEW_EXPAND_IDENTICAL_SUBDIRS
-#: Merge.rc:485
+#: Merge.rc:489
msgid "&Identical Subfolders"
msgstr ""
#. IDR_DIRDOCTYPE, ID_VIEW_COLLAPSE_ALLSUBDIRS
-#: Merge.rc:487
+#: Merge.rc:491
#, c-format
msgid "&Collapse All Subfolders"
msgstr "Luk &alle undermapper"
#. IDR_DIRDOCTYPE, ID_VIEW_SHOW_EMPTY_FOLDERS
-#: Merge.rc:488
+#: Merge.rc:492
msgid "Show &Empty Folders"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_VIEW_SELECTFONT
-#: Merge.rc:490 Merge.rc:697
+#: Merge.rc:494 Merge.rc:704
#, c-format
msgid "Select &Font..."
msgstr "Vælg &skrifttype..."
#. IDR_MERGEDOCTYPE, ID_VIEW_USEDEFAULTFONT
-#: Merge.rc:491 Merge.rc:698
+#: Merge.rc:495 Merge.rc:705
#, c-format
msgid "Use Default Font"
msgstr "Brug standard s&krifttype"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:493 Merge.rc:736
+#: Merge.rc:497 Merge.rc:743
#, c-format
msgid "Sw&ap Panes"
msgstr "By&t vinduer"
#. IDR_MERGEDOCTYPE, ID_SWAPPANES_SWAP12
-#: Merge.rc:495 Merge.rc:738
+#: Merge.rc:499 Merge.rc:745
msgid "Swap &1st | 2nd"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_SWAPPANES_SWAP23
-#: Merge.rc:496 Merge.rc:739
+#: Merge.rc:500 Merge.rc:746
msgid "Swap &2nd | 3rd"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_SWAPPANES_SWAP13
-#: Merge.rc:497 Merge.rc:740
+#: Merge.rc:501 Merge.rc:747
msgid "Swap 1st | &3rd"
msgstr ""
#. IDR_DIRDOCTYPE, ID_VIEW_DISPLAY_FILTER_BAR_MENU
-#: Merge.rc:514
+#: Merge.rc:518
msgid "Displa&y Filter Bar\tCtrl+Shift+L"
msgstr ""
#. IDR_DIRDOCTYPE, ID_VIEW_DIR_STATISTICS
-#: Merge.rc:518
+#: Merge.rc:522
#, c-format
msgid "Com&pare Statistics..."
msgstr "Sammen&ligningsstatistikker..."
#. IDR_MERGEDOCTYPE, ID_REFRESH
-#: Merge.rc:520 Merge.rc:763
+#: Merge.rc:524 Merge.rc:770
#, c-format
msgid "Refresh\tF5"
msgstr "&Opdater\tF5"
#. IDR_POPUP_DIRVIEW, ID_RESCAN
-#: Merge.rc:521 Merge.rc:1030
+#: Merge.rc:525 Merge.rc:1038
#, c-format
msgid "&Refresh Selected\tCtrl+F5"
msgstr "Op&dater valgte\tCtrl+F5"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:523 Merge.rc:765
+#: Merge.rc:527 Merge.rc:772
#, c-format
msgid "&Merge"
msgstr "&Flet"
#. IDR_DIRDOCTYPE, ID_MERGE_COMPARE
-#: Merge.rc:525
+#: Merge.rc:529
#, c-format
msgid "Co&mpare\tEnter"
msgstr "Sammen&lign\tEnter"
#. IDR_MERGEDOCTYPE, ID_NEXTDIFF
-#: Merge.rc:527 Merge.rc:767
+#: Merge.rc:531 Merge.rc:774
#, c-format
msgid "&Next Difference\tAlt+Down"
msgstr "&Næste forskel\tAlt+Ned"
#. IDR_MERGEDOCTYPE, ID_PREVDIFF
-#: Merge.rc:528 Merge.rc:768
+#: Merge.rc:532 Merge.rc:775
#, c-format
msgid "&Previous Difference\tAlt+Up"
msgstr "&Forrige forskel\tAlt+Op"
#. IDR_MERGEDOCTYPE, ID_FIRSTDIFF
-#: Merge.rc:530 Merge.rc:773
+#: Merge.rc:534 Merge.rc:780
#, c-format
msgid "&First Difference\tAlt+Home"
msgstr "F&ørste forskel\tAlt+Home"
#. IDR_MERGEDOCTYPE, ID_CURDIFF
-#: Merge.rc:531 Merge.rc:774
+#: Merge.rc:535 Merge.rc:781
#, c-format
msgid "&Current Difference\tAlt+Enter"
msgstr "&Aktuelle forskel\tAlt+Enter"
#. IDR_MERGEDOCTYPE, ID_LASTDIFF
-#: Merge.rc:532 Merge.rc:775
+#: Merge.rc:536 Merge.rc:782
#, c-format
msgid "&Last Difference\tAlt+End"
msgstr "&Sidste forskel\tAlt+End"
#. IDR_MERGEDOCTYPE, ID_L2R
-#: Merge.rc:534 Merge.rc:830
+#: Merge.rc:538 Merge.rc:837
#, c-format
msgid "Copy to &Right\tAlt+Right"
msgstr "Kopier til &højre\tAlt+Højre"
#. IDR_MERGEDOCTYPE, ID_R2L
-#: Merge.rc:535 Merge.rc:831
+#: Merge.rc:539 Merge.rc:838
#, c-format
msgid "Copy to L&eft\tAlt+Left"
msgstr "Kopier til &venstre\tAlt+Venstre"
#. IDR_DIRDOCTYPE, ID_MERGE_DELETE
-#: Merge.rc:537
+#: Merge.rc:541
#, c-format
msgid "&Delete\tDel"
msgstr "Sl&et\tDel"
#. IDR_POPUP_DIRVIEW, ID_TOOLS_CUSTOMIZECOLUMNS
-#: Merge.rc:541 Merge.rc:1042
+#: Merge.rc:545 Merge.rc:1050
#, c-format
msgid "&Customize Columns..."
msgstr "&Tilpas søjler..."
#. IDR_MERGEDOCTYPE, ID_TOOLS_GENERATEREPORT
-#: Merge.rc:544 Merge.rc:851
+#: Merge.rc:548 Merge.rc:858
#, c-format
msgid "Generate &Report..."
msgstr "Generer en &rapport..."
#. IDD_ENCODINGERROR, IDC_PLUGIN
-#: Merge.rc:556 Merge.rc:867 Merge.rc:3064
+#: Merge.rc:560 Merge.rc:874 Merge.rc:3074
#, c-format
msgid "&Edit with Unpacker..."
msgstr ""
#. IDR_MERGEDOCTYPE, ID_FILE_SAVE
-#: Merge.rc:611
+#: Merge.rc:617
#, c-format
msgid "&Save\tCtrl+S"
msgstr "&Gem\tCtrl+S"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:612
+#: Merge.rc:618
#, c-format
msgid "Sav&e"
msgstr ""
#. IDR_POPUP_SAVE, ID_FILE_SAVE_LEFT
-#: Merge.rc:614 Merge.rc:1201
+#: Merge.rc:620 Merge.rc:1211
#, c-format
msgid "Save &Left"
msgstr "Gem &venstre"
#. IDR_POPUP_SAVE, ID_FILE_SAVE_MIDDLE
-#: Merge.rc:615 Merge.rc:1202
+#: Merge.rc:621 Merge.rc:1212
#, c-format
msgid "Save &Middle"
msgstr ""
#. IDR_POPUP_SAVE, ID_FILE_SAVE_RIGHT
-#: Merge.rc:616 Merge.rc:1203
+#: Merge.rc:622 Merge.rc:1213
#, c-format
msgid "Save &Right"
msgstr "Gem &højre"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:618
+#: Merge.rc:624
#, c-format
msgid "Save &As"
msgstr ""
#. IDR_POPUP_SAVE, ID_FILE_SAVEAS_LEFT
-#: Merge.rc:620 Merge.rc:1205
+#: Merge.rc:626 Merge.rc:1215
#, c-format
msgid "Save &Left As..."
msgstr ""
#. IDR_POPUP_SAVE, ID_FILE_SAVEAS_MIDDLE
-#: Merge.rc:621 Merge.rc:1206
+#: Merge.rc:627 Merge.rc:1216
#, c-format
msgid "Save &Middle As..."
msgstr ""
#. IDR_POPUP_SAVE, ID_FILE_SAVEAS_RIGHT
-#: Merge.rc:622 Merge.rc:1207
+#: Merge.rc:628 Merge.rc:1217
#, c-format
msgid "Save &Right As..."
msgstr ""
#. IDR_MERGEDOCTYPE, ID_FILE_PRINT
-#: Merge.rc:625
+#: Merge.rc:631
msgid "&Print...\tCtrl+P"
msgstr "&Udskriv...\tCtrl+P"
#. IDR_MERGEDOCTYPE, ID_FILE_PAGE_SETUP
-#: Merge.rc:626
+#: Merge.rc:632
msgid "Page Set&up..."
msgstr "Side op&sætning..."
#. IDR_MERGEDOCTYPE, ID_FILE_PRINT_PREVIEW
-#: Merge.rc:627
+#: Merge.rc:633
msgid "Print Previe&w..."
msgstr "Vis udskrif&t..."
#. IDR_MERGEDOCTYPE
-#: Merge.rc:636
+#: Merge.rc:642
#, c-format
msgid "&Convert Line Endings to"
msgstr "&Konverter linjeendelserne til"
#. IDR_MERGEDOCTYPE, ID_FILE_MERGINGMODE
-#: Merge.rc:643
+#: Merge.rc:649
#, c-format
msgid "Mer&ge Mode\tF9"
msgstr "&Flette modus\tF9"
#. IDR_MERGEDOCTYPE, ID_RESCAN
-#: Merge.rc:645
+#: Merge.rc:651
msgid "Reloa&d\tCtrl+F5"
msgstr ""
#. IDR_MERGEDOCTYPE
-#: Merge.rc:647
+#: Merge.rc:653
#, c-format
msgid "Reco&mpare As"
msgstr ""
+#. IDR_POPUP_COMPARE, ID_MERGE_COMPARE_FOLDER
+#: Merge.rc:660 Merge.rc:947 Merge.rc:1185
+msgid "A&rchive"
+msgstr ""
+
#. IDR_MERGEDOCTYPE, ID_EDIT_UNDO
-#: Merge.rc:666
+#: Merge.rc:673
#, c-format
msgid "&Undo\tCtrl+Z"
msgstr "&Fortryd\tCtrl+Z"
#. IDR_MERGEDOCTYPE, ID_EDIT_REDO
-#: Merge.rc:667
+#: Merge.rc:674
#, c-format
msgid "&Redo\tCtrl+Y"
msgstr "&Gendan\tCtrl+Y"
#. IDR_MERGEDOCTYPE, ID_EDIT_CUT
-#: Merge.rc:669
+#: Merge.rc:676
#, c-format
msgid "Cu&t\tCtrl+X"
msgstr "&Klip\tCtrl+X"
#. IDR_POPUP_OUTPUTVIEW, ID_EDIT_COPY
-#: Merge.rc:670 Merge.rc:1342
+#: Merge.rc:677 Merge.rc:1352
#, c-format
msgid "&Copy\tCtrl+C"
msgstr "Ko&pier\tCtrl+C"
#. IDR_MERGEDOCTYPE, ID_EDIT_FIND
-#: Merge.rc:676
+#: Merge.rc:683
#, c-format
msgid "F&ind...\tCtrl+F"
msgstr "S&øg...\tCtrl+F"
#. IDR_MERGEDOCTYPE, ID_EDIT_REPLACE
-#: Merge.rc:677
+#: Merge.rc:684
#, c-format
msgid "Repla&ce...\tCtrl+H"
msgstr "&Erstat...\tCtrl+H"
#. IDR_MERGEDOCTYPE, ID_EDIT_MARK
-#: Merge.rc:678
+#: Merge.rc:685
#, c-format
msgid "&Marker...\tCtrl+Shift+M"
msgstr ""
#. IDR_MERGEDOCTYPE
-#: Merge.rc:680
+#: Merge.rc:687
#, c-format
msgid "Advanced"
msgstr "Avanceret"
#. IDR_MERGEDOCTYPE, ID_EDIT_COPY_LINENUMBERS
-#: Merge.rc:682
+#: Merge.rc:689
#, c-format
msgid "&Copy With Line Numbers\tCtrl+Shift+C"
msgstr "&Kopier med linjenumre\tCtrl+Shift+C"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:684
+#: Merge.rc:691
#, c-format
msgid "&Bookmarks"
msgstr "&Bogmærker"
#. IDR_MERGEDOCTYPE, ID_EDIT_TOGGLE_BOOKMARK
-#: Merge.rc:686
+#: Merge.rc:693
#, c-format
msgid "&Toggle Bookmark\tCtrl+F2"
msgstr "&Vis/skjul bogmærke\tCtrl+F2"
#. IDR_MERGEDOCTYPE, ID_EDIT_GOTO_NEXT_BOOKMARK
-#: Merge.rc:687
+#: Merge.rc:694
#, c-format
msgid "&Next Bookmark\tF2"
msgstr "&Næste bogmærke\tF2"
#. IDR_MERGEDOCTYPE, ID_EDIT_GOTO_PREV_BOOKMARK
-#: Merge.rc:688
+#: Merge.rc:695
#, c-format
msgid "&Previous Bookmark\tShift+F2"
msgstr "&Forrige bogmærke\tShift+F2"
#. IDR_MERGEDOCTYPE, ID_EDIT_CLEAR_ALL_BOOKMARKS
-#: Merge.rc:689
+#: Merge.rc:696
#, c-format
msgid "&Clear All Bookmarks"
msgstr "&Slet alle bogmærker"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:706
+#: Merge.rc:713
#, c-format
msgid "Syntax Highlight"
msgstr "Fremhæv syntaks"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:711
+#: Merge.rc:718
#, c-format
msgid "&Diff Context"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_ALL
-#: Merge.rc:713
+#: Merge.rc:720
#, c-format
msgid "&All Lines"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_0
-#: Merge.rc:715
+#: Merge.rc:722
#, c-format
msgid "&0 Lines"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_1
-#: Merge.rc:716
+#: Merge.rc:723
#, c-format
msgid "&1 Line"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_3
-#: Merge.rc:717
+#: Merge.rc:724
#, c-format
msgid "&3 Lines"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_5
-#: Merge.rc:718
+#: Merge.rc:725
#, c-format
msgid "&5 Lines"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_7
-#: Merge.rc:719
+#: Merge.rc:726
#, c-format
msgid "&7 Lines"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_9
-#: Merge.rc:720
+#: Merge.rc:727
#, c-format
msgid "&9 Lines"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_TOGGLE
-#: Merge.rc:722
+#: Merge.rc:729
#, c-format
msgid "&Toggle All and 0-9 Lines\tCtrl+D"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_INVERT
-#: Merge.rc:724
+#: Merge.rc:731
msgid "&Invert (Hide Different Lines)"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_VIEW_RESIZE_PANES
-#: Merge.rc:727
+#: Merge.rc:734
#, c-format
msgid "&Lock Panes"
msgstr "&Lås vinduer"
#. IDR_MERGEDOCTYPE, ID_VIEW_WHITESPACE
-#: Merge.rc:728
+#: Merge.rc:735
#, c-format
msgid "&View Whitespace"
msgstr "Vis &mellemrum"
#. IDR_MERGEDOCTYPE, ID_VIEW_EOL
-#: Merge.rc:729
+#: Merge.rc:736
msgid "View E&OL"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_VIEW_LINEDIFFS
-#: Merge.rc:730
+#: Merge.rc:737
#, c-format
msgid "Vie&w Line Differences"
msgstr "Vis &linjeforskelle"
#. IDR_MERGEDOCTYPE, ID_VIEW_LINENUMBERS
-#: Merge.rc:731
+#: Merge.rc:738
#, c-format
msgid "View Line &Numbers"
msgstr "Vis linje&numre"
#. IDR_MERGEDOCTYPE, ID_VIEW_SELMARGIN
-#: Merge.rc:732
+#: Merge.rc:739
#, c-format
msgid "View &Margins"
msgstr "Vis &margener"
#. IDR_MERGEDOCTYPE, ID_VIEW_TOPMARGIN
-#: Merge.rc:733
+#: Merge.rc:740
msgid "View To&p Margins"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_VIEW_WORDWRAP
-#: Merge.rc:734
+#: Merge.rc:741
#, c-format
msgid "W&rap Lines"
msgstr "O&mbryd linjer"
#. IDR_MERGEDOCTYPE, ID_VIEW_SPLITVERTICALLY
-#: Merge.rc:742
+#: Merge.rc:749
#, c-format
msgid "Split V&ertically"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_VIEW_DETAIL_BAR
-#: Merge.rc:759
+#: Merge.rc:766
#, c-format
msgid "Diff &Pane"
msgstr "H&orisontalt panel"
#. IDR_MERGEDOCTYPE, ID_VIEW_LOCATION_BAR
-#: Merge.rc:760
+#: Merge.rc:767
#, c-format
msgid "Lo&cation Pane"
msgstr "V&ertikalt panel"
#. IDS_OUTPUTBAR_CAPTION
-#: Merge.rc:761 Merge.rc:4902
+#: Merge.rc:768 Merge.rc:4912
msgid "Output Pane"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_NEXTCONFLICT
-#: Merge.rc:770
+#: Merge.rc:777
#, c-format
msgid "Ne&xt Conflict\tAlt+Shift+Down"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_PREVCONFLICT
-#: Merge.rc:771
+#: Merge.rc:778
#, c-format
msgid "Pre&vious Conflict\tAlt+Shift+Up"
msgstr ""
#. IDR_MERGEDOCTYPE
-#: Merge.rc:777
+#: Merge.rc:784
#, c-format
msgid "A&dvanced"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_NEXTDIFFLM
-#: Merge.rc:779
+#: Merge.rc:786
#, c-format
msgid "Next Difference (Left/Middle)\tAlt+1"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_PREVDIFFLM
-#: Merge.rc:780
+#: Merge.rc:787
#, c-format
msgid "Previous Difference (Left/Middle)\tAlt+Shift+1"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_NEXTDIFFLR
-#: Merge.rc:782
+#: Merge.rc:789
#, c-format
msgid "Next Difference (Left/Right)\tAlt+2"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_PREVDIFFLR
-#: Merge.rc:783
+#: Merge.rc:790
#, c-format
msgid "Previous Difference (Left/Right)\tAlt+Shift+2"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_NEXTDIFFMR
-#: Merge.rc:785
+#: Merge.rc:792
#, c-format
msgid "Next Difference (Middle/Right)\tAlt+3"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_PREVDIFFMR
-#: Merge.rc:786
+#: Merge.rc:793
#, c-format
msgid "Previous Difference (Middle/Right)\tAlt+Shift+3"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_NEXTDIFFLO
-#: Merge.rc:788
+#: Merge.rc:795
#, c-format
msgid "Next Left-Only Difference\tAlt+7"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_PREVDIFFLO
-#: Merge.rc:789
+#: Merge.rc:796
#, c-format
msgid "Previous Left-Only Difference\tAlt+Shift+7"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_NEXTDIFFMO
-#: Merge.rc:791
+#: Merge.rc:798
#, c-format
msgid "Next Middle-Only Difference\tAlt+8"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_PREVDIFFMO
-#: Merge.rc:792
+#: Merge.rc:799
#, c-format
msgid "Previous Middle-Only Difference\tAlt+Shift+8"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_NEXTDIFFRO
-#: Merge.rc:794
+#: Merge.rc:801
#, c-format
msgid "Next Right-Only Difference\tAlt+9"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_PREVDIFFRO
-#: Merge.rc:795
+#: Merge.rc:802
#, c-format
msgid "Previous Right-Only Difference\tAlt+Shift+9"
msgstr ""
#. IDR_MERGEDOCTYPE
-#: Merge.rc:797
+#: Merge.rc:804
msgid "Copy from &Left to"
msgstr ""
#. IDD_LOAD_SAVE_CODEPAGE, IDC_AFFECTS_MIDDLE_BTN
-#: Merge.rc:799 Merge.rc:810 Merge.rc:815 Merge.rc:826 Merge.rc:970
-#: Merge.rc:2545 Merge.rc:2817
+#: Merge.rc:806 Merge.rc:817 Merge.rc:822 Merge.rc:833 Merge.rc:978
+#: Merge.rc:2555 Merge.rc:2827
#, c-format
msgid "&Middle"
msgstr ""
#. IDD_LOAD_SAVE_CODEPAGE, IDC_AFFECTS_RIGHT_BTN
-#: Merge.rc:800 Merge.rc:805 Merge.rc:816 Merge.rc:821 Merge.rc:971
-#: Merge.rc:2546 Merge.rc:2819
+#: Merge.rc:807 Merge.rc:812 Merge.rc:823 Merge.rc:828 Merge.rc:979
+#: Merge.rc:2556 Merge.rc:2829
#, c-format
msgid "&Right"
msgstr "&Højre"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:802
+#: Merge.rc:809
msgid "Copy from &Middle to"
msgstr ""
#. IDD_LOAD_SAVE_CODEPAGE, IDC_AFFECTS_LEFT_BTN
-#: Merge.rc:804 Merge.rc:809 Merge.rc:820 Merge.rc:825 Merge.rc:969
-#: Merge.rc:2544 Merge.rc:2815
+#: Merge.rc:811 Merge.rc:816 Merge.rc:827 Merge.rc:832 Merge.rc:977
+#: Merge.rc:2554 Merge.rc:2825
#, c-format
msgid "&Left"
msgstr "&Venstre"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:807
+#: Merge.rc:814
msgid "Copy from &Right to"
msgstr ""
#. IDR_MERGEDOCTYPE
-#: Merge.rc:813
+#: Merge.rc:820
msgid "Copy Selected Lines from Le&ft to"
msgstr ""
#. IDR_MERGEDOCTYPE
-#: Merge.rc:818
+#: Merge.rc:825
msgid "Copy Selected Lines from Mi&ddle to"
msgstr ""
#. IDR_MERGEDOCTYPE
-#: Merge.rc:823
+#: Merge.rc:830
msgid "Copy Selected Lines from Ri&ght to"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_COPY_FROM_LEFT
-#: Merge.rc:833
+#: Merge.rc:840
#, c-format
msgid "Copy from Left\tAlt+Shift+Right"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_COPY_FROM_RIGHT
-#: Merge.rc:834
+#: Merge.rc:841
#, c-format
msgid "Copy from Right\tAlt+Shift+Left"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_L2RNEXT
-#: Merge.rc:836
+#: Merge.rc:843
msgid "C&opy to Right and Advance\tCtrl+Alt+Right"
msgstr "Kopier til hø&jre og gå til næste\tCtrl+Alt+Right"
#. IDR_MERGEDOCTYPE, ID_R2LNEXT
-#: Merge.rc:837
+#: Merge.rc:844
msgid "Copy &to Left and Advance\tCtrl+Alt+Left"
msgstr "Kopier til v&enstre og gå til næste\tCtrl+Alt+Left"
#. IDR_MERGEDOCTYPE, ID_ALL_RIGHT
-#: Merge.rc:839
+#: Merge.rc:846
#, c-format
msgid "Copy &All to Right"
msgstr "Kopier alt &til højre"
#. IDR_MERGEDOCTYPE, ID_ALL_LEFT
-#: Merge.rc:840
+#: Merge.rc:847
#, c-format
msgid "Cop&y All to Left"
msgstr "Kopier alt til venst&re"
#. IDR_MERGEDOCTYPE, ID_AUTO_MERGE
-#: Merge.rc:842
+#: Merge.rc:849
msgid "A&uto Merge\tCtrl+Alt+M"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_ADD_SYNCPOINT
-#: Merge.rc:844
+#: Merge.rc:851
#, c-format
msgid "Add &Synchronization Point\tAlt+S"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_CLEAR_SYNCPOINTS
-#: Merge.rc:845
+#: Merge.rc:852
#, c-format
msgid "Clear Sync&hronization Points"
msgstr ""
#. IDR_MERGEDOCTYPE
-#: Merge.rc:863
+#: Merge.rc:870
msgid "Unpac&ker"
msgstr ""
#. IDR_MERGEDOCTYPE
-#: Merge.rc:869
+#: Merge.rc:876
#, c-format
msgid "&Prediffer"
msgstr "&Prediffer"
#. IDR_MERGEDOCTYPE, ID_APPLY_PREDIFFER
-#: Merge.rc:873
+#: Merge.rc:880
msgid "Apply Pre&differ..."
msgstr ""
#. IDR_MERGEDOCTYPE, ID_TRANSFORM_WITH_SCRIPT
-#: Merge.rc:879
+#: Merge.rc:886
msgid "&Transform with Editor Script..."
msgstr ""
#. IDR_MERGEDOCTYPE
-#: Merge.rc:880
+#: Merge.rc:887
msgid "Scripts for &Copying"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_SELECT_EDITOR_SCRIPT_FOR_COPYING
-#: Merge.rc:886
+#: Merge.rc:893
msgid "Select &Editor Script..."
msgstr ""
#. IDR_MERGEDOCTYPE, ID_WINDOW_SPLIT
-#: Merge.rc:898
+#: Merge.rc:905
#, c-format
msgid "Sp&lit"
msgstr ""
#. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE
-#: Merge.rc:921
+#: Merge.rc:928
#, c-format
msgid "Comp&are"
msgstr "Samm&enlign"
#. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE_WITH_MOVED_RENAMED
-#: Merge.rc:922
+#: Merge.rc:929
msgid "Compar&e with Renamed/Moved Items"
msgstr ""
#. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE_IN_NEW_WINDOW
-#: Merge.rc:923
+#: Merge.rc:930
msgid "Compare in New &Window"
msgstr ""
#. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE_NONHORIZONTALLY
-#: Merge.rc:924 Merge.rc:931
+#: Merge.rc:931 Merge.rc:938
msgid "Compare Non-hor&izontally..."
msgstr ""
#. IDR_POPUP_DIRVIEW
-#: Merge.rc:925
+#: Merge.rc:932
#, c-format
msgid "Compare Non-hor&izontally"
msgstr ""
#. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE_LEFT1_LEFT2
-#: Merge.rc:927
+#: Merge.rc:934
#, c-format
msgid "First &Left with Second Left"
msgstr ""
#. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE_RIGHT1_RIGHT2
-#: Merge.rc:928
+#: Merge.rc:935
#, c-format
msgid "First &Right with Second Right"
msgstr ""
#. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE_LEFT1_RIGHT2
-#: Merge.rc:929
+#: Merge.rc:936
#, c-format
msgid "&First Left with Second Right"
msgstr ""
#. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE_LEFT2_RIGHT1
-#: Merge.rc:930
+#: Merge.rc:937
#, c-format
msgid "&Second Left with First Right"
msgstr ""
#. IDR_POPUP_DIRVIEW
-#: Merge.rc:933
+#: Merge.rc:940
#, c-format
msgid "Co&mpare As"
msgstr "Sa&mmenlign som"
#. IDS_COPY_LEFT_TO_MIDDLE2
-#: Merge.rc:945 Merge.rc:957 Merge.rc:4502
+#: Merge.rc:953 Merge.rc:965 Merge.rc:4512
#, c-format
msgid "Left to Middle (%1 of %2)"
msgstr ""
#. IDS_COPY_LEFT_TO_RIGHT2
-#: Merge.rc:946 Merge.rc:958 Merge.rc:4501
+#: Merge.rc:954 Merge.rc:966 Merge.rc:4511
#, c-format
msgid "Left to Right (%1 of %2)"
msgstr "Venstre til højre (%1 af %2)"
#. IDS_MOVE_LEFT_TO2
-#: Merge.rc:947 Merge.rc:959 Merge.rc:1022 Merge.rc:4513 Merge.rc:4542
+#: Merge.rc:955 Merge.rc:967 Merge.rc:1030 Merge.rc:4523 Merge.rc:4552
#, c-format
msgid "Left to... (%1 of %2)"
msgstr "Venstre til... (%1 af %2)"
#. IDS_COPY_MIDDLE_TO_LEFT2
-#: Merge.rc:948 Merge.rc:960 Merge.rc:4499
+#: Merge.rc:956 Merge.rc:968 Merge.rc:4509
#, c-format
msgid "Middle to Left (%1 of %2)"
msgstr ""
#. IDS_COPY_MIDDLE_TO_RIGHT2
-#: Merge.rc:949 Merge.rc:961 Merge.rc:4500
+#: Merge.rc:957 Merge.rc:969 Merge.rc:4510
#, c-format
msgid "Middle to Right (%1 of %2)"
msgstr ""
#. IDS_MOVE_MIDDLE_TO2
-#: Merge.rc:950 Merge.rc:962 Merge.rc:1023 Merge.rc:4514 Merge.rc:4543
+#: Merge.rc:958 Merge.rc:970 Merge.rc:1031 Merge.rc:4524 Merge.rc:4553
#, c-format
msgid "Middle to... (%1 of %2)"
msgstr ""
#. IDS_COPY_RIGHT_TO_MIDDLE2
-#: Merge.rc:951 Merge.rc:963 Merge.rc:4498
+#: Merge.rc:959 Merge.rc:971 Merge.rc:4508
#, c-format
msgid "Right to Middle (%1 of %2)"
msgstr ""
#. IDS_COPY_RIGHT_TO_LEFT2
-#: Merge.rc:952 Merge.rc:964 Merge.rc:4497
+#: Merge.rc:960 Merge.rc:972 Merge.rc:4507
#, c-format
msgid "Right to Left (%1 of %2)"
msgstr "Højre til venstre (%1 af %2)"
#. IDS_MOVE_RIGHT_TO2
-#: Merge.rc:953 Merge.rc:965 Merge.rc:1024 Merge.rc:4515 Merge.rc:4544
+#: Merge.rc:961 Merge.rc:973 Merge.rc:1032 Merge.rc:4525 Merge.rc:4554
#, c-format
msgid "Right to... (%1 of %2)"
msgstr "Højre til... (%1 af %2)"
#. IDD_EDIT_MARKER, IDC_EDIT_MARKER_DELETE
-#: Merge.rc:967 Merge.rc:2036
+#: Merge.rc:975 Merge.rc:2046
#, c-format
msgid "&Delete"
msgstr "&Slet"
#. IDR_POPUP_DIRVIEW, ID_DIR_DEL_BOTH
-#: Merge.rc:972
+#: Merge.rc:980
#, c-format
msgid "&Both"
msgstr "&Begge"
#. IDR_POPUP_DIRVIEW, ID_DIR_DEL_ALL
-#: Merge.rc:973
+#: Merge.rc:981
#, c-format
msgid "&All"
msgstr ""
#. IDD_EDIT_REPLACE, IDC_EDIT_SCOPE_SELECTION
-#: Merge.rc:974 Merge.rc:2019
+#: Merge.rc:982 Merge.rc:2029
#, c-format
msgid "&Selection"
msgstr "&Valgte"
#. IDR_POPUP_DIRVIEW, ID_DIR_ITEM_RENAME
-#: Merge.rc:976
+#: Merge.rc:984
#, c-format
msgid "Re&name"
msgstr "Om&døb"
#. IDR_POPUP_DIRVIEW, ID_DIR_HIDE_FILENAMES
-#: Merge.rc:977
+#: Merge.rc:985
#, c-format
msgid "&Hide Items"
msgstr "&Skjul emner"
#. IDR_POPUP_DIRVIEW
-#: Merge.rc:979
+#: Merge.rc:987
#, c-format
msgid "&Open Left"
msgstr "&Åben venstre"
#. IDR_POPUP_DIRVIEW
-#: Merge.rc:986
+#: Merge.rc:994
#, c-format
msgid "Open Midd&le"
msgstr ""
#. IDR_POPUP_DIRVIEW
-#: Merge.rc:993
+#: Merge.rc:1001
#, c-format
msgid "O&pen Right"
msgstr "Å&ben højre"
#. IDR_POPUP_DIRVIEW
-#: Merge.rc:1001
+#: Merge.rc:1009
#, c-format
msgid "Cop&y Paths"
msgstr "K&opier stinavne"
#. IDS_DEL_LEFT_FMT2
-#: Merge.rc:1003 Merge.rc:1012 Merge.rc:4530
+#: Merge.rc:1011 Merge.rc:1020 Merge.rc:4540
#, c-format
msgid "Left (%1 of %2)"
msgstr "Venstre (%1 af %2)"
#. IDS_DEL_MIDDLE_FMT2
-#: Merge.rc:1004 Merge.rc:1013 Merge.rc:4531
+#: Merge.rc:1012 Merge.rc:1021 Merge.rc:4541
#, c-format
msgid "Middle (%1 of %2)"
msgstr ""
#. IDS_DEL_RIGHT_FMT2
-#: Merge.rc:1005 Merge.rc:1014 Merge.rc:4532
+#: Merge.rc:1013 Merge.rc:1022 Merge.rc:4542
#, c-format
msgid "Right (%1 of %2)"
msgstr "Højre (%1 af %2)"
#. IDS_DEL_BOTH_FMT2
-#: Merge.rc:1006 Merge.rc:1015 Merge.rc:4533
+#: Merge.rc:1014 Merge.rc:1023 Merge.rc:4543
#, c-format
msgid "Both (%1 of %2)"
msgstr "Begge (%1 af %2)"
#. IDS_DEL_ALL_FMT2
-#: Merge.rc:1007 Merge.rc:1016 Merge.rc:4538
+#: Merge.rc:1015 Merge.rc:1024 Merge.rc:4548
#, c-format
msgid "All (%1 of %2)"
msgstr ""
#. IDR_POPUP_DIRVIEW, ID_DIR_COPY_FILENAMES
-#: Merge.rc:1009
+#: Merge.rc:1017
#, c-format
msgid "Copy &Filenames"
msgstr "Ko&pier filnavne"
#. IDR_POPUP_DIRVIEW
-#: Merge.rc:1010
+#: Merge.rc:1018
#, c-format
msgid "Copy Items to Clip&board"
msgstr ""
#. IDR_POPUP_DIRVIEW, ID_DIR_COPY_ALL_DISP_COLUMNS
-#: Merge.rc:1018
+#: Merge.rc:1026
msgid "Copy All Di&splayed Columns"
msgstr ""
#. IDR_POPUP_DIRVIEW
-#: Merge.rc:1020
+#: Merge.rc:1028
#, c-format
msgid "&Zip"
msgstr "&Zip"
#. IDS_COPY_BOTH_TO2
-#: Merge.rc:1025 Merge.rc:4516
+#: Merge.rc:1033 Merge.rc:4526
#, c-format
msgid "Both to... (%1 of %2)"
msgstr ""
#. IDS_COPY_ALL_TO2
-#: Merge.rc:1026 Merge.rc:4517
+#: Merge.rc:1034 Merge.rc:4527
#, c-format
msgid "All to... (%1 of %2)"
msgstr ""
#. IDS_COPY_DIFFERENCES_TO2
-#: Merge.rc:1027 Merge.rc:4518
+#: Merge.rc:1035 Merge.rc:4528
#, c-format
msgid "Differences to... (%1 of %2)"
msgstr ""
#. IDR_POPUP_DIRVIEW, ID_DIR_SHELL_CONTEXT_MENU_LEFT
-#: Merge.rc:1032
+#: Merge.rc:1040
#, c-format
msgid "Left Shell Menu"
msgstr "Venstre Shell menu"
#. IDR_POPUP_DIRVIEW, ID_DIR_SHELL_CONTEXT_MENU_MIDDLE
-#: Merge.rc:1033
+#: Merge.rc:1041
#, c-format
msgid "Middle Shell Menu"
msgstr ""
#. IDR_POPUP_DIRVIEW, ID_DIR_SHELL_CONTEXT_MENU_RIGHT
-#: Merge.rc:1034
+#: Merge.rc:1042
#, c-format
msgid "Right Shell Menu"
msgstr "Højre Shell menu"
#. IDR_POPUP_DIRVIEW, ID_DIR_SHELL_CONTEXT_MENU_BOTH
-#: Merge.rc:1035
+#: Merge.rc:1043
msgid "Both Shell Menu"
msgstr ""
#. IDR_POPUP_DIRVIEW, ID_DIR_SHELL_CONTEXT_MENU_ALL
-#: Merge.rc:1036
+#: Merge.rc:1044
msgid "All Shell Menu"
msgstr ""
#. IDR_POPUP_EDITOR_HEADERBAR, ID_EDITOR_COPY
-#: Merge.rc:1050
+#: Merge.rc:1058
#, c-format
msgid "Copy"
msgstr ""
#. IDR_POPUP_EDITOR_HEADERBAR, ID_EDITOR_COPY_PATH
-#: Merge.rc:1051
+#: Merge.rc:1059
#, c-format
msgid "&Copy Full Path"
msgstr "&Kopier det fulde stinavn"
#. IDR_POPUP_EDITOR_HEADERBAR, ID_EDITOR_COPY_FILENAME
-#: Merge.rc:1052
+#: Merge.rc:1060
#, c-format
msgid "Copy &Filename"
msgstr "Kopier &filnavn"
#. IDR_POPUP_EDITOR_HEADERBAR, ID_EDITOR_EDIT_CAPTION
-#: Merge.rc:1053
+#: Merge.rc:1061
msgid "&Edit Caption\tF2"
msgstr ""
#. IDR_POPUP_EDITOR_HEADERBAR, ID_EDITOR_EDIT_PATH
-#: Merge.rc:1055
+#: Merge.rc:1063
msgid "Edit &Path\tCtrl+L"
msgstr ""
#. IDR_POPUP_EDITOR_HEADERBAR, ID_EDITOR_SELECT_FILE
-#: Merge.rc:1056
+#: Merge.rc:1064
msgid "&Open..."
msgstr ""
#. IDR_POPUP_PLUGINS_SETTINGS
-#: Merge.rc:1062
+#: Merge.rc:1070
msgid "Unpacker Settings"
msgstr ""
#. IDS_USERCHOICE_NONE
-#: Merge.rc:1064 Merge.rc:1070 Merge.rc:1789 Merge.rc:1793 Merge.rc:5030
+#: Merge.rc:1072 Merge.rc:1078 Merge.rc:1799 Merge.rc:1803 Merge.rc:5040
#, c-format
msgid ""
msgstr ""
#. IDS_USERCHOICE_AUTOMATIC
-#: Merge.rc:1065 Merge.rc:1071 Merge.rc:5031
+#: Merge.rc:1073 Merge.rc:1079 Merge.rc:5041
#, c-format
msgid ""
msgstr ""
#. IDD_OPEN, IDC_SELECT_PREDIFFER
-#: Merge.rc:1066 Merge.rc:1072 Merge.rc:1970 Merge.rc:1974
+#: Merge.rc:1074 Merge.rc:1080 Merge.rc:1980 Merge.rc:1984
#, c-format
msgid "&Select..."
msgstr "Væ&lg..."
#. IDR_POPUP_PLUGINS_SETTINGS
-#: Merge.rc:1068
+#: Merge.rc:1076
#, c-format
msgid "Prediffer Settings"
msgstr "Prediffer indstillinger"
#. IDR_POPUP_LOCATIONBAR, ID_LOCBAR_GOTODIFF
-#: Merge.rc:1080
+#: Merge.rc:1088
msgid "G&o to Diff"
msgstr "Gå til &forskel"
#. IDR_POPUP_LOCATIONBAR, ID_LOCBAR_MOVECURSOR_ONCLICK
-#: Merge.rc:1083
+#: Merge.rc:1091
msgid "Move Cursor on &Click"
msgstr ""
#. IDR_POPUP_LOCATIONBAR, ID_DISPLAY_MOVED_NONE
-#: Merge.rc:1085
+#: Merge.rc:1093
#, c-format
msgid "&No Moved Blocks"
msgstr "&Ingen flyttede blokke"
#. IDR_POPUP_LOCATIONBAR, ID_DISPLAY_MOVED_ALL
-#: Merge.rc:1086
+#: Merge.rc:1094
#, c-format
msgid "&All Moved Blocks"
msgstr "&Alle flyttede blokke"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS
-#: Merge.rc:1094 Merge.rc:1127
+#: Merge.rc:1102 Merge.rc:1135
#, c-format
msgid "W&hitespaces"
msgstr "&Mellemrum"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_WHITESPACE_COMPARE
-#: Merge.rc:1096 Merge.rc:1129
+#: Merge.rc:1104 Merge.rc:1137
#, c-format
msgid "Com&pare"
msgstr "S&ammenlign"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_WHITESPACE_IGNORE
-#: Merge.rc:1097 Merge.rc:1130
+#: Merge.rc:1105 Merge.rc:1138
#, c-format
msgid "I&gnore Changes"
msgstr "&Ignorer ændringer"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_WHITESPACE_IGNOREALL
-#: Merge.rc:1098 Merge.rc:1131
+#: Merge.rc:1106 Merge.rc:1139
#, c-format
msgid "Ig&nore All"
msgstr "Ign&orer alle"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_IGNORE_BLANKLINES
-#: Merge.rc:1100 Merge.rc:1133
+#: Merge.rc:1108 Merge.rc:1141
#, c-format
msgid "Ignore Blan&k Lines"
msgstr "Ignorer blan&ke linjer"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_IGNORE_CASE
-#: Merge.rc:1101 Merge.rc:1134
+#: Merge.rc:1109 Merge.rc:1142
#, c-format
msgid "Ignore &Case"
msgstr "Ignorer store/små &bogstaver"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_IGNORE_EOL
-#: Merge.rc:1102 Merge.rc:1135
+#: Merge.rc:1110 Merge.rc:1143
#, c-format
msgid "Igno&re EOL Differences (Windows/Unix/Mac)"
msgstr "Igno&rer returtegns forskelle (Windows/Unix/Mac)"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_IGNORE_CODEPAGE
-#: Merge.rc:1103 Merge.rc:1136
+#: Merge.rc:1111 Merge.rc:1144
#, c-format
msgid "Ignore Codepage &Differences"
msgstr ""
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_IGNORE_NUMBERS
-#: Merge.rc:1104 Merge.rc:1137
+#: Merge.rc:1112 Merge.rc:1145
msgid "Ignore Num&bers"
msgstr ""
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_IGNORE_COMMENTS
-#: Merge.rc:1105 Merge.rc:1138
+#: Merge.rc:1113 Merge.rc:1146
msgid "Ignore C&omment Differences"
msgstr ""
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_IGNORE_MISSING_TRAILING_EOL
-#: Merge.rc:1106 Merge.rc:1139
+#: Merge.rc:1114 Merge.rc:1147
msgid "Ignore &Missing Trailing EOL"
msgstr ""
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_IGNORE_LINE_BREAKS
-#: Merge.rc:1107 Merge.rc:1140
+#: Merge.rc:1115 Merge.rc:1148
msgid "Ignore Line &Breaks (Treat as Spaces)"
msgstr ""
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_RECURS_CHECK
-#: Merge.rc:1109 Merge.rc:2963
+#: Merge.rc:1117 Merge.rc:2973
#, c-format
msgid "&Include Subfolders"
msgstr "&Inkluder undermapper"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS
-#: Merge.rc:1110 Merge.rc:1142
+#: Merge.rc:1118 Merge.rc:1150
#, c-format
msgid "&Compare Method"
msgstr "&Sammenligningsmetode"
#. IDS_COMPMETHOD_FULL_CONTENTS
-#: Merge.rc:1112 Merge.rc:1144 Merge.rc:1328 Merge.rc:4282
+#: Merge.rc:1120 Merge.rc:1152 Merge.rc:1338 Merge.rc:4292
#, c-format
msgid "Full Contents"
msgstr "Alt indhold"
#. IDS_COMPMETHOD_QUICK_CONTENTS
-#: Merge.rc:1113 Merge.rc:1145 Merge.rc:1329 Merge.rc:4283
+#: Merge.rc:1121 Merge.rc:1153 Merge.rc:1339 Merge.rc:4293
#, c-format
msgid "Quick Contents"
msgstr "Hurtigt indhold"
#. IDS_COMPMETHOD_BINARY_CONTENTS
-#: Merge.rc:1114 Merge.rc:1146 Merge.rc:1330 Merge.rc:4284
+#: Merge.rc:1122 Merge.rc:1154 Merge.rc:1340 Merge.rc:4294
#, c-format
msgid "Binary Contents"
msgstr ""
#. IDS_COMPMETHOD_MODDATE
-#: Merge.rc:1115 Merge.rc:1147 Merge.rc:1331 Merge.rc:4285
+#: Merge.rc:1123 Merge.rc:1155 Merge.rc:1341 Merge.rc:4295
#, c-format
msgid "Modified Date"
msgstr "Ændringsdato"
#. IDS_COMPMETHOD_DATESIZE
-#: Merge.rc:1116 Merge.rc:1148 Merge.rc:1332 Merge.rc:4286
+#: Merge.rc:1124 Merge.rc:1156 Merge.rc:1342 Merge.rc:4296
#, c-format
msgid "Modified Date and Size"
msgstr "Ændringsdato og størrelse"
#. IDS_COMPMETHOD_SIZE
-#: Merge.rc:1117 Merge.rc:1149 Merge.rc:1333 Merge.rc:4287
+#: Merge.rc:1125 Merge.rc:1157 Merge.rc:1343 Merge.rc:4297
#, c-format
msgid "Size"
msgstr "Størrelse"
#. IDS_COMPMETHOD_EXISTENCE
-#: Merge.rc:1118 Merge.rc:1150 Merge.rc:1334 Merge.rc:4288
+#: Merge.rc:1126 Merge.rc:1158 Merge.rc:1344 Merge.rc:4298
msgid "Existence"
msgstr ""
#. IDR_POPUP_PROJECT, ID_LOAD_PROJECT
-#: Merge.rc:1192
+#: Merge.rc:1202
#, c-format
msgid "&Load Project..."
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARGALL
-#: Merge.rc:1272 Merge.rc:1301
+#: Merge.rc:1282 Merge.rc:1311
msgid "${*} - All Arguments"
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARG1
-#: Merge.rc:1273 Merge.rc:1302
+#: Merge.rc:1283 Merge.rc:1312
msgid "${1} - First Argument"
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARG2
-#: Merge.rc:1274 Merge.rc:1303
+#: Merge.rc:1284 Merge.rc:1313
msgid "${2} - Second Argument"
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARG3
-#: Merge.rc:1275 Merge.rc:1304
+#: Merge.rc:1285 Merge.rc:1314
msgid "${3} - Third Argument"
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARG4
-#: Merge.rc:1276 Merge.rc:1305
+#: Merge.rc:1286 Merge.rc:1315
msgid "${4} - Fourth Argument"
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARG5
-#: Merge.rc:1277 Merge.rc:1306
+#: Merge.rc:1287 Merge.rc:1316
msgid "${5} - Fifth Argument"
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARG6
-#: Merge.rc:1278 Merge.rc:1307
+#: Merge.rc:1288 Merge.rc:1317
msgid "${6} - Sixth Argument"
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARG7
-#: Merge.rc:1279 Merge.rc:1308
+#: Merge.rc:1289 Merge.rc:1318
msgid "${7} - Seventh Argument"
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARG8
-#: Merge.rc:1280 Merge.rc:1309
+#: Merge.rc:1290 Merge.rc:1319
msgid "${8} - Eighth Argument"
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARG9
-#: Merge.rc:1281 Merge.rc:1310
+#: Merge.rc:1291 Merge.rc:1320
msgid "${9} - Ninth Argument"
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_SRC_FILE
-#: Merge.rc:1289
+#: Merge.rc:1299
msgid "${SRC_FILE} - Source File"
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_SRC_FOLDER
-#: Merge.rc:1290
+#: Merge.rc:1300
msgid "${SRC_FOLDER} - Source Folder"
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_SRC_URL
-#: Merge.rc:1291
+#: Merge.rc:1301
msgid "${SRC_URL} - Source URL"
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_SRC_URL_PROTOCOL
-#: Merge.rc:1292
+#: Merge.rc:1302
msgid "${SRC_URL_PROTOCOL} - Source URL Protocol"
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_SRC_URL_SUFFIX
-#: Merge.rc:1293
+#: Merge.rc:1303
msgid "${SRC_URL_SUFFIX} - Source URL Suffix"
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_DST_FILE
-#: Merge.rc:1294
+#: Merge.rc:1304
msgid "${DST_FILE} - Destination File"
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_DST_FOLDER
-#: Merge.rc:1295
+#: Merge.rc:1305
msgid "${DST_FOLDER} - Destination Folder"
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_DST_URL
-#: Merge.rc:1296
+#: Merge.rc:1306
msgid "${DST_URL} - Destination URL"
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_DST_URL_PROTOCOL
-#: Merge.rc:1297
+#: Merge.rc:1307
msgid "${DST_URL_PROTOCOL} - Destination URL Protocol"
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_DST_URL_SUFFIX
-#: Merge.rc:1298
+#: Merge.rc:1308
msgid "${DST_URL_SUFFIX} - Destination URL Suffix"
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_WINMERGE_HOME
-#: Merge.rc:1299
+#: Merge.rc:1309
msgid "${WINMERGE_HOME} - WinMerge Home Directory"
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_SCRIPT_FILE
-#: Merge.rc:1300
+#: Merge.rc:1310
msgid "${SCRIPT_FILE} - Script File"
msgstr ""
#. IDR_POPUP_PLUGIN_ADD_MENU, ID_PLUGIN_ADD_UNPACKER
-#: Merge.rc:1318
+#: Merge.rc:1328
msgid "Add &Unpacker Plugin..."
msgstr ""
#. IDR_POPUP_PLUGIN_ADD_MENU, ID_PLUGIN_ADD_PREDIFFER
-#: Merge.rc:1319
+#: Merge.rc:1329
msgid "Add &Prediffer Plugin..."
msgstr ""
#. IDR_POPUP_PLUGIN_ADD_MENU, ID_PLUGIN_DUPLICATE
-#: Merge.rc:1320
+#: Merge.rc:1330
msgid "&Duplicate Plugin..."
msgstr ""
#. IDR_POPUP_OUTPUTVIEW, ID_EDIT_CLEAR_ALL
-#: Merge.rc:1344
+#: Merge.rc:1354
msgid "Clear &All"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_MASK_CLEAR
-#: Merge.rc:1352
+#: Merge.rc:1362
msgid "&Clear All"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_MASK_REMOVE_LAST
-#: Merge.rc:1353
+#: Merge.rc:1363
msgid "Remove Last Filter &Group"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_MASK_ALL
-#: Merge.rc:1354
+#: Merge.rc:1364
msgid "R&eset to Default (*.*)"
msgstr ""
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1355
+#: Merge.rc:1365
msgid "Add E&xclude File"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_SYS
-#: Merge.rc:1357
+#: Merge.rc:1367
msgid "&System Files"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_BACKUP
-#: Merge.rc:1358
+#: Merge.rc:1368
msgid "&Editor Backup Files"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_BIN
-#: Merge.rc:1359
+#: Merge.rc:1369
msgid "&Compiled Binary Files"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_LOG
-#: Merge.rc:1360
+#: Merge.rc:1370
msgid "&Log Files"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_TEMP
-#: Merge.rc:1361
+#: Merge.rc:1371
msgid "&Temporary or Cache Files"
msgstr ""
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1363
+#: Merge.rc:1373
msgid "Add Excl&ude Folder"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FOLDER_VCS
-#: Merge.rc:1365
+#: Merge.rc:1375
msgid "&Version Control"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FOLDER_BUILD
-#: Merge.rc:1366
+#: Merge.rc:1376
msgid "&Build Artifacts"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FOLDER_IDE
-#: Merge.rc:1367
+#: Merge.rc:1377
msgid "&IDE"
msgstr ""
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1370
+#: Merge.rc:1380
msgid "Add &File Condition"
msgstr ""
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1372 Merge.rc:1551
+#: Merge.rc:1382 Merge.rc:1561
msgid "File &Size"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_SIZE, ID_FILTERMENU_DIFF_SIZE_LT_1KB
-#: Merge.rc:1374 Merge.rc:1527 Merge.rc:1564 Merge.rc:1629 Merge.rc:1707
+#: Merge.rc:1384 Merge.rc:1537 Merge.rc:1574 Merge.rc:1639 Merge.rc:1717
msgid "Less than 1KB"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_SIZE, ID_FILTERMENU_DIFF_SIZE_GE_1KB
-#: Merge.rc:1375 Merge.rc:1528 Merge.rc:1565 Merge.rc:1630 Merge.rc:1708
+#: Merge.rc:1385 Merge.rc:1538 Merge.rc:1575 Merge.rc:1640 Merge.rc:1718
msgid "1KB or more"
msgstr ""
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_LT_10KB
-#: Merge.rc:1376 Merge.rc:1529 Merge.rc:1631
+#: Merge.rc:1386 Merge.rc:1539 Merge.rc:1641
msgid "Less than 10KB"
msgstr ""
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_GE_10KB
-#: Merge.rc:1377 Merge.rc:1530 Merge.rc:1632
+#: Merge.rc:1387 Merge.rc:1540 Merge.rc:1642
msgid "10KB or more"
msgstr ""
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_LT_100KB
-#: Merge.rc:1378 Merge.rc:1531 Merge.rc:1633
+#: Merge.rc:1388 Merge.rc:1541 Merge.rc:1643
msgid "Less than 100KB"
msgstr ""
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_GE_100KB
-#: Merge.rc:1379 Merge.rc:1532 Merge.rc:1634
+#: Merge.rc:1389 Merge.rc:1542 Merge.rc:1644
msgid "100KB or more"
msgstr ""
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_LT_1MB
-#: Merge.rc:1380 Merge.rc:1533 Merge.rc:1635
+#: Merge.rc:1390 Merge.rc:1543 Merge.rc:1645
msgid "Less than 1MB"
msgstr ""
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_GE_1MB
-#: Merge.rc:1381 Merge.rc:1534 Merge.rc:1636
+#: Merge.rc:1391 Merge.rc:1544 Merge.rc:1646
msgid "1MB or more"
msgstr ""
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_LT_10MB
-#: Merge.rc:1382 Merge.rc:1535 Merge.rc:1637
+#: Merge.rc:1392 Merge.rc:1545 Merge.rc:1647
msgid "Less than 10MB"
msgstr ""
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_GE_10MB
-#: Merge.rc:1383 Merge.rc:1536 Merge.rc:1638
+#: Merge.rc:1393 Merge.rc:1546 Merge.rc:1648
msgid "10MB or more"
msgstr ""
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_LT_100MB
-#: Merge.rc:1384 Merge.rc:1537 Merge.rc:1639
+#: Merge.rc:1394 Merge.rc:1547 Merge.rc:1649
msgid "Less than 100MB"
msgstr ""
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_GE_100MB
-#: Merge.rc:1385 Merge.rc:1538 Merge.rc:1640
+#: Merge.rc:1395 Merge.rc:1548 Merge.rc:1650
msgid "100MB or more"
msgstr ""
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_LT_1GB
-#: Merge.rc:1386 Merge.rc:1539 Merge.rc:1641
+#: Merge.rc:1396 Merge.rc:1549 Merge.rc:1651
msgid "Less than 1GB"
msgstr ""
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_GE_1GB
-#: Merge.rc:1387 Merge.rc:1642
+#: Merge.rc:1397 Merge.rc:1652
msgid "1GB or more"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_RANGE
-#: Merge.rc:1388 Merge.rc:1465 Merge.rc:1517 Merge.rc:1523 Merge.rc:1540
-#: Merge.rc:1566 Merge.rc:1587 Merge.rc:1643 Merge.rc:1709 Merge.rc:1734
+#: Merge.rc:1398 Merge.rc:1475 Merge.rc:1527 Merge.rc:1533 Merge.rc:1550
+#: Merge.rc:1576 Merge.rc:1597 Merge.rc:1653 Merge.rc:1719 Merge.rc:1744
msgid "Custom Range..."
msgstr ""
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1390 Merge.rc:1471 Merge.rc:1568
+#: Merge.rc:1400 Merge.rc:1481 Merge.rc:1578
msgid "&Last Modified"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE
-#: Merge.rc:1392 Merge.rc:1473 Merge.rc:1651
+#: Merge.rc:1402 Merge.rc:1483 Merge.rc:1661
msgid "&Hour"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_HOUR_BEFORE_1
-#: Merge.rc:1394 Merge.rc:1475 Merge.rc:1653
+#: Merge.rc:1404 Merge.rc:1485 Merge.rc:1663
msgid "More than 1 hour ago"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_HOUR_WITHIN_1
-#: Merge.rc:1395 Merge.rc:1476 Merge.rc:1654
+#: Merge.rc:1405 Merge.rc:1486 Merge.rc:1664
msgid "Within 1 hour"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE
-#: Merge.rc:1397 Merge.rc:1478 Merge.rc:1656
+#: Merge.rc:1407 Merge.rc:1488 Merge.rc:1666
msgid "&Day"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_DAY_BEFORE_TODAY
-#: Merge.rc:1399 Merge.rc:1480 Merge.rc:1658
+#: Merge.rc:1409 Merge.rc:1490 Merge.rc:1668
msgid "Before today"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_DAY_TODAY
-#: Merge.rc:1400 Merge.rc:1481 Merge.rc:1659
+#: Merge.rc:1410 Merge.rc:1491 Merge.rc:1669
msgid "Today"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_DAY_BEFORE_YESTERDAY
-#: Merge.rc:1401 Merge.rc:1482 Merge.rc:1660
+#: Merge.rc:1411 Merge.rc:1492 Merge.rc:1670
msgid "Before yesterday"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_DAY_YESTERDAY
-#: Merge.rc:1402 Merge.rc:1483 Merge.rc:1661
+#: Merge.rc:1412 Merge.rc:1493 Merge.rc:1671
msgid "Yesterday"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_DAY_SINCE_YESTERDAY
-#: Merge.rc:1403 Merge.rc:1484 Merge.rc:1662
+#: Merge.rc:1413 Merge.rc:1494 Merge.rc:1672
msgid "Since yesterday"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE
-#: Merge.rc:1405 Merge.rc:1486 Merge.rc:1664
+#: Merge.rc:1415 Merge.rc:1496 Merge.rc:1674
msgid "&Week"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_WEEK_BEFORE_THIS
-#: Merge.rc:1407 Merge.rc:1488 Merge.rc:1666
+#: Merge.rc:1417 Merge.rc:1498 Merge.rc:1676
msgid "Before this week"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_WEEK_THIS
-#: Merge.rc:1408 Merge.rc:1489 Merge.rc:1667
+#: Merge.rc:1418 Merge.rc:1499 Merge.rc:1677
msgid "This week"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_WEEK_BEFORE_LAST
-#: Merge.rc:1409 Merge.rc:1490 Merge.rc:1668
+#: Merge.rc:1419 Merge.rc:1500 Merge.rc:1678
msgid "Before last week"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_WEEK_LAST
-#: Merge.rc:1410 Merge.rc:1491 Merge.rc:1669
+#: Merge.rc:1420 Merge.rc:1501 Merge.rc:1679
msgid "Last week"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_WEEK_SINCE_LAST
-#: Merge.rc:1411 Merge.rc:1492 Merge.rc:1670
+#: Merge.rc:1421 Merge.rc:1502 Merge.rc:1680
msgid "Since last week"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE
-#: Merge.rc:1413 Merge.rc:1494 Merge.rc:1672
+#: Merge.rc:1423 Merge.rc:1504 Merge.rc:1682
msgid "&Month"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_MONTH_BEFORE_THIS
-#: Merge.rc:1415 Merge.rc:1496 Merge.rc:1674
+#: Merge.rc:1425 Merge.rc:1506 Merge.rc:1684
msgid "Before this month"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_MONTH_THIS
-#: Merge.rc:1416 Merge.rc:1497 Merge.rc:1675
+#: Merge.rc:1426 Merge.rc:1507 Merge.rc:1685
msgid "This month"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_MONTH_BEFORE_LAST
-#: Merge.rc:1417 Merge.rc:1498 Merge.rc:1676
+#: Merge.rc:1427 Merge.rc:1508 Merge.rc:1686
msgid "Before last month"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_MONTH_LAST
-#: Merge.rc:1418 Merge.rc:1499 Merge.rc:1677
+#: Merge.rc:1428 Merge.rc:1509 Merge.rc:1687
msgid "Last month"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_MONTH_SINCE_LAST
-#: Merge.rc:1419 Merge.rc:1500 Merge.rc:1678
+#: Merge.rc:1429 Merge.rc:1510 Merge.rc:1688
msgid "Since last month"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE
-#: Merge.rc:1421 Merge.rc:1502 Merge.rc:1680
+#: Merge.rc:1431 Merge.rc:1512 Merge.rc:1690
msgid "&Year"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_YEAR_BEFORE_THIS
-#: Merge.rc:1423 Merge.rc:1504 Merge.rc:1682
+#: Merge.rc:1433 Merge.rc:1514 Merge.rc:1692
msgid "Before this year"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_YEAR_THIS
-#: Merge.rc:1424 Merge.rc:1505 Merge.rc:1683
+#: Merge.rc:1434 Merge.rc:1515 Merge.rc:1693
msgid "This year"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_YEAR_BEFORE_LAST
-#: Merge.rc:1425 Merge.rc:1506 Merge.rc:1684
+#: Merge.rc:1435 Merge.rc:1516 Merge.rc:1694
msgid "Before last year"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_YEAR_LAST
-#: Merge.rc:1426 Merge.rc:1507 Merge.rc:1685
+#: Merge.rc:1436 Merge.rc:1517 Merge.rc:1695
msgid "Last year"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_YEAR_SINCE_LAST
-#: Merge.rc:1427 Merge.rc:1508 Merge.rc:1686
+#: Merge.rc:1437 Merge.rc:1518 Merge.rc:1696
msgid "Since last year"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_RANGE
-#: Merge.rc:1429 Merge.rc:1510 Merge.rc:1688
+#: Merge.rc:1439 Merge.rc:1520 Merge.rc:1698
msgid "&Custom Range..."
msgstr ""
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1431 Merge.rc:1589
+#: Merge.rc:1441 Merge.rc:1599
msgid "&Attributes"
msgstr ""
#. IDR_POPUP_FILTERMENU_ATTR, ID_FILTERMENU_ATTR_READONLY
-#: Merge.rc:1433 Merge.rc:1607
+#: Merge.rc:1443 Merge.rc:1617
msgid "Read-only files"
msgstr ""
#. IDR_POPUP_FILTERMENU_ATTR, ID_FILTERMENU_ATTR_NOT_READONLY
-#: Merge.rc:1434 Merge.rc:1608
+#: Merge.rc:1444 Merge.rc:1618
msgid "Not read-only files"
msgstr ""
#. IDR_POPUP_FILTERMENU_ATTR, ID_FILTERMENU_ATTR_HIDDEN
-#: Merge.rc:1435 Merge.rc:1609
+#: Merge.rc:1445 Merge.rc:1619
msgid "Hidden files"
msgstr ""
#. IDR_POPUP_FILTERMENU_ATTR, ID_FILTERMENU_ATTR_NOT_HIDDEN
-#: Merge.rc:1436 Merge.rc:1610
+#: Merge.rc:1446 Merge.rc:1620
msgid "Not hidden files"
msgstr ""
#. IDR_POPUP_FILTERMENU_ATTR, ID_FILTERMENU_ATTR_SYSTEM
-#: Merge.rc:1437 Merge.rc:1611
+#: Merge.rc:1447 Merge.rc:1621
msgid "System files"
msgstr ""
#. IDR_POPUP_FILTERMENU_ATTR, ID_FILTERMENU_ATTR_NOT_SYSTEM
-#: Merge.rc:1438 Merge.rc:1612
+#: Merge.rc:1448 Merge.rc:1622
msgid "Not system files"
msgstr ""
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1440
+#: Merge.rc:1450
msgid "File &Content"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_CONTAINS
-#: Merge.rc:1442
+#: Merge.rc:1452
msgid "Contains string..."
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_NOT_CONTAINS
-#: Merge.rc:1443
+#: Merge.rc:1453
msgid "Does not contain string..."
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_FIRST_LINE_CONTAINS
-#: Merge.rc:1444
+#: Merge.rc:1454
msgid "First line contains string..."
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_FIRST_LINE_NOT_CONTAINS
-#: Merge.rc:1445
+#: Merge.rc:1455
msgid "First line does not contain string..."
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_FIRST_10_CONTAINS
-#: Merge.rc:1446
+#: Merge.rc:1456
msgid "First 10 lines contain string..."
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_FIRST_10_NOT_CONTAINS
-#: Merge.rc:1447
+#: Merge.rc:1457
msgid "First 10 lines do not contain string..."
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_LAST_10_CONTAINS
-#: Merge.rc:1448
+#: Merge.rc:1458
msgid "Last 10 lines contain string..."
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_LAST_10_NOT_CONTAINS
-#: Merge.rc:1449
+#: Merge.rc:1459
msgid "Last 10 lines do not contain string..."
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_LAST_LINE_CONTAINS
-#: Merge.rc:1450
+#: Merge.rc:1460
msgid "Last line contains string..."
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_LAST_LINE_NOT_CONTAINS
-#: Merge.rc:1451
+#: Merge.rc:1461
msgid "Last line does not contain string..."
msgstr ""
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1453
+#: Merge.rc:1463
msgid "&Line Count"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_LT_10
-#: Merge.rc:1455
+#: Merge.rc:1465
msgid "Less than 10"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_GE_10
-#: Merge.rc:1456
+#: Merge.rc:1466
msgid "10 or more"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_LT_100
-#: Merge.rc:1457
+#: Merge.rc:1467
msgid "Less than 100"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_GE_100
-#: Merge.rc:1458
+#: Merge.rc:1468
msgid "100 or more"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_LT_1000
-#: Merge.rc:1459
+#: Merge.rc:1469
msgid "Less than 1000"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_GE_1000
-#: Merge.rc:1460
+#: Merge.rc:1470
msgid "1000 or more"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_LT_10000
-#: Merge.rc:1461
+#: Merge.rc:1471
msgid "Less than 10000"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_GE_10000
-#: Merge.rc:1462
+#: Merge.rc:1472
msgid "10000 or more"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_LT_100000
-#: Merge.rc:1463
+#: Merge.rc:1473
msgid "Less than 100000"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_GE_100000
-#: Merge.rc:1464
+#: Merge.rc:1474
msgid "100000 or more"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_PROPS
-#: Merge.rc:1467 Merge.rc:1594 Merge.rc:1761 Merge.rc:1778
+#: Merge.rc:1477 Merge.rc:1604 Merge.rc:1771 Merge.rc:1788
msgid "Additional &Properties..."
msgstr ""
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1469
+#: Merge.rc:1479
msgid "Add F&older Condition"
msgstr ""
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1513
+#: Merge.rc:1523
msgid "&Files"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FOLDER_FILES_EQ_0
-#: Merge.rc:1515
+#: Merge.rc:1525
msgid "0 files"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FOLDER_FILES_GE_1
-#: Merge.rc:1516
+#: Merge.rc:1526
msgid "1 file or more"
msgstr ""
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1519
+#: Merge.rc:1529
msgid "&Items"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FOLDER_ITEMS_EQ_0
-#: Merge.rc:1521
+#: Merge.rc:1531
msgid "0 items"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FOLDER_ITEMS_GE_1
-#: Merge.rc:1522
+#: Merge.rc:1532
msgid "1 item or more"
msgstr ""
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1525
+#: Merge.rc:1535
msgid "&Total Size"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FOLDER_STATS_RECURSIVE
-#: Merge.rc:1542
+#: Merge.rc:1552
msgid "&Recursive"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONDITION_ANY
-#: Merge.rc:1544
+#: Merge.rc:1554
msgid "Target: &Any (Left/Middle/Right)"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONDITION_LEFT
-#: Merge.rc:1545
+#: Merge.rc:1555
msgid "Target: &Left"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONDITION_MIDDLE
-#: Merge.rc:1546
+#: Merge.rc:1556
msgid "Target: &Middle"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONDITION_RIGHT
-#: Merge.rc:1547
+#: Merge.rc:1557
msgid "Target: &Right"
msgstr ""
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1549
+#: Merge.rc:1559
msgid "Add &Difference Condition"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_PROP, ID_FILTERMENU_DIFF_PROP_EQUAL
-#: Merge.rc:1553 Merge.rc:1570 Merge.rc:1591 Merge.rc:1696 Merge.rc:1717
-#: Merge.rc:1742
+#: Merge.rc:1563 Merge.rc:1580 Merge.rc:1601 Merge.rc:1706 Merge.rc:1727
+#: Merge.rc:1752
msgid "Equal"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_PROP, ID_FILTERMENU_DIFF_PROP_NOT_EQUAL
-#: Merge.rc:1554 Merge.rc:1571 Merge.rc:1592 Merge.rc:1697 Merge.rc:1718
-#: Merge.rc:1743
+#: Merge.rc:1564 Merge.rc:1581 Merge.rc:1602 Merge.rc:1707 Merge.rc:1728
+#: Merge.rc:1753
msgid "Not Equal"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_PROP, ID_FILTERMENU_DIFF_PROP_LESS
-#: Merge.rc:1555 Merge.rc:1572 Merge.rc:1698 Merge.rc:1719 Merge.rc:1744
+#: Merge.rc:1565 Merge.rc:1582 Merge.rc:1708 Merge.rc:1729 Merge.rc:1754
msgid "Less Than"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_PROP, ID_FILTERMENU_DIFF_PROP_LESS_EQUAL
-#: Merge.rc:1556 Merge.rc:1573 Merge.rc:1699 Merge.rc:1720 Merge.rc:1745
+#: Merge.rc:1566 Merge.rc:1583 Merge.rc:1709 Merge.rc:1730 Merge.rc:1755
msgid "Less Than or Equal to"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_PROP, ID_FILTERMENU_DIFF_PROP_GREATER
-#: Merge.rc:1557 Merge.rc:1574 Merge.rc:1700 Merge.rc:1721 Merge.rc:1746
+#: Merge.rc:1567 Merge.rc:1584 Merge.rc:1710 Merge.rc:1731 Merge.rc:1756
msgid "Greater Than"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_PROP, ID_FILTERMENU_DIFF_PROP_GREATER_EQUAL
-#: Merge.rc:1558 Merge.rc:1575 Merge.rc:1701 Merge.rc:1722 Merge.rc:1747
+#: Merge.rc:1568 Merge.rc:1585 Merge.rc:1711 Merge.rc:1732 Merge.rc:1757
msgid "Greater Than or Equal to"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_SIZE, ID_FILTERMENU_DIFF_SIZE_LT_10B
-#: Merge.rc:1560 Merge.rc:1703
+#: Merge.rc:1570 Merge.rc:1713
msgid "Less than 10B"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_SIZE, ID_FILTERMENU_DIFF_SIZE_GE_10B
-#: Merge.rc:1561 Merge.rc:1704
+#: Merge.rc:1571 Merge.rc:1714
msgid "10B or more"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_SIZE, ID_FILTERMENU_DIFF_SIZE_LT_100B
-#: Merge.rc:1562 Merge.rc:1705
+#: Merge.rc:1572 Merge.rc:1715
msgid "Less than 100B"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_SIZE, ID_FILTERMENU_DIFF_SIZE_GE_100B
-#: Merge.rc:1563 Merge.rc:1706
+#: Merge.rc:1573 Merge.rc:1716
msgid "100B or more"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_LT_1SECOND
-#: Merge.rc:1577 Merge.rc:1724
+#: Merge.rc:1587 Merge.rc:1734
msgid "Less than 1 second"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_GE_1SECOND
-#: Merge.rc:1578 Merge.rc:1725
+#: Merge.rc:1588 Merge.rc:1735
msgid "1 second or more"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_LT_1MINUTE
-#: Merge.rc:1579 Merge.rc:1726
+#: Merge.rc:1589 Merge.rc:1736
msgid "Less than 1 minute"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_GE_1MINUTE
-#: Merge.rc:1580 Merge.rc:1727
+#: Merge.rc:1590 Merge.rc:1737
msgid "1 minute or more"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_LT_1HOUR
-#: Merge.rc:1581 Merge.rc:1728
+#: Merge.rc:1591 Merge.rc:1738
msgid "Less than 1 hour"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_GE_1HOUR
-#: Merge.rc:1582 Merge.rc:1729
+#: Merge.rc:1592 Merge.rc:1739
msgid "1 hour or more"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_LT_1DAY
-#: Merge.rc:1583 Merge.rc:1730
+#: Merge.rc:1593 Merge.rc:1740
msgid "Less than 1 day"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_GE_1DAY
-#: Merge.rc:1584 Merge.rc:1731
+#: Merge.rc:1594 Merge.rc:1741
msgid "1 day or more"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_LT_1WEEK
-#: Merge.rc:1585 Merge.rc:1732
+#: Merge.rc:1595 Merge.rc:1742
msgid "Less than 1 week"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_GE_1WEEK
-#: Merge.rc:1586 Merge.rc:1733
+#: Merge.rc:1596 Merge.rc:1743
msgid "1 week or more"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_CONDITION_DIFF_LEFT_RIGHT
-#: Merge.rc:1596
+#: Merge.rc:1606
msgid "Target: &Left and Right"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_CONDITION_DIFF_LEFT_MIDDLE
-#: Merge.rc:1597
+#: Merge.rc:1607
msgid "Target: Left and &Middle"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_CONDITION_DIFF_MIDDLE_RIGHT
-#: Merge.rc:1598
+#: Merge.rc:1608
msgid "Target: Middle and &Right"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_CONDITION_DIFF_ALL
-#: Merge.rc:1599
+#: Merge.rc:1609
msgid "Target: &All"
msgstr ""
#. IDR_POPUP_FILTERMENU_BINARY, ID_FILTERMENU_BINARY_ONLY
-#: Merge.rc:1620
+#: Merge.rc:1630
msgid "Binary files only"
msgstr ""
#. IDR_POPUP_FILTERMENU_BINARY, ID_FILTERMENU_TEXT_ONLY
-#: Merge.rc:1621
+#: Merge.rc:1631
msgid "Text files only"
msgstr ""
#. IDR_POPUP_ADDCMPMENU, ID_ADDCMPMENU_CLEAR
-#: Merge.rc:1755
+#: Merge.rc:1765
msgid "&Clear conditions"
msgstr ""
#. IDR_POPUP_ADDCMPMENU, ID_ADDCMPMENU_CMP_SIZE
-#: Merge.rc:1757
+#: Merge.rc:1767
msgid "Compare &Size"
msgstr ""
#. IDR_POPUP_ADDCMPMENU, ID_ADDCMPMENU_CMP_DATE
-#: Merge.rc:1758
+#: Merge.rc:1768
msgid "Compare &Date"
msgstr ""
#. IDR_POPUP_ADDCMPMENU, ID_ADDCMPMENU_CMP_ATTR
-#: Merge.rc:1759
+#: Merge.rc:1769
msgid "Compare &Attributes"
msgstr ""
#. IDR_POPUP_ADDCMPMENU, ID_ADDCMPMENU_CMP_CONTENTS
-#: Merge.rc:1760
+#: Merge.rc:1770
msgid "Compare C&ontents"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_CLEAR
-#: Merge.rc:1769
+#: Merge.rc:1779
msgid "&Clear Keys"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_NAME
-#: Merge.rc:1771
+#: Merge.rc:1781
msgid "&Name"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_BASENAME
-#: Merge.rc:1772
+#: Merge.rc:1782
msgid "&Base name (without extension)"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_NORMALIZED_NAME
-#: Merge.rc:1773
+#: Merge.rc:1783
msgid "Normalized &Unicode Name"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_RELPATH
-#: Merge.rc:1774
+#: Merge.rc:1784
msgid "&Relative Path"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_DATE
-#: Merge.rc:1776
+#: Merge.rc:1786
msgid "&Date"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_HASH_MD5
-#: Merge.rc:1777
+#: Merge.rc:1787
msgid "&Hash (MD5)"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_REPLACE
-#: Merge.rc:1780
+#: Merge.rc:1790
msgid "Insert &replace() Function"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_REGEXREPLACE
-#: Merge.rc:1781
+#: Merge.rc:1791
msgid "Insert rege&xReplace() Function"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU
-#: Merge.rc:1782
+#: Merge.rc:1792
msgid "Replace &Lists"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_CREATE_REPLACELIST
-#: Merge.rc:1784
+#: Merge.rc:1794
msgid "&Create String Replace List and Insert..."
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_CREATE_REGEXREPLACELIST
-#: Merge.rc:1785
+#: Merge.rc:1795
msgid "Create &Regex Replace List and Insert..."
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU
-#: Merge.rc:1787
+#: Merge.rc:1797
msgid "&String Replace Lists"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU
-#: Merge.rc:1791
+#: Merge.rc:1801
msgid "Re&gex Replace Lists"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_STRING_REPLACE_LISTS_FOLDER
-#: Merge.rc:1796
+#: Merge.rc:1806
msgid "Open String Replace Lists Folder..."
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_REGEX_REPLACE_LISTS_FOLDER
-#: Merge.rc:1797
+#: Merge.rc:1807
msgid "Open Regex Replace Lists Folder..."
msgstr ""
#. IDD_FILTERS_CONDITION, IDC_CONDITION_MATCHCASE
-#: Merge.rc:1799 Merge.rc:1995 Merge.rc:2014 Merge.rc:2042 Merge.rc:2585
+#: Merge.rc:1809 Merge.rc:2005 Merge.rc:2024 Merge.rc:2052 Merge.rc:2595
#, c-format
msgid "Match &case"
msgstr "Sammenlign store/små &bogstaver"
#. IDR_POPUP_RENAMEMOVE_MENU
-#: Merge.rc:1801
+#: Merge.rc:1811
msgid "Text &Normalization"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_TOLOWER
-#: Merge.rc:1803
+#: Merge.rc:1813
msgid "&Lowercase"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_TOUPPER
-#: Merge.rc:1804
+#: Merge.rc:1814
msgid "&Uppercase"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_TOHALFWIDTH
-#: Merge.rc:1805
+#: Merge.rc:1815
msgid "&Half-width"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_TOFULLWIDTH
-#: Merge.rc:1806
+#: Merge.rc:1816
msgid "&Full-width"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU
-#: Merge.rc:1807
+#: Merge.rc:1817
msgid "&Chinese Conversion"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_TOSIMPLIFIEDCHINESE
-#: Merge.rc:1809
+#: Merge.rc:1819
msgid "&Simplified Chinese"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_TOTRADITIONALCHINESE
-#: Merge.rc:1810
+#: Merge.rc:1820
msgid "&Traditional Chinese"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU
-#: Merge.rc:1812
+#: Merge.rc:1822
msgid "&Japanese Conversion"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_TOHIRAGANA
-#: Merge.rc:1814
+#: Merge.rc:1824
msgid "&Hiragana"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_TOKATAKANA
-#: Merge.rc:1815
+#: Merge.rc:1825
msgid "&Katakana"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_NORMALIZEUNICODE
-#: Merge.rc:1817
+#: Merge.rc:1827
msgid "Normalize &Unicode"
msgstr ""
#. IDD_ABOUTBOX
-#: Merge.rc:1932
+#: Merge.rc:1942
#, c-format
msgid "About WinMerge"
msgstr "Om WinMerge"
#. IDD_ABOUTBOX, IDC_WWW
-#: Merge.rc:1936
+#: Merge.rc:1946
msgid "Visit the WinMerge Homepage!"
msgstr "Besøg WinMerge hjemmesiden!"
#. IDD_PLUGINS_EDITPLUGIN, IDOK
-#: Merge.rc:1938 Merge.rc:2080 Merge.rc:2431 Merge.rc:2455 Merge.rc:2469
-#: Merge.rc:2497 Merge.rc:2588 Merge.rc:2613 Merge.rc:2674 Merge.rc:2691
-#: Merge.rc:2703 Merge.rc:2867 Merge.rc:2927 Merge.rc:3062 Merge.rc:3104
-#: Merge.rc:3147 Merge.rc:3197
+#: Merge.rc:1948 Merge.rc:2090 Merge.rc:2441 Merge.rc:2465 Merge.rc:2479
+#: Merge.rc:2507 Merge.rc:2598 Merge.rc:2623 Merge.rc:2684 Merge.rc:2701
+#: Merge.rc:2713 Merge.rc:2877 Merge.rc:2937 Merge.rc:3072 Merge.rc:3114
+#: Merge.rc:3157 Merge.rc:3207
#, c-format
msgid "OK"
msgstr "OK"
#. IDD_ABOUTBOX, IDC_OPEN_CONTRIBUTORS
-#: Merge.rc:1939
+#: Merge.rc:1949
#, c-format
msgid "Contributors"
msgstr "Deltagere"
#. IDD_SELECT_FILES_OR_FOLDERS
-#: Merge.rc:1945 Merge.rc:3070
+#: Merge.rc:1955 Merge.rc:3080
#, c-format
msgid "Select Files or Folders"
msgstr "Vælg filer eller mapper..."
#. IDD_OPEN, IDC_FILES_DIRS_GROUP0
-#: Merge.rc:1949
+#: Merge.rc:1959
#, c-format
msgid "&1st File or Folder"
msgstr ""
#. IDD_OPEN, IDC_PATH0_READONLY
-#: Merge.rc:1951
+#: Merge.rc:1961
#, c-format
msgid "Re&ad-only"
msgstr "Sk&rivebeskyttet"
#. IDD_OPEN, IDC_SWAP01_STATIC
-#: Merge.rc:1953
+#: Merge.rc:1963
#, c-format
msgid "Swap 1st | 2nd"
msgstr ""
#. IDD_GENERATE_PATCH, IDC_DIFF_BROWSE_FILE1
-#: Merge.rc:1954 Merge.rc:2310 Merge.rc:2413
+#: Merge.rc:1964 Merge.rc:2320 Merge.rc:2423
#, c-format
msgid "&Browse..."
msgstr "&Gennemse..."
#. IDD_OPEN, IDC_FILES_DIRS_GROUP1
-#: Merge.rc:1955
+#: Merge.rc:1965
#, c-format
msgid "&2nd File or Folder"
msgstr ""
#. IDD_OPEN, IDC_PATH1_READONLY
-#: Merge.rc:1957
+#: Merge.rc:1967
#, c-format
msgid "Rea&d-only"
msgstr ""
#. IDD_OPEN, IDC_SWAP12_STATIC
-#: Merge.rc:1959
+#: Merge.rc:1969
#, c-format
msgid "Swap 2nd | 3rd"
msgstr ""
#. IDD_PROPPAGE_SYSTEM, IDC_FILTER_USER_BROWSE
-#: Merge.rc:1960 Merge.rc:2315
+#: Merge.rc:1970 Merge.rc:2325
#, c-format
msgid "B&rowse..."
msgstr "G&ennemse..."
#. IDD_OPEN, IDC_FILES_DIRS_GROUP2
-#: Merge.rc:1961
+#: Merge.rc:1971
#, c-format
msgid "&3rd File or Folder (Optional)"
msgstr ""
#. IDD_OPEN, IDC_PATH2_READONLY
-#: Merge.rc:1963
+#: Merge.rc:1973
#, c-format
msgid "Read-o&nly"
msgstr ""
#. IDD_OPEN, IDC_SWAP02_STATIC
-#: Merge.rc:1965
+#: Merge.rc:1975
#, c-format
msgid "Swap 1st | 3rd"
msgstr ""
#. IDD_PROPPAGE_BACKUPS, IDC_BACKUP_BROWSE
-#: Merge.rc:1966 Merge.rc:2685 Merge.rc:2883
+#: Merge.rc:1976 Merge.rc:2695 Merge.rc:2893
#, c-format
msgid "Browse..."
msgstr "Gennemse..."
#. IDD_OPEN, IDC_FILES_DIRS_GROUP3
-#: Merge.rc:1968
+#: Merge.rc:1978
#, c-format
msgid " Folder: Filter"
msgstr ""
#. IDD_OPEN, IDC_RECURS_CHECK
-#: Merge.rc:1971
+#: Merge.rc:1981
msgid "&Include subfolders"
msgstr "&Inkluder undermapper"
#. IDD_OPEN, IDC_FILES_DIRS_GROUP5
-#: Merge.rc:1972
+#: Merge.rc:1982
msgid " File: Prediffer Plugin"
msgstr ""
#. IDD_OPEN, IDC_FILES_DIRS_GROUP4
-#: Merge.rc:1976
+#: Merge.rc:1986
#, c-format
msgid " File: Unpacker Plugin"
msgstr ""
#. IDD_OPEN, IDC_SELECT_UNPACKER
-#: Merge.rc:1978
+#: Merge.rc:1988
#, c-format
msgid "Se&lect..."
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN, IDCANCEL
-#: Merge.rc:1981 Merge.rc:2001 Merge.rc:2025 Merge.rc:2046 Merge.rc:2081
-#: Merge.rc:2432 Merge.rc:2456 Merge.rc:2470 Merge.rc:2498 Merge.rc:2551
-#: Merge.rc:2589 Merge.rc:2614 Merge.rc:2675 Merge.rc:2692 Merge.rc:2704
-#: Merge.rc:2868 Merge.rc:2928 Merge.rc:3087 Merge.rc:3105 Merge.rc:3148
-#: Merge.rc:3198
+#: Merge.rc:1991 Merge.rc:2011 Merge.rc:2035 Merge.rc:2056 Merge.rc:2091
+#: Merge.rc:2442 Merge.rc:2466 Merge.rc:2480 Merge.rc:2508 Merge.rc:2561
+#: Merge.rc:2599 Merge.rc:2624 Merge.rc:2685 Merge.rc:2702 Merge.rc:2714
+#: Merge.rc:2878 Merge.rc:2938 Merge.rc:3097 Merge.rc:3115 Merge.rc:3158
+#: Merge.rc:3208
#, c-format
msgid "Cancel"
msgstr "Annuller"
#. IDD_OPEN, IDC_OPEN_STATUS
-#: Merge.rc:1982
+#: Merge.rc:1992
#, c-format
msgid "Status:"
msgstr "Status:"
#. IDD_PLUGINS_LIST, ID_HELP
-#: Merge.rc:1983 Merge.rc:2082 Merge.rc:2929
+#: Merge.rc:1993 Merge.rc:2092 Merge.rc:2939
#, c-format
msgid "Help"
msgstr "Hjælp"
#. IDD_OPEN, IDC_OPTIONS
-#: Merge.rc:1984
+#: Merge.rc:1994
msgid "&Options..."
msgstr "I&ndstillinger..."
#. IDD_EDIT_FIND
-#: Merge.rc:1989
+#: Merge.rc:1999
#, c-format
msgid "Find"
msgstr "Søg"
#. IDD_EDIT_MARKER, IDC_STATIC
-#: Merge.rc:1992 Merge.rc:2009 Merge.rc:2037
+#: Merge.rc:2002 Merge.rc:2019 Merge.rc:2047
#, c-format
msgid "Fi&nd what:"
msgstr "F&ind hvad:"
#. IDD_EDIT_MARKER, IDC_EDIT_WHOLE_WORD
-#: Merge.rc:1994 Merge.rc:2013 Merge.rc:2041
+#: Merge.rc:2004 Merge.rc:2023 Merge.rc:2051
#, c-format
msgid "Match &whole word only"
msgstr "Sammenlign &hele ordet"
#. IDD_EDIT_MARKER, IDC_EDIT_REGEXP
-#: Merge.rc:1996 Merge.rc:2015 Merge.rc:2043
+#: Merge.rc:2006 Merge.rc:2025 Merge.rc:2053
#, c-format
msgid "Regular &expression"
msgstr "Regulært &udtryk"
#. IDD_EDIT_FIND, IDC_FINDDLG_DONTWRAP
-#: Merge.rc:1997
+#: Merge.rc:2007
#, c-format
msgid "D&on't wrap end of file"
msgstr "O&mbryd ikke filendelser"
#. IDD_EDIT_FIND, IDC_FINDDLG_DONTCLOSE
-#: Merge.rc:1998
+#: Merge.rc:2008
#, c-format
msgid "&Don't close this dialog"
msgstr ""
#. IDD_EDIT_REPLACE, IDC_EDIT_SKIP
-#: Merge.rc:1999 Merge.rc:2021
+#: Merge.rc:2009 Merge.rc:2031
#, c-format
msgid "&Find Next"
msgstr "&Find næste"
#. IDD_EDIT_FIND, IDC_EDIT_FINDPREV
-#: Merge.rc:2000
+#: Merge.rc:2010
#, c-format
msgid "Find &Prev"
msgstr ""
#. IDD_EDIT_REPLACE
-#: Merge.rc:2006
+#: Merge.rc:2016
#, c-format
msgid "Replace"
msgstr "Erstat"
#. IDD_EDIT_REPLACE, IDC_STATIC
-#: Merge.rc:2011
+#: Merge.rc:2021
#, c-format
msgid "Re&place with:"
msgstr "Ers&tat med:"
#. IDD_EDIT_REPLACE, IDC_EDIT_SCOPE_DONT_WRAP
-#: Merge.rc:2016
+#: Merge.rc:2026
#, c-format
msgid "&Don't wrap at end of file"
msgstr "&Ombryd ikke filendelser"
#. IDD_EDIT_REPLACE, IDC_STATIC
-#: Merge.rc:2018
+#: Merge.rc:2028
#, c-format
msgid "Replace in"
msgstr "Erstat i"
#. IDD_EDIT_REPLACE, IDC_EDIT_SCOPE_WHOLE_FILE
-#: Merge.rc:2020
+#: Merge.rc:2030
#, c-format
msgid "Wh&ole file"
msgstr "He&le filen"
#. IDD_EDIT_REPLACE, IDC_EDIT_FINDPREV
-#: Merge.rc:2022
+#: Merge.rc:2032
msgid "Find Pre&v"
msgstr ""
#. IDD_EDIT_REPLACE, IDC_EDIT_REPLACE
-#: Merge.rc:2023
+#: Merge.rc:2033
#, c-format
msgid "&Replace"
msgstr "&Erstat"
#. IDD_EDIT_REPLACE, IDC_EDIT_REPLACE_ALL
-#: Merge.rc:2024
+#: Merge.rc:2034
#, c-format
msgid "Replace &All"
msgstr "Erstat &alt"
#. IDS_OPTIONSPG_MARKERCOLORS
-#: Merge.rc:2030 Merge.rc:4209
+#: Merge.rc:2040 Merge.rc:4219
#, c-format
msgid "Markers"
msgstr ""
#. IDD_EDIT_MARKER, IDC_EDIT_MARKERS_ENABLED
-#: Merge.rc:2033
+#: Merge.rc:2043
#, c-format
msgid "Enable &markers"
msgstr ""
#. IDD_FILTERS_LINEFILTERS, IDC_LFILTER_ADDBTN
-#: Merge.rc:2035 Merge.rc:2057
+#: Merge.rc:2045 Merge.rc:2067
#, c-format
msgid "New"
msgstr "Ny"
#. IDD_EDIT_MARKER, IDC_STATIC
-#: Merge.rc:2039
+#: Merge.rc:2049
#, c-format
msgid "&Background color:"
msgstr ""
#. IDS_MESSAGEBOX_OK
-#: Merge.rc:2044 Merge.rc:2829 Merge.rc:3086 Merge.rc:4171
+#: Merge.rc:2054 Merge.rc:2839 Merge.rc:3096 Merge.rc:4181
#, c-format
msgid "&Ok"
msgstr "&OK"
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:2045 Merge.rc:2525 Merge.rc:3199
+#: Merge.rc:2055 Merge.rc:2535 Merge.rc:3209
#, c-format
msgid "&Apply"
msgstr "&Anvend"
#. IDD_FILTERS_LINEFILTERS
-#: Merge.rc:2051
+#: Merge.rc:2061
msgid "Line Filters"
msgstr ""
#. IDD_FILTERS_LINEFILTERS, IDC_IGNOREREGEXP
-#: Merge.rc:2054
+#: Merge.rc:2064
#, c-format
msgid "Enable Line Filters"
msgstr "Aktiver linjefiltre"
#. IDD_FILTERS_LINEFILTERS, IDC_STATIC
-#: Merge.rc:2055
+#: Merge.rc:2065
#, c-format
msgid "Regular Expressions (one per line):"
msgstr "Regulære udtryk (et pr linje):"
#. IDD_PLUGINS_LIST, IDC_PLUGIN_EDIT
-#: Merge.rc:2058 Merge.rc:2924
+#: Merge.rc:2068 Merge.rc:2934
#, c-format
msgid "Edit"
msgstr "Rediger"
#. IDD_PLUGINS_LIST, IDC_PLUGIN_REMOVE
-#: Merge.rc:2059 Merge.rc:2071 Merge.rc:2925
+#: Merge.rc:2069 Merge.rc:2081 Merge.rc:2935
#, c-format
msgid "Remove"
msgstr "Fjern"
#. IDD_FILTERS_SUBSTITUTIONFILTERS
-#: Merge.rc:2064
+#: Merge.rc:2074
msgid "Substitution Filters"
msgstr ""
#. IDD_FILTERS_SUBSTITUTIONFILTERS, IDC_STATIC
-#: Merge.rc:2067
+#: Merge.rc:2077
msgid "Changes to the listed pairs below will be ignored or marked as insignificant. Patches are unaffected."
msgstr ""
#. IDD_FILTERS_SUBSTITUTIONFILTERS, IDC_IGNORED_SUSBSTITUTIONS_ENABLED
-#: Merge.rc:2068
+#: Merge.rc:2078
msgid "Enable"
msgstr ""
#. IDD_PLUGINS_LIST, IDC_PLUGIN_ADD
-#: Merge.rc:2070 Merge.rc:2923
+#: Merge.rc:2080 Merge.rc:2933
msgid "Add"
msgstr ""
#. IDD_FILTERS_SUBSTITUTIONFILTERS, IDC_LFILTER_CLEARBTN
-#: Merge.rc:2072
+#: Merge.rc:2082
msgid "Clear"
msgstr ""
#. IDD_PREFERENCES
-#: Merge.rc:2077
+#: Merge.rc:2087
#, c-format
msgid "Options"
msgstr "Valg"
#. IDD_PREFERENCES, IDC_TREEOPT_IMPORT
-#: Merge.rc:2086
+#: Merge.rc:2096
#, c-format
msgid "Import..."
msgstr "Importer..."
#. IDD_PREFERENCES, IDC_TREEOPT_EXPORT
-#: Merge.rc:2087
+#: Merge.rc:2097
#, c-format
msgid "Export..."
msgstr "Eksporter..."
#. IDS_OPTIONSPG_GENCOMPARE
-#: Merge.rc:2092 Merge.rc:4199 Merge.rc:4202 Merge.rc:4219
+#: Merge.rc:2102 Merge.rc:4209 Merge.rc:4212 Merge.rc:4229
#, c-format
msgid "General"
msgstr "Generelt"
#. IDD_PROPPAGE_GENERAL, IDC_SCROLL_CHECK
-#: Merge.rc:2095
+#: Merge.rc:2105
#, c-format
msgid "Automatically &scroll to first difference"
msgstr "Scroll &automatisk til første forskel"
#. IDD_PROPPAGE_GENERAL, IDC_SCROLL_TO_FIRST_INLINE_DIFF_CHECK
-#: Merge.rc:2097
+#: Merge.rc:2107
msgid "Automatically s&croll to first inline difference"
msgstr ""
#. IDD_PROPPAGE_GENERAL, IDC_STATIC
-#: Merge.rc:2099
+#: Merge.rc:2109
msgid "Cl&ose windows with 'Esc':"
msgstr "L&uk vinduer med 'Esc' tasten:"
#. IDD_PROPPAGE_GENERAL, IDC_VERIFY_OPEN_PATHS
-#: Merge.rc:2101
+#: Merge.rc:2111
#, c-format
msgid "&Automatically verify paths in Open dialog"
msgstr "&Verificer automatisk stinavnene i åben dialogen"
#. IDD_PROPPAGE_GENERAL, IDC_STATIC
-#: Merge.rc:2103
+#: Merge.rc:2113
msgid "Single instance mode:"
msgstr ""
#. IDD_PROPPAGE_GENERAL, IDC_ASK_MULTIWINDOW_CLOSE
-#: Merge.rc:2105
+#: Merge.rc:2115
#, c-format
msgid "As&k when closing multiple windows"
msgstr "Sp&ørg ved lukning af flere vinduer "
#. IDD_PROPPAGE_GENERAL, IDC_PRESERVE_FILETIME
-#: Merge.rc:2107
+#: Merge.rc:2117
#, c-format
msgid "&Preserve file time in file compare"
msgstr "Bevar filtid i filsammenligning"
#. IDD_PROPPAGE_GENERAL, IDC_STARTUP_FOLDER_SELECT
-#: Merge.rc:2109
+#: Merge.rc:2119
#, c-format
msgid "Show \"Select Files or Folders\" dialog on startup"
msgstr "Vis dialogen \"Vælg filer eller mapper...\" ved hver start"
#. IDD_PROPPAGE_GENERAL, IDC_CLOSE_WITH_OK
-#: Merge.rc:2111
+#: Merge.rc:2121
msgid "Close \"Select Files or Folders\" dialog on clicking Compare button"
msgstr ""
#. IDD_PROPPAGE_GENERAL, IDC_STATIC
-#: Merge.rc:2113
+#: Merge.rc:2123
#, c-format
msgid "Op&en dialog Auto completion:"
msgstr "Å&ben-dialog Auto-fuldførelse:"
#. IDD_PROPPAGE_GENERAL, IDC_STATIC
-#: Merge.rc:2115
+#: Merge.rc:2125
msgid "Auto-&reload modified files:"
msgstr ""
#. IDD_PROPPAGE_GENERAL, IDC_STATIC
-#: Merge.rc:2117
+#: Merge.rc:2127
#, c-format
msgid "Language:"
msgstr ""
#. IDD_PROPPAGE_COMPARE_WEBPAGE, IDC_COMPARE_DEFAULTS
-#: Merge.rc:2119 Merge.rc:2299 Merge.rc:2321 Merge.rc:2352 Merge.rc:2369
-#: Merge.rc:2386 Merge.rc:2394 Merge.rc:2430 Merge.rc:2454 Merge.rc:2633
-#: Merge.rc:2644 Merge.rc:2653 Merge.rc:2887 Merge.rc:2922 Merge.rc:2985
-#: Merge.rc:3010 Merge.rc:3024 Merge.rc:3038 Merge.rc:3054
+#: Merge.rc:2129 Merge.rc:2309 Merge.rc:2331 Merge.rc:2362 Merge.rc:2379
+#: Merge.rc:2396 Merge.rc:2404 Merge.rc:2440 Merge.rc:2464 Merge.rc:2643
+#: Merge.rc:2654 Merge.rc:2663 Merge.rc:2897 Merge.rc:2932 Merge.rc:2995
+#: Merge.rc:3020 Merge.rc:3034 Merge.rc:3048 Merge.rc:3064
#, c-format
msgid "Defaults"
msgstr "Standard"
#. IDS_OPTIONSPG_COLORS
-#: Merge.rc:2124 Merge.rc:2140 Merge.rc:2267 Merge.rc:2292 Merge.rc:4205
+#: Merge.rc:2134 Merge.rc:2150 Merge.rc:2277 Merge.rc:2302 Merge.rc:4215
#, c-format
msgid "Colors"
msgstr "Farver"
#. IDD_PROPPAGE_COLOR_SCHEMES, IDC_STATIC
-#: Merge.rc:2127
+#: Merge.rc:2137
msgid "Color &mode:"
msgstr ""
#. IDD_PROPPAGE_COLOR_SCHEMES, IDC_STATIC
-#: Merge.rc:2129
+#: Merge.rc:2139
msgid "&Light mode scheme:"
msgstr ""
#. IDD_PROPPAGE_COLOR_SCHEMES, IDC_STATIC
-#: Merge.rc:2131
+#: Merge.rc:2141
msgid "&Dark mode scheme:"
msgstr ""
#. IDD_PROPPAGE_COLOR_SCHEMES, IDC_STATIC
-#: Merge.rc:2133
+#: Merge.rc:2143
msgid "Your custom schemes"
msgstr ""
#. IDD_PROPPAGE_COLOR_SCHEMES, IDC_COLOR_SCHEME_SAVE
-#: Merge.rc:2134
+#: Merge.rc:2144
msgid "&Save current scheme..."
msgstr ""
#. IDD_PROPPAGE_COLOR_SCHEMES, IDC_COLOR_SCHEME_DELETE
-#: Merge.rc:2135
+#: Merge.rc:2145
msgid "Delete ¤t scheme..."
msgstr ""
#. IDD_PROPPAGE_COLORS_DIR, IDC_BACKGROUND_COLUMN_LABEL
-#: Merge.rc:2143 Merge.rc:2238 Merge.rc:2258 Merge.rc:2272
+#: Merge.rc:2153 Merge.rc:2248 Merge.rc:2268 Merge.rc:2282
#, c-format
msgid "Background"
msgstr "Baggrund"
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2144
+#: Merge.rc:2154
#, c-format
msgid "Deleted"
msgstr "Slettet"
#. IDS_OPTIONSPG_TEXTCOLORS
-#: Merge.rc:2145 Merge.rc:2207 Merge.rc:2239 Merge.rc:2273 Merge.rc:4207
+#: Merge.rc:2155 Merge.rc:2217 Merge.rc:2249 Merge.rc:2283 Merge.rc:4217
#, c-format
msgid "Text"
msgstr "Tekst"
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2146
+#: Merge.rc:2156
#, c-format
msgid "Difference:"
msgstr "Forskelle:"
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2151
+#: Merge.rc:2161
#, c-format
msgid "Selected Difference:"
msgstr "Valgte forskelle:"
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2156
+#: Merge.rc:2166
#, c-format
msgid "Ignored Difference:"
msgstr "Ignoreret forskel:"
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2161
+#: Merge.rc:2171
#, c-format
msgid "Moved:"
msgstr "Flyttet:"
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2166
+#: Merge.rc:2176
#, c-format
msgid "Selected Moved:"
msgstr "Valgt flyttet:"
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2171
+#: Merge.rc:2181
#, c-format
msgid "Same As Next (3 panes):"
msgstr ""
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2176
+#: Merge.rc:2186
#, c-format
msgid "Same As Next (Selected):"
msgstr ""
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2181
+#: Merge.rc:2191
#, c-format
msgid "Word Difference:"
msgstr "Ordforskel:"
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2186
+#: Merge.rc:2196
#, c-format
msgid "Selected Word Diff:"
msgstr "Valgte ordforskelle:"
#. IDD_INPUTBOX
-#: Merge.rc:2195 Merge.rc:2230 Merge.rc:2251 Merge.rc:3099
+#: Merge.rc:2205 Merge.rc:2240 Merge.rc:2261 Merge.rc:3109
#, c-format
msgid "Dialog"
msgstr "Dialog"
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC
-#: Merge.rc:2198
+#: Merge.rc:2208
#, c-format
msgid "Keywords:"
msgstr "Nøgleord:"
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC
-#: Merge.rc:2199
+#: Merge.rc:2209
#, c-format
msgid "Function names:"
msgstr "Funktionsnavne:"
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC
-#: Merge.rc:2200
+#: Merge.rc:2210
#, c-format
msgid "Comments:"
msgstr "Kommentarer:"
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC
-#: Merge.rc:2201
+#: Merge.rc:2211
#, c-format
msgid "Numbers:"
msgstr "Numre:"
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC
-#: Merge.rc:2202
+#: Merge.rc:2212
#, c-format
msgid "Operators:"
msgstr "Operatører:"
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC
-#: Merge.rc:2203
+#: Merge.rc:2213
#, c-format
msgid "Strings:"
msgstr "Strenge:"
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC
-#: Merge.rc:2204
+#: Merge.rc:2214
#, c-format
msgid "Preprocessor:"
msgstr "Forbereder:"
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC
-#: Merge.rc:2205
+#: Merge.rc:2215
#, c-format
msgid "User 1:"
msgstr "Bruger 1:"
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC
-#: Merge.rc:2206
+#: Merge.rc:2216
#, c-format
msgid "User 2:"
msgstr "Bruger 2:"
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_SCOLOR_USER2_BOLD
-#: Merge.rc:2209 Merge.rc:2211 Merge.rc:2213 Merge.rc:2215 Merge.rc:2217
-#: Merge.rc:2219 Merge.rc:2221 Merge.rc:2223 Merge.rc:2225
+#: Merge.rc:2219 Merge.rc:2221 Merge.rc:2223 Merge.rc:2225 Merge.rc:2227
+#: Merge.rc:2229 Merge.rc:2231 Merge.rc:2233 Merge.rc:2235
#, c-format
msgid "Bold"
msgstr "Fed"
#. IDD_PROPPAGE_COLORS_TEXT, IDC_DEFAULT_STANDARD_COLORS
-#: Merge.rc:2233
+#: Merge.rc:2243
#, c-format
msgid "&Use customized text colors"
msgstr "&Brug tilpasset tekstfarve"
#. IDD_PROPPAGE_COLORS_TEXT, IDC_WHITESPACE_COLOR_LABEL
-#: Merge.rc:2235
+#: Merge.rc:2245
#, c-format
msgid "Whitespace:"
msgstr "Mellemrum:"
#. IDD_PROPPAGE_COLORS_TEXT, IDC_TEXT_COLOR_LABEL
-#: Merge.rc:2236
+#: Merge.rc:2246
#, c-format
msgid "Regular text:"
msgstr "Almindelig tekst:"
#. IDD_PROPPAGE_COLORS_TEXT, IDC_SELECTION_COLOR_LABEL
-#: Merge.rc:2237
+#: Merge.rc:2247
#, c-format
msgid "Selection:"
msgstr "Udvalgt:"
#. IDD_PROPPAGE_COLORS_DIR, IDC_STATIC
-#: Merge.rc:2245 Merge.rc:2286
+#: Merge.rc:2255 Merge.rc:2296
#, c-format
msgid "Margin:"
msgstr ""
#. IDD_PROPPAGE_COLORS_MARKER, IDC_MARKER0_COLOR_LABEL
-#: Merge.rc:2254
+#: Merge.rc:2264
#, c-format
msgid "Search Marker:"
msgstr ""
#. IDD_PROPPAGE_COLORS_MARKER, IDC_MARKER1_COLOR_LABEL
-#: Merge.rc:2255
+#: Merge.rc:2265
#, c-format
msgid "User Defined Marker 1:"
msgstr ""
#. IDD_PROPPAGE_COLORS_MARKER, IDC_MARKER2_COLOR_LABEL
-#: Merge.rc:2256
+#: Merge.rc:2266
#, c-format
msgid "User Defined Marker 2:"
msgstr ""
#. IDD_PROPPAGE_COLORS_MARKER, IDC_MARKER3_COLOR_LABEL
-#: Merge.rc:2257
+#: Merge.rc:2267
#, c-format
msgid "User Defined Marker 3:"
msgstr ""
#. IDD_PROPPAGE_COLORS_DIR, IDC_USE_DIR_COMPARE_COLORS
-#: Merge.rc:2270
+#: Merge.rc:2280
msgid "&Use folder compare colors"
msgstr ""
#. IDD_PROPPAGE_COLORS_DIR, IDC_STATIC
-#: Merge.rc:2274
+#: Merge.rc:2284
msgid "Items equal:"
msgstr ""
#. IDD_PROPPAGE_COLORS_DIR, IDC_STATIC
-#: Merge.rc:2277
+#: Merge.rc:2287
msgid "Items different:"
msgstr ""
#. IDD_PROPPAGE_COLORS_DIR, IDC_STATIC
-#: Merge.rc:2280
+#: Merge.rc:2290
msgid "Items missing:"
msgstr ""
#. IDD_PROPPAGE_COLORS_DIR, IDC_STATIC
-#: Merge.rc:2283
+#: Merge.rc:2293
msgid "Items filtered:"
msgstr ""
#. IDD_PROPPAGE_COLORS_SYSTEM, IDC_SYSCOLOR_HOOK_ENABLED
-#: Merge.rc:2295
+#: Merge.rc:2305
msgid "&Use custom system colors"
msgstr ""
#. IDS_PRPCAT_SYSTEM
-#: Merge.rc:2304 Merge.rc:4211 Merge.rc:4212 Merge.rc:4657
+#: Merge.rc:2314 Merge.rc:4221 Merge.rc:4222 Merge.rc:4667
#, c-format
msgid "System"
msgstr "System"
#. IDD_PROPPAGE_SYSTEM, IDC_USE_RECYCLE_BIN
-#: Merge.rc:2307
+#: Merge.rc:2317
#, c-format
msgid "&Use Recycle Bin"
msgstr "&Send slettede filer til skraldespanden"
#. IDD_PROPPAGE_SYSTEM, IDC_STATIC
-#: Merge.rc:2308
+#: Merge.rc:2318
#, c-format
msgid "&External editor:"
msgstr "&Ekstern editor:"
#. IDD_PROPPAGE_SYSTEM, IDC_STATIC
-#: Merge.rc:2311
+#: Merge.rc:2321
msgid "&Store user data in:"
msgstr ""
#. IDD_PROPPAGE_SYSTEM, IDC_STATIC
-#: Merge.rc:2313
+#: Merge.rc:2323
#, c-format
msgid "&Filter folder:"
msgstr "&Filter mappe:"
#. IDD_PROPPAGE_SYSTEM, IDC_STATIC
-#: Merge.rc:2316
+#: Merge.rc:2326
#, c-format
msgid "Temporary files folder"
msgstr "Mappe til midlertidige filer"
#. IDD_PROPPAGE_SYSTEM, IDC_TMPFOLDER_SYSTEM
-#: Merge.rc:2317
+#: Merge.rc:2327
#, c-format
msgid "S&ystem temp folder"
msgstr "S&ystemets mappe til midlertidige filer"
#. IDD_PROPPAGE_SYSTEM, IDC_STATIC
-#: Merge.rc:2318
+#: Merge.rc:2328
#, c-format
msgid "C&ustom folder:"
msgstr "V&algt mappe:"
#. IDD_GENERATE_PATCH, IDC_DIFF_BROWSE_FILE2
-#: Merge.rc:2320 Merge.rc:2416
+#: Merge.rc:2330 Merge.rc:2426
#, c-format
msgid "Br&owse..."
msgstr "G&ennemse..."
#. IDS_OPTIONSPG_COMPARE
-#: Merge.rc:2326 Merge.rc:4200
+#: Merge.rc:2336 Merge.rc:4210
#, c-format
msgid "Compare"
msgstr "Sammenlign"
#. IDD_PROPPAGE_COMPARE, IDC_STATIC
-#: Merge.rc:2329
+#: Merge.rc:2339
#, c-format
msgid "Whitespaces"
msgstr "Mellemrum"
#. IDD_PROPPAGE_COMPARE, IDC_WHITESPACE
-#: Merge.rc:2330
+#: Merge.rc:2340
#, c-format
msgid "&Compare"
msgstr "&Sammenlign"
#. IDD_PROPPAGE_COMPARE, IDC_WHITE_CHANGE
-#: Merge.rc:2331
+#: Merge.rc:2341
#, c-format
msgid "&Ignore change"
msgstr "&Ignorer ændringer"
#. IDD_PROPPAGE_COMPARE, IDC_ALL_WHITE
-#: Merge.rc:2332
+#: Merge.rc:2342
#, c-format
msgid "I&gnore all"
msgstr "I&gnorer alle"
#. IDD_PROPPAGE_COMPARE, IDC_IGNBLANKS_CHECK
-#: Merge.rc:2333
+#: Merge.rc:2343
msgid "Ignore blan&k lines"
msgstr "Ignorer blan&ke linjer"
#. IDD_PROPPAGE_COMPARE, IDC_IGNCASE_CHECK
-#: Merge.rc:2334
+#: Merge.rc:2344
msgid "Ignore &case"
msgstr "Ignorer store/små &bogstaver"
#. IDD_PROPPAGE_COMPARE, IDC_EOL_SENSITIVE
-#: Merge.rc:2335
+#: Merge.rc:2345
msgid "Igno&re EOL differences (Windows/Unix/Mac)"
msgstr ""
#. IDD_PROPPAGE_COMPARE, IDC_IGNORE_NUMBERS
-#: Merge.rc:2337
+#: Merge.rc:2347
msgid "Ignore num&bers"
msgstr ""
#. IDD_PROPPAGE_COMPARE, IDC_CP_SENSITIVE
-#: Merge.rc:2338
+#: Merge.rc:2348
msgid "Ignore codepage &differences"
msgstr ""
#. IDD_PROPPAGE_COMPARE, IDC_FILTERCOMMENTS_CHECK
-#: Merge.rc:2339
+#: Merge.rc:2349
msgid "Ignore c&omment differences"
msgstr ""
#. IDD_PROPPAGE_COMPARE, IDC_IGNEOFEOL_CHECK
-#: Merge.rc:2341
+#: Merge.rc:2351
msgid "Ignore &missing trailing EOL"
msgstr ""
#. IDD_PROPPAGE_COMPARE, IDC_IGNLBRKS_CHECK
-#: Merge.rc:2343
+#: Merge.rc:2353
msgid "Ignore line &breaks (treat as spaces)"
msgstr ""
#. IDD_PROPPAGE_COMPARE, IDC_MOVED_BLOCKS
-#: Merge.rc:2345
+#: Merge.rc:2355
#, c-format
msgid "E&nable moved block detection"
msgstr "&Aktiver detektion af flyttede blokke"
#. IDD_PROPPAGE_COMPARE, IDC_ALIGN_SIMILAR_LINES
-#: Merge.rc:2346
+#: Merge.rc:2356
msgid "Align &similar lines"
msgstr ""
#. IDD_PROPPAGE_COMPARE, IDC_STATIC
-#: Merge.rc:2347
+#: Merge.rc:2357
msgid "Diff &algorithm:"
msgstr ""
#. IDD_PROPPAGE_COMPARE, IDC_INDENT_HEURISTIC
-#: Merge.rc:2349
+#: Merge.rc:2359
msgid "Enable indent &heuristic"
msgstr ""
#. IDD_PROPPAGE_COMPARE, IDC_COMPLETELY_BLANK_OUT_IGNORED_DIFFERENCES
-#: Merge.rc:2350
+#: Merge.rc:2360
msgid "Completely unhighlight the ignored differences"
msgstr ""
#. IDS_OPTIONSPG_EDITOR
-#: Merge.rc:2357 Merge.rc:4201
+#: Merge.rc:2367 Merge.rc:4211
#, c-format
msgid "Editor"
msgstr "Redigering"
#. IDD_PROPPAGE_EDITOR, IDC_HILITE_CHECK
-#: Merge.rc:2360
+#: Merge.rc:2370
#, c-format
msgid "&Highlight syntax"
msgstr "&Fremhæv syntaksen"
#. IDD_PROPPAGE_EDITOR, IDC_MIXED_EOL
-#: Merge.rc:2361
+#: Merge.rc:2371
#, c-format
msgid "&Preserve original EOL"
msgstr "&Bevar originale EOL tegn"
#. IDD_PROPPAGE_EDITOR, IDC_STATIC
-#: Merge.rc:2362
+#: Merge.rc:2372
#, c-format
msgid "Tabs"
msgstr "Tabulator"
#. IDD_PROPPAGE_EDITOR, IDC_STATIC
-#: Merge.rc:2363
+#: Merge.rc:2373
#, c-format
msgid "&Tab size:"
msgstr "&Tabulator størrelse:"
#. IDD_PROPPAGE_EDITOR, IDC_PROP_INSERT_TABS
-#: Merge.rc:2365
+#: Merge.rc:2375
#, c-format
msgid "&Insert tabs"
msgstr "&Indsæt tabulatorer"
#. IDD_PROPPAGE_EDITOR, IDC_PROP_INSERT_SPACES
-#: Merge.rc:2366
+#: Merge.rc:2376
#, c-format
msgid "Insert &spaces"
msgstr "Indsæt &mellemrum"
#. IDD_PROPPAGE_EDITOR, IDC_STATIC
-#: Merge.rc:2367
+#: Merge.rc:2377
msgid "&Rendering mode:"
msgstr ""
#. IDD_PROPPAGE_EDITOR_COMPAREMERGE, IDC_AUTOMRESCAN_CHECK
-#: Merge.rc:2376
+#: Merge.rc:2386
#, c-format
msgid "&Automatic rescan"
msgstr "Automatisk &opdatering"
#. IDD_PROPPAGE_EDITOR_COMPAREMERGE, IDC_STATIC
-#: Merge.rc:2377
+#: Merge.rc:2387
msgid "Copy &granularity for selected differences:"
msgstr ""
#. IDD_PROPPAGE_EDITOR_COMPAREMERGE, IDC_LINE_COLORING_GROUP
-#: Merge.rc:2379
+#: Merge.rc:2389
#, c-format
msgid "Line Difference Coloring"
msgstr "Farver for linjeforskelle"
#. IDD_PROPPAGE_EDITOR_COMPAREMERGE, IDC_VIEW_LINE_DIFFERENCES
-#: Merge.rc:2380
+#: Merge.rc:2390
#, c-format
msgid "View line differences"
msgstr "Vis linjeforskelle"
#. IDD_PROPPAGE_EDITOR_COMPAREMERGE, IDC_EDITOR_CHARLEVEL
-#: Merge.rc:2381
+#: Merge.rc:2391
#, c-format
msgid "&Character-level"
msgstr "&Karakter niveau"
#. IDD_PROPPAGE_EDITOR_COMPAREMERGE, IDC_EDITOR_WORDLEVEL
-#: Merge.rc:2382
+#: Merge.rc:2392
#, c-format
msgid "&Word-level:"
msgstr "&Ord niveau:"
#. IDD_PROPPAGE_EDITOR_COMPAREMERGE, IDC_STATIC
-#: Merge.rc:2384
+#: Merge.rc:2394
#, c-format
msgid "W&ord break characters:"
msgstr ""
#. IDD_PROPPAGE_MESSAGEBOXES, IDC_STATIC
-#: Merge.rc:2401
+#: Merge.rc:2411
msgid "Some messages can be hidden by the user. Press Reset to make all messages visible again."
msgstr ""
"WinMerge kan gemme almene beskedvinduer. Brug Reset knappen for at vise "
"disse vinduer igen."
#. IDD_SELECT_FILES_OR_FOLDERS, IDC_RESET
-#: Merge.rc:2402 Merge.rc:3085
+#: Merge.rc:2412 Merge.rc:3095
#, c-format
msgid "Reset"
msgstr "Nulstil"
#. IDD_GENERATE_PATCH
-#: Merge.rc:2408
+#: Merge.rc:2418
#, c-format
msgid "Patch Generator"
msgstr "Patch Generator"
#. IDD_GENERATE_PATCH, IDC_STATIC
-#: Merge.rc:2411
+#: Merge.rc:2421
#, c-format
msgid "File&1:"
msgstr "Fil&1:"
#. IDD_GENERATE_PATCH, IDC_STATIC
-#: Merge.rc:2414
+#: Merge.rc:2424
#, c-format
msgid "File&2:"
msgstr "Fil&2:"
#. IDD_GENERATE_PATCH, IDC_DIFF_SWAPFILES
-#: Merge.rc:2417
+#: Merge.rc:2427
#, c-format
msgid "&Swap"
msgstr "&Byt"
#. IDD_DIRCMP_REPORT, IDC_REPORT_COPYCLIPBOARD
-#: Merge.rc:2418 Merge.rc:2690
+#: Merge.rc:2428 Merge.rc:2700
#, c-format
msgid "&Copy to clipboard"
msgstr "&Kopier til Udklipsholder"
#. IDD_GENERATE_PATCH, IDC_DIFF_APPENDFILE
-#: Merge.rc:2419
+#: Merge.rc:2429
#, c-format
msgid "&Append to existing file"
msgstr "&Tilføj til eksisterende fil"
#. IDD_GENERATE_PATCH, IDC_STATIC
-#: Merge.rc:2420
+#: Merge.rc:2430
#, c-format
msgid "&Result:"
msgstr "Res&ultat:"
#. IDD_GENERATE_PATCH, IDC_DIFF_BROWSE_RESULT
-#: Merge.rc:2422
+#: Merge.rc:2432
#, c-format
msgid "Bro&wse..."
msgstr "G&ennemse..."
#. IDD_GENERATE_PATCH, IDC_STATIC
-#: Merge.rc:2423
+#: Merge.rc:2433
#, c-format
msgid "&Format"
msgstr "&Format"
#. IDD_GENERATE_PATCH, IDC_STATIC
-#: Merge.rc:2424
+#: Merge.rc:2434
#, c-format
msgid "St&yle:"
msgstr "Sti&l:"
#. IDD_GENERATE_PATCH, IDC_STATIC
-#: Merge.rc:2426
+#: Merge.rc:2436
#, c-format
msgid "&Context:"
msgstr "&Sammenhæng:"
#. IDD_GENERATE_PATCH, IDC_DIFF_INCLCMDLINE
-#: Merge.rc:2428
+#: Merge.rc:2438
#, c-format
msgid "Inclu&de command line"
msgstr "Inkluder &kommandolinjen"
#. IDD_GENERATE_PATCH, IDC_DIFF_OPENTOEDITOR
-#: Merge.rc:2429
+#: Merge.rc:2439
#, c-format
msgid "Open in e&xternal editor"
msgstr "Åben i ekstern e&ditor"
#. IDD_DIRCOLS
-#: Merge.rc:2446
+#: Merge.rc:2456
#, c-format
msgid "Display Columns"
msgstr "Vis søjler"
#. IDD_DIRCOLS, IDC_UP
-#: Merge.rc:2450
+#: Merge.rc:2460
#, c-format
msgid "Move &Up"
msgstr "Flyt &op"
#. IDD_DIRCOLS, IDC_DOWN
-#: Merge.rc:2451
+#: Merge.rc:2461
#, c-format
msgid "Move &Down"
msgstr "Flyt &ned"
#. IDD_DIRCOLS, IDC_COLDLG_ADDITIONAL_PROPERTIES
-#: Merge.rc:2453
+#: Merge.rc:2463
msgid "&Additional Properties"
msgstr ""
#. IDD_DIRADDITIONALPROPS
-#: Merge.rc:2461
+#: Merge.rc:2471
msgid "Additional Properties"
msgstr ""
#. IDD_PLUGINS_SELECTPLUGIN
-#: Merge.rc:2475
+#: Merge.rc:2485
msgid "Select Plugin"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN, IDC_STATIC
-#: Merge.rc:2478 Merge.rc:3115
+#: Merge.rc:2488 Merge.rc:3125
msgid "Plugin &name:"
msgstr ""
#. IDD_PLUGINS_SELECTPLUGIN, IDC_STATIC
-#: Merge.rc:2480
+#: Merge.rc:2490
msgid "&Target files:"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN, IDC_STATIC
-#: Merge.rc:2482 Merge.rc:3117
+#: Merge.rc:2492 Merge.rc:3127
#, c-format
msgid "Extensions list:"
msgstr "Extension liste:"
#. IDD_PLUGINS_EDITPLUGIN, IDC_STATIC
-#: Merge.rc:2484 Merge.rc:3119
+#: Merge.rc:2494 Merge.rc:3129
#, c-format
msgid "Description:"
msgstr "Beskrivelse:"
#. IDD_PLUGINS_EDITPLUGIN, IDC_STATIC
-#: Merge.rc:2486 Merge.rc:3121
+#: Merge.rc:2496 Merge.rc:3131
msgid "Default arguments:"
msgstr ""
#. IDD_PLUGINS_SELECTPLUGIN, IDC_PLUGIN_ALLOW_ALL
-#: Merge.rc:2488
+#: Merge.rc:2498
msgid "Display all plugins (Ignore extension)"
msgstr ""
#. IDD_PLUGINS_SELECTPLUGIN, IDC_PLUGIN_OPEN_IN_SAME_FRAME_TYPE
-#: Merge.rc:2490
+#: Merge.rc:2500
msgid "&Open files in same window type after unpacking"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_PIPELINE_STATIC
-#: Merge.rc:2492 Merge.rc:3129
+#: Merge.rc:2502 Merge.rc:3139
msgid "&Plugin pipeline:"
msgstr ""
#. IDD_PLUGINS_SELECTPLUGIN, IDC_PLUGIN_ALIAS
-#: Merge.rc:2495
+#: Merge.rc:2505
msgid "&Alias..."
msgstr ""
#. IDD_DIRCOMP_PROGRESS, IDC_COMPARISON_STOP
-#: Merge.rc:2505
+#: Merge.rc:2515
#, c-format
msgid "Stop"
msgstr "Stop"
#. IDD_DIRCOMP_PROGRESS, IDC_COMPARISON_PAUSE
-#: Merge.rc:2506
+#: Merge.rc:2516
#, c-format
msgid "Pause"
msgstr ""
#. IDD_DIRCOMP_PROGRESS, IDC_COMPARISON_CONTINUE
-#: Merge.rc:2507
+#: Merge.rc:2517
#, c-format
msgid "Continue"
msgstr ""
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC
-#: Merge.rc:2509 Merge.rc:2973
+#: Merge.rc:2519 Merge.rc:2983
msgid "C&PU cores to use:"
msgstr ""
#. IDD_DIRCOMP_PROGRESS, IDC_STATIC
-#: Merge.rc:2510
+#: Merge.rc:2520
#, c-format
msgid "Items total:"
msgstr "Emner ialt:"
#. IDD_DIRCOMP_PROGRESS, IDC_STATIC
-#: Merge.rc:2511
+#: Merge.rc:2521
#, c-format
msgid "Items compared:"
msgstr "Emner sammenlignet:"
#. IDS_PREVIEWBAR_CLOSE
-#: Merge.rc:2526 Merge.rc:2846 Merge.rc:5328
+#: Merge.rc:2536 Merge.rc:2856 Merge.rc:5339
#, c-format
msgid "&Close"
msgstr "&Luk"
#. IDD_WMGOTO
-#: Merge.rc:2537
+#: Merge.rc:2547
msgid "Go to"
msgstr "Gå til"
#. IDD_WMGOTO, IDC_STATIC
-#: Merge.rc:2540
+#: Merge.rc:2550
msgid "G&o to:"
msgstr "G&å til:"
#. IDD_WMGOTO, IDC_STATIC
-#: Merge.rc:2543
+#: Merge.rc:2553
#, c-format
msgid "File"
msgstr "Fil"
#. IDD_WMGOTO, IDC_STATIC
-#: Merge.rc:2547
+#: Merge.rc:2557
msgid "Go to what"
msgstr "Gå til hvad"
#. IDD_WMGOTO, IDC_WMGOTO_TOLINE
-#: Merge.rc:2548
+#: Merge.rc:2558
#, c-format
msgid "Li&ne"
msgstr "Li&nje"
#. IDD_WMGOTO, IDC_WMGOTO_TODIFF
-#: Merge.rc:2549
+#: Merge.rc:2559
#, c-format
msgid "&Difference"
msgstr "&Forskel"
#. IDD_WMGOTO, IDOK
-#: Merge.rc:2550
+#: Merge.rc:2560
msgid "&Go to"
msgstr "&Gå til"
#. IDS_PROJECT_ITEM_FILE_FILTER
-#: Merge.rc:2556 Merge.rc:4321
+#: Merge.rc:2566 Merge.rc:4331
msgid "File Filters"
msgstr ""
#. IDD_FILTERS_FILEFILTERS, IDC_STATIC
-#: Merge.rc:2559
+#: Merge.rc:2569
msgid "&Mask / Filter Expression"
msgstr ""
#. IDD_FILTERS_FILEFILTERS, IDC_STATIC
-#: Merge.rc:2562
+#: Merge.rc:2572
msgid "Preset &Filters"
msgstr ""
#. IDD_FILTERS_FILEFILTERS, IDC_FILTERFILE_TEST_BTN
-#: Merge.rc:2564
+#: Merge.rc:2574
msgid "Test..."
msgstr "Test..."
#. IDD_FILTERS_FILEFILTERS, IDC_FILTERFILE_INSTALL
-#: Merge.rc:2565
+#: Merge.rc:2575
#, c-format
msgid "Install..."
msgstr "Installer..."
#. IDD_FILTERS_FILEFILTERS, IDC_FILTERFILE_NEWBTN
-#: Merge.rc:2566
+#: Merge.rc:2576
#, c-format
msgid "New..."
msgstr "Ny..."
#. IDD_FILTERS_FILEFILTERS, IDC_FILTERFILE_EDITBTN
-#: Merge.rc:2567
+#: Merge.rc:2577
#, c-format
msgid "Edit..."
msgstr "Rediger..."
#. IDD_FILTERS_FILEFILTERS, IDC_FILTERFILE_DELETEBTN
-#: Merge.rc:2568
+#: Merge.rc:2578
#, c-format
msgid "Delete..."
msgstr "Slet..."
#. IDD_FILTERS_CONDITION
-#: Merge.rc:2573
+#: Merge.rc:2583
msgid "Filter Condition"
msgstr ""
#. IDD_FILTERS_CONDITION, IDC_STATIC
-#: Merge.rc:2576
+#: Merge.rc:2586
msgid "&Left-hand side:"
msgstr ""
#. IDD_FILTERS_CONDITION, IDC_STATIC
-#: Merge.rc:2578
+#: Merge.rc:2588
msgid "&Operator:"
msgstr ""
#. IDD_FILTERS_CONDITION, IDC_STATIC
-#: Merge.rc:2580
+#: Merge.rc:2590
msgid "&Right-hand side:"
msgstr ""
#. IDD_FILTERS_CONDITION, IDC_STATIC
-#: Merge.rc:2586
+#: Merge.rc:2596
msgid "Expression:"
msgstr ""
#. IDD_COMPARISON_RESULT_FILTER
-#: Merge.rc:2595
+#: Merge.rc:2605
msgid "Filter by Comparison Result"
msgstr ""
#. IDD_COMPARISON_RESULT_FILTER, IDC_RADIO_INCLUDE
-#: Merge.rc:2598
+#: Merge.rc:2608
msgid "&Include"
msgstr ""
#. IDD_COMPARISON_RESULT_FILTER, IDC_RADIO_EXCLUDE
-#: Merge.rc:2599
+#: Merge.rc:2609
msgid "&Exclude"
msgstr ""
#. IDD_COMPARISON_RESULT_FILTER, IDC_STATIC
-#: Merge.rc:2600
+#: Merge.rc:2610
msgid "Comparison Results"
msgstr ""
#. IDS_IDENTICAL
-#: Merge.rc:2601 Merge.rc:2733 Merge.rc:2794 Merge.rc:4698
+#: Merge.rc:2611 Merge.rc:2743 Merge.rc:2804 Merge.rc:4708
#, c-format
msgid "Identical"
msgstr "Identiske"
#. IDS_DIFFERENT
-#: Merge.rc:2602 Merge.rc:2714 Merge.rc:2755 Merge.rc:4708
+#: Merge.rc:2612 Merge.rc:2724 Merge.rc:2765 Merge.rc:4718
#, c-format
msgid "Different"
msgstr "Forskellige"
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_LEFT_ONLY
-#: Merge.rc:2603
+#: Merge.rc:2613
msgid "Left only"
msgstr ""
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_RIGHT_ONLY
-#: Merge.rc:2604
+#: Merge.rc:2614
msgid "Right only"
msgstr ""
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_SKIPPED
-#: Merge.rc:2605
+#: Merge.rc:2615
msgid "Skipped"
msgstr ""
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_MIDDLE_ONLY
-#: Merge.rc:2606
+#: Merge.rc:2616
msgid "Middle only"
msgstr ""
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_LEFT_ONLY_DIFFERENT
-#: Merge.rc:2607
+#: Merge.rc:2617
msgid "Left only (different)"
msgstr ""
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_MIDDLE_ONLY_DIFFERENT
-#: Merge.rc:2608
+#: Merge.rc:2618
msgid "Middle only (different)"
msgstr ""
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_RIGHT_ONLY_DIFFERENT
-#: Merge.rc:2609
+#: Merge.rc:2619
msgid "Right only (different)"
msgstr ""
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_LEFT_ONLY_MISSING
-#: Merge.rc:2610
+#: Merge.rc:2620
msgid "Left only (missing)"
msgstr ""
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_MIDDLE_ONLY_MISSING
-#: Merge.rc:2611
+#: Merge.rc:2621
msgid "Middle only (missing)"
msgstr ""
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_RIGHT_ONLY_MISSING
-#: Merge.rc:2612
+#: Merge.rc:2622
msgid "Right only (missing)"
msgstr ""
#. IDS_OPTIONSPG_CODEPAGE
-#: Merge.rc:2619 Merge.rc:2811 Merge.rc:4213
+#: Merge.rc:2629 Merge.rc:2821 Merge.rc:4223
#, c-format
msgid "Codepage"
msgstr "Codepage"
#. IDD_PROPPAGE_CODEPAGE, IDC_STATIC
-#: Merge.rc:2622
+#: Merge.rc:2632
#, c-format
msgid "Default Codepage"
msgstr "Standard codepage"
#. IDD_PROPPAGE_CODEPAGE, IDC_STATIC
-#: Merge.rc:2623
+#: Merge.rc:2633
#, c-format
msgid "Select the default codepage for non-Unicode files:"
msgstr ""
@@ -4452,939 +4463,939 @@ msgstr ""
"unicode:"
#. IDD_PROPPAGE_CODEPAGE, IDC_CP_SYSTEM
-#: Merge.rc:2624
+#: Merge.rc:2634
#, c-format
msgid "System codepage"
msgstr "System codepage"
#. IDD_PROPPAGE_CODEPAGE, IDC_CP_UI
-#: Merge.rc:2625
+#: Merge.rc:2635
#, c-format
msgid "According to WinMerge User Interface"
msgstr "Samme som WinMerge brugerflade"
#. IDD_PROPPAGE_CODEPAGE, IDC_CP_CUSTOM
-#: Merge.rc:2626
+#: Merge.rc:2636
#, c-format
msgid "Custom codepage:"
msgstr "Udvalgt codepage:"
#. IDD_PROPPAGE_CODEPAGE, IDC_DETECT_CODEPAGE
-#: Merge.rc:2628
+#: Merge.rc:2638
msgid "Detect codepage for: .html, .rc, .xml\nRestart required."
msgstr ""
"Find codepage automatisk for disse filer: .html, .rc, .xml\n"
"WinMerge skal genstartes før dette tager effekt."
#. IDD_PROPPAGE_CODEPAGE, IDC_DETECT_CODEPAGE2
-#: Merge.rc:2630
+#: Merge.rc:2640
msgid "Detect codepage for files with mlang.dll\nRestart required."
msgstr ""
#. IDS_OPTIONSPG_ARCHIVE
-#: Merge.rc:2638 Merge.rc:4214
+#: Merge.rc:2648 Merge.rc:4224
#, c-format
msgid "Archive Support"
msgstr "Arkiv Support"
#. IDD_PROPPAGE_ARCHIVE, IDC_ARCHIVE_ENABLE
-#: Merge.rc:2641
+#: Merge.rc:2651
#, c-format
msgid "&Enable archive file support"
msgstr "&Aktiver arkiv fil support"
#. IDD_PROPPAGE_ARCHIVE, IDC_ARCHIVE_DETECTTYPE
-#: Merge.rc:2642
+#: Merge.rc:2652
#, c-format
msgid "&Detect archive type from file signature"
msgstr "Bestem arkivtype udfra fil signatur"
#. IDD_PROPPAGE_PROJECT, IDC_STATIC
-#: Merge.rc:2651
+#: Merge.rc:2661
msgid "Items saved to or restored from the project file:"
msgstr ""
#. IDD_SAVECLOSING
-#: Merge.rc:2658
+#: Merge.rc:2668
#, c-format
msgid "Save Modified Files?"
msgstr "Gem ændrede filer?"
#. IDD_SAVECLOSING, IDC_SAVECLOSING_LEFTFRAME
-#: Merge.rc:2661
+#: Merge.rc:2671
#, c-format
msgid "Left side file"
msgstr "Fil på venstre side"
#. IDD_SAVECLOSING, IDC_SAVECLOSING_SAVELEFT
-#: Merge.rc:2663
+#: Merge.rc:2673
#, c-format
msgid "&Save changes"
msgstr "&Gem ændringer"
#. IDD_SAVECLOSING, IDC_SAVECLOSING_DISCARDLEFT
-#: Merge.rc:2664
+#: Merge.rc:2674
#, c-format
msgid "&Discard changes"
msgstr "&Fjern ændringer"
#. IDD_SAVECLOSING, IDC_SAVECLOSING_MIDDLEFRAME
-#: Merge.rc:2665
+#: Merge.rc:2675
#, c-format
msgid "Middle side file"
msgstr ""
#. IDD_SAVECLOSING, IDC_SAVECLOSING_SAVEMIDDLE
-#: Merge.rc:2667
+#: Merge.rc:2677
#, c-format
msgid "Sa&ve changes"
msgstr ""
#. IDD_SAVECLOSING, IDC_SAVECLOSING_DISCARDMIDDLE
-#: Merge.rc:2668
+#: Merge.rc:2678
#, c-format
msgid "Discard c&hanges"
msgstr ""
#. IDD_SAVECLOSING, IDC_SAVECLOSING_RIGHTFRAME
-#: Merge.rc:2669
+#: Merge.rc:2679
#, c-format
msgid "Right side file"
msgstr "Fil på højre side"
#. IDD_SAVECLOSING, IDC_SAVECLOSING_SAVERIGHT
-#: Merge.rc:2671
+#: Merge.rc:2681
#, c-format
msgid "S&ave changes"
msgstr "G&em ændringer"
#. IDD_SAVECLOSING, IDC_SAVECLOSING_DISCARDRIGHT
-#: Merge.rc:2672
+#: Merge.rc:2682
#, c-format
msgid "Dis&card changes"
msgstr "F&jern ændringer"
#. IDD_SAVECLOSING, IDC_SAVECLOSING_DISCARDALL
-#: Merge.rc:2673
+#: Merge.rc:2683
#, c-format
msgid "Disca&rd All"
msgstr ""
#. IDD_DIRCMP_REPORT
-#: Merge.rc:2680
+#: Merge.rc:2690
#, c-format
msgid "Folder Compare Report"
msgstr "Directory Compare Report"
#. IDD_DIRCMP_REPORT, IDC_STATIC
-#: Merge.rc:2683
+#: Merge.rc:2693
#, c-format
msgid "Report &file:"
msgstr "Rapport &Fil:"
#. IDD_DIRCMP_REPORT, IDC_STATIC
-#: Merge.rc:2686
+#: Merge.rc:2696
#, c-format
msgid "&Style:"
msgstr "&Stil"
#. IDD_DIRCMP_REPORT, IDC_REPORT_INCLUDEFILECMPREPORT
-#: Merge.rc:2688
+#: Merge.rc:2698
#, c-format
msgid "&Include file compare report"
msgstr ""
#. IDD_FILTERS_FILEFILTERS_SHARED
-#: Merge.rc:2697
+#: Merge.rc:2707
#, c-format
msgid "Shared or Private Filter"
msgstr "Delt eller Privat Filter "
#. IDD_FILTERS_FILEFILTERS_SHARED, IDC_STATIC
-#: Merge.rc:2700
+#: Merge.rc:2710
#, c-format
msgid "What type of filter do you want?"
msgstr "Hvilken type filter vil du oprette?"
#. IDD_FILTERS_FILEFILTERS_SHARED, IDC_SHARED
-#: Merge.rc:2701
+#: Merge.rc:2711
#, c-format
msgid "Shared Filter (for all users)"
msgstr "Delt Filter (for alle brugere)"
#. IDD_FILTERS_FILEFILTERS_SHARED, IDC_PRIVATE
-#: Merge.rc:2702
+#: Merge.rc:2712
#, c-format
msgid "Private Filter (current user only)"
msgstr "Privat Filter (kun aktuel bruger)"
#. IDD_COMPARE_STATISTICS3
-#: Merge.rc:2709 Merge.rc:2750
+#: Merge.rc:2719 Merge.rc:2760
#, c-format
msgid "Compare Statistics"
msgstr "Sammenlign Statistik"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2712 Merge.rc:2753
+#: Merge.rc:2722 Merge.rc:2763
#, c-format
msgid "Folders:"
msgstr "Mapper:"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2713 Merge.rc:2754
+#: Merge.rc:2723 Merge.rc:2764
#, c-format
msgid "Files:"
msgstr "Filer:"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2719 Merge.rc:2738 Merge.rc:2760 Merge.rc:2799
+#: Merge.rc:2729 Merge.rc:2748 Merge.rc:2770 Merge.rc:2809
#, c-format
msgid "Binary:"
msgstr "Binær:"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2722 Merge.rc:2763
+#: Merge.rc:2732 Merge.rc:2773
#, c-format
msgid "Unique"
msgstr "Unik"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2723 Merge.rc:2764
+#: Merge.rc:2733 Merge.rc:2774
#, c-format
msgid "Left:"
msgstr "Venstre:"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2728 Merge.rc:2774
+#: Merge.rc:2738 Merge.rc:2784
#, c-format
msgid "Right:"
msgstr "Højre:"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2742 Merge.rc:2803
+#: Merge.rc:2752 Merge.rc:2813
#, c-format
msgid "Total:"
msgstr "Ialt:"
#. IDD_COMPARE_STATISTICS3, IDOK
-#: Merge.rc:2745 Merge.rc:2806
+#: Merge.rc:2755 Merge.rc:2816
#, c-format
msgid "Close"
msgstr "Luk"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2769
+#: Merge.rc:2779
#, c-format
msgid "Middle:"
msgstr ""
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2779
+#: Merge.rc:2789
#, c-format
msgid "Missing Left:"
msgstr ""
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2784
+#: Merge.rc:2794
#, c-format
msgid "Missing Middle:"
msgstr ""
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2789
+#: Merge.rc:2799
#, c-format
msgid "Missing Right:"
msgstr ""
#. IDD_LOAD_SAVE_CODEPAGE, IDC_AFFECTS_GROUP
-#: Merge.rc:2814
+#: Merge.rc:2824
#, c-format
msgid "Affects"
msgstr "Påvirker"
#. IDD_LOAD_SAVE_CODEPAGE, IDC_RIGHT_FILES_LABEL
-#: Merge.rc:2816 Merge.rc:2818 Merge.rc:2820
+#: Merge.rc:2826 Merge.rc:2828 Merge.rc:2830
#, c-format
msgid "(Affects)"
msgstr "(Påvirker)"
#. IDD_LOAD_SAVE_CODEPAGE, IDC_LOADING_GROUP
-#: Merge.rc:2821
+#: Merge.rc:2831
#, c-format
msgid "Select Codepage for"
msgstr "Vælg codepage til"
#. IDD_LOAD_SAVE_CODEPAGE, IDC_LOAD_FILES_LABEL
-#: Merge.rc:2822
+#: Merge.rc:2832
#, c-format
msgid "&File Loading:"
msgstr "&Fil Indlæsning:"
#. IDD_LOAD_SAVE_CODEPAGE, IDC_SAVE_FILES_LABEL
-#: Merge.rc:2824
+#: Merge.rc:2834
#, c-format
msgid "File &Saving:"
msgstr "Fil &Gemning:"
#. IDD_LOAD_SAVE_CODEPAGE, IDC_LOAD_SAVE_SAME_CODEPAGE
-#: Merge.rc:2827
+#: Merge.rc:2837
#, c-format
msgid "&Use same codepage for both"
msgstr "&Brug samme codepage for begge"
#. IDS_MESSAGEBOX_CANCEL
-#: Merge.rc:2830 Merge.rc:4172
+#: Merge.rc:2840 Merge.rc:4182
#, c-format
msgid "&Cancel"
msgstr "&Annuller"
#. IDD_FILTERS_FILEFILTERS_TEST
-#: Merge.rc:2835
+#: Merge.rc:2845
#, c-format
msgid "Test Filter"
msgstr "Test Filter"
#. IDD_FILTERS_FILEFILTERS_TEST, IDC_HEADER
-#: Merge.rc:2838
+#: Merge.rc:2848
msgid "Testing filter:"
msgstr "Tester filter:"
#. IDD_FILTERS_FILEFILTERS_TEST, IDC_PROMPT_LABEL
-#: Merge.rc:2840
+#: Merge.rc:2850
#, c-format
msgid "&Enter text to test:"
msgstr "&Indsæt test tekst:"
#. IDD_FILTERS_FILEFILTERS_TEST, IDC_IS_DIRECTORY
-#: Merge.rc:2842
+#: Merge.rc:2852
#, c-format
msgid "&Folder Name"
msgstr "&Mappenavn"
#. IDD_FILTERS_FILEFILTERS_TEST, IDC_STATIC
-#: Merge.rc:2843
+#: Merge.rc:2853
#, c-format
msgid "Result:"
msgstr "Resultater:"
#. IDD_FILTERS_FILEFILTERS_TEST, IDC_TEST_BTN
-#: Merge.rc:2845
+#: Merge.rc:2855
#, c-format
msgid "&Test"
msgstr "&Test"
#. IDS_OPTIONSPG_TABLECOMPARE
-#: Merge.rc:2851 Merge.rc:2990 Merge.rc:4228
+#: Merge.rc:2861 Merge.rc:3000 Merge.rc:4238
msgid "Table"
msgstr ""
#. IDD_OPEN_TABLE, IDC_STATIC
-#: Merge.rc:2854
+#: Merge.rc:2864
msgid "File type"
msgstr ""
#. IDD_OPEN_TABLE, IDC_COMPARETABLE_CSV
-#: Merge.rc:2855
+#: Merge.rc:2865
msgid "&CSV"
msgstr ""
#. IDD_OPEN_TABLE, IDC_COMPARETABLE_TSV
-#: Merge.rc:2856
+#: Merge.rc:2866
msgid "&TSV"
msgstr ""
#. IDD_OPEN_TABLE, IDC_COMPARETABLE_DSV
-#: Merge.rc:2857
+#: Merge.rc:2867
msgid "Custom &Delimiter-Separated Values"
msgstr ""
#. IDD_PROPPAGE_COMPARE_TABLE, IDC_STATIC
-#: Merge.rc:2859 Merge.rc:2861 Merge.rc:2996 Merge.rc:3004
+#: Merge.rc:2869 Merge.rc:2871 Merge.rc:3006 Merge.rc:3014
msgid "D&elimiter character:"
msgstr ""
#. IDD_PROPPAGE_COMPARE_TABLE, IDC_COMPARETABLE_ALLOWNEWLINE
-#: Merge.rc:2863 Merge.rc:3006
+#: Merge.rc:2873 Merge.rc:3016
msgid "&Allow newlines in quotes"
msgstr ""
#. IDD_PROPPAGE_COMPARE_TABLE, IDC_STATIC
-#: Merge.rc:2865 Merge.rc:3008
+#: Merge.rc:2875 Merge.rc:3018
msgid "&Quote character:"
msgstr ""
#. IDS_OPTIONSPG_BACKUPS
-#: Merge.rc:2873 Merge.rc:4216
+#: Merge.rc:2883 Merge.rc:4226
#, c-format
msgid "Backup Files"
msgstr "Backup filer"
#. IDD_PROPPAGE_BACKUPS, IDC_STATIC
-#: Merge.rc:2876
+#: Merge.rc:2886
#, c-format
msgid "Create backup files for:"
msgstr "Opret backup filer som:"
#. IDD_PROPPAGE_BACKUPS, IDC_BACKUP_FOLDERCMP
-#: Merge.rc:2877
+#: Merge.rc:2887
#, c-format
msgid "&Folder compare"
msgstr "&Mappe sammenligning"
#. IDD_PROPPAGE_BACKUPS, IDC_BACKUP_FILECMP
-#: Merge.rc:2878
+#: Merge.rc:2888
#, c-format
msgid "Fil&e compare"
msgstr "Fil& sammenligning"
#. IDD_PROPPAGE_BACKUPS, IDC_STATIC
-#: Merge.rc:2879
+#: Merge.rc:2889
#, c-format
msgid "Create backup files in:"
msgstr "Gem backup filer i:"
#. IDD_PROPPAGE_BACKUPS, IDC_BACKUP_ORIGFOLD
-#: Merge.rc:2880
+#: Merge.rc:2890
#, c-format
msgid "&Original file's folder"
msgstr "&Originalfilens mappe"
#. IDD_PROPPAGE_BACKUPS, IDC_BACKUP_GLOBALFOLD
-#: Merge.rc:2881
+#: Merge.rc:2891
#, c-format
msgid "&Global backup folder:"
msgstr "&Global backup mappe:"
#. IDD_PROPPAGE_BACKUPS, IDC_STATIC
-#: Merge.rc:2884
+#: Merge.rc:2894
#, c-format
msgid "Backup filename:"
msgstr "Backup filnavn:"
#. IDD_PROPPAGE_BACKUPS, IDC_BACKUP_APPEND_BAK
-#: Merge.rc:2885
+#: Merge.rc:2895
msgid "&Append .bak extension"
msgstr "&Tilføj .bak extension"
#. IDD_PROPPAGE_BACKUPS, IDC_BACKUP_APPEND_TIME
-#: Merge.rc:2886
+#: Merge.rc:2896
#, c-format
msgid "A&ppend timestamp"
msgstr "T&ilføj tidsstempel"
#. IDS_CONFIRM_COPY_CAPTION
-#: Merge.rc:2892 Merge.rc:4565
+#: Merge.rc:2902 Merge.rc:4575
#, c-format
msgid "Confirm Copy"
msgstr "Bekræft kopi"
#. IDD_CONFIRM_COPY, IDC_FLDCONFIRM_QUERY
-#: Merge.rc:2896
+#: Merge.rc:2906
#, c-format
msgid "Are you sure you want to copy XXX items?"
msgstr "Ønsker du virkelig at kopiere XXX emner?"
#. IDD_CONFIRM_COPY, IDC_FLDCONFIRM_FROM_TEXT
-#: Merge.rc:2897
+#: Merge.rc:2907
#, c-format
msgid "From left"
msgstr "Fra venstre"
#. IDD_CONFIRM_COPY, IDC_FLDCONFIRM_TO_TEXT
-#: Merge.rc:2899
+#: Merge.rc:2909
#, c-format
msgid "To right"
msgstr "Til højre"
#. IDS_MESSAGEBOX_DONT_ASK_AGAIN
-#: Merge.rc:2901 Merge.rc:4191
+#: Merge.rc:2911 Merge.rc:4201
#, c-format
msgid "Don't ask this &question again."
msgstr "Stil ikke dette sp&ørgsmål igen."
#. IDD_CONFIRM_COPY, IDYES
-#: Merge.rc:2903
+#: Merge.rc:2913
#, c-format
msgid "Yes"
msgstr "Ja"
#. IDD_CONFIRM_COPY, IDNO
-#: Merge.rc:2904
+#: Merge.rc:2914
#, c-format
msgid "No"
msgstr "Nej"
#. IDS_PROJECT_ITEM_PLUGIN
-#: Merge.rc:2909 Merge.rc:4323
+#: Merge.rc:2919 Merge.rc:4333
#, c-format
msgid "Plugins"
msgstr "Plugins"
#. IDD_PLUGINS_LIST, IDC_PLUGINS_ENABLE
-#: Merge.rc:2912
+#: Merge.rc:2922
#, c-format
msgid "&Enable plugins"
msgstr "&Aktiver plugins"
#. IDD_PLUGINS_EDITPLUGIN, IDC_STATIC
-#: Merge.rc:2913 Merge.rc:3113
+#: Merge.rc:2923 Merge.rc:3123
msgid "Plugin &type:"
msgstr ""
#. IDD_PLUGINS_LIST, IDC_STATIC
-#: Merge.rc:2916
+#: Merge.rc:2926
msgid "File filters:"
msgstr ""
#. IDD_PLUGINS_LIST, IDC_STATIC
-#: Merge.rc:2918
+#: Merge.rc:2928
msgid "&Plugin arguments:"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_AUTOMATIC
-#: Merge.rc:2920 Merge.rc:3134
+#: Merge.rc:2930 Merge.rc:3144
msgid "Enable &automatic unpacking/prediffing"
msgstr ""
#. IDS_OPTIONSPG_SHELL
-#: Merge.rc:2934 Merge.rc:4217
+#: Merge.rc:2944 Merge.rc:4227
#, c-format
msgid "Shell Integration"
msgstr "Shell Integration"
#. IDD_PROPPAGE_SHELL, IDC_STATIC
-#: Merge.rc:2937
+#: Merge.rc:2947
#, c-format
msgid "Explorer"
msgstr "Explorer"
#. IDD_PROPPAGE_SHELL, IDC_EXPLORER_CONTEXT
-#: Merge.rc:2938
+#: Merge.rc:2948
#, c-format
msgid "&Add to context menu"
msgstr "&Tilføj til kontekstmenu"
#. IDD_PROPPAGE_SHELL, IDC_EXPLORER_ADVANCED
-#: Merge.rc:2939
+#: Merge.rc:2949
#, c-format
msgid "E&nable advanced menu"
msgstr "&Aktiver den avancerede menu"
#. IDD_PROPPAGE_SHELL, IDC_EXPLORER_COMPARE_AS
-#: Merge.rc:2940
+#: Merge.rc:2950
msgid "Enable &Compare As menu"
msgstr ""
#. IDD_PROPPAGE_SHELL, IDC_REGISTER_SHELLEXTENSION
-#: Merge.rc:2941
+#: Merge.rc:2951
#, c-format
msgid "&Register Shell Extension"
msgstr ""
#. IDD_PROPPAGE_SHELL, IDC_UNREGISTER_SHELLEXTENSION
-#: Merge.rc:2942
+#: Merge.rc:2952
#, c-format
msgid "&Unregister Shell Extension"
msgstr ""
#. IDD_PROPPAGE_SHELL, IDC_REGISTER_SHELLEXTENSION_PERUSER
-#: Merge.rc:2943
+#: Merge.rc:2953
msgid "Register Shell Extension for Current User &Only"
msgstr ""
#. IDD_PROPPAGE_SHELL, IDC_UNREGISTER_SHELLEXTENSION_PERUSER
-#: Merge.rc:2944
+#: Merge.rc:2954
msgid "Unregister Shell Extension for Current User On&ly"
msgstr ""
#. IDD_PROPPAGE_SHELL, IDC_REGISTER_WINMERGECONTEXTMENU
-#: Merge.rc:2945
+#: Merge.rc:2955
msgid "Register Shell Extension for &Windows 11"
msgstr ""
#. IDD_PROPPAGE_SHELL, IDC_UNREGISTER_WINMERGECONTEXTMENU
-#: Merge.rc:2946
+#: Merge.rc:2956
msgid "Unregister Shell Extension for W&indows 11"
msgstr ""
#. IDD_PROPPAGE_SHELL, IDC_STATIC
-#: Merge.rc:2947
+#: Merge.rc:2957
msgid "Jump List"
msgstr ""
#. IDD_PROPPAGE_SHELL, IDC_CLEAR_ALL_RECENT_ITEMS
-#: Merge.rc:2949
+#: Merge.rc:2959
msgid "Clear all recent items"
msgstr ""
#. IDS_OPTIONSPG_FOLDERCOMPARE
-#: Merge.rc:2954 Merge.rc:4225
+#: Merge.rc:2964 Merge.rc:4235
msgctxt "Options dialog|Categories"
msgid "Folder"
msgstr "Mappe"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC
-#: Merge.rc:2957
+#: Merge.rc:2967
msgid "&Compare method:"
msgstr "&Sammenligningsmetode:"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_COMPARE_STOPFIRST
-#: Merge.rc:2959
+#: Merge.rc:2969
#, c-format
msgid "S&top after first difference"
msgstr "S&top efter første forskel"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_IGNORE_SMALLTIMEDIFF
-#: Merge.rc:2961
+#: Merge.rc:2971
#, c-format
msgid "Ign&ore time differences less than 3 seconds"
msgstr "Ign&orer tidsforskelle under 3 sekunder"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC
-#: Merge.rc:2964
+#: Merge.rc:2974
msgid "Expand subfolders &after comparison:"
msgstr ""
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_COMPARE_WALKSUBDIRS
-#: Merge.rc:2966
+#: Merge.rc:2976
#, c-format
msgid "Include &unique subfolders contents"
msgstr ""
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_IGNORE_REPARSEPOINTS
-#: Merge.rc:2968
+#: Merge.rc:2978
#, c-format
msgid "Ignore &reparse points"
msgstr ""
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC
-#: Merge.rc:2969
+#: Merge.rc:2979
msgid "Switch to &quick compare when size exceeds (MB):"
msgstr ""
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC
-#: Merge.rc:2971
+#: Merge.rc:2981
msgid "Switch to &binary compare when size exceeds (MB):"
msgstr ""
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC
-#: Merge.rc:2975
+#: Merge.rc:2985
msgid "Additional comparison condi&tions:"
msgstr ""
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC
-#: Merge.rc:2978
+#: Merge.rc:2988
msgid "&Rename/move detection:"
msgstr ""
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC
-#: Merge.rc:2980
+#: Merge.rc:2990
msgid "Rename/move detection &keys:"
msgstr ""
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC
-#: Merge.rc:2983
+#: Merge.rc:2993
msgid "M&erge renames and moves:"
msgstr ""
#. IDD_PROPPAGE_COMPARE_TABLE, IDC_STATIC
-#: Merge.rc:2994 Merge.rc:2999 Merge.rc:3002
+#: Merge.rc:3004 Merge.rc:3009 Merge.rc:3012
msgid "File patterns:"
msgstr ""
#. IDD_PROPPAGE_COMPARE_TABLE, IDC_STATIC
-#: Merge.rc:3001
+#: Merge.rc:3011
msgid "Custom Delimiter-Separated Values"
msgstr ""
#. IDS_OPTIONSPG_BINARYCOMPARE
-#: Merge.rc:3015 Merge.rc:4227
+#: Merge.rc:3025 Merge.rc:4237
msgctxt "Options dialog|Categories"
msgid "Binary"
msgstr "Binær"
#. IDD_PROPPAGE_COMPARE_BINARY, IDC_STATIC
-#: Merge.rc:3018
+#: Merge.rc:3028
#, c-format
msgid "Binary file &patterns:"
msgstr ""
#. IDD_PROPPAGE_COMPARE_BINARY, IDC_STATIC
-#: Merge.rc:3020
+#: Merge.rc:3030
#, c-format
msgid "Frhed settings"
msgstr ""
#. IDD_PROPPAGE_COMPARE_BINARY, IDC_COMPAREBINARY_VIEWSETTINGS
-#: Merge.rc:3021
+#: Merge.rc:3031
#, c-format
msgid "View &Settings..."
msgstr ""
#. IDD_PROPPAGE_COMPARE_BINARY, IDC_COMPAREBINARY_BINARYMODE
-#: Merge.rc:3022
+#: Merge.rc:3032
#, c-format
msgid "&Binary Mode..."
msgstr ""
#. IDD_PROPPAGE_COMPARE_BINARY, IDC_COMPAREBINARY_CHARACTERSET
-#: Merge.rc:3023
+#: Merge.rc:3033
#, c-format
msgid "&Character Set..."
msgstr ""
#. IDS_PRPCAT_IMAGE
-#: Merge.rc:3029 Merge.rc:4226 Merge.rc:4665
+#: Merge.rc:3039 Merge.rc:4236 Merge.rc:4675
msgid "Image"
msgstr ""
#. IDD_PROPPAGE_COMPARE_IMAGE, IDC_STATIC
-#: Merge.rc:3032
+#: Merge.rc:3042
#, c-format
msgid "Image file &patterns:"
msgstr ""
#. IDD_PROPPAGE_COMPARE_IMAGE, IDC_ENABLE_IMGCMP_IN_DIRCMP
-#: Merge.rc:3034
+#: Merge.rc:3044
msgid "&Enable image compare in folder compare"
msgstr ""
#. IDD_PROPPAGE_COMPARE_IMAGE, IDC_STATIC
-#: Merge.rc:3036
+#: Merge.rc:3046
msgid "OCR result:"
msgstr ""
#. IDS_OPTIONSPG_WEBPAGECOMPARE
-#: Merge.rc:3043 Merge.rc:4229
+#: Merge.rc:3053 Merge.rc:4239
msgid "Webpage"
msgstr ""
#. IDD_PROPPAGE_COMPARE_WEBPAGE, IDC_STATIC
-#: Merge.rc:3046
+#: Merge.rc:3056
msgid "URL pattern to &include (Regular expression):"
msgstr ""
#. IDD_PROPPAGE_COMPARE_WEBPAGE, IDC_STATIC
-#: Merge.rc:3048
+#: Merge.rc:3058
msgid "URL pattern to &exclude (Regular expression):"
msgstr ""
#. IDD_PROPPAGE_COMPARE_WEBPAGE, IDC_STATIC
-#: Merge.rc:3050
+#: Merge.rc:3060
msgid "&User data folder location:"
msgstr ""
#. IDD_PROPPAGE_COMPARE_WEBPAGE, IDC_COMPAREWEBPAGE_USERDATAFOLDER_PERPANE
-#: Merge.rc:3052
+#: Merge.rc:3062
msgid "&Separate user data folders for each pane"
msgstr ""
#. IDD_ENCODINGERROR, IDC_HEXVIEW
-#: Merge.rc:3065
+#: Merge.rc:3075
#, c-format
msgid "&Hex View"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3110
+#: Merge.rc:3120
msgid "Edit Plugin"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN, IDC_STATIC
-#: Merge.rc:3123
+#: Merge.rc:3133
msgid "&Category:"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_MENUCAPTION_STATIC
-#: Merge.rc:3125
+#: Merge.rc:3135
msgid "&Menu caption:"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_WINDOWTYPE_STATIC
-#: Merge.rc:3127
+#: Merge.rc:3137
msgid "&Window type:"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_UNPACKEDFILEEXTENSION_STATIC
-#: Merge.rc:3132
+#: Merge.rc:3142
msgid "&Unpacked file extension:"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_ARGUMENTSREQUIRED
-#: Merge.rc:3136
+#: Merge.rc:3146
msgid "&Require arguments"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_GENERATESCRIPT
-#: Merge.rc:3137
+#: Merge.rc:3147
msgid "&Generate editor script"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_COMMAND_LINE_STATIC
-#: Merge.rc:3140
+#: Merge.rc:3150
msgid "Command &line:"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_SCRIPT_FILEEXTENSION_STATIC
-#: Merge.rc:3143
+#: Merge.rc:3153
msgid "&Script file extension:"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_SCRIPT_BODY_STATIC
-#: Merge.rc:3145
+#: Merge.rc:3155
msgid "Script &body:"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3154
+#: Merge.rc:3164
msgid "Font"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3157
+#: Merge.rc:3167
msgid "&Font:"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3163
+#: Merge.rc:3173
msgid "Font st&yle:"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3169
+#: Merge.rc:3179
msgid "&Size:"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3175
+#: Merge.rc:3185
msgid "Effects"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3176
+#: Merge.rc:3186
msgid "Stri&keout"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3177
+#: Merge.rc:3187
msgid "&Underline"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3179
+#: Merge.rc:3189
msgid "&Color:"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3184
+#: Merge.rc:3194
msgid "Sample"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3185
+#: Merge.rc:3195
msgid "AaBbYyZz"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3189
+#: Merge.rc:3199
msgid "Sc&ript:"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN, IDC_MANAGE_LINK
-#: Merge.rc:3194
+#: Merge.rc:3204
msgid "Show more fonts"
msgstr ""
#. ID_INDICATOR_EXT
-#: Merge.rc:4118
+#: Merge.rc:4128
#, c-format
msgid "EXT"
msgstr "EXT"
#. ID_INDICATOR_CAPS
-#: Merge.rc:4119
+#: Merge.rc:4129
#, c-format
msgid "CAP"
msgstr "CAP"
#. ID_INDICATOR_NUM
-#: Merge.rc:4120
+#: Merge.rc:4130
#, c-format
msgid "NUM"
msgstr "NUM"
#. ID_INDICATOR_SCRL
-#: Merge.rc:4121
+#: Merge.rc:4131
#, c-format
msgid "SCRL"
msgstr "SCRL"
#. ID_INDICATOR_OVR
-#: Merge.rc:4122
+#: Merge.rc:4132
#, c-format
msgid "OVR"
msgstr "OVR"
#. ID_INDICATOR_REC
-#: Merge.rc:4123
+#: Merge.rc:4133
#, c-format
msgid "REC"
msgstr "REC"
#. ID_FILE_NEW
-#: Merge.rc:4129
+#: Merge.rc:4139
#, c-format
msgid "\nNew Documents (Ctrl+N)"
msgstr ""
#. ID_FILE_OPEN
-#: Merge.rc:4130
+#: Merge.rc:4140
#, c-format
msgid "\nOpen (Ctrl+O)"
msgstr ""
#. ID_FILE_SAVE
-#: Merge.rc:4131
+#: Merge.rc:4141
#, c-format
msgid "\nSave (Ctrl+S)"
msgstr ""
#. IDS_UNK_ERROR_READING_PROJECT
-#: Merge.rc:4137
+#: Merge.rc:4147
msgid "Unknown error opening project file."
msgstr "Ukendt fejl ved forsøg på åbning af projekt fil."
#. IDS_UNK_ERROR_SAVING_PROJECT
-#: Merge.rc:4138
+#: Merge.rc:4148
msgid "Unknown error saving project file."
msgstr "Ukendt fejl ved forsøg på at gemme projekt fil."
#. IDS_PROJFILE_LOAD_SUCCESS
-#: Merge.rc:4143
+#: Merge.rc:4153
#, c-format
msgid "Project file loaded."
msgstr "Projektfil indlæst succesfuldt"
#. IDS_PROJFILE_SAVE_SUCCESS
-#: Merge.rc:4144
+#: Merge.rc:4154
#, c-format
msgid "Project file saved."
msgstr "Projekt gemt succesfuldt."
#. ID_EDIT_UNDO
-#: Merge.rc:4150
+#: Merge.rc:4160
#, c-format
msgid "\nUndo (Ctrl+Z)"
msgstr ""
#. ID_EDIT_REDO
-#: Merge.rc:4151
+#: Merge.rc:4161
#, c-format
msgid "\nRedo (Ctrl+Y)"
msgstr ""
#. IDR_MERGEDOCTYPE
-#: Merge.rc:4158
+#: Merge.rc:4168
#, c-format
msgid ""
"\n"
@@ -5404,7 +5415,7 @@ msgstr ""
"WinMerge FilSammenligning"
#. IDR_DIRDOCTYPE
-#: Merge.rc:4159
+#: Merge.rc:4169
#, c-format
msgid ""
"\n"
@@ -5424,7 +5435,7 @@ msgstr ""
"WinMerge Mappe sammenligning"
#. IDS_SPLASH_GPLTEXT
-#: Merge.rc:4165
+#: Merge.rc:4175
#, c-format
msgid "WinMerge comes with ABSOLUTELY NO WARRANTY. It is free software and can be redistributed under the conditions of the GNU General Public License - see the Help menu for details."
msgstr ""
@@ -5433,177 +5444,177 @@ msgstr ""
"General Public License. Se Hjælp for yderligere oplysninger."
#. IDS_MESSAGEBOX_ABORT
-#: Merge.rc:4173
+#: Merge.rc:4183
#, c-format
msgid "&Abort"
msgstr "&Fortryd"
#. IDS_MESSAGEBOX_RETRY
-#: Merge.rc:4174
+#: Merge.rc:4184
#, c-format
msgid "&Retry"
msgstr "&Prøv igen"
#. IDS_MESSAGEBOX_IGNORE
-#: Merge.rc:4175
+#: Merge.rc:4185
#, c-format
msgid "&Ignore"
msgstr "&Ignorer"
#. IDS_MESSAGEBOX_IGNOREALL
-#: Merge.rc:4176
+#: Merge.rc:4186
#, c-format
msgid "Ignore &all"
msgstr "I&gnorer alle"
#. IDS_MESSAGEBOX_YES
-#: Merge.rc:4177
+#: Merge.rc:4187
#, c-format
msgid "&Yes"
msgstr "&Ja"
#. IDS_MESSAGEBOX_YES_TO_ALL
-#: Merge.rc:4183
+#: Merge.rc:4193
#, c-format
msgid "Yes to &all"
msgstr "Ja til &alle"
#. IDS_MESSAGEBOX_NO
-#: Merge.rc:4184
+#: Merge.rc:4194
#, c-format
msgid "&No"
msgstr "&Nej"
#. IDS_MESSAGEBOX_NO_TO_ALL
-#: Merge.rc:4185
+#: Merge.rc:4195
#, c-format
msgid "No to a&ll"
msgstr "Nej til a&lle"
#. IDS_MESSAGEBOX_CONTINUE
-#: Merge.rc:4186
+#: Merge.rc:4196
#, c-format
msgid "&Continue"
msgstr "&Fortsæt"
#. IDS_MESSAGEBOX_SKIP
-#: Merge.rc:4187
+#: Merge.rc:4197
#, c-format
msgid "&Skip"
msgstr "&Spring over"
#. IDS_MESSAGEBOX_SKIPALL
-#: Merge.rc:4188
+#: Merge.rc:4198
#, c-format
msgid "Skip &all"
msgstr "Spring over all&e"
#. IDS_MESSAGEBOX_DONT_DISPLAY_AGAIN
-#: Merge.rc:4190
+#: Merge.rc:4200
#, c-format
msgid "Don't display this &message again."
msgstr "Vis ikke denne &besked igen."
-#: Merge.rc:4193
+#: Merge.rc:4203
msgid "To make this message box visible, press Reset on the Message Boxes page in Options."
msgstr ""
#. IDS_OPTIONSPG_EDITOR_COMPAREMERGE
-#: Merge.rc:4203
+#: Merge.rc:4213
msgid "Compare/Merge"
msgstr ""
#. IDS_OPTIONSPG_SYNTAXCOLORS
-#: Merge.rc:4204 Merge.rc:4208
+#: Merge.rc:4214 Merge.rc:4218
#, c-format
msgid "Syntax"
msgstr "Syntaks"
#. IDS_OPTIONSPG_COLOR_SCHEMES
-#: Merge.rc:4206
+#: Merge.rc:4216
msgid "Color Schemes"
msgstr ""
#. IDS_OPTIONSPG_DIRCOLORS
-#: Merge.rc:4210
+#: Merge.rc:4220
msgid "Folder Compare"
msgstr ""
#. IDS_OPTIONSPG_PROJECT
-#: Merge.rc:4215
+#: Merge.rc:4225
msgid "Project"
msgstr ""
#. IDS_COLHDR_NSDIFFS
-#: Merge.rc:4218 Merge.rc:4640
+#: Merge.rc:4228 Merge.rc:4650
#, c-format
msgid "Differences"
msgstr "Forskelle"
#. IDS_OPTIONSPG_MESSAGEBOXES
-#: Merge.rc:4220
+#: Merge.rc:4230
msgid "Message Boxes"
msgstr ""
#. IDS_TO
-#: Merge.rc:4235
+#: Merge.rc:4245
#, c-format
msgid "To:"
msgstr "Til:"
#. IDS_FROM_LEFT
-#: Merge.rc:4236
+#: Merge.rc:4246
#, c-format
msgid "From left:"
msgstr "Fra Venstre:"
#. IDS_TO_LEFT
-#: Merge.rc:4237
+#: Merge.rc:4247
#, c-format
msgid "To left:"
msgstr "Til Venstre:"
#. IDS_FROM_RIGHT
-#: Merge.rc:4238
+#: Merge.rc:4248
#, c-format
msgid "From right:"
msgstr "Fra Højre:"
#. IDS_TO_RIGHT
-#: Merge.rc:4239
+#: Merge.rc:4249
#, c-format
msgid "To right:"
msgstr "Til Højre:"
#. IDS_FROM_MIDDLE
-#: Merge.rc:4240
+#: Merge.rc:4250
msgid "From middle:"
msgstr ""
#. IDS_TO_MIDDLE
-#: Merge.rc:4241
+#: Merge.rc:4251
msgid "To middle:"
msgstr ""
#. IDS_VERSION_FMT
-#: Merge.rc:4247
+#: Merge.rc:4257
#, c-format
msgid "Version %1"
msgstr "Version %1"
#. IDS_OPTIONS_TITLE
-#: Merge.rc:4253
+#: Merge.rc:4263
#, c-format
msgid "Options (%1)"
msgstr "Indstillinger (%1)"
#. IDS_MESSAGE_BOX_ARE_RESET
-#: Merge.rc:4254
+#: Merge.rc:4264
#, c-format
msgid "All message boxes are now displayed again."
msgstr "Alle beskeder vises nu igen."
-#: Merge.rc:4256
+#: Merge.rc:4266
#, c-format
msgid "Tab size value is out of range. Please use 1 - %1."
msgstr ""
@@ -5612,42 +5623,42 @@ msgstr ""
"Brug værdierne 1 - %1."
#. IDS_PROJECT_OPEN
-#: Merge.rc:4262 Merge.rc:4318
+#: Merge.rc:4272 Merge.rc:4328
#, c-format
msgid "Open"
msgstr "Åben"
#. IDS_PROGRAMFILES
-#: Merge.rc:4263
+#: Merge.rc:4273
#, c-format
msgid "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||"
msgstr "Programmer|*.exe;*.bat;*.cmd|Alle filer (*.*)|*.*||"
#. IDS_ALLFILES
-#: Merge.rc:4264
+#: Merge.rc:4274
#, c-format
msgid "All Files (*.*)|*.*||"
msgstr "Alle filer (*.*)|*.*||"
#. IDS_PROJECTFILES
-#: Merge.rc:4265
+#: Merge.rc:4275
#, c-format
msgid "WinMerge Project Files (*.WinMerge)|*.WinMerge||"
msgstr "WinMerge projektfiler (*.WinMerge)|*.WinMerge||"
#. IDS_INIFILES
-#: Merge.rc:4267
+#: Merge.rc:4277
#, c-format
msgid "Options files (*.ini)|*.ini|All Files (*.*)|*.*||"
msgstr "Valg filer (*.ini)|*.ini|Alle filer (*.*)|*.*||"
#. IDS_REPLACELIST_FILES
-#: Merge.rc:4268
+#: Merge.rc:4278
msgid "Tab-Separated Values (*.tsv;*.txt)|*.tsv;*.txt|All Files (*.*)|*.*||"
msgstr ""
#. IDS_TEXT_REPORT_FILES
-#: Merge.rc:4274
+#: Merge.rc:4284
#, c-format
msgid ""
"Text Files (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|All Files (*.*)|"
@@ -5657,136 +5668,136 @@ msgstr ""
"*)|*.*||"
#. IDS_HTML_REPORT_FILES
-#: Merge.rc:4275
+#: Merge.rc:4285
#, c-format
msgid "HTML Files (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||"
msgstr "HTML Filer (*.htm,*.html)|*.htm;*.html|Alle filer (*.*)|*.*||"
#. IDS_XML_REPORT_FILES
-#: Merge.rc:4276
+#: Merge.rc:4286
#, c-format
msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||"
msgstr "XML Filer (*.xml)|*.xml|Alle filer (*.*)|*.*||"
#. IDS_EXPANDSUBDIRS_DONOTEXPAND
-#: Merge.rc:4294
+#: Merge.rc:4304
msgid "Do not expand"
msgstr ""
#. IDS_EXPANDSUBDIRS_ALL
-#: Merge.rc:4295
+#: Merge.rc:4305
msgid "Expand all subfolders"
msgstr ""
#. IDS_EXPANDSUBDIRS_DIFFERENT
-#: Merge.rc:4296
+#: Merge.rc:4306
msgid "Expand different subfolders"
msgstr ""
#. IDS_EXPANDSUBDIRS_IDENTICAL
-#: Merge.rc:4297
+#: Merge.rc:4307
msgid "Expand identical subfolders"
msgstr ""
#. IDS_SYNTAXTABLE_FILETYPE
-#: Merge.rc:4303
+#: Merge.rc:4313
msgid "File Type"
msgstr ""
#. IDS_COLHDR_EXTENSION
-#: Merge.rc:4304 Merge.rc:4597
+#: Merge.rc:4314 Merge.rc:4607
#, c-format
msgid "Extension"
msgstr "Udvidelse"
#. IDS_PRPCAT_MESSAGE
-#: Merge.rc:4310 Merge.rc:4669
+#: Merge.rc:4320 Merge.rc:4679
msgid "Message"
msgstr ""
#. IDS_MESSAGEBOX_ANSWER
-#: Merge.rc:4311
+#: Merge.rc:4321
msgid "Answer"
msgstr ""
#. IDS_PROJECT_ITEM
-#: Merge.rc:4317
+#: Merge.rc:4327
msgid "Item"
msgstr ""
#. IDS_PROJECT_LOAD
-#: Merge.rc:4319
+#: Merge.rc:4329
msgid "Load"
msgstr ""
#. IDS_PROJECT_SAVE
-#: Merge.rc:4320
+#: Merge.rc:4330
msgid "Save"
msgstr ""
#. IDS_PROJECT_ITEM_INCLUDE_SUBFOLDERS
-#: Merge.rc:4322
+#: Merge.rc:4332
msgid "Include Subfolders"
msgstr ""
#. IDS_PROJECT_ITEM_COMPARE_OPTIONS
-#: Merge.rc:4324
+#: Merge.rc:4334
msgid "Compare Options"
msgstr ""
#. IDS_PROJECT_ITEM_HIDDEN_ITEMS
-#: Merge.rc:4325
+#: Merge.rc:4335
msgid "Hidden Items"
msgstr ""
#. IDS_PLUGINSLIST_NAME
-#: Merge.rc:4331 Merge.rc:4956
+#: Merge.rc:4341 Merge.rc:4966
#, c-format
msgid "Name"
msgstr "Navn"
#. IDS_FILTERFILE_PATHTITLE
-#: Merge.rc:4332
+#: Merge.rc:4342
#, c-format
msgid "Location"
msgstr "Sti"
#. IDS_FILTER_TITLE
-#: Merge.rc:4333
+#: Merge.rc:4343
#, c-format
msgid "Filters"
msgstr "Filtre"
#. IDS_FILTER_PREFIX
-#: Merge.rc:4334
+#: Merge.rc:4344
#, c-format
msgid "[F] "
msgstr "[F]"
#. IDS_PLUGINSLIST_DESC
-#: Merge.rc:4335 Merge.rc:4958
+#: Merge.rc:4345 Merge.rc:4968
#, c-format
msgid "Description"
msgstr "Beskrivelse"
#. IDS_FILEFILTER_SAVENEW
-#: Merge.rc:4336
+#: Merge.rc:4346
#, c-format
msgid "Select Filename for New Filter"
msgstr "Vælg filnavn til nyt filter"
#. IDS_FILEFILTER_FILEMASK
-#: Merge.rc:4337
+#: Merge.rc:4347
#, c-format
msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||"
msgstr "Fil Filtre (*.flt)|*.flt|Alle Filer (*.*)|*.*||"
-#: Merge.rc:4339
+#: Merge.rc:4349
#, c-format
msgid "Cannot find filter template!\n\nCopy %1 to WinMerge/Filters Folder:\n%2."
msgstr "Kan ikke finde filter skabelon filen!\n\nKopier filen %1 til WinMerge/Filtermappe:\n%2."
-#: Merge.rc:4341
+#: Merge.rc:4351
#, c-format
msgid ""
"Cannot copy filter template:\n"
@@ -5799,7 +5810,7 @@ msgstr ""
"\n"
"Undersøg om mappen eksisterer og kan ændres."
-#: Merge.rc:4343
+#: Merge.rc:4353
#, c-format
msgid ""
"User's filter folder is not defined!\n"
@@ -5810,7 +5821,7 @@ msgstr ""
"\n"
"Vælg filter mappe i valg/System."
-#: Merge.rc:4345
+#: Merge.rc:4355
#, c-format
msgid ""
"Failed to delete filter:\n"
@@ -5824,12 +5835,12 @@ msgstr ""
"Måske er filen skrivebeskyttet?"
#. IDS_FILEFILTER_INSTALL
-#: Merge.rc:4346
+#: Merge.rc:4356
#, c-format
msgid "Locate Filter File to Install"
msgstr "Find filter fil til installering"
-#: Merge.rc:4348
+#: Merge.rc:4358
#, c-format
msgid ""
"Installing filter file failed.\n"
@@ -5841,19 +5852,19 @@ msgstr ""
"Kunne ikke kopiere filter fil til filter mappe."
#. IDS_FILEFILTER_OVERWRITE
-#: Merge.rc:4349
+#: Merge.rc:4359
#, c-format
msgid "Filter file exists. Overwrite?"
msgstr "Filter filen eksisterer allerede. Vil du overskrive den?"
#. IDS_FILTERLINE_REGEXP
-#: Merge.rc:4355
+#: Merge.rc:4365
#, c-format
msgid "Regular expression"
msgstr "Regulært udtryk"
#. IDS_FILTERCHANGED
-#: Merge.rc:4361
+#: Merge.rc:4371
msgid "Filters updated. Refresh all open folder compares?\n\nSelect 'No' to refresh later."
msgstr ""
"Filtre blev opdateret. Vil du opdatere alle åbne sammenligninger?\n"
@@ -5861,240 +5872,240 @@ msgstr ""
"Hvis du ikke vil opdatere sammenligningerne så vælg 'Nej' og opdater senere."
#. IDS_DIRECTORY_WINDOW_TITLE
-#: Merge.rc:4367
+#: Merge.rc:4377
#, c-format
msgid "Folder Comparison Results"
msgstr "Resultat af sammenligning af mapper"
#. IDS_FILE_COMPARISON_TITLE
-#: Merge.rc:4368
+#: Merge.rc:4378
#, c-format
msgid "File Comparison"
msgstr "Filsammenligning"
#. IDS_EMPTY_LEFT_FILE
-#: Merge.rc:4369
+#: Merge.rc:4379
#, c-format
msgid "Untitled Left"
msgstr "Ikke navngivet venstre"
#. IDS_EMPTY_MIDDLE_FILE
-#: Merge.rc:4370
+#: Merge.rc:4380
#, c-format
msgid "Untitled Middle"
msgstr ""
#. IDS_EMPTY_RIGHT_FILE
-#: Merge.rc:4371
+#: Merge.rc:4381
#, c-format
msgid "Untitled Right"
msgstr "Ikke navngivet højre"
#. IDS_CONFLICT_BASE_FILE
-#: Merge.rc:4372
+#: Merge.rc:4382
msgid "Base File"
msgstr ""
#. IDS_CONFLICT_THEIRS_FILE
-#: Merge.rc:4373
+#: Merge.rc:4383
#, c-format
msgid "Theirs File"
msgstr "Deres fil"
#. IDS_CONFLICT_MINE_FILE
-#: Merge.rc:4374
+#: Merge.rc:4384
#, c-format
msgid "Mine File"
msgstr "Min fil"
#. IDS_SELFCOMPARE_ORIGINAL_FILE
-#: Merge.rc:4375
+#: Merge.rc:4385
msgid "Original File"
msgstr ""
#. IDS_LINE_STATUS_INFO_EOL
-#: Merge.rc:4381
+#: Merge.rc:4391
#, c-format
msgid "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s"
msgstr ""
#. IDS_EMPTY_LINE_STATUS_INFO
-#: Merge.rc:4382
+#: Merge.rc:4392
#, c-format
msgid "Line: %s"
msgstr "Linje: %s"
#. IDS_LINE_STATUS_INFO
-#: Merge.rc:4383
+#: Merge.rc:4393
#, c-format
msgid "Ln: %s Col: %d/%d Ch: %d/%d"
msgstr ""
#. IDS_LINE_STATUS_INFO_SEL
-#: Merge.rc:4384
+#: Merge.rc:4394
#, c-format
msgid " Sel: %d | %d"
msgstr ""
#. IDS_MERGEMODE_MERGING
-#: Merge.rc:4385
+#: Merge.rc:4395
#, c-format
msgid "Merge"
msgstr "Flet"
#. IDS_DIFF_NUMBER_STATUS_FMT
-#: Merge.rc:4386
+#: Merge.rc:4396
#, c-format
msgid "Difference %1 of %2"
msgstr "Forskel %1 af %2"
#. IDS_NO_DIFF_SEL_FMT
-#: Merge.rc:4387
+#: Merge.rc:4397
#, c-format
msgid "%1 Differences Found"
msgstr "%1 forskelle fundet"
#. IDS_1_DIFF_FOUND
-#: Merge.rc:4388
+#: Merge.rc:4398
#, c-format
msgid "1 Difference Found"
msgstr "1 forskel fundet"
#. IDS_NO_ERR_SEL_FMT
-#: Merge.rc:4389
+#: Merge.rc:4399
#, c-format
msgid "%1 Errors Found"
msgstr ""
#. IDS_1_ERR_FOUND
-#: Merge.rc:4390
+#: Merge.rc:4400
msgid "1 Error Found"
msgstr ""
#. IDS_STATUSBAR_READONLY, Abbreviation from "Read Only"
-#: Merge.rc:4391
+#: Merge.rc:4401
#, c-format
msgid "RO"
msgstr "RO"
#. IDS_DIRVIEW_STATUS_FMT_FOCUS
-#: Merge.rc:4397
+#: Merge.rc:4407
#, c-format
msgid "Item %1 of %2"
msgstr "Emne %1 of %2"
#. IDS_DIRVIEW_STATUS_FMT_NOFOCUS
-#: Merge.rc:4398
+#: Merge.rc:4408
#, c-format
msgid "Items: %1"
msgstr "Emner: %1"
#. IDS_DIRVIEW_STATUS_COMPARING
-#: Merge.rc:4399
+#: Merge.rc:4409
#, c-format
msgid "Comparing items..."
msgstr "Sammenligner emner..."
#. IDS_ITEMS_PER_SEC
-#: Merge.rc:4400
+#: Merge.rc:4410
#, c-format
msgid "%.1f[items/sec]"
msgstr ""
#. IDS_ERROR_INCOMPARABLE
-#: Merge.rc:4406
+#: Merge.rc:4416
msgid "Select two existing folders/files to compare."
msgstr "Vælg to eksisterende mapper eller filer at sammenligne."
#. IDS_DIRSEL_TAG
-#: Merge.rc:4407
+#: Merge.rc:4417
#, c-format
msgid "Folder Selection"
msgstr "Valgt mappe"
#. IDS_OPEN_FILESDIRS
-#: Merge.rc:4408
+#: Merge.rc:4418
#, c-format
msgid "Select two (or three) folders/files to compare."
msgstr ""
#. IDS_OPEN_LEFTINVALID
-#: Merge.rc:4409
+#: Merge.rc:4419
#, c-format
msgid "Left (1st) path is invalid!"
msgstr ""
#. IDS_OPEN_MIDDLEINVALID
-#: Merge.rc:4410
+#: Merge.rc:4420
#, c-format
msgid "Middle (2nd) path is invalid!"
msgstr ""
#. IDS_OPEN_RIGHTINVALID2
-#: Merge.rc:4411
+#: Merge.rc:4421
#, c-format
msgid "Right (2nd) path is invalid!"
msgstr ""
#. IDS_OPEN_RIGHTINVALID3
-#: Merge.rc:4412
+#: Merge.rc:4422
#, c-format
msgid "Right (3rd) path is invalid!"
msgstr ""
#. IDS_OPEN_BOTHINVALID
-#: Merge.rc:4413
+#: Merge.rc:4423
#, c-format
msgid "Both paths are invalid!"
msgstr "Begge stier er ugyldige!"
-#: Merge.rc:4415
+#: Merge.rc:4425
#, c-format
msgid "Left (1st) and Middle (2nd) paths are invalid!"
msgstr ""
#. IDS_OPEN_LEFTRIGHTINVALID
-#: Merge.rc:4416
+#: Merge.rc:4426
#, c-format
msgid "Left (1st) and Right (3rd) paths are invalid!"
msgstr ""
-#: Merge.rc:4418
+#: Merge.rc:4428
#, c-format
msgid "Middle (2nd) and Right (3rd) paths are invalid!"
msgstr ""
#. IDS_OPEN_ALLINVALID
-#: Merge.rc:4419
+#: Merge.rc:4429
#, c-format
msgid "All paths are invalid!"
msgstr ""
#. IDS_OPEN_UNPACKERDISABLED
-#: Merge.rc:4420
+#: Merge.rc:4430
msgid "Only enabled for file comparisons"
msgstr ""
#. IDS_OPEN_MISMATCH
-#: Merge.rc:4421
+#: Merge.rc:4431
#, c-format
msgid "Cannot compare file and folder!"
msgstr "Kan ikke sammenligne en fil og en mappe!"
#. IDS_ERROR_FILE_NOT_FOUND
-#: Merge.rc:4427
+#: Merge.rc:4437
#, c-format
msgid "File not found: %1"
msgstr "Fil ikke fundet: %1"
#. IDS_ERROR_FILE_NOT_UNPACKED
-#: Merge.rc:4428
+#: Merge.rc:4438
#, c-format
msgid "File not unpacked: %1"
msgstr "Fil ikke udpakket: %1"
#. IDS_ERROR_FILEOPEN
-#: Merge.rc:4429
+#: Merge.rc:4439
#, c-format
msgid ""
"Cannot open file\n"
@@ -6108,13 +6119,13 @@ msgstr ""
"%2"
#. IDS_ERROR_CONF_RESOLVE
-#: Merge.rc:4430
+#: Merge.rc:4440
#, c-format
msgid "Failed to parse conflict file."
msgstr "Kunne ikke fortolke konfliktfil"
#. IDS_NOT_CONFLICT_FILE
-#: Merge.rc:4431
+#: Merge.rc:4441
#, c-format
msgid "The file\n%1\nis not a conflict file."
msgstr ""
@@ -6123,24 +6134,24 @@ msgstr ""
"er ikke en konfliktfil."
#. IDS_COMPARE_LARGE_FILES
-#: Merge.rc:4432
+#: Merge.rc:4442
msgid "Comparing large files requires significant memory.\nShow only comparison results (not file contents)?"
msgstr ""
#. IDS_SAVE_AS_TITLE
-#: Merge.rc:4438
+#: Merge.rc:4448
#, c-format
msgid "Save As"
msgstr "Gem som"
#. IDS_SAVE_FMT
-#: Merge.rc:4439
+#: Merge.rc:4449
#, c-format
msgid "Save changes to %1?"
msgstr "Gem ændringer til %1?"
#. IDS_SAVEREADONLY_FMT
-#: Merge.rc:4440
+#: Merge.rc:4450
#, c-format
msgid "%1 is read-only. Override? Or 'No' to save as new filename?"
msgstr ""
@@ -6148,12 +6159,12 @@ msgstr ""
"(Nej for at gemme til et andet filnavn.)"
#. IDS_ERROR_BACKUP
-#: Merge.rc:4441
+#: Merge.rc:4451
#, c-format
msgid "Error backing up file"
msgstr "Fejl under backup af filen"
-#: Merge.rc:4443
+#: Merge.rc:4453
#, c-format
msgid ""
"Unable to backup original file:\n"
@@ -6167,7 +6178,7 @@ msgstr ""
"Fortsæt alligevel?"
#. IDS_FILESAVE_FAILED
-#: Merge.rc:4444
+#: Merge.rc:4454
#, c-format
msgid "Saving file failed.\n%1\n%2\n\t- Use different filename (OK)\n\t- Abort (Cancel)?"
msgstr ""
@@ -6178,7 +6189,7 @@ msgstr ""
"\t- bruge et andet filenavn (Tryk OK)\n"
"\t- afbryd aktuel operation (Tryk Annuller)?"
-#: Merge.rc:4446
+#: Merge.rc:4456
#, c-format
msgid "Plugin '%2' cannot pack changes to left file into '%1'.\n\nOriginal unchanged. Save unpacked version?"
msgstr ""
@@ -6189,12 +6200,12 @@ msgstr ""
"\n"
"Vil du gemme den udpakkede version under et andet filnavn?"
-#: Merge.rc:4448
+#: Merge.rc:4458
#, c-format
msgid "Plugin '%2' cannot pack changes to middle file into '%1'.\n\nOriginal unchanged. Save unpacked version?"
msgstr ""
-#: Merge.rc:4450
+#: Merge.rc:4460
#, c-format
msgid "Plugin '%2' cannot pack changes to right file into '%1'.\n\nOriginal unchanged. Save unpacked version?"
msgstr ""
@@ -6206,7 +6217,7 @@ msgstr ""
"Vil du gemme den udpakkede version under et andet filnavn?"
#. IDS_FILECHANGED_ONDISK
-#: Merge.rc:4451
+#: Merge.rc:4461
#, c-format
msgid ""
"Another application updated\n"
@@ -6222,7 +6233,7 @@ msgstr ""
"Vil du overskrive den ændrede fil?"
#. IDS_SAVEREADONLY_MULTI
-#: Merge.rc:4452
+#: Merge.rc:4462
#, c-format
msgid ""
"%1\n"
@@ -6233,7 +6244,7 @@ msgstr ""
"alligevel?"
#. IDS_FILECHANGED_RESCAN
-#: Merge.rc:4453
+#: Merge.rc:4463
#, c-format
msgid "Another application updated\n%1\nsince last scan.\n\nReload?"
msgstr ""
@@ -6244,25 +6255,25 @@ msgstr ""
"Vil du genindlæse filen?"
#. IDS_SAVE_LEFT_AS
-#: Merge.rc:4454
+#: Merge.rc:4464
#, c-format
msgid "Save Left File As"
msgstr "Gem venstre fil som"
#. IDS_SAVE_MIDDLE_AS
-#: Merge.rc:4455
+#: Merge.rc:4465
#, c-format
msgid "Save Middle File As"
msgstr ""
#. IDS_SAVE_RIGHT_AS
-#: Merge.rc:4456
+#: Merge.rc:4466
#, c-format
msgid "Save Right File As"
msgstr "Gem højre fil som"
#. IDS_FILE_DISAPPEARED
-#: Merge.rc:4461
+#: Merge.rc:4471
#, c-format
msgid ""
"File\n"
@@ -6274,7 +6285,7 @@ msgstr ""
"er forsvundet. Gem en kopi af filen for at fortsætte."
#. IDS_VIEWS_OUTOFSYNC
-#: Merge.rc:4467
+#: Merge.rc:4477
#, c-format
msgid ""
"Cannot merge unsynched documents.\n"
@@ -6286,189 +6297,189 @@ msgstr ""
"Opdater dokumenter før du fortsætter."
#. IDS_BREAK_ON_WHITESPACE
-#: Merge.rc:4472
+#: Merge.rc:4482
msgid "Break at whitespace"
msgstr "Bryd ved mellemrum"
#. IDS_BREAK_ON_PUNCTUATION
-#: Merge.rc:4473
+#: Merge.rc:4483
msgid "Break at whitespace or punctuation"
msgstr "Bryd ved mellemrum eller tegnsætning"
#. IDS_L2M
-#: Merge.rc:4479
+#: Merge.rc:4489
msgid "Copy to &Middle\tAlt+Right"
msgstr ""
#. IDS_R2M
-#: Merge.rc:4480
+#: Merge.rc:4490
msgid "Copy to &Middle\tAlt+Left"
msgstr ""
#. IDS_COPY_FROM_MIDDLE_R
-#: Merge.rc:4481
+#: Merge.rc:4491
msgid "Copy from Middle\tAlt+Shift+Right"
msgstr ""
#. IDS_COPY_FROM_MIDDLE_L
-#: Merge.rc:4482
+#: Merge.rc:4492
msgid "Copy from Middle\tAlt+Shift+Left"
msgstr ""
#. IDS_L2MNEXT
-#: Merge.rc:4483
+#: Merge.rc:4493
msgid "Copy to Middle and Advance\tCtrl+Alt+Right"
msgstr ""
#. IDS_R2MNEXT
-#: Merge.rc:4484
+#: Merge.rc:4494
msgid "Copy to Middle and Advance\tCtrl+Alt+Left"
msgstr ""
#. IDS_ALL_MIDDLE
-#: Merge.rc:4485
+#: Merge.rc:4495
msgid "Copy All to Middle"
msgstr ""
#. IDS_COPY_RIGHT_TO_LEFT
-#: Merge.rc:4491
+#: Merge.rc:4501
#, c-format
msgid "Right to Left (%1)"
msgstr "Højre til venstre (%1)"
#. IDS_COPY_RIGHT_TO_MIDDLE
-#: Merge.rc:4492
+#: Merge.rc:4502
#, c-format
msgid "Right to Middle (%1)"
msgstr ""
#. IDS_COPY_MIDDLE_TO_LEFT
-#: Merge.rc:4493
+#: Merge.rc:4503
#, c-format
msgid "Middle to Left (%1)"
msgstr ""
#. IDS_COPY_MIDDLE_TO_RIGHT
-#: Merge.rc:4494
+#: Merge.rc:4504
#, c-format
msgid "Middle to Right (%1)"
msgstr ""
#. IDS_COPY_LEFT_TO_RIGHT
-#: Merge.rc:4495
+#: Merge.rc:4505
#, c-format
msgid "Left to Right (%1)"
msgstr "Venstre til højre (%1)"
#. IDS_COPY_LEFT_TO_MIDDLE
-#: Merge.rc:4496
+#: Merge.rc:4506
#, c-format
msgid "Left to Middle (%1)"
msgstr ""
#. IDS_MOVE_LEFT_TO
-#: Merge.rc:4507 Merge.rc:4539
+#: Merge.rc:4517 Merge.rc:4549
#, c-format
msgid "Left to... (%1)"
msgstr "Venstre til... (%1)"
#. IDS_MOVE_MIDDLE_TO
-#: Merge.rc:4508 Merge.rc:4540
+#: Merge.rc:4518 Merge.rc:4550
#, c-format
msgid "Middle to... (%1)"
msgstr ""
#. IDS_MOVE_RIGHT_TO
-#: Merge.rc:4509 Merge.rc:4541
+#: Merge.rc:4519 Merge.rc:4551
#, c-format
msgid "Right to... (%1)"
msgstr "Højre til... (%1)"
#. IDS_COPY_BOTH_TO
-#: Merge.rc:4510
+#: Merge.rc:4520
#, c-format
msgid "Both to... (%1)"
msgstr ""
#. IDS_COPY_ALL_TO
-#: Merge.rc:4511
+#: Merge.rc:4521
#, c-format
msgid "All to... (%1)"
msgstr ""
#. IDS_COPY_DIFFERENCES_TO
-#: Merge.rc:4512
+#: Merge.rc:4522
#, c-format
msgid "Differences to... (%1)"
msgstr ""
#. IDS_COPY_ONLYDIFFITEMS
-#: Merge.rc:4519
+#: Merge.rc:4529
msgid "Some selected items are identical or skipped.\nCopy only items with differences?"
msgstr ""
#. IDS_DEL_LEFT_FMT
-#: Merge.rc:4525
+#: Merge.rc:4535
#, c-format
msgid "Left (%1)"
msgstr "Venstre (%1)"
#. IDS_DEL_MIDDLE_FMT
-#: Merge.rc:4526
+#: Merge.rc:4536
#, c-format
msgid "Middle (%1)"
msgstr ""
#. IDS_DEL_RIGHT_FMT
-#: Merge.rc:4527
+#: Merge.rc:4537
#, c-format
msgid "Right (%1)"
msgstr "Højre (%1)"
#. IDS_DEL_BOTH_FMT
-#: Merge.rc:4528
+#: Merge.rc:4538
#, c-format
msgid "Both (%1)"
msgstr "Begge (%1)"
#. IDS_DEL_ALL_FMT
-#: Merge.rc:4529
+#: Merge.rc:4539
#, c-format
msgid "All (%1)"
msgstr ""
#. IDS_SELECT_DEST_LEFT
-#: Merge.rc:4545
+#: Merge.rc:4555
#, c-format
msgid "Left Side - Select Destination Folder:"
msgstr "Venstre side - vælg destinationsmappen"
#. IDS_SELECT_DEST_MIDDLE
-#: Merge.rc:4546
+#: Merge.rc:4556
#, c-format
msgid "Middle Side - Select Destination Folder:"
msgstr ""
#. IDS_SELECT_DEST_RIGHT
-#: Merge.rc:4547
+#: Merge.rc:4557
#, c-format
msgid "Right Side - Select Destination Folder:"
msgstr "Højre side - vælg destinationsmappen"
#. IDS_FILES_AFFECTED_FMT
-#: Merge.rc:4548
+#: Merge.rc:4558
#, c-format
msgid "(%1 Files Affected)"
msgstr "(%1 filer påvirket)"
#. IDS_FILES_AFFECTED_FMT2
-#: Merge.rc:4549
+#: Merge.rc:4559
#, c-format
msgid "(%1 of %2 Files Affected)"
msgstr "(%1 af %2 filer påvirket)"
#. IDS_CONFIRM_DELETE_SINGLE
-#: Merge.rc:4555
+#: Merge.rc:4565
#, c-format
msgid ""
"Are you sure you want to delete\n"
@@ -6480,18 +6491,18 @@ msgstr ""
"%1 ?"
#. IDS_CONFIRM_SINGLE_COPY
-#: Merge.rc:4556
+#: Merge.rc:4566
msgid "Are you sure you want to copy?"
msgstr "Er du sikker på du vil kopiere?"
#. IDS_CONFIRM_MULTIPLE_COPY
-#: Merge.rc:4557
+#: Merge.rc:4567
#, c-format
msgid "Are you sure you want to copy %d items?"
msgstr "Er du sikker på du vil kopiere %d emner?"
#. IDS_DIRCMP_NOTSYNC
-#: Merge.rc:4558
+#: Merge.rc:4568
#, c-format
msgid ""
"Operation aborted!\n"
@@ -6511,809 +6522,809 @@ msgstr ""
"Opdater sammenligning."
#. IDS_CONFIRM_SINGLE_MOVE
-#: Merge.rc:4563
+#: Merge.rc:4573
msgid "Are you sure you want to move?"
msgstr "Er du sikker på du vil flytte?"
#. IDS_CONFIRM_MULTIPLE_MOVE
-#: Merge.rc:4564
+#: Merge.rc:4574
#, c-format
msgid "Are you sure you want to move %d items?"
msgstr "Er du sikker på du vil flytte: %d emner?"
#. IDS_CONFIRM_MOVE_CAPTION
-#: Merge.rc:4566
+#: Merge.rc:4576
#, c-format
msgid "Confirm Move"
msgstr "Bekræft flytning"
-#: Merge.rc:4568
+#: Merge.rc:4578
#, c-format
msgid "Close the folder comparison window?"
msgstr ""
-#: Merge.rc:4570
+#: Merge.rc:4580
msgid "Close the folder comparison window, which took a long time?"
msgstr ""
#. IDS_ERROR_INVALID_DIR_FILE_NAME
-#: Merge.rc:4571
+#: Merge.rc:4581
msgid "The file or folder name is invalid."
msgstr ""
#. IDS_ERROR_EXECUTE_FILE
-#: Merge.rc:4577
+#: Merge.rc:4587
#, c-format
msgid "Failed to execute external editor: %1"
msgstr "Kunne ikke eksekvere ekstern editor: %1"
#. IDS_UNKNOWN_ARCHIVE_FORMAT
-#: Merge.rc:4583
+#: Merge.rc:4593
#, c-format
msgid "Unknown archive format"
msgstr "Ukendt arkivformat"
-#: Merge.rc:4585
+#: Merge.rc:4595
msgid "Failed to extract archive.\nCompare as text file?"
msgstr ""
#. IDS_COLHDR_FILENAME
-#: Merge.rc:4591
+#: Merge.rc:4601
#, c-format
msgid "Filename"
msgstr "Filnavn"
#. IDS_COLHDR_DIR
-#: Merge.rc:4592
+#: Merge.rc:4602
msgctxt "DirView|ColumnHeader"
msgid "Folder"
msgstr "Mappe"
#. IDS_COLHDR_RESULT
-#: Merge.rc:4593
+#: Merge.rc:4603
#, c-format
msgid "Comparison Result"
msgstr "Resultat af sammenligning"
#. IDS_COLHDR_LTIMEM
-#: Merge.rc:4594
+#: Merge.rc:4604
#, c-format
msgid "Left Date"
msgstr "Venstre dato"
#. IDS_COLHDR_RTIMEM
-#: Merge.rc:4595
+#: Merge.rc:4605
#, c-format
msgid "Right Date"
msgstr "Højre dato"
#. IDS_COLHDR_MTIMEM
-#: Merge.rc:4596
+#: Merge.rc:4606
#, c-format
msgid "Middle Date"
msgstr ""
#. IDS_COLHDR_LSIZE
-#: Merge.rc:4598
+#: Merge.rc:4608
#, c-format
msgid "Left Size"
msgstr "Venstre størrelse"
#. IDS_COLHDR_RSIZE
-#: Merge.rc:4599
+#: Merge.rc:4609
#, c-format
msgid "Right Size"
msgstr "Højre størrelse"
#. IDS_COLHDR_MSIZE
-#: Merge.rc:4604
+#: Merge.rc:4614
#, c-format
msgid "Middle Size"
msgstr ""
#. IDS_COLHDR_RSIZE_SHORT
-#: Merge.rc:4605
+#: Merge.rc:4615
#, c-format
msgid "Right Size (Short)"
msgstr "Højre størrelse (kort)"
#. IDS_COLHDR_LSIZE_SHORT
-#: Merge.rc:4606
+#: Merge.rc:4616
#, c-format
msgid "Left Size (Short)"
msgstr "Venstre størrelse (kort)"
#. IDS_COLHDR_MSIZE_SHORT
-#: Merge.rc:4607
+#: Merge.rc:4617
#, c-format
msgid "Middle Size (Short)"
msgstr ""
#. IDS_COLHDR_LTIMEC
-#: Merge.rc:4613
+#: Merge.rc:4623
#, c-format
msgid "Left Creation Time"
msgstr "Venstre oprettelsesdato"
#. IDS_COLHDR_RTIMEC
-#: Merge.rc:4614
+#: Merge.rc:4624
#, c-format
msgid "Right Creation Time"
msgstr "Højre oprettelsesdato"
#. IDS_COLHDR_MTIMEC
-#: Merge.rc:4615
+#: Merge.rc:4625
#, c-format
msgid "Middle Creation Time"
msgstr ""
#. IDS_COLHDR_NEWER
-#: Merge.rc:4616
+#: Merge.rc:4626
#, c-format
msgid "Newer File"
msgstr "Nyeste fil"
#. IDS_COLHDR_LVERSION
-#: Merge.rc:4617
+#: Merge.rc:4627
#, c-format
msgid "Left File Version"
msgstr "Venstre filversion"
#. IDS_COLHDR_RVERSION
-#: Merge.rc:4618
+#: Merge.rc:4628
#, c-format
msgid "Right File Version"
msgstr "Højre filversion"
#. IDS_COLHDR_MVERSION
-#: Merge.rc:4619
+#: Merge.rc:4629
#, c-format
msgid "Middle File Version"
msgstr ""
#. IDS_COLHDR_RESULT_ABBR
-#: Merge.rc:4620
+#: Merge.rc:4630
#, c-format
msgid "Short Result"
msgstr "Kort resultat"
#. IDS_COLHDR_LATTRIBUTES
-#: Merge.rc:4621
+#: Merge.rc:4631
#, c-format
msgid "Left Attributes"
msgstr "Venstre attributter"
#. IDS_COLHDR_RATTRIBUTES
-#: Merge.rc:4622
+#: Merge.rc:4632
#, c-format
msgid "Right Attributes"
msgstr "Højre attributter"
#. IDS_COLHDR_MATTRIBUTES
-#: Merge.rc:4623
+#: Merge.rc:4633
#, c-format
msgid "Middle Attributes"
msgstr ""
#. IDS_COLHDR_LEOL_TYPE
-#: Merge.rc:4628
+#: Merge.rc:4638
#, c-format
msgid "Left EOL"
msgstr "Venstre EOL"
#. IDS_COLHDR_MEOL_TYPE
-#: Merge.rc:4629
+#: Merge.rc:4639
#, c-format
msgid "Middle EOL"
msgstr ""
#. IDS_COLHDR_REOL_TYPE
-#: Merge.rc:4630
+#: Merge.rc:4640
#, c-format
msgid "Right EOL"
msgstr "Højre EOL"
#. IDS_COLHDR_LENCODING
-#: Merge.rc:4636
+#: Merge.rc:4646
#, c-format
msgid "Left Encoding"
msgstr "Venstre encoding"
#. IDS_COLHDR_RENCODING
-#: Merge.rc:4637
+#: Merge.rc:4647
#, c-format
msgid "Right Encoding"
msgstr "Højre encoding"
#. IDS_COLHDR_MENCODING
-#: Merge.rc:4638
+#: Merge.rc:4648
#, c-format
msgid "Middle Encoding"
msgstr ""
#. IDS_COLHDR_NIDIFFS
-#: Merge.rc:4639
+#: Merge.rc:4649
msgid "Ignored Diff"
msgstr "Ignoreret forskel"
#. IDS_COLHDR_BINARY
-#: Merge.rc:4641
+#: Merge.rc:4651
msgctxt "DirView|ColumnHeader"
msgid "Binary"
msgstr "Binær"
#. IDS_PLUGINS_TYPE_UNPACKER
-#: Merge.rc:4642 Merge.rc:4959
+#: Merge.rc:4652 Merge.rc:4969
#, c-format
msgid "Unpacker"
msgstr "Udpakker"
#. IDS_PLUGIN_TYPE4
-#: Merge.rc:4643 Merge.rc:4960 Merge.rc:5267
+#: Merge.rc:4653 Merge.rc:4970 Merge.rc:5277
#, c-format
msgid "Prediffer"
msgstr "Prediffer"
#. IDS_COLHDR_LEFT
-#: Merge.rc:4644
+#: Merge.rc:4654
msgid "Left"
msgstr ""
#. IDS_COLHDR_MIDDLE
-#: Merge.rc:4645
+#: Merge.rc:4655
msgid "Middle"
msgstr ""
#. IDS_COLHDR_RIGHT
-#: Merge.rc:4646
+#: Merge.rc:4656
msgid "Right"
msgstr ""
#. IDS_COLHDR_DIFF
-#: Merge.rc:4647
+#: Merge.rc:4657
msgid "Diff"
msgstr ""
#. IDS_COLHDR_LEFT_DUPLICATE
-#: Merge.rc:4648
+#: Merge.rc:4658
msgid "Left Duplicate Count"
msgstr ""
#. IDS_COLHDR_RIGHT_DUPLICATE
-#: Merge.rc:4649
+#: Merge.rc:4659
msgid "Right Duplicate Count"
msgstr ""
#. IDS_COLHDR_MIDDLE_DUPLICATE
-#: Merge.rc:4650
+#: Merge.rc:4660
msgid "Middle Duplicate Count"
msgstr ""
#. IDS_COLHDR_MOVE
-#: Merge.rc:4651
+#: Merge.rc:4661
msgid "Move"
msgstr ""
#. IDS_PRPCAT_AUDIO
-#: Merge.rc:4658
+#: Merge.rc:4668
msgid "Audio"
msgstr ""
#. IDS_PRPCAT_CALENDAR
-#: Merge.rc:4659
+#: Merge.rc:4669
msgid "Calendar"
msgstr ""
#. IDS_PRPCAT_COMMUNICATION
-#: Merge.rc:4660
+#: Merge.rc:4670
msgid "Communication"
msgstr ""
#. IDS_PRPCAT_CONTACT
-#: Merge.rc:4661
+#: Merge.rc:4671
msgid "Contact"
msgstr ""
#. IDS_PRPCAT_DEVICES
-#: Merge.rc:4662
+#: Merge.rc:4672
msgid "Devices"
msgstr ""
#. IDS_PRPCAT_DOCUMENT
-#: Merge.rc:4663
+#: Merge.rc:4673
msgid "Document"
msgstr ""
#. IDS_PRPCAT_HOME
-#: Merge.rc:4664
+#: Merge.rc:4674
msgid "Home"
msgstr ""
#. IDS_PRPCAT_JOURNAL
-#: Merge.rc:4666
+#: Merge.rc:4676
msgid "Journal"
msgstr ""
#. IDS_PRPCAT_LINK
-#: Merge.rc:4667
+#: Merge.rc:4677
msgid "Link"
msgstr ""
#. IDS_PRPCAT_MEDIA
-#: Merge.rc:4668
+#: Merge.rc:4678
msgid "Media"
msgstr ""
#. IDS_PRPCAT_MUSIC
-#: Merge.rc:4670
+#: Merge.rc:4680
msgid "Music"
msgstr ""
#. IDS_PRPCAT_NOTE
-#: Merge.rc:4671
+#: Merge.rc:4681
msgid "Note"
msgstr ""
#. IDS_PRPCAT_PHOTO
-#: Merge.rc:4672
+#: Merge.rc:4682
msgid "Photo"
msgstr ""
#. IDS_PRPCAT_RECORDEDTV
-#: Merge.rc:4673
+#: Merge.rc:4683
msgid "RecordedTV"
msgstr ""
#. IDS_PRPCAT_SEARCH
-#: Merge.rc:4674
+#: Merge.rc:4684
msgid "Search"
msgstr ""
#. IDS_PRPCAT_SECURITY
-#: Merge.rc:4675
+#: Merge.rc:4685
msgid "Security"
msgstr ""
#. IDS_PRPCAT_SOFTWARE
-#: Merge.rc:4676
+#: Merge.rc:4686
msgid "Software"
msgstr ""
#. IDS_PRPCAT_TASK
-#: Merge.rc:4677
+#: Merge.rc:4687
msgid "Task"
msgstr ""
#. IDS_PRPCAT_VIDEO
-#: Merge.rc:4678
+#: Merge.rc:4688
msgid "Video"
msgstr ""
#. IDS_PRPCAT_HASH
-#: Merge.rc:4679
+#: Merge.rc:4689
msgid "Hash"
msgstr ""
#. IDS_CANT_COMPARE_FILES
-#: Merge.rc:4685
+#: Merge.rc:4695
#, c-format
msgid "Unable to compare files"
msgstr "Kan ikke sammenligne filer"
#. IDS_ABORTED_ITEM
-#: Merge.rc:4686
+#: Merge.rc:4696
#, c-format
msgid "Item aborted"
msgstr "Emne fortrudt"
#. IDS_FILE_SKIPPED
-#: Merge.rc:4687
+#: Merge.rc:4697
#, c-format
msgid "File skipped"
msgstr "Fil sprunget over"
#. IDS_DIR_SKIPPED
-#: Merge.rc:4688
+#: Merge.rc:4698
#, c-format
msgid "Folder skipped"
msgstr "Mappe sprunget over"
#. IDS_LEFT_ONLY_IN_FMT
-#: Merge.rc:4689
+#: Merge.rc:4699
#, c-format
msgid "Left only: %1"
msgstr "Venstre kun: %1"
#. IDS_MIDDLE_ONLY_IN_FMT
-#: Merge.rc:4690
+#: Merge.rc:4700
#, c-format
msgid "Middle only: %1"
msgstr ""
#. IDS_RIGHT_ONLY_IN_FMT
-#: Merge.rc:4691
+#: Merge.rc:4701
#, c-format
msgid "Right only: %1"
msgstr "Højre kun: %1"
#. IDS_DOES_NOT_EXIST_IN_FMT
-#: Merge.rc:4692
+#: Merge.rc:4702
#, c-format
msgid "Does not exist in %1"
msgstr ""
#. IDS_BIN_FILES_SAME
-#: Merge.rc:4693
+#: Merge.rc:4703
#, c-format
msgid "Binary files are identical"
msgstr "Binære filer er identiske"
#. IDS_BIN_FILES_DIFF
-#: Merge.rc:4699
+#: Merge.rc:4709
#, c-format
msgid "Binary files are different"
msgstr "Binære filer er forskellige"
#. IDS_FILES_ARE_DIFFERENT
-#: Merge.rc:4700
+#: Merge.rc:4710
#, c-format
msgid "Files are different"
msgstr "Filer er forskellige"
#. IDS_FOLDERS_ARE_DIFFERENT
-#: Merge.rc:4701
+#: Merge.rc:4711
#, c-format
msgid "Folders are different"
msgstr "Mapper er forskellige"
#. IDS_LEFTONLY
-#: Merge.rc:4702
+#: Merge.rc:4712
#, c-format
msgid "Left Only"
msgstr "Kun venstre"
#. IDS_RIGHTONLY
-#: Merge.rc:4703
+#: Merge.rc:4713
#, c-format
msgid "Right Only"
msgstr "Kun højre"
#. IDS_MIDDLEONLY
-#: Merge.rc:4704
+#: Merge.rc:4714
#, c-format
msgid "Middle Only"
msgstr ""
#. IDS_NOITEMLEFT
-#: Merge.rc:4705
+#: Merge.rc:4715
#, c-format
msgid "No item in left"
msgstr ""
#. IDS_NOITEMRIGHT
-#: Merge.rc:4706
+#: Merge.rc:4716
#, c-format
msgid "No item in right"
msgstr ""
#. IDS_NOITEMMIDDLE
-#: Merge.rc:4707
+#: Merge.rc:4717
#, c-format
msgid "No item in middle"
msgstr ""
#. IDS_CMPRES_ERROR
-#: Merge.rc:4709
+#: Merge.rc:4719
#, c-format
msgid "Error"
msgstr "Fejl"
#. IDS_TEXT_FILES_SAME
-#: Merge.rc:4710
+#: Merge.rc:4720
#, c-format
msgid "Text files are identical"
msgstr "Tekstfiler er identiske"
#. IDS_LEFTONLY_DIFF
-#: Merge.rc:4711
+#: Merge.rc:4721
msgid " (Middle and right are identical)"
msgstr ""
#. IDS_MIDDLEONLY_DIFF
-#: Merge.rc:4712
+#: Merge.rc:4722
msgid " (Left and right are identical)"
msgstr ""
#. IDS_RIGHTONLY_DIFF
-#: Merge.rc:4713
+#: Merge.rc:4723
msgid " (Left and middle are identical)"
msgstr ""
#. IDS_PATH_MISMATCH
-#: Merge.rc:4714
+#: Merge.rc:4724
msgid " (paths differ)"
msgstr ""
#. IDS_TEXT_FILES_DIFF
-#: Merge.rc:4715
+#: Merge.rc:4725
#, c-format
msgid "Text files are different"
msgstr "Tekstfiler er forskellige"
#. IDS_IMAGE_FILES_SAME
-#: Merge.rc:4716
+#: Merge.rc:4726
msgid "Image files are identical"
msgstr ""
#. IDS_IMAGE_FILES_DIFF
-#: Merge.rc:4717
+#: Merge.rc:4727
msgid "Image files are different"
msgstr ""
#. IDS_EXPR_DIFF
-#: Merge.rc:4718
+#: Merge.rc:4728
#, c-format
msgid "Files are different (expr: %1)"
msgstr ""
#. IDS_HASH_GROUP
-#: Merge.rc:4719
+#: Merge.rc:4729
#, c-format
msgid "Group%d"
msgstr ""
#. IDS_RENAME_MOVE_DETECTION_DISALBED
-#: Merge.rc:4720
+#: Merge.rc:4730
msgctxt "Options dialog|Compare|Folder|Detect renames and moves"
msgid "Disabled"
msgstr ""
#. IDS_RENAME_MOVE_DETECTION_RENAME
-#: Merge.rc:4721
+#: Merge.rc:4731
msgid "Detect renames"
msgstr ""
#. IDS_RENAME_MOVE_DETECTION_RENAME_MOVE
-#: Merge.rc:4722
+#: Merge.rc:4732
msgid "Detect renames and moves"
msgstr ""
#. IDS_RENAME_MOVE_MERGE_MODE_RENAME
-#: Merge.rc:4723
+#: Merge.rc:4733
msgid "Merge renames"
msgstr ""
#. IDS_RENAME_MOVE_MERGE_MODE_RENAME_MOVE
-#: Merge.rc:4724
+#: Merge.rc:4734
msgid "Merge renames and moves"
msgstr ""
#. IDS_RENAMED
-#: Merge.rc:4725
+#: Merge.rc:4735
msgid "Renamed"
msgstr ""
#. IDS_MOVED
-#: Merge.rc:4726
+#: Merge.rc:4736
msgid "Moved"
msgstr ""
#. IDS_RENAMED_MOVED
-#: Merge.rc:4727
+#: Merge.rc:4737
msgid "Renamed/Moved"
msgstr ""
#. IDS_RENAMED_MOVED_ITEMS
-#: Merge.rc:4728
+#: Merge.rc:4738
#, c-format
msgid "(%1 items)"
msgstr ""
#. IDS_RENAMED_MOVED_RESULT
-#: Merge.rc:4729
+#: Merge.rc:4739
#, c-format
msgid "%1 (set %2): "
msgstr ""
#. IDS_SWITCH_FLAT_MODE
-#: Merge.rc:4730
+#: Merge.rc:4740
msgid "Some moved items have been merged.\nIn Tree Mode, these items may appear in positions that do not reflect the actual folder structure, which can be confusing.\nSwitch to Flat Mode?"
msgstr ""
#. IDS_ELAPSED_TIME
-#: Merge.rc:4736
+#: Merge.rc:4746
#, c-format
msgid "Elapsed time: %ld ms"
msgstr "Tid forløbet: %ld ms"
#. IDS_STATUS_SELITEM1
-#: Merge.rc:4737
+#: Merge.rc:4747
#, c-format
msgid "1 item selected"
msgstr "1 element valgt"
#. IDS_STATUS_SELITEMS
-#: Merge.rc:4738
+#: Merge.rc:4748
#, c-format
msgid "%1 items selected"
msgstr "%1 elementer valgt"
#. IDS_COLDESC_FILENAME
-#: Merge.rc:4744
+#: Merge.rc:4754
#, c-format
msgid "Filename or folder name."
msgstr "Filnavn eller mappenavn."
#. IDS_COLDESC_DIR
-#: Merge.rc:4745
+#: Merge.rc:4755
#, c-format
msgid "Subfolder name when subfolders are included."
msgstr "Undermappenavn når undermapper er inkluderet."
#. IDS_COLDESC_RESULT
-#: Merge.rc:4746
+#: Merge.rc:4756
#, c-format
msgid "Comparison result, long form."
msgstr "Resultat af sammenligning, lang form."
#. IDS_COLDESC_LTIMEM
-#: Merge.rc:4751
+#: Merge.rc:4761
#, c-format
msgid "Left side modification date."
msgstr "Venstre side ændringsdato."
#. IDS_COLDESC_RTIMEM
-#: Merge.rc:4752
+#: Merge.rc:4762
#, c-format
msgid "Right side modification date."
msgstr "Højre side ændringsdato."
#. IDS_COLDESC_MTIMEM
-#: Merge.rc:4753
+#: Merge.rc:4763
#, c-format
msgid "Middle side modification date."
msgstr ""
#. IDS_COLDESC_EXTENSION
-#: Merge.rc:4754
+#: Merge.rc:4764
#, c-format
msgid "File's extension."
msgstr "Filens extension."
#. IDS_COLDESC_LSIZE
-#: Merge.rc:4755
+#: Merge.rc:4765
#, c-format
msgid "Left file size in bytes."
msgstr "Venstre filstørrelse i bytes."
#. IDS_COLDESC_RSIZE
-#: Merge.rc:4756
+#: Merge.rc:4766
#, c-format
msgid "Right file size in bytes."
msgstr "Højre filstørrelse i bytes."
#. IDS_COLDESC_MSIZE
-#: Merge.rc:4757
+#: Merge.rc:4767
#, c-format
msgid "Middle file size in bytes."
msgstr ""
#. IDS_COLDESC_LSIZE_SHORT
-#: Merge.rc:4758
+#: Merge.rc:4768
#, c-format
msgid "Left file size abbreviated."
msgstr "Venstre filstørrelse forkortet."
#. IDS_COLDESC_RSIZE_SHORT
-#: Merge.rc:4759
+#: Merge.rc:4769
#, c-format
msgid "Right file size abbreviated."
msgstr "Højre filstørrelse forkortet."
#. IDS_COLDESC_MSIZE_SHORT
-#: Merge.rc:4760
+#: Merge.rc:4770
#, c-format
msgid "Middle file size abbreviated."
msgstr ""
#. IDS_COLDESC_LTIMEC
-#: Merge.rc:4766
+#: Merge.rc:4776
#, c-format
msgid "Left side creation time."
msgstr "Venstre side oprettelsesdato."
#. IDS_COLDESC_RTIMEC
-#: Merge.rc:4767
+#: Merge.rc:4777
#, c-format
msgid "Right side creation time."
msgstr "Højre side oprettelsesdato."
#. IDS_COLDESC_MTIMEC
-#: Merge.rc:4768
+#: Merge.rc:4778
#, c-format
msgid "Middle side creation time."
msgstr ""
#. IDS_COLDESC_NEWER
-#: Merge.rc:4769
+#: Merge.rc:4779
#, c-format
msgid "Tells which side has newer modification date."
msgstr "Fortæller hvilken side har den nyeste ændringsdato."
#. IDS_COLDESC_LVERSION
-#: Merge.rc:4770
+#: Merge.rc:4780
msgid "Left side file version, only for some file types."
msgstr "Venstre side filversion, kun for nogle filtyper."
#. IDS_COLDESC_RVERSION
-#: Merge.rc:4771
+#: Merge.rc:4781
msgid "Right side file version, only for some file types."
msgstr "Højre side filversion, kun for nogle filtyper."
#. IDS_COLDESC_MVERSION
-#: Merge.rc:4776
+#: Merge.rc:4786
msgid "Middle side file version, only for some file types."
msgstr ""
#. IDS_COLDESC_RESULT_ABBR
-#: Merge.rc:4777
+#: Merge.rc:4787
#, c-format
msgid "Short comparison result."
msgstr "Kort resultat af sammenligning."
#. IDS_COLDESC_LATTRIBUTES
-#: Merge.rc:4778
+#: Merge.rc:4788
#, c-format
msgid "Left side attributes."
msgstr "Venstre side attributter."
#. IDS_COLDESC_RATTRIBUTES
-#: Merge.rc:4779
+#: Merge.rc:4789
#, c-format
msgid "Right side attributes."
msgstr "Højre side attributter."
#. IDS_COLDESC_MATTRIBUTES
-#: Merge.rc:4780
+#: Merge.rc:4790
#, c-format
msgid "Middle side attributes."
msgstr ""
#. IDS_COLDESC_LEOL_TYPE
-#: Merge.rc:4781
+#: Merge.rc:4791
msgid "Left side file EOL type."
msgstr "Venstre sidefil EOL type."
#. IDS_COLDESC_REOL_TYPE
-#: Merge.rc:4782
+#: Merge.rc:4792
msgid "Right side file EOL type."
msgstr "Højre sidefil EOL type."
#. IDS_COLDESC_MEOL_TYPE
-#: Merge.rc:4783
+#: Merge.rc:4793
msgid "Middle side file EOL type."
msgstr ""
#. IDS_COLDESC_LENCODING
-#: Merge.rc:4789
+#: Merge.rc:4799
#, c-format
msgid "Left side encoding."
msgstr "Venstre side encoding."
#. IDS_COLDESC_RENCODING
-#: Merge.rc:4790
+#: Merge.rc:4800
#, c-format
msgid "Right side encoding."
msgstr "Højre side encoding."
#. IDS_COLDESC_MENCODING
-#: Merge.rc:4791
+#: Merge.rc:4801
#, c-format
msgid "Middle side encoding."
msgstr ""
#. IDS_COLDESC_NIDIFFS
-#: Merge.rc:4792
+#: Merge.rc:4802
#, c-format
msgid "Number of ignored differences in file. Ignored and cannot be merged."
msgstr ""
@@ -7321,70 +7332,70 @@ msgstr ""
"og kan ikke blive flettet."
#. IDS_COLDESC_NSDIFFS
-#: Merge.rc:4793
+#: Merge.rc:4803
#, c-format
msgid "Number of differences in file (excluding ignored)."
#. IDS_COLDESC_BINARY
-#: Merge.rc:4794
+#: Merge.rc:4804
#, c-format
msgid "Shows an asterisk (*) if the file is binary."
msgstr "Vis stjerne (*) hvis fil er binær."
#. IDS_COLDESC_UNPACKER
-#: Merge.rc:4795
+#: Merge.rc:4805
msgid "Unpacker plugin name or pipeline."
msgstr ""
#. IDS_COLDESC_PREDIFFER
-#: Merge.rc:4796
+#: Merge.rc:4806
msgid "Prediffer plugin name or pipeline."
msgstr ""
#. IDS_DIRECTORY_REPORT_TITLE
-#: Merge.rc:4802
+#: Merge.rc:4812
#, c-format
msgid "Compare %1 with %2"
msgstr "Sammenlign %1 med %2"
#. IDS_DIRECTORY_REPORT_TITLE3
-#: Merge.rc:4803
+#: Merge.rc:4813
#, c-format
msgid "Compare %1 with %2 and %3"
msgstr ""
#. IDS_REPORT_COMMALIST
-#: Merge.rc:4804
+#: Merge.rc:4814
#, c-format
msgid "Comma-separated list"
msgstr "Komma opdelt liste"
#. IDS_REPORT_TABLIST
-#: Merge.rc:4805
+#: Merge.rc:4815
#, c-format
msgid "Tab-separated list"
msgstr "Tab opdelt liste"
#. IDS_REPORT_SIMPLEHTML
-#: Merge.rc:4806
+#: Merge.rc:4816
#, c-format
msgid "Simple HTML"
msgstr "Simpel HTML"
#. IDS_REPORT_SIMPLEXML
-#: Merge.rc:4807
+#: Merge.rc:4817
#, c-format
msgid "Simple XML"
msgstr "Simpel XML"
-#: Merge.rc:4809
+#: Merge.rc:4819
#, c-format
msgid "Report file already exists. Overwrite?"
msgstr ""
"Rapportfilen eksisterer allerede. Ønsker du at overskrive eksisterende fil"
#. IDS_REPORT_ERROR
-#: Merge.rc:4814
+#: Merge.rc:4824
#, c-format
msgid ""
"Error creating the report:\n"
@@ -7394,56 +7405,56 @@ msgstr ""
"%1"
#. IDS_REPORT_SUCCESS
-#: Merge.rc:4815
+#: Merge.rc:4825
#, c-format
msgid "Report created successfully."
msgstr "Rapporten blev oprettet succesfuldt."
#. IDS_SYNCPOINT_LASTBLOCK
-#: Merge.rc:4821
+#: Merge.rc:4831
msgid "Cannot add a synchronization point at this line."
msgstr ""
#. IDS_FILE_TO_ITSELF
-#: Merge.rc:4827
+#: Merge.rc:4837
#, c-format
msgid "Same file is opened in both panes."
msgstr "Den samme fil er åbnet på begge sider."
#. IDS_FILESSAME
-#: Merge.rc:4828
+#: Merge.rc:4838
#, c-format
msgid "Selected files are identical."
msgstr "De valgte filer er identiske."
#. IDS_FILESSAME_CURCFG
-#: Merge.rc:4829
+#: Merge.rc:4839
msgid "Selected files are identical (with current settings).\r\nChecking binary identity..."
msgstr ""
#. IDS_FILESSAME_BINERROR
-#: Merge.rc:4830
+#: Merge.rc:4840
msgid "Selected files are identical (with current settings).\r\nBut binary comparison failed."
msgstr ""
#. IDS_FILESSAME_BINSAME
-#: Merge.rc:4831
+#: Merge.rc:4841
msgid "Selected files are identical (binary match)."
msgstr ""
#. IDS_FILESSAME_BINDIFF
-#: Merge.rc:4832
+#: Merge.rc:4842
msgid "Selected files are identical (with current settings).\r\nBut differ at the binary level."
msgstr ""
#. IDS_FILEERROR
-#: Merge.rc:4833
+#: Merge.rc:4843
#, c-format
msgid "An error occurred while comparing files."
msgstr "Der skete en fejl under sammenligning af filerne."
#. IDS_TEMP_FILEERROR
-#: Merge.rc:4834
+#: Merge.rc:4844
#, c-format
msgid ""
"Could not create temporary files. Check your temporary path settings."
@@ -7452,7 +7463,7 @@ msgstr ""
"midlertidig (temp) mappe."
#. IDS_SUGGEST_IGNOREEOL
-#: Merge.rc:4835
+#: Merge.rc:4845
msgid "Files use different EOL.\n\nTreat all EOL as equivalent?\n\nSet 'Ignore EOL differences (Windows/Unix/Mac)' in Compare section of Options."
msgstr ""
"Disse filer anvender forskellige returtegn typer.\n"
@@ -7464,19 +7475,19 @@ msgstr ""
"Sammenlign (findes under Redigér)."
#. IDS_INVALID_DIRECTORY
-#: Merge.rc:4836
+#: Merge.rc:4846
#, c-format
msgid "Selected folder is invalid."
msgstr "Den valgte mappe er ugyldig."
#. IDS_CANNOT_OPEN_BINARYFILE
-#: Merge.rc:4837
+#: Merge.rc:4847
#, c-format
msgid "Cannot open a binary file in Editor."
msgstr "Kan ikke åbne en binær fil til editor."
#. IDS_CREATE_PAIR_FOLDER
-#: Merge.rc:4838
+#: Merge.rc:4848
#, c-format
msgid "Create matching folder:\n%1\non the other side and open?"
msgstr ""
@@ -7487,45 +7498,45 @@ msgstr ""
"til den anden side og åbne disse mapper?"
#. IDS_CONFIRM_COPY_ALL_DIFFS
-#: Merge.rc:4839
+#: Merge.rc:4849
msgid "Copy all differences to other file?"
msgstr ""
#. IDS_MOVE_TO_NEXTFILE
-#: Merge.rc:4844
+#: Merge.rc:4854
#, c-format
msgid "Move to next file?"
msgstr ""
#. IDS_MOVE_TO_PREVFILE
-#: Merge.rc:4845
+#: Merge.rc:4855
#, c-format
msgid "Move to previous file?"
msgstr ""
#. IDS_MOVE_TO_NEXTPAGE
-#: Merge.rc:4846
+#: Merge.rc:4856
#, c-format
msgid "Move to next page?"
msgstr ""
#. IDS_MOVE_TO_PREVPAGE
-#: Merge.rc:4847
+#: Merge.rc:4857
#, c-format
msgid "Move to previous page?"
msgstr ""
#. IDS_MOVE_TO_FIRSTFILE
-#: Merge.rc:4848
+#: Merge.rc:4858
msgid "Move to first file?"
msgstr ""
#. IDS_MOVE_TO_LASTFILE
-#: Merge.rc:4849
+#: Merge.rc:4859
msgid "Move to last file?"
msgstr ""
-#: Merge.rc:4856
+#: Merge.rc:4866
#, c-format
msgid "Different codepages: left (cp%d), right (cp%d).\nDisplay in codepage (better display) or default Windows codepage (safer merging)?\n(Recommended: default Windows codepage)"
msgstr ""
@@ -7535,163 +7546,163 @@ msgstr ""
"Vil du behandle begge filer som værende i standard Windows codepage "
"(anbefalet)?"
-#: Merge.rc:4858
+#: Merge.rc:4868
#, c-format
msgid "Information lost due to encoding errors: both files"
msgstr "Oplysninger tabt, på grund af kodnings fejl: begge filer"
-#: Merge.rc:4860
+#: Merge.rc:4870
#, c-format
msgid "Information lost due to encoding errors: first file"
msgstr ""
-#: Merge.rc:4862
+#: Merge.rc:4872
#, c-format
msgid "Information lost due to encoding errors: second file"
msgstr ""
-#: Merge.rc:4864
+#: Merge.rc:4874
#, c-format
msgid "Information lost due to encoding errors: third file"
msgstr ""
#. IDS_LINEDIFF_NODIFF
-#: Merge.rc:4870
+#: Merge.rc:4880
#, c-format
msgid "No difference"
msgstr "Ingen forskel"
#. IDS_LINEDIFF_NODIFF_CAPTION
-#: Merge.rc:4871
+#: Merge.rc:4881
#, c-format
msgid "Line difference"
msgstr "Linje forskel"
#. IDS_NUM_REPLACED
-#: Merge.rc:4877
+#: Merge.rc:4887
#, c-format
msgid "Replaced %1 string(s)."
msgstr "Erstattet %1 streng(e)."
#. IDS_EDIT_TEXT_NOT_FOUND
-#: Merge.rc:4878
+#: Merge.rc:4888
#, c-format
msgid "Cannot find string \"%s\"."
msgstr "Kan ikke finde strengen \"%s\"."
#. IDS_MERGE_MODE
-#: Merge.rc:4884
+#: Merge.rc:4894
msgid "Entering Merge Mode. Press F9 to turn off."
msgstr ""
#. IDS_AUTO_MERGE
-#: Merge.rc:4890
+#: Merge.rc:4900
#, c-format
msgid "Automatic merges: %1\nUnresolved conflicts: %2"
msgstr ""
#. IDS_CODEPAGE_MERGED
-#: Merge.rc:4891
+#: Merge.rc:4901
msgid "Codepage change merged."
msgstr ""
#. IDS_CODEPAGE_CONFLICT
-#: Merge.rc:4892
+#: Merge.rc:4902
msgid "Codepage changes are conflicting."
msgstr ""
#. IDS_EOL_MERGED
-#: Merge.rc:4893
+#: Merge.rc:4903
msgid "EOL change merged."
msgstr ""
#. IDS_EOL_CONFLICT
-#: Merge.rc:4894
+#: Merge.rc:4904
msgid "EOL changes are conflicting."
msgstr ""
#. IDS_LOCBAR_CAPTION
-#: Merge.rc:4900
+#: Merge.rc:4910
#, c-format
msgid "Location Pane"
msgstr "Placerings vindue"
#. IDS_DIFFBAR_CAPTION
-#: Merge.rc:4901
+#: Merge.rc:4911
#, c-format
msgid "Diff Pane"
msgstr "Forskels vindue"
#. IDS_DIFF_SUCCEEDED
-#: Merge.rc:4908
+#: Merge.rc:4918
#, c-format
msgid "Patch file written."
msgstr "Patch fil oprettet med succes."
#. IDS_DIFF_ITEM1NOTFOUND
-#: Merge.rc:4909
+#: Merge.rc:4919
msgid "First item not found!"
msgstr ""
#. IDS_DIFF_ITEM2NOTFOUND
-#: Merge.rc:4910
+#: Merge.rc:4920
msgid "Second item not found!"
msgstr ""
#. IDS_DIFF_FILEOVERWRITE
-#: Merge.rc:4911
+#: Merge.rc:4921
#, c-format
msgid "Patch file already exists. Overwrite?"
msgstr "Denne patch fil eksisterer allerede. Vil du overskrive den?"
#. IDS_DIFF_SELECTEDFILES
-#: Merge.rc:4912
+#: Merge.rc:4922
#, c-format
msgid "[%1 files selected]"
msgstr "[%1 filer valgt]"
#. IDS_DIFF_NORMAL
-#: Merge.rc:4913
+#: Merge.rc:4923
#, c-format
msgid "Normal"
msgstr "Normal"
#. IDS_DIFF_CONTEXT
-#: Merge.rc:4914
+#: Merge.rc:4924
#, c-format
msgid "Context"
msgstr "Kontekst"
#. IDS_DIFF_UNIFIED
-#: Merge.rc:4915
+#: Merge.rc:4925
#, c-format
msgid "Unified"
msgstr "Samlet"
#. IDS_FILEWRITE_ERROR
-#: Merge.rc:4917
+#: Merge.rc:4927
#, c-format
msgid "Could not write to file %1."
msgstr "Kunne ikke skrive til fil %1."
#. IDS_PATH_NOT_ABSOLUTE
-#: Merge.rc:4918
+#: Merge.rc:4928
#, c-format
msgid "Output path is not absolute: %1"
msgstr "Den angivne output sti er ikke en endelig sti: %1"
#. IDS_MUST_SPECIFY_OUTPUT
-#: Merge.rc:4919
+#: Merge.rc:4929
msgid "Specify an output file."
msgstr "Angiv en output fil."
-#: Merge.rc:4921
+#: Merge.rc:4931
#, c-format
msgid "Cannot create patch from binary files."
msgstr "Kan ikke lave patch filer fra binære filer."
#. IDS_SAVEFILES_FORPATCH
-#: Merge.rc:4922
+#: Merge.rc:4932
#, c-format
msgid ""
"Save all files first.\n"
@@ -7703,13 +7714,13 @@ msgstr ""
"Oprettelse af en patch kræver at alle ændringer i filen er gemt."
#. IDS_FOLDER_NOTEXIST
-#: Merge.rc:4923
+#: Merge.rc:4933
#, c-format
msgid "Folder does not exist."
msgstr "Mappen eksisterer ikke."
#. IDS_NO_ZIP_SUPPORT
-#: Merge.rc:4928
+#: Merge.rc:4938
msgid "Archive support not enabled.\n7-Zip and/or Merge7z*.dll not found.\nSee manual for archive support."
msgstr ""
"Arkiv support er ikke aktiveret.\n"
@@ -7719,43 +7730,43 @@ msgstr ""
"det."
#. IDS_OPT_EXPORT_CAPTION
-#: Merge.rc:4929
+#: Merge.rc:4939
#, c-format
msgid "Select file for export"
msgstr "Vælg fil til eksport"
#. IDS_OPT_IMPORT_CAPTION
-#: Merge.rc:4930
+#: Merge.rc:4940
#, c-format
msgid "Select file for import"
msgstr "Vælg fil til import"
#. IDS_OPT_IMPORT_DONE
-#: Merge.rc:4931
+#: Merge.rc:4941
#, c-format
msgid "Options imported from file."
msgstr "Indstillinger importeret fra filen."
#. IDS_OPT_EXPORT_DONE
-#: Merge.rc:4932
+#: Merge.rc:4942
#, c-format
msgid "Options exported to file."
msgstr "Indstillinger eksporteret til filen."
#. IDS_OPT_IMPORT_ERR
-#: Merge.rc:4933
+#: Merge.rc:4943
#, c-format
msgid "Failed to import options from file."
msgstr "Kunne ikke importere indstillinger fra filen."
#. IDS_OPT_EXPORT_ERR
-#: Merge.rc:4934
+#: Merge.rc:4944
#, c-format
msgid "Failed to write options to file."
msgstr "Kunne ikke skrive indstillinger til filen."
#. IDS_CLOSEALL_WINDOWS
-#: Merge.rc:4935
+#: Merge.rc:4945
#, c-format
msgid ""
"Close multiple compare windows?\n"
@@ -7767,1215 +7778,1220 @@ msgstr ""
"Vil du fortsætte?"
#. IDS_EOL_MIXED
-#: Merge.rc:4944
+#: Merge.rc:4954
#, c-format
msgid "Mixed"
msgstr "Mixed"
#. IDS_EOL_BIN
-#: Merge.rc:4945
+#: Merge.rc:4955
msgctxt "EOL Type"
msgid "Binary"
msgstr "Binær"
#. IDS_EOL_NONE
-#: Merge.rc:4949
+#: Merge.rc:4959
#, c-format
msgid "None"
msgstr "Ingen"
#. IDS_MARKER_COLOR_FMT
-#: Merge.rc:4950
+#: Merge.rc:4960
#, c-format
msgid "Marker Color %d"
msgstr ""
#. IDS_MARKER_NEW_PATTERN
-#: Merge.rc:4951
+#: Merge.rc:4961
msgid "New Pattern"
msgstr ""
#. IDS_PLUGINSLIST_TYPE
-#: Merge.rc:4957
+#: Merge.rc:4967
#, c-format
msgid "Type"
msgstr "Type"
#. IDS_PLUGINS_TYPE_EDITSCRIPT
-#: Merge.rc:4961
+#: Merge.rc:4971
#, c-format
msgid "Editor script"
msgstr "Editor script"
#. ID_SELECTLINEDIFF
-#: Merge.rc:4967
+#: Merge.rc:4977
#, c-format
msgid "\nDifference in Current Line (F4)"
msgstr ""
#. ID_OPTIONS
-#: Merge.rc:4968
+#: Merge.rc:4978
#, c-format
msgid "\nOptions"
msgstr ""
#. ID_REFRESH
-#: Merge.rc:4969
+#: Merge.rc:4979
#, c-format
msgid "\nRefresh (F5)"
msgstr ""
#. ID_PREVDIFF
-#: Merge.rc:4975
+#: Merge.rc:4985
#, c-format
msgid "\nPrevious Difference (Alt+Up)"
msgstr ""
#. ID_NEXTDIFF
-#: Merge.rc:4976
+#: Merge.rc:4986
#, c-format
msgid "\nNext Difference (Alt+Down)"
msgstr ""
#. ID_PREVCONFLICT
-#: Merge.rc:4977
+#: Merge.rc:4987
#, c-format
msgid "\nPrevious Conflict (Alt+Shift+Up)"
msgstr ""
#. ID_NEXTCONFLICT
-#: Merge.rc:4978
+#: Merge.rc:4988
#, c-format
msgid "\nNext Conflict (Alt+Shift+Down)"
msgstr ""
#. ID_FIRSTDIFF
-#: Merge.rc:4983
+#: Merge.rc:4993
#, c-format
msgid "\nFirst Difference (Alt+Home)"
msgstr ""
#. ID_CURDIFF
-#: Merge.rc:4984
+#: Merge.rc:4994
#, c-format
msgid "\nCurrent Difference (Alt+Enter)"
msgstr ""
#. ID_LASTDIFF
-#: Merge.rc:4985
+#: Merge.rc:4995
#, c-format
msgid "\nLast Difference (Alt+End)"
msgstr ""
#. ID_L2R
-#: Merge.rc:4986
+#: Merge.rc:4996
msgid "\nCopy to Right (Alt+Right)"
msgstr ""
#. ID_R2L
-#: Merge.rc:4987
+#: Merge.rc:4997
msgid "\nCopy to Left (Alt+Left)"
msgstr ""
#. ID_L2RNEXT
-#: Merge.rc:4988
+#: Merge.rc:4998
msgid "\nCopy to Right and Advance (Ctrl+Alt+Right)"
msgstr ""
#. ID_R2LNEXT
-#: Merge.rc:4989
+#: Merge.rc:4999
msgid "\nCopy to Left and Advance (Ctrl+Alt+Left)"
msgstr ""
#. ID_ALL_RIGHT
-#: Merge.rc:4990
+#: Merge.rc:5000
msgid "\nCopy All to Right"
msgstr "\nKopier alt til højre"
#. ID_ALL_LEFT
-#: Merge.rc:4991
+#: Merge.rc:5001
msgid "\nCopy All to Left"
msgstr "\nKopier alt til venstre"
#. ID_AUTO_MERGE
-#: Merge.rc:4992
+#: Merge.rc:5002
#, c-format
msgid "\nAuto Merge (Ctrl+Alt+M)"
msgstr ""
#. ID_FIRSTFILE
-#: Merge.rc:4993
+#: Merge.rc:5003
msgid "\nFirst File"
msgstr ""
#. ID_NEXTFILE
-#: Merge.rc:4994
+#: Merge.rc:5004
msgid "\nNext File (Ctrl+F8)"
msgstr ""
#. ID_LASTFILE
-#: Merge.rc:4995
+#: Merge.rc:5005
msgid "\nLast File"
msgstr ""
#. ID_PREVFILE
-#: Merge.rc:4996
+#: Merge.rc:5006
msgid "\nPrevious File (Ctrl+F7)"
msgstr ""
#. IDS_UNPACK_AUTO
-#: Merge.rc:5003
+#: Merge.rc:5013
msgid "Adapted unpacker applied to both files (one needs extension)."
msgstr ""
"Udpakkeren bruges på begge filer (kun den ene fil behøves en korrekt "
"extension)."
#. IDS_NO_PREDIFFER
-#: Merge.rc:5004
+#: Merge.rc:5014
#, c-format
msgid "No Prediffer (Normal)"
msgstr "Ingen prediffer (normal)"
#. IDS_SUGGESTED_PLUGINS
-#: Merge.rc:5005
+#: Merge.rc:5015
#, c-format
msgid "Suggested Plugins"
msgstr "Anbefalede plugins"
#. IDS_NOT_SUGGESTED_PLUGINS
-#: Merge.rc:5006
+#: Merge.rc:5016
msgid "All Plugins"
msgstr ""
#. IDS_PRIVATEBUILD_FMT
-#: Merge.rc:5012
+#: Merge.rc:5022
#, c-format
msgid "Private Build: %1"
msgstr "Privat Udgave: %1"
#. IDS_CHECKFORUPDATES_UPTODATE
-#: Merge.rc:5013
+#: Merge.rc:5023
msgid "Your software is up to date."
msgstr ""
-#: Merge.rc:5015
+#: Merge.rc:5025
#, c-format
msgid "WinMerge update available.\n%1 available (you have %2). Download now?"
msgstr ""
#. IDS_ALLRIGHTS_RESERVED
-#: Merge.rc:5016
+#: Merge.rc:5026
msgid " - All rights reserved."
msgstr ""
#. IDS_CHECKFORUPDATES_FAILED
-#: Merge.rc:5021
+#: Merge.rc:5031
#, c-format
msgid "Failed to download latest version information"
msgstr ""
#. IDS_TITLE_PLUGINS_SETTINGS
-#: Merge.rc:5027
+#: Merge.rc:5037
#, c-format
msgid "Plugin Settings"
msgstr "Plugin indstillinger"
#. IDS_NO_SCT_SCRIPTS
-#: Merge.rc:5029
+#: Merge.rc:5039
#, c-format
msgid "WSH not found - .sct scripts disabled"
msgstr "WSH ikke fundet - .sct scripts afbrudt"
#. IDS_LOCBAR_GOTOLINE_FMT
-#: Merge.rc:5037
+#: Merge.rc:5047
#, c-format
msgid "G&o to Line %1"
msgstr "G&å til linje %1"
#. IDS_GOTO_MOVED_LINE
-#: Merge.rc:5043
+#: Merge.rc:5053
msgid "Go to Moved Line\tCtrl+Shift+G"
msgstr ""
#. IDS_AUTOCOMPLETE_DISABLED
-#: Merge.rc:5049
+#: Merge.rc:5059
msgctxt "Options dialog|General|Open dialog Auto completion"
msgid "Disabled"
msgstr ""
#. IDS_AUTOCOMPLETE_FILE_SYS
-#: Merge.rc:5050
+#: Merge.rc:5060
#, c-format
msgid "From file system"
msgstr "Fra filsystem"
#. IDS_AUTOCOMPLETE_MRU
-#: Merge.rc:5051
+#: Merge.rc:5061
#, c-format
msgid "From Most Recently Used list"
msgstr "Fra MRU liste"
#. IDS_COLORSCHEME_PLAIN
-#: Merge.rc:5057
+#: Merge.rc:5067
#, c-format
msgid "No Highlighting"
msgstr "Ingen fremhævning"
#. IDS_COLORSCHEME_BATCH
-#: Merge.rc:5063
+#: Merge.rc:5073
#, c-format
msgid "Batch"
msgstr "Batch"
#. IDS_COLORSCHEME_PO
-#: Merge.rc:5090
+#: Merge.rc:5100
#, c-format
msgid "Portable Object"
msgstr "Transportabelt Objekt"
#. IDS_COLORSCHEME_RSRC
-#: Merge.rc:5094
+#: Merge.rc:5104
#, c-format
msgid "Resources"
msgstr "Resourser"
#. IDS_COLORSCHEME_SH
-#: Merge.rc:5098
+#: Merge.rc:5108
#, c-format
msgid "Shell"
msgstr "Shell"
#. IDS_CLOSE_LEFT_TABS
-#: Merge.rc:5115
+#: Merge.rc:5125
#, c-format
msgid "Close &Left Tabs"
msgstr ""
#. IDS_CLOSE_RIGHT_TABS
-#: Merge.rc:5116
+#: Merge.rc:5126
#, c-format
msgid "Close R&ight Tabs"
msgstr ""
#. IDS_CLOSE_OTHER_TABS
-#: Merge.rc:5117
+#: Merge.rc:5127
#, c-format
msgid "Close &Other Tabs"
msgstr ""
#. IDS_TABBAR_AUTO_MAXWIDTH
-#: Merge.rc:5118
+#: Merge.rc:5128
#, c-format
msgid "Enable &Auto Max Width"
msgstr ""
#. IDS_WEBPAGE_MENU
-#: Merge.rc:5128
+#: Merge.rc:5138
msgid "We&bpage"
msgstr ""
#. IDS_VIEW_WRAP_TEXT
-#: Merge.rc:5133
+#: Merge.rc:5143
msgid "W&rap Text"
msgstr ""
#. IDS_NOTINSTALLED
-#: Merge.rc:5138
+#: Merge.rc:5148
msgid "%1 is not installed."
msgstr ""
#. IDS_CREATE_FOLDER
-#: Merge.rc:5143
+#: Merge.rc:5153
#, c-format
msgid "%1 does not exist. Create it?"
msgstr ""
#. IDS_CREATE_FOLDER_ERROR
-#: Merge.rc:5144
+#: Merge.rc:5154
#, c-format
msgid "Failed to create folder."
msgstr ""
#. IDC_EXT_EDITOR_PATH
-#: Merge.rc:5149
+#: Merge.rc:5159
#, c-format
msgid "Parameters:\n$file: Current file path\n$linenum: Current cursor line number"
msgstr ""
#. IDS_DIFF_ALGORITHM_DEFAULT
-#: Merge.rc:5154
+#: Merge.rc:5164
msgid "default"
msgstr ""
#. IDS_DIFF_ALGORITHM_MINIMAL
-#: Merge.rc:5155
+#: Merge.rc:5165
msgid "minimal"
msgstr ""
#. IDS_DIFF_ALGORITHM_PATIENCE
-#: Merge.rc:5156
+#: Merge.rc:5166
msgid "patience"
msgstr ""
#. IDS_DIFF_ALGORITHM_HISTOGRAM
-#: Merge.rc:5157
+#: Merge.rc:5167
msgid "histogram"
msgstr ""
#. IDS_DIFF_ALGORITHM_NONE
-#: Merge.rc:5158
+#: Merge.rc:5168
msgid "none"
msgstr ""
#. IDS_RENDERING_MODE_GDI
-#: Merge.rc:5163
+#: Merge.rc:5173
msgid "GDI"
msgstr ""
#. IDS_RENDERING_MODE_DIRECTWRITE_DEFAULT
-#: Merge.rc:5164
+#: Merge.rc:5174
msgid "DirectWrite Default"
msgstr ""
#. IDS_RENDERING_MODE_DIRECTWRITE_ALIASED
-#: Merge.rc:5165
+#: Merge.rc:5175
msgid "DirectWrite Aliased"
msgstr ""
#. IDS_RENDERING_MODE_DIRECTWRITE_GDI_CLASSIC
-#: Merge.rc:5166
+#: Merge.rc:5176
msgid "DirectWrite GDI Classic"
msgstr ""
#. IDS_RENDERING_MODE_DIRECTWRITE_GDI_NATURAL
-#: Merge.rc:5167
+#: Merge.rc:5177
msgid "DirectWrite GDI Natural"
msgstr ""
#. IDS_RENDERING_MODE_DIRECTWRITE_NATURAL
-#: Merge.rc:5168
+#: Merge.rc:5178
msgid "DirectWrite Natural"
msgstr ""
#. IDS_RENDERING_MODE_DIRECTWRITE_NATURAL_SYMMETRIC
-#: Merge.rc:5169
+#: Merge.rc:5179
msgid "DirectWrite Natural Symmetric"
msgstr ""
#. IDS_CLOSE_WINDOWS_WITH_ESC_DISABLED
-#: Merge.rc:5174
+#: Merge.rc:5184
msgctxt "Options dialog|General|Close windows with Esc"
msgid "Disabled"
msgstr ""
#. IDS_CLOSE_WINDOWS_WITH_ESC_1
-#: Merge.rc:5175
+#: Merge.rc:5185
msgid "MDI child window or main window"
msgstr ""
#. IDS_CLOSE_WINDOWS_WITH_ESC_2
-#: Merge.rc:5176
+#: Merge.rc:5186
msgid "MDI child window only"
msgstr ""
#. IDS_CLOSE_WINDOWS_WITH_ESC_3
-#: Merge.rc:5177
+#: Merge.rc:5187
msgid "Close main window if only one MDI child window"
msgstr ""
#. IDS_DIFF_GROUP
-#: Merge.rc:5182
+#: Merge.rc:5192
msgctxt "ImgMergeFrame|LocationPane"
msgid "Diff"
msgstr ""
#. IDS_DIFF_HIGHLIGHT
-#: Merge.rc:5183
+#: Merge.rc:5193
msgctxt "ImgMergeFrame|LocationPane"
msgid "Highlight"
msgstr ""
#. IDS_DIFF_BLINK
-#: Merge.rc:5184
+#: Merge.rc:5194
msgctxt "ImgMergeFrame|LocationPane"
msgid "Blink"
msgstr ""
#. IDS_DIFF_BLOCKSIZE
-#: Merge.rc:5185
+#: Merge.rc:5195
msgctxt "ImgMergeFrame|LocationPane"
msgid "Block Size"
msgstr ""
#. IDS_DIFF_BLOCKALPHA
-#: Merge.rc:5186
+#: Merge.rc:5196
msgctxt "ImgMergeFrame|LocationPane"
msgid "Block Alpha"
msgstr ""
#. IDS_DIFF_CDTHRESHOLD
-#: Merge.rc:5187
+#: Merge.rc:5197
msgctxt "ImgMergeFrame|LocationPane"
msgid "CD Threshold"
msgstr ""
#. IDS_DIFF_INSERTION_DELETION_DETECTION
-#: Merge.rc:5188
+#: Merge.rc:5198
msgctxt "ImgMergeFrame|LocationPane"
msgid "Ins/Del Detection"
msgstr ""
#. IDS_OVERLAY_MODE_NONE
-#: Merge.rc:5189 Merge.rc:5194
+#: Merge.rc:5199 Merge.rc:5204
msgctxt "ImgMergeFrame|LocationPane"
msgid "None"
msgstr ""
#. IDS_DIFF_INSERTION_DELETION_DETECTION_VERTICAL
-#: Merge.rc:5190
+#: Merge.rc:5200
msgctxt "ImgMergeFrame|LocationPane"
msgid "Vertical"
msgstr ""
#. IDS_DIFF_INSERTION_DELETION_DETECTION_HORIZONTAL
-#: Merge.rc:5191
+#: Merge.rc:5201
msgctxt "ImgMergeFrame|LocationPane"
msgid "Horizontal"
msgstr ""
#. IDS_OVERLAY_GROUP
-#: Merge.rc:5192
+#: Merge.rc:5202
msgctxt "ImgMergeFrame|LocationPane"
msgid "Overlay"
msgstr ""
#. IDS_OVERLAY_ALPHA
-#: Merge.rc:5193
+#: Merge.rc:5203
msgctxt "ImgMergeFrame|LocationPane"
msgid "Alpha"
msgstr ""
#. IDS_OVERLAY_MODE_XOR
-#: Merge.rc:5195
+#: Merge.rc:5205
msgctxt "ImgMergeFrame|LocationPane"
msgid "XOR"
msgstr ""
#. IDS_OVERLAY_MODE_ALPHA
-#: Merge.rc:5196
+#: Merge.rc:5206
msgctxt "ImgMergeFrame|LocationPane"
msgid "Alpha Blend"
msgstr ""
#. IDS_OVERLAY_MODE_ALPHA_ANIMATION
-#: Merge.rc:5197
+#: Merge.rc:5207
msgctxt "ImgMergeFrame|LocationPane"
msgid "Alpha Animation"
msgstr ""
#. IDS_ZOOM
-#: Merge.rc:5198
+#: Merge.rc:5208
msgctxt "ImgMergeFrame|LocationPane"
msgid "Zoom"
msgstr ""
#. IDS_PAGE
-#: Merge.rc:5199
+#: Merge.rc:5209
msgctxt "ImgMergeFrame|LocationPane"
msgid "Page:"
msgstr ""
#. IDS_IMGCMP_STATUS_PT_RGBA_FMT
-#: Merge.rc:5200
+#: Merge.rc:5210
#, c-format
msgid "Pt: (%d, %d) RGBA: (%d, %d, %d, %d) "
msgstr ""
#. IDS_IMGCMP_STATUS_DIST1_FMT
-#: Merge.rc:5201
+#: Merge.rc:5211
#, c-format
msgid "Dist: %g "
msgstr ""
#. IDS_IMGCMP_STATUS_DIST2_FMT
-#: Merge.rc:5202
+#: Merge.rc:5212
#, c-format
msgid "Dist: %g, %g "
msgstr ""
#. IDS_IMGCMP_STATUS_PAGE_ZOOM_SIZE_BPP_FMT
-#: Merge.rc:5203
+#: Merge.rc:5213
#, c-format
msgid "Page: %d/%d Zoom: %d%% %dx%dpx %dbpp "
msgstr ""
#. IDS_IMGCMP_STATUS_RC_FMT
-#: Merge.rc:5204
+#: Merge.rc:5214
#, c-format
msgid "Rc: (%d, %d) "
msgstr ""
#. IDS_IMGCMP_STATUS_FLIPPED_FMT
-#: Merge.rc:5205
+#: Merge.rc:5215
#, c-format
msgid "Flipped: %s "
msgstr ""
#. IDS_IMGCMP_STATUS_ROTATED_FMT
-#: Merge.rc:5206
+#: Merge.rc:5216
#, c-format
msgid "Rotated: %d "
msgstr ""
#. IDS_IMGCMP_REPORT_ALLPAGES
-#: Merge.rc:5207
+#: Merge.rc:5217
msgid "All pages"
msgstr ""
#. IDS_IGNSUB_STR1
-#: Merge.rc:5212
+#: Merge.rc:5222
msgid ""
msgstr ""
#. IDS_IGNSUB_STR2
-#: Merge.rc:5213
+#: Merge.rc:5223
msgid "No differences found to select"
msgstr ""
#. IDS_IGNSUB_STR3
-#: Merge.rc:5214
+#: Merge.rc:5224
msgid "No differences found to add as substitution filter"
msgstr ""
#. IDS_IGNSUB_STR4
-#: Merge.rc:5215
+#: Merge.rc:5225
msgid "The pair is already in the Substitution Filters list"
msgstr ""
#. IDS_IGNSUB_STR5
-#: Merge.rc:5216
+#: Merge.rc:5226
msgid "Add this change to Substitution Filters?"
msgstr ""
#. IDS_OCRRESULT_TEXTONLY
-#: Merge.rc:5221
+#: Merge.rc:5231
msgid "Text only"
msgstr ""
#. IDS_OCRRESULT_POS_LINE
-#: Merge.rc:5222
+#: Merge.rc:5232
msgid "Line-by-line position and text"
msgstr ""
#. IDS_OCRRESULT_POS_WORD
-#: Merge.rc:5223
+#: Merge.rc:5233
msgid "Word-by-word position and text"
msgstr ""
#. IDS_USERDATAFOLDER_APPDATA
-#: Merge.rc:5228
+#: Merge.rc:5238
msgid "AppData (Roaming) folder"
msgstr ""
#. IDS_USERDATAFOLDER_INSTALL
-#: Merge.rc:5229
+#: Merge.rc:5239
msgid "Install folder"
msgstr ""
#. IDS_USERDATAFOLDER_DOCUMENTS
-#: Merge.rc:5230
+#: Merge.rc:5240
msgid "Documents folder"
msgstr ""
#. IDS_SINGLEINSTANCE_DISABLED
-#: Merge.rc:5235
+#: Merge.rc:5245
msgctxt "Options dialog|General|Single instance mode"
msgid "Disabled"
msgstr ""
#. IDS_SINGLEINSTANCE_STR1
-#: Merge.rc:5236
+#: Merge.rc:5246
#, c-format
msgid "Allow only one instance to run"
msgstr "Tillad kun et eksempel ad gangen"
#. IDS_SINGLEINSTANCE_STR2
-#: Merge.rc:5237
+#: Merge.rc:5247
msgid "Allow only one instance; wait for termination"
msgstr ""
#. IDS_AUTO_RELOAD_MODIFIED_FILES_DISABLED
-#: Merge.rc:5242
+#: Merge.rc:5252
msgctxt "Options dialog|General|Auto-reload modified files"
msgid "Disabled"
msgstr ""
#. IDS_AUTO_RELOAD_MODIFIED_FILES_STR1
-#: Merge.rc:5243
+#: Merge.rc:5253
msgid "Only on window activated"
msgstr ""
#. IDS_AUTO_RELOAD_MODIFIED_FILES_STR2
-#: Merge.rc:5244
+#: Merge.rc:5254
msgid "Immediately"
msgstr ""
#. IDS_PLUGIN_ALL
-#: Merge.rc:5249
+#: Merge.rc:5259
msgid "Al&l"
msgstr ""
#. IDS_PLUGIN_OTHERS
-#: Merge.rc:5250
+#: Merge.rc:5260
msgid "&Others"
msgstr ""
-#: Merge.rc:5252
+#: Merge.rc:5262
#, c-format
msgid "Missing plugin name in pipeline: %1"
msgstr ""
-#: Merge.rc:5254
+#: Merge.rc:5264
#, c-format
msgid "Missing quote in plugin pipeline: %1"
msgstr ""
#. IDS_PLUGIN_NAME_ALREADY_EXISTS
-#: Merge.rc:5255
+#: Merge.rc:5265
#, c-format
msgid "Plugin name '%1' already exists."
msgstr ""
#. IDS_PLUGIN_TITLE1
-#: Merge.rc:5256
+#: Merge.rc:5266
msgid "Specify plugin arguments"
msgstr ""
-#: Merge.rc:5258
+#: Merge.rc:5268
#, c-format
msgid "Plugin not found or invalid: %1"
msgstr ""
#. IDS_PLUGIN_NOT_UNPACK
-#: Merge.rc:5259
+#: Merge.rc:5269
#, c-format
msgid "'%1' is not an unpacker plugin"
msgstr ""
#. IDS_PLUGIN_NOT_PREDIFF
-#: Merge.rc:5260
+#: Merge.rc:5270
#, c-format
msgid "'%1' is not a prediffer plugin"
msgstr ""
-#: Merge.rc:5262
+#: Merge.rc:5272
#, c-format
msgid "Error prediffing '%1' with '%2'. Prediffing disabled."
msgstr ""
#. IDS_PLUGIN_CIRCULAR_REFERENCE
-#: Merge.rc:5263
+#: Merge.rc:5273
#, c-format
msgid "Circular reference in plugin pipeline: %1"
msgstr ""
#. IDS_PLUGIN_TYPE1
-#: Merge.rc:5264
+#: Merge.rc:5274
msgid "URL Handler"
msgstr ""
#. IDS_PLUGIN_TYPE2
-#: Merge.rc:5265
+#: Merge.rc:5275
msgid "File Unpacker"
msgstr ""
#. IDS_PLUGIN_TYPE3
-#: Merge.rc:5266
+#: Merge.rc:5276
msgid "File or Folder Unpacker"
msgstr ""
#. IDS_PLUGIN_TYPE5
-#: Merge.rc:5268
+#: Merge.rc:5278
msgid "Alias for Unpacker"
msgstr ""
#. IDS_PLUGIN_TYPE6
-#: Merge.rc:5269
+#: Merge.rc:5279
msgid "Alias for Prediffer"
msgstr ""
#. IDS_PLUGIN_TYPE7
-#: Merge.rc:5270
+#: Merge.rc:5280
msgid "Alias for Editor script"
msgstr ""
#. IDS_PLUGIN_ALIAS_DESC
-#: Merge.rc:5271
+#: Merge.rc:5281
#, c-format
msgid "Alias for plugin pipeline '%1'"
msgstr ""
#. IDS_PLUGIN_NEW_DESC
-#: Merge.rc:5272
+#: Merge.rc:5282
msgid "New plugin description"
msgstr ""
#. IDS_PLUGIN_TARGETS_ALL
-#: Merge.rc:5273
+#: Merge.rc:5283
msgid "All"
msgstr ""
#. IDS_PLUGIN_TARGETS_1ST
-#: Merge.rc:5274
+#: Merge.rc:5284
msgid "1st"
msgstr ""
#. IDS_PLUGIN_TARGETS_2ND
-#: Merge.rc:5275
+#: Merge.rc:5285
msgid "2nd"
msgstr ""
#. IDS_PLUGIN_TARGETS_3RD
-#: Merge.rc:5276
+#: Merge.rc:5286
msgid "3rd"
msgstr ""
#. IDS_PLUGIN_TARGETS_1ST_2ND
-#: Merge.rc:5277
+#: Merge.rc:5287
msgid "1st and 2nd"
msgstr ""
#. IDS_PLUGIN_TARGETS_1ST_3RD
-#: Merge.rc:5278
+#: Merge.rc:5288
msgid "1st and 3rd"
msgstr ""
#. IDS_PLUGIN_TARGETS_2ND_3RD
-#: Merge.rc:5279
+#: Merge.rc:5289
msgid "2nd and 3rd"
msgstr ""
#. IDS_FILTER_APPLIED
-#: Merge.rc:5284
+#: Merge.rc:5294
msgid "Filter applied"
msgstr ""
#. IDS_FILTERMENU_COMPARE
-#: Merge.rc:5289
+#: Merge.rc:5299
#, c-format
msgid "Compare %1"
msgstr ""
#. IDS_FILTERMENU_FILTER_BY_THIS_COLUMN
-#: Merge.rc:5290
+#: Merge.rc:5300
msgid "&Filter by This Column"
msgstr ""
#. IDS_FILTERMENU_FILTER_BY_THIS_COLUMN2
-#: Merge.rc:5291
+#: Merge.rc:5301
msgid "&Filter by This Column..."
msgstr ""
#. IDS_CLIPBOARDHISTORY_TIME
-#: Merge.rc:5296
+#: Merge.rc:5306
#, c-format
msgid "Clipboard at %s"
msgstr ""
#. IDS_CLIPBOARDHISTORY_DISABLED
-#: Merge.rc:5297
+#: Merge.rc:5307
msgid "Clipboard history disabled.\r\nEnable: Windows logo key + V, then Turn on."
msgstr ""
-#: Merge.rc:5299
+#: Merge.rc:5309
msgid "This system does not support clipboard history."
msgstr ""
-#: Merge.rc:5301
+#: Merge.rc:5311
msgid "32-bit WinMerge does not support Clipboard Compare"
msgstr ""
#. IDS_WEBVIEW2_RUNTIME_NOT_INSTALLED
-#: Merge.rc:5306
+#: Merge.rc:5316
msgid "WebView2 runtime not installed. Download it?"
msgstr ""
#. IDS_JUMPLIST_NEW_TEXT_COMPARE
-#: Merge.rc:5311
+#: Merge.rc:5321
msgid "New Text Compare"
msgstr ""
#. IDS_JUMPLIST_NEW_TABLE_COMPARE
-#: Merge.rc:5312
+#: Merge.rc:5322
msgid "New Table Compare"
msgstr ""
#. IDS_JUMPLIST_NEW_BINARY_COMPARE
-#: Merge.rc:5313
+#: Merge.rc:5323
msgid "New Binary Compare"
msgstr ""
#. IDS_JUMPLIST_NEW_IMAGE_COMPARE
-#: Merge.rc:5314
+#: Merge.rc:5324
msgid "New Image Compare"
msgstr ""
#. IDS_JUMPLIST_NEW_WEBPAGE_COMPARE
-#: Merge.rc:5315
+#: Merge.rc:5325
msgid "New Webpage Compare"
msgstr ""
+#. IDS_JUMPLIST_NEW_FOLDER_COMPARE
+#: Merge.rc:5326
+msgid "New Folder Compare"
+msgstr ""
+
#. IDS_JUMPLIST_CLIPBOARD_COMPARE
-#: Merge.rc:5316
+#: Merge.rc:5327
msgid "Clipboard Compare"
msgstr ""
#. IDS_PREVIEWBAR_PRINT
-#: Merge.rc:5321
+#: Merge.rc:5332
msgid "&Print..."
msgstr ""
#. IDS_PREVIEWBAR_PREVPAGE
-#: Merge.rc:5323
+#: Merge.rc:5334
msgid "Pre&v Page"
msgstr ""
#. IDS_PREVIEWBAR_TWOPAGE
-#: Merge.rc:5324
+#: Merge.rc:5335
msgid "&Two Page"
msgstr ""
#. IDS_PREVIEWBAR_ONEPAGE
-#: Merge.rc:5325
+#: Merge.rc:5336
msgid "&One Page"
msgstr ""
#. IDS_PREVIEWBAR_ZOOMIN
-#: Merge.rc:5326
+#: Merge.rc:5337
msgid "Zoom &In"
msgstr ""
#. IDS_PREVIEWBAR_ZOOMOUT
-#: Merge.rc:5327
+#: Merge.rc:5338
msgid "Zoom &Out"
msgstr ""
#. IDS_WEBPAGE_COMPARING
-#: Merge.rc:5333
+#: Merge.rc:5344
msgid "Comparing..."
msgstr ""
#. IDS_WEBPAGE_ZOOM
-#: Merge.rc:5334
+#: Merge.rc:5345
msgid "Zoom:"
msgstr ""
#. IDS_COPY_GRANULARITY_DIFFHUNK
-#: Merge.rc:5339
+#: Merge.rc:5350
msgid "Diff hunk"
msgstr ""
#. IDS_COPY_GRANULARITY_INLINE
-#: Merge.rc:5340
+#: Merge.rc:5351
msgid "Inline diff"
msgstr ""
#. IDS_COPY_GRANULARITY_LINE
-#: Merge.rc:5341
+#: Merge.rc:5352
msgid "Line"
msgstr ""
-#: Merge.rc:5342
+#: Merge.rc:5353
msgid "Character"
msgstr ""
#. ID_MICE_PREVDIFF
-#: Merge.rc:5347
+#: Merge.rc:5358
msgid "\nPrevious Difference (Alt+Up)\n(Right Button+Wheel Up)\n(Alt+Wheel Up)"
msgstr ""
#. ID_MICE_NEXTDIFF
-#: Merge.rc:5348
+#: Merge.rc:5359
msgid "\nNext Difference (Alt+Down)\n(Right Button+Wheel Down)\n(Alt+Wheel Down)"
msgstr ""
#. ID_MICE_L2R
-#: Merge.rc:5349
+#: Merge.rc:5360
msgid "\nCopy to Right (Alt+Right)\n(Right Button+Wheel Right)\n(Alt+Wheel Right)\n(Alt+Shift+Wheel Down)"
msgstr ""
#. ID_MICE_R2L
-#: Merge.rc:5350
+#: Merge.rc:5361
msgid "\nCopy to Left (Alt+Left)\n(Right Button+Wheel Left)\n(Alt+Wheel Left)\n(Alt+Shift+Wheel Up)"
msgstr ""
#. ID_MICE_L2RNEXT
-#: Merge.rc:5351
+#: Merge.rc:5362
msgid "\nCopy to Right and Advance (Ctrl+Alt+Right)\n(Ctrl+Alt+Wheel Right)\n(Ctrl+Alt+Shift+Wheel Down)"
msgstr ""
#. ID_MICE_R2LNEXT
-#: Merge.rc:5352
+#: Merge.rc:5363
msgid "\nCopy to Left and Advance (Ctrl+Alt+Left)\n(Ctrl+Alt+Wheel Left)\n(Ctrl+Alt+Shift+Wheel Up)"
msgstr ""
#. IDS_LOG_COMPARING_2
-#: Merge.rc:5362
+#: Merge.rc:5373
#, c-format
msgid "Comparing %1 with %2"
msgstr ""
#. IDS_LOG_COMPARING_3
-#: Merge.rc:5363
+#: Merge.rc:5374
#, c-format
msgid "Comparing %1 with %2 and %3"
msgstr ""
#. IDS_LOG_COMPARE_COMPLETED
-#: Merge.rc:5364
+#: Merge.rc:5375
msgid "Comparison completed"
msgstr ""
#. IDS_LOG_COMPARE_ERROR_2
-#: Merge.rc:5365
+#: Merge.rc:5376
#, c-format
msgid "Failed to compare %1 with %2: "
msgstr ""
#. IDS_LOG_COMPARE_ERROR_3
-#: Merge.rc:5366
+#: Merge.rc:5377
#, c-format
msgid "Failed to compare %1 with %2 and %3: "
msgstr ""
#. IDS_LOG_FILE_SAVED
-#: Merge.rc:5367
+#: Merge.rc:5378
msgid "File saved"
msgstr ""
#. IDS_LOG_COPYING_FILES
-#: Merge.rc:5368
+#: Merge.rc:5379
msgid "Copying files..."
msgstr ""
#. IDS_LOG_MOVING_FILES
-#: Merge.rc:5369
+#: Merge.rc:5380
msgid "Moving files..."
msgstr ""
#. IDS_LOG_DELETING_FILES
-#: Merge.rc:5370
+#: Merge.rc:5381
msgid "Deleting files..."
msgstr ""
#. IDS_LOG_RECYCLEBIN
-#: Merge.rc:5371
+#: Merge.rc:5382
msgid "Recycle Bin"
msgstr ""
#. IDS_LOG_PERMANENTLY_DELETED
-#: Merge.rc:5372
+#: Merge.rc:5383
msgid "Permanently deleted"
msgstr ""
#. IDS_LOG_FILEOPERATION_COMPLETED
-#: Merge.rc:5373
+#: Merge.rc:5384
msgid "File operation completed successfully"
msgstr ""
#. IDS_LOG_FILEOPERATION_CANCELED
-#: Merge.rc:5374
+#: Merge.rc:5385
msgid "File operation canceled"
msgstr ""
#. IDS_FILTER_ERROR_NO_ERROR
-#: Merge.rc:5379
+#: Merge.rc:5390
msgid "No error"
msgstr ""
#. IDS_FILTER_ERROR_EMPTY_EXPRESSION
-#: Merge.rc:5380
+#: Merge.rc:5391
msgid "Filter expression is empty"
msgstr ""
#. IDS_FILTER_ERROR_UNKNOWN_CHAR
-#: Merge.rc:5381
+#: Merge.rc:5392
msgid "Unknown character in filter expression"
msgstr ""
#. IDS_FILTER_ERROR_UNTERMINATED_STRING
-#: Merge.rc:5382
+#: Merge.rc:5393
msgid "Unterminated string literal"
msgstr ""
#. IDS_FILTER_ERROR_SYNTAX_ERROR
-#: Merge.rc:5383
+#: Merge.rc:5394
msgid "Syntax error in filter expression"
msgstr ""
#. IDS_FILTER_ERROR_PARSE_FAILURE
-#: Merge.rc:5384
+#: Merge.rc:5395
msgid "Failed to parse filter expression"
msgstr ""
#. IDS_FILTER_ERROR_INVALID_LITERAL
-#: Merge.rc:5385
+#: Merge.rc:5396
msgid "Invalid literal value"
msgstr ""
#. IDS_FILTER_ERROR_INVALID_REGULAR_EXPRESSION
-#: Merge.rc:5386
+#: Merge.rc:5397
msgid "Invalid regular expression"
msgstr ""
#. IDS_FILTER_ERROR_UNDEFINED_IDENTIFIER
-#: Merge.rc:5387
+#: Merge.rc:5398
msgid "Undefined identifier"
msgstr ""
#. IDS_FILTER_ERROR_INVALID_ARGUMENT_COUNT
-#: Merge.rc:5388
+#: Merge.rc:5399
msgid "Invalid number of arguments"
msgstr ""
#. IDS_FILTER_ERROR_FILTER_NAME_NOT_FOUND
-#: Merge.rc:5389
+#: Merge.rc:5400
msgid "Filter name not found"
msgstr ""
#. IDS_FILTER_ERROR_DIVIDE_BY_ZERO
-#: Merge.rc:5390
+#: Merge.rc:5401
msgid "Division by zero in filter expression"
msgstr ""
#. IDS_FILTER_ERROR_UNKNOWN_ERROR
-#: Merge.rc:5391
+#: Merge.rc:5402
msgid "Unknown error"
msgstr ""
#. IDS_FILTER_ERROR_INVALID_PROPERTY_NAME
-#: Merge.rc:5392
+#: Merge.rc:5403
msgid "Invalid property name"
msgstr ""
#. IDS_FILTER_ERROR_INVALID_DIRECTIVE
-#: Merge.rc:5393
+#: Merge.rc:5404
msgid "Invalid directive"
msgstr ""
#. IDS_FILTER_OP_EQUALS
-#: Merge.rc:5398
+#: Merge.rc:5409
msgid "Equals"
msgstr ""
#. IDS_FILTER_OP_NOT_EQUALS
-#: Merge.rc:5399
+#: Merge.rc:5410
msgid "Does not equal"
msgstr ""
#. IDS_FILTER_OP_LESS_THAN
-#: Merge.rc:5400
+#: Merge.rc:5411
msgid "Less than"
msgstr ""
#. IDS_FILTER_OP_LESS_EQUAL
-#: Merge.rc:5401
+#: Merge.rc:5412
msgid "Less than or equal to"
msgstr ""
#. IDS_FILTER_OP_GREATER_EQUAL
-#: Merge.rc:5402
+#: Merge.rc:5413
msgid "Greater than or equal to"
msgstr ""
#. IDS_FILTER_OP_GREATER_THAN
-#: Merge.rc:5403
+#: Merge.rc:5414
msgid "Greater than"
msgstr ""
#. IDS_FILTER_OP_BETWEEN
-#: Merge.rc:5404
+#: Merge.rc:5415
msgid "Between"
msgstr ""
#. IDS_FILTER_OP_NOT_BETWEEN
-#: Merge.rc:5405
+#: Merge.rc:5416
msgid "Not Between"
msgstr ""
#. IDS_FILTER_OP_CONTAINS
-#: Merge.rc:5406
+#: Merge.rc:5417
msgid "Contains"
msgstr ""
#. IDS_FILTER_OP_NOT_CONTAINS
-#: Merge.rc:5407
+#: Merge.rc:5418
msgid "Not Contains"
msgstr ""
#. IDS_FILTER_OP_RECONTAINS
-#: Merge.rc:5408
+#: Merge.rc:5419
msgid "Contains (regex)"
msgstr ""
#. IDS_FILTER_OP_NOT_RECONTAINS
-#: Merge.rc:5409
+#: Merge.rc:5420
msgid "Not Contains (regex)"
msgstr ""
#. IDS_FILTER_OP_LIKE
-#: Merge.rc:5410
+#: Merge.rc:5421
msgid "Match (wildcard)"
msgstr ""
#. IDS_FILTER_OP_NOT_LIKE
-#: Merge.rc:5411
+#: Merge.rc:5422
msgid "Not match (wildcard)"
msgstr ""
#. IDS_FILTER_OP_MATCHES
-#: Merge.rc:5412
+#: Merge.rc:5423
msgid "Match (regex)"
msgstr ""
#. IDS_FILTER_OP_NOT_MATCHES
-#: Merge.rc:5413
+#: Merge.rc:5424
msgid "Not match (regex)"
msgstr ""
#. IDS_COLORMODE_LIGHT
-#: Merge.rc:5418
+#: Merge.rc:5429
msgid "Light"
msgstr ""
#. IDS_COLORMODE_DARK
-#: Merge.rc:5419
+#: Merge.rc:5430
msgid "Dark"
msgstr ""
#. IDS_COLORMODE_FOLLOWSYSTEM
-#: Merge.rc:5420
+#: Merge.rc:5431
msgid "Follow system"
msgstr ""
#. IDS_EXAMPLE
-#: Merge.rc:5425
+#: Merge.rc:5436
#, c-format
msgid "e.g. %1"
msgstr ""
#. IDS_DETECTED_PREVIOUS_CRASH
-#: Merge.rc:5430
+#: Merge.rc:5441
msgid "WinMerge detected a previous crash. Please report this if possible."
msgstr ""
#. IDS_REGEX_REPLACE_LIST_TEMPLATE
-#: Merge.rc:5435
+#: Merge.rc:5446
msgid "# Regex replacement list\r\n# Format: regexreplacement\r\n# Backreferences like $1, $2 are supported\r\n\r\n(\\d{4})-(\\d{2})-(\\d{2})\t$1_$2_$3\r\n"
msgstr ""
#. IDS_STRING_REPLACE_LIST_TEMPLATE
-#: Merge.rc:5436
+#: Merge.rc:5447
msgid "# Replacement list\r\n# Format: searchreplacement\r\n# Lines starting with # are ignored\r\n\r\nfrom1\tto1\r\nfrom2\tto2\r\n"
msgstr ""
diff --git a/Translations/WinMerge/Dutch.po b/Translations/WinMerge/Dutch.po
index fff53ad18e6..216a113c179 100644
--- a/Translations/WinMerge/Dutch.po
+++ b/Translations/WinMerge/Dutch.po
@@ -21,7 +21,7 @@ msgstr ""
"X-Poedit-SourceCharset: UTF-8\n"
#. LANGUAGE, SUBLANGUAGE
-#: Merge.rc:26 Merge.rc:59 Merge.rc:5453
+#: Merge.rc:26 Merge.rc:59 Merge.rc:5464
msgid "LANG_ENGLISH, SUBLANG_ENGLISH_US"
msgstr "LANG_DUTCH, SUBLANG_DUTCH"
@@ -106,7 +106,7 @@ msgid "Copy Selected Diff (Right) to Clipboard\tCtrl+&3"
msgstr "Geselecteerd verschil (rechts) naar klembord kopiëren\tCtrl+&3"
#. IDR_MERGEDOCTYPE, ID_SELECTLINEDIFF
-#: Merge.rc:110 Merge.rc:673
+#: Merge.rc:110 Merge.rc:680
msgid "Select Line &Difference\tF4"
msgstr "Regelverschil selecteren\tF4"
@@ -136,7 +136,7 @@ msgid "Cu&t"
msgstr "Knippen"
#. IDR_POPUP_DIRVIEW
-#: Merge.rc:118 Merge.rc:943
+#: Merge.rc:118 Merge.rc:951
msgid "&Copy"
msgstr "Kopiëren"
@@ -146,19 +146,19 @@ msgid "&Paste"
msgstr "Plakken"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:121 Merge.rc:875 Merge.rc:882
+#: Merge.rc:121 Merge.rc:882 Merge.rc:889
msgid "&Scripts"
msgstr "Scripts"
#. IDS_NO_EDIT_SCRIPTS
-#: Merge.rc:123 Merge.rc:338 Merge.rc:447 Merge.rc:654 Merge.rc:659
-#: Merge.rc:865 Merge.rc:877 Merge.rc:884 Merge.rc:940 Merge.rc:1183
-#: Merge.rc:5028
+#: Merge.rc:123 Merge.rc:340 Merge.rc:451 Merge.rc:661 Merge.rc:666
+#: Merge.rc:872 Merge.rc:884 Merge.rc:891 Merge.rc:948 Merge.rc:1193
+#: Merge.rc:5038
msgid "< Empty >"
msgstr "< Leeg >"
#. IDR_POPUP_LOCATIONBAR, ID_EDIT_WMGOTO
-#: Merge.rc:126 Merge.rc:691 Merge.rc:1081
+#: Merge.rc:126 Merge.rc:698 Merge.rc:1089
msgid "&Go to...\tCtrl+G"
msgstr "Gaan naar...\tCtrl+G"
@@ -178,27 +178,27 @@ msgid "Op&en"
msgstr "Openen"
#. IDR_POPUP_DIRVIEW, ID_DIR_OPEN_RIGHT
-#: Merge.rc:132 Merge.rc:981 Merge.rc:988 Merge.rc:995
+#: Merge.rc:132 Merge.rc:989 Merge.rc:996 Merge.rc:1003
msgid "With &Registered Application"
msgstr "Met geregistreerde toepassing"
#. IDR_POPUP_DIRVIEW, ID_DIR_OPEN_RIGHT_WITHEDITOR
-#: Merge.rc:133 Merge.rc:982 Merge.rc:989 Merge.rc:996
+#: Merge.rc:133 Merge.rc:990 Merge.rc:997 Merge.rc:1004
msgid "With &External Editor\tCtrl+Alt+E"
msgstr "Met externe editor\tCtrl+Alt+E"
#. IDR_POPUP_DIRVIEW, ID_DIR_OPEN_RIGHT_WITH
-#: Merge.rc:134 Merge.rc:983 Merge.rc:990 Merge.rc:997
+#: Merge.rc:134 Merge.rc:991 Merge.rc:998 Merge.rc:1005
msgid "&With..."
msgstr "Met..."
#. IDR_POPUP_DIRVIEW, ID_DIR_OPEN_RIGHT_PARENT_FOLDER
-#: Merge.rc:135 Merge.rc:984 Merge.rc:991 Merge.rc:998
+#: Merge.rc:135 Merge.rc:992 Merge.rc:999 Merge.rc:1006
msgid "Open &Parent Folder..."
msgstr "Bovenliggende map openen..."
#. IDR_POPUP_IMG_CTXT, ID_FILE_SHELLMENU
-#: Merge.rc:137 Merge.rc:1239
+#: Merge.rc:137 Merge.rc:1249
msgid "S&hell Menu"
msgstr "Shellmenu"
@@ -233,8 +233,8 @@ msgid "Ins&ertion/Deletion Detection"
msgstr "Detectie van invoeging/verwijdering"
#. IDR_MERGEDOCTYPE, ID_TOOLBAR_NONE
-#: Merge.rc:176 Merge.rc:209 Merge.rc:216 Merge.rc:358 Merge.rc:507
-#: Merge.rc:751
+#: Merge.rc:176 Merge.rc:209 Merge.rc:216 Merge.rc:360 Merge.rc:511
+#: Merge.rc:758
msgid "&None"
msgstr "Geen"
@@ -249,12 +249,12 @@ msgid "&Horizontal"
msgstr "Horizontaal"
#. IDR_POPUP_IMG_CTXT, ID_IMG_CURPANE_PREVPAGE
-#: Merge.rc:181 Merge.rc:189 Merge.rc:1230
+#: Merge.rc:181 Merge.rc:189 Merge.rc:1240
msgid "&Previous Page"
msgstr "Vorige pagina"
#. IDS_PREVIEWBAR_NEXTPAGE
-#: Merge.rc:182 Merge.rc:190 Merge.rc:1231 Merge.rc:5322
+#: Merge.rc:182 Merge.rc:190 Merge.rc:1241 Merge.rc:5333
msgid "&Next Page"
msgstr "Volgende pagina"
@@ -264,42 +264,42 @@ msgid "&Active Pane"
msgstr "Actief venster"
#. IDR_POPUP_IMG_CTXT, ID_IMG_CURPANE_ROTATE_RIGHT_90
-#: Merge.rc:185 Merge.rc:1225
+#: Merge.rc:185 Merge.rc:1235
msgid "Rotate &Right 90deg"
msgstr "90 graden rechtsom roteren"
#. IDR_POPUP_IMG_CTXT, ID_IMG_CURPANE_ROTATE_LEFT_90
-#: Merge.rc:186 Merge.rc:1226
+#: Merge.rc:186 Merge.rc:1236
msgid "Rotate &Left 90deg"
msgstr "90 graden linksom roteren"
#. IDR_POPUP_IMG_CTXT, ID_IMG_CURPANE_FLIP_VERTICALLY
-#: Merge.rc:187 Merge.rc:1227
+#: Merge.rc:187 Merge.rc:1237
msgid "Flip V&ertically"
msgstr "Verticaal omdraaien"
#. IDR_POPUP_IMG_CTXT, ID_IMG_CURPANE_FLIP_HORIZONTALLY
-#: Merge.rc:188 Merge.rc:1228
+#: Merge.rc:188 Merge.rc:1238
msgid "Flip H&orizontally"
msgstr "Horizontaal omdraaien"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:193 Merge.rc:699
+#: Merge.rc:193 Merge.rc:706
msgid "&Zoom"
msgstr "Zoomen"
#. IDR_MERGEDOCTYPE, ID_VIEW_ZOOMIN
-#: Merge.rc:202 Merge.rc:701
+#: Merge.rc:202 Merge.rc:708
msgid "Zoom &In\tCtrl++"
msgstr "Inzoomen\tCtrl++"
#. IDR_MERGEDOCTYPE, ID_VIEW_ZOOMOUT
-#: Merge.rc:203 Merge.rc:702
+#: Merge.rc:203 Merge.rc:709
msgid "Zoom &Out\tCtrl+-"
msgstr "Uitzoomen\tCtrl+-"
#. IDR_MERGEDOCTYPE, ID_VIEW_ZOOMNORMAL, Zoom to normal
-#: Merge.rc:205 Merge.rc:704
+#: Merge.rc:205 Merge.rc:711
msgid "&Normal\tCtrl+*"
msgstr "Normaal\tCtrl+*"
@@ -324,27 +324,27 @@ msgid "Dragging &Mode"
msgstr "Sleepmodus"
#. IDR_POPUP_IMG_CTXT, ID_IMG_DRAGGINGMODE_MOVE
-#: Merge.rc:217 Merge.rc:955 Merge.rc:1233
+#: Merge.rc:217 Merge.rc:963 Merge.rc:1243
msgid "&Move"
msgstr "Verplaatsen"
#. IDR_POPUP_IMG_CTXT, ID_IMG_DRAGGINGMODE_ADJUST_OFFSET
-#: Merge.rc:218 Merge.rc:1234
+#: Merge.rc:218 Merge.rc:1244
msgid "&Adjust Offset"
msgstr "Offset aanpassen"
#. IDR_POPUP_IMG_CTXT, ID_IMG_DRAGGINGMODE_VERTICAL_WIPE
-#: Merge.rc:219 Merge.rc:1235
+#: Merge.rc:219 Merge.rc:1245
msgid "&Vertical Wipe"
msgstr "Verticaal uitvegen"
#. IDR_POPUP_IMG_CTXT, ID_IMG_DRAGGINGMODE_HORIZONTAL_WIPE
-#: Merge.rc:220 Merge.rc:1236
+#: Merge.rc:220 Merge.rc:1246
msgid "&Horizontal Wipe"
msgstr "Horizontaal uitvegen"
#. IDR_POPUP_IMG_CTXT, ID_IMG_DRAGGINGMODE_RECTANGLE_SELECT
-#: Merge.rc:221 Merge.rc:1237
+#: Merge.rc:221 Merge.rc:1247
msgid "Rectangle &Select"
msgstr "Rechthoekige selectie"
@@ -379,37 +379,37 @@ msgid "Compare Extracted &Text from Images"
msgstr "Uitgepakte tekst van afbeeldingen vergelijken"
#. IDD_OPEN, IDOK
-#: Merge.rc:272 Merge.rc:1980
+#: Merge.rc:272 Merge.rc:1990
msgid "Co&mpare"
msgstr "Vergelijken"
#. IDR_POPUP_WEBPAGE_COMPARE, ID_WEB_COMPARE_SCREENSHOTS
-#: Merge.rc:274 Merge.rc:1247
+#: Merge.rc:274 Merge.rc:1257
msgid "&Screenshots"
msgstr "Screenshots"
#. IDR_POPUP_WEBPAGE_COMPARE, ID_WEB_COMPARE_FULLSIZE_SCREENSHOTS
-#: Merge.rc:275 Merge.rc:1248
+#: Merge.rc:275 Merge.rc:1258
msgid "&Full Size Screenshots"
msgstr "Screenshots volledige grootte"
#. IDR_POPUP_WEBPAGE_COMPARE, ID_WEB_COMPARE_HTMLS
-#: Merge.rc:276 Merge.rc:1249
+#: Merge.rc:276 Merge.rc:1259
msgid "&HTMLs"
msgstr "HTML's"
#. IDR_POPUP_WEBPAGE_COMPARE, ID_WEB_COMPARE_TEXTS
-#: Merge.rc:277 Merge.rc:1250
+#: Merge.rc:277 Merge.rc:1260
msgid "&Texts"
msgstr "Teksten"
#. IDR_POPUP_WEBPAGE_COMPARE, ID_WEB_COMPARE_RESOURCETREES
-#: Merge.rc:278 Merge.rc:1251
+#: Merge.rc:278 Merge.rc:1261
msgid "&Resource Trees"
msgstr "Bron-boomstructuren"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_SIZE
-#: Merge.rc:280 Merge.rc:1775
+#: Merge.rc:280 Merge.rc:1785
msgid "&Size"
msgstr "Grootte"
@@ -424,27 +424,27 @@ msgid "&Event Sync"
msgstr "Gebeurtenis sync"
#. IDR_POPUP_WEBPAGE_SYNC_EVENTS, ID_WEB_SYNC_ENABLED
-#: Merge.rc:291 Merge.rc:1259
+#: Merge.rc:291 Merge.rc:1269
msgid "&Enabled"
msgstr "Ingeschakeld"
#. IDR_POPUP_WEBPAGE_SYNC_EVENTS, ID_WEB_SYNC_SCROLL
-#: Merge.rc:293 Merge.rc:1261
+#: Merge.rc:293 Merge.rc:1271
msgid "&Scroll"
msgstr "Scrollen"
#. IDR_POPUP_WEBPAGE_SYNC_EVENTS, ID_WEB_SYNC_CLICK
-#: Merge.rc:294 Merge.rc:1262
+#: Merge.rc:294 Merge.rc:1272
msgid "&Click"
msgstr "Klikken"
#. IDR_POPUP_WEBPAGE_SYNC_EVENTS, ID_WEB_SYNC_INPUT
-#: Merge.rc:295 Merge.rc:1263
+#: Merge.rc:295 Merge.rc:1273
msgid "&Input"
msgstr "Invoer"
#. IDR_POPUP_WEBPAGE_SYNC_EVENTS, ID_WEB_SYNC_GOBACKFORWARD
-#: Merge.rc:296 Merge.rc:1264
+#: Merge.rc:296 Merge.rc:1274
msgid "&Go Back/Forward"
msgstr "Teruggaan/verdergaan"
@@ -474,2668 +474,2679 @@ msgid "&All Profiles"
msgstr "Volledig profiel"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:310 Merge.rc:411 Merge.rc:586
+#: Merge.rc:310 Merge.rc:413 Merge.rc:590
msgid "&File"
msgstr "Bestand"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:312 Merge.rc:413 Merge.rc:588
+#: Merge.rc:312 Merge.rc:415 Merge.rc:592
msgid "&New"
msgstr "Nieuw"
#. IDR_POPUP_COMPARE, ID_MERGE_COMPARE_TEXT
-#: Merge.rc:314 Merge.rc:322 Merge.rc:415 Merge.rc:423 Merge.rc:590
-#: Merge.rc:598 Merge.rc:649 Merge.rc:935 Merge.rc:1159 Merge.rc:1171
+#: Merge.rc:314 Merge.rc:323 Merge.rc:417 Merge.rc:426 Merge.rc:594
+#: Merge.rc:603 Merge.rc:655 Merge.rc:942 Merge.rc:1167 Merge.rc:1180
msgid "&Text"
msgstr "Tekst"
#. IDR_POPUP_COMPARE, ID_MERGE_COMPARE_TABLE
-#: Merge.rc:315 Merge.rc:323 Merge.rc:416 Merge.rc:424 Merge.rc:591
-#: Merge.rc:599 Merge.rc:650 Merge.rc:936 Merge.rc:1160 Merge.rc:1172
+#: Merge.rc:315 Merge.rc:324 Merge.rc:418 Merge.rc:427 Merge.rc:595
+#: Merge.rc:604 Merge.rc:656 Merge.rc:943 Merge.rc:1168 Merge.rc:1181
msgid "T&able"
msgstr "Tabel"
#. IDR_POPUP_COMPARE, ID_MERGE_COMPARE_HEX
-#: Merge.rc:316 Merge.rc:324 Merge.rc:417 Merge.rc:425 Merge.rc:592
-#: Merge.rc:600 Merge.rc:651 Merge.rc:937 Merge.rc:1161 Merge.rc:1173
+#: Merge.rc:316 Merge.rc:325 Merge.rc:419 Merge.rc:428 Merge.rc:596
+#: Merge.rc:605 Merge.rc:657 Merge.rc:944 Merge.rc:1169 Merge.rc:1182
msgid "&Binary"
msgstr "Binair"
#. IDS_IMAGE_MENU
-#: Merge.rc:317 Merge.rc:325 Merge.rc:418 Merge.rc:426 Merge.rc:593
-#: Merge.rc:601 Merge.rc:652 Merge.rc:938 Merge.rc:1162 Merge.rc:1174
-#: Merge.rc:5123
+#: Merge.rc:317 Merge.rc:326 Merge.rc:420 Merge.rc:429 Merge.rc:597
+#: Merge.rc:606 Merge.rc:658 Merge.rc:945 Merge.rc:1170 Merge.rc:1183
+#: Merge.rc:5133
msgid "&Image"
msgstr "Afbeelding"
#. IDR_POPUP_COMPARE, ID_MERGE_COMPARE_WEBPAGE
-#: Merge.rc:318 Merge.rc:326 Merge.rc:419 Merge.rc:427 Merge.rc:594
-#: Merge.rc:602 Merge.rc:653 Merge.rc:939 Merge.rc:1163 Merge.rc:1175
+#: Merge.rc:318 Merge.rc:327 Merge.rc:421 Merge.rc:430 Merge.rc:598
+#: Merge.rc:607 Merge.rc:659 Merge.rc:946 Merge.rc:1171 Merge.rc:1184
msgid "&Webpage"
msgstr "Webpagina"
+#. IDR_POPUP_NEW, ID_FILE_NEW_FOLDER
+#: Merge.rc:319 Merge.rc:328 Merge.rc:422 Merge.rc:431 Merge.rc:599
+#: Merge.rc:608 Merge.rc:1172
+msgid "&Folder"
+msgstr ""
+
#. IDR_MERGEDOCTYPE
-#: Merge.rc:320 Merge.rc:421 Merge.rc:596
+#: Merge.rc:321 Merge.rc:424 Merge.rc:601
msgid "New (&3 panes)"
msgstr "Nieuw (3 vensters)"
#. IDR_MERGEDOCTYPE, ID_FILE_OPEN
-#: Merge.rc:328 Merge.rc:429 Merge.rc:604
+#: Merge.rc:330 Merge.rc:433 Merge.rc:610
msgid "&Open...\tCtrl+O"
msgstr "Openen...\tCtrl+O"
#. IDR_MERGEDOCTYPE, ID_FILE_OPENCONFLICT
-#: Merge.rc:329 Merge.rc:430 Merge.rc:605
+#: Merge.rc:331 Merge.rc:434 Merge.rc:611
msgid "Open Conflic&t File..."
msgstr "Conflictbestand openen..."
#. IDR_MERGEDOCTYPE, ID_FILE_OPENCLIPBOARD
-#: Merge.rc:330 Merge.rc:431 Merge.rc:606
+#: Merge.rc:332 Merge.rc:435 Merge.rc:612
msgid "Open C&lipboard"
msgstr "Klembord openen"
#. IDR_POPUP_PROJECT, ID_FILE_OPENPROJECT
-#: Merge.rc:332 Merge.rc:433 Merge.rc:608 Merge.rc:1191
+#: Merge.rc:334 Merge.rc:437 Merge.rc:614 Merge.rc:1201
msgid "Open Pro&ject...\tCtrl+J"
msgstr "Project openen...\tCtrl+J"
#. IDD_OPEN, ID_SAVE_PROJECT
-#: Merge.rc:333 Merge.rc:434 Merge.rc:609 Merge.rc:1193 Merge.rc:1979
+#: Merge.rc:335 Merge.rc:438 Merge.rc:615 Merge.rc:1203 Merge.rc:1989
msgid "Sa&ve Project..."
msgstr "Project opslaan..."
#. IDR_MAINFRAME, ID_FILE_PROJECT_MRU_FIRST
-#: Merge.rc:335
+#: Merge.rc:337
msgid "Recent Projects"
msgstr "Recente Projecten"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:336 Merge.rc:445 Merge.rc:657
+#: Merge.rc:338 Merge.rc:449 Merge.rc:664
msgid "Recent F&iles or Folders"
msgstr "Recente bestanden of mappen"
#. IDR_MERGEDOCTYPE, ID_APP_EXIT
-#: Merge.rc:341 Merge.rc:450 Merge.rc:662
+#: Merge.rc:343 Merge.rc:454 Merge.rc:669
msgid "E&xit\tCtrl+Q"
msgstr "Afsluiten\tCtrl+Q"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:343 Merge.rc:452 Merge.rc:664
+#: Merge.rc:345 Merge.rc:456 Merge.rc:671
msgid "&Edit"
msgstr "Bewerken"
#. IDR_MERGEDOCTYPE, ID_EDIT_PASTE
-#: Merge.rc:345 Merge.rc:671
+#: Merge.rc:347 Merge.rc:678
msgid "&Paste\tCtrl+V"
msgstr "Plakken\tCtrl+V"
#. IDR_MERGEDOCTYPE, ID_OPTIONS
-#: Merge.rc:347 Merge.rc:456 Merge.rc:693
+#: Merge.rc:349 Merge.rc:460 Merge.rc:700
msgid "&Options...\tCtrl+,"
msgstr "Opties...\tCtrl+,"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:349 Merge.rc:458 Merge.rc:695
+#: Merge.rc:351 Merge.rc:462 Merge.rc:702
msgid "&View"
msgstr "Beeld"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:351 Merge.rc:500 Merge.rc:744
+#: Merge.rc:353 Merge.rc:504 Merge.rc:751
msgid "Ta&b Bar"
msgstr "Tab-balk"
#. IDR_MERGEDOCTYPE, ID_VIEW_TAB_BAR
-#: Merge.rc:353 Merge.rc:502 Merge.rc:746
+#: Merge.rc:355 Merge.rc:506 Merge.rc:753
msgid "&View Tab Bar"
msgstr "Tabbalk weergeven"
#. IDR_MERGEDOCTYPE, ID_VIEW_TAB_BAR_ON_TITLE_BAR
-#: Merge.rc:354 Merge.rc:503 Merge.rc:747
+#: Merge.rc:356 Merge.rc:507 Merge.rc:754
msgid "&On Title Bar"
msgstr "Op titelbalk"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:356 Merge.rc:505 Merge.rc:749
+#: Merge.rc:358 Merge.rc:509 Merge.rc:756
msgid "&Toolbar"
msgstr "Werkbalk"
#. IDR_MERGEDOCTYPE, ID_TOOLBAR_SMALL
-#: Merge.rc:359 Merge.rc:508 Merge.rc:752
+#: Merge.rc:361 Merge.rc:512 Merge.rc:759
msgid "&Small"
msgstr "Klein"
#. IDR_MERGEDOCTYPE, ID_TOOLBAR_MEDIUM
-#: Merge.rc:360 Merge.rc:509 Merge.rc:753
+#: Merge.rc:362 Merge.rc:513 Merge.rc:760
msgid "&Medium"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_TOOLBAR_BIG
-#: Merge.rc:361 Merge.rc:510 Merge.rc:754
+#: Merge.rc:363 Merge.rc:514 Merge.rc:761
msgid "&Big"
msgstr "Groot"
#. IDR_MERGEDOCTYPE, ID_TOOLBAR_HUGE
-#: Merge.rc:362 Merge.rc:511 Merge.rc:755
+#: Merge.rc:364 Merge.rc:515 Merge.rc:762
msgid "&Huge"
msgstr "Enorm"
#. IDS_VIEW_MENU_BAR
-#: Merge.rc:364 Merge.rc:513 Merge.rc:757 Merge.rc:5357
+#: Merge.rc:366 Merge.rc:517 Merge.rc:764 Merge.rc:5368
msgid "Men&u Bar"
msgstr ""
#. IDR_DIRDOCTYPE, ID_VIEW_OUTPUT_BAR
-#: Merge.rc:365 Merge.rc:515
+#: Merge.rc:367 Merge.rc:519
msgid "&Output Pane"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_VIEW_STATUS_BAR
-#: Merge.rc:366 Merge.rc:516 Merge.rc:758
+#: Merge.rc:368 Merge.rc:520 Merge.rc:765
msgid "&Status Bar"
msgstr "Statusbalk"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:368 Merge.rc:539 Merge.rc:847
+#: Merge.rc:370 Merge.rc:543 Merge.rc:854
msgid "&Tools"
msgstr "Gereedschap"
#. IDR_MERGEDOCTYPE, ID_TOOLS_FILTERS
-#: Merge.rc:370 Merge.rc:542 Merge.rc:849
+#: Merge.rc:372 Merge.rc:546 Merge.rc:856
msgid "&Filters..."
msgstr "Filters..."
#. IDR_MERGEDOCTYPE, ID_TOOLS_GENERATEPATCH
-#: Merge.rc:371 Merge.rc:543 Merge.rc:850
+#: Merge.rc:373 Merge.rc:547 Merge.rc:857
msgid "&Generate Patch..."
msgstr "Patch genereren..."
#. IDR_MERGEDOCTYPE
-#: Merge.rc:373 Merge.rc:546 Merge.rc:853
+#: Merge.rc:375 Merge.rc:550 Merge.rc:860
msgid "&Plugins"
msgstr "Plugins"
#. IDD_PLUGINS_LIST, IDC_PLUGIN_SETTINGS
-#: Merge.rc:375 Merge.rc:548 Merge.rc:855 Merge.rc:2494 Merge.rc:2926
+#: Merge.rc:377 Merge.rc:552 Merge.rc:862 Merge.rc:2504 Merge.rc:2936
msgid "P&lugin Settings..."
msgstr "Plugin-instellingen..."
#. IDR_MERGEDOCTYPE, ID_PREDIFFER_MANUAL
-#: Merge.rc:377 Merge.rc:550 Merge.rc:857
+#: Merge.rc:379 Merge.rc:554 Merge.rc:864
msgid "Ma&nual Prediffer"
msgstr "Manuele voorvergelijking"
#. IDR_MERGEDOCTYPE, ID_PREDIFFER_AUTO
-#: Merge.rc:378 Merge.rc:551 Merge.rc:858
+#: Merge.rc:380 Merge.rc:555 Merge.rc:865
msgid "A&utomatic Prediffer"
msgstr "Automatische voorvergelijking"
#. IDR_MERGEDOCTYPE, ID_UNPACK_MANUAL
-#: Merge.rc:380 Merge.rc:553 Merge.rc:860
+#: Merge.rc:382 Merge.rc:557 Merge.rc:867
msgid "&Manual Unpacking"
msgstr "Handmatig uitpakken"
#. IDR_MERGEDOCTYPE, ID_UNPACK_AUTO
-#: Merge.rc:381 Merge.rc:554 Merge.rc:861
+#: Merge.rc:383 Merge.rc:558 Merge.rc:868
msgid "&Automatic Unpacking"
msgstr "Automatisch uitpakken"
#. IDR_MERGEDOCTYPE, ID_RELOAD_PLUGINS
-#: Merge.rc:383 Merge.rc:558 Merge.rc:889
+#: Merge.rc:385 Merge.rc:562 Merge.rc:896
msgid "&Reload Plugins"
msgstr "Plugins opnieuw laden"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:385 Merge.rc:560 Merge.rc:891
+#: Merge.rc:387 Merge.rc:564 Merge.rc:898
msgid "&Window"
msgstr "Venster"
#. IDR_MERGEDOCTYPE, ID_FILE_CLOSE
-#: Merge.rc:387 Merge.rc:562 Merge.rc:893
+#: Merge.rc:389 Merge.rc:566 Merge.rc:900
msgid "Cl&ose\tCtrl+W"
msgstr "Sluiten\tCtrl+W"
#. IDR_MERGEDOCTYPE, ID_WINDOW_CLOSEALL
-#: Merge.rc:388 Merge.rc:563 Merge.rc:894
+#: Merge.rc:390 Merge.rc:567 Merge.rc:901
msgid "Clo&se All"
msgstr "Alles sluiten"
#. IDR_MERGEDOCTYPE, ID_NEXT_PANE
-#: Merge.rc:390 Merge.rc:565 Merge.rc:896
+#: Merge.rc:392 Merge.rc:569 Merge.rc:903
msgid "Change &Pane\tF6"
msgstr "Venster wijzigen\tF6"
#. IDR_MERGEDOCTYPE, ID_WINDOW_TILE_HORZ
-#: Merge.rc:392 Merge.rc:567 Merge.rc:900
+#: Merge.rc:394 Merge.rc:571 Merge.rc:907
msgid "Tile &Horizontally"
msgstr "Horizontaal verdelen"
#. IDR_MERGEDOCTYPE, ID_WINDOW_TILE_VERT
-#: Merge.rc:393 Merge.rc:568 Merge.rc:901
+#: Merge.rc:395 Merge.rc:572 Merge.rc:908
msgid "Tile &Vertically"
msgstr "Verticaal verdelen"
#. IDR_MERGEDOCTYPE, ID_WINDOW_CASCADE
-#: Merge.rc:394 Merge.rc:569 Merge.rc:902
+#: Merge.rc:396 Merge.rc:573 Merge.rc:909
msgid "&Cascade"
msgstr "Trapsgewijs"
#. IDS_MESSAGEBOX_HELP
-#: Merge.rc:396 Merge.rc:571 Merge.rc:904 Merge.rc:3200 Merge.rc:4189
+#: Merge.rc:398 Merge.rc:575 Merge.rc:911 Merge.rc:3210 Merge.rc:4199
msgid "&Help"
msgstr "Help"
#. IDR_MERGEDOCTYPE, ID_HELP_CONTENTS
-#: Merge.rc:398 Merge.rc:573 Merge.rc:906
+#: Merge.rc:400 Merge.rc:577 Merge.rc:913
msgid "&WinMerge Help\tF1"
msgstr "WinMerge Help\tF1"
#. IDR_MERGEDOCTYPE, ID_HELP_RELEASENOTES
-#: Merge.rc:400 Merge.rc:575 Merge.rc:908
+#: Merge.rc:402 Merge.rc:579 Merge.rc:915
msgid "R&elease Notes"
msgstr "Vrijgave-opmerkingen"
#. IDR_MERGEDOCTYPE, ID_HELP_TRANSLATIONS
-#: Merge.rc:401 Merge.rc:576 Merge.rc:909
+#: Merge.rc:403 Merge.rc:580 Merge.rc:916
msgid "&Translations"
msgstr "Vertalingen"
#. IDR_MERGEDOCTYPE, ID_HELP_GETCONFIG
-#: Merge.rc:402 Merge.rc:577 Merge.rc:910
+#: Merge.rc:404 Merge.rc:581 Merge.rc:917
msgid "C&onfiguration"
msgstr "Configuratie"
#. IDR_MERGEDOCTYPE, ID_HELP_GNULICENSE
-#: Merge.rc:404 Merge.rc:579 Merge.rc:912
+#: Merge.rc:406 Merge.rc:583 Merge.rc:919
msgid "&GNU General Public License"
msgstr "GNU General Public License"
#. IDR_MERGEDOCTYPE, ID_APP_ABOUT
-#: Merge.rc:405 Merge.rc:580 Merge.rc:913
+#: Merge.rc:407 Merge.rc:584 Merge.rc:920
msgid "&About WinMerge..."
msgstr "Over WinMerge..."
#. IDR_MERGEDOCTYPE
-#: Merge.rc:436 Merge.rc:629
+#: Merge.rc:440 Merge.rc:635
msgid "&Read-Only"
msgstr "Alleen-lezen"
#. IDR_MERGEDOCTYPE, ID_FILE_LEFT_READONLY
-#: Merge.rc:438 Merge.rc:631
+#: Merge.rc:442 Merge.rc:637
msgid "L&eft Read-Only"
msgstr "Links alleen-lezen"
#. IDR_MERGEDOCTYPE, ID_FILE_MIDDLE_READONLY
-#: Merge.rc:439 Merge.rc:632
+#: Merge.rc:443 Merge.rc:638
msgid "M&iddle Read-Only"
msgstr "Midden alleen-lezen"
#. IDR_MERGEDOCTYPE, ID_FILE_RIGHT_READONLY
-#: Merge.rc:440 Merge.rc:633
+#: Merge.rc:444 Merge.rc:639
msgid "Ri&ght Read-Only"
msgstr "Rechts alleen-lezen"
#. IDD_ENCODINGERROR, IDC_FILEENCODING
-#: Merge.rc:443 Merge.rc:646 Merge.rc:1038 Merge.rc:3063
+#: Merge.rc:447 Merge.rc:652 Merge.rc:1046 Merge.rc:3073
msgid "&File Encoding..."
msgstr "Bestandscodering..."
#. IDR_POPUP_OUTPUTVIEW, ID_EDIT_SELECT_ALL
-#: Merge.rc:454 Merge.rc:674 Merge.rc:1343
+#: Merge.rc:458 Merge.rc:681 Merge.rc:1353
msgid "Select &All\tCtrl+A"
msgstr "Alles selecteren\tCtrl+A"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWIDENTICAL
-#: Merge.rc:460
+#: Merge.rc:464
msgid "Show &Identical Items"
msgstr "Identieke items weergeven"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWDIFFERENT
-#: Merge.rc:461
+#: Merge.rc:465
msgid "Show &Different Items"
msgstr "Verschillende items weergeven"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWUNIQUELEFT
-#: Merge.rc:462
+#: Merge.rc:466
msgid "Show L&eft Unique Items"
msgstr "Linkse unieke items weergeven"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWUNIQUEMIDDLE
-#: Merge.rc:463
+#: Merge.rc:467
msgid "Show Midd&le Unique Items"
msgstr "Middelste unieke items weergeven"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWUNIQUERIGHT
-#: Merge.rc:464
+#: Merge.rc:468
msgid "Show Ri&ght Unique Items"
msgstr "Rechtse unieke items weergeven"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWSKIPPED
-#: Merge.rc:465
+#: Merge.rc:469
msgid "Show S&kipped Items"
msgstr "Overgeslagen items weergeven"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWBINARIES
-#: Merge.rc:466
+#: Merge.rc:470
msgid "S&how Binary Files"
msgstr "Binaire bestanden weergeven"
#. IDR_DIRDOCTYPE
-#: Merge.rc:467
+#: Merge.rc:471
msgid "&3-way Compare"
msgstr "3-weg-vergelijking"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWDIFFERENTLEFTONLY
-#: Merge.rc:469
+#: Merge.rc:473
msgid "Show &Left Only Different Items"
msgstr "Alleen links verschillende items weergeven"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWDIFFERENTMIDDLEONLY
-#: Merge.rc:470
+#: Merge.rc:474
msgid "Show &Middle Only Different Items"
msgstr "Alleen midden verschillende items weergeven"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWDIFFERENTRIGHTONLY
-#: Merge.rc:471
+#: Merge.rc:475
msgid "Show &Right Only Different Items"
msgstr "Alleen rechts verschillende items weergeven"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWMISSINGLEFTONLY
-#: Merge.rc:473
+#: Merge.rc:477
msgid "Show L&eft Only Missing Items"
msgstr "Alleen links ontbrekende items weergeven"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWMISSINGMIDDLEONLY
-#: Merge.rc:474
+#: Merge.rc:478
msgid "Show Mi&ddle Only Missing Items"
msgstr "Alleen midden ontbrekende items weergeven"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWMISSINGRIGHTONLY
-#: Merge.rc:475
+#: Merge.rc:479
msgid "Show Rig&ht Only Missing Items"
msgstr "Alleen rechts ontbrekende items weergeven"
#. IDR_DIRDOCTYPE, ID_VIEW_SHOWHIDDENITEMS
-#: Merge.rc:478
+#: Merge.rc:482
msgid "Show Hidd&en Items"
msgstr "Verborgen items weergeven"
#. IDR_DIRDOCTYPE, ID_VIEW_TREEMODE
-#: Merge.rc:480
+#: Merge.rc:484
msgid "Tree &Mode"
msgstr "Boom-modus"
#. IDR_DIRDOCTYPE
-#: Merge.rc:481
+#: Merge.rc:485
msgid "E&xpand Subfolders"
msgstr "Submappen uitklappen"
#. IDR_DIRDOCTYPE, ID_VIEW_EXPAND_ALLSUBDIRS
-#: Merge.rc:483
+#: Merge.rc:487
msgid "&All Subfolders"
msgstr "Alle submappen"
#. IDR_DIRDOCTYPE, ID_VIEW_EXPAND_DIFFERENT_SUBDIRS
-#: Merge.rc:484
+#: Merge.rc:488
msgid "&Different Subfolders"
msgstr "Verschillende submappen"
#. IDR_DIRDOCTYPE, ID_VIEW_EXPAND_IDENTICAL_SUBDIRS
-#: Merge.rc:485
+#: Merge.rc:489
msgid "&Identical Subfolders"
msgstr "Identieke submappen"
#. IDR_DIRDOCTYPE, ID_VIEW_COLLAPSE_ALLSUBDIRS
-#: Merge.rc:487
+#: Merge.rc:491
msgid "&Collapse All Subfolders"
msgstr "Alle submappen inklappen"
#. IDR_DIRDOCTYPE, ID_VIEW_SHOW_EMPTY_FOLDERS
-#: Merge.rc:488
+#: Merge.rc:492
msgid "Show &Empty Folders"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_VIEW_SELECTFONT
-#: Merge.rc:490 Merge.rc:697
+#: Merge.rc:494 Merge.rc:704
msgid "Select &Font..."
msgstr "Lettertype kiezen..."
#. IDR_MERGEDOCTYPE, ID_VIEW_USEDEFAULTFONT
-#: Merge.rc:491 Merge.rc:698
+#: Merge.rc:495 Merge.rc:705
msgid "Use Default Font"
msgstr "Standaard lettertype gebruiken"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:493 Merge.rc:736
+#: Merge.rc:497 Merge.rc:743
msgid "Sw&ap Panes"
msgstr "Vensters wisselen"
#. IDR_MERGEDOCTYPE, ID_SWAPPANES_SWAP12
-#: Merge.rc:495 Merge.rc:738
+#: Merge.rc:499 Merge.rc:745
msgid "Swap &1st | 2nd"
msgstr "1ste en 2de wisselen"
#. IDR_MERGEDOCTYPE, ID_SWAPPANES_SWAP23
-#: Merge.rc:496 Merge.rc:739
+#: Merge.rc:500 Merge.rc:746
msgid "Swap &2nd | 3rd"
msgstr "2de en 3de wisselen"
#. IDR_MERGEDOCTYPE, ID_SWAPPANES_SWAP13
-#: Merge.rc:497 Merge.rc:740
+#: Merge.rc:501 Merge.rc:747
msgid "Swap 1st | &3rd"
msgstr "1ste en 3de wisselen"
#. IDR_DIRDOCTYPE, ID_VIEW_DISPLAY_FILTER_BAR_MENU
-#: Merge.rc:514
+#: Merge.rc:518
msgid "Displa&y Filter Bar\tCtrl+Shift+L"
msgstr ""
#. IDR_DIRDOCTYPE, ID_VIEW_DIR_STATISTICS
-#: Merge.rc:518
+#: Merge.rc:522
msgid "Com&pare Statistics..."
msgstr "Vergelijkingsstatistieken..."
#. IDR_MERGEDOCTYPE, ID_REFRESH
-#: Merge.rc:520 Merge.rc:763
+#: Merge.rc:524 Merge.rc:770
msgid "Refresh\tF5"
msgstr "Vernieuwen\tF5"
#. IDR_POPUP_DIRVIEW, ID_RESCAN
-#: Merge.rc:521 Merge.rc:1030
+#: Merge.rc:525 Merge.rc:1038
msgid "&Refresh Selected\tCtrl+F5"
msgstr "Selectie verversen\tCtrl+F5"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:523 Merge.rc:765
+#: Merge.rc:527 Merge.rc:772
msgid "&Merge"
msgstr "Samenvoegen"
#. IDR_DIRDOCTYPE, ID_MERGE_COMPARE
-#: Merge.rc:525
+#: Merge.rc:529
msgid "Co&mpare\tEnter"
msgstr "Vergelijken\tEnter"
#. IDR_MERGEDOCTYPE, ID_NEXTDIFF
-#: Merge.rc:527 Merge.rc:767
+#: Merge.rc:531 Merge.rc:774
msgid "&Next Difference\tAlt+Down"
msgstr "Volgend verschil\tAlt+Omlaag"
#. IDR_MERGEDOCTYPE, ID_PREVDIFF
-#: Merge.rc:528 Merge.rc:768
+#: Merge.rc:532 Merge.rc:775
msgid "&Previous Difference\tAlt+Up"
msgstr "Vorig verschil\tAlt+Omhoog"
#. IDR_MERGEDOCTYPE, ID_FIRSTDIFF
-#: Merge.rc:530 Merge.rc:773
+#: Merge.rc:534 Merge.rc:780
msgid "&First Difference\tAlt+Home"
msgstr "Eerste verschil\tAlt+Home"
#. IDR_MERGEDOCTYPE, ID_CURDIFF
-#: Merge.rc:531 Merge.rc:774
+#: Merge.rc:535 Merge.rc:781
msgid "&Current Difference\tAlt+Enter"
msgstr "Huidig verschil\tAlt+Enter"
#. IDR_MERGEDOCTYPE, ID_LASTDIFF
-#: Merge.rc:532 Merge.rc:775
+#: Merge.rc:536 Merge.rc:782
msgid "&Last Difference\tAlt+End"
msgstr "Laatste verschil\tAlt+End"
#. IDR_MERGEDOCTYPE, ID_L2R
-#: Merge.rc:534 Merge.rc:830
+#: Merge.rc:538 Merge.rc:837
msgid "Copy to &Right\tAlt+Right"
msgstr "Naar rechts kopiëren\tAlt+Rechts"
#. IDR_MERGEDOCTYPE, ID_R2L
-#: Merge.rc:535 Merge.rc:831
+#: Merge.rc:539 Merge.rc:838
msgid "Copy to L&eft\tAlt+Left"
msgstr "Naar links kopiëren\tAlt+Links"
#. IDR_DIRDOCTYPE, ID_MERGE_DELETE
-#: Merge.rc:537
+#: Merge.rc:541
msgid "&Delete\tDel"
msgstr "Wissen\tDel"
#. IDR_POPUP_DIRVIEW, ID_TOOLS_CUSTOMIZECOLUMNS
-#: Merge.rc:541 Merge.rc:1042
+#: Merge.rc:545 Merge.rc:1050
msgid "&Customize Columns..."
msgstr "Kolommen aanpassen..."
#. IDR_MERGEDOCTYPE, ID_TOOLS_GENERATEREPORT
-#: Merge.rc:544 Merge.rc:851
+#: Merge.rc:548 Merge.rc:858
msgid "Generate &Report..."
msgstr "Rapport genereren..."
#. IDD_ENCODINGERROR, IDC_PLUGIN
-#: Merge.rc:556 Merge.rc:867 Merge.rc:3064
+#: Merge.rc:560 Merge.rc:874 Merge.rc:3074
msgid "&Edit with Unpacker..."
msgstr "Bewerken met uitpakker..."
#. IDR_MERGEDOCTYPE, ID_FILE_SAVE
-#: Merge.rc:611
+#: Merge.rc:617
msgid "&Save\tCtrl+S"
msgstr "Opslaan\tCtrl+S"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:612
+#: Merge.rc:618
msgid "Sav&e"
msgstr "Opslaan"
#. IDR_POPUP_SAVE, ID_FILE_SAVE_LEFT
-#: Merge.rc:614 Merge.rc:1201
+#: Merge.rc:620 Merge.rc:1211
msgid "Save &Left"
msgstr "Links opslaan"
#. IDR_POPUP_SAVE, ID_FILE_SAVE_MIDDLE
-#: Merge.rc:615 Merge.rc:1202
+#: Merge.rc:621 Merge.rc:1212
msgid "Save &Middle"
msgstr "Midden opslaan"
#. IDR_POPUP_SAVE, ID_FILE_SAVE_RIGHT
-#: Merge.rc:616 Merge.rc:1203
+#: Merge.rc:622 Merge.rc:1213
msgid "Save &Right"
msgstr "Rechts opslaan"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:618
+#: Merge.rc:624
msgid "Save &As"
msgstr "Opslaan als"
#. IDR_POPUP_SAVE, ID_FILE_SAVEAS_LEFT
-#: Merge.rc:620 Merge.rc:1205
+#: Merge.rc:626 Merge.rc:1215
msgid "Save &Left As..."
msgstr "Links opslaan als..."
#. IDR_POPUP_SAVE, ID_FILE_SAVEAS_MIDDLE
-#: Merge.rc:621 Merge.rc:1206
+#: Merge.rc:627 Merge.rc:1216
msgid "Save &Middle As..."
msgstr "Midden opslaan als..."
#. IDR_POPUP_SAVE, ID_FILE_SAVEAS_RIGHT
-#: Merge.rc:622 Merge.rc:1207
+#: Merge.rc:628 Merge.rc:1217
msgid "Save &Right As..."
msgstr "Rechts opslaan als..."
#. IDR_MERGEDOCTYPE, ID_FILE_PRINT
-#: Merge.rc:625
+#: Merge.rc:631
msgid "&Print...\tCtrl+P"
msgstr "Afdrukken...\tCtrl+P"
#. IDR_MERGEDOCTYPE, ID_FILE_PAGE_SETUP
-#: Merge.rc:626
+#: Merge.rc:632
msgid "Page Set&up..."
msgstr "Pagina-instelling..."
#. IDR_MERGEDOCTYPE, ID_FILE_PRINT_PREVIEW
-#: Merge.rc:627
+#: Merge.rc:633
msgid "Print Previe&w..."
msgstr "Afdrukvoorbeeld..."
#. IDR_MERGEDOCTYPE
-#: Merge.rc:636
+#: Merge.rc:642
msgid "&Convert Line Endings to"
msgstr "Regeleindes converteren naar"
#. IDR_MERGEDOCTYPE, ID_FILE_MERGINGMODE
-#: Merge.rc:643
+#: Merge.rc:649
msgid "Mer&ge Mode\tF9"
msgstr "Samenvoegmodus\tF9"
#. IDR_MERGEDOCTYPE, ID_RESCAN
-#: Merge.rc:645
+#: Merge.rc:651
msgid "Reloa&d\tCtrl+F5"
msgstr "Opnieuw laden\tCtrl+F5"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:647
+#: Merge.rc:653
msgid "Reco&mpare As"
msgstr "Opnieuw vergelijken als"
+#. IDR_POPUP_COMPARE, ID_MERGE_COMPARE_FOLDER
+#: Merge.rc:660 Merge.rc:947 Merge.rc:1185
+msgid "A&rchive"
+msgstr ""
+
#. IDR_MERGEDOCTYPE, ID_EDIT_UNDO
-#: Merge.rc:666
+#: Merge.rc:673
msgid "&Undo\tCtrl+Z"
msgstr "Ongedaan maken\tCtrl+Z"
#. IDR_MERGEDOCTYPE, ID_EDIT_REDO
-#: Merge.rc:667
+#: Merge.rc:674
msgid "&Redo\tCtrl+Y"
msgstr "Opnieuw\tCtrl+Y"
#. IDR_MERGEDOCTYPE, ID_EDIT_CUT
-#: Merge.rc:669
+#: Merge.rc:676
msgid "Cu&t\tCtrl+X"
msgstr "Knippen\tCtrl+X"
#. IDR_POPUP_OUTPUTVIEW, ID_EDIT_COPY
-#: Merge.rc:670 Merge.rc:1342
+#: Merge.rc:677 Merge.rc:1352
msgid "&Copy\tCtrl+C"
msgstr "Kopiëren\tCtrl+C"
#. IDR_MERGEDOCTYPE, ID_EDIT_FIND
-#: Merge.rc:676
+#: Merge.rc:683
msgid "F&ind...\tCtrl+F"
msgstr "Zoeken...\tCtrl+F"
#. IDR_MERGEDOCTYPE, ID_EDIT_REPLACE
-#: Merge.rc:677
+#: Merge.rc:684
msgid "Repla&ce...\tCtrl+H"
msgstr "Vervangen...\tCtrl+H"
#. IDR_MERGEDOCTYPE, ID_EDIT_MARK
-#: Merge.rc:678
+#: Merge.rc:685
msgid "&Marker...\tCtrl+Shift+M"
msgstr "Markering...\tCtrl+Shift+M"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:680
+#: Merge.rc:687
msgid "Advanced"
msgstr "Geavanceerd"
#. IDR_MERGEDOCTYPE, ID_EDIT_COPY_LINENUMBERS
-#: Merge.rc:682
+#: Merge.rc:689
msgid "&Copy With Line Numbers\tCtrl+Shift+C"
msgstr "Kopiëren met regelnummers\tCtrl+Shift+C"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:684
+#: Merge.rc:691
msgid "&Bookmarks"
msgstr "Bladwijzers"
#. IDR_MERGEDOCTYPE, ID_EDIT_TOGGLE_BOOKMARK
-#: Merge.rc:686
+#: Merge.rc:693
msgid "&Toggle Bookmark\tCtrl+F2"
msgstr "Bladwijzer aan/uit\tCtrl+F2"
#. IDR_MERGEDOCTYPE, ID_EDIT_GOTO_NEXT_BOOKMARK
-#: Merge.rc:687
+#: Merge.rc:694
msgid "&Next Bookmark\tF2"
msgstr "Volgende bladwijzer\tF2"
#. IDR_MERGEDOCTYPE, ID_EDIT_GOTO_PREV_BOOKMARK
-#: Merge.rc:688
+#: Merge.rc:695
msgid "&Previous Bookmark\tShift+F2"
msgstr "Vorige bladwijzer\tShift+F2"
#. IDR_MERGEDOCTYPE, ID_EDIT_CLEAR_ALL_BOOKMARKS
-#: Merge.rc:689
+#: Merge.rc:696
msgid "&Clear All Bookmarks"
msgstr "Alle bladwijzers wissen"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:706
+#: Merge.rc:713
msgid "Syntax Highlight"
msgstr "Syntaxmarkering"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:711
+#: Merge.rc:718
msgid "&Diff Context"
msgstr "Verschil-context"
#. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_ALL
-#: Merge.rc:713
+#: Merge.rc:720
msgid "&All Lines"
msgstr "Alle regels"
#. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_0
-#: Merge.rc:715
+#: Merge.rc:722
msgid "&0 Lines"
msgstr "0 regels"
#. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_1
-#: Merge.rc:716
+#: Merge.rc:723
msgid "&1 Line"
msgstr "1 regel"
#. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_3
-#: Merge.rc:717
+#: Merge.rc:724
msgid "&3 Lines"
msgstr "3 regels"
#. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_5
-#: Merge.rc:718
+#: Merge.rc:725
msgid "&5 Lines"
msgstr "5 regels"
#. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_7
-#: Merge.rc:719
+#: Merge.rc:726
msgid "&7 Lines"
msgstr "7 regels"
#. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_9
-#: Merge.rc:720
+#: Merge.rc:727
msgid "&9 Lines"
msgstr "9 regels"
#. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_TOGGLE
-#: Merge.rc:722
+#: Merge.rc:729
msgid "&Toggle All and 0-9 Lines\tCtrl+D"
msgstr "Alle en 0-9 regels wisselen\tCtrl+D"
#. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_INVERT
-#: Merge.rc:724
+#: Merge.rc:731
msgid "&Invert (Hide Different Lines)"
msgstr "Inverteren (verschillende regels verbergen)"
#. IDR_MERGEDOCTYPE, ID_VIEW_RESIZE_PANES
-#: Merge.rc:727
+#: Merge.rc:734
msgid "&Lock Panes"
msgstr "Vensters vergrendelen"
#. IDR_MERGEDOCTYPE, ID_VIEW_WHITESPACE
-#: Merge.rc:728
+#: Merge.rc:735
msgid "&View Whitespace"
msgstr "Witruimte weergeven"
#. IDR_MERGEDOCTYPE, ID_VIEW_EOL
-#: Merge.rc:729
+#: Merge.rc:736
msgid "View E&OL"
msgstr "Regeleindes weergeven"
#. IDR_MERGEDOCTYPE, ID_VIEW_LINEDIFFS
-#: Merge.rc:730
+#: Merge.rc:737
msgid "Vie&w Line Differences"
msgstr "Regelverschillen weergeven"
#. IDR_MERGEDOCTYPE, ID_VIEW_LINENUMBERS
-#: Merge.rc:731
+#: Merge.rc:738
msgid "View Line &Numbers"
msgstr "Regelnummers weergeven"
#. IDR_MERGEDOCTYPE, ID_VIEW_SELMARGIN
-#: Merge.rc:732
+#: Merge.rc:739
msgid "View &Margins"
msgstr "Marges weergeven"
#. IDR_MERGEDOCTYPE, ID_VIEW_TOPMARGIN
-#: Merge.rc:733
+#: Merge.rc:740
msgid "View To&p Margins"
msgstr "Bovenste marges weergeven"
#. IDR_MERGEDOCTYPE, ID_VIEW_WORDWRAP
-#: Merge.rc:734
+#: Merge.rc:741
msgid "W&rap Lines"
msgstr "Automatische terugloop"
#. IDR_MERGEDOCTYPE, ID_VIEW_SPLITVERTICALLY
-#: Merge.rc:742
+#: Merge.rc:749
msgid "Split V&ertically"
msgstr "Verticaal splitsen"
#. IDR_MERGEDOCTYPE, ID_VIEW_DETAIL_BAR
-#: Merge.rc:759
+#: Merge.rc:766
msgid "Diff &Pane"
msgstr "Verschilvenster"
#. IDR_MERGEDOCTYPE, ID_VIEW_LOCATION_BAR
-#: Merge.rc:760
+#: Merge.rc:767
msgid "Lo&cation Pane"
msgstr "Locatievenster"
#. IDS_OUTPUTBAR_CAPTION
-#: Merge.rc:761 Merge.rc:4902
+#: Merge.rc:768 Merge.rc:4912
msgid "Output Pane"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_NEXTCONFLICT
-#: Merge.rc:770
+#: Merge.rc:777
msgid "Ne&xt Conflict\tAlt+Shift+Down"
msgstr "Volgend conflict\tAlt+Shift+Omlaag"
#. IDR_MERGEDOCTYPE, ID_PREVCONFLICT
-#: Merge.rc:771
+#: Merge.rc:778
msgid "Pre&vious Conflict\tAlt+Shift+Up"
msgstr "Vorig conflict\tAlt+Shift+Omhoog"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:777
+#: Merge.rc:784
msgid "A&dvanced"
msgstr "Geavanceerd"
#. IDR_MERGEDOCTYPE, ID_NEXTDIFFLM
-#: Merge.rc:779
+#: Merge.rc:786
msgid "Next Difference (Left/Middle)\tAlt+1"
msgstr "Volgend verschil tussen links en midden\tAlt+1"
#. IDR_MERGEDOCTYPE, ID_PREVDIFFLM
-#: Merge.rc:780
+#: Merge.rc:787
msgid "Previous Difference (Left/Middle)\tAlt+Shift+1"
msgstr "Vorig verschil tussen links en midden\tAlt+Shift+1"
#. IDR_MERGEDOCTYPE, ID_NEXTDIFFLR
-#: Merge.rc:782
+#: Merge.rc:789
msgid "Next Difference (Left/Right)\tAlt+2"
msgstr "Volgend verschil tussen links en rechts\tAlt+2"
#. IDR_MERGEDOCTYPE, ID_PREVDIFFLR
-#: Merge.rc:783
+#: Merge.rc:790
msgid "Previous Difference (Left/Right)\tAlt+Shift+2"
msgstr "Vorig verschil tussen links en rechts\tAlt+Shift+2"
#. IDR_MERGEDOCTYPE, ID_NEXTDIFFMR
-#: Merge.rc:785
+#: Merge.rc:792
msgid "Next Difference (Middle/Right)\tAlt+3"
msgstr "Volgend verschil tussen midden en rechts\tAlt+3"
#. IDR_MERGEDOCTYPE, ID_PREVDIFFMR
-#: Merge.rc:786
+#: Merge.rc:793
msgid "Previous Difference (Middle/Right)\tAlt+Shift+3"
msgstr "Vorig verschil tussen midden en rechts\tAlt+Shift+3"
#. IDR_MERGEDOCTYPE, ID_NEXTDIFFLO
-#: Merge.rc:788
+#: Merge.rc:795
msgid "Next Left-Only Difference\tAlt+7"
msgstr "Volgend alleen links verschil\tAlt+7"
#. IDR_MERGEDOCTYPE, ID_PREVDIFFLO
-#: Merge.rc:789
+#: Merge.rc:796
msgid "Previous Left-Only Difference\tAlt+Shift+7"
msgstr "Vorig alleen links verschil\tAlt+Shift+7"
#. IDR_MERGEDOCTYPE, ID_NEXTDIFFMO
-#: Merge.rc:791
+#: Merge.rc:798
msgid "Next Middle-Only Difference\tAlt+8"
msgstr "Volgend alleen midden verschil\tAlt+8"
#. IDR_MERGEDOCTYPE, ID_PREVDIFFMO
-#: Merge.rc:792
+#: Merge.rc:799
msgid "Previous Middle-Only Difference\tAlt+Shift+8"
msgstr "Vorig alleen midden verschil\tAlt+Shift+8"
#. IDR_MERGEDOCTYPE, ID_NEXTDIFFRO
-#: Merge.rc:794
+#: Merge.rc:801
msgid "Next Right-Only Difference\tAlt+9"
msgstr "Volgend alleen rechts verschil\tAlt+9"
#. IDR_MERGEDOCTYPE, ID_PREVDIFFRO
-#: Merge.rc:795
+#: Merge.rc:802
msgid "Previous Right-Only Difference\tAlt+Shift+9"
msgstr "Vorig alleen rechts verschil\tAlt+Shift+9"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:797
+#: Merge.rc:804
msgid "Copy from &Left to"
msgstr "Kopiëren van links naar"
#. IDD_LOAD_SAVE_CODEPAGE, IDC_AFFECTS_MIDDLE_BTN
-#: Merge.rc:799 Merge.rc:810 Merge.rc:815 Merge.rc:826 Merge.rc:970
-#: Merge.rc:2545 Merge.rc:2817
+#: Merge.rc:806 Merge.rc:817 Merge.rc:822 Merge.rc:833 Merge.rc:978
+#: Merge.rc:2555 Merge.rc:2827
msgid "&Middle"
msgstr "Midden"
#. IDD_LOAD_SAVE_CODEPAGE, IDC_AFFECTS_RIGHT_BTN
-#: Merge.rc:800 Merge.rc:805 Merge.rc:816 Merge.rc:821 Merge.rc:971
-#: Merge.rc:2546 Merge.rc:2819
+#: Merge.rc:807 Merge.rc:812 Merge.rc:823 Merge.rc:828 Merge.rc:979
+#: Merge.rc:2556 Merge.rc:2829
msgid "&Right"
msgstr "Rechts"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:802
+#: Merge.rc:809
msgid "Copy from &Middle to"
msgstr "Kopiëren van midden naar"
#. IDD_LOAD_SAVE_CODEPAGE, IDC_AFFECTS_LEFT_BTN
-#: Merge.rc:804 Merge.rc:809 Merge.rc:820 Merge.rc:825 Merge.rc:969
-#: Merge.rc:2544 Merge.rc:2815
+#: Merge.rc:811 Merge.rc:816 Merge.rc:827 Merge.rc:832 Merge.rc:977
+#: Merge.rc:2554 Merge.rc:2825
msgid "&Left"
msgstr "Links"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:807
+#: Merge.rc:814
msgid "Copy from &Right to"
msgstr "Kopiëren van rechts naar"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:813
+#: Merge.rc:820
msgid "Copy Selected Lines from Le&ft to"
msgstr "Geselecteerde regel(s) kopiëren van links naar"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:818
+#: Merge.rc:825
msgid "Copy Selected Lines from Mi&ddle to"
msgstr "Geselecteerde regel(s) kopiëren van midden naar"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:823
+#: Merge.rc:830
msgid "Copy Selected Lines from Ri&ght to"
msgstr "Geselecteerde regel(s) kopiëren van rechts naar"
#. IDR_MERGEDOCTYPE, ID_COPY_FROM_LEFT
-#: Merge.rc:833
+#: Merge.rc:840
msgid "Copy from Left\tAlt+Shift+Right"
msgstr "Van links kopiëren\tAlt+Shift+Rechts"
#. IDR_MERGEDOCTYPE, ID_COPY_FROM_RIGHT
-#: Merge.rc:834
+#: Merge.rc:841
msgid "Copy from Right\tAlt+Shift+Left"
msgstr "Van rechts kopiëren\tAlt+Shift+Links"
#. IDR_MERGEDOCTYPE, ID_L2RNEXT
-#: Merge.rc:836
+#: Merge.rc:843
msgid "C&opy to Right and Advance\tCtrl+Alt+Right"
msgstr "Naar rechts kopiëren en verder gaan\tCtrl+Alt+Rechts"
#. IDR_MERGEDOCTYPE, ID_R2LNEXT
-#: Merge.rc:837
+#: Merge.rc:844
msgid "Copy &to Left and Advance\tCtrl+Alt+Left"
msgstr "Naar links kopiëren en verder gaan\tCtrl+Alt+Links"
#. IDR_MERGEDOCTYPE, ID_ALL_RIGHT
-#: Merge.rc:839
+#: Merge.rc:846
msgid "Copy &All to Right"
msgstr "Alles naar rechts kopiëren"
#. IDR_MERGEDOCTYPE, ID_ALL_LEFT
-#: Merge.rc:840
+#: Merge.rc:847
msgid "Cop&y All to Left"
msgstr "Alles naar links kopiëren"
#. IDR_MERGEDOCTYPE, ID_AUTO_MERGE
-#: Merge.rc:842
+#: Merge.rc:849
msgid "A&uto Merge\tCtrl+Alt+M"
msgstr "Automatisch samenvoegen\tCtrl+Alt+M"
#. IDR_MERGEDOCTYPE, ID_ADD_SYNCPOINT
-#: Merge.rc:844
+#: Merge.rc:851
msgid "Add &Synchronization Point\tAlt+S"
msgstr "Synchronisatiepunt toevoegen\tAlt+S"
#. IDR_MERGEDOCTYPE, ID_CLEAR_SYNCPOINTS
-#: Merge.rc:845
+#: Merge.rc:852
msgid "Clear Sync&hronization Points"
msgstr "Synchronisatiepunten wissen"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:863
+#: Merge.rc:870
msgid "Unpac&ker"
msgstr "Uitpakker"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:869
+#: Merge.rc:876
msgid "&Prediffer"
msgstr "Voorvergelijking"
#. IDR_MERGEDOCTYPE, ID_APPLY_PREDIFFER
-#: Merge.rc:873
+#: Merge.rc:880
msgid "Apply Pre&differ..."
msgstr "Voorvergelijking toepassen."
#. IDR_MERGEDOCTYPE, ID_TRANSFORM_WITH_SCRIPT
-#: Merge.rc:879
+#: Merge.rc:886
msgid "&Transform with Editor Script..."
msgstr "Transformeren met editor-script..."
#. IDR_MERGEDOCTYPE
-#: Merge.rc:880
+#: Merge.rc:887
msgid "Scripts for &Copying"
msgstr "Scripts voor kopiëren"
#. IDR_MERGEDOCTYPE, ID_SELECT_EDITOR_SCRIPT_FOR_COPYING
-#: Merge.rc:886
+#: Merge.rc:893
msgid "Select &Editor Script..."
msgstr "Editor-script selecteren..."
#. IDR_MERGEDOCTYPE, ID_WINDOW_SPLIT
-#: Merge.rc:898
+#: Merge.rc:905
msgid "Sp&lit"
msgstr "Splitsen"
#. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE
-#: Merge.rc:921
+#: Merge.rc:928
msgid "Comp&are"
msgstr "Vergelijken"
#. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE_WITH_MOVED_RENAMED
-#: Merge.rc:922
+#: Merge.rc:929
msgid "Compar&e with Renamed/Moved Items"
msgstr ""
#. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE_IN_NEW_WINDOW
-#: Merge.rc:923
+#: Merge.rc:930
msgid "Compare in New &Window"
msgstr "In nieuw venster vergelijken"
#. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE_NONHORIZONTALLY
-#: Merge.rc:924 Merge.rc:931
+#: Merge.rc:931 Merge.rc:938
msgid "Compare Non-hor&izontally..."
msgstr "Niet-horizontaal vergelijken..."
#. IDR_POPUP_DIRVIEW
-#: Merge.rc:925
+#: Merge.rc:932
msgid "Compare Non-hor&izontally"
msgstr "Niet-horizontaal vergelijken"
#. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE_LEFT1_LEFT2
-#: Merge.rc:927
+#: Merge.rc:934
msgid "First &Left with Second Left"
msgstr "Eerste linker item met tweede linker item"
#. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE_RIGHT1_RIGHT2
-#: Merge.rc:928
+#: Merge.rc:935
msgid "First &Right with Second Right"
msgstr "Eerste rechter item met tweede rechter item"
#. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE_LEFT1_RIGHT2
-#: Merge.rc:929
+#: Merge.rc:936
msgid "&First Left with Second Right"
msgstr "Eerste linker item met tweede rechter item"
#. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE_LEFT2_RIGHT1
-#: Merge.rc:930
+#: Merge.rc:937
msgid "&Second Left with First Right"
msgstr "Tweede linker item met eerste rechter item"
#. IDR_POPUP_DIRVIEW
-#: Merge.rc:933
+#: Merge.rc:940
msgid "Co&mpare As"
msgstr "Vergelijken als"
#. IDS_COPY_LEFT_TO_MIDDLE2
-#: Merge.rc:945 Merge.rc:957 Merge.rc:4502
+#: Merge.rc:953 Merge.rc:965 Merge.rc:4512
#, c-format
msgid "Left to Middle (%1 of %2)"
msgstr "Links naar midden (%1 van %2)"
#. IDS_COPY_LEFT_TO_RIGHT2
-#: Merge.rc:946 Merge.rc:958 Merge.rc:4501
+#: Merge.rc:954 Merge.rc:966 Merge.rc:4511
#, c-format
msgid "Left to Right (%1 of %2)"
msgstr "Links naar rechts (%1 van %2)"
#. IDS_MOVE_LEFT_TO2
-#: Merge.rc:947 Merge.rc:959 Merge.rc:1022 Merge.rc:4513 Merge.rc:4542
+#: Merge.rc:955 Merge.rc:967 Merge.rc:1030 Merge.rc:4523 Merge.rc:4552
#, c-format
msgid "Left to... (%1 of %2)"
msgstr "Van links naar... (%1 van %2)"
#. IDS_COPY_MIDDLE_TO_LEFT2
-#: Merge.rc:948 Merge.rc:960 Merge.rc:4499
+#: Merge.rc:956 Merge.rc:968 Merge.rc:4509
#, c-format
msgid "Middle to Left (%1 of %2)"
msgstr "Midden naar links (%1 van %2)"
#. IDS_COPY_MIDDLE_TO_RIGHT2
-#: Merge.rc:949 Merge.rc:961 Merge.rc:4500
+#: Merge.rc:957 Merge.rc:969 Merge.rc:4510
#, c-format
msgid "Middle to Right (%1 of %2)"
msgstr "Midden naar rechts (%1 van %2)"
#. IDS_MOVE_MIDDLE_TO2
-#: Merge.rc:950 Merge.rc:962 Merge.rc:1023 Merge.rc:4514 Merge.rc:4543
+#: Merge.rc:958 Merge.rc:970 Merge.rc:1031 Merge.rc:4524 Merge.rc:4553
#, c-format
msgid "Middle to... (%1 of %2)"
msgstr "Midden naar... (%1 van %2)"
#. IDS_COPY_RIGHT_TO_MIDDLE2
-#: Merge.rc:951 Merge.rc:963 Merge.rc:4498
+#: Merge.rc:959 Merge.rc:971 Merge.rc:4508
#, c-format
msgid "Right to Middle (%1 of %2)"
msgstr "Rechts naar midden (%1 van %2)"
#. IDS_COPY_RIGHT_TO_LEFT2
-#: Merge.rc:952 Merge.rc:964 Merge.rc:4497
+#: Merge.rc:960 Merge.rc:972 Merge.rc:4507
#, c-format
msgid "Right to Left (%1 of %2)"
msgstr "Rechts naar links (%1 van %2)"
#. IDS_MOVE_RIGHT_TO2
-#: Merge.rc:953 Merge.rc:965 Merge.rc:1024 Merge.rc:4515 Merge.rc:4544
+#: Merge.rc:961 Merge.rc:973 Merge.rc:1032 Merge.rc:4525 Merge.rc:4554
#, c-format
msgid "Right to... (%1 of %2)"
msgstr "Rechts naar... (%1 van %2)"
#. IDD_EDIT_MARKER, IDC_EDIT_MARKER_DELETE
-#: Merge.rc:967 Merge.rc:2036
+#: Merge.rc:975 Merge.rc:2046
msgid "&Delete"
msgstr "Verwijderen"
#. IDR_POPUP_DIRVIEW, ID_DIR_DEL_BOTH
-#: Merge.rc:972
+#: Merge.rc:980
msgid "&Both"
msgstr "Beide"
#. IDR_POPUP_DIRVIEW, ID_DIR_DEL_ALL
-#: Merge.rc:973
+#: Merge.rc:981
msgid "&All"
msgstr "Alle"
#. IDD_EDIT_REPLACE, IDC_EDIT_SCOPE_SELECTION
-#: Merge.rc:974 Merge.rc:2019
+#: Merge.rc:982 Merge.rc:2029
msgid "&Selection"
msgstr "Selectie"
#. IDR_POPUP_DIRVIEW, ID_DIR_ITEM_RENAME
-#: Merge.rc:976
+#: Merge.rc:984
msgid "Re&name"
msgstr "Naam wijzigen"
#. IDR_POPUP_DIRVIEW, ID_DIR_HIDE_FILENAMES
-#: Merge.rc:977
+#: Merge.rc:985
msgid "&Hide Items"
msgstr "Items verbergen"
#. IDR_POPUP_DIRVIEW
-#: Merge.rc:979
+#: Merge.rc:987
msgid "&Open Left"
msgstr "Links openen"
#. IDR_POPUP_DIRVIEW
-#: Merge.rc:986
+#: Merge.rc:994
msgid "Open Midd&le"
msgstr "Midden openen"
#. IDR_POPUP_DIRVIEW
-#: Merge.rc:993
+#: Merge.rc:1001
msgid "O&pen Right"
msgstr "Rechts openen"
#. IDR_POPUP_DIRVIEW
-#: Merge.rc:1001
+#: Merge.rc:1009
msgid "Cop&y Paths"
msgstr "Padnamen kopiëren"
#. IDS_DEL_LEFT_FMT2
-#: Merge.rc:1003 Merge.rc:1012 Merge.rc:4530
+#: Merge.rc:1011 Merge.rc:1020 Merge.rc:4540
#, c-format
msgid "Left (%1 of %2)"
msgstr "Links (%1 van %2)"
#. IDS_DEL_MIDDLE_FMT2
-#: Merge.rc:1004 Merge.rc:1013 Merge.rc:4531
+#: Merge.rc:1012 Merge.rc:1021 Merge.rc:4541
#, c-format
msgid "Middle (%1 of %2)"
msgstr "Midden (%1 van %2)"
#. IDS_DEL_RIGHT_FMT2
-#: Merge.rc:1005 Merge.rc:1014 Merge.rc:4532
+#: Merge.rc:1013 Merge.rc:1022 Merge.rc:4542
#, c-format
msgid "Right (%1 of %2)"
msgstr "Rechts (%1 van %2)"
#. IDS_DEL_BOTH_FMT2
-#: Merge.rc:1006 Merge.rc:1015 Merge.rc:4533
+#: Merge.rc:1014 Merge.rc:1023 Merge.rc:4543
#, c-format
msgid "Both (%1 of %2)"
msgstr "Beide (%1 van %2)"
#. IDS_DEL_ALL_FMT2
-#: Merge.rc:1007 Merge.rc:1016 Merge.rc:4538
+#: Merge.rc:1015 Merge.rc:1024 Merge.rc:4548
#, c-format
msgid "All (%1 of %2)"
msgstr "Alle (%1 van %2)"
#. IDR_POPUP_DIRVIEW, ID_DIR_COPY_FILENAMES
-#: Merge.rc:1009
+#: Merge.rc:1017
msgid "Copy &Filenames"
msgstr "Bestandsnamen kopiëren"
#. IDR_POPUP_DIRVIEW
-#: Merge.rc:1010
+#: Merge.rc:1018
msgid "Copy Items to Clip&board"
msgstr "Items naar klembord kopiëren"
#. IDR_POPUP_DIRVIEW, ID_DIR_COPY_ALL_DISP_COLUMNS
-#: Merge.rc:1018
+#: Merge.rc:1026
msgid "Copy All Di&splayed Columns"
msgstr "Alle weergegeven kolommen kopiëren"
#. IDR_POPUP_DIRVIEW
-#: Merge.rc:1020
+#: Merge.rc:1028
msgid "&Zip"
msgstr "Zippen"
#. IDS_COPY_BOTH_TO2
-#: Merge.rc:1025 Merge.rc:4516
+#: Merge.rc:1033 Merge.rc:4526
#, c-format
msgid "Both to... (%1 of %2)"
msgstr "Beide naar... (%1 van %2)"
#. IDS_COPY_ALL_TO2
-#: Merge.rc:1026 Merge.rc:4517
+#: Merge.rc:1034 Merge.rc:4527
#, c-format
msgid "All to... (%1 of %2)"
msgstr "Alle naar... (%1 van %2)"
#. IDS_COPY_DIFFERENCES_TO2
-#: Merge.rc:1027 Merge.rc:4518
+#: Merge.rc:1035 Merge.rc:4528
#, c-format
msgid "Differences to... (%1 of %2)"
msgstr "Verschillen naar... (%1 van %2)"
#. IDR_POPUP_DIRVIEW, ID_DIR_SHELL_CONTEXT_MENU_LEFT
-#: Merge.rc:1032
+#: Merge.rc:1040
msgid "Left Shell Menu"
msgstr "Linker shellmenu"
#. IDR_POPUP_DIRVIEW, ID_DIR_SHELL_CONTEXT_MENU_MIDDLE
-#: Merge.rc:1033
+#: Merge.rc:1041
msgid "Middle Shell Menu"
msgstr "Middelste shellmenu"
#. IDR_POPUP_DIRVIEW, ID_DIR_SHELL_CONTEXT_MENU_RIGHT
-#: Merge.rc:1034
+#: Merge.rc:1042
msgid "Right Shell Menu"
msgstr "Rechter shellmenu"
#. IDR_POPUP_DIRVIEW, ID_DIR_SHELL_CONTEXT_MENU_BOTH
-#: Merge.rc:1035
+#: Merge.rc:1043
msgid "Both Shell Menu"
msgstr "Beide shellmenu's"
#. IDR_POPUP_DIRVIEW, ID_DIR_SHELL_CONTEXT_MENU_ALL
-#: Merge.rc:1036
+#: Merge.rc:1044
msgid "All Shell Menu"
msgstr "Alle shellmenu's"
#. IDR_POPUP_EDITOR_HEADERBAR, ID_EDITOR_COPY
-#: Merge.rc:1050
+#: Merge.rc:1058
msgid "Copy"
msgstr "Kopiëren"
#. IDR_POPUP_EDITOR_HEADERBAR, ID_EDITOR_COPY_PATH
-#: Merge.rc:1051
+#: Merge.rc:1059
msgid "&Copy Full Path"
msgstr "Volledig pad kopiëren"
#. IDR_POPUP_EDITOR_HEADERBAR, ID_EDITOR_COPY_FILENAME
-#: Merge.rc:1052
+#: Merge.rc:1060
msgid "Copy &Filename"
msgstr "Bestandsnaam kopiëren"
#. IDR_POPUP_EDITOR_HEADERBAR, ID_EDITOR_EDIT_CAPTION
-#: Merge.rc:1053
+#: Merge.rc:1061
msgid "&Edit Caption\tF2"
msgstr "Ondertitel bewerken\tF2"
#. IDR_POPUP_EDITOR_HEADERBAR, ID_EDITOR_EDIT_PATH
-#: Merge.rc:1055
+#: Merge.rc:1063
msgid "Edit &Path\tCtrl+L"
msgstr ""
#. IDR_POPUP_EDITOR_HEADERBAR, ID_EDITOR_SELECT_FILE
-#: Merge.rc:1056
+#: Merge.rc:1064
msgid "&Open..."
msgstr "Openen..."
#. IDR_POPUP_PLUGINS_SETTINGS
-#: Merge.rc:1062
+#: Merge.rc:1070
msgid "Unpacker Settings"
msgstr "Instellingen uitpakker"
#. IDS_USERCHOICE_NONE
-#: Merge.rc:1064 Merge.rc:1070 Merge.rc:1789 Merge.rc:1793 Merge.rc:5030
+#: Merge.rc:1072 Merge.rc:1078 Merge.rc:1799 Merge.rc:1803 Merge.rc:5040
msgid ""
msgstr ""
#. IDS_USERCHOICE_AUTOMATIC
-#: Merge.rc:1065 Merge.rc:1071 Merge.rc:5031
+#: Merge.rc:1073 Merge.rc:1079 Merge.rc:5041
msgid ""
msgstr ""
#. IDD_OPEN, IDC_SELECT_PREDIFFER
-#: Merge.rc:1066 Merge.rc:1072 Merge.rc:1970 Merge.rc:1974
+#: Merge.rc:1074 Merge.rc:1080 Merge.rc:1980 Merge.rc:1984
msgid "&Select..."
msgstr "Selecteren..."
#. IDR_POPUP_PLUGINS_SETTINGS
-#: Merge.rc:1068
+#: Merge.rc:1076
msgid "Prediffer Settings"
msgstr "Instellingen voorvergelijking"
#. IDR_POPUP_LOCATIONBAR, ID_LOCBAR_GOTODIFF
-#: Merge.rc:1080
+#: Merge.rc:1088
msgid "G&o to Diff"
msgstr "Ga naar verschil"
#. IDR_POPUP_LOCATIONBAR, ID_LOCBAR_MOVECURSOR_ONCLICK
-#: Merge.rc:1083
+#: Merge.rc:1091
msgid "Move Cursor on &Click"
msgstr ""
#. IDR_POPUP_LOCATIONBAR, ID_DISPLAY_MOVED_NONE
-#: Merge.rc:1085
+#: Merge.rc:1093
msgid "&No Moved Blocks"
msgstr "Geen verplaatste blokken"
#. IDR_POPUP_LOCATIONBAR, ID_DISPLAY_MOVED_ALL
-#: Merge.rc:1086
+#: Merge.rc:1094
msgid "&All Moved Blocks"
msgstr "Alle verplaatste blokken"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS
-#: Merge.rc:1094 Merge.rc:1127
+#: Merge.rc:1102 Merge.rc:1135
msgid "W&hitespaces"
msgstr "Witruimtes"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_WHITESPACE_COMPARE
-#: Merge.rc:1096 Merge.rc:1129
+#: Merge.rc:1104 Merge.rc:1137
msgid "Com&pare"
msgstr "Vergelijken"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_WHITESPACE_IGNORE
-#: Merge.rc:1097 Merge.rc:1130
+#: Merge.rc:1105 Merge.rc:1138
msgid "I&gnore Changes"
msgstr "Wijzigingen negeren"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_WHITESPACE_IGNOREALL
-#: Merge.rc:1098 Merge.rc:1131
+#: Merge.rc:1106 Merge.rc:1139
msgid "Ig&nore All"
msgstr "Alles negeren"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_IGNORE_BLANKLINES
-#: Merge.rc:1100 Merge.rc:1133
+#: Merge.rc:1108 Merge.rc:1141
msgid "Ignore Blan&k Lines"
msgstr "Lege regels negeren"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_IGNORE_CASE
-#: Merge.rc:1101 Merge.rc:1134
+#: Merge.rc:1109 Merge.rc:1142
msgid "Ignore &Case"
msgstr "Niet hoofdlettergevoelig"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_IGNORE_EOL
-#: Merge.rc:1102 Merge.rc:1135
+#: Merge.rc:1110 Merge.rc:1143
msgid "Igno&re EOL Differences (Windows/Unix/Mac)"
msgstr "Regeleinde-verschillen negeren (Windows/Unix/Mac)"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_IGNORE_CODEPAGE
-#: Merge.rc:1103 Merge.rc:1136
+#: Merge.rc:1111 Merge.rc:1144
msgid "Ignore Codepage &Differences"
msgstr "Tekenset-verschillen negeren"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_IGNORE_NUMBERS
-#: Merge.rc:1104 Merge.rc:1137
+#: Merge.rc:1112 Merge.rc:1145
msgid "Ignore Num&bers"
msgstr "Nummers negeren"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_IGNORE_COMMENTS
-#: Merge.rc:1105 Merge.rc:1138
+#: Merge.rc:1113 Merge.rc:1146
msgid "Ignore C&omment Differences"
msgstr "Opmerkingsverschillen negeren"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_IGNORE_MISSING_TRAILING_EOL
-#: Merge.rc:1106 Merge.rc:1139
+#: Merge.rc:1114 Merge.rc:1147
msgid "Ignore &Missing Trailing EOL"
msgstr ""
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_IGNORE_LINE_BREAKS
-#: Merge.rc:1107 Merge.rc:1140
+#: Merge.rc:1115 Merge.rc:1148
msgid "Ignore Line &Breaks (Treat as Spaces)"
msgstr ""
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_RECURS_CHECK
-#: Merge.rc:1109 Merge.rc:2963
+#: Merge.rc:1117 Merge.rc:2973
msgid "&Include Subfolders"
msgstr "Submappen bijvoegen"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS
-#: Merge.rc:1110 Merge.rc:1142
+#: Merge.rc:1118 Merge.rc:1150
msgid "&Compare Method"
msgstr "Vergelijkingsmethode"
#. IDS_COMPMETHOD_FULL_CONTENTS
-#: Merge.rc:1112 Merge.rc:1144 Merge.rc:1328 Merge.rc:4282
+#: Merge.rc:1120 Merge.rc:1152 Merge.rc:1338 Merge.rc:4292
msgid "Full Contents"
msgstr "Volledige Inhoud"
#. IDS_COMPMETHOD_QUICK_CONTENTS
-#: Merge.rc:1113 Merge.rc:1145 Merge.rc:1329 Merge.rc:4283
+#: Merge.rc:1121 Merge.rc:1153 Merge.rc:1339 Merge.rc:4293
msgid "Quick Contents"
msgstr "Snelle Inhoud"
#. IDS_COMPMETHOD_BINARY_CONTENTS
-#: Merge.rc:1114 Merge.rc:1146 Merge.rc:1330 Merge.rc:4284
+#: Merge.rc:1122 Merge.rc:1154 Merge.rc:1340 Merge.rc:4294
msgid "Binary Contents"
msgstr "Binaire inhoud"
#. IDS_COMPMETHOD_MODDATE
-#: Merge.rc:1115 Merge.rc:1147 Merge.rc:1331 Merge.rc:4285
+#: Merge.rc:1123 Merge.rc:1155 Merge.rc:1341 Merge.rc:4295
msgid "Modified Date"
msgstr "Datum gewijzigd"
#. IDS_COMPMETHOD_DATESIZE
-#: Merge.rc:1116 Merge.rc:1148 Merge.rc:1332 Merge.rc:4286
+#: Merge.rc:1124 Merge.rc:1156 Merge.rc:1342 Merge.rc:4296
msgid "Modified Date and Size"
msgstr "Datum en grootte gewijzigd"
#. IDS_COMPMETHOD_SIZE
-#: Merge.rc:1117 Merge.rc:1149 Merge.rc:1333 Merge.rc:4287
+#: Merge.rc:1125 Merge.rc:1157 Merge.rc:1343 Merge.rc:4297
msgid "Size"
msgstr "Grootte"
#. IDS_COMPMETHOD_EXISTENCE
-#: Merge.rc:1118 Merge.rc:1150 Merge.rc:1334 Merge.rc:4288
+#: Merge.rc:1126 Merge.rc:1158 Merge.rc:1344 Merge.rc:4298
msgid "Existence"
msgstr ""
#. IDR_POPUP_PROJECT, ID_LOAD_PROJECT
-#: Merge.rc:1192
+#: Merge.rc:1202
msgid "&Load Project..."
msgstr "Project laden..."
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARGALL
-#: Merge.rc:1272 Merge.rc:1301
+#: Merge.rc:1282 Merge.rc:1311
msgid "${*} - All Arguments"
msgstr "${*} - Alle argumenten"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARG1
-#: Merge.rc:1273 Merge.rc:1302
+#: Merge.rc:1283 Merge.rc:1312
msgid "${1} - First Argument"
msgstr "${1} - Argument 1"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARG2
-#: Merge.rc:1274 Merge.rc:1303
+#: Merge.rc:1284 Merge.rc:1313
msgid "${2} - Second Argument"
msgstr "${2} - Argument 2"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARG3
-#: Merge.rc:1275 Merge.rc:1304
+#: Merge.rc:1285 Merge.rc:1314
msgid "${3} - Third Argument"
msgstr "${3} - Argument 3"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARG4
-#: Merge.rc:1276 Merge.rc:1305
+#: Merge.rc:1286 Merge.rc:1315
msgid "${4} - Fourth Argument"
msgstr "${4} - Argument 4"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARG5
-#: Merge.rc:1277 Merge.rc:1306
+#: Merge.rc:1287 Merge.rc:1316
msgid "${5} - Fifth Argument"
msgstr "${5} - Argument 5"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARG6
-#: Merge.rc:1278 Merge.rc:1307
+#: Merge.rc:1288 Merge.rc:1317
msgid "${6} - Sixth Argument"
msgstr "${6} - Argument 6"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARG7
-#: Merge.rc:1279 Merge.rc:1308
+#: Merge.rc:1289 Merge.rc:1318
msgid "${7} - Seventh Argument"
msgstr "${7} - Argument 7"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARG8
-#: Merge.rc:1280 Merge.rc:1309
+#: Merge.rc:1290 Merge.rc:1319
msgid "${8} - Eighth Argument"
msgstr "${8} - Argument 8"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARG9
-#: Merge.rc:1281 Merge.rc:1310
+#: Merge.rc:1291 Merge.rc:1320
msgid "${9} - Ninth Argument"
msgstr "${9} - Argument 9"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_SRC_FILE
-#: Merge.rc:1289
+#: Merge.rc:1299
msgid "${SRC_FILE} - Source File"
msgstr "${SRC_FILE} - Bronbestand"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_SRC_FOLDER
-#: Merge.rc:1290
+#: Merge.rc:1300
msgid "${SRC_FOLDER} - Source Folder"
msgstr "${SRC_FOLDER} - Bronmap"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_SRC_URL
-#: Merge.rc:1291
+#: Merge.rc:1301
msgid "${SRC_URL} - Source URL"
msgstr "${SRC_URL} - Bron-URL"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_SRC_URL_PROTOCOL
-#: Merge.rc:1292
+#: Merge.rc:1302
msgid "${SRC_URL_PROTOCOL} - Source URL Protocol"
msgstr "${SRC_URL_PROTOCOL} - Bron-URL protocol"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_SRC_URL_SUFFIX
-#: Merge.rc:1293
+#: Merge.rc:1303
msgid "${SRC_URL_SUFFIX} - Source URL Suffix"
msgstr "${SRC_URL_SUFFIX} - Bron-URL suffix"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_DST_FILE
-#: Merge.rc:1294
+#: Merge.rc:1304
msgid "${DST_FILE} - Destination File"
msgstr "${DST_FILE} - Doelbestand"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_DST_FOLDER
-#: Merge.rc:1295
+#: Merge.rc:1305
msgid "${DST_FOLDER} - Destination Folder"
msgstr "${DST_FOLDER} - Doelmap"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_DST_URL
-#: Merge.rc:1296
+#: Merge.rc:1306
msgid "${DST_URL} - Destination URL"
msgstr "${DST_URL} - Doel-URL"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_DST_URL_PROTOCOL
-#: Merge.rc:1297
+#: Merge.rc:1307
msgid "${DST_URL_PROTOCOL} - Destination URL Protocol"
msgstr "${DST_URL_PROTOCOL} - Doel-URL protocol"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_DST_URL_SUFFIX
-#: Merge.rc:1298
+#: Merge.rc:1308
msgid "${DST_URL_SUFFIX} - Destination URL Suffix"
msgstr "${DST_URL_SUFFIX} - Doel-URL suffix"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_WINMERGE_HOME
-#: Merge.rc:1299
+#: Merge.rc:1309
msgid "${WINMERGE_HOME} - WinMerge Home Directory"
msgstr "${WINMERGE_HOME} - WinMerge home-map"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_SCRIPT_FILE
-#: Merge.rc:1300
+#: Merge.rc:1310
msgid "${SCRIPT_FILE} - Script File"
msgstr "${SCRIPT_FILE} - Scriptbestand"
#. IDR_POPUP_PLUGIN_ADD_MENU, ID_PLUGIN_ADD_UNPACKER
-#: Merge.rc:1318
+#: Merge.rc:1328
msgid "Add &Unpacker Plugin..."
msgstr "Uitpak-plugin toevoegen..."
#. IDR_POPUP_PLUGIN_ADD_MENU, ID_PLUGIN_ADD_PREDIFFER
-#: Merge.rc:1319
+#: Merge.rc:1329
msgid "Add &Prediffer Plugin..."
msgstr "Voorvergelijkingsplugin toevoegen..."
#. IDR_POPUP_PLUGIN_ADD_MENU, ID_PLUGIN_DUPLICATE
-#: Merge.rc:1320
+#: Merge.rc:1330
msgid "&Duplicate Plugin..."
msgstr "Plugin dupliceren..."
#. IDR_POPUP_OUTPUTVIEW, ID_EDIT_CLEAR_ALL
-#: Merge.rc:1344
+#: Merge.rc:1354
msgid "Clear &All"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_MASK_CLEAR
-#: Merge.rc:1352
+#: Merge.rc:1362
msgid "&Clear All"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_MASK_REMOVE_LAST
-#: Merge.rc:1353
+#: Merge.rc:1363
msgid "Remove Last Filter &Group"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_MASK_ALL
-#: Merge.rc:1354
+#: Merge.rc:1364
msgid "R&eset to Default (*.*)"
msgstr ""
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1355
+#: Merge.rc:1365
msgid "Add E&xclude File"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_SYS
-#: Merge.rc:1357
+#: Merge.rc:1367
msgid "&System Files"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_BACKUP
-#: Merge.rc:1358
+#: Merge.rc:1368
msgid "&Editor Backup Files"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_BIN
-#: Merge.rc:1359
+#: Merge.rc:1369
msgid "&Compiled Binary Files"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_LOG
-#: Merge.rc:1360
+#: Merge.rc:1370
msgid "&Log Files"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_TEMP
-#: Merge.rc:1361
+#: Merge.rc:1371
msgid "&Temporary or Cache Files"
msgstr ""
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1363
+#: Merge.rc:1373
msgid "Add Excl&ude Folder"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FOLDER_VCS
-#: Merge.rc:1365
+#: Merge.rc:1375
msgid "&Version Control"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FOLDER_BUILD
-#: Merge.rc:1366
+#: Merge.rc:1376
msgid "&Build Artifacts"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FOLDER_IDE
-#: Merge.rc:1367
+#: Merge.rc:1377
msgid "&IDE"
msgstr ""
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1370
+#: Merge.rc:1380
msgid "Add &File Condition"
msgstr ""
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1372 Merge.rc:1551
+#: Merge.rc:1382 Merge.rc:1561
msgid "File &Size"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_SIZE, ID_FILTERMENU_DIFF_SIZE_LT_1KB
-#: Merge.rc:1374 Merge.rc:1527 Merge.rc:1564 Merge.rc:1629 Merge.rc:1707
+#: Merge.rc:1384 Merge.rc:1537 Merge.rc:1574 Merge.rc:1639 Merge.rc:1717
msgid "Less than 1KB"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_SIZE, ID_FILTERMENU_DIFF_SIZE_GE_1KB
-#: Merge.rc:1375 Merge.rc:1528 Merge.rc:1565 Merge.rc:1630 Merge.rc:1708
+#: Merge.rc:1385 Merge.rc:1538 Merge.rc:1575 Merge.rc:1640 Merge.rc:1718
msgid "1KB or more"
msgstr ""
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_LT_10KB
-#: Merge.rc:1376 Merge.rc:1529 Merge.rc:1631
+#: Merge.rc:1386 Merge.rc:1539 Merge.rc:1641
msgid "Less than 10KB"
msgstr ""
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_GE_10KB
-#: Merge.rc:1377 Merge.rc:1530 Merge.rc:1632
+#: Merge.rc:1387 Merge.rc:1540 Merge.rc:1642
msgid "10KB or more"
msgstr ""
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_LT_100KB
-#: Merge.rc:1378 Merge.rc:1531 Merge.rc:1633
+#: Merge.rc:1388 Merge.rc:1541 Merge.rc:1643
msgid "Less than 100KB"
msgstr ""
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_GE_100KB
-#: Merge.rc:1379 Merge.rc:1532 Merge.rc:1634
+#: Merge.rc:1389 Merge.rc:1542 Merge.rc:1644
msgid "100KB or more"
msgstr ""
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_LT_1MB
-#: Merge.rc:1380 Merge.rc:1533 Merge.rc:1635
+#: Merge.rc:1390 Merge.rc:1543 Merge.rc:1645
msgid "Less than 1MB"
msgstr ""
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_GE_1MB
-#: Merge.rc:1381 Merge.rc:1534 Merge.rc:1636
+#: Merge.rc:1391 Merge.rc:1544 Merge.rc:1646
msgid "1MB or more"
msgstr ""
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_LT_10MB
-#: Merge.rc:1382 Merge.rc:1535 Merge.rc:1637
+#: Merge.rc:1392 Merge.rc:1545 Merge.rc:1647
msgid "Less than 10MB"
msgstr ""
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_GE_10MB
-#: Merge.rc:1383 Merge.rc:1536 Merge.rc:1638
+#: Merge.rc:1393 Merge.rc:1546 Merge.rc:1648
msgid "10MB or more"
msgstr ""
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_LT_100MB
-#: Merge.rc:1384 Merge.rc:1537 Merge.rc:1639
+#: Merge.rc:1394 Merge.rc:1547 Merge.rc:1649
msgid "Less than 100MB"
msgstr ""
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_GE_100MB
-#: Merge.rc:1385 Merge.rc:1538 Merge.rc:1640
+#: Merge.rc:1395 Merge.rc:1548 Merge.rc:1650
msgid "100MB or more"
msgstr ""
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_LT_1GB
-#: Merge.rc:1386 Merge.rc:1539 Merge.rc:1641
+#: Merge.rc:1396 Merge.rc:1549 Merge.rc:1651
msgid "Less than 1GB"
msgstr ""
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_GE_1GB
-#: Merge.rc:1387 Merge.rc:1642
+#: Merge.rc:1397 Merge.rc:1652
msgid "1GB or more"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_RANGE
-#: Merge.rc:1388 Merge.rc:1465 Merge.rc:1517 Merge.rc:1523 Merge.rc:1540
-#: Merge.rc:1566 Merge.rc:1587 Merge.rc:1643 Merge.rc:1709 Merge.rc:1734
+#: Merge.rc:1398 Merge.rc:1475 Merge.rc:1527 Merge.rc:1533 Merge.rc:1550
+#: Merge.rc:1576 Merge.rc:1597 Merge.rc:1653 Merge.rc:1719 Merge.rc:1744
msgid "Custom Range..."
msgstr ""
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1390 Merge.rc:1471 Merge.rc:1568
+#: Merge.rc:1400 Merge.rc:1481 Merge.rc:1578
msgid "&Last Modified"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE
-#: Merge.rc:1392 Merge.rc:1473 Merge.rc:1651
+#: Merge.rc:1402 Merge.rc:1483 Merge.rc:1661
msgid "&Hour"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_HOUR_BEFORE_1
-#: Merge.rc:1394 Merge.rc:1475 Merge.rc:1653
+#: Merge.rc:1404 Merge.rc:1485 Merge.rc:1663
msgid "More than 1 hour ago"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_HOUR_WITHIN_1
-#: Merge.rc:1395 Merge.rc:1476 Merge.rc:1654
+#: Merge.rc:1405 Merge.rc:1486 Merge.rc:1664
msgid "Within 1 hour"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE
-#: Merge.rc:1397 Merge.rc:1478 Merge.rc:1656
+#: Merge.rc:1407 Merge.rc:1488 Merge.rc:1666
msgid "&Day"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_DAY_BEFORE_TODAY
-#: Merge.rc:1399 Merge.rc:1480 Merge.rc:1658
+#: Merge.rc:1409 Merge.rc:1490 Merge.rc:1668
msgid "Before today"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_DAY_TODAY
-#: Merge.rc:1400 Merge.rc:1481 Merge.rc:1659
+#: Merge.rc:1410 Merge.rc:1491 Merge.rc:1669
msgid "Today"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_DAY_BEFORE_YESTERDAY
-#: Merge.rc:1401 Merge.rc:1482 Merge.rc:1660
+#: Merge.rc:1411 Merge.rc:1492 Merge.rc:1670
msgid "Before yesterday"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_DAY_YESTERDAY
-#: Merge.rc:1402 Merge.rc:1483 Merge.rc:1661
+#: Merge.rc:1412 Merge.rc:1493 Merge.rc:1671
msgid "Yesterday"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_DAY_SINCE_YESTERDAY
-#: Merge.rc:1403 Merge.rc:1484 Merge.rc:1662
+#: Merge.rc:1413 Merge.rc:1494 Merge.rc:1672
msgid "Since yesterday"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE
-#: Merge.rc:1405 Merge.rc:1486 Merge.rc:1664
+#: Merge.rc:1415 Merge.rc:1496 Merge.rc:1674
msgid "&Week"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_WEEK_BEFORE_THIS
-#: Merge.rc:1407 Merge.rc:1488 Merge.rc:1666
+#: Merge.rc:1417 Merge.rc:1498 Merge.rc:1676
msgid "Before this week"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_WEEK_THIS
-#: Merge.rc:1408 Merge.rc:1489 Merge.rc:1667
+#: Merge.rc:1418 Merge.rc:1499 Merge.rc:1677
msgid "This week"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_WEEK_BEFORE_LAST
-#: Merge.rc:1409 Merge.rc:1490 Merge.rc:1668
+#: Merge.rc:1419 Merge.rc:1500 Merge.rc:1678
msgid "Before last week"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_WEEK_LAST
-#: Merge.rc:1410 Merge.rc:1491 Merge.rc:1669
+#: Merge.rc:1420 Merge.rc:1501 Merge.rc:1679
msgid "Last week"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_WEEK_SINCE_LAST
-#: Merge.rc:1411 Merge.rc:1492 Merge.rc:1670
+#: Merge.rc:1421 Merge.rc:1502 Merge.rc:1680
msgid "Since last week"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE
-#: Merge.rc:1413 Merge.rc:1494 Merge.rc:1672
+#: Merge.rc:1423 Merge.rc:1504 Merge.rc:1682
msgid "&Month"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_MONTH_BEFORE_THIS
-#: Merge.rc:1415 Merge.rc:1496 Merge.rc:1674
+#: Merge.rc:1425 Merge.rc:1506 Merge.rc:1684
msgid "Before this month"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_MONTH_THIS
-#: Merge.rc:1416 Merge.rc:1497 Merge.rc:1675
+#: Merge.rc:1426 Merge.rc:1507 Merge.rc:1685
msgid "This month"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_MONTH_BEFORE_LAST
-#: Merge.rc:1417 Merge.rc:1498 Merge.rc:1676
+#: Merge.rc:1427 Merge.rc:1508 Merge.rc:1686
msgid "Before last month"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_MONTH_LAST
-#: Merge.rc:1418 Merge.rc:1499 Merge.rc:1677
+#: Merge.rc:1428 Merge.rc:1509 Merge.rc:1687
msgid "Last month"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_MONTH_SINCE_LAST
-#: Merge.rc:1419 Merge.rc:1500 Merge.rc:1678
+#: Merge.rc:1429 Merge.rc:1510 Merge.rc:1688
msgid "Since last month"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE
-#: Merge.rc:1421 Merge.rc:1502 Merge.rc:1680
+#: Merge.rc:1431 Merge.rc:1512 Merge.rc:1690
msgid "&Year"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_YEAR_BEFORE_THIS
-#: Merge.rc:1423 Merge.rc:1504 Merge.rc:1682
+#: Merge.rc:1433 Merge.rc:1514 Merge.rc:1692
msgid "Before this year"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_YEAR_THIS
-#: Merge.rc:1424 Merge.rc:1505 Merge.rc:1683
+#: Merge.rc:1434 Merge.rc:1515 Merge.rc:1693
msgid "This year"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_YEAR_BEFORE_LAST
-#: Merge.rc:1425 Merge.rc:1506 Merge.rc:1684
+#: Merge.rc:1435 Merge.rc:1516 Merge.rc:1694
msgid "Before last year"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_YEAR_LAST
-#: Merge.rc:1426 Merge.rc:1507 Merge.rc:1685
+#: Merge.rc:1436 Merge.rc:1517 Merge.rc:1695
msgid "Last year"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_YEAR_SINCE_LAST
-#: Merge.rc:1427 Merge.rc:1508 Merge.rc:1686
+#: Merge.rc:1437 Merge.rc:1518 Merge.rc:1696
msgid "Since last year"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_RANGE
-#: Merge.rc:1429 Merge.rc:1510 Merge.rc:1688
+#: Merge.rc:1439 Merge.rc:1520 Merge.rc:1698
msgid "&Custom Range..."
msgstr ""
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1431 Merge.rc:1589
+#: Merge.rc:1441 Merge.rc:1599
msgid "&Attributes"
msgstr ""
#. IDR_POPUP_FILTERMENU_ATTR, ID_FILTERMENU_ATTR_READONLY
-#: Merge.rc:1433 Merge.rc:1607
+#: Merge.rc:1443 Merge.rc:1617
msgid "Read-only files"
msgstr ""
#. IDR_POPUP_FILTERMENU_ATTR, ID_FILTERMENU_ATTR_NOT_READONLY
-#: Merge.rc:1434 Merge.rc:1608
+#: Merge.rc:1444 Merge.rc:1618
msgid "Not read-only files"
msgstr ""
#. IDR_POPUP_FILTERMENU_ATTR, ID_FILTERMENU_ATTR_HIDDEN
-#: Merge.rc:1435 Merge.rc:1609
+#: Merge.rc:1445 Merge.rc:1619
msgid "Hidden files"
msgstr ""
#. IDR_POPUP_FILTERMENU_ATTR, ID_FILTERMENU_ATTR_NOT_HIDDEN
-#: Merge.rc:1436 Merge.rc:1610
+#: Merge.rc:1446 Merge.rc:1620
msgid "Not hidden files"
msgstr ""
#. IDR_POPUP_FILTERMENU_ATTR, ID_FILTERMENU_ATTR_SYSTEM
-#: Merge.rc:1437 Merge.rc:1611
+#: Merge.rc:1447 Merge.rc:1621
msgid "System files"
msgstr ""
#. IDR_POPUP_FILTERMENU_ATTR, ID_FILTERMENU_ATTR_NOT_SYSTEM
-#: Merge.rc:1438 Merge.rc:1612
+#: Merge.rc:1448 Merge.rc:1622
msgid "Not system files"
msgstr ""
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1440
+#: Merge.rc:1450
msgid "File &Content"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_CONTAINS
-#: Merge.rc:1442
+#: Merge.rc:1452
msgid "Contains string..."
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_NOT_CONTAINS
-#: Merge.rc:1443
+#: Merge.rc:1453
msgid "Does not contain string..."
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_FIRST_LINE_CONTAINS
-#: Merge.rc:1444
+#: Merge.rc:1454
msgid "First line contains string..."
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_FIRST_LINE_NOT_CONTAINS
-#: Merge.rc:1445
+#: Merge.rc:1455
msgid "First line does not contain string..."
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_FIRST_10_CONTAINS
-#: Merge.rc:1446
+#: Merge.rc:1456
msgid "First 10 lines contain string..."
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_FIRST_10_NOT_CONTAINS
-#: Merge.rc:1447
+#: Merge.rc:1457
msgid "First 10 lines do not contain string..."
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_LAST_10_CONTAINS
-#: Merge.rc:1448
+#: Merge.rc:1458
msgid "Last 10 lines contain string..."
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_LAST_10_NOT_CONTAINS
-#: Merge.rc:1449
+#: Merge.rc:1459
msgid "Last 10 lines do not contain string..."
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_LAST_LINE_CONTAINS
-#: Merge.rc:1450
+#: Merge.rc:1460
msgid "Last line contains string..."
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_LAST_LINE_NOT_CONTAINS
-#: Merge.rc:1451
+#: Merge.rc:1461
msgid "Last line does not contain string..."
msgstr ""
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1453
+#: Merge.rc:1463
msgid "&Line Count"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_LT_10
-#: Merge.rc:1455
+#: Merge.rc:1465
msgid "Less than 10"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_GE_10
-#: Merge.rc:1456
+#: Merge.rc:1466
msgid "10 or more"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_LT_100
-#: Merge.rc:1457
+#: Merge.rc:1467
msgid "Less than 100"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_GE_100
-#: Merge.rc:1458
+#: Merge.rc:1468
msgid "100 or more"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_LT_1000
-#: Merge.rc:1459
+#: Merge.rc:1469
msgid "Less than 1000"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_GE_1000
-#: Merge.rc:1460
+#: Merge.rc:1470
msgid "1000 or more"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_LT_10000
-#: Merge.rc:1461
+#: Merge.rc:1471
msgid "Less than 10000"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_GE_10000
-#: Merge.rc:1462
+#: Merge.rc:1472
msgid "10000 or more"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_LT_100000
-#: Merge.rc:1463
+#: Merge.rc:1473
msgid "Less than 100000"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_GE_100000
-#: Merge.rc:1464
+#: Merge.rc:1474
msgid "100000 or more"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_PROPS
-#: Merge.rc:1467 Merge.rc:1594 Merge.rc:1761 Merge.rc:1778
+#: Merge.rc:1477 Merge.rc:1604 Merge.rc:1771 Merge.rc:1788
msgid "Additional &Properties..."
msgstr ""
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1469
+#: Merge.rc:1479
msgid "Add F&older Condition"
msgstr ""
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1513
+#: Merge.rc:1523
msgid "&Files"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FOLDER_FILES_EQ_0
-#: Merge.rc:1515
+#: Merge.rc:1525
msgid "0 files"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FOLDER_FILES_GE_1
-#: Merge.rc:1516
+#: Merge.rc:1526
msgid "1 file or more"
msgstr ""
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1519
+#: Merge.rc:1529
msgid "&Items"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FOLDER_ITEMS_EQ_0
-#: Merge.rc:1521
+#: Merge.rc:1531
msgid "0 items"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FOLDER_ITEMS_GE_1
-#: Merge.rc:1522
+#: Merge.rc:1532
msgid "1 item or more"
msgstr ""
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1525
+#: Merge.rc:1535
msgid "&Total Size"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FOLDER_STATS_RECURSIVE
-#: Merge.rc:1542
+#: Merge.rc:1552
msgid "&Recursive"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONDITION_ANY
-#: Merge.rc:1544
+#: Merge.rc:1554
msgid "Target: &Any (Left/Middle/Right)"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONDITION_LEFT
-#: Merge.rc:1545
+#: Merge.rc:1555
msgid "Target: &Left"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONDITION_MIDDLE
-#: Merge.rc:1546
+#: Merge.rc:1556
msgid "Target: &Middle"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONDITION_RIGHT
-#: Merge.rc:1547
+#: Merge.rc:1557
msgid "Target: &Right"
msgstr ""
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1549
+#: Merge.rc:1559
msgid "Add &Difference Condition"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_PROP, ID_FILTERMENU_DIFF_PROP_EQUAL
-#: Merge.rc:1553 Merge.rc:1570 Merge.rc:1591 Merge.rc:1696 Merge.rc:1717
-#: Merge.rc:1742
+#: Merge.rc:1563 Merge.rc:1580 Merge.rc:1601 Merge.rc:1706 Merge.rc:1727
+#: Merge.rc:1752
msgid "Equal"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_PROP, ID_FILTERMENU_DIFF_PROP_NOT_EQUAL
-#: Merge.rc:1554 Merge.rc:1571 Merge.rc:1592 Merge.rc:1697 Merge.rc:1718
-#: Merge.rc:1743
+#: Merge.rc:1564 Merge.rc:1581 Merge.rc:1602 Merge.rc:1707 Merge.rc:1728
+#: Merge.rc:1753
msgid "Not Equal"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_PROP, ID_FILTERMENU_DIFF_PROP_LESS
-#: Merge.rc:1555 Merge.rc:1572 Merge.rc:1698 Merge.rc:1719 Merge.rc:1744
+#: Merge.rc:1565 Merge.rc:1582 Merge.rc:1708 Merge.rc:1729 Merge.rc:1754
msgid "Less Than"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_PROP, ID_FILTERMENU_DIFF_PROP_LESS_EQUAL
-#: Merge.rc:1556 Merge.rc:1573 Merge.rc:1699 Merge.rc:1720 Merge.rc:1745
+#: Merge.rc:1566 Merge.rc:1583 Merge.rc:1709 Merge.rc:1730 Merge.rc:1755
msgid "Less Than or Equal to"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_PROP, ID_FILTERMENU_DIFF_PROP_GREATER
-#: Merge.rc:1557 Merge.rc:1574 Merge.rc:1700 Merge.rc:1721 Merge.rc:1746
+#: Merge.rc:1567 Merge.rc:1584 Merge.rc:1710 Merge.rc:1731 Merge.rc:1756
msgid "Greater Than"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_PROP, ID_FILTERMENU_DIFF_PROP_GREATER_EQUAL
-#: Merge.rc:1558 Merge.rc:1575 Merge.rc:1701 Merge.rc:1722 Merge.rc:1747
+#: Merge.rc:1568 Merge.rc:1585 Merge.rc:1711 Merge.rc:1732 Merge.rc:1757
msgid "Greater Than or Equal to"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_SIZE, ID_FILTERMENU_DIFF_SIZE_LT_10B
-#: Merge.rc:1560 Merge.rc:1703
+#: Merge.rc:1570 Merge.rc:1713
msgid "Less than 10B"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_SIZE, ID_FILTERMENU_DIFF_SIZE_GE_10B
-#: Merge.rc:1561 Merge.rc:1704
+#: Merge.rc:1571 Merge.rc:1714
msgid "10B or more"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_SIZE, ID_FILTERMENU_DIFF_SIZE_LT_100B
-#: Merge.rc:1562 Merge.rc:1705
+#: Merge.rc:1572 Merge.rc:1715
msgid "Less than 100B"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_SIZE, ID_FILTERMENU_DIFF_SIZE_GE_100B
-#: Merge.rc:1563 Merge.rc:1706
+#: Merge.rc:1573 Merge.rc:1716
msgid "100B or more"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_LT_1SECOND
-#: Merge.rc:1577 Merge.rc:1724
+#: Merge.rc:1587 Merge.rc:1734
msgid "Less than 1 second"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_GE_1SECOND
-#: Merge.rc:1578 Merge.rc:1725
+#: Merge.rc:1588 Merge.rc:1735
msgid "1 second or more"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_LT_1MINUTE
-#: Merge.rc:1579 Merge.rc:1726
+#: Merge.rc:1589 Merge.rc:1736
msgid "Less than 1 minute"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_GE_1MINUTE
-#: Merge.rc:1580 Merge.rc:1727
+#: Merge.rc:1590 Merge.rc:1737
msgid "1 minute or more"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_LT_1HOUR
-#: Merge.rc:1581 Merge.rc:1728
+#: Merge.rc:1591 Merge.rc:1738
msgid "Less than 1 hour"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_GE_1HOUR
-#: Merge.rc:1582 Merge.rc:1729
+#: Merge.rc:1592 Merge.rc:1739
msgid "1 hour or more"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_LT_1DAY
-#: Merge.rc:1583 Merge.rc:1730
+#: Merge.rc:1593 Merge.rc:1740
msgid "Less than 1 day"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_GE_1DAY
-#: Merge.rc:1584 Merge.rc:1731
+#: Merge.rc:1594 Merge.rc:1741
msgid "1 day or more"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_LT_1WEEK
-#: Merge.rc:1585 Merge.rc:1732
+#: Merge.rc:1595 Merge.rc:1742
msgid "Less than 1 week"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_GE_1WEEK
-#: Merge.rc:1586 Merge.rc:1733
+#: Merge.rc:1596 Merge.rc:1743
msgid "1 week or more"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_CONDITION_DIFF_LEFT_RIGHT
-#: Merge.rc:1596
+#: Merge.rc:1606
msgid "Target: &Left and Right"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_CONDITION_DIFF_LEFT_MIDDLE
-#: Merge.rc:1597
+#: Merge.rc:1607
msgid "Target: Left and &Middle"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_CONDITION_DIFF_MIDDLE_RIGHT
-#: Merge.rc:1598
+#: Merge.rc:1608
msgid "Target: Middle and &Right"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_CONDITION_DIFF_ALL
-#: Merge.rc:1599
+#: Merge.rc:1609
msgid "Target: &All"
msgstr ""
#. IDR_POPUP_FILTERMENU_BINARY, ID_FILTERMENU_BINARY_ONLY
-#: Merge.rc:1620
+#: Merge.rc:1630
msgid "Binary files only"
msgstr ""
#. IDR_POPUP_FILTERMENU_BINARY, ID_FILTERMENU_TEXT_ONLY
-#: Merge.rc:1621
+#: Merge.rc:1631
msgid "Text files only"
msgstr ""
#. IDR_POPUP_ADDCMPMENU, ID_ADDCMPMENU_CLEAR
-#: Merge.rc:1755
+#: Merge.rc:1765
msgid "&Clear conditions"
msgstr ""
#. IDR_POPUP_ADDCMPMENU, ID_ADDCMPMENU_CMP_SIZE
-#: Merge.rc:1757
+#: Merge.rc:1767
msgid "Compare &Size"
msgstr ""
#. IDR_POPUP_ADDCMPMENU, ID_ADDCMPMENU_CMP_DATE
-#: Merge.rc:1758
+#: Merge.rc:1768
msgid "Compare &Date"
msgstr ""
#. IDR_POPUP_ADDCMPMENU, ID_ADDCMPMENU_CMP_ATTR
-#: Merge.rc:1759
+#: Merge.rc:1769
msgid "Compare &Attributes"
msgstr ""
#. IDR_POPUP_ADDCMPMENU, ID_ADDCMPMENU_CMP_CONTENTS
-#: Merge.rc:1760
+#: Merge.rc:1770
msgid "Compare C&ontents"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_CLEAR
-#: Merge.rc:1769
+#: Merge.rc:1779
msgid "&Clear Keys"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_NAME
-#: Merge.rc:1771
+#: Merge.rc:1781
msgid "&Name"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_BASENAME
-#: Merge.rc:1772
+#: Merge.rc:1782
msgid "&Base name (without extension)"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_NORMALIZED_NAME
-#: Merge.rc:1773
+#: Merge.rc:1783
msgid "Normalized &Unicode Name"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_RELPATH
-#: Merge.rc:1774
+#: Merge.rc:1784
msgid "&Relative Path"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_DATE
-#: Merge.rc:1776
+#: Merge.rc:1786
msgid "&Date"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_HASH_MD5
-#: Merge.rc:1777
+#: Merge.rc:1787
msgid "&Hash (MD5)"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_REPLACE
-#: Merge.rc:1780
+#: Merge.rc:1790
msgid "Insert &replace() Function"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_REGEXREPLACE
-#: Merge.rc:1781
+#: Merge.rc:1791
msgid "Insert rege&xReplace() Function"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU
-#: Merge.rc:1782
+#: Merge.rc:1792
msgid "Replace &Lists"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_CREATE_REPLACELIST
-#: Merge.rc:1784
+#: Merge.rc:1794
msgid "&Create String Replace List and Insert..."
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_CREATE_REGEXREPLACELIST
-#: Merge.rc:1785
+#: Merge.rc:1795
msgid "Create &Regex Replace List and Insert..."
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU
-#: Merge.rc:1787
+#: Merge.rc:1797
msgid "&String Replace Lists"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU
-#: Merge.rc:1791
+#: Merge.rc:1801
msgid "Re&gex Replace Lists"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_STRING_REPLACE_LISTS_FOLDER
-#: Merge.rc:1796
+#: Merge.rc:1806
msgid "Open String Replace Lists Folder..."
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_REGEX_REPLACE_LISTS_FOLDER
-#: Merge.rc:1797
+#: Merge.rc:1807
msgid "Open Regex Replace Lists Folder..."
msgstr ""
#. IDD_FILTERS_CONDITION, IDC_CONDITION_MATCHCASE
-#: Merge.rc:1799 Merge.rc:1995 Merge.rc:2014 Merge.rc:2042 Merge.rc:2585
+#: Merge.rc:1809 Merge.rc:2005 Merge.rc:2024 Merge.rc:2052 Merge.rc:2595
msgid "Match &case"
msgstr "Hoofdlettergevoelig"
#. IDR_POPUP_RENAMEMOVE_MENU
-#: Merge.rc:1801
+#: Merge.rc:1811
msgid "Text &Normalization"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_TOLOWER
-#: Merge.rc:1803
+#: Merge.rc:1813
msgid "&Lowercase"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_TOUPPER
-#: Merge.rc:1804
+#: Merge.rc:1814
msgid "&Uppercase"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_TOHALFWIDTH
-#: Merge.rc:1805
+#: Merge.rc:1815
msgid "&Half-width"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_TOFULLWIDTH
-#: Merge.rc:1806
+#: Merge.rc:1816
msgid "&Full-width"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU
-#: Merge.rc:1807
+#: Merge.rc:1817
msgid "&Chinese Conversion"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_TOSIMPLIFIEDCHINESE
-#: Merge.rc:1809
+#: Merge.rc:1819
msgid "&Simplified Chinese"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_TOTRADITIONALCHINESE
-#: Merge.rc:1810
+#: Merge.rc:1820
msgid "&Traditional Chinese"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU
-#: Merge.rc:1812
+#: Merge.rc:1822
msgid "&Japanese Conversion"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_TOHIRAGANA
-#: Merge.rc:1814
+#: Merge.rc:1824
msgid "&Hiragana"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_TOKATAKANA
-#: Merge.rc:1815
+#: Merge.rc:1825
msgid "&Katakana"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_NORMALIZEUNICODE
-#: Merge.rc:1817
+#: Merge.rc:1827
msgid "Normalize &Unicode"
msgstr ""
#. IDD_ABOUTBOX
-#: Merge.rc:1932
+#: Merge.rc:1942
msgid "About WinMerge"
msgstr "Over WinMerge"
#. IDD_ABOUTBOX, IDC_WWW
-#: Merge.rc:1936
+#: Merge.rc:1946
msgid "Visit the WinMerge Homepage!"
msgstr "Bezoek de WinMerge-homepage!"
#. IDD_PLUGINS_EDITPLUGIN, IDOK
-#: Merge.rc:1938 Merge.rc:2080 Merge.rc:2431 Merge.rc:2455 Merge.rc:2469
-#: Merge.rc:2497 Merge.rc:2588 Merge.rc:2613 Merge.rc:2674 Merge.rc:2691
-#: Merge.rc:2703 Merge.rc:2867 Merge.rc:2927 Merge.rc:3062 Merge.rc:3104
-#: Merge.rc:3147 Merge.rc:3197
+#: Merge.rc:1948 Merge.rc:2090 Merge.rc:2441 Merge.rc:2465 Merge.rc:2479
+#: Merge.rc:2507 Merge.rc:2598 Merge.rc:2623 Merge.rc:2684 Merge.rc:2701
+#: Merge.rc:2713 Merge.rc:2877 Merge.rc:2937 Merge.rc:3072 Merge.rc:3114
+#: Merge.rc:3157 Merge.rc:3207
msgid "OK"
msgstr "Ok"
#. IDD_ABOUTBOX, IDC_OPEN_CONTRIBUTORS
-#: Merge.rc:1939
+#: Merge.rc:1949
msgid "Contributors"
msgstr "Medewerkers"
#. IDD_SELECT_FILES_OR_FOLDERS
-#: Merge.rc:1945 Merge.rc:3070
+#: Merge.rc:1955 Merge.rc:3080
msgid "Select Files or Folders"
msgstr "Bestanden of mappen selecteren"
#. IDD_OPEN, IDC_FILES_DIRS_GROUP0
-#: Merge.rc:1949
+#: Merge.rc:1959
msgid "&1st File or Folder"
msgstr "1ste bestand of map"
#. IDD_OPEN, IDC_PATH0_READONLY
-#: Merge.rc:1951
+#: Merge.rc:1961
msgid "Re&ad-only"
msgstr "Alleen-lezen"
#. IDD_OPEN, IDC_SWAP01_STATIC
-#: Merge.rc:1953
+#: Merge.rc:1963
msgid "Swap 1st | 2nd"
msgstr "1ste en 2de wisselen"
#. IDD_GENERATE_PATCH, IDC_DIFF_BROWSE_FILE1
-#: Merge.rc:1954 Merge.rc:2310 Merge.rc:2413
+#: Merge.rc:1964 Merge.rc:2320 Merge.rc:2423
msgid "&Browse..."
msgstr "Bladeren..."
#. IDD_OPEN, IDC_FILES_DIRS_GROUP1
-#: Merge.rc:1955
+#: Merge.rc:1965
msgid "&2nd File or Folder"
msgstr "2de bestand of map"
#. IDD_OPEN, IDC_PATH1_READONLY
-#: Merge.rc:1957
+#: Merge.rc:1967
msgid "Rea&d-only"
msgstr "Alleen-lezen"
#. IDD_OPEN, IDC_SWAP12_STATIC
-#: Merge.rc:1959
+#: Merge.rc:1969
msgid "Swap 2nd | 3rd"
msgstr "2de en 3de wisselen"
#. IDD_PROPPAGE_SYSTEM, IDC_FILTER_USER_BROWSE
-#: Merge.rc:1960 Merge.rc:2315
+#: Merge.rc:1970 Merge.rc:2325
msgid "B&rowse..."
msgstr "Bladeren..."
#. IDD_OPEN, IDC_FILES_DIRS_GROUP2
-#: Merge.rc:1961
+#: Merge.rc:1971
msgid "&3rd File or Folder (Optional)"
msgstr "3de bestand of map (optioneel)"
#. IDD_OPEN, IDC_PATH2_READONLY
-#: Merge.rc:1963
+#: Merge.rc:1973
msgid "Read-o&nly"
msgstr "Alleen-lezen"
#. IDD_OPEN, IDC_SWAP02_STATIC
-#: Merge.rc:1965
+#: Merge.rc:1975
msgid "Swap 1st | 3rd"
msgstr "1ste en 3de wisselen"
#. IDD_PROPPAGE_BACKUPS, IDC_BACKUP_BROWSE
-#: Merge.rc:1966 Merge.rc:2685 Merge.rc:2883
+#: Merge.rc:1976 Merge.rc:2695 Merge.rc:2893
msgid "Browse..."
msgstr "Bladeren..."
#. IDD_OPEN, IDC_FILES_DIRS_GROUP3
-#: Merge.rc:1968
+#: Merge.rc:1978
msgid " Folder: Filter"
msgstr " Map: filter"
#. IDD_OPEN, IDC_RECURS_CHECK
-#: Merge.rc:1971
+#: Merge.rc:1981
msgid "&Include subfolders"
msgstr "Submappen bijvoegen"
#. IDD_OPEN, IDC_FILES_DIRS_GROUP5
-#: Merge.rc:1972
+#: Merge.rc:1982
msgid " File: Prediffer Plugin"
msgstr " Bestand: voorvergelijking-plugin"
#. IDD_OPEN, IDC_FILES_DIRS_GROUP4
-#: Merge.rc:1976
+#: Merge.rc:1986
msgid " File: Unpacker Plugin"
msgstr " Bestand: uitpak-plugin"
#. IDD_OPEN, IDC_SELECT_UNPACKER
-#: Merge.rc:1978
+#: Merge.rc:1988
msgid "Se&lect..."
msgstr "Selecteren..."
#. IDD_PLUGINS_EDITPLUGIN, IDCANCEL
-#: Merge.rc:1981 Merge.rc:2001 Merge.rc:2025 Merge.rc:2046 Merge.rc:2081
-#: Merge.rc:2432 Merge.rc:2456 Merge.rc:2470 Merge.rc:2498 Merge.rc:2551
-#: Merge.rc:2589 Merge.rc:2614 Merge.rc:2675 Merge.rc:2692 Merge.rc:2704
-#: Merge.rc:2868 Merge.rc:2928 Merge.rc:3087 Merge.rc:3105 Merge.rc:3148
-#: Merge.rc:3198
+#: Merge.rc:1991 Merge.rc:2011 Merge.rc:2035 Merge.rc:2056 Merge.rc:2091
+#: Merge.rc:2442 Merge.rc:2466 Merge.rc:2480 Merge.rc:2508 Merge.rc:2561
+#: Merge.rc:2599 Merge.rc:2624 Merge.rc:2685 Merge.rc:2702 Merge.rc:2714
+#: Merge.rc:2878 Merge.rc:2938 Merge.rc:3097 Merge.rc:3115 Merge.rc:3158
+#: Merge.rc:3208
msgid "Cancel"
msgstr "Annuleren"
#. IDD_OPEN, IDC_OPEN_STATUS
-#: Merge.rc:1982
+#: Merge.rc:1992
msgid "Status:"
msgstr "Status:"
#. IDD_PLUGINS_LIST, ID_HELP
-#: Merge.rc:1983 Merge.rc:2082 Merge.rc:2929
+#: Merge.rc:1993 Merge.rc:2092 Merge.rc:2939
msgid "Help"
msgstr "Help"
#. IDD_OPEN, IDC_OPTIONS
-#: Merge.rc:1984
+#: Merge.rc:1994
msgid "&Options..."
msgstr "Opties..."
#. IDD_EDIT_FIND
-#: Merge.rc:1989
+#: Merge.rc:1999
msgid "Find"
msgstr "Zoeken"
#. IDD_EDIT_MARKER, IDC_STATIC
-#: Merge.rc:1992 Merge.rc:2009 Merge.rc:2037
+#: Merge.rc:2002 Merge.rc:2019 Merge.rc:2047
msgid "Fi&nd what:"
msgstr "Zoeken naar:"
#. IDD_EDIT_MARKER, IDC_EDIT_WHOLE_WORD
-#: Merge.rc:1994 Merge.rc:2013 Merge.rc:2041
+#: Merge.rc:2004 Merge.rc:2023 Merge.rc:2051
msgid "Match &whole word only"
msgstr "Alleen hele woorden"
#. IDD_EDIT_MARKER, IDC_EDIT_REGEXP
-#: Merge.rc:1996 Merge.rc:2015 Merge.rc:2043
+#: Merge.rc:2006 Merge.rc:2025 Merge.rc:2053
msgid "Regular &expression"
msgstr "Reguliere expressies"
#. IDD_EDIT_FIND, IDC_FINDDLG_DONTWRAP
-#: Merge.rc:1997
+#: Merge.rc:2007
msgid "D&on't wrap end of file"
msgstr "Bij einde bestand stoppen"
#. IDD_EDIT_FIND, IDC_FINDDLG_DONTCLOSE
-#: Merge.rc:1998
+#: Merge.rc:2008
msgid "&Don't close this dialog"
msgstr "Dit venster niet sluiten"
#. IDD_EDIT_REPLACE, IDC_EDIT_SKIP
-#: Merge.rc:1999 Merge.rc:2021
+#: Merge.rc:2009 Merge.rc:2031
msgid "&Find Next"
msgstr "Volgende zoeken"
#. IDD_EDIT_FIND, IDC_EDIT_FINDPREV
-#: Merge.rc:2000
+#: Merge.rc:2010
msgid "Find &Prev"
msgstr "Vorige zoeken"
#. IDD_EDIT_REPLACE
-#: Merge.rc:2006
+#: Merge.rc:2016
msgid "Replace"
msgstr "Vervangen"
#. IDD_EDIT_REPLACE, IDC_STATIC
-#: Merge.rc:2011
+#: Merge.rc:2021
msgid "Re&place with:"
msgstr "Vervangen door:"
#. IDD_EDIT_REPLACE, IDC_EDIT_SCOPE_DONT_WRAP
-#: Merge.rc:2016
+#: Merge.rc:2026
msgid "&Don't wrap at end of file"
msgstr "Bij einde bestand stoppen"
#. IDD_EDIT_REPLACE, IDC_STATIC
-#: Merge.rc:2018
+#: Merge.rc:2028
msgid "Replace in"
msgstr "Vervangen in"
#. IDD_EDIT_REPLACE, IDC_EDIT_SCOPE_WHOLE_FILE
-#: Merge.rc:2020
+#: Merge.rc:2030
msgid "Wh&ole file"
msgstr "Volledig bestand"
#. IDD_EDIT_REPLACE, IDC_EDIT_FINDPREV
-#: Merge.rc:2022
+#: Merge.rc:2032
msgid "Find Pre&v"
msgstr "Vorige zoeken"
#. IDD_EDIT_REPLACE, IDC_EDIT_REPLACE
-#: Merge.rc:2023
+#: Merge.rc:2033
msgid "&Replace"
msgstr "Vervangen"
#. IDD_EDIT_REPLACE, IDC_EDIT_REPLACE_ALL
-#: Merge.rc:2024
+#: Merge.rc:2034
msgid "Replace &All"
msgstr "Alles vervangen"
#. IDS_OPTIONSPG_MARKERCOLORS
-#: Merge.rc:2030 Merge.rc:4209
+#: Merge.rc:2040 Merge.rc:4219
msgid "Markers"
msgstr "Markeringen"
#. IDD_EDIT_MARKER, IDC_EDIT_MARKERS_ENABLED
-#: Merge.rc:2033
+#: Merge.rc:2043
msgid "Enable &markers"
msgstr "Markeringen inschakelen"
#. IDD_FILTERS_LINEFILTERS, IDC_LFILTER_ADDBTN
-#: Merge.rc:2035 Merge.rc:2057
+#: Merge.rc:2045 Merge.rc:2067
msgid "New"
msgstr "Nieuw"
#. IDD_EDIT_MARKER, IDC_STATIC
-#: Merge.rc:2039
+#: Merge.rc:2049
msgid "&Background color:"
msgstr "Achtergrondkleur:"
#. IDS_MESSAGEBOX_OK
-#: Merge.rc:2044 Merge.rc:2829 Merge.rc:3086 Merge.rc:4171
+#: Merge.rc:2054 Merge.rc:2839 Merge.rc:3096 Merge.rc:4181
msgid "&Ok"
msgstr "Ok"
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:2045 Merge.rc:2525 Merge.rc:3199
+#: Merge.rc:2055 Merge.rc:2535 Merge.rc:3209
msgid "&Apply"
msgstr "Toepassen"
#. IDD_FILTERS_LINEFILTERS
-#: Merge.rc:2051
+#: Merge.rc:2061
msgid "Line Filters"
msgstr "Regelfilters"
#. IDD_FILTERS_LINEFILTERS, IDC_IGNOREREGEXP
-#: Merge.rc:2054
+#: Merge.rc:2064
msgid "Enable Line Filters"
msgstr "Regelfilters inschakelen"
#. IDD_FILTERS_LINEFILTERS, IDC_STATIC
-#: Merge.rc:2055
+#: Merge.rc:2065
msgid "Regular Expressions (one per line):"
msgstr "Reguliere expressies (één per regel):"
#. IDD_PLUGINS_LIST, IDC_PLUGIN_EDIT
-#: Merge.rc:2058 Merge.rc:2924
+#: Merge.rc:2068 Merge.rc:2934
msgid "Edit"
msgstr "Bewerken"
#. IDD_PLUGINS_LIST, IDC_PLUGIN_REMOVE
-#: Merge.rc:2059 Merge.rc:2071 Merge.rc:2925
+#: Merge.rc:2069 Merge.rc:2081 Merge.rc:2935
msgid "Remove"
msgstr "Verwijderen"
#. IDD_FILTERS_SUBSTITUTIONFILTERS
-#: Merge.rc:2064
+#: Merge.rc:2074
msgid "Substitution Filters"
msgstr "Vervangingsfilters"
#. IDD_FILTERS_SUBSTITUTIONFILTERS, IDC_STATIC
-#: Merge.rc:2067
+#: Merge.rc:2077
msgid ""
"Changes to the listed pairs below will be "
"ignored or marked as insignificant. Patches are unaffected."
@@ -3145,546 +3156,546 @@ msgstr ""
"worden niet beïnvloed."
#. IDD_FILTERS_SUBSTITUTIONFILTERS, IDC_IGNORED_SUSBSTITUTIONS_ENABLED
-#: Merge.rc:2068
+#: Merge.rc:2078
msgid "Enable"
msgstr "Inschakelen"
#. IDD_PLUGINS_LIST, IDC_PLUGIN_ADD
-#: Merge.rc:2070 Merge.rc:2923
+#: Merge.rc:2080 Merge.rc:2933
msgid "Add"
msgstr "Toevoegen"
#. IDD_FILTERS_SUBSTITUTIONFILTERS, IDC_LFILTER_CLEARBTN
-#: Merge.rc:2072
+#: Merge.rc:2082
msgid "Clear"
msgstr "Wissen"
#. IDD_PREFERENCES
-#: Merge.rc:2077
+#: Merge.rc:2087
msgid "Options"
msgstr "Opties"
#. IDD_PREFERENCES, IDC_TREEOPT_IMPORT
-#: Merge.rc:2086
+#: Merge.rc:2096
msgid "Import..."
msgstr "Importeren..."
#. IDD_PREFERENCES, IDC_TREEOPT_EXPORT
-#: Merge.rc:2087
+#: Merge.rc:2097
msgid "Export..."
msgstr "Exporteren..."
#. IDS_OPTIONSPG_GENCOMPARE
-#: Merge.rc:2092 Merge.rc:4199 Merge.rc:4202 Merge.rc:4219
+#: Merge.rc:2102 Merge.rc:4209 Merge.rc:4212 Merge.rc:4229
msgid "General"
msgstr "Algemeen"
#. IDD_PROPPAGE_GENERAL, IDC_SCROLL_CHECK
-#: Merge.rc:2095
+#: Merge.rc:2105
msgid "Automatically &scroll to first difference"
msgstr "Automatisch naar eerste verschil gaan"
#. IDD_PROPPAGE_GENERAL, IDC_SCROLL_TO_FIRST_INLINE_DIFF_CHECK
-#: Merge.rc:2097
+#: Merge.rc:2107
msgid "Automatically s&croll to first inline difference"
msgstr "Automatisch naar eerste verschil binnen de regel scrollen"
#. IDD_PROPPAGE_GENERAL, IDC_STATIC
-#: Merge.rc:2099
+#: Merge.rc:2109
msgid "Cl&ose windows with 'Esc':"
msgstr "Vensters sluiten met 'Esc':"
#. IDD_PROPPAGE_GENERAL, IDC_VERIFY_OPEN_PATHS
-#: Merge.rc:2101
+#: Merge.rc:2111
msgid "&Automatically verify paths in Open dialog"
msgstr "Paden automatisch verifiëren in openen-venster"
#. IDD_PROPPAGE_GENERAL, IDC_STATIC
-#: Merge.rc:2103
+#: Merge.rc:2113
msgid "Single instance mode:"
msgstr "Modus enkele instantie:"
#. IDD_PROPPAGE_GENERAL, IDC_ASK_MULTIWINDOW_CLOSE
-#: Merge.rc:2105
+#: Merge.rc:2115
msgid "As&k when closing multiple windows"
msgstr "Vragen bij sluiten van meerdere vensters"
#. IDD_PROPPAGE_GENERAL, IDC_PRESERVE_FILETIME
-#: Merge.rc:2107
+#: Merge.rc:2117
msgid "&Preserve file time in file compare"
msgstr "Bestandstijd behouden bij bestandsvergelijking"
#. IDD_PROPPAGE_GENERAL, IDC_STARTUP_FOLDER_SELECT
-#: Merge.rc:2109
+#: Merge.rc:2119
msgid "Show \"Select Files or Folders\" dialog on startup"
msgstr "\"Bestanden of mappen selecteren\" weergeven bij opstarten"
#. IDD_PROPPAGE_GENERAL, IDC_CLOSE_WITH_OK
-#: Merge.rc:2111
+#: Merge.rc:2121
msgid "Close \"Select Files or Folders\" dialog on clicking Compare button"
msgstr "\"Bestanden of mappen selecteren\" sluiten bij klikken op vergelijken"
#. IDD_PROPPAGE_GENERAL, IDC_STATIC
-#: Merge.rc:2113
+#: Merge.rc:2123
msgid "Op&en dialog Auto completion:"
msgstr "Auto-aanvullen openen-venster:"
#. IDD_PROPPAGE_GENERAL, IDC_STATIC
-#: Merge.rc:2115
+#: Merge.rc:2125
msgid "Auto-&reload modified files:"
msgstr "Gewijzigde bestanden automatisch opnieuw laden:"
#. IDD_PROPPAGE_GENERAL, IDC_STATIC
-#: Merge.rc:2117
+#: Merge.rc:2127
msgid "Language:"
msgstr "Language:"
#. IDD_PROPPAGE_COMPARE_WEBPAGE, IDC_COMPARE_DEFAULTS
-#: Merge.rc:2119 Merge.rc:2299 Merge.rc:2321 Merge.rc:2352 Merge.rc:2369
-#: Merge.rc:2386 Merge.rc:2394 Merge.rc:2430 Merge.rc:2454 Merge.rc:2633
-#: Merge.rc:2644 Merge.rc:2653 Merge.rc:2887 Merge.rc:2922 Merge.rc:2985
-#: Merge.rc:3010 Merge.rc:3024 Merge.rc:3038 Merge.rc:3054
+#: Merge.rc:2129 Merge.rc:2309 Merge.rc:2331 Merge.rc:2362 Merge.rc:2379
+#: Merge.rc:2396 Merge.rc:2404 Merge.rc:2440 Merge.rc:2464 Merge.rc:2643
+#: Merge.rc:2654 Merge.rc:2663 Merge.rc:2897 Merge.rc:2932 Merge.rc:2995
+#: Merge.rc:3020 Merge.rc:3034 Merge.rc:3048 Merge.rc:3064
msgid "Defaults"
msgstr "Standaardwaarden"
#. IDS_OPTIONSPG_COLORS
-#: Merge.rc:2124 Merge.rc:2140 Merge.rc:2267 Merge.rc:2292 Merge.rc:4205
+#: Merge.rc:2134 Merge.rc:2150 Merge.rc:2277 Merge.rc:2302 Merge.rc:4215
msgid "Colors"
msgstr "Kleuren"
#. IDD_PROPPAGE_COLOR_SCHEMES, IDC_STATIC
-#: Merge.rc:2127
+#: Merge.rc:2137
msgid "Color &mode:"
msgstr ""
#. IDD_PROPPAGE_COLOR_SCHEMES, IDC_STATIC
-#: Merge.rc:2129
+#: Merge.rc:2139
msgid "&Light mode scheme:"
msgstr ""
#. IDD_PROPPAGE_COLOR_SCHEMES, IDC_STATIC
-#: Merge.rc:2131
+#: Merge.rc:2141
msgid "&Dark mode scheme:"
msgstr ""
#. IDD_PROPPAGE_COLOR_SCHEMES, IDC_STATIC
-#: Merge.rc:2133
+#: Merge.rc:2143
msgid "Your custom schemes"
msgstr ""
#. IDD_PROPPAGE_COLOR_SCHEMES, IDC_COLOR_SCHEME_SAVE
-#: Merge.rc:2134
+#: Merge.rc:2144
msgid "&Save current scheme..."
msgstr ""
#. IDD_PROPPAGE_COLOR_SCHEMES, IDC_COLOR_SCHEME_DELETE
-#: Merge.rc:2135
+#: Merge.rc:2145
msgid "Delete ¤t scheme..."
msgstr ""
#. IDD_PROPPAGE_COLORS_DIR, IDC_BACKGROUND_COLUMN_LABEL
-#: Merge.rc:2143 Merge.rc:2238 Merge.rc:2258 Merge.rc:2272
+#: Merge.rc:2153 Merge.rc:2248 Merge.rc:2268 Merge.rc:2282
msgid "Background"
msgstr "Achtergrond"
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2144
+#: Merge.rc:2154
msgid "Deleted"
msgstr "Verwijderd"
#. IDS_OPTIONSPG_TEXTCOLORS
-#: Merge.rc:2145 Merge.rc:2207 Merge.rc:2239 Merge.rc:2273 Merge.rc:4207
+#: Merge.rc:2155 Merge.rc:2217 Merge.rc:2249 Merge.rc:2283 Merge.rc:4217
msgid "Text"
msgstr "Tekst"
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2146
+#: Merge.rc:2156
msgid "Difference:"
msgstr "Verschil:"
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2151
+#: Merge.rc:2161
msgid "Selected Difference:"
msgstr "Geselecteerd verschil:"
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2156
+#: Merge.rc:2166
msgid "Ignored Difference:"
msgstr "Genegeerd verschil:"
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2161
+#: Merge.rc:2171
msgid "Moved:"
msgstr "Verplaatst:"
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2166
+#: Merge.rc:2176
msgid "Selected Moved:"
msgstr "Geselecteerd verplaatst:"
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2171
+#: Merge.rc:2181
msgid "Same As Next (3 panes):"
msgstr "Zelfde als de volgende (3 vensters):"
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2176
+#: Merge.rc:2186
msgid "Same As Next (Selected):"
msgstr "Zelfde als de volgende (geselecteerd):"
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2181
+#: Merge.rc:2191
msgid "Word Difference:"
msgstr "Woordverschil:"
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2186
+#: Merge.rc:2196
msgid "Selected Word Diff:"
msgstr "Geselecteerd woordverschil:"
#. IDD_INPUTBOX
-#: Merge.rc:2195 Merge.rc:2230 Merge.rc:2251 Merge.rc:3099
+#: Merge.rc:2205 Merge.rc:2240 Merge.rc:2261 Merge.rc:3109
msgid "Dialog"
msgstr "Venster"
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC
-#: Merge.rc:2198
+#: Merge.rc:2208
msgid "Keywords:"
msgstr "Sleutelwoorden:"
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC
-#: Merge.rc:2199
+#: Merge.rc:2209
msgid "Function names:"
msgstr "Functienamen:"
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC
-#: Merge.rc:2200
+#: Merge.rc:2210
msgid "Comments:"
msgstr "Opmerkingen:"
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC
-#: Merge.rc:2201
+#: Merge.rc:2211
msgid "Numbers:"
msgstr "Nummers:"
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC
-#: Merge.rc:2202
+#: Merge.rc:2212
msgid "Operators:"
msgstr "Operators:"
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC
-#: Merge.rc:2203
+#: Merge.rc:2213
msgid "Strings:"
msgstr "Strings:"
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC
-#: Merge.rc:2204
+#: Merge.rc:2214
msgid "Preprocessor:"
msgstr "Voorverwerker:"
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC
-#: Merge.rc:2205
+#: Merge.rc:2215
msgid "User 1:"
msgstr "Gebruiker 1:"
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC
-#: Merge.rc:2206
+#: Merge.rc:2216
msgid "User 2:"
msgstr "Gebruiker 2:"
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_SCOLOR_USER2_BOLD
-#: Merge.rc:2209 Merge.rc:2211 Merge.rc:2213 Merge.rc:2215 Merge.rc:2217
-#: Merge.rc:2219 Merge.rc:2221 Merge.rc:2223 Merge.rc:2225
+#: Merge.rc:2219 Merge.rc:2221 Merge.rc:2223 Merge.rc:2225 Merge.rc:2227
+#: Merge.rc:2229 Merge.rc:2231 Merge.rc:2233 Merge.rc:2235
msgid "Bold"
msgstr "Vet"
#. IDD_PROPPAGE_COLORS_TEXT, IDC_DEFAULT_STANDARD_COLORS
-#: Merge.rc:2233
+#: Merge.rc:2243
msgid "&Use customized text colors"
msgstr "Aangepaste tekstkleuren gebruiken"
#. IDD_PROPPAGE_COLORS_TEXT, IDC_WHITESPACE_COLOR_LABEL
-#: Merge.rc:2235
+#: Merge.rc:2245
msgid "Whitespace:"
msgstr "Witruimte:"
#. IDD_PROPPAGE_COLORS_TEXT, IDC_TEXT_COLOR_LABEL
-#: Merge.rc:2236
+#: Merge.rc:2246
msgid "Regular text:"
msgstr "Gewone tekst:"
#. IDD_PROPPAGE_COLORS_TEXT, IDC_SELECTION_COLOR_LABEL
-#: Merge.rc:2237
+#: Merge.rc:2247
msgid "Selection:"
msgstr "Selectie:"
#. IDD_PROPPAGE_COLORS_DIR, IDC_STATIC
-#: Merge.rc:2245 Merge.rc:2286
+#: Merge.rc:2255 Merge.rc:2296
msgid "Margin:"
msgstr "Marge:"
#. IDD_PROPPAGE_COLORS_MARKER, IDC_MARKER0_COLOR_LABEL
-#: Merge.rc:2254
+#: Merge.rc:2264
msgid "Search Marker:"
msgstr "Markering zoeken:"
#. IDD_PROPPAGE_COLORS_MARKER, IDC_MARKER1_COLOR_LABEL
-#: Merge.rc:2255
+#: Merge.rc:2265
msgid "User Defined Marker 1:"
msgstr "Aangepaste markering 1:"
#. IDD_PROPPAGE_COLORS_MARKER, IDC_MARKER2_COLOR_LABEL
-#: Merge.rc:2256
+#: Merge.rc:2266
msgid "User Defined Marker 2:"
msgstr "Aangepaste markering 2:"
#. IDD_PROPPAGE_COLORS_MARKER, IDC_MARKER3_COLOR_LABEL
-#: Merge.rc:2257
+#: Merge.rc:2267
msgid "User Defined Marker 3:"
msgstr "Aangepaste markering 3:"
#. IDD_PROPPAGE_COLORS_DIR, IDC_USE_DIR_COMPARE_COLORS
-#: Merge.rc:2270
+#: Merge.rc:2280
msgid "&Use folder compare colors"
msgstr "Mapvergelijkingskleuren gebruiken"
#. IDD_PROPPAGE_COLORS_DIR, IDC_STATIC
-#: Merge.rc:2274
+#: Merge.rc:2284
msgid "Items equal:"
msgstr "Gelijke items:"
#. IDD_PROPPAGE_COLORS_DIR, IDC_STATIC
-#: Merge.rc:2277
+#: Merge.rc:2287
msgid "Items different:"
msgstr "Verschillende items:"
#. IDD_PROPPAGE_COLORS_DIR, IDC_STATIC
-#: Merge.rc:2280
+#: Merge.rc:2290
msgid "Items missing:"
msgstr "Items bestaan niet allemaal:"
#. IDD_PROPPAGE_COLORS_DIR, IDC_STATIC
-#: Merge.rc:2283
+#: Merge.rc:2293
msgid "Items filtered:"
msgstr "Gefilterde items:"
#. IDD_PROPPAGE_COLORS_SYSTEM, IDC_SYSCOLOR_HOOK_ENABLED
-#: Merge.rc:2295
+#: Merge.rc:2305
msgid "&Use custom system colors"
msgstr ""
#. IDS_PRPCAT_SYSTEM
-#: Merge.rc:2304 Merge.rc:4211 Merge.rc:4212 Merge.rc:4657
+#: Merge.rc:2314 Merge.rc:4221 Merge.rc:4222 Merge.rc:4667
msgid "System"
msgstr "Systeem"
#. IDD_PROPPAGE_SYSTEM, IDC_USE_RECYCLE_BIN
-#: Merge.rc:2307
+#: Merge.rc:2317
msgid "&Use Recycle Bin"
msgstr "Verwijderde bestanden naar prullenbak verplaatsen"
#. IDD_PROPPAGE_SYSTEM, IDC_STATIC
-#: Merge.rc:2308
+#: Merge.rc:2318
msgid "&External editor:"
msgstr "Externe editor:"
#. IDD_PROPPAGE_SYSTEM, IDC_STATIC
-#: Merge.rc:2311
+#: Merge.rc:2321
msgid "&Store user data in:"
msgstr ""
#. IDD_PROPPAGE_SYSTEM, IDC_STATIC
-#: Merge.rc:2313
+#: Merge.rc:2323
msgid "&Filter folder:"
msgstr "Map filteren:"
#. IDD_PROPPAGE_SYSTEM, IDC_STATIC
-#: Merge.rc:2316
+#: Merge.rc:2326
msgid "Temporary files folder"
msgstr "Map met tijdelijke bestanden"
#. IDD_PROPPAGE_SYSTEM, IDC_TMPFOLDER_SYSTEM
-#: Merge.rc:2317
+#: Merge.rc:2327
msgid "S&ystem temp folder"
msgstr "Tijdelijke map van het systeem"
#. IDD_PROPPAGE_SYSTEM, IDC_STATIC
-#: Merge.rc:2318
+#: Merge.rc:2328
msgid "C&ustom folder:"
msgstr "Aangepaste map:"
#. IDD_GENERATE_PATCH, IDC_DIFF_BROWSE_FILE2
-#: Merge.rc:2320 Merge.rc:2416
+#: Merge.rc:2330 Merge.rc:2426
msgid "Br&owse..."
msgstr "Bladeren..."
#. IDS_OPTIONSPG_COMPARE
-#: Merge.rc:2326 Merge.rc:4200
+#: Merge.rc:2336 Merge.rc:4210
msgid "Compare"
msgstr "Vergelijken"
#. IDD_PROPPAGE_COMPARE, IDC_STATIC
-#: Merge.rc:2329
+#: Merge.rc:2339
msgid "Whitespaces"
msgstr "Witruimtes"
#. IDD_PROPPAGE_COMPARE, IDC_WHITESPACE
-#: Merge.rc:2330
+#: Merge.rc:2340
msgid "&Compare"
msgstr "Vergelijken"
#. IDD_PROPPAGE_COMPARE, IDC_WHITE_CHANGE
-#: Merge.rc:2331
+#: Merge.rc:2341
msgid "&Ignore change"
msgstr "Wijziging negeren"
#. IDD_PROPPAGE_COMPARE, IDC_ALL_WHITE
-#: Merge.rc:2332
+#: Merge.rc:2342
msgid "I&gnore all"
msgstr "Alles negeren"
#. IDD_PROPPAGE_COMPARE, IDC_IGNBLANKS_CHECK
-#: Merge.rc:2333
+#: Merge.rc:2343
msgid "Ignore blan&k lines"
msgstr "Lege regels negeren"
#. IDD_PROPPAGE_COMPARE, IDC_IGNCASE_CHECK
-#: Merge.rc:2334
+#: Merge.rc:2344
msgid "Ignore &case"
msgstr "Niet hoofdlettergevoelig"
#. IDD_PROPPAGE_COMPARE, IDC_EOL_SENSITIVE
-#: Merge.rc:2335
+#: Merge.rc:2345
msgid "Igno&re EOL differences (Windows/Unix/Mac)"
msgstr ""
#. IDD_PROPPAGE_COMPARE, IDC_IGNORE_NUMBERS
-#: Merge.rc:2337
+#: Merge.rc:2347
msgid "Ignore num&bers"
msgstr "Nummers negeren"
#. IDD_PROPPAGE_COMPARE, IDC_CP_SENSITIVE
-#: Merge.rc:2338
+#: Merge.rc:2348
msgid "Ignore codepage &differences"
msgstr "Tekenset-verschillen negeren"
#. IDD_PROPPAGE_COMPARE, IDC_FILTERCOMMENTS_CHECK
-#: Merge.rc:2339
+#: Merge.rc:2349
msgid "Ignore c&omment differences"
msgstr "Opmerkingsverschillen negeren"
#. IDD_PROPPAGE_COMPARE, IDC_IGNEOFEOL_CHECK
-#: Merge.rc:2341
+#: Merge.rc:2351
msgid "Ignore &missing trailing EOL"
msgstr ""
#. IDD_PROPPAGE_COMPARE, IDC_IGNLBRKS_CHECK
-#: Merge.rc:2343
+#: Merge.rc:2353
msgid "Ignore line &breaks (treat as spaces)"
msgstr ""
#. IDD_PROPPAGE_COMPARE, IDC_MOVED_BLOCKS
-#: Merge.rc:2345
+#: Merge.rc:2355
msgid "E&nable moved block detection"
msgstr "Detectie verplaatste blokken inschakelen"
#. IDD_PROPPAGE_COMPARE, IDC_ALIGN_SIMILAR_LINES
-#: Merge.rc:2346
+#: Merge.rc:2356
msgid "Align &similar lines"
msgstr "Gelijkaardige regels uitlijnen"
#. IDD_PROPPAGE_COMPARE, IDC_STATIC
-#: Merge.rc:2347
+#: Merge.rc:2357
msgid "Diff &algorithm:"
msgstr "Verschil-algoritme"
#. IDD_PROPPAGE_COMPARE, IDC_INDENT_HEURISTIC
-#: Merge.rc:2349
+#: Merge.rc:2359
msgid "Enable indent &heuristic"
msgstr "Inspringing-heuristiek inschakelen"
#. IDD_PROPPAGE_COMPARE, IDC_COMPLETELY_BLANK_OUT_IGNORED_DIFFERENCES
-#: Merge.rc:2350
+#: Merge.rc:2360
msgid "Completely unhighlight the ignored differences"
msgstr "Markering van genegeerde verschillen volledig verwijderen"
#. IDS_OPTIONSPG_EDITOR
-#: Merge.rc:2357 Merge.rc:4201
+#: Merge.rc:2367 Merge.rc:4211
msgid "Editor"
msgstr "Editor"
#. IDD_PROPPAGE_EDITOR, IDC_HILITE_CHECK
-#: Merge.rc:2360
+#: Merge.rc:2370
msgid "&Highlight syntax"
msgstr "Syntax markeren"
#. IDD_PROPPAGE_EDITOR, IDC_MIXED_EOL
-#: Merge.rc:2361
+#: Merge.rc:2371
msgid "&Preserve original EOL"
msgstr "Originele regeleinde-tekens bewaren"
#. IDD_PROPPAGE_EDITOR, IDC_STATIC
-#: Merge.rc:2362
+#: Merge.rc:2372
msgid "Tabs"
msgstr "Tabs"
#. IDD_PROPPAGE_EDITOR, IDC_STATIC
-#: Merge.rc:2363
+#: Merge.rc:2373
msgid "&Tab size:"
msgstr "Tabgrootte:"
#. IDD_PROPPAGE_EDITOR, IDC_PROP_INSERT_TABS
-#: Merge.rc:2365
+#: Merge.rc:2375
msgid "&Insert tabs"
msgstr "Tabs invoegen"
#. IDD_PROPPAGE_EDITOR, IDC_PROP_INSERT_SPACES
-#: Merge.rc:2366
+#: Merge.rc:2376
msgid "Insert &spaces"
msgstr "Spaties invoegen"
#. IDD_PROPPAGE_EDITOR, IDC_STATIC
-#: Merge.rc:2367
+#: Merge.rc:2377
msgid "&Rendering mode:"
msgstr "Rendermodus:"
#. IDD_PROPPAGE_EDITOR_COMPAREMERGE, IDC_AUTOMRESCAN_CHECK
-#: Merge.rc:2376
+#: Merge.rc:2386
msgid "&Automatic rescan"
msgstr "Automatisch opnieuw scannen"
#. IDD_PROPPAGE_EDITOR_COMPAREMERGE, IDC_STATIC
-#: Merge.rc:2377
+#: Merge.rc:2387
msgid "Copy &granularity for selected differences:"
msgstr "Fijnheid voor kopiëren van geselecteerde verschillen:"
#. IDD_PROPPAGE_EDITOR_COMPAREMERGE, IDC_LINE_COLORING_GROUP
-#: Merge.rc:2379
+#: Merge.rc:2389
msgid "Line Difference Coloring"
msgstr "Kleur van regelverschillen"
#. IDD_PROPPAGE_EDITOR_COMPAREMERGE, IDC_VIEW_LINE_DIFFERENCES
-#: Merge.rc:2380
+#: Merge.rc:2390
msgid "View line differences"
msgstr "Regelverschillen weergeven"
#. IDD_PROPPAGE_EDITOR_COMPAREMERGE, IDC_EDITOR_CHARLEVEL
-#: Merge.rc:2381
+#: Merge.rc:2391
msgid "&Character-level"
msgstr "Tekenniveau"
#. IDD_PROPPAGE_EDITOR_COMPAREMERGE, IDC_EDITOR_WORDLEVEL
-#: Merge.rc:2382
+#: Merge.rc:2392
msgid "&Word-level:"
msgstr "Woordniveau:"
#. IDD_PROPPAGE_EDITOR_COMPAREMERGE, IDC_STATIC
-#: Merge.rc:2384
+#: Merge.rc:2394
msgid "W&ord break characters:"
msgstr "Woordsplitsingstekens:"
#. IDD_PROPPAGE_MESSAGEBOXES, IDC_STATIC
-#: Merge.rc:2401
+#: Merge.rc:2411
msgid ""
"Some messages can be hidden by the user. Press Reset to "
"make all messages visible again."
@@ -3694,399 +3705,399 @@ msgstr ""
"maken."
#. IDD_SELECT_FILES_OR_FOLDERS, IDC_RESET
-#: Merge.rc:2402 Merge.rc:3085
+#: Merge.rc:2412 Merge.rc:3095
msgid "Reset"
msgstr "Herstellen"
#. IDD_GENERATE_PATCH
-#: Merge.rc:2408
+#: Merge.rc:2418
msgid "Patch Generator"
msgstr "Patch-generator"
#. IDD_GENERATE_PATCH, IDC_STATIC
-#: Merge.rc:2411
+#: Merge.rc:2421
msgid "File&1:"
msgstr "Bestand 1:"
#. IDD_GENERATE_PATCH, IDC_STATIC
-#: Merge.rc:2414
+#: Merge.rc:2424
msgid "File&2:"
msgstr "Bestand 2:"
#. IDD_GENERATE_PATCH, IDC_DIFF_SWAPFILES
-#: Merge.rc:2417
+#: Merge.rc:2427
msgid "&Swap"
msgstr "Wisselen"
#. IDD_DIRCMP_REPORT, IDC_REPORT_COPYCLIPBOARD
-#: Merge.rc:2418 Merge.rc:2690
+#: Merge.rc:2428 Merge.rc:2700
msgid "&Copy to clipboard"
msgstr "Naar klembord kopiëren"
#. IDD_GENERATE_PATCH, IDC_DIFF_APPENDFILE
-#: Merge.rc:2419
+#: Merge.rc:2429
msgid "&Append to existing file"
msgstr "Toevoegen aan bestaand bestand"
#. IDD_GENERATE_PATCH, IDC_STATIC
-#: Merge.rc:2420
+#: Merge.rc:2430
msgid "&Result:"
msgstr "Resultaat:"
#. IDD_GENERATE_PATCH, IDC_DIFF_BROWSE_RESULT
-#: Merge.rc:2422
+#: Merge.rc:2432
msgid "Bro&wse..."
msgstr "Bladeren..."
#. IDD_GENERATE_PATCH, IDC_STATIC
-#: Merge.rc:2423
+#: Merge.rc:2433
msgid "&Format"
msgstr "Formaat"
#. IDD_GENERATE_PATCH, IDC_STATIC
-#: Merge.rc:2424
+#: Merge.rc:2434
msgid "St&yle:"
msgstr "Stijl:"
#. IDD_GENERATE_PATCH, IDC_STATIC
-#: Merge.rc:2426
+#: Merge.rc:2436
msgid "&Context:"
msgstr "Context:"
#. IDD_GENERATE_PATCH, IDC_DIFF_INCLCMDLINE
-#: Merge.rc:2428
+#: Merge.rc:2438
msgid "Inclu&de command line"
msgstr "Inclusief opdrachtregel"
#. IDD_GENERATE_PATCH, IDC_DIFF_OPENTOEDITOR
-#: Merge.rc:2429
+#: Merge.rc:2439
msgid "Open in e&xternal editor"
msgstr "Openen met externe editor"
#. IDD_DIRCOLS
-#: Merge.rc:2446
+#: Merge.rc:2456
msgid "Display Columns"
msgstr "Kolommen weergeven"
#. IDD_DIRCOLS, IDC_UP
-#: Merge.rc:2450
+#: Merge.rc:2460
msgid "Move &Up"
msgstr "Omhoog verplaatsen"
#. IDD_DIRCOLS, IDC_DOWN
-#: Merge.rc:2451
+#: Merge.rc:2461
msgid "Move &Down"
msgstr "Omlaag verplaatsen"
#. IDD_DIRCOLS, IDC_COLDLG_ADDITIONAL_PROPERTIES
-#: Merge.rc:2453
+#: Merge.rc:2463
msgid "&Additional Properties"
msgstr "Extra eigenschappen"
#. IDD_DIRADDITIONALPROPS
-#: Merge.rc:2461
+#: Merge.rc:2471
msgid "Additional Properties"
msgstr "Extra eigenschappen"
#. IDD_PLUGINS_SELECTPLUGIN
-#: Merge.rc:2475
+#: Merge.rc:2485
msgid "Select Plugin"
msgstr "Plugin selecteren"
#. IDD_PLUGINS_EDITPLUGIN, IDC_STATIC
-#: Merge.rc:2478 Merge.rc:3115
+#: Merge.rc:2488 Merge.rc:3125
msgid "Plugin &name:"
msgstr "Naam plugin:"
#. IDD_PLUGINS_SELECTPLUGIN, IDC_STATIC
-#: Merge.rc:2480
+#: Merge.rc:2490
msgid "&Target files:"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN, IDC_STATIC
-#: Merge.rc:2482 Merge.rc:3117
+#: Merge.rc:2492 Merge.rc:3127
msgid "Extensions list:"
msgstr "Lijst extensies:"
#. IDD_PLUGINS_EDITPLUGIN, IDC_STATIC
-#: Merge.rc:2484 Merge.rc:3119
+#: Merge.rc:2494 Merge.rc:3129
msgid "Description:"
msgstr "Beschrijving:"
#. IDD_PLUGINS_EDITPLUGIN, IDC_STATIC
-#: Merge.rc:2486 Merge.rc:3121
+#: Merge.rc:2496 Merge.rc:3131
msgid "Default arguments:"
msgstr "Standaard argumenten:"
#. IDD_PLUGINS_SELECTPLUGIN, IDC_PLUGIN_ALLOW_ALL
-#: Merge.rc:2488
+#: Merge.rc:2498
msgid "Display all plugins (Ignore extension)"
msgstr "Alle plugins weergeven zonder de extensie te controleren"
#. IDD_PLUGINS_SELECTPLUGIN, IDC_PLUGIN_OPEN_IN_SAME_FRAME_TYPE
-#: Merge.rc:2490
+#: Merge.rc:2500
msgid "&Open files in same window type after unpacking"
msgstr "Bestanden openen in hetzelfde venstertype na uitpakken"
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_PIPELINE_STATIC
-#: Merge.rc:2492 Merge.rc:3129
+#: Merge.rc:2502 Merge.rc:3139
msgid "&Plugin pipeline:"
msgstr "Plugin pipeline:"
#. IDD_PLUGINS_SELECTPLUGIN, IDC_PLUGIN_ALIAS
-#: Merge.rc:2495
+#: Merge.rc:2505
msgid "&Alias..."
msgstr "Alias..."
#. IDD_DIRCOMP_PROGRESS, IDC_COMPARISON_STOP
-#: Merge.rc:2505
+#: Merge.rc:2515
msgid "Stop"
msgstr "Stoppen"
#. IDD_DIRCOMP_PROGRESS, IDC_COMPARISON_PAUSE
-#: Merge.rc:2506
+#: Merge.rc:2516
msgid "Pause"
msgstr "Pauzeren"
#. IDD_DIRCOMP_PROGRESS, IDC_COMPARISON_CONTINUE
-#: Merge.rc:2507
+#: Merge.rc:2517
msgid "Continue"
msgstr "Doorgaan"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC
-#: Merge.rc:2509 Merge.rc:2973
+#: Merge.rc:2519 Merge.rc:2983
msgid "C&PU cores to use:"
msgstr "Aantal CPU-kernen te gebruiken:"
#. IDD_DIRCOMP_PROGRESS, IDC_STATIC
-#: Merge.rc:2510
+#: Merge.rc:2520
msgid "Items total:"
msgstr "Totaal aantal items:"
#. IDD_DIRCOMP_PROGRESS, IDC_STATIC
-#: Merge.rc:2511
+#: Merge.rc:2521
msgid "Items compared:"
msgstr "Items vergeleken:"
#. IDS_PREVIEWBAR_CLOSE
-#: Merge.rc:2526 Merge.rc:2846 Merge.rc:5328
+#: Merge.rc:2536 Merge.rc:2856 Merge.rc:5339
msgid "&Close"
msgstr "Sluiten"
#. IDD_WMGOTO
-#: Merge.rc:2537
+#: Merge.rc:2547
msgid "Go to"
msgstr "Gaan naar"
#. IDD_WMGOTO, IDC_STATIC
-#: Merge.rc:2540
+#: Merge.rc:2550
msgid "G&o to:"
msgstr "Ga naar:"
#. IDD_WMGOTO, IDC_STATIC
-#: Merge.rc:2543
+#: Merge.rc:2553
msgid "File"
msgstr "Bestand"
#. IDD_WMGOTO, IDC_STATIC
-#: Merge.rc:2547
+#: Merge.rc:2557
msgid "Go to what"
msgstr "Gaan naar"
#. IDD_WMGOTO, IDC_WMGOTO_TOLINE
-#: Merge.rc:2548
+#: Merge.rc:2558
msgid "Li&ne"
msgstr "Regel"
#. IDD_WMGOTO, IDC_WMGOTO_TODIFF
-#: Merge.rc:2549
+#: Merge.rc:2559
msgid "&Difference"
msgstr "Verschil"
#. IDD_WMGOTO, IDOK
-#: Merge.rc:2550
+#: Merge.rc:2560
msgid "&Go to"
msgstr "Gaan naar"
#. IDS_PROJECT_ITEM_FILE_FILTER
-#: Merge.rc:2556 Merge.rc:4321
+#: Merge.rc:2566 Merge.rc:4331
msgid "File Filters"
msgstr "Bestandsfilters"
#. IDD_FILTERS_FILEFILTERS, IDC_STATIC
-#: Merge.rc:2559
+#: Merge.rc:2569
msgid "&Mask / Filter Expression"
msgstr ""
#. IDD_FILTERS_FILEFILTERS, IDC_STATIC
-#: Merge.rc:2562
+#: Merge.rc:2572
msgid "Preset &Filters"
msgstr ""
#. IDD_FILTERS_FILEFILTERS, IDC_FILTERFILE_TEST_BTN
-#: Merge.rc:2564
+#: Merge.rc:2574
msgid "Test..."
msgstr "Testen..."
#. IDD_FILTERS_FILEFILTERS, IDC_FILTERFILE_INSTALL
-#: Merge.rc:2565
+#: Merge.rc:2575
msgid "Install..."
msgstr "Installeren..."
#. IDD_FILTERS_FILEFILTERS, IDC_FILTERFILE_NEWBTN
-#: Merge.rc:2566
+#: Merge.rc:2576
msgid "New..."
msgstr "Nieuw..."
#. IDD_FILTERS_FILEFILTERS, IDC_FILTERFILE_EDITBTN
-#: Merge.rc:2567
+#: Merge.rc:2577
msgid "Edit..."
msgstr "Bewerken..."
#. IDD_FILTERS_FILEFILTERS, IDC_FILTERFILE_DELETEBTN
-#: Merge.rc:2568
+#: Merge.rc:2578
msgid "Delete..."
msgstr "Verwijderen..."
#. IDD_FILTERS_CONDITION
-#: Merge.rc:2573
+#: Merge.rc:2583
msgid "Filter Condition"
msgstr ""
#. IDD_FILTERS_CONDITION, IDC_STATIC
-#: Merge.rc:2576
+#: Merge.rc:2586
msgid "&Left-hand side:"
msgstr ""
#. IDD_FILTERS_CONDITION, IDC_STATIC
-#: Merge.rc:2578
+#: Merge.rc:2588
msgid "&Operator:"
msgstr ""
#. IDD_FILTERS_CONDITION, IDC_STATIC
-#: Merge.rc:2580
+#: Merge.rc:2590
msgid "&Right-hand side:"
msgstr ""
#. IDD_FILTERS_CONDITION, IDC_STATIC
-#: Merge.rc:2586
+#: Merge.rc:2596
msgid "Expression:"
msgstr ""
#. IDD_COMPARISON_RESULT_FILTER
-#: Merge.rc:2595
+#: Merge.rc:2605
msgid "Filter by Comparison Result"
msgstr ""
#. IDD_COMPARISON_RESULT_FILTER, IDC_RADIO_INCLUDE
-#: Merge.rc:2598
+#: Merge.rc:2608
msgid "&Include"
msgstr ""
#. IDD_COMPARISON_RESULT_FILTER, IDC_RADIO_EXCLUDE
-#: Merge.rc:2599
+#: Merge.rc:2609
msgid "&Exclude"
msgstr ""
#. IDD_COMPARISON_RESULT_FILTER, IDC_STATIC
-#: Merge.rc:2600
+#: Merge.rc:2610
msgid "Comparison Results"
msgstr ""
#. IDS_IDENTICAL
-#: Merge.rc:2601 Merge.rc:2733 Merge.rc:2794 Merge.rc:4698
+#: Merge.rc:2611 Merge.rc:2743 Merge.rc:2804 Merge.rc:4708
msgid "Identical"
msgstr "Identiek"
#. IDS_DIFFERENT
-#: Merge.rc:2602 Merge.rc:2714 Merge.rc:2755 Merge.rc:4708
+#: Merge.rc:2612 Merge.rc:2724 Merge.rc:2765 Merge.rc:4718
msgid "Different"
msgstr "Verschillend"
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_LEFT_ONLY
-#: Merge.rc:2603
+#: Merge.rc:2613
msgid "Left only"
msgstr ""
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_RIGHT_ONLY
-#: Merge.rc:2604
+#: Merge.rc:2614
msgid "Right only"
msgstr ""
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_SKIPPED
-#: Merge.rc:2605
+#: Merge.rc:2615
msgid "Skipped"
msgstr ""
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_MIDDLE_ONLY
-#: Merge.rc:2606
+#: Merge.rc:2616
msgid "Middle only"
msgstr ""
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_LEFT_ONLY_DIFFERENT
-#: Merge.rc:2607
+#: Merge.rc:2617
msgid "Left only (different)"
msgstr ""
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_MIDDLE_ONLY_DIFFERENT
-#: Merge.rc:2608
+#: Merge.rc:2618
msgid "Middle only (different)"
msgstr ""
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_RIGHT_ONLY_DIFFERENT
-#: Merge.rc:2609
+#: Merge.rc:2619
msgid "Right only (different)"
msgstr ""
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_LEFT_ONLY_MISSING
-#: Merge.rc:2610
+#: Merge.rc:2620
msgid "Left only (missing)"
msgstr ""
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_MIDDLE_ONLY_MISSING
-#: Merge.rc:2611
+#: Merge.rc:2621
msgid "Middle only (missing)"
msgstr ""
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_RIGHT_ONLY_MISSING
-#: Merge.rc:2612
+#: Merge.rc:2622
msgid "Right only (missing)"
msgstr ""
#. IDS_OPTIONSPG_CODEPAGE
-#: Merge.rc:2619 Merge.rc:2811 Merge.rc:4213
+#: Merge.rc:2629 Merge.rc:2821 Merge.rc:4223
msgid "Codepage"
msgstr "Tekenset"
#. IDD_PROPPAGE_CODEPAGE, IDC_STATIC
-#: Merge.rc:2622
+#: Merge.rc:2632
msgid "Default Codepage"
msgstr "Standaard tekenset"
#. IDD_PROPPAGE_CODEPAGE, IDC_STATIC
-#: Merge.rc:2623
+#: Merge.rc:2633
msgid "Select the default codepage for non-Unicode files:"
msgstr ""
"Selecteer de standaard veronderstelde tekenset bij laden van niet-"
"Unicodebestanden:"
#. IDD_PROPPAGE_CODEPAGE, IDC_CP_SYSTEM
-#: Merge.rc:2624
+#: Merge.rc:2634
msgid "System codepage"
msgstr "Tekenset van systeem"
#. IDD_PROPPAGE_CODEPAGE, IDC_CP_UI
-#: Merge.rc:2625
+#: Merge.rc:2635
msgid "According to WinMerge User Interface"
msgstr "Volgens WinMerge-gebruikersinterface"
#. IDD_PROPPAGE_CODEPAGE, IDC_CP_CUSTOM
-#: Merge.rc:2626
+#: Merge.rc:2636
msgid "Custom codepage:"
msgstr "Aangepaste tekenset:"
#. IDD_PROPPAGE_CODEPAGE, IDC_DETECT_CODEPAGE
-#: Merge.rc:2628
+#: Merge.rc:2638
msgid ""
"Detect codepage for: .html, .rc, .xml\n"
"Restart required."
@@ -4095,7 +4106,7 @@ msgstr ""
"Herstarten sessie noodzakelijk."
#. IDD_PROPPAGE_CODEPAGE, IDC_DETECT_CODEPAGE2
-#: Merge.rc:2630
+#: Merge.rc:2640
msgid ""
"Detect codepage for files with mlang.dll\n"
"Restart required."
@@ -4104,769 +4115,769 @@ msgstr ""
"Herstarten sessie noodzakelijk."
#. IDS_OPTIONSPG_ARCHIVE
-#: Merge.rc:2638 Merge.rc:4214
+#: Merge.rc:2648 Merge.rc:4224
msgid "Archive Support"
msgstr "Archiefondersteuning"
#. IDD_PROPPAGE_ARCHIVE, IDC_ARCHIVE_ENABLE
-#: Merge.rc:2641
+#: Merge.rc:2651
msgid "&Enable archive file support"
msgstr "Archiefbestand-ondersteuning inschakelen"
#. IDD_PROPPAGE_ARCHIVE, IDC_ARCHIVE_DETECTTYPE
-#: Merge.rc:2642
+#: Merge.rc:2652
msgid "&Detect archive type from file signature"
msgstr "Archieftype detecteren via bestandssignatuur"
#. IDD_PROPPAGE_PROJECT, IDC_STATIC
-#: Merge.rc:2651
+#: Merge.rc:2661
msgid "Items saved to or restored from the project file:"
msgstr "Items opgeslagen naar of hersteld uit het projectbestand:"
#. IDD_SAVECLOSING
-#: Merge.rc:2658
+#: Merge.rc:2668
msgid "Save Modified Files?"
msgstr "Gewijzigde bestanden opslaan?"
#. IDD_SAVECLOSING, IDC_SAVECLOSING_LEFTFRAME
-#: Merge.rc:2661
+#: Merge.rc:2671
msgid "Left side file"
msgstr "Linker bestand"
#. IDD_SAVECLOSING, IDC_SAVECLOSING_SAVELEFT
-#: Merge.rc:2663
+#: Merge.rc:2673
msgid "&Save changes"
msgstr "Wijzigingen opslaan"
#. IDD_SAVECLOSING, IDC_SAVECLOSING_DISCARDLEFT
-#: Merge.rc:2664
+#: Merge.rc:2674
msgid "&Discard changes"
msgstr "Wijzigingen verwerpen"
#. IDD_SAVECLOSING, IDC_SAVECLOSING_MIDDLEFRAME
-#: Merge.rc:2665
+#: Merge.rc:2675
msgid "Middle side file"
msgstr "Middelste bestand"
#. IDD_SAVECLOSING, IDC_SAVECLOSING_SAVEMIDDLE
-#: Merge.rc:2667
+#: Merge.rc:2677
msgid "Sa&ve changes"
msgstr "Wijzigingen opslaan"
#. IDD_SAVECLOSING, IDC_SAVECLOSING_DISCARDMIDDLE
-#: Merge.rc:2668
+#: Merge.rc:2678
msgid "Discard c&hanges"
msgstr "Wijzigingen verwerpen"
#. IDD_SAVECLOSING, IDC_SAVECLOSING_RIGHTFRAME
-#: Merge.rc:2669
+#: Merge.rc:2679
msgid "Right side file"
msgstr "Rechter bestand"
#. IDD_SAVECLOSING, IDC_SAVECLOSING_SAVERIGHT
-#: Merge.rc:2671
+#: Merge.rc:2681
msgid "S&ave changes"
msgstr "Wijzigingen opslaan"
#. IDD_SAVECLOSING, IDC_SAVECLOSING_DISCARDRIGHT
-#: Merge.rc:2672
+#: Merge.rc:2682
msgid "Dis&card changes"
msgstr "Wijzigingen verwerpen"
#. IDD_SAVECLOSING, IDC_SAVECLOSING_DISCARDALL
-#: Merge.rc:2673
+#: Merge.rc:2683
msgid "Disca&rd All"
msgstr "Alles verwerpen"
#. IDD_DIRCMP_REPORT
-#: Merge.rc:2680
+#: Merge.rc:2690
msgid "Folder Compare Report"
msgstr "Mapvergelijkingsrapport"
#. IDD_DIRCMP_REPORT, IDC_STATIC
-#: Merge.rc:2683
+#: Merge.rc:2693
msgid "Report &file:"
msgstr "Rapportbestand:"
#. IDD_DIRCMP_REPORT, IDC_STATIC
-#: Merge.rc:2686
+#: Merge.rc:2696
msgid "&Style:"
msgstr "Stijl:"
#. IDD_DIRCMP_REPORT, IDC_REPORT_INCLUDEFILECMPREPORT
-#: Merge.rc:2688
+#: Merge.rc:2698
msgid "&Include file compare report"
msgstr "Bestandsvergelijkingsrapport bijvoegen"
#. IDD_FILTERS_FILEFILTERS_SHARED
-#: Merge.rc:2697
+#: Merge.rc:2707
msgid "Shared or Private Filter"
msgstr "Gedeelde of persoonlijke filter"
#. IDD_FILTERS_FILEFILTERS_SHARED, IDC_STATIC
-#: Merge.rc:2700
+#: Merge.rc:2710
msgid "What type of filter do you want?"
msgstr "Welk type filter wilt u maken?"
#. IDD_FILTERS_FILEFILTERS_SHARED, IDC_SHARED
-#: Merge.rc:2701
+#: Merge.rc:2711
msgid "Shared Filter (for all users)"
msgstr "Gedeelde filter (voor alle gebruikers op deze pc)"
#. IDD_FILTERS_FILEFILTERS_SHARED, IDC_PRIVATE
-#: Merge.rc:2702
+#: Merge.rc:2712
msgid "Private Filter (current user only)"
msgstr "Persoonlijke filter (alleen voor huidige gebruiker)"
#. IDD_COMPARE_STATISTICS3
-#: Merge.rc:2709 Merge.rc:2750
+#: Merge.rc:2719 Merge.rc:2760
msgid "Compare Statistics"
msgstr "Vergelijkingsstatistieken"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2712 Merge.rc:2753
+#: Merge.rc:2722 Merge.rc:2763
msgid "Folders:"
msgstr "Mappen:"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2713 Merge.rc:2754
+#: Merge.rc:2723 Merge.rc:2764
msgid "Files:"
msgstr "Bestanden:"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2719 Merge.rc:2738 Merge.rc:2760 Merge.rc:2799
+#: Merge.rc:2729 Merge.rc:2748 Merge.rc:2770 Merge.rc:2809
msgid "Binary:"
msgstr "Binair:"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2722 Merge.rc:2763
+#: Merge.rc:2732 Merge.rc:2773
msgid "Unique"
msgstr "Uniek"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2723 Merge.rc:2764
+#: Merge.rc:2733 Merge.rc:2774
msgid "Left:"
msgstr "Links:"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2728 Merge.rc:2774
+#: Merge.rc:2738 Merge.rc:2784
msgid "Right:"
msgstr "Rechts:"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2742 Merge.rc:2803
+#: Merge.rc:2752 Merge.rc:2813
msgid "Total:"
msgstr "Totaal:"
#. IDD_COMPARE_STATISTICS3, IDOK
-#: Merge.rc:2745 Merge.rc:2806
+#: Merge.rc:2755 Merge.rc:2816
msgid "Close"
msgstr "Sluiten"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2769
+#: Merge.rc:2779
msgid "Middle:"
msgstr "Midden:"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2779
+#: Merge.rc:2789
msgid "Missing Left:"
msgstr "Links ontbrekend:"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2784
+#: Merge.rc:2794
msgid "Missing Middle:"
msgstr "Midden ontbrekend:"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2789
+#: Merge.rc:2799
msgid "Missing Right:"
msgstr "Rechts ontbrekend:"
#. IDD_LOAD_SAVE_CODEPAGE, IDC_AFFECTS_GROUP
-#: Merge.rc:2814
+#: Merge.rc:2824
msgid "Affects"
msgstr "Aanpassingen"
#. IDD_LOAD_SAVE_CODEPAGE, IDC_RIGHT_FILES_LABEL
-#: Merge.rc:2816 Merge.rc:2818 Merge.rc:2820
+#: Merge.rc:2826 Merge.rc:2828 Merge.rc:2830
msgid "(Affects)"
msgstr "(Aanpassingen)"
#. IDD_LOAD_SAVE_CODEPAGE, IDC_LOADING_GROUP
-#: Merge.rc:2821
+#: Merge.rc:2831
msgid "Select Codepage for"
msgstr "Tekenset selecteren voor"
#. IDD_LOAD_SAVE_CODEPAGE, IDC_LOAD_FILES_LABEL
-#: Merge.rc:2822
+#: Merge.rc:2832
msgid "&File Loading:"
msgstr "Bestanden laden:"
#. IDD_LOAD_SAVE_CODEPAGE, IDC_SAVE_FILES_LABEL
-#: Merge.rc:2824
+#: Merge.rc:2834
msgid "File &Saving:"
msgstr "Bestanden opslaan:"
#. IDD_LOAD_SAVE_CODEPAGE, IDC_LOAD_SAVE_SAME_CODEPAGE
-#: Merge.rc:2827
+#: Merge.rc:2837
msgid "&Use same codepage for both"
msgstr "Voor beide dezelfde tekenset gebruiken"
#. IDS_MESSAGEBOX_CANCEL
-#: Merge.rc:2830 Merge.rc:4172
+#: Merge.rc:2840 Merge.rc:4182
msgid "&Cancel"
msgstr "Annuleren"
#. IDD_FILTERS_FILEFILTERS_TEST
-#: Merge.rc:2835
+#: Merge.rc:2845
msgid "Test Filter"
msgstr "Filter testen"
#. IDD_FILTERS_FILEFILTERS_TEST, IDC_HEADER
-#: Merge.rc:2838
+#: Merge.rc:2848
msgid "Testing filter:"
msgstr "Filter testen:"
#. IDD_FILTERS_FILEFILTERS_TEST, IDC_PROMPT_LABEL
-#: Merge.rc:2840
+#: Merge.rc:2850
msgid "&Enter text to test:"
msgstr "Tekst opgeven om te testen:"
#. IDD_FILTERS_FILEFILTERS_TEST, IDC_IS_DIRECTORY
-#: Merge.rc:2842
+#: Merge.rc:2852
msgid "&Folder Name"
msgstr "Mapnaam"
#. IDD_FILTERS_FILEFILTERS_TEST, IDC_STATIC
-#: Merge.rc:2843
+#: Merge.rc:2853
msgid "Result:"
msgstr "Resultaat:"
#. IDD_FILTERS_FILEFILTERS_TEST, IDC_TEST_BTN
-#: Merge.rc:2845
+#: Merge.rc:2855
msgid "&Test"
msgstr "Testen"
#. IDS_OPTIONSPG_TABLECOMPARE
-#: Merge.rc:2851 Merge.rc:2990 Merge.rc:4228
+#: Merge.rc:2861 Merge.rc:3000 Merge.rc:4238
msgid "Table"
msgstr "Tabel"
#. IDD_OPEN_TABLE, IDC_STATIC
-#: Merge.rc:2854
+#: Merge.rc:2864
msgid "File type"
msgstr "Bestandstype"
#. IDD_OPEN_TABLE, IDC_COMPARETABLE_CSV
-#: Merge.rc:2855
+#: Merge.rc:2865
msgid "&CSV"
msgstr "CSV"
#. IDD_OPEN_TABLE, IDC_COMPARETABLE_TSV
-#: Merge.rc:2856
+#: Merge.rc:2866
msgid "&TSV"
msgstr "TSV"
#. IDD_OPEN_TABLE, IDC_COMPARETABLE_DSV
-#: Merge.rc:2857
+#: Merge.rc:2867
msgid "Custom &Delimiter-Separated Values"
msgstr "Aangepaste door scheidingsteken gescheiden waarden"
#. IDD_PROPPAGE_COMPARE_TABLE, IDC_STATIC
-#: Merge.rc:2859 Merge.rc:2861 Merge.rc:2996 Merge.rc:3004
+#: Merge.rc:2869 Merge.rc:2871 Merge.rc:3006 Merge.rc:3014
msgid "D&elimiter character:"
msgstr "Scheidingsteken:"
#. IDD_PROPPAGE_COMPARE_TABLE, IDC_COMPARETABLE_ALLOWNEWLINE
-#: Merge.rc:2863 Merge.rc:3006
+#: Merge.rc:2873 Merge.rc:3016
msgid "&Allow newlines in quotes"
msgstr "Witregels in citaten toestaan"
#. IDD_PROPPAGE_COMPARE_TABLE, IDC_STATIC
-#: Merge.rc:2865 Merge.rc:3008
+#: Merge.rc:2875 Merge.rc:3018
msgid "&Quote character:"
msgstr "Citaat-teken:"
#. IDS_OPTIONSPG_BACKUPS
-#: Merge.rc:2873 Merge.rc:4216
+#: Merge.rc:2883 Merge.rc:4226
msgid "Backup Files"
msgstr "Backupbestanden"
#. IDD_PROPPAGE_BACKUPS, IDC_STATIC
-#: Merge.rc:2876
+#: Merge.rc:2886
msgid "Create backup files for:"
msgstr "Backupbestanden aanmaken in:"
#. IDD_PROPPAGE_BACKUPS, IDC_BACKUP_FOLDERCMP
-#: Merge.rc:2877
+#: Merge.rc:2887
msgid "&Folder compare"
msgstr "Mappen vergelijken"
#. IDD_PROPPAGE_BACKUPS, IDC_BACKUP_FILECMP
-#: Merge.rc:2878
+#: Merge.rc:2888
msgid "Fil&e compare"
msgstr "Bestanden vergelijken"
#. IDD_PROPPAGE_BACKUPS, IDC_STATIC
-#: Merge.rc:2879
+#: Merge.rc:2889
msgid "Create backup files in:"
msgstr "Backupbestanden aanmaken in:"
#. IDD_PROPPAGE_BACKUPS, IDC_BACKUP_ORIGFOLD
-#: Merge.rc:2880
+#: Merge.rc:2890
msgid "&Original file's folder"
msgstr "Map van origineel bestand"
#. IDD_PROPPAGE_BACKUPS, IDC_BACKUP_GLOBALFOLD
-#: Merge.rc:2881
+#: Merge.rc:2891
msgid "&Global backup folder:"
msgstr "Algemene backupmap:"
#. IDD_PROPPAGE_BACKUPS, IDC_STATIC
-#: Merge.rc:2884
+#: Merge.rc:2894
msgid "Backup filename:"
msgstr "Bestandsnaam backup:"
#. IDD_PROPPAGE_BACKUPS, IDC_BACKUP_APPEND_BAK
-#: Merge.rc:2885
+#: Merge.rc:2895
msgid "&Append .bak extension"
msgstr ".bak-extensie toevoegen"
#. IDD_PROPPAGE_BACKUPS, IDC_BACKUP_APPEND_TIME
-#: Merge.rc:2886
+#: Merge.rc:2896
msgid "A&ppend timestamp"
msgstr "Tijdstempel toevoegen"
#. IDS_CONFIRM_COPY_CAPTION
-#: Merge.rc:2892 Merge.rc:4565
+#: Merge.rc:2902 Merge.rc:4575
msgid "Confirm Copy"
msgstr "Kopiëren bevestigen"
#. IDD_CONFIRM_COPY, IDC_FLDCONFIRM_QUERY
-#: Merge.rc:2896
+#: Merge.rc:2906
msgid "Are you sure you want to copy XXX items?"
msgstr "Bent u zeker dat u XXX items wilt kopiëren?"
#. IDD_CONFIRM_COPY, IDC_FLDCONFIRM_FROM_TEXT
-#: Merge.rc:2897
+#: Merge.rc:2907
msgid "From left"
msgstr "Van links"
#. IDD_CONFIRM_COPY, IDC_FLDCONFIRM_TO_TEXT
-#: Merge.rc:2899
+#: Merge.rc:2909
msgid "To right"
msgstr "Naar rechts"
#. IDS_MESSAGEBOX_DONT_ASK_AGAIN
-#: Merge.rc:2901 Merge.rc:4191
+#: Merge.rc:2911 Merge.rc:4201
msgid "Don't ask this &question again."
msgstr "Deze vraag niet meer stellen."
#. IDD_CONFIRM_COPY, IDYES
-#: Merge.rc:2903
+#: Merge.rc:2913
msgid "Yes"
msgstr "Ja"
#. IDD_CONFIRM_COPY, IDNO
-#: Merge.rc:2904
+#: Merge.rc:2914
msgid "No"
msgstr "Nee"
#. IDS_PROJECT_ITEM_PLUGIN
-#: Merge.rc:2909 Merge.rc:4323
+#: Merge.rc:2919 Merge.rc:4333
msgid "Plugins"
msgstr "Plugins"
#. IDD_PLUGINS_LIST, IDC_PLUGINS_ENABLE
-#: Merge.rc:2912
+#: Merge.rc:2922
msgid "&Enable plugins"
msgstr "Plugins inschakelen"
#. IDD_PLUGINS_EDITPLUGIN, IDC_STATIC
-#: Merge.rc:2913 Merge.rc:3113
+#: Merge.rc:2923 Merge.rc:3123
msgid "Plugin &type:"
msgstr "Type plugin:"
#. IDD_PLUGINS_LIST, IDC_STATIC
-#: Merge.rc:2916
+#: Merge.rc:2926
msgid "File filters:"
msgstr "Bestandsfilters:"
#. IDD_PLUGINS_LIST, IDC_STATIC
-#: Merge.rc:2918
+#: Merge.rc:2928
msgid "&Plugin arguments:"
msgstr "Plugin-argumenten:"
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_AUTOMATIC
-#: Merge.rc:2920 Merge.rc:3134
+#: Merge.rc:2930 Merge.rc:3144
msgid "Enable &automatic unpacking/prediffing"
msgstr "Automatisch uitpakken/voorvergelijken inschakelen voor de plugin"
#. IDS_OPTIONSPG_SHELL
-#: Merge.rc:2934 Merge.rc:4217
+#: Merge.rc:2944 Merge.rc:4227
msgid "Shell Integration"
msgstr "Shell-integratie"
#. IDD_PROPPAGE_SHELL, IDC_STATIC
-#: Merge.rc:2937
+#: Merge.rc:2947
msgid "Explorer"
msgstr "Verkenner"
#. IDD_PROPPAGE_SHELL, IDC_EXPLORER_CONTEXT
-#: Merge.rc:2938
+#: Merge.rc:2948
msgid "&Add to context menu"
msgstr "Aan contextmenu toevoegen"
#. IDD_PROPPAGE_SHELL, IDC_EXPLORER_ADVANCED
-#: Merge.rc:2939
+#: Merge.rc:2949
msgid "E&nable advanced menu"
msgstr "Geavanceerd menu inschakelen"
#. IDD_PROPPAGE_SHELL, IDC_EXPLORER_COMPARE_AS
-#: Merge.rc:2940
+#: Merge.rc:2950
msgid "Enable &Compare As menu"
msgstr "Menu 'vergelijken als' inschakelen"
#. IDD_PROPPAGE_SHELL, IDC_REGISTER_SHELLEXTENSION
-#: Merge.rc:2941
+#: Merge.rc:2951
msgid "&Register Shell Extension"
msgstr "Shell-extensie registreren"
#. IDD_PROPPAGE_SHELL, IDC_UNREGISTER_SHELLEXTENSION
-#: Merge.rc:2942
+#: Merge.rc:2952
msgid "&Unregister Shell Extension"
msgstr "Shell-extensie de-registreren"
#. IDD_PROPPAGE_SHELL, IDC_REGISTER_SHELLEXTENSION_PERUSER
-#: Merge.rc:2943
+#: Merge.rc:2953
msgid "Register Shell Extension for Current User &Only"
msgstr "Shell-extensie alleen voor huidige gebruiker registreren"
#. IDD_PROPPAGE_SHELL, IDC_UNREGISTER_SHELLEXTENSION_PERUSER
-#: Merge.rc:2944
+#: Merge.rc:2954
msgid "Unregister Shell Extension for Current User On&ly"
msgstr "Shell-extensie alleen voor huidige gebruiker de-registreren"
#. IDD_PROPPAGE_SHELL, IDC_REGISTER_WINMERGECONTEXTMENU
-#: Merge.rc:2945
+#: Merge.rc:2955
msgid "Register Shell Extension for &Windows 11"
msgstr "Shell-extensie registreren voor Windows 11 of later"
#. IDD_PROPPAGE_SHELL, IDC_UNREGISTER_WINMERGECONTEXTMENU
-#: Merge.rc:2946
+#: Merge.rc:2956
msgid "Unregister Shell Extension for W&indows 11"
msgstr "Shell-extensie voor Windows 11 of later de-registreren"
#. IDD_PROPPAGE_SHELL, IDC_STATIC
-#: Merge.rc:2947
+#: Merge.rc:2957
msgid "Jump List"
msgstr "Jump list"
#. IDD_PROPPAGE_SHELL, IDC_CLEAR_ALL_RECENT_ITEMS
-#: Merge.rc:2949
+#: Merge.rc:2959
msgid "Clear all recent items"
msgstr "Alle recente items wissen"
#. IDS_OPTIONSPG_FOLDERCOMPARE
-#: Merge.rc:2954 Merge.rc:4225
+#: Merge.rc:2964 Merge.rc:4235
msgctxt "Options dialog|Categories"
msgid "Folder"
msgstr "Map"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC
-#: Merge.rc:2957
+#: Merge.rc:2967
msgid "&Compare method:"
msgstr "Vergelijkingsmethode:"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_COMPARE_STOPFIRST
-#: Merge.rc:2959
+#: Merge.rc:2969
msgid "S&top after first difference"
msgstr "Stoppen na eerste verschil"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_IGNORE_SMALLTIMEDIFF
-#: Merge.rc:2961
+#: Merge.rc:2971
msgid "Ign&ore time differences less than 3 seconds"
msgstr "Tijdsverschillen kleiner dan 3 seconden negeren"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC
-#: Merge.rc:2964
+#: Merge.rc:2974
msgid "Expand subfolders &after comparison:"
msgstr "Submappen automatisch uitklappen na vergelijking:"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_COMPARE_WALKSUBDIRS
-#: Merge.rc:2966
+#: Merge.rc:2976
msgid "Include &unique subfolders contents"
msgstr "Inhoud van unieke submappen bijvoegen"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_IGNORE_REPARSEPOINTS
-#: Merge.rc:2968
+#: Merge.rc:2978
msgid "Ignore &reparse points"
msgstr "Punten voor opnieuw verwerken negeren"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC
-#: Merge.rc:2969
+#: Merge.rc:2979
msgid "Switch to &quick compare when size exceeds (MB):"
msgstr "Drempel voor overschakelen naar snel vergelijken (MB):"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC
-#: Merge.rc:2971
+#: Merge.rc:2981
msgid "Switch to &binary compare when size exceeds (MB):"
msgstr "Drempel voor overschakelen naar binair vergelijken (MB):"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC
-#: Merge.rc:2975
+#: Merge.rc:2985
msgid "Additional comparison condi&tions:"
msgstr ""
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC
-#: Merge.rc:2978
+#: Merge.rc:2988
msgid "&Rename/move detection:"
msgstr ""
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC
-#: Merge.rc:2980
+#: Merge.rc:2990
msgid "Rename/move detection &keys:"
msgstr ""
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC
-#: Merge.rc:2983
+#: Merge.rc:2993
msgid "M&erge renames and moves:"
msgstr ""
#. IDD_PROPPAGE_COMPARE_TABLE, IDC_STATIC
-#: Merge.rc:2994 Merge.rc:2999 Merge.rc:3002
+#: Merge.rc:3004 Merge.rc:3009 Merge.rc:3012
msgid "File patterns:"
msgstr "Bestandspatronen:"
#. IDD_PROPPAGE_COMPARE_TABLE, IDC_STATIC
-#: Merge.rc:3001
+#: Merge.rc:3011
msgid "Custom Delimiter-Separated Values"
msgstr "Aangepaste door scheidingsteken gescheiden waarden"
#. IDS_OPTIONSPG_BINARYCOMPARE
-#: Merge.rc:3015 Merge.rc:4227
+#: Merge.rc:3025 Merge.rc:4237
msgctxt "Options dialog|Categories"
msgid "Binary"
msgstr "Binair"
#. IDD_PROPPAGE_COMPARE_BINARY, IDC_STATIC
-#: Merge.rc:3018
+#: Merge.rc:3028
msgid "Binary file &patterns:"
msgstr "Binaire bestandspatronen:"
#. IDD_PROPPAGE_COMPARE_BINARY, IDC_STATIC
-#: Merge.rc:3020
+#: Merge.rc:3030
msgid "Frhed settings"
msgstr "Frhed-instellingen"
#. IDD_PROPPAGE_COMPARE_BINARY, IDC_COMPAREBINARY_VIEWSETTINGS
-#: Merge.rc:3021
+#: Merge.rc:3031
msgid "View &Settings..."
msgstr "Instellingen weergeven..."
#. IDD_PROPPAGE_COMPARE_BINARY, IDC_COMPAREBINARY_BINARYMODE
-#: Merge.rc:3022
+#: Merge.rc:3032
msgid "&Binary Mode..."
msgstr "Binaire modus..."
#. IDD_PROPPAGE_COMPARE_BINARY, IDC_COMPAREBINARY_CHARACTERSET
-#: Merge.rc:3023
+#: Merge.rc:3033
msgid "&Character Set..."
msgstr "Tekenset..."
#. IDS_PRPCAT_IMAGE
-#: Merge.rc:3029 Merge.rc:4226 Merge.rc:4665
+#: Merge.rc:3039 Merge.rc:4236 Merge.rc:4675
msgid "Image"
msgstr "Afbeelding"
#. IDD_PROPPAGE_COMPARE_IMAGE, IDC_STATIC
-#: Merge.rc:3032
+#: Merge.rc:3042
msgid "Image file &patterns:"
msgstr "Afbeeldingsbestand-patronen:"
#. IDD_PROPPAGE_COMPARE_IMAGE, IDC_ENABLE_IMGCMP_IN_DIRCMP
-#: Merge.rc:3034
+#: Merge.rc:3044
msgid "&Enable image compare in folder compare"
msgstr "Afbeeldingsvergelijking in mapvergelijking inschakelen"
#. IDD_PROPPAGE_COMPARE_IMAGE, IDC_STATIC
-#: Merge.rc:3036
+#: Merge.rc:3046
msgid "OCR result:"
msgstr "OCR-resultaat:"
#. IDS_OPTIONSPG_WEBPAGECOMPARE
-#: Merge.rc:3043 Merge.rc:4229
+#: Merge.rc:3053 Merge.rc:4239
msgid "Webpage"
msgstr "Webpagina"
#. IDD_PROPPAGE_COMPARE_WEBPAGE, IDC_STATIC
-#: Merge.rc:3046
+#: Merge.rc:3056
msgid "URL pattern to &include (Regular expression):"
msgstr "URL-patroon om bij te voegen (reguliere expressie):"
#. IDD_PROPPAGE_COMPARE_WEBPAGE, IDC_STATIC
-#: Merge.rc:3048
+#: Merge.rc:3058
msgid "URL pattern to &exclude (Regular expression):"
msgstr "URL-patroon om uit te sluiten (reguliere expressie):"
#. IDD_PROPPAGE_COMPARE_WEBPAGE, IDC_STATIC
-#: Merge.rc:3050
+#: Merge.rc:3060
msgid "&User data folder location:"
msgstr "Locatie van map met gebruikersgegevens:"
#. IDD_PROPPAGE_COMPARE_WEBPAGE, IDC_COMPAREWEBPAGE_USERDATAFOLDER_PERPANE
-#: Merge.rc:3052
+#: Merge.rc:3062
msgid "&Separate user data folders for each pane"
msgstr "Aparte mappen met gebruikersgegevens voor elk venster"
#. IDD_ENCODINGERROR, IDC_HEXVIEW
-#: Merge.rc:3065
+#: Merge.rc:3075
msgid "&Hex View"
msgstr "Hex-weergave"
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3110
+#: Merge.rc:3120
msgid "Edit Plugin"
msgstr "Plugin bewerken"
#. IDD_PLUGINS_EDITPLUGIN, IDC_STATIC
-#: Merge.rc:3123
+#: Merge.rc:3133
msgid "&Category:"
msgstr "Categorie:"
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_MENUCAPTION_STATIC
-#: Merge.rc:3125
+#: Merge.rc:3135
msgid "&Menu caption:"
msgstr "Menu-bijschrift:"
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_WINDOWTYPE_STATIC
-#: Merge.rc:3127
+#: Merge.rc:3137
msgid "&Window type:"
msgstr "Venstertype:"
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_UNPACKEDFILEEXTENSION_STATIC
-#: Merge.rc:3132
+#: Merge.rc:3142
msgid "&Unpacked file extension:"
msgstr "Niet-uitgepakte bestandsextensie:"
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_ARGUMENTSREQUIRED
-#: Merge.rc:3136
+#: Merge.rc:3146
msgid "&Require arguments"
msgstr "Argumenten vereisen"
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_GENERATESCRIPT
-#: Merge.rc:3137
+#: Merge.rc:3147
msgid "&Generate editor script"
msgstr "Editor-script genereren"
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_COMMAND_LINE_STATIC
-#: Merge.rc:3140
+#: Merge.rc:3150
msgid "Command &line:"
msgstr "Opdrachtregel"
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_SCRIPT_FILEEXTENSION_STATIC
-#: Merge.rc:3143
+#: Merge.rc:3153
msgid "&Script file extension:"
msgstr "Script-bestandsextensie:"
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_SCRIPT_BODY_STATIC
-#: Merge.rc:3145
+#: Merge.rc:3155
msgid "Script &body:"
msgstr "Script-inhoud:"
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3154
+#: Merge.rc:3164
msgid "Font"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3157
+#: Merge.rc:3167
msgid "&Font:"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3163
+#: Merge.rc:3173
msgid "Font st&yle:"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3169
+#: Merge.rc:3179
msgid "&Size:"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3175
+#: Merge.rc:3185
msgid "Effects"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3176
+#: Merge.rc:3186
msgid "Stri&keout"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3177
+#: Merge.rc:3187
msgid "&Underline"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3179
+#: Merge.rc:3189
msgid "&Color:"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3184
+#: Merge.rc:3194
msgid "Sample"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3185
+#: Merge.rc:3195
msgid "AaBbYyZz"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3189
+#: Merge.rc:3199
msgid "Sc&ript:"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN, IDC_MANAGE_LINK
-#: Merge.rc:3194
+#: Merge.rc:3204
msgid "Show more fonts"
msgstr ""
#. ID_INDICATOR_EXT
-#: Merge.rc:4118
+#: Merge.rc:4128
msgid "EXT"
msgstr "UIT"
#. ID_INDICATOR_CAPS
-#: Merge.rc:4119
+#: Merge.rc:4129
msgid "CAP"
msgstr "CAP"
#. ID_INDICATOR_NUM
-#: Merge.rc:4120
+#: Merge.rc:4130
msgid "NUM"
msgstr "NUM"
#. ID_INDICATOR_SCRL
-#: Merge.rc:4121
+#: Merge.rc:4131
msgid "SCRL"
msgstr "SCRL"
#. ID_INDICATOR_OVR
-#: Merge.rc:4122
+#: Merge.rc:4132
msgid "OVR"
msgstr "OVR"
#. ID_INDICATOR_REC
-#: Merge.rc:4123
+#: Merge.rc:4133
msgid "REC"
msgstr "OPN"
#. ID_FILE_NEW
-#: Merge.rc:4129
+#: Merge.rc:4139
msgid ""
"\n"
"New Documents (Ctrl+N)"
@@ -4875,7 +4886,7 @@ msgstr ""
"Nieuwe documenten (Ctrl+N)"
#. ID_FILE_OPEN
-#: Merge.rc:4130
+#: Merge.rc:4140
msgid ""
"\n"
"Open (Ctrl+O)"
@@ -4884,7 +4895,7 @@ msgstr ""
"Openen (Ctrl+O)"
#. ID_FILE_SAVE
-#: Merge.rc:4131
+#: Merge.rc:4141
msgid ""
"\n"
"Save (Ctrl+S)"
@@ -4893,27 +4904,27 @@ msgstr ""
"Opslaan (Ctrl+S)"
#. IDS_UNK_ERROR_READING_PROJECT
-#: Merge.rc:4137
+#: Merge.rc:4147
msgid "Unknown error opening project file."
msgstr "Onbekende fout bij poging tot openen van projectbestand."
#. IDS_UNK_ERROR_SAVING_PROJECT
-#: Merge.rc:4138
+#: Merge.rc:4148
msgid "Unknown error saving project file."
msgstr "Onbekende fout bij poging tot opslaan van projectbestand."
#. IDS_PROJFILE_LOAD_SUCCESS
-#: Merge.rc:4143
+#: Merge.rc:4153
msgid "Project file loaded."
msgstr "Projectbestand met succes geladen."
#. IDS_PROJFILE_SAVE_SUCCESS
-#: Merge.rc:4144
+#: Merge.rc:4154
msgid "Project file saved."
msgstr "Projectbestand met succes opgeslagen."
#. ID_EDIT_UNDO
-#: Merge.rc:4150
+#: Merge.rc:4160
msgid ""
"\n"
"Undo (Ctrl+Z)"
@@ -4922,7 +4933,7 @@ msgstr ""
"Ongedaan maken (Ctrl+Z)"
#. ID_EDIT_REDO
-#: Merge.rc:4151
+#: Merge.rc:4161
msgid ""
"\n"
"Redo (Ctrl+Y)"
@@ -4931,7 +4942,7 @@ msgstr ""
"Opnieuw (Ctrl+Y)"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:4158
+#: Merge.rc:4168
msgid ""
"\n"
"FileCompare\n"
@@ -4950,7 +4961,7 @@ msgstr ""
"WinMerge bestandsVergelijking"
#. IDR_DIRDOCTYPE
-#: Merge.rc:4159
+#: Merge.rc:4169
msgid ""
"\n"
"FolderCompare\n"
@@ -4969,7 +4980,7 @@ msgstr ""
"WinMerge Mapvergelijking"
#. IDS_SPLASH_GPLTEXT
-#: Merge.rc:4165
+#: Merge.rc:4175
msgid "WinMerge comes with ABSOLUTELY NO WARRANTY. It is free software and can be redistributed under the conditions of the GNU General Public License - see the Help menu for details."
msgstr ""
"WinMerge komt ABSOLUUT ZONDER GARANTIE. Dit is vrije software, en u mag het "
@@ -4977,159 +4988,159 @@ msgstr ""
" in het Help-menu voor details."
#. IDS_MESSAGEBOX_ABORT
-#: Merge.rc:4173
+#: Merge.rc:4183
msgid "&Abort"
msgstr "Afbreken"
#. IDS_MESSAGEBOX_RETRY
-#: Merge.rc:4174
+#: Merge.rc:4184
msgid "&Retry"
msgstr "Opnieuw proberen"
#. IDS_MESSAGEBOX_IGNORE
-#: Merge.rc:4175
+#: Merge.rc:4185
msgid "&Ignore"
msgstr "Negeren"
#. IDS_MESSAGEBOX_IGNOREALL
-#: Merge.rc:4176
+#: Merge.rc:4186
msgid "Ignore &all"
msgstr "Alles negeren"
#. IDS_MESSAGEBOX_YES
-#: Merge.rc:4177
+#: Merge.rc:4187
msgid "&Yes"
msgstr "Ja"
#. IDS_MESSAGEBOX_YES_TO_ALL
-#: Merge.rc:4183
+#: Merge.rc:4193
msgid "Yes to &all"
msgstr "Ja op alles"
#. IDS_MESSAGEBOX_NO
-#: Merge.rc:4184
+#: Merge.rc:4194
msgid "&No"
msgstr "Nee"
#. IDS_MESSAGEBOX_NO_TO_ALL
-#: Merge.rc:4185
+#: Merge.rc:4195
msgid "No to a&ll"
msgstr "Nee op alles"
#. IDS_MESSAGEBOX_CONTINUE
-#: Merge.rc:4186
+#: Merge.rc:4196
msgid "&Continue"
msgstr "Doorgaan"
#. IDS_MESSAGEBOX_SKIP
-#: Merge.rc:4187
+#: Merge.rc:4197
msgid "&Skip"
msgstr "Overslaan"
#. IDS_MESSAGEBOX_SKIPALL
-#: Merge.rc:4188
+#: Merge.rc:4198
msgid "Skip &all"
msgstr "Alles overslaan"
#. IDS_MESSAGEBOX_DONT_DISPLAY_AGAIN
-#: Merge.rc:4190
+#: Merge.rc:4200
msgid "Don't display this &message again."
msgstr "Dit bericht niet meer weergeven."
-#: Merge.rc:4193
+#: Merge.rc:4203
msgid "To make this message box visible, press Reset on the Message Boxes page in Options."
msgstr ""
"Druk op de herstellen-knop op de pagina \"berichtvensters\" van het venster "
"\"opties\" om dit berichtvenster opnieuw zichtbaar te maken."
#. IDS_OPTIONSPG_EDITOR_COMPAREMERGE
-#: Merge.rc:4203
+#: Merge.rc:4213
msgid "Compare/Merge"
msgstr "Vergelijken/samenvoegen"
#. IDS_OPTIONSPG_SYNTAXCOLORS
-#: Merge.rc:4204 Merge.rc:4208
+#: Merge.rc:4214 Merge.rc:4218
msgid "Syntax"
msgstr "Syntax"
#. IDS_OPTIONSPG_COLOR_SCHEMES
-#: Merge.rc:4206
+#: Merge.rc:4216
msgid "Color Schemes"
msgstr "Kleurenschema's"
#. IDS_OPTIONSPG_DIRCOLORS
-#: Merge.rc:4210
+#: Merge.rc:4220
msgid "Folder Compare"
msgstr "Mapvergelijking"
#. IDS_OPTIONSPG_PROJECT
-#: Merge.rc:4215
+#: Merge.rc:4225
msgid "Project"
msgstr "Project"
#. IDS_COLHDR_NSDIFFS
-#: Merge.rc:4218 Merge.rc:4640
+#: Merge.rc:4228 Merge.rc:4650
msgid "Differences"
msgstr "Verschillen"
#. IDS_OPTIONSPG_MESSAGEBOXES
-#: Merge.rc:4220
+#: Merge.rc:4230
msgid "Message Boxes"
msgstr "Berichtvensters"
#. IDS_TO
-#: Merge.rc:4235
+#: Merge.rc:4245
msgid "To:"
msgstr "Naar:"
#. IDS_FROM_LEFT
-#: Merge.rc:4236
+#: Merge.rc:4246
msgid "From left:"
msgstr "Van links:"
#. IDS_TO_LEFT
-#: Merge.rc:4237
+#: Merge.rc:4247
msgid "To left:"
msgstr "Naar links:"
#. IDS_FROM_RIGHT
-#: Merge.rc:4238
+#: Merge.rc:4248
msgid "From right:"
msgstr "Van rechts:"
#. IDS_TO_RIGHT
-#: Merge.rc:4239
+#: Merge.rc:4249
msgid "To right:"
msgstr "Naar rechts:"
#. IDS_FROM_MIDDLE
-#: Merge.rc:4240
+#: Merge.rc:4250
msgid "From middle:"
msgstr "Van midden:"
#. IDS_TO_MIDDLE
-#: Merge.rc:4241
+#: Merge.rc:4251
msgid "To middle:"
msgstr "Naar midden:"
#. IDS_VERSION_FMT
-#: Merge.rc:4247
+#: Merge.rc:4257
#, c-format
msgid "Version %1"
msgstr "Versie %1"
#. IDS_OPTIONS_TITLE
-#: Merge.rc:4253
+#: Merge.rc:4263
#, c-format
msgid "Options (%1)"
msgstr "Opties (%1)"
#. IDS_MESSAGE_BOX_ARE_RESET
-#: Merge.rc:4254
+#: Merge.rc:4264
msgid "All message boxes are now displayed again."
msgstr "Alle berichtvensters worden terug weergegeven."
-#: Merge.rc:4256
+#: Merge.rc:4266
#, c-format
msgid "Tab size value is out of range. Please use 1 - %1."
msgstr ""
@@ -5138,37 +5149,37 @@ msgstr ""
"Gebruik waarden 1 - %1."
#. IDS_PROJECT_OPEN
-#: Merge.rc:4262 Merge.rc:4318
+#: Merge.rc:4272 Merge.rc:4328
msgid "Open"
msgstr "Openen"
#. IDS_PROGRAMFILES
-#: Merge.rc:4263
+#: Merge.rc:4273
msgid "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||"
msgstr "Programma's|*.exe;*.bat;*.cmd|Alle bestanden (*.*)|*.*||"
#. IDS_ALLFILES
-#: Merge.rc:4264
+#: Merge.rc:4274
msgid "All Files (*.*)|*.*||"
msgstr "Alle bestanden (*.*)|*.*||"
#. IDS_PROJECTFILES
-#: Merge.rc:4265
+#: Merge.rc:4275
msgid "WinMerge Project Files (*.WinMerge)|*.WinMerge||"
msgstr "WinMerge-projectbestanden (*.WinMerge)|*.WinMerge||"
#. IDS_INIFILES
-#: Merge.rc:4267
+#: Merge.rc:4277
msgid "Options files (*.ini)|*.ini|All Files (*.*)|*.*||"
msgstr "Optie-bestanden (*.ini)|*.ini|Alle bestanden (*.*)|*.*||"
#. IDS_REPLACELIST_FILES
-#: Merge.rc:4268
+#: Merge.rc:4278
msgid "Tab-Separated Values (*.tsv;*.txt)|*.tsv;*.txt|All Files (*.*)|*.*||"
msgstr ""
#. IDS_TEXT_REPORT_FILES
-#: Merge.rc:4274
+#: Merge.rc:4284
msgid ""
"Text Files (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|All Files "
"(*.*)|*.*||"
@@ -5177,121 +5188,121 @@ msgstr ""
"bestanden (*.*)|*.*||"
#. IDS_HTML_REPORT_FILES
-#: Merge.rc:4275
+#: Merge.rc:4285
msgid "HTML Files (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||"
msgstr "HTML-bestanden (*.htm,*.html)|*.htm;*.html|Alle bestanden (*.*)|*.*||"
#. IDS_XML_REPORT_FILES
-#: Merge.rc:4276
+#: Merge.rc:4286
msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||"
msgstr "XML-bestanden (*.xml)|*.xml|Alle bestanden (*.*)|*.*||"
#. IDS_EXPANDSUBDIRS_DONOTEXPAND
-#: Merge.rc:4294
+#: Merge.rc:4304
msgid "Do not expand"
msgstr "Niet uitklappen"
#. IDS_EXPANDSUBDIRS_ALL
-#: Merge.rc:4295
+#: Merge.rc:4305
msgid "Expand all subfolders"
msgstr "Alle submappen uitklappen"
#. IDS_EXPANDSUBDIRS_DIFFERENT
-#: Merge.rc:4296
+#: Merge.rc:4306
msgid "Expand different subfolders"
msgstr "Verschillende submappen uitklappen"
#. IDS_EXPANDSUBDIRS_IDENTICAL
-#: Merge.rc:4297
+#: Merge.rc:4307
msgid "Expand identical subfolders"
msgstr "Identieke submappen uitklappen"
#. IDS_SYNTAXTABLE_FILETYPE
-#: Merge.rc:4303
+#: Merge.rc:4313
msgid "File Type"
msgstr "Bestandstype"
#. IDS_COLHDR_EXTENSION
-#: Merge.rc:4304 Merge.rc:4597
+#: Merge.rc:4314 Merge.rc:4607
msgid "Extension"
msgstr "Extensie"
#. IDS_PRPCAT_MESSAGE
-#: Merge.rc:4310 Merge.rc:4669
+#: Merge.rc:4320 Merge.rc:4679
msgid "Message"
msgstr "Bericht"
#. IDS_MESSAGEBOX_ANSWER
-#: Merge.rc:4311
+#: Merge.rc:4321
msgid "Answer"
msgstr "Antwoord"
#. IDS_PROJECT_ITEM
-#: Merge.rc:4317
+#: Merge.rc:4327
msgid "Item"
msgstr "Item"
#. IDS_PROJECT_LOAD
-#: Merge.rc:4319
+#: Merge.rc:4329
msgid "Load"
msgstr "Laden"
#. IDS_PROJECT_SAVE
-#: Merge.rc:4320
+#: Merge.rc:4330
msgid "Save"
msgstr "Opslaan"
#. IDS_PROJECT_ITEM_INCLUDE_SUBFOLDERS
-#: Merge.rc:4322
+#: Merge.rc:4332
msgid "Include Subfolders"
msgstr "Submappen bijvoegen"
#. IDS_PROJECT_ITEM_COMPARE_OPTIONS
-#: Merge.rc:4324
+#: Merge.rc:4334
msgid "Compare Options"
msgstr "Vergelijkingsopties"
#. IDS_PROJECT_ITEM_HIDDEN_ITEMS
-#: Merge.rc:4325
+#: Merge.rc:4335
msgid "Hidden Items"
msgstr "Verborgen items"
#. IDS_PLUGINSLIST_NAME
-#: Merge.rc:4331 Merge.rc:4956
+#: Merge.rc:4341 Merge.rc:4966
msgid "Name"
msgstr "Naam"
#. IDS_FILTERFILE_PATHTITLE
-#: Merge.rc:4332
+#: Merge.rc:4342
msgid "Location"
msgstr "Locatie"
#. IDS_FILTER_TITLE
-#: Merge.rc:4333
+#: Merge.rc:4343
msgid "Filters"
msgstr "Filters"
#. IDS_FILTER_PREFIX
-#: Merge.rc:4334
+#: Merge.rc:4344
msgid "[F] "
msgstr "[F] "
#. IDS_PLUGINSLIST_DESC
-#: Merge.rc:4335 Merge.rc:4958
+#: Merge.rc:4345 Merge.rc:4968
msgid "Description"
msgstr "Beschrijving"
#. IDS_FILEFILTER_SAVENEW
-#: Merge.rc:4336
+#: Merge.rc:4346
msgid "Select Filename for New Filter"
msgstr "Bestandsnaam selecteren voor nieuwe filter"
#. IDS_FILEFILTER_FILEMASK
-#: Merge.rc:4337
+#: Merge.rc:4347
msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||"
msgstr "Bestandsfilters (*.flt)|*.flt|Alle bestanden (*.*)|*.*||"
-#: Merge.rc:4339
+#: Merge.rc:4349
#, c-format
msgid ""
"Cannot find filter template!\n"
@@ -5304,7 +5315,7 @@ msgstr ""
"Kopieer bestand %1 naar map WinMerge/Filters:\n"
"%2."
-#: Merge.rc:4341
+#: Merge.rc:4351
#, c-format
msgid ""
"Cannot copy filter template:\n"
@@ -5317,7 +5328,7 @@ msgstr ""
"\n"
"Ga na of de map bestaat en schrijfbaar is."
-#: Merge.rc:4343
+#: Merge.rc:4353
msgid ""
"User's filter folder is not defined!\n"
"\n"
@@ -5327,7 +5338,7 @@ msgstr ""
"\n"
"Selecteer filtermap in Opties/Systeem."
-#: Merge.rc:4345
+#: Merge.rc:4355
#, c-format
msgid ""
"Failed to delete filter:\n"
@@ -5341,11 +5352,11 @@ msgstr ""
"Misschien is het bestand alleen-lezen?"
#. IDS_FILEFILTER_INSTALL
-#: Merge.rc:4346
+#: Merge.rc:4356
msgid "Locate Filter File to Install"
msgstr "Lokaliseer te installeren filterbestand"
-#: Merge.rc:4348
+#: Merge.rc:4358
msgid ""
"Installing filter file failed.\n"
"\n"
@@ -5356,17 +5367,17 @@ msgstr ""
"Kon nieuwe filter niet kopiëren naar filtermap."
#. IDS_FILEFILTER_OVERWRITE
-#: Merge.rc:4349
+#: Merge.rc:4359
msgid "Filter file exists. Overwrite?"
msgstr "Filterbestand bestaat reeds. Bestaande filter overschrijven?"
#. IDS_FILTERLINE_REGEXP
-#: Merge.rc:4355
+#: Merge.rc:4365
msgid "Regular expression"
msgstr "Reguliere expressie"
#. IDS_FILTERCHANGED
-#: Merge.rc:4361
+#: Merge.rc:4371
msgid ""
"Filters updated. Refresh all open folder compares?\n"
"\n"
@@ -5377,219 +5388,219 @@ msgstr ""
"Indien u dit nu niet wilt doen, kunt u 'nee' selecteren en de vergelijkingen later vernieuwen."
#. IDS_DIRECTORY_WINDOW_TITLE
-#: Merge.rc:4367
+#: Merge.rc:4377
msgid "Folder Comparison Results"
msgstr "Resultaten mapvergelijking"
#. IDS_FILE_COMPARISON_TITLE
-#: Merge.rc:4368
+#: Merge.rc:4378
msgid "File Comparison"
msgstr "Bestandsvergelijking"
#. IDS_EMPTY_LEFT_FILE
-#: Merge.rc:4369
+#: Merge.rc:4379
msgid "Untitled Left"
msgstr "Naamloos links"
#. IDS_EMPTY_MIDDLE_FILE
-#: Merge.rc:4370
+#: Merge.rc:4380
msgid "Untitled Middle"
msgstr "Naamloos midden"
#. IDS_EMPTY_RIGHT_FILE
-#: Merge.rc:4371
+#: Merge.rc:4381
msgid "Untitled Right"
msgstr "Naamloos rechts"
#. IDS_CONFLICT_BASE_FILE
-#: Merge.rc:4372
+#: Merge.rc:4382
msgid "Base File"
msgstr "Basisbestand"
#. IDS_CONFLICT_THEIRS_FILE
-#: Merge.rc:4373
+#: Merge.rc:4383
msgid "Theirs File"
msgstr "Hun bestand"
#. IDS_CONFLICT_MINE_FILE
-#: Merge.rc:4374
+#: Merge.rc:4384
msgid "Mine File"
msgstr "Mijn bestand"
#. IDS_SELFCOMPARE_ORIGINAL_FILE
-#: Merge.rc:4375
+#: Merge.rc:4385
msgid "Original File"
msgstr "Origineel bestand"
#. IDS_LINE_STATUS_INFO_EOL
-#: Merge.rc:4381
+#: Merge.rc:4391
#, c-format
msgid "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s"
msgstr "Regel: %s Kolom: %d/%d Teken: %d/%d Regeleinde: %s"
#. IDS_EMPTY_LINE_STATUS_INFO
-#: Merge.rc:4382
+#: Merge.rc:4392
#, c-format
msgid "Line: %s"
msgstr "Regel: %s"
#. IDS_LINE_STATUS_INFO
-#: Merge.rc:4383
+#: Merge.rc:4393
#, c-format
msgid "Ln: %s Col: %d/%d Ch: %d/%d"
msgstr "Regel: %s Kolom: %d/%d Teken: %d/%d"
#. IDS_LINE_STATUS_INFO_SEL
-#: Merge.rc:4384
+#: Merge.rc:4394
#, c-format
msgid " Sel: %d | %d"
msgstr " Sel: %d | %d"
#. IDS_MERGEMODE_MERGING
-#: Merge.rc:4385
+#: Merge.rc:4395
msgid "Merge"
msgstr "Samenvoegen"
#. IDS_DIFF_NUMBER_STATUS_FMT
-#: Merge.rc:4386
+#: Merge.rc:4396
#, c-format
msgid "Difference %1 of %2"
msgstr "Verschil %1 van %2"
#. IDS_NO_DIFF_SEL_FMT
-#: Merge.rc:4387
+#: Merge.rc:4397
#, c-format
msgid "%1 Differences Found"
msgstr "%1 verschillen gevonden"
#. IDS_1_DIFF_FOUND
-#: Merge.rc:4388
+#: Merge.rc:4398
msgid "1 Difference Found"
msgstr "Eén verschil gevonden"
#. IDS_NO_ERR_SEL_FMT
-#: Merge.rc:4389
+#: Merge.rc:4399
#, c-format
msgid "%1 Errors Found"
msgstr ""
#. IDS_1_ERR_FOUND
-#: Merge.rc:4390
+#: Merge.rc:4400
msgid "1 Error Found"
msgstr ""
#. IDS_STATUSBAR_READONLY, Abbreviation from "Read Only"
-#: Merge.rc:4391
+#: Merge.rc:4401
msgid "RO"
msgstr "AL"
#. IDS_DIRVIEW_STATUS_FMT_FOCUS
-#: Merge.rc:4397
+#: Merge.rc:4407
#, c-format
msgid "Item %1 of %2"
msgstr "Item %1 van %2"
#. IDS_DIRVIEW_STATUS_FMT_NOFOCUS
-#: Merge.rc:4398
+#: Merge.rc:4408
#, c-format
msgid "Items: %1"
msgstr "Items: %1"
#. IDS_DIRVIEW_STATUS_COMPARING
-#: Merge.rc:4399
+#: Merge.rc:4409
msgid "Comparing items..."
msgstr "Items vergelijken..."
#. IDS_ITEMS_PER_SEC
-#: Merge.rc:4400
+#: Merge.rc:4410
#, c-format
msgid "%.1f[items/sec]"
msgstr "%.1f[items/sec]"
#. IDS_ERROR_INCOMPARABLE
-#: Merge.rc:4406
+#: Merge.rc:4416
msgid "Select two existing folders/files to compare."
msgstr "Twee bestaande mappen of bestanden selecteren om te vergelijken."
#. IDS_DIRSEL_TAG
-#: Merge.rc:4407
+#: Merge.rc:4417
msgid "Folder Selection"
msgstr "Mapselectie"
#. IDS_OPEN_FILESDIRS
-#: Merge.rc:4408
+#: Merge.rc:4418
msgid "Select two (or three) folders/files to compare."
msgstr ""
"Twee (of drie) mappen of twee (of drie) bestanden selecteren om te "
"vergelijken."
#. IDS_OPEN_LEFTINVALID
-#: Merge.rc:4409
+#: Merge.rc:4419
msgid "Left (1st) path is invalid!"
msgstr "Linker (1ste) pad is ongeldig!"
#. IDS_OPEN_MIDDLEINVALID
-#: Merge.rc:4410
+#: Merge.rc:4420
msgid "Middle (2nd) path is invalid!"
msgstr "Middelste (2de) pad is ongeldig!"
#. IDS_OPEN_RIGHTINVALID2
-#: Merge.rc:4411
+#: Merge.rc:4421
msgid "Right (2nd) path is invalid!"
msgstr "Rechter (2de) pad is ongeldig!"
#. IDS_OPEN_RIGHTINVALID3
-#: Merge.rc:4412
+#: Merge.rc:4422
msgid "Right (3rd) path is invalid!"
msgstr "Rechter (3de) pad is ongeldig!"
#. IDS_OPEN_BOTHINVALID
-#: Merge.rc:4413
+#: Merge.rc:4423
msgid "Both paths are invalid!"
msgstr "Beide paden zijn ongeldig!"
-#: Merge.rc:4415
+#: Merge.rc:4425
msgid "Left (1st) and Middle (2nd) paths are invalid!"
msgstr "Linker (1ste) en middelste (2de) pad zijn ongeldig!"
#. IDS_OPEN_LEFTRIGHTINVALID
-#: Merge.rc:4416
+#: Merge.rc:4426
msgid "Left (1st) and Right (3rd) paths are invalid!"
msgstr "Linker (1ste) en rechter (3de) pad zijn ongeldig!"
-#: Merge.rc:4418
+#: Merge.rc:4428
msgid "Middle (2nd) and Right (3rd) paths are invalid!"
msgstr "MIddelste (2de) en rechter (3de) pad zijn ongeldig!"
#. IDS_OPEN_ALLINVALID
-#: Merge.rc:4419
+#: Merge.rc:4429
msgid "All paths are invalid!"
msgstr "Alle paden zijn ongeldig!"
#. IDS_OPEN_UNPACKERDISABLED
-#: Merge.rc:4420
+#: Merge.rc:4430
msgid "Only enabled for file comparisons"
msgstr "Alleen ingeschakeld voor bestandsvergelijkingen"
#. IDS_OPEN_MISMATCH
-#: Merge.rc:4421
+#: Merge.rc:4431
msgid "Cannot compare file and folder!"
msgstr "Kan geen bestand met een map vergelijken!"
#. IDS_ERROR_FILE_NOT_FOUND
-#: Merge.rc:4427
+#: Merge.rc:4437
#, c-format
msgid "File not found: %1"
msgstr "Bestand niet gevonden: %1"
#. IDS_ERROR_FILE_NOT_UNPACKED
-#: Merge.rc:4428
+#: Merge.rc:4438
#, c-format
msgid "File not unpacked: %1"
msgstr "Bestand niet uitgepakt: %1"
#. IDS_ERROR_FILEOPEN
-#: Merge.rc:4429
+#: Merge.rc:4439
#, c-format
msgid ""
"Cannot open file\n"
@@ -5603,12 +5614,12 @@ msgstr ""
"%2"
#. IDS_ERROR_CONF_RESOLVE
-#: Merge.rc:4430
+#: Merge.rc:4440
msgid "Failed to parse conflict file."
msgstr "Verwerken van conflictbestand mislukt."
#. IDS_NOT_CONFLICT_FILE
-#: Merge.rc:4431
+#: Merge.rc:4441
#, c-format
msgid "The file\n%1\nis not a conflict file."
msgstr ""
@@ -5617,7 +5628,7 @@ msgstr ""
"is geen conflictbestand."
#. IDS_COMPARE_LARGE_FILES
-#: Merge.rc:4432
+#: Merge.rc:4442
msgid "Comparing large files requires significant memory.\nShow only comparison results (not file contents)?"
msgstr ""
"U staat op het punt om zeer grote bestanden te vergelijken.\n"
@@ -5626,18 +5637,18 @@ msgstr ""
"\n"
#. IDS_SAVE_AS_TITLE
-#: Merge.rc:4438
+#: Merge.rc:4448
msgid "Save As"
msgstr "Opslaan als"
#. IDS_SAVE_FMT
-#: Merge.rc:4439
+#: Merge.rc:4449
#, c-format
msgid "Save changes to %1?"
msgstr "Wijzigingen opslaan in %1?"
#. IDS_SAVEREADONLY_FMT
-#: Merge.rc:4440
+#: Merge.rc:4450
#, c-format
msgid "%1 is read-only. Override? Or 'No' to save as new filename?"
msgstr ""
@@ -5645,11 +5656,11 @@ msgstr ""
"overschrijven? (Nee om op te slaan als nieuwe bestandsnaam)"
#. IDS_ERROR_BACKUP
-#: Merge.rc:4441
+#: Merge.rc:4451
msgid "Error backing up file"
msgstr "Fout bij maken van reservekopie van bestand"
-#: Merge.rc:4443
+#: Merge.rc:4453
#, c-format
msgid ""
"Unable to backup original file:\n"
@@ -5663,7 +5674,7 @@ msgstr ""
"Toch doorgaan?"
#. IDS_FILESAVE_FAILED
-#: Merge.rc:4444
+#: Merge.rc:4454
#, c-format
msgid "Saving file failed.\n%1\n%2\n\t- Use different filename (OK)\n\t- Abort (Cancel)?"
msgstr ""
@@ -5674,7 +5685,7 @@ msgstr ""
"\t- een andere bestandsnaam gebruiken? (Op 'ok' drukken)\n"
"\t- de huidige handeling afbreken? (Op 'annuleren' drukken)"
-#: Merge.rc:4446
+#: Merge.rc:4456
#, c-format
msgid "Plugin '%2' cannot pack changes to left file into '%1'.\n\nOriginal unchanged. Save unpacked version?"
msgstr ""
@@ -5684,7 +5695,7 @@ msgstr ""
"\n"
"Wilt u de uitgepakte versie in een ander bestand opslaan?"
-#: Merge.rc:4448
+#: Merge.rc:4458
#, c-format
msgid "Plugin '%2' cannot pack changes to middle file into '%1'.\n\nOriginal unchanged. Save unpacked version?"
msgstr ""
@@ -5694,7 +5705,7 @@ msgstr ""
"\n"
"Wilt u de uitgepakte versie in een ander bestand opslaan?"
-#: Merge.rc:4450
+#: Merge.rc:4460
#, c-format
msgid "Plugin '%2' cannot pack changes to right file into '%1'.\n\nOriginal unchanged. Save unpacked version?"
msgstr ""
@@ -5705,7 +5716,7 @@ msgstr ""
"Wilt u de uitgepakte versie in een ander bestand opslaan?"
#. IDS_FILECHANGED_ONDISK
-#: Merge.rc:4451
+#: Merge.rc:4461
#, c-format
msgid ""
"Another application updated\n"
@@ -5721,7 +5732,7 @@ msgstr ""
"Het gewijzigde bestand overschrijven?"
#. IDS_SAVEREADONLY_MULTI
-#: Merge.rc:4452
+#: Merge.rc:4462
#, c-format
msgid ""
"%1\n"
@@ -5731,7 +5742,7 @@ msgstr ""
"is gemarkeerd als alleen-lezen. Wilt u het alleen-lezen item overschrijven?"
#. IDS_FILECHANGED_RESCAN
-#: Merge.rc:4453
+#: Merge.rc:4463
#, c-format
msgid "Another application updated\n%1\nsince last scan.\n\nReload?"
msgstr ""
@@ -5742,22 +5753,22 @@ msgstr ""
"Wilt u het bestand opnieuw laden?"
#. IDS_SAVE_LEFT_AS
-#: Merge.rc:4454
+#: Merge.rc:4464
msgid "Save Left File As"
msgstr "Linker bestand opslaan als"
#. IDS_SAVE_MIDDLE_AS
-#: Merge.rc:4455
+#: Merge.rc:4465
msgid "Save Middle File As"
msgstr "Middelste bestand opslaan als"
#. IDS_SAVE_RIGHT_AS
-#: Merge.rc:4456
+#: Merge.rc:4466
msgid "Save Right File As"
msgstr "Rechter bestand opslaan als"
#. IDS_FILE_DISAPPEARED
-#: Merge.rc:4461
+#: Merge.rc:4471
#, c-format
msgid ""
"File\n"
@@ -5769,7 +5780,7 @@ msgstr ""
"is verdwenen. Sla een kopie van het bestand op om door te gaan."
#. IDS_VIEWS_OUTOFSYNC
-#: Merge.rc:4467
+#: Merge.rc:4477
msgid ""
"Cannot merge unsynched documents.\n"
"\n"
@@ -5780,186 +5791,186 @@ msgstr ""
"Vernieuw documenten voordat u doorgaat."
#. IDS_BREAK_ON_WHITESPACE
-#: Merge.rc:4472
+#: Merge.rc:4482
msgid "Break at whitespace"
msgstr "Afbreken bij witruimte"
#. IDS_BREAK_ON_PUNCTUATION
-#: Merge.rc:4473
+#: Merge.rc:4483
msgid "Break at whitespace or punctuation"
msgstr "Afbreken bij witruimte of interpunctie"
#. IDS_L2M
-#: Merge.rc:4479
+#: Merge.rc:4489
msgid "Copy to &Middle\tAlt+Right"
msgstr "Naar midden kopiëren\tAlt+Rechts"
#. IDS_R2M
-#: Merge.rc:4480
+#: Merge.rc:4490
msgid "Copy to &Middle\tAlt+Left"
msgstr "Naar midden kopiëren\tAlt+Links"
#. IDS_COPY_FROM_MIDDLE_R
-#: Merge.rc:4481
+#: Merge.rc:4491
msgid "Copy from Middle\tAlt+Shift+Right"
msgstr "Van midden kopiëren\tAlt+Shift+Rechts"
#. IDS_COPY_FROM_MIDDLE_L
-#: Merge.rc:4482
+#: Merge.rc:4492
msgid "Copy from Middle\tAlt+Shift+Left"
msgstr "Van midden kopiëren\tAlt+Shift+Links"
#. IDS_L2MNEXT
-#: Merge.rc:4483
+#: Merge.rc:4493
msgid "Copy to Middle and Advance\tCtrl+Alt+Right"
msgstr "Naar midden kopiëren en verder gaan\tCtrl+Alt+Rechts"
#. IDS_R2MNEXT
-#: Merge.rc:4484
+#: Merge.rc:4494
msgid "Copy to Middle and Advance\tCtrl+Alt+Left"
msgstr "Naar midden kopiëren en verder gaan\tCtrl+Alt+Links"
#. IDS_ALL_MIDDLE
-#: Merge.rc:4485
+#: Merge.rc:4495
msgid "Copy All to Middle"
msgstr "Alles naar midden kopiëren"
#. IDS_COPY_RIGHT_TO_LEFT
-#: Merge.rc:4491
+#: Merge.rc:4501
#, c-format
msgid "Right to Left (%1)"
msgstr "Rechts naar links (%1)"
#. IDS_COPY_RIGHT_TO_MIDDLE
-#: Merge.rc:4492
+#: Merge.rc:4502
#, c-format
msgid "Right to Middle (%1)"
msgstr "Rechts naar midden (%1)"
#. IDS_COPY_MIDDLE_TO_LEFT
-#: Merge.rc:4493
+#: Merge.rc:4503
#, c-format
msgid "Middle to Left (%1)"
msgstr "Midden naar links (%1)"
#. IDS_COPY_MIDDLE_TO_RIGHT
-#: Merge.rc:4494
+#: Merge.rc:4504
#, c-format
msgid "Middle to Right (%1)"
msgstr "Midden naar rechts (%1)"
#. IDS_COPY_LEFT_TO_RIGHT
-#: Merge.rc:4495
+#: Merge.rc:4505
#, c-format
msgid "Left to Right (%1)"
msgstr "Links naar rechts (%1)"
#. IDS_COPY_LEFT_TO_MIDDLE
-#: Merge.rc:4496
+#: Merge.rc:4506
#, c-format
msgid "Left to Middle (%1)"
msgstr "Links naar midden (%1)"
#. IDS_MOVE_LEFT_TO
-#: Merge.rc:4507 Merge.rc:4539
+#: Merge.rc:4517 Merge.rc:4549
#, c-format
msgid "Left to... (%1)"
msgstr "Links naar... (%1)"
#. IDS_MOVE_MIDDLE_TO
-#: Merge.rc:4508 Merge.rc:4540
+#: Merge.rc:4518 Merge.rc:4550
#, c-format
msgid "Middle to... (%1)"
msgstr "Midden naar... (%1)"
#. IDS_MOVE_RIGHT_TO
-#: Merge.rc:4509 Merge.rc:4541
+#: Merge.rc:4519 Merge.rc:4551
#, c-format
msgid "Right to... (%1)"
msgstr "Rechts naar... (%1)"
#. IDS_COPY_BOTH_TO
-#: Merge.rc:4510
+#: Merge.rc:4520
#, c-format
msgid "Both to... (%1)"
msgstr "Beide naar... (%1)"
#. IDS_COPY_ALL_TO
-#: Merge.rc:4511
+#: Merge.rc:4521
#, c-format
msgid "All to... (%1)"
msgstr "Alles naar... (%1)"
#. IDS_COPY_DIFFERENCES_TO
-#: Merge.rc:4512
+#: Merge.rc:4522
#, c-format
msgid "Differences to... (%1)"
msgstr "Verschillen naar... (%1)"
#. IDS_COPY_ONLYDIFFITEMS
-#: Merge.rc:4519
+#: Merge.rc:4529
msgid "Some selected items are identical or skipped.\nCopy only items with differences?"
msgstr ""
#. IDS_DEL_LEFT_FMT
-#: Merge.rc:4525
+#: Merge.rc:4535
#, c-format
msgid "Left (%1)"
msgstr "Links (%1)"
#. IDS_DEL_MIDDLE_FMT
-#: Merge.rc:4526
+#: Merge.rc:4536
#, c-format
msgid "Middle (%1)"
msgstr "Midden (%1)"
#. IDS_DEL_RIGHT_FMT
-#: Merge.rc:4527
+#: Merge.rc:4537
#, c-format
msgid "Right (%1)"
msgstr "Rechts (%1)"
#. IDS_DEL_BOTH_FMT
-#: Merge.rc:4528
+#: Merge.rc:4538
#, c-format
msgid "Both (%1)"
msgstr "Beide (%1)"
#. IDS_DEL_ALL_FMT
-#: Merge.rc:4529
+#: Merge.rc:4539
#, c-format
msgid "All (%1)"
msgstr "Alles (%1)"
#. IDS_SELECT_DEST_LEFT
-#: Merge.rc:4545
+#: Merge.rc:4555
msgid "Left Side - Select Destination Folder:"
msgstr "Linkerkant - doelmap selecteren:"
#. IDS_SELECT_DEST_MIDDLE
-#: Merge.rc:4546
+#: Merge.rc:4556
msgid "Middle Side - Select Destination Folder:"
msgstr "Midden - doelmap selecteren:"
#. IDS_SELECT_DEST_RIGHT
-#: Merge.rc:4547
+#: Merge.rc:4557
msgid "Right Side - Select Destination Folder:"
msgstr "Rechterkant - doelmap selecteren:"
#. IDS_FILES_AFFECTED_FMT
-#: Merge.rc:4548
+#: Merge.rc:4558
#, c-format
msgid "(%1 Files Affected)"
msgstr "(%1 bestanden aangepast)"
#. IDS_FILES_AFFECTED_FMT2
-#: Merge.rc:4549
+#: Merge.rc:4559
#, c-format
msgid "(%1 of %2 Files Affected)"
msgstr "(%1 van %2 bestanden aangepast)"
#. IDS_CONFIRM_DELETE_SINGLE
-#: Merge.rc:4555
+#: Merge.rc:4565
#, c-format
msgid ""
"Are you sure you want to delete\n"
@@ -5968,18 +5979,18 @@ msgid ""
msgstr "Weet u zeker dat u %1 wilt verwijderen?"
#. IDS_CONFIRM_SINGLE_COPY
-#: Merge.rc:4556
+#: Merge.rc:4566
msgid "Are you sure you want to copy?"
msgstr "Weet u zeker dat u wilt kopiëren?"
#. IDS_CONFIRM_MULTIPLE_COPY
-#: Merge.rc:4557
+#: Merge.rc:4567
#, c-format
msgid "Are you sure you want to copy %d items?"
msgstr "Weet u zeker dat u %d items wilt kopiëren?"
#. IDS_DIRCMP_NOTSYNC
-#: Merge.rc:4558
+#: Merge.rc:4568
#, c-format
msgid ""
"Operation aborted!\n"
@@ -5999,48 +6010,48 @@ msgstr ""
"Vernieuw de vergelijking."
#. IDS_CONFIRM_SINGLE_MOVE
-#: Merge.rc:4563
+#: Merge.rc:4573
msgid "Are you sure you want to move?"
msgstr "Weet u zeker dat u wilt verplaatsen?"
#. IDS_CONFIRM_MULTIPLE_MOVE
-#: Merge.rc:4564
+#: Merge.rc:4574
#, c-format
msgid "Are you sure you want to move %d items?"
msgstr "Weet u zeker dat u %d items wilt verplaatsen?"
#. IDS_CONFIRM_MOVE_CAPTION
-#: Merge.rc:4566
+#: Merge.rc:4576
msgid "Confirm Move"
msgstr "Verplaatsen bevestigen"
-#: Merge.rc:4568
+#: Merge.rc:4578
msgid "Close the folder comparison window?"
msgstr ""
"U staat op het punt om het venster te sluiten dat mappen aan het vergelijken"
" is. Weet u zeker dat u het venster wilt sluiten?"
-#: Merge.rc:4570
+#: Merge.rc:4580
msgid "Close the folder comparison window, which took a long time?"
msgstr ""
#. IDS_ERROR_INVALID_DIR_FILE_NAME
-#: Merge.rc:4571
+#: Merge.rc:4581
msgid "The file or folder name is invalid."
msgstr "Bestands- of mapnaam is ongeldig."
#. IDS_ERROR_EXECUTE_FILE
-#: Merge.rc:4577
+#: Merge.rc:4587
#, c-format
msgid "Failed to execute external editor: %1"
msgstr "Uitvoeren externe editor mislukt: %1"
#. IDS_UNKNOWN_ARCHIVE_FORMAT
-#: Merge.rc:4583
+#: Merge.rc:4593
msgid "Unknown archive format"
msgstr "Onbekend archiefformaat"
-#: Merge.rc:4585
+#: Merge.rc:4595
msgid ""
"Failed to extract archive.\n"
"Compare as text file?"
@@ -6049,749 +6060,749 @@ msgstr ""
"Wilt u de archiefbestanden als tekstbestanden vergelijken?"
#. IDS_COLHDR_FILENAME
-#: Merge.rc:4591
+#: Merge.rc:4601
msgid "Filename"
msgstr "Bestandsnaam"
#. IDS_COLHDR_DIR
-#: Merge.rc:4592
+#: Merge.rc:4602
msgctxt "DirView|ColumnHeader"
msgid "Folder"
msgstr "Map"
#. IDS_COLHDR_RESULT
-#: Merge.rc:4593
+#: Merge.rc:4603
msgid "Comparison Result"
msgstr "Vergelijkingsresultaat"
#. IDS_COLHDR_LTIMEM
-#: Merge.rc:4594
+#: Merge.rc:4604
msgid "Left Date"
msgstr "Datum links"
#. IDS_COLHDR_RTIMEM
-#: Merge.rc:4595
+#: Merge.rc:4605
msgid "Right Date"
msgstr "Datum rechts"
#. IDS_COLHDR_MTIMEM
-#: Merge.rc:4596
+#: Merge.rc:4606
msgid "Middle Date"
msgstr "Datum midden"
#. IDS_COLHDR_LSIZE
-#: Merge.rc:4598
+#: Merge.rc:4608
msgid "Left Size"
msgstr "Grootte links"
#. IDS_COLHDR_RSIZE
-#: Merge.rc:4599
+#: Merge.rc:4609
msgid "Right Size"
msgstr "Grootte rechts"
#. IDS_COLHDR_MSIZE
-#: Merge.rc:4604
+#: Merge.rc:4614
msgid "Middle Size"
msgstr "Grootte midden"
#. IDS_COLHDR_RSIZE_SHORT
-#: Merge.rc:4605
+#: Merge.rc:4615
msgid "Right Size (Short)"
msgstr "Grootte rechts (kort)"
#. IDS_COLHDR_LSIZE_SHORT
-#: Merge.rc:4606
+#: Merge.rc:4616
msgid "Left Size (Short)"
msgstr "Grootte links (kort)"
#. IDS_COLHDR_MSIZE_SHORT
-#: Merge.rc:4607
+#: Merge.rc:4617
msgid "Middle Size (Short)"
msgstr "Grootte midden (kort)"
#. IDS_COLHDR_LTIMEC
-#: Merge.rc:4613
+#: Merge.rc:4623
msgid "Left Creation Time"
msgstr "Aanmaaktijd links"
#. IDS_COLHDR_RTIMEC
-#: Merge.rc:4614
+#: Merge.rc:4624
msgid "Right Creation Time"
msgstr "Aanmaaktijd rechts"
#. IDS_COLHDR_MTIMEC
-#: Merge.rc:4615
+#: Merge.rc:4625
msgid "Middle Creation Time"
msgstr "Aanmaaktijd midden"
#. IDS_COLHDR_NEWER
-#: Merge.rc:4616
+#: Merge.rc:4626
msgid "Newer File"
msgstr "Nieuwer bestand"
#. IDS_COLHDR_LVERSION
-#: Merge.rc:4617
+#: Merge.rc:4627
msgid "Left File Version"
msgstr "Bestandsversie links"
#. IDS_COLHDR_RVERSION
-#: Merge.rc:4618
+#: Merge.rc:4628
msgid "Right File Version"
msgstr "Bestandsversie rechts"
#. IDS_COLHDR_MVERSION
-#: Merge.rc:4619
+#: Merge.rc:4629
msgid "Middle File Version"
msgstr "Bestandsversie midden"
#. IDS_COLHDR_RESULT_ABBR
-#: Merge.rc:4620
+#: Merge.rc:4630
msgid "Short Result"
msgstr "Kort resultaat"
#. IDS_COLHDR_LATTRIBUTES
-#: Merge.rc:4621
+#: Merge.rc:4631
msgid "Left Attributes"
msgstr "Attributen links"
#. IDS_COLHDR_RATTRIBUTES
-#: Merge.rc:4622
+#: Merge.rc:4632
msgid "Right Attributes"
msgstr "Attributen rechts"
#. IDS_COLHDR_MATTRIBUTES
-#: Merge.rc:4623
+#: Merge.rc:4633
msgid "Middle Attributes"
msgstr "Attributen midden"
#. IDS_COLHDR_LEOL_TYPE
-#: Merge.rc:4628
+#: Merge.rc:4638
msgid "Left EOL"
msgstr "Links regeleinde"
#. IDS_COLHDR_MEOL_TYPE
-#: Merge.rc:4629
+#: Merge.rc:4639
msgid "Middle EOL"
msgstr "Midden regeleinde"
#. IDS_COLHDR_REOL_TYPE
-#: Merge.rc:4630
+#: Merge.rc:4640
msgid "Right EOL"
msgstr "Rechts regeleinde"
#. IDS_COLHDR_LENCODING
-#: Merge.rc:4636
+#: Merge.rc:4646
msgid "Left Encoding"
msgstr "Tekenset links"
#. IDS_COLHDR_RENCODING
-#: Merge.rc:4637
+#: Merge.rc:4647
msgid "Right Encoding"
msgstr "Tekenset rechts"
#. IDS_COLHDR_MENCODING
-#: Merge.rc:4638
+#: Merge.rc:4648
msgid "Middle Encoding"
msgstr "Tekenset midden"
#. IDS_COLHDR_NIDIFFS
-#: Merge.rc:4639
+#: Merge.rc:4649
msgid "Ignored Diff"
msgstr "Genegeerde verschillen"
#. IDS_COLHDR_BINARY
-#: Merge.rc:4641
+#: Merge.rc:4651
msgctxt "DirView|ColumnHeader"
msgid "Binary"
msgstr "Binair"
#. IDS_PLUGINS_TYPE_UNPACKER
-#: Merge.rc:4642 Merge.rc:4959
+#: Merge.rc:4652 Merge.rc:4969
msgid "Unpacker"
msgstr "Uitpakker"
#. IDS_PLUGIN_TYPE4
-#: Merge.rc:4643 Merge.rc:4960 Merge.rc:5267
+#: Merge.rc:4653 Merge.rc:4970 Merge.rc:5277
msgid "Prediffer"
msgstr "Voorvergelijken"
#. IDS_COLHDR_LEFT
-#: Merge.rc:4644
+#: Merge.rc:4654
msgid "Left"
msgstr "Links"
#. IDS_COLHDR_MIDDLE
-#: Merge.rc:4645
+#: Merge.rc:4655
msgid "Middle"
msgstr "Midden"
#. IDS_COLHDR_RIGHT
-#: Merge.rc:4646
+#: Merge.rc:4656
msgid "Right"
msgstr "Rechts"
#. IDS_COLHDR_DIFF
-#: Merge.rc:4647
+#: Merge.rc:4657
msgid "Diff"
msgstr "Verschil"
#. IDS_COLHDR_LEFT_DUPLICATE
-#: Merge.rc:4648
+#: Merge.rc:4658
msgid "Left Duplicate Count"
msgstr "Aantal duplicaten links"
#. IDS_COLHDR_RIGHT_DUPLICATE
-#: Merge.rc:4649
+#: Merge.rc:4659
msgid "Right Duplicate Count"
msgstr "Aantal duplicaten rechts"
#. IDS_COLHDR_MIDDLE_DUPLICATE
-#: Merge.rc:4650
+#: Merge.rc:4660
msgid "Middle Duplicate Count"
msgstr "Aantal duplicaten midden"
#. IDS_COLHDR_MOVE
-#: Merge.rc:4651
+#: Merge.rc:4661
msgid "Move"
msgstr "Verplaatsen"
#. IDS_PRPCAT_AUDIO
-#: Merge.rc:4658
+#: Merge.rc:4668
msgid "Audio"
msgstr "Audio"
#. IDS_PRPCAT_CALENDAR
-#: Merge.rc:4659
+#: Merge.rc:4669
msgid "Calendar"
msgstr "Kalender"
#. IDS_PRPCAT_COMMUNICATION
-#: Merge.rc:4660
+#: Merge.rc:4670
msgid "Communication"
msgstr "Communicatie"
#. IDS_PRPCAT_CONTACT
-#: Merge.rc:4661
+#: Merge.rc:4671
msgid "Contact"
msgstr "Contact"
#. IDS_PRPCAT_DEVICES
-#: Merge.rc:4662
+#: Merge.rc:4672
msgid "Devices"
msgstr "Apparaten"
#. IDS_PRPCAT_DOCUMENT
-#: Merge.rc:4663
+#: Merge.rc:4673
msgid "Document"
msgstr "Document"
#. IDS_PRPCAT_HOME
-#: Merge.rc:4664
+#: Merge.rc:4674
msgid "Home"
msgstr "Thuis"
#. IDS_PRPCAT_JOURNAL
-#: Merge.rc:4666
+#: Merge.rc:4676
msgid "Journal"
msgstr "Tijdschrift"
#. IDS_PRPCAT_LINK
-#: Merge.rc:4667
+#: Merge.rc:4677
msgid "Link"
msgstr "Koppeling"
#. IDS_PRPCAT_MEDIA
-#: Merge.rc:4668
+#: Merge.rc:4678
msgid "Media"
msgstr "Media"
#. IDS_PRPCAT_MUSIC
-#: Merge.rc:4670
+#: Merge.rc:4680
msgid "Music"
msgstr "Muziek"
#. IDS_PRPCAT_NOTE
-#: Merge.rc:4671
+#: Merge.rc:4681
msgid "Note"
msgstr "Notitie"
#. IDS_PRPCAT_PHOTO
-#: Merge.rc:4672
+#: Merge.rc:4682
msgid "Photo"
msgstr "Foto"
#. IDS_PRPCAT_RECORDEDTV
-#: Merge.rc:4673
+#: Merge.rc:4683
msgid "RecordedTV"
msgstr "Tv-opname"
#. IDS_PRPCAT_SEARCH
-#: Merge.rc:4674
+#: Merge.rc:4684
msgid "Search"
msgstr "Zoeken"
#. IDS_PRPCAT_SECURITY
-#: Merge.rc:4675
+#: Merge.rc:4685
msgid "Security"
msgstr "Beveiliging"
#. IDS_PRPCAT_SOFTWARE
-#: Merge.rc:4676
+#: Merge.rc:4686
msgid "Software"
msgstr "Software"
#. IDS_PRPCAT_TASK
-#: Merge.rc:4677
+#: Merge.rc:4687
msgid "Task"
msgstr "Taak"
#. IDS_PRPCAT_VIDEO
-#: Merge.rc:4678
+#: Merge.rc:4688
msgid "Video"
msgstr "Video"
#. IDS_PRPCAT_HASH
-#: Merge.rc:4679
+#: Merge.rc:4689
msgid "Hash"
msgstr "Hash"
#. IDS_CANT_COMPARE_FILES
-#: Merge.rc:4685
+#: Merge.rc:4695
msgid "Unable to compare files"
msgstr "Kan bestanden niet vergelijken"
#. IDS_ABORTED_ITEM
-#: Merge.rc:4686
+#: Merge.rc:4696
msgid "Item aborted"
msgstr "Item afgebroken"
#. IDS_FILE_SKIPPED
-#: Merge.rc:4687
+#: Merge.rc:4697
msgid "File skipped"
msgstr "Bestand overgeslagen"
#. IDS_DIR_SKIPPED
-#: Merge.rc:4688
+#: Merge.rc:4698
msgid "Folder skipped"
msgstr "Map overgeslagen"
#. IDS_LEFT_ONLY_IN_FMT
-#: Merge.rc:4689
+#: Merge.rc:4699
#, c-format
msgid "Left only: %1"
msgstr "Alleen links: %1"
#. IDS_MIDDLE_ONLY_IN_FMT
-#: Merge.rc:4690
+#: Merge.rc:4700
#, c-format
msgid "Middle only: %1"
msgstr "Alleen midden: %1"
#. IDS_RIGHT_ONLY_IN_FMT
-#: Merge.rc:4691
+#: Merge.rc:4701
#, c-format
msgid "Right only: %1"
msgstr "Alleen rechts: %1"
#. IDS_DOES_NOT_EXIST_IN_FMT
-#: Merge.rc:4692
+#: Merge.rc:4702
#, c-format
msgid "Does not exist in %1"
msgstr "Bestaat niet in %1"
#. IDS_BIN_FILES_SAME
-#: Merge.rc:4693
+#: Merge.rc:4703
msgid "Binary files are identical"
msgstr "Binaire bestanden zijn identiek"
#. IDS_BIN_FILES_DIFF
-#: Merge.rc:4699
+#: Merge.rc:4709
msgid "Binary files are different"
msgstr "Binaire bestanden zijn verschillend"
#. IDS_FILES_ARE_DIFFERENT
-#: Merge.rc:4700
+#: Merge.rc:4710
msgid "Files are different"
msgstr "Bestanden zijn verschillend"
#. IDS_FOLDERS_ARE_DIFFERENT
-#: Merge.rc:4701
+#: Merge.rc:4711
msgid "Folders are different"
msgstr "Mappen zijn verschillend"
#. IDS_LEFTONLY
-#: Merge.rc:4702
+#: Merge.rc:4712
msgid "Left Only"
msgstr "Alleen links"
#. IDS_RIGHTONLY
-#: Merge.rc:4703
+#: Merge.rc:4713
msgid "Right Only"
msgstr "Alleen rechts"
#. IDS_MIDDLEONLY
-#: Merge.rc:4704
+#: Merge.rc:4714
msgid "Middle Only"
msgstr "Alleen midden"
#. IDS_NOITEMLEFT
-#: Merge.rc:4705
+#: Merge.rc:4715
msgid "No item in left"
msgstr "Geen item links"
#. IDS_NOITEMRIGHT
-#: Merge.rc:4706
+#: Merge.rc:4716
msgid "No item in right"
msgstr "Geen item rechts"
#. IDS_NOITEMMIDDLE
-#: Merge.rc:4707
+#: Merge.rc:4717
msgid "No item in middle"
msgstr "Geen item in midden"
#. IDS_CMPRES_ERROR
-#: Merge.rc:4709
+#: Merge.rc:4719
msgid "Error"
msgstr "Fout"
#. IDS_TEXT_FILES_SAME
-#: Merge.rc:4710
+#: Merge.rc:4720
msgid "Text files are identical"
msgstr "Tekstbestanden zijn identiek"
#. IDS_LEFTONLY_DIFF
-#: Merge.rc:4711
+#: Merge.rc:4721
msgid " (Middle and right are identical)"
msgstr " (Midden en rechts zijn identiek)"
#. IDS_MIDDLEONLY_DIFF
-#: Merge.rc:4712
+#: Merge.rc:4722
msgid " (Left and right are identical)"
msgstr " (Links en rechts zijn identiek)"
#. IDS_RIGHTONLY_DIFF
-#: Merge.rc:4713
+#: Merge.rc:4723
msgid " (Left and middle are identical)"
msgstr " (Links en midden zijn identiek)"
#. IDS_PATH_MISMATCH
-#: Merge.rc:4714
+#: Merge.rc:4724
msgid " (paths differ)"
msgstr ""
#. IDS_TEXT_FILES_DIFF
-#: Merge.rc:4715
+#: Merge.rc:4725
msgid "Text files are different"
msgstr "Tekstbestanden zijn verschillend"
#. IDS_IMAGE_FILES_SAME
-#: Merge.rc:4716
+#: Merge.rc:4726
msgid "Image files are identical"
msgstr "Afbeeldingsbestanden zijn identiek"
#. IDS_IMAGE_FILES_DIFF
-#: Merge.rc:4717
+#: Merge.rc:4727
msgid "Image files are different"
msgstr "Afbeeldingsbestanden zijn verschillend"
#. IDS_EXPR_DIFF
-#: Merge.rc:4718
+#: Merge.rc:4728
#, c-format
msgid "Files are different (expr: %1)"
msgstr ""
#. IDS_HASH_GROUP
-#: Merge.rc:4719
+#: Merge.rc:4729
#, c-format
msgid "Group%d"
msgstr "Groep%d"
#. IDS_RENAME_MOVE_DETECTION_DISALBED
-#: Merge.rc:4720
+#: Merge.rc:4730
msgctxt "Options dialog|Compare|Folder|Detect renames and moves"
msgid "Disabled"
msgstr ""
#. IDS_RENAME_MOVE_DETECTION_RENAME
-#: Merge.rc:4721
+#: Merge.rc:4731
msgid "Detect renames"
msgstr ""
#. IDS_RENAME_MOVE_DETECTION_RENAME_MOVE
-#: Merge.rc:4722
+#: Merge.rc:4732
msgid "Detect renames and moves"
msgstr ""
#. IDS_RENAME_MOVE_MERGE_MODE_RENAME
-#: Merge.rc:4723
+#: Merge.rc:4733
msgid "Merge renames"
msgstr ""
#. IDS_RENAME_MOVE_MERGE_MODE_RENAME_MOVE
-#: Merge.rc:4724
+#: Merge.rc:4734
msgid "Merge renames and moves"
msgstr ""
#. IDS_RENAMED
-#: Merge.rc:4725
+#: Merge.rc:4735
msgid "Renamed"
msgstr ""
#. IDS_MOVED
-#: Merge.rc:4726
+#: Merge.rc:4736
msgid "Moved"
msgstr ""
#. IDS_RENAMED_MOVED
-#: Merge.rc:4727
+#: Merge.rc:4737
msgid "Renamed/Moved"
msgstr ""
#. IDS_RENAMED_MOVED_ITEMS
-#: Merge.rc:4728
+#: Merge.rc:4738
#, c-format
msgid "(%1 items)"
msgstr ""
#. IDS_RENAMED_MOVED_RESULT
-#: Merge.rc:4729
+#: Merge.rc:4739
#, c-format
msgid "%1 (set %2): "
msgstr ""
#. IDS_SWITCH_FLAT_MODE
-#: Merge.rc:4730
+#: Merge.rc:4740
msgid "Some moved items have been merged.\nIn Tree Mode, these items may appear in positions that do not reflect the actual folder structure, which can be confusing.\nSwitch to Flat Mode?"
msgstr ""
#. IDS_ELAPSED_TIME
-#: Merge.rc:4736
+#: Merge.rc:4746
#, c-format
msgid "Elapsed time: %ld ms"
msgstr "Verstreken tijd: %ld ms"
#. IDS_STATUS_SELITEM1
-#: Merge.rc:4737
+#: Merge.rc:4747
msgid "1 item selected"
msgstr "1 item geselecteerd"
#. IDS_STATUS_SELITEMS
-#: Merge.rc:4738
+#: Merge.rc:4748
#, c-format
msgid "%1 items selected"
msgstr "%1 items geselecteerd"
#. IDS_COLDESC_FILENAME
-#: Merge.rc:4744
+#: Merge.rc:4754
msgid "Filename or folder name."
msgstr "Bestandsnaam of mapnaam."
#. IDS_COLDESC_DIR
-#: Merge.rc:4745
+#: Merge.rc:4755
msgid "Subfolder name when subfolders are included."
msgstr "Naam van submap als submappen bijgevoegd zijn."
#. IDS_COLDESC_RESULT
-#: Merge.rc:4746
+#: Merge.rc:4756
msgid "Comparison result, long form."
msgstr "Vergelijkingsresultaat, lange vorm."
#. IDS_COLDESC_LTIMEM
-#: Merge.rc:4751
+#: Merge.rc:4761
msgid "Left side modification date."
msgstr "Wijzigingsdatum linkerzijde."
#. IDS_COLDESC_RTIMEM
-#: Merge.rc:4752
+#: Merge.rc:4762
msgid "Right side modification date."
msgstr "Wijzigingsdatum rechterzijde."
#. IDS_COLDESC_MTIMEM
-#: Merge.rc:4753
+#: Merge.rc:4763
msgid "Middle side modification date."
msgstr "Wijzigingsdatum midden."
#. IDS_COLDESC_EXTENSION
-#: Merge.rc:4754
+#: Merge.rc:4764
msgid "File's extension."
msgstr "Bestandsextensie."
#. IDS_COLDESC_LSIZE
-#: Merge.rc:4755
+#: Merge.rc:4765
msgid "Left file size in bytes."
msgstr "Bestandsgrootte linkerzijde in bytes."
#. IDS_COLDESC_RSIZE
-#: Merge.rc:4756
+#: Merge.rc:4766
msgid "Right file size in bytes."
msgstr "Bestandsgrootte rechterzijde in bytes."
#. IDS_COLDESC_MSIZE
-#: Merge.rc:4757
+#: Merge.rc:4767
msgid "Middle file size in bytes."
msgstr "Bestandsgrootte midden in bytes."
#. IDS_COLDESC_LSIZE_SHORT
-#: Merge.rc:4758
+#: Merge.rc:4768
msgid "Left file size abbreviated."
msgstr "Bestandsgrootte links ingekort."
#. IDS_COLDESC_RSIZE_SHORT
-#: Merge.rc:4759
+#: Merge.rc:4769
msgid "Right file size abbreviated."
msgstr "Bestandsgrootte rechts ingekort."
#. IDS_COLDESC_MSIZE_SHORT
-#: Merge.rc:4760
+#: Merge.rc:4770
msgid "Middle file size abbreviated."
msgstr "Bestandsgrootte midden ingekort."
#. IDS_COLDESC_LTIMEC
-#: Merge.rc:4766
+#: Merge.rc:4776
msgid "Left side creation time."
msgstr "Aanmaaktijdstip linkerzijde."
#. IDS_COLDESC_RTIMEC
-#: Merge.rc:4767
+#: Merge.rc:4777
msgid "Right side creation time."
msgstr "Aanmaaktijdstip rechterzijde."
#. IDS_COLDESC_MTIMEC
-#: Merge.rc:4768
+#: Merge.rc:4778
msgid "Middle side creation time."
msgstr "Aanmaaktijdstip midden."
#. IDS_COLDESC_NEWER
-#: Merge.rc:4769
+#: Merge.rc:4779
msgid "Tells which side has newer modification date."
msgstr "Geeft aan welke zijde het recentst gewijzigd is."
#. IDS_COLDESC_LVERSION
-#: Merge.rc:4770
+#: Merge.rc:4780
msgid "Left side file version, only for some file types."
msgstr "Bestandsversie linkerzijde, alleen voor bepaalde bestandstypes."
#. IDS_COLDESC_RVERSION
-#: Merge.rc:4771
+#: Merge.rc:4781
msgid "Right side file version, only for some file types."
msgstr "Bestandsversie rechterzijde, alleen voor bepaalde bestandstypes."
#. IDS_COLDESC_MVERSION
-#: Merge.rc:4776
+#: Merge.rc:4786
msgid "Middle side file version, only for some file types."
msgstr "Bestandsversie midden, alleen voor bepaalde bestandstypes."
#. IDS_COLDESC_RESULT_ABBR
-#: Merge.rc:4777
+#: Merge.rc:4787
msgid "Short comparison result."
msgstr "Kort vergelijkingsresultaat."
#. IDS_COLDESC_LATTRIBUTES
-#: Merge.rc:4778
+#: Merge.rc:4788
msgid "Left side attributes."
msgstr "Attributen linkerzijde."
#. IDS_COLDESC_RATTRIBUTES
-#: Merge.rc:4779
+#: Merge.rc:4789
msgid "Right side attributes."
msgstr "Attributen rechterzijde."
#. IDS_COLDESC_MATTRIBUTES
-#: Merge.rc:4780
+#: Merge.rc:4790
msgid "Middle side attributes."
msgstr "Attributen midden."
#. IDS_COLDESC_LEOL_TYPE
-#: Merge.rc:4781
+#: Merge.rc:4791
msgid "Left side file EOL type."
msgstr "Type regeleinde linker bestand."
#. IDS_COLDESC_REOL_TYPE
-#: Merge.rc:4782
+#: Merge.rc:4792
msgid "Right side file EOL type."
msgstr "Type regeleinde rechter bestand."
#. IDS_COLDESC_MEOL_TYPE
-#: Merge.rc:4783
+#: Merge.rc:4793
msgid "Middle side file EOL type."
msgstr "Type regeleinde middelste bestand."
#. IDS_COLDESC_LENCODING
-#: Merge.rc:4789
+#: Merge.rc:4799
msgid "Left side encoding."
msgstr "Codering linkerzijde."
#. IDS_COLDESC_RENCODING
-#: Merge.rc:4790
+#: Merge.rc:4800
msgid "Right side encoding."
msgstr "Codering rechterzijde."
#. IDS_COLDESC_MENCODING
-#: Merge.rc:4791
+#: Merge.rc:4801
msgid "Middle side encoding."
msgstr "Codering midden."
#. IDS_COLDESC_NIDIFFS
-#: Merge.rc:4792
+#: Merge.rc:4802
msgid "Number of ignored differences in file. Ignored and cannot be merged."
msgstr ""
"Aantal genegeerde verschillen in bestand. Deze verschillen worden genegeerd "
"door WinMerge en kunnen niet samengevoegd worden."
#. IDS_COLDESC_NSDIFFS
-#: Merge.rc:4793
+#: Merge.rc:4803
msgid "Number of differences in file (excluding ignored)."
msgstr ""
"Aantal verschillen in bestand. Dit aantal bevat geen genegeerde verschillen."
#. IDS_COLDESC_BINARY
-#: Merge.rc:4794
+#: Merge.rc:4804
msgid "Shows an asterisk (*) if the file is binary."
msgstr "Geeft een asterisk (*) weer als het bestand binair is."
#. IDS_COLDESC_UNPACKER
-#: Merge.rc:4795
+#: Merge.rc:4805
msgid "Unpacker plugin name or pipeline."
msgstr "Uitpakker pluginnaam of pipeline."
#. IDS_COLDESC_PREDIFFER
-#: Merge.rc:4796
+#: Merge.rc:4806
msgid "Prediffer plugin name or pipeline."
msgstr "Voorvergelijking pluginnaam of pipeline."
#. IDS_DIRECTORY_REPORT_TITLE
-#: Merge.rc:4802
+#: Merge.rc:4812
#, c-format
msgid "Compare %1 with %2"
msgstr "%1 met %2 vergelijken"
#. IDS_DIRECTORY_REPORT_TITLE3
-#: Merge.rc:4803
+#: Merge.rc:4813
#, c-format
msgid "Compare %1 with %2 and %3"
msgstr "%1 vergelijken met %2 en %3"
#. IDS_REPORT_COMMALIST
-#: Merge.rc:4804
+#: Merge.rc:4814
msgid "Comma-separated list"
msgstr "Komma-gescheiden lijst"
#. IDS_REPORT_TABLIST
-#: Merge.rc:4805
+#: Merge.rc:4815
msgid "Tab-separated list"
msgstr "Tab-gescheiden lijst"
#. IDS_REPORT_SIMPLEHTML
-#: Merge.rc:4806
+#: Merge.rc:4816
msgid "Simple HTML"
msgstr "Simpele HTML"
#. IDS_REPORT_SIMPLEXML
-#: Merge.rc:4807
+#: Merge.rc:4817
msgid "Simple XML"
msgstr "Simpele XML"
-#: Merge.rc:4809
+#: Merge.rc:4819
msgid ""
"Report file already exists. Overwrite?"
msgstr ""
@@ -6799,7 +6810,7 @@ msgstr ""
"overschrijven?"
#. IDS_REPORT_ERROR
-#: Merge.rc:4814
+#: Merge.rc:4824
#, c-format
msgid ""
"Error creating the report:\n"
@@ -6809,52 +6820,52 @@ msgstr ""
"%1"
#. IDS_REPORT_SUCCESS
-#: Merge.rc:4815
+#: Merge.rc:4825
msgid "Report created successfully."
msgstr "Het rapport is met succes aangemaakt."
#. IDS_SYNCPOINT_LASTBLOCK
-#: Merge.rc:4821
+#: Merge.rc:4831
msgid "Cannot add a synchronization point at this line."
msgstr "Kan geen synchronisatiepunt toevoegen op deze regel."
#. IDS_FILE_TO_ITSELF
-#: Merge.rc:4827
+#: Merge.rc:4837
msgid "Same file is opened in both panes."
msgstr "Hetzelfde bestand is in beide vensters geopend."
#. IDS_FILESSAME
-#: Merge.rc:4828
+#: Merge.rc:4838
msgid "Selected files are identical."
msgstr "De geselecteerde bestanden zijn identiek."
#. IDS_FILESSAME_CURCFG
-#: Merge.rc:4829
+#: Merge.rc:4839
msgid "Selected files are identical (with current settings).\r\nChecking binary identity..."
msgstr ""
#. IDS_FILESSAME_BINERROR
-#: Merge.rc:4830
+#: Merge.rc:4840
msgid "Selected files are identical (with current settings).\r\nBut binary comparison failed."
msgstr ""
#. IDS_FILESSAME_BINSAME
-#: Merge.rc:4831
+#: Merge.rc:4841
msgid "Selected files are identical (binary match)."
msgstr ""
#. IDS_FILESSAME_BINDIFF
-#: Merge.rc:4832
+#: Merge.rc:4842
msgid "Selected files are identical (with current settings).\r\nBut differ at the binary level."
msgstr ""
#. IDS_FILEERROR
-#: Merge.rc:4833
+#: Merge.rc:4843
msgid "An error occurred while comparing files."
msgstr "Er trad een fout op bij het vergelijken van de bestanden."
#. IDS_TEMP_FILEERROR
-#: Merge.rc:4834
+#: Merge.rc:4844
msgid ""
"Could not create temporary files. Check your temporary path settings."
msgstr ""
@@ -6862,7 +6873,7 @@ msgstr ""
" voor het pad van tijdelijke bestanden."
#. IDS_SUGGEST_IGNOREEOL
-#: Merge.rc:4835
+#: Merge.rc:4845
msgid "Files use different EOL.\n\nTreat all EOL as equivalent?\n\nSet 'Ignore EOL differences (Windows/Unix/Mac)' in Compare section of Options."
msgstr ""
"Deze bestanden gebruiken verschillende regeleinde-types.\n"
@@ -6872,17 +6883,17 @@ msgstr ""
"Opmerking: Indien u op elk moment alle regeleinde-types als equivalent wilt behandelen, stel optie \"Regeleinde-verschillen negeren (Windows/Unix/Mac)\" dan in in de Vergelijken-tab van het opties-venster (beschikbaar onder Wijzigen/Opties)"
#. IDS_INVALID_DIRECTORY
-#: Merge.rc:4836
+#: Merge.rc:4846
msgid "Selected folder is invalid."
msgstr "De geselecteerde map is ongeldig."
#. IDS_CANNOT_OPEN_BINARYFILE
-#: Merge.rc:4837
+#: Merge.rc:4847
msgid "Cannot open a binary file in Editor."
msgstr "Kan geen binair bestand openen met de editor."
#. IDS_CREATE_PAIR_FOLDER
-#: Merge.rc:4838
+#: Merge.rc:4848
#, c-format
msgid "Create matching folder:\n%1\non the other side and open?"
msgstr ""
@@ -6893,42 +6904,42 @@ msgstr ""
"aanmaken aan de andere kant en deze mappen openen?"
#. IDS_CONFIRM_COPY_ALL_DIFFS
-#: Merge.rc:4839
+#: Merge.rc:4849
msgid "Copy all differences to other file?"
msgstr ""
"Weet u zeker dat u alle verschillen naar het andere bestand wilt kopiëren?"
#. IDS_MOVE_TO_NEXTFILE
-#: Merge.rc:4844
+#: Merge.rc:4854
msgid "Move to next file?"
msgstr "Wilt u naar het volgende bestand gaan?"
#. IDS_MOVE_TO_PREVFILE
-#: Merge.rc:4845
+#: Merge.rc:4855
msgid "Move to previous file?"
msgstr "Wilt u naar het vorige bestand gaan?"
#. IDS_MOVE_TO_NEXTPAGE
-#: Merge.rc:4846
+#: Merge.rc:4856
msgid "Move to next page?"
msgstr "Wilt u naar de volgende pagina gaan?"
#. IDS_MOVE_TO_PREVPAGE
-#: Merge.rc:4847
+#: Merge.rc:4857
msgid "Move to previous page?"
msgstr "Wilt u naar de vorige pagina gaan?"
#. IDS_MOVE_TO_FIRSTFILE
-#: Merge.rc:4848
+#: Merge.rc:4858
msgid "Move to first file?"
msgstr "Wilt u naar het eerste bestand gaan?"
#. IDS_MOVE_TO_LASTFILE
-#: Merge.rc:4849
+#: Merge.rc:4859
msgid "Move to last file?"
msgstr "Wilt u naar het laatste bestand gaan?"
-#: Merge.rc:4856
+#: Merge.rc:4866
#, c-format
msgid "Different codepages: left (cp%d), right (cp%d).\nDisplay in codepage (better display) or default Windows codepage (safer merging)?\n(Recommended: default Windows codepage)"
msgstr ""
@@ -6936,53 +6947,53 @@ msgstr ""
"Elk bestand in zijn eigen tekenset 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-tekenset zijn (aanbevolen)?"
-#: Merge.rc:4858
+#: Merge.rc:4868
msgid "Information lost due to encoding errors: both files"
msgstr "Informatie verloren gegaan wegens codeerfouten: beide bestanden"
-#: Merge.rc:4860
+#: Merge.rc:4870
msgid "Information lost due to encoding errors: first file"
msgstr "Informatie verloren gegaan wegens codeerfouten: eerste bestand"
-#: Merge.rc:4862
+#: Merge.rc:4872
msgid "Information lost due to encoding errors: second file"
msgstr "Informatie verloren gegaan wegens codeerfouten: tweede bestand"
-#: Merge.rc:4864
+#: Merge.rc:4874
msgid "Information lost due to encoding errors: third file"
msgstr "Informatie verloren gegaan wegens codeerfouten: derde bestand"
#. IDS_LINEDIFF_NODIFF
-#: Merge.rc:4870
+#: Merge.rc:4880
msgid "No difference"
msgstr "Geen verschil"
#. IDS_LINEDIFF_NODIFF_CAPTION
-#: Merge.rc:4871
+#: Merge.rc:4881
msgid "Line difference"
msgstr "Regelverschil"
#. IDS_NUM_REPLACED
-#: Merge.rc:4877
+#: Merge.rc:4887
#, c-format
msgid "Replaced %1 string(s)."
msgstr "%1 tekenreeks(en) vervangen."
#. IDS_EDIT_TEXT_NOT_FOUND
-#: Merge.rc:4878
+#: Merge.rc:4888
#, c-format
msgid "Cannot find string \"%s\"."
msgstr "Kan tekenreeks \"%s\" niet vinden."
#. IDS_MERGE_MODE
-#: Merge.rc:4884
+#: Merge.rc:4894
msgid "Entering Merge Mode. Press F9 to turn off."
msgstr ""
"U start nu de samenvoegmodus. Als u de samenvoegmodus wilt uitschakelen, "
"drukt u op F9."
#. IDS_AUTO_MERGE
-#: Merge.rc:4890
+#: Merge.rc:4900
#, c-format
msgid ""
"Automatic merges: %1\n"
@@ -6992,99 +7003,99 @@ msgstr ""
"Aantal niet-opgeloste conflicten: %2"
#. IDS_CODEPAGE_MERGED
-#: Merge.rc:4891
+#: Merge.rc:4901
msgid "Codepage change merged."
msgstr "Wijziging van tekenset werd samengevoegd."
#. IDS_CODEPAGE_CONFLICT
-#: Merge.rc:4892
+#: Merge.rc:4902
msgid "Codepage changes are conflicting."
msgstr "Wijzigingen van tekenset geven conflicten."
#. IDS_EOL_MERGED
-#: Merge.rc:4893
+#: Merge.rc:4903
msgid "EOL change merged."
msgstr "Wijziging van regeleinde werd samengevoegd."
#. IDS_EOL_CONFLICT
-#: Merge.rc:4894
+#: Merge.rc:4904
msgid "EOL changes are conflicting."
msgstr "Wijzigingen van regeleinde geven conflicten."
#. IDS_LOCBAR_CAPTION
-#: Merge.rc:4900
+#: Merge.rc:4910
msgid "Location Pane"
msgstr "Locatievenster"
#. IDS_DIFFBAR_CAPTION
-#: Merge.rc:4901
+#: Merge.rc:4911
msgid "Diff Pane"
msgstr "Verschilvenster"
#. IDS_DIFF_SUCCEEDED
-#: Merge.rc:4908
+#: Merge.rc:4918
msgid "Patch file written."
msgstr "Patch-bestand succesvol geschreven."
#. IDS_DIFF_ITEM1NOTFOUND
-#: Merge.rc:4909
+#: Merge.rc:4919
msgid "First item not found!"
msgstr "1. item is niet teruggevonden!"
#. IDS_DIFF_ITEM2NOTFOUND
-#: Merge.rc:4910
+#: Merge.rc:4920
msgid "Second item not found!"
msgstr "2. item is niet teruggevonden!"
#. IDS_DIFF_FILEOVERWRITE
-#: Merge.rc:4911
+#: Merge.rc:4921
msgid "Patch file already exists. Overwrite?"
msgstr "Het patch-bestand bestaat al. Wilt u het overschrijven?"
#. IDS_DIFF_SELECTEDFILES
-#: Merge.rc:4912
+#: Merge.rc:4922
#, c-format
msgid "[%1 files selected]"
msgstr "[%1 bestanden geselecteerd]"
#. IDS_DIFF_NORMAL
-#: Merge.rc:4913
+#: Merge.rc:4923
msgid "Normal"
msgstr "Normaal"
#. IDS_DIFF_CONTEXT
-#: Merge.rc:4914
+#: Merge.rc:4924
msgid "Context"
msgstr "Context"
#. IDS_DIFF_UNIFIED
-#: Merge.rc:4915
+#: Merge.rc:4925
msgid "Unified"
msgstr "Verenigd"
#. IDS_FILEWRITE_ERROR
-#: Merge.rc:4917
+#: Merge.rc:4927
#, c-format
msgid "Could not write to file %1."
msgstr "Kon niet schrijven naar bestand %1."
#. IDS_PATH_NOT_ABSOLUTE
-#: Merge.rc:4918
+#: Merge.rc:4928
#, c-format
msgid "Output path is not absolute: %1"
msgstr "Het opgegeven uitvoerpad is geen absoluut pad: %1"
#. IDS_MUST_SPECIFY_OUTPUT
-#: Merge.rc:4919
+#: Merge.rc:4929
msgid "Specify an output file."
msgstr "Uitvoerbestand opgeven."
-#: Merge.rc:4921
+#: Merge.rc:4931
msgid "Cannot create patch from binary files."
msgstr "Kan geen patch-bestand aanmaken van binaire bestanden."
#. IDS_SAVEFILES_FORPATCH
-#: Merge.rc:4922
+#: Merge.rc:4932
msgid ""
"Save all files first.\n"
"\n"
@@ -7095,12 +7106,12 @@ msgstr ""
"Een patch genereren vereist dat er geen niet-opgeslagen wijzigingen in bestanden zijn."
#. IDS_FOLDER_NOTEXIST
-#: Merge.rc:4923
+#: Merge.rc:4933
msgid "Folder does not exist."
msgstr "Map bestaat niet."
#. IDS_NO_ZIP_SUPPORT
-#: Merge.rc:4928
+#: Merge.rc:4938
msgid ""
"Archive support not enabled.\n"
"7-Zip and/or Merge7z*.dll not found.\n"
@@ -7111,37 +7122,37 @@ msgstr ""
"Zie de handleiding voor meer info over archiefondersteuning en hoe het in te schakelen."
#. IDS_OPT_EXPORT_CAPTION
-#: Merge.rc:4929
+#: Merge.rc:4939
msgid "Select file for export"
msgstr "Bestand selecteren voor exporteren"
#. IDS_OPT_IMPORT_CAPTION
-#: Merge.rc:4930
+#: Merge.rc:4940
msgid "Select file for import"
msgstr "Bestand selecteren voor importeren"
#. IDS_OPT_IMPORT_DONE
-#: Merge.rc:4931
+#: Merge.rc:4941
msgid "Options imported from file."
msgstr "Opties geïmporteerd uit het bestand."
#. IDS_OPT_EXPORT_DONE
-#: Merge.rc:4932
+#: Merge.rc:4942
msgid "Options exported to file."
msgstr "Opties geëxporteerd naar het bestand."
#. IDS_OPT_IMPORT_ERR
-#: Merge.rc:4933
+#: Merge.rc:4943
msgid "Failed to import options from file."
msgstr "Opties importeren van bestand mislukt."
#. IDS_OPT_EXPORT_ERR
-#: Merge.rc:4934
+#: Merge.rc:4944
msgid "Failed to write options to file."
msgstr "Opties schrijven naar bestand mislukt."
#. IDS_CLOSEALL_WINDOWS
-#: Merge.rc:4935
+#: Merge.rc:4945
msgid ""
"Close multiple compare windows?\n"
"\n"
@@ -7152,44 +7163,44 @@ msgstr ""
"Wilt u doorgaan?"
#. IDS_EOL_MIXED
-#: Merge.rc:4944
+#: Merge.rc:4954
msgid "Mixed"
msgstr "Gemengd"
#. IDS_EOL_BIN
-#: Merge.rc:4945
+#: Merge.rc:4955
msgctxt "EOL Type"
msgid "Binary"
msgstr "Binair"
#. IDS_EOL_NONE
-#: Merge.rc:4949
+#: Merge.rc:4959
msgid "None"
msgstr "Geen"
#. IDS_MARKER_COLOR_FMT
-#: Merge.rc:4950
+#: Merge.rc:4960
#, c-format
msgid "Marker Color %d"
msgstr "Markeringskleur %d"
#. IDS_MARKER_NEW_PATTERN
-#: Merge.rc:4951
+#: Merge.rc:4961
msgid "New Pattern"
msgstr "Nieuw patroon"
#. IDS_PLUGINSLIST_TYPE
-#: Merge.rc:4957
+#: Merge.rc:4967
msgid "Type"
msgstr "Type"
#. IDS_PLUGINS_TYPE_EDITSCRIPT
-#: Merge.rc:4961
+#: Merge.rc:4971
msgid "Editor script"
msgstr "Editor-script"
#. ID_SELECTLINEDIFF
-#: Merge.rc:4967
+#: Merge.rc:4977
msgid ""
"\n"
"Difference in Current Line (F4)"
@@ -7198,7 +7209,7 @@ msgstr ""
"Verschil in de huidige regel (F4)"
#. ID_OPTIONS
-#: Merge.rc:4968
+#: Merge.rc:4978
msgid ""
"\n"
"Options"
@@ -7207,7 +7218,7 @@ msgstr ""
"Opties"
#. ID_REFRESH
-#: Merge.rc:4969
+#: Merge.rc:4979
msgid ""
"\n"
"Refresh (F5)"
@@ -7216,7 +7227,7 @@ msgstr ""
"Vernieuwen (F5)"
#. ID_PREVDIFF
-#: Merge.rc:4975
+#: Merge.rc:4985
msgid ""
"\n"
"Previous Difference (Alt+Up)"
@@ -7225,7 +7236,7 @@ msgstr ""
"Vorig verschil (Alt+Omhoog)"
#. ID_NEXTDIFF
-#: Merge.rc:4976
+#: Merge.rc:4986
msgid ""
"\n"
"Next Difference (Alt+Down)"
@@ -7234,7 +7245,7 @@ msgstr ""
"Volgend verschil (Alt+Omlaag)"
#. ID_PREVCONFLICT
-#: Merge.rc:4977
+#: Merge.rc:4987
msgid ""
"\n"
"Previous Conflict (Alt+Shift+Up)"
@@ -7243,7 +7254,7 @@ msgstr ""
"Vorig conflict (Alt+Shift+Omhoog)"
#. ID_NEXTCONFLICT
-#: Merge.rc:4978
+#: Merge.rc:4988
msgid ""
"\n"
"Next Conflict (Alt+Shift+Down)"
@@ -7252,7 +7263,7 @@ msgstr ""
"Volgend conflict (Alt+Shift+Omlaag)"
#. ID_FIRSTDIFF
-#: Merge.rc:4983
+#: Merge.rc:4993
msgid ""
"\n"
"First Difference (Alt+Home)"
@@ -7261,7 +7272,7 @@ msgstr ""
"Eerste verschil (Alt+Home)"
#. ID_CURDIFF
-#: Merge.rc:4984
+#: Merge.rc:4994
msgid ""
"\n"
"Current Difference (Alt+Enter)"
@@ -7270,7 +7281,7 @@ msgstr ""
"Huidig verschil (Alt+Enter)"
#. ID_LASTDIFF
-#: Merge.rc:4985
+#: Merge.rc:4995
msgid ""
"\n"
"Last Difference (Alt+End)"
@@ -7279,7 +7290,7 @@ msgstr ""
"Laatste verschil (Alt+End)"
#. ID_L2R
-#: Merge.rc:4986
+#: Merge.rc:4996
msgid ""
"\n"
"Copy to Right (Alt+Right)"
@@ -7288,7 +7299,7 @@ msgstr ""
"Naar rechts kopiëren (Alt+Rechts)"
#. ID_R2L
-#: Merge.rc:4987
+#: Merge.rc:4997
msgid ""
"\n"
"Copy to Left (Alt+Left)"
@@ -7297,7 +7308,7 @@ msgstr ""
"Naar links kopiëren (Alt+Links)"
#. ID_L2RNEXT
-#: Merge.rc:4988
+#: Merge.rc:4998
msgid ""
"\n"
"Copy to Right and Advance (Ctrl+Alt+Right)"
@@ -7306,7 +7317,7 @@ msgstr ""
"Naar rechts kopiëren en verder gaan (Ctrl+Alt+Rechts)"
#. ID_R2LNEXT
-#: Merge.rc:4989
+#: Merge.rc:4999
msgid ""
"\n"
"Copy to Left and Advance (Ctrl+Alt+Left)"
@@ -7315,7 +7326,7 @@ msgstr ""
"Naar links kopiëren en verder gaan (Ctrl+Alt+Links)"
#. ID_ALL_RIGHT
-#: Merge.rc:4990
+#: Merge.rc:5000
msgid ""
"\n"
"Copy All to Right"
@@ -7324,7 +7335,7 @@ msgstr ""
"Alles naar rechts kopiëren"
#. ID_ALL_LEFT
-#: Merge.rc:4991
+#: Merge.rc:5001
msgid ""
"\n"
"Copy All to Left"
@@ -7333,7 +7344,7 @@ msgstr ""
"Alles naar links kopiëren"
#. ID_AUTO_MERGE
-#: Merge.rc:4992
+#: Merge.rc:5002
msgid ""
"\n"
"Auto Merge (Ctrl+Alt+M)"
@@ -7342,7 +7353,7 @@ msgstr ""
"Automatisch samenvoegen (Ctrl+Alt+M)"
#. ID_FIRSTFILE
-#: Merge.rc:4993
+#: Merge.rc:5003
msgid ""
"\n"
"First File"
@@ -7351,7 +7362,7 @@ msgstr ""
"Eerste bestand"
#. ID_NEXTFILE
-#: Merge.rc:4994
+#: Merge.rc:5004
msgid ""
"\n"
"Next File (Ctrl+F8)"
@@ -7360,7 +7371,7 @@ msgstr ""
"Volgend bestand (Ctrl+F8)"
#. ID_LASTFILE
-#: Merge.rc:4995
+#: Merge.rc:5005
msgid ""
"\n"
"Last File"
@@ -7369,7 +7380,7 @@ msgstr ""
"Laatste bestand"
#. ID_PREVFILE
-#: Merge.rc:4996
+#: Merge.rc:5006
msgid ""
"\n"
"Previous File (Ctrl+F7)"
@@ -7378,39 +7389,39 @@ msgstr ""
"Vorig bestand (Ctrl+F7)"
#. IDS_UNPACK_AUTO
-#: Merge.rc:5003
+#: Merge.rc:5013
msgid "Adapted unpacker applied to both files (one needs extension)."
msgstr ""
"De overgenomen uitpakker wordt toegepast op beide bestanden (één bestand "
"heeft alleen maar de extensie nodig)."
#. IDS_NO_PREDIFFER
-#: Merge.rc:5004
+#: Merge.rc:5014
msgid "No Prediffer (Normal)"
msgstr "Geen voorvergelijking (normaal)"
#. IDS_SUGGESTED_PLUGINS
-#: Merge.rc:5005
+#: Merge.rc:5015
msgid "Suggested Plugins"
msgstr "Voorgestelde plugins"
#. IDS_NOT_SUGGESTED_PLUGINS
-#: Merge.rc:5006
+#: Merge.rc:5016
msgid "All Plugins"
msgstr "Alle plugins"
#. IDS_PRIVATEBUILD_FMT
-#: Merge.rc:5012
+#: Merge.rc:5022
#, c-format
msgid "Private Build: %1"
msgstr "Privé-buld: %1"
#. IDS_CHECKFORUPDATES_UPTODATE
-#: Merge.rc:5013
+#: Merge.rc:5023
msgid "Your software is up to date."
msgstr "Uw software is bijgewerkt."
-#: Merge.rc:5015
+#: Merge.rc:5025
#, c-format
msgid ""
"WinMerge update available.\n"
@@ -7420,126 +7431,126 @@ msgstr ""
"%1 is nu beschikbaar (u heeft %2). Wilt u het nu downloaden?"
#. IDS_ALLRIGHTS_RESERVED
-#: Merge.rc:5016
+#: Merge.rc:5026
msgid " - All rights reserved."
msgstr ""
#. IDS_CHECKFORUPDATES_FAILED
-#: Merge.rc:5021
+#: Merge.rc:5031
msgid "Failed to download latest version information"
msgstr "Downloaden van laatste versie-informatie mislukt"
#. IDS_TITLE_PLUGINS_SETTINGS
-#: Merge.rc:5027
+#: Merge.rc:5037
msgid "Plugin Settings"
msgstr "Plugin-instellingen"
#. IDS_NO_SCT_SCRIPTS
-#: Merge.rc:5029
+#: Merge.rc:5039
msgid "WSH not found - .sct scripts disabled"
msgstr "WSH niet gevonden - .sct scripts uitgeschakeld"
#. IDS_LOCBAR_GOTOLINE_FMT
-#: Merge.rc:5037
+#: Merge.rc:5047
#, c-format
msgid "G&o to Line %1"
msgstr "Naar regel %1 gaan"
#. IDS_GOTO_MOVED_LINE
-#: Merge.rc:5043
+#: Merge.rc:5053
msgid "Go to Moved Line\tCtrl+Shift+G"
msgstr "Naar verplaatste regel gaan\tCtrl+Shift+G"
#. IDS_AUTOCOMPLETE_DISABLED
-#: Merge.rc:5049
+#: Merge.rc:5059
msgctxt "Options dialog|General|Open dialog Auto completion"
msgid "Disabled"
msgstr ""
#. IDS_AUTOCOMPLETE_FILE_SYS
-#: Merge.rc:5050
+#: Merge.rc:5060
msgid "From file system"
msgstr "Van bestandssysteem"
#. IDS_AUTOCOMPLETE_MRU
-#: Merge.rc:5051
+#: Merge.rc:5061
msgid "From Most Recently Used list"
msgstr "Uit lijst van recent gebruikt"
#. IDS_COLORSCHEME_PLAIN
-#: Merge.rc:5057
+#: Merge.rc:5067
msgid "No Highlighting"
msgstr "Geen markering"
#. IDS_COLORSCHEME_BATCH
-#: Merge.rc:5063
+#: Merge.rc:5073
msgid "Batch"
msgstr "Batch"
#. IDS_COLORSCHEME_PO
-#: Merge.rc:5090
+#: Merge.rc:5100
msgid "Portable Object"
msgstr "Portable object"
#. IDS_COLORSCHEME_RSRC
-#: Merge.rc:5094
+#: Merge.rc:5104
msgid "Resources"
msgstr "Bronnen"
#. IDS_COLORSCHEME_SH
-#: Merge.rc:5098
+#: Merge.rc:5108
msgid "Shell"
msgstr "Shell"
#. IDS_CLOSE_LEFT_TABS
-#: Merge.rc:5115
+#: Merge.rc:5125
msgid "Close &Left Tabs"
msgstr "Linker tabs sluiten"
#. IDS_CLOSE_RIGHT_TABS
-#: Merge.rc:5116
+#: Merge.rc:5126
msgid "Close R&ight Tabs"
msgstr "Rechter tabs sluiten"
#. IDS_CLOSE_OTHER_TABS
-#: Merge.rc:5117
+#: Merge.rc:5127
msgid "Close &Other Tabs"
msgstr "Andere tabs sluiten"
#. IDS_TABBAR_AUTO_MAXWIDTH
-#: Merge.rc:5118
+#: Merge.rc:5128
msgid "Enable &Auto Max Width"
msgstr "Automatische maximale breedte inschakelen"
#. IDS_WEBPAGE_MENU
-#: Merge.rc:5128
+#: Merge.rc:5138
msgid "We&bpage"
msgstr "Webpagina"
#. IDS_VIEW_WRAP_TEXT
-#: Merge.rc:5133
+#: Merge.rc:5143
msgid "W&rap Text"
msgstr "Tekstterugloop"
#. IDS_NOTINSTALLED
-#: Merge.rc:5138
+#: Merge.rc:5148
#, c-format
msgid "%1 is not installed."
msgstr "%1 is niet geïnstalleerd."
#. IDS_CREATE_FOLDER
-#: Merge.rc:5143
+#: Merge.rc:5153
#, c-format
msgid "%1 does not exist. Create it?"
msgstr "%1 bestaat niet. Wilt u het aanmaken?"
#. IDS_CREATE_FOLDER_ERROR
-#: Merge.rc:5144
+#: Merge.rc:5154
msgid "Failed to create folder."
msgstr "Map aanmaken mislukt."
#. IDC_EXT_EDITOR_PATH
-#: Merge.rc:5149
+#: Merge.rc:5159
msgid ""
"Parameters:\n"
"$file: Current file path\n"
@@ -7550,488 +7561,488 @@ msgstr ""
"$linenum: regelnummer van de huidige cursorpositie"
#. IDS_DIFF_ALGORITHM_DEFAULT
-#: Merge.rc:5154
+#: Merge.rc:5164
msgid "default"
msgstr "standaard"
#. IDS_DIFF_ALGORITHM_MINIMAL
-#: Merge.rc:5155
+#: Merge.rc:5165
msgid "minimal"
msgstr "minimaal"
#. IDS_DIFF_ALGORITHM_PATIENCE
-#: Merge.rc:5156
+#: Merge.rc:5166
msgid "patience"
msgstr "geduld"
#. IDS_DIFF_ALGORITHM_HISTOGRAM
-#: Merge.rc:5157
+#: Merge.rc:5167
msgid "histogram"
msgstr "histogram"
#. IDS_DIFF_ALGORITHM_NONE
-#: Merge.rc:5158
+#: Merge.rc:5168
msgid "none"
msgstr "geen"
#. IDS_RENDERING_MODE_GDI
-#: Merge.rc:5163
+#: Merge.rc:5173
msgid "GDI"
msgstr "GDI"
#. IDS_RENDERING_MODE_DIRECTWRITE_DEFAULT
-#: Merge.rc:5164
+#: Merge.rc:5174
msgid "DirectWrite Default"
msgstr "DirectWrite standaard"
#. IDS_RENDERING_MODE_DIRECTWRITE_ALIASED
-#: Merge.rc:5165
+#: Merge.rc:5175
msgid "DirectWrite Aliased"
msgstr "DirectWrite aliased"
#. IDS_RENDERING_MODE_DIRECTWRITE_GDI_CLASSIC
-#: Merge.rc:5166
+#: Merge.rc:5176
msgid "DirectWrite GDI Classic"
msgstr "DirectWrite GDI Classic"
#. IDS_RENDERING_MODE_DIRECTWRITE_GDI_NATURAL
-#: Merge.rc:5167
+#: Merge.rc:5177
msgid "DirectWrite GDI Natural"
msgstr "DirectWrite GDI Natural"
#. IDS_RENDERING_MODE_DIRECTWRITE_NATURAL
-#: Merge.rc:5168
+#: Merge.rc:5178
msgid "DirectWrite Natural"
msgstr "DirectWrite Natural"
#. IDS_RENDERING_MODE_DIRECTWRITE_NATURAL_SYMMETRIC
-#: Merge.rc:5169
+#: Merge.rc:5179
msgid "DirectWrite Natural Symmetric"
msgstr "DirectWrite Natural Symmetric"
#. IDS_CLOSE_WINDOWS_WITH_ESC_DISABLED
-#: Merge.rc:5174
+#: Merge.rc:5184
msgctxt "Options dialog|General|Close windows with Esc"
msgid "Disabled"
msgstr ""
#. IDS_CLOSE_WINDOWS_WITH_ESC_1
-#: Merge.rc:5175
+#: Merge.rc:5185
msgid "MDI child window or main window"
msgstr "MDI-dochtervenster of hoofdvenster"
#. IDS_CLOSE_WINDOWS_WITH_ESC_2
-#: Merge.rc:5176
+#: Merge.rc:5186
msgid "MDI child window only"
msgstr "Alleen MDI-dochtervenster"
#. IDS_CLOSE_WINDOWS_WITH_ESC_3
-#: Merge.rc:5177
+#: Merge.rc:5187
msgid "Close main window if only one MDI child window"
msgstr "Hoofdvenster sluiten als er slechts één MDI-dochtervenster is"
#. IDS_DIFF_GROUP
-#: Merge.rc:5182
+#: Merge.rc:5192
msgctxt "ImgMergeFrame|LocationPane"
msgid "Diff"
msgstr "Verschil"
#. IDS_DIFF_HIGHLIGHT
-#: Merge.rc:5183
+#: Merge.rc:5193
msgctxt "ImgMergeFrame|LocationPane"
msgid "Highlight"
msgstr "Markeren"
#. IDS_DIFF_BLINK
-#: Merge.rc:5184
+#: Merge.rc:5194
msgctxt "ImgMergeFrame|LocationPane"
msgid "Blink"
msgstr "Knipperen"
#. IDS_DIFF_BLOCKSIZE
-#: Merge.rc:5185
+#: Merge.rc:5195
msgctxt "ImgMergeFrame|LocationPane"
msgid "Block Size"
msgstr "Blokgrootte"
#. IDS_DIFF_BLOCKALPHA
-#: Merge.rc:5186
+#: Merge.rc:5196
msgctxt "ImgMergeFrame|LocationPane"
msgid "Block Alpha"
msgstr "Alpha van blok"
#. IDS_DIFF_CDTHRESHOLD
-#: Merge.rc:5187
+#: Merge.rc:5197
msgctxt "ImgMergeFrame|LocationPane"
msgid "CD Threshold"
msgstr "CD-drempel"
#. IDS_DIFF_INSERTION_DELETION_DETECTION
-#: Merge.rc:5188
+#: Merge.rc:5198
msgctxt "ImgMergeFrame|LocationPane"
msgid "Ins/Del Detection"
msgstr "Ins/Del-detectie"
#. IDS_OVERLAY_MODE_NONE
-#: Merge.rc:5189 Merge.rc:5194
+#: Merge.rc:5199 Merge.rc:5204
msgctxt "ImgMergeFrame|LocationPane"
msgid "None"
msgstr "Geen"
#. IDS_DIFF_INSERTION_DELETION_DETECTION_VERTICAL
-#: Merge.rc:5190
+#: Merge.rc:5200
msgctxt "ImgMergeFrame|LocationPane"
msgid "Vertical"
msgstr "Verticaal"
#. IDS_DIFF_INSERTION_DELETION_DETECTION_HORIZONTAL
-#: Merge.rc:5191
+#: Merge.rc:5201
msgctxt "ImgMergeFrame|LocationPane"
msgid "Horizontal"
msgstr "Horizontaal"
#. IDS_OVERLAY_GROUP
-#: Merge.rc:5192
+#: Merge.rc:5202
msgctxt "ImgMergeFrame|LocationPane"
msgid "Overlay"
msgstr "Overlay"
#. IDS_OVERLAY_ALPHA
-#: Merge.rc:5193
+#: Merge.rc:5203
msgctxt "ImgMergeFrame|LocationPane"
msgid "Alpha"
msgstr "Alpha"
#. IDS_OVERLAY_MODE_XOR
-#: Merge.rc:5195
+#: Merge.rc:5205
msgctxt "ImgMergeFrame|LocationPane"
msgid "XOR"
msgstr "XOR"
#. IDS_OVERLAY_MODE_ALPHA
-#: Merge.rc:5196
+#: Merge.rc:5206
msgctxt "ImgMergeFrame|LocationPane"
msgid "Alpha Blend"
msgstr "Alfa-blend"
#. IDS_OVERLAY_MODE_ALPHA_ANIMATION
-#: Merge.rc:5197
+#: Merge.rc:5207
msgctxt "ImgMergeFrame|LocationPane"
msgid "Alpha Animation"
msgstr "Alfa-animatie"
#. IDS_ZOOM
-#: Merge.rc:5198
+#: Merge.rc:5208
msgctxt "ImgMergeFrame|LocationPane"
msgid "Zoom"
msgstr "Zoomen"
#. IDS_PAGE
-#: Merge.rc:5199
+#: Merge.rc:5209
msgctxt "ImgMergeFrame|LocationPane"
msgid "Page:"
msgstr "Pagina:"
#. IDS_IMGCMP_STATUS_PT_RGBA_FMT
-#: Merge.rc:5200
+#: Merge.rc:5210
#, c-format
msgid "Pt: (%d, %d) RGBA: (%d, %d, %d, %d) "
msgstr "Pt: (%d, %d) RGBA: (%d, %d, %d, %d) "
#. IDS_IMGCMP_STATUS_DIST1_FMT
-#: Merge.rc:5201
+#: Merge.rc:5211
#, c-format
msgid "Dist: %g "
msgstr "Afstand: %g "
#. IDS_IMGCMP_STATUS_DIST2_FMT
-#: Merge.rc:5202
+#: Merge.rc:5212
#, c-format
msgid "Dist: %g, %g "
msgstr "Afstand: %g, %g "
#. IDS_IMGCMP_STATUS_PAGE_ZOOM_SIZE_BPP_FMT
-#: Merge.rc:5203
+#: Merge.rc:5213
#, c-format
msgid "Page: %d/%d Zoom: %d%% %dx%dpx %dbpp "
msgstr "Pagina: %d/%d Zoom: %d %% %dx%d px %d bpp "
#. IDS_IMGCMP_STATUS_RC_FMT
-#: Merge.rc:5204
+#: Merge.rc:5214
#, c-format
msgid "Rc: (%d, %d) "
msgstr "Rc: (%d, %d) "
#. IDS_IMGCMP_STATUS_FLIPPED_FMT
-#: Merge.rc:5205
+#: Merge.rc:5215
#, c-format
msgid "Flipped: %s "
msgstr "Omgedraaid: %s "
#. IDS_IMGCMP_STATUS_ROTATED_FMT
-#: Merge.rc:5206
+#: Merge.rc:5216
#, c-format
msgid "Rotated: %d "
msgstr "Geroteerd: %d "
#. IDS_IMGCMP_REPORT_ALLPAGES
-#: Merge.rc:5207
+#: Merge.rc:5217
msgid "All pages"
msgstr "Alle pagina's"
#. IDS_IGNSUB_STR1
-#: Merge.rc:5212
+#: Merge.rc:5222
msgid ""
msgstr ""
#. IDS_IGNSUB_STR2
-#: Merge.rc:5213
+#: Merge.rc:5223
msgid "No differences found to select"
msgstr "Geen verschillen gevonden om te selecteren"
#. IDS_IGNSUB_STR3
-#: Merge.rc:5214
+#: Merge.rc:5224
msgid "No differences found to add as substitution filter"
msgstr "Geen verschillen gevonden om toe te voegen als vervangingsfilter"
#. IDS_IGNSUB_STR4
-#: Merge.rc:5215
+#: Merge.rc:5225
msgid "The pair is already in the Substitution Filters list"
msgstr "Dit paar is al aanwezig in de lijst van vervangingsfilters"
#. IDS_IGNSUB_STR5
-#: Merge.rc:5216
+#: Merge.rc:5226
msgid "Add this change to Substitution Filters?"
msgstr "Deze wijziging aan vervangingsfilters toevoegen?"
#. IDS_OCRRESULT_TEXTONLY
-#: Merge.rc:5221
+#: Merge.rc:5231
msgid "Text only"
msgstr "Alleen tekst"
#. IDS_OCRRESULT_POS_LINE
-#: Merge.rc:5222
+#: Merge.rc:5232
msgid "Line-by-line position and text"
msgstr "Positie en tekst regel per regel"
#. IDS_OCRRESULT_POS_WORD
-#: Merge.rc:5223
+#: Merge.rc:5233
msgid "Word-by-word position and text"
msgstr "Positie en tekst woord voor woord"
#. IDS_USERDATAFOLDER_APPDATA
-#: Merge.rc:5228
+#: Merge.rc:5238
msgid "AppData (Roaming) folder"
msgstr ""
#. IDS_USERDATAFOLDER_INSTALL
-#: Merge.rc:5229
+#: Merge.rc:5239
msgid "Install folder"
msgstr "Installatiemap"
#. IDS_USERDATAFOLDER_DOCUMENTS
-#: Merge.rc:5230
+#: Merge.rc:5240
msgid "Documents folder"
msgstr ""
#. IDS_SINGLEINSTANCE_DISABLED
-#: Merge.rc:5235
+#: Merge.rc:5245
msgctxt "Options dialog|General|Single instance mode"
msgid "Disabled"
msgstr ""
#. IDS_SINGLEINSTANCE_STR1
-#: Merge.rc:5236
+#: Merge.rc:5246
msgid "Allow only one instance to run"
msgstr "Slechts één draaiende instantie toestaan"
#. IDS_SINGLEINSTANCE_STR2
-#: Merge.rc:5237
+#: Merge.rc:5247
msgid "Allow only one instance; wait for termination"
msgstr ""
"Slechts één draaiende instantie toestaan en wachten totdat de instantie "
"beëindigd is"
#. IDS_AUTO_RELOAD_MODIFIED_FILES_DISABLED
-#: Merge.rc:5242
+#: Merge.rc:5252
msgctxt "Options dialog|General|Auto-reload modified files"
msgid "Disabled"
msgstr ""
#. IDS_AUTO_RELOAD_MODIFIED_FILES_STR1
-#: Merge.rc:5243
+#: Merge.rc:5253
msgid "Only on window activated"
msgstr "Alleen wanneer venster geactiveerd wordt"
#. IDS_AUTO_RELOAD_MODIFIED_FILES_STR2
-#: Merge.rc:5244
+#: Merge.rc:5254
msgid "Immediately"
msgstr "Onmiddellijk"
#. IDS_PLUGIN_ALL
-#: Merge.rc:5249
+#: Merge.rc:5259
msgid "Al&l"
msgstr "Alles"
#. IDS_PLUGIN_OTHERS
-#: Merge.rc:5250
+#: Merge.rc:5260
msgid "&Others"
msgstr "Andere"
-#: Merge.rc:5252
+#: Merge.rc:5262
#, c-format
msgid "Missing plugin name in pipeline: %1"
msgstr "Ontbrekende pluginnaam of plugin-pipeline: %1"
-#: Merge.rc:5254
+#: Merge.rc:5264
#, c-format
msgid "Missing quote in plugin pipeline: %1"
msgstr "Ontbrekend aanhalingsteken in plugin-pipeline: %1"
#. IDS_PLUGIN_NAME_ALREADY_EXISTS
-#: Merge.rc:5255
+#: Merge.rc:5265
#, c-format
msgid "Plugin name '%1' already exists."
msgstr "Pluginnaam '%1' bestaat al."
#. IDS_PLUGIN_TITLE1
-#: Merge.rc:5256
+#: Merge.rc:5266
msgid "Specify plugin arguments"
msgstr "Plugin-argumenten opgeven"
-#: Merge.rc:5258
+#: Merge.rc:5268
#, c-format
msgid "Plugin not found or invalid: %1"
msgstr "Plugin niet gevonden of ongeldig: %1"
#. IDS_PLUGIN_NOT_UNPACK
-#: Merge.rc:5259
+#: Merge.rc:5269
#, c-format
msgid "'%1' is not an unpacker plugin"
msgstr "'%1' is geen uitpak-plugin"
#. IDS_PLUGIN_NOT_PREDIFF
-#: Merge.rc:5260
+#: Merge.rc:5270
#, c-format
msgid "'%1' is not a prediffer plugin"
msgstr "'%1' is geen voorvergelijking-plugin"
-#: Merge.rc:5262
+#: Merge.rc:5272
#, c-format
msgid "Error prediffing '%1' with '%2'. Prediffing disabled."
msgstr ""
#. IDS_PLUGIN_CIRCULAR_REFERENCE
-#: Merge.rc:5263
+#: Merge.rc:5273
#, c-format
msgid "Circular reference in plugin pipeline: %1"
msgstr "Circulaire referentie in plugin-pijplijn: %1"
#. IDS_PLUGIN_TYPE1
-#: Merge.rc:5264
+#: Merge.rc:5274
msgid "URL Handler"
msgstr "URL-handler"
#. IDS_PLUGIN_TYPE2
-#: Merge.rc:5265
+#: Merge.rc:5275
msgid "File Unpacker"
msgstr "Bestandsuitpakker:"
#. IDS_PLUGIN_TYPE3
-#: Merge.rc:5266
+#: Merge.rc:5276
msgid "File or Folder Unpacker"
msgstr "Bestands- of mapuitpakker"
#. IDS_PLUGIN_TYPE5
-#: Merge.rc:5268
+#: Merge.rc:5278
msgid "Alias for Unpacker"
msgstr "Alias voor uitpakker"
#. IDS_PLUGIN_TYPE6
-#: Merge.rc:5269
+#: Merge.rc:5279
msgid "Alias for Prediffer"
msgstr "Alias voor voorvergelijking"
#. IDS_PLUGIN_TYPE7
-#: Merge.rc:5270
+#: Merge.rc:5280
msgid "Alias for Editor script"
msgstr "Alias voor editor-script"
#. IDS_PLUGIN_ALIAS_DESC
-#: Merge.rc:5271
+#: Merge.rc:5281
#, c-format
msgid "Alias for plugin pipeline '%1'"
msgstr "Alias voor plugin-pijplijn '%1'"
#. IDS_PLUGIN_NEW_DESC
-#: Merge.rc:5272
+#: Merge.rc:5282
msgid "New plugin description"
msgstr "Beschrijving nieuwe plugin"
#. IDS_PLUGIN_TARGETS_ALL
-#: Merge.rc:5273
+#: Merge.rc:5283
msgid "All"
msgstr ""
#. IDS_PLUGIN_TARGETS_1ST
-#: Merge.rc:5274
+#: Merge.rc:5284
msgid "1st"
msgstr ""
#. IDS_PLUGIN_TARGETS_2ND
-#: Merge.rc:5275
+#: Merge.rc:5285
msgid "2nd"
msgstr ""
#. IDS_PLUGIN_TARGETS_3RD
-#: Merge.rc:5276
+#: Merge.rc:5286
msgid "3rd"
msgstr ""
#. IDS_PLUGIN_TARGETS_1ST_2ND
-#: Merge.rc:5277
+#: Merge.rc:5287
msgid "1st and 2nd"
msgstr ""
#. IDS_PLUGIN_TARGETS_1ST_3RD
-#: Merge.rc:5278
+#: Merge.rc:5288
msgid "1st and 3rd"
msgstr ""
#. IDS_PLUGIN_TARGETS_2ND_3RD
-#: Merge.rc:5279
+#: Merge.rc:5289
msgid "2nd and 3rd"
msgstr ""
#. IDS_FILTER_APPLIED
-#: Merge.rc:5284
+#: Merge.rc:5294
msgid "Filter applied"
msgstr "Filter toegepast"
#. IDS_FILTERMENU_COMPARE
-#: Merge.rc:5289
+#: Merge.rc:5299
#, c-format
msgid "Compare %1"
msgstr ""
#. IDS_FILTERMENU_FILTER_BY_THIS_COLUMN
-#: Merge.rc:5290
+#: Merge.rc:5300
msgid "&Filter by This Column"
msgstr ""
#. IDS_FILTERMENU_FILTER_BY_THIS_COLUMN2
-#: Merge.rc:5291
+#: Merge.rc:5301
msgid "&Filter by This Column..."
msgstr ""
#. IDS_CLIPBOARDHISTORY_TIME
-#: Merge.rc:5296
+#: Merge.rc:5306
#, c-format
msgid "Clipboard at %s"
msgstr "Klembord op %s"
#. IDS_CLIPBOARDHISTORY_DISABLED
-#: Merge.rc:5297
+#: Merge.rc:5307
msgid ""
"Clipboard history disabled.\r\n"
"Enable: Windows logo key + V, then Turn on."
@@ -8039,110 +8050,115 @@ msgstr ""
"De klembordgeschiedenis is uitgeschakeld.\n"
"Om de klembordgeschiedenis in te schakelen, drukt u op de Windows-logotoets + V en klikt u vervolgens op de knop Inschakelen."
-#: Merge.rc:5299
+#: Merge.rc:5309
msgid "This system does not support clipboard history."
msgstr "Dit systeem ondersteunt geen klembordgeschiedenis."
-#: Merge.rc:5301
+#: Merge.rc:5311
msgid "32-bit WinMerge does not support Clipboard Compare"
msgstr "De 32-bit-versie van WinMerge ondersteunt geen klembordvergelijking"
#. IDS_WEBVIEW2_RUNTIME_NOT_INSTALLED
-#: Merge.rc:5306
+#: Merge.rc:5316
msgid "WebView2 runtime not installed. Download it?"
msgstr "WebView2-runtime is niet geïnstalleerd. Wilt u het downloaden?"
#. IDS_JUMPLIST_NEW_TEXT_COMPARE
-#: Merge.rc:5311
+#: Merge.rc:5321
msgid "New Text Compare"
msgstr "Nieuwe tekstvergelijking"
#. IDS_JUMPLIST_NEW_TABLE_COMPARE
-#: Merge.rc:5312
+#: Merge.rc:5322
msgid "New Table Compare"
msgstr "Nieuwe tabelvergelijking"
#. IDS_JUMPLIST_NEW_BINARY_COMPARE
-#: Merge.rc:5313
+#: Merge.rc:5323
msgid "New Binary Compare"
msgstr "Nieuwe binaire vergelijking"
#. IDS_JUMPLIST_NEW_IMAGE_COMPARE
-#: Merge.rc:5314
+#: Merge.rc:5324
msgid "New Image Compare"
msgstr "Nieuwe afbeeldingsvergelijking"
#. IDS_JUMPLIST_NEW_WEBPAGE_COMPARE
-#: Merge.rc:5315
+#: Merge.rc:5325
msgid "New Webpage Compare"
msgstr "Nieuwe webpagina-vergelijking"
+#. IDS_JUMPLIST_NEW_FOLDER_COMPARE
+#: Merge.rc:5326
+msgid "New Folder Compare"
+msgstr ""
+
#. IDS_JUMPLIST_CLIPBOARD_COMPARE
-#: Merge.rc:5316
+#: Merge.rc:5327
msgid "Clipboard Compare"
msgstr "Klembordvergelijking"
#. IDS_PREVIEWBAR_PRINT
-#: Merge.rc:5321
+#: Merge.rc:5332
msgid "&Print..."
msgstr "Afdrukken..."
#. IDS_PREVIEWBAR_PREVPAGE
-#: Merge.rc:5323
+#: Merge.rc:5334
msgid "Pre&v Page"
msgstr "Vorige pagina"
#. IDS_PREVIEWBAR_TWOPAGE
-#: Merge.rc:5324
+#: Merge.rc:5335
msgid "&Two Page"
msgstr "Twee pagina's"
#. IDS_PREVIEWBAR_ONEPAGE
-#: Merge.rc:5325
+#: Merge.rc:5336
msgid "&One Page"
msgstr "Eén pagina"
#. IDS_PREVIEWBAR_ZOOMIN
-#: Merge.rc:5326
+#: Merge.rc:5337
msgid "Zoom &In"
msgstr "Inzoomen"
#. IDS_PREVIEWBAR_ZOOMOUT
-#: Merge.rc:5327
+#: Merge.rc:5338
msgid "Zoom &Out"
msgstr "Uitzoomen"
#. IDS_WEBPAGE_COMPARING
-#: Merge.rc:5333
+#: Merge.rc:5344
msgid "Comparing..."
msgstr "Vergelijken..."
#. IDS_WEBPAGE_ZOOM
-#: Merge.rc:5334
+#: Merge.rc:5345
msgid "Zoom:"
msgstr "Zoomen:"
#. IDS_COPY_GRANULARITY_DIFFHUNK
-#: Merge.rc:5339
+#: Merge.rc:5350
msgid "Diff hunk"
msgstr "Verschil-hunk"
#. IDS_COPY_GRANULARITY_INLINE
-#: Merge.rc:5340
+#: Merge.rc:5351
msgid "Inline diff"
msgstr "Inline-verschil"
#. IDS_COPY_GRANULARITY_LINE
-#: Merge.rc:5341
+#: Merge.rc:5352
msgid "Line"
msgstr "Regel"
-#: Merge.rc:5342
+#: Merge.rc:5353
msgid "Character"
msgstr "Teken"
#. ID_MICE_PREVDIFF
-#: Merge.rc:5347
+#: Merge.rc:5358
msgid ""
"\n"
"Previous Difference (Alt+Up)\n"
@@ -8155,7 +8171,7 @@ msgstr ""
"(Alt+Wiel omhoog)"
#. ID_MICE_NEXTDIFF
-#: Merge.rc:5348
+#: Merge.rc:5359
msgid ""
"\n"
"Next Difference (Alt+Down)\n"
@@ -8168,7 +8184,7 @@ msgstr ""
"(Alt+Wiel omlaag)"
#. ID_MICE_L2R
-#: Merge.rc:5349
+#: Merge.rc:5360
msgid ""
"\n"
"Copy to Right (Alt+Right)\n"
@@ -8183,7 +8199,7 @@ msgstr ""
"(Alt+Shift+Wiel omlaag)"
#. ID_MICE_R2L
-#: Merge.rc:5350
+#: Merge.rc:5361
msgid ""
"\n"
"Copy to Left (Alt+Left)\n"
@@ -8198,7 +8214,7 @@ msgstr ""
"(Alt+Shift+Wiel omhoog)"
#. ID_MICE_L2RNEXT
-#: Merge.rc:5351
+#: Merge.rc:5362
msgid ""
"\n"
"Copy to Right and Advance (Ctrl+Alt+Right)\n"
@@ -8211,7 +8227,7 @@ msgstr ""
"(Ctrl+Alt+Shift+Wiel omlaag)"
#. ID_MICE_R2LNEXT
-#: Merge.rc:5352
+#: Merge.rc:5363
msgid ""
"\n"
"Copy to Left and Advance (Ctrl+Alt+Left)\n"
@@ -8224,262 +8240,262 @@ msgstr ""
"(Ctrl+Alt+Shift+Wiel omhoog)"
#. IDS_LOG_COMPARING_2
-#: Merge.rc:5362
+#: Merge.rc:5373
#, c-format
msgid "Comparing %1 with %2"
msgstr ""
#. IDS_LOG_COMPARING_3
-#: Merge.rc:5363
+#: Merge.rc:5374
#, c-format
msgid "Comparing %1 with %2 and %3"
msgstr ""
#. IDS_LOG_COMPARE_COMPLETED
-#: Merge.rc:5364
+#: Merge.rc:5375
msgid "Comparison completed"
msgstr ""
#. IDS_LOG_COMPARE_ERROR_2
-#: Merge.rc:5365
+#: Merge.rc:5376
#, c-format
msgid "Failed to compare %1 with %2: "
msgstr ""
#. IDS_LOG_COMPARE_ERROR_3
-#: Merge.rc:5366
+#: Merge.rc:5377
#, c-format
msgid "Failed to compare %1 with %2 and %3: "
msgstr ""
#. IDS_LOG_FILE_SAVED
-#: Merge.rc:5367
+#: Merge.rc:5378
msgid "File saved"
msgstr ""
#. IDS_LOG_COPYING_FILES
-#: Merge.rc:5368
+#: Merge.rc:5379
msgid "Copying files..."
msgstr ""
#. IDS_LOG_MOVING_FILES
-#: Merge.rc:5369
+#: Merge.rc:5380
msgid "Moving files..."
msgstr ""
#. IDS_LOG_DELETING_FILES
-#: Merge.rc:5370
+#: Merge.rc:5381
msgid "Deleting files..."
msgstr ""
#. IDS_LOG_RECYCLEBIN
-#: Merge.rc:5371
+#: Merge.rc:5382
msgid "Recycle Bin"
msgstr ""
#. IDS_LOG_PERMANENTLY_DELETED
-#: Merge.rc:5372
+#: Merge.rc:5383
msgid "Permanently deleted"
msgstr ""
#. IDS_LOG_FILEOPERATION_COMPLETED
-#: Merge.rc:5373
+#: Merge.rc:5384
msgid "File operation completed successfully"
msgstr ""
#. IDS_LOG_FILEOPERATION_CANCELED
-#: Merge.rc:5374
+#: Merge.rc:5385
msgid "File operation canceled"
msgstr ""
#. IDS_FILTER_ERROR_NO_ERROR
-#: Merge.rc:5379
+#: Merge.rc:5390
msgid "No error"
msgstr ""
#. IDS_FILTER_ERROR_EMPTY_EXPRESSION
-#: Merge.rc:5380
+#: Merge.rc:5391
msgid "Filter expression is empty"
msgstr ""
#. IDS_FILTER_ERROR_UNKNOWN_CHAR
-#: Merge.rc:5381
+#: Merge.rc:5392
msgid "Unknown character in filter expression"
msgstr ""
#. IDS_FILTER_ERROR_UNTERMINATED_STRING
-#: Merge.rc:5382
+#: Merge.rc:5393
msgid "Unterminated string literal"
msgstr ""
#. IDS_FILTER_ERROR_SYNTAX_ERROR
-#: Merge.rc:5383
+#: Merge.rc:5394
msgid "Syntax error in filter expression"
msgstr ""
#. IDS_FILTER_ERROR_PARSE_FAILURE
-#: Merge.rc:5384
+#: Merge.rc:5395
msgid "Failed to parse filter expression"
msgstr ""
#. IDS_FILTER_ERROR_INVALID_LITERAL
-#: Merge.rc:5385
+#: Merge.rc:5396
msgid "Invalid literal value"
msgstr ""
#. IDS_FILTER_ERROR_INVALID_REGULAR_EXPRESSION
-#: Merge.rc:5386
+#: Merge.rc:5397
msgid "Invalid regular expression"
msgstr ""
#. IDS_FILTER_ERROR_UNDEFINED_IDENTIFIER
-#: Merge.rc:5387
+#: Merge.rc:5398
msgid "Undefined identifier"
msgstr ""
#. IDS_FILTER_ERROR_INVALID_ARGUMENT_COUNT
-#: Merge.rc:5388
+#: Merge.rc:5399
msgid "Invalid number of arguments"
msgstr ""
#. IDS_FILTER_ERROR_FILTER_NAME_NOT_FOUND
-#: Merge.rc:5389
+#: Merge.rc:5400
msgid "Filter name not found"
msgstr ""
#. IDS_FILTER_ERROR_DIVIDE_BY_ZERO
-#: Merge.rc:5390
+#: Merge.rc:5401
msgid "Division by zero in filter expression"
msgstr ""
#. IDS_FILTER_ERROR_UNKNOWN_ERROR
-#: Merge.rc:5391
+#: Merge.rc:5402
msgid "Unknown error"
msgstr ""
#. IDS_FILTER_ERROR_INVALID_PROPERTY_NAME
-#: Merge.rc:5392
+#: Merge.rc:5403
msgid "Invalid property name"
msgstr ""
#. IDS_FILTER_ERROR_INVALID_DIRECTIVE
-#: Merge.rc:5393
+#: Merge.rc:5404
msgid "Invalid directive"
msgstr ""
#. IDS_FILTER_OP_EQUALS
-#: Merge.rc:5398
+#: Merge.rc:5409
msgid "Equals"
msgstr ""
#. IDS_FILTER_OP_NOT_EQUALS
-#: Merge.rc:5399
+#: Merge.rc:5410
msgid "Does not equal"
msgstr ""
#. IDS_FILTER_OP_LESS_THAN
-#: Merge.rc:5400
+#: Merge.rc:5411
msgid "Less than"
msgstr ""
#. IDS_FILTER_OP_LESS_EQUAL
-#: Merge.rc:5401
+#: Merge.rc:5412
msgid "Less than or equal to"
msgstr ""
#. IDS_FILTER_OP_GREATER_EQUAL
-#: Merge.rc:5402
+#: Merge.rc:5413
msgid "Greater than or equal to"
msgstr ""
#. IDS_FILTER_OP_GREATER_THAN
-#: Merge.rc:5403
+#: Merge.rc:5414
msgid "Greater than"
msgstr ""
#. IDS_FILTER_OP_BETWEEN
-#: Merge.rc:5404
+#: Merge.rc:5415
msgid "Between"
msgstr ""
#. IDS_FILTER_OP_NOT_BETWEEN
-#: Merge.rc:5405
+#: Merge.rc:5416
msgid "Not Between"
msgstr ""
#. IDS_FILTER_OP_CONTAINS
-#: Merge.rc:5406
+#: Merge.rc:5417
msgid "Contains"
msgstr ""
#. IDS_FILTER_OP_NOT_CONTAINS
-#: Merge.rc:5407
+#: Merge.rc:5418
msgid "Not Contains"
msgstr ""
#. IDS_FILTER_OP_RECONTAINS
-#: Merge.rc:5408
+#: Merge.rc:5419
msgid "Contains (regex)"
msgstr ""
#. IDS_FILTER_OP_NOT_RECONTAINS
-#: Merge.rc:5409
+#: Merge.rc:5420
msgid "Not Contains (regex)"
msgstr ""
#. IDS_FILTER_OP_LIKE
-#: Merge.rc:5410
+#: Merge.rc:5421
msgid "Match (wildcard)"
msgstr ""
#. IDS_FILTER_OP_NOT_LIKE
-#: Merge.rc:5411
+#: Merge.rc:5422
msgid "Not match (wildcard)"
msgstr ""
#. IDS_FILTER_OP_MATCHES
-#: Merge.rc:5412
+#: Merge.rc:5423
msgid "Match (regex)"
msgstr ""
#. IDS_FILTER_OP_NOT_MATCHES
-#: Merge.rc:5413
+#: Merge.rc:5424
msgid "Not match (regex)"
msgstr ""
#. IDS_COLORMODE_LIGHT
-#: Merge.rc:5418
+#: Merge.rc:5429
msgid "Light"
msgstr ""
#. IDS_COLORMODE_DARK
-#: Merge.rc:5419
+#: Merge.rc:5430
msgid "Dark"
msgstr ""
#. IDS_COLORMODE_FOLLOWSYSTEM
-#: Merge.rc:5420
+#: Merge.rc:5431
msgid "Follow system"
msgstr ""
#. IDS_EXAMPLE
-#: Merge.rc:5425
+#: Merge.rc:5436
#, c-format
msgid "e.g. %1"
msgstr ""
#. IDS_DETECTED_PREVIOUS_CRASH
-#: Merge.rc:5430
+#: Merge.rc:5441
msgid "WinMerge detected a previous crash. Please report this if possible."
msgstr ""
#. IDS_REGEX_REPLACE_LIST_TEMPLATE
-#: Merge.rc:5435
+#: Merge.rc:5446
msgid "# Regex replacement list\r\n# Format: regexreplacement\r\n# Backreferences like $1, $2 are supported\r\n\r\n(\\d{4})-(\\d{2})-(\\d{2})\t$1_$2_$3\r\n"
msgstr ""
#. IDS_STRING_REPLACE_LIST_TEMPLATE
-#: Merge.rc:5436
+#: Merge.rc:5447
msgid "# Replacement list\r\n# Format: searchreplacement\r\n# Lines starting with # are ignored\r\n\r\nfrom1\tto1\r\nfrom2\tto2\r\n"
msgstr ""
diff --git a/Translations/WinMerge/English.pot b/Translations/WinMerge/English.pot
index 5ad3336fd35..42cd24ab687 100644
--- a/Translations/WinMerge/English.pot
+++ b/Translations/WinMerge/English.pot
@@ -5,7 +5,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WinMerge\n"
"Report-Msgid-Bugs-To: https://github.com/WinMerge/winmerge/issues/\n"
-"POT-Creation-Date: 2026-04-11 17:02+0000\n"
+"POT-Creation-Date: 2026-04-19 18:19+0000\n"
"PO-Revision-Date: \n"
"Last-Translator: \n"
"Language-Team: English \n"
@@ -17,7 +17,7 @@ msgstr ""
"X-Poedit-Basepath: ../../Src/\n"
#. LANGUAGE, SUBLANGUAGE
-#: Merge.rc:26 Merge.rc:59 Merge.rc:5453
+#: Merge.rc:26 Merge.rc:59 Merge.rc:5464
msgid "LANG_ENGLISH, SUBLANG_ENGLISH_US"
msgstr ""
@@ -102,7 +102,7 @@ msgid "Copy Selected Diff (Right) to Clipboard\tCtrl+&3"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_SELECTLINEDIFF
-#: Merge.rc:110 Merge.rc:673
+#: Merge.rc:110 Merge.rc:680
msgid "Select Line &Difference\tF4"
msgstr ""
@@ -132,7 +132,7 @@ msgid "Cu&t"
msgstr ""
#. IDR_POPUP_DIRVIEW
-#: Merge.rc:118 Merge.rc:943
+#: Merge.rc:118 Merge.rc:951
msgid "&Copy"
msgstr ""
@@ -142,19 +142,19 @@ msgid "&Paste"
msgstr ""
#. IDR_MERGEDOCTYPE
-#: Merge.rc:121 Merge.rc:875 Merge.rc:882
+#: Merge.rc:121 Merge.rc:882 Merge.rc:889
msgid "&Scripts"
msgstr ""
#. IDS_NO_EDIT_SCRIPTS
-#: Merge.rc:123 Merge.rc:338 Merge.rc:447 Merge.rc:654 Merge.rc:659
-#: Merge.rc:865 Merge.rc:877 Merge.rc:884 Merge.rc:940 Merge.rc:1183
-#: Merge.rc:5028
+#: Merge.rc:123 Merge.rc:340 Merge.rc:451 Merge.rc:661 Merge.rc:666
+#: Merge.rc:872 Merge.rc:884 Merge.rc:891 Merge.rc:948 Merge.rc:1193
+#: Merge.rc:5038
msgid "< Empty >"
msgstr ""
#. IDR_POPUP_LOCATIONBAR, ID_EDIT_WMGOTO
-#: Merge.rc:126 Merge.rc:691 Merge.rc:1081
+#: Merge.rc:126 Merge.rc:698 Merge.rc:1089
msgid "&Go to...\tCtrl+G"
msgstr ""
@@ -174,27 +174,27 @@ msgid "Op&en"
msgstr ""
#. IDR_POPUP_DIRVIEW, ID_DIR_OPEN_RIGHT
-#: Merge.rc:132 Merge.rc:981 Merge.rc:988 Merge.rc:995
+#: Merge.rc:132 Merge.rc:989 Merge.rc:996 Merge.rc:1003
msgid "With &Registered Application"
msgstr ""
#. IDR_POPUP_DIRVIEW, ID_DIR_OPEN_RIGHT_WITHEDITOR
-#: Merge.rc:133 Merge.rc:982 Merge.rc:989 Merge.rc:996
+#: Merge.rc:133 Merge.rc:990 Merge.rc:997 Merge.rc:1004
msgid "With &External Editor\tCtrl+Alt+E"
msgstr ""
#. IDR_POPUP_DIRVIEW, ID_DIR_OPEN_RIGHT_WITH
-#: Merge.rc:134 Merge.rc:983 Merge.rc:990 Merge.rc:997
+#: Merge.rc:134 Merge.rc:991 Merge.rc:998 Merge.rc:1005
msgid "&With..."
msgstr ""
#. IDR_POPUP_DIRVIEW, ID_DIR_OPEN_RIGHT_PARENT_FOLDER
-#: Merge.rc:135 Merge.rc:984 Merge.rc:991 Merge.rc:998
+#: Merge.rc:135 Merge.rc:992 Merge.rc:999 Merge.rc:1006
msgid "Open &Parent Folder..."
msgstr ""
#. IDR_POPUP_IMG_CTXT, ID_FILE_SHELLMENU
-#: Merge.rc:137 Merge.rc:1239
+#: Merge.rc:137 Merge.rc:1249
msgid "S&hell Menu"
msgstr ""
@@ -229,8 +229,8 @@ msgid "Ins&ertion/Deletion Detection"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_TOOLBAR_NONE
-#: Merge.rc:176 Merge.rc:209 Merge.rc:216 Merge.rc:358 Merge.rc:507
-#: Merge.rc:751
+#: Merge.rc:176 Merge.rc:209 Merge.rc:216 Merge.rc:360 Merge.rc:511
+#: Merge.rc:758
msgid "&None"
msgstr ""
@@ -245,12 +245,12 @@ msgid "&Horizontal"
msgstr ""
#. IDR_POPUP_IMG_CTXT, ID_IMG_CURPANE_PREVPAGE
-#: Merge.rc:181 Merge.rc:189 Merge.rc:1230
+#: Merge.rc:181 Merge.rc:189 Merge.rc:1240
msgid "&Previous Page"
msgstr ""
#. IDS_PREVIEWBAR_NEXTPAGE
-#: Merge.rc:182 Merge.rc:190 Merge.rc:1231 Merge.rc:5322
+#: Merge.rc:182 Merge.rc:190 Merge.rc:1241 Merge.rc:5333
msgid "&Next Page"
msgstr ""
@@ -260,42 +260,42 @@ msgid "&Active Pane"
msgstr ""
#. IDR_POPUP_IMG_CTXT, ID_IMG_CURPANE_ROTATE_RIGHT_90
-#: Merge.rc:185 Merge.rc:1225
+#: Merge.rc:185 Merge.rc:1235
msgid "Rotate &Right 90deg"
msgstr ""
#. IDR_POPUP_IMG_CTXT, ID_IMG_CURPANE_ROTATE_LEFT_90
-#: Merge.rc:186 Merge.rc:1226
+#: Merge.rc:186 Merge.rc:1236
msgid "Rotate &Left 90deg"
msgstr ""
#. IDR_POPUP_IMG_CTXT, ID_IMG_CURPANE_FLIP_VERTICALLY
-#: Merge.rc:187 Merge.rc:1227
+#: Merge.rc:187 Merge.rc:1237
msgid "Flip V&ertically"
msgstr ""
#. IDR_POPUP_IMG_CTXT, ID_IMG_CURPANE_FLIP_HORIZONTALLY
-#: Merge.rc:188 Merge.rc:1228
+#: Merge.rc:188 Merge.rc:1238
msgid "Flip H&orizontally"
msgstr ""
#. IDR_MERGEDOCTYPE
-#: Merge.rc:193 Merge.rc:699
+#: Merge.rc:193 Merge.rc:706
msgid "&Zoom"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_VIEW_ZOOMIN
-#: Merge.rc:202 Merge.rc:701
+#: Merge.rc:202 Merge.rc:708
msgid "Zoom &In\tCtrl++"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_VIEW_ZOOMOUT
-#: Merge.rc:203 Merge.rc:702
+#: Merge.rc:203 Merge.rc:709
msgid "Zoom &Out\tCtrl+-"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_VIEW_ZOOMNORMAL, Zoom to normal
-#: Merge.rc:205 Merge.rc:704
+#: Merge.rc:205 Merge.rc:711
msgid "&Normal\tCtrl+*"
msgstr ""
@@ -320,27 +320,27 @@ msgid "Dragging &Mode"
msgstr ""
#. IDR_POPUP_IMG_CTXT, ID_IMG_DRAGGINGMODE_MOVE
-#: Merge.rc:217 Merge.rc:955 Merge.rc:1233
+#: Merge.rc:217 Merge.rc:963 Merge.rc:1243
msgid "&Move"
msgstr ""
#. IDR_POPUP_IMG_CTXT, ID_IMG_DRAGGINGMODE_ADJUST_OFFSET
-#: Merge.rc:218 Merge.rc:1234
+#: Merge.rc:218 Merge.rc:1244
msgid "&Adjust Offset"
msgstr ""
#. IDR_POPUP_IMG_CTXT, ID_IMG_DRAGGINGMODE_VERTICAL_WIPE
-#: Merge.rc:219 Merge.rc:1235
+#: Merge.rc:219 Merge.rc:1245
msgid "&Vertical Wipe"
msgstr ""
#. IDR_POPUP_IMG_CTXT, ID_IMG_DRAGGINGMODE_HORIZONTAL_WIPE
-#: Merge.rc:220 Merge.rc:1236
+#: Merge.rc:220 Merge.rc:1246
msgid "&Horizontal Wipe"
msgstr ""
#. IDR_POPUP_IMG_CTXT, ID_IMG_DRAGGINGMODE_RECTANGLE_SELECT
-#: Merge.rc:221 Merge.rc:1237
+#: Merge.rc:221 Merge.rc:1247
msgid "Rectangle &Select"
msgstr ""
@@ -375,37 +375,37 @@ msgid "Compare Extracted &Text from Images"
msgstr ""
#. IDD_OPEN, IDOK
-#: Merge.rc:272 Merge.rc:1980
+#: Merge.rc:272 Merge.rc:1990
msgid "Co&mpare"
msgstr ""
#. IDR_POPUP_WEBPAGE_COMPARE, ID_WEB_COMPARE_SCREENSHOTS
-#: Merge.rc:274 Merge.rc:1247
+#: Merge.rc:274 Merge.rc:1257
msgid "&Screenshots"
msgstr ""
#. IDR_POPUP_WEBPAGE_COMPARE, ID_WEB_COMPARE_FULLSIZE_SCREENSHOTS
-#: Merge.rc:275 Merge.rc:1248
+#: Merge.rc:275 Merge.rc:1258
msgid "&Full Size Screenshots"
msgstr ""
#. IDR_POPUP_WEBPAGE_COMPARE, ID_WEB_COMPARE_HTMLS
-#: Merge.rc:276 Merge.rc:1249
+#: Merge.rc:276 Merge.rc:1259
msgid "&HTMLs"
msgstr ""
#. IDR_POPUP_WEBPAGE_COMPARE, ID_WEB_COMPARE_TEXTS
-#: Merge.rc:277 Merge.rc:1250
+#: Merge.rc:277 Merge.rc:1260
msgid "&Texts"
msgstr ""
#. IDR_POPUP_WEBPAGE_COMPARE, ID_WEB_COMPARE_RESOURCETREES
-#: Merge.rc:278 Merge.rc:1251
+#: Merge.rc:278 Merge.rc:1261
msgid "&Resource Trees"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_SIZE
-#: Merge.rc:280 Merge.rc:1775
+#: Merge.rc:280 Merge.rc:1785
msgid "&Size"
msgstr ""
@@ -420,27 +420,27 @@ msgid "&Event Sync"
msgstr ""
#. IDR_POPUP_WEBPAGE_SYNC_EVENTS, ID_WEB_SYNC_ENABLED
-#: Merge.rc:291 Merge.rc:1259
+#: Merge.rc:291 Merge.rc:1269
msgid "&Enabled"
msgstr ""
#. IDR_POPUP_WEBPAGE_SYNC_EVENTS, ID_WEB_SYNC_SCROLL
-#: Merge.rc:293 Merge.rc:1261
+#: Merge.rc:293 Merge.rc:1271
msgid "&Scroll"
msgstr ""
#. IDR_POPUP_WEBPAGE_SYNC_EVENTS, ID_WEB_SYNC_CLICK
-#: Merge.rc:294 Merge.rc:1262
+#: Merge.rc:294 Merge.rc:1272
msgid "&Click"
msgstr ""
#. IDR_POPUP_WEBPAGE_SYNC_EVENTS, ID_WEB_SYNC_INPUT
-#: Merge.rc:295 Merge.rc:1263
+#: Merge.rc:295 Merge.rc:1273
msgid "&Input"
msgstr ""
#. IDR_POPUP_WEBPAGE_SYNC_EVENTS, ID_WEB_SYNC_GOBACKFORWARD
-#: Merge.rc:296 Merge.rc:1264
+#: Merge.rc:296 Merge.rc:1274
msgid "&Go Back/Forward"
msgstr ""
@@ -470,7583 +470,7599 @@ msgid "&All Profiles"
msgstr ""
#. IDR_MERGEDOCTYPE
-#: Merge.rc:310 Merge.rc:411 Merge.rc:586
+#: Merge.rc:310 Merge.rc:413 Merge.rc:590
msgid "&File"
msgstr ""
#. IDR_MERGEDOCTYPE
-#: Merge.rc:312 Merge.rc:413 Merge.rc:588
+#: Merge.rc:312 Merge.rc:415 Merge.rc:592
msgid "&New"
msgstr ""
#. IDR_POPUP_COMPARE, ID_MERGE_COMPARE_TEXT
-#: Merge.rc:314 Merge.rc:322 Merge.rc:415 Merge.rc:423 Merge.rc:590
-#: Merge.rc:598 Merge.rc:649 Merge.rc:935 Merge.rc:1159 Merge.rc:1171
+#: Merge.rc:314 Merge.rc:323 Merge.rc:417 Merge.rc:426 Merge.rc:594
+#: Merge.rc:603 Merge.rc:655 Merge.rc:942 Merge.rc:1167 Merge.rc:1180
msgid "&Text"
msgstr ""
#. IDR_POPUP_COMPARE, ID_MERGE_COMPARE_TABLE
-#: Merge.rc:315 Merge.rc:323 Merge.rc:416 Merge.rc:424 Merge.rc:591
-#: Merge.rc:599 Merge.rc:650 Merge.rc:936 Merge.rc:1160 Merge.rc:1172
+#: Merge.rc:315 Merge.rc:324 Merge.rc:418 Merge.rc:427 Merge.rc:595
+#: Merge.rc:604 Merge.rc:656 Merge.rc:943 Merge.rc:1168 Merge.rc:1181
msgid "T&able"
msgstr ""
#. IDR_POPUP_COMPARE, ID_MERGE_COMPARE_HEX
-#: Merge.rc:316 Merge.rc:324 Merge.rc:417 Merge.rc:425 Merge.rc:592
-#: Merge.rc:600 Merge.rc:651 Merge.rc:937 Merge.rc:1161 Merge.rc:1173
+#: Merge.rc:316 Merge.rc:325 Merge.rc:419 Merge.rc:428 Merge.rc:596
+#: Merge.rc:605 Merge.rc:657 Merge.rc:944 Merge.rc:1169 Merge.rc:1182
msgid "&Binary"
msgstr ""
#. IDS_IMAGE_MENU
-#: Merge.rc:317 Merge.rc:325 Merge.rc:418 Merge.rc:426 Merge.rc:593
-#: Merge.rc:601 Merge.rc:652 Merge.rc:938 Merge.rc:1162 Merge.rc:1174
-#: Merge.rc:5123
+#: Merge.rc:317 Merge.rc:326 Merge.rc:420 Merge.rc:429 Merge.rc:597
+#: Merge.rc:606 Merge.rc:658 Merge.rc:945 Merge.rc:1170 Merge.rc:1183
+#: Merge.rc:5133
msgid "&Image"
msgstr ""
#. IDR_POPUP_COMPARE, ID_MERGE_COMPARE_WEBPAGE
-#: Merge.rc:318 Merge.rc:326 Merge.rc:419 Merge.rc:427 Merge.rc:594
-#: Merge.rc:602 Merge.rc:653 Merge.rc:939 Merge.rc:1163 Merge.rc:1175
+#: Merge.rc:318 Merge.rc:327 Merge.rc:421 Merge.rc:430 Merge.rc:598
+#: Merge.rc:607 Merge.rc:659 Merge.rc:946 Merge.rc:1171 Merge.rc:1184
msgid "&Webpage"
msgstr ""
+#. IDR_POPUP_NEW, ID_FILE_NEW_FOLDER
+#: Merge.rc:319 Merge.rc:328 Merge.rc:422 Merge.rc:431 Merge.rc:599
+#: Merge.rc:608 Merge.rc:1172
+msgid "&Folder"
+msgstr ""
+
#. IDR_MERGEDOCTYPE
-#: Merge.rc:320 Merge.rc:421 Merge.rc:596
+#: Merge.rc:321 Merge.rc:424 Merge.rc:601
msgid "New (&3 panes)"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_FILE_OPEN
-#: Merge.rc:328 Merge.rc:429 Merge.rc:604
+#: Merge.rc:330 Merge.rc:433 Merge.rc:610
msgid "&Open...\tCtrl+O"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_FILE_OPENCONFLICT
-#: Merge.rc:329 Merge.rc:430 Merge.rc:605
+#: Merge.rc:331 Merge.rc:434 Merge.rc:611
msgid "Open Conflic&t File..."
msgstr ""
#. IDR_MERGEDOCTYPE, ID_FILE_OPENCLIPBOARD
-#: Merge.rc:330 Merge.rc:431 Merge.rc:606
+#: Merge.rc:332 Merge.rc:435 Merge.rc:612
msgid "Open C&lipboard"
msgstr ""
#. IDR_POPUP_PROJECT, ID_FILE_OPENPROJECT
-#: Merge.rc:332 Merge.rc:433 Merge.rc:608 Merge.rc:1191
+#: Merge.rc:334 Merge.rc:437 Merge.rc:614 Merge.rc:1201
msgid "Open Pro&ject...\tCtrl+J"
msgstr ""
#. IDD_OPEN, ID_SAVE_PROJECT
-#: Merge.rc:333 Merge.rc:434 Merge.rc:609 Merge.rc:1193 Merge.rc:1979
+#: Merge.rc:335 Merge.rc:438 Merge.rc:615 Merge.rc:1203 Merge.rc:1989
msgid "Sa&ve Project..."
msgstr ""
#. IDR_MAINFRAME, ID_FILE_PROJECT_MRU_FIRST
-#: Merge.rc:335
+#: Merge.rc:337
msgid "Recent Projects"
msgstr ""
#. IDR_MERGEDOCTYPE
-#: Merge.rc:336 Merge.rc:445 Merge.rc:657
+#: Merge.rc:338 Merge.rc:449 Merge.rc:664
msgid "Recent F&iles or Folders"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_APP_EXIT
-#: Merge.rc:341 Merge.rc:450 Merge.rc:662
+#: Merge.rc:343 Merge.rc:454 Merge.rc:669
msgid "E&xit\tCtrl+Q"
msgstr ""
#. IDR_MERGEDOCTYPE
-#: Merge.rc:343 Merge.rc:452 Merge.rc:664
+#: Merge.rc:345 Merge.rc:456 Merge.rc:671
msgid "&Edit"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_EDIT_PASTE
-#: Merge.rc:345 Merge.rc:671
+#: Merge.rc:347 Merge.rc:678
msgid "&Paste\tCtrl+V"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_OPTIONS
-#: Merge.rc:347 Merge.rc:456 Merge.rc:693
+#: Merge.rc:349 Merge.rc:460 Merge.rc:700
msgid "&Options...\tCtrl+,"
msgstr ""
#. IDR_MERGEDOCTYPE
-#: Merge.rc:349 Merge.rc:458 Merge.rc:695
+#: Merge.rc:351 Merge.rc:462 Merge.rc:702
msgid "&View"
msgstr ""
#. IDR_MERGEDOCTYPE
-#: Merge.rc:351 Merge.rc:500 Merge.rc:744
+#: Merge.rc:353 Merge.rc:504 Merge.rc:751
msgid "Ta&b Bar"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_VIEW_TAB_BAR
-#: Merge.rc:353 Merge.rc:502 Merge.rc:746
+#: Merge.rc:355 Merge.rc:506 Merge.rc:753
msgid "&View Tab Bar"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_VIEW_TAB_BAR_ON_TITLE_BAR
-#: Merge.rc:354 Merge.rc:503 Merge.rc:747
+#: Merge.rc:356 Merge.rc:507 Merge.rc:754
msgid "&On Title Bar"
msgstr ""
#. IDR_MERGEDOCTYPE
-#: Merge.rc:356 Merge.rc:505 Merge.rc:749
+#: Merge.rc:358 Merge.rc:509 Merge.rc:756
msgid "&Toolbar"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_TOOLBAR_SMALL
-#: Merge.rc:359 Merge.rc:508 Merge.rc:752
+#: Merge.rc:361 Merge.rc:512 Merge.rc:759
msgid "&Small"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_TOOLBAR_MEDIUM
-#: Merge.rc:360 Merge.rc:509 Merge.rc:753
+#: Merge.rc:362 Merge.rc:513 Merge.rc:760
msgid "&Medium"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_TOOLBAR_BIG
-#: Merge.rc:361 Merge.rc:510 Merge.rc:754
+#: Merge.rc:363 Merge.rc:514 Merge.rc:761
msgid "&Big"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_TOOLBAR_HUGE
-#: Merge.rc:362 Merge.rc:511 Merge.rc:755
+#: Merge.rc:364 Merge.rc:515 Merge.rc:762
msgid "&Huge"
msgstr ""
#. IDS_VIEW_MENU_BAR
-#: Merge.rc:364 Merge.rc:513 Merge.rc:757 Merge.rc:5357
+#: Merge.rc:366 Merge.rc:517 Merge.rc:764 Merge.rc:5368
msgid "Men&u Bar"
msgstr ""
#. IDR_DIRDOCTYPE, ID_VIEW_OUTPUT_BAR
-#: Merge.rc:365 Merge.rc:515
+#: Merge.rc:367 Merge.rc:519
msgid "&Output Pane"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_VIEW_STATUS_BAR
-#: Merge.rc:366 Merge.rc:516 Merge.rc:758
+#: Merge.rc:368 Merge.rc:520 Merge.rc:765
msgid "&Status Bar"
msgstr ""
#. IDR_MERGEDOCTYPE
-#: Merge.rc:368 Merge.rc:539 Merge.rc:847
+#: Merge.rc:370 Merge.rc:543 Merge.rc:854
msgid "&Tools"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_TOOLS_FILTERS
-#: Merge.rc:370 Merge.rc:542 Merge.rc:849
+#: Merge.rc:372 Merge.rc:546 Merge.rc:856
msgid "&Filters..."
msgstr ""
#. IDR_MERGEDOCTYPE, ID_TOOLS_GENERATEPATCH
-#: Merge.rc:371 Merge.rc:543 Merge.rc:850
+#: Merge.rc:373 Merge.rc:547 Merge.rc:857
msgid "&Generate Patch..."
msgstr ""
#. IDR_MERGEDOCTYPE
-#: Merge.rc:373 Merge.rc:546 Merge.rc:853
+#: Merge.rc:375 Merge.rc:550 Merge.rc:860
msgid "&Plugins"
msgstr ""
#. IDD_PLUGINS_LIST, IDC_PLUGIN_SETTINGS
-#: Merge.rc:375 Merge.rc:548 Merge.rc:855 Merge.rc:2494 Merge.rc:2926
+#: Merge.rc:377 Merge.rc:552 Merge.rc:862 Merge.rc:2504 Merge.rc:2936
msgid "P&lugin Settings..."
msgstr ""
#. IDR_MERGEDOCTYPE, ID_PREDIFFER_MANUAL
-#: Merge.rc:377 Merge.rc:550 Merge.rc:857
+#: Merge.rc:379 Merge.rc:554 Merge.rc:864
msgid "Ma&nual Prediffer"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_PREDIFFER_AUTO
-#: Merge.rc:378 Merge.rc:551 Merge.rc:858
+#: Merge.rc:380 Merge.rc:555 Merge.rc:865
msgid "A&utomatic Prediffer"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_UNPACK_MANUAL
-#: Merge.rc:380 Merge.rc:553 Merge.rc:860
+#: Merge.rc:382 Merge.rc:557 Merge.rc:867
msgid "&Manual Unpacking"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_UNPACK_AUTO
-#: Merge.rc:381 Merge.rc:554 Merge.rc:861
+#: Merge.rc:383 Merge.rc:558 Merge.rc:868
msgid "&Automatic Unpacking"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_RELOAD_PLUGINS
-#: Merge.rc:383 Merge.rc:558 Merge.rc:889
+#: Merge.rc:385 Merge.rc:562 Merge.rc:896
msgid "&Reload Plugins"
msgstr ""
#. IDR_MERGEDOCTYPE
-#: Merge.rc:385 Merge.rc:560 Merge.rc:891
+#: Merge.rc:387 Merge.rc:564 Merge.rc:898
msgid "&Window"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_FILE_CLOSE
-#: Merge.rc:387 Merge.rc:562 Merge.rc:893
+#: Merge.rc:389 Merge.rc:566 Merge.rc:900
msgid "Cl&ose\tCtrl+W"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_WINDOW_CLOSEALL
-#: Merge.rc:388 Merge.rc:563 Merge.rc:894
+#: Merge.rc:390 Merge.rc:567 Merge.rc:901
msgid "Clo&se All"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_NEXT_PANE
-#: Merge.rc:390 Merge.rc:565 Merge.rc:896
+#: Merge.rc:392 Merge.rc:569 Merge.rc:903
msgid "Change &Pane\tF6"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_WINDOW_TILE_HORZ
-#: Merge.rc:392 Merge.rc:567 Merge.rc:900
+#: Merge.rc:394 Merge.rc:571 Merge.rc:907
msgid "Tile &Horizontally"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_WINDOW_TILE_VERT
-#: Merge.rc:393 Merge.rc:568 Merge.rc:901
+#: Merge.rc:395 Merge.rc:572 Merge.rc:908
msgid "Tile &Vertically"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_WINDOW_CASCADE
-#: Merge.rc:394 Merge.rc:569 Merge.rc:902
+#: Merge.rc:396 Merge.rc:573 Merge.rc:909
msgid "&Cascade"
msgstr ""
#. IDS_MESSAGEBOX_HELP
-#: Merge.rc:396 Merge.rc:571 Merge.rc:904 Merge.rc:3200 Merge.rc:4189
+#: Merge.rc:398 Merge.rc:575 Merge.rc:911 Merge.rc:3210 Merge.rc:4199
msgid "&Help"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_HELP_CONTENTS
-#: Merge.rc:398 Merge.rc:573 Merge.rc:906
+#: Merge.rc:400 Merge.rc:577 Merge.rc:913
msgid "&WinMerge Help\tF1"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_HELP_RELEASENOTES
-#: Merge.rc:400 Merge.rc:575 Merge.rc:908
+#: Merge.rc:402 Merge.rc:579 Merge.rc:915
msgid "R&elease Notes"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_HELP_TRANSLATIONS
-#: Merge.rc:401 Merge.rc:576 Merge.rc:909
+#: Merge.rc:403 Merge.rc:580 Merge.rc:916
msgid "&Translations"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_HELP_GETCONFIG
-#: Merge.rc:402 Merge.rc:577 Merge.rc:910
+#: Merge.rc:404 Merge.rc:581 Merge.rc:917
msgid "C&onfiguration"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_HELP_GNULICENSE
-#: Merge.rc:404 Merge.rc:579 Merge.rc:912
+#: Merge.rc:406 Merge.rc:583 Merge.rc:919
msgid "&GNU General Public License"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_APP_ABOUT
-#: Merge.rc:405 Merge.rc:580 Merge.rc:913
+#: Merge.rc:407 Merge.rc:584 Merge.rc:920
msgid "&About WinMerge..."
msgstr ""
#. IDR_MERGEDOCTYPE
-#: Merge.rc:436 Merge.rc:629
+#: Merge.rc:440 Merge.rc:635
msgid "&Read-Only"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_FILE_LEFT_READONLY
-#: Merge.rc:438 Merge.rc:631
+#: Merge.rc:442 Merge.rc:637
msgid "L&eft Read-Only"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_FILE_MIDDLE_READONLY
-#: Merge.rc:439 Merge.rc:632
+#: Merge.rc:443 Merge.rc:638
msgid "M&iddle Read-Only"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_FILE_RIGHT_READONLY
-#: Merge.rc:440 Merge.rc:633
+#: Merge.rc:444 Merge.rc:639
msgid "Ri&ght Read-Only"
msgstr ""
#. IDD_ENCODINGERROR, IDC_FILEENCODING
-#: Merge.rc:443 Merge.rc:646 Merge.rc:1038 Merge.rc:3063
+#: Merge.rc:447 Merge.rc:652 Merge.rc:1046 Merge.rc:3073
msgid "&File Encoding..."
msgstr ""
#. IDR_POPUP_OUTPUTVIEW, ID_EDIT_SELECT_ALL
-#: Merge.rc:454 Merge.rc:674 Merge.rc:1343
+#: Merge.rc:458 Merge.rc:681 Merge.rc:1353
msgid "Select &All\tCtrl+A"
msgstr ""
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWIDENTICAL
-#: Merge.rc:460
+#: Merge.rc:464
msgid "Show &Identical Items"
msgstr ""
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWDIFFERENT
-#: Merge.rc:461
+#: Merge.rc:465
msgid "Show &Different Items"
msgstr ""
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWUNIQUELEFT
-#: Merge.rc:462
+#: Merge.rc:466
msgid "Show L&eft Unique Items"
msgstr ""
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWUNIQUEMIDDLE
-#: Merge.rc:463
+#: Merge.rc:467
msgid "Show Midd&le Unique Items"
msgstr ""
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWUNIQUERIGHT
-#: Merge.rc:464
+#: Merge.rc:468
msgid "Show Ri&ght Unique Items"
msgstr ""
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWSKIPPED
-#: Merge.rc:465
+#: Merge.rc:469
msgid "Show S&kipped Items"
msgstr ""
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWBINARIES
-#: Merge.rc:466
+#: Merge.rc:470
msgid "S&how Binary Files"
msgstr ""
#. IDR_DIRDOCTYPE
-#: Merge.rc:467
+#: Merge.rc:471
msgid "&3-way Compare"
msgstr ""
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWDIFFERENTLEFTONLY
-#: Merge.rc:469
+#: Merge.rc:473
msgid "Show &Left Only Different Items"
msgstr ""
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWDIFFERENTMIDDLEONLY
-#: Merge.rc:470
+#: Merge.rc:474
msgid "Show &Middle Only Different Items"
msgstr ""
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWDIFFERENTRIGHTONLY
-#: Merge.rc:471
+#: Merge.rc:475
msgid "Show &Right Only Different Items"
msgstr ""
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWMISSINGLEFTONLY
-#: Merge.rc:473
+#: Merge.rc:477
msgid "Show L&eft Only Missing Items"
msgstr ""
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWMISSINGMIDDLEONLY
-#: Merge.rc:474
+#: Merge.rc:478
msgid "Show Mi&ddle Only Missing Items"
msgstr ""
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWMISSINGRIGHTONLY
-#: Merge.rc:475
+#: Merge.rc:479
msgid "Show Rig&ht Only Missing Items"
msgstr ""
#. IDR_DIRDOCTYPE, ID_VIEW_SHOWHIDDENITEMS
-#: Merge.rc:478
+#: Merge.rc:482
msgid "Show Hidd&en Items"
msgstr ""
#. IDR_DIRDOCTYPE, ID_VIEW_TREEMODE
-#: Merge.rc:480
+#: Merge.rc:484
msgid "Tree &Mode"
msgstr ""
#. IDR_DIRDOCTYPE
-#: Merge.rc:481
+#: Merge.rc:485
msgid "E&xpand Subfolders"
msgstr ""
#. IDR_DIRDOCTYPE, ID_VIEW_EXPAND_ALLSUBDIRS
-#: Merge.rc:483
+#: Merge.rc:487
msgid "&All Subfolders"
msgstr ""
#. IDR_DIRDOCTYPE, ID_VIEW_EXPAND_DIFFERENT_SUBDIRS
-#: Merge.rc:484
+#: Merge.rc:488
msgid "&Different Subfolders"
msgstr ""
#. IDR_DIRDOCTYPE, ID_VIEW_EXPAND_IDENTICAL_SUBDIRS
-#: Merge.rc:485
+#: Merge.rc:489
msgid "&Identical Subfolders"
msgstr ""
#. IDR_DIRDOCTYPE, ID_VIEW_COLLAPSE_ALLSUBDIRS
-#: Merge.rc:487
+#: Merge.rc:491
msgid "&Collapse All Subfolders"
msgstr ""
#. IDR_DIRDOCTYPE, ID_VIEW_SHOW_EMPTY_FOLDERS
-#: Merge.rc:488
+#: Merge.rc:492
msgid "Show &Empty Folders"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_VIEW_SELECTFONT
-#: Merge.rc:490 Merge.rc:697
+#: Merge.rc:494 Merge.rc:704
msgid "Select &Font..."
msgstr ""
#. IDR_MERGEDOCTYPE, ID_VIEW_USEDEFAULTFONT
-#: Merge.rc:491 Merge.rc:698
+#: Merge.rc:495 Merge.rc:705
msgid "Use Default Font"
msgstr ""
#. IDR_MERGEDOCTYPE
-#: Merge.rc:493 Merge.rc:736
+#: Merge.rc:497 Merge.rc:743
msgid "Sw&ap Panes"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_SWAPPANES_SWAP12
-#: Merge.rc:495 Merge.rc:738
+#: Merge.rc:499 Merge.rc:745
msgid "Swap &1st | 2nd"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_SWAPPANES_SWAP23
-#: Merge.rc:496 Merge.rc:739
+#: Merge.rc:500 Merge.rc:746
msgid "Swap &2nd | 3rd"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_SWAPPANES_SWAP13
-#: Merge.rc:497 Merge.rc:740
+#: Merge.rc:501 Merge.rc:747
msgid "Swap 1st | &3rd"
msgstr ""
#. IDR_DIRDOCTYPE, ID_VIEW_DISPLAY_FILTER_BAR_MENU
-#: Merge.rc:514
+#: Merge.rc:518
msgid "Displa&y Filter Bar\tCtrl+Shift+L"
msgstr ""
#. IDR_DIRDOCTYPE, ID_VIEW_DIR_STATISTICS
-#: Merge.rc:518
+#: Merge.rc:522
msgid "Com&pare Statistics..."
msgstr ""
#. IDR_MERGEDOCTYPE, ID_REFRESH
-#: Merge.rc:520 Merge.rc:763
+#: Merge.rc:524 Merge.rc:770
msgid "Refresh\tF5"
msgstr ""
#. IDR_POPUP_DIRVIEW, ID_RESCAN
-#: Merge.rc:521 Merge.rc:1030
+#: Merge.rc:525 Merge.rc:1038
msgid "&Refresh Selected\tCtrl+F5"
msgstr ""
#. IDR_MERGEDOCTYPE
-#: Merge.rc:523 Merge.rc:765
+#: Merge.rc:527 Merge.rc:772
msgid "&Merge"
msgstr ""
#. IDR_DIRDOCTYPE, ID_MERGE_COMPARE
-#: Merge.rc:525
+#: Merge.rc:529
msgid "Co&mpare\tEnter"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_NEXTDIFF
-#: Merge.rc:527 Merge.rc:767
+#: Merge.rc:531 Merge.rc:774
msgid "&Next Difference\tAlt+Down"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_PREVDIFF
-#: Merge.rc:528 Merge.rc:768
+#: Merge.rc:532 Merge.rc:775
msgid "&Previous Difference\tAlt+Up"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_FIRSTDIFF
-#: Merge.rc:530 Merge.rc:773
+#: Merge.rc:534 Merge.rc:780
msgid "&First Difference\tAlt+Home"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_CURDIFF
-#: Merge.rc:531 Merge.rc:774
+#: Merge.rc:535 Merge.rc:781
msgid "&Current Difference\tAlt+Enter"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_LASTDIFF
-#: Merge.rc:532 Merge.rc:775
+#: Merge.rc:536 Merge.rc:782
msgid "&Last Difference\tAlt+End"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_L2R
-#: Merge.rc:534 Merge.rc:830
+#: Merge.rc:538 Merge.rc:837
msgid "Copy to &Right\tAlt+Right"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_R2L
-#: Merge.rc:535 Merge.rc:831
+#: Merge.rc:539 Merge.rc:838
msgid "Copy to L&eft\tAlt+Left"
msgstr ""
#. IDR_DIRDOCTYPE, ID_MERGE_DELETE
-#: Merge.rc:537
+#: Merge.rc:541
msgid "&Delete\tDel"
msgstr ""
#. IDR_POPUP_DIRVIEW, ID_TOOLS_CUSTOMIZECOLUMNS
-#: Merge.rc:541 Merge.rc:1042
+#: Merge.rc:545 Merge.rc:1050
msgid "&Customize Columns..."
msgstr ""
#. IDR_MERGEDOCTYPE, ID_TOOLS_GENERATEREPORT
-#: Merge.rc:544 Merge.rc:851
+#: Merge.rc:548 Merge.rc:858
msgid "Generate &Report..."
msgstr ""
#. IDD_ENCODINGERROR, IDC_PLUGIN
-#: Merge.rc:556 Merge.rc:867 Merge.rc:3064
+#: Merge.rc:560 Merge.rc:874 Merge.rc:3074
msgid "&Edit with Unpacker..."
msgstr ""
#. IDR_MERGEDOCTYPE, ID_FILE_SAVE
-#: Merge.rc:611
+#: Merge.rc:617
msgid "&Save\tCtrl+S"
msgstr ""
#. IDR_MERGEDOCTYPE
-#: Merge.rc:612
+#: Merge.rc:618
msgid "Sav&e"
msgstr ""
#. IDR_POPUP_SAVE, ID_FILE_SAVE_LEFT
-#: Merge.rc:614 Merge.rc:1201
+#: Merge.rc:620 Merge.rc:1211
msgid "Save &Left"
msgstr ""
#. IDR_POPUP_SAVE, ID_FILE_SAVE_MIDDLE
-#: Merge.rc:615 Merge.rc:1202
+#: Merge.rc:621 Merge.rc:1212
msgid "Save &Middle"
msgstr ""
#. IDR_POPUP_SAVE, ID_FILE_SAVE_RIGHT
-#: Merge.rc:616 Merge.rc:1203
+#: Merge.rc:622 Merge.rc:1213
msgid "Save &Right"
msgstr ""
#. IDR_MERGEDOCTYPE
-#: Merge.rc:618
+#: Merge.rc:624
msgid "Save &As"
msgstr ""
#. IDR_POPUP_SAVE, ID_FILE_SAVEAS_LEFT
-#: Merge.rc:620 Merge.rc:1205
+#: Merge.rc:626 Merge.rc:1215
msgid "Save &Left As..."
msgstr ""
#. IDR_POPUP_SAVE, ID_FILE_SAVEAS_MIDDLE
-#: Merge.rc:621 Merge.rc:1206
+#: Merge.rc:627 Merge.rc:1216
msgid "Save &Middle As..."
msgstr ""
#. IDR_POPUP_SAVE, ID_FILE_SAVEAS_RIGHT
-#: Merge.rc:622 Merge.rc:1207
+#: Merge.rc:628 Merge.rc:1217
msgid "Save &Right As..."
msgstr ""
#. IDR_MERGEDOCTYPE, ID_FILE_PRINT
-#: Merge.rc:625
+#: Merge.rc:631
msgid "&Print...\tCtrl+P"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_FILE_PAGE_SETUP
-#: Merge.rc:626
+#: Merge.rc:632
msgid "Page Set&up..."
msgstr ""
#. IDR_MERGEDOCTYPE, ID_FILE_PRINT_PREVIEW
-#: Merge.rc:627
+#: Merge.rc:633
msgid "Print Previe&w..."
msgstr ""
#. IDR_MERGEDOCTYPE
-#: Merge.rc:636
+#: Merge.rc:642
msgid "&Convert Line Endings to"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_FILE_MERGINGMODE
-#: Merge.rc:643
+#: Merge.rc:649
msgid "Mer&ge Mode\tF9"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_RESCAN
-#: Merge.rc:645
+#: Merge.rc:651
msgid "Reloa&d\tCtrl+F5"
msgstr ""
#. IDR_MERGEDOCTYPE
-#: Merge.rc:647
+#: Merge.rc:653
msgid "Reco&mpare As"
msgstr ""
+#. IDR_POPUP_COMPARE, ID_MERGE_COMPARE_FOLDER
+#: Merge.rc:660 Merge.rc:947 Merge.rc:1185
+msgid "A&rchive"
+msgstr ""
+
#. IDR_MERGEDOCTYPE, ID_EDIT_UNDO
-#: Merge.rc:666
+#: Merge.rc:673
msgid "&Undo\tCtrl+Z"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_EDIT_REDO
-#: Merge.rc:667
+#: Merge.rc:674
msgid "&Redo\tCtrl+Y"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_EDIT_CUT
-#: Merge.rc:669
+#: Merge.rc:676
msgid "Cu&t\tCtrl+X"
msgstr ""
#. IDR_POPUP_OUTPUTVIEW, ID_EDIT_COPY
-#: Merge.rc:670 Merge.rc:1342
+#: Merge.rc:677 Merge.rc:1352
msgid "&Copy\tCtrl+C"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_EDIT_FIND
-#: Merge.rc:676
+#: Merge.rc:683
msgid "F&ind...\tCtrl+F"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_EDIT_REPLACE
-#: Merge.rc:677
+#: Merge.rc:684
msgid "Repla&ce...\tCtrl+H"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_EDIT_MARK
-#: Merge.rc:678
+#: Merge.rc:685
msgid "&Marker...\tCtrl+Shift+M"
msgstr ""
#. IDR_MERGEDOCTYPE
-#: Merge.rc:680
+#: Merge.rc:687
msgid "Advanced"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_EDIT_COPY_LINENUMBERS
-#: Merge.rc:682
+#: Merge.rc:689
msgid "&Copy With Line Numbers\tCtrl+Shift+C"
msgstr ""
#. IDR_MERGEDOCTYPE
-#: Merge.rc:684
+#: Merge.rc:691
msgid "&Bookmarks"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_EDIT_TOGGLE_BOOKMARK
-#: Merge.rc:686
+#: Merge.rc:693
msgid "&Toggle Bookmark\tCtrl+F2"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_EDIT_GOTO_NEXT_BOOKMARK
-#: Merge.rc:687
+#: Merge.rc:694
msgid "&Next Bookmark\tF2"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_EDIT_GOTO_PREV_BOOKMARK
-#: Merge.rc:688
+#: Merge.rc:695
msgid "&Previous Bookmark\tShift+F2"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_EDIT_CLEAR_ALL_BOOKMARKS
-#: Merge.rc:689
+#: Merge.rc:696
msgid "&Clear All Bookmarks"
msgstr ""
#. IDR_MERGEDOCTYPE
-#: Merge.rc:706
+#: Merge.rc:713
msgid "Syntax Highlight"
msgstr ""
#. IDR_MERGEDOCTYPE
-#: Merge.rc:711
+#: Merge.rc:718
msgid "&Diff Context"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_ALL
-#: Merge.rc:713
+#: Merge.rc:720
msgid "&All Lines"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_0
-#: Merge.rc:715
+#: Merge.rc:722
msgid "&0 Lines"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_1
-#: Merge.rc:716
+#: Merge.rc:723
msgid "&1 Line"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_3
-#: Merge.rc:717
+#: Merge.rc:724
msgid "&3 Lines"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_5
-#: Merge.rc:718
+#: Merge.rc:725
msgid "&5 Lines"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_7
-#: Merge.rc:719
+#: Merge.rc:726
msgid "&7 Lines"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_9
-#: Merge.rc:720
+#: Merge.rc:727
msgid "&9 Lines"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_TOGGLE
-#: Merge.rc:722
+#: Merge.rc:729
msgid "&Toggle All and 0-9 Lines\tCtrl+D"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_INVERT
-#: Merge.rc:724
+#: Merge.rc:731
msgid "&Invert (Hide Different Lines)"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_VIEW_RESIZE_PANES
-#: Merge.rc:727
+#: Merge.rc:734
msgid "&Lock Panes"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_VIEW_WHITESPACE
-#: Merge.rc:728
+#: Merge.rc:735
msgid "&View Whitespace"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_VIEW_EOL
-#: Merge.rc:729
+#: Merge.rc:736
msgid "View E&OL"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_VIEW_LINEDIFFS
-#: Merge.rc:730
+#: Merge.rc:737
msgid "Vie&w Line Differences"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_VIEW_LINENUMBERS
-#: Merge.rc:731
+#: Merge.rc:738
msgid "View Line &Numbers"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_VIEW_SELMARGIN
-#: Merge.rc:732
+#: Merge.rc:739
msgid "View &Margins"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_VIEW_TOPMARGIN
-#: Merge.rc:733
+#: Merge.rc:740
msgid "View To&p Margins"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_VIEW_WORDWRAP
-#: Merge.rc:734
+#: Merge.rc:741
msgid "W&rap Lines"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_VIEW_SPLITVERTICALLY
-#: Merge.rc:742
+#: Merge.rc:749
msgid "Split V&ertically"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_VIEW_DETAIL_BAR
-#: Merge.rc:759
+#: Merge.rc:766
msgid "Diff &Pane"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_VIEW_LOCATION_BAR
-#: Merge.rc:760
+#: Merge.rc:767
msgid "Lo&cation Pane"
msgstr ""
#. IDS_OUTPUTBAR_CAPTION
-#: Merge.rc:761 Merge.rc:4902
+#: Merge.rc:768 Merge.rc:4912
msgid "Output Pane"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_NEXTCONFLICT
-#: Merge.rc:770
+#: Merge.rc:777
msgid "Ne&xt Conflict\tAlt+Shift+Down"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_PREVCONFLICT
-#: Merge.rc:771
+#: Merge.rc:778
msgid "Pre&vious Conflict\tAlt+Shift+Up"
msgstr ""
#. IDR_MERGEDOCTYPE
-#: Merge.rc:777
+#: Merge.rc:784
msgid "A&dvanced"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_NEXTDIFFLM
-#: Merge.rc:779
+#: Merge.rc:786
msgid "Next Difference (Left/Middle)\tAlt+1"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_PREVDIFFLM
-#: Merge.rc:780
+#: Merge.rc:787
msgid "Previous Difference (Left/Middle)\tAlt+Shift+1"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_NEXTDIFFLR
-#: Merge.rc:782
+#: Merge.rc:789
msgid "Next Difference (Left/Right)\tAlt+2"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_PREVDIFFLR
-#: Merge.rc:783
+#: Merge.rc:790
msgid "Previous Difference (Left/Right)\tAlt+Shift+2"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_NEXTDIFFMR
-#: Merge.rc:785
+#: Merge.rc:792
msgid "Next Difference (Middle/Right)\tAlt+3"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_PREVDIFFMR
-#: Merge.rc:786
+#: Merge.rc:793
msgid "Previous Difference (Middle/Right)\tAlt+Shift+3"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_NEXTDIFFLO
-#: Merge.rc:788
+#: Merge.rc:795
msgid "Next Left-Only Difference\tAlt+7"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_PREVDIFFLO
-#: Merge.rc:789
+#: Merge.rc:796
msgid "Previous Left-Only Difference\tAlt+Shift+7"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_NEXTDIFFMO
-#: Merge.rc:791
+#: Merge.rc:798
msgid "Next Middle-Only Difference\tAlt+8"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_PREVDIFFMO
-#: Merge.rc:792
+#: Merge.rc:799
msgid "Previous Middle-Only Difference\tAlt+Shift+8"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_NEXTDIFFRO
-#: Merge.rc:794
+#: Merge.rc:801
msgid "Next Right-Only Difference\tAlt+9"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_PREVDIFFRO
-#: Merge.rc:795
+#: Merge.rc:802
msgid "Previous Right-Only Difference\tAlt+Shift+9"
msgstr ""
#. IDR_MERGEDOCTYPE
-#: Merge.rc:797
+#: Merge.rc:804
msgid "Copy from &Left to"
msgstr ""
#. IDD_LOAD_SAVE_CODEPAGE, IDC_AFFECTS_MIDDLE_BTN
-#: Merge.rc:799 Merge.rc:810 Merge.rc:815 Merge.rc:826 Merge.rc:970
-#: Merge.rc:2545 Merge.rc:2817
+#: Merge.rc:806 Merge.rc:817 Merge.rc:822 Merge.rc:833 Merge.rc:978
+#: Merge.rc:2555 Merge.rc:2827
msgid "&Middle"
msgstr ""
#. IDD_LOAD_SAVE_CODEPAGE, IDC_AFFECTS_RIGHT_BTN
-#: Merge.rc:800 Merge.rc:805 Merge.rc:816 Merge.rc:821 Merge.rc:971
-#: Merge.rc:2546 Merge.rc:2819
+#: Merge.rc:807 Merge.rc:812 Merge.rc:823 Merge.rc:828 Merge.rc:979
+#: Merge.rc:2556 Merge.rc:2829
msgid "&Right"
msgstr ""
#. IDR_MERGEDOCTYPE
-#: Merge.rc:802
+#: Merge.rc:809
msgid "Copy from &Middle to"
msgstr ""
#. IDD_LOAD_SAVE_CODEPAGE, IDC_AFFECTS_LEFT_BTN
-#: Merge.rc:804 Merge.rc:809 Merge.rc:820 Merge.rc:825 Merge.rc:969
-#: Merge.rc:2544 Merge.rc:2815
+#: Merge.rc:811 Merge.rc:816 Merge.rc:827 Merge.rc:832 Merge.rc:977
+#: Merge.rc:2554 Merge.rc:2825
msgid "&Left"
msgstr ""
#. IDR_MERGEDOCTYPE
-#: Merge.rc:807
+#: Merge.rc:814
msgid "Copy from &Right to"
msgstr ""
#. IDR_MERGEDOCTYPE
-#: Merge.rc:813
+#: Merge.rc:820
msgid "Copy Selected Lines from Le&ft to"
msgstr ""
#. IDR_MERGEDOCTYPE
-#: Merge.rc:818
+#: Merge.rc:825
msgid "Copy Selected Lines from Mi&ddle to"
msgstr ""
#. IDR_MERGEDOCTYPE
-#: Merge.rc:823
+#: Merge.rc:830
msgid "Copy Selected Lines from Ri&ght to"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_COPY_FROM_LEFT
-#: Merge.rc:833
+#: Merge.rc:840
msgid "Copy from Left\tAlt+Shift+Right"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_COPY_FROM_RIGHT
-#: Merge.rc:834
+#: Merge.rc:841
msgid "Copy from Right\tAlt+Shift+Left"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_L2RNEXT
-#: Merge.rc:836
+#: Merge.rc:843
msgid "C&opy to Right and Advance\tCtrl+Alt+Right"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_R2LNEXT
-#: Merge.rc:837
+#: Merge.rc:844
msgid "Copy &to Left and Advance\tCtrl+Alt+Left"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_ALL_RIGHT
-#: Merge.rc:839
+#: Merge.rc:846
msgid "Copy &All to Right"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_ALL_LEFT
-#: Merge.rc:840
+#: Merge.rc:847
msgid "Cop&y All to Left"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_AUTO_MERGE
-#: Merge.rc:842
+#: Merge.rc:849
msgid "A&uto Merge\tCtrl+Alt+M"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_ADD_SYNCPOINT
-#: Merge.rc:844
+#: Merge.rc:851
msgid "Add &Synchronization Point\tAlt+S"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_CLEAR_SYNCPOINTS
-#: Merge.rc:845
+#: Merge.rc:852
msgid "Clear Sync&hronization Points"
msgstr ""
#. IDR_MERGEDOCTYPE
-#: Merge.rc:863
+#: Merge.rc:870
msgid "Unpac&ker"
msgstr ""
#. IDR_MERGEDOCTYPE
-#: Merge.rc:869
+#: Merge.rc:876
msgid "&Prediffer"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_APPLY_PREDIFFER
-#: Merge.rc:873
+#: Merge.rc:880
msgid "Apply Pre&differ..."
msgstr ""
#. IDR_MERGEDOCTYPE, ID_TRANSFORM_WITH_SCRIPT
-#: Merge.rc:879
+#: Merge.rc:886
msgid "&Transform with Editor Script..."
msgstr ""
#. IDR_MERGEDOCTYPE
-#: Merge.rc:880
+#: Merge.rc:887
msgid "Scripts for &Copying"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_SELECT_EDITOR_SCRIPT_FOR_COPYING
-#: Merge.rc:886
+#: Merge.rc:893
msgid "Select &Editor Script..."
msgstr ""
#. IDR_MERGEDOCTYPE, ID_WINDOW_SPLIT
-#: Merge.rc:898
+#: Merge.rc:905
msgid "Sp&lit"
msgstr ""
#. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE
-#: Merge.rc:921
+#: Merge.rc:928
msgid "Comp&are"
msgstr ""
#. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE_WITH_MOVED_RENAMED
-#: Merge.rc:922
+#: Merge.rc:929
msgid "Compar&e with Renamed/Moved Items"
msgstr ""
#. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE_IN_NEW_WINDOW
-#: Merge.rc:923
+#: Merge.rc:930
msgid "Compare in New &Window"
msgstr ""
#. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE_NONHORIZONTALLY
-#: Merge.rc:924 Merge.rc:931
+#: Merge.rc:931 Merge.rc:938
msgid "Compare Non-hor&izontally..."
msgstr ""
#. IDR_POPUP_DIRVIEW
-#: Merge.rc:925
+#: Merge.rc:932
msgid "Compare Non-hor&izontally"
msgstr ""
#. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE_LEFT1_LEFT2
-#: Merge.rc:927
+#: Merge.rc:934
msgid "First &Left with Second Left"
msgstr ""
#. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE_RIGHT1_RIGHT2
-#: Merge.rc:928
+#: Merge.rc:935
msgid "First &Right with Second Right"
msgstr ""
#. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE_LEFT1_RIGHT2
-#: Merge.rc:929
+#: Merge.rc:936
msgid "&First Left with Second Right"
msgstr ""
#. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE_LEFT2_RIGHT1
-#: Merge.rc:930
+#: Merge.rc:937
msgid "&Second Left with First Right"
msgstr ""
#. IDR_POPUP_DIRVIEW
-#: Merge.rc:933
+#: Merge.rc:940
msgid "Co&mpare As"
msgstr ""
#. IDS_COPY_LEFT_TO_MIDDLE2
-#: Merge.rc:945 Merge.rc:957 Merge.rc:4502
+#: Merge.rc:953 Merge.rc:965 Merge.rc:4512
#, c-format
msgid "Left to Middle (%1 of %2)"
msgstr ""
#. IDS_COPY_LEFT_TO_RIGHT2
-#: Merge.rc:946 Merge.rc:958 Merge.rc:4501
+#: Merge.rc:954 Merge.rc:966 Merge.rc:4511
#, c-format
msgid "Left to Right (%1 of %2)"
msgstr ""
#. IDS_MOVE_LEFT_TO2
-#: Merge.rc:947 Merge.rc:959 Merge.rc:1022 Merge.rc:4513 Merge.rc:4542
+#: Merge.rc:955 Merge.rc:967 Merge.rc:1030 Merge.rc:4523 Merge.rc:4552
#, c-format
msgid "Left to... (%1 of %2)"
msgstr ""
#. IDS_COPY_MIDDLE_TO_LEFT2
-#: Merge.rc:948 Merge.rc:960 Merge.rc:4499
+#: Merge.rc:956 Merge.rc:968 Merge.rc:4509
#, c-format
msgid "Middle to Left (%1 of %2)"
msgstr ""
#. IDS_COPY_MIDDLE_TO_RIGHT2
-#: Merge.rc:949 Merge.rc:961 Merge.rc:4500
+#: Merge.rc:957 Merge.rc:969 Merge.rc:4510
#, c-format
msgid "Middle to Right (%1 of %2)"
msgstr ""
#. IDS_MOVE_MIDDLE_TO2
-#: Merge.rc:950 Merge.rc:962 Merge.rc:1023 Merge.rc:4514 Merge.rc:4543
+#: Merge.rc:958 Merge.rc:970 Merge.rc:1031 Merge.rc:4524 Merge.rc:4553
#, c-format
msgid "Middle to... (%1 of %2)"
msgstr ""
#. IDS_COPY_RIGHT_TO_MIDDLE2
-#: Merge.rc:951 Merge.rc:963 Merge.rc:4498
+#: Merge.rc:959 Merge.rc:971 Merge.rc:4508
#, c-format
msgid "Right to Middle (%1 of %2)"
msgstr ""
#. IDS_COPY_RIGHT_TO_LEFT2
-#: Merge.rc:952 Merge.rc:964 Merge.rc:4497
+#: Merge.rc:960 Merge.rc:972 Merge.rc:4507
#, c-format
msgid "Right to Left (%1 of %2)"
msgstr ""
#. IDS_MOVE_RIGHT_TO2
-#: Merge.rc:953 Merge.rc:965 Merge.rc:1024 Merge.rc:4515 Merge.rc:4544
+#: Merge.rc:961 Merge.rc:973 Merge.rc:1032 Merge.rc:4525 Merge.rc:4554
#, c-format
msgid "Right to... (%1 of %2)"
msgstr ""
#. IDD_EDIT_MARKER, IDC_EDIT_MARKER_DELETE
-#: Merge.rc:967 Merge.rc:2036
+#: Merge.rc:975 Merge.rc:2046
msgid "&Delete"
msgstr ""
#. IDR_POPUP_DIRVIEW, ID_DIR_DEL_BOTH
-#: Merge.rc:972
+#: Merge.rc:980
msgid "&Both"
msgstr ""
#. IDR_POPUP_DIRVIEW, ID_DIR_DEL_ALL
-#: Merge.rc:973
+#: Merge.rc:981
msgid "&All"
msgstr ""
#. IDD_EDIT_REPLACE, IDC_EDIT_SCOPE_SELECTION
-#: Merge.rc:974 Merge.rc:2019
+#: Merge.rc:982 Merge.rc:2029
msgid "&Selection"
msgstr ""
#. IDR_POPUP_DIRVIEW, ID_DIR_ITEM_RENAME
-#: Merge.rc:976
+#: Merge.rc:984
msgid "Re&name"
msgstr ""
#. IDR_POPUP_DIRVIEW, ID_DIR_HIDE_FILENAMES
-#: Merge.rc:977
+#: Merge.rc:985
msgid "&Hide Items"
msgstr ""
#. IDR_POPUP_DIRVIEW
-#: Merge.rc:979
+#: Merge.rc:987
msgid "&Open Left"
msgstr ""
#. IDR_POPUP_DIRVIEW
-#: Merge.rc:986
+#: Merge.rc:994
msgid "Open Midd&le"
msgstr ""
#. IDR_POPUP_DIRVIEW
-#: Merge.rc:993
+#: Merge.rc:1001
msgid "O&pen Right"
msgstr ""
#. IDR_POPUP_DIRVIEW
-#: Merge.rc:1001
+#: Merge.rc:1009
msgid "Cop&y Paths"
msgstr ""
#. IDS_DEL_LEFT_FMT2
-#: Merge.rc:1003 Merge.rc:1012 Merge.rc:4530
+#: Merge.rc:1011 Merge.rc:1020 Merge.rc:4540
#, c-format
msgid "Left (%1 of %2)"
msgstr ""
#. IDS_DEL_MIDDLE_FMT2
-#: Merge.rc:1004 Merge.rc:1013 Merge.rc:4531
+#: Merge.rc:1012 Merge.rc:1021 Merge.rc:4541
#, c-format
msgid "Middle (%1 of %2)"
msgstr ""
#. IDS_DEL_RIGHT_FMT2
-#: Merge.rc:1005 Merge.rc:1014 Merge.rc:4532
+#: Merge.rc:1013 Merge.rc:1022 Merge.rc:4542
#, c-format
msgid "Right (%1 of %2)"
msgstr ""
#. IDS_DEL_BOTH_FMT2
-#: Merge.rc:1006 Merge.rc:1015 Merge.rc:4533
+#: Merge.rc:1014 Merge.rc:1023 Merge.rc:4543
#, c-format
msgid "Both (%1 of %2)"
msgstr ""
#. IDS_DEL_ALL_FMT2
-#: Merge.rc:1007 Merge.rc:1016 Merge.rc:4538
+#: Merge.rc:1015 Merge.rc:1024 Merge.rc:4548
#, c-format
msgid "All (%1 of %2)"
msgstr ""
#. IDR_POPUP_DIRVIEW, ID_DIR_COPY_FILENAMES
-#: Merge.rc:1009
+#: Merge.rc:1017
msgid "Copy &Filenames"
msgstr ""
#. IDR_POPUP_DIRVIEW
-#: Merge.rc:1010
+#: Merge.rc:1018
msgid "Copy Items to Clip&board"
msgstr ""
#. IDR_POPUP_DIRVIEW, ID_DIR_COPY_ALL_DISP_COLUMNS
-#: Merge.rc:1018
+#: Merge.rc:1026
msgid "Copy All Di&splayed Columns"
msgstr ""
#. IDR_POPUP_DIRVIEW
-#: Merge.rc:1020
+#: Merge.rc:1028
msgid "&Zip"
msgstr ""
#. IDS_COPY_BOTH_TO2
-#: Merge.rc:1025 Merge.rc:4516
+#: Merge.rc:1033 Merge.rc:4526
#, c-format
msgid "Both to... (%1 of %2)"
msgstr ""
#. IDS_COPY_ALL_TO2
-#: Merge.rc:1026 Merge.rc:4517
+#: Merge.rc:1034 Merge.rc:4527
#, c-format
msgid "All to... (%1 of %2)"
msgstr ""
#. IDS_COPY_DIFFERENCES_TO2
-#: Merge.rc:1027 Merge.rc:4518
+#: Merge.rc:1035 Merge.rc:4528
#, c-format
msgid "Differences to... (%1 of %2)"
msgstr ""
#. IDR_POPUP_DIRVIEW, ID_DIR_SHELL_CONTEXT_MENU_LEFT
-#: Merge.rc:1032
+#: Merge.rc:1040
msgid "Left Shell Menu"
msgstr ""
#. IDR_POPUP_DIRVIEW, ID_DIR_SHELL_CONTEXT_MENU_MIDDLE
-#: Merge.rc:1033
+#: Merge.rc:1041
msgid "Middle Shell Menu"
msgstr ""
#. IDR_POPUP_DIRVIEW, ID_DIR_SHELL_CONTEXT_MENU_RIGHT
-#: Merge.rc:1034
+#: Merge.rc:1042
msgid "Right Shell Menu"
msgstr ""
#. IDR_POPUP_DIRVIEW, ID_DIR_SHELL_CONTEXT_MENU_BOTH
-#: Merge.rc:1035
+#: Merge.rc:1043
msgid "Both Shell Menu"
msgstr ""
#. IDR_POPUP_DIRVIEW, ID_DIR_SHELL_CONTEXT_MENU_ALL
-#: Merge.rc:1036
+#: Merge.rc:1044
msgid "All Shell Menu"
msgstr ""
#. IDR_POPUP_EDITOR_HEADERBAR, ID_EDITOR_COPY
-#: Merge.rc:1050
+#: Merge.rc:1058
msgid "Copy"
msgstr ""
#. IDR_POPUP_EDITOR_HEADERBAR, ID_EDITOR_COPY_PATH
-#: Merge.rc:1051
+#: Merge.rc:1059
msgid "&Copy Full Path"
msgstr ""
#. IDR_POPUP_EDITOR_HEADERBAR, ID_EDITOR_COPY_FILENAME
-#: Merge.rc:1052
+#: Merge.rc:1060
msgid "Copy &Filename"
msgstr ""
#. IDR_POPUP_EDITOR_HEADERBAR, ID_EDITOR_EDIT_CAPTION
-#: Merge.rc:1053
+#: Merge.rc:1061
msgid "&Edit Caption\tF2"
msgstr ""
#. IDR_POPUP_EDITOR_HEADERBAR, ID_EDITOR_EDIT_PATH
-#: Merge.rc:1055
+#: Merge.rc:1063
msgid "Edit &Path\tCtrl+L"
msgstr ""
#. IDR_POPUP_EDITOR_HEADERBAR, ID_EDITOR_SELECT_FILE
-#: Merge.rc:1056
+#: Merge.rc:1064
msgid "&Open..."
msgstr ""
#. IDR_POPUP_PLUGINS_SETTINGS
-#: Merge.rc:1062
+#: Merge.rc:1070
msgid "Unpacker Settings"
msgstr ""
#. IDS_USERCHOICE_NONE
-#: Merge.rc:1064 Merge.rc:1070 Merge.rc:1789 Merge.rc:1793 Merge.rc:5030
+#: Merge.rc:1072 Merge.rc:1078 Merge.rc:1799 Merge.rc:1803 Merge.rc:5040
msgid ""
msgstr ""
#. IDS_USERCHOICE_AUTOMATIC
-#: Merge.rc:1065 Merge.rc:1071 Merge.rc:5031
+#: Merge.rc:1073 Merge.rc:1079 Merge.rc:5041
msgid ""
msgstr ""
#. IDD_OPEN, IDC_SELECT_PREDIFFER
-#: Merge.rc:1066 Merge.rc:1072 Merge.rc:1970 Merge.rc:1974
+#: Merge.rc:1074 Merge.rc:1080 Merge.rc:1980 Merge.rc:1984
msgid "&Select..."
msgstr ""
#. IDR_POPUP_PLUGINS_SETTINGS
-#: Merge.rc:1068
+#: Merge.rc:1076
msgid "Prediffer Settings"
msgstr ""
#. IDR_POPUP_LOCATIONBAR, ID_LOCBAR_GOTODIFF
-#: Merge.rc:1080
+#: Merge.rc:1088
msgid "G&o to Diff"
msgstr ""
#. IDR_POPUP_LOCATIONBAR, ID_LOCBAR_MOVECURSOR_ONCLICK
-#: Merge.rc:1083
+#: Merge.rc:1091
msgid "Move Cursor on &Click"
msgstr ""
#. IDR_POPUP_LOCATIONBAR, ID_DISPLAY_MOVED_NONE
-#: Merge.rc:1085
+#: Merge.rc:1093
msgid "&No Moved Blocks"
msgstr ""
#. IDR_POPUP_LOCATIONBAR, ID_DISPLAY_MOVED_ALL
-#: Merge.rc:1086
+#: Merge.rc:1094
msgid "&All Moved Blocks"
msgstr ""
#. IDR_POPUP_PROJECT_DIFF_OPTIONS
-#: Merge.rc:1094 Merge.rc:1127
+#: Merge.rc:1102 Merge.rc:1135
msgid "W&hitespaces"
msgstr ""
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_WHITESPACE_COMPARE
-#: Merge.rc:1096 Merge.rc:1129
+#: Merge.rc:1104 Merge.rc:1137
msgid "Com&pare"
msgstr ""
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_WHITESPACE_IGNORE
-#: Merge.rc:1097 Merge.rc:1130
+#: Merge.rc:1105 Merge.rc:1138
msgid "I&gnore Changes"
msgstr ""
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_WHITESPACE_IGNOREALL
-#: Merge.rc:1098 Merge.rc:1131
+#: Merge.rc:1106 Merge.rc:1139
msgid "Ig&nore All"
msgstr ""
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_IGNORE_BLANKLINES
-#: Merge.rc:1100 Merge.rc:1133
+#: Merge.rc:1108 Merge.rc:1141
msgid "Ignore Blan&k Lines"
msgstr ""
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_IGNORE_CASE
-#: Merge.rc:1101 Merge.rc:1134
+#: Merge.rc:1109 Merge.rc:1142
msgid "Ignore &Case"
msgstr ""
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_IGNORE_EOL
-#: Merge.rc:1102 Merge.rc:1135
+#: Merge.rc:1110 Merge.rc:1143
msgid "Igno&re EOL Differences (Windows/Unix/Mac)"
msgstr ""
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_IGNORE_CODEPAGE
-#: Merge.rc:1103 Merge.rc:1136
+#: Merge.rc:1111 Merge.rc:1144
msgid "Ignore Codepage &Differences"
msgstr ""
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_IGNORE_NUMBERS
-#: Merge.rc:1104 Merge.rc:1137
+#: Merge.rc:1112 Merge.rc:1145
msgid "Ignore Num&bers"
msgstr ""
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_IGNORE_COMMENTS
-#: Merge.rc:1105 Merge.rc:1138
+#: Merge.rc:1113 Merge.rc:1146
msgid "Ignore C&omment Differences"
msgstr ""
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_IGNORE_MISSING_TRAILING_EOL
-#: Merge.rc:1106 Merge.rc:1139
+#: Merge.rc:1114 Merge.rc:1147
msgid "Ignore &Missing Trailing EOL"
msgstr ""
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_IGNORE_LINE_BREAKS
-#: Merge.rc:1107 Merge.rc:1140
+#: Merge.rc:1115 Merge.rc:1148
msgid "Ignore Line &Breaks (Treat as Spaces)"
msgstr ""
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_RECURS_CHECK
-#: Merge.rc:1109 Merge.rc:2963
+#: Merge.rc:1117 Merge.rc:2973
msgid "&Include Subfolders"
msgstr ""
#. IDR_POPUP_PROJECT_DIFF_OPTIONS
-#: Merge.rc:1110 Merge.rc:1142
+#: Merge.rc:1118 Merge.rc:1150
msgid "&Compare Method"
msgstr ""
#. IDS_COMPMETHOD_FULL_CONTENTS
-#: Merge.rc:1112 Merge.rc:1144 Merge.rc:1328 Merge.rc:4282
+#: Merge.rc:1120 Merge.rc:1152 Merge.rc:1338 Merge.rc:4292
msgid "Full Contents"
msgstr ""
#. IDS_COMPMETHOD_QUICK_CONTENTS
-#: Merge.rc:1113 Merge.rc:1145 Merge.rc:1329 Merge.rc:4283
+#: Merge.rc:1121 Merge.rc:1153 Merge.rc:1339 Merge.rc:4293
msgid "Quick Contents"
msgstr ""
#. IDS_COMPMETHOD_BINARY_CONTENTS
-#: Merge.rc:1114 Merge.rc:1146 Merge.rc:1330 Merge.rc:4284
+#: Merge.rc:1122 Merge.rc:1154 Merge.rc:1340 Merge.rc:4294
msgid "Binary Contents"
msgstr ""
#. IDS_COMPMETHOD_MODDATE
-#: Merge.rc:1115 Merge.rc:1147 Merge.rc:1331 Merge.rc:4285
+#: Merge.rc:1123 Merge.rc:1155 Merge.rc:1341 Merge.rc:4295
msgid "Modified Date"
msgstr ""
#. IDS_COMPMETHOD_DATESIZE
-#: Merge.rc:1116 Merge.rc:1148 Merge.rc:1332 Merge.rc:4286
+#: Merge.rc:1124 Merge.rc:1156 Merge.rc:1342 Merge.rc:4296
msgid "Modified Date and Size"
msgstr ""
#. IDS_COMPMETHOD_SIZE
-#: Merge.rc:1117 Merge.rc:1149 Merge.rc:1333 Merge.rc:4287
+#: Merge.rc:1125 Merge.rc:1157 Merge.rc:1343 Merge.rc:4297
msgid "Size"
msgstr ""
#. IDS_COMPMETHOD_EXISTENCE
-#: Merge.rc:1118 Merge.rc:1150 Merge.rc:1334 Merge.rc:4288
+#: Merge.rc:1126 Merge.rc:1158 Merge.rc:1344 Merge.rc:4298
msgid "Existence"
msgstr ""
#. IDR_POPUP_PROJECT, ID_LOAD_PROJECT
-#: Merge.rc:1192
+#: Merge.rc:1202
msgid "&Load Project..."
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARGALL
-#: Merge.rc:1272 Merge.rc:1301
+#: Merge.rc:1282 Merge.rc:1311
msgid "${*} - All Arguments"
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARG1
-#: Merge.rc:1273 Merge.rc:1302
+#: Merge.rc:1283 Merge.rc:1312
msgid "${1} - First Argument"
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARG2
-#: Merge.rc:1274 Merge.rc:1303
+#: Merge.rc:1284 Merge.rc:1313
msgid "${2} - Second Argument"
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARG3
-#: Merge.rc:1275 Merge.rc:1304
+#: Merge.rc:1285 Merge.rc:1314
msgid "${3} - Third Argument"
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARG4
-#: Merge.rc:1276 Merge.rc:1305
+#: Merge.rc:1286 Merge.rc:1315
msgid "${4} - Fourth Argument"
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARG5
-#: Merge.rc:1277 Merge.rc:1306
+#: Merge.rc:1287 Merge.rc:1316
msgid "${5} - Fifth Argument"
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARG6
-#: Merge.rc:1278 Merge.rc:1307
+#: Merge.rc:1288 Merge.rc:1317
msgid "${6} - Sixth Argument"
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARG7
-#: Merge.rc:1279 Merge.rc:1308
+#: Merge.rc:1289 Merge.rc:1318
msgid "${7} - Seventh Argument"
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARG8
-#: Merge.rc:1280 Merge.rc:1309
+#: Merge.rc:1290 Merge.rc:1319
msgid "${8} - Eighth Argument"
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARG9
-#: Merge.rc:1281 Merge.rc:1310
+#: Merge.rc:1291 Merge.rc:1320
msgid "${9} - Ninth Argument"
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_SRC_FILE
-#: Merge.rc:1289
+#: Merge.rc:1299
msgid "${SRC_FILE} - Source File"
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_SRC_FOLDER
-#: Merge.rc:1290
+#: Merge.rc:1300
msgid "${SRC_FOLDER} - Source Folder"
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_SRC_URL
-#: Merge.rc:1291
+#: Merge.rc:1301
msgid "${SRC_URL} - Source URL"
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_SRC_URL_PROTOCOL
-#: Merge.rc:1292
+#: Merge.rc:1302
msgid "${SRC_URL_PROTOCOL} - Source URL Protocol"
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_SRC_URL_SUFFIX
-#: Merge.rc:1293
+#: Merge.rc:1303
msgid "${SRC_URL_SUFFIX} - Source URL Suffix"
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_DST_FILE
-#: Merge.rc:1294
+#: Merge.rc:1304
msgid "${DST_FILE} - Destination File"
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_DST_FOLDER
-#: Merge.rc:1295
+#: Merge.rc:1305
msgid "${DST_FOLDER} - Destination Folder"
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_DST_URL
-#: Merge.rc:1296
+#: Merge.rc:1306
msgid "${DST_URL} - Destination URL"
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_DST_URL_PROTOCOL
-#: Merge.rc:1297
+#: Merge.rc:1307
msgid "${DST_URL_PROTOCOL} - Destination URL Protocol"
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_DST_URL_SUFFIX
-#: Merge.rc:1298
+#: Merge.rc:1308
msgid "${DST_URL_SUFFIX} - Destination URL Suffix"
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_WINMERGE_HOME
-#: Merge.rc:1299
+#: Merge.rc:1309
msgid "${WINMERGE_HOME} - WinMerge Home Directory"
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_SCRIPT_FILE
-#: Merge.rc:1300
+#: Merge.rc:1310
msgid "${SCRIPT_FILE} - Script File"
msgstr ""
#. IDR_POPUP_PLUGIN_ADD_MENU, ID_PLUGIN_ADD_UNPACKER
-#: Merge.rc:1318
+#: Merge.rc:1328
msgid "Add &Unpacker Plugin..."
msgstr ""
#. IDR_POPUP_PLUGIN_ADD_MENU, ID_PLUGIN_ADD_PREDIFFER
-#: Merge.rc:1319
+#: Merge.rc:1329
msgid "Add &Prediffer Plugin..."
msgstr ""
#. IDR_POPUP_PLUGIN_ADD_MENU, ID_PLUGIN_DUPLICATE
-#: Merge.rc:1320
+#: Merge.rc:1330
msgid "&Duplicate Plugin..."
msgstr ""
#. IDR_POPUP_OUTPUTVIEW, ID_EDIT_CLEAR_ALL
-#: Merge.rc:1344
+#: Merge.rc:1354
msgid "Clear &All"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_MASK_CLEAR
-#: Merge.rc:1352
+#: Merge.rc:1362
msgid "&Clear All"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_MASK_REMOVE_LAST
-#: Merge.rc:1353
+#: Merge.rc:1363
msgid "Remove Last Filter &Group"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_MASK_ALL
-#: Merge.rc:1354
+#: Merge.rc:1364
msgid "R&eset to Default (*.*)"
msgstr ""
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1355
+#: Merge.rc:1365
msgid "Add E&xclude File"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_SYS
-#: Merge.rc:1357
+#: Merge.rc:1367
msgid "&System Files"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_BACKUP
-#: Merge.rc:1358
+#: Merge.rc:1368
msgid "&Editor Backup Files"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_BIN
-#: Merge.rc:1359
+#: Merge.rc:1369
msgid "&Compiled Binary Files"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_LOG
-#: Merge.rc:1360
+#: Merge.rc:1370
msgid "&Log Files"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_TEMP
-#: Merge.rc:1361
+#: Merge.rc:1371
msgid "&Temporary or Cache Files"
msgstr ""
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1363
+#: Merge.rc:1373
msgid "Add Excl&ude Folder"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FOLDER_VCS
-#: Merge.rc:1365
+#: Merge.rc:1375
msgid "&Version Control"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FOLDER_BUILD
-#: Merge.rc:1366
+#: Merge.rc:1376
msgid "&Build Artifacts"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FOLDER_IDE
-#: Merge.rc:1367
+#: Merge.rc:1377
msgid "&IDE"
msgstr ""
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1370
+#: Merge.rc:1380
msgid "Add &File Condition"
msgstr ""
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1372 Merge.rc:1551
+#: Merge.rc:1382 Merge.rc:1561
msgid "File &Size"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_SIZE, ID_FILTERMENU_DIFF_SIZE_LT_1KB
-#: Merge.rc:1374 Merge.rc:1527 Merge.rc:1564 Merge.rc:1629 Merge.rc:1707
+#: Merge.rc:1384 Merge.rc:1537 Merge.rc:1574 Merge.rc:1639 Merge.rc:1717
msgid "Less than 1KB"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_SIZE, ID_FILTERMENU_DIFF_SIZE_GE_1KB
-#: Merge.rc:1375 Merge.rc:1528 Merge.rc:1565 Merge.rc:1630 Merge.rc:1708
+#: Merge.rc:1385 Merge.rc:1538 Merge.rc:1575 Merge.rc:1640 Merge.rc:1718
msgid "1KB or more"
msgstr ""
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_LT_10KB
-#: Merge.rc:1376 Merge.rc:1529 Merge.rc:1631
+#: Merge.rc:1386 Merge.rc:1539 Merge.rc:1641
msgid "Less than 10KB"
msgstr ""
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_GE_10KB
-#: Merge.rc:1377 Merge.rc:1530 Merge.rc:1632
+#: Merge.rc:1387 Merge.rc:1540 Merge.rc:1642
msgid "10KB or more"
msgstr ""
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_LT_100KB
-#: Merge.rc:1378 Merge.rc:1531 Merge.rc:1633
+#: Merge.rc:1388 Merge.rc:1541 Merge.rc:1643
msgid "Less than 100KB"
msgstr ""
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_GE_100KB
-#: Merge.rc:1379 Merge.rc:1532 Merge.rc:1634
+#: Merge.rc:1389 Merge.rc:1542 Merge.rc:1644
msgid "100KB or more"
msgstr ""
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_LT_1MB
-#: Merge.rc:1380 Merge.rc:1533 Merge.rc:1635
+#: Merge.rc:1390 Merge.rc:1543 Merge.rc:1645
msgid "Less than 1MB"
msgstr ""
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_GE_1MB
-#: Merge.rc:1381 Merge.rc:1534 Merge.rc:1636
+#: Merge.rc:1391 Merge.rc:1544 Merge.rc:1646
msgid "1MB or more"
msgstr ""
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_LT_10MB
-#: Merge.rc:1382 Merge.rc:1535 Merge.rc:1637
+#: Merge.rc:1392 Merge.rc:1545 Merge.rc:1647
msgid "Less than 10MB"
msgstr ""
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_GE_10MB
-#: Merge.rc:1383 Merge.rc:1536 Merge.rc:1638
+#: Merge.rc:1393 Merge.rc:1546 Merge.rc:1648
msgid "10MB or more"
msgstr ""
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_LT_100MB
-#: Merge.rc:1384 Merge.rc:1537 Merge.rc:1639
+#: Merge.rc:1394 Merge.rc:1547 Merge.rc:1649
msgid "Less than 100MB"
msgstr ""
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_GE_100MB
-#: Merge.rc:1385 Merge.rc:1538 Merge.rc:1640
+#: Merge.rc:1395 Merge.rc:1548 Merge.rc:1650
msgid "100MB or more"
msgstr ""
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_LT_1GB
-#: Merge.rc:1386 Merge.rc:1539 Merge.rc:1641
+#: Merge.rc:1396 Merge.rc:1549 Merge.rc:1651
msgid "Less than 1GB"
msgstr ""
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_GE_1GB
-#: Merge.rc:1387 Merge.rc:1642
+#: Merge.rc:1397 Merge.rc:1652
msgid "1GB or more"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_RANGE
-#: Merge.rc:1388 Merge.rc:1465 Merge.rc:1517 Merge.rc:1523 Merge.rc:1540
-#: Merge.rc:1566 Merge.rc:1587 Merge.rc:1643 Merge.rc:1709 Merge.rc:1734
+#: Merge.rc:1398 Merge.rc:1475 Merge.rc:1527 Merge.rc:1533 Merge.rc:1550
+#: Merge.rc:1576 Merge.rc:1597 Merge.rc:1653 Merge.rc:1719 Merge.rc:1744
msgid "Custom Range..."
msgstr ""
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1390 Merge.rc:1471 Merge.rc:1568
+#: Merge.rc:1400 Merge.rc:1481 Merge.rc:1578
msgid "&Last Modified"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE
-#: Merge.rc:1392 Merge.rc:1473 Merge.rc:1651
+#: Merge.rc:1402 Merge.rc:1483 Merge.rc:1661
msgid "&Hour"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_HOUR_BEFORE_1
-#: Merge.rc:1394 Merge.rc:1475 Merge.rc:1653
+#: Merge.rc:1404 Merge.rc:1485 Merge.rc:1663
msgid "More than 1 hour ago"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_HOUR_WITHIN_1
-#: Merge.rc:1395 Merge.rc:1476 Merge.rc:1654
+#: Merge.rc:1405 Merge.rc:1486 Merge.rc:1664
msgid "Within 1 hour"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE
-#: Merge.rc:1397 Merge.rc:1478 Merge.rc:1656
+#: Merge.rc:1407 Merge.rc:1488 Merge.rc:1666
msgid "&Day"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_DAY_BEFORE_TODAY
-#: Merge.rc:1399 Merge.rc:1480 Merge.rc:1658
+#: Merge.rc:1409 Merge.rc:1490 Merge.rc:1668
msgid "Before today"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_DAY_TODAY
-#: Merge.rc:1400 Merge.rc:1481 Merge.rc:1659
+#: Merge.rc:1410 Merge.rc:1491 Merge.rc:1669
msgid "Today"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_DAY_BEFORE_YESTERDAY
-#: Merge.rc:1401 Merge.rc:1482 Merge.rc:1660
+#: Merge.rc:1411 Merge.rc:1492 Merge.rc:1670
msgid "Before yesterday"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_DAY_YESTERDAY
-#: Merge.rc:1402 Merge.rc:1483 Merge.rc:1661
+#: Merge.rc:1412 Merge.rc:1493 Merge.rc:1671
msgid "Yesterday"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_DAY_SINCE_YESTERDAY
-#: Merge.rc:1403 Merge.rc:1484 Merge.rc:1662
+#: Merge.rc:1413 Merge.rc:1494 Merge.rc:1672
msgid "Since yesterday"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE
-#: Merge.rc:1405 Merge.rc:1486 Merge.rc:1664
+#: Merge.rc:1415 Merge.rc:1496 Merge.rc:1674
msgid "&Week"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_WEEK_BEFORE_THIS
-#: Merge.rc:1407 Merge.rc:1488 Merge.rc:1666
+#: Merge.rc:1417 Merge.rc:1498 Merge.rc:1676
msgid "Before this week"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_WEEK_THIS
-#: Merge.rc:1408 Merge.rc:1489 Merge.rc:1667
+#: Merge.rc:1418 Merge.rc:1499 Merge.rc:1677
msgid "This week"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_WEEK_BEFORE_LAST
-#: Merge.rc:1409 Merge.rc:1490 Merge.rc:1668
+#: Merge.rc:1419 Merge.rc:1500 Merge.rc:1678
msgid "Before last week"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_WEEK_LAST
-#: Merge.rc:1410 Merge.rc:1491 Merge.rc:1669
+#: Merge.rc:1420 Merge.rc:1501 Merge.rc:1679
msgid "Last week"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_WEEK_SINCE_LAST
-#: Merge.rc:1411 Merge.rc:1492 Merge.rc:1670
+#: Merge.rc:1421 Merge.rc:1502 Merge.rc:1680
msgid "Since last week"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE
-#: Merge.rc:1413 Merge.rc:1494 Merge.rc:1672
+#: Merge.rc:1423 Merge.rc:1504 Merge.rc:1682
msgid "&Month"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_MONTH_BEFORE_THIS
-#: Merge.rc:1415 Merge.rc:1496 Merge.rc:1674
+#: Merge.rc:1425 Merge.rc:1506 Merge.rc:1684
msgid "Before this month"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_MONTH_THIS
-#: Merge.rc:1416 Merge.rc:1497 Merge.rc:1675
+#: Merge.rc:1426 Merge.rc:1507 Merge.rc:1685
msgid "This month"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_MONTH_BEFORE_LAST
-#: Merge.rc:1417 Merge.rc:1498 Merge.rc:1676
+#: Merge.rc:1427 Merge.rc:1508 Merge.rc:1686
msgid "Before last month"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_MONTH_LAST
-#: Merge.rc:1418 Merge.rc:1499 Merge.rc:1677
+#: Merge.rc:1428 Merge.rc:1509 Merge.rc:1687
msgid "Last month"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_MONTH_SINCE_LAST
-#: Merge.rc:1419 Merge.rc:1500 Merge.rc:1678
+#: Merge.rc:1429 Merge.rc:1510 Merge.rc:1688
msgid "Since last month"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE
-#: Merge.rc:1421 Merge.rc:1502 Merge.rc:1680
+#: Merge.rc:1431 Merge.rc:1512 Merge.rc:1690
msgid "&Year"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_YEAR_BEFORE_THIS
-#: Merge.rc:1423 Merge.rc:1504 Merge.rc:1682
+#: Merge.rc:1433 Merge.rc:1514 Merge.rc:1692
msgid "Before this year"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_YEAR_THIS
-#: Merge.rc:1424 Merge.rc:1505 Merge.rc:1683
+#: Merge.rc:1434 Merge.rc:1515 Merge.rc:1693
msgid "This year"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_YEAR_BEFORE_LAST
-#: Merge.rc:1425 Merge.rc:1506 Merge.rc:1684
+#: Merge.rc:1435 Merge.rc:1516 Merge.rc:1694
msgid "Before last year"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_YEAR_LAST
-#: Merge.rc:1426 Merge.rc:1507 Merge.rc:1685
+#: Merge.rc:1436 Merge.rc:1517 Merge.rc:1695
msgid "Last year"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_YEAR_SINCE_LAST
-#: Merge.rc:1427 Merge.rc:1508 Merge.rc:1686
+#: Merge.rc:1437 Merge.rc:1518 Merge.rc:1696
msgid "Since last year"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_RANGE
-#: Merge.rc:1429 Merge.rc:1510 Merge.rc:1688
+#: Merge.rc:1439 Merge.rc:1520 Merge.rc:1698
msgid "&Custom Range..."
msgstr ""
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1431 Merge.rc:1589
+#: Merge.rc:1441 Merge.rc:1599
msgid "&Attributes"
msgstr ""
#. IDR_POPUP_FILTERMENU_ATTR, ID_FILTERMENU_ATTR_READONLY
-#: Merge.rc:1433 Merge.rc:1607
+#: Merge.rc:1443 Merge.rc:1617
msgid "Read-only files"
msgstr ""
#. IDR_POPUP_FILTERMENU_ATTR, ID_FILTERMENU_ATTR_NOT_READONLY
-#: Merge.rc:1434 Merge.rc:1608
+#: Merge.rc:1444 Merge.rc:1618
msgid "Not read-only files"
msgstr ""
#. IDR_POPUP_FILTERMENU_ATTR, ID_FILTERMENU_ATTR_HIDDEN
-#: Merge.rc:1435 Merge.rc:1609
+#: Merge.rc:1445 Merge.rc:1619
msgid "Hidden files"
msgstr ""
#. IDR_POPUP_FILTERMENU_ATTR, ID_FILTERMENU_ATTR_NOT_HIDDEN
-#: Merge.rc:1436 Merge.rc:1610
+#: Merge.rc:1446 Merge.rc:1620
msgid "Not hidden files"
msgstr ""
#. IDR_POPUP_FILTERMENU_ATTR, ID_FILTERMENU_ATTR_SYSTEM
-#: Merge.rc:1437 Merge.rc:1611
+#: Merge.rc:1447 Merge.rc:1621
msgid "System files"
msgstr ""
#. IDR_POPUP_FILTERMENU_ATTR, ID_FILTERMENU_ATTR_NOT_SYSTEM
-#: Merge.rc:1438 Merge.rc:1612
+#: Merge.rc:1448 Merge.rc:1622
msgid "Not system files"
msgstr ""
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1440
+#: Merge.rc:1450
msgid "File &Content"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_CONTAINS
-#: Merge.rc:1442
+#: Merge.rc:1452
msgid "Contains string..."
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_NOT_CONTAINS
-#: Merge.rc:1443
+#: Merge.rc:1453
msgid "Does not contain string..."
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_FIRST_LINE_CONTAINS
-#: Merge.rc:1444
+#: Merge.rc:1454
msgid "First line contains string..."
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_FIRST_LINE_NOT_CONTAINS
-#: Merge.rc:1445
+#: Merge.rc:1455
msgid "First line does not contain string..."
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_FIRST_10_CONTAINS
-#: Merge.rc:1446
+#: Merge.rc:1456
msgid "First 10 lines contain string..."
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_FIRST_10_NOT_CONTAINS
-#: Merge.rc:1447
+#: Merge.rc:1457
msgid "First 10 lines do not contain string..."
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_LAST_10_CONTAINS
-#: Merge.rc:1448
+#: Merge.rc:1458
msgid "Last 10 lines contain string..."
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_LAST_10_NOT_CONTAINS
-#: Merge.rc:1449
+#: Merge.rc:1459
msgid "Last 10 lines do not contain string..."
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_LAST_LINE_CONTAINS
-#: Merge.rc:1450
+#: Merge.rc:1460
msgid "Last line contains string..."
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_LAST_LINE_NOT_CONTAINS
-#: Merge.rc:1451
+#: Merge.rc:1461
msgid "Last line does not contain string..."
msgstr ""
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1453
+#: Merge.rc:1463
msgid "&Line Count"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_LT_10
-#: Merge.rc:1455
+#: Merge.rc:1465
msgid "Less than 10"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_GE_10
-#: Merge.rc:1456
+#: Merge.rc:1466
msgid "10 or more"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_LT_100
-#: Merge.rc:1457
+#: Merge.rc:1467
msgid "Less than 100"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_GE_100
-#: Merge.rc:1458
+#: Merge.rc:1468
msgid "100 or more"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_LT_1000
-#: Merge.rc:1459
+#: Merge.rc:1469
msgid "Less than 1000"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_GE_1000
-#: Merge.rc:1460
+#: Merge.rc:1470
msgid "1000 or more"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_LT_10000
-#: Merge.rc:1461
+#: Merge.rc:1471
msgid "Less than 10000"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_GE_10000
-#: Merge.rc:1462
+#: Merge.rc:1472
msgid "10000 or more"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_LT_100000
-#: Merge.rc:1463
+#: Merge.rc:1473
msgid "Less than 100000"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_GE_100000
-#: Merge.rc:1464
+#: Merge.rc:1474
msgid "100000 or more"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_PROPS
-#: Merge.rc:1467 Merge.rc:1594 Merge.rc:1761 Merge.rc:1778
+#: Merge.rc:1477 Merge.rc:1604 Merge.rc:1771 Merge.rc:1788
msgid "Additional &Properties..."
msgstr ""
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1469
+#: Merge.rc:1479
msgid "Add F&older Condition"
msgstr ""
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1513
+#: Merge.rc:1523
msgid "&Files"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FOLDER_FILES_EQ_0
-#: Merge.rc:1515
+#: Merge.rc:1525
msgid "0 files"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FOLDER_FILES_GE_1
-#: Merge.rc:1516
+#: Merge.rc:1526
msgid "1 file or more"
msgstr ""
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1519
+#: Merge.rc:1529
msgid "&Items"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FOLDER_ITEMS_EQ_0
-#: Merge.rc:1521
+#: Merge.rc:1531
msgid "0 items"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FOLDER_ITEMS_GE_1
-#: Merge.rc:1522
+#: Merge.rc:1532
msgid "1 item or more"
msgstr ""
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1525
+#: Merge.rc:1535
msgid "&Total Size"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FOLDER_STATS_RECURSIVE
-#: Merge.rc:1542
+#: Merge.rc:1552
msgid "&Recursive"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONDITION_ANY
-#: Merge.rc:1544
+#: Merge.rc:1554
msgid "Target: &Any (Left/Middle/Right)"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONDITION_LEFT
-#: Merge.rc:1545
+#: Merge.rc:1555
msgid "Target: &Left"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONDITION_MIDDLE
-#: Merge.rc:1546
+#: Merge.rc:1556
msgid "Target: &Middle"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONDITION_RIGHT
-#: Merge.rc:1547
+#: Merge.rc:1557
msgid "Target: &Right"
msgstr ""
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1549
+#: Merge.rc:1559
msgid "Add &Difference Condition"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_PROP, ID_FILTERMENU_DIFF_PROP_EQUAL
-#: Merge.rc:1553 Merge.rc:1570 Merge.rc:1591 Merge.rc:1696 Merge.rc:1717
-#: Merge.rc:1742
+#: Merge.rc:1563 Merge.rc:1580 Merge.rc:1601 Merge.rc:1706 Merge.rc:1727
+#: Merge.rc:1752
msgid "Equal"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_PROP, ID_FILTERMENU_DIFF_PROP_NOT_EQUAL
-#: Merge.rc:1554 Merge.rc:1571 Merge.rc:1592 Merge.rc:1697 Merge.rc:1718
-#: Merge.rc:1743
+#: Merge.rc:1564 Merge.rc:1581 Merge.rc:1602 Merge.rc:1707 Merge.rc:1728
+#: Merge.rc:1753
msgid "Not Equal"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_PROP, ID_FILTERMENU_DIFF_PROP_LESS
-#: Merge.rc:1555 Merge.rc:1572 Merge.rc:1698 Merge.rc:1719 Merge.rc:1744
+#: Merge.rc:1565 Merge.rc:1582 Merge.rc:1708 Merge.rc:1729 Merge.rc:1754
msgid "Less Than"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_PROP, ID_FILTERMENU_DIFF_PROP_LESS_EQUAL
-#: Merge.rc:1556 Merge.rc:1573 Merge.rc:1699 Merge.rc:1720 Merge.rc:1745
+#: Merge.rc:1566 Merge.rc:1583 Merge.rc:1709 Merge.rc:1730 Merge.rc:1755
msgid "Less Than or Equal to"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_PROP, ID_FILTERMENU_DIFF_PROP_GREATER
-#: Merge.rc:1557 Merge.rc:1574 Merge.rc:1700 Merge.rc:1721 Merge.rc:1746
+#: Merge.rc:1567 Merge.rc:1584 Merge.rc:1710 Merge.rc:1731 Merge.rc:1756
msgid "Greater Than"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_PROP, ID_FILTERMENU_DIFF_PROP_GREATER_EQUAL
-#: Merge.rc:1558 Merge.rc:1575 Merge.rc:1701 Merge.rc:1722 Merge.rc:1747
+#: Merge.rc:1568 Merge.rc:1585 Merge.rc:1711 Merge.rc:1732 Merge.rc:1757
msgid "Greater Than or Equal to"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_SIZE, ID_FILTERMENU_DIFF_SIZE_LT_10B
-#: Merge.rc:1560 Merge.rc:1703
+#: Merge.rc:1570 Merge.rc:1713
msgid "Less than 10B"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_SIZE, ID_FILTERMENU_DIFF_SIZE_GE_10B
-#: Merge.rc:1561 Merge.rc:1704
+#: Merge.rc:1571 Merge.rc:1714
msgid "10B or more"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_SIZE, ID_FILTERMENU_DIFF_SIZE_LT_100B
-#: Merge.rc:1562 Merge.rc:1705
+#: Merge.rc:1572 Merge.rc:1715
msgid "Less than 100B"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_SIZE, ID_FILTERMENU_DIFF_SIZE_GE_100B
-#: Merge.rc:1563 Merge.rc:1706
+#: Merge.rc:1573 Merge.rc:1716
msgid "100B or more"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_LT_1SECOND
-#: Merge.rc:1577 Merge.rc:1724
+#: Merge.rc:1587 Merge.rc:1734
msgid "Less than 1 second"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_GE_1SECOND
-#: Merge.rc:1578 Merge.rc:1725
+#: Merge.rc:1588 Merge.rc:1735
msgid "1 second or more"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_LT_1MINUTE
-#: Merge.rc:1579 Merge.rc:1726
+#: Merge.rc:1589 Merge.rc:1736
msgid "Less than 1 minute"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_GE_1MINUTE
-#: Merge.rc:1580 Merge.rc:1727
+#: Merge.rc:1590 Merge.rc:1737
msgid "1 minute or more"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_LT_1HOUR
-#: Merge.rc:1581 Merge.rc:1728
+#: Merge.rc:1591 Merge.rc:1738
msgid "Less than 1 hour"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_GE_1HOUR
-#: Merge.rc:1582 Merge.rc:1729
+#: Merge.rc:1592 Merge.rc:1739
msgid "1 hour or more"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_LT_1DAY
-#: Merge.rc:1583 Merge.rc:1730
+#: Merge.rc:1593 Merge.rc:1740
msgid "Less than 1 day"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_GE_1DAY
-#: Merge.rc:1584 Merge.rc:1731
+#: Merge.rc:1594 Merge.rc:1741
msgid "1 day or more"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_LT_1WEEK
-#: Merge.rc:1585 Merge.rc:1732
+#: Merge.rc:1595 Merge.rc:1742
msgid "Less than 1 week"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_GE_1WEEK
-#: Merge.rc:1586 Merge.rc:1733
+#: Merge.rc:1596 Merge.rc:1743
msgid "1 week or more"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_CONDITION_DIFF_LEFT_RIGHT
-#: Merge.rc:1596
+#: Merge.rc:1606
msgid "Target: &Left and Right"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_CONDITION_DIFF_LEFT_MIDDLE
-#: Merge.rc:1597
+#: Merge.rc:1607
msgid "Target: Left and &Middle"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_CONDITION_DIFF_MIDDLE_RIGHT
-#: Merge.rc:1598
+#: Merge.rc:1608
msgid "Target: Middle and &Right"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_CONDITION_DIFF_ALL
-#: Merge.rc:1599
+#: Merge.rc:1609
msgid "Target: &All"
msgstr ""
#. IDR_POPUP_FILTERMENU_BINARY, ID_FILTERMENU_BINARY_ONLY
-#: Merge.rc:1620
+#: Merge.rc:1630
msgid "Binary files only"
msgstr ""
#. IDR_POPUP_FILTERMENU_BINARY, ID_FILTERMENU_TEXT_ONLY
-#: Merge.rc:1621
+#: Merge.rc:1631
msgid "Text files only"
msgstr ""
#. IDR_POPUP_ADDCMPMENU, ID_ADDCMPMENU_CLEAR
-#: Merge.rc:1755
+#: Merge.rc:1765
msgid "&Clear conditions"
msgstr ""
#. IDR_POPUP_ADDCMPMENU, ID_ADDCMPMENU_CMP_SIZE
-#: Merge.rc:1757
+#: Merge.rc:1767
msgid "Compare &Size"
msgstr ""
#. IDR_POPUP_ADDCMPMENU, ID_ADDCMPMENU_CMP_DATE
-#: Merge.rc:1758
+#: Merge.rc:1768
msgid "Compare &Date"
msgstr ""
#. IDR_POPUP_ADDCMPMENU, ID_ADDCMPMENU_CMP_ATTR
-#: Merge.rc:1759
+#: Merge.rc:1769
msgid "Compare &Attributes"
msgstr ""
#. IDR_POPUP_ADDCMPMENU, ID_ADDCMPMENU_CMP_CONTENTS
-#: Merge.rc:1760
+#: Merge.rc:1770
msgid "Compare C&ontents"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_CLEAR
-#: Merge.rc:1769
+#: Merge.rc:1779
msgid "&Clear Keys"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_NAME
-#: Merge.rc:1771
+#: Merge.rc:1781
msgid "&Name"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_BASENAME
-#: Merge.rc:1772
+#: Merge.rc:1782
msgid "&Base name (without extension)"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_NORMALIZED_NAME
-#: Merge.rc:1773
+#: Merge.rc:1783
msgid "Normalized &Unicode Name"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_RELPATH
-#: Merge.rc:1774
+#: Merge.rc:1784
msgid "&Relative Path"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_DATE
-#: Merge.rc:1776
+#: Merge.rc:1786
msgid "&Date"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_HASH_MD5
-#: Merge.rc:1777
+#: Merge.rc:1787
msgid "&Hash (MD5)"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_REPLACE
-#: Merge.rc:1780
+#: Merge.rc:1790
msgid "Insert &replace() Function"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_REGEXREPLACE
-#: Merge.rc:1781
+#: Merge.rc:1791
msgid "Insert rege&xReplace() Function"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU
-#: Merge.rc:1782
+#: Merge.rc:1792
msgid "Replace &Lists"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_CREATE_REPLACELIST
-#: Merge.rc:1784
+#: Merge.rc:1794
msgid "&Create String Replace List and Insert..."
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_CREATE_REGEXREPLACELIST
-#: Merge.rc:1785
+#: Merge.rc:1795
msgid "Create &Regex Replace List and Insert..."
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU
-#: Merge.rc:1787
+#: Merge.rc:1797
msgid "&String Replace Lists"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU
-#: Merge.rc:1791
+#: Merge.rc:1801
msgid "Re&gex Replace Lists"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_STRING_REPLACE_LISTS_FOLDER
-#: Merge.rc:1796
+#: Merge.rc:1806
msgid "Open String Replace Lists Folder..."
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_REGEX_REPLACE_LISTS_FOLDER
-#: Merge.rc:1797
+#: Merge.rc:1807
msgid "Open Regex Replace Lists Folder..."
msgstr ""
#. IDD_FILTERS_CONDITION, IDC_CONDITION_MATCHCASE
-#: Merge.rc:1799 Merge.rc:1995 Merge.rc:2014 Merge.rc:2042 Merge.rc:2585
+#: Merge.rc:1809 Merge.rc:2005 Merge.rc:2024 Merge.rc:2052 Merge.rc:2595
msgid "Match &case"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU
-#: Merge.rc:1801
+#: Merge.rc:1811
msgid "Text &Normalization"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_TOLOWER
-#: Merge.rc:1803
+#: Merge.rc:1813
msgid "&Lowercase"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_TOUPPER
-#: Merge.rc:1804
+#: Merge.rc:1814
msgid "&Uppercase"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_TOHALFWIDTH
-#: Merge.rc:1805
+#: Merge.rc:1815
msgid "&Half-width"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_TOFULLWIDTH
-#: Merge.rc:1806
+#: Merge.rc:1816
msgid "&Full-width"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU
-#: Merge.rc:1807
+#: Merge.rc:1817
msgid "&Chinese Conversion"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_TOSIMPLIFIEDCHINESE
-#: Merge.rc:1809
+#: Merge.rc:1819
msgid "&Simplified Chinese"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_TOTRADITIONALCHINESE
-#: Merge.rc:1810
+#: Merge.rc:1820
msgid "&Traditional Chinese"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU
-#: Merge.rc:1812
+#: Merge.rc:1822
msgid "&Japanese Conversion"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_TOHIRAGANA
-#: Merge.rc:1814
+#: Merge.rc:1824
msgid "&Hiragana"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_TOKATAKANA
-#: Merge.rc:1815
+#: Merge.rc:1825
msgid "&Katakana"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_NORMALIZEUNICODE
-#: Merge.rc:1817
+#: Merge.rc:1827
msgid "Normalize &Unicode"
msgstr ""
#. IDD_ABOUTBOX
-#: Merge.rc:1932
+#: Merge.rc:1942
msgid "About WinMerge"
msgstr ""
#. IDD_ABOUTBOX, IDC_WWW
-#: Merge.rc:1936
+#: Merge.rc:1946
msgid "Visit the WinMerge Homepage!"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN, IDOK
-#: Merge.rc:1938 Merge.rc:2080 Merge.rc:2431 Merge.rc:2455 Merge.rc:2469
-#: Merge.rc:2497 Merge.rc:2588 Merge.rc:2613 Merge.rc:2674 Merge.rc:2691
-#: Merge.rc:2703 Merge.rc:2867 Merge.rc:2927 Merge.rc:3062 Merge.rc:3104
-#: Merge.rc:3147 Merge.rc:3197
+#: Merge.rc:1948 Merge.rc:2090 Merge.rc:2441 Merge.rc:2465 Merge.rc:2479
+#: Merge.rc:2507 Merge.rc:2598 Merge.rc:2623 Merge.rc:2684 Merge.rc:2701
+#: Merge.rc:2713 Merge.rc:2877 Merge.rc:2937 Merge.rc:3072 Merge.rc:3114
+#: Merge.rc:3157 Merge.rc:3207
msgid "OK"
msgstr ""
#. IDD_ABOUTBOX, IDC_OPEN_CONTRIBUTORS
-#: Merge.rc:1939
+#: Merge.rc:1949
msgid "Contributors"
msgstr ""
#. IDD_SELECT_FILES_OR_FOLDERS
-#: Merge.rc:1945 Merge.rc:3070
+#: Merge.rc:1955 Merge.rc:3080
msgid "Select Files or Folders"
msgstr ""
#. IDD_OPEN, IDC_FILES_DIRS_GROUP0
-#: Merge.rc:1949
+#: Merge.rc:1959
msgid "&1st File or Folder"
msgstr ""
#. IDD_OPEN, IDC_PATH0_READONLY
-#: Merge.rc:1951
+#: Merge.rc:1961
msgid "Re&ad-only"
msgstr ""
#. IDD_OPEN, IDC_SWAP01_STATIC
-#: Merge.rc:1953
+#: Merge.rc:1963
msgid "Swap 1st | 2nd"
msgstr ""
#. IDD_GENERATE_PATCH, IDC_DIFF_BROWSE_FILE1
-#: Merge.rc:1954 Merge.rc:2310 Merge.rc:2413
+#: Merge.rc:1964 Merge.rc:2320 Merge.rc:2423
msgid "&Browse..."
msgstr ""
#. IDD_OPEN, IDC_FILES_DIRS_GROUP1
-#: Merge.rc:1955
+#: Merge.rc:1965
msgid "&2nd File or Folder"
msgstr ""
#. IDD_OPEN, IDC_PATH1_READONLY
-#: Merge.rc:1957
+#: Merge.rc:1967
msgid "Rea&d-only"
msgstr ""
#. IDD_OPEN, IDC_SWAP12_STATIC
-#: Merge.rc:1959
+#: Merge.rc:1969
msgid "Swap 2nd | 3rd"
msgstr ""
#. IDD_PROPPAGE_SYSTEM, IDC_FILTER_USER_BROWSE
-#: Merge.rc:1960 Merge.rc:2315
+#: Merge.rc:1970 Merge.rc:2325
msgid "B&rowse..."
msgstr ""
#. IDD_OPEN, IDC_FILES_DIRS_GROUP2
-#: Merge.rc:1961
+#: Merge.rc:1971
msgid "&3rd File or Folder (Optional)"
msgstr ""
#. IDD_OPEN, IDC_PATH2_READONLY
-#: Merge.rc:1963
+#: Merge.rc:1973
msgid "Read-o&nly"
msgstr ""
#. IDD_OPEN, IDC_SWAP02_STATIC
-#: Merge.rc:1965
+#: Merge.rc:1975
msgid "Swap 1st | 3rd"
msgstr ""
#. IDD_PROPPAGE_BACKUPS, IDC_BACKUP_BROWSE
-#: Merge.rc:1966 Merge.rc:2685 Merge.rc:2883
+#: Merge.rc:1976 Merge.rc:2695 Merge.rc:2893
msgid "Browse..."
msgstr ""
#. IDD_OPEN, IDC_FILES_DIRS_GROUP3
-#: Merge.rc:1968
+#: Merge.rc:1978
msgid " Folder: Filter"
msgstr ""
#. IDD_OPEN, IDC_RECURS_CHECK
-#: Merge.rc:1971
+#: Merge.rc:1981
msgid "&Include subfolders"
msgstr ""
#. IDD_OPEN, IDC_FILES_DIRS_GROUP5
-#: Merge.rc:1972
+#: Merge.rc:1982
msgid " File: Prediffer Plugin"
msgstr ""
#. IDD_OPEN, IDC_FILES_DIRS_GROUP4
-#: Merge.rc:1976
+#: Merge.rc:1986
msgid " File: Unpacker Plugin"
msgstr ""
#. IDD_OPEN, IDC_SELECT_UNPACKER
-#: Merge.rc:1978
+#: Merge.rc:1988
msgid "Se&lect..."
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN, IDCANCEL
-#: Merge.rc:1981 Merge.rc:2001 Merge.rc:2025 Merge.rc:2046 Merge.rc:2081
-#: Merge.rc:2432 Merge.rc:2456 Merge.rc:2470 Merge.rc:2498 Merge.rc:2551
-#: Merge.rc:2589 Merge.rc:2614 Merge.rc:2675 Merge.rc:2692 Merge.rc:2704
-#: Merge.rc:2868 Merge.rc:2928 Merge.rc:3087 Merge.rc:3105 Merge.rc:3148
-#: Merge.rc:3198
+#: Merge.rc:1991 Merge.rc:2011 Merge.rc:2035 Merge.rc:2056 Merge.rc:2091
+#: Merge.rc:2442 Merge.rc:2466 Merge.rc:2480 Merge.rc:2508 Merge.rc:2561
+#: Merge.rc:2599 Merge.rc:2624 Merge.rc:2685 Merge.rc:2702 Merge.rc:2714
+#: Merge.rc:2878 Merge.rc:2938 Merge.rc:3097 Merge.rc:3115 Merge.rc:3158
+#: Merge.rc:3208
msgid "Cancel"
msgstr ""
#. IDD_OPEN, IDC_OPEN_STATUS
-#: Merge.rc:1982
+#: Merge.rc:1992
msgid "Status:"
msgstr ""
#. IDD_PLUGINS_LIST, ID_HELP
-#: Merge.rc:1983 Merge.rc:2082 Merge.rc:2929
+#: Merge.rc:1993 Merge.rc:2092 Merge.rc:2939
msgid "Help"
msgstr ""
#. IDD_OPEN, IDC_OPTIONS
-#: Merge.rc:1984
+#: Merge.rc:1994
msgid "&Options..."
msgstr ""
#. IDD_EDIT_FIND
-#: Merge.rc:1989
+#: Merge.rc:1999
msgid "Find"
msgstr ""
#. IDD_EDIT_MARKER, IDC_STATIC
-#: Merge.rc:1992 Merge.rc:2009 Merge.rc:2037
+#: Merge.rc:2002 Merge.rc:2019 Merge.rc:2047
msgid "Fi&nd what:"
msgstr ""
#. IDD_EDIT_MARKER, IDC_EDIT_WHOLE_WORD
-#: Merge.rc:1994 Merge.rc:2013 Merge.rc:2041
+#: Merge.rc:2004 Merge.rc:2023 Merge.rc:2051
msgid "Match &whole word only"
msgstr ""
#. IDD_EDIT_MARKER, IDC_EDIT_REGEXP
-#: Merge.rc:1996 Merge.rc:2015 Merge.rc:2043
+#: Merge.rc:2006 Merge.rc:2025 Merge.rc:2053
msgid "Regular &expression"
msgstr ""
#. IDD_EDIT_FIND, IDC_FINDDLG_DONTWRAP
-#: Merge.rc:1997
+#: Merge.rc:2007
msgid "D&on't wrap end of file"
msgstr ""
#. IDD_EDIT_FIND, IDC_FINDDLG_DONTCLOSE
-#: Merge.rc:1998
+#: Merge.rc:2008
msgid "&Don't close this dialog"
msgstr ""
#. IDD_EDIT_REPLACE, IDC_EDIT_SKIP
-#: Merge.rc:1999 Merge.rc:2021
+#: Merge.rc:2009 Merge.rc:2031
msgid "&Find Next"
msgstr ""
#. IDD_EDIT_FIND, IDC_EDIT_FINDPREV
-#: Merge.rc:2000
+#: Merge.rc:2010
msgid "Find &Prev"
msgstr ""
#. IDD_EDIT_REPLACE
-#: Merge.rc:2006
+#: Merge.rc:2016
msgid "Replace"
msgstr ""
#. IDD_EDIT_REPLACE, IDC_STATIC
-#: Merge.rc:2011
+#: Merge.rc:2021
msgid "Re&place with:"
msgstr ""
#. IDD_EDIT_REPLACE, IDC_EDIT_SCOPE_DONT_WRAP
-#: Merge.rc:2016
+#: Merge.rc:2026
msgid "&Don't wrap at end of file"
msgstr ""
#. IDD_EDIT_REPLACE, IDC_STATIC
-#: Merge.rc:2018
+#: Merge.rc:2028
msgid "Replace in"
msgstr ""
#. IDD_EDIT_REPLACE, IDC_EDIT_SCOPE_WHOLE_FILE
-#: Merge.rc:2020
+#: Merge.rc:2030
msgid "Wh&ole file"
msgstr ""
#. IDD_EDIT_REPLACE, IDC_EDIT_FINDPREV
-#: Merge.rc:2022
+#: Merge.rc:2032
msgid "Find Pre&v"
msgstr ""
#. IDD_EDIT_REPLACE, IDC_EDIT_REPLACE
-#: Merge.rc:2023
+#: Merge.rc:2033
msgid "&Replace"
msgstr ""
#. IDD_EDIT_REPLACE, IDC_EDIT_REPLACE_ALL
-#: Merge.rc:2024
+#: Merge.rc:2034
msgid "Replace &All"
msgstr ""
#. IDS_OPTIONSPG_MARKERCOLORS
-#: Merge.rc:2030 Merge.rc:4209
+#: Merge.rc:2040 Merge.rc:4219
msgid "Markers"
msgstr ""
#. IDD_EDIT_MARKER, IDC_EDIT_MARKERS_ENABLED
-#: Merge.rc:2033
+#: Merge.rc:2043
msgid "Enable &markers"
msgstr ""
#. IDD_FILTERS_LINEFILTERS, IDC_LFILTER_ADDBTN
-#: Merge.rc:2035 Merge.rc:2057
+#: Merge.rc:2045 Merge.rc:2067
msgid "New"
msgstr ""
#. IDD_EDIT_MARKER, IDC_STATIC
-#: Merge.rc:2039
+#: Merge.rc:2049
msgid "&Background color:"
msgstr ""
#. IDS_MESSAGEBOX_OK
-#: Merge.rc:2044 Merge.rc:2829 Merge.rc:3086 Merge.rc:4171
+#: Merge.rc:2054 Merge.rc:2839 Merge.rc:3096 Merge.rc:4181
msgid "&Ok"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:2045 Merge.rc:2525 Merge.rc:3199
+#: Merge.rc:2055 Merge.rc:2535 Merge.rc:3209
msgid "&Apply"
msgstr ""
#. IDD_FILTERS_LINEFILTERS
-#: Merge.rc:2051
+#: Merge.rc:2061
msgid "Line Filters"
msgstr ""
#. IDD_FILTERS_LINEFILTERS, IDC_IGNOREREGEXP
-#: Merge.rc:2054
+#: Merge.rc:2064
msgid "Enable Line Filters"
msgstr ""
#. IDD_FILTERS_LINEFILTERS, IDC_STATIC
-#: Merge.rc:2055
+#: Merge.rc:2065
msgid "Regular Expressions (one per line):"
msgstr ""
#. IDD_PLUGINS_LIST, IDC_PLUGIN_EDIT
-#: Merge.rc:2058 Merge.rc:2924
+#: Merge.rc:2068 Merge.rc:2934
msgid "Edit"
msgstr ""
#. IDD_PLUGINS_LIST, IDC_PLUGIN_REMOVE
-#: Merge.rc:2059 Merge.rc:2071 Merge.rc:2925
+#: Merge.rc:2069 Merge.rc:2081 Merge.rc:2935
msgid "Remove"
msgstr ""
#. IDD_FILTERS_SUBSTITUTIONFILTERS
-#: Merge.rc:2064
+#: Merge.rc:2074
msgid "Substitution Filters"
msgstr ""
#. IDD_FILTERS_SUBSTITUTIONFILTERS, IDC_STATIC
-#: Merge.rc:2067
+#: Merge.rc:2077
msgid "Changes to the listed pairs below will be ignored or marked as insignificant. Patches are unaffected."
msgstr ""
#. IDD_FILTERS_SUBSTITUTIONFILTERS, IDC_IGNORED_SUSBSTITUTIONS_ENABLED
-#: Merge.rc:2068
+#: Merge.rc:2078
msgid "Enable"
msgstr ""
#. IDD_PLUGINS_LIST, IDC_PLUGIN_ADD
-#: Merge.rc:2070 Merge.rc:2923
+#: Merge.rc:2080 Merge.rc:2933
msgid "Add"
msgstr ""
#. IDD_FILTERS_SUBSTITUTIONFILTERS, IDC_LFILTER_CLEARBTN
-#: Merge.rc:2072
+#: Merge.rc:2082
msgid "Clear"
msgstr ""
#. IDD_PREFERENCES
-#: Merge.rc:2077
+#: Merge.rc:2087
msgid "Options"
msgstr ""
#. IDD_PREFERENCES, IDC_TREEOPT_IMPORT
-#: Merge.rc:2086
+#: Merge.rc:2096
msgid "Import..."
msgstr ""
#. IDD_PREFERENCES, IDC_TREEOPT_EXPORT
-#: Merge.rc:2087
+#: Merge.rc:2097
msgid "Export..."
msgstr ""
#. IDS_OPTIONSPG_GENCOMPARE
-#: Merge.rc:2092 Merge.rc:4199 Merge.rc:4202 Merge.rc:4219
+#: Merge.rc:2102 Merge.rc:4209 Merge.rc:4212 Merge.rc:4229
msgid "General"
msgstr ""
#. IDD_PROPPAGE_GENERAL, IDC_SCROLL_CHECK
-#: Merge.rc:2095
+#: Merge.rc:2105
msgid "Automatically &scroll to first difference"
msgstr ""
#. IDD_PROPPAGE_GENERAL, IDC_SCROLL_TO_FIRST_INLINE_DIFF_CHECK
-#: Merge.rc:2097
+#: Merge.rc:2107
msgid "Automatically s&croll to first inline difference"
msgstr ""
#. IDD_PROPPAGE_GENERAL, IDC_STATIC
-#: Merge.rc:2099
+#: Merge.rc:2109
msgid "Cl&ose windows with 'Esc':"
msgstr ""
#. IDD_PROPPAGE_GENERAL, IDC_VERIFY_OPEN_PATHS
-#: Merge.rc:2101
+#: Merge.rc:2111
msgid "&Automatically verify paths in Open dialog"
msgstr ""
#. IDD_PROPPAGE_GENERAL, IDC_STATIC
-#: Merge.rc:2103
+#: Merge.rc:2113
msgid "Single instance mode:"
msgstr ""
#. IDD_PROPPAGE_GENERAL, IDC_ASK_MULTIWINDOW_CLOSE
-#: Merge.rc:2105
+#: Merge.rc:2115
msgid "As&k when closing multiple windows"
msgstr ""
#. IDD_PROPPAGE_GENERAL, IDC_PRESERVE_FILETIME
-#: Merge.rc:2107
+#: Merge.rc:2117
msgid "&Preserve file time in file compare"
msgstr ""
#. IDD_PROPPAGE_GENERAL, IDC_STARTUP_FOLDER_SELECT
-#: Merge.rc:2109
+#: Merge.rc:2119
msgid "Show \"Select Files or Folders\" dialog on startup"
msgstr ""
#. IDD_PROPPAGE_GENERAL, IDC_CLOSE_WITH_OK
-#: Merge.rc:2111
+#: Merge.rc:2121
msgid "Close \"Select Files or Folders\" dialog on clicking Compare button"
msgstr ""
#. IDD_PROPPAGE_GENERAL, IDC_STATIC
-#: Merge.rc:2113
+#: Merge.rc:2123
msgid "Op&en dialog Auto completion:"
msgstr ""
#. IDD_PROPPAGE_GENERAL, IDC_STATIC
-#: Merge.rc:2115
+#: Merge.rc:2125
msgid "Auto-&reload modified files:"
msgstr ""
#. IDD_PROPPAGE_GENERAL, IDC_STATIC
-#: Merge.rc:2117
+#: Merge.rc:2127
msgid "Language:"
msgstr ""
#. IDD_PROPPAGE_COMPARE_WEBPAGE, IDC_COMPARE_DEFAULTS
-#: Merge.rc:2119 Merge.rc:2299 Merge.rc:2321 Merge.rc:2352 Merge.rc:2369
-#: Merge.rc:2386 Merge.rc:2394 Merge.rc:2430 Merge.rc:2454 Merge.rc:2633
-#: Merge.rc:2644 Merge.rc:2653 Merge.rc:2887 Merge.rc:2922 Merge.rc:2985
-#: Merge.rc:3010 Merge.rc:3024 Merge.rc:3038 Merge.rc:3054
+#: Merge.rc:2129 Merge.rc:2309 Merge.rc:2331 Merge.rc:2362 Merge.rc:2379
+#: Merge.rc:2396 Merge.rc:2404 Merge.rc:2440 Merge.rc:2464 Merge.rc:2643
+#: Merge.rc:2654 Merge.rc:2663 Merge.rc:2897 Merge.rc:2932 Merge.rc:2995
+#: Merge.rc:3020 Merge.rc:3034 Merge.rc:3048 Merge.rc:3064
msgid "Defaults"
msgstr ""
#. IDS_OPTIONSPG_COLORS
-#: Merge.rc:2124 Merge.rc:2140 Merge.rc:2267 Merge.rc:2292 Merge.rc:4205
+#: Merge.rc:2134 Merge.rc:2150 Merge.rc:2277 Merge.rc:2302 Merge.rc:4215
msgid "Colors"
msgstr ""
#. IDD_PROPPAGE_COLOR_SCHEMES, IDC_STATIC
-#: Merge.rc:2127
+#: Merge.rc:2137
msgid "Color &mode:"
msgstr ""
#. IDD_PROPPAGE_COLOR_SCHEMES, IDC_STATIC
-#: Merge.rc:2129
+#: Merge.rc:2139
msgid "&Light mode scheme:"
msgstr ""
#. IDD_PROPPAGE_COLOR_SCHEMES, IDC_STATIC
-#: Merge.rc:2131
+#: Merge.rc:2141
msgid "&Dark mode scheme:"
msgstr ""
#. IDD_PROPPAGE_COLOR_SCHEMES, IDC_STATIC
-#: Merge.rc:2133
+#: Merge.rc:2143
msgid "Your custom schemes"
msgstr ""
#. IDD_PROPPAGE_COLOR_SCHEMES, IDC_COLOR_SCHEME_SAVE
-#: Merge.rc:2134
+#: Merge.rc:2144
msgid "&Save current scheme..."
msgstr ""
#. IDD_PROPPAGE_COLOR_SCHEMES, IDC_COLOR_SCHEME_DELETE
-#: Merge.rc:2135
+#: Merge.rc:2145
msgid "Delete ¤t scheme..."
msgstr ""
#. IDD_PROPPAGE_COLORS_DIR, IDC_BACKGROUND_COLUMN_LABEL
-#: Merge.rc:2143 Merge.rc:2238 Merge.rc:2258 Merge.rc:2272
+#: Merge.rc:2153 Merge.rc:2248 Merge.rc:2268 Merge.rc:2282
msgid "Background"
msgstr ""
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2144
+#: Merge.rc:2154
msgid "Deleted"
msgstr ""
#. IDS_OPTIONSPG_TEXTCOLORS
-#: Merge.rc:2145 Merge.rc:2207 Merge.rc:2239 Merge.rc:2273 Merge.rc:4207
+#: Merge.rc:2155 Merge.rc:2217 Merge.rc:2249 Merge.rc:2283 Merge.rc:4217
msgid "Text"
msgstr ""
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2146
+#: Merge.rc:2156
msgid "Difference:"
msgstr ""
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2151
+#: Merge.rc:2161
msgid "Selected Difference:"
msgstr ""
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2156
+#: Merge.rc:2166
msgid "Ignored Difference:"
msgstr ""
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2161
+#: Merge.rc:2171
msgid "Moved:"
msgstr ""
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2166
+#: Merge.rc:2176
msgid "Selected Moved:"
msgstr ""
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2171
+#: Merge.rc:2181
msgid "Same As Next (3 panes):"
msgstr ""
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2176
+#: Merge.rc:2186
msgid "Same As Next (Selected):"
msgstr ""
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2181
+#: Merge.rc:2191
msgid "Word Difference:"
msgstr ""
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2186
+#: Merge.rc:2196
msgid "Selected Word Diff:"
msgstr ""
#. IDD_INPUTBOX
-#: Merge.rc:2195 Merge.rc:2230 Merge.rc:2251 Merge.rc:3099
+#: Merge.rc:2205 Merge.rc:2240 Merge.rc:2261 Merge.rc:3109
msgid "Dialog"
msgstr ""
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC
-#: Merge.rc:2198
+#: Merge.rc:2208
msgid "Keywords:"
msgstr ""
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC
-#: Merge.rc:2199
+#: Merge.rc:2209
msgid "Function names:"
msgstr ""
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC
-#: Merge.rc:2200
+#: Merge.rc:2210
msgid "Comments:"
msgstr ""
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC
-#: Merge.rc:2201
+#: Merge.rc:2211
msgid "Numbers:"
msgstr ""
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC
-#: Merge.rc:2202
+#: Merge.rc:2212
msgid "Operators:"
msgstr ""
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC
-#: Merge.rc:2203
+#: Merge.rc:2213
msgid "Strings:"
msgstr ""
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC
-#: Merge.rc:2204
+#: Merge.rc:2214
msgid "Preprocessor:"
msgstr ""
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC
-#: Merge.rc:2205
+#: Merge.rc:2215
msgid "User 1:"
msgstr ""
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC
-#: Merge.rc:2206
+#: Merge.rc:2216
msgid "User 2:"
msgstr ""
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_SCOLOR_USER2_BOLD
-#: Merge.rc:2209 Merge.rc:2211 Merge.rc:2213 Merge.rc:2215 Merge.rc:2217
-#: Merge.rc:2219 Merge.rc:2221 Merge.rc:2223 Merge.rc:2225
+#: Merge.rc:2219 Merge.rc:2221 Merge.rc:2223 Merge.rc:2225 Merge.rc:2227
+#: Merge.rc:2229 Merge.rc:2231 Merge.rc:2233 Merge.rc:2235
msgid "Bold"
msgstr ""
#. IDD_PROPPAGE_COLORS_TEXT, IDC_DEFAULT_STANDARD_COLORS
-#: Merge.rc:2233
+#: Merge.rc:2243
msgid "&Use customized text colors"
msgstr ""
#. IDD_PROPPAGE_COLORS_TEXT, IDC_WHITESPACE_COLOR_LABEL
-#: Merge.rc:2235
+#: Merge.rc:2245
msgid "Whitespace:"
msgstr ""
#. IDD_PROPPAGE_COLORS_TEXT, IDC_TEXT_COLOR_LABEL
-#: Merge.rc:2236
+#: Merge.rc:2246
msgid "Regular text:"
msgstr ""
#. IDD_PROPPAGE_COLORS_TEXT, IDC_SELECTION_COLOR_LABEL
-#: Merge.rc:2237
+#: Merge.rc:2247
msgid "Selection:"
msgstr ""
#. IDD_PROPPAGE_COLORS_DIR, IDC_STATIC
-#: Merge.rc:2245 Merge.rc:2286
+#: Merge.rc:2255 Merge.rc:2296
msgid "Margin:"
msgstr ""
#. IDD_PROPPAGE_COLORS_MARKER, IDC_MARKER0_COLOR_LABEL
-#: Merge.rc:2254
+#: Merge.rc:2264
msgid "Search Marker:"
msgstr ""
#. IDD_PROPPAGE_COLORS_MARKER, IDC_MARKER1_COLOR_LABEL
-#: Merge.rc:2255
+#: Merge.rc:2265
msgid "User Defined Marker 1:"
msgstr ""
#. IDD_PROPPAGE_COLORS_MARKER, IDC_MARKER2_COLOR_LABEL
-#: Merge.rc:2256
+#: Merge.rc:2266
msgid "User Defined Marker 2:"
msgstr ""
#. IDD_PROPPAGE_COLORS_MARKER, IDC_MARKER3_COLOR_LABEL
-#: Merge.rc:2257
+#: Merge.rc:2267
msgid "User Defined Marker 3:"
msgstr ""
#. IDD_PROPPAGE_COLORS_DIR, IDC_USE_DIR_COMPARE_COLORS
-#: Merge.rc:2270
+#: Merge.rc:2280
msgid "&Use folder compare colors"
msgstr ""
#. IDD_PROPPAGE_COLORS_DIR, IDC_STATIC
-#: Merge.rc:2274
+#: Merge.rc:2284
msgid "Items equal:"
msgstr ""
#. IDD_PROPPAGE_COLORS_DIR, IDC_STATIC
-#: Merge.rc:2277
+#: Merge.rc:2287
msgid "Items different:"
msgstr ""
#. IDD_PROPPAGE_COLORS_DIR, IDC_STATIC
-#: Merge.rc:2280
+#: Merge.rc:2290
msgid "Items missing:"
msgstr ""
#. IDD_PROPPAGE_COLORS_DIR, IDC_STATIC
-#: Merge.rc:2283
+#: Merge.rc:2293
msgid "Items filtered:"
msgstr ""
#. IDD_PROPPAGE_COLORS_SYSTEM, IDC_SYSCOLOR_HOOK_ENABLED
-#: Merge.rc:2295
+#: Merge.rc:2305
msgid "&Use custom system colors"
msgstr ""
#. IDS_PRPCAT_SYSTEM
-#: Merge.rc:2304 Merge.rc:4211 Merge.rc:4212 Merge.rc:4657
+#: Merge.rc:2314 Merge.rc:4221 Merge.rc:4222 Merge.rc:4667
msgid "System"
msgstr ""
#. IDD_PROPPAGE_SYSTEM, IDC_USE_RECYCLE_BIN
-#: Merge.rc:2307
+#: Merge.rc:2317
msgid "&Use Recycle Bin"
msgstr ""
#. IDD_PROPPAGE_SYSTEM, IDC_STATIC
-#: Merge.rc:2308
+#: Merge.rc:2318
msgid "&External editor:"
msgstr ""
#. IDD_PROPPAGE_SYSTEM, IDC_STATIC
-#: Merge.rc:2311
+#: Merge.rc:2321
msgid "&Store user data in:"
msgstr ""
#. IDD_PROPPAGE_SYSTEM, IDC_STATIC
-#: Merge.rc:2313
+#: Merge.rc:2323
msgid "&Filter folder:"
msgstr ""
#. IDD_PROPPAGE_SYSTEM, IDC_STATIC
-#: Merge.rc:2316
+#: Merge.rc:2326
msgid "Temporary files folder"
msgstr ""
#. IDD_PROPPAGE_SYSTEM, IDC_TMPFOLDER_SYSTEM
-#: Merge.rc:2317
+#: Merge.rc:2327
msgid "S&ystem temp folder"
msgstr ""
#. IDD_PROPPAGE_SYSTEM, IDC_STATIC
-#: Merge.rc:2318
+#: Merge.rc:2328
msgid "C&ustom folder:"
msgstr ""
#. IDD_GENERATE_PATCH, IDC_DIFF_BROWSE_FILE2
-#: Merge.rc:2320 Merge.rc:2416
+#: Merge.rc:2330 Merge.rc:2426
msgid "Br&owse..."
msgstr ""
#. IDS_OPTIONSPG_COMPARE
-#: Merge.rc:2326 Merge.rc:4200
+#: Merge.rc:2336 Merge.rc:4210
msgid "Compare"
msgstr ""
#. IDD_PROPPAGE_COMPARE, IDC_STATIC
-#: Merge.rc:2329
+#: Merge.rc:2339
msgid "Whitespaces"
msgstr ""
#. IDD_PROPPAGE_COMPARE, IDC_WHITESPACE
-#: Merge.rc:2330
+#: Merge.rc:2340
msgid "&Compare"
msgstr ""
#. IDD_PROPPAGE_COMPARE, IDC_WHITE_CHANGE
-#: Merge.rc:2331
+#: Merge.rc:2341
msgid "&Ignore change"
msgstr ""
#. IDD_PROPPAGE_COMPARE, IDC_ALL_WHITE
-#: Merge.rc:2332
+#: Merge.rc:2342
msgid "I&gnore all"
msgstr ""
#. IDD_PROPPAGE_COMPARE, IDC_IGNBLANKS_CHECK
-#: Merge.rc:2333
+#: Merge.rc:2343
msgid "Ignore blan&k lines"
msgstr ""
#. IDD_PROPPAGE_COMPARE, IDC_IGNCASE_CHECK
-#: Merge.rc:2334
+#: Merge.rc:2344
msgid "Ignore &case"
msgstr ""
#. IDD_PROPPAGE_COMPARE, IDC_EOL_SENSITIVE
-#: Merge.rc:2335
+#: Merge.rc:2345
msgid "Igno&re EOL differences (Windows/Unix/Mac)"
msgstr ""
#. IDD_PROPPAGE_COMPARE, IDC_IGNORE_NUMBERS
-#: Merge.rc:2337
+#: Merge.rc:2347
msgid "Ignore num&bers"
msgstr ""
#. IDD_PROPPAGE_COMPARE, IDC_CP_SENSITIVE
-#: Merge.rc:2338
+#: Merge.rc:2348
msgid "Ignore codepage &differences"
msgstr ""
#. IDD_PROPPAGE_COMPARE, IDC_FILTERCOMMENTS_CHECK
-#: Merge.rc:2339
+#: Merge.rc:2349
msgid "Ignore c&omment differences"
msgstr ""
#. IDD_PROPPAGE_COMPARE, IDC_IGNEOFEOL_CHECK
-#: Merge.rc:2341
+#: Merge.rc:2351
msgid "Ignore &missing trailing EOL"
msgstr ""
#. IDD_PROPPAGE_COMPARE, IDC_IGNLBRKS_CHECK
-#: Merge.rc:2343
+#: Merge.rc:2353
msgid "Ignore line &breaks (treat as spaces)"
msgstr ""
#. IDD_PROPPAGE_COMPARE, IDC_MOVED_BLOCKS
-#: Merge.rc:2345
+#: Merge.rc:2355
msgid "E&nable moved block detection"
msgstr ""
#. IDD_PROPPAGE_COMPARE, IDC_ALIGN_SIMILAR_LINES
-#: Merge.rc:2346
+#: Merge.rc:2356
msgid "Align &similar lines"
msgstr ""
#. IDD_PROPPAGE_COMPARE, IDC_STATIC
-#: Merge.rc:2347
+#: Merge.rc:2357
msgid "Diff &algorithm:"
msgstr ""
#. IDD_PROPPAGE_COMPARE, IDC_INDENT_HEURISTIC
-#: Merge.rc:2349
+#: Merge.rc:2359
msgid "Enable indent &heuristic"
msgstr ""
#. IDD_PROPPAGE_COMPARE, IDC_COMPLETELY_BLANK_OUT_IGNORED_DIFFERENCES
-#: Merge.rc:2350
+#: Merge.rc:2360
msgid "Completely unhighlight the ignored differences"
msgstr ""
#. IDS_OPTIONSPG_EDITOR
-#: Merge.rc:2357 Merge.rc:4201
+#: Merge.rc:2367 Merge.rc:4211
msgid "Editor"
msgstr ""
#. IDD_PROPPAGE_EDITOR, IDC_HILITE_CHECK
-#: Merge.rc:2360
+#: Merge.rc:2370
msgid "&Highlight syntax"
msgstr ""
#. IDD_PROPPAGE_EDITOR, IDC_MIXED_EOL
-#: Merge.rc:2361
+#: Merge.rc:2371
msgid "&Preserve original EOL"
msgstr ""
#. IDD_PROPPAGE_EDITOR, IDC_STATIC
-#: Merge.rc:2362
+#: Merge.rc:2372
msgid "Tabs"
msgstr ""
#. IDD_PROPPAGE_EDITOR, IDC_STATIC
-#: Merge.rc:2363
+#: Merge.rc:2373
msgid "&Tab size:"
msgstr ""
#. IDD_PROPPAGE_EDITOR, IDC_PROP_INSERT_TABS
-#: Merge.rc:2365
+#: Merge.rc:2375
msgid "&Insert tabs"
msgstr ""
#. IDD_PROPPAGE_EDITOR, IDC_PROP_INSERT_SPACES
-#: Merge.rc:2366
+#: Merge.rc:2376
msgid "Insert &spaces"
msgstr ""
#. IDD_PROPPAGE_EDITOR, IDC_STATIC
-#: Merge.rc:2367
+#: Merge.rc:2377
msgid "&Rendering mode:"
msgstr ""
#. IDD_PROPPAGE_EDITOR_COMPAREMERGE, IDC_AUTOMRESCAN_CHECK
-#: Merge.rc:2376
+#: Merge.rc:2386
msgid "&Automatic rescan"
msgstr ""
#. IDD_PROPPAGE_EDITOR_COMPAREMERGE, IDC_STATIC
-#: Merge.rc:2377
+#: Merge.rc:2387
msgid "Copy &granularity for selected differences:"
msgstr ""
#. IDD_PROPPAGE_EDITOR_COMPAREMERGE, IDC_LINE_COLORING_GROUP
-#: Merge.rc:2379
+#: Merge.rc:2389
msgid "Line Difference Coloring"
msgstr ""
#. IDD_PROPPAGE_EDITOR_COMPAREMERGE, IDC_VIEW_LINE_DIFFERENCES
-#: Merge.rc:2380
+#: Merge.rc:2390
msgid "View line differences"
msgstr ""
#. IDD_PROPPAGE_EDITOR_COMPAREMERGE, IDC_EDITOR_CHARLEVEL
-#: Merge.rc:2381
+#: Merge.rc:2391
msgid "&Character-level"
msgstr ""
#. IDD_PROPPAGE_EDITOR_COMPAREMERGE, IDC_EDITOR_WORDLEVEL
-#: Merge.rc:2382
+#: Merge.rc:2392
msgid "&Word-level:"
msgstr ""
#. IDD_PROPPAGE_EDITOR_COMPAREMERGE, IDC_STATIC
-#: Merge.rc:2384
+#: Merge.rc:2394
msgid "W&ord break characters:"
msgstr ""
#. IDD_PROPPAGE_MESSAGEBOXES, IDC_STATIC
-#: Merge.rc:2401
+#: Merge.rc:2411
msgid "Some messages can be hidden by the user. Press Reset to make all messages visible again."
msgstr ""
#. IDD_SELECT_FILES_OR_FOLDERS, IDC_RESET
-#: Merge.rc:2402 Merge.rc:3085
+#: Merge.rc:2412 Merge.rc:3095
msgid "Reset"
msgstr ""
#. IDD_GENERATE_PATCH
-#: Merge.rc:2408
+#: Merge.rc:2418
msgid "Patch Generator"
msgstr ""
#. IDD_GENERATE_PATCH, IDC_STATIC
-#: Merge.rc:2411
+#: Merge.rc:2421
msgid "File&1:"
msgstr ""
#. IDD_GENERATE_PATCH, IDC_STATIC
-#: Merge.rc:2414
+#: Merge.rc:2424
msgid "File&2:"
msgstr ""
#. IDD_GENERATE_PATCH, IDC_DIFF_SWAPFILES
-#: Merge.rc:2417
+#: Merge.rc:2427
msgid "&Swap"
msgstr ""
#. IDD_DIRCMP_REPORT, IDC_REPORT_COPYCLIPBOARD
-#: Merge.rc:2418 Merge.rc:2690
+#: Merge.rc:2428 Merge.rc:2700
msgid "&Copy to clipboard"
msgstr ""
#. IDD_GENERATE_PATCH, IDC_DIFF_APPENDFILE
-#: Merge.rc:2419
+#: Merge.rc:2429
msgid "&Append to existing file"
msgstr ""
#. IDD_GENERATE_PATCH, IDC_STATIC
-#: Merge.rc:2420
+#: Merge.rc:2430
msgid "&Result:"
msgstr ""
#. IDD_GENERATE_PATCH, IDC_DIFF_BROWSE_RESULT
-#: Merge.rc:2422
+#: Merge.rc:2432
msgid "Bro&wse..."
msgstr ""
#. IDD_GENERATE_PATCH, IDC_STATIC
-#: Merge.rc:2423
+#: Merge.rc:2433
msgid "&Format"
msgstr ""
#. IDD_GENERATE_PATCH, IDC_STATIC
-#: Merge.rc:2424
+#: Merge.rc:2434
msgid "St&yle:"
msgstr ""
#. IDD_GENERATE_PATCH, IDC_STATIC
-#: Merge.rc:2426
+#: Merge.rc:2436
msgid "&Context:"
msgstr ""
#. IDD_GENERATE_PATCH, IDC_DIFF_INCLCMDLINE
-#: Merge.rc:2428
+#: Merge.rc:2438
msgid "Inclu&de command line"
msgstr ""
#. IDD_GENERATE_PATCH, IDC_DIFF_OPENTOEDITOR
-#: Merge.rc:2429
+#: Merge.rc:2439
msgid "Open in e&xternal editor"
msgstr ""
#. IDD_DIRCOLS
-#: Merge.rc:2446
+#: Merge.rc:2456
msgid "Display Columns"
msgstr ""
#. IDD_DIRCOLS, IDC_UP
-#: Merge.rc:2450
+#: Merge.rc:2460
msgid "Move &Up"
msgstr ""
#. IDD_DIRCOLS, IDC_DOWN
-#: Merge.rc:2451
+#: Merge.rc:2461
msgid "Move &Down"
msgstr ""
#. IDD_DIRCOLS, IDC_COLDLG_ADDITIONAL_PROPERTIES
-#: Merge.rc:2453
+#: Merge.rc:2463
msgid "&Additional Properties"
msgstr ""
#. IDD_DIRADDITIONALPROPS
-#: Merge.rc:2461
+#: Merge.rc:2471
msgid "Additional Properties"
msgstr ""
#. IDD_PLUGINS_SELECTPLUGIN
-#: Merge.rc:2475
+#: Merge.rc:2485
msgid "Select Plugin"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN, IDC_STATIC
-#: Merge.rc:2478 Merge.rc:3115
+#: Merge.rc:2488 Merge.rc:3125
msgid "Plugin &name:"
msgstr ""
#. IDD_PLUGINS_SELECTPLUGIN, IDC_STATIC
-#: Merge.rc:2480
+#: Merge.rc:2490
msgid "&Target files:"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN, IDC_STATIC
-#: Merge.rc:2482 Merge.rc:3117
+#: Merge.rc:2492 Merge.rc:3127
msgid "Extensions list:"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN, IDC_STATIC
-#: Merge.rc:2484 Merge.rc:3119
+#: Merge.rc:2494 Merge.rc:3129
msgid "Description:"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN, IDC_STATIC
-#: Merge.rc:2486 Merge.rc:3121
+#: Merge.rc:2496 Merge.rc:3131
msgid "Default arguments:"
msgstr ""
#. IDD_PLUGINS_SELECTPLUGIN, IDC_PLUGIN_ALLOW_ALL
-#: Merge.rc:2488
+#: Merge.rc:2498
msgid "Display all plugins (Ignore extension)"
msgstr ""
#. IDD_PLUGINS_SELECTPLUGIN, IDC_PLUGIN_OPEN_IN_SAME_FRAME_TYPE
-#: Merge.rc:2490
+#: Merge.rc:2500
msgid "&Open files in same window type after unpacking"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_PIPELINE_STATIC
-#: Merge.rc:2492 Merge.rc:3129
+#: Merge.rc:2502 Merge.rc:3139
msgid "&Plugin pipeline:"
msgstr ""
#. IDD_PLUGINS_SELECTPLUGIN, IDC_PLUGIN_ALIAS
-#: Merge.rc:2495
+#: Merge.rc:2505
msgid "&Alias..."
msgstr ""
#. IDD_DIRCOMP_PROGRESS, IDC_COMPARISON_STOP
-#: Merge.rc:2505
+#: Merge.rc:2515
msgid "Stop"
msgstr ""
#. IDD_DIRCOMP_PROGRESS, IDC_COMPARISON_PAUSE
-#: Merge.rc:2506
+#: Merge.rc:2516
msgid "Pause"
msgstr ""
#. IDD_DIRCOMP_PROGRESS, IDC_COMPARISON_CONTINUE
-#: Merge.rc:2507
+#: Merge.rc:2517
msgid "Continue"
msgstr ""
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC
-#: Merge.rc:2509 Merge.rc:2973
+#: Merge.rc:2519 Merge.rc:2983
msgid "C&PU cores to use:"
msgstr ""
#. IDD_DIRCOMP_PROGRESS, IDC_STATIC
-#: Merge.rc:2510
+#: Merge.rc:2520
msgid "Items total:"
msgstr ""
#. IDD_DIRCOMP_PROGRESS, IDC_STATIC
-#: Merge.rc:2511
+#: Merge.rc:2521
msgid "Items compared:"
msgstr ""
#. IDS_PREVIEWBAR_CLOSE
-#: Merge.rc:2526 Merge.rc:2846 Merge.rc:5328
+#: Merge.rc:2536 Merge.rc:2856 Merge.rc:5339
msgid "&Close"
msgstr ""
#. IDD_WMGOTO
-#: Merge.rc:2537
+#: Merge.rc:2547
msgid "Go to"
msgstr ""
#. IDD_WMGOTO, IDC_STATIC
-#: Merge.rc:2540
+#: Merge.rc:2550
msgid "G&o to:"
msgstr ""
#. IDD_WMGOTO, IDC_STATIC
-#: Merge.rc:2543
+#: Merge.rc:2553
msgid "File"
msgstr ""
#. IDD_WMGOTO, IDC_STATIC
-#: Merge.rc:2547
+#: Merge.rc:2557
msgid "Go to what"
msgstr ""
#. IDD_WMGOTO, IDC_WMGOTO_TOLINE
-#: Merge.rc:2548
+#: Merge.rc:2558
msgid "Li&ne"
msgstr ""
#. IDD_WMGOTO, IDC_WMGOTO_TODIFF
-#: Merge.rc:2549
+#: Merge.rc:2559
msgid "&Difference"
msgstr ""
#. IDD_WMGOTO, IDOK
-#: Merge.rc:2550
+#: Merge.rc:2560
msgid "&Go to"
msgstr ""
#. IDS_PROJECT_ITEM_FILE_FILTER
-#: Merge.rc:2556 Merge.rc:4321
+#: Merge.rc:2566 Merge.rc:4331
msgid "File Filters"
msgstr ""
#. IDD_FILTERS_FILEFILTERS, IDC_STATIC
-#: Merge.rc:2559
+#: Merge.rc:2569
msgid "&Mask / Filter Expression"
msgstr ""
#. IDD_FILTERS_FILEFILTERS, IDC_STATIC
-#: Merge.rc:2562
+#: Merge.rc:2572
msgid "Preset &Filters"
msgstr ""
#. IDD_FILTERS_FILEFILTERS, IDC_FILTERFILE_TEST_BTN
-#: Merge.rc:2564
+#: Merge.rc:2574
msgid "Test..."
msgstr ""
#. IDD_FILTERS_FILEFILTERS, IDC_FILTERFILE_INSTALL
-#: Merge.rc:2565
+#: Merge.rc:2575
msgid "Install..."
msgstr ""
#. IDD_FILTERS_FILEFILTERS, IDC_FILTERFILE_NEWBTN
-#: Merge.rc:2566
+#: Merge.rc:2576
msgid "New..."
msgstr ""
#. IDD_FILTERS_FILEFILTERS, IDC_FILTERFILE_EDITBTN
-#: Merge.rc:2567
+#: Merge.rc:2577
msgid "Edit..."
msgstr ""
#. IDD_FILTERS_FILEFILTERS, IDC_FILTERFILE_DELETEBTN
-#: Merge.rc:2568
+#: Merge.rc:2578
msgid "Delete..."
msgstr ""
#. IDD_FILTERS_CONDITION
-#: Merge.rc:2573
+#: Merge.rc:2583
msgid "Filter Condition"
msgstr ""
#. IDD_FILTERS_CONDITION, IDC_STATIC
-#: Merge.rc:2576
+#: Merge.rc:2586
msgid "&Left-hand side:"
msgstr ""
#. IDD_FILTERS_CONDITION, IDC_STATIC
-#: Merge.rc:2578
+#: Merge.rc:2588
msgid "&Operator:"
msgstr ""
#. IDD_FILTERS_CONDITION, IDC_STATIC
-#: Merge.rc:2580
+#: Merge.rc:2590
msgid "&Right-hand side:"
msgstr ""
#. IDD_FILTERS_CONDITION, IDC_STATIC
-#: Merge.rc:2586
+#: Merge.rc:2596
msgid "Expression:"
msgstr ""
#. IDD_COMPARISON_RESULT_FILTER
-#: Merge.rc:2595
+#: Merge.rc:2605
msgid "Filter by Comparison Result"
msgstr ""
#. IDD_COMPARISON_RESULT_FILTER, IDC_RADIO_INCLUDE
-#: Merge.rc:2598
+#: Merge.rc:2608
msgid "&Include"
msgstr ""
#. IDD_COMPARISON_RESULT_FILTER, IDC_RADIO_EXCLUDE
-#: Merge.rc:2599
+#: Merge.rc:2609
msgid "&Exclude"
msgstr ""
#. IDD_COMPARISON_RESULT_FILTER, IDC_STATIC
-#: Merge.rc:2600
+#: Merge.rc:2610
msgid "Comparison Results"
msgstr ""
#. IDS_IDENTICAL
-#: Merge.rc:2601 Merge.rc:2733 Merge.rc:2794 Merge.rc:4698
+#: Merge.rc:2611 Merge.rc:2743 Merge.rc:2804 Merge.rc:4708
msgid "Identical"
msgstr ""
#. IDS_DIFFERENT
-#: Merge.rc:2602 Merge.rc:2714 Merge.rc:2755 Merge.rc:4708
+#: Merge.rc:2612 Merge.rc:2724 Merge.rc:2765 Merge.rc:4718
msgid "Different"
msgstr ""
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_LEFT_ONLY
-#: Merge.rc:2603
+#: Merge.rc:2613
msgid "Left only"
msgstr ""
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_RIGHT_ONLY
-#: Merge.rc:2604
+#: Merge.rc:2614
msgid "Right only"
msgstr ""
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_SKIPPED
-#: Merge.rc:2605
+#: Merge.rc:2615
msgid "Skipped"
msgstr ""
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_MIDDLE_ONLY
-#: Merge.rc:2606
+#: Merge.rc:2616
msgid "Middle only"
msgstr ""
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_LEFT_ONLY_DIFFERENT
-#: Merge.rc:2607
+#: Merge.rc:2617
msgid "Left only (different)"
msgstr ""
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_MIDDLE_ONLY_DIFFERENT
-#: Merge.rc:2608
+#: Merge.rc:2618
msgid "Middle only (different)"
msgstr ""
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_RIGHT_ONLY_DIFFERENT
-#: Merge.rc:2609
+#: Merge.rc:2619
msgid "Right only (different)"
msgstr ""
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_LEFT_ONLY_MISSING
-#: Merge.rc:2610
+#: Merge.rc:2620
msgid "Left only (missing)"
msgstr ""
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_MIDDLE_ONLY_MISSING
-#: Merge.rc:2611
+#: Merge.rc:2621
msgid "Middle only (missing)"
msgstr ""
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_RIGHT_ONLY_MISSING
-#: Merge.rc:2612
+#: Merge.rc:2622
msgid "Right only (missing)"
msgstr ""
#. IDS_OPTIONSPG_CODEPAGE
-#: Merge.rc:2619 Merge.rc:2811 Merge.rc:4213
+#: Merge.rc:2629 Merge.rc:2821 Merge.rc:4223
msgid "Codepage"
msgstr ""
#. IDD_PROPPAGE_CODEPAGE, IDC_STATIC
-#: Merge.rc:2622
+#: Merge.rc:2632
msgid "Default Codepage"
msgstr ""
#. IDD_PROPPAGE_CODEPAGE, IDC_STATIC
-#: Merge.rc:2623
+#: Merge.rc:2633
msgid "Select the default codepage for non-Unicode files:"
msgstr ""
#. IDD_PROPPAGE_CODEPAGE, IDC_CP_SYSTEM
-#: Merge.rc:2624
+#: Merge.rc:2634
msgid "System codepage"
msgstr ""
#. IDD_PROPPAGE_CODEPAGE, IDC_CP_UI
-#: Merge.rc:2625
+#: Merge.rc:2635
msgid "According to WinMerge User Interface"
msgstr ""
#. IDD_PROPPAGE_CODEPAGE, IDC_CP_CUSTOM
-#: Merge.rc:2626
+#: Merge.rc:2636
msgid "Custom codepage:"
msgstr ""
#. IDD_PROPPAGE_CODEPAGE, IDC_DETECT_CODEPAGE
-#: Merge.rc:2628
+#: Merge.rc:2638
msgid "Detect codepage for: .html, .rc, .xml\nRestart required."
msgstr ""
#. IDD_PROPPAGE_CODEPAGE, IDC_DETECT_CODEPAGE2
-#: Merge.rc:2630
+#: Merge.rc:2640
msgid "Detect codepage for files with mlang.dll\nRestart required."
msgstr ""
#. IDS_OPTIONSPG_ARCHIVE
-#: Merge.rc:2638 Merge.rc:4214
+#: Merge.rc:2648 Merge.rc:4224
msgid "Archive Support"
msgstr ""
#. IDD_PROPPAGE_ARCHIVE, IDC_ARCHIVE_ENABLE
-#: Merge.rc:2641
+#: Merge.rc:2651
msgid "&Enable archive file support"
msgstr ""
#. IDD_PROPPAGE_ARCHIVE, IDC_ARCHIVE_DETECTTYPE
-#: Merge.rc:2642
+#: Merge.rc:2652
msgid "&Detect archive type from file signature"
msgstr ""
#. IDD_PROPPAGE_PROJECT, IDC_STATIC
-#: Merge.rc:2651
+#: Merge.rc:2661
msgid "Items saved to or restored from the project file:"
msgstr ""
#. IDD_SAVECLOSING
-#: Merge.rc:2658
+#: Merge.rc:2668
msgid "Save Modified Files?"
msgstr ""
#. IDD_SAVECLOSING, IDC_SAVECLOSING_LEFTFRAME
-#: Merge.rc:2661
+#: Merge.rc:2671
msgid "Left side file"
msgstr ""
#. IDD_SAVECLOSING, IDC_SAVECLOSING_SAVELEFT
-#: Merge.rc:2663
+#: Merge.rc:2673
msgid "&Save changes"
msgstr ""
#. IDD_SAVECLOSING, IDC_SAVECLOSING_DISCARDLEFT
-#: Merge.rc:2664
+#: Merge.rc:2674
msgid "&Discard changes"
msgstr ""
#. IDD_SAVECLOSING, IDC_SAVECLOSING_MIDDLEFRAME
-#: Merge.rc:2665
+#: Merge.rc:2675
msgid "Middle side file"
msgstr ""
#. IDD_SAVECLOSING, IDC_SAVECLOSING_SAVEMIDDLE
-#: Merge.rc:2667
+#: Merge.rc:2677
msgid "Sa&ve changes"
msgstr ""
#. IDD_SAVECLOSING, IDC_SAVECLOSING_DISCARDMIDDLE
-#: Merge.rc:2668
+#: Merge.rc:2678
msgid "Discard c&hanges"
msgstr ""
#. IDD_SAVECLOSING, IDC_SAVECLOSING_RIGHTFRAME
-#: Merge.rc:2669
+#: Merge.rc:2679
msgid "Right side file"
msgstr ""
#. IDD_SAVECLOSING, IDC_SAVECLOSING_SAVERIGHT
-#: Merge.rc:2671
+#: Merge.rc:2681
msgid "S&ave changes"
msgstr ""
#. IDD_SAVECLOSING, IDC_SAVECLOSING_DISCARDRIGHT
-#: Merge.rc:2672
+#: Merge.rc:2682
msgid "Dis&card changes"
msgstr ""
#. IDD_SAVECLOSING, IDC_SAVECLOSING_DISCARDALL
-#: Merge.rc:2673
+#: Merge.rc:2683
msgid "Disca&rd All"
msgstr ""
#. IDD_DIRCMP_REPORT
-#: Merge.rc:2680
+#: Merge.rc:2690
msgid "Folder Compare Report"
msgstr ""
#. IDD_DIRCMP_REPORT, IDC_STATIC
-#: Merge.rc:2683
+#: Merge.rc:2693
msgid "Report &file:"
msgstr ""
#. IDD_DIRCMP_REPORT, IDC_STATIC
-#: Merge.rc:2686
+#: Merge.rc:2696
msgid "&Style:"
msgstr ""
#. IDD_DIRCMP_REPORT, IDC_REPORT_INCLUDEFILECMPREPORT
-#: Merge.rc:2688
+#: Merge.rc:2698
msgid "&Include file compare report"
msgstr ""
#. IDD_FILTERS_FILEFILTERS_SHARED
-#: Merge.rc:2697
+#: Merge.rc:2707
msgid "Shared or Private Filter"
msgstr ""
#. IDD_FILTERS_FILEFILTERS_SHARED, IDC_STATIC
-#: Merge.rc:2700
+#: Merge.rc:2710
msgid "What type of filter do you want?"
msgstr ""
#. IDD_FILTERS_FILEFILTERS_SHARED, IDC_SHARED
-#: Merge.rc:2701
+#: Merge.rc:2711
msgid "Shared Filter (for all users)"
msgstr ""
#. IDD_FILTERS_FILEFILTERS_SHARED, IDC_PRIVATE
-#: Merge.rc:2702
+#: Merge.rc:2712
msgid "Private Filter (current user only)"
msgstr ""
#. IDD_COMPARE_STATISTICS3
-#: Merge.rc:2709 Merge.rc:2750
+#: Merge.rc:2719 Merge.rc:2760
msgid "Compare Statistics"
msgstr ""
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2712 Merge.rc:2753
+#: Merge.rc:2722 Merge.rc:2763
msgid "Folders:"
msgstr ""
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2713 Merge.rc:2754
+#: Merge.rc:2723 Merge.rc:2764
msgid "Files:"
msgstr ""
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2719 Merge.rc:2738 Merge.rc:2760 Merge.rc:2799
+#: Merge.rc:2729 Merge.rc:2748 Merge.rc:2770 Merge.rc:2809
msgid "Binary:"
msgstr ""
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2722 Merge.rc:2763
+#: Merge.rc:2732 Merge.rc:2773
msgid "Unique"
msgstr ""
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2723 Merge.rc:2764
+#: Merge.rc:2733 Merge.rc:2774
msgid "Left:"
msgstr ""
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2728 Merge.rc:2774
+#: Merge.rc:2738 Merge.rc:2784
msgid "Right:"
msgstr ""
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2742 Merge.rc:2803
+#: Merge.rc:2752 Merge.rc:2813
msgid "Total:"
msgstr ""
#. IDD_COMPARE_STATISTICS3, IDOK
-#: Merge.rc:2745 Merge.rc:2806
+#: Merge.rc:2755 Merge.rc:2816
msgid "Close"
msgstr ""
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2769
+#: Merge.rc:2779
msgid "Middle:"
msgstr ""
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2779
+#: Merge.rc:2789
msgid "Missing Left:"
msgstr ""
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2784
+#: Merge.rc:2794
msgid "Missing Middle:"
msgstr ""
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2789
+#: Merge.rc:2799
msgid "Missing Right:"
msgstr ""
#. IDD_LOAD_SAVE_CODEPAGE, IDC_AFFECTS_GROUP
-#: Merge.rc:2814
+#: Merge.rc:2824
msgid "Affects"
msgstr ""
#. IDD_LOAD_SAVE_CODEPAGE, IDC_RIGHT_FILES_LABEL
-#: Merge.rc:2816 Merge.rc:2818 Merge.rc:2820
+#: Merge.rc:2826 Merge.rc:2828 Merge.rc:2830
msgid "(Affects)"
msgstr ""
#. IDD_LOAD_SAVE_CODEPAGE, IDC_LOADING_GROUP
-#: Merge.rc:2821
+#: Merge.rc:2831
msgid "Select Codepage for"
msgstr ""
#. IDD_LOAD_SAVE_CODEPAGE, IDC_LOAD_FILES_LABEL
-#: Merge.rc:2822
+#: Merge.rc:2832
msgid "&File Loading:"
msgstr ""
#. IDD_LOAD_SAVE_CODEPAGE, IDC_SAVE_FILES_LABEL
-#: Merge.rc:2824
+#: Merge.rc:2834
msgid "File &Saving:"
msgstr ""
#. IDD_LOAD_SAVE_CODEPAGE, IDC_LOAD_SAVE_SAME_CODEPAGE
-#: Merge.rc:2827
+#: Merge.rc:2837
msgid "&Use same codepage for both"
msgstr ""
#. IDS_MESSAGEBOX_CANCEL
-#: Merge.rc:2830 Merge.rc:4172
+#: Merge.rc:2840 Merge.rc:4182
msgid "&Cancel"
msgstr ""
#. IDD_FILTERS_FILEFILTERS_TEST
-#: Merge.rc:2835
+#: Merge.rc:2845
msgid "Test Filter"
msgstr ""
#. IDD_FILTERS_FILEFILTERS_TEST, IDC_HEADER
-#: Merge.rc:2838
+#: Merge.rc:2848
msgid "Testing filter:"
msgstr ""
#. IDD_FILTERS_FILEFILTERS_TEST, IDC_PROMPT_LABEL
-#: Merge.rc:2840
+#: Merge.rc:2850
msgid "&Enter text to test:"
msgstr ""
#. IDD_FILTERS_FILEFILTERS_TEST, IDC_IS_DIRECTORY
-#: Merge.rc:2842
+#: Merge.rc:2852
msgid "&Folder Name"
msgstr ""
#. IDD_FILTERS_FILEFILTERS_TEST, IDC_STATIC
-#: Merge.rc:2843
+#: Merge.rc:2853
msgid "Result:"
msgstr ""
#. IDD_FILTERS_FILEFILTERS_TEST, IDC_TEST_BTN
-#: Merge.rc:2845
+#: Merge.rc:2855
msgid "&Test"
msgstr ""
#. IDS_OPTIONSPG_TABLECOMPARE
-#: Merge.rc:2851 Merge.rc:2990 Merge.rc:4228
+#: Merge.rc:2861 Merge.rc:3000 Merge.rc:4238
msgid "Table"
msgstr ""
#. IDD_OPEN_TABLE, IDC_STATIC
-#: Merge.rc:2854
+#: Merge.rc:2864
msgid "File type"
msgstr ""
#. IDD_OPEN_TABLE, IDC_COMPARETABLE_CSV
-#: Merge.rc:2855
+#: Merge.rc:2865
msgid "&CSV"
msgstr ""
#. IDD_OPEN_TABLE, IDC_COMPARETABLE_TSV
-#: Merge.rc:2856
+#: Merge.rc:2866
msgid "&TSV"
msgstr ""
#. IDD_OPEN_TABLE, IDC_COMPARETABLE_DSV
-#: Merge.rc:2857
+#: Merge.rc:2867
msgid "Custom &Delimiter-Separated Values"
msgstr ""
#. IDD_PROPPAGE_COMPARE_TABLE, IDC_STATIC
-#: Merge.rc:2859 Merge.rc:2861 Merge.rc:2996 Merge.rc:3004
+#: Merge.rc:2869 Merge.rc:2871 Merge.rc:3006 Merge.rc:3014
msgid "D&elimiter character:"
msgstr ""
#. IDD_PROPPAGE_COMPARE_TABLE, IDC_COMPARETABLE_ALLOWNEWLINE
-#: Merge.rc:2863 Merge.rc:3006
+#: Merge.rc:2873 Merge.rc:3016
msgid "&Allow newlines in quotes"
msgstr ""
#. IDD_PROPPAGE_COMPARE_TABLE, IDC_STATIC
-#: Merge.rc:2865 Merge.rc:3008
+#: Merge.rc:2875 Merge.rc:3018
msgid "&Quote character:"
msgstr ""
#. IDS_OPTIONSPG_BACKUPS
-#: Merge.rc:2873 Merge.rc:4216
+#: Merge.rc:2883 Merge.rc:4226
msgid "Backup Files"
msgstr ""
#. IDD_PROPPAGE_BACKUPS, IDC_STATIC
-#: Merge.rc:2876
+#: Merge.rc:2886
msgid "Create backup files for:"
msgstr ""
#. IDD_PROPPAGE_BACKUPS, IDC_BACKUP_FOLDERCMP
-#: Merge.rc:2877
+#: Merge.rc:2887
msgid "&Folder compare"
msgstr ""
#. IDD_PROPPAGE_BACKUPS, IDC_BACKUP_FILECMP
-#: Merge.rc:2878
+#: Merge.rc:2888
msgid "Fil&e compare"
msgstr ""
#. IDD_PROPPAGE_BACKUPS, IDC_STATIC
-#: Merge.rc:2879
+#: Merge.rc:2889
msgid "Create backup files in:"
msgstr ""
#. IDD_PROPPAGE_BACKUPS, IDC_BACKUP_ORIGFOLD
-#: Merge.rc:2880
+#: Merge.rc:2890
msgid "&Original file's folder"
msgstr ""
#. IDD_PROPPAGE_BACKUPS, IDC_BACKUP_GLOBALFOLD
-#: Merge.rc:2881
+#: Merge.rc:2891
msgid "&Global backup folder:"
msgstr ""
#. IDD_PROPPAGE_BACKUPS, IDC_STATIC
-#: Merge.rc:2884
+#: Merge.rc:2894
msgid "Backup filename:"
msgstr ""
#. IDD_PROPPAGE_BACKUPS, IDC_BACKUP_APPEND_BAK
-#: Merge.rc:2885
+#: Merge.rc:2895
msgid "&Append .bak extension"
msgstr ""
#. IDD_PROPPAGE_BACKUPS, IDC_BACKUP_APPEND_TIME
-#: Merge.rc:2886
+#: Merge.rc:2896
msgid "A&ppend timestamp"
msgstr ""
#. IDS_CONFIRM_COPY_CAPTION
-#: Merge.rc:2892 Merge.rc:4565
+#: Merge.rc:2902 Merge.rc:4575
msgid "Confirm Copy"
msgstr ""
#. IDD_CONFIRM_COPY, IDC_FLDCONFIRM_QUERY
-#: Merge.rc:2896
+#: Merge.rc:2906
msgid "Are you sure you want to copy XXX items?"
msgstr ""
#. IDD_CONFIRM_COPY, IDC_FLDCONFIRM_FROM_TEXT
-#: Merge.rc:2897
+#: Merge.rc:2907
msgid "From left"
msgstr ""
#. IDD_CONFIRM_COPY, IDC_FLDCONFIRM_TO_TEXT
-#: Merge.rc:2899
+#: Merge.rc:2909
msgid "To right"
msgstr ""
#. IDS_MESSAGEBOX_DONT_ASK_AGAIN
-#: Merge.rc:2901 Merge.rc:4191
+#: Merge.rc:2911 Merge.rc:4201
msgid "Don't ask this &question again."
msgstr ""
#. IDD_CONFIRM_COPY, IDYES
-#: Merge.rc:2903
+#: Merge.rc:2913
msgid "Yes"
msgstr ""
#. IDD_CONFIRM_COPY, IDNO
-#: Merge.rc:2904
+#: Merge.rc:2914
msgid "No"
msgstr ""
#. IDS_PROJECT_ITEM_PLUGIN
-#: Merge.rc:2909 Merge.rc:4323
+#: Merge.rc:2919 Merge.rc:4333
msgid "Plugins"
msgstr ""
#. IDD_PLUGINS_LIST, IDC_PLUGINS_ENABLE
-#: Merge.rc:2912
+#: Merge.rc:2922
msgid "&Enable plugins"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN, IDC_STATIC
-#: Merge.rc:2913 Merge.rc:3113
+#: Merge.rc:2923 Merge.rc:3123
msgid "Plugin &type:"
msgstr ""
#. IDD_PLUGINS_LIST, IDC_STATIC
-#: Merge.rc:2916
+#: Merge.rc:2926
msgid "File filters:"
msgstr ""
#. IDD_PLUGINS_LIST, IDC_STATIC
-#: Merge.rc:2918
+#: Merge.rc:2928
msgid "&Plugin arguments:"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_AUTOMATIC
-#: Merge.rc:2920 Merge.rc:3134
+#: Merge.rc:2930 Merge.rc:3144
msgid "Enable &automatic unpacking/prediffing"
msgstr ""
#. IDS_OPTIONSPG_SHELL
-#: Merge.rc:2934 Merge.rc:4217
+#: Merge.rc:2944 Merge.rc:4227
msgid "Shell Integration"
msgstr ""
#. IDD_PROPPAGE_SHELL, IDC_STATIC
-#: Merge.rc:2937
+#: Merge.rc:2947
msgid "Explorer"
msgstr ""
#. IDD_PROPPAGE_SHELL, IDC_EXPLORER_CONTEXT
-#: Merge.rc:2938
+#: Merge.rc:2948
msgid "&Add to context menu"
msgstr ""
#. IDD_PROPPAGE_SHELL, IDC_EXPLORER_ADVANCED
-#: Merge.rc:2939
+#: Merge.rc:2949
msgid "E&nable advanced menu"
msgstr ""
#. IDD_PROPPAGE_SHELL, IDC_EXPLORER_COMPARE_AS
-#: Merge.rc:2940
+#: Merge.rc:2950
msgid "Enable &Compare As menu"
msgstr ""
#. IDD_PROPPAGE_SHELL, IDC_REGISTER_SHELLEXTENSION
-#: Merge.rc:2941
+#: Merge.rc:2951
msgid "&Register Shell Extension"
msgstr ""
#. IDD_PROPPAGE_SHELL, IDC_UNREGISTER_SHELLEXTENSION
-#: Merge.rc:2942
+#: Merge.rc:2952
msgid "&Unregister Shell Extension"
msgstr ""
#. IDD_PROPPAGE_SHELL, IDC_REGISTER_SHELLEXTENSION_PERUSER
-#: Merge.rc:2943
+#: Merge.rc:2953
msgid "Register Shell Extension for Current User &Only"
msgstr ""
#. IDD_PROPPAGE_SHELL, IDC_UNREGISTER_SHELLEXTENSION_PERUSER
-#: Merge.rc:2944
+#: Merge.rc:2954
msgid "Unregister Shell Extension for Current User On&ly"
msgstr ""
#. IDD_PROPPAGE_SHELL, IDC_REGISTER_WINMERGECONTEXTMENU
-#: Merge.rc:2945
+#: Merge.rc:2955
msgid "Register Shell Extension for &Windows 11"
msgstr ""
#. IDD_PROPPAGE_SHELL, IDC_UNREGISTER_WINMERGECONTEXTMENU
-#: Merge.rc:2946
+#: Merge.rc:2956
msgid "Unregister Shell Extension for W&indows 11"
msgstr ""
#. IDD_PROPPAGE_SHELL, IDC_STATIC
-#: Merge.rc:2947
+#: Merge.rc:2957
msgid "Jump List"
msgstr ""
#. IDD_PROPPAGE_SHELL, IDC_CLEAR_ALL_RECENT_ITEMS
-#: Merge.rc:2949
+#: Merge.rc:2959
msgid "Clear all recent items"
msgstr ""
#. IDS_OPTIONSPG_FOLDERCOMPARE
-#: Merge.rc:2954 Merge.rc:4225
+#: Merge.rc:2964 Merge.rc:4235
msgctxt "Options dialog|Categories"
msgid "Folder"
msgstr ""
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC
-#: Merge.rc:2957
+#: Merge.rc:2967
msgid "&Compare method:"
msgstr ""
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_COMPARE_STOPFIRST
-#: Merge.rc:2959
+#: Merge.rc:2969
msgid "S&top after first difference"
msgstr ""
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_IGNORE_SMALLTIMEDIFF
-#: Merge.rc:2961
+#: Merge.rc:2971
msgid "Ign&ore time differences less than 3 seconds"
msgstr ""
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC
-#: Merge.rc:2964
+#: Merge.rc:2974
msgid "Expand subfolders &after comparison:"
msgstr ""
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_COMPARE_WALKSUBDIRS
-#: Merge.rc:2966
+#: Merge.rc:2976
msgid "Include &unique subfolders contents"
msgstr ""
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_IGNORE_REPARSEPOINTS
-#: Merge.rc:2968
+#: Merge.rc:2978
msgid "Ignore &reparse points"
msgstr ""
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC
-#: Merge.rc:2969
+#: Merge.rc:2979
msgid "Switch to &quick compare when size exceeds (MB):"
msgstr ""
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC
-#: Merge.rc:2971
+#: Merge.rc:2981
msgid "Switch to &binary compare when size exceeds (MB):"
msgstr ""
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC
-#: Merge.rc:2975
+#: Merge.rc:2985
msgid "Additional comparison condi&tions:"
msgstr ""
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC
-#: Merge.rc:2978
+#: Merge.rc:2988
msgid "&Rename/move detection:"
msgstr ""
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC
-#: Merge.rc:2980
+#: Merge.rc:2990
msgid "Rename/move detection &keys:"
msgstr ""
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC
-#: Merge.rc:2983
+#: Merge.rc:2993
msgid "M&erge renames and moves:"
msgstr ""
#. IDD_PROPPAGE_COMPARE_TABLE, IDC_STATIC
-#: Merge.rc:2994 Merge.rc:2999 Merge.rc:3002
+#: Merge.rc:3004 Merge.rc:3009 Merge.rc:3012
msgid "File patterns:"
msgstr ""
#. IDD_PROPPAGE_COMPARE_TABLE, IDC_STATIC
-#: Merge.rc:3001
+#: Merge.rc:3011
msgid "Custom Delimiter-Separated Values"
msgstr ""
#. IDS_OPTIONSPG_BINARYCOMPARE
-#: Merge.rc:3015 Merge.rc:4227
+#: Merge.rc:3025 Merge.rc:4237
msgctxt "Options dialog|Categories"
msgid "Binary"
msgstr ""
#. IDD_PROPPAGE_COMPARE_BINARY, IDC_STATIC
-#: Merge.rc:3018
+#: Merge.rc:3028
msgid "Binary file &patterns:"
msgstr ""
#. IDD_PROPPAGE_COMPARE_BINARY, IDC_STATIC
-#: Merge.rc:3020
+#: Merge.rc:3030
msgid "Frhed settings"
msgstr ""
#. IDD_PROPPAGE_COMPARE_BINARY, IDC_COMPAREBINARY_VIEWSETTINGS
-#: Merge.rc:3021
+#: Merge.rc:3031
msgid "View &Settings..."
msgstr ""
#. IDD_PROPPAGE_COMPARE_BINARY, IDC_COMPAREBINARY_BINARYMODE
-#: Merge.rc:3022
+#: Merge.rc:3032
msgid "&Binary Mode..."
msgstr ""
#. IDD_PROPPAGE_COMPARE_BINARY, IDC_COMPAREBINARY_CHARACTERSET
-#: Merge.rc:3023
+#: Merge.rc:3033
msgid "&Character Set..."
msgstr ""
#. IDS_PRPCAT_IMAGE
-#: Merge.rc:3029 Merge.rc:4226 Merge.rc:4665
+#: Merge.rc:3039 Merge.rc:4236 Merge.rc:4675
msgid "Image"
msgstr ""
#. IDD_PROPPAGE_COMPARE_IMAGE, IDC_STATIC
-#: Merge.rc:3032
+#: Merge.rc:3042
msgid "Image file &patterns:"
msgstr ""
#. IDD_PROPPAGE_COMPARE_IMAGE, IDC_ENABLE_IMGCMP_IN_DIRCMP
-#: Merge.rc:3034
+#: Merge.rc:3044
msgid "&Enable image compare in folder compare"
msgstr ""
#. IDD_PROPPAGE_COMPARE_IMAGE, IDC_STATIC
-#: Merge.rc:3036
+#: Merge.rc:3046
msgid "OCR result:"
msgstr ""
#. IDS_OPTIONSPG_WEBPAGECOMPARE
-#: Merge.rc:3043 Merge.rc:4229
+#: Merge.rc:3053 Merge.rc:4239
msgid "Webpage"
msgstr ""
#. IDD_PROPPAGE_COMPARE_WEBPAGE, IDC_STATIC
-#: Merge.rc:3046
+#: Merge.rc:3056
msgid "URL pattern to &include (Regular expression):"
msgstr ""
#. IDD_PROPPAGE_COMPARE_WEBPAGE, IDC_STATIC
-#: Merge.rc:3048
+#: Merge.rc:3058
msgid "URL pattern to &exclude (Regular expression):"
msgstr ""
#. IDD_PROPPAGE_COMPARE_WEBPAGE, IDC_STATIC
-#: Merge.rc:3050
+#: Merge.rc:3060
msgid "&User data folder location:"
msgstr ""
#. IDD_PROPPAGE_COMPARE_WEBPAGE, IDC_COMPAREWEBPAGE_USERDATAFOLDER_PERPANE
-#: Merge.rc:3052
+#: Merge.rc:3062
msgid "&Separate user data folders for each pane"
msgstr ""
#. IDD_ENCODINGERROR, IDC_HEXVIEW
-#: Merge.rc:3065
+#: Merge.rc:3075
msgid "&Hex View"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3110
+#: Merge.rc:3120
msgid "Edit Plugin"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN, IDC_STATIC
-#: Merge.rc:3123
+#: Merge.rc:3133
msgid "&Category:"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_MENUCAPTION_STATIC
-#: Merge.rc:3125
+#: Merge.rc:3135
msgid "&Menu caption:"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_WINDOWTYPE_STATIC
-#: Merge.rc:3127
+#: Merge.rc:3137
msgid "&Window type:"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_UNPACKEDFILEEXTENSION_STATIC
-#: Merge.rc:3132
+#: Merge.rc:3142
msgid "&Unpacked file extension:"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_ARGUMENTSREQUIRED
-#: Merge.rc:3136
+#: Merge.rc:3146
msgid "&Require arguments"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_GENERATESCRIPT
-#: Merge.rc:3137
+#: Merge.rc:3147
msgid "&Generate editor script"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_COMMAND_LINE_STATIC
-#: Merge.rc:3140
+#: Merge.rc:3150
msgid "Command &line:"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_SCRIPT_FILEEXTENSION_STATIC
-#: Merge.rc:3143
+#: Merge.rc:3153
msgid "&Script file extension:"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_SCRIPT_BODY_STATIC
-#: Merge.rc:3145
+#: Merge.rc:3155
msgid "Script &body:"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3154
+#: Merge.rc:3164
msgid "Font"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3157
+#: Merge.rc:3167
msgid "&Font:"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3163
+#: Merge.rc:3173
msgid "Font st&yle:"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3169
+#: Merge.rc:3179
msgid "&Size:"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3175
+#: Merge.rc:3185
msgid "Effects"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3176
+#: Merge.rc:3186
msgid "Stri&keout"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3177
+#: Merge.rc:3187
msgid "&Underline"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3179
+#: Merge.rc:3189
msgid "&Color:"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3184
+#: Merge.rc:3194
msgid "Sample"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3185
+#: Merge.rc:3195
msgid "AaBbYyZz"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3189
+#: Merge.rc:3199
msgid "Sc&ript:"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN, IDC_MANAGE_LINK
-#: Merge.rc:3194
+#: Merge.rc:3204
msgid "Show more fonts"
msgstr ""
#. ID_INDICATOR_EXT
-#: Merge.rc:4118
+#: Merge.rc:4128
msgid "EXT"
msgstr ""
#. ID_INDICATOR_CAPS
-#: Merge.rc:4119
+#: Merge.rc:4129
msgid "CAP"
msgstr ""
#. ID_INDICATOR_NUM
-#: Merge.rc:4120
+#: Merge.rc:4130
msgid "NUM"
msgstr ""
#. ID_INDICATOR_SCRL
-#: Merge.rc:4121
+#: Merge.rc:4131
msgid "SCRL"
msgstr ""
#. ID_INDICATOR_OVR
-#: Merge.rc:4122
+#: Merge.rc:4132
msgid "OVR"
msgstr ""
#. ID_INDICATOR_REC
-#: Merge.rc:4123
+#: Merge.rc:4133
msgid "REC"
msgstr ""
#. ID_FILE_NEW
-#: Merge.rc:4129
+#: Merge.rc:4139
msgid "\nNew Documents (Ctrl+N)"
msgstr ""
#. ID_FILE_OPEN
-#: Merge.rc:4130
+#: Merge.rc:4140
msgid "\nOpen (Ctrl+O)"
msgstr ""
#. ID_FILE_SAVE
-#: Merge.rc:4131
+#: Merge.rc:4141
msgid "\nSave (Ctrl+S)"
msgstr ""
#. IDS_UNK_ERROR_READING_PROJECT
-#: Merge.rc:4137
+#: Merge.rc:4147
msgid "Unknown error opening project file."
msgstr ""
#. IDS_UNK_ERROR_SAVING_PROJECT
-#: Merge.rc:4138
+#: Merge.rc:4148
msgid "Unknown error saving project file."
msgstr ""
#. IDS_PROJFILE_LOAD_SUCCESS
-#: Merge.rc:4143
+#: Merge.rc:4153
msgid "Project file loaded."
msgstr ""
#. IDS_PROJFILE_SAVE_SUCCESS
-#: Merge.rc:4144
+#: Merge.rc:4154
msgid "Project file saved."
msgstr ""
#. ID_EDIT_UNDO
-#: Merge.rc:4150
+#: Merge.rc:4160
msgid "\nUndo (Ctrl+Z)"
msgstr ""
#. ID_EDIT_REDO
-#: Merge.rc:4151
+#: Merge.rc:4161
msgid "\nRedo (Ctrl+Y)"
msgstr ""
#. IDR_MERGEDOCTYPE
-#: Merge.rc:4158
+#: Merge.rc:4168
msgid "\nFileCompare\n\n\n\nWinMerge.FileCompare\nWinMerge File Compare"
msgstr ""
#. IDR_DIRDOCTYPE
-#: Merge.rc:4159
+#: Merge.rc:4169
msgid "\nFolderCompare\n\n\n\nWinMerge.FolderCompare\nWinMerge Folder Compare"
msgstr ""
#. IDS_SPLASH_GPLTEXT
-#: Merge.rc:4165
+#: Merge.rc:4175
msgid "WinMerge comes with ABSOLUTELY NO WARRANTY. It is free software and can be redistributed under the conditions of the GNU General Public License - see the Help menu for details."
msgstr ""
#. IDS_MESSAGEBOX_ABORT
-#: Merge.rc:4173
+#: Merge.rc:4183
msgid "&Abort"
msgstr ""
#. IDS_MESSAGEBOX_RETRY
-#: Merge.rc:4174
+#: Merge.rc:4184
msgid "&Retry"
msgstr ""
#. IDS_MESSAGEBOX_IGNORE
-#: Merge.rc:4175
+#: Merge.rc:4185
msgid "&Ignore"
msgstr ""
#. IDS_MESSAGEBOX_IGNOREALL
-#: Merge.rc:4176
+#: Merge.rc:4186
msgid "Ignore &all"
msgstr ""
#. IDS_MESSAGEBOX_YES
-#: Merge.rc:4177
+#: Merge.rc:4187
msgid "&Yes"
msgstr ""
#. IDS_MESSAGEBOX_YES_TO_ALL
-#: Merge.rc:4183
+#: Merge.rc:4193
msgid "Yes to &all"
msgstr ""
#. IDS_MESSAGEBOX_NO
-#: Merge.rc:4184
+#: Merge.rc:4194
msgid "&No"
msgstr ""
#. IDS_MESSAGEBOX_NO_TO_ALL
-#: Merge.rc:4185
+#: Merge.rc:4195
msgid "No to a&ll"
msgstr ""
#. IDS_MESSAGEBOX_CONTINUE
-#: Merge.rc:4186
+#: Merge.rc:4196
msgid "&Continue"
msgstr ""
#. IDS_MESSAGEBOX_SKIP
-#: Merge.rc:4187
+#: Merge.rc:4197
msgid "&Skip"
msgstr ""
#. IDS_MESSAGEBOX_SKIPALL
-#: Merge.rc:4188
+#: Merge.rc:4198
msgid "Skip &all"
msgstr ""
#. IDS_MESSAGEBOX_DONT_DISPLAY_AGAIN
-#: Merge.rc:4190
+#: Merge.rc:4200
msgid "Don't display this &message again."
msgstr ""
-#: Merge.rc:4193
+#: Merge.rc:4203
msgid "To make this message box visible, press Reset on the Message Boxes page in Options."
msgstr ""
#. IDS_OPTIONSPG_EDITOR_COMPAREMERGE
-#: Merge.rc:4203
+#: Merge.rc:4213
msgid "Compare/Merge"
msgstr ""
#. IDS_OPTIONSPG_SYNTAXCOLORS
-#: Merge.rc:4204 Merge.rc:4208
+#: Merge.rc:4214 Merge.rc:4218
msgid "Syntax"
msgstr ""
#. IDS_OPTIONSPG_COLOR_SCHEMES
-#: Merge.rc:4206
+#: Merge.rc:4216
msgid "Color Schemes"
msgstr ""
#. IDS_OPTIONSPG_DIRCOLORS
-#: Merge.rc:4210
+#: Merge.rc:4220
msgid "Folder Compare"
msgstr ""
#. IDS_OPTIONSPG_PROJECT
-#: Merge.rc:4215
+#: Merge.rc:4225
msgid "Project"
msgstr ""
#. IDS_COLHDR_NSDIFFS
-#: Merge.rc:4218 Merge.rc:4640
+#: Merge.rc:4228 Merge.rc:4650
msgid "Differences"
msgstr ""
#. IDS_OPTIONSPG_MESSAGEBOXES
-#: Merge.rc:4220
+#: Merge.rc:4230
msgid "Message Boxes"
msgstr ""
#. IDS_TO
-#: Merge.rc:4235
+#: Merge.rc:4245
msgid "To:"
msgstr ""
#. IDS_FROM_LEFT
-#: Merge.rc:4236
+#: Merge.rc:4246
msgid "From left:"
msgstr ""
#. IDS_TO_LEFT
-#: Merge.rc:4237
+#: Merge.rc:4247
msgid "To left:"
msgstr ""
#. IDS_FROM_RIGHT
-#: Merge.rc:4238
+#: Merge.rc:4248
msgid "From right:"
msgstr ""
#. IDS_TO_RIGHT
-#: Merge.rc:4239
+#: Merge.rc:4249
msgid "To right:"
msgstr ""
#. IDS_FROM_MIDDLE
-#: Merge.rc:4240
+#: Merge.rc:4250
msgid "From middle:"
msgstr ""
#. IDS_TO_MIDDLE
-#: Merge.rc:4241
+#: Merge.rc:4251
msgid "To middle:"
msgstr ""
#. IDS_VERSION_FMT
-#: Merge.rc:4247
+#: Merge.rc:4257
#, c-format
msgid "Version %1"
msgstr ""
#. IDS_OPTIONS_TITLE
-#: Merge.rc:4253
+#: Merge.rc:4263
#, c-format
msgid "Options (%1)"
msgstr ""
#. IDS_MESSAGE_BOX_ARE_RESET
-#: Merge.rc:4254
+#: Merge.rc:4264
msgid "All message boxes are now displayed again."
msgstr ""
-#: Merge.rc:4256
+#: Merge.rc:4266
#, c-format
msgid "Tab size value is out of range. Please use 1 - %1."
msgstr ""
#. IDS_PROJECT_OPEN
-#: Merge.rc:4262 Merge.rc:4318
+#: Merge.rc:4272 Merge.rc:4328
msgid "Open"
msgstr ""
#. IDS_PROGRAMFILES
-#: Merge.rc:4263
+#: Merge.rc:4273
msgid "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||"
msgstr ""
#. IDS_ALLFILES
-#: Merge.rc:4264
+#: Merge.rc:4274
msgid "All Files (*.*)|*.*||"
msgstr ""
#. IDS_PROJECTFILES
-#: Merge.rc:4265
+#: Merge.rc:4275
msgid "WinMerge Project Files (*.WinMerge)|*.WinMerge||"
msgstr ""
#. IDS_INIFILES
-#: Merge.rc:4267
+#: Merge.rc:4277
msgid "Options files (*.ini)|*.ini|All Files (*.*)|*.*||"
msgstr ""
#. IDS_REPLACELIST_FILES
-#: Merge.rc:4268
+#: Merge.rc:4278
msgid "Tab-Separated Values (*.tsv;*.txt)|*.tsv;*.txt|All Files (*.*)|*.*||"
msgstr ""
#. IDS_TEXT_REPORT_FILES
-#: Merge.rc:4274
+#: Merge.rc:4284
msgid "Text Files (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|All Files (*.*)|*.*||"
msgstr ""
#. IDS_HTML_REPORT_FILES
-#: Merge.rc:4275
+#: Merge.rc:4285
msgid "HTML Files (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||"
msgstr ""
#. IDS_XML_REPORT_FILES
-#: Merge.rc:4276
+#: Merge.rc:4286
msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||"
msgstr ""
#. IDS_EXPANDSUBDIRS_DONOTEXPAND
-#: Merge.rc:4294
+#: Merge.rc:4304
msgid "Do not expand"
msgstr ""
#. IDS_EXPANDSUBDIRS_ALL
-#: Merge.rc:4295
+#: Merge.rc:4305
msgid "Expand all subfolders"
msgstr ""
#. IDS_EXPANDSUBDIRS_DIFFERENT
-#: Merge.rc:4296
+#: Merge.rc:4306
msgid "Expand different subfolders"
msgstr ""
#. IDS_EXPANDSUBDIRS_IDENTICAL
-#: Merge.rc:4297
+#: Merge.rc:4307
msgid "Expand identical subfolders"
msgstr ""
#. IDS_SYNTAXTABLE_FILETYPE
-#: Merge.rc:4303
+#: Merge.rc:4313
msgid "File Type"
msgstr ""
#. IDS_COLHDR_EXTENSION
-#: Merge.rc:4304 Merge.rc:4597
+#: Merge.rc:4314 Merge.rc:4607
msgid "Extension"
msgstr ""
#. IDS_PRPCAT_MESSAGE
-#: Merge.rc:4310 Merge.rc:4669
+#: Merge.rc:4320 Merge.rc:4679
msgid "Message"
msgstr ""
#. IDS_MESSAGEBOX_ANSWER
-#: Merge.rc:4311
+#: Merge.rc:4321
msgid "Answer"
msgstr ""
#. IDS_PROJECT_ITEM
-#: Merge.rc:4317
+#: Merge.rc:4327
msgid "Item"
msgstr ""
#. IDS_PROJECT_LOAD
-#: Merge.rc:4319
+#: Merge.rc:4329
msgid "Load"
msgstr ""
#. IDS_PROJECT_SAVE
-#: Merge.rc:4320
+#: Merge.rc:4330
msgid "Save"
msgstr ""
#. IDS_PROJECT_ITEM_INCLUDE_SUBFOLDERS
-#: Merge.rc:4322
+#: Merge.rc:4332
msgid "Include Subfolders"
msgstr ""
#. IDS_PROJECT_ITEM_COMPARE_OPTIONS
-#: Merge.rc:4324
+#: Merge.rc:4334
msgid "Compare Options"
msgstr ""
#. IDS_PROJECT_ITEM_HIDDEN_ITEMS
-#: Merge.rc:4325
+#: Merge.rc:4335
msgid "Hidden Items"
msgstr ""
#. IDS_PLUGINSLIST_NAME
-#: Merge.rc:4331 Merge.rc:4956
+#: Merge.rc:4341 Merge.rc:4966
msgid "Name"
msgstr ""
#. IDS_FILTERFILE_PATHTITLE
-#: Merge.rc:4332
+#: Merge.rc:4342
msgid "Location"
msgstr ""
#. IDS_FILTER_TITLE
-#: Merge.rc:4333
+#: Merge.rc:4343
msgid "Filters"
msgstr ""
#. IDS_FILTER_PREFIX
-#: Merge.rc:4334
+#: Merge.rc:4344
msgid "[F] "
msgstr ""
#. IDS_PLUGINSLIST_DESC
-#: Merge.rc:4335 Merge.rc:4958
+#: Merge.rc:4345 Merge.rc:4968
msgid "Description"
msgstr ""
#. IDS_FILEFILTER_SAVENEW
-#: Merge.rc:4336
+#: Merge.rc:4346
msgid "Select Filename for New Filter"
msgstr ""
#. IDS_FILEFILTER_FILEMASK
-#: Merge.rc:4337
+#: Merge.rc:4347
msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||"
msgstr ""
-#: Merge.rc:4339
+#: Merge.rc:4349
#, c-format
msgid "Cannot find filter template!\n\nCopy %1 to WinMerge/Filters Folder:\n%2."
msgstr ""
-#: Merge.rc:4341
+#: Merge.rc:4351
#, c-format
msgid "Cannot copy filter template:\n%1\n\nMake sure the folder exists and is writable."
msgstr ""
-#: Merge.rc:4343
+#: Merge.rc:4353
msgid "User's filter folder is not defined!\n\nSelect filter folder in Options/System."
msgstr ""
-#: Merge.rc:4345
+#: Merge.rc:4355
#, c-format
msgid "Failed to delete filter:\n%1\n\nFile may be read-only."
msgstr ""
#. IDS_FILEFILTER_INSTALL
-#: Merge.rc:4346
+#: Merge.rc:4356
msgid "Locate Filter File to Install"
msgstr ""
-#: Merge.rc:4348
+#: Merge.rc:4358
msgid "Installing filter file failed.\n\nCould not copy new filter to folder."
msgstr ""
#. IDS_FILEFILTER_OVERWRITE
-#: Merge.rc:4349
+#: Merge.rc:4359
msgid "Filter file exists. Overwrite?"
msgstr ""
#. IDS_FILTERLINE_REGEXP
-#: Merge.rc:4355
+#: Merge.rc:4365
msgid "Regular expression"
msgstr ""
#. IDS_FILTERCHANGED
-#: Merge.rc:4361
+#: Merge.rc:4371
msgid "Filters updated. Refresh all open folder compares?\n\nSelect 'No' to refresh later."
msgstr ""
#. IDS_DIRECTORY_WINDOW_TITLE
-#: Merge.rc:4367
+#: Merge.rc:4377
msgid "Folder Comparison Results"
msgstr ""
#. IDS_FILE_COMPARISON_TITLE
-#: Merge.rc:4368
+#: Merge.rc:4378
msgid "File Comparison"
msgstr ""
#. IDS_EMPTY_LEFT_FILE
-#: Merge.rc:4369
+#: Merge.rc:4379
msgid "Untitled Left"
msgstr ""
#. IDS_EMPTY_MIDDLE_FILE
-#: Merge.rc:4370
+#: Merge.rc:4380
msgid "Untitled Middle"
msgstr ""
#. IDS_EMPTY_RIGHT_FILE
-#: Merge.rc:4371
+#: Merge.rc:4381
msgid "Untitled Right"
msgstr ""
#. IDS_CONFLICT_BASE_FILE
-#: Merge.rc:4372
+#: Merge.rc:4382
msgid "Base File"
msgstr ""
#. IDS_CONFLICT_THEIRS_FILE
-#: Merge.rc:4373
+#: Merge.rc:4383
msgid "Theirs File"
msgstr ""
#. IDS_CONFLICT_MINE_FILE
-#: Merge.rc:4374
+#: Merge.rc:4384
msgid "Mine File"
msgstr ""
#. IDS_SELFCOMPARE_ORIGINAL_FILE
-#: Merge.rc:4375
+#: Merge.rc:4385
msgid "Original File"
msgstr ""
#. IDS_LINE_STATUS_INFO_EOL
-#: Merge.rc:4381
+#: Merge.rc:4391
#, c-format
msgid "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s"
msgstr ""
#. IDS_EMPTY_LINE_STATUS_INFO
-#: Merge.rc:4382
+#: Merge.rc:4392
#, c-format
msgid "Line: %s"
msgstr ""
#. IDS_LINE_STATUS_INFO
-#: Merge.rc:4383
+#: Merge.rc:4393
#, c-format
msgid "Ln: %s Col: %d/%d Ch: %d/%d"
msgstr ""
#. IDS_LINE_STATUS_INFO_SEL
-#: Merge.rc:4384
+#: Merge.rc:4394
#, c-format
msgid " Sel: %d | %d"
msgstr ""
#. IDS_MERGEMODE_MERGING
-#: Merge.rc:4385
+#: Merge.rc:4395
msgid "Merge"
msgstr ""
#. IDS_DIFF_NUMBER_STATUS_FMT
-#: Merge.rc:4386
+#: Merge.rc:4396
#, c-format
msgid "Difference %1 of %2"
msgstr ""
#. IDS_NO_DIFF_SEL_FMT
-#: Merge.rc:4387
+#: Merge.rc:4397
#, c-format
msgid "%1 Differences Found"
msgstr ""
#. IDS_1_DIFF_FOUND
-#: Merge.rc:4388
+#: Merge.rc:4398
msgid "1 Difference Found"
msgstr ""
#. IDS_NO_ERR_SEL_FMT
-#: Merge.rc:4389
+#: Merge.rc:4399
#, c-format
msgid "%1 Errors Found"
msgstr ""
#. IDS_1_ERR_FOUND
-#: Merge.rc:4390
+#: Merge.rc:4400
msgid "1 Error Found"
msgstr ""
#. IDS_STATUSBAR_READONLY, Abbreviation from "Read Only"
-#: Merge.rc:4391
+#: Merge.rc:4401
msgid "RO"
msgstr ""
#. IDS_DIRVIEW_STATUS_FMT_FOCUS
-#: Merge.rc:4397
+#: Merge.rc:4407
#, c-format
msgid "Item %1 of %2"
msgstr ""
#. IDS_DIRVIEW_STATUS_FMT_NOFOCUS
-#: Merge.rc:4398
+#: Merge.rc:4408
#, c-format
msgid "Items: %1"
msgstr ""
#. IDS_DIRVIEW_STATUS_COMPARING
-#: Merge.rc:4399
+#: Merge.rc:4409
msgid "Comparing items..."
msgstr ""
#. IDS_ITEMS_PER_SEC
-#: Merge.rc:4400
+#: Merge.rc:4410
#, c-format
msgid "%.1f[items/sec]"
msgstr ""
#. IDS_ERROR_INCOMPARABLE
-#: Merge.rc:4406
+#: Merge.rc:4416
msgid "Select two existing folders/files to compare."
msgstr ""
#. IDS_DIRSEL_TAG
-#: Merge.rc:4407
+#: Merge.rc:4417
msgid "Folder Selection"
msgstr ""
#. IDS_OPEN_FILESDIRS
-#: Merge.rc:4408
+#: Merge.rc:4418
msgid "Select two (or three) folders/files to compare."
msgstr ""
#. IDS_OPEN_LEFTINVALID
-#: Merge.rc:4409
+#: Merge.rc:4419
msgid "Left (1st) path is invalid!"
msgstr ""
#. IDS_OPEN_MIDDLEINVALID
-#: Merge.rc:4410
+#: Merge.rc:4420
msgid "Middle (2nd) path is invalid!"
msgstr ""
#. IDS_OPEN_RIGHTINVALID2
-#: Merge.rc:4411
+#: Merge.rc:4421
msgid "Right (2nd) path is invalid!"
msgstr ""
#. IDS_OPEN_RIGHTINVALID3
-#: Merge.rc:4412
+#: Merge.rc:4422
msgid "Right (3rd) path is invalid!"
msgstr ""
#. IDS_OPEN_BOTHINVALID
-#: Merge.rc:4413
+#: Merge.rc:4423
msgid "Both paths are invalid!"
msgstr ""
-#: Merge.rc:4415
+#: Merge.rc:4425
msgid "Left (1st) and Middle (2nd) paths are invalid!"
msgstr ""
#. IDS_OPEN_LEFTRIGHTINVALID
-#: Merge.rc:4416
+#: Merge.rc:4426
msgid "Left (1st) and Right (3rd) paths are invalid!"
msgstr ""
-#: Merge.rc:4418
+#: Merge.rc:4428
msgid "Middle (2nd) and Right (3rd) paths are invalid!"
msgstr ""
#. IDS_OPEN_ALLINVALID
-#: Merge.rc:4419
+#: Merge.rc:4429
msgid "All paths are invalid!"
msgstr ""
#. IDS_OPEN_UNPACKERDISABLED
-#: Merge.rc:4420
+#: Merge.rc:4430
msgid "Only enabled for file comparisons"
msgstr ""
#. IDS_OPEN_MISMATCH
-#: Merge.rc:4421
+#: Merge.rc:4431
msgid "Cannot compare file and folder!"
msgstr ""
#. IDS_ERROR_FILE_NOT_FOUND
-#: Merge.rc:4427
+#: Merge.rc:4437
#, c-format
msgid "File not found: %1"
msgstr ""
#. IDS_ERROR_FILE_NOT_UNPACKED
-#: Merge.rc:4428
+#: Merge.rc:4438
#, c-format
msgid "File not unpacked: %1"
msgstr ""
#. IDS_ERROR_FILEOPEN
-#: Merge.rc:4429
+#: Merge.rc:4439
#, c-format
msgid "Cannot open file\n%1\n\n%2"
msgstr ""
#. IDS_ERROR_CONF_RESOLVE
-#: Merge.rc:4430
+#: Merge.rc:4440
msgid "Failed to parse conflict file."
msgstr ""
#. IDS_NOT_CONFLICT_FILE
-#: Merge.rc:4431
+#: Merge.rc:4441
#, c-format
msgid "The file\n%1\nis not a conflict file."
msgstr ""
#. IDS_COMPARE_LARGE_FILES
-#: Merge.rc:4432
+#: Merge.rc:4442
msgid "Comparing large files requires significant memory.\nShow only comparison results (not file contents)?"
msgstr ""
#. IDS_SAVE_AS_TITLE
-#: Merge.rc:4438
+#: Merge.rc:4448
msgid "Save As"
msgstr ""
#. IDS_SAVE_FMT
-#: Merge.rc:4439
+#: Merge.rc:4449
#, c-format
msgid "Save changes to %1?"
msgstr ""
#. IDS_SAVEREADONLY_FMT
-#: Merge.rc:4440
+#: Merge.rc:4450
#, c-format
msgid "%1 is read-only. Override? Or 'No' to save as new filename?"
msgstr ""
#. IDS_ERROR_BACKUP
-#: Merge.rc:4441
+#: Merge.rc:4451
msgid "Error backing up file"
msgstr ""
-#: Merge.rc:4443
+#: Merge.rc:4453
#, c-format
msgid "Unable to backup original file:\n%1\n\nContinue anyway?"
msgstr ""
#. IDS_FILESAVE_FAILED
-#: Merge.rc:4444
+#: Merge.rc:4454
#, c-format
msgid "Saving file failed.\n%1\n%2\n\t- Use different filename (OK)\n\t- Abort (Cancel)?"
msgstr ""
-#: Merge.rc:4446
+#: Merge.rc:4456
#, c-format
msgid "Plugin '%2' cannot pack changes to left file into '%1'.\n\nOriginal unchanged. Save unpacked version?"
msgstr ""
-#: Merge.rc:4448
+#: Merge.rc:4458
#, c-format
msgid "Plugin '%2' cannot pack changes to middle file into '%1'.\n\nOriginal unchanged. Save unpacked version?"
msgstr ""
-#: Merge.rc:4450
+#: Merge.rc:4460
#, c-format
msgid "Plugin '%2' cannot pack changes to right file into '%1'.\n\nOriginal unchanged. Save unpacked version?"
msgstr ""
#. IDS_FILECHANGED_ONDISK
-#: Merge.rc:4451
+#: Merge.rc:4461
#, c-format
msgid "Another application updated\n%1\nsince WinMerge loaded it.\n\nOverwrite?"
msgstr ""
#. IDS_SAVEREADONLY_MULTI
-#: Merge.rc:4452
+#: Merge.rc:4462
#, c-format
msgid "%1\nis read-only. Override?"
msgstr ""
#. IDS_FILECHANGED_RESCAN
-#: Merge.rc:4453
+#: Merge.rc:4463
#, c-format
msgid "Another application updated\n%1\nsince last scan.\n\nReload?"
msgstr ""
#. IDS_SAVE_LEFT_AS
-#: Merge.rc:4454
+#: Merge.rc:4464
msgid "Save Left File As"
msgstr ""
#. IDS_SAVE_MIDDLE_AS
-#: Merge.rc:4455
+#: Merge.rc:4465
msgid "Save Middle File As"
msgstr ""
#. IDS_SAVE_RIGHT_AS
-#: Merge.rc:4456
+#: Merge.rc:4466
msgid "Save Right File As"
msgstr ""
#. IDS_FILE_DISAPPEARED
-#: Merge.rc:4461
+#: Merge.rc:4471
#, c-format
msgid "File\n%1\nnot found. Save a copy to continue."
msgstr ""
#. IDS_VIEWS_OUTOFSYNC
-#: Merge.rc:4467
+#: Merge.rc:4477
msgid "Cannot merge unsynched documents.\n\nRefresh before continuing."
msgstr ""
#. IDS_BREAK_ON_WHITESPACE
-#: Merge.rc:4472
+#: Merge.rc:4482
msgid "Break at whitespace"
msgstr ""
#. IDS_BREAK_ON_PUNCTUATION
-#: Merge.rc:4473
+#: Merge.rc:4483
msgid "Break at whitespace or punctuation"
msgstr ""
#. IDS_L2M
-#: Merge.rc:4479
+#: Merge.rc:4489
msgid "Copy to &Middle\tAlt+Right"
msgstr ""
#. IDS_R2M
-#: Merge.rc:4480
+#: Merge.rc:4490
msgid "Copy to &Middle\tAlt+Left"
msgstr ""
#. IDS_COPY_FROM_MIDDLE_R
-#: Merge.rc:4481
+#: Merge.rc:4491
msgid "Copy from Middle\tAlt+Shift+Right"
msgstr ""
#. IDS_COPY_FROM_MIDDLE_L
-#: Merge.rc:4482
+#: Merge.rc:4492
msgid "Copy from Middle\tAlt+Shift+Left"
msgstr ""
#. IDS_L2MNEXT
-#: Merge.rc:4483
+#: Merge.rc:4493
msgid "Copy to Middle and Advance\tCtrl+Alt+Right"
msgstr ""
#. IDS_R2MNEXT
-#: Merge.rc:4484
+#: Merge.rc:4494
msgid "Copy to Middle and Advance\tCtrl+Alt+Left"
msgstr ""
#. IDS_ALL_MIDDLE
-#: Merge.rc:4485
+#: Merge.rc:4495
msgid "Copy All to Middle"
msgstr ""
#. IDS_COPY_RIGHT_TO_LEFT
-#: Merge.rc:4491
+#: Merge.rc:4501
#, c-format
msgid "Right to Left (%1)"
msgstr ""
#. IDS_COPY_RIGHT_TO_MIDDLE
-#: Merge.rc:4492
+#: Merge.rc:4502
#, c-format
msgid "Right to Middle (%1)"
msgstr ""
#. IDS_COPY_MIDDLE_TO_LEFT
-#: Merge.rc:4493
+#: Merge.rc:4503
#, c-format
msgid "Middle to Left (%1)"
msgstr ""
#. IDS_COPY_MIDDLE_TO_RIGHT
-#: Merge.rc:4494
+#: Merge.rc:4504
#, c-format
msgid "Middle to Right (%1)"
msgstr ""
#. IDS_COPY_LEFT_TO_RIGHT
-#: Merge.rc:4495
+#: Merge.rc:4505
#, c-format
msgid "Left to Right (%1)"
msgstr ""
#. IDS_COPY_LEFT_TO_MIDDLE
-#: Merge.rc:4496
+#: Merge.rc:4506
#, c-format
msgid "Left to Middle (%1)"
msgstr ""
#. IDS_MOVE_LEFT_TO
-#: Merge.rc:4507 Merge.rc:4539
+#: Merge.rc:4517 Merge.rc:4549
#, c-format
msgid "Left to... (%1)"
msgstr ""
#. IDS_MOVE_MIDDLE_TO
-#: Merge.rc:4508 Merge.rc:4540
+#: Merge.rc:4518 Merge.rc:4550
#, c-format
msgid "Middle to... (%1)"
msgstr ""
#. IDS_MOVE_RIGHT_TO
-#: Merge.rc:4509 Merge.rc:4541
+#: Merge.rc:4519 Merge.rc:4551
#, c-format
msgid "Right to... (%1)"
msgstr ""
#. IDS_COPY_BOTH_TO
-#: Merge.rc:4510
+#: Merge.rc:4520
#, c-format
msgid "Both to... (%1)"
msgstr ""
#. IDS_COPY_ALL_TO
-#: Merge.rc:4511
+#: Merge.rc:4521
#, c-format
msgid "All to... (%1)"
msgstr ""
#. IDS_COPY_DIFFERENCES_TO
-#: Merge.rc:4512
+#: Merge.rc:4522
#, c-format
msgid "Differences to... (%1)"
msgstr ""
#. IDS_COPY_ONLYDIFFITEMS
-#: Merge.rc:4519
+#: Merge.rc:4529
msgid "Some selected items are identical or skipped.\nCopy only items with differences?"
msgstr ""
#. IDS_DEL_LEFT_FMT
-#: Merge.rc:4525
+#: Merge.rc:4535
#, c-format
msgid "Left (%1)"
msgstr ""
#. IDS_DEL_MIDDLE_FMT
-#: Merge.rc:4526
+#: Merge.rc:4536
#, c-format
msgid "Middle (%1)"
msgstr ""
#. IDS_DEL_RIGHT_FMT
-#: Merge.rc:4527
+#: Merge.rc:4537
#, c-format
msgid "Right (%1)"
msgstr ""
#. IDS_DEL_BOTH_FMT
-#: Merge.rc:4528
+#: Merge.rc:4538
#, c-format
msgid "Both (%1)"
msgstr ""
#. IDS_DEL_ALL_FMT
-#: Merge.rc:4529
+#: Merge.rc:4539
#, c-format
msgid "All (%1)"
msgstr ""
#. IDS_SELECT_DEST_LEFT
-#: Merge.rc:4545
+#: Merge.rc:4555
msgid "Left Side - Select Destination Folder:"
msgstr ""
#. IDS_SELECT_DEST_MIDDLE
-#: Merge.rc:4546
+#: Merge.rc:4556
msgid "Middle Side - Select Destination Folder:"
msgstr ""
#. IDS_SELECT_DEST_RIGHT
-#: Merge.rc:4547
+#: Merge.rc:4557
msgid "Right Side - Select Destination Folder:"
msgstr ""
#. IDS_FILES_AFFECTED_FMT
-#: Merge.rc:4548
+#: Merge.rc:4558
#, c-format
msgid "(%1 Files Affected)"
msgstr ""
#. IDS_FILES_AFFECTED_FMT2
-#: Merge.rc:4549
+#: Merge.rc:4559
#, c-format
msgid "(%1 of %2 Files Affected)"
msgstr ""
#. IDS_CONFIRM_DELETE_SINGLE
-#: Merge.rc:4555
+#: Merge.rc:4565
#, c-format
msgid "Are you sure you want to delete\n\n%1 ?"
msgstr ""
#. IDS_CONFIRM_SINGLE_COPY
-#: Merge.rc:4556
+#: Merge.rc:4566
msgid "Are you sure you want to copy?"
msgstr ""
#. IDS_CONFIRM_MULTIPLE_COPY
-#: Merge.rc:4557
+#: Merge.rc:4567
#, c-format
msgid "Are you sure you want to copy %d items?"
msgstr ""
#. IDS_DIRCMP_NOTSYNC
-#: Merge.rc:4558
+#: Merge.rc:4568
#, c-format
msgid "Operation aborted!\n\nFolder contents changed, path\n%1\nnot found.\n\nRefresh the compare."
msgstr ""
#. IDS_CONFIRM_SINGLE_MOVE
-#: Merge.rc:4563
+#: Merge.rc:4573
msgid "Are you sure you want to move?"
msgstr ""
#. IDS_CONFIRM_MULTIPLE_MOVE
-#: Merge.rc:4564
+#: Merge.rc:4574
#, c-format
msgid "Are you sure you want to move %d items?"
msgstr ""
#. IDS_CONFIRM_MOVE_CAPTION
-#: Merge.rc:4566
+#: Merge.rc:4576
msgid "Confirm Move"
msgstr ""
-#: Merge.rc:4568
+#: Merge.rc:4578
msgid "Close the folder comparison window?"
msgstr ""
-#: Merge.rc:4570
+#: Merge.rc:4580
msgid "Close the folder comparison window, which took a long time?"
msgstr ""
#. IDS_ERROR_INVALID_DIR_FILE_NAME
-#: Merge.rc:4571
+#: Merge.rc:4581
msgid "The file or folder name is invalid."
msgstr ""
#. IDS_ERROR_EXECUTE_FILE
-#: Merge.rc:4577
+#: Merge.rc:4587
#, c-format
msgid "Failed to execute external editor: %1"
msgstr ""
#. IDS_UNKNOWN_ARCHIVE_FORMAT
-#: Merge.rc:4583
+#: Merge.rc:4593
msgid "Unknown archive format"
msgstr ""
-#: Merge.rc:4585
+#: Merge.rc:4595
msgid "Failed to extract archive.\nCompare as text file?"
msgstr ""
#. IDS_COLHDR_FILENAME
-#: Merge.rc:4591
+#: Merge.rc:4601
msgid "Filename"
msgstr ""
#. IDS_COLHDR_DIR
-#: Merge.rc:4592
+#: Merge.rc:4602
msgctxt "DirView|ColumnHeader"
msgid "Folder"
msgstr ""
#. IDS_COLHDR_RESULT
-#: Merge.rc:4593
+#: Merge.rc:4603
msgid "Comparison Result"
msgstr ""
#. IDS_COLHDR_LTIMEM
-#: Merge.rc:4594
+#: Merge.rc:4604
msgid "Left Date"
msgstr ""
#. IDS_COLHDR_RTIMEM
-#: Merge.rc:4595
+#: Merge.rc:4605
msgid "Right Date"
msgstr ""
#. IDS_COLHDR_MTIMEM
-#: Merge.rc:4596
+#: Merge.rc:4606
msgid "Middle Date"
msgstr ""
#. IDS_COLHDR_LSIZE
-#: Merge.rc:4598
+#: Merge.rc:4608
msgid "Left Size"
msgstr ""
#. IDS_COLHDR_RSIZE
-#: Merge.rc:4599
+#: Merge.rc:4609
msgid "Right Size"
msgstr ""
#. IDS_COLHDR_MSIZE
-#: Merge.rc:4604
+#: Merge.rc:4614
msgid "Middle Size"
msgstr ""
#. IDS_COLHDR_RSIZE_SHORT
-#: Merge.rc:4605
+#: Merge.rc:4615
msgid "Right Size (Short)"
msgstr ""
#. IDS_COLHDR_LSIZE_SHORT
-#: Merge.rc:4606
+#: Merge.rc:4616
msgid "Left Size (Short)"
msgstr ""
#. IDS_COLHDR_MSIZE_SHORT
-#: Merge.rc:4607
+#: Merge.rc:4617
msgid "Middle Size (Short)"
msgstr ""
#. IDS_COLHDR_LTIMEC
-#: Merge.rc:4613
+#: Merge.rc:4623
msgid "Left Creation Time"
msgstr ""
#. IDS_COLHDR_RTIMEC
-#: Merge.rc:4614
+#: Merge.rc:4624
msgid "Right Creation Time"
msgstr ""
#. IDS_COLHDR_MTIMEC
-#: Merge.rc:4615
+#: Merge.rc:4625
msgid "Middle Creation Time"
msgstr ""
#. IDS_COLHDR_NEWER
-#: Merge.rc:4616
+#: Merge.rc:4626
msgid "Newer File"
msgstr ""
#. IDS_COLHDR_LVERSION
-#: Merge.rc:4617
+#: Merge.rc:4627
msgid "Left File Version"
msgstr ""
#. IDS_COLHDR_RVERSION
-#: Merge.rc:4618
+#: Merge.rc:4628
msgid "Right File Version"
msgstr ""
#. IDS_COLHDR_MVERSION
-#: Merge.rc:4619
+#: Merge.rc:4629
msgid "Middle File Version"
msgstr ""
#. IDS_COLHDR_RESULT_ABBR
-#: Merge.rc:4620
+#: Merge.rc:4630
msgid "Short Result"
msgstr ""
#. IDS_COLHDR_LATTRIBUTES
-#: Merge.rc:4621
+#: Merge.rc:4631
msgid "Left Attributes"
msgstr ""
#. IDS_COLHDR_RATTRIBUTES
-#: Merge.rc:4622
+#: Merge.rc:4632
msgid "Right Attributes"
msgstr ""
#. IDS_COLHDR_MATTRIBUTES
-#: Merge.rc:4623
+#: Merge.rc:4633
msgid "Middle Attributes"
msgstr ""
#. IDS_COLHDR_LEOL_TYPE
-#: Merge.rc:4628
+#: Merge.rc:4638
msgid "Left EOL"
msgstr ""
#. IDS_COLHDR_MEOL_TYPE
-#: Merge.rc:4629
+#: Merge.rc:4639
msgid "Middle EOL"
msgstr ""
#. IDS_COLHDR_REOL_TYPE
-#: Merge.rc:4630
+#: Merge.rc:4640
msgid "Right EOL"
msgstr ""
#. IDS_COLHDR_LENCODING
-#: Merge.rc:4636
+#: Merge.rc:4646
msgid "Left Encoding"
msgstr ""
#. IDS_COLHDR_RENCODING
-#: Merge.rc:4637
+#: Merge.rc:4647
msgid "Right Encoding"
msgstr ""
#. IDS_COLHDR_MENCODING
-#: Merge.rc:4638
+#: Merge.rc:4648
msgid "Middle Encoding"
msgstr ""
#. IDS_COLHDR_NIDIFFS
-#: Merge.rc:4639
+#: Merge.rc:4649
msgid "Ignored Diff"
msgstr ""
#. IDS_COLHDR_BINARY
-#: Merge.rc:4641
+#: Merge.rc:4651
msgctxt "DirView|ColumnHeader"
msgid "Binary"
msgstr ""
#. IDS_PLUGINS_TYPE_UNPACKER
-#: Merge.rc:4642 Merge.rc:4959
+#: Merge.rc:4652 Merge.rc:4969
msgid "Unpacker"
msgstr ""
#. IDS_PLUGIN_TYPE4
-#: Merge.rc:4643 Merge.rc:4960 Merge.rc:5267
+#: Merge.rc:4653 Merge.rc:4970 Merge.rc:5277
msgid "Prediffer"
msgstr ""
#. IDS_COLHDR_LEFT
-#: Merge.rc:4644
+#: Merge.rc:4654
msgid "Left"
msgstr ""
#. IDS_COLHDR_MIDDLE
-#: Merge.rc:4645
+#: Merge.rc:4655
msgid "Middle"
msgstr ""
#. IDS_COLHDR_RIGHT
-#: Merge.rc:4646
+#: Merge.rc:4656
msgid "Right"
msgstr ""
#. IDS_COLHDR_DIFF
-#: Merge.rc:4647
+#: Merge.rc:4657
msgid "Diff"
msgstr ""
#. IDS_COLHDR_LEFT_DUPLICATE
-#: Merge.rc:4648
+#: Merge.rc:4658
msgid "Left Duplicate Count"
msgstr ""
#. IDS_COLHDR_RIGHT_DUPLICATE
-#: Merge.rc:4649
+#: Merge.rc:4659
msgid "Right Duplicate Count"
msgstr ""
#. IDS_COLHDR_MIDDLE_DUPLICATE
-#: Merge.rc:4650
+#: Merge.rc:4660
msgid "Middle Duplicate Count"
msgstr ""
#. IDS_COLHDR_MOVE
-#: Merge.rc:4651
+#: Merge.rc:4661
msgid "Move"
msgstr ""
#. IDS_PRPCAT_AUDIO
-#: Merge.rc:4658
+#: Merge.rc:4668
msgid "Audio"
msgstr ""
#. IDS_PRPCAT_CALENDAR
-#: Merge.rc:4659
+#: Merge.rc:4669
msgid "Calendar"
msgstr ""
#. IDS_PRPCAT_COMMUNICATION
-#: Merge.rc:4660
+#: Merge.rc:4670
msgid "Communication"
msgstr ""
#. IDS_PRPCAT_CONTACT
-#: Merge.rc:4661
+#: Merge.rc:4671
msgid "Contact"
msgstr ""
#. IDS_PRPCAT_DEVICES
-#: Merge.rc:4662
+#: Merge.rc:4672
msgid "Devices"
msgstr ""
#. IDS_PRPCAT_DOCUMENT
-#: Merge.rc:4663
+#: Merge.rc:4673
msgid "Document"
msgstr ""
#. IDS_PRPCAT_HOME
-#: Merge.rc:4664
+#: Merge.rc:4674
msgid "Home"
msgstr ""
#. IDS_PRPCAT_JOURNAL
-#: Merge.rc:4666
+#: Merge.rc:4676
msgid "Journal"
msgstr ""
#. IDS_PRPCAT_LINK
-#: Merge.rc:4667
+#: Merge.rc:4677
msgid "Link"
msgstr ""
#. IDS_PRPCAT_MEDIA
-#: Merge.rc:4668
+#: Merge.rc:4678
msgid "Media"
msgstr ""
#. IDS_PRPCAT_MUSIC
-#: Merge.rc:4670
+#: Merge.rc:4680
msgid "Music"
msgstr ""
#. IDS_PRPCAT_NOTE
-#: Merge.rc:4671
+#: Merge.rc:4681
msgid "Note"
msgstr ""
#. IDS_PRPCAT_PHOTO
-#: Merge.rc:4672
+#: Merge.rc:4682
msgid "Photo"
msgstr ""
#. IDS_PRPCAT_RECORDEDTV
-#: Merge.rc:4673
+#: Merge.rc:4683
msgid "RecordedTV"
msgstr ""
#. IDS_PRPCAT_SEARCH
-#: Merge.rc:4674
+#: Merge.rc:4684
msgid "Search"
msgstr ""
#. IDS_PRPCAT_SECURITY
-#: Merge.rc:4675
+#: Merge.rc:4685
msgid "Security"
msgstr ""
#. IDS_PRPCAT_SOFTWARE
-#: Merge.rc:4676
+#: Merge.rc:4686
msgid "Software"
msgstr ""
#. IDS_PRPCAT_TASK
-#: Merge.rc:4677
+#: Merge.rc:4687
msgid "Task"
msgstr ""
#. IDS_PRPCAT_VIDEO
-#: Merge.rc:4678
+#: Merge.rc:4688
msgid "Video"
msgstr ""
#. IDS_PRPCAT_HASH
-#: Merge.rc:4679
+#: Merge.rc:4689
msgid "Hash"
msgstr ""
#. IDS_CANT_COMPARE_FILES
-#: Merge.rc:4685
+#: Merge.rc:4695
msgid "Unable to compare files"
msgstr ""
#. IDS_ABORTED_ITEM
-#: Merge.rc:4686
+#: Merge.rc:4696
msgid "Item aborted"
msgstr ""
#. IDS_FILE_SKIPPED
-#: Merge.rc:4687
+#: Merge.rc:4697
msgid "File skipped"
msgstr ""
#. IDS_DIR_SKIPPED
-#: Merge.rc:4688
+#: Merge.rc:4698
msgid "Folder skipped"
msgstr ""
#. IDS_LEFT_ONLY_IN_FMT
-#: Merge.rc:4689
+#: Merge.rc:4699
#, c-format
msgid "Left only: %1"
msgstr ""
#. IDS_MIDDLE_ONLY_IN_FMT
-#: Merge.rc:4690
+#: Merge.rc:4700
#, c-format
msgid "Middle only: %1"
msgstr ""
#. IDS_RIGHT_ONLY_IN_FMT
-#: Merge.rc:4691
+#: Merge.rc:4701
#, c-format
msgid "Right only: %1"
msgstr ""
#. IDS_DOES_NOT_EXIST_IN_FMT
-#: Merge.rc:4692
+#: Merge.rc:4702
#, c-format
msgid "Does not exist in %1"
msgstr ""
#. IDS_BIN_FILES_SAME
-#: Merge.rc:4693
+#: Merge.rc:4703
msgid "Binary files are identical"
msgstr ""
#. IDS_BIN_FILES_DIFF
-#: Merge.rc:4699
+#: Merge.rc:4709
msgid "Binary files are different"
msgstr ""
#. IDS_FILES_ARE_DIFFERENT
-#: Merge.rc:4700
+#: Merge.rc:4710
msgid "Files are different"
msgstr ""
#. IDS_FOLDERS_ARE_DIFFERENT
-#: Merge.rc:4701
+#: Merge.rc:4711
msgid "Folders are different"
msgstr ""
#. IDS_LEFTONLY
-#: Merge.rc:4702
+#: Merge.rc:4712
msgid "Left Only"
msgstr ""
#. IDS_RIGHTONLY
-#: Merge.rc:4703
+#: Merge.rc:4713
msgid "Right Only"
msgstr ""
#. IDS_MIDDLEONLY
-#: Merge.rc:4704
+#: Merge.rc:4714
msgid "Middle Only"
msgstr ""
#. IDS_NOITEMLEFT
-#: Merge.rc:4705
+#: Merge.rc:4715
msgid "No item in left"
msgstr ""
#. IDS_NOITEMRIGHT
-#: Merge.rc:4706
+#: Merge.rc:4716
msgid "No item in right"
msgstr ""
#. IDS_NOITEMMIDDLE
-#: Merge.rc:4707
+#: Merge.rc:4717
msgid "No item in middle"
msgstr ""
#. IDS_CMPRES_ERROR
-#: Merge.rc:4709
+#: Merge.rc:4719
msgid "Error"
msgstr ""
#. IDS_TEXT_FILES_SAME
-#: Merge.rc:4710
+#: Merge.rc:4720
msgid "Text files are identical"
msgstr ""
#. IDS_LEFTONLY_DIFF
-#: Merge.rc:4711
+#: Merge.rc:4721
msgid " (Middle and right are identical)"
msgstr ""
#. IDS_MIDDLEONLY_DIFF
-#: Merge.rc:4712
+#: Merge.rc:4722
msgid " (Left and right are identical)"
msgstr ""
#. IDS_RIGHTONLY_DIFF
-#: Merge.rc:4713
+#: Merge.rc:4723
msgid " (Left and middle are identical)"
msgstr ""
#. IDS_PATH_MISMATCH
-#: Merge.rc:4714
+#: Merge.rc:4724
msgid " (paths differ)"
msgstr ""
#. IDS_TEXT_FILES_DIFF
-#: Merge.rc:4715
+#: Merge.rc:4725
msgid "Text files are different"
msgstr ""
#. IDS_IMAGE_FILES_SAME
-#: Merge.rc:4716
+#: Merge.rc:4726
msgid "Image files are identical"
msgstr ""
#. IDS_IMAGE_FILES_DIFF
-#: Merge.rc:4717
+#: Merge.rc:4727
msgid "Image files are different"
msgstr ""
#. IDS_EXPR_DIFF
-#: Merge.rc:4718
+#: Merge.rc:4728
#, c-format
msgid "Files are different (expr: %1)"
msgstr ""
#. IDS_HASH_GROUP
-#: Merge.rc:4719
+#: Merge.rc:4729
#, c-format
msgid "Group%d"
msgstr ""
#. IDS_RENAME_MOVE_DETECTION_DISALBED
-#: Merge.rc:4720
+#: Merge.rc:4730
msgctxt "Options dialog|Compare|Folder|Detect renames and moves"
msgid "Disabled"
msgstr ""
#. IDS_RENAME_MOVE_DETECTION_RENAME
-#: Merge.rc:4721
+#: Merge.rc:4731
msgid "Detect renames"
msgstr ""
#. IDS_RENAME_MOVE_DETECTION_RENAME_MOVE
-#: Merge.rc:4722
+#: Merge.rc:4732
msgid "Detect renames and moves"
msgstr ""
#. IDS_RENAME_MOVE_MERGE_MODE_RENAME
-#: Merge.rc:4723
+#: Merge.rc:4733
msgid "Merge renames"
msgstr ""
#. IDS_RENAME_MOVE_MERGE_MODE_RENAME_MOVE
-#: Merge.rc:4724
+#: Merge.rc:4734
msgid "Merge renames and moves"
msgstr ""
#. IDS_RENAMED
-#: Merge.rc:4725
+#: Merge.rc:4735
msgid "Renamed"
msgstr ""
#. IDS_MOVED
-#: Merge.rc:4726
+#: Merge.rc:4736
msgid "Moved"
msgstr ""
#. IDS_RENAMED_MOVED
-#: Merge.rc:4727
+#: Merge.rc:4737
msgid "Renamed/Moved"
msgstr ""
#. IDS_RENAMED_MOVED_ITEMS
-#: Merge.rc:4728
+#: Merge.rc:4738
#, c-format
msgid "(%1 items)"
msgstr ""
#. IDS_RENAMED_MOVED_RESULT
-#: Merge.rc:4729
+#: Merge.rc:4739
#, c-format
msgid "%1 (set %2): "
msgstr ""
#. IDS_SWITCH_FLAT_MODE
-#: Merge.rc:4730
+#: Merge.rc:4740
msgid "Some moved items have been merged.\nIn Tree Mode, these items may appear in positions that do not reflect the actual folder structure, which can be confusing.\nSwitch to Flat Mode?"
msgstr ""
#. IDS_ELAPSED_TIME
-#: Merge.rc:4736
+#: Merge.rc:4746
#, c-format
msgid "Elapsed time: %ld ms"
msgstr ""
#. IDS_STATUS_SELITEM1
-#: Merge.rc:4737
+#: Merge.rc:4747
msgid "1 item selected"
msgstr ""
#. IDS_STATUS_SELITEMS
-#: Merge.rc:4738
+#: Merge.rc:4748
#, c-format
msgid "%1 items selected"
msgstr ""
#. IDS_COLDESC_FILENAME
-#: Merge.rc:4744
+#: Merge.rc:4754
msgid "Filename or folder name."
msgstr ""
#. IDS_COLDESC_DIR
-#: Merge.rc:4745
+#: Merge.rc:4755
msgid "Subfolder name when subfolders are included."
msgstr ""
#. IDS_COLDESC_RESULT
-#: Merge.rc:4746
+#: Merge.rc:4756
msgid "Comparison result, long form."
msgstr ""
#. IDS_COLDESC_LTIMEM
-#: Merge.rc:4751
+#: Merge.rc:4761
msgid "Left side modification date."
msgstr ""
#. IDS_COLDESC_RTIMEM
-#: Merge.rc:4752
+#: Merge.rc:4762
msgid "Right side modification date."
msgstr ""
#. IDS_COLDESC_MTIMEM
-#: Merge.rc:4753
+#: Merge.rc:4763
msgid "Middle side modification date."
msgstr ""
#. IDS_COLDESC_EXTENSION
-#: Merge.rc:4754
+#: Merge.rc:4764
msgid "File's extension."
msgstr ""
#. IDS_COLDESC_LSIZE
-#: Merge.rc:4755
+#: Merge.rc:4765
msgid "Left file size in bytes."
msgstr ""
#. IDS_COLDESC_RSIZE
-#: Merge.rc:4756
+#: Merge.rc:4766
msgid "Right file size in bytes."
msgstr ""
#. IDS_COLDESC_MSIZE
-#: Merge.rc:4757
+#: Merge.rc:4767
msgid "Middle file size in bytes."
msgstr ""
#. IDS_COLDESC_LSIZE_SHORT
-#: Merge.rc:4758
+#: Merge.rc:4768
msgid "Left file size abbreviated."
msgstr ""
#. IDS_COLDESC_RSIZE_SHORT
-#: Merge.rc:4759
+#: Merge.rc:4769
msgid "Right file size abbreviated."
msgstr ""
#. IDS_COLDESC_MSIZE_SHORT
-#: Merge.rc:4760
+#: Merge.rc:4770
msgid "Middle file size abbreviated."
msgstr ""
#. IDS_COLDESC_LTIMEC
-#: Merge.rc:4766
+#: Merge.rc:4776
msgid "Left side creation time."
msgstr ""
#. IDS_COLDESC_RTIMEC
-#: Merge.rc:4767
+#: Merge.rc:4777
msgid "Right side creation time."
msgstr ""
#. IDS_COLDESC_MTIMEC
-#: Merge.rc:4768
+#: Merge.rc:4778
msgid "Middle side creation time."
msgstr ""
#. IDS_COLDESC_NEWER
-#: Merge.rc:4769
+#: Merge.rc:4779
msgid "Tells which side has newer modification date."
msgstr ""
#. IDS_COLDESC_LVERSION
-#: Merge.rc:4770
+#: Merge.rc:4780
msgid "Left side file version, only for some file types."
msgstr ""
#. IDS_COLDESC_RVERSION
-#: Merge.rc:4771
+#: Merge.rc:4781
msgid "Right side file version, only for some file types."
msgstr ""
#. IDS_COLDESC_MVERSION
-#: Merge.rc:4776
+#: Merge.rc:4786
msgid "Middle side file version, only for some file types."
msgstr ""
#. IDS_COLDESC_RESULT_ABBR
-#: Merge.rc:4777
+#: Merge.rc:4787
msgid "Short comparison result."
msgstr ""
#. IDS_COLDESC_LATTRIBUTES
-#: Merge.rc:4778
+#: Merge.rc:4788
msgid "Left side attributes."
msgstr ""
#. IDS_COLDESC_RATTRIBUTES
-#: Merge.rc:4779
+#: Merge.rc:4789
msgid "Right side attributes."
msgstr ""
#. IDS_COLDESC_MATTRIBUTES
-#: Merge.rc:4780
+#: Merge.rc:4790
msgid "Middle side attributes."
msgstr ""
#. IDS_COLDESC_LEOL_TYPE
-#: Merge.rc:4781
+#: Merge.rc:4791
msgid "Left side file EOL type."
msgstr ""
#. IDS_COLDESC_REOL_TYPE
-#: Merge.rc:4782
+#: Merge.rc:4792
msgid "Right side file EOL type."
msgstr ""
#. IDS_COLDESC_MEOL_TYPE
-#: Merge.rc:4783
+#: Merge.rc:4793
msgid "Middle side file EOL type."
msgstr ""
#. IDS_COLDESC_LENCODING
-#: Merge.rc:4789
+#: Merge.rc:4799
msgid "Left side encoding."
msgstr ""
#. IDS_COLDESC_RENCODING
-#: Merge.rc:4790
+#: Merge.rc:4800
msgid "Right side encoding."
msgstr ""
#. IDS_COLDESC_MENCODING
-#: Merge.rc:4791
+#: Merge.rc:4801
msgid "Middle side encoding."
msgstr ""
#. IDS_COLDESC_NIDIFFS
-#: Merge.rc:4792
+#: Merge.rc:4802
msgid "Number of ignored differences in file. Ignored and cannot be merged."
msgstr ""
#. IDS_COLDESC_NSDIFFS
-#: Merge.rc:4793
+#: Merge.rc:4803
msgid "Number of differences in file (excluding ignored)."
msgstr ""
#. IDS_COLDESC_BINARY
-#: Merge.rc:4794
+#: Merge.rc:4804
msgid "Shows an asterisk (*) if the file is binary."
msgstr ""
#. IDS_COLDESC_UNPACKER
-#: Merge.rc:4795
+#: Merge.rc:4805
msgid "Unpacker plugin name or pipeline."
msgstr ""
#. IDS_COLDESC_PREDIFFER
-#: Merge.rc:4796
+#: Merge.rc:4806
msgid "Prediffer plugin name or pipeline."
msgstr ""
#. IDS_DIRECTORY_REPORT_TITLE
-#: Merge.rc:4802
+#: Merge.rc:4812
#, c-format
msgid "Compare %1 with %2"
msgstr ""
#. IDS_DIRECTORY_REPORT_TITLE3
-#: Merge.rc:4803
+#: Merge.rc:4813
#, c-format
msgid "Compare %1 with %2 and %3"
msgstr ""
#. IDS_REPORT_COMMALIST
-#: Merge.rc:4804
+#: Merge.rc:4814
msgid "Comma-separated list"
msgstr ""
#. IDS_REPORT_TABLIST
-#: Merge.rc:4805
+#: Merge.rc:4815
msgid "Tab-separated list"
msgstr ""
#. IDS_REPORT_SIMPLEHTML
-#: Merge.rc:4806
+#: Merge.rc:4816
msgid "Simple HTML"
msgstr ""
#. IDS_REPORT_SIMPLEXML
-#: Merge.rc:4807
+#: Merge.rc:4817
msgid "Simple XML"
msgstr ""
-#: Merge.rc:4809
+#: Merge.rc:4819
msgid "Report file already exists. Overwrite?"
msgstr ""
#. IDS_REPORT_ERROR
-#: Merge.rc:4814
+#: Merge.rc:4824
#, c-format
msgid "Error creating the report:\n%1"
msgstr ""
#. IDS_REPORT_SUCCESS
-#: Merge.rc:4815
+#: Merge.rc:4825
msgid "Report created successfully."
msgstr ""
#. IDS_SYNCPOINT_LASTBLOCK
-#: Merge.rc:4821
+#: Merge.rc:4831
msgid "Cannot add a synchronization point at this line."
msgstr ""
#. IDS_FILE_TO_ITSELF
-#: Merge.rc:4827
+#: Merge.rc:4837
msgid "Same file is opened in both panes."
msgstr ""
#. IDS_FILESSAME
-#: Merge.rc:4828
+#: Merge.rc:4838
msgid "Selected files are identical."
msgstr ""
#. IDS_FILESSAME_CURCFG
-#: Merge.rc:4829
+#: Merge.rc:4839
msgid "Selected files are identical (with current settings).\r\nChecking binary identity..."
msgstr ""
#. IDS_FILESSAME_BINERROR
-#: Merge.rc:4830
+#: Merge.rc:4840
msgid "Selected files are identical (with current settings).\r\nBut binary comparison failed."
msgstr ""
#. IDS_FILESSAME_BINSAME
-#: Merge.rc:4831
+#: Merge.rc:4841
msgid "Selected files are identical (binary match)."
msgstr ""
#. IDS_FILESSAME_BINDIFF
-#: Merge.rc:4832
+#: Merge.rc:4842
msgid "Selected files are identical (with current settings).\r\nBut differ at the binary level."
msgstr ""
#. IDS_FILEERROR
-#: Merge.rc:4833
+#: Merge.rc:4843
msgid "An error occurred while comparing files."
msgstr ""
#. IDS_TEMP_FILEERROR
-#: Merge.rc:4834
+#: Merge.rc:4844
msgid "Could not create temporary files. Check your temporary path settings."
msgstr ""
#. IDS_SUGGEST_IGNOREEOL
-#: Merge.rc:4835
+#: Merge.rc:4845
msgid "Files use different EOL.\n\nTreat all EOL as equivalent?\n\nSet 'Ignore EOL differences (Windows/Unix/Mac)' in Compare section of Options."
msgstr ""
#. IDS_INVALID_DIRECTORY
-#: Merge.rc:4836
+#: Merge.rc:4846
msgid "Selected folder is invalid."
msgstr ""
#. IDS_CANNOT_OPEN_BINARYFILE
-#: Merge.rc:4837
+#: Merge.rc:4847
msgid "Cannot open a binary file in Editor."
msgstr ""
#. IDS_CREATE_PAIR_FOLDER
-#: Merge.rc:4838
+#: Merge.rc:4848
#, c-format
msgid "Create matching folder:\n%1\non the other side and open?"
msgstr ""
#. IDS_CONFIRM_COPY_ALL_DIFFS
-#: Merge.rc:4839
+#: Merge.rc:4849
msgid "Copy all differences to other file?"
msgstr ""
#. IDS_MOVE_TO_NEXTFILE
-#: Merge.rc:4844
+#: Merge.rc:4854
msgid "Move to next file?"
msgstr ""
#. IDS_MOVE_TO_PREVFILE
-#: Merge.rc:4845
+#: Merge.rc:4855
msgid "Move to previous file?"
msgstr ""
#. IDS_MOVE_TO_NEXTPAGE
-#: Merge.rc:4846
+#: Merge.rc:4856
msgid "Move to next page?"
msgstr ""
#. IDS_MOVE_TO_PREVPAGE
-#: Merge.rc:4847
+#: Merge.rc:4857
msgid "Move to previous page?"
msgstr ""
#. IDS_MOVE_TO_FIRSTFILE
-#: Merge.rc:4848
+#: Merge.rc:4858
msgid "Move to first file?"
msgstr ""
#. IDS_MOVE_TO_LASTFILE
-#: Merge.rc:4849
+#: Merge.rc:4859
msgid "Move to last file?"
msgstr ""
-#: Merge.rc:4856
+#: Merge.rc:4866
#, c-format
msgid "Different codepages: left (cp%d), right (cp%d).\nDisplay in codepage (better display) or default Windows codepage (safer merging)?\n(Recommended: default Windows codepage)"
msgstr ""
-#: Merge.rc:4858
+#: Merge.rc:4868
msgid "Information lost due to encoding errors: both files"
msgstr ""
-#: Merge.rc:4860
+#: Merge.rc:4870
msgid "Information lost due to encoding errors: first file"
msgstr ""
-#: Merge.rc:4862
+#: Merge.rc:4872
msgid "Information lost due to encoding errors: second file"
msgstr ""
-#: Merge.rc:4864
+#: Merge.rc:4874
msgid "Information lost due to encoding errors: third file"
msgstr ""
#. IDS_LINEDIFF_NODIFF
-#: Merge.rc:4870
+#: Merge.rc:4880
msgid "No difference"
msgstr ""
#. IDS_LINEDIFF_NODIFF_CAPTION
-#: Merge.rc:4871
+#: Merge.rc:4881
msgid "Line difference"
msgstr ""
#. IDS_NUM_REPLACED
-#: Merge.rc:4877
+#: Merge.rc:4887
#, c-format
msgid "Replaced %1 string(s)."
msgstr ""
#. IDS_EDIT_TEXT_NOT_FOUND
-#: Merge.rc:4878
+#: Merge.rc:4888
#, c-format
msgid "Cannot find string \"%s\"."
msgstr ""
#. IDS_MERGE_MODE
-#: Merge.rc:4884
+#: Merge.rc:4894
msgid "Entering Merge Mode. Press F9 to turn off."
msgstr ""
#. IDS_AUTO_MERGE
-#: Merge.rc:4890
+#: Merge.rc:4900
#, c-format
msgid "Automatic merges: %1\nUnresolved conflicts: %2"
msgstr ""
#. IDS_CODEPAGE_MERGED
-#: Merge.rc:4891
+#: Merge.rc:4901
msgid "Codepage change merged."
msgstr ""
#. IDS_CODEPAGE_CONFLICT
-#: Merge.rc:4892
+#: Merge.rc:4902
msgid "Codepage changes are conflicting."
msgstr ""
#. IDS_EOL_MERGED
-#: Merge.rc:4893
+#: Merge.rc:4903
msgid "EOL change merged."
msgstr ""
#. IDS_EOL_CONFLICT
-#: Merge.rc:4894
+#: Merge.rc:4904
msgid "EOL changes are conflicting."
msgstr ""
#. IDS_LOCBAR_CAPTION
-#: Merge.rc:4900
+#: Merge.rc:4910
msgid "Location Pane"
msgstr ""
#. IDS_DIFFBAR_CAPTION
-#: Merge.rc:4901
+#: Merge.rc:4911
msgid "Diff Pane"
msgstr ""
#. IDS_DIFF_SUCCEEDED
-#: Merge.rc:4908
+#: Merge.rc:4918
msgid "Patch file written."
msgstr ""
#. IDS_DIFF_ITEM1NOTFOUND
-#: Merge.rc:4909
+#: Merge.rc:4919
msgid "First item not found!"
msgstr ""
#. IDS_DIFF_ITEM2NOTFOUND
-#: Merge.rc:4910
+#: Merge.rc:4920
msgid "Second item not found!"
msgstr ""
#. IDS_DIFF_FILEOVERWRITE
-#: Merge.rc:4911
+#: Merge.rc:4921
msgid "Patch file already exists. Overwrite?"
msgstr ""
#. IDS_DIFF_SELECTEDFILES
-#: Merge.rc:4912
+#: Merge.rc:4922
#, c-format
msgid "[%1 files selected]"
msgstr ""
#. IDS_DIFF_NORMAL
-#: Merge.rc:4913
+#: Merge.rc:4923
msgid "Normal"
msgstr ""
#. IDS_DIFF_CONTEXT
-#: Merge.rc:4914
+#: Merge.rc:4924
msgid "Context"
msgstr ""
#. IDS_DIFF_UNIFIED
-#: Merge.rc:4915
+#: Merge.rc:4925
msgid "Unified"
msgstr ""
#. IDS_FILEWRITE_ERROR
-#: Merge.rc:4917
+#: Merge.rc:4927
#, c-format
msgid "Could not write to file %1."
msgstr ""
#. IDS_PATH_NOT_ABSOLUTE
-#: Merge.rc:4918
+#: Merge.rc:4928
#, c-format
msgid "Output path is not absolute: %1"
msgstr ""
#. IDS_MUST_SPECIFY_OUTPUT
-#: Merge.rc:4919
+#: Merge.rc:4929
msgid "Specify an output file."
msgstr ""
-#: Merge.rc:4921
+#: Merge.rc:4931
msgid "Cannot create patch from binary files."
msgstr ""
#. IDS_SAVEFILES_FORPATCH
-#: Merge.rc:4922
+#: Merge.rc:4932
msgid "Save all files first.\n\nCreating a patch requires no unsaved changes."
msgstr ""
#. IDS_FOLDER_NOTEXIST
-#: Merge.rc:4923
+#: Merge.rc:4933
msgid "Folder does not exist."
msgstr ""
#. IDS_NO_ZIP_SUPPORT
-#: Merge.rc:4928
+#: Merge.rc:4938
msgid "Archive support not enabled.\n7-Zip and/or Merge7z*.dll not found.\nSee manual for archive support."
msgstr ""
#. IDS_OPT_EXPORT_CAPTION
-#: Merge.rc:4929
+#: Merge.rc:4939
msgid "Select file for export"
msgstr ""
#. IDS_OPT_IMPORT_CAPTION
-#: Merge.rc:4930
+#: Merge.rc:4940
msgid "Select file for import"
msgstr ""
#. IDS_OPT_IMPORT_DONE
-#: Merge.rc:4931
+#: Merge.rc:4941
msgid "Options imported from file."
msgstr ""
#. IDS_OPT_EXPORT_DONE
-#: Merge.rc:4932
+#: Merge.rc:4942
msgid "Options exported to file."
msgstr ""
#. IDS_OPT_IMPORT_ERR
-#: Merge.rc:4933
+#: Merge.rc:4943
msgid "Failed to import options from file."
msgstr ""
#. IDS_OPT_EXPORT_ERR
-#: Merge.rc:4934
+#: Merge.rc:4944
msgid "Failed to write options to file."
msgstr ""
#. IDS_CLOSEALL_WINDOWS
-#: Merge.rc:4935
+#: Merge.rc:4945
msgid "Close multiple compare windows?\n\nContinue?"
msgstr ""
#. IDS_EOL_MIXED
-#: Merge.rc:4944
+#: Merge.rc:4954
msgid "Mixed"
msgstr ""
#. IDS_EOL_BIN
-#: Merge.rc:4945
+#: Merge.rc:4955
msgctxt "EOL Type"
msgid "Binary"
msgstr ""
#. IDS_EOL_NONE
-#: Merge.rc:4949
+#: Merge.rc:4959
msgid "None"
msgstr ""
#. IDS_MARKER_COLOR_FMT
-#: Merge.rc:4950
+#: Merge.rc:4960
#, c-format
msgid "Marker Color %d"
msgstr ""
#. IDS_MARKER_NEW_PATTERN
-#: Merge.rc:4951
+#: Merge.rc:4961
msgid "New Pattern"
msgstr ""
#. IDS_PLUGINSLIST_TYPE
-#: Merge.rc:4957
+#: Merge.rc:4967
msgid "Type"
msgstr ""
#. IDS_PLUGINS_TYPE_EDITSCRIPT
-#: Merge.rc:4961
+#: Merge.rc:4971
msgid "Editor script"
msgstr ""
#. ID_SELECTLINEDIFF
-#: Merge.rc:4967
+#: Merge.rc:4977
msgid "\nDifference in Current Line (F4)"
msgstr ""
#. ID_OPTIONS
-#: Merge.rc:4968
+#: Merge.rc:4978
msgid "\nOptions"
msgstr ""
#. ID_REFRESH
-#: Merge.rc:4969
+#: Merge.rc:4979
msgid "\nRefresh (F5)"
msgstr ""
#. ID_PREVDIFF
-#: Merge.rc:4975
+#: Merge.rc:4985
msgid "\nPrevious Difference (Alt+Up)"
msgstr ""
#. ID_NEXTDIFF
-#: Merge.rc:4976
+#: Merge.rc:4986
msgid "\nNext Difference (Alt+Down)"
msgstr ""
#. ID_PREVCONFLICT
-#: Merge.rc:4977
+#: Merge.rc:4987
msgid "\nPrevious Conflict (Alt+Shift+Up)"
msgstr ""
#. ID_NEXTCONFLICT
-#: Merge.rc:4978
+#: Merge.rc:4988
msgid "\nNext Conflict (Alt+Shift+Down)"
msgstr ""
#. ID_FIRSTDIFF
-#: Merge.rc:4983
+#: Merge.rc:4993
msgid "\nFirst Difference (Alt+Home)"
msgstr ""
#. ID_CURDIFF
-#: Merge.rc:4984
+#: Merge.rc:4994
msgid "\nCurrent Difference (Alt+Enter)"
msgstr ""
#. ID_LASTDIFF
-#: Merge.rc:4985
+#: Merge.rc:4995
msgid "\nLast Difference (Alt+End)"
msgstr ""
#. ID_L2R
-#: Merge.rc:4986
+#: Merge.rc:4996
msgid "\nCopy to Right (Alt+Right)"
msgstr ""
#. ID_R2L
-#: Merge.rc:4987
+#: Merge.rc:4997
msgid "\nCopy to Left (Alt+Left)"
msgstr ""
#. ID_L2RNEXT
-#: Merge.rc:4988
+#: Merge.rc:4998
msgid "\nCopy to Right and Advance (Ctrl+Alt+Right)"
msgstr ""
#. ID_R2LNEXT
-#: Merge.rc:4989
+#: Merge.rc:4999
msgid "\nCopy to Left and Advance (Ctrl+Alt+Left)"
msgstr ""
#. ID_ALL_RIGHT
-#: Merge.rc:4990
+#: Merge.rc:5000
msgid "\nCopy All to Right"
msgstr ""
#. ID_ALL_LEFT
-#: Merge.rc:4991
+#: Merge.rc:5001
msgid "\nCopy All to Left"
msgstr ""
#. ID_AUTO_MERGE
-#: Merge.rc:4992
+#: Merge.rc:5002
msgid "\nAuto Merge (Ctrl+Alt+M)"
msgstr ""
#. ID_FIRSTFILE
-#: Merge.rc:4993
+#: Merge.rc:5003
msgid "\nFirst File"
msgstr ""
#. ID_NEXTFILE
-#: Merge.rc:4994
+#: Merge.rc:5004
msgid "\nNext File (Ctrl+F8)"
msgstr ""
#. ID_LASTFILE
-#: Merge.rc:4995
+#: Merge.rc:5005
msgid "\nLast File"
msgstr ""
#. ID_PREVFILE
-#: Merge.rc:4996
+#: Merge.rc:5006
msgid "\nPrevious File (Ctrl+F7)"
msgstr ""
#. IDS_UNPACK_AUTO
-#: Merge.rc:5003
+#: Merge.rc:5013
msgid "Adapted unpacker applied to both files (one needs extension)."
msgstr ""
#. IDS_NO_PREDIFFER
-#: Merge.rc:5004
+#: Merge.rc:5014
msgid "No Prediffer (Normal)"
msgstr ""
#. IDS_SUGGESTED_PLUGINS
-#: Merge.rc:5005
+#: Merge.rc:5015
msgid "Suggested Plugins"
msgstr ""
#. IDS_NOT_SUGGESTED_PLUGINS
-#: Merge.rc:5006
+#: Merge.rc:5016
msgid "All Plugins"
msgstr ""
#. IDS_PRIVATEBUILD_FMT
-#: Merge.rc:5012
+#: Merge.rc:5022
#, c-format
msgid "Private Build: %1"
msgstr ""
#. IDS_CHECKFORUPDATES_UPTODATE
-#: Merge.rc:5013
+#: Merge.rc:5023
msgid "Your software is up to date."
msgstr ""
-#: Merge.rc:5015
+#: Merge.rc:5025
#, c-format
msgid "WinMerge update available.\n%1 available (you have %2). Download now?"
msgstr ""
#. IDS_ALLRIGHTS_RESERVED
-#: Merge.rc:5016
+#: Merge.rc:5026
msgid " - All rights reserved."
msgstr ""
#. IDS_CHECKFORUPDATES_FAILED
-#: Merge.rc:5021
+#: Merge.rc:5031
msgid "Failed to download latest version information"
msgstr ""
#. IDS_TITLE_PLUGINS_SETTINGS
-#: Merge.rc:5027
+#: Merge.rc:5037
msgid "Plugin Settings"
msgstr ""
#. IDS_NO_SCT_SCRIPTS
-#: Merge.rc:5029
+#: Merge.rc:5039
msgid "WSH not found - .sct scripts disabled"
msgstr ""
#. IDS_LOCBAR_GOTOLINE_FMT
-#: Merge.rc:5037
+#: Merge.rc:5047
#, c-format
msgid "G&o to Line %1"
msgstr ""
#. IDS_GOTO_MOVED_LINE
-#: Merge.rc:5043
+#: Merge.rc:5053
msgid "Go to Moved Line\tCtrl+Shift+G"
msgstr ""
#. IDS_AUTOCOMPLETE_DISABLED
-#: Merge.rc:5049
+#: Merge.rc:5059
msgctxt "Options dialog|General|Open dialog Auto completion"
msgid "Disabled"
msgstr ""
#. IDS_AUTOCOMPLETE_FILE_SYS
-#: Merge.rc:5050
+#: Merge.rc:5060
msgid "From file system"
msgstr ""
#. IDS_AUTOCOMPLETE_MRU
-#: Merge.rc:5051
+#: Merge.rc:5061
msgid "From Most Recently Used list"
msgstr ""
#. IDS_COLORSCHEME_PLAIN
-#: Merge.rc:5057
+#: Merge.rc:5067
msgid "No Highlighting"
msgstr ""
#. IDS_COLORSCHEME_BATCH
-#: Merge.rc:5063
+#: Merge.rc:5073
msgid "Batch"
msgstr ""
#. IDS_COLORSCHEME_PO
-#: Merge.rc:5090
+#: Merge.rc:5100
msgid "Portable Object"
msgstr ""
#. IDS_COLORSCHEME_RSRC
-#: Merge.rc:5094
+#: Merge.rc:5104
msgid "Resources"
msgstr ""
#. IDS_COLORSCHEME_SH
-#: Merge.rc:5098
+#: Merge.rc:5108
msgid "Shell"
msgstr ""
#. IDS_CLOSE_LEFT_TABS
-#: Merge.rc:5115
+#: Merge.rc:5125
msgid "Close &Left Tabs"
msgstr ""
#. IDS_CLOSE_RIGHT_TABS
-#: Merge.rc:5116
+#: Merge.rc:5126
msgid "Close R&ight Tabs"
msgstr ""
#. IDS_CLOSE_OTHER_TABS
-#: Merge.rc:5117
+#: Merge.rc:5127
msgid "Close &Other Tabs"
msgstr ""
#. IDS_TABBAR_AUTO_MAXWIDTH
-#: Merge.rc:5118
+#: Merge.rc:5128
msgid "Enable &Auto Max Width"
msgstr ""
#. IDS_WEBPAGE_MENU
-#: Merge.rc:5128
+#: Merge.rc:5138
msgid "We&bpage"
msgstr ""
#. IDS_VIEW_WRAP_TEXT
-#: Merge.rc:5133
+#: Merge.rc:5143
msgid "W&rap Text"
msgstr ""
#. IDS_NOTINSTALLED
-#: Merge.rc:5138
+#: Merge.rc:5148
#, c-format
msgid "%1 is not installed."
msgstr ""
#. IDS_CREATE_FOLDER
-#: Merge.rc:5143
+#: Merge.rc:5153
#, c-format
msgid "%1 does not exist. Create it?"
msgstr ""
#. IDS_CREATE_FOLDER_ERROR
-#: Merge.rc:5144
+#: Merge.rc:5154
msgid "Failed to create folder."
msgstr ""
#. IDC_EXT_EDITOR_PATH
-#: Merge.rc:5149
+#: Merge.rc:5159
msgid "Parameters:\n$file: Current file path\n$linenum: Current cursor line number"
msgstr ""
#. IDS_DIFF_ALGORITHM_DEFAULT
-#: Merge.rc:5154
+#: Merge.rc:5164
msgid "default"
msgstr ""
#. IDS_DIFF_ALGORITHM_MINIMAL
-#: Merge.rc:5155
+#: Merge.rc:5165
msgid "minimal"
msgstr ""
#. IDS_DIFF_ALGORITHM_PATIENCE
-#: Merge.rc:5156
+#: Merge.rc:5166
msgid "patience"
msgstr ""
#. IDS_DIFF_ALGORITHM_HISTOGRAM
-#: Merge.rc:5157
+#: Merge.rc:5167
msgid "histogram"
msgstr ""
#. IDS_DIFF_ALGORITHM_NONE
-#: Merge.rc:5158
+#: Merge.rc:5168
msgid "none"
msgstr ""
#. IDS_RENDERING_MODE_GDI
-#: Merge.rc:5163
+#: Merge.rc:5173
msgid "GDI"
msgstr ""
#. IDS_RENDERING_MODE_DIRECTWRITE_DEFAULT
-#: Merge.rc:5164
+#: Merge.rc:5174
msgid "DirectWrite Default"
msgstr ""
#. IDS_RENDERING_MODE_DIRECTWRITE_ALIASED
-#: Merge.rc:5165
+#: Merge.rc:5175
msgid "DirectWrite Aliased"
msgstr ""
#. IDS_RENDERING_MODE_DIRECTWRITE_GDI_CLASSIC
-#: Merge.rc:5166
+#: Merge.rc:5176
msgid "DirectWrite GDI Classic"
msgstr ""
#. IDS_RENDERING_MODE_DIRECTWRITE_GDI_NATURAL
-#: Merge.rc:5167
+#: Merge.rc:5177
msgid "DirectWrite GDI Natural"
msgstr ""
#. IDS_RENDERING_MODE_DIRECTWRITE_NATURAL
-#: Merge.rc:5168
+#: Merge.rc:5178
msgid "DirectWrite Natural"
msgstr ""
#. IDS_RENDERING_MODE_DIRECTWRITE_NATURAL_SYMMETRIC
-#: Merge.rc:5169
+#: Merge.rc:5179
msgid "DirectWrite Natural Symmetric"
msgstr ""
#. IDS_CLOSE_WINDOWS_WITH_ESC_DISABLED
-#: Merge.rc:5174
+#: Merge.rc:5184
msgctxt "Options dialog|General|Close windows with Esc"
msgid "Disabled"
msgstr ""
#. IDS_CLOSE_WINDOWS_WITH_ESC_1
-#: Merge.rc:5175
+#: Merge.rc:5185
msgid "MDI child window or main window"
msgstr ""
#. IDS_CLOSE_WINDOWS_WITH_ESC_2
-#: Merge.rc:5176
+#: Merge.rc:5186
msgid "MDI child window only"
msgstr ""
#. IDS_CLOSE_WINDOWS_WITH_ESC_3
-#: Merge.rc:5177
+#: Merge.rc:5187
msgid "Close main window if only one MDI child window"
msgstr ""
#. IDS_DIFF_GROUP
-#: Merge.rc:5182
+#: Merge.rc:5192
msgctxt "ImgMergeFrame|LocationPane"
msgid "Diff"
msgstr ""
#. IDS_DIFF_HIGHLIGHT
-#: Merge.rc:5183
+#: Merge.rc:5193
msgctxt "ImgMergeFrame|LocationPane"
msgid "Highlight"
msgstr ""
#. IDS_DIFF_BLINK
-#: Merge.rc:5184
+#: Merge.rc:5194
msgctxt "ImgMergeFrame|LocationPane"
msgid "Blink"
msgstr ""
#. IDS_DIFF_BLOCKSIZE
-#: Merge.rc:5185
+#: Merge.rc:5195
msgctxt "ImgMergeFrame|LocationPane"
msgid "Block Size"
msgstr ""
#. IDS_DIFF_BLOCKALPHA
-#: Merge.rc:5186
+#: Merge.rc:5196
msgctxt "ImgMergeFrame|LocationPane"
msgid "Block Alpha"
msgstr ""
#. IDS_DIFF_CDTHRESHOLD
-#: Merge.rc:5187
+#: Merge.rc:5197
msgctxt "ImgMergeFrame|LocationPane"
msgid "CD Threshold"
msgstr ""
#. IDS_DIFF_INSERTION_DELETION_DETECTION
-#: Merge.rc:5188
+#: Merge.rc:5198
msgctxt "ImgMergeFrame|LocationPane"
msgid "Ins/Del Detection"
msgstr ""
#. IDS_OVERLAY_MODE_NONE
-#: Merge.rc:5189 Merge.rc:5194
+#: Merge.rc:5199 Merge.rc:5204
msgctxt "ImgMergeFrame|LocationPane"
msgid "None"
msgstr ""
#. IDS_DIFF_INSERTION_DELETION_DETECTION_VERTICAL
-#: Merge.rc:5190
+#: Merge.rc:5200
msgctxt "ImgMergeFrame|LocationPane"
msgid "Vertical"
msgstr ""
#. IDS_DIFF_INSERTION_DELETION_DETECTION_HORIZONTAL
-#: Merge.rc:5191
+#: Merge.rc:5201
msgctxt "ImgMergeFrame|LocationPane"
msgid "Horizontal"
msgstr ""
#. IDS_OVERLAY_GROUP
-#: Merge.rc:5192
+#: Merge.rc:5202
msgctxt "ImgMergeFrame|LocationPane"
msgid "Overlay"
msgstr ""
#. IDS_OVERLAY_ALPHA
-#: Merge.rc:5193
+#: Merge.rc:5203
msgctxt "ImgMergeFrame|LocationPane"
msgid "Alpha"
msgstr ""
#. IDS_OVERLAY_MODE_XOR
-#: Merge.rc:5195
+#: Merge.rc:5205
msgctxt "ImgMergeFrame|LocationPane"
msgid "XOR"
msgstr ""
#. IDS_OVERLAY_MODE_ALPHA
-#: Merge.rc:5196
+#: Merge.rc:5206
msgctxt "ImgMergeFrame|LocationPane"
msgid "Alpha Blend"
msgstr ""
#. IDS_OVERLAY_MODE_ALPHA_ANIMATION
-#: Merge.rc:5197
+#: Merge.rc:5207
msgctxt "ImgMergeFrame|LocationPane"
msgid "Alpha Animation"
msgstr ""
#. IDS_ZOOM
-#: Merge.rc:5198
+#: Merge.rc:5208
msgctxt "ImgMergeFrame|LocationPane"
msgid "Zoom"
msgstr ""
#. IDS_PAGE
-#: Merge.rc:5199
+#: Merge.rc:5209
msgctxt "ImgMergeFrame|LocationPane"
msgid "Page:"
msgstr ""
#. IDS_IMGCMP_STATUS_PT_RGBA_FMT
-#: Merge.rc:5200
+#: Merge.rc:5210
#, c-format
msgid "Pt: (%d, %d) RGBA: (%d, %d, %d, %d) "
msgstr ""
#. IDS_IMGCMP_STATUS_DIST1_FMT
-#: Merge.rc:5201
+#: Merge.rc:5211
#, c-format
msgid "Dist: %g "
msgstr ""
#. IDS_IMGCMP_STATUS_DIST2_FMT
-#: Merge.rc:5202
+#: Merge.rc:5212
#, c-format
msgid "Dist: %g, %g "
msgstr ""
#. IDS_IMGCMP_STATUS_PAGE_ZOOM_SIZE_BPP_FMT
-#: Merge.rc:5203
+#: Merge.rc:5213
#, c-format
msgid "Page: %d/%d Zoom: %d%% %dx%dpx %dbpp "
msgstr ""
#. IDS_IMGCMP_STATUS_RC_FMT
-#: Merge.rc:5204
+#: Merge.rc:5214
#, c-format
msgid "Rc: (%d, %d) "
msgstr ""
#. IDS_IMGCMP_STATUS_FLIPPED_FMT
-#: Merge.rc:5205
+#: Merge.rc:5215
#, c-format
msgid "Flipped: %s "
msgstr ""
#. IDS_IMGCMP_STATUS_ROTATED_FMT
-#: Merge.rc:5206
+#: Merge.rc:5216
#, c-format
msgid "Rotated: %d "
msgstr ""
#. IDS_IMGCMP_REPORT_ALLPAGES
-#: Merge.rc:5207
+#: Merge.rc:5217
msgid "All pages"
msgstr ""
#. IDS_IGNSUB_STR1
-#: Merge.rc:5212
+#: Merge.rc:5222
msgid ""
msgstr ""
#. IDS_IGNSUB_STR2
-#: Merge.rc:5213
+#: Merge.rc:5223
msgid "No differences found to select"
msgstr ""
#. IDS_IGNSUB_STR3
-#: Merge.rc:5214
+#: Merge.rc:5224
msgid "No differences found to add as substitution filter"
msgstr ""
#. IDS_IGNSUB_STR4
-#: Merge.rc:5215
+#: Merge.rc:5225
msgid "The pair is already in the Substitution Filters list"
msgstr ""
#. IDS_IGNSUB_STR5
-#: Merge.rc:5216
+#: Merge.rc:5226
msgid "Add this change to Substitution Filters?"
msgstr ""
#. IDS_OCRRESULT_TEXTONLY
-#: Merge.rc:5221
+#: Merge.rc:5231
msgid "Text only"
msgstr ""
#. IDS_OCRRESULT_POS_LINE
-#: Merge.rc:5222
+#: Merge.rc:5232
msgid "Line-by-line position and text"
msgstr ""
#. IDS_OCRRESULT_POS_WORD
-#: Merge.rc:5223
+#: Merge.rc:5233
msgid "Word-by-word position and text"
msgstr ""
#. IDS_USERDATAFOLDER_APPDATA
-#: Merge.rc:5228
+#: Merge.rc:5238
msgid "AppData (Roaming) folder"
msgstr ""
#. IDS_USERDATAFOLDER_INSTALL
-#: Merge.rc:5229
+#: Merge.rc:5239
msgid "Install folder"
msgstr ""
#. IDS_USERDATAFOLDER_DOCUMENTS
-#: Merge.rc:5230
+#: Merge.rc:5240
msgid "Documents folder"
msgstr ""
#. IDS_SINGLEINSTANCE_DISABLED
-#: Merge.rc:5235
+#: Merge.rc:5245
msgctxt "Options dialog|General|Single instance mode"
msgid "Disabled"
msgstr ""
#. IDS_SINGLEINSTANCE_STR1
-#: Merge.rc:5236
+#: Merge.rc:5246
msgid "Allow only one instance to run"
msgstr ""
#. IDS_SINGLEINSTANCE_STR2
-#: Merge.rc:5237
+#: Merge.rc:5247
msgid "Allow only one instance; wait for termination"
msgstr ""
#. IDS_AUTO_RELOAD_MODIFIED_FILES_DISABLED
-#: Merge.rc:5242
+#: Merge.rc:5252
msgctxt "Options dialog|General|Auto-reload modified files"
msgid "Disabled"
msgstr ""
#. IDS_AUTO_RELOAD_MODIFIED_FILES_STR1
-#: Merge.rc:5243
+#: Merge.rc:5253
msgid "Only on window activated"
msgstr ""
#. IDS_AUTO_RELOAD_MODIFIED_FILES_STR2
-#: Merge.rc:5244
+#: Merge.rc:5254
msgid "Immediately"
msgstr ""
#. IDS_PLUGIN_ALL
-#: Merge.rc:5249
+#: Merge.rc:5259
msgid "Al&l"
msgstr ""
#. IDS_PLUGIN_OTHERS
-#: Merge.rc:5250
+#: Merge.rc:5260
msgid "&Others"
msgstr ""
-#: Merge.rc:5252
+#: Merge.rc:5262
#, c-format
msgid "Missing plugin name in pipeline: %1"
msgstr ""
-#: Merge.rc:5254
+#: Merge.rc:5264
#, c-format
msgid "Missing quote in plugin pipeline: %1"
msgstr ""
#. IDS_PLUGIN_NAME_ALREADY_EXISTS
-#: Merge.rc:5255
+#: Merge.rc:5265
#, c-format
msgid "Plugin name '%1' already exists."
msgstr ""
#. IDS_PLUGIN_TITLE1
-#: Merge.rc:5256
+#: Merge.rc:5266
msgid "Specify plugin arguments"
msgstr ""
-#: Merge.rc:5258
+#: Merge.rc:5268
#, c-format
msgid "Plugin not found or invalid: %1"
msgstr ""
#. IDS_PLUGIN_NOT_UNPACK
-#: Merge.rc:5259
+#: Merge.rc:5269
#, c-format
msgid "'%1' is not an unpacker plugin"
msgstr ""
#. IDS_PLUGIN_NOT_PREDIFF
-#: Merge.rc:5260
+#: Merge.rc:5270
#, c-format
msgid "'%1' is not a prediffer plugin"
msgstr ""
-#: Merge.rc:5262
+#: Merge.rc:5272
#, c-format
msgid "Error prediffing '%1' with '%2'. Prediffing disabled."
msgstr ""
#. IDS_PLUGIN_CIRCULAR_REFERENCE
-#: Merge.rc:5263
+#: Merge.rc:5273
#, c-format
msgid "Circular reference in plugin pipeline: %1"
msgstr ""
#. IDS_PLUGIN_TYPE1
-#: Merge.rc:5264
+#: Merge.rc:5274
msgid "URL Handler"
msgstr ""
#. IDS_PLUGIN_TYPE2
-#: Merge.rc:5265
+#: Merge.rc:5275
msgid "File Unpacker"
msgstr ""
#. IDS_PLUGIN_TYPE3
-#: Merge.rc:5266
+#: Merge.rc:5276
msgid "File or Folder Unpacker"
msgstr ""
#. IDS_PLUGIN_TYPE5
-#: Merge.rc:5268
+#: Merge.rc:5278
msgid "Alias for Unpacker"
msgstr ""
#. IDS_PLUGIN_TYPE6
-#: Merge.rc:5269
+#: Merge.rc:5279
msgid "Alias for Prediffer"
msgstr ""
#. IDS_PLUGIN_TYPE7
-#: Merge.rc:5270
+#: Merge.rc:5280
msgid "Alias for Editor script"
msgstr ""
#. IDS_PLUGIN_ALIAS_DESC
-#: Merge.rc:5271
+#: Merge.rc:5281
#, c-format
msgid "Alias for plugin pipeline '%1'"
msgstr ""
#. IDS_PLUGIN_NEW_DESC
-#: Merge.rc:5272
+#: Merge.rc:5282
msgid "New plugin description"
msgstr ""
#. IDS_PLUGIN_TARGETS_ALL
-#: Merge.rc:5273
+#: Merge.rc:5283
msgid "All"
msgstr ""
#. IDS_PLUGIN_TARGETS_1ST
-#: Merge.rc:5274
+#: Merge.rc:5284
msgid "1st"
msgstr ""
#. IDS_PLUGIN_TARGETS_2ND
-#: Merge.rc:5275
+#: Merge.rc:5285
msgid "2nd"
msgstr ""
#. IDS_PLUGIN_TARGETS_3RD
-#: Merge.rc:5276
+#: Merge.rc:5286
msgid "3rd"
msgstr ""
#. IDS_PLUGIN_TARGETS_1ST_2ND
-#: Merge.rc:5277
+#: Merge.rc:5287
msgid "1st and 2nd"
msgstr ""
#. IDS_PLUGIN_TARGETS_1ST_3RD
-#: Merge.rc:5278
+#: Merge.rc:5288
msgid "1st and 3rd"
msgstr ""
#. IDS_PLUGIN_TARGETS_2ND_3RD
-#: Merge.rc:5279
+#: Merge.rc:5289
msgid "2nd and 3rd"
msgstr ""
#. IDS_FILTER_APPLIED
-#: Merge.rc:5284
+#: Merge.rc:5294
msgid "Filter applied"
msgstr ""
#. IDS_FILTERMENU_COMPARE
-#: Merge.rc:5289
+#: Merge.rc:5299
#, c-format
msgid "Compare %1"
msgstr ""
#. IDS_FILTERMENU_FILTER_BY_THIS_COLUMN
-#: Merge.rc:5290
+#: Merge.rc:5300
msgid "&Filter by This Column"
msgstr ""
#. IDS_FILTERMENU_FILTER_BY_THIS_COLUMN2
-#: Merge.rc:5291
+#: Merge.rc:5301
msgid "&Filter by This Column..."
msgstr ""
#. IDS_CLIPBOARDHISTORY_TIME
-#: Merge.rc:5296
+#: Merge.rc:5306
#, c-format
msgid "Clipboard at %s"
msgstr ""
#. IDS_CLIPBOARDHISTORY_DISABLED
-#: Merge.rc:5297
+#: Merge.rc:5307
msgid "Clipboard history disabled.\r\nEnable: Windows logo key + V, then Turn on."
msgstr ""
-#: Merge.rc:5299
+#: Merge.rc:5309
msgid "This system does not support clipboard history."
msgstr ""
-#: Merge.rc:5301
+#: Merge.rc:5311
msgid "32-bit WinMerge does not support Clipboard Compare"
msgstr ""
#. IDS_WEBVIEW2_RUNTIME_NOT_INSTALLED
-#: Merge.rc:5306
+#: Merge.rc:5316
msgid "WebView2 runtime not installed. Download it?"
msgstr ""
#. IDS_JUMPLIST_NEW_TEXT_COMPARE
-#: Merge.rc:5311
+#: Merge.rc:5321
msgid "New Text Compare"
msgstr ""
#. IDS_JUMPLIST_NEW_TABLE_COMPARE
-#: Merge.rc:5312
+#: Merge.rc:5322
msgid "New Table Compare"
msgstr ""
#. IDS_JUMPLIST_NEW_BINARY_COMPARE
-#: Merge.rc:5313
+#: Merge.rc:5323
msgid "New Binary Compare"
msgstr ""
#. IDS_JUMPLIST_NEW_IMAGE_COMPARE
-#: Merge.rc:5314
+#: Merge.rc:5324
msgid "New Image Compare"
msgstr ""
#. IDS_JUMPLIST_NEW_WEBPAGE_COMPARE
-#: Merge.rc:5315
+#: Merge.rc:5325
msgid "New Webpage Compare"
msgstr ""
+#. IDS_JUMPLIST_NEW_FOLDER_COMPARE
+#: Merge.rc:5326
+msgid "New Folder Compare"
+msgstr ""
+
#. IDS_JUMPLIST_CLIPBOARD_COMPARE
-#: Merge.rc:5316
+#: Merge.rc:5327
msgid "Clipboard Compare"
msgstr ""
#. IDS_PREVIEWBAR_PRINT
-#: Merge.rc:5321
+#: Merge.rc:5332
msgid "&Print..."
msgstr ""
#. IDS_PREVIEWBAR_PREVPAGE
-#: Merge.rc:5323
+#: Merge.rc:5334
msgid "Pre&v Page"
msgstr ""
#. IDS_PREVIEWBAR_TWOPAGE
-#: Merge.rc:5324
+#: Merge.rc:5335
msgid "&Two Page"
msgstr ""
#. IDS_PREVIEWBAR_ONEPAGE
-#: Merge.rc:5325
+#: Merge.rc:5336
msgid "&One Page"
msgstr ""
#. IDS_PREVIEWBAR_ZOOMIN
-#: Merge.rc:5326
+#: Merge.rc:5337
msgid "Zoom &In"
msgstr ""
#. IDS_PREVIEWBAR_ZOOMOUT
-#: Merge.rc:5327
+#: Merge.rc:5338
msgid "Zoom &Out"
msgstr ""
#. IDS_WEBPAGE_COMPARING
-#: Merge.rc:5333
+#: Merge.rc:5344
msgid "Comparing..."
msgstr ""
#. IDS_WEBPAGE_ZOOM
-#: Merge.rc:5334
+#: Merge.rc:5345
msgid "Zoom:"
msgstr ""
#. IDS_COPY_GRANULARITY_DIFFHUNK
-#: Merge.rc:5339
+#: Merge.rc:5350
msgid "Diff hunk"
msgstr ""
#. IDS_COPY_GRANULARITY_INLINE
-#: Merge.rc:5340
+#: Merge.rc:5351
msgid "Inline diff"
msgstr ""
#. IDS_COPY_GRANULARITY_LINE
-#: Merge.rc:5341
+#: Merge.rc:5352
msgid "Line"
msgstr ""
-#: Merge.rc:5342
+#: Merge.rc:5353
msgid "Character"
msgstr ""
#. ID_MICE_PREVDIFF
-#: Merge.rc:5347
+#: Merge.rc:5358
msgid "\nPrevious Difference (Alt+Up)\n(Right Button+Wheel Up)\n(Alt+Wheel Up)"
msgstr ""
#. ID_MICE_NEXTDIFF
-#: Merge.rc:5348
+#: Merge.rc:5359
msgid "\nNext Difference (Alt+Down)\n(Right Button+Wheel Down)\n(Alt+Wheel Down)"
msgstr ""
#. ID_MICE_L2R
-#: Merge.rc:5349
+#: Merge.rc:5360
msgid "\nCopy to Right (Alt+Right)\n(Right Button+Wheel Right)\n(Alt+Wheel Right)\n(Alt+Shift+Wheel Down)"
msgstr ""
#. ID_MICE_R2L
-#: Merge.rc:5350
+#: Merge.rc:5361
msgid "\nCopy to Left (Alt+Left)\n(Right Button+Wheel Left)\n(Alt+Wheel Left)\n(Alt+Shift+Wheel Up)"
msgstr ""
#. ID_MICE_L2RNEXT
-#: Merge.rc:5351
+#: Merge.rc:5362
msgid "\nCopy to Right and Advance (Ctrl+Alt+Right)\n(Ctrl+Alt+Wheel Right)\n(Ctrl+Alt+Shift+Wheel Down)"
msgstr ""
#. ID_MICE_R2LNEXT
-#: Merge.rc:5352
+#: Merge.rc:5363
msgid "\nCopy to Left and Advance (Ctrl+Alt+Left)\n(Ctrl+Alt+Wheel Left)\n(Ctrl+Alt+Shift+Wheel Up)"
msgstr ""
#. IDS_LOG_COMPARING_2
-#: Merge.rc:5362
+#: Merge.rc:5373
#, c-format
msgid "Comparing %1 with %2"
msgstr ""
#. IDS_LOG_COMPARING_3
-#: Merge.rc:5363
+#: Merge.rc:5374
#, c-format
msgid "Comparing %1 with %2 and %3"
msgstr ""
#. IDS_LOG_COMPARE_COMPLETED
-#: Merge.rc:5364
+#: Merge.rc:5375
msgid "Comparison completed"
msgstr ""
#. IDS_LOG_COMPARE_ERROR_2
-#: Merge.rc:5365
+#: Merge.rc:5376
#, c-format
msgid "Failed to compare %1 with %2: "
msgstr ""
#. IDS_LOG_COMPARE_ERROR_3
-#: Merge.rc:5366
+#: Merge.rc:5377
#, c-format
msgid "Failed to compare %1 with %2 and %3: "
msgstr ""
#. IDS_LOG_FILE_SAVED
-#: Merge.rc:5367
+#: Merge.rc:5378
msgid "File saved"
msgstr ""
#. IDS_LOG_COPYING_FILES
-#: Merge.rc:5368
+#: Merge.rc:5379
msgid "Copying files..."
msgstr ""
#. IDS_LOG_MOVING_FILES
-#: Merge.rc:5369
+#: Merge.rc:5380
msgid "Moving files..."
msgstr ""
#. IDS_LOG_DELETING_FILES
-#: Merge.rc:5370
+#: Merge.rc:5381
msgid "Deleting files..."
msgstr ""
#. IDS_LOG_RECYCLEBIN
-#: Merge.rc:5371
+#: Merge.rc:5382
msgid "Recycle Bin"
msgstr ""
#. IDS_LOG_PERMANENTLY_DELETED
-#: Merge.rc:5372
+#: Merge.rc:5383
msgid "Permanently deleted"
msgstr ""
#. IDS_LOG_FILEOPERATION_COMPLETED
-#: Merge.rc:5373
+#: Merge.rc:5384
msgid "File operation completed successfully"
msgstr ""
#. IDS_LOG_FILEOPERATION_CANCELED
-#: Merge.rc:5374
+#: Merge.rc:5385
msgid "File operation canceled"
msgstr ""
#. IDS_FILTER_ERROR_NO_ERROR
-#: Merge.rc:5379
+#: Merge.rc:5390
msgid "No error"
msgstr ""
#. IDS_FILTER_ERROR_EMPTY_EXPRESSION
-#: Merge.rc:5380
+#: Merge.rc:5391
msgid "Filter expression is empty"
msgstr ""
#. IDS_FILTER_ERROR_UNKNOWN_CHAR
-#: Merge.rc:5381
+#: Merge.rc:5392
msgid "Unknown character in filter expression"
msgstr ""
#. IDS_FILTER_ERROR_UNTERMINATED_STRING
-#: Merge.rc:5382
+#: Merge.rc:5393
msgid "Unterminated string literal"
msgstr ""
#. IDS_FILTER_ERROR_SYNTAX_ERROR
-#: Merge.rc:5383
+#: Merge.rc:5394
msgid "Syntax error in filter expression"
msgstr ""
#. IDS_FILTER_ERROR_PARSE_FAILURE
-#: Merge.rc:5384
+#: Merge.rc:5395
msgid "Failed to parse filter expression"
msgstr ""
#. IDS_FILTER_ERROR_INVALID_LITERAL
-#: Merge.rc:5385
+#: Merge.rc:5396
msgid "Invalid literal value"
msgstr ""
#. IDS_FILTER_ERROR_INVALID_REGULAR_EXPRESSION
-#: Merge.rc:5386
+#: Merge.rc:5397
msgid "Invalid regular expression"
msgstr ""
#. IDS_FILTER_ERROR_UNDEFINED_IDENTIFIER
-#: Merge.rc:5387
+#: Merge.rc:5398
msgid "Undefined identifier"
msgstr ""
#. IDS_FILTER_ERROR_INVALID_ARGUMENT_COUNT
-#: Merge.rc:5388
+#: Merge.rc:5399
msgid "Invalid number of arguments"
msgstr ""
#. IDS_FILTER_ERROR_FILTER_NAME_NOT_FOUND
-#: Merge.rc:5389
+#: Merge.rc:5400
msgid "Filter name not found"
msgstr ""
#. IDS_FILTER_ERROR_DIVIDE_BY_ZERO
-#: Merge.rc:5390
+#: Merge.rc:5401
msgid "Division by zero in filter expression"
msgstr ""
#. IDS_FILTER_ERROR_UNKNOWN_ERROR
-#: Merge.rc:5391
+#: Merge.rc:5402
msgid "Unknown error"
msgstr ""
#. IDS_FILTER_ERROR_INVALID_PROPERTY_NAME
-#: Merge.rc:5392
+#: Merge.rc:5403
msgid "Invalid property name"
msgstr ""
#. IDS_FILTER_ERROR_INVALID_DIRECTIVE
-#: Merge.rc:5393
+#: Merge.rc:5404
msgid "Invalid directive"
msgstr ""
#. IDS_FILTER_OP_EQUALS
-#: Merge.rc:5398
+#: Merge.rc:5409
msgid "Equals"
msgstr ""
#. IDS_FILTER_OP_NOT_EQUALS
-#: Merge.rc:5399
+#: Merge.rc:5410
msgid "Does not equal"
msgstr ""
#. IDS_FILTER_OP_LESS_THAN
-#: Merge.rc:5400
+#: Merge.rc:5411
msgid "Less than"
msgstr ""
#. IDS_FILTER_OP_LESS_EQUAL
-#: Merge.rc:5401
+#: Merge.rc:5412
msgid "Less than or equal to"
msgstr ""
#. IDS_FILTER_OP_GREATER_EQUAL
-#: Merge.rc:5402
+#: Merge.rc:5413
msgid "Greater than or equal to"
msgstr ""
#. IDS_FILTER_OP_GREATER_THAN
-#: Merge.rc:5403
+#: Merge.rc:5414
msgid "Greater than"
msgstr ""
#. IDS_FILTER_OP_BETWEEN
-#: Merge.rc:5404
+#: Merge.rc:5415
msgid "Between"
msgstr ""
#. IDS_FILTER_OP_NOT_BETWEEN
-#: Merge.rc:5405
+#: Merge.rc:5416
msgid "Not Between"
msgstr ""
#. IDS_FILTER_OP_CONTAINS
-#: Merge.rc:5406
+#: Merge.rc:5417
msgid "Contains"
msgstr ""
#. IDS_FILTER_OP_NOT_CONTAINS
-#: Merge.rc:5407
+#: Merge.rc:5418
msgid "Not Contains"
msgstr ""
#. IDS_FILTER_OP_RECONTAINS
-#: Merge.rc:5408
+#: Merge.rc:5419
msgid "Contains (regex)"
msgstr ""
#. IDS_FILTER_OP_NOT_RECONTAINS
-#: Merge.rc:5409
+#: Merge.rc:5420
msgid "Not Contains (regex)"
msgstr ""
#. IDS_FILTER_OP_LIKE
-#: Merge.rc:5410
+#: Merge.rc:5421
msgid "Match (wildcard)"
msgstr ""
#. IDS_FILTER_OP_NOT_LIKE
-#: Merge.rc:5411
+#: Merge.rc:5422
msgid "Not match (wildcard)"
msgstr ""
#. IDS_FILTER_OP_MATCHES
-#: Merge.rc:5412
+#: Merge.rc:5423
msgid "Match (regex)"
msgstr ""
#. IDS_FILTER_OP_NOT_MATCHES
-#: Merge.rc:5413
+#: Merge.rc:5424
msgid "Not match (regex)"
msgstr ""
#. IDS_COLORMODE_LIGHT
-#: Merge.rc:5418
+#: Merge.rc:5429
msgid "Light"
msgstr ""
#. IDS_COLORMODE_DARK
-#: Merge.rc:5419
+#: Merge.rc:5430
msgid "Dark"
msgstr ""
#. IDS_COLORMODE_FOLLOWSYSTEM
-#: Merge.rc:5420
+#: Merge.rc:5431
msgid "Follow system"
msgstr ""
#. IDS_EXAMPLE
-#: Merge.rc:5425
+#: Merge.rc:5436
#, c-format
msgid "e.g. %1"
msgstr ""
#. IDS_DETECTED_PREVIOUS_CRASH
-#: Merge.rc:5430
+#: Merge.rc:5441
msgid "WinMerge detected a previous crash. Please report this if possible."
msgstr ""
#. IDS_REGEX_REPLACE_LIST_TEMPLATE
-#: Merge.rc:5435
+#: Merge.rc:5446
msgid "# Regex replacement list\r\n# Format: regexreplacement\r\n# Backreferences like $1, $2 are supported\r\n\r\n(\\d{4})-(\\d{2})-(\\d{2})\t$1_$2_$3\r\n"
msgstr ""
#. IDS_STRING_REPLACE_LIST_TEMPLATE
-#: Merge.rc:5436
+#: Merge.rc:5447
msgid "# Replacement list\r\n# Format: searchreplacement\r\n# Lines starting with # are ignored\r\n\r\nfrom1\tto1\r\nfrom2\tto2\r\n"
msgstr ""
diff --git a/Translations/WinMerge/Finnish.po b/Translations/WinMerge/Finnish.po
index 121bbf72541..11b9533013d 100644
--- a/Translations/WinMerge/Finnish.po
+++ b/Translations/WinMerge/Finnish.po
@@ -22,7 +22,7 @@ msgstr ""
"X-Generator: Poedit 3.1.1\n"
#. LANGUAGE, SUBLANGUAGE
-#: Merge.rc:26 Merge.rc:59 Merge.rc:5453
+#: Merge.rc:26 Merge.rc:59 Merge.rc:5464
msgid "LANG_ENGLISH, SUBLANG_ENGLISH_US"
msgstr "LANG_FINNISH, SUBLANG_DEFAULT"
@@ -107,7 +107,7 @@ msgid "Copy Selected Diff (Right) to Clipboard\tCtrl+&3"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_SELECTLINEDIFF
-#: Merge.rc:110 Merge.rc:673
+#: Merge.rc:110 Merge.rc:680
msgid "Select Line &Difference\tF4"
msgstr "Valitse riviero\tF4"
@@ -137,7 +137,7 @@ msgid "Cu&t"
msgstr "Lei&kkaa"
#. IDR_POPUP_DIRVIEW
-#: Merge.rc:118 Merge.rc:943
+#: Merge.rc:118 Merge.rc:951
msgid "&Copy"
msgstr "&Kopioi"
@@ -147,19 +147,19 @@ msgid "&Paste"
msgstr "Lii&tä"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:121 Merge.rc:875 Merge.rc:882
+#: Merge.rc:121 Merge.rc:882 Merge.rc:889
msgid "&Scripts"
msgstr "Skriptit"
#. IDS_NO_EDIT_SCRIPTS
-#: Merge.rc:123 Merge.rc:338 Merge.rc:447 Merge.rc:654 Merge.rc:659
-#: Merge.rc:865 Merge.rc:877 Merge.rc:884 Merge.rc:940 Merge.rc:1183
-#: Merge.rc:5028
+#: Merge.rc:123 Merge.rc:340 Merge.rc:451 Merge.rc:661 Merge.rc:666
+#: Merge.rc:872 Merge.rc:884 Merge.rc:891 Merge.rc:948 Merge.rc:1193
+#: Merge.rc:5038
msgid "< Empty >"
msgstr "< Tyhjä >"
#. IDR_POPUP_LOCATIONBAR, ID_EDIT_WMGOTO
-#: Merge.rc:126 Merge.rc:691 Merge.rc:1081
+#: Merge.rc:126 Merge.rc:698 Merge.rc:1089
msgid "&Go to...\tCtrl+G"
msgstr "&Siirry...\tCtrl+G"
@@ -180,27 +180,27 @@ msgid "Op&en"
msgstr "Av&aa"
#. IDR_POPUP_DIRVIEW, ID_DIR_OPEN_RIGHT
-#: Merge.rc:132 Merge.rc:981 Merge.rc:988 Merge.rc:995
+#: Merge.rc:132 Merge.rc:989 Merge.rc:996 Merge.rc:1003
msgid "With &Registered Application"
msgstr "&Rekisteröidyllä sovelluksella"
#. IDR_POPUP_DIRVIEW, ID_DIR_OPEN_RIGHT_WITHEDITOR
-#: Merge.rc:133 Merge.rc:982 Merge.rc:989 Merge.rc:996
+#: Merge.rc:133 Merge.rc:990 Merge.rc:997 Merge.rc:1004
msgid "With &External Editor\tCtrl+Alt+E"
msgstr "Ulkois&ella editorilla\tCtrl+Alt+E"
#. IDR_POPUP_DIRVIEW, ID_DIR_OPEN_RIGHT_WITH
-#: Merge.rc:134 Merge.rc:983 Merge.rc:990 Merge.rc:997
+#: Merge.rc:134 Merge.rc:991 Merge.rc:998 Merge.rc:1005
msgid "&With..."
msgstr "&Ohjelmalla..."
#. IDR_POPUP_DIRVIEW, ID_DIR_OPEN_RIGHT_PARENT_FOLDER
-#: Merge.rc:135 Merge.rc:984 Merge.rc:991 Merge.rc:998
+#: Merge.rc:135 Merge.rc:992 Merge.rc:999 Merge.rc:1006
msgid "Open &Parent Folder..."
msgstr "Avaa &emokansio..."
#. IDR_POPUP_IMG_CTXT, ID_FILE_SHELLMENU
-#: Merge.rc:137 Merge.rc:1239
+#: Merge.rc:137 Merge.rc:1249
msgid "S&hell Menu"
msgstr "&Liittymävalikko"
@@ -235,8 +235,8 @@ msgid "Ins&ertion/Deletion Detection"
msgstr "Lisäyksen/poiston tunnistus"
#. IDR_MERGEDOCTYPE, ID_TOOLBAR_NONE
-#: Merge.rc:176 Merge.rc:209 Merge.rc:216 Merge.rc:358 Merge.rc:507
-#: Merge.rc:751
+#: Merge.rc:176 Merge.rc:209 Merge.rc:216 Merge.rc:360 Merge.rc:511
+#: Merge.rc:758
msgid "&None"
msgstr "Ei mitään"
@@ -251,12 +251,12 @@ msgid "&Horizontal"
msgstr "&Vaakasuora"
#. IDR_POPUP_IMG_CTXT, ID_IMG_CURPANE_PREVPAGE
-#: Merge.rc:181 Merge.rc:189 Merge.rc:1230
+#: Merge.rc:181 Merge.rc:189 Merge.rc:1240
msgid "&Previous Page"
msgstr "E&dellinen sivu"
#. IDS_PREVIEWBAR_NEXTPAGE
-#: Merge.rc:182 Merge.rc:190 Merge.rc:1231 Merge.rc:5322
+#: Merge.rc:182 Merge.rc:190 Merge.rc:1241 Merge.rc:5333
msgid "&Next Page"
msgstr "Seu&raava sivu"
@@ -266,42 +266,42 @@ msgid "&Active Pane"
msgstr "&Aktiivinen ruutu"
#. IDR_POPUP_IMG_CTXT, ID_IMG_CURPANE_ROTATE_RIGHT_90
-#: Merge.rc:185 Merge.rc:1225
+#: Merge.rc:185 Merge.rc:1235
msgid "Rotate &Right 90deg"
msgstr "Käännä &oikealle 90 astetta"
#. IDR_POPUP_IMG_CTXT, ID_IMG_CURPANE_ROTATE_LEFT_90
-#: Merge.rc:186 Merge.rc:1226
+#: Merge.rc:186 Merge.rc:1236
msgid "Rotate &Left 90deg"
msgstr "Käännä &vasemmalle 90 astetta"
#. IDR_POPUP_IMG_CTXT, ID_IMG_CURPANE_FLIP_VERTICALLY
-#: Merge.rc:187 Merge.rc:1227
+#: Merge.rc:187 Merge.rc:1237
msgid "Flip V&ertically"
msgstr "Käännä &pystytasossa"
#. IDR_POPUP_IMG_CTXT, ID_IMG_CURPANE_FLIP_HORIZONTALLY
-#: Merge.rc:188 Merge.rc:1228
+#: Merge.rc:188 Merge.rc:1238
msgid "Flip H&orizontally"
msgstr "Käännä &vaakatasossa"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:193 Merge.rc:699
+#: Merge.rc:193 Merge.rc:706
msgid "&Zoom"
msgstr "Zoomaa"
#. IDR_MERGEDOCTYPE, ID_VIEW_ZOOMIN
-#: Merge.rc:202 Merge.rc:701
+#: Merge.rc:202 Merge.rc:708
msgid "Zoom &In\tCtrl++"
msgstr "Suurenna\tCtrl++"
#. IDR_MERGEDOCTYPE, ID_VIEW_ZOOMOUT
-#: Merge.rc:203 Merge.rc:702
+#: Merge.rc:203 Merge.rc:709
msgid "Zoom &Out\tCtrl+-"
msgstr "Pienennä\tCtrl+-"
#. IDR_MERGEDOCTYPE, ID_VIEW_ZOOMNORMAL, Zoom to normal
-#: Merge.rc:205 Merge.rc:704
+#: Merge.rc:205 Merge.rc:711
msgid "&Normal\tCtrl+*"
msgstr "&Normaali\tCtrl+*"
@@ -326,27 +326,27 @@ msgid "Dragging &Mode"
msgstr "Veto&tila"
#. IDR_POPUP_IMG_CTXT, ID_IMG_DRAGGINGMODE_MOVE
-#: Merge.rc:217 Merge.rc:955 Merge.rc:1233
+#: Merge.rc:217 Merge.rc:963 Merge.rc:1243
msgid "&Move"
msgstr "Siirrä"
#. IDR_POPUP_IMG_CTXT, ID_IMG_DRAGGINGMODE_ADJUST_OFFSET
-#: Merge.rc:218 Merge.rc:1234
+#: Merge.rc:218 Merge.rc:1244
msgid "&Adjust Offset"
msgstr "&Säädä siirtymää"
#. IDR_POPUP_IMG_CTXT, ID_IMG_DRAGGINGMODE_VERTICAL_WIPE
-#: Merge.rc:219 Merge.rc:1235
+#: Merge.rc:219 Merge.rc:1245
msgid "&Vertical Wipe"
msgstr "&Pystypyyhintä"
#. IDR_POPUP_IMG_CTXT, ID_IMG_DRAGGINGMODE_HORIZONTAL_WIPE
-#: Merge.rc:220 Merge.rc:1236
+#: Merge.rc:220 Merge.rc:1246
msgid "&Horizontal Wipe"
msgstr "&Vaakapyyhintä"
#. IDR_POPUP_IMG_CTXT, ID_IMG_DRAGGINGMODE_RECTANGLE_SELECT
-#: Merge.rc:221 Merge.rc:1237
+#: Merge.rc:221 Merge.rc:1247
msgid "Rectangle &Select"
msgstr ""
@@ -381,37 +381,37 @@ msgid "Compare Extracted &Text from Images"
msgstr "Vertaa kuvista poimittua &tekstiä"
#. IDD_OPEN, IDOK
-#: Merge.rc:272 Merge.rc:1980
+#: Merge.rc:272 Merge.rc:1990
msgid "Co&mpare"
msgstr "Ver&taa"
#. IDR_POPUP_WEBPAGE_COMPARE, ID_WEB_COMPARE_SCREENSHOTS
-#: Merge.rc:274 Merge.rc:1247
+#: Merge.rc:274 Merge.rc:1257
msgid "&Screenshots"
msgstr "Kuvakaappauk&set"
#. IDR_POPUP_WEBPAGE_COMPARE, ID_WEB_COMPARE_FULLSIZE_SCREENSHOTS
-#: Merge.rc:275 Merge.rc:1248
+#: Merge.rc:275 Merge.rc:1258
msgid "&Full Size Screenshots"
msgstr "&Täyden koon kuvakaappaukset"
#. IDR_POPUP_WEBPAGE_COMPARE, ID_WEB_COMPARE_HTMLS
-#: Merge.rc:276 Merge.rc:1249
+#: Merge.rc:276 Merge.rc:1259
msgid "&HTMLs"
msgstr "&HTMLs"
#. IDR_POPUP_WEBPAGE_COMPARE, ID_WEB_COMPARE_TEXTS
-#: Merge.rc:277 Merge.rc:1250
+#: Merge.rc:277 Merge.rc:1260
msgid "&Texts"
msgstr "&Tekstit"
#. IDR_POPUP_WEBPAGE_COMPARE, ID_WEB_COMPARE_RESOURCETREES
-#: Merge.rc:278 Merge.rc:1251
+#: Merge.rc:278 Merge.rc:1261
msgid "&Resource Trees"
msgstr "&Resurssipuut"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_SIZE
-#: Merge.rc:280 Merge.rc:1775
+#: Merge.rc:280 Merge.rc:1785
msgid "&Size"
msgstr "&Koko"
@@ -426,27 +426,27 @@ msgid "&Event Sync"
msgstr ""
#. IDR_POPUP_WEBPAGE_SYNC_EVENTS, ID_WEB_SYNC_ENABLED
-#: Merge.rc:291 Merge.rc:1259
+#: Merge.rc:291 Merge.rc:1269
msgid "&Enabled"
msgstr ""
#. IDR_POPUP_WEBPAGE_SYNC_EVENTS, ID_WEB_SYNC_SCROLL
-#: Merge.rc:293 Merge.rc:1261
+#: Merge.rc:293 Merge.rc:1271
msgid "&Scroll"
msgstr ""
#. IDR_POPUP_WEBPAGE_SYNC_EVENTS, ID_WEB_SYNC_CLICK
-#: Merge.rc:294 Merge.rc:1262
+#: Merge.rc:294 Merge.rc:1272
msgid "&Click"
msgstr ""
#. IDR_POPUP_WEBPAGE_SYNC_EVENTS, ID_WEB_SYNC_INPUT
-#: Merge.rc:295 Merge.rc:1263
+#: Merge.rc:295 Merge.rc:1273
msgid "&Input"
msgstr ""
#. IDR_POPUP_WEBPAGE_SYNC_EVENTS, ID_WEB_SYNC_GOBACKFORWARD
-#: Merge.rc:296 Merge.rc:1264
+#: Merge.rc:296 Merge.rc:1274
msgid "&Go Back/Forward"
msgstr ""
@@ -476,2668 +476,2679 @@ msgid "&All Profiles"
msgstr "Koko &profiili"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:310 Merge.rc:411 Merge.rc:586
+#: Merge.rc:310 Merge.rc:413 Merge.rc:590
msgid "&File"
msgstr "Tiedosto"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:312 Merge.rc:413 Merge.rc:588
+#: Merge.rc:312 Merge.rc:415 Merge.rc:592
msgid "&New"
msgstr "Uusi"
#. IDR_POPUP_COMPARE, ID_MERGE_COMPARE_TEXT
-#: Merge.rc:314 Merge.rc:322 Merge.rc:415 Merge.rc:423 Merge.rc:590
-#: Merge.rc:598 Merge.rc:649 Merge.rc:935 Merge.rc:1159 Merge.rc:1171
+#: Merge.rc:314 Merge.rc:323 Merge.rc:417 Merge.rc:426 Merge.rc:594
+#: Merge.rc:603 Merge.rc:655 Merge.rc:942 Merge.rc:1167 Merge.rc:1180
msgid "&Text"
msgstr "&Teksti"
#. IDR_POPUP_COMPARE, ID_MERGE_COMPARE_TABLE
-#: Merge.rc:315 Merge.rc:323 Merge.rc:416 Merge.rc:424 Merge.rc:591
-#: Merge.rc:599 Merge.rc:650 Merge.rc:936 Merge.rc:1160 Merge.rc:1172
+#: Merge.rc:315 Merge.rc:324 Merge.rc:418 Merge.rc:427 Merge.rc:595
+#: Merge.rc:604 Merge.rc:656 Merge.rc:943 Merge.rc:1168 Merge.rc:1181
msgid "T&able"
msgstr "T&aulukko"
#. IDR_POPUP_COMPARE, ID_MERGE_COMPARE_HEX
-#: Merge.rc:316 Merge.rc:324 Merge.rc:417 Merge.rc:425 Merge.rc:592
-#: Merge.rc:600 Merge.rc:651 Merge.rc:937 Merge.rc:1161 Merge.rc:1173
+#: Merge.rc:316 Merge.rc:325 Merge.rc:419 Merge.rc:428 Merge.rc:596
+#: Merge.rc:605 Merge.rc:657 Merge.rc:944 Merge.rc:1169 Merge.rc:1182
msgid "&Binary"
msgstr "Binääri"
#. IDS_IMAGE_MENU
-#: Merge.rc:317 Merge.rc:325 Merge.rc:418 Merge.rc:426 Merge.rc:593
-#: Merge.rc:601 Merge.rc:652 Merge.rc:938 Merge.rc:1162 Merge.rc:1174
-#: Merge.rc:5123
+#: Merge.rc:317 Merge.rc:326 Merge.rc:420 Merge.rc:429 Merge.rc:597
+#: Merge.rc:606 Merge.rc:658 Merge.rc:945 Merge.rc:1170 Merge.rc:1183
+#: Merge.rc:5133
msgid "&Image"
msgstr "&Kuva"
#. IDR_POPUP_COMPARE, ID_MERGE_COMPARE_WEBPAGE
-#: Merge.rc:318 Merge.rc:326 Merge.rc:419 Merge.rc:427 Merge.rc:594
-#: Merge.rc:602 Merge.rc:653 Merge.rc:939 Merge.rc:1163 Merge.rc:1175
+#: Merge.rc:318 Merge.rc:327 Merge.rc:421 Merge.rc:430 Merge.rc:598
+#: Merge.rc:607 Merge.rc:659 Merge.rc:946 Merge.rc:1171 Merge.rc:1184
msgid "&Webpage"
msgstr "&Verkkosivu"
+#. IDR_POPUP_NEW, ID_FILE_NEW_FOLDER
+#: Merge.rc:319 Merge.rc:328 Merge.rc:422 Merge.rc:431 Merge.rc:599
+#: Merge.rc:608 Merge.rc:1172
+msgid "&Folder"
+msgstr ""
+
#. IDR_MERGEDOCTYPE
-#: Merge.rc:320 Merge.rc:421 Merge.rc:596
+#: Merge.rc:321 Merge.rc:424 Merge.rc:601
msgid "New (&3 panes)"
msgstr "Uusi (&3 ruutua)"
#. IDR_MERGEDOCTYPE, ID_FILE_OPEN
-#: Merge.rc:328 Merge.rc:429 Merge.rc:604
+#: Merge.rc:330 Merge.rc:433 Merge.rc:610
msgid "&Open...\tCtrl+O"
msgstr "Avaa...\tCtrl+O"
#. IDR_MERGEDOCTYPE, ID_FILE_OPENCONFLICT
-#: Merge.rc:329 Merge.rc:430 Merge.rc:605
+#: Merge.rc:331 Merge.rc:434 Merge.rc:611
msgid "Open Conflic&t File..."
msgstr "Avaa ristiriitatiedosto..."
#. IDR_MERGEDOCTYPE, ID_FILE_OPENCLIPBOARD
-#: Merge.rc:330 Merge.rc:431 Merge.rc:606
+#: Merge.rc:332 Merge.rc:435 Merge.rc:612
msgid "Open C&lipboard"
msgstr "Avaa &leikepöytä"
#. IDR_POPUP_PROJECT, ID_FILE_OPENPROJECT
-#: Merge.rc:332 Merge.rc:433 Merge.rc:608 Merge.rc:1191
+#: Merge.rc:334 Merge.rc:437 Merge.rc:614 Merge.rc:1201
msgid "Open Pro&ject...\tCtrl+J"
msgstr "Avaa pro&jekti...\tCtrl+J"
#. IDD_OPEN, ID_SAVE_PROJECT
-#: Merge.rc:333 Merge.rc:434 Merge.rc:609 Merge.rc:1193 Merge.rc:1979
+#: Merge.rc:335 Merge.rc:438 Merge.rc:615 Merge.rc:1203 Merge.rc:1989
msgid "Sa&ve Project..."
msgstr "Tallenna projekti..."
#. IDR_MAINFRAME, ID_FILE_PROJECT_MRU_FIRST
-#: Merge.rc:335
+#: Merge.rc:337
msgid "Recent Projects"
msgstr "Viimeiset projektit"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:336 Merge.rc:445 Merge.rc:657
+#: Merge.rc:338 Merge.rc:449 Merge.rc:664
msgid "Recent F&iles or Folders"
msgstr "Viimeaikaiset t&iedostot tai kansiot"
#. IDR_MERGEDOCTYPE, ID_APP_EXIT
-#: Merge.rc:341 Merge.rc:450 Merge.rc:662
+#: Merge.rc:343 Merge.rc:454 Merge.rc:669
msgid "E&xit\tCtrl+Q"
msgstr "Poistu\tCtrl+Q"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:343 Merge.rc:452 Merge.rc:664
+#: Merge.rc:345 Merge.rc:456 Merge.rc:671
msgid "&Edit"
msgstr "Muokkaa"
#. IDR_MERGEDOCTYPE, ID_EDIT_PASTE
-#: Merge.rc:345 Merge.rc:671
+#: Merge.rc:347 Merge.rc:678
msgid "&Paste\tCtrl+V"
msgstr "Liitä\tCtrl+V"
#. IDR_MERGEDOCTYPE, ID_OPTIONS
-#: Merge.rc:347 Merge.rc:456 Merge.rc:693
+#: Merge.rc:349 Merge.rc:460 Merge.rc:700
msgid "&Options...\tCtrl+,"
msgstr "Asetukset...\tCtrl+,"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:349 Merge.rc:458 Merge.rc:695
+#: Merge.rc:351 Merge.rc:462 Merge.rc:702
msgid "&View"
msgstr "Näkymä"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:351 Merge.rc:500 Merge.rc:744
+#: Merge.rc:353 Merge.rc:504 Merge.rc:751
msgid "Ta&b Bar"
msgstr "Välilehdet"
#. IDR_MERGEDOCTYPE, ID_VIEW_TAB_BAR
-#: Merge.rc:353 Merge.rc:502 Merge.rc:746
+#: Merge.rc:355 Merge.rc:506 Merge.rc:753
msgid "&View Tab Bar"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_VIEW_TAB_BAR_ON_TITLE_BAR
-#: Merge.rc:354 Merge.rc:503 Merge.rc:747
+#: Merge.rc:356 Merge.rc:507 Merge.rc:754
msgid "&On Title Bar"
msgstr ""
#. IDR_MERGEDOCTYPE
-#: Merge.rc:356 Merge.rc:505 Merge.rc:749
+#: Merge.rc:358 Merge.rc:509 Merge.rc:756
msgid "&Toolbar"
msgstr "Työkalurivi"
#. IDR_MERGEDOCTYPE, ID_TOOLBAR_SMALL
-#: Merge.rc:359 Merge.rc:508 Merge.rc:752
+#: Merge.rc:361 Merge.rc:512 Merge.rc:759
msgid "&Small"
msgstr "Pieni"
#. IDR_MERGEDOCTYPE, ID_TOOLBAR_MEDIUM
-#: Merge.rc:360 Merge.rc:509 Merge.rc:753
+#: Merge.rc:362 Merge.rc:513 Merge.rc:760
msgid "&Medium"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_TOOLBAR_BIG
-#: Merge.rc:361 Merge.rc:510 Merge.rc:754
+#: Merge.rc:363 Merge.rc:514 Merge.rc:761
msgid "&Big"
msgstr "Iso"
#. IDR_MERGEDOCTYPE, ID_TOOLBAR_HUGE
-#: Merge.rc:362 Merge.rc:511 Merge.rc:755
+#: Merge.rc:364 Merge.rc:515 Merge.rc:762
msgid "&Huge"
msgstr "&Valtava"
#. IDS_VIEW_MENU_BAR
-#: Merge.rc:364 Merge.rc:513 Merge.rc:757 Merge.rc:5357
+#: Merge.rc:366 Merge.rc:517 Merge.rc:764 Merge.rc:5368
msgid "Men&u Bar"
msgstr ""
#. IDR_DIRDOCTYPE, ID_VIEW_OUTPUT_BAR
-#: Merge.rc:365 Merge.rc:515
+#: Merge.rc:367 Merge.rc:519
msgid "&Output Pane"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_VIEW_STATUS_BAR
-#: Merge.rc:366 Merge.rc:516 Merge.rc:758
+#: Merge.rc:368 Merge.rc:520 Merge.rc:765
msgid "&Status Bar"
msgstr "Tilarivi"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:368 Merge.rc:539 Merge.rc:847
+#: Merge.rc:370 Merge.rc:543 Merge.rc:854
msgid "&Tools"
msgstr "Työkalut"
#. IDR_MERGEDOCTYPE, ID_TOOLS_FILTERS
-#: Merge.rc:370 Merge.rc:542 Merge.rc:849
+#: Merge.rc:372 Merge.rc:546 Merge.rc:856
msgid "&Filters..."
msgstr "Suotimet..."
#. IDR_MERGEDOCTYPE, ID_TOOLS_GENERATEPATCH
-#: Merge.rc:371 Merge.rc:543 Merge.rc:850
+#: Merge.rc:373 Merge.rc:547 Merge.rc:857
msgid "&Generate Patch..."
msgstr "Luo korjaustiedosto..."
#. IDR_MERGEDOCTYPE
-#: Merge.rc:373 Merge.rc:546 Merge.rc:853
+#: Merge.rc:375 Merge.rc:550 Merge.rc:860
msgid "&Plugins"
msgstr "Lisäosat"
#. IDD_PLUGINS_LIST, IDC_PLUGIN_SETTINGS
-#: Merge.rc:375 Merge.rc:548 Merge.rc:855 Merge.rc:2494 Merge.rc:2926
+#: Merge.rc:377 Merge.rc:552 Merge.rc:862 Merge.rc:2504 Merge.rc:2936
msgid "P&lugin Settings..."
msgstr "&Lisäosien asetukset..."
#. IDR_MERGEDOCTYPE, ID_PREDIFFER_MANUAL
-#: Merge.rc:377 Merge.rc:550 Merge.rc:857
+#: Merge.rc:379 Merge.rc:554 Merge.rc:864
msgid "Ma&nual Prediffer"
msgstr "Manuaalinen esivertailu"
#. IDR_MERGEDOCTYPE, ID_PREDIFFER_AUTO
-#: Merge.rc:378 Merge.rc:551 Merge.rc:858
+#: Merge.rc:380 Merge.rc:555 Merge.rc:865
msgid "A&utomatic Prediffer"
msgstr "Automaattinen esivertailu"
#. IDR_MERGEDOCTYPE, ID_UNPACK_MANUAL
-#: Merge.rc:380 Merge.rc:553 Merge.rc:860
+#: Merge.rc:382 Merge.rc:557 Merge.rc:867
msgid "&Manual Unpacking"
msgstr "Manuaalinen purku"
#. IDR_MERGEDOCTYPE, ID_UNPACK_AUTO
-#: Merge.rc:381 Merge.rc:554 Merge.rc:861
+#: Merge.rc:383 Merge.rc:558 Merge.rc:868
msgid "&Automatic Unpacking"
msgstr "Automaattinen purku"
#. IDR_MERGEDOCTYPE, ID_RELOAD_PLUGINS
-#: Merge.rc:383 Merge.rc:558 Merge.rc:889
+#: Merge.rc:385 Merge.rc:562 Merge.rc:896
msgid "&Reload Plugins"
msgstr "Lataa lisäosat uudelleen"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:385 Merge.rc:560 Merge.rc:891
+#: Merge.rc:387 Merge.rc:564 Merge.rc:898
msgid "&Window"
msgstr "Ikkuna"
#. IDR_MERGEDOCTYPE, ID_FILE_CLOSE
-#: Merge.rc:387 Merge.rc:562 Merge.rc:893
+#: Merge.rc:389 Merge.rc:566 Merge.rc:900
msgid "Cl&ose\tCtrl+W"
msgstr "Sulje\tCtrl+W"
#. IDR_MERGEDOCTYPE, ID_WINDOW_CLOSEALL
-#: Merge.rc:388 Merge.rc:563 Merge.rc:894
+#: Merge.rc:390 Merge.rc:567 Merge.rc:901
msgid "Clo&se All"
msgstr "Sulje kaikki"
#. IDR_MERGEDOCTYPE, ID_NEXT_PANE
-#: Merge.rc:390 Merge.rc:565 Merge.rc:896
+#: Merge.rc:392 Merge.rc:569 Merge.rc:903
msgid "Change &Pane\tF6"
msgstr "Vaihda ruutua\tF6"
#. IDR_MERGEDOCTYPE, ID_WINDOW_TILE_HORZ
-#: Merge.rc:392 Merge.rc:567 Merge.rc:900
+#: Merge.rc:394 Merge.rc:571 Merge.rc:907
msgid "Tile &Horizontally"
msgstr "Vierekkäin vaakasuunnassa"
#. IDR_MERGEDOCTYPE, ID_WINDOW_TILE_VERT
-#: Merge.rc:393 Merge.rc:568 Merge.rc:901
+#: Merge.rc:395 Merge.rc:572 Merge.rc:908
msgid "Tile &Vertically"
msgstr "Vierekkäin pystysunnassa"
#. IDR_MERGEDOCTYPE, ID_WINDOW_CASCADE
-#: Merge.rc:394 Merge.rc:569 Merge.rc:902
+#: Merge.rc:396 Merge.rc:573 Merge.rc:909
msgid "&Cascade"
msgstr "Limittäin"
#. IDS_MESSAGEBOX_HELP
-#: Merge.rc:396 Merge.rc:571 Merge.rc:904 Merge.rc:3200 Merge.rc:4189
+#: Merge.rc:398 Merge.rc:575 Merge.rc:911 Merge.rc:3210 Merge.rc:4199
msgid "&Help"
msgstr "Ohje"
#. IDR_MERGEDOCTYPE, ID_HELP_CONTENTS
-#: Merge.rc:398 Merge.rc:573 Merge.rc:906
+#: Merge.rc:400 Merge.rc:577 Merge.rc:913
msgid "&WinMerge Help\tF1"
msgstr "WinMerge Ohje\tF1"
#. IDR_MERGEDOCTYPE, ID_HELP_RELEASENOTES
-#: Merge.rc:400 Merge.rc:575 Merge.rc:908
+#: Merge.rc:402 Merge.rc:579 Merge.rc:915
msgid "R&elease Notes"
msgstr "Versiotiedot"
#. IDR_MERGEDOCTYPE, ID_HELP_TRANSLATIONS
-#: Merge.rc:401 Merge.rc:576 Merge.rc:909
+#: Merge.rc:403 Merge.rc:580 Merge.rc:916
msgid "&Translations"
msgstr "Käännökset"
#. IDR_MERGEDOCTYPE, ID_HELP_GETCONFIG
-#: Merge.rc:402 Merge.rc:577 Merge.rc:910
+#: Merge.rc:404 Merge.rc:581 Merge.rc:917
msgid "C&onfiguration"
msgstr "Asetukset"
#. IDR_MERGEDOCTYPE, ID_HELP_GNULICENSE
-#: Merge.rc:404 Merge.rc:579 Merge.rc:912
+#: Merge.rc:406 Merge.rc:583 Merge.rc:919
msgid "&GNU General Public License"
msgstr "&GNU General Public License"
#. IDR_MERGEDOCTYPE, ID_APP_ABOUT
-#: Merge.rc:405 Merge.rc:580 Merge.rc:913
+#: Merge.rc:407 Merge.rc:584 Merge.rc:920
msgid "&About WinMerge..."
msgstr "Tietoj&a WinMergestä..."
#. IDR_MERGEDOCTYPE
-#: Merge.rc:436 Merge.rc:629
+#: Merge.rc:440 Merge.rc:635
msgid "&Read-Only"
msgstr "&Vain luku"
#. IDR_MERGEDOCTYPE, ID_FILE_LEFT_READONLY
-#: Merge.rc:438 Merge.rc:631
+#: Merge.rc:442 Merge.rc:637
msgid "L&eft Read-Only"
msgstr "Vasen vain luku"
#. IDR_MERGEDOCTYPE, ID_FILE_MIDDLE_READONLY
-#: Merge.rc:439 Merge.rc:632
+#: Merge.rc:443 Merge.rc:638
msgid "M&iddle Read-Only"
msgstr "Kesk&immäinen vain luku"
#. IDR_MERGEDOCTYPE, ID_FILE_RIGHT_READONLY
-#: Merge.rc:440 Merge.rc:633
+#: Merge.rc:444 Merge.rc:639
msgid "Ri&ght Read-Only"
msgstr "Oikea vain luku"
#. IDD_ENCODINGERROR, IDC_FILEENCODING
-#: Merge.rc:443 Merge.rc:646 Merge.rc:1038 Merge.rc:3063
+#: Merge.rc:447 Merge.rc:652 Merge.rc:1046 Merge.rc:3073
msgid "&File Encoding..."
msgstr "Tiedoston koodaus..."
#. IDR_POPUP_OUTPUTVIEW, ID_EDIT_SELECT_ALL
-#: Merge.rc:454 Merge.rc:674 Merge.rc:1343
+#: Merge.rc:458 Merge.rc:681 Merge.rc:1353
msgid "Select &All\tCtrl+A"
msgstr "Valitse kaikki\tCtrl+A"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWIDENTICAL
-#: Merge.rc:460
+#: Merge.rc:464
msgid "Show &Identical Items"
msgstr "Näytä yhtäläiset kohteet"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWDIFFERENT
-#: Merge.rc:461
+#: Merge.rc:465
msgid "Show &Different Items"
msgstr "Näytä eroavat kohteet"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWUNIQUELEFT
-#: Merge.rc:462
+#: Merge.rc:466
msgid "Show L&eft Unique Items"
msgstr "Näytä yksilölliset kohteet vasemmalla"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWUNIQUEMIDDLE
-#: Merge.rc:463
+#: Merge.rc:467
msgid "Show Midd&le Unique Items"
msgstr "Näytä yksilö&lliset keskimmäiset kohteet"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWUNIQUERIGHT
-#: Merge.rc:464
+#: Merge.rc:468
msgid "Show Ri&ght Unique Items"
msgstr "Näytä yksilölliset kohteet oikealla"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWSKIPPED
-#: Merge.rc:465
+#: Merge.rc:469
msgid "Show S&kipped Items"
msgstr "Näytä ohitetut &kohteet"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWBINARIES
-#: Merge.rc:466
+#: Merge.rc:470
msgid "S&how Binary Files"
msgstr "Näytä binääritiedostot"
#. IDR_DIRDOCTYPE
-#: Merge.rc:467
+#: Merge.rc:471
msgid "&3-way Compare"
msgstr "&3-suuntainen vertailu"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWDIFFERENTLEFTONLY
-#: Merge.rc:469
+#: Merge.rc:473
msgid "Show &Left Only Different Items"
msgstr "Näytä vasemmalla vain eroavat kohteet"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWDIFFERENTMIDDLEONLY
-#: Merge.rc:470
+#: Merge.rc:474
msgid "Show &Middle Only Different Items"
msgstr "Näytä keskellä vain eroavat kohteet"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWDIFFERENTRIGHTONLY
-#: Merge.rc:471
+#: Merge.rc:475
msgid "Show &Right Only Different Items"
msgstr "Näytä oikealla vain eroavat kohteet"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWMISSINGLEFTONLY
-#: Merge.rc:473
+#: Merge.rc:477
msgid "Show L&eft Only Missing Items"
msgstr "Näytä vas&emmalla vain puuttuvat kohteet"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWMISSINGMIDDLEONLY
-#: Merge.rc:474
+#: Merge.rc:478
msgid "Show Mi&ddle Only Missing Items"
msgstr "Näytä kes&kellä vain puuttuvat kohteet"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWMISSINGRIGHTONLY
-#: Merge.rc:475
+#: Merge.rc:479
msgid "Show Rig&ht Only Missing Items"
msgstr "Näytä oik&alla vain puuttuvat kohteet"
#. IDR_DIRDOCTYPE, ID_VIEW_SHOWHIDDENITEMS
-#: Merge.rc:478
+#: Merge.rc:482
msgid "Show Hidd&en Items"
msgstr "Näytä piilotetut kohteet"
#. IDR_DIRDOCTYPE, ID_VIEW_TREEMODE
-#: Merge.rc:480
+#: Merge.rc:484
msgid "Tree &Mode"
msgstr "Puunäkymä"
#. IDR_DIRDOCTYPE
-#: Merge.rc:481
+#: Merge.rc:485
msgid "E&xpand Subfolders"
msgstr ""
#. IDR_DIRDOCTYPE, ID_VIEW_EXPAND_ALLSUBDIRS
-#: Merge.rc:483
+#: Merge.rc:487
msgid "&All Subfolders"
msgstr ""
#. IDR_DIRDOCTYPE, ID_VIEW_EXPAND_DIFFERENT_SUBDIRS
-#: Merge.rc:484
+#: Merge.rc:488
msgid "&Different Subfolders"
msgstr ""
#. IDR_DIRDOCTYPE, ID_VIEW_EXPAND_IDENTICAL_SUBDIRS
-#: Merge.rc:485
+#: Merge.rc:489
msgid "&Identical Subfolders"
msgstr ""
#. IDR_DIRDOCTYPE, ID_VIEW_COLLAPSE_ALLSUBDIRS
-#: Merge.rc:487
+#: Merge.rc:491
msgid "&Collapse All Subfolders"
msgstr "Tiivistä kaikki alikansiot"
#. IDR_DIRDOCTYPE, ID_VIEW_SHOW_EMPTY_FOLDERS
-#: Merge.rc:488
+#: Merge.rc:492
msgid "Show &Empty Folders"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_VIEW_SELECTFONT
-#: Merge.rc:490 Merge.rc:697
+#: Merge.rc:494 Merge.rc:704
msgid "Select &Font..."
msgstr "Valitse &fontti..."
#. IDR_MERGEDOCTYPE, ID_VIEW_USEDEFAULTFONT
-#: Merge.rc:491 Merge.rc:698
+#: Merge.rc:495 Merge.rc:705
msgid "Use Default Font"
msgstr "Käytä oletusfonttia"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:493 Merge.rc:736
+#: Merge.rc:497 Merge.rc:743
msgid "Sw&ap Panes"
msgstr "Vaihda ruudut"
#. IDR_MERGEDOCTYPE, ID_SWAPPANES_SWAP12
-#: Merge.rc:495 Merge.rc:738
+#: Merge.rc:499 Merge.rc:745
msgid "Swap &1st | 2nd"
msgstr "Vaihda &1. | toinen"
#. IDR_MERGEDOCTYPE, ID_SWAPPANES_SWAP23
-#: Merge.rc:496 Merge.rc:739
+#: Merge.rc:500 Merge.rc:746
msgid "Swap &2nd | 3rd"
msgstr "Vaihda &2. | kolmas"
#. IDR_MERGEDOCTYPE, ID_SWAPPANES_SWAP13
-#: Merge.rc:497 Merge.rc:740
+#: Merge.rc:501 Merge.rc:747
msgid "Swap 1st | &3rd"
msgstr "Vaihda 1. | &kolmas"
#. IDR_DIRDOCTYPE, ID_VIEW_DISPLAY_FILTER_BAR_MENU
-#: Merge.rc:514
+#: Merge.rc:518
msgid "Displa&y Filter Bar\tCtrl+Shift+L"
msgstr ""
#. IDR_DIRDOCTYPE, ID_VIEW_DIR_STATISTICS
-#: Merge.rc:518
+#: Merge.rc:522
msgid "Com&pare Statistics..."
msgstr "Vertaa tilastoja..."
#. IDR_MERGEDOCTYPE, ID_REFRESH
-#: Merge.rc:520 Merge.rc:763
+#: Merge.rc:524 Merge.rc:770
msgid "Refresh\tF5"
msgstr ""
#. IDR_POPUP_DIRVIEW, ID_RESCAN
-#: Merge.rc:521 Merge.rc:1030
+#: Merge.rc:525 Merge.rc:1038
msgid "&Refresh Selected\tCtrl+F5"
msgstr "Päivitä valitut\tCtrl+F5"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:523 Merge.rc:765
+#: Merge.rc:527 Merge.rc:772
msgid "&Merge"
msgstr "Yhdistä"
#. IDR_DIRDOCTYPE, ID_MERGE_COMPARE
-#: Merge.rc:525
+#: Merge.rc:529
msgid "Co&mpare\tEnter"
msgstr "Vertaa\tEnter"
#. IDR_MERGEDOCTYPE, ID_NEXTDIFF
-#: Merge.rc:527 Merge.rc:767
+#: Merge.rc:531 Merge.rc:774
msgid "&Next Difference\tAlt+Down"
msgstr "Seuraava ero\tAlt+Down"
#. IDR_MERGEDOCTYPE, ID_PREVDIFF
-#: Merge.rc:528 Merge.rc:768
+#: Merge.rc:532 Merge.rc:775
msgid "&Previous Difference\tAlt+Up"
msgstr "Edellinen ero\tAlt+Up"
#. IDR_MERGEDOCTYPE, ID_FIRSTDIFF
-#: Merge.rc:530 Merge.rc:773
+#: Merge.rc:534 Merge.rc:780
msgid "&First Difference\tAlt+Home"
msgstr "Ensimmäinen ero\tAlt+Home"
#. IDR_MERGEDOCTYPE, ID_CURDIFF
-#: Merge.rc:531 Merge.rc:774
+#: Merge.rc:535 Merge.rc:781
msgid "&Current Difference\tAlt+Enter"
msgstr "Nykyinen ero\tAlt+Enter"
#. IDR_MERGEDOCTYPE, ID_LASTDIFF
-#: Merge.rc:532 Merge.rc:775
+#: Merge.rc:536 Merge.rc:782
msgid "&Last Difference\tAlt+End"
msgstr "Viimeinen ero\tAlt+End"
#. IDR_MERGEDOCTYPE, ID_L2R
-#: Merge.rc:534 Merge.rc:830
+#: Merge.rc:538 Merge.rc:837
msgid "Copy to &Right\tAlt+Right"
msgstr "Kopioi oikealle\tAlt+Right"
#. IDR_MERGEDOCTYPE, ID_R2L
-#: Merge.rc:535 Merge.rc:831
+#: Merge.rc:539 Merge.rc:838
msgid "Copy to L&eft\tAlt+Left"
msgstr "Kopioi vasemmalle\tAlt+Left"
#. IDR_DIRDOCTYPE, ID_MERGE_DELETE
-#: Merge.rc:537
+#: Merge.rc:541
msgid "&Delete\tDel"
msgstr "Poista\tDel"
#. IDR_POPUP_DIRVIEW, ID_TOOLS_CUSTOMIZECOLUMNS
-#: Merge.rc:541 Merge.rc:1042
+#: Merge.rc:545 Merge.rc:1050
msgid "&Customize Columns..."
msgstr "Muokkaa sarakkeita..."
#. IDR_MERGEDOCTYPE, ID_TOOLS_GENERATEREPORT
-#: Merge.rc:544 Merge.rc:851
+#: Merge.rc:548 Merge.rc:858
msgid "Generate &Report..."
msgstr "Luo &raportti..."
#. IDD_ENCODINGERROR, IDC_PLUGIN
-#: Merge.rc:556 Merge.rc:867 Merge.rc:3064
+#: Merge.rc:560 Merge.rc:874 Merge.rc:3074
msgid "&Edit with Unpacker..."
msgstr "Muokkaa ti&edoston purkajalla..."
#. IDR_MERGEDOCTYPE, ID_FILE_SAVE
-#: Merge.rc:611
+#: Merge.rc:617
msgid "&Save\tCtrl+S"
msgstr "Tallenna\tCtrl+S"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:612
+#: Merge.rc:618
msgid "Sav&e"
msgstr "Tall&enna"
#. IDR_POPUP_SAVE, ID_FILE_SAVE_LEFT
-#: Merge.rc:614 Merge.rc:1201
+#: Merge.rc:620 Merge.rc:1211
msgid "Save &Left"
msgstr "Ta&llenna vasen"
#. IDR_POPUP_SAVE, ID_FILE_SAVE_MIDDLE
-#: Merge.rc:615 Merge.rc:1202
+#: Merge.rc:621 Merge.rc:1212
msgid "Save &Middle"
msgstr "&Tallenna keskimmäinen"
#. IDR_POPUP_SAVE, ID_FILE_SAVE_RIGHT
-#: Merge.rc:616 Merge.rc:1203
+#: Merge.rc:622 Merge.rc:1213
msgid "Save &Right"
msgstr "Tallenna oikea"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:618
+#: Merge.rc:624
msgid "Save &As"
msgstr "T&allenna nimellä"
#. IDR_POPUP_SAVE, ID_FILE_SAVEAS_LEFT
-#: Merge.rc:620 Merge.rc:1205
+#: Merge.rc:626 Merge.rc:1215
msgid "Save &Left As..."
msgstr "Tallenna vasen nime&llä..."
#. IDR_POPUP_SAVE, ID_FILE_SAVEAS_MIDDLE
-#: Merge.rc:621 Merge.rc:1206
+#: Merge.rc:627 Merge.rc:1216
msgid "Save &Middle As..."
msgstr "Tallenna keski&mmäinen nimellä..."
#. IDR_POPUP_SAVE, ID_FILE_SAVEAS_RIGHT
-#: Merge.rc:622 Merge.rc:1207
+#: Merge.rc:628 Merge.rc:1217
msgid "Save &Right As..."
msgstr "Tallenna oikea &nimellä..."
#. IDR_MERGEDOCTYPE, ID_FILE_PRINT
-#: Merge.rc:625
+#: Merge.rc:631
msgid "&Print...\tCtrl+P"
msgstr "Tulosta...\tCtrl+P"
#. IDR_MERGEDOCTYPE, ID_FILE_PAGE_SETUP
-#: Merge.rc:626
+#: Merge.rc:632
msgid "Page Set&up..."
msgstr "Sivun asetukset..."
#. IDR_MERGEDOCTYPE, ID_FILE_PRINT_PREVIEW
-#: Merge.rc:627
+#: Merge.rc:633
msgid "Print Previe&w..."
msgstr "Tulostuksen esikatselu..."
#. IDR_MERGEDOCTYPE
-#: Merge.rc:636
+#: Merge.rc:642
msgid "&Convert Line Endings to"
msgstr "Muunna &rivinloput >"
#. IDR_MERGEDOCTYPE, ID_FILE_MERGINGMODE
-#: Merge.rc:643
+#: Merge.rc:649
msgid "Mer&ge Mode\tF9"
msgstr "Yhdistäminen\tF9"
#. IDR_MERGEDOCTYPE, ID_RESCAN
-#: Merge.rc:645
+#: Merge.rc:651
msgid "Reloa&d\tCtrl+F5"
msgstr ""
#. IDR_MERGEDOCTYPE
-#: Merge.rc:647
+#: Merge.rc:653
msgid "Reco&mpare As"
msgstr "Vertaa uudelleen"
+#. IDR_POPUP_COMPARE, ID_MERGE_COMPARE_FOLDER
+#: Merge.rc:660 Merge.rc:947 Merge.rc:1185
+msgid "A&rchive"
+msgstr ""
+
#. IDR_MERGEDOCTYPE, ID_EDIT_UNDO
-#: Merge.rc:666
+#: Merge.rc:673
msgid "&Undo\tCtrl+Z"
msgstr "Kumoa\tCtrl+Z"
#. IDR_MERGEDOCTYPE, ID_EDIT_REDO
-#: Merge.rc:667
+#: Merge.rc:674
msgid "&Redo\tCtrl+Y"
msgstr "Tee uudestaan\tCtrl+Y"
#. IDR_MERGEDOCTYPE, ID_EDIT_CUT
-#: Merge.rc:669
+#: Merge.rc:676
msgid "Cu&t\tCtrl+X"
msgstr "Leikkaa\tCtrl+X"
#. IDR_POPUP_OUTPUTVIEW, ID_EDIT_COPY
-#: Merge.rc:670 Merge.rc:1342
+#: Merge.rc:677 Merge.rc:1352
msgid "&Copy\tCtrl+C"
msgstr "Kopioi\tCtrl+C"
#. IDR_MERGEDOCTYPE, ID_EDIT_FIND
-#: Merge.rc:676
+#: Merge.rc:683
msgid "F&ind...\tCtrl+F"
msgstr "Ets&i...\tCtrl+F"
#. IDR_MERGEDOCTYPE, ID_EDIT_REPLACE
-#: Merge.rc:677
+#: Merge.rc:684
msgid "Repla&ce...\tCtrl+H"
msgstr "Korvaa...\tCtrl+H"
#. IDR_MERGEDOCTYPE, ID_EDIT_MARK
-#: Merge.rc:678
+#: Merge.rc:685
msgid "&Marker...\tCtrl+Shift+M"
msgstr "&Merkki...\tCtrl+Shift+M"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:680
+#: Merge.rc:687
msgid "Advanced"
msgstr "Edistynyt"
#. IDR_MERGEDOCTYPE, ID_EDIT_COPY_LINENUMBERS
-#: Merge.rc:682
+#: Merge.rc:689
msgid "&Copy With Line Numbers\tCtrl+Shift+C"
msgstr "Kopioi myös rivinumerot\tCtrl+Shift+C"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:684
+#: Merge.rc:691
msgid "&Bookmarks"
msgstr "Kirjanmerkit"
#. IDR_MERGEDOCTYPE, ID_EDIT_TOGGLE_BOOKMARK
-#: Merge.rc:686
+#: Merge.rc:693
msgid "&Toggle Bookmark\tCtrl+F2"
msgstr "Kirjanmerkki on/ei\tCtrl+F2"
#. IDR_MERGEDOCTYPE, ID_EDIT_GOTO_NEXT_BOOKMARK
-#: Merge.rc:687
+#: Merge.rc:694
msgid "&Next Bookmark\tF2"
msgstr "Seuraava kirjanmerkki\tF2"
#. IDR_MERGEDOCTYPE, ID_EDIT_GOTO_PREV_BOOKMARK
-#: Merge.rc:688
+#: Merge.rc:695
msgid "&Previous Bookmark\tShift+F2"
msgstr "Edellinen kirjanmerkki\tShift+F2"
#. IDR_MERGEDOCTYPE, ID_EDIT_CLEAR_ALL_BOOKMARKS
-#: Merge.rc:689
+#: Merge.rc:696
msgid "&Clear All Bookmarks"
msgstr "Poista kaikki kirjanmerkit"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:706
+#: Merge.rc:713
msgid "Syntax Highlight"
msgstr "Syntaksin korostus"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:711
+#: Merge.rc:718
msgid "&Diff Context"
msgstr "&Ero-konteksti"
#. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_ALL
-#: Merge.rc:713
+#: Merge.rc:720
msgid "&All Lines"
msgstr "K&aikki rivit"
#. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_0
-#: Merge.rc:715
+#: Merge.rc:722
msgid "&0 Lines"
msgstr "&0 riviä"
#. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_1
-#: Merge.rc:716
+#: Merge.rc:723
msgid "&1 Line"
msgstr "&1 rivi"
#. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_3
-#: Merge.rc:717
+#: Merge.rc:724
msgid "&3 Lines"
msgstr "&3 riviä"
#. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_5
-#: Merge.rc:718
+#: Merge.rc:725
msgid "&5 Lines"
msgstr "&5 riviä"
#. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_7
-#: Merge.rc:719
+#: Merge.rc:726
msgid "&7 Lines"
msgstr "&7 riviä"
#. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_9
-#: Merge.rc:720
+#: Merge.rc:727
msgid "&9 Lines"
msgstr "&9 riviä"
#. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_TOGGLE
-#: Merge.rc:722
+#: Merge.rc:729
msgid "&Toggle All and 0-9 Lines\tCtrl+D"
msgstr "&Vaihda kaikki ja 0-9 riviä\tCtrl+D"
#. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_INVERT
-#: Merge.rc:724
+#: Merge.rc:731
msgid "&Invert (Hide Different Lines)"
msgstr "Käänteinen (p&iilota erilaiset rivit)"
#. IDR_MERGEDOCTYPE, ID_VIEW_RESIZE_PANES
-#: Merge.rc:727
+#: Merge.rc:734
msgid "&Lock Panes"
msgstr "Lukitse ruudut"
#. IDR_MERGEDOCTYPE, ID_VIEW_WHITESPACE
-#: Merge.rc:728
+#: Merge.rc:735
msgid "&View Whitespace"
msgstr "Välilyönnit"
#. IDR_MERGEDOCTYPE, ID_VIEW_EOL
-#: Merge.rc:729
+#: Merge.rc:736
msgid "View E&OL"
msgstr "Näytä E&OL"
#. IDR_MERGEDOCTYPE, ID_VIEW_LINEDIFFS
-#: Merge.rc:730
+#: Merge.rc:737
msgid "Vie&w Line Differences"
msgstr "Näytä rivierot"
#. IDR_MERGEDOCTYPE, ID_VIEW_LINENUMBERS
-#: Merge.rc:731
+#: Merge.rc:738
msgid "View Line &Numbers"
msgstr "Näytä rivinumerot"
#. IDR_MERGEDOCTYPE, ID_VIEW_SELMARGIN
-#: Merge.rc:732
+#: Merge.rc:739
msgid "View &Margins"
msgstr "Näytä &marginaalit"
#. IDR_MERGEDOCTYPE, ID_VIEW_TOPMARGIN
-#: Merge.rc:733
+#: Merge.rc:740
msgid "View To&p Margins"
msgstr "Näytä ylimmät &marginaalit"
#. IDR_MERGEDOCTYPE, ID_VIEW_WORDWRAP
-#: Merge.rc:734
+#: Merge.rc:741
msgid "W&rap Lines"
msgstr "&Rivitä"
#. IDR_MERGEDOCTYPE, ID_VIEW_SPLITVERTICALLY
-#: Merge.rc:742
+#: Merge.rc:749
msgid "Split V&ertically"
msgstr "Jaa pystysuunnassa"
#. IDR_MERGEDOCTYPE, ID_VIEW_DETAIL_BAR
-#: Merge.rc:759
+#: Merge.rc:766
msgid "Diff &Pane"
msgstr "Eroavuusruutu"
#. IDR_MERGEDOCTYPE, ID_VIEW_LOCATION_BAR
-#: Merge.rc:760
+#: Merge.rc:767
msgid "Lo&cation Pane"
msgstr "Sijaintiruutu"
#. IDS_OUTPUTBAR_CAPTION
-#: Merge.rc:761 Merge.rc:4902
+#: Merge.rc:768 Merge.rc:4912
msgid "Output Pane"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_NEXTCONFLICT
-#: Merge.rc:770
+#: Merge.rc:777
msgid "Ne&xt Conflict\tAlt+Shift+Down"
msgstr "Seu&raava ristiriita\tAlt+Shift+Down"
#. IDR_MERGEDOCTYPE, ID_PREVCONFLICT
-#: Merge.rc:771
+#: Merge.rc:778
msgid "Pre&vious Conflict\tAlt+Shift+Up"
msgstr "E&dellinen ristiriita\tAlt+Shift+Up"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:777
+#: Merge.rc:784
msgid "A&dvanced"
msgstr "E&distynyt"
#. IDR_MERGEDOCTYPE, ID_NEXTDIFFLM
-#: Merge.rc:779
+#: Merge.rc:786
msgid "Next Difference (Left/Middle)\tAlt+1"
msgstr "Seuraava ero vasemmassa ja keskimmäisessä\tAlt+1"
#. IDR_MERGEDOCTYPE, ID_PREVDIFFLM
-#: Merge.rc:780
+#: Merge.rc:787
msgid "Previous Difference (Left/Middle)\tAlt+Shift+1"
msgstr "Edellinen ero vasemmassa ja keskimmäisessä\tAlt+Shift+1"
#. IDR_MERGEDOCTYPE, ID_NEXTDIFFLR
-#: Merge.rc:782
+#: Merge.rc:789
msgid "Next Difference (Left/Right)\tAlt+2"
msgstr "Seuraava ero vasemmassa ja oikeassa\tAlt+2"
#. IDR_MERGEDOCTYPE, ID_PREVDIFFLR
-#: Merge.rc:783
+#: Merge.rc:790
msgid "Previous Difference (Left/Right)\tAlt+Shift+2"
msgstr "Edellinen ero vasemmassa ja oikeassa\tAlt+Shift+2"
#. IDR_MERGEDOCTYPE, ID_NEXTDIFFMR
-#: Merge.rc:785
+#: Merge.rc:792
msgid "Next Difference (Middle/Right)\tAlt+3"
msgstr "Seuraava ero keskimmäisessä ja oikeassa\tAlt+3"
#. IDR_MERGEDOCTYPE, ID_PREVDIFFMR
-#: Merge.rc:786
+#: Merge.rc:793
msgid "Previous Difference (Middle/Right)\tAlt+Shift+3"
msgstr "Edellinen ero keskimmäisessä ja oikeassa\tAlt+Shift+3"
#. IDR_MERGEDOCTYPE, ID_NEXTDIFFLO
-#: Merge.rc:788
+#: Merge.rc:795
msgid "Next Left-Only Difference\tAlt+7"
msgstr "Seuraava ero vain vasemmassa\tAlt+7"
#. IDR_MERGEDOCTYPE, ID_PREVDIFFLO
-#: Merge.rc:789
+#: Merge.rc:796
msgid "Previous Left-Only Difference\tAlt+Shift+7"
msgstr "Edellinen ero vain vasemmassa\tAlt+Shift+7"
#. IDR_MERGEDOCTYPE, ID_NEXTDIFFMO
-#: Merge.rc:791
+#: Merge.rc:798
msgid "Next Middle-Only Difference\tAlt+8"
msgstr "Seuraava ero vain keskimmäisessä\tAlt+8"
#. IDR_MERGEDOCTYPE, ID_PREVDIFFMO
-#: Merge.rc:792
+#: Merge.rc:799
msgid "Previous Middle-Only Difference\tAlt+Shift+8"
msgstr "Edellinen ero vain keskimmäisessä\tAlt+Shift+8"
#. IDR_MERGEDOCTYPE, ID_NEXTDIFFRO
-#: Merge.rc:794
+#: Merge.rc:801
msgid "Next Right-Only Difference\tAlt+9"
msgstr "Seuraava ero vain oikeassa\tAlt+9"
#. IDR_MERGEDOCTYPE, ID_PREVDIFFRO
-#: Merge.rc:795
+#: Merge.rc:802
msgid "Previous Right-Only Difference\tAlt+Shift+9"
msgstr "Edellinen ero vain oikeassaa\tAlt+Shift+9"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:797
+#: Merge.rc:804
msgid "Copy from &Left to"
msgstr ""
#. IDD_LOAD_SAVE_CODEPAGE, IDC_AFFECTS_MIDDLE_BTN
-#: Merge.rc:799 Merge.rc:810 Merge.rc:815 Merge.rc:826 Merge.rc:970
-#: Merge.rc:2545 Merge.rc:2817
+#: Merge.rc:806 Merge.rc:817 Merge.rc:822 Merge.rc:833 Merge.rc:978
+#: Merge.rc:2555 Merge.rc:2827
msgid "&Middle"
msgstr "&Keski"
#. IDD_LOAD_SAVE_CODEPAGE, IDC_AFFECTS_RIGHT_BTN
-#: Merge.rc:800 Merge.rc:805 Merge.rc:816 Merge.rc:821 Merge.rc:971
-#: Merge.rc:2546 Merge.rc:2819
+#: Merge.rc:807 Merge.rc:812 Merge.rc:823 Merge.rc:828 Merge.rc:979
+#: Merge.rc:2556 Merge.rc:2829
msgid "&Right"
msgstr "Oikea"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:802
+#: Merge.rc:809
msgid "Copy from &Middle to"
msgstr "Kopioi &keskeltä ->"
#. IDD_LOAD_SAVE_CODEPAGE, IDC_AFFECTS_LEFT_BTN
-#: Merge.rc:804 Merge.rc:809 Merge.rc:820 Merge.rc:825 Merge.rc:969
-#: Merge.rc:2544 Merge.rc:2815
+#: Merge.rc:811 Merge.rc:816 Merge.rc:827 Merge.rc:832 Merge.rc:977
+#: Merge.rc:2554 Merge.rc:2825
msgid "&Left"
msgstr "Vasen"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:807
+#: Merge.rc:814
msgid "Copy from &Right to"
msgstr ""
#. IDR_MERGEDOCTYPE
-#: Merge.rc:813
+#: Merge.rc:820
msgid "Copy Selected Lines from Le&ft to"
msgstr "Kopioi valittu(t) rivi(t) &vasemmalta ->"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:818
+#: Merge.rc:825
msgid "Copy Selected Lines from Mi&ddle to"
msgstr "Kopioi valittu(t) rivi(t) &keskeltä ->"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:823
+#: Merge.rc:830
msgid "Copy Selected Lines from Ri&ght to"
msgstr "Kopioi valittu(t) rivi(t) &oikealta ->"
#. IDR_MERGEDOCTYPE, ID_COPY_FROM_LEFT
-#: Merge.rc:833
+#: Merge.rc:840
msgid "Copy from Left\tAlt+Shift+Right"
msgstr "Kopioi vasemmalta\tAlt+Shift+Right"
#. IDR_MERGEDOCTYPE, ID_COPY_FROM_RIGHT
-#: Merge.rc:834
+#: Merge.rc:841
msgid "Copy from Right\tAlt+Shift+Left"
msgstr "Kopioi oikealta\tAlt+Shift+Left"
#. IDR_MERGEDOCTYPE, ID_L2RNEXT
-#: Merge.rc:836
+#: Merge.rc:843
msgid "C&opy to Right and Advance\tCtrl+Alt+Right"
msgstr "Kopioi oikealle ja etene\tCtrl+Alt+Right"
#. IDR_MERGEDOCTYPE, ID_R2LNEXT
-#: Merge.rc:837
+#: Merge.rc:844
msgid "Copy &to Left and Advance\tCtrl+Alt+Left"
msgstr "Kopioi vasemmalle ja etene\tCtrl+Alt+Left"
#. IDR_MERGEDOCTYPE, ID_ALL_RIGHT
-#: Merge.rc:839
+#: Merge.rc:846
msgid "Copy &All to Right"
msgstr "Kopioi kaikki oikealle"
#. IDR_MERGEDOCTYPE, ID_ALL_LEFT
-#: Merge.rc:840
+#: Merge.rc:847
msgid "Cop&y All to Left"
msgstr "Kopioi kaikki vasemmalle"
#. IDR_MERGEDOCTYPE, ID_AUTO_MERGE
-#: Merge.rc:842
+#: Merge.rc:849
msgid "A&uto Merge\tCtrl+Alt+M"
msgstr "A&utomaattinen yhdistäminen\tCtrl+Alt+M"
#. IDR_MERGEDOCTYPE, ID_ADD_SYNCPOINT
-#: Merge.rc:844
+#: Merge.rc:851
msgid "Add &Synchronization Point\tAlt+S"
msgstr "Lisää &synkronointipiste\tAlt+S"
#. IDR_MERGEDOCTYPE, ID_CLEAR_SYNCPOINTS
-#: Merge.rc:845
+#: Merge.rc:852
msgid "Clear Sync&hronization Points"
msgstr "Poista syn&kronointipisteet"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:863
+#: Merge.rc:870
msgid "Unpac&ker"
msgstr "Pur&kaja"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:869
+#: Merge.rc:876
msgid "&Prediffer"
msgstr "Esivertailu"
#. IDR_MERGEDOCTYPE, ID_APPLY_PREDIFFER
-#: Merge.rc:873
+#: Merge.rc:880
msgid "Apply Pre&differ..."
msgstr "Käytä &ennakointia..."
#. IDR_MERGEDOCTYPE, ID_TRANSFORM_WITH_SCRIPT
-#: Merge.rc:879
+#: Merge.rc:886
msgid "&Transform with Editor Script..."
msgstr "&Muunna editoriskriptillä..."
#. IDR_MERGEDOCTYPE
-#: Merge.rc:880
+#: Merge.rc:887
msgid "Scripts for &Copying"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_SELECT_EDITOR_SCRIPT_FOR_COPYING
-#: Merge.rc:886
+#: Merge.rc:893
msgid "Select &Editor Script..."
msgstr ""
#. IDR_MERGEDOCTYPE, ID_WINDOW_SPLIT
-#: Merge.rc:898
+#: Merge.rc:905
msgid "Sp&lit"
msgstr "J&aa"
#. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE
-#: Merge.rc:921
+#: Merge.rc:928
msgid "Comp&are"
msgstr "Vertaa"
#. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE_WITH_MOVED_RENAMED
-#: Merge.rc:922
+#: Merge.rc:929
msgid "Compar&e with Renamed/Moved Items"
msgstr ""
#. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE_IN_NEW_WINDOW
-#: Merge.rc:923
+#: Merge.rc:930
msgid "Compare in New &Window"
msgstr "Vertaa uudessa &ikkunassa"
#. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE_NONHORIZONTALLY
-#: Merge.rc:924 Merge.rc:931
+#: Merge.rc:931 Merge.rc:938
msgid "Compare Non-hor&izontally..."
msgstr "Vertaa e&i-vaakasuunnassa..."
#. IDR_POPUP_DIRVIEW
-#: Merge.rc:925
+#: Merge.rc:932
msgid "Compare Non-hor&izontally"
msgstr "Vertaa ei-vaakasuunnassa"
#. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE_LEFT1_LEFT2
-#: Merge.rc:927
+#: Merge.rc:934
msgid "First &Left with Second Left"
msgstr "Ensimmäinen &vasen kohde toisen vasemman kohteen kanssa"
#. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE_RIGHT1_RIGHT2
-#: Merge.rc:928
+#: Merge.rc:935
msgid "First &Right with Second Right"
msgstr "Ensimmäinen &oikea kohde toisen oikean kohteen kanssa"
#. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE_LEFT1_RIGHT2
-#: Merge.rc:929
+#: Merge.rc:936
msgid "&First Left with Second Right"
msgstr "&Ensimmäinen vasen kohde toisen oikean kohteen kanssa"
#. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE_LEFT2_RIGHT1
-#: Merge.rc:930
+#: Merge.rc:937
msgid "&Second Left with First Right"
msgstr "&Toinen vasen kohde ensimmäisen oikean kohteen kanssa"
#. IDR_POPUP_DIRVIEW
-#: Merge.rc:933
+#: Merge.rc:940
msgid "Co&mpare As"
msgstr "Vertaa >"
#. IDS_COPY_LEFT_TO_MIDDLE2
-#: Merge.rc:945 Merge.rc:957 Merge.rc:4502
+#: Merge.rc:953 Merge.rc:965 Merge.rc:4512
#, c-format
msgid "Left to Middle (%1 of %2)"
msgstr "Vasemmalta keskelle (%1 / %2)"
#. IDS_COPY_LEFT_TO_RIGHT2
-#: Merge.rc:946 Merge.rc:958 Merge.rc:4501
+#: Merge.rc:954 Merge.rc:966 Merge.rc:4511
#, c-format
msgid "Left to Right (%1 of %2)"
msgstr "Vasemmalta oikealle (%1 / %2)"
#. IDS_MOVE_LEFT_TO2
-#: Merge.rc:947 Merge.rc:959 Merge.rc:1022 Merge.rc:4513 Merge.rc:4542
+#: Merge.rc:955 Merge.rc:967 Merge.rc:1030 Merge.rc:4523 Merge.rc:4552
#, c-format
msgid "Left to... (%1 of %2)"
msgstr "Vasemmalta... (%1 / %2)"
#. IDS_COPY_MIDDLE_TO_LEFT2
-#: Merge.rc:948 Merge.rc:960 Merge.rc:4499
+#: Merge.rc:956 Merge.rc:968 Merge.rc:4509
#, c-format
msgid "Middle to Left (%1 of %2)"
msgstr "Keskeltä vasemmalle (%1 / %2)"
#. IDS_COPY_MIDDLE_TO_RIGHT2
-#: Merge.rc:949 Merge.rc:961 Merge.rc:4500
+#: Merge.rc:957 Merge.rc:969 Merge.rc:4510
#, c-format
msgid "Middle to Right (%1 of %2)"
msgstr "Vasemmalta oikealle (%1 / %2)"
#. IDS_MOVE_MIDDLE_TO2
-#: Merge.rc:950 Merge.rc:962 Merge.rc:1023 Merge.rc:4514 Merge.rc:4543
+#: Merge.rc:958 Merge.rc:970 Merge.rc:1031 Merge.rc:4524 Merge.rc:4553
#, c-format
msgid "Middle to... (%1 of %2)"
msgstr "Keskellä... (%1 / %2)"
#. IDS_COPY_RIGHT_TO_MIDDLE2
-#: Merge.rc:951 Merge.rc:963 Merge.rc:4498
+#: Merge.rc:959 Merge.rc:971 Merge.rc:4508
#, c-format
msgid "Right to Middle (%1 of %2)"
msgstr "Oikealta keskelle (%1 / %2)"
#. IDS_COPY_RIGHT_TO_LEFT2
-#: Merge.rc:952 Merge.rc:964 Merge.rc:4497
+#: Merge.rc:960 Merge.rc:972 Merge.rc:4507
#, c-format
msgid "Right to Left (%1 of %2)"
msgstr "Oikealta vasemmalle (%1 / %2)"
#. IDS_MOVE_RIGHT_TO2
-#: Merge.rc:953 Merge.rc:965 Merge.rc:1024 Merge.rc:4515 Merge.rc:4544
+#: Merge.rc:961 Merge.rc:973 Merge.rc:1032 Merge.rc:4525 Merge.rc:4554
#, c-format
msgid "Right to... (%1 of %2)"
msgstr "Oikealta... (%1 / %2)"
#. IDD_EDIT_MARKER, IDC_EDIT_MARKER_DELETE
-#: Merge.rc:967 Merge.rc:2036
+#: Merge.rc:975 Merge.rc:2046
msgid "&Delete"
msgstr "Poista"
#. IDR_POPUP_DIRVIEW, ID_DIR_DEL_BOTH
-#: Merge.rc:972
+#: Merge.rc:980
msgid "&Both"
msgstr "Molemmat"
#. IDR_POPUP_DIRVIEW, ID_DIR_DEL_ALL
-#: Merge.rc:973
+#: Merge.rc:981
msgid "&All"
msgstr "K&aikki"
#. IDD_EDIT_REPLACE, IDC_EDIT_SCOPE_SELECTION
-#: Merge.rc:974 Merge.rc:2019
+#: Merge.rc:982 Merge.rc:2029
msgid "&Selection"
msgstr "Valinta"
#. IDR_POPUP_DIRVIEW, ID_DIR_ITEM_RENAME
-#: Merge.rc:976
+#: Merge.rc:984
msgid "Re&name"
msgstr "Nimeä uudelleen"
#. IDR_POPUP_DIRVIEW, ID_DIR_HIDE_FILENAMES
-#: Merge.rc:977
+#: Merge.rc:985
msgid "&Hide Items"
msgstr "Piilota kohteet"
#. IDR_POPUP_DIRVIEW
-#: Merge.rc:979
+#: Merge.rc:987
msgid "&Open Left"
msgstr "Avaa vasen"
#. IDR_POPUP_DIRVIEW
-#: Merge.rc:986
+#: Merge.rc:994
msgid "Open Midd&le"
msgstr "Avaa ke&skimmäinen"
#. IDR_POPUP_DIRVIEW
-#: Merge.rc:993
+#: Merge.rc:1001
msgid "O&pen Right"
msgstr "Avaa oikea"
#. IDR_POPUP_DIRVIEW
-#: Merge.rc:1001
+#: Merge.rc:1009
msgid "Cop&y Paths"
msgstr "Kopioi polkunimet"
#. IDS_DEL_LEFT_FMT2
-#: Merge.rc:1003 Merge.rc:1012 Merge.rc:4530
+#: Merge.rc:1011 Merge.rc:1020 Merge.rc:4540
#, c-format
msgid "Left (%1 of %2)"
msgstr "Vasen (%1 / %2)"
#. IDS_DEL_MIDDLE_FMT2
-#: Merge.rc:1004 Merge.rc:1013 Merge.rc:4531
+#: Merge.rc:1012 Merge.rc:1021 Merge.rc:4541
#, c-format
msgid "Middle (%1 of %2)"
msgstr "Keskimmäinen (%1 / %2)"
#. IDS_DEL_RIGHT_FMT2
-#: Merge.rc:1005 Merge.rc:1014 Merge.rc:4532
+#: Merge.rc:1013 Merge.rc:1022 Merge.rc:4542
#, c-format
msgid "Right (%1 of %2)"
msgstr "Oikea (%1 / %2)"
#. IDS_DEL_BOTH_FMT2
-#: Merge.rc:1006 Merge.rc:1015 Merge.rc:4533
+#: Merge.rc:1014 Merge.rc:1023 Merge.rc:4543
#, c-format
msgid "Both (%1 of %2)"
msgstr "Molemmat (%1 / %2)"
#. IDS_DEL_ALL_FMT2
-#: Merge.rc:1007 Merge.rc:1016 Merge.rc:4538
+#: Merge.rc:1015 Merge.rc:1024 Merge.rc:4548
#, c-format
msgid "All (%1 of %2)"
msgstr "Kaikki (%1 / %2)"
#. IDR_POPUP_DIRVIEW, ID_DIR_COPY_FILENAMES
-#: Merge.rc:1009
+#: Merge.rc:1017
msgid "Copy &Filenames"
msgstr "Kopioi tiedostonimet"
#. IDR_POPUP_DIRVIEW
-#: Merge.rc:1010
+#: Merge.rc:1018
msgid "Copy Items to Clip&board"
msgstr "Kopioi kohteet leike&pöydälle"
#. IDR_POPUP_DIRVIEW, ID_DIR_COPY_ALL_DISP_COLUMNS
-#: Merge.rc:1018
+#: Merge.rc:1026
msgid "Copy All Di&splayed Columns"
msgstr ""
#. IDR_POPUP_DIRVIEW
-#: Merge.rc:1020
+#: Merge.rc:1028
msgid "&Zip"
msgstr "Pakkaa"
#. IDS_COPY_BOTH_TO2
-#: Merge.rc:1025 Merge.rc:4516
+#: Merge.rc:1033 Merge.rc:4526
#, c-format
msgid "Both to... (%1 of %2)"
msgstr "Molemmat... (%1 / %2)"
#. IDS_COPY_ALL_TO2
-#: Merge.rc:1026 Merge.rc:4517
+#: Merge.rc:1034 Merge.rc:4527
#, c-format
msgid "All to... (%1 of %2)"
msgstr "Kaikki... (%1 / %2)"
#. IDS_COPY_DIFFERENCES_TO2
-#: Merge.rc:1027 Merge.rc:4518
+#: Merge.rc:1035 Merge.rc:4528
#, c-format
msgid "Differences to... (%1 of %2)"
msgstr "Eroavaisuudet... (%1 / %2)"
#. IDR_POPUP_DIRVIEW, ID_DIR_SHELL_CONTEXT_MENU_LEFT
-#: Merge.rc:1032
+#: Merge.rc:1040
msgid "Left Shell Menu"
msgstr "Vasen Shell-valikko"
#. IDR_POPUP_DIRVIEW, ID_DIR_SHELL_CONTEXT_MENU_MIDDLE
-#: Merge.rc:1033
+#: Merge.rc:1041
msgid "Middle Shell Menu"
msgstr "Keskimmäinen liittymävalikko"
#. IDR_POPUP_DIRVIEW, ID_DIR_SHELL_CONTEXT_MENU_RIGHT
-#: Merge.rc:1034
+#: Merge.rc:1042
msgid "Right Shell Menu"
msgstr "Oikea Shell-valikko"
#. IDR_POPUP_DIRVIEW, ID_DIR_SHELL_CONTEXT_MENU_BOTH
-#: Merge.rc:1035
+#: Merge.rc:1043
msgid "Both Shell Menu"
msgstr ""
#. IDR_POPUP_DIRVIEW, ID_DIR_SHELL_CONTEXT_MENU_ALL
-#: Merge.rc:1036
+#: Merge.rc:1044
msgid "All Shell Menu"
msgstr ""
#. IDR_POPUP_EDITOR_HEADERBAR, ID_EDITOR_COPY
-#: Merge.rc:1050
+#: Merge.rc:1058
msgid "Copy"
msgstr "Kopioi"
#. IDR_POPUP_EDITOR_HEADERBAR, ID_EDITOR_COPY_PATH
-#: Merge.rc:1051
+#: Merge.rc:1059
msgid "&Copy Full Path"
msgstr "Kopioi täysi polku"
#. IDR_POPUP_EDITOR_HEADERBAR, ID_EDITOR_COPY_FILENAME
-#: Merge.rc:1052
+#: Merge.rc:1060
msgid "Copy &Filename"
msgstr "Kopioi tiedostonimi"
#. IDR_POPUP_EDITOR_HEADERBAR, ID_EDITOR_EDIT_CAPTION
-#: Merge.rc:1053
+#: Merge.rc:1061
msgid "&Edit Caption\tF2"
msgstr "Muokkaa &otsikkoa\tF2"
#. IDR_POPUP_EDITOR_HEADERBAR, ID_EDITOR_EDIT_PATH
-#: Merge.rc:1055
+#: Merge.rc:1063
msgid "Edit &Path\tCtrl+L"
msgstr ""
#. IDR_POPUP_EDITOR_HEADERBAR, ID_EDITOR_SELECT_FILE
-#: Merge.rc:1056
+#: Merge.rc:1064
msgid "&Open..."
msgstr ""
#. IDR_POPUP_PLUGINS_SETTINGS
-#: Merge.rc:1062
+#: Merge.rc:1070
msgid "Unpacker Settings"
msgstr "Pakkauksen purkuasetukset"
#. IDS_USERCHOICE_NONE
-#: Merge.rc:1064 Merge.rc:1070 Merge.rc:1789 Merge.rc:1793 Merge.rc:5030
+#: Merge.rc:1072 Merge.rc:1078 Merge.rc:1799 Merge.rc:1803 Merge.rc:5040
msgid ""
msgstr ""
#. IDS_USERCHOICE_AUTOMATIC
-#: Merge.rc:1065 Merge.rc:1071 Merge.rc:5031
+#: Merge.rc:1073 Merge.rc:1079 Merge.rc:5041
msgid ""
msgstr ""
#. IDD_OPEN, IDC_SELECT_PREDIFFER
-#: Merge.rc:1066 Merge.rc:1072 Merge.rc:1970 Merge.rc:1974
+#: Merge.rc:1074 Merge.rc:1080 Merge.rc:1980 Merge.rc:1984
msgid "&Select..."
msgstr "Valitse..."
#. IDR_POPUP_PLUGINS_SETTINGS
-#: Merge.rc:1068
+#: Merge.rc:1076
msgid "Prediffer Settings"
msgstr "Esivertailun asetukset"
#. IDR_POPUP_LOCATIONBAR, ID_LOCBAR_GOTODIFF
-#: Merge.rc:1080
+#: Merge.rc:1088
msgid "G&o to Diff"
msgstr "Siirry eroon"
#. IDR_POPUP_LOCATIONBAR, ID_LOCBAR_MOVECURSOR_ONCLICK
-#: Merge.rc:1083
+#: Merge.rc:1091
msgid "Move Cursor on &Click"
msgstr ""
#. IDR_POPUP_LOCATIONBAR, ID_DISPLAY_MOVED_NONE
-#: Merge.rc:1085
+#: Merge.rc:1093
msgid "&No Moved Blocks"
msgstr "Ei siirrettyjä lohkoja"
#. IDR_POPUP_LOCATIONBAR, ID_DISPLAY_MOVED_ALL
-#: Merge.rc:1086
+#: Merge.rc:1094
msgid "&All Moved Blocks"
msgstr "Kaikki siirretyt lohkot"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS
-#: Merge.rc:1094 Merge.rc:1127
+#: Merge.rc:1102 Merge.rc:1135
msgid "W&hitespaces"
msgstr "Välilyönnit"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_WHITESPACE_COMPARE
-#: Merge.rc:1096 Merge.rc:1129
+#: Merge.rc:1104 Merge.rc:1137
msgid "Com&pare"
msgstr "Vertaa"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_WHITESPACE_IGNORE
-#: Merge.rc:1097 Merge.rc:1130
+#: Merge.rc:1105 Merge.rc:1138
msgid "I&gnore Changes"
msgstr "Hylkää muutokset"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_WHITESPACE_IGNOREALL
-#: Merge.rc:1098 Merge.rc:1131
+#: Merge.rc:1106 Merge.rc:1139
msgid "Ig&nore All"
msgstr "Hylkää kaikki"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_IGNORE_BLANKLINES
-#: Merge.rc:1100 Merge.rc:1133
+#: Merge.rc:1108 Merge.rc:1141
msgid "Ignore Blan&k Lines"
msgstr "Ohita tyhjät rivit"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_IGNORE_CASE
-#: Merge.rc:1101 Merge.rc:1134
+#: Merge.rc:1109 Merge.rc:1142
msgid "Ignore &Case"
msgstr "Ohita kirjainkoko"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_IGNORE_EOL
-#: Merge.rc:1102 Merge.rc:1135
+#: Merge.rc:1110 Merge.rc:1143
msgid "Igno&re EOL Differences (Windows/Unix/Mac)"
msgstr "Ohita rivinvaihtoerot (Windows/Unix/Mac)"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_IGNORE_CODEPAGE
-#: Merge.rc:1103 Merge.rc:1136
+#: Merge.rc:1111 Merge.rc:1144
msgid "Ignore Codepage &Differences"
msgstr "Ohita koodisivuerot"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_IGNORE_NUMBERS
-#: Merge.rc:1104 Merge.rc:1137
+#: Merge.rc:1112 Merge.rc:1145
msgid "Ignore Num&bers"
msgstr "Jätä nume&rot huomiotta"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_IGNORE_COMMENTS
-#: Merge.rc:1105 Merge.rc:1138
+#: Merge.rc:1113 Merge.rc:1146
msgid "Ignore C&omment Differences"
msgstr "Jätä k&ommenttien erot huomiotta"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_IGNORE_MISSING_TRAILING_EOL
-#: Merge.rc:1106 Merge.rc:1139
+#: Merge.rc:1114 Merge.rc:1147
msgid "Ignore &Missing Trailing EOL"
msgstr ""
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_IGNORE_LINE_BREAKS
-#: Merge.rc:1107 Merge.rc:1140
+#: Merge.rc:1115 Merge.rc:1148
msgid "Ignore Line &Breaks (Treat as Spaces)"
msgstr ""
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_RECURS_CHECK
-#: Merge.rc:1109 Merge.rc:2963
+#: Merge.rc:1117 Merge.rc:2973
msgid "&Include Subfolders"
msgstr "Sisällytä alihakemistot"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS
-#: Merge.rc:1110 Merge.rc:1142
+#: Merge.rc:1118 Merge.rc:1150
msgid "&Compare Method"
msgstr "Vertailumenetelmä"
#. IDS_COMPMETHOD_FULL_CONTENTS
-#: Merge.rc:1112 Merge.rc:1144 Merge.rc:1328 Merge.rc:4282
+#: Merge.rc:1120 Merge.rc:1152 Merge.rc:1338 Merge.rc:4292
msgid "Full Contents"
msgstr "Koko sisältö"
#. IDS_COMPMETHOD_QUICK_CONTENTS
-#: Merge.rc:1113 Merge.rc:1145 Merge.rc:1329 Merge.rc:4283
+#: Merge.rc:1121 Merge.rc:1153 Merge.rc:1339 Merge.rc:4293
msgid "Quick Contents"
msgstr "Pikasisältö"
#. IDS_COMPMETHOD_BINARY_CONTENTS
-#: Merge.rc:1114 Merge.rc:1146 Merge.rc:1330 Merge.rc:4284
+#: Merge.rc:1122 Merge.rc:1154 Merge.rc:1340 Merge.rc:4294
msgid "Binary Contents"
msgstr "Binaarinen sisältö"
#. IDS_COMPMETHOD_MODDATE
-#: Merge.rc:1115 Merge.rc:1147 Merge.rc:1331 Merge.rc:4285
+#: Merge.rc:1123 Merge.rc:1155 Merge.rc:1341 Merge.rc:4295
msgid "Modified Date"
msgstr "Muutospäivämäärä"
#. IDS_COMPMETHOD_DATESIZE
-#: Merge.rc:1116 Merge.rc:1148 Merge.rc:1332 Merge.rc:4286
+#: Merge.rc:1124 Merge.rc:1156 Merge.rc:1342 Merge.rc:4296
msgid "Modified Date and Size"
msgstr "Muutospäivä ja koko"
#. IDS_COMPMETHOD_SIZE
-#: Merge.rc:1117 Merge.rc:1149 Merge.rc:1333 Merge.rc:4287
+#: Merge.rc:1125 Merge.rc:1157 Merge.rc:1343 Merge.rc:4297
msgid "Size"
msgstr "Koko"
#. IDS_COMPMETHOD_EXISTENCE
-#: Merge.rc:1118 Merge.rc:1150 Merge.rc:1334 Merge.rc:4288
+#: Merge.rc:1126 Merge.rc:1158 Merge.rc:1344 Merge.rc:4298
msgid "Existence"
msgstr ""
#. IDR_POPUP_PROJECT, ID_LOAD_PROJECT
-#: Merge.rc:1192
+#: Merge.rc:1202
msgid "&Load Project..."
msgstr "&Lataa projekti..."
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARGALL
-#: Merge.rc:1272 Merge.rc:1301
+#: Merge.rc:1282 Merge.rc:1311
msgid "${*} - All Arguments"
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARG1
-#: Merge.rc:1273 Merge.rc:1302
+#: Merge.rc:1283 Merge.rc:1312
msgid "${1} - First Argument"
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARG2
-#: Merge.rc:1274 Merge.rc:1303
+#: Merge.rc:1284 Merge.rc:1313
msgid "${2} - Second Argument"
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARG3
-#: Merge.rc:1275 Merge.rc:1304
+#: Merge.rc:1285 Merge.rc:1314
msgid "${3} - Third Argument"
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARG4
-#: Merge.rc:1276 Merge.rc:1305
+#: Merge.rc:1286 Merge.rc:1315
msgid "${4} - Fourth Argument"
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARG5
-#: Merge.rc:1277 Merge.rc:1306
+#: Merge.rc:1287 Merge.rc:1316
msgid "${5} - Fifth Argument"
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARG6
-#: Merge.rc:1278 Merge.rc:1307
+#: Merge.rc:1288 Merge.rc:1317
msgid "${6} - Sixth Argument"
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARG7
-#: Merge.rc:1279 Merge.rc:1308
+#: Merge.rc:1289 Merge.rc:1318
msgid "${7} - Seventh Argument"
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARG8
-#: Merge.rc:1280 Merge.rc:1309
+#: Merge.rc:1290 Merge.rc:1319
msgid "${8} - Eighth Argument"
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARG9
-#: Merge.rc:1281 Merge.rc:1310
+#: Merge.rc:1291 Merge.rc:1320
msgid "${9} - Ninth Argument"
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_SRC_FILE
-#: Merge.rc:1289
+#: Merge.rc:1299
msgid "${SRC_FILE} - Source File"
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_SRC_FOLDER
-#: Merge.rc:1290
+#: Merge.rc:1300
msgid "${SRC_FOLDER} - Source Folder"
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_SRC_URL
-#: Merge.rc:1291
+#: Merge.rc:1301
msgid "${SRC_URL} - Source URL"
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_SRC_URL_PROTOCOL
-#: Merge.rc:1292
+#: Merge.rc:1302
msgid "${SRC_URL_PROTOCOL} - Source URL Protocol"
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_SRC_URL_SUFFIX
-#: Merge.rc:1293
+#: Merge.rc:1303
msgid "${SRC_URL_SUFFIX} - Source URL Suffix"
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_DST_FILE
-#: Merge.rc:1294
+#: Merge.rc:1304
msgid "${DST_FILE} - Destination File"
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_DST_FOLDER
-#: Merge.rc:1295
+#: Merge.rc:1305
msgid "${DST_FOLDER} - Destination Folder"
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_DST_URL
-#: Merge.rc:1296
+#: Merge.rc:1306
msgid "${DST_URL} - Destination URL"
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_DST_URL_PROTOCOL
-#: Merge.rc:1297
+#: Merge.rc:1307
msgid "${DST_URL_PROTOCOL} - Destination URL Protocol"
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_DST_URL_SUFFIX
-#: Merge.rc:1298
+#: Merge.rc:1308
msgid "${DST_URL_SUFFIX} - Destination URL Suffix"
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_WINMERGE_HOME
-#: Merge.rc:1299
+#: Merge.rc:1309
msgid "${WINMERGE_HOME} - WinMerge Home Directory"
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_SCRIPT_FILE
-#: Merge.rc:1300
+#: Merge.rc:1310
msgid "${SCRIPT_FILE} - Script File"
msgstr ""
#. IDR_POPUP_PLUGIN_ADD_MENU, ID_PLUGIN_ADD_UNPACKER
-#: Merge.rc:1318
+#: Merge.rc:1328
msgid "Add &Unpacker Plugin..."
msgstr ""
#. IDR_POPUP_PLUGIN_ADD_MENU, ID_PLUGIN_ADD_PREDIFFER
-#: Merge.rc:1319
+#: Merge.rc:1329
msgid "Add &Prediffer Plugin..."
msgstr ""
#. IDR_POPUP_PLUGIN_ADD_MENU, ID_PLUGIN_DUPLICATE
-#: Merge.rc:1320
+#: Merge.rc:1330
msgid "&Duplicate Plugin..."
msgstr ""
#. IDR_POPUP_OUTPUTVIEW, ID_EDIT_CLEAR_ALL
-#: Merge.rc:1344
+#: Merge.rc:1354
msgid "Clear &All"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_MASK_CLEAR
-#: Merge.rc:1352
+#: Merge.rc:1362
msgid "&Clear All"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_MASK_REMOVE_LAST
-#: Merge.rc:1353
+#: Merge.rc:1363
msgid "Remove Last Filter &Group"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_MASK_ALL
-#: Merge.rc:1354
+#: Merge.rc:1364
msgid "R&eset to Default (*.*)"
msgstr ""
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1355
+#: Merge.rc:1365
msgid "Add E&xclude File"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_SYS
-#: Merge.rc:1357
+#: Merge.rc:1367
msgid "&System Files"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_BACKUP
-#: Merge.rc:1358
+#: Merge.rc:1368
msgid "&Editor Backup Files"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_BIN
-#: Merge.rc:1359
+#: Merge.rc:1369
msgid "&Compiled Binary Files"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_LOG
-#: Merge.rc:1360
+#: Merge.rc:1370
msgid "&Log Files"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_TEMP
-#: Merge.rc:1361
+#: Merge.rc:1371
msgid "&Temporary or Cache Files"
msgstr ""
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1363
+#: Merge.rc:1373
msgid "Add Excl&ude Folder"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FOLDER_VCS
-#: Merge.rc:1365
+#: Merge.rc:1375
msgid "&Version Control"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FOLDER_BUILD
-#: Merge.rc:1366
+#: Merge.rc:1376
msgid "&Build Artifacts"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FOLDER_IDE
-#: Merge.rc:1367
+#: Merge.rc:1377
msgid "&IDE"
msgstr ""
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1370
+#: Merge.rc:1380
msgid "Add &File Condition"
msgstr ""
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1372 Merge.rc:1551
+#: Merge.rc:1382 Merge.rc:1561
msgid "File &Size"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_SIZE, ID_FILTERMENU_DIFF_SIZE_LT_1KB
-#: Merge.rc:1374 Merge.rc:1527 Merge.rc:1564 Merge.rc:1629 Merge.rc:1707
+#: Merge.rc:1384 Merge.rc:1537 Merge.rc:1574 Merge.rc:1639 Merge.rc:1717
msgid "Less than 1KB"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_SIZE, ID_FILTERMENU_DIFF_SIZE_GE_1KB
-#: Merge.rc:1375 Merge.rc:1528 Merge.rc:1565 Merge.rc:1630 Merge.rc:1708
+#: Merge.rc:1385 Merge.rc:1538 Merge.rc:1575 Merge.rc:1640 Merge.rc:1718
msgid "1KB or more"
msgstr ""
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_LT_10KB
-#: Merge.rc:1376 Merge.rc:1529 Merge.rc:1631
+#: Merge.rc:1386 Merge.rc:1539 Merge.rc:1641
msgid "Less than 10KB"
msgstr ""
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_GE_10KB
-#: Merge.rc:1377 Merge.rc:1530 Merge.rc:1632
+#: Merge.rc:1387 Merge.rc:1540 Merge.rc:1642
msgid "10KB or more"
msgstr ""
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_LT_100KB
-#: Merge.rc:1378 Merge.rc:1531 Merge.rc:1633
+#: Merge.rc:1388 Merge.rc:1541 Merge.rc:1643
msgid "Less than 100KB"
msgstr ""
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_GE_100KB
-#: Merge.rc:1379 Merge.rc:1532 Merge.rc:1634
+#: Merge.rc:1389 Merge.rc:1542 Merge.rc:1644
msgid "100KB or more"
msgstr ""
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_LT_1MB
-#: Merge.rc:1380 Merge.rc:1533 Merge.rc:1635
+#: Merge.rc:1390 Merge.rc:1543 Merge.rc:1645
msgid "Less than 1MB"
msgstr ""
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_GE_1MB
-#: Merge.rc:1381 Merge.rc:1534 Merge.rc:1636
+#: Merge.rc:1391 Merge.rc:1544 Merge.rc:1646
msgid "1MB or more"
msgstr ""
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_LT_10MB
-#: Merge.rc:1382 Merge.rc:1535 Merge.rc:1637
+#: Merge.rc:1392 Merge.rc:1545 Merge.rc:1647
msgid "Less than 10MB"
msgstr ""
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_GE_10MB
-#: Merge.rc:1383 Merge.rc:1536 Merge.rc:1638
+#: Merge.rc:1393 Merge.rc:1546 Merge.rc:1648
msgid "10MB or more"
msgstr ""
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_LT_100MB
-#: Merge.rc:1384 Merge.rc:1537 Merge.rc:1639
+#: Merge.rc:1394 Merge.rc:1547 Merge.rc:1649
msgid "Less than 100MB"
msgstr ""
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_GE_100MB
-#: Merge.rc:1385 Merge.rc:1538 Merge.rc:1640
+#: Merge.rc:1395 Merge.rc:1548 Merge.rc:1650
msgid "100MB or more"
msgstr ""
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_LT_1GB
-#: Merge.rc:1386 Merge.rc:1539 Merge.rc:1641
+#: Merge.rc:1396 Merge.rc:1549 Merge.rc:1651
msgid "Less than 1GB"
msgstr ""
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_GE_1GB
-#: Merge.rc:1387 Merge.rc:1642
+#: Merge.rc:1397 Merge.rc:1652
msgid "1GB or more"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_RANGE
-#: Merge.rc:1388 Merge.rc:1465 Merge.rc:1517 Merge.rc:1523 Merge.rc:1540
-#: Merge.rc:1566 Merge.rc:1587 Merge.rc:1643 Merge.rc:1709 Merge.rc:1734
+#: Merge.rc:1398 Merge.rc:1475 Merge.rc:1527 Merge.rc:1533 Merge.rc:1550
+#: Merge.rc:1576 Merge.rc:1597 Merge.rc:1653 Merge.rc:1719 Merge.rc:1744
msgid "Custom Range..."
msgstr ""
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1390 Merge.rc:1471 Merge.rc:1568
+#: Merge.rc:1400 Merge.rc:1481 Merge.rc:1578
msgid "&Last Modified"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE
-#: Merge.rc:1392 Merge.rc:1473 Merge.rc:1651
+#: Merge.rc:1402 Merge.rc:1483 Merge.rc:1661
msgid "&Hour"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_HOUR_BEFORE_1
-#: Merge.rc:1394 Merge.rc:1475 Merge.rc:1653
+#: Merge.rc:1404 Merge.rc:1485 Merge.rc:1663
msgid "More than 1 hour ago"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_HOUR_WITHIN_1
-#: Merge.rc:1395 Merge.rc:1476 Merge.rc:1654
+#: Merge.rc:1405 Merge.rc:1486 Merge.rc:1664
msgid "Within 1 hour"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE
-#: Merge.rc:1397 Merge.rc:1478 Merge.rc:1656
+#: Merge.rc:1407 Merge.rc:1488 Merge.rc:1666
msgid "&Day"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_DAY_BEFORE_TODAY
-#: Merge.rc:1399 Merge.rc:1480 Merge.rc:1658
+#: Merge.rc:1409 Merge.rc:1490 Merge.rc:1668
msgid "Before today"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_DAY_TODAY
-#: Merge.rc:1400 Merge.rc:1481 Merge.rc:1659
+#: Merge.rc:1410 Merge.rc:1491 Merge.rc:1669
msgid "Today"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_DAY_BEFORE_YESTERDAY
-#: Merge.rc:1401 Merge.rc:1482 Merge.rc:1660
+#: Merge.rc:1411 Merge.rc:1492 Merge.rc:1670
msgid "Before yesterday"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_DAY_YESTERDAY
-#: Merge.rc:1402 Merge.rc:1483 Merge.rc:1661
+#: Merge.rc:1412 Merge.rc:1493 Merge.rc:1671
msgid "Yesterday"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_DAY_SINCE_YESTERDAY
-#: Merge.rc:1403 Merge.rc:1484 Merge.rc:1662
+#: Merge.rc:1413 Merge.rc:1494 Merge.rc:1672
msgid "Since yesterday"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE
-#: Merge.rc:1405 Merge.rc:1486 Merge.rc:1664
+#: Merge.rc:1415 Merge.rc:1496 Merge.rc:1674
msgid "&Week"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_WEEK_BEFORE_THIS
-#: Merge.rc:1407 Merge.rc:1488 Merge.rc:1666
+#: Merge.rc:1417 Merge.rc:1498 Merge.rc:1676
msgid "Before this week"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_WEEK_THIS
-#: Merge.rc:1408 Merge.rc:1489 Merge.rc:1667
+#: Merge.rc:1418 Merge.rc:1499 Merge.rc:1677
msgid "This week"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_WEEK_BEFORE_LAST
-#: Merge.rc:1409 Merge.rc:1490 Merge.rc:1668
+#: Merge.rc:1419 Merge.rc:1500 Merge.rc:1678
msgid "Before last week"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_WEEK_LAST
-#: Merge.rc:1410 Merge.rc:1491 Merge.rc:1669
+#: Merge.rc:1420 Merge.rc:1501 Merge.rc:1679
msgid "Last week"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_WEEK_SINCE_LAST
-#: Merge.rc:1411 Merge.rc:1492 Merge.rc:1670
+#: Merge.rc:1421 Merge.rc:1502 Merge.rc:1680
msgid "Since last week"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE
-#: Merge.rc:1413 Merge.rc:1494 Merge.rc:1672
+#: Merge.rc:1423 Merge.rc:1504 Merge.rc:1682
msgid "&Month"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_MONTH_BEFORE_THIS
-#: Merge.rc:1415 Merge.rc:1496 Merge.rc:1674
+#: Merge.rc:1425 Merge.rc:1506 Merge.rc:1684
msgid "Before this month"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_MONTH_THIS
-#: Merge.rc:1416 Merge.rc:1497 Merge.rc:1675
+#: Merge.rc:1426 Merge.rc:1507 Merge.rc:1685
msgid "This month"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_MONTH_BEFORE_LAST
-#: Merge.rc:1417 Merge.rc:1498 Merge.rc:1676
+#: Merge.rc:1427 Merge.rc:1508 Merge.rc:1686
msgid "Before last month"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_MONTH_LAST
-#: Merge.rc:1418 Merge.rc:1499 Merge.rc:1677
+#: Merge.rc:1428 Merge.rc:1509 Merge.rc:1687
msgid "Last month"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_MONTH_SINCE_LAST
-#: Merge.rc:1419 Merge.rc:1500 Merge.rc:1678
+#: Merge.rc:1429 Merge.rc:1510 Merge.rc:1688
msgid "Since last month"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE
-#: Merge.rc:1421 Merge.rc:1502 Merge.rc:1680
+#: Merge.rc:1431 Merge.rc:1512 Merge.rc:1690
msgid "&Year"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_YEAR_BEFORE_THIS
-#: Merge.rc:1423 Merge.rc:1504 Merge.rc:1682
+#: Merge.rc:1433 Merge.rc:1514 Merge.rc:1692
msgid "Before this year"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_YEAR_THIS
-#: Merge.rc:1424 Merge.rc:1505 Merge.rc:1683
+#: Merge.rc:1434 Merge.rc:1515 Merge.rc:1693
msgid "This year"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_YEAR_BEFORE_LAST
-#: Merge.rc:1425 Merge.rc:1506 Merge.rc:1684
+#: Merge.rc:1435 Merge.rc:1516 Merge.rc:1694
msgid "Before last year"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_YEAR_LAST
-#: Merge.rc:1426 Merge.rc:1507 Merge.rc:1685
+#: Merge.rc:1436 Merge.rc:1517 Merge.rc:1695
msgid "Last year"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_YEAR_SINCE_LAST
-#: Merge.rc:1427 Merge.rc:1508 Merge.rc:1686
+#: Merge.rc:1437 Merge.rc:1518 Merge.rc:1696
msgid "Since last year"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_RANGE
-#: Merge.rc:1429 Merge.rc:1510 Merge.rc:1688
+#: Merge.rc:1439 Merge.rc:1520 Merge.rc:1698
msgid "&Custom Range..."
msgstr ""
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1431 Merge.rc:1589
+#: Merge.rc:1441 Merge.rc:1599
msgid "&Attributes"
msgstr ""
#. IDR_POPUP_FILTERMENU_ATTR, ID_FILTERMENU_ATTR_READONLY
-#: Merge.rc:1433 Merge.rc:1607
+#: Merge.rc:1443 Merge.rc:1617
msgid "Read-only files"
msgstr ""
#. IDR_POPUP_FILTERMENU_ATTR, ID_FILTERMENU_ATTR_NOT_READONLY
-#: Merge.rc:1434 Merge.rc:1608
+#: Merge.rc:1444 Merge.rc:1618
msgid "Not read-only files"
msgstr ""
#. IDR_POPUP_FILTERMENU_ATTR, ID_FILTERMENU_ATTR_HIDDEN
-#: Merge.rc:1435 Merge.rc:1609
+#: Merge.rc:1445 Merge.rc:1619
msgid "Hidden files"
msgstr ""
#. IDR_POPUP_FILTERMENU_ATTR, ID_FILTERMENU_ATTR_NOT_HIDDEN
-#: Merge.rc:1436 Merge.rc:1610
+#: Merge.rc:1446 Merge.rc:1620
msgid "Not hidden files"
msgstr ""
#. IDR_POPUP_FILTERMENU_ATTR, ID_FILTERMENU_ATTR_SYSTEM
-#: Merge.rc:1437 Merge.rc:1611
+#: Merge.rc:1447 Merge.rc:1621
msgid "System files"
msgstr ""
#. IDR_POPUP_FILTERMENU_ATTR, ID_FILTERMENU_ATTR_NOT_SYSTEM
-#: Merge.rc:1438 Merge.rc:1612
+#: Merge.rc:1448 Merge.rc:1622
msgid "Not system files"
msgstr ""
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1440
+#: Merge.rc:1450
msgid "File &Content"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_CONTAINS
-#: Merge.rc:1442
+#: Merge.rc:1452
msgid "Contains string..."
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_NOT_CONTAINS
-#: Merge.rc:1443
+#: Merge.rc:1453
msgid "Does not contain string..."
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_FIRST_LINE_CONTAINS
-#: Merge.rc:1444
+#: Merge.rc:1454
msgid "First line contains string..."
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_FIRST_LINE_NOT_CONTAINS
-#: Merge.rc:1445
+#: Merge.rc:1455
msgid "First line does not contain string..."
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_FIRST_10_CONTAINS
-#: Merge.rc:1446
+#: Merge.rc:1456
msgid "First 10 lines contain string..."
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_FIRST_10_NOT_CONTAINS
-#: Merge.rc:1447
+#: Merge.rc:1457
msgid "First 10 lines do not contain string..."
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_LAST_10_CONTAINS
-#: Merge.rc:1448
+#: Merge.rc:1458
msgid "Last 10 lines contain string..."
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_LAST_10_NOT_CONTAINS
-#: Merge.rc:1449
+#: Merge.rc:1459
msgid "Last 10 lines do not contain string..."
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_LAST_LINE_CONTAINS
-#: Merge.rc:1450
+#: Merge.rc:1460
msgid "Last line contains string..."
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_LAST_LINE_NOT_CONTAINS
-#: Merge.rc:1451
+#: Merge.rc:1461
msgid "Last line does not contain string..."
msgstr ""
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1453
+#: Merge.rc:1463
msgid "&Line Count"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_LT_10
-#: Merge.rc:1455
+#: Merge.rc:1465
msgid "Less than 10"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_GE_10
-#: Merge.rc:1456
+#: Merge.rc:1466
msgid "10 or more"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_LT_100
-#: Merge.rc:1457
+#: Merge.rc:1467
msgid "Less than 100"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_GE_100
-#: Merge.rc:1458
+#: Merge.rc:1468
msgid "100 or more"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_LT_1000
-#: Merge.rc:1459
+#: Merge.rc:1469
msgid "Less than 1000"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_GE_1000
-#: Merge.rc:1460
+#: Merge.rc:1470
msgid "1000 or more"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_LT_10000
-#: Merge.rc:1461
+#: Merge.rc:1471
msgid "Less than 10000"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_GE_10000
-#: Merge.rc:1462
+#: Merge.rc:1472
msgid "10000 or more"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_LT_100000
-#: Merge.rc:1463
+#: Merge.rc:1473
msgid "Less than 100000"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_GE_100000
-#: Merge.rc:1464
+#: Merge.rc:1474
msgid "100000 or more"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_PROPS
-#: Merge.rc:1467 Merge.rc:1594 Merge.rc:1761 Merge.rc:1778
+#: Merge.rc:1477 Merge.rc:1604 Merge.rc:1771 Merge.rc:1788
msgid "Additional &Properties..."
msgstr ""
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1469
+#: Merge.rc:1479
msgid "Add F&older Condition"
msgstr ""
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1513
+#: Merge.rc:1523
msgid "&Files"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FOLDER_FILES_EQ_0
-#: Merge.rc:1515
+#: Merge.rc:1525
msgid "0 files"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FOLDER_FILES_GE_1
-#: Merge.rc:1516
+#: Merge.rc:1526
msgid "1 file or more"
msgstr ""
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1519
+#: Merge.rc:1529
msgid "&Items"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FOLDER_ITEMS_EQ_0
-#: Merge.rc:1521
+#: Merge.rc:1531
msgid "0 items"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FOLDER_ITEMS_GE_1
-#: Merge.rc:1522
+#: Merge.rc:1532
msgid "1 item or more"
msgstr ""
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1525
+#: Merge.rc:1535
msgid "&Total Size"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FOLDER_STATS_RECURSIVE
-#: Merge.rc:1542
+#: Merge.rc:1552
msgid "&Recursive"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONDITION_ANY
-#: Merge.rc:1544
+#: Merge.rc:1554
msgid "Target: &Any (Left/Middle/Right)"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONDITION_LEFT
-#: Merge.rc:1545
+#: Merge.rc:1555
msgid "Target: &Left"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONDITION_MIDDLE
-#: Merge.rc:1546
+#: Merge.rc:1556
msgid "Target: &Middle"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONDITION_RIGHT
-#: Merge.rc:1547
+#: Merge.rc:1557
msgid "Target: &Right"
msgstr ""
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1549
+#: Merge.rc:1559
msgid "Add &Difference Condition"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_PROP, ID_FILTERMENU_DIFF_PROP_EQUAL
-#: Merge.rc:1553 Merge.rc:1570 Merge.rc:1591 Merge.rc:1696 Merge.rc:1717
-#: Merge.rc:1742
+#: Merge.rc:1563 Merge.rc:1580 Merge.rc:1601 Merge.rc:1706 Merge.rc:1727
+#: Merge.rc:1752
msgid "Equal"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_PROP, ID_FILTERMENU_DIFF_PROP_NOT_EQUAL
-#: Merge.rc:1554 Merge.rc:1571 Merge.rc:1592 Merge.rc:1697 Merge.rc:1718
-#: Merge.rc:1743
+#: Merge.rc:1564 Merge.rc:1581 Merge.rc:1602 Merge.rc:1707 Merge.rc:1728
+#: Merge.rc:1753
msgid "Not Equal"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_PROP, ID_FILTERMENU_DIFF_PROP_LESS
-#: Merge.rc:1555 Merge.rc:1572 Merge.rc:1698 Merge.rc:1719 Merge.rc:1744
+#: Merge.rc:1565 Merge.rc:1582 Merge.rc:1708 Merge.rc:1729 Merge.rc:1754
msgid "Less Than"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_PROP, ID_FILTERMENU_DIFF_PROP_LESS_EQUAL
-#: Merge.rc:1556 Merge.rc:1573 Merge.rc:1699 Merge.rc:1720 Merge.rc:1745
+#: Merge.rc:1566 Merge.rc:1583 Merge.rc:1709 Merge.rc:1730 Merge.rc:1755
msgid "Less Than or Equal to"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_PROP, ID_FILTERMENU_DIFF_PROP_GREATER
-#: Merge.rc:1557 Merge.rc:1574 Merge.rc:1700 Merge.rc:1721 Merge.rc:1746
+#: Merge.rc:1567 Merge.rc:1584 Merge.rc:1710 Merge.rc:1731 Merge.rc:1756
msgid "Greater Than"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_PROP, ID_FILTERMENU_DIFF_PROP_GREATER_EQUAL
-#: Merge.rc:1558 Merge.rc:1575 Merge.rc:1701 Merge.rc:1722 Merge.rc:1747
+#: Merge.rc:1568 Merge.rc:1585 Merge.rc:1711 Merge.rc:1732 Merge.rc:1757
msgid "Greater Than or Equal to"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_SIZE, ID_FILTERMENU_DIFF_SIZE_LT_10B
-#: Merge.rc:1560 Merge.rc:1703
+#: Merge.rc:1570 Merge.rc:1713
msgid "Less than 10B"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_SIZE, ID_FILTERMENU_DIFF_SIZE_GE_10B
-#: Merge.rc:1561 Merge.rc:1704
+#: Merge.rc:1571 Merge.rc:1714
msgid "10B or more"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_SIZE, ID_FILTERMENU_DIFF_SIZE_LT_100B
-#: Merge.rc:1562 Merge.rc:1705
+#: Merge.rc:1572 Merge.rc:1715
msgid "Less than 100B"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_SIZE, ID_FILTERMENU_DIFF_SIZE_GE_100B
-#: Merge.rc:1563 Merge.rc:1706
+#: Merge.rc:1573 Merge.rc:1716
msgid "100B or more"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_LT_1SECOND
-#: Merge.rc:1577 Merge.rc:1724
+#: Merge.rc:1587 Merge.rc:1734
msgid "Less than 1 second"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_GE_1SECOND
-#: Merge.rc:1578 Merge.rc:1725
+#: Merge.rc:1588 Merge.rc:1735
msgid "1 second or more"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_LT_1MINUTE
-#: Merge.rc:1579 Merge.rc:1726
+#: Merge.rc:1589 Merge.rc:1736
msgid "Less than 1 minute"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_GE_1MINUTE
-#: Merge.rc:1580 Merge.rc:1727
+#: Merge.rc:1590 Merge.rc:1737
msgid "1 minute or more"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_LT_1HOUR
-#: Merge.rc:1581 Merge.rc:1728
+#: Merge.rc:1591 Merge.rc:1738
msgid "Less than 1 hour"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_GE_1HOUR
-#: Merge.rc:1582 Merge.rc:1729
+#: Merge.rc:1592 Merge.rc:1739
msgid "1 hour or more"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_LT_1DAY
-#: Merge.rc:1583 Merge.rc:1730
+#: Merge.rc:1593 Merge.rc:1740
msgid "Less than 1 day"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_GE_1DAY
-#: Merge.rc:1584 Merge.rc:1731
+#: Merge.rc:1594 Merge.rc:1741
msgid "1 day or more"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_LT_1WEEK
-#: Merge.rc:1585 Merge.rc:1732
+#: Merge.rc:1595 Merge.rc:1742
msgid "Less than 1 week"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_GE_1WEEK
-#: Merge.rc:1586 Merge.rc:1733
+#: Merge.rc:1596 Merge.rc:1743
msgid "1 week or more"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_CONDITION_DIFF_LEFT_RIGHT
-#: Merge.rc:1596
+#: Merge.rc:1606
msgid "Target: &Left and Right"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_CONDITION_DIFF_LEFT_MIDDLE
-#: Merge.rc:1597
+#: Merge.rc:1607
msgid "Target: Left and &Middle"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_CONDITION_DIFF_MIDDLE_RIGHT
-#: Merge.rc:1598
+#: Merge.rc:1608
msgid "Target: Middle and &Right"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_CONDITION_DIFF_ALL
-#: Merge.rc:1599
+#: Merge.rc:1609
msgid "Target: &All"
msgstr ""
#. IDR_POPUP_FILTERMENU_BINARY, ID_FILTERMENU_BINARY_ONLY
-#: Merge.rc:1620
+#: Merge.rc:1630
msgid "Binary files only"
msgstr ""
#. IDR_POPUP_FILTERMENU_BINARY, ID_FILTERMENU_TEXT_ONLY
-#: Merge.rc:1621
+#: Merge.rc:1631
msgid "Text files only"
msgstr ""
#. IDR_POPUP_ADDCMPMENU, ID_ADDCMPMENU_CLEAR
-#: Merge.rc:1755
+#: Merge.rc:1765
msgid "&Clear conditions"
msgstr ""
#. IDR_POPUP_ADDCMPMENU, ID_ADDCMPMENU_CMP_SIZE
-#: Merge.rc:1757
+#: Merge.rc:1767
msgid "Compare &Size"
msgstr ""
#. IDR_POPUP_ADDCMPMENU, ID_ADDCMPMENU_CMP_DATE
-#: Merge.rc:1758
+#: Merge.rc:1768
msgid "Compare &Date"
msgstr ""
#. IDR_POPUP_ADDCMPMENU, ID_ADDCMPMENU_CMP_ATTR
-#: Merge.rc:1759
+#: Merge.rc:1769
msgid "Compare &Attributes"
msgstr ""
#. IDR_POPUP_ADDCMPMENU, ID_ADDCMPMENU_CMP_CONTENTS
-#: Merge.rc:1760
+#: Merge.rc:1770
msgid "Compare C&ontents"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_CLEAR
-#: Merge.rc:1769
+#: Merge.rc:1779
msgid "&Clear Keys"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_NAME
-#: Merge.rc:1771
+#: Merge.rc:1781
msgid "&Name"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_BASENAME
-#: Merge.rc:1772
+#: Merge.rc:1782
msgid "&Base name (without extension)"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_NORMALIZED_NAME
-#: Merge.rc:1773
+#: Merge.rc:1783
msgid "Normalized &Unicode Name"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_RELPATH
-#: Merge.rc:1774
+#: Merge.rc:1784
msgid "&Relative Path"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_DATE
-#: Merge.rc:1776
+#: Merge.rc:1786
msgid "&Date"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_HASH_MD5
-#: Merge.rc:1777
+#: Merge.rc:1787
msgid "&Hash (MD5)"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_REPLACE
-#: Merge.rc:1780
+#: Merge.rc:1790
msgid "Insert &replace() Function"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_REGEXREPLACE
-#: Merge.rc:1781
+#: Merge.rc:1791
msgid "Insert rege&xReplace() Function"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU
-#: Merge.rc:1782
+#: Merge.rc:1792
msgid "Replace &Lists"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_CREATE_REPLACELIST
-#: Merge.rc:1784
+#: Merge.rc:1794
msgid "&Create String Replace List and Insert..."
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_CREATE_REGEXREPLACELIST
-#: Merge.rc:1785
+#: Merge.rc:1795
msgid "Create &Regex Replace List and Insert..."
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU
-#: Merge.rc:1787
+#: Merge.rc:1797
msgid "&String Replace Lists"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU
-#: Merge.rc:1791
+#: Merge.rc:1801
msgid "Re&gex Replace Lists"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_STRING_REPLACE_LISTS_FOLDER
-#: Merge.rc:1796
+#: Merge.rc:1806
msgid "Open String Replace Lists Folder..."
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_REGEX_REPLACE_LISTS_FOLDER
-#: Merge.rc:1797
+#: Merge.rc:1807
msgid "Open Regex Replace Lists Folder..."
msgstr ""
#. IDD_FILTERS_CONDITION, IDC_CONDITION_MATCHCASE
-#: Merge.rc:1799 Merge.rc:1995 Merge.rc:2014 Merge.rc:2042 Merge.rc:2585
+#: Merge.rc:1809 Merge.rc:2005 Merge.rc:2024 Merge.rc:2052 Merge.rc:2595
msgid "Match &case"
msgstr "Sama kirjainkoko"
#. IDR_POPUP_RENAMEMOVE_MENU
-#: Merge.rc:1801
+#: Merge.rc:1811
msgid "Text &Normalization"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_TOLOWER
-#: Merge.rc:1803
+#: Merge.rc:1813
msgid "&Lowercase"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_TOUPPER
-#: Merge.rc:1804
+#: Merge.rc:1814
msgid "&Uppercase"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_TOHALFWIDTH
-#: Merge.rc:1805
+#: Merge.rc:1815
msgid "&Half-width"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_TOFULLWIDTH
-#: Merge.rc:1806
+#: Merge.rc:1816
msgid "&Full-width"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU
-#: Merge.rc:1807
+#: Merge.rc:1817
msgid "&Chinese Conversion"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_TOSIMPLIFIEDCHINESE
-#: Merge.rc:1809
+#: Merge.rc:1819
msgid "&Simplified Chinese"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_TOTRADITIONALCHINESE
-#: Merge.rc:1810
+#: Merge.rc:1820
msgid "&Traditional Chinese"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU
-#: Merge.rc:1812
+#: Merge.rc:1822
msgid "&Japanese Conversion"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_TOHIRAGANA
-#: Merge.rc:1814
+#: Merge.rc:1824
msgid "&Hiragana"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_TOKATAKANA
-#: Merge.rc:1815
+#: Merge.rc:1825
msgid "&Katakana"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_NORMALIZEUNICODE
-#: Merge.rc:1817
+#: Merge.rc:1827
msgid "Normalize &Unicode"
msgstr ""
#. IDD_ABOUTBOX
-#: Merge.rc:1932
+#: Merge.rc:1942
msgid "About WinMerge"
msgstr "Tietoja WinMergestä"
#. IDD_ABOUTBOX, IDC_WWW
-#: Merge.rc:1936
+#: Merge.rc:1946
msgid "Visit the WinMerge Homepage!"
msgstr "Vieraile WinMergen kotisivulla!"
#. IDD_PLUGINS_EDITPLUGIN, IDOK
-#: Merge.rc:1938 Merge.rc:2080 Merge.rc:2431 Merge.rc:2455 Merge.rc:2469
-#: Merge.rc:2497 Merge.rc:2588 Merge.rc:2613 Merge.rc:2674 Merge.rc:2691
-#: Merge.rc:2703 Merge.rc:2867 Merge.rc:2927 Merge.rc:3062 Merge.rc:3104
-#: Merge.rc:3147 Merge.rc:3197
+#: Merge.rc:1948 Merge.rc:2090 Merge.rc:2441 Merge.rc:2465 Merge.rc:2479
+#: Merge.rc:2507 Merge.rc:2598 Merge.rc:2623 Merge.rc:2684 Merge.rc:2701
+#: Merge.rc:2713 Merge.rc:2877 Merge.rc:2937 Merge.rc:3072 Merge.rc:3114
+#: Merge.rc:3157 Merge.rc:3207
msgid "OK"
msgstr "OK"
#. IDD_ABOUTBOX, IDC_OPEN_CONTRIBUTORS
-#: Merge.rc:1939
+#: Merge.rc:1949
msgid "Contributors"
msgstr "Avustajat"
#. IDD_SELECT_FILES_OR_FOLDERS
-#: Merge.rc:1945 Merge.rc:3070
+#: Merge.rc:1955 Merge.rc:3080
msgid "Select Files or Folders"
msgstr "Valitse tiedostoja tai kansioita"
#. IDD_OPEN, IDC_FILES_DIRS_GROUP0
-#: Merge.rc:1949
+#: Merge.rc:1959
msgid "&1st File or Folder"
msgstr "&1. tiedosto tai kansio"
#. IDD_OPEN, IDC_PATH0_READONLY
-#: Merge.rc:1951
+#: Merge.rc:1961
msgid "Re&ad-only"
msgstr "Vain luku"
#. IDD_OPEN, IDC_SWAP01_STATIC
-#: Merge.rc:1953
+#: Merge.rc:1963
msgid "Swap 1st | 2nd"
msgstr "Vaihda 1. | toinen"
#. IDD_GENERATE_PATCH, IDC_DIFF_BROWSE_FILE1
-#: Merge.rc:1954 Merge.rc:2310 Merge.rc:2413
+#: Merge.rc:1964 Merge.rc:2320 Merge.rc:2423
msgid "&Browse..."
msgstr "Selaa..."
#. IDD_OPEN, IDC_FILES_DIRS_GROUP1
-#: Merge.rc:1955
+#: Merge.rc:1965
msgid "&2nd File or Folder"
msgstr "&2. tiedosto tai kansio"
#. IDD_OPEN, IDC_PATH1_READONLY
-#: Merge.rc:1957
+#: Merge.rc:1967
msgid "Rea&d-only"
msgstr "&Vain luku"
#. IDD_OPEN, IDC_SWAP12_STATIC
-#: Merge.rc:1959
+#: Merge.rc:1969
msgid "Swap 2nd | 3rd"
msgstr "Vaihda 2. | kolmas"
#. IDD_PROPPAGE_SYSTEM, IDC_FILTER_USER_BROWSE
-#: Merge.rc:1960 Merge.rc:2315
+#: Merge.rc:1970 Merge.rc:2325
msgid "B&rowse..."
msgstr "Selaa..."
#. IDD_OPEN, IDC_FILES_DIRS_GROUP2
-#: Merge.rc:1961
+#: Merge.rc:1971
msgid "&3rd File or Folder (Optional)"
msgstr "&3. tiedosto tai kansio (valinnainen)"
#. IDD_OPEN, IDC_PATH2_READONLY
-#: Merge.rc:1963
+#: Merge.rc:1973
msgid "Read-o&nly"
msgstr "Vai&n luku"
#. IDD_OPEN, IDC_SWAP02_STATIC
-#: Merge.rc:1965
+#: Merge.rc:1975
msgid "Swap 1st | 3rd"
msgstr "Vaihda 1. | kolmas"
#. IDD_PROPPAGE_BACKUPS, IDC_BACKUP_BROWSE
-#: Merge.rc:1966 Merge.rc:2685 Merge.rc:2883
+#: Merge.rc:1976 Merge.rc:2695 Merge.rc:2893
msgid "Browse..."
msgstr "Selaa..."
#. IDD_OPEN, IDC_FILES_DIRS_GROUP3
-#: Merge.rc:1968
+#: Merge.rc:1978
msgid " Folder: Filter"
msgstr " Kansio: Suodin"
#. IDD_OPEN, IDC_RECURS_CHECK
-#: Merge.rc:1971
+#: Merge.rc:1981
msgid "&Include subfolders"
msgstr "Sisällytä alihakemistot"
#. IDD_OPEN, IDC_FILES_DIRS_GROUP5
-#: Merge.rc:1972
+#: Merge.rc:1982
msgid " File: Prediffer Plugin"
msgstr ""
#. IDD_OPEN, IDC_FILES_DIRS_GROUP4
-#: Merge.rc:1976
+#: Merge.rc:1986
msgid " File: Unpacker Plugin"
msgstr " Tiedosto: Purkaja-lisäosa"
#. IDD_OPEN, IDC_SELECT_UNPACKER
-#: Merge.rc:1978
+#: Merge.rc:1988
msgid "Se&lect..."
msgstr "Va&litse..."
#. IDD_PLUGINS_EDITPLUGIN, IDCANCEL
-#: Merge.rc:1981 Merge.rc:2001 Merge.rc:2025 Merge.rc:2046 Merge.rc:2081
-#: Merge.rc:2432 Merge.rc:2456 Merge.rc:2470 Merge.rc:2498 Merge.rc:2551
-#: Merge.rc:2589 Merge.rc:2614 Merge.rc:2675 Merge.rc:2692 Merge.rc:2704
-#: Merge.rc:2868 Merge.rc:2928 Merge.rc:3087 Merge.rc:3105 Merge.rc:3148
-#: Merge.rc:3198
+#: Merge.rc:1991 Merge.rc:2011 Merge.rc:2035 Merge.rc:2056 Merge.rc:2091
+#: Merge.rc:2442 Merge.rc:2466 Merge.rc:2480 Merge.rc:2508 Merge.rc:2561
+#: Merge.rc:2599 Merge.rc:2624 Merge.rc:2685 Merge.rc:2702 Merge.rc:2714
+#: Merge.rc:2878 Merge.rc:2938 Merge.rc:3097 Merge.rc:3115 Merge.rc:3158
+#: Merge.rc:3208
msgid "Cancel"
msgstr "Peruuta"
#. IDD_OPEN, IDC_OPEN_STATUS
-#: Merge.rc:1982
+#: Merge.rc:1992
msgid "Status:"
msgstr "Tila:"
#. IDD_PLUGINS_LIST, ID_HELP
-#: Merge.rc:1983 Merge.rc:2082 Merge.rc:2929
+#: Merge.rc:1993 Merge.rc:2092 Merge.rc:2939
msgid "Help"
msgstr "Ohje"
#. IDD_OPEN, IDC_OPTIONS
-#: Merge.rc:1984
+#: Merge.rc:1994
msgid "&Options..."
msgstr "Asetukset..."
#. IDD_EDIT_FIND
-#: Merge.rc:1989
+#: Merge.rc:1999
msgid "Find"
msgstr "Etsi"
#. IDD_EDIT_MARKER, IDC_STATIC
-#: Merge.rc:1992 Merge.rc:2009 Merge.rc:2037
+#: Merge.rc:2002 Merge.rc:2019 Merge.rc:2047
msgid "Fi&nd what:"
msgstr "Etsittävä:"
#. IDD_EDIT_MARKER, IDC_EDIT_WHOLE_WORD
-#: Merge.rc:1994 Merge.rc:2013 Merge.rc:2041
+#: Merge.rc:2004 Merge.rc:2023 Merge.rc:2051
msgid "Match &whole word only"
msgstr "Vain &kokonaiset sanat"
#. IDD_EDIT_MARKER, IDC_EDIT_REGEXP
-#: Merge.rc:1996 Merge.rc:2015 Merge.rc:2043
+#: Merge.rc:2006 Merge.rc:2025 Merge.rc:2053
msgid "Regular &expression"
msgstr "Säännöllinen lauseke"
#. IDD_EDIT_FIND, IDC_FINDDLG_DONTWRAP
-#: Merge.rc:1997
+#: Merge.rc:2007
msgid "D&on't wrap end of file"
msgstr "Älä rivitä tiedoston loppua"
#. IDD_EDIT_FIND, IDC_FINDDLG_DONTCLOSE
-#: Merge.rc:1998
+#: Merge.rc:2008
msgid "&Don't close this dialog"
msgstr "&Älä sulje tätä valintaikkunaa"
#. IDD_EDIT_REPLACE, IDC_EDIT_SKIP
-#: Merge.rc:1999 Merge.rc:2021
+#: Merge.rc:2009 Merge.rc:2031
msgid "&Find Next"
msgstr "Etsi seuraava"
#. IDD_EDIT_FIND, IDC_EDIT_FINDPREV
-#: Merge.rc:2000
+#: Merge.rc:2010
msgid "Find &Prev"
msgstr "Etsi &edellinen"
#. IDD_EDIT_REPLACE
-#: Merge.rc:2006
+#: Merge.rc:2016
msgid "Replace"
msgstr "Korvaa"
#. IDD_EDIT_REPLACE, IDC_STATIC
-#: Merge.rc:2011
+#: Merge.rc:2021
msgid "Re&place with:"
msgstr "Korvaava:"
#. IDD_EDIT_REPLACE, IDC_EDIT_SCOPE_DONT_WRAP
-#: Merge.rc:2016
+#: Merge.rc:2026
msgid "&Don't wrap at end of file"
msgstr "Älä rivitä tiedoston loppua"
#. IDD_EDIT_REPLACE, IDC_STATIC
-#: Merge.rc:2018
+#: Merge.rc:2028
msgid "Replace in"
msgstr "Korvaa kohteessa"
#. IDD_EDIT_REPLACE, IDC_EDIT_SCOPE_WHOLE_FILE
-#: Merge.rc:2020
+#: Merge.rc:2030
msgid "Wh&ole file"
msgstr "Koko tiedosto"
#. IDD_EDIT_REPLACE, IDC_EDIT_FINDPREV
-#: Merge.rc:2022
+#: Merge.rc:2032
msgid "Find Pre&v"
msgstr "Etsi e&dellinen"
#. IDD_EDIT_REPLACE, IDC_EDIT_REPLACE
-#: Merge.rc:2023
+#: Merge.rc:2033
msgid "&Replace"
msgstr "Korvaa"
#. IDD_EDIT_REPLACE, IDC_EDIT_REPLACE_ALL
-#: Merge.rc:2024
+#: Merge.rc:2034
msgid "Replace &All"
msgstr "Korvaa kaikki"
#. IDS_OPTIONSPG_MARKERCOLORS
-#: Merge.rc:2030 Merge.rc:4209
+#: Merge.rc:2040 Merge.rc:4219
msgid "Markers"
msgstr "Merkitsimet"
#. IDD_EDIT_MARKER, IDC_EDIT_MARKERS_ENABLED
-#: Merge.rc:2033
+#: Merge.rc:2043
msgid "Enable &markers"
msgstr "Ota &merkitsemiset käyttöön"
#. IDD_FILTERS_LINEFILTERS, IDC_LFILTER_ADDBTN
-#: Merge.rc:2035 Merge.rc:2057
+#: Merge.rc:2045 Merge.rc:2067
msgid "New"
msgstr "Uusi"
#. IDD_EDIT_MARKER, IDC_STATIC
-#: Merge.rc:2039
+#: Merge.rc:2049
msgid "&Background color:"
msgstr "&Taustaväri:"
#. IDS_MESSAGEBOX_OK
-#: Merge.rc:2044 Merge.rc:2829 Merge.rc:3086 Merge.rc:4171
+#: Merge.rc:2054 Merge.rc:2839 Merge.rc:3096 Merge.rc:4181
msgid "&Ok"
msgstr "OK"
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:2045 Merge.rc:2525 Merge.rc:3199
+#: Merge.rc:2055 Merge.rc:2535 Merge.rc:3209
msgid "&Apply"
msgstr "Käytä"
#. IDD_FILTERS_LINEFILTERS
-#: Merge.rc:2051
+#: Merge.rc:2061
msgid "Line Filters"
msgstr "Rivisuodattimet"
#. IDD_FILTERS_LINEFILTERS, IDC_IGNOREREGEXP
-#: Merge.rc:2054
+#: Merge.rc:2064
msgid "Enable Line Filters"
msgstr "Käytä rivisuodattimia"
#. IDD_FILTERS_LINEFILTERS, IDC_STATIC
-#: Merge.rc:2055
+#: Merge.rc:2065
msgid "Regular Expressions (one per line):"
msgstr "Säännölliset lausekkeet (yksi rivillä):"
#. IDD_PLUGINS_LIST, IDC_PLUGIN_EDIT
-#: Merge.rc:2058 Merge.rc:2924
+#: Merge.rc:2068 Merge.rc:2934
msgid "Edit"
msgstr "Muokkaa"
#. IDD_PLUGINS_LIST, IDC_PLUGIN_REMOVE
-#: Merge.rc:2059 Merge.rc:2071 Merge.rc:2925
+#: Merge.rc:2069 Merge.rc:2081 Merge.rc:2935
msgid "Remove"
msgstr "Poista"
#. IDD_FILTERS_SUBSTITUTIONFILTERS
-#: Merge.rc:2064
+#: Merge.rc:2074
msgid "Substitution Filters"
msgstr ""
#. IDD_FILTERS_SUBSTITUTIONFILTERS, IDC_STATIC
-#: Merge.rc:2067
+#: Merge.rc:2077
msgid ""
"Changes to the listed pairs below will be "
"ignored or marked as insignificant. Patches are unaffected."
@@ -3146,546 +3157,546 @@ msgstr ""
"huomiotta tai merkitään merkityksettömiksi. Korjauksiin ne eivät vaikuta."
#. IDD_FILTERS_SUBSTITUTIONFILTERS, IDC_IGNORED_SUSBSTITUTIONS_ENABLED
-#: Merge.rc:2068
+#: Merge.rc:2078
msgid "Enable"
msgstr "Ota käyttöön"
#. IDD_PLUGINS_LIST, IDC_PLUGIN_ADD
-#: Merge.rc:2070 Merge.rc:2923
+#: Merge.rc:2080 Merge.rc:2933
msgid "Add"
msgstr "Lisää"
#. IDD_FILTERS_SUBSTITUTIONFILTERS, IDC_LFILTER_CLEARBTN
-#: Merge.rc:2072
+#: Merge.rc:2082
msgid "Clear"
msgstr "Tyhjennä"
#. IDD_PREFERENCES
-#: Merge.rc:2077
+#: Merge.rc:2087
msgid "Options"
msgstr "Asetukset"
#. IDD_PREFERENCES, IDC_TREEOPT_IMPORT
-#: Merge.rc:2086
+#: Merge.rc:2096
msgid "Import..."
msgstr "Tuo..."
#. IDD_PREFERENCES, IDC_TREEOPT_EXPORT
-#: Merge.rc:2087
+#: Merge.rc:2097
msgid "Export..."
msgstr "Vie..."
#. IDS_OPTIONSPG_GENCOMPARE
-#: Merge.rc:2092 Merge.rc:4199 Merge.rc:4202 Merge.rc:4219
+#: Merge.rc:2102 Merge.rc:4209 Merge.rc:4212 Merge.rc:4229
msgid "General"
msgstr "Yleinen"
#. IDD_PROPPAGE_GENERAL, IDC_SCROLL_CHECK
-#: Merge.rc:2095
+#: Merge.rc:2105
msgid "Automatically &scroll to first difference"
msgstr "Siirry automaattisesti ensimmäiseen eroavuuteen"
#. IDD_PROPPAGE_GENERAL, IDC_SCROLL_TO_FIRST_INLINE_DIFF_CHECK
-#: Merge.rc:2097
+#: Merge.rc:2107
msgid "Automatically s&croll to first inline difference"
msgstr "Rullaa automaattisesti en&simmäiseen rivin sisäiseen eroon"
#. IDD_PROPPAGE_GENERAL, IDC_STATIC
-#: Merge.rc:2099
+#: Merge.rc:2109
msgid "Cl&ose windows with 'Esc':"
msgstr "Sulje ikkuna 'Esc':llä:"
#. IDD_PROPPAGE_GENERAL, IDC_VERIFY_OPEN_PATHS
-#: Merge.rc:2101
+#: Merge.rc:2111
msgid "&Automatically verify paths in Open dialog"
msgstr "Tarkista polut automaattisesti Avaa-valintaikkunassa"
#. IDD_PROPPAGE_GENERAL, IDC_STATIC
-#: Merge.rc:2103
+#: Merge.rc:2113
msgid "Single instance mode:"
msgstr "Yhden instanssin tila:"
#. IDD_PROPPAGE_GENERAL, IDC_ASK_MULTIWINDOW_CLOSE
-#: Merge.rc:2105
+#: Merge.rc:2115
msgid "As&k when closing multiple windows"
msgstr "Kysy monikerta-ikkunoita suljettaessa"
#. IDD_PROPPAGE_GENERAL, IDC_PRESERVE_FILETIME
-#: Merge.rc:2107
+#: Merge.rc:2117
msgid "&Preserve file time in file compare"
msgstr "Säilytä tiedostoaika tiedostovertailussa"
#. IDD_PROPPAGE_GENERAL, IDC_STARTUP_FOLDER_SELECT
-#: Merge.rc:2109
+#: Merge.rc:2119
msgid "Show \"Select Files or Folders\" dialog on startup"
msgstr "Näytä \"Valitse tiedostot tai kansiot\"-valintaikkuna käynnistyksessä"
#. IDD_PROPPAGE_GENERAL, IDC_CLOSE_WITH_OK
-#: Merge.rc:2111
+#: Merge.rc:2121
msgid "Close \"Select Files or Folders\" dialog on clicking Compare button"
msgstr ""
#. IDD_PROPPAGE_GENERAL, IDC_STATIC
-#: Merge.rc:2113
+#: Merge.rc:2123
msgid "Op&en dialog Auto completion:"
msgstr ""
#. IDD_PROPPAGE_GENERAL, IDC_STATIC
-#: Merge.rc:2115
+#: Merge.rc:2125
msgid "Auto-&reload modified files:"
msgstr ""
#. IDD_PROPPAGE_GENERAL, IDC_STATIC
-#: Merge.rc:2117
+#: Merge.rc:2127
msgid "Language:"
msgstr "Kieli:"
#. IDD_PROPPAGE_COMPARE_WEBPAGE, IDC_COMPARE_DEFAULTS
-#: Merge.rc:2119 Merge.rc:2299 Merge.rc:2321 Merge.rc:2352 Merge.rc:2369
-#: Merge.rc:2386 Merge.rc:2394 Merge.rc:2430 Merge.rc:2454 Merge.rc:2633
-#: Merge.rc:2644 Merge.rc:2653 Merge.rc:2887 Merge.rc:2922 Merge.rc:2985
-#: Merge.rc:3010 Merge.rc:3024 Merge.rc:3038 Merge.rc:3054
+#: Merge.rc:2129 Merge.rc:2309 Merge.rc:2331 Merge.rc:2362 Merge.rc:2379
+#: Merge.rc:2396 Merge.rc:2404 Merge.rc:2440 Merge.rc:2464 Merge.rc:2643
+#: Merge.rc:2654 Merge.rc:2663 Merge.rc:2897 Merge.rc:2932 Merge.rc:2995
+#: Merge.rc:3020 Merge.rc:3034 Merge.rc:3048 Merge.rc:3064
msgid "Defaults"
msgstr "Oletukset"
#. IDS_OPTIONSPG_COLORS
-#: Merge.rc:2124 Merge.rc:2140 Merge.rc:2267 Merge.rc:2292 Merge.rc:4205
+#: Merge.rc:2134 Merge.rc:2150 Merge.rc:2277 Merge.rc:2302 Merge.rc:4215
msgid "Colors"
msgstr "Värit"
#. IDD_PROPPAGE_COLOR_SCHEMES, IDC_STATIC
-#: Merge.rc:2127
+#: Merge.rc:2137
msgid "Color &mode:"
msgstr ""
#. IDD_PROPPAGE_COLOR_SCHEMES, IDC_STATIC
-#: Merge.rc:2129
+#: Merge.rc:2139
msgid "&Light mode scheme:"
msgstr ""
#. IDD_PROPPAGE_COLOR_SCHEMES, IDC_STATIC
-#: Merge.rc:2131
+#: Merge.rc:2141
msgid "&Dark mode scheme:"
msgstr ""
#. IDD_PROPPAGE_COLOR_SCHEMES, IDC_STATIC
-#: Merge.rc:2133
+#: Merge.rc:2143
msgid "Your custom schemes"
msgstr ""
#. IDD_PROPPAGE_COLOR_SCHEMES, IDC_COLOR_SCHEME_SAVE
-#: Merge.rc:2134
+#: Merge.rc:2144
msgid "&Save current scheme..."
msgstr ""
#. IDD_PROPPAGE_COLOR_SCHEMES, IDC_COLOR_SCHEME_DELETE
-#: Merge.rc:2135
+#: Merge.rc:2145
msgid "Delete ¤t scheme..."
msgstr ""
#. IDD_PROPPAGE_COLORS_DIR, IDC_BACKGROUND_COLUMN_LABEL
-#: Merge.rc:2143 Merge.rc:2238 Merge.rc:2258 Merge.rc:2272
+#: Merge.rc:2153 Merge.rc:2248 Merge.rc:2268 Merge.rc:2282
msgid "Background"
msgstr "Tausta"
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2144
+#: Merge.rc:2154
msgid "Deleted"
msgstr "Poistettu"
#. IDS_OPTIONSPG_TEXTCOLORS
-#: Merge.rc:2145 Merge.rc:2207 Merge.rc:2239 Merge.rc:2273 Merge.rc:4207
+#: Merge.rc:2155 Merge.rc:2217 Merge.rc:2249 Merge.rc:2283 Merge.rc:4217
msgid "Text"
msgstr "Teksti"
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2146
+#: Merge.rc:2156
msgid "Difference:"
msgstr "Erilaisuus:"
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2151
+#: Merge.rc:2161
msgid "Selected Difference:"
msgstr "Valittu ero:"
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2156
+#: Merge.rc:2166
msgid "Ignored Difference:"
msgstr "Ohitettu ero:"
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2161
+#: Merge.rc:2171
msgid "Moved:"
msgstr "Siirretty:"
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2166
+#: Merge.rc:2176
msgid "Selected Moved:"
msgstr "Valittu siirretty:"
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2171
+#: Merge.rc:2181
msgid "Same As Next (3 panes):"
msgstr "Sama kuin seuraava (3 ruutua):"
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2176
+#: Merge.rc:2186
msgid "Same As Next (Selected):"
msgstr "Sama kuin seuraava (valittu):"
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2181
+#: Merge.rc:2191
msgid "Word Difference:"
msgstr "Sanaero:"
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2186
+#: Merge.rc:2196
msgid "Selected Word Diff:"
msgstr "Valittu sanaero:"
#. IDD_INPUTBOX
-#: Merge.rc:2195 Merge.rc:2230 Merge.rc:2251 Merge.rc:3099
+#: Merge.rc:2205 Merge.rc:2240 Merge.rc:2261 Merge.rc:3109
msgid "Dialog"
msgstr "Valintaikkuna"
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC
-#: Merge.rc:2198
+#: Merge.rc:2208
msgid "Keywords:"
msgstr "Avainsanat:"
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC
-#: Merge.rc:2199
+#: Merge.rc:2209
msgid "Function names:"
msgstr "Funktionimet:"
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC
-#: Merge.rc:2200
+#: Merge.rc:2210
msgid "Comments:"
msgstr "Kommentit:"
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC
-#: Merge.rc:2201
+#: Merge.rc:2211
msgid "Numbers:"
msgstr "Numerot:"
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC
-#: Merge.rc:2202
+#: Merge.rc:2212
msgid "Operators:"
msgstr "Operaattorit:"
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC
-#: Merge.rc:2203
+#: Merge.rc:2213
msgid "Strings:"
msgstr "Merkkijonot:"
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC
-#: Merge.rc:2204
+#: Merge.rc:2214
msgid "Preprocessor:"
msgstr "Esikäsittelijä:"
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC
-#: Merge.rc:2205
+#: Merge.rc:2215
msgid "User 1:"
msgstr "Käyttäjä 1:"
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC
-#: Merge.rc:2206
+#: Merge.rc:2216
msgid "User 2:"
msgstr "Käyttäjä 2:"
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_SCOLOR_USER2_BOLD
-#: Merge.rc:2209 Merge.rc:2211 Merge.rc:2213 Merge.rc:2215 Merge.rc:2217
-#: Merge.rc:2219 Merge.rc:2221 Merge.rc:2223 Merge.rc:2225
+#: Merge.rc:2219 Merge.rc:2221 Merge.rc:2223 Merge.rc:2225 Merge.rc:2227
+#: Merge.rc:2229 Merge.rc:2231 Merge.rc:2233 Merge.rc:2235
msgid "Bold"
msgstr "Lihavoitu"
#. IDD_PROPPAGE_COLORS_TEXT, IDC_DEFAULT_STANDARD_COLORS
-#: Merge.rc:2233
+#: Merge.rc:2243
msgid "&Use customized text colors"
msgstr "Käytä mukautettuja tekstivärejä"
#. IDD_PROPPAGE_COLORS_TEXT, IDC_WHITESPACE_COLOR_LABEL
-#: Merge.rc:2235
+#: Merge.rc:2245
msgid "Whitespace:"
msgstr "Välilyönti:"
#. IDD_PROPPAGE_COLORS_TEXT, IDC_TEXT_COLOR_LABEL
-#: Merge.rc:2236
+#: Merge.rc:2246
msgid "Regular text:"
msgstr "Normaali teksti:"
#. IDD_PROPPAGE_COLORS_TEXT, IDC_SELECTION_COLOR_LABEL
-#: Merge.rc:2237
+#: Merge.rc:2247
msgid "Selection:"
msgstr "Valinta:"
#. IDD_PROPPAGE_COLORS_DIR, IDC_STATIC
-#: Merge.rc:2245 Merge.rc:2286
+#: Merge.rc:2255 Merge.rc:2296
msgid "Margin:"
msgstr "Marginaali:"
#. IDD_PROPPAGE_COLORS_MARKER, IDC_MARKER0_COLOR_LABEL
-#: Merge.rc:2254
+#: Merge.rc:2264
msgid "Search Marker:"
msgstr "Hakumerkki:"
#. IDD_PROPPAGE_COLORS_MARKER, IDC_MARKER1_COLOR_LABEL
-#: Merge.rc:2255
+#: Merge.rc:2265
msgid "User Defined Marker 1:"
msgstr "Käyttäjän määrittämä merkintä1:"
#. IDD_PROPPAGE_COLORS_MARKER, IDC_MARKER2_COLOR_LABEL
-#: Merge.rc:2256
+#: Merge.rc:2266
msgid "User Defined Marker 2:"
msgstr "Käyttäjän määrittämä merkintä2:"
#. IDD_PROPPAGE_COLORS_MARKER, IDC_MARKER3_COLOR_LABEL
-#: Merge.rc:2257
+#: Merge.rc:2267
msgid "User Defined Marker 3:"
msgstr "Käyttäjän määrittämä merkintä3:"
#. IDD_PROPPAGE_COLORS_DIR, IDC_USE_DIR_COMPARE_COLORS
-#: Merge.rc:2270
+#: Merge.rc:2280
msgid "&Use folder compare colors"
msgstr "Käytä kansiovertailun värejä"
#. IDD_PROPPAGE_COLORS_DIR, IDC_STATIC
-#: Merge.rc:2274
+#: Merge.rc:2284
msgid "Items equal:"
msgstr "Yhtä suuret kohteet:"
#. IDD_PROPPAGE_COLORS_DIR, IDC_STATIC
-#: Merge.rc:2277
+#: Merge.rc:2287
msgid "Items different:"
msgstr "Eroavat kohteet:"
#. IDD_PROPPAGE_COLORS_DIR, IDC_STATIC
-#: Merge.rc:2280
+#: Merge.rc:2290
msgid "Items missing:"
msgstr "Kaikki kohteet, joita ei ole:"
#. IDD_PROPPAGE_COLORS_DIR, IDC_STATIC
-#: Merge.rc:2283
+#: Merge.rc:2293
msgid "Items filtered:"
msgstr "Suodatetut kohteet:"
#. IDD_PROPPAGE_COLORS_SYSTEM, IDC_SYSCOLOR_HOOK_ENABLED
-#: Merge.rc:2295
+#: Merge.rc:2305
msgid "&Use custom system colors"
msgstr ""
#. IDS_PRPCAT_SYSTEM
-#: Merge.rc:2304 Merge.rc:4211 Merge.rc:4212 Merge.rc:4657
+#: Merge.rc:2314 Merge.rc:4221 Merge.rc:4222 Merge.rc:4667
msgid "System"
msgstr "Järjestelmä"
#. IDD_PROPPAGE_SYSTEM, IDC_USE_RECYCLE_BIN
-#: Merge.rc:2307
+#: Merge.rc:2317
msgid "&Use Recycle Bin"
msgstr "Siirrä poistetut tiedostot roskakoriin"
#. IDD_PROPPAGE_SYSTEM, IDC_STATIC
-#: Merge.rc:2308
+#: Merge.rc:2318
msgid "&External editor:"
msgstr "Ulkoinen editori:"
#. IDD_PROPPAGE_SYSTEM, IDC_STATIC
-#: Merge.rc:2311
+#: Merge.rc:2321
msgid "&Store user data in:"
msgstr ""
#. IDD_PROPPAGE_SYSTEM, IDC_STATIC
-#: Merge.rc:2313
+#: Merge.rc:2323
msgid "&Filter folder:"
msgstr "Suodatinkansio:"
#. IDD_PROPPAGE_SYSTEM, IDC_STATIC
-#: Merge.rc:2316
+#: Merge.rc:2326
msgid "Temporary files folder"
msgstr "Kansio tilapäisille tiedostoille"
#. IDD_PROPPAGE_SYSTEM, IDC_TMPFOLDER_SYSTEM
-#: Merge.rc:2317
+#: Merge.rc:2327
msgid "S&ystem temp folder"
msgstr "Järjestelmän tilapäiskansio"
#. IDD_PROPPAGE_SYSTEM, IDC_STATIC
-#: Merge.rc:2318
+#: Merge.rc:2328
msgid "C&ustom folder:"
msgstr "Mukautettu kansio:"
#. IDD_GENERATE_PATCH, IDC_DIFF_BROWSE_FILE2
-#: Merge.rc:2320 Merge.rc:2416
+#: Merge.rc:2330 Merge.rc:2426
msgid "Br&owse..."
msgstr "Selaa..."
#. IDS_OPTIONSPG_COMPARE
-#: Merge.rc:2326 Merge.rc:4200
+#: Merge.rc:2336 Merge.rc:4210
msgid "Compare"
msgstr "Vertaa"
#. IDD_PROPPAGE_COMPARE, IDC_STATIC
-#: Merge.rc:2329
+#: Merge.rc:2339
msgid "Whitespaces"
msgstr "Välilyönti"
#. IDD_PROPPAGE_COMPARE, IDC_WHITESPACE
-#: Merge.rc:2330
+#: Merge.rc:2340
msgid "&Compare"
msgstr "Vertaa"
#. IDD_PROPPAGE_COMPARE, IDC_WHITE_CHANGE
-#: Merge.rc:2331
+#: Merge.rc:2341
msgid "&Ignore change"
msgstr "Hylkää muutos"
#. IDD_PROPPAGE_COMPARE, IDC_ALL_WHITE
-#: Merge.rc:2332
+#: Merge.rc:2342
msgid "I&gnore all"
msgstr "Hylkää kaikki"
#. IDD_PROPPAGE_COMPARE, IDC_IGNBLANKS_CHECK
-#: Merge.rc:2333
+#: Merge.rc:2343
msgid "Ignore blan&k lines"
msgstr "Ohita tyhjät rivit"
#. IDD_PROPPAGE_COMPARE, IDC_IGNCASE_CHECK
-#: Merge.rc:2334
+#: Merge.rc:2344
msgid "Ignore &case"
msgstr "Ohita kirjainkoko"
#. IDD_PROPPAGE_COMPARE, IDC_EOL_SENSITIVE
-#: Merge.rc:2335
+#: Merge.rc:2345
msgid "Igno&re EOL differences (Windows/Unix/Mac)"
msgstr ""
#. IDD_PROPPAGE_COMPARE, IDC_IGNORE_NUMBERS
-#: Merge.rc:2337
+#: Merge.rc:2347
msgid "Ignore num&bers"
msgstr "Jätä nume&rot huomiotta"
#. IDD_PROPPAGE_COMPARE, IDC_CP_SENSITIVE
-#: Merge.rc:2338
+#: Merge.rc:2348
msgid "Ignore codepage &differences"
msgstr "Ohita koodisivuerot"
#. IDD_PROPPAGE_COMPARE, IDC_FILTERCOMMENTS_CHECK
-#: Merge.rc:2339
+#: Merge.rc:2349
msgid "Ignore c&omment differences"
msgstr "Jätä k&ommenttien erot huomiotta"
#. IDD_PROPPAGE_COMPARE, IDC_IGNEOFEOL_CHECK
-#: Merge.rc:2341
+#: Merge.rc:2351
msgid "Ignore &missing trailing EOL"
msgstr ""
#. IDD_PROPPAGE_COMPARE, IDC_IGNLBRKS_CHECK
-#: Merge.rc:2343
+#: Merge.rc:2353
msgid "Ignore line &breaks (treat as spaces)"
msgstr ""
#. IDD_PROPPAGE_COMPARE, IDC_MOVED_BLOCKS
-#: Merge.rc:2345
+#: Merge.rc:2355
msgid "E&nable moved block detection"
msgstr "Ota siirretyn lohkon tunnistus käyttöön"
#. IDD_PROPPAGE_COMPARE, IDC_ALIGN_SIMILAR_LINES
-#: Merge.rc:2346
+#: Merge.rc:2356
msgid "Align &similar lines"
msgstr ""
#. IDD_PROPPAGE_COMPARE, IDC_STATIC
-#: Merge.rc:2347
+#: Merge.rc:2357
msgid "Diff &algorithm:"
msgstr "Ero&algoritmi:"
#. IDD_PROPPAGE_COMPARE, IDC_INDENT_HEURISTIC
-#: Merge.rc:2349
+#: Merge.rc:2359
msgid "Enable indent &heuristic"
msgstr "Ota käyttöön &heuristinen sisennys"
#. IDD_PROPPAGE_COMPARE, IDC_COMPLETELY_BLANK_OUT_IGNORED_DIFFERENCES
-#: Merge.rc:2350
+#: Merge.rc:2360
msgid "Completely unhighlight the ignored differences"
msgstr ""
#. IDS_OPTIONSPG_EDITOR
-#: Merge.rc:2357 Merge.rc:4201
+#: Merge.rc:2367 Merge.rc:4211
msgid "Editor"
msgstr "Muokkain"
#. IDD_PROPPAGE_EDITOR, IDC_HILITE_CHECK
-#: Merge.rc:2360
+#: Merge.rc:2370
msgid "&Highlight syntax"
msgstr "Korosta syntaksi"
#. IDD_PROPPAGE_EDITOR, IDC_MIXED_EOL
-#: Merge.rc:2361
+#: Merge.rc:2371
msgid "&Preserve original EOL"
msgstr "Säilytä alkuperäiset EOL merkit"
#. IDD_PROPPAGE_EDITOR, IDC_STATIC
-#: Merge.rc:2362
+#: Merge.rc:2372
msgid "Tabs"
msgstr "Välilehdet"
#. IDD_PROPPAGE_EDITOR, IDC_STATIC
-#: Merge.rc:2363
+#: Merge.rc:2373
msgid "&Tab size:"
msgstr "Välilehden koko:"
#. IDD_PROPPAGE_EDITOR, IDC_PROP_INSERT_TABS
-#: Merge.rc:2365
+#: Merge.rc:2375
msgid "&Insert tabs"
msgstr "Lisää välilehtiä"
#. IDD_PROPPAGE_EDITOR, IDC_PROP_INSERT_SPACES
-#: Merge.rc:2366
+#: Merge.rc:2376
msgid "Insert &spaces"
msgstr "Lisää välilyöntejä"
#. IDD_PROPPAGE_EDITOR, IDC_STATIC
-#: Merge.rc:2367
+#: Merge.rc:2377
msgid "&Rendering mode:"
msgstr "&Hahmonnustila:"
#. IDD_PROPPAGE_EDITOR_COMPAREMERGE, IDC_AUTOMRESCAN_CHECK
-#: Merge.rc:2376
+#: Merge.rc:2386
msgid "&Automatic rescan"
msgstr "Automaattinen uusi haku"
#. IDD_PROPPAGE_EDITOR_COMPAREMERGE, IDC_STATIC
-#: Merge.rc:2377
+#: Merge.rc:2387
msgid "Copy &granularity for selected differences:"
msgstr ""
#. IDD_PROPPAGE_EDITOR_COMPAREMERGE, IDC_LINE_COLORING_GROUP
-#: Merge.rc:2379
+#: Merge.rc:2389
msgid "Line Difference Coloring"
msgstr "Rivierojen väritys"
#. IDD_PROPPAGE_EDITOR_COMPAREMERGE, IDC_VIEW_LINE_DIFFERENCES
-#: Merge.rc:2380
+#: Merge.rc:2390
msgid "View line differences"
msgstr "Näytä rivin erot"
#. IDD_PROPPAGE_EDITOR_COMPAREMERGE, IDC_EDITOR_CHARLEVEL
-#: Merge.rc:2381
+#: Merge.rc:2391
msgid "&Character-level"
msgstr "Merkkitaso"
#. IDD_PROPPAGE_EDITOR_COMPAREMERGE, IDC_EDITOR_WORDLEVEL
-#: Merge.rc:2382
+#: Merge.rc:2392
msgid "&Word-level:"
msgstr "&Sanataso:"
#. IDD_PROPPAGE_EDITOR_COMPAREMERGE, IDC_STATIC
-#: Merge.rc:2384
+#: Merge.rc:2394
msgid "W&ord break characters:"
msgstr "Sanakatk&on merkit:"
#. IDD_PROPPAGE_MESSAGEBOXES, IDC_STATIC
-#: Merge.rc:2401
+#: Merge.rc:2411
msgid ""
"Some messages can be hidden by the user. Press Reset to "
"make all messages visible again."
@@ -3694,1176 +3705,1176 @@ msgstr ""
"tehdäksesi kaikki viestiruudut uudelleen näkyviksi."
#. IDD_SELECT_FILES_OR_FOLDERS, IDC_RESET
-#: Merge.rc:2402 Merge.rc:3085
+#: Merge.rc:2412 Merge.rc:3095
msgid "Reset"
msgstr "Palauta"
#. IDD_GENERATE_PATCH
-#: Merge.rc:2408
+#: Merge.rc:2418
msgid "Patch Generator"
msgstr "Korjausgeneraattori"
#. IDD_GENERATE_PATCH, IDC_STATIC
-#: Merge.rc:2411
+#: Merge.rc:2421
msgid "File&1:"
msgstr "Tiedosto1:"
#. IDD_GENERATE_PATCH, IDC_STATIC
-#: Merge.rc:2414
+#: Merge.rc:2424
msgid "File&2:"
msgstr "Tiedosto2:"
#. IDD_GENERATE_PATCH, IDC_DIFF_SWAPFILES
-#: Merge.rc:2417
+#: Merge.rc:2427
msgid "&Swap"
msgstr "Vaihda"
#. IDD_DIRCMP_REPORT, IDC_REPORT_COPYCLIPBOARD
-#: Merge.rc:2418 Merge.rc:2690
+#: Merge.rc:2428 Merge.rc:2700
msgid "&Copy to clipboard"
msgstr "Kopioi leikepöydälle"
#. IDD_GENERATE_PATCH, IDC_DIFF_APPENDFILE
-#: Merge.rc:2419
+#: Merge.rc:2429
msgid "&Append to existing file"
msgstr "Lisää olem&assa olevaan tiedostoon"
#. IDD_GENERATE_PATCH, IDC_STATIC
-#: Merge.rc:2420
+#: Merge.rc:2430
msgid "&Result:"
msgstr "Tulokset:"
#. IDD_GENERATE_PATCH, IDC_DIFF_BROWSE_RESULT
-#: Merge.rc:2422
+#: Merge.rc:2432
msgid "Bro&wse..."
msgstr "Selaa..."
#. IDD_GENERATE_PATCH, IDC_STATIC
-#: Merge.rc:2423
+#: Merge.rc:2433
msgid "&Format"
msgstr "Formaatti"
#. IDD_GENERATE_PATCH, IDC_STATIC
-#: Merge.rc:2424
+#: Merge.rc:2434
msgid "St&yle:"
msgstr "Ty&yli:"
#. IDD_GENERATE_PATCH, IDC_STATIC
-#: Merge.rc:2426
+#: Merge.rc:2436
msgid "&Context:"
msgstr "Konteksti:"
#. IDD_GENERATE_PATCH, IDC_DIFF_INCLCMDLINE
-#: Merge.rc:2428
+#: Merge.rc:2438
msgid "Inclu&de command line"
msgstr "Sisällytä komentorivi"
#. IDD_GENERATE_PATCH, IDC_DIFF_OPENTOEDITOR
-#: Merge.rc:2429
+#: Merge.rc:2439
msgid "Open in e&xternal editor"
msgstr "Avaa ulkoiseen editoriin"
#. IDD_DIRCOLS
-#: Merge.rc:2446
+#: Merge.rc:2456
msgid "Display Columns"
msgstr "Näytä sarakkeet"
#. IDD_DIRCOLS, IDC_UP
-#: Merge.rc:2450
+#: Merge.rc:2460
msgid "Move &Up"
msgstr "Siirrä ylös"
#. IDD_DIRCOLS, IDC_DOWN
-#: Merge.rc:2451
+#: Merge.rc:2461
msgid "Move &Down"
msgstr "Siirrä alas"
#. IDD_DIRCOLS, IDC_COLDLG_ADDITIONAL_PROPERTIES
-#: Merge.rc:2453
+#: Merge.rc:2463
msgid "&Additional Properties"
msgstr "&Lisäominaisuudet"
#. IDD_DIRADDITIONALPROPS
-#: Merge.rc:2461
+#: Merge.rc:2471
msgid "Additional Properties"
msgstr "Lisäominaisuudet"
#. IDD_PLUGINS_SELECTPLUGIN
-#: Merge.rc:2475
+#: Merge.rc:2485
msgid "Select Plugin"
msgstr "Valitse laajennus (Plugin)"
#. IDD_PLUGINS_EDITPLUGIN, IDC_STATIC
-#: Merge.rc:2478 Merge.rc:3115
+#: Merge.rc:2488 Merge.rc:3125
msgid "Plugin &name:"
msgstr "Laajennuksen &nimi:"
#. IDD_PLUGINS_SELECTPLUGIN, IDC_STATIC
-#: Merge.rc:2480
+#: Merge.rc:2490
msgid "&Target files:"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN, IDC_STATIC
-#: Merge.rc:2482 Merge.rc:3117
+#: Merge.rc:2492 Merge.rc:3127
msgid "Extensions list:"
msgstr "Päätelista:"
#. IDD_PLUGINS_EDITPLUGIN, IDC_STATIC
-#: Merge.rc:2484 Merge.rc:3119
+#: Merge.rc:2494 Merge.rc:3129
msgid "Description:"
msgstr "Kuvaus:"
#. IDD_PLUGINS_EDITPLUGIN, IDC_STATIC
-#: Merge.rc:2486 Merge.rc:3121
+#: Merge.rc:2496 Merge.rc:3131
msgid "Default arguments:"
msgstr "Oletusargumentit:"
#. IDD_PLUGINS_SELECTPLUGIN, IDC_PLUGIN_ALLOW_ALL
-#: Merge.rc:2488
+#: Merge.rc:2498
msgid "Display all plugins (Ignore extension)"
msgstr ""
#. IDD_PLUGINS_SELECTPLUGIN, IDC_PLUGIN_OPEN_IN_SAME_FRAME_TYPE
-#: Merge.rc:2490
+#: Merge.rc:2500
msgid "&Open files in same window type after unpacking"
msgstr ""
"Avaa tied&ostot samassa ikkunatyypissä pakkauksen purkamisen jälkeen"
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_PIPELINE_STATIC
-#: Merge.rc:2492 Merge.rc:3129
+#: Merge.rc:2502 Merge.rc:3139
msgid "&Plugin pipeline:"
msgstr "&Laajennusputki:"
#. IDD_PLUGINS_SELECTPLUGIN, IDC_PLUGIN_ALIAS
-#: Merge.rc:2495
+#: Merge.rc:2505
msgid "&Alias..."
msgstr ""
#. IDD_DIRCOMP_PROGRESS, IDC_COMPARISON_STOP
-#: Merge.rc:2505
+#: Merge.rc:2515
msgid "Stop"
msgstr "Pysäytä"
#. IDD_DIRCOMP_PROGRESS, IDC_COMPARISON_PAUSE
-#: Merge.rc:2506
+#: Merge.rc:2516
msgid "Pause"
msgstr "Tauko"
#. IDD_DIRCOMP_PROGRESS, IDC_COMPARISON_CONTINUE
-#: Merge.rc:2507
+#: Merge.rc:2517
msgid "Continue"
msgstr "Jatka"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC
-#: Merge.rc:2509 Merge.rc:2973
+#: Merge.rc:2519 Merge.rc:2983
msgid "C&PU cores to use:"
msgstr ""
#. IDD_DIRCOMP_PROGRESS, IDC_STATIC
-#: Merge.rc:2510
+#: Merge.rc:2520
msgid "Items total:"
msgstr "Kohteita yhteensä:"
#. IDD_DIRCOMP_PROGRESS, IDC_STATIC
-#: Merge.rc:2511
+#: Merge.rc:2521
msgid "Items compared:"
msgstr "Verratut kohteet:"
#. IDS_PREVIEWBAR_CLOSE
-#: Merge.rc:2526 Merge.rc:2846 Merge.rc:5328
+#: Merge.rc:2536 Merge.rc:2856 Merge.rc:5339
msgid "&Close"
msgstr "Sulje"
#. IDD_WMGOTO
-#: Merge.rc:2537
+#: Merge.rc:2547
msgid "Go to"
msgstr "Siirry >"
#. IDD_WMGOTO, IDC_STATIC
-#: Merge.rc:2540
+#: Merge.rc:2550
msgid "G&o to:"
msgstr "Siirry:"
#. IDD_WMGOTO, IDC_STATIC
-#: Merge.rc:2543
+#: Merge.rc:2553
msgid "File"
msgstr "Tiedosto"
#. IDD_WMGOTO, IDC_STATIC
-#: Merge.rc:2547
+#: Merge.rc:2557
msgid "Go to what"
msgstr "Siirry mihin"
#. IDD_WMGOTO, IDC_WMGOTO_TOLINE
-#: Merge.rc:2548
+#: Merge.rc:2558
msgid "Li&ne"
msgstr "Rivi"
#. IDD_WMGOTO, IDC_WMGOTO_TODIFF
-#: Merge.rc:2549
+#: Merge.rc:2559
msgid "&Difference"
msgstr "Erilaisuus"
#. IDD_WMGOTO, IDOK
-#: Merge.rc:2550
+#: Merge.rc:2560
msgid "&Go to"
msgstr "Siirry kohteeseen"
#. IDS_PROJECT_ITEM_FILE_FILTER
-#: Merge.rc:2556 Merge.rc:4321
+#: Merge.rc:2566 Merge.rc:4331
msgid "File Filters"
msgstr "Tiedostosuodattimet"
#. IDD_FILTERS_FILEFILTERS, IDC_STATIC
-#: Merge.rc:2559
+#: Merge.rc:2569
msgid "&Mask / Filter Expression"
msgstr ""
#. IDD_FILTERS_FILEFILTERS, IDC_STATIC
-#: Merge.rc:2562
+#: Merge.rc:2572
msgid "Preset &Filters"
msgstr ""
#. IDD_FILTERS_FILEFILTERS, IDC_FILTERFILE_TEST_BTN
-#: Merge.rc:2564
+#: Merge.rc:2574
msgid "Test..."
msgstr "Testi..."
#. IDD_FILTERS_FILEFILTERS, IDC_FILTERFILE_INSTALL
-#: Merge.rc:2565
+#: Merge.rc:2575
msgid "Install..."
msgstr "Asenna..."
#. IDD_FILTERS_FILEFILTERS, IDC_FILTERFILE_NEWBTN
-#: Merge.rc:2566
+#: Merge.rc:2576
msgid "New..."
msgstr "Uusi..."
#. IDD_FILTERS_FILEFILTERS, IDC_FILTERFILE_EDITBTN
-#: Merge.rc:2567
+#: Merge.rc:2577
msgid "Edit..."
msgstr "Muokkaa..."
#. IDD_FILTERS_FILEFILTERS, IDC_FILTERFILE_DELETEBTN
-#: Merge.rc:2568
+#: Merge.rc:2578
msgid "Delete..."
msgstr "Poista..."
#. IDD_FILTERS_CONDITION
-#: Merge.rc:2573
+#: Merge.rc:2583
msgid "Filter Condition"
msgstr ""
#. IDD_FILTERS_CONDITION, IDC_STATIC
-#: Merge.rc:2576
+#: Merge.rc:2586
msgid "&Left-hand side:"
msgstr ""
#. IDD_FILTERS_CONDITION, IDC_STATIC
-#: Merge.rc:2578
+#: Merge.rc:2588
msgid "&Operator:"
msgstr ""
#. IDD_FILTERS_CONDITION, IDC_STATIC
-#: Merge.rc:2580
+#: Merge.rc:2590
msgid "&Right-hand side:"
msgstr ""
#. IDD_FILTERS_CONDITION, IDC_STATIC
-#: Merge.rc:2586
+#: Merge.rc:2596
msgid "Expression:"
msgstr ""
#. IDD_COMPARISON_RESULT_FILTER
-#: Merge.rc:2595
+#: Merge.rc:2605
msgid "Filter by Comparison Result"
msgstr ""
#. IDD_COMPARISON_RESULT_FILTER, IDC_RADIO_INCLUDE
-#: Merge.rc:2598
+#: Merge.rc:2608
msgid "&Include"
msgstr ""
#. IDD_COMPARISON_RESULT_FILTER, IDC_RADIO_EXCLUDE
-#: Merge.rc:2599
+#: Merge.rc:2609
msgid "&Exclude"
msgstr ""
#. IDD_COMPARISON_RESULT_FILTER, IDC_STATIC
-#: Merge.rc:2600
+#: Merge.rc:2610
msgid "Comparison Results"
msgstr ""
#. IDS_IDENTICAL
-#: Merge.rc:2601 Merge.rc:2733 Merge.rc:2794 Merge.rc:4698
+#: Merge.rc:2611 Merge.rc:2743 Merge.rc:2804 Merge.rc:4708
msgid "Identical"
msgstr "Samanlainen"
#. IDS_DIFFERENT
-#: Merge.rc:2602 Merge.rc:2714 Merge.rc:2755 Merge.rc:4708
+#: Merge.rc:2612 Merge.rc:2724 Merge.rc:2765 Merge.rc:4718
msgid "Different"
msgstr "Poikkeava"
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_LEFT_ONLY
-#: Merge.rc:2603
+#: Merge.rc:2613
msgid "Left only"
msgstr ""
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_RIGHT_ONLY
-#: Merge.rc:2604
+#: Merge.rc:2614
msgid "Right only"
msgstr ""
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_SKIPPED
-#: Merge.rc:2605
+#: Merge.rc:2615
msgid "Skipped"
msgstr ""
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_MIDDLE_ONLY
-#: Merge.rc:2606
+#: Merge.rc:2616
msgid "Middle only"
msgstr ""
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_LEFT_ONLY_DIFFERENT
-#: Merge.rc:2607
+#: Merge.rc:2617
msgid "Left only (different)"
msgstr ""
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_MIDDLE_ONLY_DIFFERENT
-#: Merge.rc:2608
+#: Merge.rc:2618
msgid "Middle only (different)"
msgstr ""
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_RIGHT_ONLY_DIFFERENT
-#: Merge.rc:2609
+#: Merge.rc:2619
msgid "Right only (different)"
msgstr ""
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_LEFT_ONLY_MISSING
-#: Merge.rc:2610
+#: Merge.rc:2620
msgid "Left only (missing)"
msgstr ""
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_MIDDLE_ONLY_MISSING
-#: Merge.rc:2611
+#: Merge.rc:2621
msgid "Middle only (missing)"
msgstr ""
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_RIGHT_ONLY_MISSING
-#: Merge.rc:2612
+#: Merge.rc:2622
msgid "Right only (missing)"
msgstr ""
#. IDS_OPTIONSPG_CODEPAGE
-#: Merge.rc:2619 Merge.rc:2811 Merge.rc:4213
+#: Merge.rc:2629 Merge.rc:2821 Merge.rc:4223
msgid "Codepage"
msgstr "Koodisivu"
#. IDD_PROPPAGE_CODEPAGE, IDC_STATIC
-#: Merge.rc:2622
+#: Merge.rc:2632
msgid "Default Codepage"
msgstr "Koodisivu (oletus)"
#. IDD_PROPPAGE_CODEPAGE, IDC_STATIC
-#: Merge.rc:2623
+#: Merge.rc:2633
msgid "Select the default codepage for non-Unicode files:"
msgstr "Valitse oletuskoodisivu ladattaessa muita kuin Unicode-tiedostoja:"
#. IDD_PROPPAGE_CODEPAGE, IDC_CP_SYSTEM
-#: Merge.rc:2624
+#: Merge.rc:2634
msgid "System codepage"
msgstr "Järjestelmän koodisivu"
#. IDD_PROPPAGE_CODEPAGE, IDC_CP_UI
-#: Merge.rc:2625
+#: Merge.rc:2635
msgid "According to WinMerge User Interface"
msgstr "WinMerge-käyttöliittymän mukaan"
#. IDD_PROPPAGE_CODEPAGE, IDC_CP_CUSTOM
-#: Merge.rc:2626
+#: Merge.rc:2636
msgid "Custom codepage:"
msgstr "Mukautettu koodisivu:"
#. IDD_PROPPAGE_CODEPAGE, IDC_DETECT_CODEPAGE
-#: Merge.rc:2628
+#: Merge.rc:2638
msgid "Detect codepage for: .html, .rc, .xml\nRestart required."
msgstr ""
#. IDD_PROPPAGE_CODEPAGE, IDC_DETECT_CODEPAGE2
-#: Merge.rc:2630
+#: Merge.rc:2640
msgid "Detect codepage for files with mlang.dll\nRestart required."
msgstr ""
#. IDS_OPTIONSPG_ARCHIVE
-#: Merge.rc:2638 Merge.rc:4214
+#: Merge.rc:2648 Merge.rc:4224
msgid "Archive Support"
msgstr "Arkistotuki"
#. IDD_PROPPAGE_ARCHIVE, IDC_ARCHIVE_ENABLE
-#: Merge.rc:2641
+#: Merge.rc:2651
msgid "&Enable archive file support"
msgstr "Käytä arkistotiedostojen tukea"
#. IDD_PROPPAGE_ARCHIVE, IDC_ARCHIVE_DETECTTYPE
-#: Merge.rc:2642
+#: Merge.rc:2652
msgid "&Detect archive type from file signature"
msgstr "Tunnista arkistotyyppi tiedoston allekirjoituksesta"
#. IDD_PROPPAGE_PROJECT, IDC_STATIC
-#: Merge.rc:2651
+#: Merge.rc:2661
msgid "Items saved to or restored from the project file:"
msgstr "Projektitiedostoon tallennetut tai siitä palautetut kohteet:"
#. IDD_SAVECLOSING
-#: Merge.rc:2658
+#: Merge.rc:2668
msgid "Save Modified Files?"
msgstr "Tallennetaanko muokatut tiedostot?"
#. IDD_SAVECLOSING, IDC_SAVECLOSING_LEFTFRAME
-#: Merge.rc:2661
+#: Merge.rc:2671
msgid "Left side file"
msgstr "Vasen tiedosto"
#. IDD_SAVECLOSING, IDC_SAVECLOSING_SAVELEFT
-#: Merge.rc:2663
+#: Merge.rc:2673
msgid "&Save changes"
msgstr "Tallenna muutokset"
#. IDD_SAVECLOSING, IDC_SAVECLOSING_DISCARDLEFT
-#: Merge.rc:2664
+#: Merge.rc:2674
msgid "&Discard changes"
msgstr "Hylkää muutokset"
#. IDD_SAVECLOSING, IDC_SAVECLOSING_MIDDLEFRAME
-#: Merge.rc:2665
+#: Merge.rc:2675
msgid "Middle side file"
msgstr "Keskimmäinen sivutiedosto"
#. IDD_SAVECLOSING, IDC_SAVECLOSING_SAVEMIDDLE
-#: Merge.rc:2667
+#: Merge.rc:2677
msgid "Sa&ve changes"
msgstr "&Tallenna muutokset"
#. IDD_SAVECLOSING, IDC_SAVECLOSING_DISCARDMIDDLE
-#: Merge.rc:2668
+#: Merge.rc:2678
msgid "Discard c&hanges"
msgstr "Hylkää &muutokset"
#. IDD_SAVECLOSING, IDC_SAVECLOSING_RIGHTFRAME
-#: Merge.rc:2669
+#: Merge.rc:2679
msgid "Right side file"
msgstr "Oikea tiedosto"
#. IDD_SAVECLOSING, IDC_SAVECLOSING_SAVERIGHT
-#: Merge.rc:2671
+#: Merge.rc:2681
msgid "S&ave changes"
msgstr "Tallenna muutokset"
#. IDD_SAVECLOSING, IDC_SAVECLOSING_DISCARDRIGHT
-#: Merge.rc:2672
+#: Merge.rc:2682
msgid "Dis&card changes"
msgstr "Hylkää muutokset"
#. IDD_SAVECLOSING, IDC_SAVECLOSING_DISCARDALL
-#: Merge.rc:2673
+#: Merge.rc:2683
msgid "Disca&rd All"
msgstr "Hylkää &kaikki"
#. IDD_DIRCMP_REPORT
-#: Merge.rc:2680
+#: Merge.rc:2690
msgid "Folder Compare Report"
msgstr "Kansiovertailun raportti"
#. IDD_DIRCMP_REPORT, IDC_STATIC
-#: Merge.rc:2683
+#: Merge.rc:2693
msgid "Report &file:"
msgstr "Raporttitiedosto:"
#. IDD_DIRCMP_REPORT, IDC_STATIC
-#: Merge.rc:2686
+#: Merge.rc:2696
msgid "&Style:"
msgstr "Tyyli:"
#. IDD_DIRCMP_REPORT, IDC_REPORT_INCLUDEFILECMPREPORT
-#: Merge.rc:2688
+#: Merge.rc:2698
msgid "&Include file compare report"
msgstr "S&isällytä tiedoston vertailuraportti"
#. IDD_FILTERS_FILEFILTERS_SHARED
-#: Merge.rc:2697
+#: Merge.rc:2707
msgid "Shared or Private Filter"
msgstr "Yhteinen tai yksityinen suodatin"
#. IDD_FILTERS_FILEFILTERS_SHARED, IDC_STATIC
-#: Merge.rc:2700
+#: Merge.rc:2710
msgid "What type of filter do you want?"
msgstr "Minkä tyyppisen suodattimen haluat luoda?"
#. IDD_FILTERS_FILEFILTERS_SHARED, IDC_SHARED
-#: Merge.rc:2701
+#: Merge.rc:2711
msgid "Shared Filter (for all users)"
msgstr "Yhteinen suodatin (kaikille tämän koneen käyttäjille)"
#. IDD_FILTERS_FILEFILTERS_SHARED, IDC_PRIVATE
-#: Merge.rc:2702
+#: Merge.rc:2712
msgid "Private Filter (current user only)"
msgstr "Yksityinen suodatin (vain nykyiselle käyttäjälle)"
#. IDD_COMPARE_STATISTICS3
-#: Merge.rc:2709 Merge.rc:2750
+#: Merge.rc:2719 Merge.rc:2760
msgid "Compare Statistics"
msgstr "Vertaa tilastoja"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2712 Merge.rc:2753
+#: Merge.rc:2722 Merge.rc:2763
msgid "Folders:"
msgstr "Kansiot:"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2713 Merge.rc:2754
+#: Merge.rc:2723 Merge.rc:2764
msgid "Files:"
msgstr "Tiedostot:"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2719 Merge.rc:2738 Merge.rc:2760 Merge.rc:2799
+#: Merge.rc:2729 Merge.rc:2748 Merge.rc:2770 Merge.rc:2809
msgid "Binary:"
msgstr "Binääri:"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2722 Merge.rc:2763
+#: Merge.rc:2732 Merge.rc:2773
msgid "Unique"
msgstr "Yksikäsitteinen"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2723 Merge.rc:2764
+#: Merge.rc:2733 Merge.rc:2774
msgid "Left:"
msgstr "Vasen:"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2728 Merge.rc:2774
+#: Merge.rc:2738 Merge.rc:2784
msgid "Right:"
msgstr "Oikea:"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2742 Merge.rc:2803
+#: Merge.rc:2752 Merge.rc:2813
msgid "Total:"
msgstr "Yhteensä:"
#. IDD_COMPARE_STATISTICS3, IDOK
-#: Merge.rc:2745 Merge.rc:2806
+#: Merge.rc:2755 Merge.rc:2816
msgid "Close"
msgstr "Sulje"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2769
+#: Merge.rc:2779
msgid "Middle:"
msgstr "Keskimmäinen:"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2779
+#: Merge.rc:2789
msgid "Missing Left:"
msgstr "Puuttuva vasen:"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2784
+#: Merge.rc:2794
msgid "Missing Middle:"
msgstr "Puuttuva keskimmäinen:"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2789
+#: Merge.rc:2799
msgid "Missing Right:"
msgstr "Puuttuva oikea:"
#. IDD_LOAD_SAVE_CODEPAGE, IDC_AFFECTS_GROUP
-#: Merge.rc:2814
+#: Merge.rc:2824
msgid "Affects"
msgstr "Vaikutukset"
#. IDD_LOAD_SAVE_CODEPAGE, IDC_RIGHT_FILES_LABEL
-#: Merge.rc:2816 Merge.rc:2818 Merge.rc:2820
+#: Merge.rc:2826 Merge.rc:2828 Merge.rc:2830
msgid "(Affects)"
msgstr "(Vaikutukset)"
#. IDD_LOAD_SAVE_CODEPAGE, IDC_LOADING_GROUP
-#: Merge.rc:2821
+#: Merge.rc:2831
msgid "Select Codepage for"
msgstr "Valitse koodisivu"
#. IDD_LOAD_SAVE_CODEPAGE, IDC_LOAD_FILES_LABEL
-#: Merge.rc:2822
+#: Merge.rc:2832
msgid "&File Loading:"
msgstr "Tiedoston lataus:"
#. IDD_LOAD_SAVE_CODEPAGE, IDC_SAVE_FILES_LABEL
-#: Merge.rc:2824
+#: Merge.rc:2834
msgid "File &Saving:"
msgstr "Tiedoston tallennus:"
#. IDD_LOAD_SAVE_CODEPAGE, IDC_LOAD_SAVE_SAME_CODEPAGE
-#: Merge.rc:2827
+#: Merge.rc:2837
msgid "&Use same codepage for both"
msgstr "Käytä samaa koodisivua molemmille"
#. IDS_MESSAGEBOX_CANCEL
-#: Merge.rc:2830 Merge.rc:4172
+#: Merge.rc:2840 Merge.rc:4182
msgid "&Cancel"
msgstr "Peruuta"
#. IDD_FILTERS_FILEFILTERS_TEST
-#: Merge.rc:2835
+#: Merge.rc:2845
msgid "Test Filter"
msgstr "Testaa suodin"
#. IDD_FILTERS_FILEFILTERS_TEST, IDC_HEADER
-#: Merge.rc:2838
+#: Merge.rc:2848
msgid "Testing filter:"
msgstr "Testataan suodinta:"
#. IDD_FILTERS_FILEFILTERS_TEST, IDC_PROMPT_LABEL
-#: Merge.rc:2840
+#: Merge.rc:2850
msgid "&Enter text to test:"
msgstr "Anna testiteksti:"
#. IDD_FILTERS_FILEFILTERS_TEST, IDC_IS_DIRECTORY
-#: Merge.rc:2842
+#: Merge.rc:2852
msgid "&Folder Name"
msgstr "Kansionimi"
#. IDD_FILTERS_FILEFILTERS_TEST, IDC_STATIC
-#: Merge.rc:2843
+#: Merge.rc:2853
msgid "Result:"
msgstr "Tulos:"
#. IDD_FILTERS_FILEFILTERS_TEST, IDC_TEST_BTN
-#: Merge.rc:2845
+#: Merge.rc:2855
msgid "&Test"
msgstr "Testi"
#. IDS_OPTIONSPG_TABLECOMPARE
-#: Merge.rc:2851 Merge.rc:2990 Merge.rc:4228
+#: Merge.rc:2861 Merge.rc:3000 Merge.rc:4238
msgid "Table"
msgstr "Taulukko"
#. IDD_OPEN_TABLE, IDC_STATIC
-#: Merge.rc:2854
+#: Merge.rc:2864
msgid "File type"
msgstr "Tiedostotyyppi"
#. IDD_OPEN_TABLE, IDC_COMPARETABLE_CSV
-#: Merge.rc:2855
+#: Merge.rc:2865
msgid "&CSV"
msgstr "&CSV"
#. IDD_OPEN_TABLE, IDC_COMPARETABLE_TSV
-#: Merge.rc:2856
+#: Merge.rc:2866
msgid "&TSV"
msgstr "&TSV"
#. IDD_OPEN_TABLE, IDC_COMPARETABLE_DSV
-#: Merge.rc:2857
+#: Merge.rc:2867
msgid "Custom &Delimiter-Separated Values"
msgstr "Mukautetut ja &erottimella erotetut arvot"
#. IDD_PROPPAGE_COMPARE_TABLE, IDC_STATIC
-#: Merge.rc:2859 Merge.rc:2861 Merge.rc:2996 Merge.rc:3004
+#: Merge.rc:2869 Merge.rc:2871 Merge.rc:3006 Merge.rc:3014
msgid "D&elimiter character:"
msgstr "&Erotinmerkki:"
#. IDD_PROPPAGE_COMPARE_TABLE, IDC_COMPARETABLE_ALLOWNEWLINE
-#: Merge.rc:2863 Merge.rc:3006
+#: Merge.rc:2873 Merge.rc:3016
msgid "&Allow newlines in quotes"
msgstr "&Salli uudet rivit lainauksissa"
#. IDD_PROPPAGE_COMPARE_TABLE, IDC_STATIC
-#: Merge.rc:2865 Merge.rc:3008
+#: Merge.rc:2875 Merge.rc:3018
msgid "&Quote character:"
msgstr "&Lainausmerkki:"
#. IDS_OPTIONSPG_BACKUPS
-#: Merge.rc:2873 Merge.rc:4216
+#: Merge.rc:2883 Merge.rc:4226
msgid "Backup Files"
msgstr "Varmuuskopiot"
#. IDD_PROPPAGE_BACKUPS, IDC_STATIC
-#: Merge.rc:2876
+#: Merge.rc:2886
msgid "Create backup files for:"
msgstr "Luo varmuuskopiot:"
#. IDD_PROPPAGE_BACKUPS, IDC_BACKUP_FOLDERCMP
-#: Merge.rc:2877
+#: Merge.rc:2887
msgid "&Folder compare"
msgstr "Kansiovertailu"
#. IDD_PROPPAGE_BACKUPS, IDC_BACKUP_FILECMP
-#: Merge.rc:2878
+#: Merge.rc:2888
msgid "Fil&e compare"
msgstr "Tiedostovertailu"
#. IDD_PROPPAGE_BACKUPS, IDC_STATIC
-#: Merge.rc:2879
+#: Merge.rc:2889
msgid "Create backup files in:"
msgstr "Luo varmuuskopiotiedostot:"
#. IDD_PROPPAGE_BACKUPS, IDC_BACKUP_ORIGFOLD
-#: Merge.rc:2880
+#: Merge.rc:2890
msgid "&Original file's folder"
msgstr "Alkuperäiseen tiedostokansioon"
#. IDD_PROPPAGE_BACKUPS, IDC_BACKUP_GLOBALFOLD
-#: Merge.rc:2881
+#: Merge.rc:2891
msgid "&Global backup folder:"
msgstr "Yleiseen varmuuskopiokansioon:"
#. IDD_PROPPAGE_BACKUPS, IDC_STATIC
-#: Merge.rc:2884
+#: Merge.rc:2894
msgid "Backup filename:"
msgstr "Varmuuskopion nimi:"
#. IDD_PROPPAGE_BACKUPS, IDC_BACKUP_APPEND_BAK
-#: Merge.rc:2885
+#: Merge.rc:2895
msgid "&Append .bak extension"
msgstr "Liitä .b&ak pääte"
#. IDD_PROPPAGE_BACKUPS, IDC_BACKUP_APPEND_TIME
-#: Merge.rc:2886
+#: Merge.rc:2896
msgid "A&ppend timestamp"
msgstr "Liitä aikaleima"
#. IDS_CONFIRM_COPY_CAPTION
-#: Merge.rc:2892 Merge.rc:4565
+#: Merge.rc:2902 Merge.rc:4575
msgid "Confirm Copy"
msgstr "Vahvista kopionti"
#. IDD_CONFIRM_COPY, IDC_FLDCONFIRM_QUERY
-#: Merge.rc:2896
+#: Merge.rc:2906
msgid "Are you sure you want to copy XXX items?"
msgstr "Oletko varma, että haluat kopioida XXX kohdetta?"
#. IDD_CONFIRM_COPY, IDC_FLDCONFIRM_FROM_TEXT
-#: Merge.rc:2897
+#: Merge.rc:2907
msgid "From left"
msgstr "Vasemmalta"
#. IDD_CONFIRM_COPY, IDC_FLDCONFIRM_TO_TEXT
-#: Merge.rc:2899
+#: Merge.rc:2909
msgid "To right"
msgstr "Oikealle"
#. IDS_MESSAGEBOX_DONT_ASK_AGAIN
-#: Merge.rc:2901 Merge.rc:4191
+#: Merge.rc:2911 Merge.rc:4201
msgid "Don't ask this &question again."
msgstr "Älä tee tätä kysymystä vastaisuudessa."
#. IDD_CONFIRM_COPY, IDYES
-#: Merge.rc:2903
+#: Merge.rc:2913
msgid "Yes"
msgstr "Kyllä"
#. IDD_CONFIRM_COPY, IDNO
-#: Merge.rc:2904
+#: Merge.rc:2914
msgid "No"
msgstr "Ei"
#. IDS_PROJECT_ITEM_PLUGIN
-#: Merge.rc:2909 Merge.rc:4323
+#: Merge.rc:2919 Merge.rc:4333
msgid "Plugins"
msgstr "Lisäosat"
#. IDD_PLUGINS_LIST, IDC_PLUGINS_ENABLE
-#: Merge.rc:2912
+#: Merge.rc:2922
msgid "&Enable plugins"
msgstr "Ota laajennukset käyttöön"
#. IDD_PLUGINS_EDITPLUGIN, IDC_STATIC
-#: Merge.rc:2913 Merge.rc:3113
+#: Merge.rc:2923 Merge.rc:3123
msgid "Plugin &type:"
msgstr ""
#. IDD_PLUGINS_LIST, IDC_STATIC
-#: Merge.rc:2916
+#: Merge.rc:2926
msgid "File filters:"
msgstr "Tiedostosuodattimet:"
#. IDD_PLUGINS_LIST, IDC_STATIC
-#: Merge.rc:2918
+#: Merge.rc:2928
msgid "&Plugin arguments:"
msgstr "&Laajennuksen argumentit:"
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_AUTOMATIC
-#: Merge.rc:2920 Merge.rc:3134
+#: Merge.rc:2930 Merge.rc:3144
msgid "Enable &automatic unpacking/prediffing"
msgstr ""
"Ota laajennukselle käyttöön automaattinen pakkauksen purku/"
"ennakkotarkistus"
#. IDS_OPTIONSPG_SHELL
-#: Merge.rc:2934 Merge.rc:4217
+#: Merge.rc:2944 Merge.rc:4227
msgid "Shell Integration"
msgstr "Shell integraatio"
#. IDD_PROPPAGE_SHELL, IDC_STATIC
-#: Merge.rc:2937
+#: Merge.rc:2947
msgid "Explorer"
msgstr "Resurssienhallinta"
#. IDD_PROPPAGE_SHELL, IDC_EXPLORER_CONTEXT
-#: Merge.rc:2938
+#: Merge.rc:2948
msgid "&Add to context menu"
msgstr "Lisää pikavalikkoon"
#. IDD_PROPPAGE_SHELL, IDC_EXPLORER_ADVANCED
-#: Merge.rc:2939
+#: Merge.rc:2949
msgid "E&nable advanced menu"
msgstr "Ota käyttöön Lisäasetukset-valikko"
#. IDD_PROPPAGE_SHELL, IDC_EXPLORER_COMPARE_AS
-#: Merge.rc:2940
+#: Merge.rc:2950
msgid "Enable &Compare As menu"
msgstr ""
#. IDD_PROPPAGE_SHELL, IDC_REGISTER_SHELLEXTENSION
-#: Merge.rc:2941
+#: Merge.rc:2951
msgid "&Register Shell Extension"
msgstr "&Rekisteröi liittymälaajennus"
#. IDD_PROPPAGE_SHELL, IDC_UNREGISTER_SHELLEXTENSION
-#: Merge.rc:2942
+#: Merge.rc:2952
msgid "&Unregister Shell Extension"
msgstr "&Poista liittymälaajennuksen rekisteröinti"
#. IDD_PROPPAGE_SHELL, IDC_REGISTER_SHELLEXTENSION_PERUSER
-#: Merge.rc:2943
+#: Merge.rc:2953
msgid "Register Shell Extension for Current User &Only"
msgstr "Rekisteröi liittymälaajennus &vain nykyiselle käyttäjälle"
#. IDD_PROPPAGE_SHELL, IDC_UNREGISTER_SHELLEXTENSION_PERUSER
-#: Merge.rc:2944
+#: Merge.rc:2954
msgid "Unregister Shell Extension for Current User On&ly"
msgstr "Poista &liittymälaajennuksen rekisteröinti vain nykyiseltä käyttäjältä"
#. IDD_PROPPAGE_SHELL, IDC_REGISTER_WINMERGECONTEXTMENU
-#: Merge.rc:2945
+#: Merge.rc:2955
msgid "Register Shell Extension for &Windows 11"
msgstr ""
"Rekisteröi komentotulkin laajennus &Windows 11:lle tai uudemmalle "
"versiolle"
#. IDD_PROPPAGE_SHELL, IDC_UNREGISTER_WINMERGECONTEXTMENU
-#: Merge.rc:2946
+#: Merge.rc:2956
msgid "Unregister Shell Extension for W&indows 11"
msgstr ""
"Poista komentotulkin laajennuksen rekisteröinti &Windows 11:lle tai "
"uudemmalle versiolle"
#. IDD_PROPPAGE_SHELL, IDC_STATIC
-#: Merge.rc:2947
+#: Merge.rc:2957
msgid "Jump List"
msgstr ""
#. IDD_PROPPAGE_SHELL, IDC_CLEAR_ALL_RECENT_ITEMS
-#: Merge.rc:2949
+#: Merge.rc:2959
msgid "Clear all recent items"
msgstr ""
#. IDS_OPTIONSPG_FOLDERCOMPARE
-#: Merge.rc:2954 Merge.rc:4225
+#: Merge.rc:2964 Merge.rc:4235
msgctxt "Options dialog|Categories"
msgid "Folder"
msgstr "Kansio"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC
-#: Merge.rc:2957
+#: Merge.rc:2967
msgid "&Compare method:"
msgstr "Vertailumenetelmä:"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_COMPARE_STOPFIRST
-#: Merge.rc:2959
+#: Merge.rc:2969
msgid "S&top after first difference"
msgstr "Pysäytä ensimmäisen eron jälkeen"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_IGNORE_SMALLTIMEDIFF
-#: Merge.rc:2961
+#: Merge.rc:2971
msgid "Ign&ore time differences less than 3 seconds"
msgstr "Jätä alle 3 sekunnin aikaerot huomiotta"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC
-#: Merge.rc:2964
+#: Merge.rc:2974
msgid "Expand subfolders &after comparison:"
msgstr ""
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_COMPARE_WALKSUBDIRS
-#: Merge.rc:2966
+#: Merge.rc:2976
msgid "Include &unique subfolders contents"
msgstr ""
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_IGNORE_REPARSEPOINTS
-#: Merge.rc:2968
+#: Merge.rc:2978
msgid "Ignore &reparse points"
msgstr "Ohita &uudelleenjäsennyskohdat"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC
-#: Merge.rc:2969
+#: Merge.rc:2979
msgid "Switch to &quick compare when size exceeds (MB):"
msgstr "Kynnysarvo, jossa siirrytään &nopeaan vertailuun (MB):"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC
-#: Merge.rc:2971
+#: Merge.rc:2981
msgid "Switch to &binary compare when size exceeds (MB):"
msgstr "Kynnysarvo, jossa siirrytään &binaariseen vertailuun (MB):"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC
-#: Merge.rc:2975
+#: Merge.rc:2985
msgid "Additional comparison condi&tions:"
msgstr ""
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC
-#: Merge.rc:2978
+#: Merge.rc:2988
msgid "&Rename/move detection:"
msgstr ""
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC
-#: Merge.rc:2980
+#: Merge.rc:2990
msgid "Rename/move detection &keys:"
msgstr ""
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC
-#: Merge.rc:2983
+#: Merge.rc:2993
msgid "M&erge renames and moves:"
msgstr ""
#. IDD_PROPPAGE_COMPARE_TABLE, IDC_STATIC
-#: Merge.rc:2994 Merge.rc:2999 Merge.rc:3002
+#: Merge.rc:3004 Merge.rc:3009 Merge.rc:3012
msgid "File patterns:"
msgstr "Tiedostomallit:"
#. IDD_PROPPAGE_COMPARE_TABLE, IDC_STATIC
-#: Merge.rc:3001
+#: Merge.rc:3011
msgid "Custom Delimiter-Separated Values"
msgstr "Mukautetulla erottimella erotetut arvot"
#. IDS_OPTIONSPG_BINARYCOMPARE
-#: Merge.rc:3015 Merge.rc:4227
+#: Merge.rc:3025 Merge.rc:4237
msgctxt "Options dialog|Categories"
msgid "Binary"
msgstr "Binääri"
#. IDD_PROPPAGE_COMPARE_BINARY, IDC_STATIC
-#: Merge.rc:3018
+#: Merge.rc:3028
msgid "Binary file &patterns:"
msgstr "Binaaritiedosto&malli:"
#. IDD_PROPPAGE_COMPARE_BINARY, IDC_STATIC
-#: Merge.rc:3020
+#: Merge.rc:3030
msgid "Frhed settings"
msgstr "Frhed-asetukset"
#. IDD_PROPPAGE_COMPARE_BINARY, IDC_COMPAREBINARY_VIEWSETTINGS
-#: Merge.rc:3021
+#: Merge.rc:3031
msgid "View &Settings..."
msgstr "Näytä a&setukset..."
#. IDD_PROPPAGE_COMPARE_BINARY, IDC_COMPAREBINARY_BINARYMODE
-#: Merge.rc:3022
+#: Merge.rc:3032
msgid "&Binary Mode..."
msgstr "&Binääritila..."
#. IDD_PROPPAGE_COMPARE_BINARY, IDC_COMPAREBINARY_CHARACTERSET
-#: Merge.rc:3023
+#: Merge.rc:3033
msgid "&Character Set..."
msgstr "&Merkistö..."
#. IDS_PRPCAT_IMAGE
-#: Merge.rc:3029 Merge.rc:4226 Merge.rc:4665
+#: Merge.rc:3039 Merge.rc:4236 Merge.rc:4675
msgid "Image"
msgstr "Kuva"
#. IDD_PROPPAGE_COMPARE_IMAGE, IDC_STATIC
-#: Merge.rc:3032
+#: Merge.rc:3042
msgid "Image file &patterns:"
msgstr "Kuvatiedosto&mallit:"
#. IDD_PROPPAGE_COMPARE_IMAGE, IDC_ENABLE_IMGCMP_IN_DIRCMP
-#: Merge.rc:3034
+#: Merge.rc:3044
msgid "&Enable image compare in folder compare"
msgstr "Ota kuvi&en vertailu käyttöön kansiovertailussa"
#. IDD_PROPPAGE_COMPARE_IMAGE, IDC_STATIC
-#: Merge.rc:3036
+#: Merge.rc:3046
msgid "OCR result:"
msgstr "OCR-tulos:"
#. IDS_OPTIONSPG_WEBPAGECOMPARE
-#: Merge.rc:3043 Merge.rc:4229
+#: Merge.rc:3053 Merge.rc:4239
msgid "Webpage"
msgstr "Verkkosivu"
#. IDD_PROPPAGE_COMPARE_WEBPAGE, IDC_STATIC
-#: Merge.rc:3046
+#: Merge.rc:3056
msgid "URL pattern to &include (Regular expression):"
msgstr "Sisällytettävä URL-kuv&io (säännöllinen lauseke):"
#. IDD_PROPPAGE_COMPARE_WEBPAGE, IDC_STATIC
-#: Merge.rc:3048
+#: Merge.rc:3058
msgid "URL pattern to &exclude (Regular expression):"
msgstr "Poissulj&ettava URL-kuvio (säännöllinen lauseke):"
#. IDD_PROPPAGE_COMPARE_WEBPAGE, IDC_STATIC
-#: Merge.rc:3050
+#: Merge.rc:3060
msgid "&User data folder location:"
msgstr "&Käyttäjätietokansion sijainti:"
#. IDD_PROPPAGE_COMPARE_WEBPAGE, IDC_COMPAREWEBPAGE_USERDATAFOLDER_PERPANE
-#: Merge.rc:3052
+#: Merge.rc:3062
msgid "&Separate user data folders for each pane"
msgstr "&Erilliset käyttäjätietokansiot jokaiselle ruudulle"
#. IDD_ENCODINGERROR, IDC_HEXVIEW
-#: Merge.rc:3065
+#: Merge.rc:3075
msgid "&Hex View"
msgstr "&Hexanäkymä"
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3110
+#: Merge.rc:3120
msgid "Edit Plugin"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN, IDC_STATIC
-#: Merge.rc:3123
+#: Merge.rc:3133
msgid "&Category:"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_MENUCAPTION_STATIC
-#: Merge.rc:3125
+#: Merge.rc:3135
msgid "&Menu caption:"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_WINDOWTYPE_STATIC
-#: Merge.rc:3127
+#: Merge.rc:3137
msgid "&Window type:"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_UNPACKEDFILEEXTENSION_STATIC
-#: Merge.rc:3132
+#: Merge.rc:3142
msgid "&Unpacked file extension:"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_ARGUMENTSREQUIRED
-#: Merge.rc:3136
+#: Merge.rc:3146
msgid "&Require arguments"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_GENERATESCRIPT
-#: Merge.rc:3137
+#: Merge.rc:3147
msgid "&Generate editor script"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_COMMAND_LINE_STATIC
-#: Merge.rc:3140
+#: Merge.rc:3150
msgid "Command &line:"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_SCRIPT_FILEEXTENSION_STATIC
-#: Merge.rc:3143
+#: Merge.rc:3153
msgid "&Script file extension:"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_SCRIPT_BODY_STATIC
-#: Merge.rc:3145
+#: Merge.rc:3155
msgid "Script &body:"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3154
+#: Merge.rc:3164
msgid "Font"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3157
+#: Merge.rc:3167
msgid "&Font:"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3163
+#: Merge.rc:3173
msgid "Font st&yle:"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3169
+#: Merge.rc:3179
msgid "&Size:"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3175
+#: Merge.rc:3185
msgid "Effects"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3176
+#: Merge.rc:3186
msgid "Stri&keout"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3177
+#: Merge.rc:3187
msgid "&Underline"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3179
+#: Merge.rc:3189
msgid "&Color:"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3184
+#: Merge.rc:3194
msgid "Sample"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3185
+#: Merge.rc:3195
msgid "AaBbYyZz"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3189
+#: Merge.rc:3199
msgid "Sc&ript:"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN, IDC_MANAGE_LINK
-#: Merge.rc:3194
+#: Merge.rc:3204
msgid "Show more fonts"
msgstr ""
#. ID_INDICATOR_EXT
-#: Merge.rc:4118
+#: Merge.rc:4128
msgid "EXT"
msgstr "EXT"
#. ID_INDICATOR_CAPS
-#: Merge.rc:4119
+#: Merge.rc:4129
msgid "CAP"
msgstr "CAP"
#. ID_INDICATOR_NUM
-#: Merge.rc:4120
+#: Merge.rc:4130
msgid "NUM"
msgstr "NUM"
#. ID_INDICATOR_SCRL
-#: Merge.rc:4121
+#: Merge.rc:4131
msgid "SCRL"
msgstr "SCRL"
#. ID_INDICATOR_OVR
-#: Merge.rc:4122
+#: Merge.rc:4132
msgid "OVR"
msgstr "OVR"
#. ID_INDICATOR_REC
-#: Merge.rc:4123
+#: Merge.rc:4133
msgid "REC"
msgstr "REC"
#. ID_FILE_NEW
-#: Merge.rc:4129
+#: Merge.rc:4139
msgid ""
"\n"
"New Documents (Ctrl+N)"
@@ -4872,7 +4883,7 @@ msgstr ""
"Uudet asiakirjat (Ctrl+N)"
#. ID_FILE_OPEN
-#: Merge.rc:4130
+#: Merge.rc:4140
msgid ""
"\n"
"Open (Ctrl+O)"
@@ -4881,7 +4892,7 @@ msgstr ""
"Avaa (Ctrl+O)"
#. ID_FILE_SAVE
-#: Merge.rc:4131
+#: Merge.rc:4141
msgid ""
"\n"
"Save (Ctrl+S)"
@@ -4890,27 +4901,27 @@ msgstr ""
"Tallenna (CTRL+S)"
#. IDS_UNK_ERROR_READING_PROJECT
-#: Merge.rc:4137
+#: Merge.rc:4147
msgid "Unknown error opening project file."
msgstr "Tuntematon virhe avattaessa projektitiedostoa."
#. IDS_UNK_ERROR_SAVING_PROJECT
-#: Merge.rc:4138
+#: Merge.rc:4148
msgid "Unknown error saving project file."
msgstr "Tuntematon virhe yritettäessä tallentaa projektitiedosto."
#. IDS_PROJFILE_LOAD_SUCCESS
-#: Merge.rc:4143
+#: Merge.rc:4153
msgid "Project file loaded."
msgstr "Projektitiedoston lataus onnistui."
#. IDS_PROJFILE_SAVE_SUCCESS
-#: Merge.rc:4144
+#: Merge.rc:4154
msgid "Project file saved."
msgstr "Projektitiedoston tallennus onnistui."
#. ID_EDIT_UNDO
-#: Merge.rc:4150
+#: Merge.rc:4160
msgid ""
"\n"
"Undo (Ctrl+Z)"
@@ -4919,7 +4930,7 @@ msgstr ""
"Kumoa (Ctrl+Z)"
#. ID_EDIT_REDO
-#: Merge.rc:4151
+#: Merge.rc:4161
msgid ""
"\n"
"Redo (Ctrl+Y)"
@@ -4928,7 +4939,7 @@ msgstr ""
"Tee uudelleen (Ctrl+Y)"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:4158
+#: Merge.rc:4168
msgid ""
"\n"
"FileCompare\n"
@@ -4947,7 +4958,7 @@ msgstr ""
"WinMerge File Compare"
#. IDR_DIRDOCTYPE
-#: Merge.rc:4159
+#: Merge.rc:4169
msgid ""
"\n"
"FolderCompare\n"
@@ -4966,7 +4977,7 @@ msgstr ""
"WinMerge Folder Compare"
#. IDS_SPLASH_GPLTEXT
-#: Merge.rc:4165
+#: Merge.rc:4175
msgid "WinMerge comes with ABSOLUTELY NO WARRANTY. It is free software and can be redistributed under the conditions of the GNU General Public License - see the Help menu for details."
msgstr ""
"WinMergellä ei ole MITÄÄN TAKUUTA. Tämä on ilmainen ohjelmisto ja voit jakaa "
@@ -4974,157 +4985,157 @@ msgstr ""
"General Public License-osiossa."
#. IDS_MESSAGEBOX_ABORT
-#: Merge.rc:4173
+#: Merge.rc:4183
msgid "&Abort"
msgstr "Poistu"
#. IDS_MESSAGEBOX_RETRY
-#: Merge.rc:4174
+#: Merge.rc:4184
msgid "&Retry"
msgstr "Yritä uudelleen"
#. IDS_MESSAGEBOX_IGNORE
-#: Merge.rc:4175
+#: Merge.rc:4185
msgid "&Ignore"
msgstr "Ohita"
#. IDS_MESSAGEBOX_IGNOREALL
-#: Merge.rc:4176
+#: Merge.rc:4186
msgid "Ignore &all"
msgstr "Ohita kaikki"
#. IDS_MESSAGEBOX_YES
-#: Merge.rc:4177
+#: Merge.rc:4187
msgid "&Yes"
msgstr "Kyllä"
#. IDS_MESSAGEBOX_YES_TO_ALL
-#: Merge.rc:4183
+#: Merge.rc:4193
msgid "Yes to &all"
msgstr "Kyllä kaikkiin"
#. IDS_MESSAGEBOX_NO
-#: Merge.rc:4184
+#: Merge.rc:4194
msgid "&No"
msgstr "Ei"
#. IDS_MESSAGEBOX_NO_TO_ALL
-#: Merge.rc:4185
+#: Merge.rc:4195
msgid "No to a&ll"
msgstr "Ei kaikkiin"
#. IDS_MESSAGEBOX_CONTINUE
-#: Merge.rc:4186
+#: Merge.rc:4196
msgid "&Continue"
msgstr "Jatka"
#. IDS_MESSAGEBOX_SKIP
-#: Merge.rc:4187
+#: Merge.rc:4197
msgid "&Skip"
msgstr "Ohita"
#. IDS_MESSAGEBOX_SKIPALL
-#: Merge.rc:4188
+#: Merge.rc:4198
msgid "Skip &all"
msgstr "Ohita kaikki"
#. IDS_MESSAGEBOX_DONT_DISPLAY_AGAIN
-#: Merge.rc:4190
+#: Merge.rc:4200
msgid "Don't display this &message again."
msgstr "Älä näytä tätä ilmoitusta uudestaan."
-#: Merge.rc:4193
+#: Merge.rc:4203
msgid "To make this message box visible, press Reset on the Message Boxes page in Options."
msgstr ""
#. IDS_OPTIONSPG_EDITOR_COMPAREMERGE
-#: Merge.rc:4203
+#: Merge.rc:4213
msgid "Compare/Merge"
msgstr ""
#. IDS_OPTIONSPG_SYNTAXCOLORS
-#: Merge.rc:4204 Merge.rc:4208
+#: Merge.rc:4214 Merge.rc:4218
msgid "Syntax"
msgstr "Syntaksi"
#. IDS_OPTIONSPG_COLOR_SCHEMES
-#: Merge.rc:4206
+#: Merge.rc:4216
msgid "Color Schemes"
msgstr "Värimallit"
#. IDS_OPTIONSPG_DIRCOLORS
-#: Merge.rc:4210
+#: Merge.rc:4220
msgid "Folder Compare"
msgstr "Kansiovertailu"
#. IDS_OPTIONSPG_PROJECT
-#: Merge.rc:4215
+#: Merge.rc:4225
msgid "Project"
msgstr "Projekti"
#. IDS_COLHDR_NSDIFFS
-#: Merge.rc:4218 Merge.rc:4640
+#: Merge.rc:4228 Merge.rc:4650
msgid "Differences"
msgstr "Erilaisuudet"
#. IDS_OPTIONSPG_MESSAGEBOXES
-#: Merge.rc:4220
+#: Merge.rc:4230
msgid "Message Boxes"
msgstr "Viestiruudut"
#. IDS_TO
-#: Merge.rc:4235
+#: Merge.rc:4245
msgid "To:"
msgstr "Mihin:"
#. IDS_FROM_LEFT
-#: Merge.rc:4236
+#: Merge.rc:4246
msgid "From left:"
msgstr "Vasemmalta:"
#. IDS_TO_LEFT
-#: Merge.rc:4237
+#: Merge.rc:4247
msgid "To left:"
msgstr "Vasemmalle:"
#. IDS_FROM_RIGHT
-#: Merge.rc:4238
+#: Merge.rc:4248
msgid "From right:"
msgstr "Oikealta:"
#. IDS_TO_RIGHT
-#: Merge.rc:4239
+#: Merge.rc:4249
msgid "To right:"
msgstr "Oikealle:"
#. IDS_FROM_MIDDLE
-#: Merge.rc:4240
+#: Merge.rc:4250
msgid "From middle:"
msgstr "Keskeltä:"
#. IDS_TO_MIDDLE
-#: Merge.rc:4241
+#: Merge.rc:4251
msgid "To middle:"
msgstr "Keskelle:"
#. IDS_VERSION_FMT
-#: Merge.rc:4247
+#: Merge.rc:4257
#, c-format
msgid "Version %1"
msgstr "Versio %1"
#. IDS_OPTIONS_TITLE
-#: Merge.rc:4253
+#: Merge.rc:4263
#, c-format
msgid "Options (%1)"
msgstr "Asetukset (%1)"
#. IDS_MESSAGE_BOX_ARE_RESET
-#: Merge.rc:4254
+#: Merge.rc:4264
msgid "All message boxes are now displayed again."
msgstr "Kaikki ilmoitusruudut näkyvät nyt uudelleen."
-#: Merge.rc:4256
+#: Merge.rc:4266
#, c-format
msgid "Tab size value is out of range. Please use 1 - %1."
msgstr ""
@@ -5133,37 +5144,37 @@ msgstr ""
"Käytä arvoja 1 - %1."
#. IDS_PROJECT_OPEN
-#: Merge.rc:4262 Merge.rc:4318
+#: Merge.rc:4272 Merge.rc:4328
msgid "Open"
msgstr "Avaa"
#. IDS_PROGRAMFILES
-#: Merge.rc:4263
+#: Merge.rc:4273
msgid "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||"
msgstr "Ohjelmat|*.exe;*.bat;*.cmd|Kaikki tiedostot (*.*)|*.*||"
#. IDS_ALLFILES
-#: Merge.rc:4264
+#: Merge.rc:4274
msgid "All Files (*.*)|*.*||"
msgstr "Kaikki tiedostot (*.*)|*.*||"
#. IDS_PROJECTFILES
-#: Merge.rc:4265
+#: Merge.rc:4275
msgid "WinMerge Project Files (*.WinMerge)|*.WinMerge||"
msgstr "WinMerge projektitiedostot (*.WinMerge)|*.WinMerge||"
#. IDS_INIFILES
-#: Merge.rc:4267
+#: Merge.rc:4277
msgid "Options files (*.ini)|*.ini|All Files (*.*)|*.*||"
msgstr "Asetustiedostot (*.ini)|*.ini|Kaikki tiedostot (*.*)|*.*||"
#. IDS_REPLACELIST_FILES
-#: Merge.rc:4268
+#: Merge.rc:4278
msgid "Tab-Separated Values (*.tsv;*.txt)|*.tsv;*.txt|All Files (*.*)|*.*||"
msgstr ""
#. IDS_TEXT_REPORT_FILES
-#: Merge.rc:4274
+#: Merge.rc:4284
msgid ""
"Text Files (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|All Files (*.*)|"
"*.*||"
@@ -5172,127 +5183,127 @@ msgstr ""
"tiedostot (*.*)|*.*||"
#. IDS_HTML_REPORT_FILES
-#: Merge.rc:4275
+#: Merge.rc:4285
msgid "HTML Files (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||"
msgstr ""
"HTML-tiedostot (*.htm,*.html)|*.htm;*.html|Kaikki tiedostot (*.*)|*.*||"
#. IDS_XML_REPORT_FILES
-#: Merge.rc:4276
+#: Merge.rc:4286
msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||"
msgstr "XML-tiedostot (*.xml)|*.xml|Kaikki tiedostot (*.*)|*.*||"
#. IDS_EXPANDSUBDIRS_DONOTEXPAND
-#: Merge.rc:4294
+#: Merge.rc:4304
msgid "Do not expand"
msgstr ""
#. IDS_EXPANDSUBDIRS_ALL
-#: Merge.rc:4295
+#: Merge.rc:4305
msgid "Expand all subfolders"
msgstr ""
#. IDS_EXPANDSUBDIRS_DIFFERENT
-#: Merge.rc:4296
+#: Merge.rc:4306
msgid "Expand different subfolders"
msgstr ""
#. IDS_EXPANDSUBDIRS_IDENTICAL
-#: Merge.rc:4297
+#: Merge.rc:4307
msgid "Expand identical subfolders"
msgstr ""
#. IDS_SYNTAXTABLE_FILETYPE
-#: Merge.rc:4303
+#: Merge.rc:4313
msgid "File Type"
msgstr "Tiedostotyyppi"
#. IDS_COLHDR_EXTENSION
-#: Merge.rc:4304 Merge.rc:4597
+#: Merge.rc:4314 Merge.rc:4607
msgid "Extension"
msgstr "Pääte"
#. IDS_PRPCAT_MESSAGE
-#: Merge.rc:4310 Merge.rc:4669
+#: Merge.rc:4320 Merge.rc:4679
msgid "Message"
msgstr "Viesti"
#. IDS_MESSAGEBOX_ANSWER
-#: Merge.rc:4311
+#: Merge.rc:4321
msgid "Answer"
msgstr "Vastaus"
#. IDS_PROJECT_ITEM
-#: Merge.rc:4317
+#: Merge.rc:4327
msgid "Item"
msgstr "Kohde"
#. IDS_PROJECT_LOAD
-#: Merge.rc:4319
+#: Merge.rc:4329
msgid "Load"
msgstr "Lataa"
#. IDS_PROJECT_SAVE
-#: Merge.rc:4320
+#: Merge.rc:4330
msgid "Save"
msgstr "Tallenna"
#. IDS_PROJECT_ITEM_INCLUDE_SUBFOLDERS
-#: Merge.rc:4322
+#: Merge.rc:4332
msgid "Include Subfolders"
msgstr "Sisällytä alikansiot"
#. IDS_PROJECT_ITEM_COMPARE_OPTIONS
-#: Merge.rc:4324
+#: Merge.rc:4334
msgid "Compare Options"
msgstr "Vertailuasetukset"
#. IDS_PROJECT_ITEM_HIDDEN_ITEMS
-#: Merge.rc:4325
+#: Merge.rc:4335
msgid "Hidden Items"
msgstr "Piilotetut kohteet"
#. IDS_PLUGINSLIST_NAME
-#: Merge.rc:4331 Merge.rc:4956
+#: Merge.rc:4341 Merge.rc:4966
msgid "Name"
msgstr "Nimi"
#. IDS_FILTERFILE_PATHTITLE
-#: Merge.rc:4332
+#: Merge.rc:4342
msgid "Location"
msgstr "Sijainti"
#. IDS_FILTER_TITLE
-#: Merge.rc:4333
+#: Merge.rc:4343
msgid "Filters"
msgstr "Suotimet"
#. IDS_FILTER_PREFIX
-#: Merge.rc:4334
+#: Merge.rc:4344
msgid "[F] "
msgstr "[F] "
#. IDS_PLUGINSLIST_DESC
-#: Merge.rc:4335 Merge.rc:4958
+#: Merge.rc:4345 Merge.rc:4968
msgid "Description"
msgstr "Kuvaus"
#. IDS_FILEFILTER_SAVENEW
-#: Merge.rc:4336
+#: Merge.rc:4346
msgid "Select Filename for New Filter"
msgstr "Valitse tiedostonimi uudelle suodattimelle"
#. IDS_FILEFILTER_FILEMASK
-#: Merge.rc:4337
+#: Merge.rc:4347
msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||"
msgstr "Tiedostosuotimet (*.flt)|*.flt|Kaikki tiedostot (*.*)|*.*||"
-#: Merge.rc:4339
+#: Merge.rc:4349
#, c-format
msgid "Cannot find filter template!\n\nCopy %1 to WinMerge/Filters Folder:\n%2."
msgstr ""
-#: Merge.rc:4341
+#: Merge.rc:4351
#, c-format
msgid ""
"Cannot copy filter template:\n"
@@ -5305,7 +5316,7 @@ msgstr ""
"\n"
"Varmista, että kansio on olemassa ja kirjoitettavissa."
-#: Merge.rc:4343
+#: Merge.rc:4353
msgid ""
"User's filter folder is not defined!\n"
"\n"
@@ -5315,7 +5326,7 @@ msgstr ""
"\n"
"Valitse suodatinkansio valikosta Asetukset/Järjestelmä."
-#: Merge.rc:4345
+#: Merge.rc:4355
#, c-format
msgid ""
"Failed to delete filter:\n"
@@ -5329,11 +5340,11 @@ msgstr ""
"Ehkä tiedosto on kirjoitussuojattu?"
#. IDS_FILEFILTER_INSTALL
-#: Merge.rc:4346
+#: Merge.rc:4356
msgid "Locate Filter File to Install"
msgstr "Etsi asennettava suodatintiedosto"
-#: Merge.rc:4348
+#: Merge.rc:4358
msgid ""
"Installing filter file failed.\n"
"\n"
@@ -5344,19 +5355,19 @@ msgstr ""
"Uutta suodatintiedostoa ei voinut kopioida suodatinkansioon."
#. IDS_FILEFILTER_OVERWRITE
-#: Merge.rc:4349
+#: Merge.rc:4359
msgid "Filter file exists. Overwrite?"
msgstr ""
"Suodatintiedosto on jo olemassa. Haluatko korvata olemassa olevan "
"suodattimen?"
#. IDS_FILTERLINE_REGEXP
-#: Merge.rc:4355
+#: Merge.rc:4365
msgid "Regular expression"
msgstr "Säännöllinen lauseke"
#. IDS_FILTERCHANGED
-#: Merge.rc:4361
+#: Merge.rc:4371
msgid "Filters updated. Refresh all open folder compares?\n\nSelect 'No' to refresh later."
msgstr ""
"Suodattimet päivitettiin. Haluatko päivittää kaikki avoimet "
@@ -5366,219 +5377,219 @@ msgstr ""
"vertailut myöhemmin."
#. IDS_DIRECTORY_WINDOW_TITLE
-#: Merge.rc:4367
+#: Merge.rc:4377
msgid "Folder Comparison Results"
msgstr "Kansiovertailun tulokset"
#. IDS_FILE_COMPARISON_TITLE
-#: Merge.rc:4368
+#: Merge.rc:4378
msgid "File Comparison"
msgstr "Tiedostovertailu"
#. IDS_EMPTY_LEFT_FILE
-#: Merge.rc:4369
+#: Merge.rc:4379
msgid "Untitled Left"
msgstr "Nimetön vasen"
#. IDS_EMPTY_MIDDLE_FILE
-#: Merge.rc:4370
+#: Merge.rc:4380
msgid "Untitled Middle"
msgstr "Nimetön keskimmäinen"
#. IDS_EMPTY_RIGHT_FILE
-#: Merge.rc:4371
+#: Merge.rc:4381
msgid "Untitled Right"
msgstr "Nimetön oikea"
#. IDS_CONFLICT_BASE_FILE
-#: Merge.rc:4372
+#: Merge.rc:4382
msgid "Base File"
msgstr "Perustiedosto"
#. IDS_CONFLICT_THEIRS_FILE
-#: Merge.rc:4373
+#: Merge.rc:4383
msgid "Theirs File"
msgstr "Niiden tiedosto"
#. IDS_CONFLICT_MINE_FILE
-#: Merge.rc:4374
+#: Merge.rc:4384
msgid "Mine File"
msgstr "Minun tiedosto"
#. IDS_SELFCOMPARE_ORIGINAL_FILE
-#: Merge.rc:4375
+#: Merge.rc:4385
msgid "Original File"
msgstr "Alkuperäinen tiedosto"
#. IDS_LINE_STATUS_INFO_EOL
-#: Merge.rc:4381
+#: Merge.rc:4391
#, c-format
msgid "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s"
msgstr "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s"
#. IDS_EMPTY_LINE_STATUS_INFO
-#: Merge.rc:4382
+#: Merge.rc:4392
#, c-format
msgid "Line: %s"
msgstr "Rivi: %s"
#. IDS_LINE_STATUS_INFO
-#: Merge.rc:4383
+#: Merge.rc:4393
#, c-format
msgid "Ln: %s Col: %d/%d Ch: %d/%d"
msgstr "Ln: %s Col: %d/%d Ch: %d/%d"
#. IDS_LINE_STATUS_INFO_SEL
-#: Merge.rc:4384
+#: Merge.rc:4394
#, c-format
msgid " Sel: %d | %d"
msgstr " Val: %d | %d"
#. IDS_MERGEMODE_MERGING
-#: Merge.rc:4385
+#: Merge.rc:4395
msgid "Merge"
msgstr "Yhdistä"
#. IDS_DIFF_NUMBER_STATUS_FMT
-#: Merge.rc:4386
+#: Merge.rc:4396
#, c-format
msgid "Difference %1 of %2"
msgstr "Eroavuus %1 / %2"
#. IDS_NO_DIFF_SEL_FMT
-#: Merge.rc:4387
+#: Merge.rc:4397
#, c-format
msgid "%1 Differences Found"
msgstr "%1 eroa löytyi"
#. IDS_1_DIFF_FOUND
-#: Merge.rc:4388
+#: Merge.rc:4398
msgid "1 Difference Found"
msgstr "1 ero löytyi"
#. IDS_NO_ERR_SEL_FMT
-#: Merge.rc:4389
+#: Merge.rc:4399
#, c-format
msgid "%1 Errors Found"
msgstr ""
#. IDS_1_ERR_FOUND
-#: Merge.rc:4390
+#: Merge.rc:4400
msgid "1 Error Found"
msgstr ""
#. IDS_STATUSBAR_READONLY, Abbreviation from "Read Only"
-#: Merge.rc:4391
+#: Merge.rc:4401
msgid "RO"
msgstr "RO"
#. IDS_DIRVIEW_STATUS_FMT_FOCUS
-#: Merge.rc:4397
+#: Merge.rc:4407
#, c-format
msgid "Item %1 of %2"
msgstr "Kohta %1 / %2"
#. IDS_DIRVIEW_STATUS_FMT_NOFOCUS
-#: Merge.rc:4398
+#: Merge.rc:4408
#, c-format
msgid "Items: %1"
msgstr "Kohdat: %1"
#. IDS_DIRVIEW_STATUS_COMPARING
-#: Merge.rc:4399
+#: Merge.rc:4409
msgid "Comparing items..."
msgstr "Verrataan kohteita..."
#. IDS_ITEMS_PER_SEC
-#: Merge.rc:4400
+#: Merge.rc:4410
#, c-format
msgid "%.1f[items/sec]"
msgstr ""
#. IDS_ERROR_INCOMPARABLE
-#: Merge.rc:4406
+#: Merge.rc:4416
msgid "Select two existing folders/files to compare."
msgstr "Valitse vertailuun kaksi olemassa olevaa kansioita tai tiedostoa."
#. IDS_DIRSEL_TAG
-#: Merge.rc:4407
+#: Merge.rc:4417
msgid "Folder Selection"
msgstr "Kansion valinta"
#. IDS_OPEN_FILESDIRS
-#: Merge.rc:4408
+#: Merge.rc:4418
msgid "Select two (or three) folders/files to compare."
msgstr ""
"Valitse kaksi (tai kolme) kansiota tai kaksi (tai kolme) tiedostoa vertailua "
"varten."
#. IDS_OPEN_LEFTINVALID
-#: Merge.rc:4409
+#: Merge.rc:4419
msgid "Left (1st) path is invalid!"
msgstr "Vasen (1.) polku ei kelpaa!"
#. IDS_OPEN_MIDDLEINVALID
-#: Merge.rc:4410
+#: Merge.rc:4420
msgid "Middle (2nd) path is invalid!"
msgstr "Keskimmäinen (2.) polku ei kelpaa!"
#. IDS_OPEN_RIGHTINVALID2
-#: Merge.rc:4411
+#: Merge.rc:4421
msgid "Right (2nd) path is invalid!"
msgstr "Oikea (2.) polku ei kelpaa!"
#. IDS_OPEN_RIGHTINVALID3
-#: Merge.rc:4412
+#: Merge.rc:4422
msgid "Right (3rd) path is invalid!"
msgstr "Oikea (3.) polku ei kelpaa!"
#. IDS_OPEN_BOTHINVALID
-#: Merge.rc:4413
+#: Merge.rc:4423
msgid "Both paths are invalid!"
msgstr "Kummatkin polut ovat virheellisiä!"
-#: Merge.rc:4415
+#: Merge.rc:4425
msgid "Left (1st) and Middle (2nd) paths are invalid!"
msgstr "Vasen (1.) ja keskimmäinen (2.) polut eivät kelpaa!"
#. IDS_OPEN_LEFTRIGHTINVALID
-#: Merge.rc:4416
+#: Merge.rc:4426
msgid "Left (1st) and Right (3rd) paths are invalid!"
msgstr "Vasen (1.) ja oikea (3.) polut ovat virheellisiä!"
-#: Merge.rc:4418
+#: Merge.rc:4428
msgid "Middle (2nd) and Right (3rd) paths are invalid!"
msgstr "Keskimmäinen (2.) ja oikea (3.) polut ovat virheellisiä!"
#. IDS_OPEN_ALLINVALID
-#: Merge.rc:4419
+#: Merge.rc:4429
msgid "All paths are invalid!"
msgstr "Kaikki polut ovat virheellisiä!"
#. IDS_OPEN_UNPACKERDISABLED
-#: Merge.rc:4420
+#: Merge.rc:4430
msgid "Only enabled for file comparisons"
msgstr "Käytössä vain tiedostojen vertailussa"
#. IDS_OPEN_MISMATCH
-#: Merge.rc:4421
+#: Merge.rc:4431
msgid "Cannot compare file and folder!"
msgstr "Tiedostoa ja kansiota ei voi verrata!"
#. IDS_ERROR_FILE_NOT_FOUND
-#: Merge.rc:4427
+#: Merge.rc:4437
#, c-format
msgid "File not found: %1"
msgstr "Tiedostoa ei löytynyt: %1"
#. IDS_ERROR_FILE_NOT_UNPACKED
-#: Merge.rc:4428
+#: Merge.rc:4438
#, c-format
msgid "File not unpacked: %1"
msgstr "Tiedostoa ei ole purettu: %1"
#. IDS_ERROR_FILEOPEN
-#: Merge.rc:4429
+#: Merge.rc:4439
#, c-format
msgid ""
"Cannot open file\n"
@@ -5592,12 +5603,12 @@ msgstr ""
"%2"
#. IDS_ERROR_CONF_RESOLVE
-#: Merge.rc:4430
+#: Merge.rc:4440
msgid "Failed to parse conflict file."
msgstr "Ristiriitatiedoston jäsennys epäonnistui."
#. IDS_NOT_CONFLICT_FILE
-#: Merge.rc:4431
+#: Merge.rc:4441
#, c-format
msgid "The file\n%1\nis not a conflict file."
msgstr ""
@@ -5606,7 +5617,7 @@ msgstr ""
"ei ole ristiriitatiedosto."
#. IDS_COMPARE_LARGE_FILES
-#: Merge.rc:4432
+#: Merge.rc:4442
msgid "Comparing large files requires significant memory.\nShow only comparison results (not file contents)?"
msgstr ""
"Olet vertaamassa hyvin suuria tiedostoja.\n"
@@ -5615,18 +5626,18 @@ msgstr ""
"\n"
#. IDS_SAVE_AS_TITLE
-#: Merge.rc:4438
+#: Merge.rc:4448
msgid "Save As"
msgstr "Tallenna nimellä"
#. IDS_SAVE_FMT
-#: Merge.rc:4439
+#: Merge.rc:4449
#, c-format
msgid "Save changes to %1?"
msgstr "Tallennetaanko muutokset tiedostoon %1?"
#. IDS_SAVEREADONLY_FMT
-#: Merge.rc:4440
+#: Merge.rc:4450
#, c-format
msgid "%1 is read-only. Override? Or 'No' to save as new filename?"
msgstr ""
@@ -5634,11 +5645,11 @@ msgstr ""
"tarkoita 'Tallenna nimellä'"
#. IDS_ERROR_BACKUP
-#: Merge.rc:4441
+#: Merge.rc:4451
msgid "Error backing up file"
msgstr "Virhe varmuuskopioinnissa"
-#: Merge.rc:4443
+#: Merge.rc:4453
#, c-format
msgid ""
"Unable to backup original file:\n"
@@ -5652,7 +5663,7 @@ msgstr ""
"Jatketaanko?"
#. IDS_FILESAVE_FAILED
-#: Merge.rc:4444
+#: Merge.rc:4454
#, c-format
msgid "Saving file failed.\n%1\n%2\n\t- Use different filename (OK)\n\t- Abort (Cancel)?"
msgstr ""
@@ -5663,7 +5674,7 @@ msgstr ""
"\t- käyttää eri tiedostonimeä (paina Ok)\n"
"\t- keskeyttää nykyisen työvaiheen (paina Peruuta)?"
-#: Merge.rc:4446
+#: Merge.rc:4456
#, c-format
msgid "Plugin '%2' cannot pack changes to left file into '%1'.\n\nOriginal unchanged. Save unpacked version?"
msgstr ""
@@ -5673,7 +5684,7 @@ msgstr ""
"\n"
"Haluatko tallentaa puretun version toiseen tiedostoon?"
-#: Merge.rc:4448
+#: Merge.rc:4458
#, c-format
msgid "Plugin '%2' cannot pack changes to middle file into '%1'.\n\nOriginal unchanged. Save unpacked version?"
msgstr ""
@@ -5684,7 +5695,7 @@ msgstr ""
"\n"
"Haluatko tallentaa puretun version toiseen tiedostoon?"
-#: Merge.rc:4450
+#: Merge.rc:4460
#, c-format
msgid "Plugin '%2' cannot pack changes to right file into '%1'.\n\nOriginal unchanged. Save unpacked version?"
msgstr ""
@@ -5695,7 +5706,7 @@ msgstr ""
"Haluatko tallentaa puretun version toiseen tiedostoon?"
#. IDS_FILECHANGED_ONDISK
-#: Merge.rc:4451
+#: Merge.rc:4461
#, c-format
msgid ""
"Another application updated\n"
@@ -5711,7 +5722,7 @@ msgstr ""
"Korvataanko muuttunut tiedosto?"
#. IDS_SAVEREADONLY_MULTI
-#: Merge.rc:4452
+#: Merge.rc:4462
#, c-format
msgid ""
"%1\n"
@@ -5721,7 +5732,7 @@ msgstr ""
"on merkitty vain luku-tilaan. Haluatko ohittaa vain-luku kohteen?"
#. IDS_FILECHANGED_RESCAN
-#: Merge.rc:4453
+#: Merge.rc:4463
#, c-format
msgid "Another application updated\n%1\nsince last scan.\n\nReload?"
msgstr ""
@@ -5732,22 +5743,22 @@ msgstr ""
"Haluatko uudelleenladata tiedoston?"
#. IDS_SAVE_LEFT_AS
-#: Merge.rc:4454
+#: Merge.rc:4464
msgid "Save Left File As"
msgstr "Tallenna vasen tiedosto nimellä"
#. IDS_SAVE_MIDDLE_AS
-#: Merge.rc:4455
+#: Merge.rc:4465
msgid "Save Middle File As"
msgstr "Tallenna keskimmäinen tiedosto nimellä"
#. IDS_SAVE_RIGHT_AS
-#: Merge.rc:4456
+#: Merge.rc:4466
msgid "Save Right File As"
msgstr "Talleta oikea tiedosto nimellä"
#. IDS_FILE_DISAPPEARED
-#: Merge.rc:4461
+#: Merge.rc:4471
#, c-format
msgid ""
"File\n"
@@ -5759,7 +5770,7 @@ msgstr ""
"on kadonnut. Tallenna kopio tiedostosta jatkaaksesi."
#. IDS_VIEWS_OUTOFSYNC
-#: Merge.rc:4467
+#: Merge.rc:4477
msgid ""
"Cannot merge unsynched documents.\n"
"\n"
@@ -5770,186 +5781,186 @@ msgstr ""
"Päivitä asiakirjat ennen jatkamista."
#. IDS_BREAK_ON_WHITESPACE
-#: Merge.rc:4472
+#: Merge.rc:4482
msgid "Break at whitespace"
msgstr "Rivinvaihto tyhjätilamerkissä"
#. IDS_BREAK_ON_PUNCTUATION
-#: Merge.rc:4473
+#: Merge.rc:4483
msgid "Break at whitespace or punctuation"
msgstr "Rivinvaihto tyhjätilassa tai pilkutuksessa"
#. IDS_L2M
-#: Merge.rc:4479
+#: Merge.rc:4489
msgid "Copy to &Middle\tAlt+Right"
msgstr "Kopioi &keskelle\tAlt+Oikea"
#. IDS_R2M
-#: Merge.rc:4480
+#: Merge.rc:4490
msgid "Copy to &Middle\tAlt+Left"
msgstr "Kopioi &keskelle\tAlt+Vasen"
#. IDS_COPY_FROM_MIDDLE_R
-#: Merge.rc:4481
+#: Merge.rc:4491
msgid "Copy from Middle\tAlt+Shift+Right"
msgstr "Kopioi keskeltä\tAlt+Shift+Oikea"
#. IDS_COPY_FROM_MIDDLE_L
-#: Merge.rc:4482
+#: Merge.rc:4492
msgid "Copy from Middle\tAlt+Shift+Left"
msgstr "Kopioi keskeltä\tAlt+Shift+Vasen"
#. IDS_L2MNEXT
-#: Merge.rc:4483
+#: Merge.rc:4493
msgid "Copy to Middle and Advance\tCtrl+Alt+Right"
msgstr "Kopioi keskelle ja etene\tCtrl+Alt+Oikea"
#. IDS_R2MNEXT
-#: Merge.rc:4484
+#: Merge.rc:4494
msgid "Copy to Middle and Advance\tCtrl+Alt+Left"
msgstr "Kopioi keskelle ja etene\tCtrl+Alt+Vasen"
#. IDS_ALL_MIDDLE
-#: Merge.rc:4485
+#: Merge.rc:4495
msgid "Copy All to Middle"
msgstr "Kopioi kaikki keskelle"
#. IDS_COPY_RIGHT_TO_LEFT
-#: Merge.rc:4491
+#: Merge.rc:4501
#, c-format
msgid "Right to Left (%1)"
msgstr "Oikealta vasemmalle (%1)"
#. IDS_COPY_RIGHT_TO_MIDDLE
-#: Merge.rc:4492
+#: Merge.rc:4502
#, c-format
msgid "Right to Middle (%1)"
msgstr "Oikealta keskelle (%1)"
#. IDS_COPY_MIDDLE_TO_LEFT
-#: Merge.rc:4493
+#: Merge.rc:4503
#, c-format
msgid "Middle to Left (%1)"
msgstr "Keskeltä vasemmalle (%1)"
#. IDS_COPY_MIDDLE_TO_RIGHT
-#: Merge.rc:4494
+#: Merge.rc:4504
#, c-format
msgid "Middle to Right (%1)"
msgstr "Keskeltä oikealle (%1)"
#. IDS_COPY_LEFT_TO_RIGHT
-#: Merge.rc:4495
+#: Merge.rc:4505
#, c-format
msgid "Left to Right (%1)"
msgstr "Vasemmalta oikealle (%1)"
#. IDS_COPY_LEFT_TO_MIDDLE
-#: Merge.rc:4496
+#: Merge.rc:4506
#, c-format
msgid "Left to Middle (%1)"
msgstr "Vasemmalle keskelle (%1)"
#. IDS_MOVE_LEFT_TO
-#: Merge.rc:4507 Merge.rc:4539
+#: Merge.rc:4517 Merge.rc:4549
#, c-format
msgid "Left to... (%1)"
msgstr "Vasemmalta... (%1)"
#. IDS_MOVE_MIDDLE_TO
-#: Merge.rc:4508 Merge.rc:4540
+#: Merge.rc:4518 Merge.rc:4550
#, c-format
msgid "Middle to... (%1)"
msgstr "Keskellä... (%1)"
#. IDS_MOVE_RIGHT_TO
-#: Merge.rc:4509 Merge.rc:4541
+#: Merge.rc:4519 Merge.rc:4551
#, c-format
msgid "Right to... (%1)"
msgstr "Oikealta... (%1)"
#. IDS_COPY_BOTH_TO
-#: Merge.rc:4510
+#: Merge.rc:4520
#, c-format
msgid "Both to... (%1)"
msgstr "Molemmat... (%1)"
#. IDS_COPY_ALL_TO
-#: Merge.rc:4511
+#: Merge.rc:4521
#, c-format
msgid "All to... (%1)"
msgstr "Kaikki... (%1)"
#. IDS_COPY_DIFFERENCES_TO
-#: Merge.rc:4512
+#: Merge.rc:4522
#, c-format
msgid "Differences to... (%1)"
msgstr "Erot... (%1)"
#. IDS_COPY_ONLYDIFFITEMS
-#: Merge.rc:4519
+#: Merge.rc:4529
msgid "Some selected items are identical or skipped.\nCopy only items with differences?"
msgstr ""
#. IDS_DEL_LEFT_FMT
-#: Merge.rc:4525
+#: Merge.rc:4535
#, c-format
msgid "Left (%1)"
msgstr "Vasen (%1)"
#. IDS_DEL_MIDDLE_FMT
-#: Merge.rc:4526
+#: Merge.rc:4536
#, c-format
msgid "Middle (%1)"
msgstr "Keskimmäinen (%1)"
#. IDS_DEL_RIGHT_FMT
-#: Merge.rc:4527
+#: Merge.rc:4537
#, c-format
msgid "Right (%1)"
msgstr "Oikea (%1)"
#. IDS_DEL_BOTH_FMT
-#: Merge.rc:4528
+#: Merge.rc:4538
#, c-format
msgid "Both (%1)"
msgstr "Molemmat (%1)"
#. IDS_DEL_ALL_FMT
-#: Merge.rc:4529
+#: Merge.rc:4539
#, c-format
msgid "All (%1)"
msgstr "Kaikki (%1)"
#. IDS_SELECT_DEST_LEFT
-#: Merge.rc:4545
+#: Merge.rc:4555
msgid "Left Side - Select Destination Folder:"
msgstr "Vasen puoli - valitse kohdekansio:"
#. IDS_SELECT_DEST_MIDDLE
-#: Merge.rc:4546
+#: Merge.rc:4556
msgid "Middle Side - Select Destination Folder:"
msgstr "Keskimmäinen - valitse kohdekansio:"
#. IDS_SELECT_DEST_RIGHT
-#: Merge.rc:4547
+#: Merge.rc:4557
msgid "Right Side - Select Destination Folder:"
msgstr "Oikea puoli - valitse kohdekansio:"
#. IDS_FILES_AFFECTED_FMT
-#: Merge.rc:4548
+#: Merge.rc:4558
#, c-format
msgid "(%1 Files Affected)"
msgstr "(%1 tiedostoa muokattu)"
#. IDS_FILES_AFFECTED_FMT2
-#: Merge.rc:4549
+#: Merge.rc:4559
#, c-format
msgid "(%1 of %2 Files Affected)"
msgstr "(%1 / %2 tiedostoon vaikutettu)"
#. IDS_CONFIRM_DELETE_SINGLE
-#: Merge.rc:4555
+#: Merge.rc:4565
#, c-format
msgid ""
"Are you sure you want to delete\n"
@@ -5961,18 +5972,18 @@ msgstr ""
"%1 ?"
#. IDS_CONFIRM_SINGLE_COPY
-#: Merge.rc:4556
+#: Merge.rc:4566
msgid "Are you sure you want to copy?"
msgstr "Oletko varma, että haluat kopioida?"
#. IDS_CONFIRM_MULTIPLE_COPY
-#: Merge.rc:4557
+#: Merge.rc:4567
#, c-format
msgid "Are you sure you want to copy %d items?"
msgstr "Oletko varma, että haluat kopioida %d kohdetta?"
#. IDS_DIRCMP_NOTSYNC
-#: Merge.rc:4558
+#: Merge.rc:4568
#, c-format
msgid ""
"Operation aborted!\n"
@@ -5992,47 +6003,47 @@ msgstr ""
"Päivitä vertailu."
#. IDS_CONFIRM_SINGLE_MOVE
-#: Merge.rc:4563
+#: Merge.rc:4573
msgid "Are you sure you want to move?"
msgstr "Oletko varma, että haluat siirtää?"
#. IDS_CONFIRM_MULTIPLE_MOVE
-#: Merge.rc:4564
+#: Merge.rc:4574
#, c-format
msgid "Are you sure you want to move %d items?"
msgstr "Oletko varma, että haluat siirtää %d kohdetta?"
#. IDS_CONFIRM_MOVE_CAPTION
-#: Merge.rc:4566
+#: Merge.rc:4576
msgid "Confirm Move"
msgstr "Vahvista siirto"
-#: Merge.rc:4568
+#: Merge.rc:4578
msgid "Close the folder comparison window?"
msgstr ""
"Olet sulkemassa kansioiden vertailuikkunaa. Haluatko varmasti sulkea ikkunan?"
-#: Merge.rc:4570
+#: Merge.rc:4580
msgid "Close the folder comparison window, which took a long time?"
msgstr ""
#. IDS_ERROR_INVALID_DIR_FILE_NAME
-#: Merge.rc:4571
+#: Merge.rc:4581
msgid "The file or folder name is invalid."
msgstr "Tiedoston tai kansion nimi on virheellinen."
#. IDS_ERROR_EXECUTE_FILE
-#: Merge.rc:4577
+#: Merge.rc:4587
#, c-format
msgid "Failed to execute external editor: %1"
msgstr "Ulkoisen editorin ajo epäonnistui: %1"
#. IDS_UNKNOWN_ARCHIVE_FORMAT
-#: Merge.rc:4583
+#: Merge.rc:4593
msgid "Unknown archive format"
msgstr "Tuntematon arkistomuoto"
-#: Merge.rc:4585
+#: Merge.rc:4595
msgid ""
"Failed to extract archive.\n"
"Compare as text file?"
@@ -6041,752 +6052,752 @@ msgstr ""
"Haluatko verrata arkistotiedostoja tekstitiedostoina?"
#. IDS_COLHDR_FILENAME
-#: Merge.rc:4591
+#: Merge.rc:4601
msgid "Filename"
msgstr "Tiedostonimi"
#. IDS_COLHDR_DIR
-#: Merge.rc:4592
+#: Merge.rc:4602
msgctxt "DirView|ColumnHeader"
msgid "Folder"
msgstr "Kansio"
#. IDS_COLHDR_RESULT
-#: Merge.rc:4593
+#: Merge.rc:4603
msgid "Comparison Result"
msgstr "Vertailutulokset"
#. IDS_COLHDR_LTIMEM
-#: Merge.rc:4594
+#: Merge.rc:4604
msgid "Left Date"
msgstr "Vasen päiväys"
#. IDS_COLHDR_RTIMEM
-#: Merge.rc:4595
+#: Merge.rc:4605
msgid "Right Date"
msgstr "Oikea päiväys"
#. IDS_COLHDR_MTIMEM
-#: Merge.rc:4596
+#: Merge.rc:4606
msgid "Middle Date"
msgstr "Keskimmäinen päivä"
#. IDS_COLHDR_LSIZE
-#: Merge.rc:4598
+#: Merge.rc:4608
msgid "Left Size"
msgstr "Vasen koko"
#. IDS_COLHDR_RSIZE
-#: Merge.rc:4599
+#: Merge.rc:4609
msgid "Right Size"
msgstr "Oikea koko"
#. IDS_COLHDR_MSIZE
-#: Merge.rc:4604
+#: Merge.rc:4614
msgid "Middle Size"
msgstr "Keskimmäinen koko"
#. IDS_COLHDR_RSIZE_SHORT
-#: Merge.rc:4605
+#: Merge.rc:4615
msgid "Right Size (Short)"
msgstr "Oikea koko (lyhyt)"
#. IDS_COLHDR_LSIZE_SHORT
-#: Merge.rc:4606
+#: Merge.rc:4616
msgid "Left Size (Short)"
msgstr "Vasen koko (lyhyt)"
#. IDS_COLHDR_MSIZE_SHORT
-#: Merge.rc:4607
+#: Merge.rc:4617
msgid "Middle Size (Short)"
msgstr "Keskimmäinen koko (lyhyt)"
#. IDS_COLHDR_LTIMEC
-#: Merge.rc:4613
+#: Merge.rc:4623
msgid "Left Creation Time"
msgstr "Vasen luontiaika"
#. IDS_COLHDR_RTIMEC
-#: Merge.rc:4614
+#: Merge.rc:4624
msgid "Right Creation Time"
msgstr "Oikea luontiaika"
#. IDS_COLHDR_MTIMEC
-#: Merge.rc:4615
+#: Merge.rc:4625
msgid "Middle Creation Time"
msgstr "Keskimmäinen luontiaika"
#. IDS_COLHDR_NEWER
-#: Merge.rc:4616
+#: Merge.rc:4626
msgid "Newer File"
msgstr "Uudempi tiedosto"
#. IDS_COLHDR_LVERSION
-#: Merge.rc:4617
+#: Merge.rc:4627
msgid "Left File Version"
msgstr "Vasen tiedostoversio"
#. IDS_COLHDR_RVERSION
-#: Merge.rc:4618
+#: Merge.rc:4628
msgid "Right File Version"
msgstr "Oikea tiedostoversio"
#. IDS_COLHDR_MVERSION
-#: Merge.rc:4619
+#: Merge.rc:4629
msgid "Middle File Version"
msgstr "Keskimmäinen tiedostoversio"
#. IDS_COLHDR_RESULT_ABBR
-#: Merge.rc:4620
+#: Merge.rc:4630
msgid "Short Result"
msgstr "Lyhyt tulos"
#. IDS_COLHDR_LATTRIBUTES
-#: Merge.rc:4621
+#: Merge.rc:4631
msgid "Left Attributes"
msgstr "Vasemmat määritteet"
#. IDS_COLHDR_RATTRIBUTES
-#: Merge.rc:4622
+#: Merge.rc:4632
msgid "Right Attributes"
msgstr "Oikeat määritteet"
#. IDS_COLHDR_MATTRIBUTES
-#: Merge.rc:4623
+#: Merge.rc:4633
msgid "Middle Attributes"
msgstr "Keskimmäinen attribuutit"
#. IDS_COLHDR_LEOL_TYPE
-#: Merge.rc:4628
+#: Merge.rc:4638
msgid "Left EOL"
msgstr "Vasen EOL"
#. IDS_COLHDR_MEOL_TYPE
-#: Merge.rc:4629
+#: Merge.rc:4639
msgid "Middle EOL"
msgstr "Keskimmäinen EOL"
#. IDS_COLHDR_REOL_TYPE
-#: Merge.rc:4630
+#: Merge.rc:4640
msgid "Right EOL"
msgstr "Oikea EOL"
#. IDS_COLHDR_LENCODING
-#: Merge.rc:4636
+#: Merge.rc:4646
msgid "Left Encoding"
msgstr "Vasen koodaus"
#. IDS_COLHDR_RENCODING
-#: Merge.rc:4637
+#: Merge.rc:4647
msgid "Right Encoding"
msgstr "Oikea koodaus"
#. IDS_COLHDR_MENCODING
-#: Merge.rc:4638
+#: Merge.rc:4648
msgid "Middle Encoding"
msgstr "Keskimmäinen koodaus"
#. IDS_COLHDR_NIDIFFS
-#: Merge.rc:4639
+#: Merge.rc:4649
msgid "Ignored Diff"
msgstr "Ohitetut erot"
#. IDS_COLHDR_BINARY
-#: Merge.rc:4641
+#: Merge.rc:4651
msgctxt "DirView|ColumnHeader"
msgid "Binary"
msgstr "Binääri"
#. IDS_PLUGINS_TYPE_UNPACKER
-#: Merge.rc:4642 Merge.rc:4959
+#: Merge.rc:4652 Merge.rc:4969
msgid "Unpacker"
msgstr "Purkaja"
#. IDS_PLUGIN_TYPE4
-#: Merge.rc:4643 Merge.rc:4960 Merge.rc:5267
+#: Merge.rc:4653 Merge.rc:4970 Merge.rc:5277
msgid "Prediffer"
msgstr "Esivertailu"
#. IDS_COLHDR_LEFT
-#: Merge.rc:4644
+#: Merge.rc:4654
msgid "Left"
msgstr "Vasen"
#. IDS_COLHDR_MIDDLE
-#: Merge.rc:4645
+#: Merge.rc:4655
msgid "Middle"
msgstr "Keski"
#. IDS_COLHDR_RIGHT
-#: Merge.rc:4646
+#: Merge.rc:4656
msgid "Right"
msgstr "Oikea"
#. IDS_COLHDR_DIFF
-#: Merge.rc:4647
+#: Merge.rc:4657
msgid "Diff"
msgstr "Ero"
#. IDS_COLHDR_LEFT_DUPLICATE
-#: Merge.rc:4648
+#: Merge.rc:4658
msgid "Left Duplicate Count"
msgstr "Vasen kaksoiskappaleiden määrä"
#. IDS_COLHDR_RIGHT_DUPLICATE
-#: Merge.rc:4649
+#: Merge.rc:4659
msgid "Right Duplicate Count"
msgstr "Oikea kaksoiskappaleiden määrä"
#. IDS_COLHDR_MIDDLE_DUPLICATE
-#: Merge.rc:4650
+#: Merge.rc:4660
msgid "Middle Duplicate Count"
msgstr "Keskimmäinen kaksoiskappaleiden määrä"
#. IDS_COLHDR_MOVE
-#: Merge.rc:4651
+#: Merge.rc:4661
msgid "Move"
msgstr "Siirrä"
#. IDS_PRPCAT_AUDIO
-#: Merge.rc:4658
+#: Merge.rc:4668
msgid "Audio"
msgstr "Audio"
#. IDS_PRPCAT_CALENDAR
-#: Merge.rc:4659
+#: Merge.rc:4669
msgid "Calendar"
msgstr "Kalenteri"
#. IDS_PRPCAT_COMMUNICATION
-#: Merge.rc:4660
+#: Merge.rc:4670
msgid "Communication"
msgstr "Viestintä"
#. IDS_PRPCAT_CONTACT
-#: Merge.rc:4661
+#: Merge.rc:4671
msgid "Contact"
msgstr "Yhteystieto"
#. IDS_PRPCAT_DEVICES
-#: Merge.rc:4662
+#: Merge.rc:4672
msgid "Devices"
msgstr "Laitteet"
#. IDS_PRPCAT_DOCUMENT
-#: Merge.rc:4663
+#: Merge.rc:4673
msgid "Document"
msgstr "Dokumentti"
#. IDS_PRPCAT_HOME
-#: Merge.rc:4664
+#: Merge.rc:4674
msgid "Home"
msgstr "Koti"
#. IDS_PRPCAT_JOURNAL
-#: Merge.rc:4666
+#: Merge.rc:4676
msgid "Journal"
msgstr "Aikakauslehti"
#. IDS_PRPCAT_LINK
-#: Merge.rc:4667
+#: Merge.rc:4677
msgid "Link"
msgstr "Linkki"
#. IDS_PRPCAT_MEDIA
-#: Merge.rc:4668
+#: Merge.rc:4678
msgid "Media"
msgstr "Media"
#. IDS_PRPCAT_MUSIC
-#: Merge.rc:4670
+#: Merge.rc:4680
msgid "Music"
msgstr "Musiikki"
#. IDS_PRPCAT_NOTE
-#: Merge.rc:4671
+#: Merge.rc:4681
msgid "Note"
msgstr "Huomautus"
#. IDS_PRPCAT_PHOTO
-#: Merge.rc:4672
+#: Merge.rc:4682
msgid "Photo"
msgstr "Valokuva"
#. IDS_PRPCAT_RECORDEDTV
-#: Merge.rc:4673
+#: Merge.rc:4683
msgid "RecordedTV"
msgstr "TallennettuTV"
#. IDS_PRPCAT_SEARCH
-#: Merge.rc:4674
+#: Merge.rc:4684
msgid "Search"
msgstr "Haku"
#. IDS_PRPCAT_SECURITY
-#: Merge.rc:4675
+#: Merge.rc:4685
msgid "Security"
msgstr "Turvallisuus"
#. IDS_PRPCAT_SOFTWARE
-#: Merge.rc:4676
+#: Merge.rc:4686
msgid "Software"
msgstr "Ohjelmisto"
#. IDS_PRPCAT_TASK
-#: Merge.rc:4677
+#: Merge.rc:4687
msgid "Task"
msgstr "Tehtävä"
#. IDS_PRPCAT_VIDEO
-#: Merge.rc:4678
+#: Merge.rc:4688
msgid "Video"
msgstr "Video"
#. IDS_PRPCAT_HASH
-#: Merge.rc:4679
+#: Merge.rc:4689
msgid "Hash"
msgstr "Tiiviste (hash)"
#. IDS_CANT_COMPARE_FILES
-#: Merge.rc:4685
+#: Merge.rc:4695
msgid "Unable to compare files"
msgstr "Tiedostoja ei voi verrata"
#. IDS_ABORTED_ITEM
-#: Merge.rc:4686
+#: Merge.rc:4696
msgid "Item aborted"
msgstr "Kohde keskeytetty"
#. IDS_FILE_SKIPPED
-#: Merge.rc:4687
+#: Merge.rc:4697
msgid "File skipped"
msgstr "Tiedosto ohitettu"
#. IDS_DIR_SKIPPED
-#: Merge.rc:4688
+#: Merge.rc:4698
msgid "Folder skipped"
msgstr "Kansio ohitettu"
#. IDS_LEFT_ONLY_IN_FMT
-#: Merge.rc:4689
+#: Merge.rc:4699
#, c-format
msgid "Left only: %1"
msgstr "Vain vasen: %1"
#. IDS_MIDDLE_ONLY_IN_FMT
-#: Merge.rc:4690
+#: Merge.rc:4700
#, c-format
msgid "Middle only: %1"
msgstr "Vain keskimmäinen: %1"
#. IDS_RIGHT_ONLY_IN_FMT
-#: Merge.rc:4691
+#: Merge.rc:4701
#, c-format
msgid "Right only: %1"
msgstr "Vain oikea: %1"
#. IDS_DOES_NOT_EXIST_IN_FMT
-#: Merge.rc:4692
+#: Merge.rc:4702
#, c-format
msgid "Does not exist in %1"
msgstr "Ei ole kohteessa %1"
#. IDS_BIN_FILES_SAME
-#: Merge.rc:4693
+#: Merge.rc:4703
msgid "Binary files are identical"
msgstr "Binaaritiedostot ovat samanlaisia"
#. IDS_BIN_FILES_DIFF
-#: Merge.rc:4699
+#: Merge.rc:4709
msgid "Binary files are different"
msgstr "Binaaritiedostot ovat erilaisia"
#. IDS_FILES_ARE_DIFFERENT
-#: Merge.rc:4700
+#: Merge.rc:4710
msgid "Files are different"
msgstr "Tiedostot ovat erilaisia"
#. IDS_FOLDERS_ARE_DIFFERENT
-#: Merge.rc:4701
+#: Merge.rc:4711
msgid "Folders are different"
msgstr "Kansiot ovat erilaisia"
#. IDS_LEFTONLY
-#: Merge.rc:4702
+#: Merge.rc:4712
msgid "Left Only"
msgstr "Vain vasen"
#. IDS_RIGHTONLY
-#: Merge.rc:4703
+#: Merge.rc:4713
msgid "Right Only"
msgstr "Vain oikea"
#. IDS_MIDDLEONLY
-#: Merge.rc:4704
+#: Merge.rc:4714
msgid "Middle Only"
msgstr "Vain keskimmäinen"
#. IDS_NOITEMLEFT
-#: Merge.rc:4705
+#: Merge.rc:4715
msgid "No item in left"
msgstr "Ei kohdetta vasemmalla"
#. IDS_NOITEMRIGHT
-#: Merge.rc:4706
+#: Merge.rc:4716
msgid "No item in right"
msgstr "Ei kohdetta oikealla"
#. IDS_NOITEMMIDDLE
-#: Merge.rc:4707
+#: Merge.rc:4717
msgid "No item in middle"
msgstr "Ei kohdetta keskellä"
#. IDS_CMPRES_ERROR
-#: Merge.rc:4709
+#: Merge.rc:4719
msgid "Error"
msgstr "Virhe"
#. IDS_TEXT_FILES_SAME
-#: Merge.rc:4710
+#: Merge.rc:4720
msgid "Text files are identical"
msgstr "Tekstitiedostot ovat samanlaisia"
#. IDS_LEFTONLY_DIFF
-#: Merge.rc:4711
+#: Merge.rc:4721
msgid " (Middle and right are identical)"
msgstr ""
#. IDS_MIDDLEONLY_DIFF
-#: Merge.rc:4712
+#: Merge.rc:4722
msgid " (Left and right are identical)"
msgstr ""
#. IDS_RIGHTONLY_DIFF
-#: Merge.rc:4713
+#: Merge.rc:4723
msgid " (Left and middle are identical)"
msgstr ""
#. IDS_PATH_MISMATCH
-#: Merge.rc:4714
+#: Merge.rc:4724
msgid " (paths differ)"
msgstr ""
#. IDS_TEXT_FILES_DIFF
-#: Merge.rc:4715
+#: Merge.rc:4725
msgid "Text files are different"
msgstr "Tekstitiedostot ovat erilaisia"
#. IDS_IMAGE_FILES_SAME
-#: Merge.rc:4716
+#: Merge.rc:4726
msgid "Image files are identical"
msgstr "Kuvatiedostot ovat identtiset"
#. IDS_IMAGE_FILES_DIFF
-#: Merge.rc:4717
+#: Merge.rc:4727
msgid "Image files are different"
msgstr "Kuvatiedostot ovat erilaisia"
#. IDS_EXPR_DIFF
-#: Merge.rc:4718
+#: Merge.rc:4728
#, c-format
msgid "Files are different (expr: %1)"
msgstr ""
#. IDS_HASH_GROUP
-#: Merge.rc:4719
+#: Merge.rc:4729
#, c-format
msgid "Group%d"
msgstr "Ryhmä%d"
#. IDS_RENAME_MOVE_DETECTION_DISALBED
-#: Merge.rc:4720
+#: Merge.rc:4730
msgctxt "Options dialog|Compare|Folder|Detect renames and moves"
msgid "Disabled"
msgstr ""
#. IDS_RENAME_MOVE_DETECTION_RENAME
-#: Merge.rc:4721
+#: Merge.rc:4731
msgid "Detect renames"
msgstr ""
#. IDS_RENAME_MOVE_DETECTION_RENAME_MOVE
-#: Merge.rc:4722
+#: Merge.rc:4732
msgid "Detect renames and moves"
msgstr ""
#. IDS_RENAME_MOVE_MERGE_MODE_RENAME
-#: Merge.rc:4723
+#: Merge.rc:4733
msgid "Merge renames"
msgstr ""
#. IDS_RENAME_MOVE_MERGE_MODE_RENAME_MOVE
-#: Merge.rc:4724
+#: Merge.rc:4734
msgid "Merge renames and moves"
msgstr ""
#. IDS_RENAMED
-#: Merge.rc:4725
+#: Merge.rc:4735
msgid "Renamed"
msgstr ""
#. IDS_MOVED
-#: Merge.rc:4726
+#: Merge.rc:4736
msgid "Moved"
msgstr ""
#. IDS_RENAMED_MOVED
-#: Merge.rc:4727
+#: Merge.rc:4737
msgid "Renamed/Moved"
msgstr ""
#. IDS_RENAMED_MOVED_ITEMS
-#: Merge.rc:4728
+#: Merge.rc:4738
#, c-format
msgid "(%1 items)"
msgstr ""
#. IDS_RENAMED_MOVED_RESULT
-#: Merge.rc:4729
+#: Merge.rc:4739
#, c-format
msgid "%1 (set %2): "
msgstr ""
#. IDS_SWITCH_FLAT_MODE
-#: Merge.rc:4730
+#: Merge.rc:4740
msgid "Some moved items have been merged.\nIn Tree Mode, these items may appear in positions that do not reflect the actual folder structure, which can be confusing.\nSwitch to Flat Mode?"
msgstr ""
#. IDS_ELAPSED_TIME
-#: Merge.rc:4736
+#: Merge.rc:4746
#, c-format
msgid "Elapsed time: %ld ms"
msgstr "Kulunut aika: %ld ms"
#. IDS_STATUS_SELITEM1
-#: Merge.rc:4737
+#: Merge.rc:4747
msgid "1 item selected"
msgstr "1 kohde valittu"
#. IDS_STATUS_SELITEMS
-#: Merge.rc:4738
+#: Merge.rc:4748
#, c-format
msgid "%1 items selected"
msgstr "%1 kohdetta valittu"
#. IDS_COLDESC_FILENAME
-#: Merge.rc:4744
+#: Merge.rc:4754
msgid "Filename or folder name."
msgstr "Tiedosto- tai kansionimi."
#. IDS_COLDESC_DIR
-#: Merge.rc:4745
+#: Merge.rc:4755
msgid "Subfolder name when subfolders are included."
msgstr "Alikansion nimi, kun alikansiot ovat mukana."
#. IDS_COLDESC_RESULT
-#: Merge.rc:4746
+#: Merge.rc:4756
msgid "Comparison result, long form."
msgstr "Vertailutulokset, pitkä muoto."
#. IDS_COLDESC_LTIMEM
-#: Merge.rc:4751
+#: Merge.rc:4761
msgid "Left side modification date."
msgstr "Vasemman muokkauspäivä."
#. IDS_COLDESC_RTIMEM
-#: Merge.rc:4752
+#: Merge.rc:4762
msgid "Right side modification date."
msgstr "Oikean muokkauspäivä."
#. IDS_COLDESC_MTIMEM
-#: Merge.rc:4753
+#: Merge.rc:4763
msgid "Middle side modification date."
msgstr "Keskimmäinen sivu muokkauspäivä."
#. IDS_COLDESC_EXTENSION
-#: Merge.rc:4754
+#: Merge.rc:4764
msgid "File's extension."
msgstr "Tiedostopäätteet."
#. IDS_COLDESC_LSIZE
-#: Merge.rc:4755
+#: Merge.rc:4765
msgid "Left file size in bytes."
msgstr "Vasemman tiedoston koko tavuina."
#. IDS_COLDESC_RSIZE
-#: Merge.rc:4756
+#: Merge.rc:4766
msgid "Right file size in bytes."
msgstr "Oikean tiedoston koko tavuina."
#. IDS_COLDESC_MSIZE
-#: Merge.rc:4757
+#: Merge.rc:4767
msgid "Middle file size in bytes."
msgstr "Keskimmäinen tiedostokoko tavuina."
#. IDS_COLDESC_LSIZE_SHORT
-#: Merge.rc:4758
+#: Merge.rc:4768
msgid "Left file size abbreviated."
msgstr "Vasen tiedostokoko lyhennettynä."
#. IDS_COLDESC_RSIZE_SHORT
-#: Merge.rc:4759
+#: Merge.rc:4769
msgid "Right file size abbreviated."
msgstr "Oikea tiedostokoko lyhennettynä."
#. IDS_COLDESC_MSIZE_SHORT
-#: Merge.rc:4760
+#: Merge.rc:4770
msgid "Middle file size abbreviated."
msgstr "Keskimmäinen tiedosto koko lyhennetty."
#. IDS_COLDESC_LTIMEC
-#: Merge.rc:4766
+#: Merge.rc:4776
msgid "Left side creation time."
msgstr "Vasemman puolen luontiaika."
#. IDS_COLDESC_RTIMEC
-#: Merge.rc:4767
+#: Merge.rc:4777
msgid "Right side creation time."
msgstr "Oikean puolen luontiaika."
#. IDS_COLDESC_MTIMEC
-#: Merge.rc:4768
+#: Merge.rc:4778
msgid "Middle side creation time."
msgstr "Keskimmäisen sivun luontiaika."
#. IDS_COLDESC_NEWER
-#: Merge.rc:4769
+#: Merge.rc:4779
msgid "Tells which side has newer modification date."
msgstr "Kertoo kummallako puolella on uudempi muutospäivä."
#. IDS_COLDESC_LVERSION
-#: Merge.rc:4770
+#: Merge.rc:4780
msgid "Left side file version, only for some file types."
msgstr ""
#. IDS_COLDESC_RVERSION
-#: Merge.rc:4771
+#: Merge.rc:4781
msgid "Right side file version, only for some file types."
msgstr ""
#. IDS_COLDESC_MVERSION
-#: Merge.rc:4776
+#: Merge.rc:4786
msgid "Middle side file version, only for some file types."
msgstr ""
#. IDS_COLDESC_RESULT_ABBR
-#: Merge.rc:4777
+#: Merge.rc:4787
msgid "Short comparison result."
msgstr "Lyhyt vertailutulos."
#. IDS_COLDESC_LATTRIBUTES
-#: Merge.rc:4778
+#: Merge.rc:4788
msgid "Left side attributes."
msgstr "Vasemman puolen määritteet."
#. IDS_COLDESC_RATTRIBUTES
-#: Merge.rc:4779
+#: Merge.rc:4789
msgid "Right side attributes."
msgstr "Oikean puolen määritteet."
#. IDS_COLDESC_MATTRIBUTES
-#: Merge.rc:4780
+#: Merge.rc:4790
msgid "Middle side attributes."
msgstr "Keskimmäinen sivu määritteet."
#. IDS_COLDESC_LEOL_TYPE
-#: Merge.rc:4781
+#: Merge.rc:4791
msgid "Left side file EOL type."
msgstr "Vasemman tiedoston EOL-tyyppi."
#. IDS_COLDESC_REOL_TYPE
-#: Merge.rc:4782
+#: Merge.rc:4792
msgid "Right side file EOL type."
msgstr "Oikean tiedoston EOL-tyyppi."
#. IDS_COLDESC_MEOL_TYPE
-#: Merge.rc:4783
+#: Merge.rc:4793
msgid "Middle side file EOL type."
msgstr "Keskimmäinen sivu tiedosto EOL-tyyppi."
#. IDS_COLDESC_LENCODING
-#: Merge.rc:4789
+#: Merge.rc:4799
msgid "Left side encoding."
msgstr "Vasemman puolen koodaus."
#. IDS_COLDESC_RENCODING
-#: Merge.rc:4790
+#: Merge.rc:4800
msgid "Right side encoding."
msgstr "Oikean puolen koodaus."
#. IDS_COLDESC_MENCODING
-#: Merge.rc:4791
+#: Merge.rc:4801
msgid "Middle side encoding."
msgstr "Keskimmäinen sivu koodaus."
#. IDS_COLDESC_NIDIFFS
-#: Merge.rc:4792
+#: Merge.rc:4802
msgid "Number of ignored differences in file. Ignored and cannot be merged."
msgstr ""
"Tiedostossa useita ohitettuja eroja. WinMerge on ohittanut nämä erot, eikä "
"niitä voi yhdistää."
#. IDS_COLDESC_NSDIFFS
-#: Merge.rc:4793
+#: Merge.rc:4803
msgid "Number of differences in file (excluding ignored)."
#. IDS_COLDESC_BINARY
-#: Merge.rc:4794
+#: Merge.rc:4804
msgid "Shows an asterisk (*) if the file is binary."
msgstr "Näyttää tähden(*), jos tiedosto on binäärinen."
#. IDS_COLDESC_UNPACKER
-#: Merge.rc:4795
+#: Merge.rc:4805
msgid "Unpacker plugin name or pipeline."
msgstr "Pakkauksen purkuohjelman laajennuksen nimi tai putki."
#. IDS_COLDESC_PREDIFFER
-#: Merge.rc:4796
+#: Merge.rc:4806
msgid "Prediffer plugin name or pipeline."
msgstr "Ennakointilaajennuksen nimi tai putki."
#. IDS_DIRECTORY_REPORT_TITLE
-#: Merge.rc:4802
+#: Merge.rc:4812
#, c-format
msgid "Compare %1 with %2"
msgstr "Vertaa %1 -> %2"
#. IDS_DIRECTORY_REPORT_TITLE3
-#: Merge.rc:4803
+#: Merge.rc:4813
#, c-format
msgid "Compare %1 with %2 and %3"
msgstr "Vertaa %1 -> %2 -> %3"
#. IDS_REPORT_COMMALIST
-#: Merge.rc:4804
+#: Merge.rc:4814
msgid "Comma-separated list"
msgstr "Pilkuilla erotettu lista"
#. IDS_REPORT_TABLIST
-#: Merge.rc:4805
+#: Merge.rc:4815
msgid "Tab-separated list"
msgstr "Sarkain erotettu lista"
#. IDS_REPORT_SIMPLEHTML
-#: Merge.rc:4806
+#: Merge.rc:4816
msgid "Simple HTML"
msgstr "Yksinkertainen HTML"
#. IDS_REPORT_SIMPLEXML
-#: Merge.rc:4807
+#: Merge.rc:4817
msgid "Simple XML"
msgstr "Yksinkertainen XML"
-#: Merge.rc:4809
+#: Merge.rc:4819
msgid "Report file already exists. Overwrite?"
msgstr "Raportti on jo olemassa. Haluatko korvata sen sisällön?"
#. IDS_REPORT_ERROR
-#: Merge.rc:4814
+#: Merge.rc:4824
#, c-format
msgid ""
"Error creating the report:\n"
@@ -6796,59 +6807,59 @@ msgstr ""
"%1"
#. IDS_REPORT_SUCCESS
-#: Merge.rc:4815
+#: Merge.rc:4825
msgid "Report created successfully."
msgstr "Raportin luominen onnistui."
#. IDS_SYNCPOINT_LASTBLOCK
-#: Merge.rc:4821
+#: Merge.rc:4831
msgid "Cannot add a synchronization point at this line."
msgstr "Synkronointipistettä ei voi lisätä tällä rivillä."
#. IDS_FILE_TO_ITSELF
-#: Merge.rc:4827
+#: Merge.rc:4837
msgid "Same file is opened in both panes."
msgstr "Sama tiedosto on avatttu molemmissa paneeleissa."
#. IDS_FILESSAME
-#: Merge.rc:4828
+#: Merge.rc:4838
msgid "Selected files are identical."
msgstr "Valitut tiedostot ovat identtisiä."
#. IDS_FILESSAME_CURCFG
-#: Merge.rc:4829
+#: Merge.rc:4839
msgid "Selected files are identical (with current settings).\r\nChecking binary identity..."
msgstr ""
#. IDS_FILESSAME_BINERROR
-#: Merge.rc:4830
+#: Merge.rc:4840
msgid "Selected files are identical (with current settings).\r\nBut binary comparison failed."
msgstr ""
#. IDS_FILESSAME_BINSAME
-#: Merge.rc:4831
+#: Merge.rc:4841
msgid "Selected files are identical (binary match)."
msgstr ""
#. IDS_FILESSAME_BINDIFF
-#: Merge.rc:4832
+#: Merge.rc:4842
msgid "Selected files are identical (with current settings).\r\nBut differ at the binary level."
msgstr ""
#. IDS_FILEERROR
-#: Merge.rc:4833
+#: Merge.rc:4843
msgid "An error occurred while comparing files."
msgstr "Virhe tiedostojen vertaamisessa."
#. IDS_TEMP_FILEERROR
-#: Merge.rc:4834
+#: Merge.rc:4844
msgid ""
"Could not create temporary files. Check your temporary path settings."
msgstr ""
"Väliaikaisia tiedostoja ei voi luoda. Tarkista väliaikaiset polkuasetukset."
#. IDS_SUGGEST_IGNOREEOL
-#: Merge.rc:4835
+#: Merge.rc:4845
msgid "Files use different EOL.\n\nTreat all EOL as equivalent?\n\nSet 'Ignore EOL differences (Windows/Unix/Mac)' in Compare section of Options."
msgstr ""
"Nämä tiedostot käyttävät erilaisia rivinvaihtotyyppejä.\n"
@@ -6860,17 +6871,17 @@ msgstr ""
"välilehden Asetukset-valintaikkunassa (Muokkaa/Asetukset)."
#. IDS_INVALID_DIRECTORY
-#: Merge.rc:4836
+#: Merge.rc:4846
msgid "Selected folder is invalid."
msgstr "Valittu kansio ei kelpaa."
#. IDS_CANNOT_OPEN_BINARYFILE
-#: Merge.rc:4837
+#: Merge.rc:4847
msgid "Cannot open a binary file in Editor."
msgstr "Binaaritiedostoa voi avata editoriin."
#. IDS_CREATE_PAIR_FOLDER
-#: Merge.rc:4838
+#: Merge.rc:4848
#, c-format
msgid "Create matching folder:\n%1\non the other side and open?"
msgstr ""
@@ -6881,41 +6892,41 @@ msgstr ""
"toiselle puolelle ja avata nämä kansiot?"
#. IDS_CONFIRM_COPY_ALL_DIFFS
-#: Merge.rc:4839
+#: Merge.rc:4849
msgid "Copy all differences to other file?"
msgstr ""
#. IDS_MOVE_TO_NEXTFILE
-#: Merge.rc:4844
+#: Merge.rc:4854
msgid "Move to next file?"
msgstr "Haluatko siirtyä seuraavaan tiedostoon?"
#. IDS_MOVE_TO_PREVFILE
-#: Merge.rc:4845
+#: Merge.rc:4855
msgid "Move to previous file?"
msgstr "Haluatko siirtyä edelliseen tiedostoon?"
#. IDS_MOVE_TO_NEXTPAGE
-#: Merge.rc:4846
+#: Merge.rc:4856
msgid "Move to next page?"
msgstr "Haluatko siirtyä seuraavalle sivulle?"
#. IDS_MOVE_TO_PREVPAGE
-#: Merge.rc:4847
+#: Merge.rc:4857
msgid "Move to previous page?"
msgstr "Haluatko siirtyä edelliselle sivulle?"
#. IDS_MOVE_TO_FIRSTFILE
-#: Merge.rc:4848
+#: Merge.rc:4858
msgid "Move to first file?"
msgstr "Haluatko siirtyä ensimmäiseen tiedostoon?"
#. IDS_MOVE_TO_LASTFILE
-#: Merge.rc:4849
+#: Merge.rc:4859
msgid "Move to last file?"
msgstr "Haluatko siirtyä viimeiseen tiedostoon?"
-#: Merge.rc:4856
+#: Merge.rc:4866
#, c-format
msgid "Different codepages: left (cp%d), right (cp%d).\nDisplay in codepage (better display) or default Windows codepage (safer merging)?\n(Recommended: default Windows codepage)"
msgstr ""
@@ -6924,53 +6935,53 @@ msgstr ""
"yhdistäminen/kopiointi on vaarallista.\n"
"Haluatko käsitellä molemmat tiedostot Windowsin oletusmerkistöllä (suositus)?"
-#: Merge.rc:4858
+#: Merge.rc:4868
msgid "Information lost due to encoding errors: both files"
msgstr "Tietoja menetettiin koodausvirheistä johtuen: molemmat tiedostot"
-#: Merge.rc:4860
+#: Merge.rc:4870
msgid "Information lost due to encoding errors: first file"
msgstr "Koodausvirheiden vuoksi menetetyt tiedot: ensimmäinen tiedosto"
-#: Merge.rc:4862
+#: Merge.rc:4872
msgid "Information lost due to encoding errors: second file"
msgstr "Koodausvirheiden vuoksi menetetyt tiedot: toinen tiedosto"
-#: Merge.rc:4864
+#: Merge.rc:4874
msgid "Information lost due to encoding errors: third file"
msgstr "Koodausvirheiden vuoksi menetetyt tiedot: kolmas tiedosto"
#. IDS_LINEDIFF_NODIFF
-#: Merge.rc:4870
+#: Merge.rc:4880
msgid "No difference"
msgstr "Ei eroja"
#. IDS_LINEDIFF_NODIFF_CAPTION
-#: Merge.rc:4871
+#: Merge.rc:4881
msgid "Line difference"
msgstr "Rivien välinen ero"
#. IDS_NUM_REPLACED
-#: Merge.rc:4877
+#: Merge.rc:4887
#, c-format
msgid "Replaced %1 string(s)."
msgstr "Korvattu %1 merkkijono(a)."
#. IDS_EDIT_TEXT_NOT_FOUND
-#: Merge.rc:4878
+#: Merge.rc:4888
#, c-format
msgid "Cannot find string \"%s\"."
msgstr "Merkkijonoa \"%s\" ei löydy."
#. IDS_MERGE_MODE
-#: Merge.rc:4884
+#: Merge.rc:4894
msgid "Entering Merge Mode. Press F9 to turn off."
msgstr ""
"Olet nyt siirtymässä yhdistämistilaan. Jos haluat poistua yhdistämistilasta, "
"paina F9-näppäintä."
#. IDS_AUTO_MERGE
-#: Merge.rc:4890
+#: Merge.rc:4900
#, c-format
msgid ""
"Automatic merges: %1\n"
@@ -6980,99 +6991,99 @@ msgstr ""
"Ratkaisemattomien ristiriitojen määrä: %2"
#. IDS_CODEPAGE_MERGED
-#: Merge.rc:4891
+#: Merge.rc:4901
msgid "Codepage change merged."
msgstr "Koodisivun muutos on yhdistetty."
#. IDS_CODEPAGE_CONFLICT
-#: Merge.rc:4892
+#: Merge.rc:4902
msgid "Codepage changes are conflicting."
msgstr "Koodisivun muutokset ovat ristiriitaisia."
#. IDS_EOL_MERGED
-#: Merge.rc:4893
+#: Merge.rc:4903
msgid "EOL change merged."
msgstr "EOL-muutos on yhdistetty."
#. IDS_EOL_CONFLICT
-#: Merge.rc:4894
+#: Merge.rc:4904
msgid "EOL changes are conflicting."
msgstr "EOL-muutokset ovat ristiriitaisia."
#. IDS_LOCBAR_CAPTION
-#: Merge.rc:4900
+#: Merge.rc:4910
msgid "Location Pane"
msgstr "Sijaintiruutu"
#. IDS_DIFFBAR_CAPTION
-#: Merge.rc:4901
+#: Merge.rc:4911
msgid "Diff Pane"
msgstr "Eroavuusruutu"
#. IDS_DIFF_SUCCEEDED
-#: Merge.rc:4908
+#: Merge.rc:4918
msgid "Patch file written."
msgstr "Paikkaustiedoston kirjoitus onnistui."
#. IDS_DIFF_ITEM1NOTFOUND
-#: Merge.rc:4909
+#: Merge.rc:4919
msgid "First item not found!"
msgstr "1. kohdetta ei löydy!"
#. IDS_DIFF_ITEM2NOTFOUND
-#: Merge.rc:4910
+#: Merge.rc:4920
msgid "Second item not found!"
msgstr "2. kohdetta ei löydy!"
#. IDS_DIFF_FILEOVERWRITE
-#: Merge.rc:4911
+#: Merge.rc:4921
msgid "Patch file already exists. Overwrite?"
msgstr "Paikkaustiedosto on jo olemassa. Haluatko korvata sen?"
#. IDS_DIFF_SELECTEDFILES
-#: Merge.rc:4912
+#: Merge.rc:4922
#, c-format
msgid "[%1 files selected]"
msgstr "[%1 tiedostoa valittu]"
#. IDS_DIFF_NORMAL
-#: Merge.rc:4913
+#: Merge.rc:4923
msgid "Normal"
msgstr "Normaali"
#. IDS_DIFF_CONTEXT
-#: Merge.rc:4914
+#: Merge.rc:4924
msgid "Context"
msgstr "Konteksti"
#. IDS_DIFF_UNIFIED
-#: Merge.rc:4915
+#: Merge.rc:4925
msgid "Unified"
msgstr "Yhtenäistetty"
#. IDS_FILEWRITE_ERROR
-#: Merge.rc:4917
+#: Merge.rc:4927
#, c-format
msgid "Could not write to file %1."
msgstr "Ei voitu kirjoittaa tiedostoon %1."
#. IDS_PATH_NOT_ABSOLUTE
-#: Merge.rc:4918
+#: Merge.rc:4928
#, c-format
msgid "Output path is not absolute: %1"
msgstr "Määritetty kohdepolku ei ole absoluuttinen polku: %1"
#. IDS_MUST_SPECIFY_OUTPUT
-#: Merge.rc:4919
+#: Merge.rc:4929
msgid "Specify an output file."
msgstr "Määrittele kohdetiedost."
-#: Merge.rc:4921
+#: Merge.rc:4931
msgid "Cannot create patch from binary files."
msgstr "Paikkaustiedostoa ei voi luoda binääritiedostoista."
#. IDS_SAVEFILES_FORPATCH
-#: Merge.rc:4922
+#: Merge.rc:4932
msgid ""
"Save all files first.\n"
"\n"
@@ -7084,12 +7095,12 @@ msgstr ""
"tallentamattomia muutoksia."
#. IDS_FOLDER_NOTEXIST
-#: Merge.rc:4923
+#: Merge.rc:4933
msgid "Folder does not exist."
msgstr "Kansiota ei ole olemassa."
#. IDS_NO_ZIP_SUPPORT
-#: Merge.rc:4928
+#: Merge.rc:4938
msgid "Archive support not enabled.\n7-Zip and/or Merge7z*.dll not found.\nSee manual for archive support."
msgstr ""
"Arkistotuki ei ole käytössä.\n"
@@ -7098,37 +7109,37 @@ msgstr ""
"Katso käyttöohjeesta lisätietoja arkistotuesta ja kuinka se otetaan käyttöön."
#. IDS_OPT_EXPORT_CAPTION
-#: Merge.rc:4929
+#: Merge.rc:4939
msgid "Select file for export"
msgstr "Valitse vietävä tiedosto"
#. IDS_OPT_IMPORT_CAPTION
-#: Merge.rc:4930
+#: Merge.rc:4940
msgid "Select file for import"
msgstr "Valitse tuotava tiedosto"
#. IDS_OPT_IMPORT_DONE
-#: Merge.rc:4931
+#: Merge.rc:4941
msgid "Options imported from file."
msgstr "Asetukset tuotu tiedostosta."
#. IDS_OPT_EXPORT_DONE
-#: Merge.rc:4932
+#: Merge.rc:4942
msgid "Options exported to file."
msgstr "Asetukset viety tiedostoon."
#. IDS_OPT_IMPORT_ERR
-#: Merge.rc:4933
+#: Merge.rc:4943
msgid "Failed to import options from file."
msgstr "Asetuksien tuonti tiedostosta epäonnistui."
#. IDS_OPT_EXPORT_ERR
-#: Merge.rc:4934
+#: Merge.rc:4944
msgid "Failed to write options to file."
msgstr "Asetuksien kirjoitus tiedostoon epäonnistui."
#. IDS_CLOSEALL_WINDOWS
-#: Merge.rc:4935
+#: Merge.rc:4945
msgid ""
"Close multiple compare windows?\n"
"\n"
@@ -7139,44 +7150,44 @@ msgstr ""
"Haluatko jatkaa?"
#. IDS_EOL_MIXED
-#: Merge.rc:4944
+#: Merge.rc:4954
msgid "Mixed"
msgstr "Sekoitettu"
#. IDS_EOL_BIN
-#: Merge.rc:4945
+#: Merge.rc:4955
msgctxt "EOL Type"
msgid "Binary"
msgstr "Binääri"
#. IDS_EOL_NONE
-#: Merge.rc:4949
+#: Merge.rc:4959
msgid "None"
msgstr "Ei mitään"
#. IDS_MARKER_COLOR_FMT
-#: Merge.rc:4950
+#: Merge.rc:4960
#, c-format
msgid "Marker Color %d"
msgstr "Merkin väri %d"
#. IDS_MARKER_NEW_PATTERN
-#: Merge.rc:4951
+#: Merge.rc:4961
msgid "New Pattern"
msgstr "Uusi kuvio"
#. IDS_PLUGINSLIST_TYPE
-#: Merge.rc:4957
+#: Merge.rc:4967
msgid "Type"
msgstr "Tyyppi"
#. IDS_PLUGINS_TYPE_EDITSCRIPT
-#: Merge.rc:4961
+#: Merge.rc:4971
msgid "Editor script"
msgstr "Muokkainskripti"
#. ID_SELECTLINEDIFF
-#: Merge.rc:4967
+#: Merge.rc:4977
msgid ""
"\n"
"Difference in Current Line (F4)"
@@ -7185,7 +7196,7 @@ msgstr ""
"Ero nykyisessä rivissä (F4)"
#. ID_OPTIONS
-#: Merge.rc:4968
+#: Merge.rc:4978
msgid ""
"\n"
"Options"
@@ -7194,7 +7205,7 @@ msgstr ""
"Asetukset"
#. ID_REFRESH
-#: Merge.rc:4969
+#: Merge.rc:4979
msgid ""
"\n"
"Refresh (F5)"
@@ -7203,7 +7214,7 @@ msgstr ""
"Päivitä (F5)"
#. ID_PREVDIFF
-#: Merge.rc:4975
+#: Merge.rc:4985
msgid ""
"\n"
"Previous Difference (Alt+Up)"
@@ -7212,7 +7223,7 @@ msgstr ""
"Edellinen ero (Alt+Up)"
#. ID_NEXTDIFF
-#: Merge.rc:4976
+#: Merge.rc:4986
msgid ""
"\n"
"Next Difference (Alt+Down)"
@@ -7221,7 +7232,7 @@ msgstr ""
"Seuraava ero (Alt+Down)"
#. ID_PREVCONFLICT
-#: Merge.rc:4977
+#: Merge.rc:4987
msgid ""
"\n"
"Previous Conflict (Alt+Shift+Up)"
@@ -7230,7 +7241,7 @@ msgstr ""
"Edellinen ristiriita (Alt+Shift+Up)"
#. ID_NEXTCONFLICT
-#: Merge.rc:4978
+#: Merge.rc:4988
msgid ""
"\n"
"Next Conflict (Alt+Shift+Down)"
@@ -7239,7 +7250,7 @@ msgstr ""
"Seuraava ristiriita (Alt+Shift+Down)"
#. ID_FIRSTDIFF
-#: Merge.rc:4983
+#: Merge.rc:4993
msgid ""
"\n"
"First Difference (Alt+Home)"
@@ -7248,7 +7259,7 @@ msgstr ""
"Ensimmäinen ero (Alt+Home)"
#. ID_CURDIFF
-#: Merge.rc:4984
+#: Merge.rc:4994
msgid ""
"\n"
"Current Difference (Alt+Enter)"
@@ -7257,7 +7268,7 @@ msgstr ""
"Nykyinen ero (Alt+Enter)"
#. ID_LASTDIFF
-#: Merge.rc:4985
+#: Merge.rc:4995
msgid ""
"\n"
"Last Difference (Alt+End)"
@@ -7266,37 +7277,37 @@ msgstr ""
"Viimeinen ero (Alt+End)"
#. ID_L2R
-#: Merge.rc:4986
+#: Merge.rc:4996
msgid "\nCopy to Right (Alt+Right)"
msgstr ""
#. ID_R2L
-#: Merge.rc:4987
+#: Merge.rc:4997
msgid "\nCopy to Left (Alt+Left)"
msgstr ""
#. ID_L2RNEXT
-#: Merge.rc:4988
+#: Merge.rc:4998
msgid "\nCopy to Right and Advance (Ctrl+Alt+Right)"
msgstr ""
#. ID_R2LNEXT
-#: Merge.rc:4989
+#: Merge.rc:4999
msgid "\nCopy to Left and Advance (Ctrl+Alt+Left)"
msgstr ""
#. ID_ALL_RIGHT
-#: Merge.rc:4990
+#: Merge.rc:5000
msgid "\nCopy All to Right"
msgstr ""
#. ID_ALL_LEFT
-#: Merge.rc:4991
+#: Merge.rc:5001
msgid "\nCopy All to Left"
msgstr ""
#. ID_AUTO_MERGE
-#: Merge.rc:4992
+#: Merge.rc:5002
msgid ""
"\n"
"Auto Merge (Ctrl+Alt+M)"
@@ -7305,7 +7316,7 @@ msgstr ""
"Yhdistä automaattisesti (Ctrl+Alt+M)"
#. ID_FIRSTFILE
-#: Merge.rc:4993
+#: Merge.rc:5003
msgid ""
"\n"
"First File"
@@ -7314,7 +7325,7 @@ msgstr ""
"Ensimmäinen tiedosto"
#. ID_NEXTFILE
-#: Merge.rc:4994
+#: Merge.rc:5004
msgid ""
"\n"
"Next File (Ctrl+F8)"
@@ -7323,7 +7334,7 @@ msgstr ""
"Seuraava tiedosto (Ctrl+F8)"
#. ID_LASTFILE
-#: Merge.rc:4995
+#: Merge.rc:5005
msgid ""
"\n"
"Last File"
@@ -7332,7 +7343,7 @@ msgstr ""
"Viimeinen tiedosto"
#. ID_PREVFILE
-#: Merge.rc:4996
+#: Merge.rc:5006
msgid ""
"\n"
"Previous File (Ctrl+F7)"
@@ -7341,39 +7352,39 @@ msgstr ""
"Edellinen tiedosto (Ctrl+F7)"
#. IDS_UNPACK_AUTO
-#: Merge.rc:5003
+#: Merge.rc:5013
msgid "Adapted unpacker applied to both files (one needs extension)."
msgstr ""
"Mukautettua purkajaa käytetään molempiin tiedostoihin (vain yksi tiedosto "
"tarvitsee päätteen)."
#. IDS_NO_PREDIFFER
-#: Merge.rc:5004
+#: Merge.rc:5014
msgid "No Prediffer (Normal)"
msgstr "Ei esivertailua (normaali)"
#. IDS_SUGGESTED_PLUGINS
-#: Merge.rc:5005
+#: Merge.rc:5015
msgid "Suggested Plugins"
msgstr "Suositellut lisäosat"
#. IDS_NOT_SUGGESTED_PLUGINS
-#: Merge.rc:5006
+#: Merge.rc:5016
msgid "All Plugins"
msgstr "Kaikki laajennukset"
#. IDS_PRIVATEBUILD_FMT
-#: Merge.rc:5012
+#: Merge.rc:5022
#, c-format
msgid "Private Build: %1"
msgstr "Yksityinen rakenne: %1"
#. IDS_CHECKFORUPDATES_UPTODATE
-#: Merge.rc:5013
+#: Merge.rc:5023
msgid "Your software is up to date."
msgstr "Ohjelmisto on ajan tasalla."
-#: Merge.rc:5015
+#: Merge.rc:5025
#, c-format
msgid ""
"WinMerge update available.\n"
@@ -7383,125 +7394,125 @@ msgstr ""
"%1 on nyt saatavilla (sinulla on %2). Haluatko ladata sen nyt?"
#. IDS_ALLRIGHTS_RESERVED
-#: Merge.rc:5016
+#: Merge.rc:5026
msgid " - All rights reserved."
msgstr ""
#. IDS_CHECKFORUPDATES_FAILED
-#: Merge.rc:5021
+#: Merge.rc:5031
msgid "Failed to download latest version information"
msgstr "Uusimpien versiotietojen lataaminen epäonnistui"
#. IDS_TITLE_PLUGINS_SETTINGS
-#: Merge.rc:5027
+#: Merge.rc:5037
msgid "Plugin Settings"
msgstr "Lisäosien asetukset"
#. IDS_NO_SCT_SCRIPTS
-#: Merge.rc:5029
+#: Merge.rc:5039
msgid "WSH not found - .sct scripts disabled"
msgstr "WSH ei löytynyt - .sct skriptit poistettu käytöstä"
#. IDS_LOCBAR_GOTOLINE_FMT
-#: Merge.rc:5037
+#: Merge.rc:5047
#, c-format
msgid "G&o to Line %1"
msgstr "Siirry riville %1"
#. IDS_GOTO_MOVED_LINE
-#: Merge.rc:5043
+#: Merge.rc:5053
msgid "Go to Moved Line\tCtrl+Shift+G"
msgstr "Siirry siirrettyyn riviin\tCtrl+Shift+G"
#. IDS_AUTOCOMPLETE_DISABLED
-#: Merge.rc:5049
+#: Merge.rc:5059
msgctxt "Options dialog|General|Open dialog Auto completion"
msgid "Disabled"
msgstr ""
#. IDS_AUTOCOMPLETE_FILE_SYS
-#: Merge.rc:5050
+#: Merge.rc:5060
msgid "From file system"
msgstr "Tiedostojärjestelmästä"
#. IDS_AUTOCOMPLETE_MRU
-#: Merge.rc:5051
+#: Merge.rc:5061
msgid "From Most Recently Used list"
msgstr "MRU listalta"
#. IDS_COLORSCHEME_PLAIN
-#: Merge.rc:5057
+#: Merge.rc:5067
msgid "No Highlighting"
msgstr "Ei korostusta"
#. IDS_COLORSCHEME_BATCH
-#: Merge.rc:5063
+#: Merge.rc:5073
msgid "Batch"
msgstr "Erä"
#. IDS_COLORSCHEME_PO
-#: Merge.rc:5090
+#: Merge.rc:5100
msgid "Portable Object"
msgstr "Siirrettävä objekti"
#. IDS_COLORSCHEME_RSRC
-#: Merge.rc:5094
+#: Merge.rc:5104
msgid "Resources"
msgstr "Resurssit"
#. IDS_COLORSCHEME_SH
-#: Merge.rc:5098
+#: Merge.rc:5108
msgid "Shell"
msgstr "Shell"
#. IDS_CLOSE_LEFT_TABS
-#: Merge.rc:5115
+#: Merge.rc:5125
msgid "Close &Left Tabs"
msgstr "Sulje vasemmat väli&lehdet"
#. IDS_CLOSE_RIGHT_TABS
-#: Merge.rc:5116
+#: Merge.rc:5126
msgid "Close R&ight Tabs"
msgstr "Sulje oikeat väl&ilehdet"
#. IDS_CLOSE_OTHER_TABS
-#: Merge.rc:5117
+#: Merge.rc:5127
msgid "Close &Other Tabs"
msgstr "Sulje &muut välilehdet"
#. IDS_TABBAR_AUTO_MAXWIDTH
-#: Merge.rc:5118
+#: Merge.rc:5128
msgid "Enable &Auto Max Width"
msgstr "Käytä &automaattista maksimi leveyttä"
#. IDS_WEBPAGE_MENU
-#: Merge.rc:5128
+#: Merge.rc:5138
msgid "We&bpage"
msgstr "Ver&kkosivu"
#. IDS_VIEW_WRAP_TEXT
-#: Merge.rc:5133
+#: Merge.rc:5143
msgid "W&rap Text"
msgstr ""
#. IDS_NOTINSTALLED
-#: Merge.rc:5138
+#: Merge.rc:5148
msgid "%1 is not installed."
msgstr "%1 ei ole asennettu."
#. IDS_CREATE_FOLDER
-#: Merge.rc:5143
+#: Merge.rc:5153
#, c-format
msgid "%1 does not exist. Create it?"
msgstr "%1 ei ole. Haluatko luoda sen?"
#. IDS_CREATE_FOLDER_ERROR
-#: Merge.rc:5144
+#: Merge.rc:5154
msgid "Failed to create folder."
msgstr "Kansiota ei voitu luoda."
#. IDC_EXT_EDITOR_PATH
-#: Merge.rc:5149
+#: Merge.rc:5159
msgid ""
"Parameters:\n"
"$file: Current file path\n"
@@ -7512,303 +7523,303 @@ msgstr ""
"$linenum: Kohdistimen nykyisen sijainnin rivinumero"
#. IDS_DIFF_ALGORITHM_DEFAULT
-#: Merge.rc:5154
+#: Merge.rc:5164
msgid "default"
msgstr "oletus"
#. IDS_DIFF_ALGORITHM_MINIMAL
-#: Merge.rc:5155
+#: Merge.rc:5165
msgid "minimal"
msgstr "minimaalinen"
#. IDS_DIFF_ALGORITHM_PATIENCE
-#: Merge.rc:5156
+#: Merge.rc:5166
msgid "patience"
msgstr "kärsivällisyyttä"
#. IDS_DIFF_ALGORITHM_HISTOGRAM
-#: Merge.rc:5157
+#: Merge.rc:5167
msgid "histogram"
msgstr "histogrammi"
#. IDS_DIFF_ALGORITHM_NONE
-#: Merge.rc:5158
+#: Merge.rc:5168
msgid "none"
msgstr "ei mikään"
#. IDS_RENDERING_MODE_GDI
-#: Merge.rc:5163
+#: Merge.rc:5173
msgid "GDI"
msgstr "GDI"
#. IDS_RENDERING_MODE_DIRECTWRITE_DEFAULT
-#: Merge.rc:5164
+#: Merge.rc:5174
msgid "DirectWrite Default"
msgstr "DirectWrite oletus"
#. IDS_RENDERING_MODE_DIRECTWRITE_ALIASED
-#: Merge.rc:5165
+#: Merge.rc:5175
msgid "DirectWrite Aliased"
msgstr "DirectWrite alias"
#. IDS_RENDERING_MODE_DIRECTWRITE_GDI_CLASSIC
-#: Merge.rc:5166
+#: Merge.rc:5176
msgid "DirectWrite GDI Classic"
msgstr "DirectWrite GDI klassinen"
#. IDS_RENDERING_MODE_DIRECTWRITE_GDI_NATURAL
-#: Merge.rc:5167
+#: Merge.rc:5177
msgid "DirectWrite GDI Natural"
msgstr "DirectWrite GDI luonnollinen"
#. IDS_RENDERING_MODE_DIRECTWRITE_NATURAL
-#: Merge.rc:5168
+#: Merge.rc:5178
msgid "DirectWrite Natural"
msgstr "DirectWrite luonnollinen"
#. IDS_RENDERING_MODE_DIRECTWRITE_NATURAL_SYMMETRIC
-#: Merge.rc:5169
+#: Merge.rc:5179
msgid "DirectWrite Natural Symmetric"
msgstr "DirectWrite Natural symmetrinen"
#. IDS_CLOSE_WINDOWS_WITH_ESC_DISABLED
-#: Merge.rc:5174
+#: Merge.rc:5184
msgctxt "Options dialog|General|Close windows with Esc"
msgid "Disabled"
msgstr ""
#. IDS_CLOSE_WINDOWS_WITH_ESC_1
-#: Merge.rc:5175
+#: Merge.rc:5185
msgid "MDI child window or main window"
msgstr "MDI ali-ikkuna tai pääikkuna"
#. IDS_CLOSE_WINDOWS_WITH_ESC_2
-#: Merge.rc:5176
+#: Merge.rc:5186
msgid "MDI child window only"
msgstr "Vain MDI ali-ikkuna"
#. IDS_CLOSE_WINDOWS_WITH_ESC_3
-#: Merge.rc:5177
+#: Merge.rc:5187
msgid "Close main window if only one MDI child window"
msgstr "Sulje pääikkuna, jos on vain yksi MDI ali-ikkuna"
#. IDS_DIFF_GROUP
-#: Merge.rc:5182
+#: Merge.rc:5192
msgctxt "ImgMergeFrame|LocationPane"
msgid "Diff"
msgstr "Ero"
#. IDS_DIFF_HIGHLIGHT
-#: Merge.rc:5183
+#: Merge.rc:5193
msgctxt "ImgMergeFrame|LocationPane"
msgid "Highlight"
msgstr "Korostus"
#. IDS_DIFF_BLINK
-#: Merge.rc:5184
+#: Merge.rc:5194
msgctxt "ImgMergeFrame|LocationPane"
msgid "Blink"
msgstr "Vilkku"
#. IDS_DIFF_BLOCKSIZE
-#: Merge.rc:5185
+#: Merge.rc:5195
msgctxt "ImgMergeFrame|LocationPane"
msgid "Block Size"
msgstr "Lohkon koko"
#. IDS_DIFF_BLOCKALPHA
-#: Merge.rc:5186
+#: Merge.rc:5196
msgctxt "ImgMergeFrame|LocationPane"
msgid "Block Alpha"
msgstr "Lohko Alfa"
#. IDS_DIFF_CDTHRESHOLD
-#: Merge.rc:5187
+#: Merge.rc:5197
msgctxt "ImgMergeFrame|LocationPane"
msgid "CD Threshold"
msgstr "CD kynnys"
#. IDS_DIFF_INSERTION_DELETION_DETECTION
-#: Merge.rc:5188
+#: Merge.rc:5198
msgctxt "ImgMergeFrame|LocationPane"
msgid "Ins/Del Detection"
msgstr "Ins/Del-tunnistus"
#. IDS_OVERLAY_MODE_NONE
-#: Merge.rc:5189 Merge.rc:5194
+#: Merge.rc:5199 Merge.rc:5204
msgctxt "ImgMergeFrame|LocationPane"
msgid "None"
msgstr "Ei mikään"
#. IDS_DIFF_INSERTION_DELETION_DETECTION_VERTICAL
-#: Merge.rc:5190
+#: Merge.rc:5200
msgctxt "ImgMergeFrame|LocationPane"
msgid "Vertical"
msgstr "Pystysuora"
#. IDS_DIFF_INSERTION_DELETION_DETECTION_HORIZONTAL
-#: Merge.rc:5191
+#: Merge.rc:5201
msgctxt "ImgMergeFrame|LocationPane"
msgid "Horizontal"
msgstr "Vaakasuora"
#. IDS_OVERLAY_GROUP
-#: Merge.rc:5192
+#: Merge.rc:5202
msgctxt "ImgMergeFrame|LocationPane"
msgid "Overlay"
msgstr "Peite (Overlay)"
#. IDS_OVERLAY_ALPHA
-#: Merge.rc:5193
+#: Merge.rc:5203
msgctxt "ImgMergeFrame|LocationPane"
msgid "Alpha"
msgstr "Alfa"
#. IDS_OVERLAY_MODE_XOR
-#: Merge.rc:5195
+#: Merge.rc:5205
msgctxt "ImgMergeFrame|LocationPane"
msgid "XOR"
msgstr "XOR"
#. IDS_OVERLAY_MODE_ALPHA
-#: Merge.rc:5196
+#: Merge.rc:5206
msgctxt "ImgMergeFrame|LocationPane"
msgid "Alpha Blend"
msgstr "Alfasekoitus"
#. IDS_OVERLAY_MODE_ALPHA_ANIMATION
-#: Merge.rc:5197
+#: Merge.rc:5207
msgctxt "ImgMergeFrame|LocationPane"
msgid "Alpha Animation"
msgstr "Alfa-animaatio"
#. IDS_ZOOM
-#: Merge.rc:5198
+#: Merge.rc:5208
msgctxt "ImgMergeFrame|LocationPane"
msgid "Zoom"
msgstr "Suurennus"
#. IDS_PAGE
-#: Merge.rc:5199
+#: Merge.rc:5209
msgctxt "ImgMergeFrame|LocationPane"
msgid "Page:"
msgstr "Sivu:"
#. IDS_IMGCMP_STATUS_PT_RGBA_FMT
-#: Merge.rc:5200
+#: Merge.rc:5210
#, c-format
msgid "Pt: (%d, %d) RGBA: (%d, %d, %d, %d) "
msgstr "Pt: (%d, %d) RGBA: (%d, %d, %d, %d) "
#. IDS_IMGCMP_STATUS_DIST1_FMT
-#: Merge.rc:5201
+#: Merge.rc:5211
#, c-format
msgid "Dist: %g "
msgstr "Dist: %g "
#. IDS_IMGCMP_STATUS_DIST2_FMT
-#: Merge.rc:5202
+#: Merge.rc:5212
#, c-format
msgid "Dist: %g, %g "
msgstr "Dist: %g, %g "
#. IDS_IMGCMP_STATUS_PAGE_ZOOM_SIZE_BPP_FMT
-#: Merge.rc:5203
+#: Merge.rc:5213
#, c-format
msgid "Page: %d/%d Zoom: %d%% %dx%dpx %dbpp "
msgstr ""
#. IDS_IMGCMP_STATUS_RC_FMT
-#: Merge.rc:5204
+#: Merge.rc:5214
#, c-format
msgid "Rc: (%d, %d) "
msgstr "Rc: (%d, %d) "
#. IDS_IMGCMP_STATUS_FLIPPED_FMT
-#: Merge.rc:5205
+#: Merge.rc:5215
#, c-format
msgid "Flipped: %s "
msgstr "Käännetty: %s "
#. IDS_IMGCMP_STATUS_ROTATED_FMT
-#: Merge.rc:5206
+#: Merge.rc:5216
#, c-format
msgid "Rotated: %d "
msgstr "Kierretty: %d "
#. IDS_IMGCMP_REPORT_ALLPAGES
-#: Merge.rc:5207
+#: Merge.rc:5217
msgid "All pages"
msgstr "Kaikki sivut"
#. IDS_IGNSUB_STR1
-#: Merge.rc:5212
+#: Merge.rc:5222
msgid ""
msgstr ""
#. IDS_IGNSUB_STR2
-#: Merge.rc:5213
+#: Merge.rc:5223
msgid "No differences found to select"
msgstr "Valittavissa olevia eroja ei löydy"
#. IDS_IGNSUB_STR3
-#: Merge.rc:5214
+#: Merge.rc:5224
msgid "No differences found to add as substitution filter"
msgstr ""
#. IDS_IGNSUB_STR4
-#: Merge.rc:5215
+#: Merge.rc:5225
msgid "The pair is already in the Substitution Filters list"
msgstr ""
#. IDS_IGNSUB_STR5
-#: Merge.rc:5216
+#: Merge.rc:5226
msgid "Add this change to Substitution Filters?"
msgstr ""
#. IDS_OCRRESULT_TEXTONLY
-#: Merge.rc:5221
+#: Merge.rc:5231
msgid "Text only"
msgstr "Vain teksti"
#. IDS_OCRRESULT_POS_LINE
-#: Merge.rc:5222
+#: Merge.rc:5232
msgid "Line-by-line position and text"
msgstr "Rivikohtainen sijainti ja teksti"
#. IDS_OCRRESULT_POS_WORD
-#: Merge.rc:5223
+#: Merge.rc:5233
msgid "Word-by-word position and text"
msgstr "Sanakohtainen sijainti ja teksti"
#. IDS_USERDATAFOLDER_APPDATA
-#: Merge.rc:5228
+#: Merge.rc:5238
msgid "AppData (Roaming) folder"
msgstr ""
#. IDS_USERDATAFOLDER_INSTALL
-#: Merge.rc:5229
+#: Merge.rc:5239
msgid "Install folder"
msgstr "Asennuskansio"
#. IDS_USERDATAFOLDER_DOCUMENTS
-#: Merge.rc:5230
+#: Merge.rc:5240
msgid "Documents folder"
msgstr ""
#. IDS_SINGLEINSTANCE_DISABLED
-#: Merge.rc:5235
+#: Merge.rc:5245
msgctxt "Options dialog|General|Single instance mode"
msgid "Disabled"
msgstr ""
#. IDS_SINGLEINSTANCE_STR1
-#: Merge.rc:5236
+#: Merge.rc:5246
msgid "Allow only one instance to run"
msgstr ""
#. IDS_SINGLEINSTANCE_STR2
-#: Merge.rc:5237
+#: Merge.rc:5247
msgid ""
"Allow only one instance; wait for termination"
msgstr ""
@@ -7816,577 +7827,582 @@ msgstr ""
"lopetetaan"
#. IDS_AUTO_RELOAD_MODIFIED_FILES_DISABLED
-#: Merge.rc:5242
+#: Merge.rc:5252
msgctxt "Options dialog|General|Auto-reload modified files"
msgid "Disabled"
msgstr ""
#. IDS_AUTO_RELOAD_MODIFIED_FILES_STR1
-#: Merge.rc:5243
+#: Merge.rc:5253
msgid "Only on window activated"
msgstr ""
#. IDS_AUTO_RELOAD_MODIFIED_FILES_STR2
-#: Merge.rc:5244
+#: Merge.rc:5254
msgid "Immediately"
msgstr ""
#. IDS_PLUGIN_ALL
-#: Merge.rc:5249
+#: Merge.rc:5259
msgid "Al&l"
msgstr "K&aikki"
#. IDS_PLUGIN_OTHERS
-#: Merge.rc:5250
+#: Merge.rc:5260
msgid "&Others"
msgstr "&Muut"
-#: Merge.rc:5252
+#: Merge.rc:5262
#, c-format
msgid "Missing plugin name in pipeline: %1"
msgstr "Puuttuva lisäosan nimi laajennusputkessa: %1"
-#: Merge.rc:5254
+#: Merge.rc:5264
#, c-format
msgid "Missing quote in plugin pipeline: %1"
msgstr "Puuttuva lainausmerkki laajennusputkessa: %1"
#. IDS_PLUGIN_NAME_ALREADY_EXISTS
-#: Merge.rc:5255
+#: Merge.rc:5265
#, c-format
msgid "Plugin name '%1' already exists."
msgstr ""
#. IDS_PLUGIN_TITLE1
-#: Merge.rc:5256
+#: Merge.rc:5266
msgid "Specify plugin arguments"
msgstr "Määritä laajennuksen argumentit"
-#: Merge.rc:5258
+#: Merge.rc:5268
#, c-format
msgid "Plugin not found or invalid: %1"
msgstr ""
#. IDS_PLUGIN_NOT_UNPACK
-#: Merge.rc:5259
+#: Merge.rc:5269
#, c-format
msgid "'%1' is not an unpacker plugin"
msgstr ""
#. IDS_PLUGIN_NOT_PREDIFF
-#: Merge.rc:5260
+#: Merge.rc:5270
#, c-format
msgid "'%1' is not a prediffer plugin"
msgstr ""
-#: Merge.rc:5262
+#: Merge.rc:5272
#, c-format
msgid "Error prediffing '%1' with '%2'. Prediffing disabled."
msgstr ""
#. IDS_PLUGIN_CIRCULAR_REFERENCE
-#: Merge.rc:5263
+#: Merge.rc:5273
#, c-format
msgid "Circular reference in plugin pipeline: %1"
msgstr ""
#. IDS_PLUGIN_TYPE1
-#: Merge.rc:5264
+#: Merge.rc:5274
msgid "URL Handler"
msgstr ""
#. IDS_PLUGIN_TYPE2
-#: Merge.rc:5265
+#: Merge.rc:5275
msgid "File Unpacker"
msgstr ""
#. IDS_PLUGIN_TYPE3
-#: Merge.rc:5266
+#: Merge.rc:5276
msgid "File or Folder Unpacker"
msgstr ""
#. IDS_PLUGIN_TYPE5
-#: Merge.rc:5268
+#: Merge.rc:5278
msgid "Alias for Unpacker"
msgstr ""
#. IDS_PLUGIN_TYPE6
-#: Merge.rc:5269
+#: Merge.rc:5279
msgid "Alias for Prediffer"
msgstr ""
#. IDS_PLUGIN_TYPE7
-#: Merge.rc:5270
+#: Merge.rc:5280
msgid "Alias for Editor script"
msgstr ""
#. IDS_PLUGIN_ALIAS_DESC
-#: Merge.rc:5271
+#: Merge.rc:5281
#, c-format
msgid "Alias for plugin pipeline '%1'"
msgstr ""
#. IDS_PLUGIN_NEW_DESC
-#: Merge.rc:5272
+#: Merge.rc:5282
msgid "New plugin description"
msgstr ""
#. IDS_PLUGIN_TARGETS_ALL
-#: Merge.rc:5273
+#: Merge.rc:5283
msgid "All"
msgstr ""
#. IDS_PLUGIN_TARGETS_1ST
-#: Merge.rc:5274
+#: Merge.rc:5284
msgid "1st"
msgstr ""
#. IDS_PLUGIN_TARGETS_2ND
-#: Merge.rc:5275
+#: Merge.rc:5285
msgid "2nd"
msgstr ""
#. IDS_PLUGIN_TARGETS_3RD
-#: Merge.rc:5276
+#: Merge.rc:5286
msgid "3rd"
msgstr ""
#. IDS_PLUGIN_TARGETS_1ST_2ND
-#: Merge.rc:5277
+#: Merge.rc:5287
msgid "1st and 2nd"
msgstr ""
#. IDS_PLUGIN_TARGETS_1ST_3RD
-#: Merge.rc:5278
+#: Merge.rc:5288
msgid "1st and 3rd"
msgstr ""
#. IDS_PLUGIN_TARGETS_2ND_3RD
-#: Merge.rc:5279
+#: Merge.rc:5289
msgid "2nd and 3rd"
msgstr ""
#. IDS_FILTER_APPLIED
-#: Merge.rc:5284
+#: Merge.rc:5294
msgid "Filter applied"
msgstr "Sovellettu suodatin"
#. IDS_FILTERMENU_COMPARE
-#: Merge.rc:5289
+#: Merge.rc:5299
#, c-format
msgid "Compare %1"
msgstr ""
#. IDS_FILTERMENU_FILTER_BY_THIS_COLUMN
-#: Merge.rc:5290
+#: Merge.rc:5300
msgid "&Filter by This Column"
msgstr ""
#. IDS_FILTERMENU_FILTER_BY_THIS_COLUMN2
-#: Merge.rc:5291
+#: Merge.rc:5301
msgid "&Filter by This Column..."
msgstr ""
#. IDS_CLIPBOARDHISTORY_TIME
-#: Merge.rc:5296
+#: Merge.rc:5306
#, c-format
msgid "Clipboard at %s"
msgstr "Leikepöytä %s"
#. IDS_CLIPBOARDHISTORY_DISABLED
-#: Merge.rc:5297
+#: Merge.rc:5307
msgid "Clipboard history disabled.\r\nEnable: Windows logo key + V, then Turn on."
msgstr ""
-#: Merge.rc:5299
+#: Merge.rc:5309
msgid "This system does not support clipboard history."
msgstr "Tämä järjestelmä ei tue leikepöydän historiaa."
-#: Merge.rc:5301
+#: Merge.rc:5311
msgid "32-bit WinMerge does not support Clipboard Compare"
msgstr "WinMergen 32-bittinen versio ei tue leikepöytävertailua"
#. IDS_WEBVIEW2_RUNTIME_NOT_INSTALLED
-#: Merge.rc:5306
+#: Merge.rc:5316
msgid "WebView2 runtime not installed. Download it?"
msgstr "WebView2-runtimea ei ole asennettu. Haluatko ladata sen?"
#. IDS_JUMPLIST_NEW_TEXT_COMPARE
-#: Merge.rc:5311
+#: Merge.rc:5321
msgid "New Text Compare"
msgstr ""
#. IDS_JUMPLIST_NEW_TABLE_COMPARE
-#: Merge.rc:5312
+#: Merge.rc:5322
msgid "New Table Compare"
msgstr ""
#. IDS_JUMPLIST_NEW_BINARY_COMPARE
-#: Merge.rc:5313
+#: Merge.rc:5323
msgid "New Binary Compare"
msgstr ""
#. IDS_JUMPLIST_NEW_IMAGE_COMPARE
-#: Merge.rc:5314
+#: Merge.rc:5324
msgid "New Image Compare"
msgstr ""
#. IDS_JUMPLIST_NEW_WEBPAGE_COMPARE
-#: Merge.rc:5315
+#: Merge.rc:5325
msgid "New Webpage Compare"
msgstr ""
+#. IDS_JUMPLIST_NEW_FOLDER_COMPARE
+#: Merge.rc:5326
+msgid "New Folder Compare"
+msgstr ""
+
#. IDS_JUMPLIST_CLIPBOARD_COMPARE
-#: Merge.rc:5316
+#: Merge.rc:5327
msgid "Clipboard Compare"
msgstr ""
#. IDS_PREVIEWBAR_PRINT
-#: Merge.rc:5321
+#: Merge.rc:5332
msgid "&Print..."
msgstr ""
#. IDS_PREVIEWBAR_PREVPAGE
-#: Merge.rc:5323
+#: Merge.rc:5334
msgid "Pre&v Page"
msgstr ""
#. IDS_PREVIEWBAR_TWOPAGE
-#: Merge.rc:5324
+#: Merge.rc:5335
msgid "&Two Page"
msgstr ""
#. IDS_PREVIEWBAR_ONEPAGE
-#: Merge.rc:5325
+#: Merge.rc:5336
msgid "&One Page"
msgstr ""
#. IDS_PREVIEWBAR_ZOOMIN
-#: Merge.rc:5326
+#: Merge.rc:5337
msgid "Zoom &In"
msgstr ""
#. IDS_PREVIEWBAR_ZOOMOUT
-#: Merge.rc:5327
+#: Merge.rc:5338
msgid "Zoom &Out"
msgstr ""
#. IDS_WEBPAGE_COMPARING
-#: Merge.rc:5333
+#: Merge.rc:5344
msgid "Comparing..."
msgstr ""
#. IDS_WEBPAGE_ZOOM
-#: Merge.rc:5334
+#: Merge.rc:5345
msgid "Zoom:"
msgstr ""
#. IDS_COPY_GRANULARITY_DIFFHUNK
-#: Merge.rc:5339
+#: Merge.rc:5350
msgid "Diff hunk"
msgstr ""
#. IDS_COPY_GRANULARITY_INLINE
-#: Merge.rc:5340
+#: Merge.rc:5351
msgid "Inline diff"
msgstr ""
#. IDS_COPY_GRANULARITY_LINE
-#: Merge.rc:5341
+#: Merge.rc:5352
msgid "Line"
msgstr ""
-#: Merge.rc:5342
+#: Merge.rc:5353
msgid "Character"
msgstr ""
#. ID_MICE_PREVDIFF
-#: Merge.rc:5347
+#: Merge.rc:5358
msgid "\nPrevious Difference (Alt+Up)\n(Right Button+Wheel Up)\n(Alt+Wheel Up)"
msgstr ""
#. ID_MICE_NEXTDIFF
-#: Merge.rc:5348
+#: Merge.rc:5359
msgid "\nNext Difference (Alt+Down)\n(Right Button+Wheel Down)\n(Alt+Wheel Down)"
msgstr ""
#. ID_MICE_L2R
-#: Merge.rc:5349
+#: Merge.rc:5360
msgid "\nCopy to Right (Alt+Right)\n(Right Button+Wheel Right)\n(Alt+Wheel Right)\n(Alt+Shift+Wheel Down)"
msgstr ""
#. ID_MICE_R2L
-#: Merge.rc:5350
+#: Merge.rc:5361
msgid "\nCopy to Left (Alt+Left)\n(Right Button+Wheel Left)\n(Alt+Wheel Left)\n(Alt+Shift+Wheel Up)"
msgstr ""
#. ID_MICE_L2RNEXT
-#: Merge.rc:5351
+#: Merge.rc:5362
msgid "\nCopy to Right and Advance (Ctrl+Alt+Right)\n(Ctrl+Alt+Wheel Right)\n(Ctrl+Alt+Shift+Wheel Down)"
msgstr ""
#. ID_MICE_R2LNEXT
-#: Merge.rc:5352
+#: Merge.rc:5363
msgid "\nCopy to Left and Advance (Ctrl+Alt+Left)\n(Ctrl+Alt+Wheel Left)\n(Ctrl+Alt+Shift+Wheel Up)"
msgstr ""
#. IDS_LOG_COMPARING_2
-#: Merge.rc:5362
+#: Merge.rc:5373
#, c-format
msgid "Comparing %1 with %2"
msgstr ""
#. IDS_LOG_COMPARING_3
-#: Merge.rc:5363
+#: Merge.rc:5374
#, c-format
msgid "Comparing %1 with %2 and %3"
msgstr ""
#. IDS_LOG_COMPARE_COMPLETED
-#: Merge.rc:5364
+#: Merge.rc:5375
msgid "Comparison completed"
msgstr ""
#. IDS_LOG_COMPARE_ERROR_2
-#: Merge.rc:5365
+#: Merge.rc:5376
#, c-format
msgid "Failed to compare %1 with %2: "
msgstr ""
#. IDS_LOG_COMPARE_ERROR_3
-#: Merge.rc:5366
+#: Merge.rc:5377
#, c-format
msgid "Failed to compare %1 with %2 and %3: "
msgstr ""
#. IDS_LOG_FILE_SAVED
-#: Merge.rc:5367
+#: Merge.rc:5378
msgid "File saved"
msgstr ""
#. IDS_LOG_COPYING_FILES
-#: Merge.rc:5368
+#: Merge.rc:5379
msgid "Copying files..."
msgstr ""
#. IDS_LOG_MOVING_FILES
-#: Merge.rc:5369
+#: Merge.rc:5380
msgid "Moving files..."
msgstr ""
#. IDS_LOG_DELETING_FILES
-#: Merge.rc:5370
+#: Merge.rc:5381
msgid "Deleting files..."
msgstr ""
#. IDS_LOG_RECYCLEBIN
-#: Merge.rc:5371
+#: Merge.rc:5382
msgid "Recycle Bin"
msgstr ""
#. IDS_LOG_PERMANENTLY_DELETED
-#: Merge.rc:5372
+#: Merge.rc:5383
msgid "Permanently deleted"
msgstr ""
#. IDS_LOG_FILEOPERATION_COMPLETED
-#: Merge.rc:5373
+#: Merge.rc:5384
msgid "File operation completed successfully"
msgstr ""
#. IDS_LOG_FILEOPERATION_CANCELED
-#: Merge.rc:5374
+#: Merge.rc:5385
msgid "File operation canceled"
msgstr ""
#. IDS_FILTER_ERROR_NO_ERROR
-#: Merge.rc:5379
+#: Merge.rc:5390
msgid "No error"
msgstr ""
#. IDS_FILTER_ERROR_EMPTY_EXPRESSION
-#: Merge.rc:5380
+#: Merge.rc:5391
msgid "Filter expression is empty"
msgstr ""
#. IDS_FILTER_ERROR_UNKNOWN_CHAR
-#: Merge.rc:5381
+#: Merge.rc:5392
msgid "Unknown character in filter expression"
msgstr ""
#. IDS_FILTER_ERROR_UNTERMINATED_STRING
-#: Merge.rc:5382
+#: Merge.rc:5393
msgid "Unterminated string literal"
msgstr ""
#. IDS_FILTER_ERROR_SYNTAX_ERROR
-#: Merge.rc:5383
+#: Merge.rc:5394
msgid "Syntax error in filter expression"
msgstr ""
#. IDS_FILTER_ERROR_PARSE_FAILURE
-#: Merge.rc:5384
+#: Merge.rc:5395
msgid "Failed to parse filter expression"
msgstr ""
#. IDS_FILTER_ERROR_INVALID_LITERAL
-#: Merge.rc:5385
+#: Merge.rc:5396
msgid "Invalid literal value"
msgstr ""
#. IDS_FILTER_ERROR_INVALID_REGULAR_EXPRESSION
-#: Merge.rc:5386
+#: Merge.rc:5397
msgid "Invalid regular expression"
msgstr ""
#. IDS_FILTER_ERROR_UNDEFINED_IDENTIFIER
-#: Merge.rc:5387
+#: Merge.rc:5398
msgid "Undefined identifier"
msgstr ""
#. IDS_FILTER_ERROR_INVALID_ARGUMENT_COUNT
-#: Merge.rc:5388
+#: Merge.rc:5399
msgid "Invalid number of arguments"
msgstr ""
#. IDS_FILTER_ERROR_FILTER_NAME_NOT_FOUND
-#: Merge.rc:5389
+#: Merge.rc:5400
msgid "Filter name not found"
msgstr ""
#. IDS_FILTER_ERROR_DIVIDE_BY_ZERO
-#: Merge.rc:5390
+#: Merge.rc:5401
msgid "Division by zero in filter expression"
msgstr ""
#. IDS_FILTER_ERROR_UNKNOWN_ERROR
-#: Merge.rc:5391
+#: Merge.rc:5402
msgid "Unknown error"
msgstr ""
#. IDS_FILTER_ERROR_INVALID_PROPERTY_NAME
-#: Merge.rc:5392
+#: Merge.rc:5403
msgid "Invalid property name"
msgstr ""
#. IDS_FILTER_ERROR_INVALID_DIRECTIVE
-#: Merge.rc:5393
+#: Merge.rc:5404
msgid "Invalid directive"
msgstr ""
#. IDS_FILTER_OP_EQUALS
-#: Merge.rc:5398
+#: Merge.rc:5409
msgid "Equals"
msgstr ""
#. IDS_FILTER_OP_NOT_EQUALS
-#: Merge.rc:5399
+#: Merge.rc:5410
msgid "Does not equal"
msgstr ""
#. IDS_FILTER_OP_LESS_THAN
-#: Merge.rc:5400
+#: Merge.rc:5411
msgid "Less than"
msgstr ""
#. IDS_FILTER_OP_LESS_EQUAL
-#: Merge.rc:5401
+#: Merge.rc:5412
msgid "Less than or equal to"
msgstr ""
#. IDS_FILTER_OP_GREATER_EQUAL
-#: Merge.rc:5402
+#: Merge.rc:5413
msgid "Greater than or equal to"
msgstr ""
#. IDS_FILTER_OP_GREATER_THAN
-#: Merge.rc:5403
+#: Merge.rc:5414
msgid "Greater than"
msgstr ""
#. IDS_FILTER_OP_BETWEEN
-#: Merge.rc:5404
+#: Merge.rc:5415
msgid "Between"
msgstr ""
#. IDS_FILTER_OP_NOT_BETWEEN
-#: Merge.rc:5405
+#: Merge.rc:5416
msgid "Not Between"
msgstr ""
#. IDS_FILTER_OP_CONTAINS
-#: Merge.rc:5406
+#: Merge.rc:5417
msgid "Contains"
msgstr ""
#. IDS_FILTER_OP_NOT_CONTAINS
-#: Merge.rc:5407
+#: Merge.rc:5418
msgid "Not Contains"
msgstr ""
#. IDS_FILTER_OP_RECONTAINS
-#: Merge.rc:5408
+#: Merge.rc:5419
msgid "Contains (regex)"
msgstr ""
#. IDS_FILTER_OP_NOT_RECONTAINS
-#: Merge.rc:5409
+#: Merge.rc:5420
msgid "Not Contains (regex)"
msgstr ""
#. IDS_FILTER_OP_LIKE
-#: Merge.rc:5410
+#: Merge.rc:5421
msgid "Match (wildcard)"
msgstr ""
#. IDS_FILTER_OP_NOT_LIKE
-#: Merge.rc:5411
+#: Merge.rc:5422
msgid "Not match (wildcard)"
msgstr ""
#. IDS_FILTER_OP_MATCHES
-#: Merge.rc:5412
+#: Merge.rc:5423
msgid "Match (regex)"
msgstr ""
#. IDS_FILTER_OP_NOT_MATCHES
-#: Merge.rc:5413
+#: Merge.rc:5424
msgid "Not match (regex)"
msgstr ""
#. IDS_COLORMODE_LIGHT
-#: Merge.rc:5418
+#: Merge.rc:5429
msgid "Light"
msgstr ""
#. IDS_COLORMODE_DARK
-#: Merge.rc:5419
+#: Merge.rc:5430
msgid "Dark"
msgstr ""
#. IDS_COLORMODE_FOLLOWSYSTEM
-#: Merge.rc:5420
+#: Merge.rc:5431
msgid "Follow system"
msgstr ""
#. IDS_EXAMPLE
-#: Merge.rc:5425
+#: Merge.rc:5436
#, c-format
msgid "e.g. %1"
msgstr ""
#. IDS_DETECTED_PREVIOUS_CRASH
-#: Merge.rc:5430
+#: Merge.rc:5441
msgid "WinMerge detected a previous crash. Please report this if possible."
msgstr ""
#. IDS_REGEX_REPLACE_LIST_TEMPLATE
-#: Merge.rc:5435
+#: Merge.rc:5446
msgid "# Regex replacement list\r\n# Format: regexreplacement\r\n# Backreferences like $1, $2 are supported\r\n\r\n(\\d{4})-(\\d{2})-(\\d{2})\t$1_$2_$3\r\n"
msgstr ""
#. IDS_STRING_REPLACE_LIST_TEMPLATE
-#: Merge.rc:5436
+#: Merge.rc:5447
msgid "# Replacement list\r\n# Format: searchreplacement\r\n# Lines starting with # are ignored\r\n\r\nfrom1\tto1\r\nfrom2\tto2\r\n"
msgstr ""
diff --git a/Translations/WinMerge/French.po b/Translations/WinMerge/French.po
index 1e65e321c02..10630203b86 100644
--- a/Translations/WinMerge/French.po
+++ b/Translations/WinMerge/French.po
@@ -30,7 +30,7 @@ msgstr ""
"X-Poedit-Basepath: ../../Src\n"
#. LANGUAGE, SUBLANGUAGE
-#: Merge.rc:26 Merge.rc:59 Merge.rc:5453
+#: Merge.rc:26 Merge.rc:59 Merge.rc:5464
msgid "LANG_ENGLISH, SUBLANG_ENGLISH_US"
msgstr "LANG_FRENCH, SUBLANG_FRENCH"
@@ -115,7 +115,7 @@ msgid "Copy Selected Diff (Right) to Clipboard\tCtrl+&3"
msgstr "Copier la différence sélectionnée (Droite) dans le presse-papiers\tCtrl+&3"
#. IDR_MERGEDOCTYPE, ID_SELECTLINEDIFF
-#: Merge.rc:110 Merge.rc:673
+#: Merge.rc:110 Merge.rc:680
msgid "Select Line &Difference\tF4"
msgstr "&Sélectionner la différence suivante\tF4"
@@ -145,7 +145,7 @@ msgid "Cu&t"
msgstr "&Couper"
#. IDR_POPUP_DIRVIEW
-#: Merge.rc:118 Merge.rc:943
+#: Merge.rc:118 Merge.rc:951
msgid "&Copy"
msgstr "Co&pier"
@@ -155,19 +155,19 @@ msgid "&Paste"
msgstr "Co&ller"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:121 Merge.rc:875 Merge.rc:882
+#: Merge.rc:121 Merge.rc:882 Merge.rc:889
msgid "&Scripts"
msgstr "Appli&quer un script"
#. IDS_NO_EDIT_SCRIPTS
-#: Merge.rc:123 Merge.rc:338 Merge.rc:447 Merge.rc:654 Merge.rc:659
-#: Merge.rc:865 Merge.rc:877 Merge.rc:884 Merge.rc:940 Merge.rc:1183
-#: Merge.rc:5028
+#: Merge.rc:123 Merge.rc:340 Merge.rc:451 Merge.rc:661 Merge.rc:666
+#: Merge.rc:872 Merge.rc:884 Merge.rc:891 Merge.rc:948 Merge.rc:1193
+#: Merge.rc:5038
msgid "< Empty >"
msgstr "< Vide >"
#. IDR_POPUP_LOCATIONBAR, ID_EDIT_WMGOTO
-#: Merge.rc:126 Merge.rc:691 Merge.rc:1081
+#: Merge.rc:126 Merge.rc:698 Merge.rc:1089
msgid "&Go to...\tCtrl+G"
msgstr "&Atteindre...\tCtrl+G"
@@ -187,27 +187,27 @@ msgid "Op&en"
msgstr "&Ouvrir"
#. IDR_POPUP_DIRVIEW, ID_DIR_OPEN_RIGHT
-#: Merge.rc:132 Merge.rc:981 Merge.rc:988 Merge.rc:995
+#: Merge.rc:132 Merge.rc:989 Merge.rc:996 Merge.rc:1003
msgid "With &Registered Application"
msgstr "Avec l'application &désignée"
#. IDR_POPUP_DIRVIEW, ID_DIR_OPEN_RIGHT_WITHEDITOR
-#: Merge.rc:133 Merge.rc:982 Merge.rc:989 Merge.rc:996
+#: Merge.rc:133 Merge.rc:990 Merge.rc:997 Merge.rc:1004
msgid "With &External Editor\tCtrl+Alt+E"
msgstr "Avec un éditeur &externe\tCtrl+Alt+E"
#. IDR_POPUP_DIRVIEW, ID_DIR_OPEN_RIGHT_WITH
-#: Merge.rc:134 Merge.rc:983 Merge.rc:990 Merge.rc:997
+#: Merge.rc:134 Merge.rc:991 Merge.rc:998 Merge.rc:1005
msgid "&With..."
msgstr "&Avec une application du PC..."
#. IDR_POPUP_DIRVIEW, ID_DIR_OPEN_RIGHT_PARENT_FOLDER
-#: Merge.rc:135 Merge.rc:984 Merge.rc:991 Merge.rc:998
+#: Merge.rc:135 Merge.rc:992 Merge.rc:999 Merge.rc:1006
msgid "Open &Parent Folder..."
msgstr "Ouvrir le dossier &parent..."
#. IDR_POPUP_IMG_CTXT, ID_FILE_SHELLMENU
-#: Merge.rc:137 Merge.rc:1239
+#: Merge.rc:137 Merge.rc:1249
msgid "S&hell Menu"
msgstr "Menu du S&hell"
@@ -242,8 +242,8 @@ msgid "Ins&ertion/Deletion Detection"
msgstr "Détection d'ins&ertion/suppression"
#. IDR_MERGEDOCTYPE, ID_TOOLBAR_NONE
-#: Merge.rc:176 Merge.rc:209 Merge.rc:216 Merge.rc:358 Merge.rc:507
-#: Merge.rc:751
+#: Merge.rc:176 Merge.rc:209 Merge.rc:216 Merge.rc:360 Merge.rc:511
+#: Merge.rc:758
msgid "&None"
msgstr "&Aucune"
@@ -258,12 +258,12 @@ msgid "&Horizontal"
msgstr "&Horizontal"
#. IDR_POPUP_IMG_CTXT, ID_IMG_CURPANE_PREVPAGE
-#: Merge.rc:181 Merge.rc:189 Merge.rc:1230
+#: Merge.rc:181 Merge.rc:189 Merge.rc:1240
msgid "&Previous Page"
msgstr "Page &précédente"
#. IDS_PREVIEWBAR_NEXTPAGE
-#: Merge.rc:182 Merge.rc:190 Merge.rc:1231 Merge.rc:5322
+#: Merge.rc:182 Merge.rc:190 Merge.rc:1241 Merge.rc:5333
msgid "&Next Page"
msgstr "Page &suivante"
@@ -273,42 +273,42 @@ msgid "&Active Pane"
msgstr "Panneau &actif"
#. IDR_POPUP_IMG_CTXT, ID_IMG_CURPANE_ROTATE_RIGHT_90
-#: Merge.rc:185 Merge.rc:1225
+#: Merge.rc:185 Merge.rc:1235
msgid "Rotate &Right 90deg"
msgstr "Rotation à &droite 90deg"
#. IDR_POPUP_IMG_CTXT, ID_IMG_CURPANE_ROTATE_LEFT_90
-#: Merge.rc:186 Merge.rc:1226
+#: Merge.rc:186 Merge.rc:1236
msgid "Rotate &Left 90deg"
msgstr "Rotation à &gauche 90deg"
#. IDR_POPUP_IMG_CTXT, ID_IMG_CURPANE_FLIP_VERTICALLY
-#: Merge.rc:187 Merge.rc:1227
+#: Merge.rc:187 Merge.rc:1237
msgid "Flip V&ertically"
msgstr "Retournement v&ertical"
#. IDR_POPUP_IMG_CTXT, ID_IMG_CURPANE_FLIP_HORIZONTALLY
-#: Merge.rc:188 Merge.rc:1228
+#: Merge.rc:188 Merge.rc:1238
msgid "Flip H&orizontally"
msgstr "Retournement h&orizontal"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:193 Merge.rc:699
+#: Merge.rc:193 Merge.rc:706
msgid "&Zoom"
msgstr "&Zoom"
#. IDR_MERGEDOCTYPE, ID_VIEW_ZOOMIN
-#: Merge.rc:202 Merge.rc:701
+#: Merge.rc:202 Merge.rc:708
msgid "Zoom &In\tCtrl++"
msgstr "Zoom a&vant\tCtrl++"
#. IDR_MERGEDOCTYPE, ID_VIEW_ZOOMOUT
-#: Merge.rc:203 Merge.rc:702
+#: Merge.rc:203 Merge.rc:709
msgid "Zoom &Out\tCtrl+-"
msgstr "Zoom a&rrière\tCtrl+-"
#. IDR_MERGEDOCTYPE, ID_VIEW_ZOOMNORMAL, Zoom to normal
-#: Merge.rc:205 Merge.rc:704
+#: Merge.rc:205 Merge.rc:711
msgid "&Normal\tCtrl+*"
msgstr "&Taille normale\tCtrl+*"
@@ -333,27 +333,27 @@ msgid "Dragging &Mode"
msgstr "&Mode glisser"
#. IDR_POPUP_IMG_CTXT, ID_IMG_DRAGGINGMODE_MOVE
-#: Merge.rc:217 Merge.rc:955 Merge.rc:1233
+#: Merge.rc:217 Merge.rc:963 Merge.rc:1243
msgid "&Move"
msgstr "Dé&placer"
#. IDR_POPUP_IMG_CTXT, ID_IMG_DRAGGINGMODE_ADJUST_OFFSET
-#: Merge.rc:218 Merge.rc:1234
+#: Merge.rc:218 Merge.rc:1244
msgid "&Adjust Offset"
msgstr "&Ajuster le décalage"
#. IDR_POPUP_IMG_CTXT, ID_IMG_DRAGGINGMODE_VERTICAL_WIPE
-#: Merge.rc:219 Merge.rc:1235
+#: Merge.rc:219 Merge.rc:1245
msgid "&Vertical Wipe"
msgstr "Effacement &vertical"
#. IDR_POPUP_IMG_CTXT, ID_IMG_DRAGGINGMODE_HORIZONTAL_WIPE
-#: Merge.rc:220 Merge.rc:1236
+#: Merge.rc:220 Merge.rc:1246
msgid "&Horizontal Wipe"
msgstr "Effacement &horizontal"
#. IDR_POPUP_IMG_CTXT, ID_IMG_DRAGGINGMODE_RECTANGLE_SELECT
-#: Merge.rc:221 Merge.rc:1237
+#: Merge.rc:221 Merge.rc:1247
msgid "Rectangle &Select"
msgstr "&Sélection rectangulaire"
@@ -388,37 +388,37 @@ msgid "Compare Extracted &Text from Images"
msgstr "Comparer le &texte extrait depuis les images"
#. IDD_OPEN, IDOK
-#: Merge.rc:272 Merge.rc:1980
+#: Merge.rc:272 Merge.rc:1990
msgid "Co&mpare"
msgstr "Co&mparer"
#. IDR_POPUP_WEBPAGE_COMPARE, ID_WEB_COMPARE_SCREENSHOTS
-#: Merge.rc:274 Merge.rc:1247
+#: Merge.rc:274 Merge.rc:1257
msgid "&Screenshots"
msgstr "Capture&s d'écran"
#. IDR_POPUP_WEBPAGE_COMPARE, ID_WEB_COMPARE_FULLSIZE_SCREENSHOTS
-#: Merge.rc:275 Merge.rc:1248
+#: Merge.rc:275 Merge.rc:1258
msgid "&Full Size Screenshots"
msgstr "Captures d'écran en taille &réelle"
#. IDR_POPUP_WEBPAGE_COMPARE, ID_WEB_COMPARE_HTMLS
-#: Merge.rc:276 Merge.rc:1249
+#: Merge.rc:276 Merge.rc:1259
msgid "&HTMLs"
msgstr "&HTMLs"
#. IDR_POPUP_WEBPAGE_COMPARE, ID_WEB_COMPARE_TEXTS
-#: Merge.rc:277 Merge.rc:1250
+#: Merge.rc:277 Merge.rc:1260
msgid "&Texts"
msgstr "&Textes"
#. IDR_POPUP_WEBPAGE_COMPARE, ID_WEB_COMPARE_RESOURCETREES
-#: Merge.rc:278 Merge.rc:1251
+#: Merge.rc:278 Merge.rc:1261
msgid "&Resource Trees"
msgstr "Arborescences de &ressources"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_SIZE
-#: Merge.rc:280 Merge.rc:1775
+#: Merge.rc:280 Merge.rc:1785
msgid "&Size"
msgstr "&Taille"
@@ -433,27 +433,27 @@ msgid "&Event Sync"
msgstr "Synchronisation d&es événements"
#. IDR_POPUP_WEBPAGE_SYNC_EVENTS, ID_WEB_SYNC_ENABLED
-#: Merge.rc:291 Merge.rc:1259
+#: Merge.rc:291 Merge.rc:1269
msgid "&Enabled"
msgstr "Activé&e"
#. IDR_POPUP_WEBPAGE_SYNC_EVENTS, ID_WEB_SYNC_SCROLL
-#: Merge.rc:293 Merge.rc:1261
+#: Merge.rc:293 Merge.rc:1271
msgid "&Scroll"
msgstr "&Défilement"
#. IDR_POPUP_WEBPAGE_SYNC_EVENTS, ID_WEB_SYNC_CLICK
-#: Merge.rc:294 Merge.rc:1262
+#: Merge.rc:294 Merge.rc:1272
msgid "&Click"
msgstr "&Clic"
#. IDR_POPUP_WEBPAGE_SYNC_EVENTS, ID_WEB_SYNC_INPUT
-#: Merge.rc:295 Merge.rc:1263
+#: Merge.rc:295 Merge.rc:1273
msgid "&Input"
msgstr "Sa&isie"
#. IDR_POPUP_WEBPAGE_SYNC_EVENTS, ID_WEB_SYNC_GOBACKFORWARD
-#: Merge.rc:296 Merge.rc:1264
+#: Merge.rc:296 Merge.rc:1274
msgid "&Go Back/Forward"
msgstr "&En Arrière/Avant"
@@ -483,3609 +483,3620 @@ msgid "&All Profiles"
msgstr "&Tous les profils"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:310 Merge.rc:411 Merge.rc:586
+#: Merge.rc:310 Merge.rc:413 Merge.rc:590
msgid "&File"
msgstr "&Fichier"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:312 Merge.rc:413 Merge.rc:588
+#: Merge.rc:312 Merge.rc:415 Merge.rc:592
msgid "&New"
msgstr "&Nouveau"
#. IDR_POPUP_COMPARE, ID_MERGE_COMPARE_TEXT
-#: Merge.rc:314 Merge.rc:322 Merge.rc:415 Merge.rc:423 Merge.rc:590
-#: Merge.rc:598 Merge.rc:649 Merge.rc:935 Merge.rc:1159 Merge.rc:1171
+#: Merge.rc:314 Merge.rc:323 Merge.rc:417 Merge.rc:426 Merge.rc:594
+#: Merge.rc:603 Merge.rc:655 Merge.rc:942 Merge.rc:1167 Merge.rc:1180
msgid "&Text"
msgstr "&Texte"
#. IDR_POPUP_COMPARE, ID_MERGE_COMPARE_TABLE
-#: Merge.rc:315 Merge.rc:323 Merge.rc:416 Merge.rc:424 Merge.rc:591
-#: Merge.rc:599 Merge.rc:650 Merge.rc:936 Merge.rc:1160 Merge.rc:1172
+#: Merge.rc:315 Merge.rc:324 Merge.rc:418 Merge.rc:427 Merge.rc:595
+#: Merge.rc:604 Merge.rc:656 Merge.rc:943 Merge.rc:1168 Merge.rc:1181
msgid "T&able"
msgstr "T&ableau"
#. IDR_POPUP_COMPARE, ID_MERGE_COMPARE_HEX
-#: Merge.rc:316 Merge.rc:324 Merge.rc:417 Merge.rc:425 Merge.rc:592
-#: Merge.rc:600 Merge.rc:651 Merge.rc:937 Merge.rc:1161 Merge.rc:1173
+#: Merge.rc:316 Merge.rc:325 Merge.rc:419 Merge.rc:428 Merge.rc:596
+#: Merge.rc:605 Merge.rc:657 Merge.rc:944 Merge.rc:1169 Merge.rc:1182
msgid "&Binary"
msgstr "&Binaire"
#. IDS_IMAGE_MENU
-#: Merge.rc:317 Merge.rc:325 Merge.rc:418 Merge.rc:426 Merge.rc:593
-#: Merge.rc:601 Merge.rc:652 Merge.rc:938 Merge.rc:1162 Merge.rc:1174
-#: Merge.rc:5123
+#: Merge.rc:317 Merge.rc:326 Merge.rc:420 Merge.rc:429 Merge.rc:597
+#: Merge.rc:606 Merge.rc:658 Merge.rc:945 Merge.rc:1170 Merge.rc:1183
+#: Merge.rc:5133
msgid "&Image"
msgstr "&Image"
#. IDR_POPUP_COMPARE, ID_MERGE_COMPARE_WEBPAGE
-#: Merge.rc:318 Merge.rc:326 Merge.rc:419 Merge.rc:427 Merge.rc:594
-#: Merge.rc:602 Merge.rc:653 Merge.rc:939 Merge.rc:1163 Merge.rc:1175
+#: Merge.rc:318 Merge.rc:327 Merge.rc:421 Merge.rc:430 Merge.rc:598
+#: Merge.rc:607 Merge.rc:659 Merge.rc:946 Merge.rc:1171 Merge.rc:1184
msgid "&Webpage"
msgstr "Page &Web"
+#. IDR_POPUP_NEW, ID_FILE_NEW_FOLDER
+#: Merge.rc:319 Merge.rc:328 Merge.rc:422 Merge.rc:431 Merge.rc:599
+#: Merge.rc:608 Merge.rc:1172
+msgid "&Folder"
+msgstr ""
+
#. IDR_MERGEDOCTYPE
-#: Merge.rc:320 Merge.rc:421 Merge.rc:596
+#: Merge.rc:321 Merge.rc:424 Merge.rc:601
msgid "New (&3 panes)"
msgstr "Nouveau (&3 panneaux)"
#. IDR_MERGEDOCTYPE, ID_FILE_OPEN
-#: Merge.rc:328 Merge.rc:429 Merge.rc:604
+#: Merge.rc:330 Merge.rc:433 Merge.rc:610
msgid "&Open...\tCtrl+O"
msgstr "&Ouvrir...\tCtrl+O"
#. IDR_MERGEDOCTYPE, ID_FILE_OPENCONFLICT
-#: Merge.rc:329 Merge.rc:430 Merge.rc:605
+#: Merge.rc:331 Merge.rc:434 Merge.rc:611
msgid "Open Conflic&t File..."
msgstr "Ouvrir le fichier en confli&t..."
#. IDR_MERGEDOCTYPE, ID_FILE_OPENCLIPBOARD
-#: Merge.rc:330 Merge.rc:431 Merge.rc:606
+#: Merge.rc:332 Merge.rc:435 Merge.rc:612
msgid "Open C&lipboard"
msgstr "Ouvrir &le presse-papiers"
#. IDR_POPUP_PROJECT, ID_FILE_OPENPROJECT
-#: Merge.rc:332 Merge.rc:433 Merge.rc:608 Merge.rc:1191
+#: Merge.rc:334 Merge.rc:437 Merge.rc:614 Merge.rc:1201
msgid "Open Pro&ject...\tCtrl+J"
msgstr "Ouvrir un pro&jet...\tCtrl+J"
#. IDD_OPEN, ID_SAVE_PROJECT
-#: Merge.rc:333 Merge.rc:434 Merge.rc:609 Merge.rc:1193 Merge.rc:1979
+#: Merge.rc:335 Merge.rc:438 Merge.rc:615 Merge.rc:1203 Merge.rc:1989
msgid "Sa&ve Project..."
msgstr "Enre&gistrer le projet..."
#. IDR_MAINFRAME, ID_FILE_PROJECT_MRU_FIRST
-#: Merge.rc:335
+#: Merge.rc:337
msgid "Recent Projects"
msgstr "Projets récents"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:336 Merge.rc:445 Merge.rc:657
+#: Merge.rc:338 Merge.rc:449 Merge.rc:664
msgid "Recent F&iles or Folders"
msgstr "F&ichiers ou dossiers récents"
#. IDR_MERGEDOCTYPE, ID_APP_EXIT
-#: Merge.rc:341 Merge.rc:450 Merge.rc:662
+#: Merge.rc:343 Merge.rc:454 Merge.rc:669
msgid "E&xit\tCtrl+Q"
msgstr "&Quitter\tCtrl+Q"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:343 Merge.rc:452 Merge.rc:664
+#: Merge.rc:345 Merge.rc:456 Merge.rc:671
msgid "&Edit"
msgstr "&Edition"
#. IDR_MERGEDOCTYPE, ID_EDIT_PASTE
-#: Merge.rc:345 Merge.rc:671
+#: Merge.rc:347 Merge.rc:678
msgid "&Paste\tCtrl+V"
msgstr "Co&ller\tCtrl+V"
#. IDR_MERGEDOCTYPE, ID_OPTIONS
-#: Merge.rc:347 Merge.rc:456 Merge.rc:693
+#: Merge.rc:349 Merge.rc:460 Merge.rc:700
msgid "&Options...\tCtrl+,"
msgstr "&Préférences...\tCtrl+,"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:349 Merge.rc:458 Merge.rc:695
+#: Merge.rc:351 Merge.rc:462 Merge.rc:702
msgid "&View"
msgstr "&Affichage"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:351 Merge.rc:500 Merge.rc:744
+#: Merge.rc:353 Merge.rc:504 Merge.rc:751
msgid "Ta&b Bar"
msgstr "&Barre d'onglets"
#. IDR_MERGEDOCTYPE, ID_VIEW_TAB_BAR
-#: Merge.rc:353 Merge.rc:502 Merge.rc:746
+#: Merge.rc:355 Merge.rc:506 Merge.rc:753
msgid "&View Tab Bar"
msgstr "&Afficher la barre d'onglets"
#. IDR_MERGEDOCTYPE, ID_VIEW_TAB_BAR_ON_TITLE_BAR
-#: Merge.rc:354 Merge.rc:503 Merge.rc:747
+#: Merge.rc:356 Merge.rc:507 Merge.rc:754
msgid "&On Title Bar"
msgstr "&Sur la barre de titre"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:356 Merge.rc:505 Merge.rc:749
+#: Merge.rc:358 Merge.rc:509 Merge.rc:756
msgid "&Toolbar"
msgstr "Barre d'ou&tils"
#. IDR_MERGEDOCTYPE, ID_TOOLBAR_SMALL
-#: Merge.rc:359 Merge.rc:508 Merge.rc:752
+#: Merge.rc:361 Merge.rc:512 Merge.rc:759
msgid "&Small"
msgstr "&Petite"
#. IDR_MERGEDOCTYPE, ID_TOOLBAR_MEDIUM
-#: Merge.rc:360 Merge.rc:509 Merge.rc:753
+#: Merge.rc:362 Merge.rc:513 Merge.rc:760
msgid "&Medium"
msgstr "&Moyenne"
#. IDR_MERGEDOCTYPE, ID_TOOLBAR_BIG
-#: Merge.rc:361 Merge.rc:510 Merge.rc:754
+#: Merge.rc:363 Merge.rc:514 Merge.rc:761
msgid "&Big"
msgstr "&Grande"
#. IDR_MERGEDOCTYPE, ID_TOOLBAR_HUGE
-#: Merge.rc:362 Merge.rc:511 Merge.rc:755
+#: Merge.rc:364 Merge.rc:515 Merge.rc:762
msgid "&Huge"
msgstr "&Très grande"
#. IDS_VIEW_MENU_BAR
-#: Merge.rc:364 Merge.rc:513 Merge.rc:757 Merge.rc:5357
+#: Merge.rc:366 Merge.rc:517 Merge.rc:764 Merge.rc:5368
msgid "Men&u Bar"
msgstr "Barre de men&u"
#. IDR_DIRDOCTYPE, ID_VIEW_OUTPUT_BAR
-#: Merge.rc:365 Merge.rc:515
+#: Merge.rc:367 Merge.rc:519
msgid "&Output Pane"
msgstr "Panneau de s&ortie"
#. IDR_MERGEDOCTYPE, ID_VIEW_STATUS_BAR
-#: Merge.rc:366 Merge.rc:516 Merge.rc:758
+#: Merge.rc:368 Merge.rc:520 Merge.rc:765
msgid "&Status Bar"
msgstr "Ba&rre d'état"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:368 Merge.rc:539 Merge.rc:847
+#: Merge.rc:370 Merge.rc:543 Merge.rc:854
msgid "&Tools"
msgstr "&Outils"
#. IDR_MERGEDOCTYPE, ID_TOOLS_FILTERS
-#: Merge.rc:370 Merge.rc:542 Merge.rc:849
+#: Merge.rc:372 Merge.rc:546 Merge.rc:856
msgid "&Filters..."
msgstr "&Filtres..."
#. IDR_MERGEDOCTYPE, ID_TOOLS_GENERATEPATCH
-#: Merge.rc:371 Merge.rc:543 Merge.rc:850
+#: Merge.rc:373 Merge.rc:547 Merge.rc:857
msgid "&Generate Patch..."
msgstr "&Générer des retouches..."
#. IDR_MERGEDOCTYPE
-#: Merge.rc:373 Merge.rc:546 Merge.rc:853
+#: Merge.rc:375 Merge.rc:550 Merge.rc:860
msgid "&Plugins"
msgstr "&Plug-ins"
#. IDD_PLUGINS_LIST, IDC_PLUGIN_SETTINGS
-#: Merge.rc:375 Merge.rc:548 Merge.rc:855 Merge.rc:2494 Merge.rc:2926
+#: Merge.rc:377 Merge.rc:552 Merge.rc:862 Merge.rc:2504 Merge.rc:2936
msgid "P&lugin Settings..."
msgstr "Paramètres des p&lug-ins..."
#. IDR_MERGEDOCTYPE, ID_PREDIFFER_MANUAL
-#: Merge.rc:377 Merge.rc:550 Merge.rc:857
+#: Merge.rc:379 Merge.rc:554 Merge.rc:864
msgid "Ma&nual Prediffer"
msgstr "Précomparaison ma&nuelle"
#. IDR_MERGEDOCTYPE, ID_PREDIFFER_AUTO
-#: Merge.rc:378 Merge.rc:551 Merge.rc:858
+#: Merge.rc:380 Merge.rc:555 Merge.rc:865
msgid "A&utomatic Prediffer"
msgstr "Précomparaison a&utomatique"
#. IDR_MERGEDOCTYPE, ID_UNPACK_MANUAL
-#: Merge.rc:380 Merge.rc:553 Merge.rc:860
+#: Merge.rc:382 Merge.rc:557 Merge.rc:867
msgid "&Manual Unpacking"
msgstr "Décompression &manuelle"
#. IDR_MERGEDOCTYPE, ID_UNPACK_AUTO
-#: Merge.rc:381 Merge.rc:554 Merge.rc:861
+#: Merge.rc:383 Merge.rc:558 Merge.rc:868
msgid "&Automatic Unpacking"
msgstr "Décompression &automatique"
#. IDR_MERGEDOCTYPE, ID_RELOAD_PLUGINS
-#: Merge.rc:383 Merge.rc:558 Merge.rc:889
+#: Merge.rc:385 Merge.rc:562 Merge.rc:896
msgid "&Reload Plugins"
msgstr "&Recharger les plug-ins"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:385 Merge.rc:560 Merge.rc:891
+#: Merge.rc:387 Merge.rc:564 Merge.rc:898
msgid "&Window"
msgstr "Fe&nêtre"
#. IDR_MERGEDOCTYPE, ID_FILE_CLOSE
-#: Merge.rc:387 Merge.rc:562 Merge.rc:893
+#: Merge.rc:389 Merge.rc:566 Merge.rc:900
msgid "Cl&ose\tCtrl+W"
msgstr "&Fermer\tCtrl+W"
#. IDR_MERGEDOCTYPE, ID_WINDOW_CLOSEALL
-#: Merge.rc:388 Merge.rc:563 Merge.rc:894
+#: Merge.rc:390 Merge.rc:567 Merge.rc:901
msgid "Clo&se All"
msgstr "Fermer &tout"
#. IDR_MERGEDOCTYPE, ID_NEXT_PANE
-#: Merge.rc:390 Merge.rc:565 Merge.rc:896
+#: Merge.rc:392 Merge.rc:569 Merge.rc:903
msgid "Change &Pane\tF6"
msgstr "Changer de &panneau\tF6"
#. IDR_MERGEDOCTYPE, ID_WINDOW_TILE_HORZ
-#: Merge.rc:392 Merge.rc:567 Merge.rc:900
+#: Merge.rc:394 Merge.rc:571 Merge.rc:907
msgid "Tile &Horizontally"
msgstr "Organiser &horizontalement"
#. IDR_MERGEDOCTYPE, ID_WINDOW_TILE_VERT
-#: Merge.rc:393 Merge.rc:568 Merge.rc:901
+#: Merge.rc:395 Merge.rc:572 Merge.rc:908
msgid "Tile &Vertically"
msgstr "Organiser &verticalement"
#. IDR_MERGEDOCTYPE, ID_WINDOW_CASCADE
-#: Merge.rc:394 Merge.rc:569 Merge.rc:902
+#: Merge.rc:396 Merge.rc:573 Merge.rc:909
msgid "&Cascade"
msgstr "Organiser en &cascade"
#. IDS_MESSAGEBOX_HELP
-#: Merge.rc:396 Merge.rc:571 Merge.rc:904 Merge.rc:3200 Merge.rc:4189
+#: Merge.rc:398 Merge.rc:575 Merge.rc:911 Merge.rc:3210 Merge.rc:4199
msgid "&Help"
msgstr "A&ide"
#. IDR_MERGEDOCTYPE, ID_HELP_CONTENTS
-#: Merge.rc:398 Merge.rc:573 Merge.rc:906
+#: Merge.rc:400 Merge.rc:577 Merge.rc:913
msgid "&WinMerge Help\tF1"
msgstr "Aide pour &WinMerge\tF1"
#. IDR_MERGEDOCTYPE, ID_HELP_RELEASENOTES
-#: Merge.rc:400 Merge.rc:575 Merge.rc:908
+#: Merge.rc:402 Merge.rc:579 Merge.rc:915
msgid "R&elease Notes"
msgstr "Not&es de version"
#. IDR_MERGEDOCTYPE, ID_HELP_TRANSLATIONS
-#: Merge.rc:401 Merge.rc:576 Merge.rc:909
+#: Merge.rc:403 Merge.rc:580 Merge.rc:916
msgid "&Translations"
msgstr "&Traductions"
#. IDR_MERGEDOCTYPE, ID_HELP_GETCONFIG
-#: Merge.rc:402 Merge.rc:577 Merge.rc:910
+#: Merge.rc:404 Merge.rc:581 Merge.rc:917
msgid "C&onfiguration"
msgstr "C&onfiguration"
#. IDR_MERGEDOCTYPE, ID_HELP_GNULICENSE
-#: Merge.rc:404 Merge.rc:579 Merge.rc:912
+#: Merge.rc:406 Merge.rc:583 Merge.rc:919
msgid "&GNU General Public License"
msgstr "Licence publique générale &GNU"
#. IDR_MERGEDOCTYPE, ID_APP_ABOUT
-#: Merge.rc:405 Merge.rc:580 Merge.rc:913
+#: Merge.rc:407 Merge.rc:584 Merge.rc:920
msgid "&About WinMerge..."
msgstr "&À propos de WinMerge..."
#. IDR_MERGEDOCTYPE
-#: Merge.rc:436 Merge.rc:629
+#: Merge.rc:440 Merge.rc:635
msgid "&Read-Only"
msgstr "Lectu&re seule"
#. IDR_MERGEDOCTYPE, ID_FILE_LEFT_READONLY
-#: Merge.rc:438 Merge.rc:631
+#: Merge.rc:442 Merge.rc:637
msgid "L&eft Read-Only"
msgstr "Panneau Gauc&he en lecture seule"
#. IDR_MERGEDOCTYPE, ID_FILE_MIDDLE_READONLY
-#: Merge.rc:439 Merge.rc:632
+#: Merge.rc:443 Merge.rc:638
msgid "M&iddle Read-Only"
msgstr "Panneau M&ilieu en lecture seule"
#. IDR_MERGEDOCTYPE, ID_FILE_RIGHT_READONLY
-#: Merge.rc:440 Merge.rc:633
+#: Merge.rc:444 Merge.rc:639
msgid "Ri&ght Read-Only"
msgstr "Panneau Droi&te en lecture seule"
#. IDD_ENCODINGERROR, IDC_FILEENCODING
-#: Merge.rc:443 Merge.rc:646 Merge.rc:1038 Merge.rc:3063
+#: Merge.rc:447 Merge.rc:652 Merge.rc:1046 Merge.rc:3073
msgid "&File Encoding..."
msgstr "Encodage de &fichier..."
#. IDR_POPUP_OUTPUTVIEW, ID_EDIT_SELECT_ALL
-#: Merge.rc:454 Merge.rc:674 Merge.rc:1343
+#: Merge.rc:458 Merge.rc:681 Merge.rc:1353
msgid "Select &All\tCtrl+A"
msgstr "&Tout sélectionner\tCtrl+A"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWIDENTICAL
-#: Merge.rc:460
+#: Merge.rc:464
msgid "Show &Identical Items"
msgstr "Afficher les éléments &identiques"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWDIFFERENT
-#: Merge.rc:461
+#: Merge.rc:465
msgid "Show &Different Items"
msgstr "Afficher les éléments &différents"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWUNIQUELEFT
-#: Merge.rc:462
+#: Merge.rc:466
msgid "Show L&eft Unique Items"
msgstr "Afficher les éléments uniquement à Gauch&e"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWUNIQUEMIDDLE
-#: Merge.rc:463
+#: Merge.rc:467
msgid "Show Midd&le Unique Items"
msgstr "Afficher les éléments uniquement au Mi&lieu"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWUNIQUERIGHT
-#: Merge.rc:464
+#: Merge.rc:468
msgid "Show Ri&ght Unique Items"
msgstr "Afficher les éléments uniquement à D&roite"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWSKIPPED
-#: Merge.rc:465
+#: Merge.rc:469
msgid "Show S&kipped Items"
msgstr "Afficher les éléments ig&norés"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWBINARIES
-#: Merge.rc:466
+#: Merge.rc:470
msgid "S&how Binary Files"
msgstr "Affic&her les fichiers binaires"
#. IDR_DIRDOCTYPE
-#: Merge.rc:467
+#: Merge.rc:471
msgid "&3-way Compare"
msgstr "Comparaison &3 voies"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWDIFFERENTLEFTONLY
-#: Merge.rc:469
+#: Merge.rc:473
msgid "Show &Left Only Different Items"
msgstr "Afficher les é&léments différents à Gauche seulement"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWDIFFERENTMIDDLEONLY
-#: Merge.rc:470
+#: Merge.rc:474
msgid "Show &Middle Only Different Items"
msgstr "Afficher les éléments différents au &Milieu seulement"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWDIFFERENTRIGHTONLY
-#: Merge.rc:471
+#: Merge.rc:475
msgid "Show &Right Only Different Items"
msgstr "Afficher les éléments diffé&rents à Droite seulement"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWMISSINGLEFTONLY
-#: Merge.rc:473
+#: Merge.rc:477
msgid "Show L&eft Only Missing Items"
msgstr "Afficher les éléments manquants à Gauch&e seulement"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWMISSINGMIDDLEONLY
-#: Merge.rc:474
+#: Merge.rc:478
msgid "Show Mi&ddle Only Missing Items"
msgstr "Afficher les éléments manquants au Mi&lieu seulement"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWMISSINGRIGHTONLY
-#: Merge.rc:475
+#: Merge.rc:479
msgid "Show Rig&ht Only Missing Items"
msgstr "Affic&her les éléments manquants à Droite seulement"
#. IDR_DIRDOCTYPE, ID_VIEW_SHOWHIDDENITEMS
-#: Merge.rc:478
+#: Merge.rc:482
msgid "Show Hidd&en Items"
msgstr "Affich&er les éléments cachés"
#. IDR_DIRDOCTYPE, ID_VIEW_TREEMODE
-#: Merge.rc:480
+#: Merge.rc:484
msgid "Tree &Mode"
msgstr "&Mode Arborescence"
#. IDR_DIRDOCTYPE
-#: Merge.rc:481
+#: Merge.rc:485
msgid "E&xpand Subfolders"
msgstr "Dé&velopper l'arborescense"
#. IDR_DIRDOCTYPE, ID_VIEW_EXPAND_ALLSUBDIRS
-#: Merge.rc:483
+#: Merge.rc:487
msgid "&All Subfolders"
msgstr "&Tous les sous-dossiers"
#. IDR_DIRDOCTYPE, ID_VIEW_EXPAND_DIFFERENT_SUBDIRS
-#: Merge.rc:484
+#: Merge.rc:488
msgid "&Different Subfolders"
msgstr "Sous-dossiers &différents"
#. IDR_DIRDOCTYPE, ID_VIEW_EXPAND_IDENTICAL_SUBDIRS
-#: Merge.rc:485
+#: Merge.rc:489
msgid "&Identical Subfolders"
msgstr "Sous-dossiers &identiques"
#. IDR_DIRDOCTYPE, ID_VIEW_COLLAPSE_ALLSUBDIRS
-#: Merge.rc:487
+#: Merge.rc:491
msgid "&Collapse All Subfolders"
msgstr "Réduire l'arbores&cense"
#. IDR_DIRDOCTYPE, ID_VIEW_SHOW_EMPTY_FOLDERS
-#: Merge.rc:488
+#: Merge.rc:492
msgid "Show &Empty Folders"
msgstr "Afficher les dossiers &vides"
#. IDR_MERGEDOCTYPE, ID_VIEW_SELECTFONT
-#: Merge.rc:490 Merge.rc:697
+#: Merge.rc:494 Merge.rc:704
msgid "Select &Font..."
msgstr "Choisir une &police..."
#. IDR_MERGEDOCTYPE, ID_VIEW_USEDEFAULTFONT
-#: Merge.rc:491 Merge.rc:698
+#: Merge.rc:495 Merge.rc:705
msgid "Use Default Font"
msgstr "Utiliser la police par défaut"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:493 Merge.rc:736
+#: Merge.rc:497 Merge.rc:743
msgid "Sw&ap Panes"
msgstr "&Intervertir les panneaux"
#. IDR_MERGEDOCTYPE, ID_SWAPPANES_SWAP12
-#: Merge.rc:495 Merge.rc:738
+#: Merge.rc:499 Merge.rc:745
msgid "Swap &1st | 2nd"
msgstr "Intervertir &1er | 2ème"
#. IDR_MERGEDOCTYPE, ID_SWAPPANES_SWAP23
-#: Merge.rc:496 Merge.rc:739
+#: Merge.rc:500 Merge.rc:746
msgid "Swap &2nd | 3rd"
msgstr "Intervertir &2ème | 3ème"
#. IDR_MERGEDOCTYPE, ID_SWAPPANES_SWAP13
-#: Merge.rc:497 Merge.rc:740
+#: Merge.rc:501 Merge.rc:747
msgid "Swap 1st | &3rd"
msgstr "Intervertir 1er | &3ème"
#. IDR_DIRDOCTYPE, ID_VIEW_DISPLAY_FILTER_BAR_MENU
-#: Merge.rc:514
+#: Merge.rc:518
msgid "Displa&y Filter Bar\tCtrl+Shift+L"
msgstr "Afficher la barre de &filtrage\tCtrl+Shift+L"
#. IDR_DIRDOCTYPE, ID_VIEW_DIR_STATISTICS
-#: Merge.rc:518
+#: Merge.rc:522
msgid "Com&pare Statistics..."
msgstr "Statistiques des com¶isons..."
#. IDR_MERGEDOCTYPE, ID_REFRESH
-#: Merge.rc:520 Merge.rc:763
+#: Merge.rc:524 Merge.rc:770
msgid "Refresh\tF5"
msgstr "Actualiser\tF5"
#. IDR_POPUP_DIRVIEW, ID_RESCAN
-#: Merge.rc:521 Merge.rc:1030
+#: Merge.rc:525 Merge.rc:1038
msgid "&Refresh Selected\tCtrl+F5"
msgstr "Actualise&r la sélection\tCtrl+F5"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:523 Merge.rc:765
+#: Merge.rc:527 Merge.rc:772
msgid "&Merge"
msgstr "Fusio&nner"
#. IDR_DIRDOCTYPE, ID_MERGE_COMPARE
-#: Merge.rc:525
+#: Merge.rc:529
msgid "Co&mpare\tEnter"
msgstr "Co&mparer\tEntrée"
#. IDR_MERGEDOCTYPE, ID_NEXTDIFF
-#: Merge.rc:527 Merge.rc:767
+#: Merge.rc:531 Merge.rc:774
msgid "&Next Difference\tAlt+Down"
msgstr "Différence &suivante\tAlt+Bas"
#. IDR_MERGEDOCTYPE, ID_PREVDIFF
-#: Merge.rc:528 Merge.rc:768
+#: Merge.rc:532 Merge.rc:775
msgid "&Previous Difference\tAlt+Up"
msgstr "Différence &précédente\tAlt+Haut"
#. IDR_MERGEDOCTYPE, ID_FIRSTDIFF
-#: Merge.rc:530 Merge.rc:773
+#: Merge.rc:534 Merge.rc:780
msgid "&First Difference\tAlt+Home"
msgstr "Première di&fférence\tAlt+Début"
#. IDR_MERGEDOCTYPE, ID_CURDIFF
-#: Merge.rc:531 Merge.rc:774
+#: Merge.rc:535 Merge.rc:781
msgid "&Current Difference\tAlt+Enter"
msgstr "Différence &courante\tAlt+Entrée"
#. IDR_MERGEDOCTYPE, ID_LASTDIFF
-#: Merge.rc:532 Merge.rc:775
+#: Merge.rc:536 Merge.rc:782
msgid "&Last Difference\tAlt+End"
msgstr "&Dernière différence\tAlt+Fin"
#. IDR_MERGEDOCTYPE, ID_L2R
-#: Merge.rc:534 Merge.rc:830
+#: Merge.rc:538 Merge.rc:837
msgid "Copy to &Right\tAlt+Right"
msgstr "Copier vers la D&roite\tAlt+Droite"
#. IDR_MERGEDOCTYPE, ID_R2L
-#: Merge.rc:535 Merge.rc:831
+#: Merge.rc:539 Merge.rc:838
msgid "Copy to L&eft\tAlt+Left"
msgstr "Copier vers la Gauch&e\tAlt+Gauche"
#. IDR_DIRDOCTYPE, ID_MERGE_DELETE
-#: Merge.rc:537
+#: Merge.rc:541
msgid "&Delete\tDel"
msgstr "Su&pprimer\tDel"
#. IDR_POPUP_DIRVIEW, ID_TOOLS_CUSTOMIZECOLUMNS
-#: Merge.rc:541 Merge.rc:1042
+#: Merge.rc:545 Merge.rc:1050
msgid "&Customize Columns..."
msgstr "Personnaliser les &colonnes..."
#. IDR_MERGEDOCTYPE, ID_TOOLS_GENERATEREPORT
-#: Merge.rc:544 Merge.rc:851
+#: Merge.rc:548 Merge.rc:858
msgid "Generate &Report..."
msgstr "Générer un &rapport..."
#. IDD_ENCODINGERROR, IDC_PLUGIN
-#: Merge.rc:556 Merge.rc:867 Merge.rc:3064
+#: Merge.rc:560 Merge.rc:874 Merge.rc:3074
msgid "&Edit with Unpacker..."
msgstr "Édit&er avec le décompresseur..."
#. IDR_MERGEDOCTYPE, ID_FILE_SAVE
-#: Merge.rc:611
+#: Merge.rc:617
msgid "&Save\tCtrl+S"
msgstr "Enregi&strer\tCtrl+S"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:612
+#: Merge.rc:618
msgid "Sav&e"
msgstr "&Enregistrer"
#. IDR_POPUP_SAVE, ID_FILE_SAVE_LEFT
-#: Merge.rc:614 Merge.rc:1201
+#: Merge.rc:620 Merge.rc:1211
msgid "Save &Left"
msgstr "Enregistrer &Gauche"
#. IDR_POPUP_SAVE, ID_FILE_SAVE_MIDDLE
-#: Merge.rc:615 Merge.rc:1202
+#: Merge.rc:621 Merge.rc:1212
msgid "Save &Middle"
msgstr "Enregistrer &Milieu"
#. IDR_POPUP_SAVE, ID_FILE_SAVE_RIGHT
-#: Merge.rc:616 Merge.rc:1203
+#: Merge.rc:622 Merge.rc:1213
msgid "Save &Right"
msgstr "Enregistrer D&roite"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:618
+#: Merge.rc:624
msgid "Save &As"
msgstr "Enregistrer &sous"
#. IDR_POPUP_SAVE, ID_FILE_SAVEAS_LEFT
-#: Merge.rc:620 Merge.rc:1205
+#: Merge.rc:626 Merge.rc:1215
msgid "Save &Left As..."
msgstr "Enregistrer &Gauche sous..."
#. IDR_POPUP_SAVE, ID_FILE_SAVEAS_MIDDLE
-#: Merge.rc:621 Merge.rc:1206
+#: Merge.rc:627 Merge.rc:1216
msgid "Save &Middle As..."
msgstr "Enregistrer &Milieu sous..."
#. IDR_POPUP_SAVE, ID_FILE_SAVEAS_RIGHT
-#: Merge.rc:622 Merge.rc:1207
+#: Merge.rc:628 Merge.rc:1217
msgid "Save &Right As..."
msgstr "Enregistrer D&roite sous..."
#. IDR_MERGEDOCTYPE, ID_FILE_PRINT
-#: Merge.rc:625
+#: Merge.rc:631
msgid "&Print...\tCtrl+P"
msgstr "Im&primer...\tCtrl+P"
#. IDR_MERGEDOCTYPE, ID_FILE_PAGE_SETUP
-#: Merge.rc:626
+#: Merge.rc:632
msgid "Page Set&up..."
msgstr "&Mise en page..."
#. IDR_MERGEDOCTYPE, ID_FILE_PRINT_PREVIEW
-#: Merge.rc:627
+#: Merge.rc:633
msgid "Print Previe&w..."
msgstr "Aperç&u avant impression..."
#. IDR_MERGEDOCTYPE
-#: Merge.rc:636
+#: Merge.rc:642
msgid "&Convert Line Endings to"
msgstr "Convertir les fins de ligne en"
#. IDR_MERGEDOCTYPE, ID_FILE_MERGINGMODE
-#: Merge.rc:643
+#: Merge.rc:649
msgid "Mer&ge Mode\tF9"
msgstr "Mode &fusion\tF9"
#. IDR_MERGEDOCTYPE, ID_RESCAN
-#: Merge.rc:645
+#: Merge.rc:651
msgid "Reloa&d\tCtrl+F5"
msgstr "Re&charger\tCtrl+F5"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:647
+#: Merge.rc:653
msgid "Reco&mpare As"
msgstr "Reco&mparer comme un(e)"
+#. IDR_POPUP_COMPARE, ID_MERGE_COMPARE_FOLDER
+#: Merge.rc:660 Merge.rc:947 Merge.rc:1185
+msgid "A&rchive"
+msgstr ""
+
#. IDR_MERGEDOCTYPE, ID_EDIT_UNDO
-#: Merge.rc:666
+#: Merge.rc:673
msgid "&Undo\tCtrl+Z"
msgstr "Ann&uler\tCtrl+Z"
#. IDR_MERGEDOCTYPE, ID_EDIT_REDO
-#: Merge.rc:667
+#: Merge.rc:674
msgid "&Redo\tCtrl+Y"
msgstr "&Rétablir\tCtrl+Y"
#. IDR_MERGEDOCTYPE, ID_EDIT_CUT
-#: Merge.rc:669
+#: Merge.rc:676
msgid "Cu&t\tCtrl+X"
msgstr "Cou&per\tCtrl+X"
#. IDR_POPUP_OUTPUTVIEW, ID_EDIT_COPY
-#: Merge.rc:670 Merge.rc:1342
+#: Merge.rc:677 Merge.rc:1352
msgid "&Copy\tCtrl+C"
msgstr "&Copier\tCtrl+C"
#. IDR_MERGEDOCTYPE, ID_EDIT_FIND
-#: Merge.rc:676
+#: Merge.rc:683
msgid "F&ind...\tCtrl+F"
msgstr "Rec&hercher...\tCtrl+F"
#. IDR_MERGEDOCTYPE, ID_EDIT_REPLACE
-#: Merge.rc:677
+#: Merge.rc:684
msgid "Repla&ce...\tCtrl+H"
msgstr "Rempla&cer...\tCtrl+H"
#. IDR_MERGEDOCTYPE, ID_EDIT_MARK
-#: Merge.rc:678
+#: Merge.rc:685
msgid "&Marker...\tCtrl+Shift+M"
msgstr "M&arqueur...\tCtrl+Maj+M"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:680
+#: Merge.rc:687
msgid "Advanced"
msgstr "Avancé"
#. IDR_MERGEDOCTYPE, ID_EDIT_COPY_LINENUMBERS
-#: Merge.rc:682
+#: Merge.rc:689
msgid "&Copy With Line Numbers\tCtrl+Shift+C"
msgstr "&Copier avec les numéros de ligne\tCtrl+Maj+C"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:684
+#: Merge.rc:691
msgid "&Bookmarks"
msgstr "Signe&ts"
#. IDR_MERGEDOCTYPE, ID_EDIT_TOGGLE_BOOKMARK
-#: Merge.rc:686
+#: Merge.rc:693
msgid "&Toggle Bookmark\tCtrl+F2"
msgstr "Placer/retirer un signe&t\tCtrl+F2"
#. IDR_MERGEDOCTYPE, ID_EDIT_GOTO_NEXT_BOOKMARK
-#: Merge.rc:687
+#: Merge.rc:694
msgid "&Next Bookmark\tF2"
msgstr "Sig&net suivant\tF2"
#. IDR_MERGEDOCTYPE, ID_EDIT_GOTO_PREV_BOOKMARK
-#: Merge.rc:688
+#: Merge.rc:695
msgid "&Previous Bookmark\tShift+F2"
msgstr "Signet &précédent\tMaj+F2"
#. IDR_MERGEDOCTYPE, ID_EDIT_CLEAR_ALL_BOOKMARKS
-#: Merge.rc:689
+#: Merge.rc:696
msgid "&Clear All Bookmarks"
msgstr "Effa&cer tous les signets"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:706
+#: Merge.rc:713
msgid "Syntax Highlight"
msgstr "Mettre en surbrillance la syntaxe"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:711
+#: Merge.rc:718
msgid "&Diff Context"
msgstr "Contexte de &différences"
#. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_ALL
-#: Merge.rc:713
+#: Merge.rc:720
msgid "&All Lines"
msgstr "&Toutes les lignes"
#. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_0
-#: Merge.rc:715
+#: Merge.rc:722
msgid "&0 Lines"
msgstr "&0 ligne"
#. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_1
-#: Merge.rc:716
+#: Merge.rc:723
msgid "&1 Line"
msgstr "&1 ligne"
#. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_3
-#: Merge.rc:717
+#: Merge.rc:724
msgid "&3 Lines"
msgstr "&3 lignes"
#. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_5
-#: Merge.rc:718
+#: Merge.rc:725
msgid "&5 Lines"
msgstr "&5 lignes"
#. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_7
-#: Merge.rc:719
+#: Merge.rc:726
msgid "&7 Lines"
msgstr "&7 lignes"
#. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_9
-#: Merge.rc:720
+#: Merge.rc:727
msgid "&9 Lines"
msgstr "&9 lignes"
#. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_TOGGLE
-#: Merge.rc:722
+#: Merge.rc:729
msgid "&Toggle All and 0-9 Lines\tCtrl+D"
msgstr "Basculer entre &Toutes et 0-9 lignes\tCtrl+D"
#. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_INVERT
-#: Merge.rc:724
+#: Merge.rc:731
msgid "&Invert (Hide Different Lines)"
msgstr "&Inverser (masquer les lignes différentes)"
#. IDR_MERGEDOCTYPE, ID_VIEW_RESIZE_PANES
-#: Merge.rc:727
+#: Merge.rc:734
msgid "&Lock Panes"
msgstr "Verroui&ller les panneaux"
#. IDR_MERGEDOCTYPE, ID_VIEW_WHITESPACE
-#: Merge.rc:728
+#: Merge.rc:735
msgid "&View Whitespace"
msgstr "&Afficher les espaces"
#. IDR_MERGEDOCTYPE, ID_VIEW_EOL
-#: Merge.rc:729
+#: Merge.rc:736
msgid "View E&OL"
msgstr "Afficher les caractères de fin de ligne (E&OL)"
#. IDR_MERGEDOCTYPE, ID_VIEW_LINEDIFFS
-#: Merge.rc:730
+#: Merge.rc:737
msgid "Vie&w Line Differences"
msgstr "&Afficher les différences de ligne"
#. IDR_MERGEDOCTYPE, ID_VIEW_LINENUMBERS
-#: Merge.rc:731
+#: Merge.rc:738
msgid "View Line &Numbers"
msgstr "Afficher le &numéro de ligne"
#. IDR_MERGEDOCTYPE, ID_VIEW_SELMARGIN
-#: Merge.rc:732
+#: Merge.rc:739
msgid "View &Margins"
msgstr "Afficher les &marges"
#. IDR_MERGEDOCTYPE, ID_VIEW_TOPMARGIN
-#: Merge.rc:733
+#: Merge.rc:740
msgid "View To&p Margins"
msgstr "Afficher les marges &hautes"
#. IDR_MERGEDOCTYPE, ID_VIEW_WORDWRAP
-#: Merge.rc:734
+#: Merge.rc:741
msgid "W&rap Lines"
msgstr "&Retour à la ligne automatique"
#. IDR_MERGEDOCTYPE, ID_VIEW_SPLITVERTICALLY
-#: Merge.rc:742
+#: Merge.rc:749
msgid "Split V&ertically"
msgstr "Scinder v&erticalement"
#. IDR_MERGEDOCTYPE, ID_VIEW_DETAIL_BAR
-#: Merge.rc:759
+#: Merge.rc:766
msgid "Diff &Pane"
msgstr "&Panneau des différences"
#. IDR_MERGEDOCTYPE, ID_VIEW_LOCATION_BAR
-#: Merge.rc:760
+#: Merge.rc:767
msgid "Lo&cation Pane"
msgstr "Panneau de lo&calisation"
#. IDS_OUTPUTBAR_CAPTION
-#: Merge.rc:761 Merge.rc:4902
+#: Merge.rc:768 Merge.rc:4912
msgid "Output Pane"
msgstr "Panneau de sortie"
#. IDR_MERGEDOCTYPE, ID_NEXTCONFLICT
-#: Merge.rc:770
+#: Merge.rc:777
msgid "Ne&xt Conflict\tAlt+Shift+Down"
msgstr "Conflit sui&vant\tAlt+Maj+Bas"
#. IDR_MERGEDOCTYPE, ID_PREVCONFLICT
-#: Merge.rc:771
+#: Merge.rc:778
msgid "Pre&vious Conflict\tAlt+Shift+Up"
msgstr "Conflit précé&dent\tAlt+Maj+Haut"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:777
+#: Merge.rc:784
msgid "A&dvanced"
msgstr "A&vancé"
#. IDR_MERGEDOCTYPE, ID_NEXTDIFFLM
-#: Merge.rc:779
+#: Merge.rc:786
msgid "Next Difference (Left/Middle)\tAlt+1"
msgstr "Différence suivante (Gauche/Milieu)\tAlt+1"
#. IDR_MERGEDOCTYPE, ID_PREVDIFFLM
-#: Merge.rc:780
+#: Merge.rc:787
msgid "Previous Difference (Left/Middle)\tAlt+Shift+1"
msgstr "Différence précédente (Gauche/Milieu)\tAlt+Maj+1"
#. IDR_MERGEDOCTYPE, ID_NEXTDIFFLR
-#: Merge.rc:782
+#: Merge.rc:789
msgid "Next Difference (Left/Right)\tAlt+2"
msgstr "Différence suivante (Gauche/Droite)\tAlt+2"
#. IDR_MERGEDOCTYPE, ID_PREVDIFFLR
-#: Merge.rc:783
+#: Merge.rc:790
msgid "Previous Difference (Left/Right)\tAlt+Shift+2"
msgstr "Différence précédente (Gauche/Droite)\tAlt+Maj+2"
#. IDR_MERGEDOCTYPE, ID_NEXTDIFFMR
-#: Merge.rc:785
+#: Merge.rc:792
msgid "Next Difference (Middle/Right)\tAlt+3"
msgstr "Différence suivante (Milieu/Droite)\tALT+3"
#. IDR_MERGEDOCTYPE, ID_PREVDIFFMR
-#: Merge.rc:786
+#: Merge.rc:793
msgid "Previous Difference (Middle/Right)\tAlt+Shift+3"
msgstr "Différence précédente (Milieu/Droite)\tAlt+Maj+3"
#. IDR_MERGEDOCTYPE, ID_NEXTDIFFLO
-#: Merge.rc:788
+#: Merge.rc:795
msgid "Next Left-Only Difference\tAlt+7"
msgstr "Différence suivante Gauche seulement\tAlt+7"
#. IDR_MERGEDOCTYPE, ID_PREVDIFFLO
-#: Merge.rc:789
+#: Merge.rc:796
msgid "Previous Left-Only Difference\tAlt+Shift+7"
msgstr "Différence précédente Gauche seulement\tAlt+Maj+7"
#. IDR_MERGEDOCTYPE, ID_NEXTDIFFMO
-#: Merge.rc:791
+#: Merge.rc:798
msgid "Next Middle-Only Difference\tAlt+8"
msgstr "Différence suivante Milieu seulement\tAlt+8"
#. IDR_MERGEDOCTYPE, ID_PREVDIFFMO
-#: Merge.rc:792
+#: Merge.rc:799
msgid "Previous Middle-Only Difference\tAlt+Shift+8"
msgstr "Différence précédente Milieu seulement\tAlt+Maj+8"
#. IDR_MERGEDOCTYPE, ID_NEXTDIFFRO
-#: Merge.rc:794
+#: Merge.rc:801
msgid "Next Right-Only Difference\tAlt+9"
msgstr "Différence suivante Droite seulement\tAlt+9"
#. IDR_MERGEDOCTYPE, ID_PREVDIFFRO
-#: Merge.rc:795
+#: Merge.rc:802
msgid "Previous Right-Only Difference\tAlt+Shift+9"
msgstr "Différence précédente Droite seulement\tAlt+Maj+9"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:797
+#: Merge.rc:804
msgid "Copy from &Left to"
msgstr "Copier de la &Gauche vers le(la)"
#. IDD_LOAD_SAVE_CODEPAGE, IDC_AFFECTS_MIDDLE_BTN
-#: Merge.rc:799 Merge.rc:810 Merge.rc:815 Merge.rc:826 Merge.rc:970
-#: Merge.rc:2545 Merge.rc:2817
+#: Merge.rc:806 Merge.rc:817 Merge.rc:822 Merge.rc:833 Merge.rc:978
+#: Merge.rc:2555 Merge.rc:2827
msgid "&Middle"
msgstr "&Milieu"
#. IDD_LOAD_SAVE_CODEPAGE, IDC_AFFECTS_RIGHT_BTN
-#: Merge.rc:800 Merge.rc:805 Merge.rc:816 Merge.rc:821 Merge.rc:971
-#: Merge.rc:2546 Merge.rc:2819
+#: Merge.rc:807 Merge.rc:812 Merge.rc:823 Merge.rc:828 Merge.rc:979
+#: Merge.rc:2556 Merge.rc:2829
msgid "&Right"
msgstr "D&roite"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:802
+#: Merge.rc:809
msgid "Copy from &Middle to"
msgstr "Copier du &Milieu vers la"
#. IDD_LOAD_SAVE_CODEPAGE, IDC_AFFECTS_LEFT_BTN
-#: Merge.rc:804 Merge.rc:809 Merge.rc:820 Merge.rc:825 Merge.rc:969
-#: Merge.rc:2544 Merge.rc:2815
+#: Merge.rc:811 Merge.rc:816 Merge.rc:827 Merge.rc:832 Merge.rc:977
+#: Merge.rc:2554 Merge.rc:2825
msgid "&Left"
msgstr "&Gauche"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:807
+#: Merge.rc:814
msgid "Copy from &Right to"
msgstr "Copier de la D&roite vers le(la)"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:813
+#: Merge.rc:820
msgid "Copy Selected Lines from Le&ft to"
msgstr "Copier les lignes sélectionnées de la Ga&uche vers le(la)"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:818
+#: Merge.rc:825
msgid "Copy Selected Lines from Mi&ddle to"
msgstr "Copier les lignes sélectionnées du Mi&lieu vers la"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:823
+#: Merge.rc:830
msgid "Copy Selected Lines from Ri&ght to"
msgstr "Copier les lignes sélectionnées de la Dr&oite vers le(la)"
#. IDR_MERGEDOCTYPE, ID_COPY_FROM_LEFT
-#: Merge.rc:833
+#: Merge.rc:840
msgid "Copy from Left\tAlt+Shift+Right"
msgstr "Copier de la Gauche\tAlt+Maj+Droite"
#. IDR_MERGEDOCTYPE, ID_COPY_FROM_RIGHT
-#: Merge.rc:834
+#: Merge.rc:841
msgid "Copy from Right\tAlt+Shift+Left"
msgstr "Copier de la Droite\tAlt+Maj+Gauche"
#. IDR_MERGEDOCTYPE, ID_L2RNEXT
-#: Merge.rc:836
+#: Merge.rc:843
msgid "C&opy to Right and Advance\tCtrl+Alt+Right"
msgstr "C&opier vers la Droite et Avancer\tCtrl+Alt+Droite"
#. IDR_MERGEDOCTYPE, ID_R2LNEXT
-#: Merge.rc:837
+#: Merge.rc:844
msgid "Copy &to Left and Advance\tCtrl+Alt+Left"
msgstr "Copier vers la Ga&uche et Avancer\tCtrl+Alt+Gauche"
#. IDR_MERGEDOCTYPE, ID_ALL_RIGHT
-#: Merge.rc:839
+#: Merge.rc:846
msgid "Copy &All to Right"
msgstr "Cop&er toutes vers l&a Droite"
#. IDR_MERGEDOCTYPE, ID_ALL_LEFT
-#: Merge.rc:840
+#: Merge.rc:847
msgid "Cop&y All to Left"
msgstr "Cop&ier toutes vers la Gauche"
#. IDR_MERGEDOCTYPE, ID_AUTO_MERGE
-#: Merge.rc:842
+#: Merge.rc:849
msgid "A&uto Merge\tCtrl+Alt+M"
msgstr "Fusion a&utomatique\tCtrl+Alt+M"
#. IDR_MERGEDOCTYPE, ID_ADD_SYNCPOINT
-#: Merge.rc:844
+#: Merge.rc:851
msgid "Add &Synchronization Point\tAlt+S"
msgstr "Ajouter un point de &synchronisation\tAlt+S"
#. IDR_MERGEDOCTYPE, ID_CLEAR_SYNCPOINTS
-#: Merge.rc:845
+#: Merge.rc:852
msgid "Clear Sync&hronization Points"
msgstr "Effacer les points de sync&hronisation"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:863
+#: Merge.rc:870
msgid "Unpac&ker"
msgstr "Décompre&sseur"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:869
+#: Merge.rc:876
msgid "&Prediffer"
msgstr "&Précomparer"
#. IDR_MERGEDOCTYPE, ID_APPLY_PREDIFFER
-#: Merge.rc:873
+#: Merge.rc:880
msgid "Apply Pre&differ..."
msgstr "Appliquer la pré&comparaison..."
#. IDR_MERGEDOCTYPE, ID_TRANSFORM_WITH_SCRIPT
-#: Merge.rc:879
+#: Merge.rc:886
msgid "&Transform with Editor Script..."
msgstr "&Transformer avec le script de l'éditeur..."
#. IDR_MERGEDOCTYPE
-#: Merge.rc:880
+#: Merge.rc:887
msgid "Scripts for &Copying"
msgstr "Scripts pour la &copie"
#. IDR_MERGEDOCTYPE, ID_SELECT_EDITOR_SCRIPT_FOR_COPYING
-#: Merge.rc:886
+#: Merge.rc:893
msgid "Select &Editor Script..."
msgstr "Choisir l&e script de l'éditeur..."
#. IDR_MERGEDOCTYPE, ID_WINDOW_SPLIT
-#: Merge.rc:898
+#: Merge.rc:905
msgid "Sp&lit"
msgstr "&Scinder"
#. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE
-#: Merge.rc:921
+#: Merge.rc:928
msgid "Comp&are"
msgstr "Comp&arer"
#. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE_WITH_MOVED_RENAMED
-#: Merge.rc:922
+#: Merge.rc:929
msgid "Compar&e with Renamed/Moved Items"
msgstr "Compa&rer avec les éléments renommés/déplacés"
#. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE_IN_NEW_WINDOW
-#: Merge.rc:923
+#: Merge.rc:930
msgid "Compare in New &Window"
msgstr "Comparer dans une nouvelle &fenêtre"
#. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE_NONHORIZONTALLY
-#: Merge.rc:924 Merge.rc:931
+#: Merge.rc:931 Merge.rc:938
msgid "Compare Non-hor&izontally..."
msgstr "Comparer non-hor&izontalement..."
#. IDR_POPUP_DIRVIEW
-#: Merge.rc:925
+#: Merge.rc:932
msgid "Compare Non-hor&izontally"
msgstr "Comparer non-hor&izontalement"
#. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE_LEFT1_LEFT2
-#: Merge.rc:927
+#: Merge.rc:934
msgid "First &Left with Second Left"
msgstr "Premier é&lément Gauche avec deuxième élément Gauche"
#. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE_RIGHT1_RIGHT2
-#: Merge.rc:928
+#: Merge.rc:935
msgid "First &Right with Second Right"
msgstr "P&remier élément Droite avec le deuxième élément Droite"
#. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE_LEFT1_RIGHT2
-#: Merge.rc:929
+#: Merge.rc:936
msgid "&First Left with Second Right"
msgstr "&Premier élément Gauche avec deuxième élément Droite"
#. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE_LEFT2_RIGHT1
-#: Merge.rc:930
+#: Merge.rc:937
msgid "&Second Left with First Right"
msgstr "&Deuxième élément Gauche avec premier élément Droite"
#. IDR_POPUP_DIRVIEW
-#: Merge.rc:933
+#: Merge.rc:940
msgid "Co&mpare As"
msgstr "Co&mparer comme un(e)"
#. IDS_COPY_LEFT_TO_MIDDLE2
-#: Merge.rc:945 Merge.rc:957 Merge.rc:4502
+#: Merge.rc:953 Merge.rc:965 Merge.rc:4512
#, c-format
msgid "Left to Middle (%1 of %2)"
msgstr "Gauche vers Milieu (%1 de %2)"
#. IDS_COPY_LEFT_TO_RIGHT2
-#: Merge.rc:946 Merge.rc:958 Merge.rc:4501
+#: Merge.rc:954 Merge.rc:966 Merge.rc:4511
#, c-format
msgid "Left to Right (%1 of %2)"
msgstr "Gauche vers Droite (%1 de %2)"
#. IDS_MOVE_LEFT_TO2
-#: Merge.rc:947 Merge.rc:959 Merge.rc:1022 Merge.rc:4513 Merge.rc:4542
+#: Merge.rc:955 Merge.rc:967 Merge.rc:1030 Merge.rc:4523 Merge.rc:4552
#, c-format
msgid "Left to... (%1 of %2)"
msgstr "Gauche vers... (%1 de %2)"
#. IDS_COPY_MIDDLE_TO_LEFT2
-#: Merge.rc:948 Merge.rc:960 Merge.rc:4499
+#: Merge.rc:956 Merge.rc:968 Merge.rc:4509
#, c-format
msgid "Middle to Left (%1 of %2)"
msgstr "Milieu vers Gauche (%1 de %2)"
#. IDS_COPY_MIDDLE_TO_RIGHT2
-#: Merge.rc:949 Merge.rc:961 Merge.rc:4500
+#: Merge.rc:957 Merge.rc:969 Merge.rc:4510
#, c-format
msgid "Middle to Right (%1 of %2)"
msgstr "Milieu vers Droite (%1 de %2)"
#. IDS_MOVE_MIDDLE_TO2
-#: Merge.rc:950 Merge.rc:962 Merge.rc:1023 Merge.rc:4514 Merge.rc:4543
+#: Merge.rc:958 Merge.rc:970 Merge.rc:1031 Merge.rc:4524 Merge.rc:4553
#, c-format
msgid "Middle to... (%1 of %2)"
msgstr "Milieu vers... (%1 de %2)"
#. IDS_COPY_RIGHT_TO_MIDDLE2
-#: Merge.rc:951 Merge.rc:963 Merge.rc:4498
+#: Merge.rc:959 Merge.rc:971 Merge.rc:4508
#, c-format
msgid "Right to Middle (%1 of %2)"
msgstr "Droite vers Milieu (%1 de %2)"
#. IDS_COPY_RIGHT_TO_LEFT2
-#: Merge.rc:952 Merge.rc:964 Merge.rc:4497
+#: Merge.rc:960 Merge.rc:972 Merge.rc:4507
#, c-format
msgid "Right to Left (%1 of %2)"
msgstr "Droite vers Gauche (%1 de %2)"
#. IDS_MOVE_RIGHT_TO2
-#: Merge.rc:953 Merge.rc:965 Merge.rc:1024 Merge.rc:4515 Merge.rc:4544
+#: Merge.rc:961 Merge.rc:973 Merge.rc:1032 Merge.rc:4525 Merge.rc:4554
#, c-format
msgid "Right to... (%1 of %2)"
msgstr "Droite vers... (%1 de %2)"
#. IDD_EDIT_MARKER, IDC_EDIT_MARKER_DELETE
-#: Merge.rc:967 Merge.rc:2036
+#: Merge.rc:975 Merge.rc:2046
msgid "&Delete"
msgstr "&Supprimer"
#. IDR_POPUP_DIRVIEW, ID_DIR_DEL_BOTH
-#: Merge.rc:972
+#: Merge.rc:980
msgid "&Both"
msgstr "Les &deux"
#. IDR_POPUP_DIRVIEW, ID_DIR_DEL_ALL
-#: Merge.rc:973
+#: Merge.rc:981
msgid "&All"
msgstr "&Tous"
#. IDD_EDIT_REPLACE, IDC_EDIT_SCOPE_SELECTION
-#: Merge.rc:974 Merge.rc:2019
+#: Merge.rc:982 Merge.rc:2029
msgid "&Selection"
msgstr "&sélection"
#. IDR_POPUP_DIRVIEW, ID_DIR_ITEM_RENAME
-#: Merge.rc:976
+#: Merge.rc:984
msgid "Re&name"
msgstr "Re&nommer"
#. IDR_POPUP_DIRVIEW, ID_DIR_HIDE_FILENAMES
-#: Merge.rc:977
+#: Merge.rc:985
msgid "&Hide Items"
msgstr "&Masquer les éléments"
#. IDR_POPUP_DIRVIEW
-#: Merge.rc:979
+#: Merge.rc:987
msgid "&Open Left"
msgstr "&Ouvrir à Gauche"
#. IDR_POPUP_DIRVIEW
-#: Merge.rc:986
+#: Merge.rc:994
msgid "Open Midd&le"
msgstr "Ouvrir au Mi&lieu"
#. IDR_POPUP_DIRVIEW
-#: Merge.rc:993
+#: Merge.rc:1001
msgid "O&pen Right"
msgstr "Ouvrir à &Droite"
#. IDR_POPUP_DIRVIEW
-#: Merge.rc:1001
+#: Merge.rc:1009
msgid "Cop&y Paths"
msgstr "Cop&ier les chemins"
#. IDS_DEL_LEFT_FMT2
-#: Merge.rc:1003 Merge.rc:1012 Merge.rc:4530
+#: Merge.rc:1011 Merge.rc:1020 Merge.rc:4540
#, c-format
msgid "Left (%1 of %2)"
msgstr "Gauche (%1 de %2)"
#. IDS_DEL_MIDDLE_FMT2
-#: Merge.rc:1004 Merge.rc:1013 Merge.rc:4531
+#: Merge.rc:1012 Merge.rc:1021 Merge.rc:4541
#, c-format
msgid "Middle (%1 of %2)"
msgstr "Milieu (%1 de %2)"
#. IDS_DEL_RIGHT_FMT2
-#: Merge.rc:1005 Merge.rc:1014 Merge.rc:4532
+#: Merge.rc:1013 Merge.rc:1022 Merge.rc:4542
#, c-format
msgid "Right (%1 of %2)"
msgstr "Droite (%1 de %2)"
#. IDS_DEL_BOTH_FMT2
-#: Merge.rc:1006 Merge.rc:1015 Merge.rc:4533
+#: Merge.rc:1014 Merge.rc:1023 Merge.rc:4543
#, c-format
msgid "Both (%1 of %2)"
msgstr "Les deux (%1 de %2)"
#. IDS_DEL_ALL_FMT2
-#: Merge.rc:1007 Merge.rc:1016 Merge.rc:4538
+#: Merge.rc:1015 Merge.rc:1024 Merge.rc:4548
#, c-format
msgid "All (%1 of %2)"
msgstr "Tous (%1 de %2)"
#. IDR_POPUP_DIRVIEW, ID_DIR_COPY_FILENAMES
-#: Merge.rc:1009
+#: Merge.rc:1017
msgid "Copy &Filenames"
msgstr "Copier les noms de &fichiers"
#. IDR_POPUP_DIRVIEW
-#: Merge.rc:1010
+#: Merge.rc:1018
msgid "Copy Items to Clip&board"
msgstr "Copier les éléments dans le &presse-papiers"
#. IDR_POPUP_DIRVIEW, ID_DIR_COPY_ALL_DISP_COLUMNS
-#: Merge.rc:1018
+#: Merge.rc:1026
msgid "Copy All Di&splayed Columns"
msgstr "Copier toute&s les colonnes affichées"
#. IDR_POPUP_DIRVIEW
-#: Merge.rc:1020
+#: Merge.rc:1028
msgid "&Zip"
msgstr "Co&mpresser"
#. IDS_COPY_BOTH_TO2
-#: Merge.rc:1025 Merge.rc:4516
+#: Merge.rc:1033 Merge.rc:4526
#, c-format
msgid "Both to... (%1 of %2)"
msgstr "Les deux vers... (%1 de %2)"
#. IDS_COPY_ALL_TO2
-#: Merge.rc:1026 Merge.rc:4517
+#: Merge.rc:1034 Merge.rc:4527
#, c-format
msgid "All to... (%1 of %2)"
msgstr "Tous vers... (%1 de %2)"
#. IDS_COPY_DIFFERENCES_TO2
-#: Merge.rc:1027 Merge.rc:4518
+#: Merge.rc:1035 Merge.rc:4528
#, c-format
msgid "Differences to... (%1 of %2)"
msgstr "Différences vers... (%1 de %2)"
#. IDR_POPUP_DIRVIEW, ID_DIR_SHELL_CONTEXT_MENU_LEFT
-#: Merge.rc:1032
+#: Merge.rc:1040
msgid "Left Shell Menu"
msgstr "Menu du Shell Gauche"
#. IDR_POPUP_DIRVIEW, ID_DIR_SHELL_CONTEXT_MENU_MIDDLE
-#: Merge.rc:1033
+#: Merge.rc:1041
msgid "Middle Shell Menu"
msgstr "Menu du Shell Milieu"
#. IDR_POPUP_DIRVIEW, ID_DIR_SHELL_CONTEXT_MENU_RIGHT
-#: Merge.rc:1034
+#: Merge.rc:1042
msgid "Right Shell Menu"
msgstr "Menu du Shell Droite"
#. IDR_POPUP_DIRVIEW, ID_DIR_SHELL_CONTEXT_MENU_BOTH
-#: Merge.rc:1035
+#: Merge.rc:1043
msgid "Both Shell Menu"
msgstr "Les deux menus du Shell"
#. IDR_POPUP_DIRVIEW, ID_DIR_SHELL_CONTEXT_MENU_ALL
-#: Merge.rc:1036
+#: Merge.rc:1044
msgid "All Shell Menu"
msgstr "Tous les menus du Shell"
#. IDR_POPUP_EDITOR_HEADERBAR, ID_EDITOR_COPY
-#: Merge.rc:1050
+#: Merge.rc:1058
msgid "Copy"
msgstr "Copier"
#. IDR_POPUP_EDITOR_HEADERBAR, ID_EDITOR_COPY_PATH
-#: Merge.rc:1051
+#: Merge.rc:1059
msgid "&Copy Full Path"
msgstr "&Copier le chemin complet"
#. IDR_POPUP_EDITOR_HEADERBAR, ID_EDITOR_COPY_FILENAME
-#: Merge.rc:1052
+#: Merge.rc:1060
msgid "Copy &Filename"
msgstr "Copier le nom de &fichier"
#. IDR_POPUP_EDITOR_HEADERBAR, ID_EDITOR_EDIT_CAPTION
-#: Merge.rc:1053
+#: Merge.rc:1061
msgid "&Edit Caption\tF2"
msgstr "Modifi&er la légende\tF2"
#. IDR_POPUP_EDITOR_HEADERBAR, ID_EDITOR_EDIT_PATH
-#: Merge.rc:1055
+#: Merge.rc:1063
msgid "Edit &Path\tCtrl+L"
msgstr "Modifier le &chemin\tCtrl+L"
#. IDR_POPUP_EDITOR_HEADERBAR, ID_EDITOR_SELECT_FILE
-#: Merge.rc:1056
+#: Merge.rc:1064
msgid "&Open..."
msgstr "&Ouvrir..."
#. IDR_POPUP_PLUGINS_SETTINGS
-#: Merge.rc:1062
+#: Merge.rc:1070
msgid "Unpacker Settings"
msgstr "Paramètres du décompresseur"
#. IDS_USERCHOICE_NONE
-#: Merge.rc:1064 Merge.rc:1070 Merge.rc:1789 Merge.rc:1793 Merge.rc:5030
+#: Merge.rc:1072 Merge.rc:1078 Merge.rc:1799 Merge.rc:1803 Merge.rc:5040
msgid ""
msgstr ""
#. IDS_USERCHOICE_AUTOMATIC
-#: Merge.rc:1065 Merge.rc:1071 Merge.rc:5031
+#: Merge.rc:1073 Merge.rc:1079 Merge.rc:5041
msgid ""
msgstr ""
#. IDD_OPEN, IDC_SELECT_PREDIFFER
-#: Merge.rc:1066 Merge.rc:1072 Merge.rc:1970 Merge.rc:1974
+#: Merge.rc:1074 Merge.rc:1080 Merge.rc:1980 Merge.rc:1984
msgid "&Select..."
msgstr "&Sélectionner..."
#. IDR_POPUP_PLUGINS_SETTINGS
-#: Merge.rc:1068
+#: Merge.rc:1076
msgid "Prediffer Settings"
msgstr "Paramètres de précomparaison"
#. IDR_POPUP_LOCATIONBAR, ID_LOCBAR_GOTODIFF
-#: Merge.rc:1080
+#: Merge.rc:1088
msgid "G&o to Diff"
msgstr "A&tteindre la différence"
#. IDR_POPUP_LOCATIONBAR, ID_LOCBAR_MOVECURSOR_ONCLICK
-#: Merge.rc:1083
+#: Merge.rc:1091
msgid "Move Cursor on &Click"
msgstr "Déplacer le curseur en &cliquant"
#. IDR_POPUP_LOCATIONBAR, ID_DISPLAY_MOVED_NONE
-#: Merge.rc:1085
+#: Merge.rc:1093
msgid "&No Moved Blocks"
msgstr "Aucu&n blocs déplacés"
#. IDR_POPUP_LOCATIONBAR, ID_DISPLAY_MOVED_ALL
-#: Merge.rc:1086
+#: Merge.rc:1094
msgid "&All Moved Blocks"
msgstr "&Tous les blocs déplacés"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS
-#: Merge.rc:1094 Merge.rc:1127
+#: Merge.rc:1102 Merge.rc:1135
msgid "W&hitespaces"
msgstr "Caractères d'&espacement"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_WHITESPACE_COMPARE
-#: Merge.rc:1096 Merge.rc:1129
+#: Merge.rc:1104 Merge.rc:1137
msgid "Com&pare"
msgstr "Com&parer"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_WHITESPACE_IGNORE
-#: Merge.rc:1097 Merge.rc:1130
+#: Merge.rc:1105 Merge.rc:1138
msgid "I&gnore Changes"
msgstr "I&gnorer les changements"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_WHITESPACE_IGNOREALL
-#: Merge.rc:1098 Merge.rc:1131
+#: Merge.rc:1106 Merge.rc:1139
msgid "Ig&nore All"
msgstr "Ig&norer tout"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_IGNORE_BLANKLINES
-#: Merge.rc:1100 Merge.rc:1133
+#: Merge.rc:1108 Merge.rc:1141
msgid "Ignore Blan&k Lines"
msgstr "Ignorer les lignes &vides"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_IGNORE_CASE
-#: Merge.rc:1101 Merge.rc:1134
+#: Merge.rc:1109 Merge.rc:1142
msgid "Ignore &Case"
msgstr "Ignorer la &casse"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_IGNORE_EOL
-#: Merge.rc:1102 Merge.rc:1135
+#: Merge.rc:1110 Merge.rc:1143
msgid "Igno&re EOL Differences (Windows/Unix/Mac)"
msgstr "Ignorer les différences d'EOL (Windows/Unix/Mac)"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_IGNORE_CODEPAGE
-#: Merge.rc:1103 Merge.rc:1136
+#: Merge.rc:1111 Merge.rc:1144
msgid "Ignore Codepage &Differences"
msgstr "Ignorer les &différences de page de code"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_IGNORE_NUMBERS
-#: Merge.rc:1104 Merge.rc:1137
+#: Merge.rc:1112 Merge.rc:1145
msgid "Ignore Num&bers"
msgstr "Ignorer les nom&bres"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_IGNORE_COMMENTS
-#: Merge.rc:1105 Merge.rc:1138
+#: Merge.rc:1113 Merge.rc:1146
msgid "Ignore C&omment Differences"
msgstr "Ignorer les différences de c&ommentaire"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_IGNORE_MISSING_TRAILING_EOL
-#: Merge.rc:1106 Merge.rc:1139
+#: Merge.rc:1114 Merge.rc:1147
msgid "Ignore &Missing Trailing EOL"
msgstr "Ignorer les EOL de fin &manquants"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_IGNORE_LINE_BREAKS
-#: Merge.rc:1107 Merge.rc:1140
+#: Merge.rc:1115 Merge.rc:1148
msgid "Ignore Line &Breaks (Treat as Spaces)"
msgstr "Ignorer les sauts de ligne (traiter comme des espaces)"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_RECURS_CHECK
-#: Merge.rc:1109 Merge.rc:2963
+#: Merge.rc:1117 Merge.rc:2973
msgid "&Include Subfolders"
msgstr "&Inclure les sous-dossiers"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS
-#: Merge.rc:1110 Merge.rc:1142
+#: Merge.rc:1118 Merge.rc:1150
msgid "&Compare Method"
msgstr "Méthode de &comparaison"
#. IDS_COMPMETHOD_FULL_CONTENTS
-#: Merge.rc:1112 Merge.rc:1144 Merge.rc:1328 Merge.rc:4282
+#: Merge.rc:1120 Merge.rc:1152 Merge.rc:1338 Merge.rc:4292
msgid "Full Contents"
msgstr "Contenu complet"
#. IDS_COMPMETHOD_QUICK_CONTENTS
-#: Merge.rc:1113 Merge.rc:1145 Merge.rc:1329 Merge.rc:4283
+#: Merge.rc:1121 Merge.rc:1153 Merge.rc:1339 Merge.rc:4293
msgid "Quick Contents"
msgstr "Contenu rapide"
#. IDS_COMPMETHOD_BINARY_CONTENTS
-#: Merge.rc:1114 Merge.rc:1146 Merge.rc:1330 Merge.rc:4284
+#: Merge.rc:1122 Merge.rc:1154 Merge.rc:1340 Merge.rc:4294
msgid "Binary Contents"
msgstr "Contenu binaire"
#. IDS_COMPMETHOD_MODDATE
-#: Merge.rc:1115 Merge.rc:1147 Merge.rc:1331 Merge.rc:4285
+#: Merge.rc:1123 Merge.rc:1155 Merge.rc:1341 Merge.rc:4295
msgid "Modified Date"
msgstr "Date modifiée"
#. IDS_COMPMETHOD_DATESIZE
-#: Merge.rc:1116 Merge.rc:1148 Merge.rc:1332 Merge.rc:4286
+#: Merge.rc:1124 Merge.rc:1156 Merge.rc:1342 Merge.rc:4296
msgid "Modified Date and Size"
msgstr "Date et taille modifiées"
#. IDS_COMPMETHOD_SIZE
-#: Merge.rc:1117 Merge.rc:1149 Merge.rc:1333 Merge.rc:4287
+#: Merge.rc:1125 Merge.rc:1157 Merge.rc:1343 Merge.rc:4297
msgid "Size"
msgstr "Taille"
#. IDS_COMPMETHOD_EXISTENCE
-#: Merge.rc:1118 Merge.rc:1150 Merge.rc:1334 Merge.rc:4288
+#: Merge.rc:1126 Merge.rc:1158 Merge.rc:1344 Merge.rc:4298
msgid "Existence"
msgstr "Existence"
#. IDR_POPUP_PROJECT, ID_LOAD_PROJECT
-#: Merge.rc:1192
+#: Merge.rc:1202
msgid "&Load Project..."
msgstr "Charger &un projet..."
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARGALL
-#: Merge.rc:1272 Merge.rc:1301
+#: Merge.rc:1282 Merge.rc:1311
msgid "${*} - All Arguments"
msgstr "${*} - Tous les arguments"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARG1
-#: Merge.rc:1273 Merge.rc:1302
+#: Merge.rc:1283 Merge.rc:1312
msgid "${1} - First Argument"
msgstr "${1} - Premier argument"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARG2
-#: Merge.rc:1274 Merge.rc:1303
+#: Merge.rc:1284 Merge.rc:1313
msgid "${2} - Second Argument"
msgstr "${2} - Deuxième argument"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARG3
-#: Merge.rc:1275 Merge.rc:1304
+#: Merge.rc:1285 Merge.rc:1314
msgid "${3} - Third Argument"
msgstr "${3} - Troisième argument"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARG4
-#: Merge.rc:1276 Merge.rc:1305
+#: Merge.rc:1286 Merge.rc:1315
msgid "${4} - Fourth Argument"
msgstr "${4} - Quatrième argument"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARG5
-#: Merge.rc:1277 Merge.rc:1306
+#: Merge.rc:1287 Merge.rc:1316
msgid "${5} - Fifth Argument"
msgstr "${5} - Cinquième argument"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARG6
-#: Merge.rc:1278 Merge.rc:1307
+#: Merge.rc:1288 Merge.rc:1317
msgid "${6} - Sixth Argument"
msgstr "${6} - Sixième argument"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARG7
-#: Merge.rc:1279 Merge.rc:1308
+#: Merge.rc:1289 Merge.rc:1318
msgid "${7} - Seventh Argument"
msgstr "${7} - Septième argument"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARG8
-#: Merge.rc:1280 Merge.rc:1309
+#: Merge.rc:1290 Merge.rc:1319
msgid "${8} - Eighth Argument"
msgstr "${8} - Huitième argument"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARG9
-#: Merge.rc:1281 Merge.rc:1310
+#: Merge.rc:1291 Merge.rc:1320
msgid "${9} - Ninth Argument"
msgstr "${9} - Neuvième argument"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_SRC_FILE
-#: Merge.rc:1289
+#: Merge.rc:1299
msgid "${SRC_FILE} - Source File"
msgstr "${SRC_FILE} - Fichier source"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_SRC_FOLDER
-#: Merge.rc:1290
+#: Merge.rc:1300
msgid "${SRC_FOLDER} - Source Folder"
msgstr "${SRC_FOLDER} - Dossier source"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_SRC_URL
-#: Merge.rc:1291
+#: Merge.rc:1301
msgid "${SRC_URL} - Source URL"
msgstr "${SRC_URL} - URL de la source"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_SRC_URL_PROTOCOL
-#: Merge.rc:1292
+#: Merge.rc:1302
msgid "${SRC_URL_PROTOCOL} - Source URL Protocol"
msgstr "${SRC_URL_PROTOCOL} - Protocole de l'URL source"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_SRC_URL_SUFFIX
-#: Merge.rc:1293
+#: Merge.rc:1303
msgid "${SRC_URL_SUFFIX} - Source URL Suffix"
msgstr "${SRC_URL_SUFFIX} - Suffixe de l'URL source"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_DST_FILE
-#: Merge.rc:1294
+#: Merge.rc:1304
msgid "${DST_FILE} - Destination File"
msgstr "${DST_FILE} - Fichier de destination"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_DST_FOLDER
-#: Merge.rc:1295
+#: Merge.rc:1305
msgid "${DST_FOLDER} - Destination Folder"
msgstr "${DST_FOLDER} - Dossier de destination"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_DST_URL
-#: Merge.rc:1296
+#: Merge.rc:1306
msgid "${DST_URL} - Destination URL"
msgstr "${DST_URL} - URL de destination"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_DST_URL_PROTOCOL
-#: Merge.rc:1297
+#: Merge.rc:1307
msgid "${DST_URL_PROTOCOL} - Destination URL Protocol"
msgstr "${DST_URL_PROTOCOL} - Protocole de l'URL de destination"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_DST_URL_SUFFIX
-#: Merge.rc:1298
+#: Merge.rc:1308
msgid "${DST_URL_SUFFIX} - Destination URL Suffix"
msgstr "${DST_URL_SUFFIX} - Suffixe de l'URL de destination"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_WINMERGE_HOME
-#: Merge.rc:1299
+#: Merge.rc:1309
msgid "${WINMERGE_HOME} - WinMerge Home Directory"
msgstr "${WINMERGE_HOME} - Répertoire d'origine de WinMerge"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_SCRIPT_FILE
-#: Merge.rc:1300
+#: Merge.rc:1310
msgid "${SCRIPT_FILE} - Script File"
msgstr "${SCRIPT_FILE} - Fichier de script"
#. IDR_POPUP_PLUGIN_ADD_MENU, ID_PLUGIN_ADD_UNPACKER
-#: Merge.rc:1318
+#: Merge.rc:1328
msgid "Add &Unpacker Plugin..."
msgstr "Ajo&uter le plug-in décompresseur..."
#. IDR_POPUP_PLUGIN_ADD_MENU, ID_PLUGIN_ADD_PREDIFFER
-#: Merge.rc:1319
+#: Merge.rc:1329
msgid "Add &Prediffer Plugin..."
msgstr "Ajouter le plug-in de &précomparaison..."
#. IDR_POPUP_PLUGIN_ADD_MENU, ID_PLUGIN_DUPLICATE
-#: Merge.rc:1320
+#: Merge.rc:1330
msgid "&Duplicate Plugin..."
msgstr "&Dupliquer le plug-in..."
#. IDR_POPUP_OUTPUTVIEW, ID_EDIT_CLEAR_ALL
-#: Merge.rc:1344
+#: Merge.rc:1354
msgid "Clear &All"
msgstr "Effacer &tout"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_MASK_CLEAR
-#: Merge.rc:1352
+#: Merge.rc:1362
msgid "&Clear All"
msgstr "&Effacer tout"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_MASK_REMOVE_LAST
-#: Merge.rc:1353
+#: Merge.rc:1363
msgid "Remove Last Filter &Group"
msgstr "Supprimer le dernier &groupe de filtres"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_MASK_ALL
-#: Merge.rc:1354
+#: Merge.rc:1364
msgid "R&eset to Default (*.*)"
msgstr "Réin&itialiser aux valeurs par défaut (*.*)"
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1355
+#: Merge.rc:1365
msgid "Add E&xclude File"
msgstr "Ajouter un fichier d'e&xclusion"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_SYS
-#: Merge.rc:1357
+#: Merge.rc:1367
msgid "&System Files"
msgstr "&Fichiers système"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_BACKUP
-#: Merge.rc:1358
+#: Merge.rc:1368
msgid "&Editor Backup Files"
msgstr "Fichiers de sauvegarde de l'é&diteur"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_BIN
-#: Merge.rc:1359
+#: Merge.rc:1369
msgid "&Compiled Binary Files"
msgstr "Fichiers &binaires compilés"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_LOG
-#: Merge.rc:1360
+#: Merge.rc:1370
msgid "&Log Files"
msgstr "Fichiers &journaux"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_TEMP
-#: Merge.rc:1361
+#: Merge.rc:1371
msgid "&Temporary or Cache Files"
msgstr "Fichiers &temporaires ou en cache"
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1363
+#: Merge.rc:1373
msgid "Add Excl&ude Folder"
msgstr "Ajouter un dossier d'excl&usion"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FOLDER_VCS
-#: Merge.rc:1365
+#: Merge.rc:1375
msgid "&Version Control"
msgstr "Contrôle de &version"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FOLDER_BUILD
-#: Merge.rc:1366
+#: Merge.rc:1376
msgid "&Build Artifacts"
msgstr "&Créer des artefacts"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FOLDER_IDE
-#: Merge.rc:1367
+#: Merge.rc:1377
msgid "&IDE"
msgstr "&IDE"
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1370
+#: Merge.rc:1380
msgid "Add &File Condition"
msgstr "Ajouter une condition de &fichier"
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1372 Merge.rc:1551
+#: Merge.rc:1382 Merge.rc:1561
msgid "File &Size"
msgstr "&Taille du fichier"
#. IDR_POPUP_FILTERMENU_DIFF_SIZE, ID_FILTERMENU_DIFF_SIZE_LT_1KB
-#: Merge.rc:1374 Merge.rc:1527 Merge.rc:1564 Merge.rc:1629 Merge.rc:1707
+#: Merge.rc:1384 Merge.rc:1537 Merge.rc:1574 Merge.rc:1639 Merge.rc:1717
msgid "Less than 1KB"
msgstr "Moins de 1 Ko"
#. IDR_POPUP_FILTERMENU_DIFF_SIZE, ID_FILTERMENU_DIFF_SIZE_GE_1KB
-#: Merge.rc:1375 Merge.rc:1528 Merge.rc:1565 Merge.rc:1630 Merge.rc:1708
+#: Merge.rc:1385 Merge.rc:1538 Merge.rc:1575 Merge.rc:1640 Merge.rc:1718
msgid "1KB or more"
msgstr "1 Ko ou plus"
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_LT_10KB
-#: Merge.rc:1376 Merge.rc:1529 Merge.rc:1631
+#: Merge.rc:1386 Merge.rc:1539 Merge.rc:1641
msgid "Less than 10KB"
msgstr "Moins de 10 Ko"
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_GE_10KB
-#: Merge.rc:1377 Merge.rc:1530 Merge.rc:1632
+#: Merge.rc:1387 Merge.rc:1540 Merge.rc:1642
msgid "10KB or more"
msgstr "10 Ko ou plus"
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_LT_100KB
-#: Merge.rc:1378 Merge.rc:1531 Merge.rc:1633
+#: Merge.rc:1388 Merge.rc:1541 Merge.rc:1643
msgid "Less than 100KB"
msgstr "Moins de 100 Ko"
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_GE_100KB
-#: Merge.rc:1379 Merge.rc:1532 Merge.rc:1634
+#: Merge.rc:1389 Merge.rc:1542 Merge.rc:1644
msgid "100KB or more"
msgstr "100 Ko ou plus"
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_LT_1MB
-#: Merge.rc:1380 Merge.rc:1533 Merge.rc:1635
+#: Merge.rc:1390 Merge.rc:1543 Merge.rc:1645
msgid "Less than 1MB"
msgstr "Moins de 1 Mo"
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_GE_1MB
-#: Merge.rc:1381 Merge.rc:1534 Merge.rc:1636
+#: Merge.rc:1391 Merge.rc:1544 Merge.rc:1646
msgid "1MB or more"
msgstr "1 Mo ou plus"
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_LT_10MB
-#: Merge.rc:1382 Merge.rc:1535 Merge.rc:1637
+#: Merge.rc:1392 Merge.rc:1545 Merge.rc:1647
msgid "Less than 10MB"
msgstr "Moins de 10 Mo"
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_GE_10MB
-#: Merge.rc:1383 Merge.rc:1536 Merge.rc:1638
+#: Merge.rc:1393 Merge.rc:1546 Merge.rc:1648
msgid "10MB or more"
msgstr "10 Mo ou plus"
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_LT_100MB
-#: Merge.rc:1384 Merge.rc:1537 Merge.rc:1639
+#: Merge.rc:1394 Merge.rc:1547 Merge.rc:1649
msgid "Less than 100MB"
msgstr "Moins de 100 Mo"
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_GE_100MB
-#: Merge.rc:1385 Merge.rc:1538 Merge.rc:1640
+#: Merge.rc:1395 Merge.rc:1548 Merge.rc:1650
msgid "100MB or more"
msgstr "100 Mo ou plus"
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_LT_1GB
-#: Merge.rc:1386 Merge.rc:1539 Merge.rc:1641
+#: Merge.rc:1396 Merge.rc:1549 Merge.rc:1651
msgid "Less than 1GB"
msgstr "Moins de 1 Go"
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_GE_1GB
-#: Merge.rc:1387 Merge.rc:1642
+#: Merge.rc:1397 Merge.rc:1652
msgid "1GB or more"
msgstr "1 Go ou plus"
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_RANGE
-#: Merge.rc:1388 Merge.rc:1465 Merge.rc:1517 Merge.rc:1523 Merge.rc:1540
-#: Merge.rc:1566 Merge.rc:1587 Merge.rc:1643 Merge.rc:1709 Merge.rc:1734
+#: Merge.rc:1398 Merge.rc:1475 Merge.rc:1527 Merge.rc:1533 Merge.rc:1550
+#: Merge.rc:1576 Merge.rc:1597 Merge.rc:1653 Merge.rc:1719 Merge.rc:1744
msgid "Custom Range..."
msgstr "Plage personnalisée..."
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1390 Merge.rc:1471 Merge.rc:1568
+#: Merge.rc:1400 Merge.rc:1481 Merge.rc:1578
msgid "&Last Modified"
msgstr "&Dernière modification"
#. IDR_POPUP_FILTERMENU_DATE
-#: Merge.rc:1392 Merge.rc:1473 Merge.rc:1651
+#: Merge.rc:1402 Merge.rc:1483 Merge.rc:1661
msgid "&Hour"
msgstr "&Heure"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_HOUR_BEFORE_1
-#: Merge.rc:1394 Merge.rc:1475 Merge.rc:1653
+#: Merge.rc:1404 Merge.rc:1485 Merge.rc:1663
msgid "More than 1 hour ago"
msgstr "Il y a plus d'une heure"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_HOUR_WITHIN_1
-#: Merge.rc:1395 Merge.rc:1476 Merge.rc:1654
+#: Merge.rc:1405 Merge.rc:1486 Merge.rc:1664
msgid "Within 1 hour"
msgstr "Dans 1 heure"
#. IDR_POPUP_FILTERMENU_DATE
-#: Merge.rc:1397 Merge.rc:1478 Merge.rc:1656
+#: Merge.rc:1407 Merge.rc:1488 Merge.rc:1666
msgid "&Day"
msgstr "&Jour"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_DAY_BEFORE_TODAY
-#: Merge.rc:1399 Merge.rc:1480 Merge.rc:1658
+#: Merge.rc:1409 Merge.rc:1490 Merge.rc:1668
msgid "Before today"
msgstr "Avant aujourd'hui"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_DAY_TODAY
-#: Merge.rc:1400 Merge.rc:1481 Merge.rc:1659
+#: Merge.rc:1410 Merge.rc:1491 Merge.rc:1669
msgid "Today"
msgstr "Aujourd'hui"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_DAY_BEFORE_YESTERDAY
-#: Merge.rc:1401 Merge.rc:1482 Merge.rc:1660
+#: Merge.rc:1411 Merge.rc:1492 Merge.rc:1670
msgid "Before yesterday"
msgstr "Avant hier"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_DAY_YESTERDAY
-#: Merge.rc:1402 Merge.rc:1483 Merge.rc:1661
+#: Merge.rc:1412 Merge.rc:1493 Merge.rc:1671
msgid "Yesterday"
msgstr "Hier"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_DAY_SINCE_YESTERDAY
-#: Merge.rc:1403 Merge.rc:1484 Merge.rc:1662
+#: Merge.rc:1413 Merge.rc:1494 Merge.rc:1672
msgid "Since yesterday"
msgstr "Depuis hier"
#. IDR_POPUP_FILTERMENU_DATE
-#: Merge.rc:1405 Merge.rc:1486 Merge.rc:1664
+#: Merge.rc:1415 Merge.rc:1496 Merge.rc:1674
msgid "&Week"
msgstr "&Semaine"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_WEEK_BEFORE_THIS
-#: Merge.rc:1407 Merge.rc:1488 Merge.rc:1666
+#: Merge.rc:1417 Merge.rc:1498 Merge.rc:1676
msgid "Before this week"
msgstr "Avant cette semaine"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_WEEK_THIS
-#: Merge.rc:1408 Merge.rc:1489 Merge.rc:1667
+#: Merge.rc:1418 Merge.rc:1499 Merge.rc:1677
msgid "This week"
msgstr "Cette semaine"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_WEEK_BEFORE_LAST
-#: Merge.rc:1409 Merge.rc:1490 Merge.rc:1668
+#: Merge.rc:1419 Merge.rc:1500 Merge.rc:1678
msgid "Before last week"
msgstr "Avant la semaine dernière"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_WEEK_LAST
-#: Merge.rc:1410 Merge.rc:1491 Merge.rc:1669
+#: Merge.rc:1420 Merge.rc:1501 Merge.rc:1679
msgid "Last week"
msgstr "La semaine dernière"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_WEEK_SINCE_LAST
-#: Merge.rc:1411 Merge.rc:1492 Merge.rc:1670
+#: Merge.rc:1421 Merge.rc:1502 Merge.rc:1680
msgid "Since last week"
msgstr "Depuis la semaine dernière"
#. IDR_POPUP_FILTERMENU_DATE
-#: Merge.rc:1413 Merge.rc:1494 Merge.rc:1672
+#: Merge.rc:1423 Merge.rc:1504 Merge.rc:1682
msgid "&Month"
msgstr "&Mois"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_MONTH_BEFORE_THIS
-#: Merge.rc:1415 Merge.rc:1496 Merge.rc:1674
+#: Merge.rc:1425 Merge.rc:1506 Merge.rc:1684
msgid "Before this month"
msgstr "Avant ce mois"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_MONTH_THIS
-#: Merge.rc:1416 Merge.rc:1497 Merge.rc:1675
+#: Merge.rc:1426 Merge.rc:1507 Merge.rc:1685
msgid "This month"
msgstr "Ce mois-ci"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_MONTH_BEFORE_LAST
-#: Merge.rc:1417 Merge.rc:1498 Merge.rc:1676
+#: Merge.rc:1427 Merge.rc:1508 Merge.rc:1686
msgid "Before last month"
msgstr "Avant le mois dernier"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_MONTH_LAST
-#: Merge.rc:1418 Merge.rc:1499 Merge.rc:1677
+#: Merge.rc:1428 Merge.rc:1509 Merge.rc:1687
msgid "Last month"
msgstr "Mois dernier"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_MONTH_SINCE_LAST
-#: Merge.rc:1419 Merge.rc:1500 Merge.rc:1678
+#: Merge.rc:1429 Merge.rc:1510 Merge.rc:1688
msgid "Since last month"
msgstr "Depuis le mois dernier"
#. IDR_POPUP_FILTERMENU_DATE
-#: Merge.rc:1421 Merge.rc:1502 Merge.rc:1680
+#: Merge.rc:1431 Merge.rc:1512 Merge.rc:1690
msgid "&Year"
msgstr "&Année"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_YEAR_BEFORE_THIS
-#: Merge.rc:1423 Merge.rc:1504 Merge.rc:1682
+#: Merge.rc:1433 Merge.rc:1514 Merge.rc:1692
msgid "Before this year"
msgstr "Avant cette année"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_YEAR_THIS
-#: Merge.rc:1424 Merge.rc:1505 Merge.rc:1683
+#: Merge.rc:1434 Merge.rc:1515 Merge.rc:1693
msgid "This year"
msgstr "Cette année"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_YEAR_BEFORE_LAST
-#: Merge.rc:1425 Merge.rc:1506 Merge.rc:1684
+#: Merge.rc:1435 Merge.rc:1516 Merge.rc:1694
msgid "Before last year"
msgstr "Avant l'année dernière"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_YEAR_LAST
-#: Merge.rc:1426 Merge.rc:1507 Merge.rc:1685
+#: Merge.rc:1436 Merge.rc:1517 Merge.rc:1695
msgid "Last year"
msgstr "L'année dernière"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_YEAR_SINCE_LAST
-#: Merge.rc:1427 Merge.rc:1508 Merge.rc:1686
+#: Merge.rc:1437 Merge.rc:1518 Merge.rc:1696
msgid "Since last year"
msgstr "Depuis l'année dernière"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_RANGE
-#: Merge.rc:1429 Merge.rc:1510 Merge.rc:1688
+#: Merge.rc:1439 Merge.rc:1520 Merge.rc:1698
msgid "&Custom Range..."
msgstr "&Plage personnalisée..."
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1431 Merge.rc:1589
+#: Merge.rc:1441 Merge.rc:1599
msgid "&Attributes"
msgstr "&Attributs"
#. IDR_POPUP_FILTERMENU_ATTR, ID_FILTERMENU_ATTR_READONLY
-#: Merge.rc:1433 Merge.rc:1607
+#: Merge.rc:1443 Merge.rc:1617
msgid "Read-only files"
msgstr "Fichiers en lecture seule"
#. IDR_POPUP_FILTERMENU_ATTR, ID_FILTERMENU_ATTR_NOT_READONLY
-#: Merge.rc:1434 Merge.rc:1608
+#: Merge.rc:1444 Merge.rc:1618
msgid "Not read-only files"
msgstr "Fichiers non en lecture seule"
#. IDR_POPUP_FILTERMENU_ATTR, ID_FILTERMENU_ATTR_HIDDEN
-#: Merge.rc:1435 Merge.rc:1609
+#: Merge.rc:1445 Merge.rc:1619
msgid "Hidden files"
msgstr "Fichiers cachés"
#. IDR_POPUP_FILTERMENU_ATTR, ID_FILTERMENU_ATTR_NOT_HIDDEN
-#: Merge.rc:1436 Merge.rc:1610
+#: Merge.rc:1446 Merge.rc:1620
msgid "Not hidden files"
msgstr "Pas de fichiers cachés"
#. IDR_POPUP_FILTERMENU_ATTR, ID_FILTERMENU_ATTR_SYSTEM
-#: Merge.rc:1437 Merge.rc:1611
+#: Merge.rc:1447 Merge.rc:1621
msgid "System files"
msgstr "Fichiers système"
#. IDR_POPUP_FILTERMENU_ATTR, ID_FILTERMENU_ATTR_NOT_SYSTEM
-#: Merge.rc:1438 Merge.rc:1612
+#: Merge.rc:1448 Merge.rc:1622
msgid "Not system files"
msgstr "Pas les fichiers système"
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1440
+#: Merge.rc:1450
msgid "File &Content"
msgstr "&Contenu du fichier"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_CONTAINS
-#: Merge.rc:1442
+#: Merge.rc:1452
msgid "Contains string..."
msgstr "Contient la chaîne..."
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_NOT_CONTAINS
-#: Merge.rc:1443
+#: Merge.rc:1453
msgid "Does not contain string..."
msgstr "Ne contient pas la chaîne..."
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_FIRST_LINE_CONTAINS
-#: Merge.rc:1444
+#: Merge.rc:1454
msgid "First line contains string..."
msgstr "La première ligne contient la chaîne..."
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_FIRST_LINE_NOT_CONTAINS
-#: Merge.rc:1445
+#: Merge.rc:1455
msgid "First line does not contain string..."
msgstr "La première ligne ne contient pas la chaîne..."
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_FIRST_10_CONTAINS
-#: Merge.rc:1446
+#: Merge.rc:1456
msgid "First 10 lines contain string..."
msgstr "Les 10 premières lignes contiennent la chaîne..."
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_FIRST_10_NOT_CONTAINS
-#: Merge.rc:1447
+#: Merge.rc:1457
msgid "First 10 lines do not contain string..."
msgstr "Les 10 premières lignes ne contiennent pas la chaîne..."
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_LAST_10_CONTAINS
-#: Merge.rc:1448
+#: Merge.rc:1458
msgid "Last 10 lines contain string..."
msgstr "Les 10 dernières lignes contiennent la chaîne..."
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_LAST_10_NOT_CONTAINS
-#: Merge.rc:1449
+#: Merge.rc:1459
msgid "Last 10 lines do not contain string..."
msgstr "Les 10 dernières lignes ne contiennent pas la chaîne..."
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_LAST_LINE_CONTAINS
-#: Merge.rc:1450
+#: Merge.rc:1460
msgid "Last line contains string..."
msgstr "La dernière ligne contient une chaîne..."
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_LAST_LINE_NOT_CONTAINS
-#: Merge.rc:1451
+#: Merge.rc:1461
msgid "Last line does not contain string..."
msgstr "La dernière ligne ne contient pas la chaîne..."
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1453
+#: Merge.rc:1463
msgid "&Line Count"
msgstr "&Nombre de lignes"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_LT_10
-#: Merge.rc:1455
+#: Merge.rc:1465
msgid "Less than 10"
msgstr "Moins de 10"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_GE_10
-#: Merge.rc:1456
+#: Merge.rc:1466
msgid "10 or more"
msgstr "10 ou plus"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_LT_100
-#: Merge.rc:1457
+#: Merge.rc:1467
msgid "Less than 100"
msgstr "Moins de 100"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_GE_100
-#: Merge.rc:1458
+#: Merge.rc:1468
msgid "100 or more"
msgstr "100 ou plus"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_LT_1000
-#: Merge.rc:1459
+#: Merge.rc:1469
msgid "Less than 1000"
msgstr "Moins de 1000"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_GE_1000
-#: Merge.rc:1460
+#: Merge.rc:1470
msgid "1000 or more"
msgstr "1000 ou plus"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_LT_10000
-#: Merge.rc:1461
+#: Merge.rc:1471
msgid "Less than 10000"
msgstr "Moins de 10 000"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_GE_10000
-#: Merge.rc:1462
+#: Merge.rc:1472
msgid "10000 or more"
msgstr "10 000 ou plus"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_LT_100000
-#: Merge.rc:1463
+#: Merge.rc:1473
msgid "Less than 100000"
msgstr "Moins de 100 000"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_GE_100000
-#: Merge.rc:1464
+#: Merge.rc:1474
msgid "100000 or more"
msgstr "100 000 ou plus"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_PROPS
-#: Merge.rc:1467 Merge.rc:1594 Merge.rc:1761 Merge.rc:1778
+#: Merge.rc:1477 Merge.rc:1604 Merge.rc:1771 Merge.rc:1788
msgid "Additional &Properties..."
msgstr "&Propriétés supplémentaires..."
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1469
+#: Merge.rc:1479
msgid "Add F&older Condition"
msgstr "Ajouter une condition de d&ossier"
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1513
+#: Merge.rc:1523
msgid "&Files"
msgstr "&Fichiers"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FOLDER_FILES_EQ_0
-#: Merge.rc:1515
+#: Merge.rc:1525
msgid "0 files"
msgstr "0 fichier"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FOLDER_FILES_GE_1
-#: Merge.rc:1516
+#: Merge.rc:1526
msgid "1 file or more"
msgstr "1 fichier ou plus"
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1519
+#: Merge.rc:1529
msgid "&Items"
msgstr "&Éléments"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FOLDER_ITEMS_EQ_0
-#: Merge.rc:1521
+#: Merge.rc:1531
msgid "0 items"
msgstr "0 élément"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FOLDER_ITEMS_GE_1
-#: Merge.rc:1522
+#: Merge.rc:1532
msgid "1 item or more"
msgstr "1 élément ou plus"
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1525
+#: Merge.rc:1535
msgid "&Total Size"
msgstr "&Taille totale"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FOLDER_STATS_RECURSIVE
-#: Merge.rc:1542
+#: Merge.rc:1552
msgid "&Recursive"
msgstr "&Récursif"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONDITION_ANY
-#: Merge.rc:1544
+#: Merge.rc:1554
msgid "Target: &Any (Left/Middle/Right)"
msgstr "Cible : &Tout (Gauche/Milieu/Droite)"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONDITION_LEFT
-#: Merge.rc:1545
+#: Merge.rc:1555
msgid "Target: &Left"
msgstr "Cible : &Gauche"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONDITION_MIDDLE
-#: Merge.rc:1546
+#: Merge.rc:1556
msgid "Target: &Middle"
msgstr "Cible : &Milieu"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONDITION_RIGHT
-#: Merge.rc:1547
+#: Merge.rc:1557
msgid "Target: &Right"
msgstr "Cible : &Droite"
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1549
+#: Merge.rc:1559
msgid "Add &Difference Condition"
msgstr "Ajouter une condition de &différence"
#. IDR_POPUP_FILTERMENU_DIFF_PROP, ID_FILTERMENU_DIFF_PROP_EQUAL
-#: Merge.rc:1553 Merge.rc:1570 Merge.rc:1591 Merge.rc:1696 Merge.rc:1717
-#: Merge.rc:1742
+#: Merge.rc:1563 Merge.rc:1580 Merge.rc:1601 Merge.rc:1706 Merge.rc:1727
+#: Merge.rc:1752
msgid "Equal"
msgstr "Égal"
#. IDR_POPUP_FILTERMENU_DIFF_PROP, ID_FILTERMENU_DIFF_PROP_NOT_EQUAL
-#: Merge.rc:1554 Merge.rc:1571 Merge.rc:1592 Merge.rc:1697 Merge.rc:1718
-#: Merge.rc:1743
+#: Merge.rc:1564 Merge.rc:1581 Merge.rc:1602 Merge.rc:1707 Merge.rc:1728
+#: Merge.rc:1753
msgid "Not Equal"
msgstr "Différent"
#. IDR_POPUP_FILTERMENU_DIFF_PROP, ID_FILTERMENU_DIFF_PROP_LESS
-#: Merge.rc:1555 Merge.rc:1572 Merge.rc:1698 Merge.rc:1719 Merge.rc:1744
+#: Merge.rc:1565 Merge.rc:1582 Merge.rc:1708 Merge.rc:1729 Merge.rc:1754
msgid "Less Than"
msgstr "Inférieur à"
#. IDR_POPUP_FILTERMENU_DIFF_PROP, ID_FILTERMENU_DIFF_PROP_LESS_EQUAL
-#: Merge.rc:1556 Merge.rc:1573 Merge.rc:1699 Merge.rc:1720 Merge.rc:1745
+#: Merge.rc:1566 Merge.rc:1583 Merge.rc:1709 Merge.rc:1730 Merge.rc:1755
msgid "Less Than or Equal to"
msgstr "Inférieur ou égal à"
#. IDR_POPUP_FILTERMENU_DIFF_PROP, ID_FILTERMENU_DIFF_PROP_GREATER
-#: Merge.rc:1557 Merge.rc:1574 Merge.rc:1700 Merge.rc:1721 Merge.rc:1746
+#: Merge.rc:1567 Merge.rc:1584 Merge.rc:1710 Merge.rc:1731 Merge.rc:1756
msgid "Greater Than"
msgstr "Supérieur à"
#. IDR_POPUP_FILTERMENU_DIFF_PROP, ID_FILTERMENU_DIFF_PROP_GREATER_EQUAL
-#: Merge.rc:1558 Merge.rc:1575 Merge.rc:1701 Merge.rc:1722 Merge.rc:1747
+#: Merge.rc:1568 Merge.rc:1585 Merge.rc:1711 Merge.rc:1732 Merge.rc:1757
msgid "Greater Than or Equal to"
msgstr "Supérieur ou égal à"
#. IDR_POPUP_FILTERMENU_DIFF_SIZE, ID_FILTERMENU_DIFF_SIZE_LT_10B
-#: Merge.rc:1560 Merge.rc:1703
+#: Merge.rc:1570 Merge.rc:1713
msgid "Less than 10B"
msgstr "Moins de 10 octets"
#. IDR_POPUP_FILTERMENU_DIFF_SIZE, ID_FILTERMENU_DIFF_SIZE_GE_10B
-#: Merge.rc:1561 Merge.rc:1704
+#: Merge.rc:1571 Merge.rc:1714
msgid "10B or more"
msgstr "10 octets ou plus"
#. IDR_POPUP_FILTERMENU_DIFF_SIZE, ID_FILTERMENU_DIFF_SIZE_LT_100B
-#: Merge.rc:1562 Merge.rc:1705
+#: Merge.rc:1572 Merge.rc:1715
msgid "Less than 100B"
msgstr "Moins de 100 octets"
#. IDR_POPUP_FILTERMENU_DIFF_SIZE, ID_FILTERMENU_DIFF_SIZE_GE_100B
-#: Merge.rc:1563 Merge.rc:1706
+#: Merge.rc:1573 Merge.rc:1716
msgid "100B or more"
msgstr "100 octets ou plus"
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_LT_1SECOND
-#: Merge.rc:1577 Merge.rc:1724
+#: Merge.rc:1587 Merge.rc:1734
msgid "Less than 1 second"
msgstr "Moins de 1 seconde"
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_GE_1SECOND
-#: Merge.rc:1578 Merge.rc:1725
+#: Merge.rc:1588 Merge.rc:1735
msgid "1 second or more"
msgstr "1 seconde ou plus"
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_LT_1MINUTE
-#: Merge.rc:1579 Merge.rc:1726
+#: Merge.rc:1589 Merge.rc:1736
msgid "Less than 1 minute"
msgstr "Moins de 1 minute"
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_GE_1MINUTE
-#: Merge.rc:1580 Merge.rc:1727
+#: Merge.rc:1590 Merge.rc:1737
msgid "1 minute or more"
msgstr "1 minute ou plus"
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_LT_1HOUR
-#: Merge.rc:1581 Merge.rc:1728
+#: Merge.rc:1591 Merge.rc:1738
msgid "Less than 1 hour"
msgstr "Moins de 1 heure"
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_GE_1HOUR
-#: Merge.rc:1582 Merge.rc:1729
+#: Merge.rc:1592 Merge.rc:1739
msgid "1 hour or more"
msgstr "1 heure ou plus"
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_LT_1DAY
-#: Merge.rc:1583 Merge.rc:1730
+#: Merge.rc:1593 Merge.rc:1740
msgid "Less than 1 day"
msgstr "Moins de 1 jour"
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_GE_1DAY
-#: Merge.rc:1584 Merge.rc:1731
+#: Merge.rc:1594 Merge.rc:1741
msgid "1 day or more"
msgstr "1 jour ou plus"
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_LT_1WEEK
-#: Merge.rc:1585 Merge.rc:1732
+#: Merge.rc:1595 Merge.rc:1742
msgid "Less than 1 week"
msgstr "Moins de 1 semaine"
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_GE_1WEEK
-#: Merge.rc:1586 Merge.rc:1733
+#: Merge.rc:1596 Merge.rc:1743
msgid "1 week or more"
msgstr "1 semaine ou plus"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_CONDITION_DIFF_LEFT_RIGHT
-#: Merge.rc:1596
+#: Merge.rc:1606
msgid "Target: &Left and Right"
msgstr "Cible : &Gauche et Droite"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_CONDITION_DIFF_LEFT_MIDDLE
-#: Merge.rc:1597
+#: Merge.rc:1607
msgid "Target: Left and &Middle"
msgstr "Cible : Gauche et &Milieu"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_CONDITION_DIFF_MIDDLE_RIGHT
-#: Merge.rc:1598
+#: Merge.rc:1608
msgid "Target: Middle and &Right"
msgstr "Cible : Milieu et &Droite"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_CONDITION_DIFF_ALL
-#: Merge.rc:1599
+#: Merge.rc:1609
msgid "Target: &All"
msgstr "Cible : &Tous"
#. IDR_POPUP_FILTERMENU_BINARY, ID_FILTERMENU_BINARY_ONLY
-#: Merge.rc:1620
+#: Merge.rc:1630
msgid "Binary files only"
msgstr "Fichiers binaires uniquement"
#. IDR_POPUP_FILTERMENU_BINARY, ID_FILTERMENU_TEXT_ONLY
-#: Merge.rc:1621
+#: Merge.rc:1631
msgid "Text files only"
msgstr "Fichiers texte uniquement"
#. IDR_POPUP_ADDCMPMENU, ID_ADDCMPMENU_CLEAR
-#: Merge.rc:1755
+#: Merge.rc:1765
msgid "&Clear conditions"
msgstr "&Supprimer les conditions"
#. IDR_POPUP_ADDCMPMENU, ID_ADDCMPMENU_CMP_SIZE
-#: Merge.rc:1757
+#: Merge.rc:1767
msgid "Compare &Size"
msgstr "Comparer la &Taille"
#. IDR_POPUP_ADDCMPMENU, ID_ADDCMPMENU_CMP_DATE
-#: Merge.rc:1758
+#: Merge.rc:1768
msgid "Compare &Date"
msgstr "Comparer la &Date"
#. IDR_POPUP_ADDCMPMENU, ID_ADDCMPMENU_CMP_ATTR
-#: Merge.rc:1759
+#: Merge.rc:1769
msgid "Compare &Attributes"
msgstr "Comparer les &Attributs"
#. IDR_POPUP_ADDCMPMENU, ID_ADDCMPMENU_CMP_CONTENTS
-#: Merge.rc:1760
+#: Merge.rc:1770
msgid "Compare C&ontents"
msgstr "Comparer les C&ontenus"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_CLEAR
-#: Merge.rc:1769
+#: Merge.rc:1779
msgid "&Clear Keys"
msgstr "&Effacer les clés"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_NAME
-#: Merge.rc:1771
+#: Merge.rc:1781
msgid "&Name"
msgstr "&Nom"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_BASENAME
-#: Merge.rc:1772
+#: Merge.rc:1782
msgid "&Base name (without extension)"
msgstr "Nom de &base (sans extension)"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_NORMALIZED_NAME
-#: Merge.rc:1773
+#: Merge.rc:1783
msgid "Normalized &Unicode Name"
msgstr "Nom &Unicode normalisé"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_RELPATH
-#: Merge.rc:1774
+#: Merge.rc:1784
msgid "&Relative Path"
msgstr "Chemin &relatif"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_DATE
-#: Merge.rc:1776
+#: Merge.rc:1786
msgid "&Date"
msgstr "&Date"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_HASH_MD5
-#: Merge.rc:1777
+#: Merge.rc:1787
msgid "&Hash (MD5)"
msgstr "&Hachage (MD5)"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_REPLACE
-#: Merge.rc:1780
+#: Merge.rc:1790
msgid "Insert &replace() Function"
msgstr "Insérer la fonction &replace()"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_REGEXREPLACE
-#: Merge.rc:1781
+#: Merge.rc:1791
msgid "Insert rege&xReplace() Function"
msgstr "Insérer la fonction rege&xReplace()"
#. IDR_POPUP_RENAMEMOVE_MENU
-#: Merge.rc:1782
+#: Merge.rc:1792
msgid "Replace &Lists"
msgstr "&Listes de remplacement"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_CREATE_REPLACELIST
-#: Merge.rc:1784
+#: Merge.rc:1794
msgid "&Create String Replace List and Insert..."
msgstr "&Créer une liste de remplacement de chaînes et insérer..."
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_CREATE_REGEXREPLACELIST
-#: Merge.rc:1785
+#: Merge.rc:1795
msgid "Create &Regex Replace List and Insert..."
msgstr "Créer une liste de remplacement ®ex et insérer..."
#. IDR_POPUP_RENAMEMOVE_MENU
-#: Merge.rc:1787
+#: Merge.rc:1797
msgid "&String Replace Lists"
msgstr "Li&stes de remplacement de chaînes"
#. IDR_POPUP_RENAMEMOVE_MENU
-#: Merge.rc:1791
+#: Merge.rc:1801
msgid "Re&gex Replace Lists"
msgstr "Listes de remplacement re&gex"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_STRING_REPLACE_LISTS_FOLDER
-#: Merge.rc:1796
+#: Merge.rc:1806
msgid "Open String Replace Lists Folder..."
msgstr "Ouvrir le dossier des listes de remplacement de chaînes..."
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_REGEX_REPLACE_LISTS_FOLDER
-#: Merge.rc:1797
+#: Merge.rc:1807
msgid "Open Regex Replace Lists Folder..."
msgstr "Ouvrir le dossier des listes de remplacement regex..."
#. IDD_FILTERS_CONDITION, IDC_CONDITION_MATCHCASE
-#: Merge.rc:1799 Merge.rc:1995 Merge.rc:2014 Merge.rc:2042 Merge.rc:2585
+#: Merge.rc:1809 Merge.rc:2005 Merge.rc:2024 Merge.rc:2052 Merge.rc:2595
msgid "Match &case"
msgstr "Respecter la &casse"
#. IDR_POPUP_RENAMEMOVE_MENU
-#: Merge.rc:1801
+#: Merge.rc:1811
msgid "Text &Normalization"
msgstr "&Normalisation du texte"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_TOLOWER
-#: Merge.rc:1803
+#: Merge.rc:1813
msgid "&Lowercase"
msgstr "Minuscu&le"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_TOUPPER
-#: Merge.rc:1804
+#: Merge.rc:1814
msgid "&Uppercase"
msgstr "Maj&uscule"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_TOHALFWIDTH
-#: Merge.rc:1805
+#: Merge.rc:1815
msgid "&Half-width"
msgstr "&Demi-largeur"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_TOFULLWIDTH
-#: Merge.rc:1806
+#: Merge.rc:1816
msgid "&Full-width"
msgstr "&Pleine largeur"
#. IDR_POPUP_RENAMEMOVE_MENU
-#: Merge.rc:1807
+#: Merge.rc:1817
msgid "&Chinese Conversion"
msgstr "Conversion &chinoise"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_TOSIMPLIFIEDCHINESE
-#: Merge.rc:1809
+#: Merge.rc:1819
msgid "&Simplified Chinese"
msgstr "Chinois &simplifié"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_TOTRADITIONALCHINESE
-#: Merge.rc:1810
+#: Merge.rc:1820
msgid "&Traditional Chinese"
msgstr "Chinois &traditionnel"
#. IDR_POPUP_RENAMEMOVE_MENU
-#: Merge.rc:1812
+#: Merge.rc:1822
msgid "&Japanese Conversion"
msgstr "Conversion &japonaise"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_TOHIRAGANA
-#: Merge.rc:1814
+#: Merge.rc:1824
msgid "&Hiragana"
msgstr "&Hiragana"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_TOKATAKANA
-#: Merge.rc:1815
+#: Merge.rc:1825
msgid "&Katakana"
msgstr "&Katakana"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_NORMALIZEUNICODE
-#: Merge.rc:1817
+#: Merge.rc:1827
msgid "Normalize &Unicode"
msgstr "Normaliser l'&Unicode"
#. IDD_ABOUTBOX
-#: Merge.rc:1932
+#: Merge.rc:1942
msgid "About WinMerge"
msgstr "À propos de WinMerge"
#. IDD_ABOUTBOX, IDC_WWW
-#: Merge.rc:1936
+#: Merge.rc:1946
msgid "Visit the WinMerge Homepage!"
msgstr "Visiter la page d'accueil de WinMerge !"
#. IDD_PLUGINS_EDITPLUGIN, IDOK
-#: Merge.rc:1938 Merge.rc:2080 Merge.rc:2431 Merge.rc:2455 Merge.rc:2469
-#: Merge.rc:2497 Merge.rc:2588 Merge.rc:2613 Merge.rc:2674 Merge.rc:2691
-#: Merge.rc:2703 Merge.rc:2867 Merge.rc:2927 Merge.rc:3062 Merge.rc:3104
-#: Merge.rc:3147 Merge.rc:3197
+#: Merge.rc:1948 Merge.rc:2090 Merge.rc:2441 Merge.rc:2465 Merge.rc:2479
+#: Merge.rc:2507 Merge.rc:2598 Merge.rc:2623 Merge.rc:2684 Merge.rc:2701
+#: Merge.rc:2713 Merge.rc:2877 Merge.rc:2937 Merge.rc:3072 Merge.rc:3114
+#: Merge.rc:3157 Merge.rc:3207
msgid "OK"
msgstr "OK"
#. IDD_ABOUTBOX, IDC_OPEN_CONTRIBUTORS
-#: Merge.rc:1939
+#: Merge.rc:1949
msgid "Contributors"
msgstr "Contributeurs"
#. IDD_SELECT_FILES_OR_FOLDERS
-#: Merge.rc:1945 Merge.rc:3070
+#: Merge.rc:1955 Merge.rc:3080
msgid "Select Files or Folders"
msgstr "Sélectionner des fichiers ou dossiers"
#. IDD_OPEN, IDC_FILES_DIRS_GROUP0
-#: Merge.rc:1949
+#: Merge.rc:1959
msgid "&1st File or Folder"
msgstr "&1er fichier ou dossier"
#. IDD_OPEN, IDC_PATH0_READONLY
-#: Merge.rc:1951
+#: Merge.rc:1961
msgid "Re&ad-only"
msgstr "&Lecture seule"
#. IDD_OPEN, IDC_SWAP01_STATIC
-#: Merge.rc:1953
+#: Merge.rc:1963
msgid "Swap 1st | 2nd"
msgstr "Intervertir 1er | 2ème"
#. IDD_GENERATE_PATCH, IDC_DIFF_BROWSE_FILE1
-#: Merge.rc:1954 Merge.rc:2310 Merge.rc:2413
+#: Merge.rc:1964 Merge.rc:2320 Merge.rc:2423
msgid "&Browse..."
msgstr "&Parcourir..."
#. IDD_OPEN, IDC_FILES_DIRS_GROUP1
-#: Merge.rc:1955
+#: Merge.rc:1965
msgid "&2nd File or Folder"
msgstr "&2ème fichier ou dossier"
#. IDD_OPEN, IDC_PATH1_READONLY
-#: Merge.rc:1957
+#: Merge.rc:1967
msgid "Rea&d-only"
msgstr "L&ecture seule"
#. IDD_OPEN, IDC_SWAP12_STATIC
-#: Merge.rc:1959
+#: Merge.rc:1969
msgid "Swap 2nd | 3rd"
msgstr "Intervertir 2ème | 3ème"
#. IDD_PROPPAGE_SYSTEM, IDC_FILTER_USER_BROWSE
-#: Merge.rc:1960 Merge.rc:2315
+#: Merge.rc:1970 Merge.rc:2325
msgid "B&rowse..."
msgstr "Pa&rcourir..."
#. IDD_OPEN, IDC_FILES_DIRS_GROUP2
-#: Merge.rc:1961
+#: Merge.rc:1971
msgid "&3rd File or Folder (Optional)"
msgstr "&3ème fichier ou dossier (facultatif)"
#. IDD_OPEN, IDC_PATH2_READONLY
-#: Merge.rc:1963
+#: Merge.rc:1973
msgid "Read-o&nly"
msgstr "Le&cture seule"
#. IDD_OPEN, IDC_SWAP02_STATIC
-#: Merge.rc:1965
+#: Merge.rc:1975
msgid "Swap 1st | 3rd"
msgstr "Intervertir 1er | 3ème"
#. IDD_PROPPAGE_BACKUPS, IDC_BACKUP_BROWSE
-#: Merge.rc:1966 Merge.rc:2685 Merge.rc:2883
+#: Merge.rc:1976 Merge.rc:2695 Merge.rc:2893
msgid "Browse..."
msgstr "Parcourir..."
#. IDD_OPEN, IDC_FILES_DIRS_GROUP3
-#: Merge.rc:1968
+#: Merge.rc:1978
msgid " Folder: Filter"
msgstr " Dossier : filtre"
#. IDD_OPEN, IDC_RECURS_CHECK
-#: Merge.rc:1971
+#: Merge.rc:1981
msgid "&Include subfolders"
msgstr "&Inclure les sous-dossiers"
#. IDD_OPEN, IDC_FILES_DIRS_GROUP5
-#: Merge.rc:1972
+#: Merge.rc:1982
msgid " File: Prediffer Plugin"
msgstr " Fichier : Plug-in pour la prédifférence"
#. IDD_OPEN, IDC_FILES_DIRS_GROUP4
-#: Merge.rc:1976
+#: Merge.rc:1986
msgid " File: Unpacker Plugin"
msgstr " Fichier : Plug-in du décompresseur"
#. IDD_OPEN, IDC_SELECT_UNPACKER
-#: Merge.rc:1978
+#: Merge.rc:1988
msgid "Se&lect..."
msgstr "Sé&lectionner..."
#. IDD_PLUGINS_EDITPLUGIN, IDCANCEL
-#: Merge.rc:1981 Merge.rc:2001 Merge.rc:2025 Merge.rc:2046 Merge.rc:2081
-#: Merge.rc:2432 Merge.rc:2456 Merge.rc:2470 Merge.rc:2498 Merge.rc:2551
-#: Merge.rc:2589 Merge.rc:2614 Merge.rc:2675 Merge.rc:2692 Merge.rc:2704
-#: Merge.rc:2868 Merge.rc:2928 Merge.rc:3087 Merge.rc:3105 Merge.rc:3148
-#: Merge.rc:3198
+#: Merge.rc:1991 Merge.rc:2011 Merge.rc:2035 Merge.rc:2056 Merge.rc:2091
+#: Merge.rc:2442 Merge.rc:2466 Merge.rc:2480 Merge.rc:2508 Merge.rc:2561
+#: Merge.rc:2599 Merge.rc:2624 Merge.rc:2685 Merge.rc:2702 Merge.rc:2714
+#: Merge.rc:2878 Merge.rc:2938 Merge.rc:3097 Merge.rc:3115 Merge.rc:3158
+#: Merge.rc:3208
msgid "Cancel"
msgstr "Annuler"
#. IDD_OPEN, IDC_OPEN_STATUS
-#: Merge.rc:1982
+#: Merge.rc:1992
msgid "Status:"
msgstr "Statut :"
#. IDD_PLUGINS_LIST, ID_HELP
-#: Merge.rc:1983 Merge.rc:2082 Merge.rc:2929
+#: Merge.rc:1993 Merge.rc:2092 Merge.rc:2939
msgid "Help"
msgstr "Aide"
#. IDD_OPEN, IDC_OPTIONS
-#: Merge.rc:1984
+#: Merge.rc:1994
msgid "&Options..."
msgstr "&Options..."
#. IDD_EDIT_FIND
-#: Merge.rc:1989
+#: Merge.rc:1999
msgid "Find"
msgstr "Rechercher"
#. IDD_EDIT_MARKER, IDC_STATIC
-#: Merge.rc:1992 Merge.rc:2009 Merge.rc:2037
+#: Merge.rc:2002 Merge.rc:2019 Merge.rc:2047
msgid "Fi&nd what:"
msgstr "Chercher q&uoi :"
#. IDD_EDIT_MARKER, IDC_EDIT_WHOLE_WORD
-#: Merge.rc:1994 Merge.rc:2013 Merge.rc:2041
+#: Merge.rc:2004 Merge.rc:2023 Merge.rc:2051
msgid "Match &whole word only"
msgstr "&Mot entier seulement"
#. IDD_EDIT_MARKER, IDC_EDIT_REGEXP
-#: Merge.rc:1996 Merge.rc:2015 Merge.rc:2043
+#: Merge.rc:2006 Merge.rc:2025 Merge.rc:2053
msgid "Regular &expression"
msgstr "E&xpressions régulières"
#. IDD_EDIT_FIND, IDC_FINDDLG_DONTWRAP
-#: Merge.rc:1997
+#: Merge.rc:2007
msgid "D&on't wrap end of file"
msgstr "Ne pas boucler à la fin du fichier"
#. IDD_EDIT_FIND, IDC_FINDDLG_DONTCLOSE
-#: Merge.rc:1998
+#: Merge.rc:2008
msgid "&Don't close this dialog"
msgstr "Ne pas fermer pas cette boîte de &dialogue"
#. IDD_EDIT_REPLACE, IDC_EDIT_SKIP
-#: Merge.rc:1999 Merge.rc:2021
+#: Merge.rc:2009 Merge.rc:2031
msgid "&Find Next"
msgstr "&Suivant"
#. IDD_EDIT_FIND, IDC_EDIT_FINDPREV
-#: Merge.rc:2000
+#: Merge.rc:2010
msgid "Find &Prev"
msgstr "&Précédent"
#. IDD_EDIT_REPLACE
-#: Merge.rc:2006
+#: Merge.rc:2016
msgid "Replace"
msgstr "Remplacer"
#. IDD_EDIT_REPLACE, IDC_STATIC
-#: Merge.rc:2011
+#: Merge.rc:2021
msgid "Re&place with:"
msgstr "Rem&placer par :"
#. IDD_EDIT_REPLACE, IDC_EDIT_SCOPE_DONT_WRAP
-#: Merge.rc:2016
+#: Merge.rc:2026
msgid "&Don't wrap at end of file"
msgstr "Ne pas boucler à la fin &du fichier"
#. IDD_EDIT_REPLACE, IDC_STATIC
-#: Merge.rc:2018
+#: Merge.rc:2028
msgid "Replace in"
msgstr "Remplacer dans"
#. IDD_EDIT_REPLACE, IDC_EDIT_SCOPE_WHOLE_FILE
-#: Merge.rc:2020
+#: Merge.rc:2030
msgid "Wh&ole file"
msgstr "T&out le fichier"
#. IDD_EDIT_REPLACE, IDC_EDIT_FINDPREV
-#: Merge.rc:2022
+#: Merge.rc:2032
msgid "Find Pre&v"
msgstr "&Précédent"
#. IDD_EDIT_REPLACE, IDC_EDIT_REPLACE
-#: Merge.rc:2023
+#: Merge.rc:2033
msgid "&Replace"
msgstr "&Remplacer"
#. IDD_EDIT_REPLACE, IDC_EDIT_REPLACE_ALL
-#: Merge.rc:2024
+#: Merge.rc:2034
msgid "Replace &All"
msgstr "Remplacer &tout"
#. IDS_OPTIONSPG_MARKERCOLORS
-#: Merge.rc:2030 Merge.rc:4209
+#: Merge.rc:2040 Merge.rc:4219
msgid "Markers"
msgstr "Marqueurs"
#. IDD_EDIT_MARKER, IDC_EDIT_MARKERS_ENABLED
-#: Merge.rc:2033
+#: Merge.rc:2043
msgid "Enable &markers"
msgstr "Activer les &marqueurs"
#. IDD_FILTERS_LINEFILTERS, IDC_LFILTER_ADDBTN
-#: Merge.rc:2035 Merge.rc:2057
+#: Merge.rc:2045 Merge.rc:2067
msgid "New"
msgstr "Nouveau"
#. IDD_EDIT_MARKER, IDC_STATIC
-#: Merge.rc:2039
+#: Merge.rc:2049
msgid "&Background color:"
msgstr "&Couleur du fond :"
#. IDS_MESSAGEBOX_OK
-#: Merge.rc:2044 Merge.rc:2829 Merge.rc:3086 Merge.rc:4171
+#: Merge.rc:2054 Merge.rc:2839 Merge.rc:3096 Merge.rc:4181
msgid "&Ok"
msgstr "&OK"
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:2045 Merge.rc:2525 Merge.rc:3199
+#: Merge.rc:2055 Merge.rc:2535 Merge.rc:3209
msgid "&Apply"
msgstr "&Appliquer"
#. IDD_FILTERS_LINEFILTERS
-#: Merge.rc:2051
+#: Merge.rc:2061
msgid "Line Filters"
msgstr "Filtres de ligne"
#. IDD_FILTERS_LINEFILTERS, IDC_IGNOREREGEXP
-#: Merge.rc:2054
+#: Merge.rc:2064
msgid "Enable Line Filters"
msgstr "Activer les filtres de ligne"
#. IDD_FILTERS_LINEFILTERS, IDC_STATIC
-#: Merge.rc:2055
+#: Merge.rc:2065
msgid "Regular Expressions (one per line):"
msgstr "Expressions régulières (une par ligne) :"
#. IDD_PLUGINS_LIST, IDC_PLUGIN_EDIT
-#: Merge.rc:2058 Merge.rc:2924
+#: Merge.rc:2068 Merge.rc:2934
msgid "Edit"
msgstr "Modifier"
#. IDD_PLUGINS_LIST, IDC_PLUGIN_REMOVE
-#: Merge.rc:2059 Merge.rc:2071 Merge.rc:2925
+#: Merge.rc:2069 Merge.rc:2081 Merge.rc:2935
msgid "Remove"
msgstr "Retirer"
#. IDD_FILTERS_SUBSTITUTIONFILTERS
-#: Merge.rc:2064
+#: Merge.rc:2074
msgid "Substitution Filters"
msgstr "Filtres de substitution"
#. IDD_FILTERS_SUBSTITUTIONFILTERS, IDC_STATIC
-#: Merge.rc:2067
+#: Merge.rc:2077
msgid "Changes to the listed pairs below will be ignored or marked as insignificant. Patches are unaffected."
msgstr "Les modifications apportées aux paires énumérées ci-dessous seront ignorées ou marquées comme insignifiantes. Les retouches ne sont pas affectées."
#. IDD_FILTERS_SUBSTITUTIONFILTERS, IDC_IGNORED_SUSBSTITUTIONS_ENABLED
-#: Merge.rc:2068
+#: Merge.rc:2078
msgid "Enable"
msgstr "Activer"
#. IDD_PLUGINS_LIST, IDC_PLUGIN_ADD
-#: Merge.rc:2070 Merge.rc:2923
+#: Merge.rc:2080 Merge.rc:2933
msgid "Add"
msgstr "Ajouter"
#. IDD_FILTERS_SUBSTITUTIONFILTERS, IDC_LFILTER_CLEARBTN
-#: Merge.rc:2072
+#: Merge.rc:2082
msgid "Clear"
msgstr "Effacer"
#. IDD_PREFERENCES
-#: Merge.rc:2077
+#: Merge.rc:2087
msgid "Options"
msgstr "Préférences"
#. IDD_PREFERENCES, IDC_TREEOPT_IMPORT
-#: Merge.rc:2086
+#: Merge.rc:2096
msgid "Import..."
msgstr "Importer..."
#. IDD_PREFERENCES, IDC_TREEOPT_EXPORT
-#: Merge.rc:2087
+#: Merge.rc:2097
msgid "Export..."
msgstr "Exporter..."
#. IDS_OPTIONSPG_GENCOMPARE
-#: Merge.rc:2092 Merge.rc:4199 Merge.rc:4202 Merge.rc:4219
+#: Merge.rc:2102 Merge.rc:4209 Merge.rc:4212 Merge.rc:4229
msgid "General"
msgstr "Général"
#. IDD_PROPPAGE_GENERAL, IDC_SCROLL_CHECK
-#: Merge.rc:2095
+#: Merge.rc:2105
msgid "Automatically &scroll to first difference"
msgstr "&Atteindre automatiquement la première différence"
#. IDD_PROPPAGE_GENERAL, IDC_SCROLL_TO_FIRST_INLINE_DIFF_CHECK
-#: Merge.rc:2097
+#: Merge.rc:2107
msgid "Automatically s&croll to first inline difference"
msgstr "&Atteindre automatiquement la première différence en ligne"
#. IDD_PROPPAGE_GENERAL, IDC_STATIC
-#: Merge.rc:2099
+#: Merge.rc:2109
msgid "Cl&ose windows with 'Esc':"
msgstr "Fermeture des fenêtres avec la t&ouche 'Échap' :"
#. IDD_PROPPAGE_GENERAL, IDC_VERIFY_OPEN_PATHS
-#: Merge.rc:2101
+#: Merge.rc:2111
msgid "&Automatically verify paths in Open dialog"
msgstr "Vérifier &automatiquement les chemins de la boîte de dialogue Ouvrir"
#. IDD_PROPPAGE_GENERAL, IDC_STATIC
-#: Merge.rc:2103
+#: Merge.rc:2113
msgid "Single instance mode:"
msgstr "Mode d'instance unique :"
#. IDD_PROPPAGE_GENERAL, IDC_ASK_MULTIWINDOW_CLOSE
-#: Merge.rc:2105
+#: Merge.rc:2115
msgid "As&k when closing multiple windows"
msgstr "&Confirmer la fermeture de plusieurs fenêtres"
#. IDD_PROPPAGE_GENERAL, IDC_PRESERVE_FILETIME
-#: Merge.rc:2107
+#: Merge.rc:2117
msgid "&Preserve file time in file compare"
msgstr "&Préserver l'horodatage dans la comparaison de fichier"
#. IDD_PROPPAGE_GENERAL, IDC_STARTUP_FOLDER_SELECT
-#: Merge.rc:2109
+#: Merge.rc:2119
msgid "Show \"Select Files or Folders\" dialog on startup"
msgstr "Afficher \"Sélectionner les fichiers ou dossiers\" au démarrage"
#. IDD_PROPPAGE_GENERAL, IDC_CLOSE_WITH_OK
-#: Merge.rc:2111
+#: Merge.rc:2121
msgid "Close \"Select Files or Folders\" dialog on clicking Compare button"
msgstr "Fermer \"Sélectionner les fichiers ou dossiers\" en cliquant sur Comparer"
#. IDD_PROPPAGE_GENERAL, IDC_STATIC
-#: Merge.rc:2113
+#: Merge.rc:2123
msgid "Op&en dialog Auto completion:"
msgstr "R&emplissage automatique de la boîte de dialogue Ouvrir :"
#. IDD_PROPPAGE_GENERAL, IDC_STATIC
-#: Merge.rc:2115
+#: Merge.rc:2125
msgid "Auto-&reload modified files:"
msgstr "&Rechargement automatique des fichiers modifiés :"
#. IDD_PROPPAGE_GENERAL, IDC_STATIC
-#: Merge.rc:2117
+#: Merge.rc:2127
msgid "Language:"
msgstr "Langue :"
#. IDD_PROPPAGE_COMPARE_WEBPAGE, IDC_COMPARE_DEFAULTS
-#: Merge.rc:2119 Merge.rc:2299 Merge.rc:2321 Merge.rc:2352 Merge.rc:2369
-#: Merge.rc:2386 Merge.rc:2394 Merge.rc:2430 Merge.rc:2454 Merge.rc:2633
-#: Merge.rc:2644 Merge.rc:2653 Merge.rc:2887 Merge.rc:2922 Merge.rc:2985
-#: Merge.rc:3010 Merge.rc:3024 Merge.rc:3038 Merge.rc:3054
+#: Merge.rc:2129 Merge.rc:2309 Merge.rc:2331 Merge.rc:2362 Merge.rc:2379
+#: Merge.rc:2396 Merge.rc:2404 Merge.rc:2440 Merge.rc:2464 Merge.rc:2643
+#: Merge.rc:2654 Merge.rc:2663 Merge.rc:2897 Merge.rc:2932 Merge.rc:2995
+#: Merge.rc:3020 Merge.rc:3034 Merge.rc:3048 Merge.rc:3064
msgid "Defaults"
msgstr "Par défaut"
#. IDS_OPTIONSPG_COLORS
-#: Merge.rc:2124 Merge.rc:2140 Merge.rc:2267 Merge.rc:2292 Merge.rc:4205
+#: Merge.rc:2134 Merge.rc:2150 Merge.rc:2277 Merge.rc:2302 Merge.rc:4215
msgid "Colors"
msgstr "Couleurs"
#. IDD_PROPPAGE_COLOR_SCHEMES, IDC_STATIC
-#: Merge.rc:2127
+#: Merge.rc:2137
msgid "Color &mode:"
msgstr "Mode de &couleur :"
#. IDD_PROPPAGE_COLOR_SCHEMES, IDC_STATIC
-#: Merge.rc:2129
+#: Merge.rc:2139
msgid "&Light mode scheme:"
msgstr "&Schéma du mode clair :"
#. IDD_PROPPAGE_COLOR_SCHEMES, IDC_STATIC
-#: Merge.rc:2131
+#: Merge.rc:2141
msgid "&Dark mode scheme:"
msgstr "&Schéma du mode foncé :"
#. IDD_PROPPAGE_COLOR_SCHEMES, IDC_STATIC
-#: Merge.rc:2133
+#: Merge.rc:2143
msgid "Your custom schemes"
msgstr "Vos schémas personnalisés"
#. IDD_PROPPAGE_COLOR_SCHEMES, IDC_COLOR_SCHEME_SAVE
-#: Merge.rc:2134
+#: Merge.rc:2144
msgid "&Save current scheme..."
msgstr "&Sauvegarder le schéma actuel..."
#. IDD_PROPPAGE_COLOR_SCHEMES, IDC_COLOR_SCHEME_DELETE
-#: Merge.rc:2135
+#: Merge.rc:2145
msgid "Delete ¤t scheme..."
msgstr "Supprimer le schéma &actuel..."
#. IDD_PROPPAGE_COLORS_DIR, IDC_BACKGROUND_COLUMN_LABEL
-#: Merge.rc:2143 Merge.rc:2238 Merge.rc:2258 Merge.rc:2272
+#: Merge.rc:2153 Merge.rc:2248 Merge.rc:2268 Merge.rc:2282
msgid "Background"
msgstr "Arrière-plan"
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2144
+#: Merge.rc:2154
msgid "Deleted"
msgstr "Supprimé"
#. IDS_OPTIONSPG_TEXTCOLORS
-#: Merge.rc:2145 Merge.rc:2207 Merge.rc:2239 Merge.rc:2273 Merge.rc:4207
+#: Merge.rc:2155 Merge.rc:2217 Merge.rc:2249 Merge.rc:2283 Merge.rc:4217
msgid "Text"
msgstr "Texte"
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2146
+#: Merge.rc:2156
msgid "Difference:"
msgstr "Différence :"
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2151
+#: Merge.rc:2161
msgid "Selected Difference:"
msgstr "Différence sélectionnée :"
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2156
+#: Merge.rc:2166
msgid "Ignored Difference:"
msgstr "Différence ignorée :"
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2161
+#: Merge.rc:2171
msgid "Moved:"
msgstr "Déplacé :"
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2166
+#: Merge.rc:2176
msgid "Selected Moved:"
msgstr "Déplacé sélectionné :"
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2171
+#: Merge.rc:2181
msgid "Same As Next (3 panes):"
msgstr ""
"Identique au suivant\n"
"(3 panneaux) :"
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2176
+#: Merge.rc:2186
msgid "Same As Next (Selected):"
msgstr "Identique au suivant (sélectionné) :"
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2181
+#: Merge.rc:2191
msgid "Word Difference:"
msgstr "Différence de mot :"
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2186
+#: Merge.rc:2196
msgid "Selected Word Diff:"
msgstr "Différence de mot sélectionné :"
#. IDD_INPUTBOX
-#: Merge.rc:2195 Merge.rc:2230 Merge.rc:2251 Merge.rc:3099
+#: Merge.rc:2205 Merge.rc:2240 Merge.rc:2261 Merge.rc:3109
msgid "Dialog"
msgstr "Dialogue"
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC
-#: Merge.rc:2198
+#: Merge.rc:2208
msgid "Keywords:"
msgstr "Mots clés :"
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC
-#: Merge.rc:2199
+#: Merge.rc:2209
msgid "Function names:"
msgstr "Nom des fonctions :"
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC
-#: Merge.rc:2200
+#: Merge.rc:2210
msgid "Comments:"
msgstr "Commentaires :"
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC
-#: Merge.rc:2201
+#: Merge.rc:2211
msgid "Numbers:"
msgstr "Nombres :"
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC
-#: Merge.rc:2202
+#: Merge.rc:2212
msgid "Operators:"
msgstr "Opérateurs :"
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC
-#: Merge.rc:2203
+#: Merge.rc:2213
msgid "Strings:"
msgstr "Chaînes :"
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC
-#: Merge.rc:2204
+#: Merge.rc:2214
msgid "Preprocessor:"
msgstr "Préprocesseur :"
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC
-#: Merge.rc:2205
+#: Merge.rc:2215
msgid "User 1:"
msgstr "Utilisateur 1 :"
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC
-#: Merge.rc:2206
+#: Merge.rc:2216
msgid "User 2:"
msgstr "Utilisateur 2 :"
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_SCOLOR_USER2_BOLD
-#: Merge.rc:2209 Merge.rc:2211 Merge.rc:2213 Merge.rc:2215 Merge.rc:2217
-#: Merge.rc:2219 Merge.rc:2221 Merge.rc:2223 Merge.rc:2225
+#: Merge.rc:2219 Merge.rc:2221 Merge.rc:2223 Merge.rc:2225 Merge.rc:2227
+#: Merge.rc:2229 Merge.rc:2231 Merge.rc:2233 Merge.rc:2235
msgid "Bold"
msgstr "Gras"
#. IDD_PROPPAGE_COLORS_TEXT, IDC_DEFAULT_STANDARD_COLORS
-#: Merge.rc:2233
+#: Merge.rc:2243
msgid "&Use customized text colors"
msgstr "&Utiliser des couleurs de texte personnalisées"
#. IDD_PROPPAGE_COLORS_TEXT, IDC_WHITESPACE_COLOR_LABEL
-#: Merge.rc:2235
+#: Merge.rc:2245
msgid "Whitespace:"
msgstr "Caractère d'espace :"
#. IDD_PROPPAGE_COLORS_TEXT, IDC_TEXT_COLOR_LABEL
-#: Merge.rc:2236
+#: Merge.rc:2246
msgid "Regular text:"
msgstr "Texte régulier :"
#. IDD_PROPPAGE_COLORS_TEXT, IDC_SELECTION_COLOR_LABEL
-#: Merge.rc:2237
+#: Merge.rc:2247
msgid "Selection:"
msgstr "Sélection :"
#. IDD_PROPPAGE_COLORS_DIR, IDC_STATIC
-#: Merge.rc:2245 Merge.rc:2286
+#: Merge.rc:2255 Merge.rc:2296
msgid "Margin:"
msgstr "Marge :"
#. IDD_PROPPAGE_COLORS_MARKER, IDC_MARKER0_COLOR_LABEL
-#: Merge.rc:2254
+#: Merge.rc:2264
msgid "Search Marker:"
msgstr "Marqueur de recherche :"
#. IDD_PROPPAGE_COLORS_MARKER, IDC_MARKER1_COLOR_LABEL
-#: Merge.rc:2255
+#: Merge.rc:2265
msgid "User Defined Marker 1:"
msgstr "Marqueur 1 défini par l'utilisateur :"
#. IDD_PROPPAGE_COLORS_MARKER, IDC_MARKER2_COLOR_LABEL
-#: Merge.rc:2256
+#: Merge.rc:2266
msgid "User Defined Marker 2:"
msgstr "Marqueur 2 défini par l'utilisateur :"
#. IDD_PROPPAGE_COLORS_MARKER, IDC_MARKER3_COLOR_LABEL
-#: Merge.rc:2257
+#: Merge.rc:2267
msgid "User Defined Marker 3:"
msgstr "Marqueur 3 défini par l'utilisateur :"
#. IDD_PROPPAGE_COLORS_DIR, IDC_USE_DIR_COMPARE_COLORS
-#: Merge.rc:2270
+#: Merge.rc:2280
msgid "&Use folder compare colors"
msgstr "&Utiliser les couleurs de comparaison de dossier"
#. IDD_PROPPAGE_COLORS_DIR, IDC_STATIC
-#: Merge.rc:2274
+#: Merge.rc:2284
msgid "Items equal:"
msgstr "Éléments égaux :"
#. IDD_PROPPAGE_COLORS_DIR, IDC_STATIC
-#: Merge.rc:2277
+#: Merge.rc:2287
msgid "Items different:"
msgstr "Éléments différents :"
#. IDD_PROPPAGE_COLORS_DIR, IDC_STATIC
-#: Merge.rc:2280
+#: Merge.rc:2290
msgid "Items missing:"
msgstr "Éléments manquants :"
#. IDD_PROPPAGE_COLORS_DIR, IDC_STATIC
-#: Merge.rc:2283
+#: Merge.rc:2293
msgid "Items filtered:"
msgstr "Éléments filtrés :"
#. IDD_PROPPAGE_COLORS_SYSTEM, IDC_SYSCOLOR_HOOK_ENABLED
-#: Merge.rc:2295
+#: Merge.rc:2305
msgid "&Use custom system colors"
msgstr "&Utiliser les couleurs du système personnalisées"
#. IDS_PRPCAT_SYSTEM
-#: Merge.rc:2304 Merge.rc:4211 Merge.rc:4212 Merge.rc:4657
+#: Merge.rc:2314 Merge.rc:4221 Merge.rc:4222 Merge.rc:4667
msgid "System"
msgstr "Système"
#. IDD_PROPPAGE_SYSTEM, IDC_USE_RECYCLE_BIN
-#: Merge.rc:2307
+#: Merge.rc:2317
msgid "&Use Recycle Bin"
msgstr "&Utiliser la Corbeille"
#. IDD_PROPPAGE_SYSTEM, IDC_STATIC
-#: Merge.rc:2308
+#: Merge.rc:2318
msgid "&External editor:"
msgstr "Édit&eur externe :"
#. IDD_PROPPAGE_SYSTEM, IDC_STATIC
-#: Merge.rc:2311
+#: Merge.rc:2321
msgid "&Store user data in:"
msgstr "&Stocker les données utilisateur dans :"
#. IDD_PROPPAGE_SYSTEM, IDC_STATIC
-#: Merge.rc:2313
+#: Merge.rc:2323
msgid "&Filter folder:"
msgstr "Dossier de &filtre :"
#. IDD_PROPPAGE_SYSTEM, IDC_STATIC
-#: Merge.rc:2316
+#: Merge.rc:2326
msgid "Temporary files folder"
msgstr "Dossier des fichiers temporaires"
#. IDD_PROPPAGE_SYSTEM, IDC_TMPFOLDER_SYSTEM
-#: Merge.rc:2317
+#: Merge.rc:2327
msgid "S&ystem temp folder"
msgstr "Dossier temporaire du s&ystème"
#. IDD_PROPPAGE_SYSTEM, IDC_STATIC
-#: Merge.rc:2318
+#: Merge.rc:2328
msgid "C&ustom folder:"
msgstr "Dossier &personnalisé :"
#. IDD_GENERATE_PATCH, IDC_DIFF_BROWSE_FILE2
-#: Merge.rc:2320 Merge.rc:2416
+#: Merge.rc:2330 Merge.rc:2426
msgid "Br&owse..."
msgstr "Parc&ourir..."
#. IDS_OPTIONSPG_COMPARE
-#: Merge.rc:2326 Merge.rc:4200
+#: Merge.rc:2336 Merge.rc:4210
msgid "Compare"
msgstr "Comparer"
#. IDD_PROPPAGE_COMPARE, IDC_STATIC
-#: Merge.rc:2329
+#: Merge.rc:2339
msgid "Whitespaces"
msgstr "Caractères d'espacement"
#. IDD_PROPPAGE_COMPARE, IDC_WHITESPACE
-#: Merge.rc:2330
+#: Merge.rc:2340
msgid "&Compare"
msgstr "&Comparer"
#. IDD_PROPPAGE_COMPARE, IDC_WHITE_CHANGE
-#: Merge.rc:2331
+#: Merge.rc:2341
msgid "&Ignore change"
msgstr "&Ignorer le changement"
#. IDD_PROPPAGE_COMPARE, IDC_ALL_WHITE
-#: Merge.rc:2332
+#: Merge.rc:2342
msgid "I&gnore all"
msgstr "Ignorer &tout"
#. IDD_PROPPAGE_COMPARE, IDC_IGNBLANKS_CHECK
-#: Merge.rc:2333
+#: Merge.rc:2343
msgid "Ignore blan&k lines"
msgstr "Ignorer les lignes &vides"
#. IDD_PROPPAGE_COMPARE, IDC_IGNCASE_CHECK
-#: Merge.rc:2334
+#: Merge.rc:2344
msgid "Ignore &case"
msgstr "Ignorer la &casse"
#. IDD_PROPPAGE_COMPARE, IDC_EOL_SENSITIVE
-#: Merge.rc:2335
+#: Merge.rc:2345
msgid "Igno&re EOL differences (Windows/Unix/Mac)"
msgstr "Igno&rer les différences d'EOL (Windows/Unix/Mac)"
#. IDD_PROPPAGE_COMPARE, IDC_IGNORE_NUMBERS
-#: Merge.rc:2337
+#: Merge.rc:2347
msgid "Ignore num&bers"
msgstr "Ignorer les nom&bres"
#. IDD_PROPPAGE_COMPARE, IDC_CP_SENSITIVE
-#: Merge.rc:2338
+#: Merge.rc:2348
msgid "Ignore codepage &differences"
msgstr "Ignorer les &différences de page de code"
#. IDD_PROPPAGE_COMPARE, IDC_FILTERCOMMENTS_CHECK
-#: Merge.rc:2339
+#: Merge.rc:2349
msgid "Ignore c&omment differences"
msgstr "Ignorer les différences de c&ommentaire"
#. IDD_PROPPAGE_COMPARE, IDC_IGNEOFEOL_CHECK
-#: Merge.rc:2341
+#: Merge.rc:2351
msgid "Ignore &missing trailing EOL"
msgstr "Ignorer les EOL de fin &manquants"
#. IDD_PROPPAGE_COMPARE, IDC_IGNLBRKS_CHECK
-#: Merge.rc:2343
+#: Merge.rc:2353
msgid "Ignore line &breaks (treat as spaces)"
msgstr "Ignorer les sauts de ligne (traiter comme des espaces)"
#. IDD_PROPPAGE_COMPARE, IDC_MOVED_BLOCKS
-#: Merge.rc:2345
+#: Merge.rc:2355
msgid "E&nable moved block detection"
msgstr "Activer la détectio&n des blocs déplacés"
#. IDD_PROPPAGE_COMPARE, IDC_ALIGN_SIMILAR_LINES
-#: Merge.rc:2346
+#: Merge.rc:2356
msgid "Align &similar lines"
msgstr "Aligner les lignes &similaires"
#. IDD_PROPPAGE_COMPARE, IDC_STATIC
-#: Merge.rc:2347
+#: Merge.rc:2357
msgid "Diff &algorithm:"
msgstr "&Algorithme différentiel :"
#. IDD_PROPPAGE_COMPARE, IDC_INDENT_HEURISTIC
-#: Merge.rc:2349
+#: Merge.rc:2359
msgid "Enable indent &heuristic"
msgstr "Activer l'indentation &heuristique"
#. IDD_PROPPAGE_COMPARE, IDC_COMPLETELY_BLANK_OUT_IGNORED_DIFFERENCES
-#: Merge.rc:2350
+#: Merge.rc:2360
msgid "Completely unhighlight the ignored differences"
msgstr "Ne pas mettre en surbrillance les différences ignorées"
#. IDS_OPTIONSPG_EDITOR
-#: Merge.rc:2357 Merge.rc:4201
+#: Merge.rc:2367 Merge.rc:4211
msgid "Editor"
msgstr "Éditeur"
#. IDD_PROPPAGE_EDITOR, IDC_HILITE_CHECK
-#: Merge.rc:2360
+#: Merge.rc:2370
msgid "&Highlight syntax"
msgstr "Mettre en &surbrillance la syntaxe"
#. IDD_PROPPAGE_EDITOR, IDC_MIXED_EOL
-#: Merge.rc:2361
+#: Merge.rc:2371
msgid "&Preserve original EOL"
msgstr "&Préserver les EOL d'origine"
#. IDD_PROPPAGE_EDITOR, IDC_STATIC
-#: Merge.rc:2362
+#: Merge.rc:2372
msgid "Tabs"
msgstr "Tabulations"
#. IDD_PROPPAGE_EDITOR, IDC_STATIC
-#: Merge.rc:2363
+#: Merge.rc:2373
msgid "&Tab size:"
msgstr "&Taille des tabulations :"
#. IDD_PROPPAGE_EDITOR, IDC_PROP_INSERT_TABS
-#: Merge.rc:2365
+#: Merge.rc:2375
msgid "&Insert tabs"
msgstr "&Insérer des tabulations"
#. IDD_PROPPAGE_EDITOR, IDC_PROP_INSERT_SPACES
-#: Merge.rc:2366
+#: Merge.rc:2376
msgid "Insert &spaces"
msgstr "Insérer des e&spaces"
#. IDD_PROPPAGE_EDITOR, IDC_STATIC
-#: Merge.rc:2367
+#: Merge.rc:2377
msgid "&Rendering mode:"
msgstr "Mode de &rendu :"
#. IDD_PROPPAGE_EDITOR_COMPAREMERGE, IDC_AUTOMRESCAN_CHECK
-#: Merge.rc:2376
+#: Merge.rc:2386
msgid "&Automatic rescan"
msgstr "&Actualiser automatiquement"
#. IDD_PROPPAGE_EDITOR_COMPAREMERGE, IDC_STATIC
-#: Merge.rc:2377
+#: Merge.rc:2387
msgid "Copy &granularity for selected differences:"
msgstr "Copie la granularité pour les différences sélectionnées :"
#. IDD_PROPPAGE_EDITOR_COMPAREMERGE, IDC_LINE_COLORING_GROUP
-#: Merge.rc:2379
+#: Merge.rc:2389
msgid "Line Difference Coloring"
msgstr "Coloration de la différence de ligne"
#. IDD_PROPPAGE_EDITOR_COMPAREMERGE, IDC_VIEW_LINE_DIFFERENCES
-#: Merge.rc:2380
+#: Merge.rc:2390
msgid "View line differences"
msgstr "Afficher les différences de ligne"
#. IDD_PROPPAGE_EDITOR_COMPAREMERGE, IDC_EDITOR_CHARLEVEL
-#: Merge.rc:2381
+#: Merge.rc:2391
msgid "&Character-level"
msgstr "Précision au &caractère"
#. IDD_PROPPAGE_EDITOR_COMPAREMERGE, IDC_EDITOR_WORDLEVEL
-#: Merge.rc:2382
+#: Merge.rc:2392
msgid "&Word-level:"
msgstr "Précision au &mot :"
#. IDD_PROPPAGE_EDITOR_COMPAREMERGE, IDC_STATIC
-#: Merge.rc:2384
+#: Merge.rc:2394
msgid "W&ord break characters:"
msgstr "Caractères de coupure de m&ot :"
#. IDD_PROPPAGE_MESSAGEBOXES, IDC_STATIC
-#: Merge.rc:2401
+#: Merge.rc:2411
msgid "Some messages can be hidden by the user. Press Reset to make all messages visible again."
msgstr "Certains messages peuvent être masqués par l'utilisateur. Appuyez sur Réinitialiser pour rendre à nouveau tous les messages visibles."
#. IDD_SELECT_FILES_OR_FOLDERS, IDC_RESET
-#: Merge.rc:2402 Merge.rc:3085
+#: Merge.rc:2412 Merge.rc:3095
msgid "Reset"
msgstr "Réinitialiser"
#. IDD_GENERATE_PATCH
-#: Merge.rc:2408
+#: Merge.rc:2418
msgid "Patch Generator"
msgstr "Générateur de retouche"
#. IDD_GENERATE_PATCH, IDC_STATIC
-#: Merge.rc:2411
+#: Merge.rc:2421
msgid "File&1:"
msgstr "Fichier&1 :"
#. IDD_GENERATE_PATCH, IDC_STATIC
-#: Merge.rc:2414
+#: Merge.rc:2424
msgid "File&2:"
msgstr "Fichier&2 :"
#. IDD_GENERATE_PATCH, IDC_DIFF_SWAPFILES
-#: Merge.rc:2417
+#: Merge.rc:2427
msgid "&Swap"
msgstr "&Intervertir"
#. IDD_DIRCMP_REPORT, IDC_REPORT_COPYCLIPBOARD
-#: Merge.rc:2418 Merge.rc:2690
+#: Merge.rc:2428 Merge.rc:2700
msgid "&Copy to clipboard"
msgstr "&Copier vers le presse-papiers"
#. IDD_GENERATE_PATCH, IDC_DIFF_APPENDFILE
-#: Merge.rc:2419
+#: Merge.rc:2429
msgid "&Append to existing file"
msgstr "&Ajouter au fichier existant"
#. IDD_GENERATE_PATCH, IDC_STATIC
-#: Merge.rc:2420
+#: Merge.rc:2430
msgid "&Result:"
msgstr "&Résultat :"
#. IDD_GENERATE_PATCH, IDC_DIFF_BROWSE_RESULT
-#: Merge.rc:2422
+#: Merge.rc:2432
msgid "Bro&wse..."
msgstr "&Parcourir..."
#. IDD_GENERATE_PATCH, IDC_STATIC
-#: Merge.rc:2423
+#: Merge.rc:2433
msgid "&Format"
msgstr "&Format"
#. IDD_GENERATE_PATCH, IDC_STATIC
-#: Merge.rc:2424
+#: Merge.rc:2434
msgid "St&yle:"
msgstr "St&yle :"
#. IDD_GENERATE_PATCH, IDC_STATIC
-#: Merge.rc:2426
+#: Merge.rc:2436
msgid "&Context:"
msgstr "&Contexte :"
#. IDD_GENERATE_PATCH, IDC_DIFF_INCLCMDLINE
-#: Merge.rc:2428
+#: Merge.rc:2438
msgid "Inclu&de command line"
msgstr "Inclure la ligne de comman&de"
#. IDD_GENERATE_PATCH, IDC_DIFF_OPENTOEDITOR
-#: Merge.rc:2429
+#: Merge.rc:2439
msgid "Open in e&xternal editor"
msgstr "Ouvrir dans l'éditeur e&xterne"
#. IDD_DIRCOLS
-#: Merge.rc:2446
+#: Merge.rc:2456
msgid "Display Columns"
msgstr "Affichage des colonnes"
#. IDD_DIRCOLS, IDC_UP
-#: Merge.rc:2450
+#: Merge.rc:2460
msgid "Move &Up"
msgstr "&Monter"
#. IDD_DIRCOLS, IDC_DOWN
-#: Merge.rc:2451
+#: Merge.rc:2461
msgid "Move &Down"
msgstr "&Descendre"
#. IDD_DIRCOLS, IDC_COLDLG_ADDITIONAL_PROPERTIES
-#: Merge.rc:2453
+#: Merge.rc:2463
msgid "&Additional Properties"
msgstr "&Propriétés supplémentaires"
#. IDD_DIRADDITIONALPROPS
-#: Merge.rc:2461
+#: Merge.rc:2471
msgid "Additional Properties"
msgstr "Propriétés supplémentaires"
#. IDD_PLUGINS_SELECTPLUGIN
-#: Merge.rc:2475
+#: Merge.rc:2485
msgid "Select Plugin"
msgstr "Sélectionner le plug-in"
#. IDD_PLUGINS_EDITPLUGIN, IDC_STATIC
-#: Merge.rc:2478 Merge.rc:3115
+#: Merge.rc:2488 Merge.rc:3125
msgid "Plugin &name:"
msgstr "&Nom du plug-in :"
#. IDD_PLUGINS_SELECTPLUGIN, IDC_STATIC
-#: Merge.rc:2480
+#: Merge.rc:2490
msgid "&Target files:"
msgstr "&Fichiers cibles :"
#. IDD_PLUGINS_EDITPLUGIN, IDC_STATIC
-#: Merge.rc:2482 Merge.rc:3117
+#: Merge.rc:2492 Merge.rc:3127
msgid "Extensions list:"
msgstr "Liste des extensions :"
#. IDD_PLUGINS_EDITPLUGIN, IDC_STATIC
-#: Merge.rc:2484 Merge.rc:3119
+#: Merge.rc:2494 Merge.rc:3129
msgid "Description:"
msgstr "Description :"
#. IDD_PLUGINS_EDITPLUGIN, IDC_STATIC
-#: Merge.rc:2486 Merge.rc:3121
+#: Merge.rc:2496 Merge.rc:3131
msgid "Default arguments:"
msgstr "Arguments par défaut :"
#. IDD_PLUGINS_SELECTPLUGIN, IDC_PLUGIN_ALLOW_ALL
-#: Merge.rc:2488
+#: Merge.rc:2498
msgid "Display all plugins (Ignore extension)"
msgstr "Afficher tous les plug-ins (ignorer l'extension)"
#. IDD_PLUGINS_SELECTPLUGIN, IDC_PLUGIN_OPEN_IN_SAME_FRAME_TYPE
-#: Merge.rc:2490
+#: Merge.rc:2500
msgid "&Open files in same window type after unpacking"
msgstr "&Ouvrir les fichiers dans le même type de fenêtre après la décompression"
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_PIPELINE_STATIC
-#: Merge.rc:2492 Merge.rc:3129
+#: Merge.rc:2502 Merge.rc:3139
msgid "&Plugin pipeline:"
msgstr "&Pipeline du plug-in :"
#. IDD_PLUGINS_SELECTPLUGIN, IDC_PLUGIN_ALIAS
-#: Merge.rc:2495
+#: Merge.rc:2505
msgid "&Alias..."
msgstr "&Alias..."
#. IDD_DIRCOMP_PROGRESS, IDC_COMPARISON_STOP
-#: Merge.rc:2505
+#: Merge.rc:2515
msgid "Stop"
msgstr "Arrêter"
#. IDD_DIRCOMP_PROGRESS, IDC_COMPARISON_PAUSE
-#: Merge.rc:2506
+#: Merge.rc:2516
msgid "Pause"
msgstr "Interrompre"
#. IDD_DIRCOMP_PROGRESS, IDC_COMPARISON_CONTINUE
-#: Merge.rc:2507
+#: Merge.rc:2517
msgid "Continue"
msgstr "Continuer"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC
-#: Merge.rc:2509 Merge.rc:2973
+#: Merge.rc:2519 Merge.rc:2983
msgid "C&PU cores to use:"
msgstr "Nombre de &cœurs du processeur à utiliser :"
#. IDD_DIRCOMP_PROGRESS, IDC_STATIC
-#: Merge.rc:2510
+#: Merge.rc:2520
msgid "Items total:"
msgstr "Total des éléments :"
#. IDD_DIRCOMP_PROGRESS, IDC_STATIC
-#: Merge.rc:2511
+#: Merge.rc:2521
msgid "Items compared:"
msgstr "Éléments comparés :"
#. IDS_PREVIEWBAR_CLOSE
-#: Merge.rc:2526 Merge.rc:2846 Merge.rc:5328
+#: Merge.rc:2536 Merge.rc:2856 Merge.rc:5339
msgid "&Close"
msgstr "&Fermer"
#. IDD_WMGOTO
-#: Merge.rc:2537
+#: Merge.rc:2547
msgid "Go to"
msgstr "Atteindre"
#. IDD_WMGOTO, IDC_STATIC
-#: Merge.rc:2540
+#: Merge.rc:2550
msgid "G&o to:"
msgstr "A&tteindre :"
#. IDD_WMGOTO, IDC_STATIC
-#: Merge.rc:2543
+#: Merge.rc:2553
msgid "File"
msgstr "Fichier"
#. IDD_WMGOTO, IDC_STATIC
-#: Merge.rc:2547
+#: Merge.rc:2557
msgid "Go to what"
msgstr "Atteindre quoi"
#. IDD_WMGOTO, IDC_WMGOTO_TOLINE
-#: Merge.rc:2548
+#: Merge.rc:2558
msgid "Li&ne"
msgstr "Lig&ne"
#. IDD_WMGOTO, IDC_WMGOTO_TODIFF
-#: Merge.rc:2549
+#: Merge.rc:2559
msgid "&Difference"
msgstr "&Différence"
#. IDD_WMGOTO, IDOK
-#: Merge.rc:2550
+#: Merge.rc:2560
msgid "&Go to"
msgstr "&Atteindre"
#. IDS_PROJECT_ITEM_FILE_FILTER
-#: Merge.rc:2556 Merge.rc:4321
+#: Merge.rc:2566 Merge.rc:4331
msgid "File Filters"
msgstr "Filtres de fichier"
#. IDD_FILTERS_FILEFILTERS, IDC_STATIC
-#: Merge.rc:2559
+#: Merge.rc:2569
msgid "&Mask / Filter Expression"
msgstr "Masque / Filtre Expression"
#. IDD_FILTERS_FILEFILTERS, IDC_STATIC
-#: Merge.rc:2562
+#: Merge.rc:2572
msgid "Preset &Filters"
msgstr "Filtres &prédéfinis"
#. IDD_FILTERS_FILEFILTERS, IDC_FILTERFILE_TEST_BTN
-#: Merge.rc:2564
+#: Merge.rc:2574
msgid "Test..."
msgstr "Tester..."
#. IDD_FILTERS_FILEFILTERS, IDC_FILTERFILE_INSTALL
-#: Merge.rc:2565
+#: Merge.rc:2575
msgid "Install..."
msgstr "Installer..."
#. IDD_FILTERS_FILEFILTERS, IDC_FILTERFILE_NEWBTN
-#: Merge.rc:2566
+#: Merge.rc:2576
msgid "New..."
msgstr "Nouveau..."
#. IDD_FILTERS_FILEFILTERS, IDC_FILTERFILE_EDITBTN
-#: Merge.rc:2567
+#: Merge.rc:2577
msgid "Edit..."
msgstr "Éditer..."
#. IDD_FILTERS_FILEFILTERS, IDC_FILTERFILE_DELETEBTN
-#: Merge.rc:2568
+#: Merge.rc:2578
msgid "Delete..."
msgstr "Supprimer..."
#. IDD_FILTERS_CONDITION
-#: Merge.rc:2573
+#: Merge.rc:2583
msgid "Filter Condition"
msgstr "État du filtre"
#. IDD_FILTERS_CONDITION, IDC_STATIC
-#: Merge.rc:2576
+#: Merge.rc:2586
msgid "&Left-hand side:"
msgstr "Côté &gauche :"
#. IDD_FILTERS_CONDITION, IDC_STATIC
-#: Merge.rc:2578
+#: Merge.rc:2588
msgid "&Operator:"
msgstr "&Opérateur :"
#. IDD_FILTERS_CONDITION, IDC_STATIC
-#: Merge.rc:2580
+#: Merge.rc:2590
msgid "&Right-hand side:"
msgstr "Côté &droit :"
#. IDD_FILTERS_CONDITION, IDC_STATIC
-#: Merge.rc:2586
+#: Merge.rc:2596
msgid "Expression:"
msgstr "Expression :"
#. IDD_COMPARISON_RESULT_FILTER
-#: Merge.rc:2595
+#: Merge.rc:2605
msgid "Filter by Comparison Result"
msgstr "Filtrer par résultat de comparaison"
#. IDD_COMPARISON_RESULT_FILTER, IDC_RADIO_INCLUDE
-#: Merge.rc:2598
+#: Merge.rc:2608
msgid "&Include"
msgstr "&Inclure"
#. IDD_COMPARISON_RESULT_FILTER, IDC_RADIO_EXCLUDE
-#: Merge.rc:2599
+#: Merge.rc:2609
msgid "&Exclude"
msgstr "&Exclure"
#. IDD_COMPARISON_RESULT_FILTER, IDC_STATIC
-#: Merge.rc:2600
+#: Merge.rc:2610
msgid "Comparison Results"
msgstr "Résultats de la comparaison"
#. IDS_IDENTICAL
-#: Merge.rc:2601 Merge.rc:2733 Merge.rc:2794 Merge.rc:4698
+#: Merge.rc:2611 Merge.rc:2743 Merge.rc:2804 Merge.rc:4708
msgid "Identical"
msgstr "Identique"
#. IDS_DIFFERENT
-#: Merge.rc:2602 Merge.rc:2714 Merge.rc:2755 Merge.rc:4708
+#: Merge.rc:2612 Merge.rc:2724 Merge.rc:2765 Merge.rc:4718
msgid "Different"
msgstr "Différent"
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_LEFT_ONLY
-#: Merge.rc:2603
+#: Merge.rc:2613
msgid "Left only"
msgstr "Gauche seulement"
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_RIGHT_ONLY
-#: Merge.rc:2604
+#: Merge.rc:2614
msgid "Right only"
msgstr "Droite seulement"
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_SKIPPED
-#: Merge.rc:2605
+#: Merge.rc:2615
msgid "Skipped"
msgstr "Ignoré"
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_MIDDLE_ONLY
-#: Merge.rc:2606
+#: Merge.rc:2616
msgid "Middle only"
msgstr "Milieu seulement"
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_LEFT_ONLY_DIFFERENT
-#: Merge.rc:2607
+#: Merge.rc:2617
msgid "Left only (different)"
msgstr "Gauche seulement (différent)"
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_MIDDLE_ONLY_DIFFERENT
-#: Merge.rc:2608
+#: Merge.rc:2618
msgid "Middle only (different)"
msgstr "Milieu seulement (différent)"
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_RIGHT_ONLY_DIFFERENT
-#: Merge.rc:2609
+#: Merge.rc:2619
msgid "Right only (different)"
msgstr "Droite seulement (différent)"
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_LEFT_ONLY_MISSING
-#: Merge.rc:2610
+#: Merge.rc:2620
msgid "Left only (missing)"
msgstr "Gauche seulement (manquant)"
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_MIDDLE_ONLY_MISSING
-#: Merge.rc:2611
+#: Merge.rc:2621
msgid "Middle only (missing)"
msgstr "Milieu seulement (manquant)"
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_RIGHT_ONLY_MISSING
-#: Merge.rc:2612
+#: Merge.rc:2622
msgid "Right only (missing)"
msgstr "Droite seulement (manquant)"
#. IDS_OPTIONSPG_CODEPAGE
-#: Merge.rc:2619 Merge.rc:2811 Merge.rc:4213
+#: Merge.rc:2629 Merge.rc:2821 Merge.rc:4223
msgid "Codepage"
msgstr "Page de code"
#. IDD_PROPPAGE_CODEPAGE, IDC_STATIC
-#: Merge.rc:2622
+#: Merge.rc:2632
msgid "Default Codepage"
msgstr "Page de code par défaut"
#. IDD_PROPPAGE_CODEPAGE, IDC_STATIC
-#: Merge.rc:2623
+#: Merge.rc:2633
msgid "Select the default codepage for non-Unicode files:"
msgstr "Sélectionnez la page de codes par défaut pour les fichiers non Unicode :"
#. IDD_PROPPAGE_CODEPAGE, IDC_CP_SYSTEM
-#: Merge.rc:2624
+#: Merge.rc:2634
msgid "System codepage"
msgstr "Page de code du système"
#. IDD_PROPPAGE_CODEPAGE, IDC_CP_UI
-#: Merge.rc:2625
+#: Merge.rc:2635
msgid "According to WinMerge User Interface"
msgstr "Conformément à l'interface utilisateur de WinMerge"
#. IDD_PROPPAGE_CODEPAGE, IDC_CP_CUSTOM
-#: Merge.rc:2626
+#: Merge.rc:2636
msgid "Custom codepage:"
msgstr "Page de code personnalisée :"
#. IDD_PROPPAGE_CODEPAGE, IDC_DETECT_CODEPAGE
-#: Merge.rc:2628
+#: Merge.rc:2638
msgid ""
"Detect codepage for: .html, .rc, .xml\n"
"Restart required."
@@ -4094,7 +4105,7 @@ msgstr ""
"Redémarrage requis."
#. IDD_PROPPAGE_CODEPAGE, IDC_DETECT_CODEPAGE2
-#: Merge.rc:2630
+#: Merge.rc:2640
msgid ""
"Detect codepage for files with mlang.dll\n"
"Restart required."
@@ -4103,769 +4114,769 @@ msgstr ""
"Redémarrage requis."
#. IDS_OPTIONSPG_ARCHIVE
-#: Merge.rc:2638 Merge.rc:4214
+#: Merge.rc:2648 Merge.rc:4224
msgid "Archive Support"
msgstr "Support d'archives"
#. IDD_PROPPAGE_ARCHIVE, IDC_ARCHIVE_ENABLE
-#: Merge.rc:2641
+#: Merge.rc:2651
msgid "&Enable archive file support"
msgstr "Activ&er le support d'archives"
#. IDD_PROPPAGE_ARCHIVE, IDC_ARCHIVE_DETECTTYPE
-#: Merge.rc:2642
+#: Merge.rc:2652
msgid "&Detect archive type from file signature"
msgstr "&Détecter le type d'archives avec un fichier de signature"
#. IDD_PROPPAGE_PROJECT, IDC_STATIC
-#: Merge.rc:2651
+#: Merge.rc:2661
msgid "Items saved to or restored from the project file:"
msgstr "Éléments enregistrés ou restaurés à partir du fichier de projet :"
#. IDD_SAVECLOSING
-#: Merge.rc:2658
+#: Merge.rc:2668
msgid "Save Modified Files?"
msgstr "Enregistrer les fichiers modifiés ?"
#. IDD_SAVECLOSING, IDC_SAVECLOSING_LEFTFRAME
-#: Merge.rc:2661
+#: Merge.rc:2671
msgid "Left side file"
msgstr "Fichier du panneau Gauche"
#. IDD_SAVECLOSING, IDC_SAVECLOSING_SAVELEFT
-#: Merge.rc:2663
+#: Merge.rc:2673
msgid "&Save changes"
msgstr "&Enregister les changements"
#. IDD_SAVECLOSING, IDC_SAVECLOSING_DISCARDLEFT
-#: Merge.rc:2664
+#: Merge.rc:2674
msgid "&Discard changes"
msgstr "&Ignorer les changements"
#. IDD_SAVECLOSING, IDC_SAVECLOSING_MIDDLEFRAME
-#: Merge.rc:2665
+#: Merge.rc:2675
msgid "Middle side file"
msgstr "Fichier du panneau Milieu"
#. IDD_SAVECLOSING, IDC_SAVECLOSING_SAVEMIDDLE
-#: Merge.rc:2667
+#: Merge.rc:2677
msgid "Sa&ve changes"
msgstr "En®istrer les modifications"
#. IDD_SAVECLOSING, IDC_SAVECLOSING_DISCARDMIDDLE
-#: Merge.rc:2668
+#: Merge.rc:2678
msgid "Discard c&hanges"
msgstr "Annuler les m&odifications"
#. IDD_SAVECLOSING, IDC_SAVECLOSING_RIGHTFRAME
-#: Merge.rc:2669
+#: Merge.rc:2679
msgid "Right side file"
msgstr "Fichier du panneau Droite"
#. IDD_SAVECLOSING, IDC_SAVECLOSING_SAVERIGHT
-#: Merge.rc:2671
+#: Merge.rc:2681
msgid "S&ave changes"
msgstr "E&nregister les changements"
#. IDD_SAVECLOSING, IDC_SAVECLOSING_DISCARDRIGHT
-#: Merge.rc:2672
+#: Merge.rc:2682
msgid "Dis&card changes"
msgstr "Annuler les &modifications"
#. IDD_SAVECLOSING, IDC_SAVECLOSING_DISCARDALL
-#: Merge.rc:2673
+#: Merge.rc:2683
msgid "Disca&rd All"
msgstr "Annuler &tout"
#. IDD_DIRCMP_REPORT
-#: Merge.rc:2680
+#: Merge.rc:2690
msgid "Folder Compare Report"
msgstr "Dossier du rapport de comparaison"
#. IDD_DIRCMP_REPORT, IDC_STATIC
-#: Merge.rc:2683
+#: Merge.rc:2693
msgid "Report &file:"
msgstr "Fichier du &rapport :"
#. IDD_DIRCMP_REPORT, IDC_STATIC
-#: Merge.rc:2686
+#: Merge.rc:2696
msgid "&Style:"
msgstr "&Style :"
#. IDD_DIRCMP_REPORT, IDC_REPORT_INCLUDEFILECMPREPORT
-#: Merge.rc:2688
+#: Merge.rc:2698
msgid "&Include file compare report"
msgstr "&Inclure le rapport de comparaison de fichier"
#. IDD_FILTERS_FILEFILTERS_SHARED
-#: Merge.rc:2697
+#: Merge.rc:2707
msgid "Shared or Private Filter"
msgstr "Filtre partagé ou privé"
#. IDD_FILTERS_FILEFILTERS_SHARED, IDC_STATIC
-#: Merge.rc:2700
+#: Merge.rc:2710
msgid "What type of filter do you want?"
msgstr "Quel type de filtre voulez-vous ?"
#. IDD_FILTERS_FILEFILTERS_SHARED, IDC_SHARED
-#: Merge.rc:2701
+#: Merge.rc:2711
msgid "Shared Filter (for all users)"
msgstr "Filtre partagé (pour tous les utilisateurs)"
#. IDD_FILTERS_FILEFILTERS_SHARED, IDC_PRIVATE
-#: Merge.rc:2702
+#: Merge.rc:2712
msgid "Private Filter (current user only)"
msgstr "Filtre privé (utilisateur actuel seulement)"
#. IDD_COMPARE_STATISTICS3
-#: Merge.rc:2709 Merge.rc:2750
+#: Merge.rc:2719 Merge.rc:2760
msgid "Compare Statistics"
msgstr "Statistiques des comparaisons"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2712 Merge.rc:2753
+#: Merge.rc:2722 Merge.rc:2763
msgid "Folders:"
msgstr "Dossiers :"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2713 Merge.rc:2754
+#: Merge.rc:2723 Merge.rc:2764
msgid "Files:"
msgstr "Fichiers :"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2719 Merge.rc:2738 Merge.rc:2760 Merge.rc:2799
+#: Merge.rc:2729 Merge.rc:2748 Merge.rc:2770 Merge.rc:2809
msgid "Binary:"
msgstr "Binaire :"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2722 Merge.rc:2763
+#: Merge.rc:2732 Merge.rc:2773
msgid "Unique"
msgstr "Unique"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2723 Merge.rc:2764
+#: Merge.rc:2733 Merge.rc:2774
msgid "Left:"
msgstr "Gauche :"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2728 Merge.rc:2774
+#: Merge.rc:2738 Merge.rc:2784
msgid "Right:"
msgstr "Droite :"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2742 Merge.rc:2803
+#: Merge.rc:2752 Merge.rc:2813
msgid "Total:"
msgstr "Total :"
#. IDD_COMPARE_STATISTICS3, IDOK
-#: Merge.rc:2745 Merge.rc:2806
+#: Merge.rc:2755 Merge.rc:2816
msgid "Close"
msgstr "Fermer"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2769
+#: Merge.rc:2779
msgid "Middle:"
msgstr "Milieu :"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2779
+#: Merge.rc:2789
msgid "Missing Left:"
msgstr "Gauche manquant :"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2784
+#: Merge.rc:2794
msgid "Missing Middle:"
msgstr "Milieu manquant :"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2789
+#: Merge.rc:2799
msgid "Missing Right:"
msgstr "Droite manquant :"
#. IDD_LOAD_SAVE_CODEPAGE, IDC_AFFECTS_GROUP
-#: Merge.rc:2814
+#: Merge.rc:2824
msgid "Affects"
msgstr "Affectations"
#. IDD_LOAD_SAVE_CODEPAGE, IDC_RIGHT_FILES_LABEL
-#: Merge.rc:2816 Merge.rc:2818 Merge.rc:2820
+#: Merge.rc:2826 Merge.rc:2828 Merge.rc:2830
msgid "(Affects)"
msgstr "(Affectations)"
#. IDD_LOAD_SAVE_CODEPAGE, IDC_LOADING_GROUP
-#: Merge.rc:2821
+#: Merge.rc:2831
msgid "Select Codepage for"
msgstr "Sélectionner le code de page pour"
#. IDD_LOAD_SAVE_CODEPAGE, IDC_LOAD_FILES_LABEL
-#: Merge.rc:2822
+#: Merge.rc:2832
msgid "&File Loading:"
msgstr "Chargement du &fichier :"
#. IDD_LOAD_SAVE_CODEPAGE, IDC_SAVE_FILES_LABEL
-#: Merge.rc:2824
+#: Merge.rc:2834
msgid "File &Saving:"
msgstr "Enregi&strement du fichier :"
#. IDD_LOAD_SAVE_CODEPAGE, IDC_LOAD_SAVE_SAME_CODEPAGE
-#: Merge.rc:2827
+#: Merge.rc:2837
msgid "&Use same codepage for both"
msgstr "&Utiliser la même page de code pour les deux"
#. IDS_MESSAGEBOX_CANCEL
-#: Merge.rc:2830 Merge.rc:4172
+#: Merge.rc:2840 Merge.rc:4182
msgid "&Cancel"
msgstr "&Annuler"
#. IDD_FILTERS_FILEFILTERS_TEST
-#: Merge.rc:2835
+#: Merge.rc:2845
msgid "Test Filter"
msgstr "Filtre de test"
#. IDD_FILTERS_FILEFILTERS_TEST, IDC_HEADER
-#: Merge.rc:2838
+#: Merge.rc:2848
msgid "Testing filter:"
msgstr "Tester le filtre :"
#. IDD_FILTERS_FILEFILTERS_TEST, IDC_PROMPT_LABEL
-#: Merge.rc:2840
+#: Merge.rc:2850
msgid "&Enter text to test:"
msgstr "Entrez l&e texte à tester :"
#. IDD_FILTERS_FILEFILTERS_TEST, IDC_IS_DIRECTORY
-#: Merge.rc:2842
+#: Merge.rc:2852
msgid "&Folder Name"
msgstr "Nom du &dossier"
#. IDD_FILTERS_FILEFILTERS_TEST, IDC_STATIC
-#: Merge.rc:2843
+#: Merge.rc:2853
msgid "Result:"
msgstr "Résultat :"
#. IDD_FILTERS_FILEFILTERS_TEST, IDC_TEST_BTN
-#: Merge.rc:2845
+#: Merge.rc:2855
msgid "&Test"
msgstr "&Tester"
#. IDS_OPTIONSPG_TABLECOMPARE
-#: Merge.rc:2851 Merge.rc:2990 Merge.rc:4228
+#: Merge.rc:2861 Merge.rc:3000 Merge.rc:4238
msgid "Table"
msgstr "Tableau"
#. IDD_OPEN_TABLE, IDC_STATIC
-#: Merge.rc:2854
+#: Merge.rc:2864
msgid "File type"
msgstr "Type de fichier"
#. IDD_OPEN_TABLE, IDC_COMPARETABLE_CSV
-#: Merge.rc:2855
+#: Merge.rc:2865
msgid "&CSV"
msgstr "&CSV"
#. IDD_OPEN_TABLE, IDC_COMPARETABLE_TSV
-#: Merge.rc:2856
+#: Merge.rc:2866
msgid "&TSV"
msgstr "&TSV"
#. IDD_OPEN_TABLE, IDC_COMPARETABLE_DSV
-#: Merge.rc:2857
+#: Merge.rc:2867
msgid "Custom &Delimiter-Separated Values"
msgstr "Personnalisation des &délimiteurs"
#. IDD_PROPPAGE_COMPARE_TABLE, IDC_STATIC
-#: Merge.rc:2859 Merge.rc:2861 Merge.rc:2996 Merge.rc:3004
+#: Merge.rc:2869 Merge.rc:2871 Merge.rc:3006 Merge.rc:3014
msgid "D&elimiter character:"
msgstr "Caractère de séparation :"
#. IDD_PROPPAGE_COMPARE_TABLE, IDC_COMPARETABLE_ALLOWNEWLINE
-#: Merge.rc:2863 Merge.rc:3006
+#: Merge.rc:2873 Merge.rc:3016
msgid "&Allow newlines in quotes"
msgstr "&Autoriser les sauts lignes dans les citations"
#. IDD_PROPPAGE_COMPARE_TABLE, IDC_STATIC
-#: Merge.rc:2865 Merge.rc:3008
+#: Merge.rc:2875 Merge.rc:3018
msgid "&Quote character:"
msgstr "&Caractère de citation :"
#. IDS_OPTIONSPG_BACKUPS
-#: Merge.rc:2873 Merge.rc:4216
+#: Merge.rc:2883 Merge.rc:4226
msgid "Backup Files"
msgstr "Fichiers d'archive"
#. IDD_PROPPAGE_BACKUPS, IDC_STATIC
-#: Merge.rc:2876
+#: Merge.rc:2886
msgid "Create backup files for:"
msgstr "Créer des fichiers d'archive pour la :"
#. IDD_PROPPAGE_BACKUPS, IDC_BACKUP_FOLDERCMP
-#: Merge.rc:2877
+#: Merge.rc:2887
msgid "&Folder compare"
msgstr "Comparaison de &dossiers"
#. IDD_PROPPAGE_BACKUPS, IDC_BACKUP_FILECMP
-#: Merge.rc:2878
+#: Merge.rc:2888
msgid "Fil&e compare"
msgstr "Comparaison de &fichiers"
#. IDD_PROPPAGE_BACKUPS, IDC_STATIC
-#: Merge.rc:2879
+#: Merge.rc:2889
msgid "Create backup files in:"
msgstr "Créer les fichiers d'archive dans le :"
#. IDD_PROPPAGE_BACKUPS, IDC_BACKUP_ORIGFOLD
-#: Merge.rc:2880
+#: Merge.rc:2890
msgid "&Original file's folder"
msgstr "Dossier d'&origine du fichier"
#. IDD_PROPPAGE_BACKUPS, IDC_BACKUP_GLOBALFOLD
-#: Merge.rc:2881
+#: Merge.rc:2891
msgid "&Global backup folder:"
msgstr "Dossier d'archive &global :"
#. IDD_PROPPAGE_BACKUPS, IDC_STATIC
-#: Merge.rc:2884
+#: Merge.rc:2894
msgid "Backup filename:"
msgstr "Nom du fichier d'archive :"
#. IDD_PROPPAGE_BACKUPS, IDC_BACKUP_APPEND_BAK
-#: Merge.rc:2885
+#: Merge.rc:2895
msgid "&Append .bak extension"
msgstr "&Ajouter l'extension .bak"
#. IDD_PROPPAGE_BACKUPS, IDC_BACKUP_APPEND_TIME
-#: Merge.rc:2886
+#: Merge.rc:2896
msgid "A&ppend timestamp"
msgstr "Ajouter un &horodatage"
#. IDS_CONFIRM_COPY_CAPTION
-#: Merge.rc:2892 Merge.rc:4565
+#: Merge.rc:2902 Merge.rc:4575
msgid "Confirm Copy"
msgstr "Confirmer la copie"
#. IDD_CONFIRM_COPY, IDC_FLDCONFIRM_QUERY
-#: Merge.rc:2896
+#: Merge.rc:2906
msgid "Are you sure you want to copy XXX items?"
msgstr "Êtes-vous sûr de vouloir copier XXX éléments ?"
#. IDD_CONFIRM_COPY, IDC_FLDCONFIRM_FROM_TEXT
-#: Merge.rc:2897
+#: Merge.rc:2907
msgid "From left"
msgstr "De la Gauche"
#. IDD_CONFIRM_COPY, IDC_FLDCONFIRM_TO_TEXT
-#: Merge.rc:2899
+#: Merge.rc:2909
msgid "To right"
msgstr "Vers la Droite"
#. IDS_MESSAGEBOX_DONT_ASK_AGAIN
-#: Merge.rc:2901 Merge.rc:4191
+#: Merge.rc:2911 Merge.rc:4201
msgid "Don't ask this &question again."
msgstr "Ne plus poser cette &question."
#. IDD_CONFIRM_COPY, IDYES
-#: Merge.rc:2903
+#: Merge.rc:2913
msgid "Yes"
msgstr "Oui"
#. IDD_CONFIRM_COPY, IDNO
-#: Merge.rc:2904
+#: Merge.rc:2914
msgid "No"
msgstr "Non"
#. IDS_PROJECT_ITEM_PLUGIN
-#: Merge.rc:2909 Merge.rc:4323
+#: Merge.rc:2919 Merge.rc:4333
msgid "Plugins"
msgstr "Plug-ins"
#. IDD_PLUGINS_LIST, IDC_PLUGINS_ENABLE
-#: Merge.rc:2912
+#: Merge.rc:2922
msgid "&Enable plugins"
msgstr "Activ&er les plug-ins"
#. IDD_PLUGINS_EDITPLUGIN, IDC_STATIC
-#: Merge.rc:2913 Merge.rc:3113
+#: Merge.rc:2923 Merge.rc:3123
msgid "Plugin &type:"
msgstr "&Type de plug-in :"
#. IDD_PLUGINS_LIST, IDC_STATIC
-#: Merge.rc:2916
+#: Merge.rc:2926
msgid "File filters:"
msgstr "Filtres de fichier :"
#. IDD_PLUGINS_LIST, IDC_STATIC
-#: Merge.rc:2918
+#: Merge.rc:2928
msgid "&Plugin arguments:"
msgstr "&Arguments :"
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_AUTOMATIC
-#: Merge.rc:2920 Merge.rc:3134
+#: Merge.rc:2930 Merge.rc:3144
msgid "Enable &automatic unpacking/prediffing"
msgstr "Activer la décompression/prédifférenciation &automatique"
#. IDS_OPTIONSPG_SHELL
-#: Merge.rc:2934 Merge.rc:4217
+#: Merge.rc:2944 Merge.rc:4227
msgid "Shell Integration"
msgstr "Intégration au Shell"
#. IDD_PROPPAGE_SHELL, IDC_STATIC
-#: Merge.rc:2937
+#: Merge.rc:2947
msgid "Explorer"
msgstr "Explorateur"
#. IDD_PROPPAGE_SHELL, IDC_EXPLORER_CONTEXT
-#: Merge.rc:2938
+#: Merge.rc:2948
msgid "&Add to context menu"
msgstr "&Ajouter au menu contextuel"
#. IDD_PROPPAGE_SHELL, IDC_EXPLORER_ADVANCED
-#: Merge.rc:2939
+#: Merge.rc:2949
msgid "E&nable advanced menu"
msgstr "Activer le me&nu avancé"
#. IDD_PROPPAGE_SHELL, IDC_EXPLORER_COMPARE_AS
-#: Merge.rc:2940
+#: Merge.rc:2950
msgid "Enable &Compare As menu"
msgstr "Activer le menu &Comparer en tant que"
#. IDD_PROPPAGE_SHELL, IDC_REGISTER_SHELLEXTENSION
-#: Merge.rc:2941
+#: Merge.rc:2951
msgid "&Register Shell Extension"
msgstr "Inscri&re l'extension du Shell"
#. IDD_PROPPAGE_SHELL, IDC_UNREGISTER_SHELLEXTENSION
-#: Merge.rc:2942
+#: Merge.rc:2952
msgid "&Unregister Shell Extension"
msgstr "Désinscrire l'extension d&u Shell"
#. IDD_PROPPAGE_SHELL, IDC_REGISTER_SHELLEXTENSION_PERUSER
-#: Merge.rc:2943
+#: Merge.rc:2953
msgid "Register Shell Extension for Current User &Only"
msgstr "Inscrire l'extension du Shell p&our l'utilisateur actuel"
#. IDD_PROPPAGE_SHELL, IDC_UNREGISTER_SHELLEXTENSION_PERUSER
-#: Merge.rc:2944
+#: Merge.rc:2954
msgid "Unregister Shell Extension for Current User On&ly"
msgstr "Désinscrire l'extension du Shell pour l'utilisateur actue&l"
#. IDD_PROPPAGE_SHELL, IDC_REGISTER_WINMERGECONTEXTMENU
-#: Merge.rc:2945
+#: Merge.rc:2955
msgid "Register Shell Extension for &Windows 11"
msgstr "Inscrire l'extension du Shell pour &Windows 11"
#. IDD_PROPPAGE_SHELL, IDC_UNREGISTER_WINMERGECONTEXTMENU
-#: Merge.rc:2946
+#: Merge.rc:2956
msgid "Unregister Shell Extension for W&indows 11"
msgstr "Désinscrire l'extension du Shell pour W&indows 11"
#. IDD_PROPPAGE_SHELL, IDC_STATIC
-#: Merge.rc:2947
+#: Merge.rc:2957
msgid "Jump List"
msgstr "Liste de raccourcis"
#. IDD_PROPPAGE_SHELL, IDC_CLEAR_ALL_RECENT_ITEMS
-#: Merge.rc:2949
+#: Merge.rc:2959
msgid "Clear all recent items"
msgstr "Effacer tous les éléments récents"
#. IDS_OPTIONSPG_FOLDERCOMPARE
-#: Merge.rc:2954 Merge.rc:4225
+#: Merge.rc:2964 Merge.rc:4235
msgctxt "Options dialog|Categories"
msgid "Folder"
msgstr "Dossier"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC
-#: Merge.rc:2957
+#: Merge.rc:2967
msgid "&Compare method:"
msgstr "Méthode de &comparaison :"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_COMPARE_STOPFIRST
-#: Merge.rc:2959
+#: Merge.rc:2969
msgid "S&top after first difference"
msgstr "Arrê&ter à la première différence"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_IGNORE_SMALLTIMEDIFF
-#: Merge.rc:2961
+#: Merge.rc:2971
msgid "Ign&ore time differences less than 3 seconds"
msgstr "Ign&orer les différences de temps de moins de 3 secondes"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC
-#: Merge.rc:2964
+#: Merge.rc:2974
msgid "Expand subfolders &after comparison:"
msgstr "Développer automatiquement l'arborescence &après comparaison :"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_COMPARE_WALKSUBDIRS
-#: Merge.rc:2966
+#: Merge.rc:2976
msgid "Include &unique subfolders contents"
msgstr "&Inclure le contenu des sous-dossiers uniques"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_IGNORE_REPARSEPOINTS
-#: Merge.rc:2968
+#: Merge.rc:2978
msgid "Ignore &reparse points"
msgstr "Igno&rer les points d'analyse"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC
-#: Merge.rc:2969
+#: Merge.rc:2979
msgid "Switch to &quick compare when size exceeds (MB):"
msgstr "Passer à la comparaison ra&pide quand la taille dépasse (Mo) :"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC
-#: Merge.rc:2971
+#: Merge.rc:2981
msgid "Switch to &binary compare when size exceeds (MB):"
msgstr "Passer à la comparaison &binaire quand la taille dépasse (Mo) :"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC
-#: Merge.rc:2975
+#: Merge.rc:2985
msgid "Additional comparison condi&tions:"
msgstr "Conditions de comparaison supplémen&taires :"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC
-#: Merge.rc:2978
+#: Merge.rc:2988
msgid "&Rename/move detection:"
msgstr "Détection du renommage/déplacement :"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC
-#: Merge.rc:2980
+#: Merge.rc:2990
msgid "Rename/move detection &keys:"
msgstr "Clés de détection du renommage/déplacement :"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC
-#: Merge.rc:2983
+#: Merge.rc:2993
msgid "M&erge renames and moves:"
msgstr "Fusionn&er les renommages et les déplacements :"
#. IDD_PROPPAGE_COMPARE_TABLE, IDC_STATIC
-#: Merge.rc:2994 Merge.rc:2999 Merge.rc:3002
+#: Merge.rc:3004 Merge.rc:3009 Merge.rc:3012
msgid "File patterns:"
msgstr "Modèles de fichiers :"
#. IDD_PROPPAGE_COMPARE_TABLE, IDC_STATIC
-#: Merge.rc:3001
+#: Merge.rc:3011
msgid "Custom Delimiter-Separated Values"
msgstr "Personnalisation des valeurs des délimiteurs"
#. IDS_OPTIONSPG_BINARYCOMPARE
-#: Merge.rc:3015 Merge.rc:4227
+#: Merge.rc:3025 Merge.rc:4237
msgctxt "Options dialog|Categories"
msgid "Binary"
msgstr "Binaire"
#. IDD_PROPPAGE_COMPARE_BINARY, IDC_STATIC
-#: Merge.rc:3018
+#: Merge.rc:3028
msgid "Binary file &patterns:"
msgstr "&Modèles de fichiers binaires :"
#. IDD_PROPPAGE_COMPARE_BINARY, IDC_STATIC
-#: Merge.rc:3020
+#: Merge.rc:3030
msgid "Frhed settings"
msgstr "Paramètres Frhed"
#. IDD_PROPPAGE_COMPARE_BINARY, IDC_COMPAREBINARY_VIEWSETTINGS
-#: Merge.rc:3021
+#: Merge.rc:3031
msgid "View &Settings..."
msgstr "Paramètre&s d'affichage..."
#. IDD_PROPPAGE_COMPARE_BINARY, IDC_COMPAREBINARY_BINARYMODE
-#: Merge.rc:3022
+#: Merge.rc:3032
msgid "&Binary Mode..."
msgstr "Mode &binaire..."
#. IDD_PROPPAGE_COMPARE_BINARY, IDC_COMPAREBINARY_CHARACTERSET
-#: Merge.rc:3023
+#: Merge.rc:3033
msgid "&Character Set..."
msgstr "En&codage..."
#. IDS_PRPCAT_IMAGE
-#: Merge.rc:3029 Merge.rc:4226 Merge.rc:4665
+#: Merge.rc:3039 Merge.rc:4236 Merge.rc:4675
msgid "Image"
msgstr "Image"
#. IDD_PROPPAGE_COMPARE_IMAGE, IDC_STATIC
-#: Merge.rc:3032
+#: Merge.rc:3042
msgid "Image file &patterns:"
msgstr "&Modèles de fichiers image :"
#. IDD_PROPPAGE_COMPARE_IMAGE, IDC_ENABLE_IMGCMP_IN_DIRCMP
-#: Merge.rc:3034
+#: Merge.rc:3044
msgid "&Enable image compare in folder compare"
msgstr "&Activer la comparaison d'images dans la comparaison de dossiers"
#. IDD_PROPPAGE_COMPARE_IMAGE, IDC_STATIC
-#: Merge.rc:3036
+#: Merge.rc:3046
msgid "OCR result:"
msgstr "Résultat OCR :"
#. IDS_OPTIONSPG_WEBPAGECOMPARE
-#: Merge.rc:3043 Merge.rc:4229
+#: Merge.rc:3053 Merge.rc:4239
msgid "Webpage"
msgstr "Page Web"
#. IDD_PROPPAGE_COMPARE_WEBPAGE, IDC_STATIC
-#: Merge.rc:3046
+#: Merge.rc:3056
msgid "URL pattern to &include (Regular expression):"
msgstr "Modèle d'URL à &inclure (Expression régulière) :"
#. IDD_PROPPAGE_COMPARE_WEBPAGE, IDC_STATIC
-#: Merge.rc:3048
+#: Merge.rc:3058
msgid "URL pattern to &exclude (Regular expression):"
msgstr "Modèle d'URL à &exclure (Expression régulière) :"
#. IDD_PROPPAGE_COMPARE_WEBPAGE, IDC_STATIC
-#: Merge.rc:3050
+#: Merge.rc:3060
msgid "&User data folder location:"
msgstr "Emplacement du dossier de données &utilisateur :"
#. IDD_PROPPAGE_COMPARE_WEBPAGE, IDC_COMPAREWEBPAGE_USERDATAFOLDER_PERPANE
-#: Merge.rc:3052
+#: Merge.rc:3062
msgid "&Separate user data folders for each pane"
msgstr "&Séparer les dossiers de données utilisateur pour chaque panneau"
#. IDD_ENCODINGERROR, IDC_HEXVIEW
-#: Merge.rc:3065
+#: Merge.rc:3075
msgid "&Hex View"
msgstr "Affichage &Hexa"
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3110
+#: Merge.rc:3120
msgid "Edit Plugin"
msgstr "Modifier le plug-in"
#. IDD_PLUGINS_EDITPLUGIN, IDC_STATIC
-#: Merge.rc:3123
+#: Merge.rc:3133
msgid "&Category:"
msgstr "&Catégorie :"
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_MENUCAPTION_STATIC
-#: Merge.rc:3125
+#: Merge.rc:3135
msgid "&Menu caption:"
msgstr "Légende du &menu :"
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_WINDOWTYPE_STATIC
-#: Merge.rc:3127
+#: Merge.rc:3137
msgid "&Window type:"
msgstr "Type de &fenêtre :"
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_UNPACKEDFILEEXTENSION_STATIC
-#: Merge.rc:3132
+#: Merge.rc:3142
msgid "&Unpacked file extension:"
msgstr "E&xtension du fichier :"
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_ARGUMENTSREQUIRED
-#: Merge.rc:3136
+#: Merge.rc:3146
msgid "&Require arguments"
msgstr "Exige&r des arguments"
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_GENERATESCRIPT
-#: Merge.rc:3137
+#: Merge.rc:3147
msgid "&Generate editor script"
msgstr "&Générer un script d'édition"
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_COMMAND_LINE_STATIC
-#: Merge.rc:3140
+#: Merge.rc:3150
msgid "Command &line:"
msgstr "&Ligne de commande :"
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_SCRIPT_FILEEXTENSION_STATIC
-#: Merge.rc:3143
+#: Merge.rc:3153
msgid "&Script file extension:"
msgstr "Extension de fichier &Script :"
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_SCRIPT_BODY_STATIC
-#: Merge.rc:3145
+#: Merge.rc:3155
msgid "Script &body:"
msgstr "&Corps du script :"
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3154
+#: Merge.rc:3164
msgid "Font"
msgstr "Police"
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3157
+#: Merge.rc:3167
msgid "&Font:"
msgstr "&Police :"
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3163
+#: Merge.rc:3173
msgid "Font st&yle:"
msgstr "St&yle de police :"
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3169
+#: Merge.rc:3179
msgid "&Size:"
msgstr "&Taille :"
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3175
+#: Merge.rc:3185
msgid "Effects"
msgstr "Effets"
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3176
+#: Merge.rc:3186
msgid "Stri&keout"
msgstr "Ba&rré"
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3177
+#: Merge.rc:3187
msgid "&Underline"
msgstr "&Souligner"
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3179
+#: Merge.rc:3189
msgid "&Color:"
msgstr "&Couleur :"
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3184
+#: Merge.rc:3194
msgid "Sample"
msgstr "Exemple"
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3185
+#: Merge.rc:3195
msgid "AaBbYyZz"
msgstr "AaBbYyZz"
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3189
+#: Merge.rc:3199
msgid "Sc&ript:"
msgstr "Sc&ript :"
#. IDD_PLUGINS_EDITPLUGIN, IDC_MANAGE_LINK
-#: Merge.rc:3194
+#: Merge.rc:3204
msgid "Show more fonts"
msgstr "Afficher plus de polices"
#. ID_INDICATOR_EXT
-#: Merge.rc:4118
+#: Merge.rc:4128
msgid "EXT"
msgstr "EXT"
#. ID_INDICATOR_CAPS
-#: Merge.rc:4119
+#: Merge.rc:4129
msgid "CAP"
msgstr "MAJ"
#. ID_INDICATOR_NUM
-#: Merge.rc:4120
+#: Merge.rc:4130
msgid "NUM"
msgstr "NUM"
#. ID_INDICATOR_SCRL
-#: Merge.rc:4121
+#: Merge.rc:4131
msgid "SCRL"
msgstr "SCRL"
#. ID_INDICATOR_OVR
-#: Merge.rc:4122
+#: Merge.rc:4132
msgid "OVR"
msgstr "OVR"
#. ID_INDICATOR_REC
-#: Merge.rc:4123
+#: Merge.rc:4133
msgid "REC"
msgstr "REC"
#. ID_FILE_NEW
-#: Merge.rc:4129
+#: Merge.rc:4139
msgid ""
"\n"
"New Documents (Ctrl+N)"
@@ -4874,7 +4885,7 @@ msgstr ""
"Nouveaux documents (Ctrl+N)"
#. ID_FILE_OPEN
-#: Merge.rc:4130
+#: Merge.rc:4140
msgid ""
"\n"
"Open (Ctrl+O)"
@@ -4883,7 +4894,7 @@ msgstr ""
"Ouvrir (Ctrl+O)"
#. ID_FILE_SAVE
-#: Merge.rc:4131
+#: Merge.rc:4141
msgid ""
"\n"
"Save (Ctrl+S)"
@@ -4892,27 +4903,27 @@ msgstr ""
"Enregistrer (Ctrl+S)"
#. IDS_UNK_ERROR_READING_PROJECT
-#: Merge.rc:4137
+#: Merge.rc:4147
msgid "Unknown error opening project file."
msgstr "Erreur inconnue lors de l'ouverture du fichier de projet."
#. IDS_UNK_ERROR_SAVING_PROJECT
-#: Merge.rc:4138
+#: Merge.rc:4148
msgid "Unknown error saving project file."
msgstr "Erreur inconnue lors de l'enregistrement du fichier de projet."
#. IDS_PROJFILE_LOAD_SUCCESS
-#: Merge.rc:4143
+#: Merge.rc:4153
msgid "Project file loaded."
msgstr "Fichier de projet chargé."
#. IDS_PROJFILE_SAVE_SUCCESS
-#: Merge.rc:4144
+#: Merge.rc:4154
msgid "Project file saved."
msgstr "Fichier de projet enregistré."
#. ID_EDIT_UNDO
-#: Merge.rc:4150
+#: Merge.rc:4160
msgid ""
"\n"
"Undo (Ctrl+Z)"
@@ -4921,7 +4932,7 @@ msgstr ""
"Annuler (Ctrl+Z)"
#. ID_EDIT_REDO
-#: Merge.rc:4151
+#: Merge.rc:4161
msgid ""
"\n"
"Redo (Ctrl+Y)"
@@ -4930,7 +4941,7 @@ msgstr ""
"Répéter (Ctrl+Y)"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:4158
+#: Merge.rc:4168
msgid ""
"\n"
"FileCompare\n"
@@ -4949,7 +4960,7 @@ msgstr ""
"Comparaison de fichier WinMerge"
#. IDR_DIRDOCTYPE
-#: Merge.rc:4159
+#: Merge.rc:4169
msgid ""
"\n"
"FolderCompare\n"
@@ -4968,317 +4979,317 @@ msgstr ""
"Comparaison de dossier WinMerge"
#. IDS_SPLASH_GPLTEXT
-#: Merge.rc:4165
+#: Merge.rc:4175
msgid "WinMerge comes with ABSOLUTELY NO WARRANTY. It is free software and can be redistributed under the conditions of the GNU General Public License - see the Help menu for details."
msgstr "WinMerge est livré avec ABSOLUMENT AUCUNE GARANTIE. Il s'agit d'un logiciel libre et peut être redistribué selon les conditions de la licence publique générale GNU - voir le menu Aide pour plus de détails."
#. IDS_MESSAGEBOX_ABORT
-#: Merge.rc:4173
+#: Merge.rc:4183
msgid "&Abort"
msgstr "&Abandonner"
#. IDS_MESSAGEBOX_RETRY
-#: Merge.rc:4174
+#: Merge.rc:4184
msgid "&Retry"
msgstr "&Réessayer"
#. IDS_MESSAGEBOX_IGNORE
-#: Merge.rc:4175
+#: Merge.rc:4185
msgid "&Ignore"
msgstr "&Ignorer"
#. IDS_MESSAGEBOX_IGNOREALL
-#: Merge.rc:4176
+#: Merge.rc:4186
msgid "Ignore &all"
msgstr "Ignorer &tout"
#. IDS_MESSAGEBOX_YES
-#: Merge.rc:4177
+#: Merge.rc:4187
msgid "&Yes"
msgstr "&Oui"
#. IDS_MESSAGEBOX_YES_TO_ALL
-#: Merge.rc:4183
+#: Merge.rc:4193
msgid "Yes to &all"
msgstr "Oui à &tout"
#. IDS_MESSAGEBOX_NO
-#: Merge.rc:4184
+#: Merge.rc:4194
msgid "&No"
msgstr "&Non"
#. IDS_MESSAGEBOX_NO_TO_ALL
-#: Merge.rc:4185
+#: Merge.rc:4195
msgid "No to a&ll"
msgstr "Non à t&out"
#. IDS_MESSAGEBOX_CONTINUE
-#: Merge.rc:4186
+#: Merge.rc:4196
msgid "&Continue"
msgstr "&Continuer"
#. IDS_MESSAGEBOX_SKIP
-#: Merge.rc:4187
+#: Merge.rc:4197
msgid "&Skip"
msgstr "&Ignorer"
#. IDS_MESSAGEBOX_SKIPALL
-#: Merge.rc:4188
+#: Merge.rc:4198
msgid "Skip &all"
msgstr "Ignorer &tout"
#. IDS_MESSAGEBOX_DONT_DISPLAY_AGAIN
-#: Merge.rc:4190
+#: Merge.rc:4200
msgid "Don't display this &message again."
msgstr "Ne plus afficher ce &message."
-#: Merge.rc:4193
+#: Merge.rc:4203
msgid "To make this message box visible, press Reset on the Message Boxes page in Options."
msgstr "Pour rendre cette boîte de message visible, appuyez sur \"Réinitialiser\" sur la page Boîtes de message sous Préférences."
#. IDS_OPTIONSPG_EDITOR_COMPAREMERGE
-#: Merge.rc:4203
+#: Merge.rc:4213
msgid "Compare/Merge"
msgstr "Comparer/Fusionner"
#. IDS_OPTIONSPG_SYNTAXCOLORS
-#: Merge.rc:4204 Merge.rc:4208
+#: Merge.rc:4214 Merge.rc:4218
msgid "Syntax"
msgstr "Syntaxe"
#. IDS_OPTIONSPG_COLOR_SCHEMES
-#: Merge.rc:4206
+#: Merge.rc:4216
msgid "Color Schemes"
msgstr "Schémas de couleurs"
#. IDS_OPTIONSPG_DIRCOLORS
-#: Merge.rc:4210
+#: Merge.rc:4220
msgid "Folder Compare"
msgstr "Compar. de dossiers"
#. IDS_OPTIONSPG_PROJECT
-#: Merge.rc:4215
+#: Merge.rc:4225
msgid "Project"
msgstr "Projet"
#. IDS_COLHDR_NSDIFFS
-#: Merge.rc:4218 Merge.rc:4640
+#: Merge.rc:4228 Merge.rc:4650
msgid "Differences"
msgstr "Différences"
#. IDS_OPTIONSPG_MESSAGEBOXES
-#: Merge.rc:4220
+#: Merge.rc:4230
msgid "Message Boxes"
msgstr "Boîtes de message"
#. IDS_TO
-#: Merge.rc:4235
+#: Merge.rc:4245
msgid "To:"
msgstr "Vers :"
#. IDS_FROM_LEFT
-#: Merge.rc:4236
+#: Merge.rc:4246
msgid "From left:"
msgstr "De Gauche :"
#. IDS_TO_LEFT
-#: Merge.rc:4237
+#: Merge.rc:4247
msgid "To left:"
msgstr "Vers Gauche :"
#. IDS_FROM_RIGHT
-#: Merge.rc:4238
+#: Merge.rc:4248
msgid "From right:"
msgstr "De Droite :"
#. IDS_TO_RIGHT
-#: Merge.rc:4239
+#: Merge.rc:4249
msgid "To right:"
msgstr "Vers Droite :"
#. IDS_FROM_MIDDLE
-#: Merge.rc:4240
+#: Merge.rc:4250
msgid "From middle:"
msgstr "De Milieu :"
#. IDS_TO_MIDDLE
-#: Merge.rc:4241
+#: Merge.rc:4251
msgid "To middle:"
msgstr "Vers Milieu :"
#. IDS_VERSION_FMT
-#: Merge.rc:4247
+#: Merge.rc:4257
#, c-format
msgid "Version %1"
msgstr "Version %1"
#. IDS_OPTIONS_TITLE
-#: Merge.rc:4253
+#: Merge.rc:4263
#, c-format
msgid "Options (%1)"
msgstr "Préférences (%1)"
#. IDS_MESSAGE_BOX_ARE_RESET
-#: Merge.rc:4254
+#: Merge.rc:4264
msgid "All message boxes are now displayed again."
msgstr "Toutes les boîtes de message seront réaffichées."
-#: Merge.rc:4256
+#: Merge.rc:4266
#, c-format
msgid "Tab size value is out of range. Please use 1 - %1."
msgstr "La valeur de la taille des tabulations est hors limites. Veuillez utiliser 1 - %1."
#. IDS_PROJECT_OPEN
-#: Merge.rc:4262 Merge.rc:4318
+#: Merge.rc:4272 Merge.rc:4328
msgid "Open"
msgstr "Ouvrir"
#. IDS_PROGRAMFILES
-#: Merge.rc:4263
+#: Merge.rc:4273
msgid "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||"
msgstr "Programmes|*.exe;*.bat;*.cmd|Tous les fichiers (*.*)|*.*||"
#. IDS_ALLFILES
-#: Merge.rc:4264
+#: Merge.rc:4274
msgid "All Files (*.*)|*.*||"
msgstr "Tous les fichiers (*.*)|*.*||"
#. IDS_PROJECTFILES
-#: Merge.rc:4265
+#: Merge.rc:4275
msgid "WinMerge Project Files (*.WinMerge)|*.WinMerge||"
msgstr "Fichiers de projet WinMerge (*.WinMerge)|*.WinMerge||"
#. IDS_INIFILES
-#: Merge.rc:4267
+#: Merge.rc:4277
msgid "Options files (*.ini)|*.ini|All Files (*.*)|*.*||"
msgstr "Fichiers de préférences (*.ini)|*.ini|Tous les fichiers (*.*)|*.*||"
#. IDS_REPLACELIST_FILES
-#: Merge.rc:4268
+#: Merge.rc:4278
msgid "Tab-Separated Values (*.tsv;*.txt)|*.tsv;*.txt|All Files (*.*)|*.*||"
msgstr "Valeurs séparées par des tabulations (*.tsv;*.txt)|*.tsv;*.txt|Tous les fichiers (*.*)|*.*||"
#. IDS_TEXT_REPORT_FILES
-#: Merge.rc:4274
+#: Merge.rc:4284
msgid "Text Files (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|All Files (*.*)|*.*||"
msgstr "Fichiers texte (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|Tous les fichiers (*.*)|*.*||"
#. IDS_HTML_REPORT_FILES
-#: Merge.rc:4275
+#: Merge.rc:4285
msgid "HTML Files (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||"
msgstr "Fichiers HTML (*.htm,*.html)|*.htm;*.html|Tous les fichiers(*.*)|*.*||"
#. IDS_XML_REPORT_FILES
-#: Merge.rc:4276
+#: Merge.rc:4286
msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||"
msgstr "Fichiers XML (*.xml)|*.xml|Tous les fichiers (*.*)|*.*||"
#. IDS_EXPANDSUBDIRS_DONOTEXPAND
-#: Merge.rc:4294
+#: Merge.rc:4304
msgid "Do not expand"
msgstr "Ne pas développer"
#. IDS_EXPANDSUBDIRS_ALL
-#: Merge.rc:4295
+#: Merge.rc:4305
msgid "Expand all subfolders"
msgstr "Développer tous les sous-dossiers"
#. IDS_EXPANDSUBDIRS_DIFFERENT
-#: Merge.rc:4296
+#: Merge.rc:4306
msgid "Expand different subfolders"
msgstr "Développer les sous-dossiers différents"
#. IDS_EXPANDSUBDIRS_IDENTICAL
-#: Merge.rc:4297
+#: Merge.rc:4307
msgid "Expand identical subfolders"
msgstr "Développer les sous-dossiers identiques"
#. IDS_SYNTAXTABLE_FILETYPE
-#: Merge.rc:4303
+#: Merge.rc:4313
msgid "File Type"
msgstr "Type de fichier"
#. IDS_COLHDR_EXTENSION
-#: Merge.rc:4304 Merge.rc:4597
+#: Merge.rc:4314 Merge.rc:4607
msgid "Extension"
msgstr "Extension"
#. IDS_PRPCAT_MESSAGE
-#: Merge.rc:4310 Merge.rc:4669
+#: Merge.rc:4320 Merge.rc:4679
msgid "Message"
msgstr "Message"
#. IDS_MESSAGEBOX_ANSWER
-#: Merge.rc:4311
+#: Merge.rc:4321
msgid "Answer"
msgstr "Réponse"
#. IDS_PROJECT_ITEM
-#: Merge.rc:4317
+#: Merge.rc:4327
msgid "Item"
msgstr "Élément"
#. IDS_PROJECT_LOAD
-#: Merge.rc:4319
+#: Merge.rc:4329
msgid "Load"
msgstr "Charger"
#. IDS_PROJECT_SAVE
-#: Merge.rc:4320
+#: Merge.rc:4330
msgid "Save"
msgstr "Enregistrer"
#. IDS_PROJECT_ITEM_INCLUDE_SUBFOLDERS
-#: Merge.rc:4322
+#: Merge.rc:4332
msgid "Include Subfolders"
msgstr "Inclure les sous-dossiers"
#. IDS_PROJECT_ITEM_COMPARE_OPTIONS
-#: Merge.rc:4324
+#: Merge.rc:4334
msgid "Compare Options"
msgstr "Préférences de comparaison"
#. IDS_PROJECT_ITEM_HIDDEN_ITEMS
-#: Merge.rc:4325
+#: Merge.rc:4335
msgid "Hidden Items"
msgstr "Éléments cachés"
#. IDS_PLUGINSLIST_NAME
-#: Merge.rc:4331 Merge.rc:4956
+#: Merge.rc:4341 Merge.rc:4966
msgid "Name"
msgstr "Nom"
#. IDS_FILTERFILE_PATHTITLE
-#: Merge.rc:4332
+#: Merge.rc:4342
msgid "Location"
msgstr "Emplacement"
#. IDS_FILTER_TITLE
-#: Merge.rc:4333
+#: Merge.rc:4343
msgid "Filters"
msgstr "Filtres"
#. IDS_FILTER_PREFIX
-#: Merge.rc:4334
+#: Merge.rc:4344
msgid "[F] "
msgstr "[F] "
#. IDS_PLUGINSLIST_DESC
-#: Merge.rc:4335 Merge.rc:4958
+#: Merge.rc:4345 Merge.rc:4968
msgid "Description"
msgstr "Description"
#. IDS_FILEFILTER_SAVENEW
-#: Merge.rc:4336
+#: Merge.rc:4346
msgid "Select Filename for New Filter"
msgstr "Sélectionnez un nom de fichier pour le nouveau filtre"
#. IDS_FILEFILTER_FILEMASK
-#: Merge.rc:4337
+#: Merge.rc:4347
msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||"
msgstr "Filtres de fichier (*.flt)|*.flt|Tous les fichiers (*.*)|*.*||"
-#: Merge.rc:4339
+#: Merge.rc:4349
#, c-format
msgid ""
"Cannot find filter template!\n"
@@ -5291,7 +5302,7 @@ msgstr ""
"Copier %1 dans le dossier WinMerge/Filters :\n"
"%2."
-#: Merge.rc:4341
+#: Merge.rc:4351
#, c-format
msgid ""
"Cannot copy filter template:\n"
@@ -5304,7 +5315,7 @@ msgstr ""
"\n"
"Assurez-vous que le dossier existe et qu'il est accessible en écriture."
-#: Merge.rc:4343
+#: Merge.rc:4353
msgid ""
"User's filter folder is not defined!\n"
"\n"
@@ -5314,7 +5325,7 @@ msgstr ""
"\n"
"Sélectionnez le dossier de filtre sous Préférences/Système."
-#: Merge.rc:4345
+#: Merge.rc:4355
#, c-format
msgid ""
"Failed to delete filter:\n"
@@ -5328,11 +5339,11 @@ msgstr ""
"Le fichier est peut-être en lecture seule."
#. IDS_FILEFILTER_INSTALL
-#: Merge.rc:4346
+#: Merge.rc:4356
msgid "Locate Filter File to Install"
msgstr "Localiser le fichier de filtre à installer"
-#: Merge.rc:4348
+#: Merge.rc:4358
msgid ""
"Installing filter file failed.\n"
"\n"
@@ -5343,17 +5354,17 @@ msgstr ""
"Impossible de copier le nouveau filtre dans le dossier."
#. IDS_FILEFILTER_OVERWRITE
-#: Merge.rc:4349
+#: Merge.rc:4359
msgid "Filter file exists. Overwrite?"
msgstr "Le fichier de filtre existe. Écraser?"
#. IDS_FILTERLINE_REGEXP
-#: Merge.rc:4355
+#: Merge.rc:4365
msgid "Regular expression"
msgstr "Expression régulière"
#. IDS_FILTERCHANGED
-#: Merge.rc:4361
+#: Merge.rc:4371
msgid ""
"Filters updated. Refresh all open folder compares?\n"
"\n"
@@ -5364,217 +5375,217 @@ msgstr ""
"Sélectionnez \"Non\" pour actualiser ultérieurement."
#. IDS_DIRECTORY_WINDOW_TITLE
-#: Merge.rc:4367
+#: Merge.rc:4377
msgid "Folder Comparison Results"
msgstr "Résultats de la comparaison des dossiers"
#. IDS_FILE_COMPARISON_TITLE
-#: Merge.rc:4368
+#: Merge.rc:4378
msgid "File Comparison"
msgstr "Comparaison de fichiers"
#. IDS_EMPTY_LEFT_FILE
-#: Merge.rc:4369
+#: Merge.rc:4379
msgid "Untitled Left"
msgstr "Sans titre à Gauche"
#. IDS_EMPTY_MIDDLE_FILE
-#: Merge.rc:4370
+#: Merge.rc:4380
msgid "Untitled Middle"
msgstr "Sans titre au Milieu"
#. IDS_EMPTY_RIGHT_FILE
-#: Merge.rc:4371
+#: Merge.rc:4381
msgid "Untitled Right"
msgstr "Sans titre à Droite"
#. IDS_CONFLICT_BASE_FILE
-#: Merge.rc:4372
+#: Merge.rc:4382
msgid "Base File"
msgstr "Fichiers de base"
#. IDS_CONFLICT_THEIRS_FILE
-#: Merge.rc:4373
+#: Merge.rc:4383
msgid "Theirs File"
msgstr "Leurs fichiers"
#. IDS_CONFLICT_MINE_FILE
-#: Merge.rc:4374
+#: Merge.rc:4384
msgid "Mine File"
msgstr "Mes fichiers"
#. IDS_SELFCOMPARE_ORIGINAL_FILE
-#: Merge.rc:4375
+#: Merge.rc:4385
msgid "Original File"
msgstr "Fichier original"
#. IDS_LINE_STATUS_INFO_EOL
-#: Merge.rc:4381
+#: Merge.rc:4391
#, c-format
msgid "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s"
msgstr "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s"
#. IDS_EMPTY_LINE_STATUS_INFO
-#: Merge.rc:4382
+#: Merge.rc:4392
#, c-format
msgid "Line: %s"
msgstr "Ligne: %s"
#. IDS_LINE_STATUS_INFO
-#: Merge.rc:4383
+#: Merge.rc:4393
#, c-format
msgid "Ln: %s Col: %d/%d Ch: %d/%d"
msgstr "Ln: %s Col: %d/%d Ch: %d/%d"
#. IDS_LINE_STATUS_INFO_SEL
-#: Merge.rc:4384
+#: Merge.rc:4394
#, c-format
msgid " Sel: %d | %d"
msgstr " Sél: %d | %d"
#. IDS_MERGEMODE_MERGING
-#: Merge.rc:4385
+#: Merge.rc:4395
msgid "Merge"
msgstr "Fusion"
#. IDS_DIFF_NUMBER_STATUS_FMT
-#: Merge.rc:4386
+#: Merge.rc:4396
#, c-format
msgid "Difference %1 of %2"
msgstr "Différence %1 de %2"
#. IDS_NO_DIFF_SEL_FMT
-#: Merge.rc:4387
+#: Merge.rc:4397
#, c-format
msgid "%1 Differences Found"
msgstr "%1 différences trouvées"
#. IDS_1_DIFF_FOUND
-#: Merge.rc:4388
+#: Merge.rc:4398
msgid "1 Difference Found"
msgstr "1 différence trouvée"
#. IDS_NO_ERR_SEL_FMT
-#: Merge.rc:4389
+#: Merge.rc:4399
#, c-format
msgid "%1 Errors Found"
msgstr "%1 Erreurs trouvées"
#. IDS_1_ERR_FOUND
-#: Merge.rc:4390
+#: Merge.rc:4400
msgid "1 Error Found"
msgstr "1 erreur trouvée"
#. IDS_STATUSBAR_READONLY, Abbreviation from "Read Only"
-#: Merge.rc:4391
+#: Merge.rc:4401
msgid "RO"
msgstr "LS"
#. IDS_DIRVIEW_STATUS_FMT_FOCUS
-#: Merge.rc:4397
+#: Merge.rc:4407
#, c-format
msgid "Item %1 of %2"
msgstr "Élément %1 de %2"
#. IDS_DIRVIEW_STATUS_FMT_NOFOCUS
-#: Merge.rc:4398
+#: Merge.rc:4408
#, c-format
msgid "Items: %1"
msgstr "Éléments : %1"
#. IDS_DIRVIEW_STATUS_COMPARING
-#: Merge.rc:4399
+#: Merge.rc:4409
msgid "Comparing items..."
msgstr "Comparaison des éléments en cours..."
#. IDS_ITEMS_PER_SEC
-#: Merge.rc:4400
+#: Merge.rc:4410
#, c-format
msgid "%.1f[items/sec]"
msgstr "%.1f[éléments/sec]"
#. IDS_ERROR_INCOMPARABLE
-#: Merge.rc:4406
+#: Merge.rc:4416
msgid "Select two existing folders/files to compare."
msgstr "Sélectionnez deux fichiers ou dossiers existants à comparer."
#. IDS_DIRSEL_TAG
-#: Merge.rc:4407
+#: Merge.rc:4417
msgid "Folder Selection"
msgstr "Sélection de dossier"
#. IDS_OPEN_FILESDIRS
-#: Merge.rc:4408
+#: Merge.rc:4418
msgid "Select two (or three) folders/files to compare."
msgstr "Sélectionnez deux (ou trois) dossiers/fichiers à comparer."
#. IDS_OPEN_LEFTINVALID
-#: Merge.rc:4409
+#: Merge.rc:4419
msgid "Left (1st) path is invalid!"
msgstr "Le chemin de Gauche (1er) est invalide !"
#. IDS_OPEN_MIDDLEINVALID
-#: Merge.rc:4410
+#: Merge.rc:4420
msgid "Middle (2nd) path is invalid!"
msgstr "Le chemin du Milieu (2ème) est invalide !"
#. IDS_OPEN_RIGHTINVALID2
-#: Merge.rc:4411
+#: Merge.rc:4421
msgid "Right (2nd) path is invalid!"
msgstr "Le chemin de Droite (2ème) est invalide !"
#. IDS_OPEN_RIGHTINVALID3
-#: Merge.rc:4412
+#: Merge.rc:4422
msgid "Right (3rd) path is invalid!"
msgstr "Le chemin de Droite (3ème) est invalide !"
#. IDS_OPEN_BOTHINVALID
-#: Merge.rc:4413
+#: Merge.rc:4423
msgid "Both paths are invalid!"
msgstr "Les deux chemins sont invalides !"
-#: Merge.rc:4415
+#: Merge.rc:4425
msgid "Left (1st) and Middle (2nd) paths are invalid!"
msgstr "Les chemins de Gauche (1er) et du Milieu (2ème) sont invalides !"
#. IDS_OPEN_LEFTRIGHTINVALID
-#: Merge.rc:4416
+#: Merge.rc:4426
msgid "Left (1st) and Right (3rd) paths are invalid!"
msgstr "Les chemins de Gauche (1er) et de Droite (3ème) sont invalides !"
-#: Merge.rc:4418
+#: Merge.rc:4428
msgid "Middle (2nd) and Right (3rd) paths are invalid!"
msgstr "Les chemins du Milieu (2ème) et de Droite (3ème) sont invalides !"
#. IDS_OPEN_ALLINVALID
-#: Merge.rc:4419
+#: Merge.rc:4429
msgid "All paths are invalid!"
msgstr "Tous les chemins sont invalides !"
#. IDS_OPEN_UNPACKERDISABLED
-#: Merge.rc:4420
+#: Merge.rc:4430
msgid "Only enabled for file comparisons"
msgstr "Activé uniquement pour les comparaisons de fichiers"
#. IDS_OPEN_MISMATCH
-#: Merge.rc:4421
+#: Merge.rc:4431
msgid "Cannot compare file and folder!"
msgstr "Impossible de comparer un fichier avec un dossier !"
#. IDS_ERROR_FILE_NOT_FOUND
-#: Merge.rc:4427
+#: Merge.rc:4437
#, c-format
msgid "File not found: %1"
msgstr "Fichier non trouvé : %1"
#. IDS_ERROR_FILE_NOT_UNPACKED
-#: Merge.rc:4428
+#: Merge.rc:4438
#, c-format
msgid "File not unpacked: %1"
msgstr "Fichier non décompressé : %1"
#. IDS_ERROR_FILEOPEN
-#: Merge.rc:4429
+#: Merge.rc:4439
#, c-format
msgid ""
"Cannot open file\n"
@@ -5588,12 +5599,12 @@ msgstr ""
"%2"
#. IDS_ERROR_CONF_RESOLVE
-#: Merge.rc:4430
+#: Merge.rc:4440
msgid "Failed to parse conflict file."
msgstr "Échec de l'analyse du fichier en conflit."
#. IDS_NOT_CONFLICT_FILE
-#: Merge.rc:4431
+#: Merge.rc:4441
#, c-format
msgid ""
"The file\n"
@@ -5605,7 +5616,7 @@ msgstr ""
"'est pas un fichier en conflit."
#. IDS_COMPARE_LARGE_FILES
-#: Merge.rc:4432
+#: Merge.rc:4442
msgid ""
"Comparing large files requires significant memory.\n"
"Show only comparison results (not file contents)?"
@@ -5614,28 +5625,28 @@ msgstr ""
"Afficher uniquement les résultats de la comparaison (pas le contenu du fichier) ?"
#. IDS_SAVE_AS_TITLE
-#: Merge.rc:4438
+#: Merge.rc:4448
msgid "Save As"
msgstr "Enregistrer sous"
#. IDS_SAVE_FMT
-#: Merge.rc:4439
+#: Merge.rc:4449
#, c-format
msgid "Save changes to %1?"
msgstr "Enregistrer les changements de %1 ?"
#. IDS_SAVEREADONLY_FMT
-#: Merge.rc:4440
+#: Merge.rc:4450
#, c-format
msgid "%1 is read-only. Override? Or 'No' to save as new filename?"
msgstr "%1 est en lecture seule. Outrepasser? ou \"Non\" pour enregistrer sous un nouveau nom de fichier ?"
#. IDS_ERROR_BACKUP
-#: Merge.rc:4441
+#: Merge.rc:4451
msgid "Error backing up file"
msgstr "Erreur lors de la sauvegarde du fichier"
-#: Merge.rc:4443
+#: Merge.rc:4453
#, c-format
msgid ""
"Unable to backup original file:\n"
@@ -5649,7 +5660,7 @@ msgstr ""
"Continuer quand même ?"
#. IDS_FILESAVE_FAILED
-#: Merge.rc:4444
+#: Merge.rc:4454
#, c-format
msgid ""
"Saving file failed.\n"
@@ -5664,7 +5675,7 @@ msgstr ""
"\t- Utiliser un autre nom de fichier (OK)\n"
"\t- Abandonner (Annuler) ?)"
-#: Merge.rc:4446
+#: Merge.rc:4456
#, c-format
msgid ""
"Plugin '%2' cannot pack changes to left file into '%1'.\n"
@@ -5675,7 +5686,7 @@ msgstr ""
"\n"
"Original inchangé. Enregistrer la version décompressée ?"
-#: Merge.rc:4448
+#: Merge.rc:4458
#, c-format
msgid ""
"Plugin '%2' cannot pack changes to middle file into '%1'.\n"
@@ -5686,7 +5697,7 @@ msgstr ""
"\n"
"Original inchangé. Enregistrer la version décompressée ?"
-#: Merge.rc:4450
+#: Merge.rc:4460
#, c-format
msgid ""
"Plugin '%2' cannot pack changes to right file into '%1'.\n"
@@ -5698,7 +5709,7 @@ msgstr ""
"Original inchangé. Enregistrer la version décompressée ?"
#. IDS_FILECHANGED_ONDISK
-#: Merge.rc:4451
+#: Merge.rc:4461
#, c-format
msgid ""
"Another application updated\n"
@@ -5714,7 +5725,7 @@ msgstr ""
"Écraser ?"
#. IDS_SAVEREADONLY_MULTI
-#: Merge.rc:4452
+#: Merge.rc:4462
#, c-format
msgid ""
"%1\n"
@@ -5724,7 +5735,7 @@ msgstr ""
"est en lecture seule. Outrepasser?"
#. IDS_FILECHANGED_RESCAN
-#: Merge.rc:4453
+#: Merge.rc:4463
#, c-format
msgid ""
"Another application updated\n"
@@ -5740,22 +5751,22 @@ msgstr ""
"Recharger ?"
#. IDS_SAVE_LEFT_AS
-#: Merge.rc:4454
+#: Merge.rc:4464
msgid "Save Left File As"
msgstr "Enregistrer le fichier de Gauche sous"
#. IDS_SAVE_MIDDLE_AS
-#: Merge.rc:4455
+#: Merge.rc:4465
msgid "Save Middle File As"
msgstr "Enregistrer fichier du Milieu sous"
#. IDS_SAVE_RIGHT_AS
-#: Merge.rc:4456
+#: Merge.rc:4466
msgid "Save Right File As"
msgstr "Enregistrer le fichier de Droite sous"
#. IDS_FILE_DISAPPEARED
-#: Merge.rc:4461
+#: Merge.rc:4471
#, c-format
msgid ""
"File\n"
@@ -5767,7 +5778,7 @@ msgstr ""
"on trouvé. Sauvegardez une copie pour continuer."
#. IDS_VIEWS_OUTOFSYNC
-#: Merge.rc:4467
+#: Merge.rc:4477
msgid ""
"Cannot merge unsynched documents.\n"
"\n"
@@ -5778,124 +5789,124 @@ msgstr ""
"Actualisez avant de continuer."
#. IDS_BREAK_ON_WHITESPACE
-#: Merge.rc:4472
+#: Merge.rc:4482
msgid "Break at whitespace"
msgstr "Coupure à l'espacement"
#. IDS_BREAK_ON_PUNCTUATION
-#: Merge.rc:4473
+#: Merge.rc:4483
msgid "Break at whitespace or punctuation"
msgstr "Coupure à l'espacement ou la ponctuation"
#. IDS_L2M
-#: Merge.rc:4479
+#: Merge.rc:4489
msgid "Copy to &Middle\tAlt+Right"
msgstr "Copier vers le &Milieu\tAlt+Droite"
#. IDS_R2M
-#: Merge.rc:4480
+#: Merge.rc:4490
msgid "Copy to &Middle\tAlt+Left"
msgstr "Copier vers le &Milieu\tAlt+Gauche"
#. IDS_COPY_FROM_MIDDLE_R
-#: Merge.rc:4481
+#: Merge.rc:4491
msgid "Copy from Middle\tAlt+Shift+Right"
msgstr "Copier depuis le &Milieu\tAlt+Maj+Droite"
#. IDS_COPY_FROM_MIDDLE_L
-#: Merge.rc:4482
+#: Merge.rc:4492
msgid "Copy from Middle\tAlt+Shift+Left"
msgstr "Copier depuis le Milieu\tAlt+Maj+Gauche"
#. IDS_L2MNEXT
-#: Merge.rc:4483
+#: Merge.rc:4493
msgid "Copy to Middle and Advance\tCtrl+Alt+Right"
msgstr "Copier vers le Milieu et Avancer\tCtrl+Alt+Droite"
#. IDS_R2MNEXT
-#: Merge.rc:4484
+#: Merge.rc:4494
msgid "Copy to Middle and Advance\tCtrl+Alt+Left"
msgstr "Copier vers le Milieu et Avancer\tCtrl+Alt+Gauche"
#. IDS_ALL_MIDDLE
-#: Merge.rc:4485
+#: Merge.rc:4495
msgid "Copy All to Middle"
msgstr "Tout copier vers le Milieu"
#. IDS_COPY_RIGHT_TO_LEFT
-#: Merge.rc:4491
+#: Merge.rc:4501
#, c-format
msgid "Right to Left (%1)"
msgstr "De Droite vers Gauche (%1)"
#. IDS_COPY_RIGHT_TO_MIDDLE
-#: Merge.rc:4492
+#: Merge.rc:4502
#, c-format
msgid "Right to Middle (%1)"
msgstr "De Droite vers Milieu (%1)"
#. IDS_COPY_MIDDLE_TO_LEFT
-#: Merge.rc:4493
+#: Merge.rc:4503
#, c-format
msgid "Middle to Left (%1)"
msgstr "De Milieu vers Gauche (%1)"
#. IDS_COPY_MIDDLE_TO_RIGHT
-#: Merge.rc:4494
+#: Merge.rc:4504
#, c-format
msgid "Middle to Right (%1)"
msgstr "De Milieu vers Droite (%1)"
#. IDS_COPY_LEFT_TO_RIGHT
-#: Merge.rc:4495
+#: Merge.rc:4505
#, c-format
msgid "Left to Right (%1)"
msgstr "De Gauche vers Droite (%1)"
#. IDS_COPY_LEFT_TO_MIDDLE
-#: Merge.rc:4496
+#: Merge.rc:4506
#, c-format
msgid "Left to Middle (%1)"
msgstr "De Gauche vers Milieu (%1)"
#. IDS_MOVE_LEFT_TO
-#: Merge.rc:4507 Merge.rc:4539
+#: Merge.rc:4517 Merge.rc:4549
#, c-format
msgid "Left to... (%1)"
msgstr "De Gauche vers... (%1)"
#. IDS_MOVE_MIDDLE_TO
-#: Merge.rc:4508 Merge.rc:4540
+#: Merge.rc:4518 Merge.rc:4550
#, c-format
msgid "Middle to... (%1)"
msgstr "De Milieu vers... (%1)"
#. IDS_MOVE_RIGHT_TO
-#: Merge.rc:4509 Merge.rc:4541
+#: Merge.rc:4519 Merge.rc:4551
#, c-format
msgid "Right to... (%1)"
msgstr "De Droite vers... (%1)"
#. IDS_COPY_BOTH_TO
-#: Merge.rc:4510
+#: Merge.rc:4520
#, c-format
msgid "Both to... (%1)"
msgstr "Les deux vers… (%1)"
#. IDS_COPY_ALL_TO
-#: Merge.rc:4511
+#: Merge.rc:4521
#, c-format
msgid "All to... (%1)"
msgstr "Tout vers... (%1)"
#. IDS_COPY_DIFFERENCES_TO
-#: Merge.rc:4512
+#: Merge.rc:4522
#, c-format
msgid "Differences to... (%1)"
msgstr "Différences vers... (%1)"
#. IDS_COPY_ONLYDIFFITEMS
-#: Merge.rc:4519
+#: Merge.rc:4529
msgid ""
"Some selected items are identical or skipped.\n"
"Copy only items with differences?"
@@ -5904,64 +5915,64 @@ msgstr ""
"Copier uniquement les éléments présentant des différences ?"
#. IDS_DEL_LEFT_FMT
-#: Merge.rc:4525
+#: Merge.rc:4535
#, c-format
msgid "Left (%1)"
msgstr "Gauche (%1)"
#. IDS_DEL_MIDDLE_FMT
-#: Merge.rc:4526
+#: Merge.rc:4536
#, c-format
msgid "Middle (%1)"
msgstr "Milieu (%1)"
#. IDS_DEL_RIGHT_FMT
-#: Merge.rc:4527
+#: Merge.rc:4537
#, c-format
msgid "Right (%1)"
msgstr "Droite (%1)"
#. IDS_DEL_BOTH_FMT
-#: Merge.rc:4528
+#: Merge.rc:4538
#, c-format
msgid "Both (%1)"
msgstr "Les deux (%1)"
#. IDS_DEL_ALL_FMT
-#: Merge.rc:4529
+#: Merge.rc:4539
#, c-format
msgid "All (%1)"
msgstr "Tout (%1)"
#. IDS_SELECT_DEST_LEFT
-#: Merge.rc:4545
+#: Merge.rc:4555
msgid "Left Side - Select Destination Folder:"
msgstr "Panneau Gauche - choisir le dossier de destination :"
#. IDS_SELECT_DEST_MIDDLE
-#: Merge.rc:4546
+#: Merge.rc:4556
msgid "Middle Side - Select Destination Folder:"
msgstr "Panneau Milieu - choisir le dossier de destination :"
#. IDS_SELECT_DEST_RIGHT
-#: Merge.rc:4547
+#: Merge.rc:4557
msgid "Right Side - Select Destination Folder:"
msgstr "Panneau Droite - choisir le dossier de destination :"
#. IDS_FILES_AFFECTED_FMT
-#: Merge.rc:4548
+#: Merge.rc:4558
#, c-format
msgid "(%1 Files Affected)"
msgstr "(%1 fichiers concernés)"
#. IDS_FILES_AFFECTED_FMT2
-#: Merge.rc:4549
+#: Merge.rc:4559
#, c-format
msgid "(%1 of %2 Files Affected)"
msgstr "(%1 de %2 fichiers concernés)"
#. IDS_CONFIRM_DELETE_SINGLE
-#: Merge.rc:4555
+#: Merge.rc:4565
#, c-format
msgid ""
"Are you sure you want to delete\n"
@@ -5973,18 +5984,18 @@ msgstr ""
"%1 ?"
#. IDS_CONFIRM_SINGLE_COPY
-#: Merge.rc:4556
+#: Merge.rc:4566
msgid "Are you sure you want to copy?"
msgstr "Êtes-vous sûr de vouloir copier ?"
#. IDS_CONFIRM_MULTIPLE_COPY
-#: Merge.rc:4557
+#: Merge.rc:4567
#, c-format
msgid "Are you sure you want to copy %d items?"
msgstr "Êtes-vous sûr de vouloir copier %d éléments ?"
#. IDS_DIRCMP_NOTSYNC
-#: Merge.rc:4558
+#: Merge.rc:4568
#, c-format
msgid ""
"Operation aborted!\n"
@@ -6004,46 +6015,46 @@ msgstr ""
"Actualisez la comparaison."
#. IDS_CONFIRM_SINGLE_MOVE
-#: Merge.rc:4563
+#: Merge.rc:4573
msgid "Are you sure you want to move?"
msgstr "Êtes-vous sûr de vouloir déplacer ?"
#. IDS_CONFIRM_MULTIPLE_MOVE
-#: Merge.rc:4564
+#: Merge.rc:4574
#, c-format
msgid "Are you sure you want to move %d items?"
msgstr "Êtes-vous sûr de vouloir déplacer %d éléments ?"
#. IDS_CONFIRM_MOVE_CAPTION
-#: Merge.rc:4566
+#: Merge.rc:4576
msgid "Confirm Move"
msgstr "Confirmer le déplacement"
-#: Merge.rc:4568
+#: Merge.rc:4578
msgid "Close the folder comparison window?"
msgstr "Fermer la fenêtre de comparaison des dossiers ?"
-#: Merge.rc:4570
+#: Merge.rc:4580
msgid "Close the folder comparison window, which took a long time?"
msgstr "Fermer la fenêtre de comparaison de dossiers, qui a pris beaucoup de temps ?"
#. IDS_ERROR_INVALID_DIR_FILE_NAME
-#: Merge.rc:4571
+#: Merge.rc:4581
msgid "The file or folder name is invalid."
msgstr "Le nom du fichier ou dossier est invalide."
#. IDS_ERROR_EXECUTE_FILE
-#: Merge.rc:4577
+#: Merge.rc:4587
#, c-format
msgid "Failed to execute external editor: %1"
msgstr "Échec de l'exécution de l'éditeur externe : %1"
#. IDS_UNKNOWN_ARCHIVE_FORMAT
-#: Merge.rc:4583
+#: Merge.rc:4593
msgid "Unknown archive format"
msgstr "Format d'archives inconnu"
-#: Merge.rc:4585
+#: Merge.rc:4595
msgid ""
"Failed to extract archive.\n"
"Compare as text file?"
@@ -6052,518 +6063,518 @@ msgstr ""
"Comparer en tant que fichier texte ?"
#. IDS_COLHDR_FILENAME
-#: Merge.rc:4591
+#: Merge.rc:4601
msgid "Filename"
msgstr "Nom du fichier"
#. IDS_COLHDR_DIR
-#: Merge.rc:4592
+#: Merge.rc:4602
msgctxt "DirView|ColumnHeader"
msgid "Folder"
msgstr "Dossier"
#. IDS_COLHDR_RESULT
-#: Merge.rc:4593
+#: Merge.rc:4603
msgid "Comparison Result"
msgstr "Résultat de la comparaison"
#. IDS_COLHDR_LTIMEM
-#: Merge.rc:4594
+#: Merge.rc:4604
msgid "Left Date"
msgstr "Date Gauche"
#. IDS_COLHDR_RTIMEM
-#: Merge.rc:4595
+#: Merge.rc:4605
msgid "Right Date"
msgstr "Date Droite"
#. IDS_COLHDR_MTIMEM
-#: Merge.rc:4596
+#: Merge.rc:4606
msgid "Middle Date"
msgstr "Date Milieu"
#. IDS_COLHDR_LSIZE
-#: Merge.rc:4598
+#: Merge.rc:4608
msgid "Left Size"
msgstr "Taille Gauche"
#. IDS_COLHDR_RSIZE
-#: Merge.rc:4599
+#: Merge.rc:4609
msgid "Right Size"
msgstr "Taille Droite"
#. IDS_COLHDR_MSIZE
-#: Merge.rc:4604
+#: Merge.rc:4614
msgid "Middle Size"
msgstr "Taille Milieu"
#. IDS_COLHDR_RSIZE_SHORT
-#: Merge.rc:4605
+#: Merge.rc:4615
msgid "Right Size (Short)"
msgstr "Taille Droite (abrégée)"
#. IDS_COLHDR_LSIZE_SHORT
-#: Merge.rc:4606
+#: Merge.rc:4616
msgid "Left Size (Short)"
msgstr "Taille Gauche (abrégée)"
#. IDS_COLHDR_MSIZE_SHORT
-#: Merge.rc:4607
+#: Merge.rc:4617
msgid "Middle Size (Short)"
msgstr "Taille Milieu (abrégée)"
#. IDS_COLHDR_LTIMEC
-#: Merge.rc:4613
+#: Merge.rc:4623
msgid "Left Creation Time"
msgstr "Heure créa. Gauche"
#. IDS_COLHDR_RTIMEC
-#: Merge.rc:4614
+#: Merge.rc:4624
msgid "Right Creation Time"
msgstr "Heure créa. Droite"
#. IDS_COLHDR_MTIMEC
-#: Merge.rc:4615
+#: Merge.rc:4625
msgid "Middle Creation Time"
msgstr "Heure créa. Milieu"
#. IDS_COLHDR_NEWER
-#: Merge.rc:4616
+#: Merge.rc:4626
msgid "Newer File"
msgstr "Plus récent"
#. IDS_COLHDR_LVERSION
-#: Merge.rc:4617
+#: Merge.rc:4627
msgid "Left File Version"
msgstr "Version fichier Gauche"
#. IDS_COLHDR_RVERSION
-#: Merge.rc:4618
+#: Merge.rc:4628
msgid "Right File Version"
msgstr "Version fichier Droite"
#. IDS_COLHDR_MVERSION
-#: Merge.rc:4619
+#: Merge.rc:4629
msgid "Middle File Version"
msgstr "Version fichier Milieu"
#. IDS_COLHDR_RESULT_ABBR
-#: Merge.rc:4620
+#: Merge.rc:4630
msgid "Short Result"
msgstr "Résultat court"
#. IDS_COLHDR_LATTRIBUTES
-#: Merge.rc:4621
+#: Merge.rc:4631
msgid "Left Attributes"
msgstr "Attributs Gauche"
#. IDS_COLHDR_RATTRIBUTES
-#: Merge.rc:4622
+#: Merge.rc:4632
msgid "Right Attributes"
msgstr "Attributs Droite"
#. IDS_COLHDR_MATTRIBUTES
-#: Merge.rc:4623
+#: Merge.rc:4633
msgid "Middle Attributes"
msgstr "Attributs Milieu"
#. IDS_COLHDR_LEOL_TYPE
-#: Merge.rc:4628
+#: Merge.rc:4638
msgid "Left EOL"
msgstr "EOL Gauche"
#. IDS_COLHDR_MEOL_TYPE
-#: Merge.rc:4629
+#: Merge.rc:4639
msgid "Middle EOL"
msgstr "EOL Milieu"
#. IDS_COLHDR_REOL_TYPE
-#: Merge.rc:4630
+#: Merge.rc:4640
msgid "Right EOL"
msgstr "EOL Droite"
#. IDS_COLHDR_LENCODING
-#: Merge.rc:4636
+#: Merge.rc:4646
msgid "Left Encoding"
msgstr "Encodage Gauche"
#. IDS_COLHDR_RENCODING
-#: Merge.rc:4637
+#: Merge.rc:4647
msgid "Right Encoding"
msgstr "Encodage Droite"
#. IDS_COLHDR_MENCODING
-#: Merge.rc:4638
+#: Merge.rc:4648
msgid "Middle Encoding"
msgstr "Encodage Milieu"
#. IDS_COLHDR_NIDIFFS
-#: Merge.rc:4639
+#: Merge.rc:4649
msgid "Ignored Diff"
msgstr "Différences ignorées"
#. IDS_COLHDR_BINARY
-#: Merge.rc:4641
+#: Merge.rc:4651
msgctxt "DirView|ColumnHeader"
msgid "Binary"
msgstr "Binaire"
#. IDS_PLUGINS_TYPE_UNPACKER
-#: Merge.rc:4642 Merge.rc:4959
+#: Merge.rc:4652 Merge.rc:4969
msgid "Unpacker"
msgstr "Décompresseur"
#. IDS_PLUGIN_TYPE4
-#: Merge.rc:4643 Merge.rc:4960 Merge.rc:5267
+#: Merge.rc:4653 Merge.rc:4970 Merge.rc:5277
msgid "Prediffer"
msgstr "Précomparaison"
#. IDS_COLHDR_LEFT
-#: Merge.rc:4644
+#: Merge.rc:4654
msgid "Left"
msgstr "Gauche"
#. IDS_COLHDR_MIDDLE
-#: Merge.rc:4645
+#: Merge.rc:4655
msgid "Middle"
msgstr "Milieu"
#. IDS_COLHDR_RIGHT
-#: Merge.rc:4646
+#: Merge.rc:4656
msgid "Right"
msgstr "Droite"
#. IDS_COLHDR_DIFF
-#: Merge.rc:4647
+#: Merge.rc:4657
msgid "Diff"
msgstr "Différence"
#. IDS_COLHDR_LEFT_DUPLICATE
-#: Merge.rc:4648
+#: Merge.rc:4658
msgid "Left Duplicate Count"
msgstr "Nombre de doublons à Gauche"
#. IDS_COLHDR_RIGHT_DUPLICATE
-#: Merge.rc:4649
+#: Merge.rc:4659
msgid "Right Duplicate Count"
msgstr "Nombre de doublons à Droite"
#. IDS_COLHDR_MIDDLE_DUPLICATE
-#: Merge.rc:4650
+#: Merge.rc:4660
msgid "Middle Duplicate Count"
msgstr "Nombre de doublons au Milieu"
#. IDS_COLHDR_MOVE
-#: Merge.rc:4651
+#: Merge.rc:4661
msgid "Move"
msgstr "Déplacer"
#. IDS_PRPCAT_AUDIO
-#: Merge.rc:4658
+#: Merge.rc:4668
msgid "Audio"
msgstr "Audio"
#. IDS_PRPCAT_CALENDAR
-#: Merge.rc:4659
+#: Merge.rc:4669
msgid "Calendar"
msgstr "Calendrier"
#. IDS_PRPCAT_COMMUNICATION
-#: Merge.rc:4660
+#: Merge.rc:4670
msgid "Communication"
msgstr "Communication"
#. IDS_PRPCAT_CONTACT
-#: Merge.rc:4661
+#: Merge.rc:4671
msgid "Contact"
msgstr "Contact"
#. IDS_PRPCAT_DEVICES
-#: Merge.rc:4662
+#: Merge.rc:4672
msgid "Devices"
msgstr "Appareils"
#. IDS_PRPCAT_DOCUMENT
-#: Merge.rc:4663
+#: Merge.rc:4673
msgid "Document"
msgstr "Document"
#. IDS_PRPCAT_HOME
-#: Merge.rc:4664
+#: Merge.rc:4674
msgid "Home"
msgstr "Accueil"
#. IDS_PRPCAT_JOURNAL
-#: Merge.rc:4666
+#: Merge.rc:4676
msgid "Journal"
msgstr "Journal"
#. IDS_PRPCAT_LINK
-#: Merge.rc:4667
+#: Merge.rc:4677
msgid "Link"
msgstr "Lien"
#. IDS_PRPCAT_MEDIA
-#: Merge.rc:4668
+#: Merge.rc:4678
msgid "Media"
msgstr "Média"
#. IDS_PRPCAT_MUSIC
-#: Merge.rc:4670
+#: Merge.rc:4680
msgid "Music"
msgstr "Musique"
#. IDS_PRPCAT_NOTE
-#: Merge.rc:4671
+#: Merge.rc:4681
msgid "Note"
msgstr "Note"
#. IDS_PRPCAT_PHOTO
-#: Merge.rc:4672
+#: Merge.rc:4682
msgid "Photo"
msgstr "Photo"
#. IDS_PRPCAT_RECORDEDTV
-#: Merge.rc:4673
+#: Merge.rc:4683
msgid "RecordedTV"
msgstr "Enregistrement TV"
#. IDS_PRPCAT_SEARCH
-#: Merge.rc:4674
+#: Merge.rc:4684
msgid "Search"
msgstr "Recherche"
#. IDS_PRPCAT_SECURITY
-#: Merge.rc:4675
+#: Merge.rc:4685
msgid "Security"
msgstr "Sécurité"
#. IDS_PRPCAT_SOFTWARE
-#: Merge.rc:4676
+#: Merge.rc:4686
msgid "Software"
msgstr "Logiciel"
#. IDS_PRPCAT_TASK
-#: Merge.rc:4677
+#: Merge.rc:4687
msgid "Task"
msgstr "Tâche"
#. IDS_PRPCAT_VIDEO
-#: Merge.rc:4678
+#: Merge.rc:4688
msgid "Video"
msgstr "Vidéo"
#. IDS_PRPCAT_HASH
-#: Merge.rc:4679
+#: Merge.rc:4689
msgid "Hash"
msgstr "Hachage"
#. IDS_CANT_COMPARE_FILES
-#: Merge.rc:4685
+#: Merge.rc:4695
msgid "Unable to compare files"
msgstr "Impossible de comparer les fichiers"
#. IDS_ABORTED_ITEM
-#: Merge.rc:4686
+#: Merge.rc:4696
msgid "Item aborted"
msgstr "Élément abandonné"
#. IDS_FILE_SKIPPED
-#: Merge.rc:4687
+#: Merge.rc:4697
msgid "File skipped"
msgstr "Fichier ignoré"
#. IDS_DIR_SKIPPED
-#: Merge.rc:4688
+#: Merge.rc:4698
msgid "Folder skipped"
msgstr "Dossier ignoré"
#. IDS_LEFT_ONLY_IN_FMT
-#: Merge.rc:4689
+#: Merge.rc:4699
#, c-format
msgid "Left only: %1"
msgstr "Gauche uniquement : %1"
#. IDS_MIDDLE_ONLY_IN_FMT
-#: Merge.rc:4690
+#: Merge.rc:4700
#, c-format
msgid "Middle only: %1"
msgstr "Milieu uniquement : %1"
#. IDS_RIGHT_ONLY_IN_FMT
-#: Merge.rc:4691
+#: Merge.rc:4701
#, c-format
msgid "Right only: %1"
msgstr "Droite uniquement : %1"
#. IDS_DOES_NOT_EXIST_IN_FMT
-#: Merge.rc:4692
+#: Merge.rc:4702
#, c-format
msgid "Does not exist in %1"
msgstr "N'existe pas dans %1"
#. IDS_BIN_FILES_SAME
-#: Merge.rc:4693
+#: Merge.rc:4703
msgid "Binary files are identical"
msgstr "Les fichiers binaires sont identiques"
#. IDS_BIN_FILES_DIFF
-#: Merge.rc:4699
+#: Merge.rc:4709
msgid "Binary files are different"
msgstr "Les fichiers binaires sont différents"
#. IDS_FILES_ARE_DIFFERENT
-#: Merge.rc:4700
+#: Merge.rc:4710
msgid "Files are different"
msgstr "Les fichiers sont différents"
#. IDS_FOLDERS_ARE_DIFFERENT
-#: Merge.rc:4701
+#: Merge.rc:4711
msgid "Folders are different"
msgstr "Les dossiers sont différents"
#. IDS_LEFTONLY
-#: Merge.rc:4702
+#: Merge.rc:4712
msgid "Left Only"
msgstr "À Gauche uniquement"
#. IDS_RIGHTONLY
-#: Merge.rc:4703
+#: Merge.rc:4713
msgid "Right Only"
msgstr "À Droite uniquement"
#. IDS_MIDDLEONLY
-#: Merge.rc:4704
+#: Merge.rc:4714
msgid "Middle Only"
msgstr "Au Milieu uniquement"
#. IDS_NOITEMLEFT
-#: Merge.rc:4705
+#: Merge.rc:4715
msgid "No item in left"
msgstr "Aucun élément à Gauche"
#. IDS_NOITEMRIGHT
-#: Merge.rc:4706
+#: Merge.rc:4716
msgid "No item in right"
msgstr "Aucun élément à Droite"
#. IDS_NOITEMMIDDLE
-#: Merge.rc:4707
+#: Merge.rc:4717
msgid "No item in middle"
msgstr "Aucun élément au Milieu"
#. IDS_CMPRES_ERROR
-#: Merge.rc:4709
+#: Merge.rc:4719
msgid "Error"
msgstr "Erreur"
#. IDS_TEXT_FILES_SAME
-#: Merge.rc:4710
+#: Merge.rc:4720
msgid "Text files are identical"
msgstr "Les fichiers texte sont identiques"
#. IDS_LEFTONLY_DIFF
-#: Merge.rc:4711
+#: Merge.rc:4721
msgid " (Middle and right are identical)"
msgstr " (Milieu et Droite sont identiques)"
#. IDS_MIDDLEONLY_DIFF
-#: Merge.rc:4712
+#: Merge.rc:4722
msgid " (Left and right are identical)"
msgstr " (Gauche et Droite sont identiques)"
#. IDS_RIGHTONLY_DIFF
-#: Merge.rc:4713
+#: Merge.rc:4723
msgid " (Left and middle are identical)"
msgstr " (Gauche et Milieu sont identiques)"
#. IDS_PATH_MISMATCH
-#: Merge.rc:4714
+#: Merge.rc:4724
msgid " (paths differ)"
msgstr " (différences des chemins)"
#. IDS_TEXT_FILES_DIFF
-#: Merge.rc:4715
+#: Merge.rc:4725
msgid "Text files are different"
msgstr "Les fichiers texte sont différents"
#. IDS_IMAGE_FILES_SAME
-#: Merge.rc:4716
+#: Merge.rc:4726
msgid "Image files are identical"
msgstr "Les fichiers image sont identiques"
#. IDS_IMAGE_FILES_DIFF
-#: Merge.rc:4717
+#: Merge.rc:4727
msgid "Image files are different"
msgstr "Les fichiers image sont différents"
#. IDS_EXPR_DIFF
-#: Merge.rc:4718
+#: Merge.rc:4728
#, c-format
msgid "Files are different (expr: %1)"
msgstr "Les fichiers sont différents (expr : %1)"
#. IDS_HASH_GROUP
-#: Merge.rc:4719
+#: Merge.rc:4729
#, c-format
msgid "Group%d"
msgstr "Groupe%d"
#. IDS_RENAME_MOVE_DETECTION_DISALBED
-#: Merge.rc:4720
+#: Merge.rc:4730
msgctxt "Options dialog|Compare|Folder|Detect renames and moves"
msgid "Disabled"
msgstr "Désactivée"
#. IDS_RENAME_MOVE_DETECTION_RENAME
-#: Merge.rc:4721
+#: Merge.rc:4731
msgid "Detect renames"
msgstr "Détecter les renommages"
#. IDS_RENAME_MOVE_DETECTION_RENAME_MOVE
-#: Merge.rc:4722
+#: Merge.rc:4732
msgid "Detect renames and moves"
msgstr "Détecter les renommages et les déplacements"
#. IDS_RENAME_MOVE_MERGE_MODE_RENAME
-#: Merge.rc:4723
+#: Merge.rc:4733
msgid "Merge renames"
msgstr "Fusionner les renommages"
#. IDS_RENAME_MOVE_MERGE_MODE_RENAME_MOVE
-#: Merge.rc:4724
+#: Merge.rc:4734
msgid "Merge renames and moves"
msgstr "Fusionner les renommages et les déplacements"
#. IDS_RENAMED
-#: Merge.rc:4725
+#: Merge.rc:4735
msgid "Renamed"
msgstr "Renommé"
#. IDS_MOVED
-#: Merge.rc:4726
+#: Merge.rc:4736
msgid "Moved"
msgstr "Déplacé"
#. IDS_RENAMED_MOVED
-#: Merge.rc:4727
+#: Merge.rc:4737
msgid "Renamed/Moved"
msgstr "Renommé/Déplacé"
#. IDS_RENAMED_MOVED_ITEMS
-#: Merge.rc:4728
+#: Merge.rc:4738
#, c-format
msgid "(%1 items)"
msgstr "(%1 éléments)"
#. IDS_RENAMED_MOVED_RESULT
-#: Merge.rc:4729
+#: Merge.rc:4739
#, c-format
msgid "%1 (set %2): "
msgstr "%1 (ensemble %2) : "
#. IDS_SWITCH_FLAT_MODE
-#: Merge.rc:4730
+#: Merge.rc:4740
msgid ""
"Some moved items have been merged.\n"
"In Tree Mode, these items may appear in positions that do not reflect the actual folder structure, which can be confusing.\n"
@@ -6574,235 +6585,235 @@ msgstr ""
"Passer en mode Plat ?"
#. IDS_ELAPSED_TIME
-#: Merge.rc:4736
+#: Merge.rc:4746
#, c-format
msgid "Elapsed time: %ld ms"
msgstr "Temps écoulé: %ld ms"
#. IDS_STATUS_SELITEM1
-#: Merge.rc:4737
+#: Merge.rc:4747
msgid "1 item selected"
msgstr "1 élément sélectionné"
#. IDS_STATUS_SELITEMS
-#: Merge.rc:4738
+#: Merge.rc:4748
#, c-format
msgid "%1 items selected"
msgstr "%1 éléments sélectionnés"
#. IDS_COLDESC_FILENAME
-#: Merge.rc:4744
+#: Merge.rc:4754
msgid "Filename or folder name."
msgstr "Nom de fichier ou dossier."
#. IDS_COLDESC_DIR
-#: Merge.rc:4745
+#: Merge.rc:4755
msgid "Subfolder name when subfolders are included."
msgstr "Nom du sous-dossier lorsque ceux-ci sont inclus."
#. IDS_COLDESC_RESULT
-#: Merge.rc:4746
+#: Merge.rc:4756
msgid "Comparison result, long form."
msgstr "Resultat de la comparaison, format étendu."
#. IDS_COLDESC_LTIMEM
-#: Merge.rc:4751
+#: Merge.rc:4761
msgid "Left side modification date."
msgstr "Date de modification du panneau Gauche."
#. IDS_COLDESC_RTIMEM
-#: Merge.rc:4752
+#: Merge.rc:4762
msgid "Right side modification date."
msgstr "Date de modification du panneau Droite."
#. IDS_COLDESC_MTIMEM
-#: Merge.rc:4753
+#: Merge.rc:4763
msgid "Middle side modification date."
msgstr "Date modification du panneau Milieu."
#. IDS_COLDESC_EXTENSION
-#: Merge.rc:4754
+#: Merge.rc:4764
msgid "File's extension."
msgstr "Extension du fichier."
#. IDS_COLDESC_LSIZE
-#: Merge.rc:4755
+#: Merge.rc:4765
msgid "Left file size in bytes."
msgstr "Taille du fichier du panneau Gauche en octets."
#. IDS_COLDESC_RSIZE
-#: Merge.rc:4756
+#: Merge.rc:4766
msgid "Right file size in bytes."
msgstr "Taille du fichier du panneau Droite en octets."
#. IDS_COLDESC_MSIZE
-#: Merge.rc:4757
+#: Merge.rc:4767
msgid "Middle file size in bytes."
msgstr "Taille du fichier du panneau Milieu en octets."
#. IDS_COLDESC_LSIZE_SHORT
-#: Merge.rc:4758
+#: Merge.rc:4768
msgid "Left file size abbreviated."
msgstr "Taille du fichier du panneau Gauche abrégée."
#. IDS_COLDESC_RSIZE_SHORT
-#: Merge.rc:4759
+#: Merge.rc:4769
msgid "Right file size abbreviated."
msgstr "Taille du fichier du panneau Droite abrégée."
#. IDS_COLDESC_MSIZE_SHORT
-#: Merge.rc:4760
+#: Merge.rc:4770
msgid "Middle file size abbreviated."
msgstr "Taille du fichier du panneau Milieu abrégée."
#. IDS_COLDESC_LTIMEC
-#: Merge.rc:4766
+#: Merge.rc:4776
msgid "Left side creation time."
msgstr "Date de création du panneau Gauche."
#. IDS_COLDESC_RTIMEC
-#: Merge.rc:4767
+#: Merge.rc:4777
msgid "Right side creation time."
msgstr "Date de création du panneau Droite."
#. IDS_COLDESC_MTIMEC
-#: Merge.rc:4768
+#: Merge.rc:4778
msgid "Middle side creation time."
msgstr "Date de création du panneau Milieu."
#. IDS_COLDESC_NEWER
-#: Merge.rc:4769
+#: Merge.rc:4779
msgid "Tells which side has newer modification date."
msgstr "Indique le panneau ayant la date de modification la plus récente."
#. IDS_COLDESC_LVERSION
-#: Merge.rc:4770
+#: Merge.rc:4780
msgid "Left side file version, only for some file types."
msgstr "Version du fichier du panneau Gauche, uniquement pour certain types de fichiers."
#. IDS_COLDESC_RVERSION
-#: Merge.rc:4771
+#: Merge.rc:4781
msgid "Right side file version, only for some file types."
msgstr "Version du fichier du panneau Droite, uniquement pour certain types de fichiers."
#. IDS_COLDESC_MVERSION
-#: Merge.rc:4776
+#: Merge.rc:4786
msgid "Middle side file version, only for some file types."
msgstr "Version du fichier du panneau Milieu, uniquement pour certain types de fichiers."
#. IDS_COLDESC_RESULT_ABBR
-#: Merge.rc:4777
+#: Merge.rc:4787
msgid "Short comparison result."
msgstr "Résultat de la comparaison, format abrégé."
#. IDS_COLDESC_LATTRIBUTES
-#: Merge.rc:4778
+#: Merge.rc:4788
msgid "Left side attributes."
msgstr "Attributs du panneau Gauche."
#. IDS_COLDESC_RATTRIBUTES
-#: Merge.rc:4779
+#: Merge.rc:4789
msgid "Right side attributes."
msgstr "Attributs du panneau Droite."
#. IDS_COLDESC_MATTRIBUTES
-#: Merge.rc:4780
+#: Merge.rc:4790
msgid "Middle side attributes."
msgstr "Attributs du panneau Milieu."
#. IDS_COLDESC_LEOL_TYPE
-#: Merge.rc:4781
+#: Merge.rc:4791
msgid "Left side file EOL type."
msgstr "Type d'EOL du panneau Gauche."
#. IDS_COLDESC_REOL_TYPE
-#: Merge.rc:4782
+#: Merge.rc:4792
msgid "Right side file EOL type."
msgstr "Type d'EOL du panneau Droite."
#. IDS_COLDESC_MEOL_TYPE
-#: Merge.rc:4783
+#: Merge.rc:4793
msgid "Middle side file EOL type."
msgstr "Type d'EOL du panneau Milieu."
#. IDS_COLDESC_LENCODING
-#: Merge.rc:4789
+#: Merge.rc:4799
msgid "Left side encoding."
msgstr "Encodage du panneau Gauche."
#. IDS_COLDESC_RENCODING
-#: Merge.rc:4790
+#: Merge.rc:4800
msgid "Right side encoding."
msgstr "Encodage du panneau Droite."
#. IDS_COLDESC_MENCODING
-#: Merge.rc:4791
+#: Merge.rc:4801
msgid "Middle side encoding."
msgstr "Encodage du panneau Milieu."
#. IDS_COLDESC_NIDIFFS
-#: Merge.rc:4792
+#: Merge.rc:4802
msgid "Number of ignored differences in file. Ignored and cannot be merged."
msgstr "Nombre de différences ignorées dans le fichier. Ignoré et ne peut pas être fusionné."
#. IDS_COLDESC_NSDIFFS
-#: Merge.rc:4793
+#: Merge.rc:4803
msgid "Number of differences in file (excluding ignored)."
msgstr "Nombre de différences dans le fichier (sauf ignorées)."
#. IDS_COLDESC_BINARY
-#: Merge.rc:4794
+#: Merge.rc:4804
msgid "Shows an asterisk (*) if the file is binary."
msgstr "Affiche un astérisque (*) si le fichier est binaire."
#. IDS_COLDESC_UNPACKER
-#: Merge.rc:4795
+#: Merge.rc:4805
msgid "Unpacker plugin name or pipeline."
msgstr "Nom du plug-in ou pipeline de décompression."
#. IDS_COLDESC_PREDIFFER
-#: Merge.rc:4796
+#: Merge.rc:4806
msgid "Prediffer plugin name or pipeline."
msgstr "Précomparer le nom du plug-in ou du pipeline."
#. IDS_DIRECTORY_REPORT_TITLE
-#: Merge.rc:4802
+#: Merge.rc:4812
#, c-format
msgid "Compare %1 with %2"
msgstr "Comparer %1 avec %2"
#. IDS_DIRECTORY_REPORT_TITLE3
-#: Merge.rc:4803
+#: Merge.rc:4813
#, c-format
msgid "Compare %1 with %2 and %3"
msgstr "Comparer %1 avec %2 et %3"
#. IDS_REPORT_COMMALIST
-#: Merge.rc:4804
+#: Merge.rc:4814
msgid "Comma-separated list"
msgstr "Liste délimitée par des virgules"
#. IDS_REPORT_TABLIST
-#: Merge.rc:4805
+#: Merge.rc:4815
msgid "Tab-separated list"
msgstr "Liste délimitée par des tabulations"
#. IDS_REPORT_SIMPLEHTML
-#: Merge.rc:4806
+#: Merge.rc:4816
msgid "Simple HTML"
msgstr "HTML simple"
#. IDS_REPORT_SIMPLEXML
-#: Merge.rc:4807
+#: Merge.rc:4817
msgid "Simple XML"
msgstr "XML simple"
-#: Merge.rc:4809
+#: Merge.rc:4819
msgid "Report file already exists. Overwrite?"
msgstr "Le fichier de rapport existe déjà. Écraser ?"
#. IDS_REPORT_ERROR
-#: Merge.rc:4814
+#: Merge.rc:4824
#, c-format
msgid ""
"Error creating the report:\n"
@@ -6812,27 +6823,27 @@ msgstr ""
"%1"
#. IDS_REPORT_SUCCESS
-#: Merge.rc:4815
+#: Merge.rc:4825
msgid "Report created successfully."
msgstr "Rapport créé avec succès."
#. IDS_SYNCPOINT_LASTBLOCK
-#: Merge.rc:4821
+#: Merge.rc:4831
msgid "Cannot add a synchronization point at this line."
msgstr "Impossible d'ajouter un point de synchronisation sur cette ligne."
#. IDS_FILE_TO_ITSELF
-#: Merge.rc:4827
+#: Merge.rc:4837
msgid "Same file is opened in both panes."
msgstr "Le même fichier est ouvert dans les deux panneaux."
#. IDS_FILESSAME
-#: Merge.rc:4828
+#: Merge.rc:4838
msgid "Selected files are identical."
msgstr "Les fichiers sélectionnés sont identiques."
#. IDS_FILESSAME_CURCFG
-#: Merge.rc:4829
+#: Merge.rc:4839
msgid ""
"Selected files are identical (with current settings).\r\n"
"Checking binary identity..."
@@ -6841,7 +6852,7 @@ msgstr ""
"Vérification de l'identité binaire..."
#. IDS_FILESSAME_BINERROR
-#: Merge.rc:4830
+#: Merge.rc:4840
msgid ""
"Selected files are identical (with current settings).\r\n"
"But binary comparison failed."
@@ -6850,12 +6861,12 @@ msgstr ""
"Mais la comparaison binaire a échoué."
#. IDS_FILESSAME_BINSAME
-#: Merge.rc:4831
+#: Merge.rc:4841
msgid "Selected files are identical (binary match)."
msgstr "Les fichiers sélectionnés sont identiques (correspondance binaire)."
#. IDS_FILESSAME_BINDIFF
-#: Merge.rc:4832
+#: Merge.rc:4842
msgid ""
"Selected files are identical (with current settings).\r\n"
"But differ at the binary level."
@@ -6864,17 +6875,17 @@ msgstr ""
"Mais diffèrent au niveau binaire."
#. IDS_FILEERROR
-#: Merge.rc:4833
+#: Merge.rc:4843
msgid "An error occurred while comparing files."
msgstr "Une erreur s'est produite lors de la comparaison des fichiers."
#. IDS_TEMP_FILEERROR
-#: Merge.rc:4834
+#: Merge.rc:4844
msgid "Could not create temporary files. Check your temporary path settings."
msgstr "Impossible de créer des fichiers temporaires. Vérifiez vos paramètres de chemin temporaire."
#. IDS_SUGGEST_IGNOREEOL
-#: Merge.rc:4835
+#: Merge.rc:4845
msgid ""
"Files use different EOL.\n"
"\n"
@@ -6889,17 +6900,17 @@ msgstr ""
"Définissez \"Ignorer les différences d'EOL (Windows/Unix/Mac)\" dans la section Comparer sous Préférences."
#. IDS_INVALID_DIRECTORY
-#: Merge.rc:4836
+#: Merge.rc:4846
msgid "Selected folder is invalid."
msgstr "Le dossier sélectionné est invalide."
#. IDS_CANNOT_OPEN_BINARYFILE
-#: Merge.rc:4837
+#: Merge.rc:4847
msgid "Cannot open a binary file in Editor."
msgstr "Impossible d'ouvrir un fichier binaire avec l'éditeur."
#. IDS_CREATE_PAIR_FOLDER
-#: Merge.rc:4838
+#: Merge.rc:4848
#, c-format
msgid ""
"Create matching folder:\n"
@@ -6911,41 +6922,41 @@ msgstr ""
"de l'autre côté et l'ouvrir ?"
#. IDS_CONFIRM_COPY_ALL_DIFFS
-#: Merge.rc:4839
+#: Merge.rc:4849
msgid "Copy all differences to other file?"
msgstr "Copier toutes les différences dans un autre fichier ?"
#. IDS_MOVE_TO_NEXTFILE
-#: Merge.rc:4844
+#: Merge.rc:4854
msgid "Move to next file?"
msgstr "Passer au fichier suivant ?"
#. IDS_MOVE_TO_PREVFILE
-#: Merge.rc:4845
+#: Merge.rc:4855
msgid "Move to previous file?"
msgstr "Passer au fichier précédent ?"
#. IDS_MOVE_TO_NEXTPAGE
-#: Merge.rc:4846
+#: Merge.rc:4856
msgid "Move to next page?"
msgstr "Passer à la page suivante ?"
#. IDS_MOVE_TO_PREVPAGE
-#: Merge.rc:4847
+#: Merge.rc:4857
msgid "Move to previous page?"
msgstr "Passer à la page précédente ?"
#. IDS_MOVE_TO_FIRSTFILE
-#: Merge.rc:4848
+#: Merge.rc:4858
msgid "Move to first file?"
msgstr "Passer au premier fichier ?"
#. IDS_MOVE_TO_LASTFILE
-#: Merge.rc:4849
+#: Merge.rc:4859
msgid "Move to last file?"
msgstr "Passer au dernier fichier ?"
-#: Merge.rc:4856
+#: Merge.rc:4866
#, c-format
msgid ""
"Different codepages: left (cp%d), right (cp%d).\n"
@@ -6956,51 +6967,51 @@ msgstr ""
"Affichage dans la page de codes (meilleur affichage) ou page de codes Windows par défaut (fusion plus sûre) ?\n"
"(Recommandé : page de codes Windows par défaut)"
-#: Merge.rc:4858
+#: Merge.rc:4868
msgid "Information lost due to encoding errors: both files"
msgstr "Information perdue à cause d'erreurs d'encodage: pour les deux fichiers"
-#: Merge.rc:4860
+#: Merge.rc:4870
msgid "Information lost due to encoding errors: first file"
msgstr "Information perdue à cause d'erreurs d'encodage : premier fichier"
-#: Merge.rc:4862
+#: Merge.rc:4872
msgid "Information lost due to encoding errors: second file"
msgstr "Information perdue à cause d'erreurs d'encodage : second fichier"
-#: Merge.rc:4864
+#: Merge.rc:4874
msgid "Information lost due to encoding errors: third file"
msgstr "Information perdue à cause d'erreurs d'encodage : troisième fichier"
#. IDS_LINEDIFF_NODIFF
-#: Merge.rc:4870
+#: Merge.rc:4880
msgid "No difference"
msgstr "Aucune différence"
#. IDS_LINEDIFF_NODIFF_CAPTION
-#: Merge.rc:4871
+#: Merge.rc:4881
msgid "Line difference"
msgstr "Ligne différente"
#. IDS_NUM_REPLACED
-#: Merge.rc:4877
+#: Merge.rc:4887
#, c-format
msgid "Replaced %1 string(s)."
msgstr "%1 remplacement(s) effectué(s)."
#. IDS_EDIT_TEXT_NOT_FOUND
-#: Merge.rc:4878
+#: Merge.rc:4888
#, c-format
msgid "Cannot find string \"%s\"."
msgstr "Chaîne \"%s\" non trouvée."
#. IDS_MERGE_MODE
-#: Merge.rc:4884
+#: Merge.rc:4894
msgid "Entering Merge Mode. Press F9 to turn off."
msgstr "Entrée en mode fusion. Appuyez sur F9 pour désactiver."
#. IDS_AUTO_MERGE
-#: Merge.rc:4890
+#: Merge.rc:4900
#, c-format
msgid ""
"Automatic merges: %1\n"
@@ -7010,99 +7021,99 @@ msgstr ""
"Conflits non résolus : %2"
#. IDS_CODEPAGE_MERGED
-#: Merge.rc:4891
+#: Merge.rc:4901
msgid "Codepage change merged."
msgstr "Le changement de page de code a été fusionné."
#. IDS_CODEPAGE_CONFLICT
-#: Merge.rc:4892
+#: Merge.rc:4902
msgid "Codepage changes are conflicting."
msgstr "Les changements de page de code sont en conflits."
#. IDS_EOL_MERGED
-#: Merge.rc:4893
+#: Merge.rc:4903
msgid "EOL change merged."
msgstr "Les changements d'EOL ont été fusionnés."
#. IDS_EOL_CONFLICT
-#: Merge.rc:4894
+#: Merge.rc:4904
msgid "EOL changes are conflicting."
msgstr "Les changements d'EOL sont en conflits."
#. IDS_LOCBAR_CAPTION
-#: Merge.rc:4900
+#: Merge.rc:4910
msgid "Location Pane"
msgstr "Panneau de localisation"
#. IDS_DIFFBAR_CAPTION
-#: Merge.rc:4901
+#: Merge.rc:4911
msgid "Diff Pane"
msgstr "Panneau des différences"
#. IDS_DIFF_SUCCEEDED
-#: Merge.rc:4908
+#: Merge.rc:4918
msgid "Patch file written."
msgstr "Le fichier de retouche a été écrit avec succès."
#. IDS_DIFF_ITEM1NOTFOUND
-#: Merge.rc:4909
+#: Merge.rc:4919
msgid "First item not found!"
msgstr "Premier élément non trouvé !"
#. IDS_DIFF_ITEM2NOTFOUND
-#: Merge.rc:4910
+#: Merge.rc:4920
msgid "Second item not found!"
msgstr "Second élément non trouvé !"
#. IDS_DIFF_FILEOVERWRITE
-#: Merge.rc:4911
+#: Merge.rc:4921
msgid "Patch file already exists. Overwrite?"
msgstr "Le fichier de retouche existe déja. L'écraser ?"
#. IDS_DIFF_SELECTEDFILES
-#: Merge.rc:4912
+#: Merge.rc:4922
#, c-format
msgid "[%1 files selected]"
msgstr "[%1 fichiers sélectionnés]"
#. IDS_DIFF_NORMAL
-#: Merge.rc:4913
+#: Merge.rc:4923
msgid "Normal"
msgstr "Normal"
#. IDS_DIFF_CONTEXT
-#: Merge.rc:4914
+#: Merge.rc:4924
msgid "Context"
msgstr "Contexte"
#. IDS_DIFF_UNIFIED
-#: Merge.rc:4915
+#: Merge.rc:4925
msgid "Unified"
msgstr "Unifié"
#. IDS_FILEWRITE_ERROR
-#: Merge.rc:4917
+#: Merge.rc:4927
#, c-format
msgid "Could not write to file %1."
msgstr "Impossible d'écrire dans le fichier %1."
#. IDS_PATH_NOT_ABSOLUTE
-#: Merge.rc:4918
+#: Merge.rc:4928
#, c-format
msgid "Output path is not absolute: %1"
msgstr "Le chemin spécifié n'est pas un chemin absolu : %1"
#. IDS_MUST_SPECIFY_OUTPUT
-#: Merge.rc:4919
+#: Merge.rc:4929
msgid "Specify an output file."
msgstr "Indiquer un fichier de sortie."
-#: Merge.rc:4921
+#: Merge.rc:4931
msgid "Cannot create patch from binary files."
msgstr "Impossible de créer un fichier de retouche depuis un fichier binaire."
#. IDS_SAVEFILES_FORPATCH
-#: Merge.rc:4922
+#: Merge.rc:4932
msgid ""
"Save all files first.\n"
"\n"
@@ -7110,12 +7121,12 @@ msgid ""
msgstr "Sauvegardez d'abord tous les fichiers.\\in\\La création d'une retouche nécessite que toute modification soit enregistrée."
#. IDS_FOLDER_NOTEXIST
-#: Merge.rc:4923
+#: Merge.rc:4933
msgid "Folder does not exist."
msgstr "Le dossier n'existe pas."
#. IDS_NO_ZIP_SUPPORT
-#: Merge.rc:4928
+#: Merge.rc:4938
msgid ""
"Archive support not enabled.\n"
"7-Zip and/or Merge7z*.dll not found.\n"
@@ -7126,37 +7137,37 @@ msgstr ""
"Voir le manuel pour la prise en charge des archives."
#. IDS_OPT_EXPORT_CAPTION
-#: Merge.rc:4929
+#: Merge.rc:4939
msgid "Select file for export"
msgstr "Sélectionner le fichier pour exportation"
#. IDS_OPT_IMPORT_CAPTION
-#: Merge.rc:4930
+#: Merge.rc:4940
msgid "Select file for import"
msgstr "Sélectionner le fichier pour importation"
#. IDS_OPT_IMPORT_DONE
-#: Merge.rc:4931
+#: Merge.rc:4941
msgid "Options imported from file."
msgstr "Préférences importées depuis le fichier."
#. IDS_OPT_EXPORT_DONE
-#: Merge.rc:4932
+#: Merge.rc:4942
msgid "Options exported to file."
msgstr "Préférences exportées vers le fichier."
#. IDS_OPT_IMPORT_ERR
-#: Merge.rc:4933
+#: Merge.rc:4943
msgid "Failed to import options from file."
msgstr "Échec de l'importation des préférences à partir du fichier."
#. IDS_OPT_EXPORT_ERR
-#: Merge.rc:4934
+#: Merge.rc:4944
msgid "Failed to write options to file."
msgstr "Échec de l'écriture des préférences dans le fichier."
#. IDS_CLOSEALL_WINDOWS
-#: Merge.rc:4935
+#: Merge.rc:4945
msgid ""
"Close multiple compare windows?\n"
"\n"
@@ -7167,44 +7178,44 @@ msgstr ""
"Continuer ?"
#. IDS_EOL_MIXED
-#: Merge.rc:4944
+#: Merge.rc:4954
msgid "Mixed"
msgstr "Combiné"
#. IDS_EOL_BIN
-#: Merge.rc:4945
+#: Merge.rc:4955
msgctxt "EOL Type"
msgid "Binary"
msgstr "Binaire"
#. IDS_EOL_NONE
-#: Merge.rc:4949
+#: Merge.rc:4959
msgid "None"
msgstr "Aucun"
#. IDS_MARKER_COLOR_FMT
-#: Merge.rc:4950
+#: Merge.rc:4960
#, c-format
msgid "Marker Color %d"
msgstr "Couleur du marqueur %d"
#. IDS_MARKER_NEW_PATTERN
-#: Merge.rc:4951
+#: Merge.rc:4961
msgid "New Pattern"
msgstr "Nouveau modèle"
#. IDS_PLUGINSLIST_TYPE
-#: Merge.rc:4957
+#: Merge.rc:4967
msgid "Type"
msgstr "Type"
#. IDS_PLUGINS_TYPE_EDITSCRIPT
-#: Merge.rc:4961
+#: Merge.rc:4971
msgid "Editor script"
msgstr "Éditeur de script"
#. ID_SELECTLINEDIFF
-#: Merge.rc:4967
+#: Merge.rc:4977
msgid ""
"\n"
"Difference in Current Line (F4)"
@@ -7213,7 +7224,7 @@ msgstr ""
"Différence sur la ligne courante (F4)"
#. ID_OPTIONS
-#: Merge.rc:4968
+#: Merge.rc:4978
msgid ""
"\n"
"Options"
@@ -7222,7 +7233,7 @@ msgstr ""
"Préférences"
#. ID_REFRESH
-#: Merge.rc:4969
+#: Merge.rc:4979
msgid ""
"\n"
"Refresh (F5)"
@@ -7231,7 +7242,7 @@ msgstr ""
"Actualiser (F5)"
#. ID_PREVDIFF
-#: Merge.rc:4975
+#: Merge.rc:4985
msgid ""
"\n"
"Previous Difference (Alt+Up)"
@@ -7240,7 +7251,7 @@ msgstr ""
"Différence précédente (Alt+Haut)"
#. ID_NEXTDIFF
-#: Merge.rc:4976
+#: Merge.rc:4986
msgid ""
"\n"
"Next Difference (Alt+Down)"
@@ -7249,7 +7260,7 @@ msgstr ""
"Différence suivante (Alt+Bas)"
#. ID_PREVCONFLICT
-#: Merge.rc:4977
+#: Merge.rc:4987
msgid ""
"\n"
"Previous Conflict (Alt+Shift+Up)"
@@ -7258,7 +7269,7 @@ msgstr ""
"Conflit précédent (Alt+Maj+Haut)"
#. ID_NEXTCONFLICT
-#: Merge.rc:4978
+#: Merge.rc:4988
msgid ""
"\n"
"Next Conflict (Alt+Shift+Down)"
@@ -7267,7 +7278,7 @@ msgstr ""
"Conflit suivant (Alt+Maj+Bas)"
#. ID_FIRSTDIFF
-#: Merge.rc:4983
+#: Merge.rc:4993
msgid ""
"\n"
"First Difference (Alt+Home)"
@@ -7276,7 +7287,7 @@ msgstr ""
"Première différence (Alt+Début)"
#. ID_CURDIFF
-#: Merge.rc:4984
+#: Merge.rc:4994
msgid ""
"\n"
"Current Difference (Alt+Enter)"
@@ -7285,7 +7296,7 @@ msgstr ""
"Différence courante (Alt+Entrée)"
#. ID_LASTDIFF
-#: Merge.rc:4985
+#: Merge.rc:4995
msgid ""
"\n"
"Last Difference (Alt+End)"
@@ -7294,7 +7305,7 @@ msgstr ""
"Dernière différence (Alt+Fin)"
#. ID_L2R
-#: Merge.rc:4986
+#: Merge.rc:4996
msgid ""
"\n"
"Copy to Right (Alt+Right)"
@@ -7303,7 +7314,7 @@ msgstr ""
"Copier vers la Droite (Alt+Droite)"
#. ID_R2L
-#: Merge.rc:4987
+#: Merge.rc:4997
msgid ""
"\n"
"Copy to Left (Alt+Left)"
@@ -7312,7 +7323,7 @@ msgstr ""
"Copier vers la Gauche (Alt+Gauche)"
#. ID_L2RNEXT
-#: Merge.rc:4988
+#: Merge.rc:4998
msgid ""
"\n"
"Copy to Right and Advance (Ctrl+Alt+Right)"
@@ -7321,7 +7332,7 @@ msgstr ""
"Copier vers la Droite et Avancer (Ctrl+Alt+Droite)"
#. ID_R2LNEXT
-#: Merge.rc:4989
+#: Merge.rc:4999
msgid ""
"\n"
"Copy to Left and Advance (Ctrl+Alt+Left)"
@@ -7330,7 +7341,7 @@ msgstr ""
"Copier vers la Gauche et Avancer (Ctrl+Alt+Gauche)"
#. ID_ALL_RIGHT
-#: Merge.rc:4990
+#: Merge.rc:5000
msgid ""
"\n"
"Copy All to Right"
@@ -7339,7 +7350,7 @@ msgstr ""
"Tout copier vers la Droite"
#. ID_ALL_LEFT
-#: Merge.rc:4991
+#: Merge.rc:5001
msgid ""
"\n"
"Copy All to Left"
@@ -7348,7 +7359,7 @@ msgstr ""
"Tout copier vers la Gauche"
#. ID_AUTO_MERGE
-#: Merge.rc:4992
+#: Merge.rc:5002
msgid ""
"\n"
"Auto Merge (Ctrl+Alt+M)"
@@ -7357,7 +7368,7 @@ msgstr ""
"Fusionner automatiquement (Ctrl+Alt+M)"
#. ID_FIRSTFILE
-#: Merge.rc:4993
+#: Merge.rc:5003
msgid ""
"\n"
"First File"
@@ -7366,7 +7377,7 @@ msgstr ""
"Premier fichier"
#. ID_NEXTFILE
-#: Merge.rc:4994
+#: Merge.rc:5004
msgid ""
"\n"
"Next File (Ctrl+F8)"
@@ -7375,7 +7386,7 @@ msgstr ""
"Fichier suivant (Ctrl+F8)"
#. ID_LASTFILE
-#: Merge.rc:4995
+#: Merge.rc:5005
msgid ""
"\n"
"Last File"
@@ -7384,7 +7395,7 @@ msgstr ""
"Dernier fichier"
#. ID_PREVFILE
-#: Merge.rc:4996
+#: Merge.rc:5006
msgid ""
"\n"
"Previous File (Ctrl+F7)"
@@ -7393,37 +7404,37 @@ msgstr ""
"Fichier précédent (Ctrl+F7)"
#. IDS_UNPACK_AUTO
-#: Merge.rc:5003
+#: Merge.rc:5013
msgid "Adapted unpacker applied to both files (one needs extension)."
msgstr "Le décompresseur approprié est appliqué aux deux fichiers (un seul fichier nécessite une extension)."
#. IDS_NO_PREDIFFER
-#: Merge.rc:5004
+#: Merge.rc:5014
msgid "No Prediffer (Normal)"
msgstr "Aucune précomparaison (normal)"
#. IDS_SUGGESTED_PLUGINS
-#: Merge.rc:5005
+#: Merge.rc:5015
msgid "Suggested Plugins"
msgstr "Plug-ins suggérés"
#. IDS_NOT_SUGGESTED_PLUGINS
-#: Merge.rc:5006
+#: Merge.rc:5016
msgid "All Plugins"
msgstr "Tous les plug-ins"
#. IDS_PRIVATEBUILD_FMT
-#: Merge.rc:5012
+#: Merge.rc:5022
#, c-format
msgid "Private Build: %1"
msgstr "Compilation privée : %1"
#. IDS_CHECKFORUPDATES_UPTODATE
-#: Merge.rc:5013
+#: Merge.rc:5023
msgid "Your software is up to date."
msgstr "Votre logiciel est à jour."
-#: Merge.rc:5015
+#: Merge.rc:5025
#, c-format
msgid ""
"WinMerge update available.\n"
@@ -7433,126 +7444,126 @@ msgstr ""
"%1 disponible (vous avez %2). Télécharger maintenant ?"
#. IDS_ALLRIGHTS_RESERVED
-#: Merge.rc:5016
+#: Merge.rc:5026
msgid " - All rights reserved."
msgstr " - Tous droits réservés."
#. IDS_CHECKFORUPDATES_FAILED
-#: Merge.rc:5021
+#: Merge.rc:5031
msgid "Failed to download latest version information"
msgstr "Échec du téléchargement des informations sur la plus récente version"
#. IDS_TITLE_PLUGINS_SETTINGS
-#: Merge.rc:5027
+#: Merge.rc:5037
msgid "Plugin Settings"
msgstr "Paramètres des plug-ins"
#. IDS_NO_SCT_SCRIPTS
-#: Merge.rc:5029
+#: Merge.rc:5039
msgid "WSH not found - .sct scripts disabled"
msgstr "WSH non trouvé - les scripts .sct sont désactivés"
#. IDS_LOCBAR_GOTOLINE_FMT
-#: Merge.rc:5037
+#: Merge.rc:5047
#, c-format
msgid "G&o to Line %1"
msgstr "Atteindre la ligne %1"
#. IDS_GOTO_MOVED_LINE
-#: Merge.rc:5043
+#: Merge.rc:5053
msgid "Go to Moved Line\tCtrl+Shift+G"
msgstr "Aller à la ligne déplacée\tCtrl+Maj+G"
#. IDS_AUTOCOMPLETE_DISABLED
-#: Merge.rc:5049
+#: Merge.rc:5059
msgctxt "Options dialog|General|Open dialog Auto completion"
msgid "Disabled"
msgstr "Désactivé"
#. IDS_AUTOCOMPLETE_FILE_SYS
-#: Merge.rc:5050
+#: Merge.rc:5060
msgid "From file system"
msgstr "A partir du système de fichier"
#. IDS_AUTOCOMPLETE_MRU
-#: Merge.rc:5051
+#: Merge.rc:5061
msgid "From Most Recently Used list"
msgstr "A partir de la liste des fichiers récents"
#. IDS_COLORSCHEME_PLAIN
-#: Merge.rc:5057
+#: Merge.rc:5067
msgid "No Highlighting"
msgstr "Aucune surbrillance"
#. IDS_COLORSCHEME_BATCH
-#: Merge.rc:5063
+#: Merge.rc:5073
msgid "Batch"
msgstr "Lot"
#. IDS_COLORSCHEME_PO
-#: Merge.rc:5090
+#: Merge.rc:5100
msgid "Portable Object"
msgstr "Objet portable"
#. IDS_COLORSCHEME_RSRC
-#: Merge.rc:5094
+#: Merge.rc:5104
msgid "Resources"
msgstr "Ressources"
#. IDS_COLORSCHEME_SH
-#: Merge.rc:5098
+#: Merge.rc:5108
msgid "Shell"
msgstr "Shell"
#. IDS_CLOSE_LEFT_TABS
-#: Merge.rc:5115
+#: Merge.rc:5125
msgid "Close &Left Tabs"
msgstr "Fermer l'ong&let de Gauche"
#. IDS_CLOSE_RIGHT_TABS
-#: Merge.rc:5116
+#: Merge.rc:5126
msgid "Close R&ight Tabs"
msgstr "Fermer l'onglet de Dro&ite"
#. IDS_CLOSE_OTHER_TABS
-#: Merge.rc:5117
+#: Merge.rc:5127
msgid "Close &Other Tabs"
msgstr "Fermer les autres &onglets"
#. IDS_TABBAR_AUTO_MAXWIDTH
-#: Merge.rc:5118
+#: Merge.rc:5128
msgid "Enable &Auto Max Width"
msgstr "Activer largeur max. &auto."
#. IDS_WEBPAGE_MENU
-#: Merge.rc:5128
+#: Merge.rc:5138
msgid "We&bpage"
msgstr "Page We&b"
#. IDS_VIEW_WRAP_TEXT
-#: Merge.rc:5133
+#: Merge.rc:5143
msgid "W&rap Text"
msgstr "Habilla&ge de texte"
#. IDS_NOTINSTALLED
-#: Merge.rc:5138
+#: Merge.rc:5148
#, c-format
msgid "%1 is not installed."
msgstr "%1 n'est pas installé."
#. IDS_CREATE_FOLDER
-#: Merge.rc:5143
+#: Merge.rc:5153
#, c-format
msgid "%1 does not exist. Create it?"
msgstr "%1 n'existe pas. Le créer ?"
#. IDS_CREATE_FOLDER_ERROR
-#: Merge.rc:5144
+#: Merge.rc:5154
msgid "Failed to create folder."
msgstr "Échec de la création du dossier."
#. IDC_EXT_EDITOR_PATH
-#: Merge.rc:5149
+#: Merge.rc:5159
msgid ""
"Parameters:\n"
"$file: Current file path\n"
@@ -7563,486 +7574,486 @@ msgstr ""
"$linenum : numéro de ligne actuel du curseur"
#. IDS_DIFF_ALGORITHM_DEFAULT
-#: Merge.rc:5154
+#: Merge.rc:5164
msgid "default"
msgstr "par défaut"
#. IDS_DIFF_ALGORITHM_MINIMAL
-#: Merge.rc:5155
+#: Merge.rc:5165
msgid "minimal"
msgstr "minimal"
#. IDS_DIFF_ALGORITHM_PATIENCE
-#: Merge.rc:5156
+#: Merge.rc:5166
msgid "patience"
msgstr "patience"
#. IDS_DIFF_ALGORITHM_HISTOGRAM
-#: Merge.rc:5157
+#: Merge.rc:5167
msgid "histogram"
msgstr "histogramme"
#. IDS_DIFF_ALGORITHM_NONE
-#: Merge.rc:5158
+#: Merge.rc:5168
msgid "none"
msgstr "aucun"
#. IDS_RENDERING_MODE_GDI
-#: Merge.rc:5163
+#: Merge.rc:5173
msgid "GDI"
msgstr "GDI"
#. IDS_RENDERING_MODE_DIRECTWRITE_DEFAULT
-#: Merge.rc:5164
+#: Merge.rc:5174
msgid "DirectWrite Default"
msgstr "DirectWrite par défaut"
#. IDS_RENDERING_MODE_DIRECTWRITE_ALIASED
-#: Merge.rc:5165
+#: Merge.rc:5175
msgid "DirectWrite Aliased"
msgstr "DirectWrite aliasé"
#. IDS_RENDERING_MODE_DIRECTWRITE_GDI_CLASSIC
-#: Merge.rc:5166
+#: Merge.rc:5176
msgid "DirectWrite GDI Classic"
msgstr "DirectWrite GDI classique"
#. IDS_RENDERING_MODE_DIRECTWRITE_GDI_NATURAL
-#: Merge.rc:5167
+#: Merge.rc:5177
msgid "DirectWrite GDI Natural"
msgstr "DirectWrite GDI naturel"
#. IDS_RENDERING_MODE_DIRECTWRITE_NATURAL
-#: Merge.rc:5168
+#: Merge.rc:5178
msgid "DirectWrite Natural"
msgstr "DirectWrite naturel"
#. IDS_RENDERING_MODE_DIRECTWRITE_NATURAL_SYMMETRIC
-#: Merge.rc:5169
+#: Merge.rc:5179
msgid "DirectWrite Natural Symmetric"
msgstr "DirectWrite symétrique naturel"
#. IDS_CLOSE_WINDOWS_WITH_ESC_DISABLED
-#: Merge.rc:5174
+#: Merge.rc:5184
msgctxt "Options dialog|General|Close windows with Esc"
msgid "Disabled"
msgstr "Désactivé"
#. IDS_CLOSE_WINDOWS_WITH_ESC_1
-#: Merge.rc:5175
+#: Merge.rc:5185
msgid "MDI child window or main window"
msgstr "Fenêtre enfant MDI ou fenêtre principale"
#. IDS_CLOSE_WINDOWS_WITH_ESC_2
-#: Merge.rc:5176
+#: Merge.rc:5186
msgid "MDI child window only"
msgstr "Fenêtre enfant MDI uniquement"
#. IDS_CLOSE_WINDOWS_WITH_ESC_3
-#: Merge.rc:5177
+#: Merge.rc:5187
msgid "Close main window if only one MDI child window"
msgstr "Fermer la fenêtre principale s'il n'y a qu'une seule fenêtre enfant MDI"
#. IDS_DIFF_GROUP
-#: Merge.rc:5182
+#: Merge.rc:5192
msgctxt "ImgMergeFrame|LocationPane"
msgid "Diff"
msgstr "Différence"
#. IDS_DIFF_HIGHLIGHT
-#: Merge.rc:5183
+#: Merge.rc:5193
msgctxt "ImgMergeFrame|LocationPane"
msgid "Highlight"
msgstr "Surbrillance"
#. IDS_DIFF_BLINK
-#: Merge.rc:5184
+#: Merge.rc:5194
msgctxt "ImgMergeFrame|LocationPane"
msgid "Blink"
msgstr "Clignotement"
#. IDS_DIFF_BLOCKSIZE
-#: Merge.rc:5185
+#: Merge.rc:5195
msgctxt "ImgMergeFrame|LocationPane"
msgid "Block Size"
msgstr "Taille du bloc"
#. IDS_DIFF_BLOCKALPHA
-#: Merge.rc:5186
+#: Merge.rc:5196
msgctxt "ImgMergeFrame|LocationPane"
msgid "Block Alpha"
msgstr "Alpha du bloc"
#. IDS_DIFF_CDTHRESHOLD
-#: Merge.rc:5187
+#: Merge.rc:5197
msgctxt "ImgMergeFrame|LocationPane"
msgid "CD Threshold"
msgstr "Seuil CD"
#. IDS_DIFF_INSERTION_DELETION_DETECTION
-#: Merge.rc:5188
+#: Merge.rc:5198
msgctxt "ImgMergeFrame|LocationPane"
msgid "Ins/Del Detection"
msgstr "Détection Insér./Suppr."
#. IDS_OVERLAY_MODE_NONE
-#: Merge.rc:5189 Merge.rc:5194
+#: Merge.rc:5199 Merge.rc:5204
msgctxt "ImgMergeFrame|LocationPane"
msgid "None"
msgstr "Aucun"
#. IDS_DIFF_INSERTION_DELETION_DETECTION_VERTICAL
-#: Merge.rc:5190
+#: Merge.rc:5200
msgctxt "ImgMergeFrame|LocationPane"
msgid "Vertical"
msgstr "Vertical"
#. IDS_DIFF_INSERTION_DELETION_DETECTION_HORIZONTAL
-#: Merge.rc:5191
+#: Merge.rc:5201
msgctxt "ImgMergeFrame|LocationPane"
msgid "Horizontal"
msgstr "Horizontal"
#. IDS_OVERLAY_GROUP
-#: Merge.rc:5192
+#: Merge.rc:5202
msgctxt "ImgMergeFrame|LocationPane"
msgid "Overlay"
msgstr "Recouvrir"
#. IDS_OVERLAY_ALPHA
-#: Merge.rc:5193
+#: Merge.rc:5203
msgctxt "ImgMergeFrame|LocationPane"
msgid "Alpha"
msgstr "Alpha"
#. IDS_OVERLAY_MODE_XOR
-#: Merge.rc:5195
+#: Merge.rc:5205
msgctxt "ImgMergeFrame|LocationPane"
msgid "XOR"
msgstr "XOR"
#. IDS_OVERLAY_MODE_ALPHA
-#: Merge.rc:5196
+#: Merge.rc:5206
msgctxt "ImgMergeFrame|LocationPane"
msgid "Alpha Blend"
msgstr "Mélange alpha"
#. IDS_OVERLAY_MODE_ALPHA_ANIMATION
-#: Merge.rc:5197
+#: Merge.rc:5207
msgctxt "ImgMergeFrame|LocationPane"
msgid "Alpha Animation"
msgstr "Animation alpha"
#. IDS_ZOOM
-#: Merge.rc:5198
+#: Merge.rc:5208
msgctxt "ImgMergeFrame|LocationPane"
msgid "Zoom"
msgstr "Zoom"
#. IDS_PAGE
-#: Merge.rc:5199
+#: Merge.rc:5209
msgctxt "ImgMergeFrame|LocationPane"
msgid "Page:"
msgstr "Page :"
#. IDS_IMGCMP_STATUS_PT_RGBA_FMT
-#: Merge.rc:5200
+#: Merge.rc:5210
#, c-format
msgid "Pt: (%d, %d) RGBA: (%d, %d, %d, %d) "
msgstr "Pt : (%d, %d) RGBA : (%d, %d, %d, %d) "
#. IDS_IMGCMP_STATUS_DIST1_FMT
-#: Merge.rc:5201
+#: Merge.rc:5211
#, c-format
msgid "Dist: %g "
msgstr "Dist : %g "
#. IDS_IMGCMP_STATUS_DIST2_FMT
-#: Merge.rc:5202
+#: Merge.rc:5212
#, c-format
msgid "Dist: %g, %g "
msgstr "Dist : %g, %g "
#. IDS_IMGCMP_STATUS_PAGE_ZOOM_SIZE_BPP_FMT
-#: Merge.rc:5203
+#: Merge.rc:5213
#, c-format
msgid "Page: %d/%d Zoom: %d%% %dx%dpx %dbpp "
msgstr "Page : %d/%d Zoom : %d%% %dx%dpx %dbpp "
#. IDS_IMGCMP_STATUS_RC_FMT
-#: Merge.rc:5204
+#: Merge.rc:5214
#, c-format
msgid "Rc: (%d, %d) "
msgstr "Rc : (%d, %d) "
#. IDS_IMGCMP_STATUS_FLIPPED_FMT
-#: Merge.rc:5205
+#: Merge.rc:5215
#, c-format
msgid "Flipped: %s "
msgstr "Inversé : %s "
#. IDS_IMGCMP_STATUS_ROTATED_FMT
-#: Merge.rc:5206
+#: Merge.rc:5216
#, c-format
msgid "Rotated: %d "
msgstr "Rotation : %d "
#. IDS_IMGCMP_REPORT_ALLPAGES
-#: Merge.rc:5207
+#: Merge.rc:5217
msgid "All pages"
msgstr "Toutes les pages"
#. IDS_IGNSUB_STR1
-#: Merge.rc:5212
+#: Merge.rc:5222
msgid ""
msgstr ""
#. IDS_IGNSUB_STR2
-#: Merge.rc:5213
+#: Merge.rc:5223
msgid "No differences found to select"
msgstr "Aucune différence trouvée à sélectionner"
#. IDS_IGNSUB_STR3
-#: Merge.rc:5214
+#: Merge.rc:5224
msgid "No differences found to add as substitution filter"
msgstr "Aucune différence trouvée à ajouter comme filtre de substitution"
#. IDS_IGNSUB_STR4
-#: Merge.rc:5215
+#: Merge.rc:5225
msgid "The pair is already in the Substitution Filters list"
msgstr "La paire est déjà présente dans la liste des filtres de substitution"
#. IDS_IGNSUB_STR5
-#: Merge.rc:5216
+#: Merge.rc:5226
msgid "Add this change to Substitution Filters?"
msgstr "Ajouter cette modification aux filtres de substitution ?"
#. IDS_OCRRESULT_TEXTONLY
-#: Merge.rc:5221
+#: Merge.rc:5231
msgid "Text only"
msgstr "Texte seulement"
#. IDS_OCRRESULT_POS_LINE
-#: Merge.rc:5222
+#: Merge.rc:5232
msgid "Line-by-line position and text"
msgstr "Position et texte ligne par ligne"
#. IDS_OCRRESULT_POS_WORD
-#: Merge.rc:5223
+#: Merge.rc:5233
msgid "Word-by-word position and text"
msgstr "Position et texte mot par mot"
#. IDS_USERDATAFOLDER_APPDATA
-#: Merge.rc:5228
+#: Merge.rc:5238
msgid "AppData (Roaming) folder"
msgstr "Dossier AppData (Roaming)"
#. IDS_USERDATAFOLDER_INSTALL
-#: Merge.rc:5229
+#: Merge.rc:5239
msgid "Install folder"
msgstr "Dossier d'installation"
#. IDS_USERDATAFOLDER_DOCUMENTS
-#: Merge.rc:5230
+#: Merge.rc:5240
msgid "Documents folder"
msgstr "Dossier Documents"
#. IDS_SINGLEINSTANCE_DISABLED
-#: Merge.rc:5235
+#: Merge.rc:5245
msgctxt "Options dialog|General|Single instance mode"
msgid "Disabled"
msgstr "Désactivé"
#. IDS_SINGLEINSTANCE_STR1
-#: Merge.rc:5236
+#: Merge.rc:5246
msgid "Allow only one instance to run"
msgstr "Permettre une seule instance en exécution"
#. IDS_SINGLEINSTANCE_STR2
-#: Merge.rc:5237
+#: Merge.rc:5247
msgid "Allow only one instance; wait for termination"
msgstr "Permettre une seule instance; attendre que l'instance se termine"
#. IDS_AUTO_RELOAD_MODIFIED_FILES_DISABLED
-#: Merge.rc:5242
+#: Merge.rc:5252
msgctxt "Options dialog|General|Auto-reload modified files"
msgid "Disabled"
msgstr "Désactivé"
#. IDS_AUTO_RELOAD_MODIFIED_FILES_STR1
-#: Merge.rc:5243
+#: Merge.rc:5253
msgid "Only on window activated"
msgstr "Seulement sur la fenêtre activée"
#. IDS_AUTO_RELOAD_MODIFIED_FILES_STR2
-#: Merge.rc:5244
+#: Merge.rc:5254
msgid "Immediately"
msgstr "Immédiatement"
#. IDS_PLUGIN_ALL
-#: Merge.rc:5249
+#: Merge.rc:5259
msgid "Al&l"
msgstr "To&us"
#. IDS_PLUGIN_OTHERS
-#: Merge.rc:5250
+#: Merge.rc:5260
msgid "&Others"
msgstr "&Autres"
-#: Merge.rc:5252
+#: Merge.rc:5262
#, c-format
msgid "Missing plugin name in pipeline: %1"
msgstr "Nom du plug-in manquant dans le pipeline : %1"
-#: Merge.rc:5254
+#: Merge.rc:5264
#, c-format
msgid "Missing quote in plugin pipeline: %1"
msgstr "Guillemet manquant dans le pipeline du plug-in : %1"
#. IDS_PLUGIN_NAME_ALREADY_EXISTS
-#: Merge.rc:5255
+#: Merge.rc:5265
#, c-format
msgid "Plugin name '%1' already exists."
msgstr "Le nom du plug-in '%1' existe déjà."
#. IDS_PLUGIN_TITLE1
-#: Merge.rc:5256
+#: Merge.rc:5266
msgid "Specify plugin arguments"
msgstr "Spécifier les arguments du plug-in"
-#: Merge.rc:5258
+#: Merge.rc:5268
#, c-format
msgid "Plugin not found or invalid: %1"
msgstr "Plug-in introuvable ou invalide : %1"
#. IDS_PLUGIN_NOT_UNPACK
-#: Merge.rc:5259
+#: Merge.rc:5269
#, c-format
msgid "'%1' is not an unpacker plugin"
msgstr "'%1' n'est pas un plug-in de décompression"
#. IDS_PLUGIN_NOT_PREDIFF
-#: Merge.rc:5260
+#: Merge.rc:5270
#, c-format
msgid "'%1' is not a prediffer plugin"
msgstr "'%1' n'est pas un plug-in de prédifférence"
-#: Merge.rc:5262
+#: Merge.rc:5272
#, c-format
msgid "Error prediffing '%1' with '%2'. Prediffing disabled."
msgstr "Erreur lors de la prédifférence de '%1' avec '%2'. Prédifférence désactivée."
#. IDS_PLUGIN_CIRCULAR_REFERENCE
-#: Merge.rc:5263
+#: Merge.rc:5273
#, c-format
msgid "Circular reference in plugin pipeline: %1"
msgstr "Référence circulaire dans le pipeline du plug-in : %1"
#. IDS_PLUGIN_TYPE1
-#: Merge.rc:5264
+#: Merge.rc:5274
msgid "URL Handler"
msgstr "Gestionnaire d'URL"
#. IDS_PLUGIN_TYPE2
-#: Merge.rc:5265
+#: Merge.rc:5275
msgid "File Unpacker"
msgstr "Décompresseur de fichiers"
#. IDS_PLUGIN_TYPE3
-#: Merge.rc:5266
+#: Merge.rc:5276
msgid "File or Folder Unpacker"
msgstr "Décompresseur de fichiers ou dossiers"
#. IDS_PLUGIN_TYPE5
-#: Merge.rc:5268
+#: Merge.rc:5278
msgid "Alias for Unpacker"
msgstr "Alias pour le décompresseur"
#. IDS_PLUGIN_TYPE6
-#: Merge.rc:5269
+#: Merge.rc:5279
msgid "Alias for Prediffer"
msgstr "Alias pour la précomparaison"
#. IDS_PLUGIN_TYPE7
-#: Merge.rc:5270
+#: Merge.rc:5280
msgid "Alias for Editor script"
msgstr "Alias pour l'éditeur de script"
#. IDS_PLUGIN_ALIAS_DESC
-#: Merge.rc:5271
+#: Merge.rc:5281
#, c-format
msgid "Alias for plugin pipeline '%1'"
msgstr "Alias pour le pipeline du plug-in '%1'"
#. IDS_PLUGIN_NEW_DESC
-#: Merge.rc:5272
+#: Merge.rc:5282
msgid "New plugin description"
msgstr "Description du nouveau plug-in"
#. IDS_PLUGIN_TARGETS_ALL
-#: Merge.rc:5273
+#: Merge.rc:5283
msgid "All"
msgstr "Tous"
#. IDS_PLUGIN_TARGETS_1ST
-#: Merge.rc:5274
+#: Merge.rc:5284
msgid "1st"
msgstr "1er"
#. IDS_PLUGIN_TARGETS_2ND
-#: Merge.rc:5275
+#: Merge.rc:5285
msgid "2nd"
msgstr "2ème"
#. IDS_PLUGIN_TARGETS_3RD
-#: Merge.rc:5276
+#: Merge.rc:5286
msgid "3rd"
msgstr "3ème"
#. IDS_PLUGIN_TARGETS_1ST_2ND
-#: Merge.rc:5277
+#: Merge.rc:5287
msgid "1st and 2nd"
msgstr "1er et 2ème"
#. IDS_PLUGIN_TARGETS_1ST_3RD
-#: Merge.rc:5278
+#: Merge.rc:5288
msgid "1st and 3rd"
msgstr "1er et 3ème"
#. IDS_PLUGIN_TARGETS_2ND_3RD
-#: Merge.rc:5279
+#: Merge.rc:5289
msgid "2nd and 3rd"
msgstr "2ème et 3ème"
#. IDS_FILTER_APPLIED
-#: Merge.rc:5284
+#: Merge.rc:5294
msgid "Filter applied"
msgstr "Filtre appliqué"
#. IDS_FILTERMENU_COMPARE
-#: Merge.rc:5289
+#: Merge.rc:5299
#, c-format
msgid "Compare %1"
msgstr "Comparer %1"
#. IDS_FILTERMENU_FILTER_BY_THIS_COLUMN
-#: Merge.rc:5290
+#: Merge.rc:5300
msgid "&Filter by This Column"
msgstr "&Filtrer par cette colonne"
#. IDS_FILTERMENU_FILTER_BY_THIS_COLUMN2
-#: Merge.rc:5291
+#: Merge.rc:5301
msgid "&Filter by This Column..."
msgstr "&Filtrer par cette colonne..."
#. IDS_CLIPBOARDHISTORY_TIME
-#: Merge.rc:5296
+#: Merge.rc:5306
#, c-format
msgid "Clipboard at %s"
msgstr "Presse-papiers à %s"
#. IDS_CLIPBOARDHISTORY_DISABLED
-#: Merge.rc:5297
+#: Merge.rc:5307
msgid ""
"Clipboard history disabled.\r\n"
"Enable: Windows logo key + V, then Turn on."
@@ -8050,110 +8061,115 @@ msgstr ""
"L'historique du presse-papiers est désactivé.\r\n"
"Pour l'activer : appuyez sur la touche de logo Windows + V, puis cliquez sur Activer."
-#: Merge.rc:5299
+#: Merge.rc:5309
msgid "This system does not support clipboard history."
msgstr "Ce système ne prend pas en charge l'historique du presse-papiers."
-#: Merge.rc:5301
+#: Merge.rc:5311
msgid "32-bit WinMerge does not support Clipboard Compare"
msgstr "La version 32 bits de WinMerge ne prend pas en charge la comparaison du presse-papiers"
#. IDS_WEBVIEW2_RUNTIME_NOT_INSTALLED
-#: Merge.rc:5306
+#: Merge.rc:5316
msgid "WebView2 runtime not installed. Download it?"
msgstr "Le runtime WebView2 n'est pas installé. Voulez-vous le télécharger ?"
#. IDS_JUMPLIST_NEW_TEXT_COMPARE
-#: Merge.rc:5311
+#: Merge.rc:5321
msgid "New Text Compare"
msgstr "Nouvelle comparaison de texte"
#. IDS_JUMPLIST_NEW_TABLE_COMPARE
-#: Merge.rc:5312
+#: Merge.rc:5322
msgid "New Table Compare"
msgstr "Nouvelle comparaison de tableau"
#. IDS_JUMPLIST_NEW_BINARY_COMPARE
-#: Merge.rc:5313
+#: Merge.rc:5323
msgid "New Binary Compare"
msgstr "Nouvelle comparaison de binaire"
#. IDS_JUMPLIST_NEW_IMAGE_COMPARE
-#: Merge.rc:5314
+#: Merge.rc:5324
msgid "New Image Compare"
msgstr "Nouvelle comparaison d'image"
#. IDS_JUMPLIST_NEW_WEBPAGE_COMPARE
-#: Merge.rc:5315
+#: Merge.rc:5325
msgid "New Webpage Compare"
msgstr "Nouvelle comparaison de page Web"
+#. IDS_JUMPLIST_NEW_FOLDER_COMPARE
+#: Merge.rc:5326
+msgid "New Folder Compare"
+msgstr ""
+
#. IDS_JUMPLIST_CLIPBOARD_COMPARE
-#: Merge.rc:5316
+#: Merge.rc:5327
msgid "Clipboard Compare"
msgstr "Comparer le presse-papiers"
#. IDS_PREVIEWBAR_PRINT
-#: Merge.rc:5321
+#: Merge.rc:5332
msgid "&Print..."
msgstr "Im&primer..."
#. IDS_PREVIEWBAR_PREVPAGE
-#: Merge.rc:5323
+#: Merge.rc:5334
msgid "Pre&v Page"
msgstr "Page pré&c."
#. IDS_PREVIEWBAR_TWOPAGE
-#: Merge.rc:5324
+#: Merge.rc:5335
msgid "&Two Page"
msgstr "&Deux pages"
#. IDS_PREVIEWBAR_ONEPAGE
-#: Merge.rc:5325
+#: Merge.rc:5336
msgid "&One Page"
msgstr "&Une page"
#. IDS_PREVIEWBAR_ZOOMIN
-#: Merge.rc:5326
+#: Merge.rc:5337
msgid "Zoom &In"
msgstr "Zoom a&vant"
#. IDS_PREVIEWBAR_ZOOMOUT
-#: Merge.rc:5327
+#: Merge.rc:5338
msgid "Zoom &Out"
msgstr "Zoom a&rrière"
#. IDS_WEBPAGE_COMPARING
-#: Merge.rc:5333
+#: Merge.rc:5344
msgid "Comparing..."
msgstr "Comparaison en cours..."
#. IDS_WEBPAGE_ZOOM
-#: Merge.rc:5334
+#: Merge.rc:5345
msgid "Zoom:"
msgstr "Zoom :"
#. IDS_COPY_GRANULARITY_DIFFHUNK
-#: Merge.rc:5339
+#: Merge.rc:5350
msgid "Diff hunk"
msgstr "Différence en bloc"
#. IDS_COPY_GRANULARITY_INLINE
-#: Merge.rc:5340
+#: Merge.rc:5351
msgid "Inline diff"
msgstr "Différence en ligne"
#. IDS_COPY_GRANULARITY_LINE
-#: Merge.rc:5341
+#: Merge.rc:5352
msgid "Line"
msgstr "Ligne"
-#: Merge.rc:5342
+#: Merge.rc:5353
msgid "Character"
msgstr "Caractère"
#. ID_MICE_PREVDIFF
-#: Merge.rc:5347
+#: Merge.rc:5358
msgid ""
"\n"
"Previous Difference (Alt+Up)\n"
@@ -8166,7 +8182,7 @@ msgstr ""
"(Alt+Molette vers le haut)"
#. ID_MICE_NEXTDIFF
-#: Merge.rc:5348
+#: Merge.rc:5359
msgid ""
"\n"
"Next Difference (Alt+Down)\n"
@@ -8179,7 +8195,7 @@ msgstr ""
"(Alt+Molette vers le bas)"
#. ID_MICE_L2R
-#: Merge.rc:5349
+#: Merge.rc:5360
msgid ""
"\n"
"Copy to Right (Alt+Right)\n"
@@ -8194,7 +8210,7 @@ msgstr ""
"(Alt+Maj+Molette vers le bas)"
#. ID_MICE_R2L
-#: Merge.rc:5350
+#: Merge.rc:5361
msgid ""
"\n"
"Copy to Left (Alt+Left)\n"
@@ -8209,7 +8225,7 @@ msgstr ""
"(Alt+Maj+Molette haut)"
#. ID_MICE_L2RNEXT
-#: Merge.rc:5351
+#: Merge.rc:5362
msgid ""
"\n"
"Copy to Right and Advance (Ctrl+Alt+Right)\n"
@@ -8222,7 +8238,7 @@ msgstr ""
"(Ctrl+Alt+Maj+Molette vers le bas)"
#. ID_MICE_R2LNEXT
-#: Merge.rc:5352
+#: Merge.rc:5363
msgid ""
"\n"
"Copy to Left and Advance (Ctrl+Alt+Left)\n"
@@ -8235,257 +8251,257 @@ msgstr ""
"(Ctrl+Alt+Maj+Molette haut)"
#. IDS_LOG_COMPARING_2
-#: Merge.rc:5362
+#: Merge.rc:5373
#, c-format
msgid "Comparing %1 with %2"
msgstr "Comparaison de %1 avec %2"
#. IDS_LOG_COMPARING_3
-#: Merge.rc:5363
+#: Merge.rc:5374
#, c-format
msgid "Comparing %1 with %2 and %3"
msgstr "Comparaison de %1 avec %2 et %3"
#. IDS_LOG_COMPARE_COMPLETED
-#: Merge.rc:5364
+#: Merge.rc:5375
msgid "Comparison completed"
msgstr "Comparaison terminée"
#. IDS_LOG_COMPARE_ERROR_2
-#: Merge.rc:5365
+#: Merge.rc:5376
#, c-format
msgid "Failed to compare %1 with %2: "
msgstr "Échec de la comparaison de %1 avec %2 : "
#. IDS_LOG_COMPARE_ERROR_3
-#: Merge.rc:5366
+#: Merge.rc:5377
#, c-format
msgid "Failed to compare %1 with %2 and %3: "
msgstr "Échec de la comparaison de %1 avec %2 et %3 : "
#. IDS_LOG_FILE_SAVED
-#: Merge.rc:5367
+#: Merge.rc:5378
msgid "File saved"
msgstr "Fichier enregistré"
#. IDS_LOG_COPYING_FILES
-#: Merge.rc:5368
+#: Merge.rc:5379
msgid "Copying files..."
msgstr "Copie de fichiers en cours..."
#. IDS_LOG_MOVING_FILES
-#: Merge.rc:5369
+#: Merge.rc:5380
msgid "Moving files..."
msgstr "Déplacement de fichiers en cours..."
#. IDS_LOG_DELETING_FILES
-#: Merge.rc:5370
+#: Merge.rc:5381
msgid "Deleting files..."
msgstr "Suppression de fichiers en cours..."
#. IDS_LOG_RECYCLEBIN
-#: Merge.rc:5371
+#: Merge.rc:5382
msgid "Recycle Bin"
msgstr "Corbeille"
#. IDS_LOG_PERMANENTLY_DELETED
-#: Merge.rc:5372
+#: Merge.rc:5383
msgid "Permanently deleted"
msgstr "Supprimé définitivement"
#. IDS_LOG_FILEOPERATION_COMPLETED
-#: Merge.rc:5373
+#: Merge.rc:5384
msgid "File operation completed successfully"
msgstr "L'opération sur le fichier s'est déroulé avec succès"
#. IDS_LOG_FILEOPERATION_CANCELED
-#: Merge.rc:5374
+#: Merge.rc:5385
msgid "File operation canceled"
msgstr "L'opération sur le fichier a été annulée"
#. IDS_FILTER_ERROR_NO_ERROR
-#: Merge.rc:5379
+#: Merge.rc:5390
msgid "No error"
msgstr "Aucune erreur"
#. IDS_FILTER_ERROR_EMPTY_EXPRESSION
-#: Merge.rc:5380
+#: Merge.rc:5391
msgid "Filter expression is empty"
msgstr "L'expression de filtre est vide"
#. IDS_FILTER_ERROR_UNKNOWN_CHAR
-#: Merge.rc:5381
+#: Merge.rc:5392
msgid "Unknown character in filter expression"
msgstr "Caractère inconnu dans l'expression du filtre"
#. IDS_FILTER_ERROR_UNTERMINATED_STRING
-#: Merge.rc:5382
+#: Merge.rc:5393
msgid "Unterminated string literal"
msgstr "Littéral de chaîne non terminé"
#. IDS_FILTER_ERROR_SYNTAX_ERROR
-#: Merge.rc:5383
+#: Merge.rc:5394
msgid "Syntax error in filter expression"
msgstr "Erreur de syntaxe dans l'expression du filtre"
#. IDS_FILTER_ERROR_PARSE_FAILURE
-#: Merge.rc:5384
+#: Merge.rc:5395
msgid "Failed to parse filter expression"
msgstr "Échec de l'analyse de l'expression du filtre"
#. IDS_FILTER_ERROR_INVALID_LITERAL
-#: Merge.rc:5385
+#: Merge.rc:5396
msgid "Invalid literal value"
msgstr "Valeur littérale non valide"
#. IDS_FILTER_ERROR_INVALID_REGULAR_EXPRESSION
-#: Merge.rc:5386
+#: Merge.rc:5397
msgid "Invalid regular expression"
msgstr "Expression régulière invalide"
#. IDS_FILTER_ERROR_UNDEFINED_IDENTIFIER
-#: Merge.rc:5387
+#: Merge.rc:5398
msgid "Undefined identifier"
msgstr "Identifiant non défini"
#. IDS_FILTER_ERROR_INVALID_ARGUMENT_COUNT
-#: Merge.rc:5388
+#: Merge.rc:5399
msgid "Invalid number of arguments"
msgstr "Nombre d'arguments invalide"
#. IDS_FILTER_ERROR_FILTER_NAME_NOT_FOUND
-#: Merge.rc:5389
+#: Merge.rc:5400
msgid "Filter name not found"
msgstr "Nom du filtre introuvable"
#. IDS_FILTER_ERROR_DIVIDE_BY_ZERO
-#: Merge.rc:5390
+#: Merge.rc:5401
msgid "Division by zero in filter expression"
msgstr "Division par zéro dans l'expression du filtre"
#. IDS_FILTER_ERROR_UNKNOWN_ERROR
-#: Merge.rc:5391
+#: Merge.rc:5402
msgid "Unknown error"
msgstr "Erreur inconnue"
#. IDS_FILTER_ERROR_INVALID_PROPERTY_NAME
-#: Merge.rc:5392
+#: Merge.rc:5403
msgid "Invalid property name"
msgstr "Nom de propriété invalide"
#. IDS_FILTER_ERROR_INVALID_DIRECTIVE
-#: Merge.rc:5393
+#: Merge.rc:5404
msgid "Invalid directive"
msgstr "Directive invalide"
#. IDS_FILTER_OP_EQUALS
-#: Merge.rc:5398
+#: Merge.rc:5409
msgid "Equals"
msgstr "Égal"
#. IDS_FILTER_OP_NOT_EQUALS
-#: Merge.rc:5399
+#: Merge.rc:5410
msgid "Does not equal"
msgstr "N'est pas égal"
#. IDS_FILTER_OP_LESS_THAN
-#: Merge.rc:5400
+#: Merge.rc:5411
msgid "Less than"
msgstr "Inférieur à"
#. IDS_FILTER_OP_LESS_EQUAL
-#: Merge.rc:5401
+#: Merge.rc:5412
msgid "Less than or equal to"
msgstr "Inférieur ou égal à"
#. IDS_FILTER_OP_GREATER_EQUAL
-#: Merge.rc:5402
+#: Merge.rc:5413
msgid "Greater than or equal to"
msgstr "Supérieur ou égal à"
#. IDS_FILTER_OP_GREATER_THAN
-#: Merge.rc:5403
+#: Merge.rc:5414
msgid "Greater than"
msgstr "Supérieur à"
#. IDS_FILTER_OP_BETWEEN
-#: Merge.rc:5404
+#: Merge.rc:5415
msgid "Between"
msgstr "Entre"
#. IDS_FILTER_OP_NOT_BETWEEN
-#: Merge.rc:5405
+#: Merge.rc:5416
msgid "Not Between"
msgstr "Pas entre"
#. IDS_FILTER_OP_CONTAINS
-#: Merge.rc:5406
+#: Merge.rc:5417
msgid "Contains"
msgstr "Contient"
#. IDS_FILTER_OP_NOT_CONTAINS
-#: Merge.rc:5407
+#: Merge.rc:5418
msgid "Not Contains"
msgstr "Ne contient pas"
#. IDS_FILTER_OP_RECONTAINS
-#: Merge.rc:5408
+#: Merge.rc:5419
msgid "Contains (regex)"
msgstr "Contient (regex)"
#. IDS_FILTER_OP_NOT_RECONTAINS
-#: Merge.rc:5409
+#: Merge.rc:5420
msgid "Not Contains (regex)"
msgstr "Ne contient pas (regex)"
#. IDS_FILTER_OP_LIKE
-#: Merge.rc:5410
+#: Merge.rc:5421
msgid "Match (wildcard)"
msgstr "Correspond (caractère générique)"
#. IDS_FILTER_OP_NOT_LIKE
-#: Merge.rc:5411
+#: Merge.rc:5422
msgid "Not match (wildcard)"
msgstr "Ne correspond pas (caractère générique)"
#. IDS_FILTER_OP_MATCHES
-#: Merge.rc:5412
+#: Merge.rc:5423
msgid "Match (regex)"
msgstr "Correspond (regex)"
#. IDS_FILTER_OP_NOT_MATCHES
-#: Merge.rc:5413
+#: Merge.rc:5424
msgid "Not match (regex)"
msgstr "Ne correspond pas (regex)"
#. IDS_COLORMODE_LIGHT
-#: Merge.rc:5418
+#: Merge.rc:5429
msgid "Light"
msgstr "Clair"
#. IDS_COLORMODE_DARK
-#: Merge.rc:5419
+#: Merge.rc:5430
msgid "Dark"
msgstr "Foncé"
#. IDS_COLORMODE_FOLLOWSYSTEM
-#: Merge.rc:5420
+#: Merge.rc:5431
msgid "Follow system"
msgstr "Suivre le système"
#. IDS_EXAMPLE
-#: Merge.rc:5425
+#: Merge.rc:5436
#, c-format
msgid "e.g. %1"
msgstr "p. ex. %1"
#. IDS_DETECTED_PREVIOUS_CRASH
-#: Merge.rc:5430
+#: Merge.rc:5441
msgid "WinMerge detected a previous crash. Please report this if possible."
msgstr "WinMerge a détecté un plantage précédent. Veuillez le signaler si possible."
#. IDS_REGEX_REPLACE_LIST_TEMPLATE
-#: Merge.rc:5435
+#: Merge.rc:5446
msgid ""
"# Regex replacement list\r\n"
"# Format: regexreplacement\r\n"
@@ -8501,7 +8517,7 @@ msgstr ""
"\v\n"
#. IDS_STRING_REPLACE_LIST_TEMPLATE
-#: Merge.rc:5436
+#: Merge.rc:5447
msgid ""
"# Replacement list\r\n"
"# Format: searchreplacement\r\n"
diff --git a/Translations/WinMerge/Galician.po b/Translations/WinMerge/Galician.po
index 3b621fce997..9f4af8b456f 100644
--- a/Translations/WinMerge/Galician.po
+++ b/Translations/WinMerge/Galician.po
@@ -24,7 +24,7 @@ msgstr ""
"X-Generator: Poedit 3.4.1\n"
#. LANGUAGE, SUBLANGUAGE
-#: Merge.rc:26 Merge.rc:59 Merge.rc:5453
+#: Merge.rc:26 Merge.rc:59 Merge.rc:5464
msgid "LANG_ENGLISH, SUBLANG_ENGLISH_US"
msgstr "LANG_GALICIAN, SUBLANG_DEFAULT"
@@ -109,7 +109,7 @@ msgid "Copy Selected Diff (Right) to Clipboard\tCtrl+&3"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_SELECTLINEDIFF
-#: Merge.rc:110 Merge.rc:673
+#: Merge.rc:110 Merge.rc:680
msgid "Select Line &Difference\tF4"
msgstr "Seleccionar diferen&za de liña\tF4"
@@ -139,7 +139,7 @@ msgid "Cu&t"
msgstr "Cor&tar"
#. IDR_POPUP_DIRVIEW
-#: Merge.rc:118 Merge.rc:943
+#: Merge.rc:118 Merge.rc:951
msgid "&Copy"
msgstr "&Copiar"
@@ -149,19 +149,19 @@ msgid "&Paste"
msgstr "&Pegar"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:121 Merge.rc:875 Merge.rc:882
+#: Merge.rc:121 Merge.rc:882 Merge.rc:889
msgid "&Scripts"
msgstr "&Scripts"
#. IDS_NO_EDIT_SCRIPTS
-#: Merge.rc:123 Merge.rc:338 Merge.rc:447 Merge.rc:654 Merge.rc:659
-#: Merge.rc:865 Merge.rc:877 Merge.rc:884 Merge.rc:940 Merge.rc:1183
-#: Merge.rc:5028
+#: Merge.rc:123 Merge.rc:340 Merge.rc:451 Merge.rc:661 Merge.rc:666
+#: Merge.rc:872 Merge.rc:884 Merge.rc:891 Merge.rc:948 Merge.rc:1193
+#: Merge.rc:5038
msgid "< Empty >"
msgstr "< Baleiro >"
#. IDR_POPUP_LOCATIONBAR, ID_EDIT_WMGOTO
-#: Merge.rc:126 Merge.rc:691 Merge.rc:1081
+#: Merge.rc:126 Merge.rc:698 Merge.rc:1089
msgid "&Go to...\tCtrl+G"
msgstr "&Ir a...\tCtrl+G"
@@ -181,27 +181,27 @@ msgid "Op&en"
msgstr "A&brir"
#. IDR_POPUP_DIRVIEW, ID_DIR_OPEN_RIGHT
-#: Merge.rc:132 Merge.rc:981 Merge.rc:988 Merge.rc:995
+#: Merge.rc:132 Merge.rc:989 Merge.rc:996 Merge.rc:1003
msgid "With &Registered Application"
msgstr "Con aplicación &rexistrada (Poedit)"
#. IDR_POPUP_DIRVIEW, ID_DIR_OPEN_RIGHT_WITHEDITOR
-#: Merge.rc:133 Merge.rc:982 Merge.rc:989 Merge.rc:996
+#: Merge.rc:133 Merge.rc:990 Merge.rc:997 Merge.rc:1004
msgid "With &External Editor\tCtrl+Alt+E"
msgstr "Co &editor externo\tCtrl+Alt+E"
#. IDR_POPUP_DIRVIEW, ID_DIR_OPEN_RIGHT_WITH
-#: Merge.rc:134 Merge.rc:983 Merge.rc:990 Merge.rc:997
+#: Merge.rc:134 Merge.rc:991 Merge.rc:998 Merge.rc:1005
msgid "&With..."
msgstr "&Con..."
#. IDR_POPUP_DIRVIEW, ID_DIR_OPEN_RIGHT_PARENT_FOLDER
-#: Merge.rc:135 Merge.rc:984 Merge.rc:991 Merge.rc:998
+#: Merge.rc:135 Merge.rc:992 Merge.rc:999 Merge.rc:1006
msgid "Open &Parent Folder..."
msgstr "Abrir a car&peta raíz..."
#. IDR_POPUP_IMG_CTXT, ID_FILE_SHELLMENU
-#: Merge.rc:137 Merge.rc:1239
+#: Merge.rc:137 Merge.rc:1249
msgid "S&hell Menu"
msgstr "Menú contextual de Windows"
@@ -236,8 +236,8 @@ msgid "Ins&ertion/Deletion Detection"
msgstr "D&etección de inserción/eliminación"
#. IDR_MERGEDOCTYPE, ID_TOOLBAR_NONE
-#: Merge.rc:176 Merge.rc:209 Merge.rc:216 Merge.rc:358 Merge.rc:507
-#: Merge.rc:751
+#: Merge.rc:176 Merge.rc:209 Merge.rc:216 Merge.rc:360 Merge.rc:511
+#: Merge.rc:758
msgid "&None"
msgstr "&Ningún"
@@ -252,12 +252,12 @@ msgid "&Horizontal"
msgstr "&Horizontal"
#. IDR_POPUP_IMG_CTXT, ID_IMG_CURPANE_PREVPAGE
-#: Merge.rc:181 Merge.rc:189 Merge.rc:1230
+#: Merge.rc:181 Merge.rc:189 Merge.rc:1240
msgid "&Previous Page"
msgstr "&Páxina anterior"
#. IDS_PREVIEWBAR_NEXTPAGE
-#: Merge.rc:182 Merge.rc:190 Merge.rc:1231 Merge.rc:5322
+#: Merge.rc:182 Merge.rc:190 Merge.rc:1241 Merge.rc:5333
msgid "&Next Page"
msgstr "Páxi&na seguinte"
@@ -267,42 +267,42 @@ msgid "&Active Pane"
msgstr "P&anel activo"
#. IDR_POPUP_IMG_CTXT, ID_IMG_CURPANE_ROTATE_RIGHT_90
-#: Merge.rc:185 Merge.rc:1225
+#: Merge.rc:185 Merge.rc:1235
msgid "Rotate &Right 90deg"
msgstr "Rotar o de&reito 90 graos"
#. IDR_POPUP_IMG_CTXT, ID_IMG_CURPANE_ROTATE_LEFT_90
-#: Merge.rc:186 Merge.rc:1226
+#: Merge.rc:186 Merge.rc:1236
msgid "Rotate &Left 90deg"
msgstr "Rotar o es&querdo 90 graos"
#. IDR_POPUP_IMG_CTXT, ID_IMG_CURPANE_FLIP_VERTICALLY
-#: Merge.rc:187 Merge.rc:1227
+#: Merge.rc:187 Merge.rc:1237
msgid "Flip V&ertically"
msgstr "Voltear v&erticalmente"
#. IDR_POPUP_IMG_CTXT, ID_IMG_CURPANE_FLIP_HORIZONTALLY
-#: Merge.rc:188 Merge.rc:1228
+#: Merge.rc:188 Merge.rc:1238
msgid "Flip H&orizontally"
msgstr "Voltear h&orizontalmente"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:193 Merge.rc:699
+#: Merge.rc:193 Merge.rc:706
msgid "&Zoom"
msgstr "&Zoom"
#. IDR_MERGEDOCTYPE, ID_VIEW_ZOOMIN
-#: Merge.rc:202 Merge.rc:701
+#: Merge.rc:202 Merge.rc:708
msgid "Zoom &In\tCtrl++"
msgstr "&Aumentar zoo&m\tCtrl++"
#. IDR_MERGEDOCTYPE, ID_VIEW_ZOOMOUT
-#: Merge.rc:203 Merge.rc:702
+#: Merge.rc:203 Merge.rc:709
msgid "Zoom &Out\tCtrl+-"
msgstr "Reducir z&oom\tCtrl+-"
#. IDR_MERGEDOCTYPE, ID_VIEW_ZOOMNORMAL, Zoom to normal
-#: Merge.rc:205 Merge.rc:704
+#: Merge.rc:205 Merge.rc:711
msgid "&Normal\tCtrl+*"
msgstr "&Normal\tCtrl+*"
@@ -327,27 +327,27 @@ msgid "Dragging &Mode"
msgstr "&Modo de arrastre"
#. IDR_POPUP_IMG_CTXT, ID_IMG_DRAGGINGMODE_MOVE
-#: Merge.rc:217 Merge.rc:955 Merge.rc:1233
+#: Merge.rc:217 Merge.rc:963 Merge.rc:1243
msgid "&Move"
msgstr "&Mover"
#. IDR_POPUP_IMG_CTXT, ID_IMG_DRAGGINGMODE_ADJUST_OFFSET
-#: Merge.rc:218 Merge.rc:1234
+#: Merge.rc:218 Merge.rc:1244
msgid "&Adjust Offset"
msgstr "&Axustar desprazamento"
#. IDR_POPUP_IMG_CTXT, ID_IMG_DRAGGINGMODE_VERTICAL_WIPE
-#: Merge.rc:219 Merge.rc:1235
+#: Merge.rc:219 Merge.rc:1245
msgid "&Vertical Wipe"
msgstr "Divisor &vertical"
#. IDR_POPUP_IMG_CTXT, ID_IMG_DRAGGINGMODE_HORIZONTAL_WIPE
-#: Merge.rc:220 Merge.rc:1236
+#: Merge.rc:220 Merge.rc:1246
msgid "&Horizontal Wipe"
msgstr "Divisor &horizontal"
#. IDR_POPUP_IMG_CTXT, ID_IMG_DRAGGINGMODE_RECTANGLE_SELECT
-#: Merge.rc:221 Merge.rc:1237
+#: Merge.rc:221 Merge.rc:1247
msgid "Rectangle &Select"
msgstr "&Selección rectangular"
@@ -382,37 +382,37 @@ msgid "Compare Extracted &Text from Images"
msgstr "Comparar o &texto extraído das imaxes"
#. IDD_OPEN, IDOK
-#: Merge.rc:272 Merge.rc:1980
+#: Merge.rc:272 Merge.rc:1990
msgid "Co&mpare"
msgstr "Co&mparar"
#. IDR_POPUP_WEBPAGE_COMPARE, ID_WEB_COMPARE_SCREENSHOTS
-#: Merge.rc:274 Merge.rc:1247
+#: Merge.rc:274 Merge.rc:1257
msgid "&Screenshots"
msgstr "Captura&s de pantalla"
#. IDR_POPUP_WEBPAGE_COMPARE, ID_WEB_COMPARE_FULLSIZE_SCREENSHOTS
-#: Merge.rc:275 Merge.rc:1248
+#: Merge.rc:275 Merge.rc:1258
msgid "&Full Size Screenshots"
msgstr "Capt&uras de pantalla a tamaño completo"
#. IDR_POPUP_WEBPAGE_COMPARE, ID_WEB_COMPARE_HTMLS
-#: Merge.rc:276 Merge.rc:1249
+#: Merge.rc:276 Merge.rc:1259
msgid "&HTMLs"
msgstr "&HTMLs"
#. IDR_POPUP_WEBPAGE_COMPARE, ID_WEB_COMPARE_TEXTS
-#: Merge.rc:277 Merge.rc:1250
+#: Merge.rc:277 Merge.rc:1260
msgid "&Texts"
msgstr "&Textos"
#. IDR_POPUP_WEBPAGE_COMPARE, ID_WEB_COMPARE_RESOURCETREES
-#: Merge.rc:278 Merge.rc:1251
+#: Merge.rc:278 Merge.rc:1261
msgid "&Resource Trees"
msgstr "&Árbores de recursos"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_SIZE
-#: Merge.rc:280 Merge.rc:1775
+#: Merge.rc:280 Merge.rc:1785
msgid "&Size"
msgstr "&Tamaño"
@@ -427,27 +427,27 @@ msgid "&Event Sync"
msgstr ""
#. IDR_POPUP_WEBPAGE_SYNC_EVENTS, ID_WEB_SYNC_ENABLED
-#: Merge.rc:291 Merge.rc:1259
+#: Merge.rc:291 Merge.rc:1269
msgid "&Enabled"
msgstr "&Habilitado"
#. IDR_POPUP_WEBPAGE_SYNC_EVENTS, ID_WEB_SYNC_SCROLL
-#: Merge.rc:293 Merge.rc:1261
+#: Merge.rc:293 Merge.rc:1271
msgid "&Scroll"
msgstr "Des&plazar"
#. IDR_POPUP_WEBPAGE_SYNC_EVENTS, ID_WEB_SYNC_CLICK
-#: Merge.rc:294 Merge.rc:1262
+#: Merge.rc:294 Merge.rc:1272
msgid "&Click"
msgstr "&Clic"
#. IDR_POPUP_WEBPAGE_SYNC_EVENTS, ID_WEB_SYNC_INPUT
-#: Merge.rc:295 Merge.rc:1263
+#: Merge.rc:295 Merge.rc:1273
msgid "&Input"
msgstr "&Entrada"
#. IDR_POPUP_WEBPAGE_SYNC_EVENTS, ID_WEB_SYNC_GOBACKFORWARD
-#: Merge.rc:296 Merge.rc:1264
+#: Merge.rc:296 Merge.rc:1274
msgid "&Go Back/Forward"
msgstr "&Atrás/Adelante"
@@ -477,3607 +477,3618 @@ msgid "&All Profiles"
msgstr "&Todos os perfís"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:310 Merge.rc:411 Merge.rc:586
+#: Merge.rc:310 Merge.rc:413 Merge.rc:590
msgid "&File"
msgstr "&Arquivo"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:312 Merge.rc:413 Merge.rc:588
+#: Merge.rc:312 Merge.rc:415 Merge.rc:592
msgid "&New"
msgstr "&Novo"
#. IDR_POPUP_COMPARE, ID_MERGE_COMPARE_TEXT
-#: Merge.rc:314 Merge.rc:322 Merge.rc:415 Merge.rc:423 Merge.rc:590
-#: Merge.rc:598 Merge.rc:649 Merge.rc:935 Merge.rc:1159 Merge.rc:1171
+#: Merge.rc:314 Merge.rc:323 Merge.rc:417 Merge.rc:426 Merge.rc:594
+#: Merge.rc:603 Merge.rc:655 Merge.rc:942 Merge.rc:1167 Merge.rc:1180
msgid "&Text"
msgstr "&Texto"
#. IDR_POPUP_COMPARE, ID_MERGE_COMPARE_TABLE
-#: Merge.rc:315 Merge.rc:323 Merge.rc:416 Merge.rc:424 Merge.rc:591
-#: Merge.rc:599 Merge.rc:650 Merge.rc:936 Merge.rc:1160 Merge.rc:1172
+#: Merge.rc:315 Merge.rc:324 Merge.rc:418 Merge.rc:427 Merge.rc:595
+#: Merge.rc:604 Merge.rc:656 Merge.rc:943 Merge.rc:1168 Merge.rc:1181
msgid "T&able"
msgstr "Tábo&a"
#. IDR_POPUP_COMPARE, ID_MERGE_COMPARE_HEX
-#: Merge.rc:316 Merge.rc:324 Merge.rc:417 Merge.rc:425 Merge.rc:592
-#: Merge.rc:600 Merge.rc:651 Merge.rc:937 Merge.rc:1161 Merge.rc:1173
+#: Merge.rc:316 Merge.rc:325 Merge.rc:419 Merge.rc:428 Merge.rc:596
+#: Merge.rc:605 Merge.rc:657 Merge.rc:944 Merge.rc:1169 Merge.rc:1182
msgid "&Binary"
msgstr "&Binario"
#. IDS_IMAGE_MENU
-#: Merge.rc:317 Merge.rc:325 Merge.rc:418 Merge.rc:426 Merge.rc:593
-#: Merge.rc:601 Merge.rc:652 Merge.rc:938 Merge.rc:1162 Merge.rc:1174
-#: Merge.rc:5123
+#: Merge.rc:317 Merge.rc:326 Merge.rc:420 Merge.rc:429 Merge.rc:597
+#: Merge.rc:606 Merge.rc:658 Merge.rc:945 Merge.rc:1170 Merge.rc:1183
+#: Merge.rc:5133
msgid "&Image"
msgstr "&Imaxe"
#. IDR_POPUP_COMPARE, ID_MERGE_COMPARE_WEBPAGE
-#: Merge.rc:318 Merge.rc:326 Merge.rc:419 Merge.rc:427 Merge.rc:594
-#: Merge.rc:602 Merge.rc:653 Merge.rc:939 Merge.rc:1163 Merge.rc:1175
+#: Merge.rc:318 Merge.rc:327 Merge.rc:421 Merge.rc:430 Merge.rc:598
+#: Merge.rc:607 Merge.rc:659 Merge.rc:946 Merge.rc:1171 Merge.rc:1184
msgid "&Webpage"
msgstr "Páxina &Web"
+#. IDR_POPUP_NEW, ID_FILE_NEW_FOLDER
+#: Merge.rc:319 Merge.rc:328 Merge.rc:422 Merge.rc:431 Merge.rc:599
+#: Merge.rc:608 Merge.rc:1172
+msgid "&Folder"
+msgstr ""
+
#. IDR_MERGEDOCTYPE
-#: Merge.rc:320 Merge.rc:421 Merge.rc:596
+#: Merge.rc:321 Merge.rc:424 Merge.rc:601
msgid "New (&3 panes)"
msgstr "Novo (&3 paneis)"
#. IDR_MERGEDOCTYPE, ID_FILE_OPEN
-#: Merge.rc:328 Merge.rc:429 Merge.rc:604
+#: Merge.rc:330 Merge.rc:433 Merge.rc:610
msgid "&Open...\tCtrl+O"
msgstr "&Abrir...\tCtrl+O"
#. IDR_MERGEDOCTYPE, ID_FILE_OPENCONFLICT
-#: Merge.rc:329 Merge.rc:430 Merge.rc:605
+#: Merge.rc:331 Merge.rc:434 Merge.rc:611
msgid "Open Conflic&t File..."
msgstr "Abrir ficheiro de confli&to..."
#. IDR_MERGEDOCTYPE, ID_FILE_OPENCLIPBOARD
-#: Merge.rc:330 Merge.rc:431 Merge.rc:606
+#: Merge.rc:332 Merge.rc:435 Merge.rc:612
msgid "Open C&lipboard"
msgstr "Abrir &portapapeis"
#. IDR_POPUP_PROJECT, ID_FILE_OPENPROJECT
-#: Merge.rc:332 Merge.rc:433 Merge.rc:608 Merge.rc:1191
+#: Merge.rc:334 Merge.rc:437 Merge.rc:614 Merge.rc:1201
msgid "Open Pro&ject...\tCtrl+J"
msgstr "Abrir pro&xecto...\tCtrl+J"
#. IDD_OPEN, ID_SAVE_PROJECT
-#: Merge.rc:333 Merge.rc:434 Merge.rc:609 Merge.rc:1193 Merge.rc:1979
+#: Merge.rc:335 Merge.rc:438 Merge.rc:615 Merge.rc:1203 Merge.rc:1989
msgid "Sa&ve Project..."
msgstr "Gar&dar proxecto..."
#. IDR_MAINFRAME, ID_FILE_PROJECT_MRU_FIRST
-#: Merge.rc:335
+#: Merge.rc:337
msgid "Recent Projects"
msgstr "Proxectos recentes"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:336 Merge.rc:445 Merge.rc:657
+#: Merge.rc:338 Merge.rc:449 Merge.rc:664
msgid "Recent F&iles or Folders"
msgstr "F&icheiros ou carpetas recentes"
#. IDR_MERGEDOCTYPE, ID_APP_EXIT
-#: Merge.rc:341 Merge.rc:450 Merge.rc:662
+#: Merge.rc:343 Merge.rc:454 Merge.rc:669
msgid "E&xit\tCtrl+Q"
msgstr "S&aír\tCtrl+Q"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:343 Merge.rc:452 Merge.rc:664
+#: Merge.rc:345 Merge.rc:456 Merge.rc:671
msgid "&Edit"
msgstr "&Editar"
#. IDR_MERGEDOCTYPE, ID_EDIT_PASTE
-#: Merge.rc:345 Merge.rc:671
+#: Merge.rc:347 Merge.rc:678
msgid "&Paste\tCtrl+V"
msgstr "&Pegar\tCtrl+V"
#. IDR_MERGEDOCTYPE, ID_OPTIONS
-#: Merge.rc:347 Merge.rc:456 Merge.rc:693
+#: Merge.rc:349 Merge.rc:460 Merge.rc:700
msgid "&Options...\tCtrl+,"
msgstr "&C&onfiguración...\tCtrl+,"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:349 Merge.rc:458 Merge.rc:695
+#: Merge.rc:351 Merge.rc:462 Merge.rc:702
msgid "&View"
msgstr "&Ver"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:351 Merge.rc:500 Merge.rc:744
+#: Merge.rc:353 Merge.rc:504 Merge.rc:751
msgid "Ta&b Bar"
msgstr "&Barra de pestanas"
#. IDR_MERGEDOCTYPE, ID_VIEW_TAB_BAR
-#: Merge.rc:353 Merge.rc:502 Merge.rc:746
+#: Merge.rc:355 Merge.rc:506 Merge.rc:753
msgid "&View Tab Bar"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_VIEW_TAB_BAR_ON_TITLE_BAR
-#: Merge.rc:354 Merge.rc:503 Merge.rc:747
+#: Merge.rc:356 Merge.rc:507 Merge.rc:754
msgid "&On Title Bar"
msgstr ""
#. IDR_MERGEDOCTYPE
-#: Merge.rc:356 Merge.rc:505 Merge.rc:749
+#: Merge.rc:358 Merge.rc:509 Merge.rc:756
msgid "&Toolbar"
msgstr "Barra de ferramen&tas"
#. IDR_MERGEDOCTYPE, ID_TOOLBAR_SMALL
-#: Merge.rc:359 Merge.rc:508 Merge.rc:752
+#: Merge.rc:361 Merge.rc:512 Merge.rc:759
msgid "&Small"
msgstr "&Pequena"
#. IDR_MERGEDOCTYPE, ID_TOOLBAR_MEDIUM
-#: Merge.rc:360 Merge.rc:509 Merge.rc:753
+#: Merge.rc:362 Merge.rc:513 Merge.rc:760
msgid "&Medium"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_TOOLBAR_BIG
-#: Merge.rc:361 Merge.rc:510 Merge.rc:754
+#: Merge.rc:363 Merge.rc:514 Merge.rc:761
msgid "&Big"
msgstr "&Grande"
#. IDR_MERGEDOCTYPE, ID_TOOLBAR_HUGE
-#: Merge.rc:362 Merge.rc:511 Merge.rc:755
+#: Merge.rc:364 Merge.rc:515 Merge.rc:762
msgid "&Huge"
msgstr "&Enorme"
#. IDS_VIEW_MENU_BAR
-#: Merge.rc:364 Merge.rc:513 Merge.rc:757 Merge.rc:5357
+#: Merge.rc:366 Merge.rc:517 Merge.rc:764 Merge.rc:5368
msgid "Men&u Bar"
msgstr ""
#. IDR_DIRDOCTYPE, ID_VIEW_OUTPUT_BAR
-#: Merge.rc:365 Merge.rc:515
+#: Merge.rc:367 Merge.rc:519
msgid "&Output Pane"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_VIEW_STATUS_BAR
-#: Merge.rc:366 Merge.rc:516 Merge.rc:758
+#: Merge.rc:368 Merge.rc:520 Merge.rc:765
msgid "&Status Bar"
msgstr "Barra de e&stado"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:368 Merge.rc:539 Merge.rc:847
+#: Merge.rc:370 Merge.rc:543 Merge.rc:854
msgid "&Tools"
msgstr "Ferramen&tas"
#. IDR_MERGEDOCTYPE, ID_TOOLS_FILTERS
-#: Merge.rc:370 Merge.rc:542 Merge.rc:849
+#: Merge.rc:372 Merge.rc:546 Merge.rc:856
msgid "&Filters..."
msgstr "&Filtros..."
#. IDR_MERGEDOCTYPE, ID_TOOLS_GENERATEPATCH
-#: Merge.rc:371 Merge.rc:543 Merge.rc:850
+#: Merge.rc:373 Merge.rc:547 Merge.rc:857
msgid "&Generate Patch..."
msgstr "&Xerar parche..."
#. IDR_MERGEDOCTYPE
-#: Merge.rc:373 Merge.rc:546 Merge.rc:853
+#: Merge.rc:375 Merge.rc:550 Merge.rc:860
msgid "&Plugins"
msgstr "Com&plementos"
#. IDD_PLUGINS_LIST, IDC_PLUGIN_SETTINGS
-#: Merge.rc:375 Merge.rc:548 Merge.rc:855 Merge.rc:2494 Merge.rc:2926
+#: Merge.rc:377 Merge.rc:552 Merge.rc:862 Merge.rc:2504 Merge.rc:2936
msgid "P&lugin Settings..."
msgstr "&Configuración..."
#. IDR_MERGEDOCTYPE, ID_PREDIFFER_MANUAL
-#: Merge.rc:377 Merge.rc:550 Merge.rc:857
+#: Merge.rc:379 Merge.rc:554 Merge.rc:864
msgid "Ma&nual Prediffer"
msgstr "Precomparador ma&nual"
#. IDR_MERGEDOCTYPE, ID_PREDIFFER_AUTO
-#: Merge.rc:378 Merge.rc:551 Merge.rc:858
+#: Merge.rc:380 Merge.rc:555 Merge.rc:865
msgid "A&utomatic Prediffer"
msgstr "Precomparador a&utomático"
#. IDR_MERGEDOCTYPE, ID_UNPACK_MANUAL
-#: Merge.rc:380 Merge.rc:553 Merge.rc:860
+#: Merge.rc:382 Merge.rc:557 Merge.rc:867
msgid "&Manual Unpacking"
msgstr "Desempaquetado &manual"
#. IDR_MERGEDOCTYPE, ID_UNPACK_AUTO
-#: Merge.rc:381 Merge.rc:554 Merge.rc:861
+#: Merge.rc:383 Merge.rc:558 Merge.rc:868
msgid "&Automatic Unpacking"
msgstr "Desempaquetado &automático"
#. IDR_MERGEDOCTYPE, ID_RELOAD_PLUGINS
-#: Merge.rc:383 Merge.rc:558 Merge.rc:889
+#: Merge.rc:385 Merge.rc:562 Merge.rc:896
msgid "&Reload Plugins"
msgstr "&Recargar complementos"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:385 Merge.rc:560 Merge.rc:891
+#: Merge.rc:387 Merge.rc:564 Merge.rc:898
msgid "&Window"
msgstr "Ve&ntá"
#. IDR_MERGEDOCTYPE, ID_FILE_CLOSE
-#: Merge.rc:387 Merge.rc:562 Merge.rc:893
+#: Merge.rc:389 Merge.rc:566 Merge.rc:900
msgid "Cl&ose\tCtrl+W"
msgstr "Pe&char\tCtrl+W"
#. IDR_MERGEDOCTYPE, ID_WINDOW_CLOSEALL
-#: Merge.rc:388 Merge.rc:563 Merge.rc:894
+#: Merge.rc:390 Merge.rc:567 Merge.rc:901
msgid "Clo&se All"
msgstr "Pechar todo&s"
#. IDR_MERGEDOCTYPE, ID_NEXT_PANE
-#: Merge.rc:390 Merge.rc:565 Merge.rc:896
+#: Merge.rc:392 Merge.rc:569 Merge.rc:903
msgid "Change &Pane\tF6"
msgstr "Cambiar &panel\tF6"
#. IDR_MERGEDOCTYPE, ID_WINDOW_TILE_HORZ
-#: Merge.rc:392 Merge.rc:567 Merge.rc:900
+#: Merge.rc:394 Merge.rc:571 Merge.rc:907
msgid "Tile &Horizontally"
msgstr "Ordenar &horizontalmente"
#. IDR_MERGEDOCTYPE, ID_WINDOW_TILE_VERT
-#: Merge.rc:393 Merge.rc:568 Merge.rc:901
+#: Merge.rc:395 Merge.rc:572 Merge.rc:908
msgid "Tile &Vertically"
msgstr "Ordenar &verticalmente"
#. IDR_MERGEDOCTYPE, ID_WINDOW_CASCADE
-#: Merge.rc:394 Merge.rc:569 Merge.rc:902
+#: Merge.rc:396 Merge.rc:573 Merge.rc:909
msgid "&Cascade"
msgstr "&En fervenza"
#. IDS_MESSAGEBOX_HELP
-#: Merge.rc:396 Merge.rc:571 Merge.rc:904 Merge.rc:3200 Merge.rc:4189
+#: Merge.rc:398 Merge.rc:575 Merge.rc:911 Merge.rc:3210 Merge.rc:4199
msgid "&Help"
msgstr "A&xuda"
#. IDR_MERGEDOCTYPE, ID_HELP_CONTENTS
-#: Merge.rc:398 Merge.rc:573 Merge.rc:906
+#: Merge.rc:400 Merge.rc:577 Merge.rc:913
msgid "&WinMerge Help\tF1"
msgstr "Axuda de &WinMerge\tF1"
#. IDR_MERGEDOCTYPE, ID_HELP_RELEASENOTES
-#: Merge.rc:400 Merge.rc:575 Merge.rc:908
+#: Merge.rc:402 Merge.rc:579 Merge.rc:915
msgid "R&elease Notes"
msgstr "Notas da v&ersión (online)"
#. IDR_MERGEDOCTYPE, ID_HELP_TRANSLATIONS
-#: Merge.rc:401 Merge.rc:576 Merge.rc:909
+#: Merge.rc:403 Merge.rc:580 Merge.rc:916
msgid "&Translations"
msgstr "&Traducións (online)"
#. IDR_MERGEDOCTYPE, ID_HELP_GETCONFIG
-#: Merge.rc:402 Merge.rc:577 Merge.rc:910
+#: Merge.rc:404 Merge.rc:581 Merge.rc:917
msgid "C&onfiguration"
msgstr "Rexistro de c&onfiguración"
#. IDR_MERGEDOCTYPE, ID_HELP_GNULICENSE
-#: Merge.rc:404 Merge.rc:579 Merge.rc:912
+#: Merge.rc:406 Merge.rc:583 Merge.rc:919
msgid "&GNU General Public License"
msgstr "Licenza Pública Xeral &GNU (online)"
#. IDR_MERGEDOCTYPE, ID_APP_ABOUT
-#: Merge.rc:405 Merge.rc:580 Merge.rc:913
+#: Merge.rc:407 Merge.rc:584 Merge.rc:920
msgid "&About WinMerge..."
msgstr "&Acerca de WinMerge..."
#. IDR_MERGEDOCTYPE
-#: Merge.rc:436 Merge.rc:629
+#: Merge.rc:440 Merge.rc:635
msgid "&Read-Only"
msgstr "Só lectu&ra"
#. IDR_MERGEDOCTYPE, ID_FILE_LEFT_READONLY
-#: Merge.rc:438 Merge.rc:631
+#: Merge.rc:442 Merge.rc:637
msgid "L&eft Read-Only"
msgstr "&Esquerdo só lectura"
#. IDR_MERGEDOCTYPE, ID_FILE_MIDDLE_READONLY
-#: Merge.rc:439 Merge.rc:632
+#: Merge.rc:443 Merge.rc:638
msgid "M&iddle Read-Only"
msgstr "Cen&tral só lectura"
#. IDR_MERGEDOCTYPE, ID_FILE_RIGHT_READONLY
-#: Merge.rc:440 Merge.rc:633
+#: Merge.rc:444 Merge.rc:639
msgid "Ri&ght Read-Only"
msgstr "&Dereito só lectura"
#. IDD_ENCODINGERROR, IDC_FILEENCODING
-#: Merge.rc:443 Merge.rc:646 Merge.rc:1038 Merge.rc:3063
+#: Merge.rc:447 Merge.rc:652 Merge.rc:1046 Merge.rc:3073
msgid "&File Encoding..."
msgstr "Codi&ficación de archivo..."
#. IDR_POPUP_OUTPUTVIEW, ID_EDIT_SELECT_ALL
-#: Merge.rc:454 Merge.rc:674 Merge.rc:1343
+#: Merge.rc:458 Merge.rc:681 Merge.rc:1353
msgid "Select &All\tCtrl+A"
msgstr "S&eleccionar todo\tCtrl+A"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWIDENTICAL
-#: Merge.rc:460
+#: Merge.rc:464
msgid "Show &Identical Items"
msgstr "Mostrar elementos &idénticos"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWDIFFERENT
-#: Merge.rc:461
+#: Merge.rc:465
msgid "Show &Different Items"
msgstr "Mostrar elementos &diferentes"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWUNIQUELEFT
-#: Merge.rc:462
+#: Merge.rc:466
msgid "Show L&eft Unique Items"
msgstr "Mostrar &elementos únicos no esquerdo"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWUNIQUEMIDDLE
-#: Merge.rc:463
+#: Merge.rc:467
msgid "Show Midd&le Unique Items"
msgstr "Mostrar e&lementos únicos no central"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWUNIQUERIGHT
-#: Merge.rc:464
+#: Merge.rc:468
msgid "Show Ri&ght Unique Items"
msgstr "Mostrar elementos únicos no &dereito"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWSKIPPED
-#: Merge.rc:465
+#: Merge.rc:469
msgid "Show S&kipped Items"
msgstr "Mostrar elementos i&gnorados"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWBINARIES
-#: Merge.rc:466
+#: Merge.rc:470
msgid "S&how Binary Files"
msgstr "Mostrar arquivos &binarios"
#. IDR_DIRDOCTYPE
-#: Merge.rc:467
+#: Merge.rc:471
msgid "&3-way Compare"
msgstr "Comparación a &3 bandas"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWDIFFERENTLEFTONLY
-#: Merge.rc:469
+#: Merge.rc:473
msgid "Show &Left Only Different Items"
msgstr "Mostrar só as diferenzas á es&querda"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWDIFFERENTMIDDLEONLY
-#: Merge.rc:470
+#: Merge.rc:474
msgid "Show &Middle Only Different Items"
msgstr "Mostrar só as diferenzas do ¢ral"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWDIFFERENTRIGHTONLY
-#: Merge.rc:471
+#: Merge.rc:475
msgid "Show &Right Only Different Items"
msgstr "Mostrar só as diferenzas do de&reito"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWMISSINGLEFTONLY
-#: Merge.rc:473
+#: Merge.rc:477
msgid "Show L&eft Only Missing Items"
msgstr "Mostrar só elementos ausentes do esq&uerdo"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWMISSINGMIDDLEONLY
-#: Merge.rc:474
+#: Merge.rc:478
msgid "Show Mi&ddle Only Missing Items"
msgstr "Mostrar só elementos ausentes &do central"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWMISSINGRIGHTONLY
-#: Merge.rc:475
+#: Merge.rc:479
msgid "Show Rig&ht Only Missing Items"
msgstr "Mostrar só elementos ausentes do dere&ito"
#. IDR_DIRDOCTYPE, ID_VIEW_SHOWHIDDENITEMS
-#: Merge.rc:478
+#: Merge.rc:482
msgid "Show Hidd&en Items"
msgstr "Mostrar elementos &ocultos"
#. IDR_DIRDOCTYPE, ID_VIEW_TREEMODE
-#: Merge.rc:480
+#: Merge.rc:484
msgid "Tree &Mode"
msgstr "&Modo árbore"
#. IDR_DIRDOCTYPE
-#: Merge.rc:481
+#: Merge.rc:485
msgid "E&xpand Subfolders"
msgstr "E&xpandir subcarpetas"
#. IDR_DIRDOCTYPE, ID_VIEW_EXPAND_ALLSUBDIRS
-#: Merge.rc:483
+#: Merge.rc:487
msgid "&All Subfolders"
msgstr "Tod&as as subcarpetas"
#. IDR_DIRDOCTYPE, ID_VIEW_EXPAND_DIFFERENT_SUBDIRS
-#: Merge.rc:484
+#: Merge.rc:488
msgid "&Different Subfolders"
msgstr "Subcarpetas &diferentes"
#. IDR_DIRDOCTYPE, ID_VIEW_EXPAND_IDENTICAL_SUBDIRS
-#: Merge.rc:485
+#: Merge.rc:489
msgid "&Identical Subfolders"
msgstr "Subcarpetas &iguais"
#. IDR_DIRDOCTYPE, ID_VIEW_COLLAPSE_ALLSUBDIRS
-#: Merge.rc:487
+#: Merge.rc:491
msgid "&Collapse All Subfolders"
msgstr "Colapsar todas as s&ubcarpetas"
#. IDR_DIRDOCTYPE, ID_VIEW_SHOW_EMPTY_FOLDERS
-#: Merge.rc:488
+#: Merge.rc:492
msgid "Show &Empty Folders"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_VIEW_SELECTFONT
-#: Merge.rc:490 Merge.rc:697
+#: Merge.rc:494 Merge.rc:704
msgid "Select &Font..."
msgstr "Seleccionar &fonte..."
#. IDR_MERGEDOCTYPE, ID_VIEW_USEDEFAULTFONT
-#: Merge.rc:491 Merge.rc:698
+#: Merge.rc:495 Merge.rc:705
msgid "Use Default Font"
msgstr "Usar fonte predeterminada"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:493 Merge.rc:736
+#: Merge.rc:497 Merge.rc:743
msgid "Sw&ap Panes"
msgstr "Interc&ambiar paneis"
#. IDR_MERGEDOCTYPE, ID_SWAPPANES_SWAP12
-#: Merge.rc:495 Merge.rc:738
+#: Merge.rc:499 Merge.rc:745
msgid "Swap &1st | 2nd"
msgstr "Intercambiar &1º | 2º"
#. IDR_MERGEDOCTYPE, ID_SWAPPANES_SWAP23
-#: Merge.rc:496 Merge.rc:739
+#: Merge.rc:500 Merge.rc:746
msgid "Swap &2nd | 3rd"
msgstr "Intercambiar &2º | 3º"
#. IDR_MERGEDOCTYPE, ID_SWAPPANES_SWAP13
-#: Merge.rc:497 Merge.rc:740
+#: Merge.rc:501 Merge.rc:747
msgid "Swap 1st | &3rd"
msgstr "Intercambiar 1º | &3º"
#. IDR_DIRDOCTYPE, ID_VIEW_DISPLAY_FILTER_BAR_MENU
-#: Merge.rc:514
+#: Merge.rc:518
msgid "Displa&y Filter Bar\tCtrl+Shift+L"
msgstr ""
#. IDR_DIRDOCTYPE, ID_VIEW_DIR_STATISTICS
-#: Merge.rc:518
+#: Merge.rc:522
msgid "Com&pare Statistics..."
msgstr "Estatísticas da com¶ción..."
#. IDR_MERGEDOCTYPE, ID_REFRESH
-#: Merge.rc:520 Merge.rc:763
+#: Merge.rc:524 Merge.rc:770
msgid "Refresh\tF5"
msgstr "Actualizar\tF5"
#. IDR_POPUP_DIRVIEW, ID_RESCAN
-#: Merge.rc:521 Merge.rc:1030
+#: Merge.rc:525 Merge.rc:1038
msgid "&Refresh Selected\tCtrl+F5"
msgstr "Actualiza&r seleccionados\tCtrl+F5"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:523 Merge.rc:765
+#: Merge.rc:527 Merge.rc:772
msgid "&Merge"
msgstr "Com&binar"
#. IDR_DIRDOCTYPE, ID_MERGE_COMPARE
-#: Merge.rc:525
+#: Merge.rc:529
msgid "Co&mpare\tEnter"
msgstr "Co&mparar\tIntro"
#. IDR_MERGEDOCTYPE, ID_NEXTDIFF
-#: Merge.rc:527 Merge.rc:767
+#: Merge.rc:531 Merge.rc:774
msgid "&Next Difference\tAlt+Down"
msgstr "Diferenza segui&nte\tAlt+Abaixo"
#. IDR_MERGEDOCTYPE, ID_PREVDIFF
-#: Merge.rc:528 Merge.rc:768
+#: Merge.rc:532 Merge.rc:775
msgid "&Previous Difference\tAlt+Up"
msgstr "Diferenza &anterior\tAlt+Arriba"
#. IDR_MERGEDOCTYPE, ID_FIRSTDIFF
-#: Merge.rc:530 Merge.rc:773
+#: Merge.rc:534 Merge.rc:780
msgid "&First Difference\tAlt+Home"
msgstr "Primeira di&ferenza\tAlt+Inicio"
#. IDR_MERGEDOCTYPE, ID_CURDIFF
-#: Merge.rc:531 Merge.rc:774
+#: Merge.rc:535 Merge.rc:781
msgid "&Current Difference\tAlt+Enter"
msgstr "Diferenza a&ctual\tAlt+Intro"
#. IDR_MERGEDOCTYPE, ID_LASTDIFF
-#: Merge.rc:532 Merge.rc:775
+#: Merge.rc:536 Merge.rc:782
msgid "&Last Difference\tAlt+End"
msgstr "&Derradeira diferenza\tAlt+Fin"
#. IDR_MERGEDOCTYPE, ID_L2R
-#: Merge.rc:534 Merge.rc:830
+#: Merge.rc:538 Merge.rc:837
msgid "Copy to &Right\tAlt+Right"
msgstr "Copia&r ao dereito\tAlt+Dereita"
#. IDR_MERGEDOCTYPE, ID_R2L
-#: Merge.rc:535 Merge.rc:831
+#: Merge.rc:539 Merge.rc:838
msgid "Copy to L&eft\tAlt+Left"
msgstr "Copiar ao &esquerdo\tAlt+Esquerda"
#. IDR_DIRDOCTYPE, ID_MERGE_DELETE
-#: Merge.rc:537
+#: Merge.rc:541
msgid "&Delete\tDel"
msgstr "&Borrar\tDel"
#. IDR_POPUP_DIRVIEW, ID_TOOLS_CUSTOMIZECOLUMNS
-#: Merge.rc:541 Merge.rc:1042
+#: Merge.rc:545 Merge.rc:1050
msgid "&Customize Columns..."
msgstr "Personalizar &columnas..."
#. IDR_MERGEDOCTYPE, ID_TOOLS_GENERATEREPORT
-#: Merge.rc:544 Merge.rc:851
+#: Merge.rc:548 Merge.rc:858
msgid "Generate &Report..."
msgstr "Xe&rar informe..."
#. IDD_ENCODINGERROR, IDC_PLUGIN
-#: Merge.rc:556 Merge.rc:867 Merge.rc:3064
+#: Merge.rc:560 Merge.rc:874 Merge.rc:3074
msgid "&Edit with Unpacker..."
msgstr "&Editar co desempaquetador..."
#. IDR_MERGEDOCTYPE, ID_FILE_SAVE
-#: Merge.rc:611
+#: Merge.rc:617
msgid "&Save\tCtrl+S"
msgstr "&Gardar\tCtrl+S"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:612
+#: Merge.rc:618
msgid "Sav&e"
msgstr "Ga&rdar"
#. IDR_POPUP_SAVE, ID_FILE_SAVE_LEFT
-#: Merge.rc:614 Merge.rc:1201
+#: Merge.rc:620 Merge.rc:1211
msgid "Save &Left"
msgstr "Gardar o lado &esquerdo"
#. IDR_POPUP_SAVE, ID_FILE_SAVE_MIDDLE
-#: Merge.rc:615 Merge.rc:1202
+#: Merge.rc:621 Merge.rc:1212
msgid "Save &Middle"
msgstr "Gardar o ce&ntral"
#. IDR_POPUP_SAVE, ID_FILE_SAVE_RIGHT
-#: Merge.rc:616 Merge.rc:1203
+#: Merge.rc:622 Merge.rc:1213
msgid "Save &Right"
msgstr "Ga&rdar o dereito"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:618
+#: Merge.rc:624
msgid "Save &As"
msgstr "Gardar c&omo"
#. IDR_POPUP_SAVE, ID_FILE_SAVEAS_LEFT
-#: Merge.rc:620 Merge.rc:1205
+#: Merge.rc:626 Merge.rc:1215
msgid "Save &Left As..."
msgstr "Gardar o &esquerdo como..."
#. IDR_POPUP_SAVE, ID_FILE_SAVEAS_MIDDLE
-#: Merge.rc:621 Merge.rc:1206
+#: Merge.rc:627 Merge.rc:1216
msgid "Save &Middle As..."
msgstr "Gardar o central co&mo..."
#. IDR_POPUP_SAVE, ID_FILE_SAVEAS_RIGHT
-#: Merge.rc:622 Merge.rc:1207
+#: Merge.rc:628 Merge.rc:1217
msgid "Save &Right As..."
msgstr "Gardar o de&reito como..."
#. IDR_MERGEDOCTYPE, ID_FILE_PRINT
-#: Merge.rc:625
+#: Merge.rc:631
msgid "&Print...\tCtrl+P"
msgstr "Im&primir...\tCtrl+P"
#. IDR_MERGEDOCTYPE, ID_FILE_PAGE_SETUP
-#: Merge.rc:626
+#: Merge.rc:632
msgid "Page Set&up..."
msgstr "Config&urar páxina..."
#. IDR_MERGEDOCTYPE, ID_FILE_PRINT_PREVIEW
-#: Merge.rc:627
+#: Merge.rc:633
msgid "Print Previe&w..."
msgstr "&Vista previa da impresión..."
#. IDR_MERGEDOCTYPE
-#: Merge.rc:636
+#: Merge.rc:642
msgid "&Convert Line Endings to"
msgstr "&Converter finais de liña en"
#. IDR_MERGEDOCTYPE, ID_FILE_MERGINGMODE
-#: Merge.rc:643
+#: Merge.rc:649
msgid "Mer&ge Mode\tF9"
msgstr "&Modo combinación\tF9"
#. IDR_MERGEDOCTYPE, ID_RESCAN
-#: Merge.rc:645
+#: Merge.rc:651
msgid "Reloa&d\tCtrl+F5"
msgstr "R&ecargar\tCtrl+F5"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:647
+#: Merge.rc:653
msgid "Reco&mpare As"
msgstr "Volver a co&mparar como"
+#. IDR_POPUP_COMPARE, ID_MERGE_COMPARE_FOLDER
+#: Merge.rc:660 Merge.rc:947 Merge.rc:1185
+msgid "A&rchive"
+msgstr ""
+
#. IDR_MERGEDOCTYPE, ID_EDIT_UNDO
-#: Merge.rc:666
+#: Merge.rc:673
msgid "&Undo\tCtrl+Z"
msgstr "&Desfacer\tCtrl+Z"
#. IDR_MERGEDOCTYPE, ID_EDIT_REDO
-#: Merge.rc:667
+#: Merge.rc:674
msgid "&Redo\tCtrl+Y"
msgstr "&Refacer\tCtrl+Y"
#. IDR_MERGEDOCTYPE, ID_EDIT_CUT
-#: Merge.rc:669
+#: Merge.rc:676
msgid "Cu&t\tCtrl+X"
msgstr "Cor&tar\tCtrl+X"
#. IDR_POPUP_OUTPUTVIEW, ID_EDIT_COPY
-#: Merge.rc:670 Merge.rc:1342
+#: Merge.rc:677 Merge.rc:1352
msgid "&Copy\tCtrl+C"
msgstr "&Copiar\tCtrl+C"
#. IDR_MERGEDOCTYPE, ID_EDIT_FIND
-#: Merge.rc:676
+#: Merge.rc:683
msgid "F&ind...\tCtrl+F"
msgstr "B&uscar...\tCtrl+F"
#. IDR_MERGEDOCTYPE, ID_EDIT_REPLACE
-#: Merge.rc:677
+#: Merge.rc:684
msgid "Repla&ce...\tCtrl+H"
msgstr "Su&bstituír...\tCtrl+H"
#. IDR_MERGEDOCTYPE, ID_EDIT_MARK
-#: Merge.rc:678
+#: Merge.rc:685
msgid "&Marker...\tCtrl+Shift+M"
msgstr "&Marcador...\tCtrl+Maiús+M"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:680
+#: Merge.rc:687
msgid "Advanced"
msgstr "Avanzado"
#. IDR_MERGEDOCTYPE, ID_EDIT_COPY_LINENUMBERS
-#: Merge.rc:682
+#: Merge.rc:689
msgid "&Copy With Line Numbers\tCtrl+Shift+C"
msgstr "&Copiar cos números de liña\tCtrl+Maiús+C"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:684
+#: Merge.rc:691
msgid "&Bookmarks"
msgstr "Marcad&ores"
#. IDR_MERGEDOCTYPE, ID_EDIT_TOGGLE_BOOKMARK
-#: Merge.rc:686
+#: Merge.rc:693
msgid "&Toggle Bookmark\tCtrl+F2"
msgstr "Al&ternar marcador\tCtrl+F2"
#. IDR_MERGEDOCTYPE, ID_EDIT_GOTO_NEXT_BOOKMARK
-#: Merge.rc:687
+#: Merge.rc:694
msgid "&Next Bookmark\tF2"
msgstr "Marcador segui&nte\tF2"
#. IDR_MERGEDOCTYPE, ID_EDIT_GOTO_PREV_BOOKMARK
-#: Merge.rc:688
+#: Merge.rc:695
msgid "&Previous Bookmark\tShift+F2"
msgstr "Marcador &anterior\tMaiús+F2"
#. IDR_MERGEDOCTYPE, ID_EDIT_CLEAR_ALL_BOOKMARKS
-#: Merge.rc:689
+#: Merge.rc:696
msgid "&Clear All Bookmarks"
msgstr "Borrar todos os mar&cadores"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:706
+#: Merge.rc:713
msgid "Syntax Highlight"
msgstr "Resaltar sintaxe"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:711
+#: Merge.rc:718
msgid "&Diff Context"
msgstr "Contexto da &diferenza"
#. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_ALL
-#: Merge.rc:713
+#: Merge.rc:720
msgid "&All Lines"
msgstr "Tod&as as liñas"
#. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_0
-#: Merge.rc:715
+#: Merge.rc:722
msgid "&0 Lines"
msgstr "&0 liñas"
#. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_1
-#: Merge.rc:716
+#: Merge.rc:723
msgid "&1 Line"
msgstr "&1 liña"
#. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_3
-#: Merge.rc:717
+#: Merge.rc:724
msgid "&3 Lines"
msgstr "&3 liñas"
#. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_5
-#: Merge.rc:718
+#: Merge.rc:725
msgid "&5 Lines"
msgstr "&5 liñas"
#. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_7
-#: Merge.rc:719
+#: Merge.rc:726
msgid "&7 Lines"
msgstr "&7 liñas"
#. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_9
-#: Merge.rc:720
+#: Merge.rc:727
msgid "&9 Lines"
msgstr "&9 liñas"
#. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_TOGGLE
-#: Merge.rc:722
+#: Merge.rc:729
msgid "&Toggle All and 0-9 Lines\tCtrl+D"
msgstr "Al&ternar todo e as liñas 0-9\tCtrl+D"
#. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_INVERT
-#: Merge.rc:724
+#: Merge.rc:731
msgid "&Invert (Hide Different Lines)"
msgstr "&Invertir (ocultar liñas diferentes)"
#. IDR_MERGEDOCTYPE, ID_VIEW_RESIZE_PANES
-#: Merge.rc:727
+#: Merge.rc:734
msgid "&Lock Panes"
msgstr "B&loquear paneis"
#. IDR_MERGEDOCTYPE, ID_VIEW_WHITESPACE
-#: Merge.rc:728
+#: Merge.rc:735
msgid "&View Whitespace"
msgstr "Mostrar &espazos en branco"
#. IDR_MERGEDOCTYPE, ID_VIEW_EOL
-#: Merge.rc:729
+#: Merge.rc:736
msgid "View E&OL"
msgstr "M&ostrar finais de liña"
#. IDR_MERGEDOCTYPE, ID_VIEW_LINEDIFFS
-#: Merge.rc:730
+#: Merge.rc:737
msgid "Vie&w Line Differences"
msgstr "M&ostrar diferenzas de liña"
#. IDR_MERGEDOCTYPE, ID_VIEW_LINENUMBERS
-#: Merge.rc:731
+#: Merge.rc:738
msgid "View Line &Numbers"
msgstr "Mostrar &números de liña"
#. IDR_MERGEDOCTYPE, ID_VIEW_SELMARGIN
-#: Merge.rc:732
+#: Merge.rc:739
msgid "View &Margins"
msgstr "Mostrar &marxes"
#. IDR_MERGEDOCTYPE, ID_VIEW_TOPMARGIN
-#: Merge.rc:733
+#: Merge.rc:740
msgid "View To&p Margins"
msgstr "Mostrar marxes su&periores"
#. IDR_MERGEDOCTYPE, ID_VIEW_WORDWRAP
-#: Merge.rc:734
+#: Merge.rc:741
msgid "W&rap Lines"
msgstr "&Axuste de liñas"
#. IDR_MERGEDOCTYPE, ID_VIEW_SPLITVERTICALLY
-#: Merge.rc:742
+#: Merge.rc:749
msgid "Split V&ertically"
msgstr "Dividir &verticalmente"
#. IDR_MERGEDOCTYPE, ID_VIEW_DETAIL_BAR
-#: Merge.rc:759
+#: Merge.rc:766
msgid "Diff &Pane"
msgstr "&Panel de diferenzas"
#. IDR_MERGEDOCTYPE, ID_VIEW_LOCATION_BAR
-#: Merge.rc:760
+#: Merge.rc:767
msgid "Lo&cation Pane"
msgstr "Panel de localiza&ción"
#. IDS_OUTPUTBAR_CAPTION
-#: Merge.rc:761 Merge.rc:4902
+#: Merge.rc:768 Merge.rc:4912
msgid "Output Pane"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_NEXTCONFLICT
-#: Merge.rc:770
+#: Merge.rc:777
msgid "Ne&xt Conflict\tAlt+Shift+Down"
msgstr "Conflito se&guinte\tAlt+Maiús+Abaixo"
#. IDR_MERGEDOCTYPE, ID_PREVCONFLICT
-#: Merge.rc:771
+#: Merge.rc:778
msgid "Pre&vious Conflict\tAlt+Shift+Up"
msgstr "Conflito &anterior\tAlt+Maiús+Arriba"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:777
+#: Merge.rc:784
msgid "A&dvanced"
msgstr "Avanza&do"
#. IDR_MERGEDOCTYPE, ID_NEXTDIFFLM
-#: Merge.rc:779
+#: Merge.rc:786
msgid "Next Difference (Left/Middle)\tAlt+1"
msgstr "Diferenza seguinte entre o esquerdo e o central\tAlt+1"
#. IDR_MERGEDOCTYPE, ID_PREVDIFFLM
-#: Merge.rc:780
+#: Merge.rc:787
msgid "Previous Difference (Left/Middle)\tAlt+Shift+1"
msgstr "Diferenza anterior entre o esquerdo e o central\tAlt+Maiús+1"
#. IDR_MERGEDOCTYPE, ID_NEXTDIFFLR
-#: Merge.rc:782
+#: Merge.rc:789
msgid "Next Difference (Left/Right)\tAlt+2"
msgstr "Diferenza seguinte entre o esquerdo e o dereito\tAlt+2"
#. IDR_MERGEDOCTYPE, ID_PREVDIFFLR
-#: Merge.rc:783
+#: Merge.rc:790
msgid "Previous Difference (Left/Right)\tAlt+Shift+2"
msgstr "Diferenza anterior entre o esquerdo e o dereito\tAlt+Maiús+2"
#. IDR_MERGEDOCTYPE, ID_NEXTDIFFMR
-#: Merge.rc:785
+#: Merge.rc:792
msgid "Next Difference (Middle/Right)\tAlt+3"
msgstr "Diferenza seguinte entre o central e o dereito\tAlt+3"
#. IDR_MERGEDOCTYPE, ID_PREVDIFFMR
-#: Merge.rc:786
+#: Merge.rc:793
msgid "Previous Difference (Middle/Right)\tAlt+Shift+3"
msgstr "Diferenza anterior entre o central e o dereito\tAlt+Maiús+3"
#. IDR_MERGEDOCTYPE, ID_NEXTDIFFLO
-#: Merge.rc:788
+#: Merge.rc:795
msgid "Next Left-Only Difference\tAlt+7"
msgstr "Diferenza seguinte só no esquerdo \tAlt+7"
#. IDR_MERGEDOCTYPE, ID_PREVDIFFLO
-#: Merge.rc:789
+#: Merge.rc:796
msgid "Previous Left-Only Difference\tAlt+Shift+7"
msgstr "Diferenza anterior só no esquerdo\tAlt+Maiús+7"
#. IDR_MERGEDOCTYPE, ID_NEXTDIFFMO
-#: Merge.rc:791
+#: Merge.rc:798
msgid "Next Middle-Only Difference\tAlt+8"
msgstr "Diferenza seguinte só no central\tAlt+8"
#. IDR_MERGEDOCTYPE, ID_PREVDIFFMO
-#: Merge.rc:792
+#: Merge.rc:799
msgid "Previous Middle-Only Difference\tAlt+Shift+8"
msgstr "Diferenza anterior só no central\tAlt+Maiús+8"
#. IDR_MERGEDOCTYPE, ID_NEXTDIFFRO
-#: Merge.rc:794
+#: Merge.rc:801
msgid "Next Right-Only Difference\tAlt+9"
msgstr "Diferenza seguinte só no dereito\tAlt+9"
#. IDR_MERGEDOCTYPE, ID_PREVDIFFRO
-#: Merge.rc:795
+#: Merge.rc:802
msgid "Previous Right-Only Difference\tAlt+Shift+9"
msgstr "Diferenza anterior só no dereito\tAlt+Maiús+9"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:797
+#: Merge.rc:804
msgid "Copy from &Left to"
msgstr "Copiar do es&querdo a"
#. IDD_LOAD_SAVE_CODEPAGE, IDC_AFFECTS_MIDDLE_BTN
-#: Merge.rc:799 Merge.rc:810 Merge.rc:815 Merge.rc:826 Merge.rc:970
-#: Merge.rc:2545 Merge.rc:2817
+#: Merge.rc:806 Merge.rc:817 Merge.rc:822 Merge.rc:833 Merge.rc:978
+#: Merge.rc:2555 Merge.rc:2827
msgid "&Middle"
msgstr "&Central"
#. IDD_LOAD_SAVE_CODEPAGE, IDC_AFFECTS_RIGHT_BTN
-#: Merge.rc:800 Merge.rc:805 Merge.rc:816 Merge.rc:821 Merge.rc:971
-#: Merge.rc:2546 Merge.rc:2819
+#: Merge.rc:807 Merge.rc:812 Merge.rc:823 Merge.rc:828 Merge.rc:979
+#: Merge.rc:2556 Merge.rc:2829
msgid "&Right"
msgstr "De&reito"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:802
+#: Merge.rc:809
msgid "Copy from &Middle to"
msgstr "Co&piar do central a"
#. IDD_LOAD_SAVE_CODEPAGE, IDC_AFFECTS_LEFT_BTN
-#: Merge.rc:804 Merge.rc:809 Merge.rc:820 Merge.rc:825 Merge.rc:969
-#: Merge.rc:2544 Merge.rc:2815
+#: Merge.rc:811 Merge.rc:816 Merge.rc:827 Merge.rc:832 Merge.rc:977
+#: Merge.rc:2554 Merge.rc:2825
msgid "&Left"
msgstr "&Esquerdo"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:807
+#: Merge.rc:814
msgid "Copy from &Right to"
msgstr "Copiar do de&reito a"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:813
+#: Merge.rc:820
msgid "Copy Selected Lines from Le&ft to"
msgstr "Copiar liña(s) seleccionada(s) do es&querdo a"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:818
+#: Merge.rc:825
msgid "Copy Selected Lines from Mi&ddle to"
msgstr "Copiar liña(s) seleccionada(s) &do central a"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:823
+#: Merge.rc:830
msgid "Copy Selected Lines from Ri&ght to"
msgstr "Copiar liña(s) s&eleccionada(s) do dereito a"
#. IDR_MERGEDOCTYPE, ID_COPY_FROM_LEFT
-#: Merge.rc:833
+#: Merge.rc:840
msgid "Copy from Left\tAlt+Shift+Right"
msgstr "Copiar do esquerdo\tAlt+Maiús+Dereita"
#. IDR_MERGEDOCTYPE, ID_COPY_FROM_RIGHT
-#: Merge.rc:834
+#: Merge.rc:841
msgid "Copy from Right\tAlt+Shift+Left"
msgstr "Copiar do dereito\tAlt+Maiús+Esquerda"
#. IDR_MERGEDOCTYPE, ID_L2RNEXT
-#: Merge.rc:836
+#: Merge.rc:843
msgid "C&opy to Right and Advance\tCtrl+Alt+Right"
msgstr "C&opiar ao dereito e avanzar\tCtrl+Alt+Dereita"
#. IDR_MERGEDOCTYPE, ID_R2LNEXT
-#: Merge.rc:837
+#: Merge.rc:844
msgid "Copy &to Left and Advance\tCtrl+Alt+Left"
msgstr "Copiar ao es&querdo e avanzar\tCtrl+Alt+Esquerda"
#. IDR_MERGEDOCTYPE, ID_ALL_RIGHT
-#: Merge.rc:839
+#: Merge.rc:846
msgid "Copy &All to Right"
msgstr "Copiar todo &ao dereito"
#. IDR_MERGEDOCTYPE, ID_ALL_LEFT
-#: Merge.rc:840
+#: Merge.rc:847
msgid "Cop&y All to Left"
msgstr "Co&piar todo ao esquerdo"
#. IDR_MERGEDOCTYPE, ID_AUTO_MERGE
-#: Merge.rc:842
+#: Merge.rc:849
msgid "A&uto Merge\tCtrl+Alt+M"
msgstr "A&utomesturar\tCtrl+Alt+M"
#. IDR_MERGEDOCTYPE, ID_ADD_SYNCPOINT
-#: Merge.rc:844
+#: Merge.rc:851
msgid "Add &Synchronization Point\tAlt+S"
msgstr "Engadir punto de &sincronización\tAlt+S"
#. IDR_MERGEDOCTYPE, ID_CLEAR_SYNCPOINTS
-#: Merge.rc:845
+#: Merge.rc:852
msgid "Clear Sync&hronization Points"
msgstr "Limpar puntos de sincroni&zación"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:863
+#: Merge.rc:870
msgid "Unpac&ker"
msgstr "Desempa&quetador"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:869
+#: Merge.rc:876
msgid "&Prediffer"
msgstr "&Precomparador"
#. IDR_MERGEDOCTYPE, ID_APPLY_PREDIFFER
-#: Merge.rc:873
+#: Merge.rc:880
msgid "Apply Pre&differ..."
msgstr "Aplicar precompara&dor..."
#. IDR_MERGEDOCTYPE, ID_TRANSFORM_WITH_SCRIPT
-#: Merge.rc:879
+#: Merge.rc:886
msgid "&Transform with Editor Script..."
msgstr "&Transformar con script de edición..."
#. IDR_MERGEDOCTYPE
-#: Merge.rc:880
+#: Merge.rc:887
msgid "Scripts for &Copying"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_SELECT_EDITOR_SCRIPT_FOR_COPYING
-#: Merge.rc:886
+#: Merge.rc:893
msgid "Select &Editor Script..."
msgstr ""
#. IDR_MERGEDOCTYPE, ID_WINDOW_SPLIT
-#: Merge.rc:898
+#: Merge.rc:905
msgid "Sp&lit"
msgstr "&Dividir"
#. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE
-#: Merge.rc:921
+#: Merge.rc:928
msgid "Comp&are"
msgstr "Comp&arar"
#. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE_WITH_MOVED_RENAMED
-#: Merge.rc:922
+#: Merge.rc:929
msgid "Compar&e with Renamed/Moved Items"
msgstr ""
#. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE_IN_NEW_WINDOW
-#: Merge.rc:923
+#: Merge.rc:930
msgid "Compare in New &Window"
msgstr "Comparar nunha nova &ventá"
#. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE_NONHORIZONTALLY
-#: Merge.rc:924 Merge.rc:931
+#: Merge.rc:931 Merge.rc:938
msgid "Compare Non-hor&izontally..."
msgstr "Non comparar hor&izontalmente..."
#. IDR_POPUP_DIRVIEW
-#: Merge.rc:925
+#: Merge.rc:932
msgid "Compare Non-hor&izontally"
msgstr "Non comparar hor&izontalmente"
#. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE_LEFT1_LEFT2
-#: Merge.rc:927
+#: Merge.rc:934
msgid "First &Left with Second Left"
msgstr "Primeiro e&lemento esquerdo co segundo elemento esquerdo"
#. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE_RIGHT1_RIGHT2
-#: Merge.rc:928
+#: Merge.rc:935
msgid "First &Right with Second Right"
msgstr "Primeiro elemento de&reito co segundo elemento dereito"
#. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE_LEFT1_RIGHT2
-#: Merge.rc:929
+#: Merge.rc:936
msgid "&First Left with Second Right"
msgstr "&Primeiro elemento esquerdo co segundo elemento dereito"
#. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE_LEFT2_RIGHT1
-#: Merge.rc:930
+#: Merge.rc:937
msgid "&Second Left with First Right"
msgstr "&Segundo elemento esquerdo co primeiro elemento dereito"
#. IDR_POPUP_DIRVIEW
-#: Merge.rc:933
+#: Merge.rc:940
msgid "Co&mpare As"
msgstr "Co&mparar como"
#. IDS_COPY_LEFT_TO_MIDDLE2
-#: Merge.rc:945 Merge.rc:957 Merge.rc:4502
+#: Merge.rc:953 Merge.rc:965 Merge.rc:4512
#, c-format
msgid "Left to Middle (%1 of %2)"
msgstr "Esquerdo ao central (%1 de %2)"
#. IDS_COPY_LEFT_TO_RIGHT2
-#: Merge.rc:946 Merge.rc:958 Merge.rc:4501
+#: Merge.rc:954 Merge.rc:966 Merge.rc:4511
#, c-format
msgid "Left to Right (%1 of %2)"
msgstr "Esquerdo ao dereito (%1 de %2)"
#. IDS_MOVE_LEFT_TO2
-#: Merge.rc:947 Merge.rc:959 Merge.rc:1022 Merge.rc:4513 Merge.rc:4542
+#: Merge.rc:955 Merge.rc:967 Merge.rc:1030 Merge.rc:4523 Merge.rc:4552
#, c-format
msgid "Left to... (%1 of %2)"
msgstr "Esquerdo a... (%1 de %2)"
#. IDS_COPY_MIDDLE_TO_LEFT2
-#: Merge.rc:948 Merge.rc:960 Merge.rc:4499
+#: Merge.rc:956 Merge.rc:968 Merge.rc:4509
#, c-format
msgid "Middle to Left (%1 of %2)"
msgstr "Central ao esquerdo (%1 de %2)"
#. IDS_COPY_MIDDLE_TO_RIGHT2
-#: Merge.rc:949 Merge.rc:961 Merge.rc:4500
+#: Merge.rc:957 Merge.rc:969 Merge.rc:4510
#, c-format
msgid "Middle to Right (%1 of %2)"
msgstr "Do central ao dereito (%1 de %2)"
#. IDS_MOVE_MIDDLE_TO2
-#: Merge.rc:950 Merge.rc:962 Merge.rc:1023 Merge.rc:4514 Merge.rc:4543
+#: Merge.rc:958 Merge.rc:970 Merge.rc:1031 Merge.rc:4524 Merge.rc:4553
#, c-format
msgid "Middle to... (%1 of %2)"
msgstr "Central a... (%1 de %2)"
#. IDS_COPY_RIGHT_TO_MIDDLE2
-#: Merge.rc:951 Merge.rc:963 Merge.rc:4498
+#: Merge.rc:959 Merge.rc:971 Merge.rc:4508
#, c-format
msgid "Right to Middle (%1 of %2)"
msgstr "Dereito ao central (%1 de %2)"
#. IDS_COPY_RIGHT_TO_LEFT2
-#: Merge.rc:952 Merge.rc:964 Merge.rc:4497
+#: Merge.rc:960 Merge.rc:972 Merge.rc:4507
#, c-format
msgid "Right to Left (%1 of %2)"
msgstr "Dereito ao esquerdo (%1 de %2)"
#. IDS_MOVE_RIGHT_TO2
-#: Merge.rc:953 Merge.rc:965 Merge.rc:1024 Merge.rc:4515 Merge.rc:4544
+#: Merge.rc:961 Merge.rc:973 Merge.rc:1032 Merge.rc:4525 Merge.rc:4554
#, c-format
msgid "Right to... (%1 of %2)"
msgstr "Dereito a... (%1 de %2)"
#. IDD_EDIT_MARKER, IDC_EDIT_MARKER_DELETE
-#: Merge.rc:967 Merge.rc:2036
+#: Merge.rc:975 Merge.rc:2046
msgid "&Delete"
msgstr "&Borrar"
#. IDR_POPUP_DIRVIEW, ID_DIR_DEL_BOTH
-#: Merge.rc:972
+#: Merge.rc:980
msgid "&Both"
msgstr "Am&bos"
#. IDR_POPUP_DIRVIEW, ID_DIR_DEL_ALL
-#: Merge.rc:973
+#: Merge.rc:981
msgid "&All"
msgstr "&Todos"
#. IDD_EDIT_REPLACE, IDC_EDIT_SCOPE_SELECTION
-#: Merge.rc:974 Merge.rc:2019
+#: Merge.rc:982 Merge.rc:2029
msgid "&Selection"
msgstr "&Selección"
#. IDR_POPUP_DIRVIEW, ID_DIR_ITEM_RENAME
-#: Merge.rc:976
+#: Merge.rc:984
msgid "Re&name"
msgstr "Re&nomear"
#. IDR_POPUP_DIRVIEW, ID_DIR_HIDE_FILENAMES
-#: Merge.rc:977
+#: Merge.rc:985
msgid "&Hide Items"
msgstr "Ocultar ele&mentos"
#. IDR_POPUP_DIRVIEW
-#: Merge.rc:979
+#: Merge.rc:987
msgid "&Open Left"
msgstr "Abrir ficheir&o esquerdo"
#. IDR_POPUP_DIRVIEW
-#: Merge.rc:986
+#: Merge.rc:994
msgid "Open Midd&le"
msgstr "Abrir ficheiro centra&l"
#. IDR_POPUP_DIRVIEW
-#: Merge.rc:993
+#: Merge.rc:1001
msgid "O&pen Right"
msgstr "Abrir ficheiro &dereito"
#. IDR_POPUP_DIRVIEW
-#: Merge.rc:1001
+#: Merge.rc:1009
msgid "Cop&y Paths"
msgstr "Copiar nomes da &ruta"
#. IDS_DEL_LEFT_FMT2
-#: Merge.rc:1003 Merge.rc:1012 Merge.rc:4530
+#: Merge.rc:1011 Merge.rc:1020 Merge.rc:4540
#, c-format
msgid "Left (%1 of %2)"
msgstr "Esquerdo (%1 de %2)"
#. IDS_DEL_MIDDLE_FMT2
-#: Merge.rc:1004 Merge.rc:1013 Merge.rc:4531
+#: Merge.rc:1012 Merge.rc:1021 Merge.rc:4541
#, c-format
msgid "Middle (%1 of %2)"
msgstr "Central (%1 de %2)"
#. IDS_DEL_RIGHT_FMT2
-#: Merge.rc:1005 Merge.rc:1014 Merge.rc:4532
+#: Merge.rc:1013 Merge.rc:1022 Merge.rc:4542
#, c-format
msgid "Right (%1 of %2)"
msgstr "Dereito (%1 de %2)"
#. IDS_DEL_BOTH_FMT2
-#: Merge.rc:1006 Merge.rc:1015 Merge.rc:4533
+#: Merge.rc:1014 Merge.rc:1023 Merge.rc:4543
#, c-format
msgid "Both (%1 of %2)"
msgstr "Ambos (%1 de %2)"
#. IDS_DEL_ALL_FMT2
-#: Merge.rc:1007 Merge.rc:1016 Merge.rc:4538
+#: Merge.rc:1015 Merge.rc:1024 Merge.rc:4548
#, c-format
msgid "All (%1 of %2)"
msgstr "Todo (%1 de %2)"
#. IDR_POPUP_DIRVIEW, ID_DIR_COPY_FILENAMES
-#: Merge.rc:1009
+#: Merge.rc:1017
msgid "Copy &Filenames"
msgstr "Copiar nomes dos &ficheiros"
#. IDR_POPUP_DIRVIEW
-#: Merge.rc:1010
+#: Merge.rc:1018
msgid "Copy Items to Clip&board"
msgstr "Copiar elementos ao &portapapeis"
#. IDR_POPUP_DIRVIEW, ID_DIR_COPY_ALL_DISP_COLUMNS
-#: Merge.rc:1018
+#: Merge.rc:1026
msgid "Copy All Di&splayed Columns"
msgstr "Copiar todas as columnas mostradas"
#. IDR_POPUP_DIRVIEW
-#: Merge.rc:1020
+#: Merge.rc:1028
msgid "&Zip"
msgstr "&Zip"
#. IDS_COPY_BOTH_TO2
-#: Merge.rc:1025 Merge.rc:4516
+#: Merge.rc:1033 Merge.rc:4526
#, c-format
msgid "Both to... (%1 of %2)"
msgstr "Ambos a... (%1 de %2)"
#. IDS_COPY_ALL_TO2
-#: Merge.rc:1026 Merge.rc:4517
+#: Merge.rc:1034 Merge.rc:4527
#, c-format
msgid "All to... (%1 of %2)"
msgstr "Todo a... (%1 de %2)"
#. IDS_COPY_DIFFERENCES_TO2
-#: Merge.rc:1027 Merge.rc:4518
+#: Merge.rc:1035 Merge.rc:4528
#, c-format
msgid "Differences to... (%1 of %2)"
msgstr "Diferenzas a... (%1 de %2)"
#. IDR_POPUP_DIRVIEW, ID_DIR_SHELL_CONTEXT_MENU_LEFT
-#: Merge.rc:1032
+#: Merge.rc:1040
msgid "Left Shell Menu"
msgstr "Menú contextual esquerdo"
#. IDR_POPUP_DIRVIEW, ID_DIR_SHELL_CONTEXT_MENU_MIDDLE
-#: Merge.rc:1033
+#: Merge.rc:1041
msgid "Middle Shell Menu"
msgstr "Menú contextual central"
#. IDR_POPUP_DIRVIEW, ID_DIR_SHELL_CONTEXT_MENU_RIGHT
-#: Merge.rc:1034
+#: Merge.rc:1042
msgid "Right Shell Menu"
msgstr "Menú contextual dereito"
#. IDR_POPUP_DIRVIEW, ID_DIR_SHELL_CONTEXT_MENU_BOTH
-#: Merge.rc:1035
+#: Merge.rc:1043
msgid "Both Shell Menu"
msgstr "Os dous menús contextuais"
#. IDR_POPUP_DIRVIEW, ID_DIR_SHELL_CONTEXT_MENU_ALL
-#: Merge.rc:1036
+#: Merge.rc:1044
msgid "All Shell Menu"
msgstr "Todos os menús contextuais"
#. IDR_POPUP_EDITOR_HEADERBAR, ID_EDITOR_COPY
-#: Merge.rc:1050
+#: Merge.rc:1058
msgid "Copy"
msgstr "Copiar"
#. IDR_POPUP_EDITOR_HEADERBAR, ID_EDITOR_COPY_PATH
-#: Merge.rc:1051
+#: Merge.rc:1059
msgid "&Copy Full Path"
msgstr "&Copiar ruta completa"
#. IDR_POPUP_EDITOR_HEADERBAR, ID_EDITOR_COPY_FILENAME
-#: Merge.rc:1052
+#: Merge.rc:1060
msgid "Copy &Filename"
msgstr "Copiar nome do &ficheiro"
#. IDR_POPUP_EDITOR_HEADERBAR, ID_EDITOR_EDIT_CAPTION
-#: Merge.rc:1053
+#: Merge.rc:1061
msgid "&Edit Caption\tF2"
msgstr "&Editar título\tF2"
#. IDR_POPUP_EDITOR_HEADERBAR, ID_EDITOR_EDIT_PATH
-#: Merge.rc:1055
+#: Merge.rc:1063
msgid "Edit &Path\tCtrl+L"
msgstr ""
#. IDR_POPUP_EDITOR_HEADERBAR, ID_EDITOR_SELECT_FILE
-#: Merge.rc:1056
+#: Merge.rc:1064
msgid "&Open..."
msgstr "&Abrir..."
#. IDR_POPUP_PLUGINS_SETTINGS
-#: Merge.rc:1062
+#: Merge.rc:1070
msgid "Unpacker Settings"
msgstr "Opcións do desempaquetador"
#. IDS_USERCHOICE_NONE
-#: Merge.rc:1064 Merge.rc:1070 Merge.rc:1789 Merge.rc:1793 Merge.rc:5030
+#: Merge.rc:1072 Merge.rc:1078 Merge.rc:1799 Merge.rc:1803 Merge.rc:5040
msgid ""
msgstr ""
#. IDS_USERCHOICE_AUTOMATIC
-#: Merge.rc:1065 Merge.rc:1071 Merge.rc:5031
+#: Merge.rc:1073 Merge.rc:1079 Merge.rc:5041
msgid ""
msgstr ""
#. IDD_OPEN, IDC_SELECT_PREDIFFER
-#: Merge.rc:1066 Merge.rc:1072 Merge.rc:1970 Merge.rc:1974
+#: Merge.rc:1074 Merge.rc:1080 Merge.rc:1980 Merge.rc:1984
msgid "&Select..."
msgstr "&Seleccionar..."
#. IDR_POPUP_PLUGINS_SETTINGS
-#: Merge.rc:1068
+#: Merge.rc:1076
msgid "Prediffer Settings"
msgstr "Config. precomparación"
#. IDR_POPUP_LOCATIONBAR, ID_LOCBAR_GOTODIFF
-#: Merge.rc:1080
+#: Merge.rc:1088
msgid "G&o to Diff"
msgstr "Ir á &diferenza"
#. IDR_POPUP_LOCATIONBAR, ID_LOCBAR_MOVECURSOR_ONCLICK
-#: Merge.rc:1083
+#: Merge.rc:1091
msgid "Move Cursor on &Click"
msgstr ""
#. IDR_POPUP_LOCATIONBAR, ID_DISPLAY_MOVED_NONE
-#: Merge.rc:1085
+#: Merge.rc:1093
msgid "&No Moved Blocks"
msgstr "&Non hai bloques desprazados"
#. IDR_POPUP_LOCATIONBAR, ID_DISPLAY_MOVED_ALL
-#: Merge.rc:1086
+#: Merge.rc:1094
msgid "&All Moved Blocks"
msgstr "todos os bloques despr&azados"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS
-#: Merge.rc:1094 Merge.rc:1127
+#: Merge.rc:1102 Merge.rc:1135
msgid "W&hitespaces"
msgstr "Espazos en &branco"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_WHITESPACE_COMPARE
-#: Merge.rc:1096 Merge.rc:1129
+#: Merge.rc:1104 Merge.rc:1137
msgid "Com&pare"
msgstr "Com¶r"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_WHITESPACE_IGNORE
-#: Merge.rc:1097 Merge.rc:1130
+#: Merge.rc:1105 Merge.rc:1138
msgid "I&gnore Changes"
msgstr "I&gnorar cambios"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_WHITESPACE_IGNOREALL
-#: Merge.rc:1098 Merge.rc:1131
+#: Merge.rc:1106 Merge.rc:1139
msgid "Ig&nore All"
msgstr "Ig&norar todo"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_IGNORE_BLANKLINES
-#: Merge.rc:1100 Merge.rc:1133
+#: Merge.rc:1108 Merge.rc:1141
msgid "Ignore Blan&k Lines"
msgstr "Ignorar &liñas en branco"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_IGNORE_CASE
-#: Merge.rc:1101 Merge.rc:1134
+#: Merge.rc:1109 Merge.rc:1142
msgid "Ignore &Case"
msgstr "Ignorar MAIÚSCULAS e minús&culas"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_IGNORE_EOL
-#: Merge.rc:1102 Merge.rc:1135
+#: Merge.rc:1110 Merge.rc:1143
msgid "Igno&re EOL Differences (Windows/Unix/Mac)"
msgstr "Igno&rar diferenzas nos saltos de liña (Windows/Unix/Mac)"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_IGNORE_CODEPAGE
-#: Merge.rc:1103 Merge.rc:1136
+#: Merge.rc:1111 Merge.rc:1144
msgid "Ignore Codepage &Differences"
msgstr "Ignorar &diferenzas de codificación"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_IGNORE_NUMBERS
-#: Merge.rc:1104 Merge.rc:1137
+#: Merge.rc:1112 Merge.rc:1145
msgid "Ignore Num&bers"
msgstr "Ignorar nú&meros"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_IGNORE_COMMENTS
-#: Merge.rc:1105 Merge.rc:1138
+#: Merge.rc:1113 Merge.rc:1146
msgid "Ignore C&omment Differences"
msgstr "Ignorar diferenzas nos c&omentarios"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_IGNORE_MISSING_TRAILING_EOL
-#: Merge.rc:1106 Merge.rc:1139
+#: Merge.rc:1114 Merge.rc:1147
msgid "Ignore &Missing Trailing EOL"
msgstr ""
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_IGNORE_LINE_BREAKS
-#: Merge.rc:1107 Merge.rc:1140
+#: Merge.rc:1115 Merge.rc:1148
msgid "Ignore Line &Breaks (Treat as Spaces)"
msgstr ""
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_RECURS_CHECK
-#: Merge.rc:1109 Merge.rc:2963
+#: Merge.rc:1117 Merge.rc:2973
msgid "&Include Subfolders"
msgstr "&Incluír subcarpetas"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS
-#: Merge.rc:1110 Merge.rc:1142
+#: Merge.rc:1118 Merge.rc:1150
msgid "&Compare Method"
msgstr "Método de &comparación"
#. IDS_COMPMETHOD_FULL_CONTENTS
-#: Merge.rc:1112 Merge.rc:1144 Merge.rc:1328 Merge.rc:4282
+#: Merge.rc:1120 Merge.rc:1152 Merge.rc:1338 Merge.rc:4292
msgid "Full Contents"
msgstr "Todos os contidos"
#. IDS_COMPMETHOD_QUICK_CONTENTS
-#: Merge.rc:1113 Merge.rc:1145 Merge.rc:1329 Merge.rc:4283
+#: Merge.rc:1121 Merge.rc:1153 Merge.rc:1339 Merge.rc:4293
msgid "Quick Contents"
msgstr "Contidos breves"
#. IDS_COMPMETHOD_BINARY_CONTENTS
-#: Merge.rc:1114 Merge.rc:1146 Merge.rc:1330 Merge.rc:4284
+#: Merge.rc:1122 Merge.rc:1154 Merge.rc:1340 Merge.rc:4294
msgid "Binary Contents"
msgstr "Contidos binarios"
#. IDS_COMPMETHOD_MODDATE
-#: Merge.rc:1115 Merge.rc:1147 Merge.rc:1331 Merge.rc:4285
+#: Merge.rc:1123 Merge.rc:1155 Merge.rc:1341 Merge.rc:4295
msgid "Modified Date"
msgstr "Data de modificación"
#. IDS_COMPMETHOD_DATESIZE
-#: Merge.rc:1116 Merge.rc:1148 Merge.rc:1332 Merge.rc:4286
+#: Merge.rc:1124 Merge.rc:1156 Merge.rc:1342 Merge.rc:4296
msgid "Modified Date and Size"
msgstr "Data de modificación e tamaño"
#. IDS_COMPMETHOD_SIZE
-#: Merge.rc:1117 Merge.rc:1149 Merge.rc:1333 Merge.rc:4287
+#: Merge.rc:1125 Merge.rc:1157 Merge.rc:1343 Merge.rc:4297
msgid "Size"
msgstr "Tamaño"
#. IDS_COMPMETHOD_EXISTENCE
-#: Merge.rc:1118 Merge.rc:1150 Merge.rc:1334 Merge.rc:4288
+#: Merge.rc:1126 Merge.rc:1158 Merge.rc:1344 Merge.rc:4298
msgid "Existence"
msgstr ""
#. IDR_POPUP_PROJECT, ID_LOAD_PROJECT
-#: Merge.rc:1192
+#: Merge.rc:1202
msgid "&Load Project..."
msgstr "&Cargar proxecto..."
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARGALL
-#: Merge.rc:1272 Merge.rc:1301
+#: Merge.rc:1282 Merge.rc:1311
msgid "${*} - All Arguments"
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARG1
-#: Merge.rc:1273 Merge.rc:1302
+#: Merge.rc:1283 Merge.rc:1312
msgid "${1} - First Argument"
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARG2
-#: Merge.rc:1274 Merge.rc:1303
+#: Merge.rc:1284 Merge.rc:1313
msgid "${2} - Second Argument"
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARG3
-#: Merge.rc:1275 Merge.rc:1304
+#: Merge.rc:1285 Merge.rc:1314
msgid "${3} - Third Argument"
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARG4
-#: Merge.rc:1276 Merge.rc:1305
+#: Merge.rc:1286 Merge.rc:1315
msgid "${4} - Fourth Argument"
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARG5
-#: Merge.rc:1277 Merge.rc:1306
+#: Merge.rc:1287 Merge.rc:1316
msgid "${5} - Fifth Argument"
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARG6
-#: Merge.rc:1278 Merge.rc:1307
+#: Merge.rc:1288 Merge.rc:1317
msgid "${6} - Sixth Argument"
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARG7
-#: Merge.rc:1279 Merge.rc:1308
+#: Merge.rc:1289 Merge.rc:1318
msgid "${7} - Seventh Argument"
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARG8
-#: Merge.rc:1280 Merge.rc:1309
+#: Merge.rc:1290 Merge.rc:1319
msgid "${8} - Eighth Argument"
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARG9
-#: Merge.rc:1281 Merge.rc:1310
+#: Merge.rc:1291 Merge.rc:1320
msgid "${9} - Ninth Argument"
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_SRC_FILE
-#: Merge.rc:1289
+#: Merge.rc:1299
msgid "${SRC_FILE} - Source File"
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_SRC_FOLDER
-#: Merge.rc:1290
+#: Merge.rc:1300
msgid "${SRC_FOLDER} - Source Folder"
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_SRC_URL
-#: Merge.rc:1291
+#: Merge.rc:1301
msgid "${SRC_URL} - Source URL"
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_SRC_URL_PROTOCOL
-#: Merge.rc:1292
+#: Merge.rc:1302
msgid "${SRC_URL_PROTOCOL} - Source URL Protocol"
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_SRC_URL_SUFFIX
-#: Merge.rc:1293
+#: Merge.rc:1303
msgid "${SRC_URL_SUFFIX} - Source URL Suffix"
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_DST_FILE
-#: Merge.rc:1294
+#: Merge.rc:1304
msgid "${DST_FILE} - Destination File"
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_DST_FOLDER
-#: Merge.rc:1295
+#: Merge.rc:1305
msgid "${DST_FOLDER} - Destination Folder"
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_DST_URL
-#: Merge.rc:1296
+#: Merge.rc:1306
msgid "${DST_URL} - Destination URL"
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_DST_URL_PROTOCOL
-#: Merge.rc:1297
+#: Merge.rc:1307
msgid "${DST_URL_PROTOCOL} - Destination URL Protocol"
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_DST_URL_SUFFIX
-#: Merge.rc:1298
+#: Merge.rc:1308
msgid "${DST_URL_SUFFIX} - Destination URL Suffix"
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_WINMERGE_HOME
-#: Merge.rc:1299
+#: Merge.rc:1309
msgid "${WINMERGE_HOME} - WinMerge Home Directory"
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_SCRIPT_FILE
-#: Merge.rc:1300
+#: Merge.rc:1310
msgid "${SCRIPT_FILE} - Script File"
msgstr ""
#. IDR_POPUP_PLUGIN_ADD_MENU, ID_PLUGIN_ADD_UNPACKER
-#: Merge.rc:1318
+#: Merge.rc:1328
msgid "Add &Unpacker Plugin..."
msgstr ""
#. IDR_POPUP_PLUGIN_ADD_MENU, ID_PLUGIN_ADD_PREDIFFER
-#: Merge.rc:1319
+#: Merge.rc:1329
msgid "Add &Prediffer Plugin..."
msgstr ""
#. IDR_POPUP_PLUGIN_ADD_MENU, ID_PLUGIN_DUPLICATE
-#: Merge.rc:1320
+#: Merge.rc:1330
msgid "&Duplicate Plugin..."
msgstr ""
#. IDR_POPUP_OUTPUTVIEW, ID_EDIT_CLEAR_ALL
-#: Merge.rc:1344
+#: Merge.rc:1354
msgid "Clear &All"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_MASK_CLEAR
-#: Merge.rc:1352
+#: Merge.rc:1362
msgid "&Clear All"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_MASK_REMOVE_LAST
-#: Merge.rc:1353
+#: Merge.rc:1363
msgid "Remove Last Filter &Group"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_MASK_ALL
-#: Merge.rc:1354
+#: Merge.rc:1364
msgid "R&eset to Default (*.*)"
msgstr ""
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1355
+#: Merge.rc:1365
msgid "Add E&xclude File"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_SYS
-#: Merge.rc:1357
+#: Merge.rc:1367
msgid "&System Files"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_BACKUP
-#: Merge.rc:1358
+#: Merge.rc:1368
msgid "&Editor Backup Files"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_BIN
-#: Merge.rc:1359
+#: Merge.rc:1369
msgid "&Compiled Binary Files"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_LOG
-#: Merge.rc:1360
+#: Merge.rc:1370
msgid "&Log Files"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_TEMP
-#: Merge.rc:1361
+#: Merge.rc:1371
msgid "&Temporary or Cache Files"
msgstr ""
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1363
+#: Merge.rc:1373
msgid "Add Excl&ude Folder"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FOLDER_VCS
-#: Merge.rc:1365
+#: Merge.rc:1375
msgid "&Version Control"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FOLDER_BUILD
-#: Merge.rc:1366
+#: Merge.rc:1376
msgid "&Build Artifacts"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FOLDER_IDE
-#: Merge.rc:1367
+#: Merge.rc:1377
msgid "&IDE"
msgstr ""
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1370
+#: Merge.rc:1380
msgid "Add &File Condition"
msgstr ""
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1372 Merge.rc:1551
+#: Merge.rc:1382 Merge.rc:1561
msgid "File &Size"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_SIZE, ID_FILTERMENU_DIFF_SIZE_LT_1KB
-#: Merge.rc:1374 Merge.rc:1527 Merge.rc:1564 Merge.rc:1629 Merge.rc:1707
+#: Merge.rc:1384 Merge.rc:1537 Merge.rc:1574 Merge.rc:1639 Merge.rc:1717
msgid "Less than 1KB"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_SIZE, ID_FILTERMENU_DIFF_SIZE_GE_1KB
-#: Merge.rc:1375 Merge.rc:1528 Merge.rc:1565 Merge.rc:1630 Merge.rc:1708
+#: Merge.rc:1385 Merge.rc:1538 Merge.rc:1575 Merge.rc:1640 Merge.rc:1718
msgid "1KB or more"
msgstr ""
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_LT_10KB
-#: Merge.rc:1376 Merge.rc:1529 Merge.rc:1631
+#: Merge.rc:1386 Merge.rc:1539 Merge.rc:1641
msgid "Less than 10KB"
msgstr ""
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_GE_10KB
-#: Merge.rc:1377 Merge.rc:1530 Merge.rc:1632
+#: Merge.rc:1387 Merge.rc:1540 Merge.rc:1642
msgid "10KB or more"
msgstr ""
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_LT_100KB
-#: Merge.rc:1378 Merge.rc:1531 Merge.rc:1633
+#: Merge.rc:1388 Merge.rc:1541 Merge.rc:1643
msgid "Less than 100KB"
msgstr ""
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_GE_100KB
-#: Merge.rc:1379 Merge.rc:1532 Merge.rc:1634
+#: Merge.rc:1389 Merge.rc:1542 Merge.rc:1644
msgid "100KB or more"
msgstr ""
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_LT_1MB
-#: Merge.rc:1380 Merge.rc:1533 Merge.rc:1635
+#: Merge.rc:1390 Merge.rc:1543 Merge.rc:1645
msgid "Less than 1MB"
msgstr ""
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_GE_1MB
-#: Merge.rc:1381 Merge.rc:1534 Merge.rc:1636
+#: Merge.rc:1391 Merge.rc:1544 Merge.rc:1646
msgid "1MB or more"
msgstr ""
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_LT_10MB
-#: Merge.rc:1382 Merge.rc:1535 Merge.rc:1637
+#: Merge.rc:1392 Merge.rc:1545 Merge.rc:1647
msgid "Less than 10MB"
msgstr ""
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_GE_10MB
-#: Merge.rc:1383 Merge.rc:1536 Merge.rc:1638
+#: Merge.rc:1393 Merge.rc:1546 Merge.rc:1648
msgid "10MB or more"
msgstr ""
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_LT_100MB
-#: Merge.rc:1384 Merge.rc:1537 Merge.rc:1639
+#: Merge.rc:1394 Merge.rc:1547 Merge.rc:1649
msgid "Less than 100MB"
msgstr ""
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_GE_100MB
-#: Merge.rc:1385 Merge.rc:1538 Merge.rc:1640
+#: Merge.rc:1395 Merge.rc:1548 Merge.rc:1650
msgid "100MB or more"
msgstr ""
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_LT_1GB
-#: Merge.rc:1386 Merge.rc:1539 Merge.rc:1641
+#: Merge.rc:1396 Merge.rc:1549 Merge.rc:1651
msgid "Less than 1GB"
msgstr ""
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_GE_1GB
-#: Merge.rc:1387 Merge.rc:1642
+#: Merge.rc:1397 Merge.rc:1652
msgid "1GB or more"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_RANGE
-#: Merge.rc:1388 Merge.rc:1465 Merge.rc:1517 Merge.rc:1523 Merge.rc:1540
-#: Merge.rc:1566 Merge.rc:1587 Merge.rc:1643 Merge.rc:1709 Merge.rc:1734
+#: Merge.rc:1398 Merge.rc:1475 Merge.rc:1527 Merge.rc:1533 Merge.rc:1550
+#: Merge.rc:1576 Merge.rc:1597 Merge.rc:1653 Merge.rc:1719 Merge.rc:1744
msgid "Custom Range..."
msgstr ""
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1390 Merge.rc:1471 Merge.rc:1568
+#: Merge.rc:1400 Merge.rc:1481 Merge.rc:1578
msgid "&Last Modified"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE
-#: Merge.rc:1392 Merge.rc:1473 Merge.rc:1651
+#: Merge.rc:1402 Merge.rc:1483 Merge.rc:1661
msgid "&Hour"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_HOUR_BEFORE_1
-#: Merge.rc:1394 Merge.rc:1475 Merge.rc:1653
+#: Merge.rc:1404 Merge.rc:1485 Merge.rc:1663
msgid "More than 1 hour ago"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_HOUR_WITHIN_1
-#: Merge.rc:1395 Merge.rc:1476 Merge.rc:1654
+#: Merge.rc:1405 Merge.rc:1486 Merge.rc:1664
msgid "Within 1 hour"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE
-#: Merge.rc:1397 Merge.rc:1478 Merge.rc:1656
+#: Merge.rc:1407 Merge.rc:1488 Merge.rc:1666
msgid "&Day"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_DAY_BEFORE_TODAY
-#: Merge.rc:1399 Merge.rc:1480 Merge.rc:1658
+#: Merge.rc:1409 Merge.rc:1490 Merge.rc:1668
msgid "Before today"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_DAY_TODAY
-#: Merge.rc:1400 Merge.rc:1481 Merge.rc:1659
+#: Merge.rc:1410 Merge.rc:1491 Merge.rc:1669
msgid "Today"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_DAY_BEFORE_YESTERDAY
-#: Merge.rc:1401 Merge.rc:1482 Merge.rc:1660
+#: Merge.rc:1411 Merge.rc:1492 Merge.rc:1670
msgid "Before yesterday"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_DAY_YESTERDAY
-#: Merge.rc:1402 Merge.rc:1483 Merge.rc:1661
+#: Merge.rc:1412 Merge.rc:1493 Merge.rc:1671
msgid "Yesterday"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_DAY_SINCE_YESTERDAY
-#: Merge.rc:1403 Merge.rc:1484 Merge.rc:1662
+#: Merge.rc:1413 Merge.rc:1494 Merge.rc:1672
msgid "Since yesterday"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE
-#: Merge.rc:1405 Merge.rc:1486 Merge.rc:1664
+#: Merge.rc:1415 Merge.rc:1496 Merge.rc:1674
msgid "&Week"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_WEEK_BEFORE_THIS
-#: Merge.rc:1407 Merge.rc:1488 Merge.rc:1666
+#: Merge.rc:1417 Merge.rc:1498 Merge.rc:1676
msgid "Before this week"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_WEEK_THIS
-#: Merge.rc:1408 Merge.rc:1489 Merge.rc:1667
+#: Merge.rc:1418 Merge.rc:1499 Merge.rc:1677
msgid "This week"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_WEEK_BEFORE_LAST
-#: Merge.rc:1409 Merge.rc:1490 Merge.rc:1668
+#: Merge.rc:1419 Merge.rc:1500 Merge.rc:1678
msgid "Before last week"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_WEEK_LAST
-#: Merge.rc:1410 Merge.rc:1491 Merge.rc:1669
+#: Merge.rc:1420 Merge.rc:1501 Merge.rc:1679
msgid "Last week"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_WEEK_SINCE_LAST
-#: Merge.rc:1411 Merge.rc:1492 Merge.rc:1670
+#: Merge.rc:1421 Merge.rc:1502 Merge.rc:1680
msgid "Since last week"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE
-#: Merge.rc:1413 Merge.rc:1494 Merge.rc:1672
+#: Merge.rc:1423 Merge.rc:1504 Merge.rc:1682
msgid "&Month"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_MONTH_BEFORE_THIS
-#: Merge.rc:1415 Merge.rc:1496 Merge.rc:1674
+#: Merge.rc:1425 Merge.rc:1506 Merge.rc:1684
msgid "Before this month"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_MONTH_THIS
-#: Merge.rc:1416 Merge.rc:1497 Merge.rc:1675
+#: Merge.rc:1426 Merge.rc:1507 Merge.rc:1685
msgid "This month"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_MONTH_BEFORE_LAST
-#: Merge.rc:1417 Merge.rc:1498 Merge.rc:1676
+#: Merge.rc:1427 Merge.rc:1508 Merge.rc:1686
msgid "Before last month"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_MONTH_LAST
-#: Merge.rc:1418 Merge.rc:1499 Merge.rc:1677
+#: Merge.rc:1428 Merge.rc:1509 Merge.rc:1687
msgid "Last month"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_MONTH_SINCE_LAST
-#: Merge.rc:1419 Merge.rc:1500 Merge.rc:1678
+#: Merge.rc:1429 Merge.rc:1510 Merge.rc:1688
msgid "Since last month"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE
-#: Merge.rc:1421 Merge.rc:1502 Merge.rc:1680
+#: Merge.rc:1431 Merge.rc:1512 Merge.rc:1690
msgid "&Year"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_YEAR_BEFORE_THIS
-#: Merge.rc:1423 Merge.rc:1504 Merge.rc:1682
+#: Merge.rc:1433 Merge.rc:1514 Merge.rc:1692
msgid "Before this year"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_YEAR_THIS
-#: Merge.rc:1424 Merge.rc:1505 Merge.rc:1683
+#: Merge.rc:1434 Merge.rc:1515 Merge.rc:1693
msgid "This year"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_YEAR_BEFORE_LAST
-#: Merge.rc:1425 Merge.rc:1506 Merge.rc:1684
+#: Merge.rc:1435 Merge.rc:1516 Merge.rc:1694
msgid "Before last year"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_YEAR_LAST
-#: Merge.rc:1426 Merge.rc:1507 Merge.rc:1685
+#: Merge.rc:1436 Merge.rc:1517 Merge.rc:1695
msgid "Last year"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_YEAR_SINCE_LAST
-#: Merge.rc:1427 Merge.rc:1508 Merge.rc:1686
+#: Merge.rc:1437 Merge.rc:1518 Merge.rc:1696
msgid "Since last year"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_RANGE
-#: Merge.rc:1429 Merge.rc:1510 Merge.rc:1688
+#: Merge.rc:1439 Merge.rc:1520 Merge.rc:1698
msgid "&Custom Range..."
msgstr ""
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1431 Merge.rc:1589
+#: Merge.rc:1441 Merge.rc:1599
msgid "&Attributes"
msgstr ""
#. IDR_POPUP_FILTERMENU_ATTR, ID_FILTERMENU_ATTR_READONLY
-#: Merge.rc:1433 Merge.rc:1607
+#: Merge.rc:1443 Merge.rc:1617
msgid "Read-only files"
msgstr ""
#. IDR_POPUP_FILTERMENU_ATTR, ID_FILTERMENU_ATTR_NOT_READONLY
-#: Merge.rc:1434 Merge.rc:1608
+#: Merge.rc:1444 Merge.rc:1618
msgid "Not read-only files"
msgstr ""
#. IDR_POPUP_FILTERMENU_ATTR, ID_FILTERMENU_ATTR_HIDDEN
-#: Merge.rc:1435 Merge.rc:1609
+#: Merge.rc:1445 Merge.rc:1619
msgid "Hidden files"
msgstr ""
#. IDR_POPUP_FILTERMENU_ATTR, ID_FILTERMENU_ATTR_NOT_HIDDEN
-#: Merge.rc:1436 Merge.rc:1610
+#: Merge.rc:1446 Merge.rc:1620
msgid "Not hidden files"
msgstr ""
#. IDR_POPUP_FILTERMENU_ATTR, ID_FILTERMENU_ATTR_SYSTEM
-#: Merge.rc:1437 Merge.rc:1611
+#: Merge.rc:1447 Merge.rc:1621
msgid "System files"
msgstr ""
#. IDR_POPUP_FILTERMENU_ATTR, ID_FILTERMENU_ATTR_NOT_SYSTEM
-#: Merge.rc:1438 Merge.rc:1612
+#: Merge.rc:1448 Merge.rc:1622
msgid "Not system files"
msgstr ""
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1440
+#: Merge.rc:1450
msgid "File &Content"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_CONTAINS
-#: Merge.rc:1442
+#: Merge.rc:1452
msgid "Contains string..."
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_NOT_CONTAINS
-#: Merge.rc:1443
+#: Merge.rc:1453
msgid "Does not contain string..."
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_FIRST_LINE_CONTAINS
-#: Merge.rc:1444
+#: Merge.rc:1454
msgid "First line contains string..."
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_FIRST_LINE_NOT_CONTAINS
-#: Merge.rc:1445
+#: Merge.rc:1455
msgid "First line does not contain string..."
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_FIRST_10_CONTAINS
-#: Merge.rc:1446
+#: Merge.rc:1456
msgid "First 10 lines contain string..."
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_FIRST_10_NOT_CONTAINS
-#: Merge.rc:1447
+#: Merge.rc:1457
msgid "First 10 lines do not contain string..."
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_LAST_10_CONTAINS
-#: Merge.rc:1448
+#: Merge.rc:1458
msgid "Last 10 lines contain string..."
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_LAST_10_NOT_CONTAINS
-#: Merge.rc:1449
+#: Merge.rc:1459
msgid "Last 10 lines do not contain string..."
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_LAST_LINE_CONTAINS
-#: Merge.rc:1450
+#: Merge.rc:1460
msgid "Last line contains string..."
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_LAST_LINE_NOT_CONTAINS
-#: Merge.rc:1451
+#: Merge.rc:1461
msgid "Last line does not contain string..."
msgstr ""
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1453
+#: Merge.rc:1463
msgid "&Line Count"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_LT_10
-#: Merge.rc:1455
+#: Merge.rc:1465
msgid "Less than 10"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_GE_10
-#: Merge.rc:1456
+#: Merge.rc:1466
msgid "10 or more"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_LT_100
-#: Merge.rc:1457
+#: Merge.rc:1467
msgid "Less than 100"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_GE_100
-#: Merge.rc:1458
+#: Merge.rc:1468
msgid "100 or more"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_LT_1000
-#: Merge.rc:1459
+#: Merge.rc:1469
msgid "Less than 1000"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_GE_1000
-#: Merge.rc:1460
+#: Merge.rc:1470
msgid "1000 or more"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_LT_10000
-#: Merge.rc:1461
+#: Merge.rc:1471
msgid "Less than 10000"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_GE_10000
-#: Merge.rc:1462
+#: Merge.rc:1472
msgid "10000 or more"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_LT_100000
-#: Merge.rc:1463
+#: Merge.rc:1473
msgid "Less than 100000"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_GE_100000
-#: Merge.rc:1464
+#: Merge.rc:1474
msgid "100000 or more"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_PROPS
-#: Merge.rc:1467 Merge.rc:1594 Merge.rc:1761 Merge.rc:1778
+#: Merge.rc:1477 Merge.rc:1604 Merge.rc:1771 Merge.rc:1788
msgid "Additional &Properties..."
msgstr ""
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1469
+#: Merge.rc:1479
msgid "Add F&older Condition"
msgstr ""
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1513
+#: Merge.rc:1523
msgid "&Files"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FOLDER_FILES_EQ_0
-#: Merge.rc:1515
+#: Merge.rc:1525
msgid "0 files"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FOLDER_FILES_GE_1
-#: Merge.rc:1516
+#: Merge.rc:1526
msgid "1 file or more"
msgstr ""
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1519
+#: Merge.rc:1529
msgid "&Items"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FOLDER_ITEMS_EQ_0
-#: Merge.rc:1521
+#: Merge.rc:1531
msgid "0 items"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FOLDER_ITEMS_GE_1
-#: Merge.rc:1522
+#: Merge.rc:1532
msgid "1 item or more"
msgstr ""
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1525
+#: Merge.rc:1535
msgid "&Total Size"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FOLDER_STATS_RECURSIVE
-#: Merge.rc:1542
+#: Merge.rc:1552
msgid "&Recursive"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONDITION_ANY
-#: Merge.rc:1544
+#: Merge.rc:1554
msgid "Target: &Any (Left/Middle/Right)"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONDITION_LEFT
-#: Merge.rc:1545
+#: Merge.rc:1555
msgid "Target: &Left"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONDITION_MIDDLE
-#: Merge.rc:1546
+#: Merge.rc:1556
msgid "Target: &Middle"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONDITION_RIGHT
-#: Merge.rc:1547
+#: Merge.rc:1557
msgid "Target: &Right"
msgstr ""
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1549
+#: Merge.rc:1559
msgid "Add &Difference Condition"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_PROP, ID_FILTERMENU_DIFF_PROP_EQUAL
-#: Merge.rc:1553 Merge.rc:1570 Merge.rc:1591 Merge.rc:1696 Merge.rc:1717
-#: Merge.rc:1742
+#: Merge.rc:1563 Merge.rc:1580 Merge.rc:1601 Merge.rc:1706 Merge.rc:1727
+#: Merge.rc:1752
msgid "Equal"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_PROP, ID_FILTERMENU_DIFF_PROP_NOT_EQUAL
-#: Merge.rc:1554 Merge.rc:1571 Merge.rc:1592 Merge.rc:1697 Merge.rc:1718
-#: Merge.rc:1743
+#: Merge.rc:1564 Merge.rc:1581 Merge.rc:1602 Merge.rc:1707 Merge.rc:1728
+#: Merge.rc:1753
msgid "Not Equal"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_PROP, ID_FILTERMENU_DIFF_PROP_LESS
-#: Merge.rc:1555 Merge.rc:1572 Merge.rc:1698 Merge.rc:1719 Merge.rc:1744
+#: Merge.rc:1565 Merge.rc:1582 Merge.rc:1708 Merge.rc:1729 Merge.rc:1754
msgid "Less Than"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_PROP, ID_FILTERMENU_DIFF_PROP_LESS_EQUAL
-#: Merge.rc:1556 Merge.rc:1573 Merge.rc:1699 Merge.rc:1720 Merge.rc:1745
+#: Merge.rc:1566 Merge.rc:1583 Merge.rc:1709 Merge.rc:1730 Merge.rc:1755
msgid "Less Than or Equal to"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_PROP, ID_FILTERMENU_DIFF_PROP_GREATER
-#: Merge.rc:1557 Merge.rc:1574 Merge.rc:1700 Merge.rc:1721 Merge.rc:1746
+#: Merge.rc:1567 Merge.rc:1584 Merge.rc:1710 Merge.rc:1731 Merge.rc:1756
msgid "Greater Than"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_PROP, ID_FILTERMENU_DIFF_PROP_GREATER_EQUAL
-#: Merge.rc:1558 Merge.rc:1575 Merge.rc:1701 Merge.rc:1722 Merge.rc:1747
+#: Merge.rc:1568 Merge.rc:1585 Merge.rc:1711 Merge.rc:1732 Merge.rc:1757
msgid "Greater Than or Equal to"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_SIZE, ID_FILTERMENU_DIFF_SIZE_LT_10B
-#: Merge.rc:1560 Merge.rc:1703
+#: Merge.rc:1570 Merge.rc:1713
msgid "Less than 10B"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_SIZE, ID_FILTERMENU_DIFF_SIZE_GE_10B
-#: Merge.rc:1561 Merge.rc:1704
+#: Merge.rc:1571 Merge.rc:1714
msgid "10B or more"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_SIZE, ID_FILTERMENU_DIFF_SIZE_LT_100B
-#: Merge.rc:1562 Merge.rc:1705
+#: Merge.rc:1572 Merge.rc:1715
msgid "Less than 100B"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_SIZE, ID_FILTERMENU_DIFF_SIZE_GE_100B
-#: Merge.rc:1563 Merge.rc:1706
+#: Merge.rc:1573 Merge.rc:1716
msgid "100B or more"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_LT_1SECOND
-#: Merge.rc:1577 Merge.rc:1724
+#: Merge.rc:1587 Merge.rc:1734
msgid "Less than 1 second"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_GE_1SECOND
-#: Merge.rc:1578 Merge.rc:1725
+#: Merge.rc:1588 Merge.rc:1735
msgid "1 second or more"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_LT_1MINUTE
-#: Merge.rc:1579 Merge.rc:1726
+#: Merge.rc:1589 Merge.rc:1736
msgid "Less than 1 minute"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_GE_1MINUTE
-#: Merge.rc:1580 Merge.rc:1727
+#: Merge.rc:1590 Merge.rc:1737
msgid "1 minute or more"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_LT_1HOUR
-#: Merge.rc:1581 Merge.rc:1728
+#: Merge.rc:1591 Merge.rc:1738
msgid "Less than 1 hour"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_GE_1HOUR
-#: Merge.rc:1582 Merge.rc:1729
+#: Merge.rc:1592 Merge.rc:1739
msgid "1 hour or more"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_LT_1DAY
-#: Merge.rc:1583 Merge.rc:1730
+#: Merge.rc:1593 Merge.rc:1740
msgid "Less than 1 day"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_GE_1DAY
-#: Merge.rc:1584 Merge.rc:1731
+#: Merge.rc:1594 Merge.rc:1741
msgid "1 day or more"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_LT_1WEEK
-#: Merge.rc:1585 Merge.rc:1732
+#: Merge.rc:1595 Merge.rc:1742
msgid "Less than 1 week"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_GE_1WEEK
-#: Merge.rc:1586 Merge.rc:1733
+#: Merge.rc:1596 Merge.rc:1743
msgid "1 week or more"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_CONDITION_DIFF_LEFT_RIGHT
-#: Merge.rc:1596
+#: Merge.rc:1606
msgid "Target: &Left and Right"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_CONDITION_DIFF_LEFT_MIDDLE
-#: Merge.rc:1597
+#: Merge.rc:1607
msgid "Target: Left and &Middle"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_CONDITION_DIFF_MIDDLE_RIGHT
-#: Merge.rc:1598
+#: Merge.rc:1608
msgid "Target: Middle and &Right"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_CONDITION_DIFF_ALL
-#: Merge.rc:1599
+#: Merge.rc:1609
msgid "Target: &All"
msgstr ""
#. IDR_POPUP_FILTERMENU_BINARY, ID_FILTERMENU_BINARY_ONLY
-#: Merge.rc:1620
+#: Merge.rc:1630
msgid "Binary files only"
msgstr ""
#. IDR_POPUP_FILTERMENU_BINARY, ID_FILTERMENU_TEXT_ONLY
-#: Merge.rc:1621
+#: Merge.rc:1631
msgid "Text files only"
msgstr ""
#. IDR_POPUP_ADDCMPMENU, ID_ADDCMPMENU_CLEAR
-#: Merge.rc:1755
+#: Merge.rc:1765
msgid "&Clear conditions"
msgstr ""
#. IDR_POPUP_ADDCMPMENU, ID_ADDCMPMENU_CMP_SIZE
-#: Merge.rc:1757
+#: Merge.rc:1767
msgid "Compare &Size"
msgstr ""
#. IDR_POPUP_ADDCMPMENU, ID_ADDCMPMENU_CMP_DATE
-#: Merge.rc:1758
+#: Merge.rc:1768
msgid "Compare &Date"
msgstr ""
#. IDR_POPUP_ADDCMPMENU, ID_ADDCMPMENU_CMP_ATTR
-#: Merge.rc:1759
+#: Merge.rc:1769
msgid "Compare &Attributes"
msgstr ""
#. IDR_POPUP_ADDCMPMENU, ID_ADDCMPMENU_CMP_CONTENTS
-#: Merge.rc:1760
+#: Merge.rc:1770
msgid "Compare C&ontents"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_CLEAR
-#: Merge.rc:1769
+#: Merge.rc:1779
msgid "&Clear Keys"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_NAME
-#: Merge.rc:1771
+#: Merge.rc:1781
msgid "&Name"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_BASENAME
-#: Merge.rc:1772
+#: Merge.rc:1782
msgid "&Base name (without extension)"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_NORMALIZED_NAME
-#: Merge.rc:1773
+#: Merge.rc:1783
msgid "Normalized &Unicode Name"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_RELPATH
-#: Merge.rc:1774
+#: Merge.rc:1784
msgid "&Relative Path"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_DATE
-#: Merge.rc:1776
+#: Merge.rc:1786
msgid "&Date"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_HASH_MD5
-#: Merge.rc:1777
+#: Merge.rc:1787
msgid "&Hash (MD5)"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_REPLACE
-#: Merge.rc:1780
+#: Merge.rc:1790
msgid "Insert &replace() Function"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_REGEXREPLACE
-#: Merge.rc:1781
+#: Merge.rc:1791
msgid "Insert rege&xReplace() Function"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU
-#: Merge.rc:1782
+#: Merge.rc:1792
msgid "Replace &Lists"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_CREATE_REPLACELIST
-#: Merge.rc:1784
+#: Merge.rc:1794
msgid "&Create String Replace List and Insert..."
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_CREATE_REGEXREPLACELIST
-#: Merge.rc:1785
+#: Merge.rc:1795
msgid "Create &Regex Replace List and Insert..."
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU
-#: Merge.rc:1787
+#: Merge.rc:1797
msgid "&String Replace Lists"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU
-#: Merge.rc:1791
+#: Merge.rc:1801
msgid "Re&gex Replace Lists"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_STRING_REPLACE_LISTS_FOLDER
-#: Merge.rc:1796
+#: Merge.rc:1806
msgid "Open String Replace Lists Folder..."
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_REGEX_REPLACE_LISTS_FOLDER
-#: Merge.rc:1797
+#: Merge.rc:1807
msgid "Open Regex Replace Lists Folder..."
msgstr ""
#. IDD_FILTERS_CONDITION, IDC_CONDITION_MATCHCASE
-#: Merge.rc:1799 Merge.rc:1995 Merge.rc:2014 Merge.rc:2042 Merge.rc:2585
+#: Merge.rc:1809 Merge.rc:2005 Merge.rc:2024 Merge.rc:2052 Merge.rc:2595
msgid "Match &case"
msgstr "&Coincidir MAIÚSCULAS e minúsculas"
#. IDR_POPUP_RENAMEMOVE_MENU
-#: Merge.rc:1801
+#: Merge.rc:1811
msgid "Text &Normalization"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_TOLOWER
-#: Merge.rc:1803
+#: Merge.rc:1813
msgid "&Lowercase"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_TOUPPER
-#: Merge.rc:1804
+#: Merge.rc:1814
msgid "&Uppercase"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_TOHALFWIDTH
-#: Merge.rc:1805
+#: Merge.rc:1815
msgid "&Half-width"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_TOFULLWIDTH
-#: Merge.rc:1806
+#: Merge.rc:1816
msgid "&Full-width"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU
-#: Merge.rc:1807
+#: Merge.rc:1817
msgid "&Chinese Conversion"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_TOSIMPLIFIEDCHINESE
-#: Merge.rc:1809
+#: Merge.rc:1819
msgid "&Simplified Chinese"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_TOTRADITIONALCHINESE
-#: Merge.rc:1810
+#: Merge.rc:1820
msgid "&Traditional Chinese"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU
-#: Merge.rc:1812
+#: Merge.rc:1822
msgid "&Japanese Conversion"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_TOHIRAGANA
-#: Merge.rc:1814
+#: Merge.rc:1824
msgid "&Hiragana"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_TOKATAKANA
-#: Merge.rc:1815
+#: Merge.rc:1825
msgid "&Katakana"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_NORMALIZEUNICODE
-#: Merge.rc:1817
+#: Merge.rc:1827
msgid "Normalize &Unicode"
msgstr ""
#. IDD_ABOUTBOX
-#: Merge.rc:1932
+#: Merge.rc:1942
msgid "About WinMerge"
msgstr "Acerca de WinMerge"
#. IDD_ABOUTBOX, IDC_WWW
-#: Merge.rc:1936
+#: Merge.rc:1946
msgid "Visit the WinMerge Homepage!"
msgstr "¡Visite a páxina web de WinMerge!"
#. IDD_PLUGINS_EDITPLUGIN, IDOK
-#: Merge.rc:1938 Merge.rc:2080 Merge.rc:2431 Merge.rc:2455 Merge.rc:2469
-#: Merge.rc:2497 Merge.rc:2588 Merge.rc:2613 Merge.rc:2674 Merge.rc:2691
-#: Merge.rc:2703 Merge.rc:2867 Merge.rc:2927 Merge.rc:3062 Merge.rc:3104
-#: Merge.rc:3147 Merge.rc:3197
+#: Merge.rc:1948 Merge.rc:2090 Merge.rc:2441 Merge.rc:2465 Merge.rc:2479
+#: Merge.rc:2507 Merge.rc:2598 Merge.rc:2623 Merge.rc:2684 Merge.rc:2701
+#: Merge.rc:2713 Merge.rc:2877 Merge.rc:2937 Merge.rc:3072 Merge.rc:3114
+#: Merge.rc:3157 Merge.rc:3207
msgid "OK"
msgstr "Aceptar"
#. IDD_ABOUTBOX, IDC_OPEN_CONTRIBUTORS
-#: Merge.rc:1939
+#: Merge.rc:1949
msgid "Contributors"
msgstr "Colaboradores"
#. IDD_SELECT_FILES_OR_FOLDERS
-#: Merge.rc:1945 Merge.rc:3070
+#: Merge.rc:1955 Merge.rc:3080
msgid "Select Files or Folders"
msgstr "Seleccione ficheiros ou carpetas"
#. IDD_OPEN, IDC_FILES_DIRS_GROUP0
-#: Merge.rc:1949
+#: Merge.rc:1959
msgid "&1st File or Folder"
msgstr "&1º ficheiro ou carpeta"
#. IDD_OPEN, IDC_PATH0_READONLY
-#: Merge.rc:1951
+#: Merge.rc:1961
msgid "Re&ad-only"
msgstr "Só lectur&a"
#. IDD_OPEN, IDC_SWAP01_STATIC
-#: Merge.rc:1953
+#: Merge.rc:1963
msgid "Swap 1st | 2nd"
msgstr "Intercambiar 1º por 2º"
#. IDD_GENERATE_PATCH, IDC_DIFF_BROWSE_FILE1
-#: Merge.rc:1954 Merge.rc:2310 Merge.rc:2413
+#: Merge.rc:1964 Merge.rc:2320 Merge.rc:2423
msgid "&Browse..."
msgstr "&Examinar..."
#. IDD_OPEN, IDC_FILES_DIRS_GROUP1
-#: Merge.rc:1955
+#: Merge.rc:1965
msgid "&2nd File or Folder"
msgstr "&2º ficheiro ou carpeta"
#. IDD_OPEN, IDC_PATH1_READONLY
-#: Merge.rc:1957
+#: Merge.rc:1967
msgid "Rea&d-only"
msgstr "Só lec&tura"
#. IDD_OPEN, IDC_SWAP12_STATIC
-#: Merge.rc:1959
+#: Merge.rc:1969
msgid "Swap 2nd | 3rd"
msgstr "Intercambiar 2º | 3º"
#. IDD_PROPPAGE_SYSTEM, IDC_FILTER_USER_BROWSE
-#: Merge.rc:1960 Merge.rc:2315
+#: Merge.rc:1970 Merge.rc:2325
msgid "B&rowse..."
msgstr "Examina&r..."
#. IDD_OPEN, IDC_FILES_DIRS_GROUP2
-#: Merge.rc:1961
+#: Merge.rc:1971
msgid "&3rd File or Folder (Optional)"
msgstr "&3º ficheiro ou carpeta (opcional)"
#. IDD_OPEN, IDC_PATH2_READONLY
-#: Merge.rc:1963
+#: Merge.rc:1973
msgid "Read-o&nly"
msgstr "S&ó lectura"
#. IDD_OPEN, IDC_SWAP02_STATIC
-#: Merge.rc:1965
+#: Merge.rc:1975
msgid "Swap 1st | 3rd"
msgstr "Intercambiar 1º por 3º"
#. IDD_PROPPAGE_BACKUPS, IDC_BACKUP_BROWSE
-#: Merge.rc:1966 Merge.rc:2685 Merge.rc:2883
+#: Merge.rc:1976 Merge.rc:2695 Merge.rc:2893
msgid "Browse..."
msgstr "Examinar..."
#. IDD_OPEN, IDC_FILES_DIRS_GROUP3
-#: Merge.rc:1968
+#: Merge.rc:1978
msgid " Folder: Filter"
msgstr " Carpeta: filtro"
#. IDD_OPEN, IDC_RECURS_CHECK
-#: Merge.rc:1971
+#: Merge.rc:1981
msgid "&Include subfolders"
msgstr "&Incluír subcarpetas"
#. IDD_OPEN, IDC_FILES_DIRS_GROUP5
-#: Merge.rc:1972
+#: Merge.rc:1982
msgid " File: Prediffer Plugin"
msgstr " Complemento precomparador"
#. IDD_OPEN, IDC_FILES_DIRS_GROUP4
-#: Merge.rc:1976
+#: Merge.rc:1986
msgid " File: Unpacker Plugin"
msgstr " Complemento desempaquetador"
#. IDD_OPEN, IDC_SELECT_UNPACKER
-#: Merge.rc:1978
+#: Merge.rc:1988
msgid "Se&lect..."
msgstr "Se&leccionar..."
#. IDD_PLUGINS_EDITPLUGIN, IDCANCEL
-#: Merge.rc:1981 Merge.rc:2001 Merge.rc:2025 Merge.rc:2046 Merge.rc:2081
-#: Merge.rc:2432 Merge.rc:2456 Merge.rc:2470 Merge.rc:2498 Merge.rc:2551
-#: Merge.rc:2589 Merge.rc:2614 Merge.rc:2675 Merge.rc:2692 Merge.rc:2704
-#: Merge.rc:2868 Merge.rc:2928 Merge.rc:3087 Merge.rc:3105 Merge.rc:3148
-#: Merge.rc:3198
+#: Merge.rc:1991 Merge.rc:2011 Merge.rc:2035 Merge.rc:2056 Merge.rc:2091
+#: Merge.rc:2442 Merge.rc:2466 Merge.rc:2480 Merge.rc:2508 Merge.rc:2561
+#: Merge.rc:2599 Merge.rc:2624 Merge.rc:2685 Merge.rc:2702 Merge.rc:2714
+#: Merge.rc:2878 Merge.rc:2938 Merge.rc:3097 Merge.rc:3115 Merge.rc:3158
+#: Merge.rc:3208
msgid "Cancel"
msgstr "Cancelar"
#. IDD_OPEN, IDC_OPEN_STATUS
-#: Merge.rc:1982
+#: Merge.rc:1992
msgid "Status:"
msgstr "Estado:"
#. IDD_PLUGINS_LIST, ID_HELP
-#: Merge.rc:1983 Merge.rc:2082 Merge.rc:2929
+#: Merge.rc:1993 Merge.rc:2092 Merge.rc:2939
msgid "Help"
msgstr "Axuda"
#. IDD_OPEN, IDC_OPTIONS
-#: Merge.rc:1984
+#: Merge.rc:1994
msgid "&Options..."
msgstr "&C&onfiguración..."
#. IDD_EDIT_FIND
-#: Merge.rc:1989
+#: Merge.rc:1999
msgid "Find"
msgstr "Buscar"
#. IDD_EDIT_MARKER, IDC_STATIC
-#: Merge.rc:1992 Merge.rc:2009 Merge.rc:2037
+#: Merge.rc:2002 Merge.rc:2019 Merge.rc:2047
msgid "Fi&nd what:"
msgstr "Que &buscar:"
#. IDD_EDIT_MARKER, IDC_EDIT_WHOLE_WORD
-#: Merge.rc:1994 Merge.rc:2013 Merge.rc:2041
+#: Merge.rc:2004 Merge.rc:2023 Merge.rc:2051
msgid "Match &whole word only"
msgstr "Só &palabras completas"
#. IDD_EDIT_MARKER, IDC_EDIT_REGEXP
-#: Merge.rc:1996 Merge.rc:2015 Merge.rc:2043
+#: Merge.rc:2006 Merge.rc:2025 Merge.rc:2053
msgid "Regular &expression"
msgstr "&Expresión regular"
#. IDD_EDIT_FIND, IDC_FINDDLG_DONTWRAP
-#: Merge.rc:1997
+#: Merge.rc:2007
msgid "D&on't wrap end of file"
msgstr "Deterse ao final do arquiv&o"
#. IDD_EDIT_FIND, IDC_FINDDLG_DONTCLOSE
-#: Merge.rc:1998
+#: Merge.rc:2008
msgid "&Don't close this dialog"
msgstr "Non pechar este ca&dro de diálogo"
#. IDD_EDIT_REPLACE, IDC_EDIT_SKIP
-#: Merge.rc:1999 Merge.rc:2021
+#: Merge.rc:2009 Merge.rc:2031
msgid "&Find Next"
msgstr "&Seguinte"
#. IDD_EDIT_FIND, IDC_EDIT_FINDPREV
-#: Merge.rc:2000
+#: Merge.rc:2010
msgid "Find &Prev"
msgstr "&Anterior"
#. IDD_EDIT_REPLACE
-#: Merge.rc:2006
+#: Merge.rc:2016
msgid "Replace"
msgstr "Substituír"
#. IDD_EDIT_REPLACE, IDC_STATIC
-#: Merge.rc:2011
+#: Merge.rc:2021
msgid "Re&place with:"
msgstr "&Substituír con:"
#. IDD_EDIT_REPLACE, IDC_EDIT_SCOPE_DONT_WRAP
-#: Merge.rc:2016
+#: Merge.rc:2026
msgid "&Don't wrap at end of file"
msgstr "Deterse ao final &do arquivo"
#. IDD_EDIT_REPLACE, IDC_STATIC
-#: Merge.rc:2018
+#: Merge.rc:2028
msgid "Replace in"
msgstr "Substituír en"
#. IDD_EDIT_REPLACE, IDC_EDIT_SCOPE_WHOLE_FILE
-#: Merge.rc:2020
+#: Merge.rc:2030
msgid "Wh&ole file"
msgstr "T&odo o ficheiro"
#. IDD_EDIT_REPLACE, IDC_EDIT_FINDPREV
-#: Merge.rc:2022
+#: Merge.rc:2032
msgid "Find Pre&v"
msgstr "Buscar an&terior"
#. IDD_EDIT_REPLACE, IDC_EDIT_REPLACE
-#: Merge.rc:2023
+#: Merge.rc:2033
msgid "&Replace"
msgstr "Substituí&r"
#. IDD_EDIT_REPLACE, IDC_EDIT_REPLACE_ALL
-#: Merge.rc:2024
+#: Merge.rc:2034
msgid "Replace &All"
msgstr "Cambi&ar todo"
#. IDS_OPTIONSPG_MARKERCOLORS
-#: Merge.rc:2030 Merge.rc:4209
+#: Merge.rc:2040 Merge.rc:4219
msgid "Markers"
msgstr "Marcadores"
#. IDD_EDIT_MARKER, IDC_EDIT_MARKERS_ENABLED
-#: Merge.rc:2033
+#: Merge.rc:2043
msgid "Enable &markers"
msgstr "Habilitar &marcadores"
#. IDD_FILTERS_LINEFILTERS, IDC_LFILTER_ADDBTN
-#: Merge.rc:2035 Merge.rc:2057
+#: Merge.rc:2045 Merge.rc:2067
msgid "New"
msgstr "Novo"
#. IDD_EDIT_MARKER, IDC_STATIC
-#: Merge.rc:2039
+#: Merge.rc:2049
msgid "&Background color:"
msgstr "Cor de &fondo:"
#. IDS_MESSAGEBOX_OK
-#: Merge.rc:2044 Merge.rc:2829 Merge.rc:3086 Merge.rc:4171
+#: Merge.rc:2054 Merge.rc:2839 Merge.rc:3096 Merge.rc:4181
msgid "&Ok"
msgstr "Ace&ptar"
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:2045 Merge.rc:2525 Merge.rc:3199
+#: Merge.rc:2055 Merge.rc:2535 Merge.rc:3209
msgid "&Apply"
msgstr "&Aplicar"
#. IDD_FILTERS_LINEFILTERS
-#: Merge.rc:2051
+#: Merge.rc:2061
msgid "Line Filters"
msgstr "Filtros de liña"
#. IDD_FILTERS_LINEFILTERS, IDC_IGNOREREGEXP
-#: Merge.rc:2054
+#: Merge.rc:2064
msgid "Enable Line Filters"
msgstr "Habilitar Filtros de liña"
#. IDD_FILTERS_LINEFILTERS, IDC_STATIC
-#: Merge.rc:2055
+#: Merge.rc:2065
msgid "Regular Expressions (one per line):"
msgstr "Expresións regulares (unha por liña):"
#. IDD_PLUGINS_LIST, IDC_PLUGIN_EDIT
-#: Merge.rc:2058 Merge.rc:2924
+#: Merge.rc:2068 Merge.rc:2934
msgid "Edit"
msgstr "Editar"
#. IDD_PLUGINS_LIST, IDC_PLUGIN_REMOVE
-#: Merge.rc:2059 Merge.rc:2071 Merge.rc:2925
+#: Merge.rc:2069 Merge.rc:2081 Merge.rc:2935
msgid "Remove"
msgstr "Eliminar"
#. IDD_FILTERS_SUBSTITUTIONFILTERS
-#: Merge.rc:2064
+#: Merge.rc:2074
msgid "Substitution Filters"
msgstr "Filtros de substitución"
#. IDD_FILTERS_SUBSTITUTIONFILTERS, IDC_STATIC
-#: Merge.rc:2067
+#: Merge.rc:2077
msgid "Changes to the listed pairs below will be ignored or marked as insignificant. Patches are unaffected."
msgstr "Os cambios que aparecen nos paneis, como os pares listados a continuac serán ignorados ou marcados como insignificantes. Non afecta aos parches."
#. IDD_FILTERS_SUBSTITUTIONFILTERS, IDC_IGNORED_SUSBSTITUTIONS_ENABLED
-#: Merge.rc:2068
+#: Merge.rc:2078
msgid "Enable"
msgstr "Habilitar"
#. IDD_PLUGINS_LIST, IDC_PLUGIN_ADD
-#: Merge.rc:2070 Merge.rc:2923
+#: Merge.rc:2080 Merge.rc:2933
msgid "Add"
msgstr "Añadir"
#. IDD_FILTERS_SUBSTITUTIONFILTERS, IDC_LFILTER_CLEARBTN
-#: Merge.rc:2072
+#: Merge.rc:2082
msgid "Clear"
msgstr "Borrar"
#. IDD_PREFERENCES
-#: Merge.rc:2077
+#: Merge.rc:2087
msgid "Options"
msgstr "Configuración"
#. IDD_PREFERENCES, IDC_TREEOPT_IMPORT
-#: Merge.rc:2086
+#: Merge.rc:2096
msgid "Import..."
msgstr "Importar..."
#. IDD_PREFERENCES, IDC_TREEOPT_EXPORT
-#: Merge.rc:2087
+#: Merge.rc:2097
msgid "Export..."
msgstr "Exportar..."
#. IDS_OPTIONSPG_GENCOMPARE
-#: Merge.rc:2092 Merge.rc:4199 Merge.rc:4202 Merge.rc:4219
+#: Merge.rc:2102 Merge.rc:4209 Merge.rc:4212 Merge.rc:4229
msgid "General"
msgstr "Xeral"
#. IDD_PROPPAGE_GENERAL, IDC_SCROLL_CHECK
-#: Merge.rc:2095
+#: Merge.rc:2105
msgid "Automatically &scroll to first difference"
msgstr "De&sprazarse automaticamente á primeira diferenza"
#. IDD_PROPPAGE_GENERAL, IDC_SCROLL_TO_FIRST_INLINE_DIFF_CHECK
-#: Merge.rc:2097
+#: Merge.rc:2107
msgid "Automatically s&croll to first inline difference"
msgstr "Desprazarse automati&camente á primeira diferenza de liña"
#. IDD_PROPPAGE_GENERAL, IDC_STATIC
-#: Merge.rc:2099
+#: Merge.rc:2109
msgid "Cl&ose windows with 'Esc':"
msgstr "Pechar ventás c&on 'Esc':"
#. IDD_PROPPAGE_GENERAL, IDC_VERIFY_OPEN_PATHS
-#: Merge.rc:2101
+#: Merge.rc:2111
msgid "&Automatically verify paths in Open dialog"
msgstr "Comprobar &automaticamente as rutas no diálogo Abrir"
#. IDD_PROPPAGE_GENERAL, IDC_STATIC
-#: Merge.rc:2103
+#: Merge.rc:2113
msgid "Single instance mode:"
msgstr "Modo de instancia única:"
#. IDD_PROPPAGE_GENERAL, IDC_ASK_MULTIWINDOW_CLOSE
-#: Merge.rc:2105
+#: Merge.rc:2115
msgid "As&k when closing multiple windows"
msgstr "Pre&guntar antes de pechar varias ventás"
#. IDD_PROPPAGE_GENERAL, IDC_PRESERVE_FILETIME
-#: Merge.rc:2107
+#: Merge.rc:2117
msgid "&Preserve file time in file compare"
msgstr "Manter a hora do ficheiro na com¶ción de ficheiros"
#. IDD_PROPPAGE_GENERAL, IDC_STARTUP_FOLDER_SELECT
-#: Merge.rc:2109
+#: Merge.rc:2119
msgid "Show \"Select Files or Folders\" dialog on startup"
msgstr "Mostrar \"Seleccione ficheiros ou carpetas' ao inicio"
#. IDD_PROPPAGE_GENERAL, IDC_CLOSE_WITH_OK
-#: Merge.rc:2111
+#: Merge.rc:2121
msgid "Close \"Select Files or Folders\" dialog on clicking Compare button"
msgstr "Pechar 'Seleccione ficheiros ou carpetas' ao premer o botón Comparar"
#. IDD_PROPPAGE_GENERAL, IDC_STATIC
-#: Merge.rc:2113
+#: Merge.rc:2123
msgid "Op&en dialog Auto completion:"
msgstr "Autocompl&etar no diálogo Abrir:"
#. IDD_PROPPAGE_GENERAL, IDC_STATIC
-#: Merge.rc:2115
+#: Merge.rc:2125
msgid "Auto-&reload modified files:"
msgstr "Autorecarga de arquivos modificados:"
#. IDD_PROPPAGE_GENERAL, IDC_STATIC
-#: Merge.rc:2117
+#: Merge.rc:2127
msgid "Language:"
msgstr "Idioma:"
#. IDD_PROPPAGE_COMPARE_WEBPAGE, IDC_COMPARE_DEFAULTS
-#: Merge.rc:2119 Merge.rc:2299 Merge.rc:2321 Merge.rc:2352 Merge.rc:2369
-#: Merge.rc:2386 Merge.rc:2394 Merge.rc:2430 Merge.rc:2454 Merge.rc:2633
-#: Merge.rc:2644 Merge.rc:2653 Merge.rc:2887 Merge.rc:2922 Merge.rc:2985
-#: Merge.rc:3010 Merge.rc:3024 Merge.rc:3038 Merge.rc:3054
+#: Merge.rc:2129 Merge.rc:2309 Merge.rc:2331 Merge.rc:2362 Merge.rc:2379
+#: Merge.rc:2396 Merge.rc:2404 Merge.rc:2440 Merge.rc:2464 Merge.rc:2643
+#: Merge.rc:2654 Merge.rc:2663 Merge.rc:2897 Merge.rc:2932 Merge.rc:2995
+#: Merge.rc:3020 Merge.rc:3034 Merge.rc:3048 Merge.rc:3064
msgid "Defaults"
msgstr "Predeterminados"
#. IDS_OPTIONSPG_COLORS
-#: Merge.rc:2124 Merge.rc:2140 Merge.rc:2267 Merge.rc:2292 Merge.rc:4205
+#: Merge.rc:2134 Merge.rc:2150 Merge.rc:2277 Merge.rc:2302 Merge.rc:4215
msgid "Colors"
msgstr "Cores"
#. IDD_PROPPAGE_COLOR_SCHEMES, IDC_STATIC
-#: Merge.rc:2127
+#: Merge.rc:2137
msgid "Color &mode:"
msgstr ""
#. IDD_PROPPAGE_COLOR_SCHEMES, IDC_STATIC
-#: Merge.rc:2129
+#: Merge.rc:2139
msgid "&Light mode scheme:"
msgstr ""
#. IDD_PROPPAGE_COLOR_SCHEMES, IDC_STATIC
-#: Merge.rc:2131
+#: Merge.rc:2141
msgid "&Dark mode scheme:"
msgstr ""
#. IDD_PROPPAGE_COLOR_SCHEMES, IDC_STATIC
-#: Merge.rc:2133
+#: Merge.rc:2143
msgid "Your custom schemes"
msgstr ""
#. IDD_PROPPAGE_COLOR_SCHEMES, IDC_COLOR_SCHEME_SAVE
-#: Merge.rc:2134
+#: Merge.rc:2144
msgid "&Save current scheme..."
msgstr ""
#. IDD_PROPPAGE_COLOR_SCHEMES, IDC_COLOR_SCHEME_DELETE
-#: Merge.rc:2135
+#: Merge.rc:2145
msgid "Delete ¤t scheme..."
msgstr ""
#. IDD_PROPPAGE_COLORS_DIR, IDC_BACKGROUND_COLUMN_LABEL
-#: Merge.rc:2143 Merge.rc:2238 Merge.rc:2258 Merge.rc:2272
+#: Merge.rc:2153 Merge.rc:2248 Merge.rc:2268 Merge.rc:2282
msgid "Background"
msgstr "Fondo"
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2144
+#: Merge.rc:2154
msgid "Deleted"
msgstr "Eliminado"
#. IDS_OPTIONSPG_TEXTCOLORS
-#: Merge.rc:2145 Merge.rc:2207 Merge.rc:2239 Merge.rc:2273 Merge.rc:4207
+#: Merge.rc:2155 Merge.rc:2217 Merge.rc:2249 Merge.rc:2283 Merge.rc:4217
msgid "Text"
msgstr "Texto"
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2146
+#: Merge.rc:2156
msgid "Difference:"
msgstr "Diferenzas:"
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2151
+#: Merge.rc:2161
msgid "Selected Difference:"
msgstr "Diferenza seleccionada:"
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2156
+#: Merge.rc:2166
msgid "Ignored Difference:"
msgstr "Diferenza ignorada:"
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2161
+#: Merge.rc:2171
msgid "Moved:"
msgstr "Movida:"
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2166
+#: Merge.rc:2176
msgid "Selected Moved:"
msgstr "Movida seleccionada:"
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2171
+#: Merge.rc:2181
msgid "Same As Next (3 panes):"
msgstr "O mesmo que o seguinte (3 paneis)"
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2176
+#: Merge.rc:2186
msgid "Same As Next (Selected):"
msgstr "O mesmo que o seguinte (seleccionado):"
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2181
+#: Merge.rc:2191
msgid "Word Difference:"
msgstr "Diferenza de palabras:"
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2186
+#: Merge.rc:2196
msgid "Selected Word Diff:"
msgstr "Diferenza de palabra seleccionada:"
#. IDD_INPUTBOX
-#: Merge.rc:2195 Merge.rc:2230 Merge.rc:2251 Merge.rc:3099
+#: Merge.rc:2205 Merge.rc:2240 Merge.rc:2261 Merge.rc:3109
msgid "Dialog"
msgstr "Diálogo"
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC
-#: Merge.rc:2198
+#: Merge.rc:2208
msgid "Keywords:"
msgstr "Palabras clave:"
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC
-#: Merge.rc:2199
+#: Merge.rc:2209
msgid "Function names:"
msgstr "Funcións:"
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC
-#: Merge.rc:2200
+#: Merge.rc:2210
msgid "Comments:"
msgstr "Comentarios:"
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC
-#: Merge.rc:2201
+#: Merge.rc:2211
msgid "Numbers:"
msgstr "Números:"
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC
-#: Merge.rc:2202
+#: Merge.rc:2212
msgid "Operators:"
msgstr "Operadores:"
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC
-#: Merge.rc:2203
+#: Merge.rc:2213
msgid "Strings:"
msgstr "Cadeas:"
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC
-#: Merge.rc:2204
+#: Merge.rc:2214
msgid "Preprocessor:"
msgstr "Preprocesador:"
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC
-#: Merge.rc:2205
+#: Merge.rc:2215
msgid "User 1:"
msgstr "Usuario 1:"
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC
-#: Merge.rc:2206
+#: Merge.rc:2216
msgid "User 2:"
msgstr "Usuario 2:"
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_SCOLOR_USER2_BOLD
-#: Merge.rc:2209 Merge.rc:2211 Merge.rc:2213 Merge.rc:2215 Merge.rc:2217
-#: Merge.rc:2219 Merge.rc:2221 Merge.rc:2223 Merge.rc:2225
+#: Merge.rc:2219 Merge.rc:2221 Merge.rc:2223 Merge.rc:2225 Merge.rc:2227
+#: Merge.rc:2229 Merge.rc:2231 Merge.rc:2233 Merge.rc:2235
msgid "Bold"
msgstr "Grosa"
#. IDD_PROPPAGE_COLORS_TEXT, IDC_DEFAULT_STANDARD_COLORS
-#: Merge.rc:2233
+#: Merge.rc:2243
msgid "&Use customized text colors"
msgstr "&Usar cores personalizadas para o texto"
#. IDD_PROPPAGE_COLORS_TEXT, IDC_WHITESPACE_COLOR_LABEL
-#: Merge.rc:2235
+#: Merge.rc:2245
msgid "Whitespace:"
msgstr "Espazo:"
#. IDD_PROPPAGE_COLORS_TEXT, IDC_TEXT_COLOR_LABEL
-#: Merge.rc:2236
+#: Merge.rc:2246
msgid "Regular text:"
msgstr "Texto normal:"
#. IDD_PROPPAGE_COLORS_TEXT, IDC_SELECTION_COLOR_LABEL
-#: Merge.rc:2237
+#: Merge.rc:2247
msgid "Selection:"
msgstr "Selección:"
#. IDD_PROPPAGE_COLORS_DIR, IDC_STATIC
-#: Merge.rc:2245 Merge.rc:2286
+#: Merge.rc:2255 Merge.rc:2296
msgid "Margin:"
msgstr "Marxe:"
#. IDD_PROPPAGE_COLORS_MARKER, IDC_MARKER0_COLOR_LABEL
-#: Merge.rc:2254
+#: Merge.rc:2264
msgid "Search Marker:"
msgstr "Marcador de busca:"
#. IDD_PROPPAGE_COLORS_MARKER, IDC_MARKER1_COLOR_LABEL
-#: Merge.rc:2255
+#: Merge.rc:2265
msgid "User Defined Marker 1:"
msgstr "Personalizado 1:"
#. IDD_PROPPAGE_COLORS_MARKER, IDC_MARKER2_COLOR_LABEL
-#: Merge.rc:2256
+#: Merge.rc:2266
msgid "User Defined Marker 2:"
msgstr "Personalizado 2:"
#. IDD_PROPPAGE_COLORS_MARKER, IDC_MARKER3_COLOR_LABEL
-#: Merge.rc:2257
+#: Merge.rc:2267
msgid "User Defined Marker 3:"
msgstr "Personalizado 3:"
#. IDD_PROPPAGE_COLORS_DIR, IDC_USE_DIR_COMPARE_COLORS
-#: Merge.rc:2270
+#: Merge.rc:2280
msgid "&Use folder compare colors"
msgstr "&Usar cores para comparar carpetas"
#. IDD_PROPPAGE_COLORS_DIR, IDC_STATIC
-#: Merge.rc:2274
+#: Merge.rc:2284
msgid "Items equal:"
msgstr "Elementos iguais:"
#. IDD_PROPPAGE_COLORS_DIR, IDC_STATIC
-#: Merge.rc:2277
+#: Merge.rc:2287
msgid "Items different:"
msgstr "Elementos diferentes:"
#. IDD_PROPPAGE_COLORS_DIR, IDC_STATIC
-#: Merge.rc:2280
+#: Merge.rc:2290
msgid "Items missing:"
msgstr "Elementos inexistentes:"
#. IDD_PROPPAGE_COLORS_DIR, IDC_STATIC
-#: Merge.rc:2283
+#: Merge.rc:2293
msgid "Items filtered:"
msgstr "Elementos filtrados:"
#. IDD_PROPPAGE_COLORS_SYSTEM, IDC_SYSCOLOR_HOOK_ENABLED
-#: Merge.rc:2295
+#: Merge.rc:2305
msgid "&Use custom system colors"
msgstr ""
#. IDS_PRPCAT_SYSTEM
-#: Merge.rc:2304 Merge.rc:4211 Merge.rc:4212 Merge.rc:4657
+#: Merge.rc:2314 Merge.rc:4221 Merge.rc:4222 Merge.rc:4667
msgid "System"
msgstr "Sistema"
#. IDD_PROPPAGE_SYSTEM, IDC_USE_RECYCLE_BIN
-#: Merge.rc:2307
+#: Merge.rc:2317
msgid "&Use Recycle Bin"
msgstr "Enviar os ficheiro&s eliminados á Papeleira de reciclaxe"
#. IDD_PROPPAGE_SYSTEM, IDC_STATIC
-#: Merge.rc:2308
+#: Merge.rc:2318
msgid "&External editor:"
msgstr "&Editor externo:"
#. IDD_PROPPAGE_SYSTEM, IDC_STATIC
-#: Merge.rc:2311
+#: Merge.rc:2321
msgid "&Store user data in:"
msgstr ""
#. IDD_PROPPAGE_SYSTEM, IDC_STATIC
-#: Merge.rc:2313
+#: Merge.rc:2323
msgid "&Filter folder:"
msgstr "Carpeta de &filtros:"
#. IDD_PROPPAGE_SYSTEM, IDC_STATIC
-#: Merge.rc:2316
+#: Merge.rc:2326
msgid "Temporary files folder"
msgstr "Carpeta de ficheiros temporais"
#. IDD_PROPPAGE_SYSTEM, IDC_TMPFOLDER_SYSTEM
-#: Merge.rc:2317
+#: Merge.rc:2327
msgid "S&ystem temp folder"
msgstr "Carpeta temporal do s&istema"
#. IDD_PROPPAGE_SYSTEM, IDC_STATIC
-#: Merge.rc:2318
+#: Merge.rc:2328
msgid "C&ustom folder:"
msgstr "Carpeta &personalizada:"
#. IDD_GENERATE_PATCH, IDC_DIFF_BROWSE_FILE2
-#: Merge.rc:2320 Merge.rc:2416
+#: Merge.rc:2330 Merge.rc:2426
msgid "Br&owse..."
msgstr "&Examinar..."
#. IDS_OPTIONSPG_COMPARE
-#: Merge.rc:2326 Merge.rc:4200
+#: Merge.rc:2336 Merge.rc:4210
msgid "Compare"
msgstr "Comparar"
#. IDD_PROPPAGE_COMPARE, IDC_STATIC
-#: Merge.rc:2329
+#: Merge.rc:2339
msgid "Whitespaces"
msgstr "Espazos en branco"
#. IDD_PROPPAGE_COMPARE, IDC_WHITESPACE
-#: Merge.rc:2330
+#: Merge.rc:2340
msgid "&Compare"
msgstr "&Comparar"
#. IDD_PROPPAGE_COMPARE, IDC_WHITE_CHANGE
-#: Merge.rc:2331
+#: Merge.rc:2341
msgid "&Ignore change"
msgstr "&Ignorar cambios"
#. IDD_PROPPAGE_COMPARE, IDC_ALL_WHITE
-#: Merge.rc:2332
+#: Merge.rc:2342
msgid "I&gnore all"
msgstr "I&gnorar todo"
#. IDD_PROPPAGE_COMPARE, IDC_IGNBLANKS_CHECK
-#: Merge.rc:2333
+#: Merge.rc:2343
msgid "Ignore blan&k lines"
msgstr "Ignorar &liñas en branco"
#. IDD_PROPPAGE_COMPARE, IDC_IGNCASE_CHECK
-#: Merge.rc:2334
+#: Merge.rc:2344
msgid "Ignore &case"
msgstr "Ignorar MAIÚSCULAS e minús&culas"
#. IDD_PROPPAGE_COMPARE, IDC_EOL_SENSITIVE
-#: Merge.rc:2335
+#: Merge.rc:2345
msgid "Igno&re EOL differences (Windows/Unix/Mac)"
msgstr ""
#. IDD_PROPPAGE_COMPARE, IDC_IGNORE_NUMBERS
-#: Merge.rc:2337
+#: Merge.rc:2347
msgid "Ignore num&bers"
msgstr "Ignorar nú&meros"
#. IDD_PROPPAGE_COMPARE, IDC_CP_SENSITIVE
-#: Merge.rc:2338
+#: Merge.rc:2348
msgid "Ignore codepage &differences"
msgstr "Ignorar &diferenzas de codificación"
#. IDD_PROPPAGE_COMPARE, IDC_FILTERCOMMENTS_CHECK
-#: Merge.rc:2339
+#: Merge.rc:2349
msgid "Ignore c&omment differences"
msgstr "Ignorar diferenzas nos c&omentarios"
#. IDD_PROPPAGE_COMPARE, IDC_IGNEOFEOL_CHECK
-#: Merge.rc:2341
+#: Merge.rc:2351
msgid "Ignore &missing trailing EOL"
msgstr ""
#. IDD_PROPPAGE_COMPARE, IDC_IGNLBRKS_CHECK
-#: Merge.rc:2343
+#: Merge.rc:2353
msgid "Ignore line &breaks (treat as spaces)"
msgstr ""
#. IDD_PROPPAGE_COMPARE, IDC_MOVED_BLOCKS
-#: Merge.rc:2345
+#: Merge.rc:2355
msgid "E&nable moved block detection"
msgstr "Habilitar detecció&n de bloques desprazados"
#. IDD_PROPPAGE_COMPARE, IDC_ALIGN_SIMILAR_LINES
-#: Merge.rc:2346
+#: Merge.rc:2356
msgid "Align &similar lines"
msgstr "Aliñar liñas &similares"
#. IDD_PROPPAGE_COMPARE, IDC_STATIC
-#: Merge.rc:2347
+#: Merge.rc:2357
msgid "Diff &algorithm:"
msgstr "&Algoritmo de comparación:"
#. IDD_PROPPAGE_COMPARE, IDC_INDENT_HEURISTIC
-#: Merge.rc:2349
+#: Merge.rc:2359
msgid "Enable indent &heuristic"
msgstr "Habilitar a &heurística do sangrado"
#. IDD_PROPPAGE_COMPARE, IDC_COMPLETELY_BLANK_OUT_IGNORED_DIFFERENCES
-#: Merge.rc:2350
+#: Merge.rc:2360
msgid "Completely unhighlight the ignored differences"
msgstr "Desmarcar por completo as diferenzas ignoradas"
#. IDS_OPTIONSPG_EDITOR
-#: Merge.rc:2357 Merge.rc:4201
+#: Merge.rc:2367 Merge.rc:4211
msgid "Editor"
msgstr "Editor"
#. IDD_PROPPAGE_EDITOR, IDC_HILITE_CHECK
-#: Merge.rc:2360
+#: Merge.rc:2370
msgid "&Highlight syntax"
msgstr "Resaltar a sinta&xe"
#. IDD_PROPPAGE_EDITOR, IDC_MIXED_EOL
-#: Merge.rc:2361
+#: Merge.rc:2371
msgid "&Preserve original EOL"
msgstr "&Conservar os caracteres EOL orixinais"
#. IDD_PROPPAGE_EDITOR, IDC_STATIC
-#: Merge.rc:2362
+#: Merge.rc:2372
msgid "Tabs"
msgstr "Tabulacións"
#. IDD_PROPPAGE_EDITOR, IDC_STATIC
-#: Merge.rc:2363
+#: Merge.rc:2373
msgid "&Tab size:"
msgstr "&Tamaño do tabulador:"
#. IDD_PROPPAGE_EDITOR, IDC_PROP_INSERT_TABS
-#: Merge.rc:2365
+#: Merge.rc:2375
msgid "&Insert tabs"
msgstr "&Inserir tabulacións"
#. IDD_PROPPAGE_EDITOR, IDC_PROP_INSERT_SPACES
-#: Merge.rc:2366
+#: Merge.rc:2376
msgid "Insert &spaces"
msgstr "Inserir &espazos"
#. IDD_PROPPAGE_EDITOR, IDC_STATIC
-#: Merge.rc:2367
+#: Merge.rc:2377
msgid "&Rendering mode:"
msgstr "Modo de &renderizado:"
#. IDD_PROPPAGE_EDITOR_COMPAREMERGE, IDC_AUTOMRESCAN_CHECK
-#: Merge.rc:2376
+#: Merge.rc:2386
msgid "&Automatic rescan"
msgstr "Reescaneo &automático"
#. IDD_PROPPAGE_EDITOR_COMPAREMERGE, IDC_STATIC
-#: Merge.rc:2377
+#: Merge.rc:2387
msgid "Copy &granularity for selected differences:"
msgstr ""
#. IDD_PROPPAGE_EDITOR_COMPAREMERGE, IDC_LINE_COLORING_GROUP
-#: Merge.rc:2379
+#: Merge.rc:2389
msgid "Line Difference Coloring"
msgstr "Colorear a diferenza de liñas"
#. IDD_PROPPAGE_EDITOR_COMPAREMERGE, IDC_VIEW_LINE_DIFFERENCES
-#: Merge.rc:2380
+#: Merge.rc:2390
msgid "View line differences"
msgstr "Ver diferenzas de liña"
#. IDD_PROPPAGE_EDITOR_COMPAREMERGE, IDC_EDITOR_CHARLEVEL
-#: Merge.rc:2381
+#: Merge.rc:2391
msgid "&Character-level"
msgstr "A nivel do &carácter"
#. IDD_PROPPAGE_EDITOR_COMPAREMERGE, IDC_EDITOR_WORDLEVEL
-#: Merge.rc:2382
+#: Merge.rc:2392
msgid "&Word-level:"
msgstr "A nivel da pa&labra:"
#. IDD_PROPPAGE_EDITOR_COMPAREMERGE, IDC_STATIC
-#: Merge.rc:2384
+#: Merge.rc:2394
msgid "W&ord break characters:"
msgstr "Caracteres de salt&o de palabra:"
#. IDD_PROPPAGE_MESSAGEBOXES, IDC_STATIC
-#: Merge.rc:2401
+#: Merge.rc:2411
msgid "Some messages can be hidden by the user. Press Reset to make all messages visible again."
msgstr "WinMerge permite ocultar algunhas mensaxes de uso frecuente. Prema o botón 'Restablecer' para facelas visibles de novo."
#. IDD_SELECT_FILES_OR_FOLDERS, IDC_RESET
-#: Merge.rc:2402 Merge.rc:3085
+#: Merge.rc:2412 Merge.rc:3095
msgid "Reset"
msgstr "Restablecer"
#. IDD_GENERATE_PATCH
-#: Merge.rc:2408
+#: Merge.rc:2418
msgid "Patch Generator"
msgstr "Xerar parche"
#. IDD_GENERATE_PATCH, IDC_STATIC
-#: Merge.rc:2411
+#: Merge.rc:2421
msgid "File&1:"
msgstr "Ficheiro &1:"
#. IDD_GENERATE_PATCH, IDC_STATIC
-#: Merge.rc:2414
+#: Merge.rc:2424
msgid "File&2:"
msgstr "Ficheiro &2:"
#. IDD_GENERATE_PATCH, IDC_DIFF_SWAPFILES
-#: Merge.rc:2417
+#: Merge.rc:2427
msgid "&Swap"
msgstr "&Intercambiar"
#. IDD_DIRCMP_REPORT, IDC_REPORT_COPYCLIPBOARD
-#: Merge.rc:2418 Merge.rc:2690
+#: Merge.rc:2428 Merge.rc:2700
msgid "&Copy to clipboard"
msgstr "&Copiar ao portapapeis"
#. IDD_GENERATE_PATCH, IDC_DIFF_APPENDFILE
-#: Merge.rc:2419
+#: Merge.rc:2429
msgid "&Append to existing file"
msgstr "&Anexar ao ficheiro existente"
#. IDD_GENERATE_PATCH, IDC_STATIC
-#: Merge.rc:2420
+#: Merge.rc:2430
msgid "&Result:"
msgstr "&Resultado:"
#. IDD_GENERATE_PATCH, IDC_DIFF_BROWSE_RESULT
-#: Merge.rc:2422
+#: Merge.rc:2432
msgid "Bro&wse..."
msgstr "E&xaminar..."
#. IDD_GENERATE_PATCH, IDC_STATIC
-#: Merge.rc:2423
+#: Merge.rc:2433
msgid "&Format"
msgstr "&Formato"
#. IDD_GENERATE_PATCH, IDC_STATIC
-#: Merge.rc:2424
+#: Merge.rc:2434
msgid "St&yle:"
msgstr "Es&tilo:"
#. IDD_GENERATE_PATCH, IDC_STATIC
-#: Merge.rc:2426
+#: Merge.rc:2436
msgid "&Context:"
msgstr "&Contexto:"
#. IDD_GENERATE_PATCH, IDC_DIFF_INCLCMDLINE
-#: Merge.rc:2428
+#: Merge.rc:2438
msgid "Inclu&de command line"
msgstr "Incluír liña de coman&dos"
#. IDD_GENERATE_PATCH, IDC_DIFF_OPENTOEDITOR
-#: Merge.rc:2429
+#: Merge.rc:2439
msgid "Open in e&xternal editor"
msgstr "Abrir nun editor e&xterno"
#. IDD_DIRCOLS
-#: Merge.rc:2446
+#: Merge.rc:2456
msgid "Display Columns"
msgstr "Mostrar columnas"
#. IDD_DIRCOLS, IDC_UP
-#: Merge.rc:2450
+#: Merge.rc:2460
msgid "Move &Up"
msgstr "S&ubir"
#. IDD_DIRCOLS, IDC_DOWN
-#: Merge.rc:2451
+#: Merge.rc:2461
msgid "Move &Down"
msgstr "&Baixar"
#. IDD_DIRCOLS, IDC_COLDLG_ADDITIONAL_PROPERTIES
-#: Merge.rc:2453
+#: Merge.rc:2463
msgid "&Additional Properties"
msgstr "Propiedades &adicionais"
#. IDD_DIRADDITIONALPROPS
-#: Merge.rc:2461
+#: Merge.rc:2471
msgid "Additional Properties"
msgstr "Propiedades adicionais"
#. IDD_PLUGINS_SELECTPLUGIN
-#: Merge.rc:2475
+#: Merge.rc:2485
msgid "Select Plugin"
msgstr "Escolla complemento"
#. IDD_PLUGINS_EDITPLUGIN, IDC_STATIC
-#: Merge.rc:2478 Merge.rc:3115
+#: Merge.rc:2488 Merge.rc:3125
msgid "Plugin &name:"
msgstr "&Nome:"
#. IDD_PLUGINS_SELECTPLUGIN, IDC_STATIC
-#: Merge.rc:2480
+#: Merge.rc:2490
msgid "&Target files:"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN, IDC_STATIC
-#: Merge.rc:2482 Merge.rc:3117
+#: Merge.rc:2492 Merge.rc:3127
msgid "Extensions list:"
msgstr "Listaxe de extensións:"
#. IDD_PLUGINS_EDITPLUGIN, IDC_STATIC
-#: Merge.rc:2484 Merge.rc:3119
+#: Merge.rc:2494 Merge.rc:3129
msgid "Description:"
msgstr "Descrición:"
#. IDD_PLUGINS_EDITPLUGIN, IDC_STATIC
-#: Merge.rc:2486 Merge.rc:3121
+#: Merge.rc:2496 Merge.rc:3131
msgid "Default arguments:"
msgstr "Argumentos predeterminados:"
#. IDD_PLUGINS_SELECTPLUGIN, IDC_PLUGIN_ALLOW_ALL
-#: Merge.rc:2488
+#: Merge.rc:2498
msgid "Display all plugins (Ignore extension)"
msgstr "Mostrar todos os complementos, non comprobar a extensión"
#. IDD_PLUGINS_SELECTPLUGIN, IDC_PLUGIN_OPEN_IN_SAME_FRAME_TYPE
-#: Merge.rc:2490
+#: Merge.rc:2500
msgid "&Open files in same window type after unpacking"
msgstr "Abrir ficheir&os na mesma ventá despois de desempaquetar"
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_PIPELINE_STATIC
-#: Merge.rc:2492 Merge.rc:3129
+#: Merge.rc:2502 Merge.rc:3139
msgid "&Plugin pipeline:"
msgstr "Canais de com&plementos:"
#. IDD_PLUGINS_SELECTPLUGIN, IDC_PLUGIN_ALIAS
-#: Merge.rc:2495
+#: Merge.rc:2505
msgid "&Alias..."
msgstr ""
#. IDD_DIRCOMP_PROGRESS, IDC_COMPARISON_STOP
-#: Merge.rc:2505
+#: Merge.rc:2515
msgid "Stop"
msgstr "Deter"
#. IDD_DIRCOMP_PROGRESS, IDC_COMPARISON_PAUSE
-#: Merge.rc:2506
+#: Merge.rc:2516
msgid "Pause"
msgstr "Pausar"
#. IDD_DIRCOMP_PROGRESS, IDC_COMPARISON_CONTINUE
-#: Merge.rc:2507
+#: Merge.rc:2517
msgid "Continue"
msgstr "Continuar"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC
-#: Merge.rc:2509 Merge.rc:2973
+#: Merge.rc:2519 Merge.rc:2983
msgid "C&PU cores to use:"
msgstr "&Número de núcleos de CPU a utilizar:"
#. IDD_DIRCOMP_PROGRESS, IDC_STATIC
-#: Merge.rc:2510
+#: Merge.rc:2520
msgid "Items total:"
msgstr "Total:"
#. IDD_DIRCOMP_PROGRESS, IDC_STATIC
-#: Merge.rc:2511
+#: Merge.rc:2521
msgid "Items compared:"
msgstr "Elementos comparados:"
#. IDS_PREVIEWBAR_CLOSE
-#: Merge.rc:2526 Merge.rc:2846 Merge.rc:5328
+#: Merge.rc:2536 Merge.rc:2856 Merge.rc:5339
msgid "&Close"
msgstr "Pe&char"
#. IDD_WMGOTO
-#: Merge.rc:2537
+#: Merge.rc:2547
msgid "Go to"
msgstr "Ir a"
#. IDD_WMGOTO, IDC_STATIC
-#: Merge.rc:2540
+#: Merge.rc:2550
msgid "G&o to:"
msgstr "I&r a:"
#. IDD_WMGOTO, IDC_STATIC
-#: Merge.rc:2543
+#: Merge.rc:2553
msgid "File"
msgstr "Ficheiro"
#. IDD_WMGOTO, IDC_STATIC
-#: Merge.rc:2547
+#: Merge.rc:2557
msgid "Go to what"
msgstr "Ir ao/á"
#. IDD_WMGOTO, IDC_WMGOTO_TOLINE
-#: Merge.rc:2548
+#: Merge.rc:2558
msgid "Li&ne"
msgstr "&Liña"
#. IDD_WMGOTO, IDC_WMGOTO_TODIFF
-#: Merge.rc:2549
+#: Merge.rc:2559
msgid "&Difference"
msgstr "&Diferenza"
#. IDD_WMGOTO, IDOK
-#: Merge.rc:2550
+#: Merge.rc:2560
msgid "&Go to"
msgstr "&Ir a"
#. IDS_PROJECT_ITEM_FILE_FILTER
-#: Merge.rc:2556 Merge.rc:4321
+#: Merge.rc:2566 Merge.rc:4331
msgid "File Filters"
msgstr "Filtros de ficheiro"
#. IDD_FILTERS_FILEFILTERS, IDC_STATIC
-#: Merge.rc:2559
+#: Merge.rc:2569
msgid "&Mask / Filter Expression"
msgstr ""
#. IDD_FILTERS_FILEFILTERS, IDC_STATIC
-#: Merge.rc:2562
+#: Merge.rc:2572
msgid "Preset &Filters"
msgstr ""
#. IDD_FILTERS_FILEFILTERS, IDC_FILTERFILE_TEST_BTN
-#: Merge.rc:2564
+#: Merge.rc:2574
msgid "Test..."
msgstr "Probar..."
#. IDD_FILTERS_FILEFILTERS, IDC_FILTERFILE_INSTALL
-#: Merge.rc:2565
+#: Merge.rc:2575
msgid "Install..."
msgstr "Instalar..."
#. IDD_FILTERS_FILEFILTERS, IDC_FILTERFILE_NEWBTN
-#: Merge.rc:2566
+#: Merge.rc:2576
msgid "New..."
msgstr "Novo..."
#. IDD_FILTERS_FILEFILTERS, IDC_FILTERFILE_EDITBTN
-#: Merge.rc:2567
+#: Merge.rc:2577
msgid "Edit..."
msgstr "Editar..."
#. IDD_FILTERS_FILEFILTERS, IDC_FILTERFILE_DELETEBTN
-#: Merge.rc:2568
+#: Merge.rc:2578
msgid "Delete..."
msgstr "Borrar..."
#. IDD_FILTERS_CONDITION
-#: Merge.rc:2573
+#: Merge.rc:2583
msgid "Filter Condition"
msgstr ""
#. IDD_FILTERS_CONDITION, IDC_STATIC
-#: Merge.rc:2576
+#: Merge.rc:2586
msgid "&Left-hand side:"
msgstr ""
#. IDD_FILTERS_CONDITION, IDC_STATIC
-#: Merge.rc:2578
+#: Merge.rc:2588
msgid "&Operator:"
msgstr ""
#. IDD_FILTERS_CONDITION, IDC_STATIC
-#: Merge.rc:2580
+#: Merge.rc:2590
msgid "&Right-hand side:"
msgstr ""
#. IDD_FILTERS_CONDITION, IDC_STATIC
-#: Merge.rc:2586
+#: Merge.rc:2596
msgid "Expression:"
msgstr ""
#. IDD_COMPARISON_RESULT_FILTER
-#: Merge.rc:2595
+#: Merge.rc:2605
msgid "Filter by Comparison Result"
msgstr ""
#. IDD_COMPARISON_RESULT_FILTER, IDC_RADIO_INCLUDE
-#: Merge.rc:2598
+#: Merge.rc:2608
msgid "&Include"
msgstr ""
#. IDD_COMPARISON_RESULT_FILTER, IDC_RADIO_EXCLUDE
-#: Merge.rc:2599
+#: Merge.rc:2609
msgid "&Exclude"
msgstr ""
#. IDD_COMPARISON_RESULT_FILTER, IDC_STATIC
-#: Merge.rc:2600
+#: Merge.rc:2610
msgid "Comparison Results"
msgstr ""
#. IDS_IDENTICAL
-#: Merge.rc:2601 Merge.rc:2733 Merge.rc:2794 Merge.rc:4698
+#: Merge.rc:2611 Merge.rc:2743 Merge.rc:2804 Merge.rc:4708
msgid "Identical"
msgstr "Iguais"
#. IDS_DIFFERENT
-#: Merge.rc:2602 Merge.rc:2714 Merge.rc:2755 Merge.rc:4708
+#: Merge.rc:2612 Merge.rc:2724 Merge.rc:2765 Merge.rc:4718
msgid "Different"
msgstr "Diferente"
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_LEFT_ONLY
-#: Merge.rc:2603
+#: Merge.rc:2613
msgid "Left only"
msgstr ""
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_RIGHT_ONLY
-#: Merge.rc:2604
+#: Merge.rc:2614
msgid "Right only"
msgstr ""
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_SKIPPED
-#: Merge.rc:2605
+#: Merge.rc:2615
msgid "Skipped"
msgstr ""
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_MIDDLE_ONLY
-#: Merge.rc:2606
+#: Merge.rc:2616
msgid "Middle only"
msgstr ""
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_LEFT_ONLY_DIFFERENT
-#: Merge.rc:2607
+#: Merge.rc:2617
msgid "Left only (different)"
msgstr ""
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_MIDDLE_ONLY_DIFFERENT
-#: Merge.rc:2608
+#: Merge.rc:2618
msgid "Middle only (different)"
msgstr ""
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_RIGHT_ONLY_DIFFERENT
-#: Merge.rc:2609
+#: Merge.rc:2619
msgid "Right only (different)"
msgstr ""
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_LEFT_ONLY_MISSING
-#: Merge.rc:2610
+#: Merge.rc:2620
msgid "Left only (missing)"
msgstr ""
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_MIDDLE_ONLY_MISSING
-#: Merge.rc:2611
+#: Merge.rc:2621
msgid "Middle only (missing)"
msgstr ""
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_RIGHT_ONLY_MISSING
-#: Merge.rc:2612
+#: Merge.rc:2622
msgid "Right only (missing)"
msgstr ""
#. IDS_OPTIONSPG_CODEPAGE
-#: Merge.rc:2619 Merge.rc:2811 Merge.rc:4213
+#: Merge.rc:2629 Merge.rc:2821 Merge.rc:4223
msgid "Codepage"
msgstr "Codificación"
#. IDD_PROPPAGE_CODEPAGE, IDC_STATIC
-#: Merge.rc:2622
+#: Merge.rc:2632
msgid "Default Codepage"
msgstr "Codificación predeterminada"
#. IDD_PROPPAGE_CODEPAGE, IDC_STATIC
-#: Merge.rc:2623
+#: Merge.rc:2633
msgid "Select the default codepage for non-Unicode files:"
msgstr "Seleccione a codificación predeterminada a usar cando se carguen ficheiros non Unicode:"
#. IDD_PROPPAGE_CODEPAGE, IDC_CP_SYSTEM
-#: Merge.rc:2624
+#: Merge.rc:2634
msgid "System codepage"
msgstr "Codificación do sistema"
#. IDD_PROPPAGE_CODEPAGE, IDC_CP_UI
-#: Merge.rc:2625
+#: Merge.rc:2635
msgid "According to WinMerge User Interface"
msgstr "Segundo á interface de usuario de WinMerge"
#. IDD_PROPPAGE_CODEPAGE, IDC_CP_CUSTOM
-#: Merge.rc:2626
+#: Merge.rc:2636
msgid "Custom codepage:"
msgstr "Codificación personalizada:"
#. IDD_PROPPAGE_CODEPAGE, IDC_DETECT_CODEPAGE
-#: Merge.rc:2628
+#: Merge.rc:2638
msgid ""
"Detect codepage for: .html, .rc, .xml\n"
"Restart required."
@@ -4086,7 +4097,7 @@ msgstr ""
"Precísase reiniciar a sesión."
#. IDD_PROPPAGE_CODEPAGE, IDC_DETECT_CODEPAGE2
-#: Merge.rc:2630
+#: Merge.rc:2640
msgid ""
"Detect codepage for files with mlang.dll\n"
"Restart required."
@@ -4095,769 +4106,769 @@ msgstr ""
"Precísase reiniciar a sesión."
#. IDS_OPTIONSPG_ARCHIVE
-#: Merge.rc:2638 Merge.rc:4214
+#: Merge.rc:2648 Merge.rc:4224
msgid "Archive Support"
msgstr "Soporte de arquivos"
#. IDD_PROPPAGE_ARCHIVE, IDC_ARCHIVE_ENABLE
-#: Merge.rc:2641
+#: Merge.rc:2651
msgid "&Enable archive file support"
msgstr "Habilitar o soport&e de arquivos"
#. IDD_PROPPAGE_ARCHIVE, IDC_ARCHIVE_DETECTTYPE
-#: Merge.rc:2642
+#: Merge.rc:2652
msgid "&Detect archive type from file signature"
msgstr "&Detectar o tipo de arquivo pola sinatura"
#. IDD_PROPPAGE_PROJECT, IDC_STATIC
-#: Merge.rc:2651
+#: Merge.rc:2661
msgid "Items saved to or restored from the project file:"
msgstr "Elementos gardados ou restaurados do ficheiro de proxecto:"
#. IDD_SAVECLOSING
-#: Merge.rc:2658
+#: Merge.rc:2668
msgid "Save Modified Files?"
msgstr "Gardar os ficheiros modificados?"
#. IDD_SAVECLOSING, IDC_SAVECLOSING_LEFTFRAME
-#: Merge.rc:2661
+#: Merge.rc:2671
msgid "Left side file"
msgstr "Ficheiro esquerdo"
#. IDD_SAVECLOSING, IDC_SAVECLOSING_SAVELEFT
-#: Merge.rc:2663
+#: Merge.rc:2673
msgid "&Save changes"
msgstr "Gardar cambio&s"
#. IDD_SAVECLOSING, IDC_SAVECLOSING_DISCARDLEFT
-#: Merge.rc:2664
+#: Merge.rc:2674
msgid "&Discard changes"
msgstr "&Desbotar cambios"
#. IDD_SAVECLOSING, IDC_SAVECLOSING_MIDDLEFRAME
-#: Merge.rc:2665
+#: Merge.rc:2675
msgid "Middle side file"
msgstr "Ficheiro central"
#. IDD_SAVECLOSING, IDC_SAVECLOSING_SAVEMIDDLE
-#: Merge.rc:2667
+#: Merge.rc:2677
msgid "Sa&ve changes"
msgstr "Gar&dar cambios"
#. IDD_SAVECLOSING, IDC_SAVECLOSING_DISCARDMIDDLE
-#: Merge.rc:2668
+#: Merge.rc:2678
msgid "Discard c&hanges"
msgstr "Desbotar ca&mbios"
#. IDD_SAVECLOSING, IDC_SAVECLOSING_RIGHTFRAME
-#: Merge.rc:2669
+#: Merge.rc:2679
msgid "Right side file"
msgstr "Ficheiro dereito"
#. IDD_SAVECLOSING, IDC_SAVECLOSING_SAVERIGHT
-#: Merge.rc:2671
+#: Merge.rc:2681
msgid "S&ave changes"
msgstr "G&ardar cambios"
#. IDD_SAVECLOSING, IDC_SAVECLOSING_DISCARDRIGHT
-#: Merge.rc:2672
+#: Merge.rc:2682
msgid "Dis&card changes"
msgstr "Desbo&tar cambios"
#. IDD_SAVECLOSING, IDC_SAVECLOSING_DISCARDALL
-#: Merge.rc:2673
+#: Merge.rc:2683
msgid "Disca&rd All"
msgstr "Desbota&r todo"
#. IDD_DIRCMP_REPORT
-#: Merge.rc:2680
+#: Merge.rc:2690
msgid "Folder Compare Report"
msgstr "Informe da comparación de carpetas"
#. IDD_DIRCMP_REPORT, IDC_STATIC
-#: Merge.rc:2683
+#: Merge.rc:2693
msgid "Report &file:"
msgstr "&Ficheiro do informe:"
#. IDD_DIRCMP_REPORT, IDC_STATIC
-#: Merge.rc:2686
+#: Merge.rc:2696
msgid "&Style:"
msgstr "E&stilo:"
#. IDD_DIRCMP_REPORT, IDC_REPORT_INCLUDEFILECMPREPORT
-#: Merge.rc:2688
+#: Merge.rc:2698
msgid "&Include file compare report"
msgstr "&Incluír informe de comparación de ficheiros"
#. IDD_FILTERS_FILEFILTERS_SHARED
-#: Merge.rc:2697
+#: Merge.rc:2707
msgid "Shared or Private Filter"
msgstr "Filtro compartido ou privado"
#. IDD_FILTERS_FILEFILTERS_SHARED, IDC_STATIC
-#: Merge.rc:2700
+#: Merge.rc:2710
msgid "What type of filter do you want?"
msgstr "Que tipo de filtro quere crear?"
#. IDD_FILTERS_FILEFILTERS_SHARED, IDC_SHARED
-#: Merge.rc:2701
+#: Merge.rc:2711
msgid "Shared Filter (for all users)"
msgstr "Filtro compartido (para todos os usuarios deste ordenador)"
#. IDD_FILTERS_FILEFILTERS_SHARED, IDC_PRIVATE
-#: Merge.rc:2702
+#: Merge.rc:2712
msgid "Private Filter (current user only)"
msgstr "Filtro privado (só para o usuario actual)"
#. IDD_COMPARE_STATISTICS3
-#: Merge.rc:2709 Merge.rc:2750
+#: Merge.rc:2719 Merge.rc:2760
msgid "Compare Statistics"
msgstr "Estatísticas da comparación"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2712 Merge.rc:2753
+#: Merge.rc:2722 Merge.rc:2763
msgid "Folders:"
msgstr "Carpetas:"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2713 Merge.rc:2754
+#: Merge.rc:2723 Merge.rc:2764
msgid "Files:"
msgstr "Arquivos:"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2719 Merge.rc:2738 Merge.rc:2760 Merge.rc:2799
+#: Merge.rc:2729 Merge.rc:2748 Merge.rc:2770 Merge.rc:2809
msgid "Binary:"
msgstr "Binario:"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2722 Merge.rc:2763
+#: Merge.rc:2732 Merge.rc:2773
msgid "Unique"
msgstr "Único"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2723 Merge.rc:2764
+#: Merge.rc:2733 Merge.rc:2774
msgid "Left:"
msgstr "Esquerda:"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2728 Merge.rc:2774
+#: Merge.rc:2738 Merge.rc:2784
msgid "Right:"
msgstr "Dereita:"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2742 Merge.rc:2803
+#: Merge.rc:2752 Merge.rc:2813
msgid "Total:"
msgstr "Total:"
#. IDD_COMPARE_STATISTICS3, IDOK
-#: Merge.rc:2745 Merge.rc:2806
+#: Merge.rc:2755 Merge.rc:2816
msgid "Close"
msgstr "Pechar"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2769
+#: Merge.rc:2779
msgid "Middle:"
msgstr "Central:"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2779
+#: Merge.rc:2789
msgid "Missing Left:"
msgstr "Falta no esquerdo:"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2784
+#: Merge.rc:2794
msgid "Missing Middle:"
msgstr "Falta no central:"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2789
+#: Merge.rc:2799
msgid "Missing Right:"
msgstr "Falta no dereito:"
#. IDD_LOAD_SAVE_CODEPAGE, IDC_AFFECTS_GROUP
-#: Merge.rc:2814
+#: Merge.rc:2824
msgid "Affects"
msgstr "Afecta"
#. IDD_LOAD_SAVE_CODEPAGE, IDC_RIGHT_FILES_LABEL
-#: Merge.rc:2816 Merge.rc:2818 Merge.rc:2820
+#: Merge.rc:2826 Merge.rc:2828 Merge.rc:2830
msgid "(Affects)"
msgstr "(Afecta)"
#. IDD_LOAD_SAVE_CODEPAGE, IDC_LOADING_GROUP
-#: Merge.rc:2821
+#: Merge.rc:2831
msgid "Select Codepage for"
msgstr "Seleccione a codificación para"
#. IDD_LOAD_SAVE_CODEPAGE, IDC_LOAD_FILES_LABEL
-#: Merge.rc:2822
+#: Merge.rc:2832
msgid "&File Loading:"
msgstr "&Carga do ficheiro:"
#. IDD_LOAD_SAVE_CODEPAGE, IDC_SAVE_FILES_LABEL
-#: Merge.rc:2824
+#: Merge.rc:2834
msgid "File &Saving:"
msgstr "Gardado do &ficheiro:"
#. IDD_LOAD_SAVE_CODEPAGE, IDC_LOAD_SAVE_SAME_CODEPAGE
-#: Merge.rc:2827
+#: Merge.rc:2837
msgid "&Use same codepage for both"
msgstr "&Usar a mesma codificación para ambos"
#. IDS_MESSAGEBOX_CANCEL
-#: Merge.rc:2830 Merge.rc:4172
+#: Merge.rc:2840 Merge.rc:4182
msgid "&Cancel"
msgstr "&Cancelar"
#. IDD_FILTERS_FILEFILTERS_TEST
-#: Merge.rc:2835
+#: Merge.rc:2845
msgid "Test Filter"
msgstr "Proba de filtro"
#. IDD_FILTERS_FILEFILTERS_TEST, IDC_HEADER
-#: Merge.rc:2838
+#: Merge.rc:2848
msgid "Testing filter:"
msgstr "Probando filtro:"
#. IDD_FILTERS_FILEFILTERS_TEST, IDC_PROMPT_LABEL
-#: Merge.rc:2840
+#: Merge.rc:2850
msgid "&Enter text to test:"
msgstr "&Inserir texto para probar:"
#. IDD_FILTERS_FILEFILTERS_TEST, IDC_IS_DIRECTORY
-#: Merge.rc:2842
+#: Merge.rc:2852
msgid "&Folder Name"
msgstr "&Nome da carpeta"
#. IDD_FILTERS_FILEFILTERS_TEST, IDC_STATIC
-#: Merge.rc:2843
+#: Merge.rc:2853
msgid "Result:"
msgstr "Resultado:"
#. IDD_FILTERS_FILEFILTERS_TEST, IDC_TEST_BTN
-#: Merge.rc:2845
+#: Merge.rc:2855
msgid "&Test"
msgstr "&Probar"
#. IDS_OPTIONSPG_TABLECOMPARE
-#: Merge.rc:2851 Merge.rc:2990 Merge.rc:4228
+#: Merge.rc:2861 Merge.rc:3000 Merge.rc:4238
msgid "Table"
msgstr "Táboa"
#. IDD_OPEN_TABLE, IDC_STATIC
-#: Merge.rc:2854
+#: Merge.rc:2864
msgid "File type"
msgstr "Tipo de ficheiro"
#. IDD_OPEN_TABLE, IDC_COMPARETABLE_CSV
-#: Merge.rc:2855
+#: Merge.rc:2865
msgid "&CSV"
msgstr "&CSV"
#. IDD_OPEN_TABLE, IDC_COMPARETABLE_TSV
-#: Merge.rc:2856
+#: Merge.rc:2866
msgid "&TSV"
msgstr "&TSV"
#. IDD_OPEN_TABLE, IDC_COMPARETABLE_DSV
-#: Merge.rc:2857
+#: Merge.rc:2867
msgid "Custom &Delimiter-Separated Values"
msgstr "Valores separados por &delimitadores personalizados"
#. IDD_PROPPAGE_COMPARE_TABLE, IDC_STATIC
-#: Merge.rc:2859 Merge.rc:2861 Merge.rc:2996 Merge.rc:3004
+#: Merge.rc:2869 Merge.rc:2871 Merge.rc:3006 Merge.rc:3014
msgid "D&elimiter character:"
msgstr "Caráct&er delimitador:"
#. IDD_PROPPAGE_COMPARE_TABLE, IDC_COMPARETABLE_ALLOWNEWLINE
-#: Merge.rc:2863 Merge.rc:3006
+#: Merge.rc:2873 Merge.rc:3016
msgid "&Allow newlines in quotes"
msgstr "Permitir liñas nov&as entre comiñas"
#. IDD_PROPPAGE_COMPARE_TABLE, IDC_STATIC
-#: Merge.rc:2865 Merge.rc:3008
+#: Merge.rc:2875 Merge.rc:3018
msgid "&Quote character:"
msgstr "Carác&ter de comiñas:"
#. IDS_OPTIONSPG_BACKUPS
-#: Merge.rc:2873 Merge.rc:4216
+#: Merge.rc:2883 Merge.rc:4226
msgid "Backup Files"
msgstr "Copias de seguridade"
#. IDD_PROPPAGE_BACKUPS, IDC_STATIC
-#: Merge.rc:2876
+#: Merge.rc:2886
msgid "Create backup files for:"
msgstr "Crear copias de seguridade en:"
#. IDD_PROPPAGE_BACKUPS, IDC_BACKUP_FOLDERCMP
-#: Merge.rc:2877
+#: Merge.rc:2887
msgid "&Folder compare"
msgstr "Comparación de &carpetas"
#. IDD_PROPPAGE_BACKUPS, IDC_BACKUP_FILECMP
-#: Merge.rc:2878
+#: Merge.rc:2888
msgid "Fil&e compare"
msgstr "Comparación de fich&eiros"
#. IDD_PROPPAGE_BACKUPS, IDC_STATIC
-#: Merge.rc:2879
+#: Merge.rc:2889
msgid "Create backup files in:"
msgstr "Crear copias de seguridade en:"
#. IDD_PROPPAGE_BACKUPS, IDC_BACKUP_ORIGFOLD
-#: Merge.rc:2880
+#: Merge.rc:2890
msgid "&Original file's folder"
msgstr "Carpeta do ficheiro &orixinal"
#. IDD_PROPPAGE_BACKUPS, IDC_BACKUP_GLOBALFOLD
-#: Merge.rc:2881
+#: Merge.rc:2891
msgid "&Global backup folder:"
msgstr "Carpeta &global para as copias de seguridade:"
#. IDD_PROPPAGE_BACKUPS, IDC_STATIC
-#: Merge.rc:2884
+#: Merge.rc:2894
msgid "Backup filename:"
msgstr "Nome do ficheiro da copia de seguridade:"
#. IDD_PROPPAGE_BACKUPS, IDC_BACKUP_APPEND_BAK
-#: Merge.rc:2885
+#: Merge.rc:2895
msgid "&Append .bak extension"
msgstr "&Añadir extensión .bak"
#. IDD_PROPPAGE_BACKUPS, IDC_BACKUP_APPEND_TIME
-#: Merge.rc:2886
+#: Merge.rc:2896
msgid "A&ppend timestamp"
msgstr "Añadir marca de tem&po"
#. IDS_CONFIRM_COPY_CAPTION
-#: Merge.rc:2892 Merge.rc:4565
+#: Merge.rc:2902 Merge.rc:4575
msgid "Confirm Copy"
msgstr "Confirmar copia"
#. IDD_CONFIRM_COPY, IDC_FLDCONFIRM_QUERY
-#: Merge.rc:2896
+#: Merge.rc:2906
msgid "Are you sure you want to copy XXX items?"
msgstr "Seguro que quere copiar XXX elementos?"
#. IDD_CONFIRM_COPY, IDC_FLDCONFIRM_FROM_TEXT
-#: Merge.rc:2897
+#: Merge.rc:2907
msgid "From left"
msgstr "Do esquerdo"
#. IDD_CONFIRM_COPY, IDC_FLDCONFIRM_TO_TEXT
-#: Merge.rc:2899
+#: Merge.rc:2909
msgid "To right"
msgstr "Para a dereito"
#. IDS_MESSAGEBOX_DONT_ASK_AGAIN
-#: Merge.rc:2901 Merge.rc:4191
+#: Merge.rc:2911 Merge.rc:4201
msgid "Don't ask this &question again."
msgstr "Non &preguntar isto de novo."
#. IDD_CONFIRM_COPY, IDYES
-#: Merge.rc:2903
+#: Merge.rc:2913
msgid "Yes"
msgstr "Si"
#. IDD_CONFIRM_COPY, IDNO
-#: Merge.rc:2904
+#: Merge.rc:2914
msgid "No"
msgstr "Non"
#. IDS_PROJECT_ITEM_PLUGIN
-#: Merge.rc:2909 Merge.rc:4323
+#: Merge.rc:2919 Merge.rc:4333
msgid "Plugins"
msgstr "Complementos"
#. IDD_PLUGINS_LIST, IDC_PLUGINS_ENABLE
-#: Merge.rc:2912
+#: Merge.rc:2922
msgid "&Enable plugins"
msgstr "Habilitar compl&ementos"
#. IDD_PLUGINS_EDITPLUGIN, IDC_STATIC
-#: Merge.rc:2913 Merge.rc:3113
+#: Merge.rc:2923 Merge.rc:3123
msgid "Plugin &type:"
msgstr ""
#. IDD_PLUGINS_LIST, IDC_STATIC
-#: Merge.rc:2916
+#: Merge.rc:2926
msgid "File filters:"
msgstr "Filtros de ficheiro:"
#. IDD_PLUGINS_LIST, IDC_STATIC
-#: Merge.rc:2918
+#: Merge.rc:2928
msgid "&Plugin arguments:"
msgstr "&Argumentos dos complementos:"
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_AUTOMATIC
-#: Merge.rc:2920 Merge.rc:3134
+#: Merge.rc:2930 Merge.rc:3144
msgid "Enable &automatic unpacking/prediffing"
msgstr "&Habilitar desempaquetamento/precomparación automática para o complemento"
#. IDS_OPTIONSPG_SHELL
-#: Merge.rc:2934 Merge.rc:4217
+#: Merge.rc:2944 Merge.rc:4227
msgid "Shell Integration"
msgstr "Integración"
#. IDD_PROPPAGE_SHELL, IDC_STATIC
-#: Merge.rc:2937
+#: Merge.rc:2947
msgid "Explorer"
msgstr "Explorador"
#. IDD_PROPPAGE_SHELL, IDC_EXPLORER_CONTEXT
-#: Merge.rc:2938
+#: Merge.rc:2948
msgid "&Add to context menu"
msgstr "&Añadir ao menú contextual"
#. IDD_PROPPAGE_SHELL, IDC_EXPLORER_ADVANCED
-#: Merge.rc:2939
+#: Merge.rc:2949
msgid "E&nable advanced menu"
msgstr "Habilitar me&nú avanzado"
#. IDD_PROPPAGE_SHELL, IDC_EXPLORER_COMPARE_AS
-#: Merge.rc:2940
+#: Merge.rc:2950
msgid "Enable &Compare As menu"
msgstr "Activar menú '&Comparar como'"
#. IDD_PROPPAGE_SHELL, IDC_REGISTER_SHELLEXTENSION
-#: Merge.rc:2941
+#: Merge.rc:2951
msgid "&Register Shell Extension"
msgstr "&Rexistrar extensión de shell"
#. IDD_PROPPAGE_SHELL, IDC_UNREGISTER_SHELLEXTENSION
-#: Merge.rc:2942
+#: Merge.rc:2952
msgid "&Unregister Shell Extension"
msgstr "An&ular rexistro da extensión de shell"
#. IDD_PROPPAGE_SHELL, IDC_REGISTER_SHELLEXTENSION_PERUSER
-#: Merge.rc:2943
+#: Merge.rc:2953
msgid "Register Shell Extension for Current User &Only"
msgstr "Rexistrar extensión de shell só para o usuari&o actual"
#. IDD_PROPPAGE_SHELL, IDC_UNREGISTER_SHELLEXTENSION_PERUSER
-#: Merge.rc:2944
+#: Merge.rc:2954
msgid "Unregister Shell Extension for Current User On&ly"
msgstr "Anu&lar rexistro da extensión de shell só para o usuario actual"
#. IDD_PROPPAGE_SHELL, IDC_REGISTER_WINMERGECONTEXTMENU
-#: Merge.rc:2945
+#: Merge.rc:2955
msgid "Register Shell Extension for &Windows 11"
msgstr "Rexistrar a extensión de shell para &Windows 11 ou posterior"
#. IDD_PROPPAGE_SHELL, IDC_UNREGISTER_WINMERGECONTEXTMENU
-#: Merge.rc:2946
+#: Merge.rc:2956
msgid "Unregister Shell Extension for W&indows 11"
msgstr "Anular a extensión de shell para W&indows 11 ou posterior"
#. IDD_PROPPAGE_SHELL, IDC_STATIC
-#: Merge.rc:2947
+#: Merge.rc:2957
msgid "Jump List"
msgstr "Lista rápida"
#. IDD_PROPPAGE_SHELL, IDC_CLEAR_ALL_RECENT_ITEMS
-#: Merge.rc:2949
+#: Merge.rc:2959
msgid "Clear all recent items"
msgstr "Borrar todos os elementos recentes"
#. IDS_OPTIONSPG_FOLDERCOMPARE
-#: Merge.rc:2954 Merge.rc:4225
+#: Merge.rc:2964 Merge.rc:4235
msgctxt "Options dialog|Categories"
msgid "Folder"
msgstr "Carpeta"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC
-#: Merge.rc:2957
+#: Merge.rc:2967
msgid "&Compare method:"
msgstr "Método de &comparación:"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_COMPARE_STOPFIRST
-#: Merge.rc:2959
+#: Merge.rc:2969
msgid "S&top after first difference"
msgstr "De&ter despois da primeira diferenza"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_IGNORE_SMALLTIMEDIFF
-#: Merge.rc:2961
+#: Merge.rc:2971
msgid "Ign&ore time differences less than 3 seconds"
msgstr "Ign&orar diferenzas de tempo inferiores a 3 segundos"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC
-#: Merge.rc:2964
+#: Merge.rc:2974
msgid "Expand subfolders &after comparison:"
msgstr "Expandir &automaticamente todas as subcarpetas despois da comparación:"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_COMPARE_WALKSUBDIRS
-#: Merge.rc:2966
+#: Merge.rc:2976
msgid "Include &unique subfolders contents"
msgstr "Incl&uír contidos únicos das subcarpetas"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_IGNORE_REPARSEPOINTS
-#: Merge.rc:2968
+#: Merge.rc:2978
msgid "Ignore &reparse points"
msgstr "Igno&rar os puntos de reparación"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC
-#: Merge.rc:2969
+#: Merge.rc:2979
msgid "Switch to &quick compare when size exceeds (MB):"
msgstr "Li&miar para cambiar a comparación rápida (MB):"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC
-#: Merge.rc:2971
+#: Merge.rc:2981
msgid "Switch to &binary compare when size exceeds (MB):"
msgstr "Limiar para cambiar a comparación &binaria (MB):"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC
-#: Merge.rc:2975
+#: Merge.rc:2985
msgid "Additional comparison condi&tions:"
msgstr ""
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC
-#: Merge.rc:2978
+#: Merge.rc:2988
msgid "&Rename/move detection:"
msgstr ""
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC
-#: Merge.rc:2980
+#: Merge.rc:2990
msgid "Rename/move detection &keys:"
msgstr ""
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC
-#: Merge.rc:2983
+#: Merge.rc:2993
msgid "M&erge renames and moves:"
msgstr ""
#. IDD_PROPPAGE_COMPARE_TABLE, IDC_STATIC
-#: Merge.rc:2994 Merge.rc:2999 Merge.rc:3002
+#: Merge.rc:3004 Merge.rc:3009 Merge.rc:3012
msgid "File patterns:"
msgstr "Padróns de ficheiro:"
#. IDD_PROPPAGE_COMPARE_TABLE, IDC_STATIC
-#: Merge.rc:3001
+#: Merge.rc:3011
msgid "Custom Delimiter-Separated Values"
msgstr "Separador personalizado de valores"
#. IDS_OPTIONSPG_BINARYCOMPARE
-#: Merge.rc:3015 Merge.rc:4227
+#: Merge.rc:3025 Merge.rc:4237
msgctxt "Options dialog|Categories"
msgid "Binary"
msgstr "Binario"
#. IDD_PROPPAGE_COMPARE_BINARY, IDC_STATIC
-#: Merge.rc:3018
+#: Merge.rc:3028
msgid "Binary file &patterns:"
msgstr "&Padróns de ficheiros binario:"
#. IDD_PROPPAGE_COMPARE_BINARY, IDC_STATIC
-#: Merge.rc:3020
+#: Merge.rc:3030
msgid "Frhed settings"
msgstr "Axustes de Frhed"
#. IDD_PROPPAGE_COMPARE_BINARY, IDC_COMPAREBINARY_VIEWSETTINGS
-#: Merge.rc:3021
+#: Merge.rc:3031
msgid "View &Settings..."
msgstr "Ver axu&stes..."
#. IDD_PROPPAGE_COMPARE_BINARY, IDC_COMPAREBINARY_BINARYMODE
-#: Merge.rc:3022
+#: Merge.rc:3032
msgid "&Binary Mode..."
msgstr "Modo &binario..."
#. IDD_PROPPAGE_COMPARE_BINARY, IDC_COMPAREBINARY_CHARACTERSET
-#: Merge.rc:3023
+#: Merge.rc:3033
msgid "&Character Set..."
msgstr "&Conxunto de caracteres..."
#. IDS_PRPCAT_IMAGE
-#: Merge.rc:3029 Merge.rc:4226 Merge.rc:4665
+#: Merge.rc:3039 Merge.rc:4236 Merge.rc:4675
msgid "Image"
msgstr "Imaxe"
#. IDD_PROPPAGE_COMPARE_IMAGE, IDC_STATIC
-#: Merge.rc:3032
+#: Merge.rc:3042
msgid "Image file &patterns:"
msgstr "&Padróns de ficheiros de imaxe:"
#. IDD_PROPPAGE_COMPARE_IMAGE, IDC_ENABLE_IMGCMP_IN_DIRCMP
-#: Merge.rc:3034
+#: Merge.rc:3044
msgid "&Enable image compare in folder compare"
msgstr "Activar a comparación de imax&es na comparación de carpetas"
#. IDD_PROPPAGE_COMPARE_IMAGE, IDC_STATIC
-#: Merge.rc:3036
+#: Merge.rc:3046
msgid "OCR result:"
msgstr "Resultado de OCR:"
#. IDS_OPTIONSPG_WEBPAGECOMPARE
-#: Merge.rc:3043 Merge.rc:4229
+#: Merge.rc:3053 Merge.rc:4239
msgid "Webpage"
msgstr "Páxina Web"
#. IDD_PROPPAGE_COMPARE_WEBPAGE, IDC_STATIC
-#: Merge.rc:3046
+#: Merge.rc:3056
msgid "URL pattern to &include (Regular expression):"
msgstr "Padrón URL a &incluír (expresión regular):"
#. IDD_PROPPAGE_COMPARE_WEBPAGE, IDC_STATIC
-#: Merge.rc:3048
+#: Merge.rc:3058
msgid "URL pattern to &exclude (Regular expression):"
msgstr "Padrón URL a &excluír (expresión regular):"
#. IDD_PROPPAGE_COMPARE_WEBPAGE, IDC_STATIC
-#: Merge.rc:3050
+#: Merge.rc:3060
msgid "&User data folder location:"
msgstr "&Ubicación da carpeta de datos do usuario:"
#. IDD_PROPPAGE_COMPARE_WEBPAGE, IDC_COMPAREWEBPAGE_USERDATAFOLDER_PERPANE
-#: Merge.rc:3052
+#: Merge.rc:3062
msgid "&Separate user data folders for each pane"
msgstr "Carpeta&s de datos do usuario separadas para cada panel"
#. IDD_ENCODINGERROR, IDC_HEXVIEW
-#: Merge.rc:3065
+#: Merge.rc:3075
msgid "&Hex View"
msgstr "Vista &hexadecimal"
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3110
+#: Merge.rc:3120
msgid "Edit Plugin"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN, IDC_STATIC
-#: Merge.rc:3123
+#: Merge.rc:3133
msgid "&Category:"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_MENUCAPTION_STATIC
-#: Merge.rc:3125
+#: Merge.rc:3135
msgid "&Menu caption:"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_WINDOWTYPE_STATIC
-#: Merge.rc:3127
+#: Merge.rc:3137
msgid "&Window type:"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_UNPACKEDFILEEXTENSION_STATIC
-#: Merge.rc:3132
+#: Merge.rc:3142
msgid "&Unpacked file extension:"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_ARGUMENTSREQUIRED
-#: Merge.rc:3136
+#: Merge.rc:3146
msgid "&Require arguments"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_GENERATESCRIPT
-#: Merge.rc:3137
+#: Merge.rc:3147
msgid "&Generate editor script"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_COMMAND_LINE_STATIC
-#: Merge.rc:3140
+#: Merge.rc:3150
msgid "Command &line:"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_SCRIPT_FILEEXTENSION_STATIC
-#: Merge.rc:3143
+#: Merge.rc:3153
msgid "&Script file extension:"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_SCRIPT_BODY_STATIC
-#: Merge.rc:3145
+#: Merge.rc:3155
msgid "Script &body:"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3154
+#: Merge.rc:3164
msgid "Font"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3157
+#: Merge.rc:3167
msgid "&Font:"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3163
+#: Merge.rc:3173
msgid "Font st&yle:"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3169
+#: Merge.rc:3179
msgid "&Size:"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3175
+#: Merge.rc:3185
msgid "Effects"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3176
+#: Merge.rc:3186
msgid "Stri&keout"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3177
+#: Merge.rc:3187
msgid "&Underline"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3179
+#: Merge.rc:3189
msgid "&Color:"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3184
+#: Merge.rc:3194
msgid "Sample"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3185
+#: Merge.rc:3195
msgid "AaBbYyZz"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3189
+#: Merge.rc:3199
msgid "Sc&ript:"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN, IDC_MANAGE_LINK
-#: Merge.rc:3194
+#: Merge.rc:3204
msgid "Show more fonts"
msgstr ""
#. ID_INDICATOR_EXT
-#: Merge.rc:4118
+#: Merge.rc:4128
msgid "EXT"
msgstr "EXT"
#. ID_INDICATOR_CAPS
-#: Merge.rc:4119
+#: Merge.rc:4129
msgid "CAP"
msgstr "MAY"
#. ID_INDICATOR_NUM
-#: Merge.rc:4120
+#: Merge.rc:4130
msgid "NUM"
msgstr "NÚM"
#. ID_INDICATOR_SCRL
-#: Merge.rc:4121
+#: Merge.rc:4131
msgid "SCRL"
msgstr "DESP"
#. ID_INDICATOR_OVR
-#: Merge.rc:4122
+#: Merge.rc:4132
msgid "OVR"
msgstr "SOBR"
#. ID_INDICATOR_REC
-#: Merge.rc:4123
+#: Merge.rc:4133
msgid "REC"
msgstr "GRV"
#. ID_FILE_NEW
-#: Merge.rc:4129
+#: Merge.rc:4139
msgid ""
"\n"
"New Documents (Ctrl+N)"
@@ -4866,7 +4877,7 @@ msgstr ""
"Novo documento (Ctrl+N)"
#. ID_FILE_OPEN
-#: Merge.rc:4130
+#: Merge.rc:4140
msgid ""
"\n"
"Open (Ctrl+O)"
@@ -4875,7 +4886,7 @@ msgstr ""
"Abrir (Ctrl+O)"
#. ID_FILE_SAVE
-#: Merge.rc:4131
+#: Merge.rc:4141
msgid ""
"\n"
"Save (Ctrl+S)"
@@ -4884,27 +4895,27 @@ msgstr ""
"Gardar (Ctrl+S)"
#. IDS_UNK_ERROR_READING_PROJECT
-#: Merge.rc:4137
+#: Merge.rc:4147
msgid "Unknown error opening project file."
msgstr "Erro descoñecido ao tentar abrir o ficheiro do proxecto."
#. IDS_UNK_ERROR_SAVING_PROJECT
-#: Merge.rc:4138
+#: Merge.rc:4148
msgid "Unknown error saving project file."
msgstr "Erro descoñecido ao tentar gardar o ficheiro do proxecto."
#. IDS_PROJFILE_LOAD_SUCCESS
-#: Merge.rc:4143
+#: Merge.rc:4153
msgid "Project file loaded."
msgstr "Ficheiro do proxecto cargado correctamente."
#. IDS_PROJFILE_SAVE_SUCCESS
-#: Merge.rc:4144
+#: Merge.rc:4154
msgid "Project file saved."
msgstr "Ficheiro do proxecto gardado correctamente."
#. ID_EDIT_UNDO
-#: Merge.rc:4150
+#: Merge.rc:4160
msgid ""
"\n"
"Undo (Ctrl+Z)"
@@ -4913,7 +4924,7 @@ msgstr ""
"Desfacer (Ctrl+Z)"
#. ID_EDIT_REDO
-#: Merge.rc:4151
+#: Merge.rc:4161
msgid ""
"\n"
"Redo (Ctrl+Y)"
@@ -4922,7 +4933,7 @@ msgstr ""
"Refacer (Ctrl+Y)"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:4158
+#: Merge.rc:4168
msgid ""
"\n"
"FileCompare\n"
@@ -4941,7 +4952,7 @@ msgstr ""
"Comparación de arquivos de WinMerge"
#. IDR_DIRDOCTYPE
-#: Merge.rc:4159
+#: Merge.rc:4169
msgid ""
"\n"
"FolderCompare\n"
@@ -4960,162 +4971,162 @@ msgstr ""
"Comparación de carpetas de WinMerge"
#. IDS_SPLASH_GPLTEXT
-#: Merge.rc:4165
+#: Merge.rc:4175
msgid "WinMerge comes with ABSOLUTELY NO WARRANTY. It is free software and can be redistributed under the conditions of the GNU General Public License - see the Help menu for details."
msgstr "WinMerge ofrécese sen GARANTÍA DE NINGUNHA CLASE. Este programa é software gratuíto e animámolo a distribuílo baixo certas condicións. Consulte a Licenza Pública Xeral GNU na opción Axuda para ter máis información."
#. IDS_MESSAGEBOX_ABORT
-#: Merge.rc:4173
+#: Merge.rc:4183
msgid "&Abort"
msgstr "C&ancelar"
#. IDS_MESSAGEBOX_RETRY
-#: Merge.rc:4174
+#: Merge.rc:4184
msgid "&Retry"
msgstr "Tenta&r de novo"
#. IDS_MESSAGEBOX_IGNORE
-#: Merge.rc:4175
+#: Merge.rc:4185
msgid "&Ignore"
msgstr "&Ignorar"
#. IDS_MESSAGEBOX_IGNOREALL
-#: Merge.rc:4176
+#: Merge.rc:4186
msgid "Ignore &all"
msgstr "Ignor&ar todo"
#. IDS_MESSAGEBOX_YES
-#: Merge.rc:4177
+#: Merge.rc:4187
msgid "&Yes"
msgstr "&Si"
#. IDS_MESSAGEBOX_YES_TO_ALL
-#: Merge.rc:4183
+#: Merge.rc:4193
msgid "Yes to &all"
msgstr "Si &a todo"
#. IDS_MESSAGEBOX_NO
-#: Merge.rc:4184
+#: Merge.rc:4194
msgid "&No"
msgstr "&Non"
#. IDS_MESSAGEBOX_NO_TO_ALL
-#: Merge.rc:4185
+#: Merge.rc:4195
msgid "No to a&ll"
msgstr "Non a &todo"
#. IDS_MESSAGEBOX_CONTINUE
-#: Merge.rc:4186
+#: Merge.rc:4196
msgid "&Continue"
msgstr "&Continuar"
#. IDS_MESSAGEBOX_SKIP
-#: Merge.rc:4187
+#: Merge.rc:4197
msgid "&Skip"
msgstr "&Omitir"
#. IDS_MESSAGEBOX_SKIPALL
-#: Merge.rc:4188
+#: Merge.rc:4198
msgid "Skip &all"
msgstr "O&mitir todo"
#. IDS_MESSAGEBOX_DONT_DISPLAY_AGAIN
-#: Merge.rc:4190
+#: Merge.rc:4200
msgid "Don't display this &message again."
msgstr "Non mostrar esta &mensaxe de novo."
-#: Merge.rc:4193
+#: Merge.rc:4203
msgid "To make this message box visible, press Reset on the Message Boxes page in Options."
msgstr "Para facer visible outra vez este diálogo de mensaxe prema o botón Restablecer na páxina Cadros de mensaxes de Configuración."
#. IDS_OPTIONSPG_EDITOR_COMPAREMERGE
-#: Merge.rc:4203
+#: Merge.rc:4213
msgid "Compare/Merge"
msgstr ""
#. IDS_OPTIONSPG_SYNTAXCOLORS
-#: Merge.rc:4204 Merge.rc:4208
+#: Merge.rc:4214 Merge.rc:4218
msgid "Syntax"
msgstr "Sintaxe"
#. IDS_OPTIONSPG_COLOR_SCHEMES
-#: Merge.rc:4206
+#: Merge.rc:4216
msgid "Color Schemes"
msgstr "Esquemas de cores"
#. IDS_OPTIONSPG_DIRCOLORS
-#: Merge.rc:4210
+#: Merge.rc:4220
msgid "Folder Compare"
msgstr "Comparación de carpetas"
#. IDS_OPTIONSPG_PROJECT
-#: Merge.rc:4215
+#: Merge.rc:4225
msgid "Project"
msgstr "Proxecto"
#. IDS_COLHDR_NSDIFFS
-#: Merge.rc:4218 Merge.rc:4640
+#: Merge.rc:4228 Merge.rc:4650
msgid "Differences"
msgstr "Diferenzas"
#. IDS_OPTIONSPG_MESSAGEBOXES
-#: Merge.rc:4220
+#: Merge.rc:4230
msgid "Message Boxes"
msgstr "Cadros de mensaxes"
#. IDS_TO
-#: Merge.rc:4235
+#: Merge.rc:4245
msgid "To:"
msgstr "A:"
#. IDS_FROM_LEFT
-#: Merge.rc:4236
+#: Merge.rc:4246
msgid "From left:"
msgstr "Do esquerdo:"
#. IDS_TO_LEFT
-#: Merge.rc:4237
+#: Merge.rc:4247
msgid "To left:"
msgstr "Ao esquerdo:"
#. IDS_FROM_RIGHT
-#: Merge.rc:4238
+#: Merge.rc:4248
msgid "From right:"
msgstr "Do dereito:"
#. IDS_TO_RIGHT
-#: Merge.rc:4239
+#: Merge.rc:4249
msgid "To right:"
msgstr "Ao dereito:"
#. IDS_FROM_MIDDLE
-#: Merge.rc:4240
+#: Merge.rc:4250
msgid "From middle:"
msgstr "Do central:"
#. IDS_TO_MIDDLE
-#: Merge.rc:4241
+#: Merge.rc:4251
msgid "To middle:"
msgstr "Ao central:"
#. IDS_VERSION_FMT
-#: Merge.rc:4247
+#: Merge.rc:4257
#, c-format
msgid "Version %1"
msgstr "Versión %1"
#. IDS_OPTIONS_TITLE
-#: Merge.rc:4253
+#: Merge.rc:4263
#, c-format
msgid "Options (%1)"
msgstr "Configuración (%1)"
#. IDS_MESSAGE_BOX_ARE_RESET
-#: Merge.rc:4254
+#: Merge.rc:4264
msgid "All message boxes are now displayed again."
msgstr "Todos os cadros de mensaxe mostraranse de novo."
-#: Merge.rc:4256
+#: Merge.rc:4266
#, c-format
msgid "Tab size value is out of range. Please use 1 - %1."
msgstr ""
@@ -5124,156 +5135,156 @@ msgstr ""
"Por favor, use valores entre 1 e %1."
#. IDS_PROJECT_OPEN
-#: Merge.rc:4262 Merge.rc:4318
+#: Merge.rc:4272 Merge.rc:4328
msgid "Open"
msgstr "Abrir"
#. IDS_PROGRAMFILES
-#: Merge.rc:4263
+#: Merge.rc:4273
msgid "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||"
msgstr "Programas | *.exe; *.bat; *.cmd | Todos os ficheiros (*.*) |*.*| |"
#. IDS_ALLFILES
-#: Merge.rc:4264
+#: Merge.rc:4274
msgid "All Files (*.*)|*.*||"
msgstr "Todos os ficheiros (*.*) |*.*| |"
#. IDS_PROJECTFILES
-#: Merge.rc:4265
+#: Merge.rc:4275
msgid "WinMerge Project Files (*.WinMerge)|*.WinMerge||"
msgstr "Ficheiros de proxecto de WinMerge (*.WinMerge) |*.WinMerge| |"
#. IDS_INIFILES
-#: Merge.rc:4267
+#: Merge.rc:4277
msgid "Options files (*.ini)|*.ini|All Files (*.*)|*.*||"
msgstr "Ficheiros de opcións (*.ini) | *.ini | Todos os ficheiros (*.*) |*.*| |"
#. IDS_REPLACELIST_FILES
-#: Merge.rc:4268
+#: Merge.rc:4278
msgid "Tab-Separated Values (*.tsv;*.txt)|*.tsv;*.txt|All Files (*.*)|*.*||"
msgstr ""
#. IDS_TEXT_REPORT_FILES
-#: Merge.rc:4274
+#: Merge.rc:4284
msgid "Text Files (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|All Files (*.*)|*.*||"
msgstr "Ficheiros de texto (*.csv; *.asc; *.rpt; *.txt) | *.csv; *.asc; *.rpt; *.txt | Todos os ficheiros (*.*) |*.*| |"
#. IDS_HTML_REPORT_FILES
-#: Merge.rc:4275
+#: Merge.rc:4285
msgid "HTML Files (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||"
msgstr "Ficheiros HTML (*.htm, *.html) | *.htm;* .html | Todos os ficheiros (*.*) |*.*| |"
#. IDS_XML_REPORT_FILES
-#: Merge.rc:4276
+#: Merge.rc:4286
msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||"
msgstr "Ficheiros XML (*.xml) |*.xml | Todos os ficheiros (*.*) |*.*| |"
#. IDS_EXPANDSUBDIRS_DONOTEXPAND
-#: Merge.rc:4294
+#: Merge.rc:4304
msgid "Do not expand"
msgstr "Non expandir"
#. IDS_EXPANDSUBDIRS_ALL
-#: Merge.rc:4295
+#: Merge.rc:4305
msgid "Expand all subfolders"
msgstr "Expandir todas as subcarpetas"
#. IDS_EXPANDSUBDIRS_DIFFERENT
-#: Merge.rc:4296
+#: Merge.rc:4306
msgid "Expand different subfolders"
msgstr "Expandir as subcarpetas diferentes"
#. IDS_EXPANDSUBDIRS_IDENTICAL
-#: Merge.rc:4297
+#: Merge.rc:4307
msgid "Expand identical subfolders"
msgstr "Expandir as subcarpetas iguais"
#. IDS_SYNTAXTABLE_FILETYPE
-#: Merge.rc:4303
+#: Merge.rc:4313
msgid "File Type"
msgstr "Tipo de ficheiro"
#. IDS_COLHDR_EXTENSION
-#: Merge.rc:4304 Merge.rc:4597
+#: Merge.rc:4314 Merge.rc:4607
msgid "Extension"
msgstr "Extensión"
#. IDS_PRPCAT_MESSAGE
-#: Merge.rc:4310 Merge.rc:4669
+#: Merge.rc:4320 Merge.rc:4679
msgid "Message"
msgstr "Mensaxe"
#. IDS_MESSAGEBOX_ANSWER
-#: Merge.rc:4311
+#: Merge.rc:4321
msgid "Answer"
msgstr "Resposta"
#. IDS_PROJECT_ITEM
-#: Merge.rc:4317
+#: Merge.rc:4327
msgid "Item"
msgstr "Elemento"
#. IDS_PROJECT_LOAD
-#: Merge.rc:4319
+#: Merge.rc:4329
msgid "Load"
msgstr "Cargar"
#. IDS_PROJECT_SAVE
-#: Merge.rc:4320
+#: Merge.rc:4330
msgid "Save"
msgstr "Gardar"
#. IDS_PROJECT_ITEM_INCLUDE_SUBFOLDERS
-#: Merge.rc:4322
+#: Merge.rc:4332
msgid "Include Subfolders"
msgstr "Incluír subcarpetas"
#. IDS_PROJECT_ITEM_COMPARE_OPTIONS
-#: Merge.rc:4324
+#: Merge.rc:4334
msgid "Compare Options"
msgstr "Opcións de comparación"
#. IDS_PROJECT_ITEM_HIDDEN_ITEMS
-#: Merge.rc:4325
+#: Merge.rc:4335
msgid "Hidden Items"
msgstr "Elementos ocultos"
#. IDS_PLUGINSLIST_NAME
-#: Merge.rc:4331 Merge.rc:4956
+#: Merge.rc:4341 Merge.rc:4966
msgid "Name"
msgstr "Nome"
#. IDS_FILTERFILE_PATHTITLE
-#: Merge.rc:4332
+#: Merge.rc:4342
msgid "Location"
msgstr "Ubicación"
#. IDS_FILTER_TITLE
-#: Merge.rc:4333
+#: Merge.rc:4343
msgid "Filters"
msgstr "Filtros"
#. IDS_FILTER_PREFIX
-#: Merge.rc:4334
+#: Merge.rc:4344
msgid "[F] "
msgstr "[F] "
#. IDS_PLUGINSLIST_DESC
-#: Merge.rc:4335 Merge.rc:4958
+#: Merge.rc:4345 Merge.rc:4968
msgid "Description"
msgstr "Descrición"
#. IDS_FILEFILTER_SAVENEW
-#: Merge.rc:4336
+#: Merge.rc:4346
msgid "Select Filename for New Filter"
msgstr "Seleccione un nome de ficheiro para o novo filtro"
#. IDS_FILEFILTER_FILEMASK
-#: Merge.rc:4337
+#: Merge.rc:4347
msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||"
msgstr "Arquivo de filtros (*.flt) |* .flt | Todos os ficheiros (*.*)| *.*| |"
-#: Merge.rc:4339
+#: Merge.rc:4349
#, c-format
msgid ""
"Cannot find filter template!\n"
@@ -5286,7 +5297,7 @@ msgstr ""
"Copie o ficheiro %1 á carpeta de WinMerge/Filters:\n"
"%2."
-#: Merge.rc:4341
+#: Merge.rc:4351
#, c-format
msgid ""
"Cannot copy filter template:\n"
@@ -5299,7 +5310,7 @@ msgstr ""
"\n"
"Asegúrese de que a carpeta existe e de que ten permiso de escritura nela."
-#: Merge.rc:4343
+#: Merge.rc:4353
msgid ""
"User's filter folder is not defined!\n"
"\n"
@@ -5309,7 +5320,7 @@ msgstr ""
"\n"
"Escolla unha carpeta de filtros en Configuración/Sistema."
-#: Merge.rc:4345
+#: Merge.rc:4355
#, c-format
msgid ""
"Failed to delete filter:\n"
@@ -5323,11 +5334,11 @@ msgstr ""
"O ficheiro é de só lectura?"
#. IDS_FILEFILTER_INSTALL
-#: Merge.rc:4346
+#: Merge.rc:4356
msgid "Locate Filter File to Install"
msgstr "Localice o arquivo de filtro a instalar"
-#: Merge.rc:4348
+#: Merge.rc:4358
msgid ""
"Installing filter file failed.\n"
"\n"
@@ -5338,17 +5349,17 @@ msgstr ""
"Non se puido copiar o novo ficheiro de filtros á carpeta de filtros."
#. IDS_FILEFILTER_OVERWRITE
-#: Merge.rc:4349
+#: Merge.rc:4359
msgid "Filter file exists. Overwrite?"
msgstr "O ficheiro de filtros xa existe. Quéreo sobrescribir?"
#. IDS_FILTERLINE_REGEXP
-#: Merge.rc:4355
+#: Merge.rc:4365
msgid "Regular expression"
msgstr "Expresión regular"
#. IDS_FILTERCHANGED
-#: Merge.rc:4361
+#: Merge.rc:4371
msgid ""
"Filters updated. Refresh all open folder compares?\n"
"\n"
@@ -5359,217 +5370,217 @@ msgstr ""
"Se non quere actualizar todas as comparacións agora, pode escoller 'Non' e actualizalas máis adiante."
#. IDS_DIRECTORY_WINDOW_TITLE
-#: Merge.rc:4367
+#: Merge.rc:4377
msgid "Folder Comparison Results"
msgstr "Resultado da comparación de carpetas"
#. IDS_FILE_COMPARISON_TITLE
-#: Merge.rc:4368
+#: Merge.rc:4378
msgid "File Comparison"
msgstr "Comparación de ficheiros"
#. IDS_EMPTY_LEFT_FILE
-#: Merge.rc:4369
+#: Merge.rc:4379
msgid "Untitled Left"
msgstr "Esquerdo sen título"
#. IDS_EMPTY_MIDDLE_FILE
-#: Merge.rc:4370
+#: Merge.rc:4380
msgid "Untitled Middle"
msgstr "Central sen título"
#. IDS_EMPTY_RIGHT_FILE
-#: Merge.rc:4371
+#: Merge.rc:4381
msgid "Untitled Right"
msgstr "Dereito sen título"
#. IDS_CONFLICT_BASE_FILE
-#: Merge.rc:4372
+#: Merge.rc:4382
msgid "Base File"
msgstr "Ficheiro base"
#. IDS_CONFLICT_THEIRS_FILE
-#: Merge.rc:4373
+#: Merge.rc:4383
msgid "Theirs File"
msgstr "O seu ficheiro"
#. IDS_CONFLICT_MINE_FILE
-#: Merge.rc:4374
+#: Merge.rc:4384
msgid "Mine File"
msgstr "O meu ficheiro"
#. IDS_SELFCOMPARE_ORIGINAL_FILE
-#: Merge.rc:4375
+#: Merge.rc:4385
msgid "Original File"
msgstr "Ficheiro orixinal"
#. IDS_LINE_STATUS_INFO_EOL
-#: Merge.rc:4381
+#: Merge.rc:4391
#, c-format
msgid "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s"
msgstr "Liña: %s Columna: %d/%d Carácter: %d/%d EOL: %s"
#. IDS_EMPTY_LINE_STATUS_INFO
-#: Merge.rc:4382
+#: Merge.rc:4392
#, c-format
msgid "Line: %s"
msgstr "Liña: %s"
#. IDS_LINE_STATUS_INFO
-#: Merge.rc:4383
+#: Merge.rc:4393
#, c-format
msgid "Ln: %s Col: %d/%d Ch: %d/%d"
msgstr "Liña: %s Columna: %d/%d Carácter: %d/%d"
#. IDS_LINE_STATUS_INFO_SEL
-#: Merge.rc:4384
+#: Merge.rc:4394
#, c-format
msgid " Sel: %d | %d"
msgstr " Selec.: %d | %d"
#. IDS_MERGEMODE_MERGING
-#: Merge.rc:4385
+#: Merge.rc:4395
msgid "Merge"
msgstr "Mesturar"
#. IDS_DIFF_NUMBER_STATUS_FMT
-#: Merge.rc:4386
+#: Merge.rc:4396
#, c-format
msgid "Difference %1 of %2"
msgstr "Diferenza %1 de %2"
#. IDS_NO_DIFF_SEL_FMT
-#: Merge.rc:4387
+#: Merge.rc:4397
#, c-format
msgid "%1 Differences Found"
msgstr "%1 diferenzas atopadas"
#. IDS_1_DIFF_FOUND
-#: Merge.rc:4388
+#: Merge.rc:4398
msgid "1 Difference Found"
msgstr "1 diferenza atopada"
#. IDS_NO_ERR_SEL_FMT
-#: Merge.rc:4389
+#: Merge.rc:4399
#, c-format
msgid "%1 Errors Found"
msgstr ""
#. IDS_1_ERR_FOUND
-#: Merge.rc:4390
+#: Merge.rc:4400
msgid "1 Error Found"
msgstr ""
#. IDS_STATUSBAR_READONLY, Abbreviation from "Read Only"
-#: Merge.rc:4391
+#: Merge.rc:4401
msgid "RO"
msgstr "SL"
#. IDS_DIRVIEW_STATUS_FMT_FOCUS
-#: Merge.rc:4397
+#: Merge.rc:4407
#, c-format
msgid "Item %1 of %2"
msgstr "Elemento %1 de %2"
#. IDS_DIRVIEW_STATUS_FMT_NOFOCUS
-#: Merge.rc:4398
+#: Merge.rc:4408
#, c-format
msgid "Items: %1"
msgstr "Elementos: %1"
#. IDS_DIRVIEW_STATUS_COMPARING
-#: Merge.rc:4399
+#: Merge.rc:4409
msgid "Comparing items..."
msgstr "Comparando elementos..."
#. IDS_ITEMS_PER_SEC
-#: Merge.rc:4400
+#: Merge.rc:4410
#, c-format
msgid "%.1f[items/sec]"
msgstr "%.1f[elementos/seg]"
#. IDS_ERROR_INCOMPARABLE
-#: Merge.rc:4406
+#: Merge.rc:4416
msgid "Select two existing folders/files to compare."
msgstr "Seleccione dúas carpetas ou ficheiros para comparar."
#. IDS_DIRSEL_TAG
-#: Merge.rc:4407
+#: Merge.rc:4417
msgid "Folder Selection"
msgstr "Selección de carpeta"
#. IDS_OPEN_FILESDIRS
-#: Merge.rc:4408
+#: Merge.rc:4418
msgid "Select two (or three) folders/files to compare."
msgstr "Seleccione dúas (ou tres) carpetas ou dous (ou tres) ficheiros para comparar."
#. IDS_OPEN_LEFTINVALID
-#: Merge.rc:4409
+#: Merge.rc:4419
msgid "Left (1st) path is invalid!"
msgstr "¡A ruta do esquerdo (1º) non é válida!"
#. IDS_OPEN_MIDDLEINVALID
-#: Merge.rc:4410
+#: Merge.rc:4420
msgid "Middle (2nd) path is invalid!"
msgstr "¡A ruta do central (2º) non é válida!"
#. IDS_OPEN_RIGHTINVALID2
-#: Merge.rc:4411
+#: Merge.rc:4421
msgid "Right (2nd) path is invalid!"
msgstr "¡A ruta do dereito (2º) non é válida!"
#. IDS_OPEN_RIGHTINVALID3
-#: Merge.rc:4412
+#: Merge.rc:4422
msgid "Right (3rd) path is invalid!"
msgstr "¡A ruta do dereito (3º) non é válida!"
#. IDS_OPEN_BOTHINVALID
-#: Merge.rc:4413
+#: Merge.rc:4423
msgid "Both paths are invalid!"
msgstr "¡Ambas rutas non son válidas!"
-#: Merge.rc:4415
+#: Merge.rc:4425
msgid "Left (1st) and Middle (2nd) paths are invalid!"
msgstr "¡As rutas do esquerdo (1º) e central (2º) non son válidas!"
#. IDS_OPEN_LEFTRIGHTINVALID
-#: Merge.rc:4416
+#: Merge.rc:4426
msgid "Left (1st) and Right (3rd) paths are invalid!"
msgstr "¡As rutas do esquerdo (1º) e dereito (3º) non son válidas!"
-#: Merge.rc:4418
+#: Merge.rc:4428
msgid "Middle (2nd) and Right (3rd) paths are invalid!"
msgstr "¡As rutas do central (2º) e dereito (3º) non son válidas!"
#. IDS_OPEN_ALLINVALID
-#: Merge.rc:4419
+#: Merge.rc:4429
msgid "All paths are invalid!"
msgstr "¡Ningunha ruta é válida!"
#. IDS_OPEN_UNPACKERDISABLED
-#: Merge.rc:4420
+#: Merge.rc:4430
msgid "Only enabled for file comparisons"
msgstr "Habilitar só para comparar ficheiros"
#. IDS_OPEN_MISMATCH
-#: Merge.rc:4421
+#: Merge.rc:4431
msgid "Cannot compare file and folder!"
msgstr "¡Non se pode comparar un ficheiro cunha carpeta!"
#. IDS_ERROR_FILE_NOT_FOUND
-#: Merge.rc:4427
+#: Merge.rc:4437
#, c-format
msgid "File not found: %1"
msgstr "Ficheiro non atopado: %1"
#. IDS_ERROR_FILE_NOT_UNPACKED
-#: Merge.rc:4428
+#: Merge.rc:4438
#, c-format
msgid "File not unpacked: %1"
msgstr "Ficheiro non desempaquetado: %1"
#. IDS_ERROR_FILEOPEN
-#: Merge.rc:4429
+#: Merge.rc:4439
#, c-format
msgid ""
"Cannot open file\n"
@@ -5583,12 +5594,12 @@ msgstr ""
"%2"
#. IDS_ERROR_CONF_RESOLVE
-#: Merge.rc:4430
+#: Merge.rc:4440
msgid "Failed to parse conflict file."
msgstr "Non se puido analizar o ficheiro de conflito."
#. IDS_NOT_CONFLICT_FILE
-#: Merge.rc:4431
+#: Merge.rc:4441
#, c-format
msgid "The file\n%1\nis not a conflict file."
msgstr ""
@@ -5597,7 +5608,7 @@ msgstr ""
"non é conflitivo."
#. IDS_COMPARE_LARGE_FILES
-#: Merge.rc:4432
+#: Merge.rc:4442
msgid "Comparing large files requires significant memory.\nShow only comparison results (not file contents)?"
msgstr ""
"Vai comparar dous ficheiros moi grandes.\n"
@@ -5606,28 +5617,28 @@ msgstr ""
"\n"
#. IDS_SAVE_AS_TITLE
-#: Merge.rc:4438
+#: Merge.rc:4448
msgid "Save As"
msgstr "Gardar como"
#. IDS_SAVE_FMT
-#: Merge.rc:4439
+#: Merge.rc:4449
#, c-format
msgid "Save changes to %1?"
msgstr "Quere gardar os cambios en %1?"
#. IDS_SAVEREADONLY_FMT
-#: Merge.rc:4440
+#: Merge.rc:4450
#, c-format
msgid "%1 is read-only. Override? Or 'No' to save as new filename?"
msgstr "%1 está definido como de só lectura. Desexa anular a marca de só lectura? (Seleccione 'Non' para gardalo cun novo nome de arquivo)."
#. IDS_ERROR_BACKUP
-#: Merge.rc:4441
+#: Merge.rc:4451
msgid "Error backing up file"
msgstr "Erro ao facer unha copia de seguridade do ficheiro"
-#: Merge.rc:4443
+#: Merge.rc:4453
#, c-format
msgid ""
"Unable to backup original file:\n"
@@ -5641,7 +5652,7 @@ msgstr ""
"Continuar de todas formas?"
#. IDS_FILESAVE_FAILED
-#: Merge.rc:4444
+#: Merge.rc:4454
#, c-format
msgid "Saving file failed.\n%1\n%2\n\t- Use different filename (OK)\n\t- Abort (Cancel)?"
msgstr ""
@@ -5652,7 +5663,7 @@ msgstr ""
"\t- usar un nome de ficheiro distinto (prema Aceptar)\n"
"\t- cancelar a operación (prema Cancelar)"
-#: Merge.rc:4446
+#: Merge.rc:4456
#, c-format
msgid "Plugin '%2' cannot pack changes to left file into '%1'.\n\nOriginal unchanged. Save unpacked version?"
msgstr ""
@@ -5662,7 +5673,7 @@ msgstr ""
"\n"
"Desexa gardar a versión sin empaquetar noutro ficheiro?"
-#: Merge.rc:4448
+#: Merge.rc:4458
#, c-format
msgid "Plugin '%2' cannot pack changes to middle file into '%1'.\n\nOriginal unchanged. Save unpacked version?"
msgstr ""
@@ -5672,7 +5683,7 @@ msgstr ""
"\n"
"Desexa gardar a versión sin empaquetar noutro ficheiro?"
-#: Merge.rc:4450
+#: Merge.rc:4460
#, c-format
msgid "Plugin '%2' cannot pack changes to right file into '%1'.\n\nOriginal unchanged. Save unpacked version?"
msgstr ""
@@ -5683,7 +5694,7 @@ msgstr ""
"Desexa gardar a versión sin empaquetar noutro ficheiro?"
#. IDS_FILECHANGED_ONDISK
-#: Merge.rc:4451
+#: Merge.rc:4461
#, c-format
msgid ""
"Another application updated\n"
@@ -5699,7 +5710,7 @@ msgstr ""
"Quere sobrescribir o ficheiro cambiado?"
#. IDS_SAVEREADONLY_MULTI
-#: Merge.rc:4452
+#: Merge.rc:4462
#, c-format
msgid ""
"%1\n"
@@ -5709,7 +5720,7 @@ msgstr ""
"é de só lectura. Desexa anular esa opción e sobrescribilo?"
#. IDS_FILECHANGED_RESCAN
-#: Merge.rc:4453
+#: Merge.rc:4463
#, c-format
msgid "Another application updated\n%1\nsince last scan.\n\nReload?"
msgstr ""
@@ -5720,22 +5731,22 @@ msgstr ""
"Desexa recargalo?"
#. IDS_SAVE_LEFT_AS
-#: Merge.rc:4454
+#: Merge.rc:4464
msgid "Save Left File As"
msgstr "Gardar o ficheiro esquerdo como"
#. IDS_SAVE_MIDDLE_AS
-#: Merge.rc:4455
+#: Merge.rc:4465
msgid "Save Middle File As"
msgstr "Gardar o ficheiro central como"
#. IDS_SAVE_RIGHT_AS
-#: Merge.rc:4456
+#: Merge.rc:4466
msgid "Save Right File As"
msgstr "Gardar o ficheiro dereito como"
#. IDS_FILE_DISAPPEARED
-#: Merge.rc:4461
+#: Merge.rc:4471
#, c-format
msgid ""
"File\n"
@@ -5747,7 +5758,7 @@ msgstr ""
"desapareceu. Por favor, garde unha copia do ficheiro para continuar."
#. IDS_VIEWS_OUTOFSYNC
-#: Merge.rc:4467
+#: Merge.rc:4477
msgid ""
"Cannot merge unsynched documents.\n"
"\n"
@@ -5758,186 +5769,186 @@ msgstr ""
"Actualíceos antes de seguir."
#. IDS_BREAK_ON_WHITESPACE
-#: Merge.rc:4472
+#: Merge.rc:4482
msgid "Break at whitespace"
msgstr "Deter en espazo en branco"
#. IDS_BREAK_ON_PUNCTUATION
-#: Merge.rc:4473
+#: Merge.rc:4483
msgid "Break at whitespace or punctuation"
msgstr "Deter en espazo en branco ou puntuación"
#. IDS_L2M
-#: Merge.rc:4479
+#: Merge.rc:4489
msgid "Copy to &Middle\tAlt+Right"
msgstr "Copiar ao cen&tral\tAlt+Dereita"
#. IDS_R2M
-#: Merge.rc:4480
+#: Merge.rc:4490
msgid "Copy to &Middle\tAlt+Left"
msgstr "Copiar ao ¢ral\tAlt+Esquerda"
#. IDS_COPY_FROM_MIDDLE_R
-#: Merge.rc:4481
+#: Merge.rc:4491
msgid "Copy from Middle\tAlt+Shift+Right"
msgstr "Copiar desde o central\tAlt+Maiús+Dereita"
#. IDS_COPY_FROM_MIDDLE_L
-#: Merge.rc:4482
+#: Merge.rc:4492
msgid "Copy from Middle\tAlt+Shift+Left"
msgstr "Copiar desde o central\tAlt+Maiús+Esquerda"
#. IDS_L2MNEXT
-#: Merge.rc:4483
+#: Merge.rc:4493
msgid "Copy to Middle and Advance\tCtrl+Alt+Right"
msgstr "Copiar ao central e avanzar\tCtrl+Alt+Dereita"
#. IDS_R2MNEXT
-#: Merge.rc:4484
+#: Merge.rc:4494
msgid "Copy to Middle and Advance\tCtrl+Alt+Left"
msgstr "Copiar ao central e avanzar\tCtrl+Alt+Esquerda"
#. IDS_ALL_MIDDLE
-#: Merge.rc:4485
+#: Merge.rc:4495
msgid "Copy All to Middle"
msgstr "Copiar todo no central"
#. IDS_COPY_RIGHT_TO_LEFT
-#: Merge.rc:4491
+#: Merge.rc:4501
#, c-format
msgid "Right to Left (%1)"
msgstr "Dereito ao esquerdo (%1)"
#. IDS_COPY_RIGHT_TO_MIDDLE
-#: Merge.rc:4492
+#: Merge.rc:4502
#, c-format
msgid "Right to Middle (%1)"
msgstr "Dereito ao central (%1)"
#. IDS_COPY_MIDDLE_TO_LEFT
-#: Merge.rc:4493
+#: Merge.rc:4503
#, c-format
msgid "Middle to Left (%1)"
msgstr "Central ao esquerdo (%1)"
#. IDS_COPY_MIDDLE_TO_RIGHT
-#: Merge.rc:4494
+#: Merge.rc:4504
#, c-format
msgid "Middle to Right (%1)"
msgstr "Central ao dereito (%1)"
#. IDS_COPY_LEFT_TO_RIGHT
-#: Merge.rc:4495
+#: Merge.rc:4505
#, c-format
msgid "Left to Right (%1)"
msgstr "Esquerdo ao dereito (%1)"
#. IDS_COPY_LEFT_TO_MIDDLE
-#: Merge.rc:4496
+#: Merge.rc:4506
#, c-format
msgid "Left to Middle (%1)"
msgstr "Esquerdo ao central (%1)"
#. IDS_MOVE_LEFT_TO
-#: Merge.rc:4507 Merge.rc:4539
+#: Merge.rc:4517 Merge.rc:4549
#, c-format
msgid "Left to... (%1)"
msgstr "Esquerdo ao... (%1)"
#. IDS_MOVE_MIDDLE_TO
-#: Merge.rc:4508 Merge.rc:4540
+#: Merge.rc:4518 Merge.rc:4550
#, c-format
msgid "Middle to... (%1)"
msgstr "Central ao... (%1)"
#. IDS_MOVE_RIGHT_TO
-#: Merge.rc:4509 Merge.rc:4541
+#: Merge.rc:4519 Merge.rc:4551
#, c-format
msgid "Right to... (%1)"
msgstr "Dereito ao... (%1)"
#. IDS_COPY_BOTH_TO
-#: Merge.rc:4510
+#: Merge.rc:4520
#, c-format
msgid "Both to... (%1)"
msgstr "Ambos a... (%1)"
#. IDS_COPY_ALL_TO
-#: Merge.rc:4511
+#: Merge.rc:4521
#, c-format
msgid "All to... (%1)"
msgstr "Todo a... (%1)"
#. IDS_COPY_DIFFERENCES_TO
-#: Merge.rc:4512
+#: Merge.rc:4522
#, c-format
msgid "Differences to... (%1)"
msgstr "Diferenzas a... (%1)"
#. IDS_COPY_ONLYDIFFITEMS
-#: Merge.rc:4519
+#: Merge.rc:4529
msgid "Some selected items are identical or skipped.\nCopy only items with differences?"
msgstr ""
#. IDS_DEL_LEFT_FMT
-#: Merge.rc:4525
+#: Merge.rc:4535
#, c-format
msgid "Left (%1)"
msgstr "Esquerdo (%1)"
#. IDS_DEL_MIDDLE_FMT
-#: Merge.rc:4526
+#: Merge.rc:4536
#, c-format
msgid "Middle (%1)"
msgstr "Central (%1)"
#. IDS_DEL_RIGHT_FMT
-#: Merge.rc:4527
+#: Merge.rc:4537
#, c-format
msgid "Right (%1)"
msgstr "Dereito (%1)"
#. IDS_DEL_BOTH_FMT
-#: Merge.rc:4528
+#: Merge.rc:4538
#, c-format
msgid "Both (%1)"
msgstr "Ambos (%1)"
#. IDS_DEL_ALL_FMT
-#: Merge.rc:4529
+#: Merge.rc:4539
#, c-format
msgid "All (%1)"
msgstr "Todo (%1)"
#. IDS_SELECT_DEST_LEFT
-#: Merge.rc:4545
+#: Merge.rc:4555
msgid "Left Side - Select Destination Folder:"
msgstr "Esquerdo - Seleccione carpeta de destino:"
#. IDS_SELECT_DEST_MIDDLE
-#: Merge.rc:4546
+#: Merge.rc:4556
msgid "Middle Side - Select Destination Folder:"
msgstr "Central - Seleccione carpeta de destino:"
#. IDS_SELECT_DEST_RIGHT
-#: Merge.rc:4547
+#: Merge.rc:4557
msgid "Right Side - Select Destination Folder:"
msgstr "Dereito - Seleccione carpeta de destino:"
#. IDS_FILES_AFFECTED_FMT
-#: Merge.rc:4548
+#: Merge.rc:4558
#, c-format
msgid "(%1 Files Affected)"
msgstr "(%1 ficheiros afectados)"
#. IDS_FILES_AFFECTED_FMT2
-#: Merge.rc:4549
+#: Merge.rc:4559
#, c-format
msgid "(%1 of %2 Files Affected)"
msgstr "(%1 de %2 ficheiros afectados)"
#. IDS_CONFIRM_DELETE_SINGLE
-#: Merge.rc:4555
+#: Merge.rc:4565
#, c-format
msgid ""
"Are you sure you want to delete\n"
@@ -5949,18 +5960,18 @@ msgstr ""
"%1?"
#. IDS_CONFIRM_SINGLE_COPY
-#: Merge.rc:4556
+#: Merge.rc:4566
msgid "Are you sure you want to copy?"
msgstr "Seguro que quere copiar?"
#. IDS_CONFIRM_MULTIPLE_COPY
-#: Merge.rc:4557
+#: Merge.rc:4567
#, c-format
msgid "Are you sure you want to copy %d items?"
msgstr "Seguro que quere copiar %d elementos?"
#. IDS_DIRCMP_NOTSYNC
-#: Merge.rc:4558
+#: Merge.rc:4568
#, c-format
msgid ""
"Operation aborted!\n"
@@ -5980,46 +5991,46 @@ msgstr ""
"Actualice a comparación."
#. IDS_CONFIRM_SINGLE_MOVE
-#: Merge.rc:4563
+#: Merge.rc:4573
msgid "Are you sure you want to move?"
msgstr "Seguro que quere mover?"
#. IDS_CONFIRM_MULTIPLE_MOVE
-#: Merge.rc:4564
+#: Merge.rc:4574
#, c-format
msgid "Are you sure you want to move %d items?"
msgstr "Seguro que quere mover %d elementos?"
#. IDS_CONFIRM_MOVE_CAPTION
-#: Merge.rc:4566
+#: Merge.rc:4576
msgid "Confirm Move"
msgstr "Confirmar movemento"
-#: Merge.rc:4568
+#: Merge.rc:4578
msgid "Close the folder comparison window?"
msgstr "Vai pechar a ventá de comparación de carpetas. Seguro que quere cerrala?"
-#: Merge.rc:4570
+#: Merge.rc:4580
msgid "Close the folder comparison window, which took a long time?"
msgstr "Vai pechar a ventá de comparación de carpetas que precisou dun unha gran cantidade de tempo. Seguro que quere pechala?"
#. IDS_ERROR_INVALID_DIR_FILE_NAME
-#: Merge.rc:4571
+#: Merge.rc:4581
msgid "The file or folder name is invalid."
msgstr "O nome do arquivo ou carpeta non é válido."
#. IDS_ERROR_EXECUTE_FILE
-#: Merge.rc:4577
+#: Merge.rc:4587
#, c-format
msgid "Failed to execute external editor: %1"
msgstr "Non se puido executar o editor externo %1"
#. IDS_UNKNOWN_ARCHIVE_FORMAT
-#: Merge.rc:4583
+#: Merge.rc:4593
msgid "Unknown archive format"
msgstr "Formato de arquivo descoñecido"
-#: Merge.rc:4585
+#: Merge.rc:4595
msgid ""
"Failed to extract archive.\n"
"Compare as text file?"
@@ -6028,751 +6039,751 @@ msgstr ""
"Quere comparar os ficheiros do arquivo como ficheiros de texto?"
#. IDS_COLHDR_FILENAME
-#: Merge.rc:4591
+#: Merge.rc:4601
msgid "Filename"
msgstr "Nome do ficheiro"
#. IDS_COLHDR_DIR
-#: Merge.rc:4592
+#: Merge.rc:4602
msgctxt "DirView|ColumnHeader"
msgid "Folder"
msgstr "Carpeta"
#. IDS_COLHDR_RESULT
-#: Merge.rc:4593
+#: Merge.rc:4603
msgid "Comparison Result"
msgstr "Resultado da comparación"
#. IDS_COLHDR_LTIMEM
-#: Merge.rc:4594
+#: Merge.rc:4604
msgid "Left Date"
msgstr "Data do esquerdo"
#. IDS_COLHDR_RTIMEM
-#: Merge.rc:4595
+#: Merge.rc:4605
msgid "Right Date"
msgstr "Data do dereito"
#. IDS_COLHDR_MTIMEM
-#: Merge.rc:4596
+#: Merge.rc:4606
msgid "Middle Date"
msgstr "Data do central"
#. IDS_COLHDR_LSIZE
-#: Merge.rc:4598
+#: Merge.rc:4608
msgid "Left Size"
msgstr "Tamaño do esquerdo"
#. IDS_COLHDR_RSIZE
-#: Merge.rc:4599
+#: Merge.rc:4609
msgid "Right Size"
msgstr "Tamaño do dereito"
#. IDS_COLHDR_MSIZE
-#: Merge.rc:4604
+#: Merge.rc:4614
msgid "Middle Size"
msgstr "Tamaño do central"
#. IDS_COLHDR_RSIZE_SHORT
-#: Merge.rc:4605
+#: Merge.rc:4615
msgid "Right Size (Short)"
msgstr "Tamaño do dereito (curto)"
#. IDS_COLHDR_LSIZE_SHORT
-#: Merge.rc:4606
+#: Merge.rc:4616
msgid "Left Size (Short)"
msgstr "Tamaño do esquerdo (curto)"
#. IDS_COLHDR_MSIZE_SHORT
-#: Merge.rc:4607
+#: Merge.rc:4617
msgid "Middle Size (Short)"
msgstr "Tamaño do central (curto)"
#. IDS_COLHDR_LTIMEC
-#: Merge.rc:4613
+#: Merge.rc:4623
msgid "Left Creation Time"
msgstr "Data de creación do esquerdo"
#. IDS_COLHDR_RTIMEC
-#: Merge.rc:4614
+#: Merge.rc:4624
msgid "Right Creation Time"
msgstr "Data de creación do dereito"
#. IDS_COLHDR_MTIMEC
-#: Merge.rc:4615
+#: Merge.rc:4625
msgid "Middle Creation Time"
msgstr "Data de creación do central"
#. IDS_COLHDR_NEWER
-#: Merge.rc:4616
+#: Merge.rc:4626
msgid "Newer File"
msgstr "Ficheiro máis recente"
#. IDS_COLHDR_LVERSION
-#: Merge.rc:4617
+#: Merge.rc:4627
msgid "Left File Version"
msgstr "Versión do ficheiro esquerdo"
#. IDS_COLHDR_RVERSION
-#: Merge.rc:4618
+#: Merge.rc:4628
msgid "Right File Version"
msgstr "Versión do ficheiro dereito"
#. IDS_COLHDR_MVERSION
-#: Merge.rc:4619
+#: Merge.rc:4629
msgid "Middle File Version"
msgstr "Versión do ficheiro central"
#. IDS_COLHDR_RESULT_ABBR
-#: Merge.rc:4620
+#: Merge.rc:4630
msgid "Short Result"
msgstr "Resultado curto"
#. IDS_COLHDR_LATTRIBUTES
-#: Merge.rc:4621
+#: Merge.rc:4631
msgid "Left Attributes"
msgstr "Atributos do esquerdo"
#. IDS_COLHDR_RATTRIBUTES
-#: Merge.rc:4622
+#: Merge.rc:4632
msgid "Right Attributes"
msgstr "Atributos do dereito"
#. IDS_COLHDR_MATTRIBUTES
-#: Merge.rc:4623
+#: Merge.rc:4633
msgid "Middle Attributes"
msgstr "Atributos do central"
#. IDS_COLHDR_LEOL_TYPE
-#: Merge.rc:4628
+#: Merge.rc:4638
msgid "Left EOL"
msgstr "EOL do esquerdo"
#. IDS_COLHDR_MEOL_TYPE
-#: Merge.rc:4629
+#: Merge.rc:4639
msgid "Middle EOL"
msgstr "EOL do central"
#. IDS_COLHDR_REOL_TYPE
-#: Merge.rc:4630
+#: Merge.rc:4640
msgid "Right EOL"
msgstr "EOL do dereito"
#. IDS_COLHDR_LENCODING
-#: Merge.rc:4636
+#: Merge.rc:4646
msgid "Left Encoding"
msgstr "Codificación do esquerdo"
#. IDS_COLHDR_RENCODING
-#: Merge.rc:4637
+#: Merge.rc:4647
msgid "Right Encoding"
msgstr "Codificación do dereito"
#. IDS_COLHDR_MENCODING
-#: Merge.rc:4638
+#: Merge.rc:4648
msgid "Middle Encoding"
msgstr "Codificación do central"
#. IDS_COLHDR_NIDIFFS
-#: Merge.rc:4639
+#: Merge.rc:4649
msgid "Ignored Diff"
msgstr "Difs. ignoradas"
#. IDS_COLHDR_BINARY
-#: Merge.rc:4641
+#: Merge.rc:4651
msgctxt "DirView|ColumnHeader"
msgid "Binary"
msgstr "Binario"
#. IDS_PLUGINS_TYPE_UNPACKER
-#: Merge.rc:4642 Merge.rc:4959
+#: Merge.rc:4652 Merge.rc:4969
msgid "Unpacker"
msgstr "Desempaquetador"
#. IDS_PLUGIN_TYPE4
-#: Merge.rc:4643 Merge.rc:4960 Merge.rc:5267
+#: Merge.rc:4653 Merge.rc:4970 Merge.rc:5277
msgid "Prediffer"
msgstr "Precomparación"
#. IDS_COLHDR_LEFT
-#: Merge.rc:4644
+#: Merge.rc:4654
msgid "Left"
msgstr "Esquerdo"
#. IDS_COLHDR_MIDDLE
-#: Merge.rc:4645
+#: Merge.rc:4655
msgid "Middle"
msgstr "Central"
#. IDS_COLHDR_RIGHT
-#: Merge.rc:4646
+#: Merge.rc:4656
msgid "Right"
msgstr "Dereito"
#. IDS_COLHDR_DIFF
-#: Merge.rc:4647
+#: Merge.rc:4657
msgid "Diff"
msgstr "Diferenza"
#. IDS_COLHDR_LEFT_DUPLICATE
-#: Merge.rc:4648
+#: Merge.rc:4658
msgid "Left Duplicate Count"
msgstr "Contador de duplicados no esquerdo"
#. IDS_COLHDR_RIGHT_DUPLICATE
-#: Merge.rc:4649
+#: Merge.rc:4659
msgid "Right Duplicate Count"
msgstr "Contador de duplicados no dereito"
#. IDS_COLHDR_MIDDLE_DUPLICATE
-#: Merge.rc:4650
+#: Merge.rc:4660
msgid "Middle Duplicate Count"
msgstr "Contador de duplicados no central"
#. IDS_COLHDR_MOVE
-#: Merge.rc:4651
+#: Merge.rc:4661
msgid "Move"
msgstr "Mover"
#. IDS_PRPCAT_AUDIO
-#: Merge.rc:4658
+#: Merge.rc:4668
msgid "Audio"
msgstr "Audio"
#. IDS_PRPCAT_CALENDAR
-#: Merge.rc:4659
+#: Merge.rc:4669
msgid "Calendar"
msgstr "Calendario"
#. IDS_PRPCAT_COMMUNICATION
-#: Merge.rc:4660
+#: Merge.rc:4670
msgid "Communication"
msgstr "Comunicación"
#. IDS_PRPCAT_CONTACT
-#: Merge.rc:4661
+#: Merge.rc:4671
msgid "Contact"
msgstr "Contacto"
#. IDS_PRPCAT_DEVICES
-#: Merge.rc:4662
+#: Merge.rc:4672
msgid "Devices"
msgstr "Dispositivos"
#. IDS_PRPCAT_DOCUMENT
-#: Merge.rc:4663
+#: Merge.rc:4673
msgid "Document"
msgstr "Documento"
#. IDS_PRPCAT_HOME
-#: Merge.rc:4664
+#: Merge.rc:4674
msgid "Home"
msgstr "Inicio"
#. IDS_PRPCAT_JOURNAL
-#: Merge.rc:4666
+#: Merge.rc:4676
msgid "Journal"
msgstr "Diario"
#. IDS_PRPCAT_LINK
-#: Merge.rc:4667
+#: Merge.rc:4677
msgid "Link"
msgstr "Ligazón"
#. IDS_PRPCAT_MEDIA
-#: Merge.rc:4668
+#: Merge.rc:4678
msgid "Media"
msgstr "Medios"
#. IDS_PRPCAT_MUSIC
-#: Merge.rc:4670
+#: Merge.rc:4680
msgid "Music"
msgstr "Música"
#. IDS_PRPCAT_NOTE
-#: Merge.rc:4671
+#: Merge.rc:4681
msgid "Note"
msgstr "Nota"
#. IDS_PRPCAT_PHOTO
-#: Merge.rc:4672
+#: Merge.rc:4682
msgid "Photo"
msgstr "Fotografía"
#. IDS_PRPCAT_RECORDEDTV
-#: Merge.rc:4673
+#: Merge.rc:4683
msgid "RecordedTV"
msgstr "TV gravada"
#. IDS_PRPCAT_SEARCH
-#: Merge.rc:4674
+#: Merge.rc:4684
msgid "Search"
msgstr "Buscar"
#. IDS_PRPCAT_SECURITY
-#: Merge.rc:4675
+#: Merge.rc:4685
msgid "Security"
msgstr "Seguridade"
#. IDS_PRPCAT_SOFTWARE
-#: Merge.rc:4676
+#: Merge.rc:4686
msgid "Software"
msgstr "Software"
#. IDS_PRPCAT_TASK
-#: Merge.rc:4677
+#: Merge.rc:4687
msgid "Task"
msgstr "Tarefa"
#. IDS_PRPCAT_VIDEO
-#: Merge.rc:4678
+#: Merge.rc:4688
msgid "Video"
msgstr "Vídeo"
#. IDS_PRPCAT_HASH
-#: Merge.rc:4679
+#: Merge.rc:4689
msgid "Hash"
msgstr "Suma de verificación"
#. IDS_CANT_COMPARE_FILES
-#: Merge.rc:4685
+#: Merge.rc:4695
msgid "Unable to compare files"
msgstr "Non se puideron comparar os ficheiros"
#. IDS_ABORTED_ITEM
-#: Merge.rc:4686
+#: Merge.rc:4696
msgid "Item aborted"
msgstr "Elemento cancelado"
#. IDS_FILE_SKIPPED
-#: Merge.rc:4687
+#: Merge.rc:4697
msgid "File skipped"
msgstr "Ficheiro omitido"
#. IDS_DIR_SKIPPED
-#: Merge.rc:4688
+#: Merge.rc:4698
msgid "Folder skipped"
msgstr "Carpeta omitida"
#. IDS_LEFT_ONLY_IN_FMT
-#: Merge.rc:4689
+#: Merge.rc:4699
#, c-format
msgid "Left only: %1"
msgstr "Só esquerdo: %1"
#. IDS_MIDDLE_ONLY_IN_FMT
-#: Merge.rc:4690
+#: Merge.rc:4700
#, c-format
msgid "Middle only: %1"
msgstr "Só central: %1"
#. IDS_RIGHT_ONLY_IN_FMT
-#: Merge.rc:4691
+#: Merge.rc:4701
#, c-format
msgid "Right only: %1"
msgstr "Só dereito: %1"
#. IDS_DOES_NOT_EXIST_IN_FMT
-#: Merge.rc:4692
+#: Merge.rc:4702
#, c-format
msgid "Does not exist in %1"
msgstr "Non existe en %1"
#. IDS_BIN_FILES_SAME
-#: Merge.rc:4693
+#: Merge.rc:4703
msgid "Binary files are identical"
msgstr "Os ficheiros binarios son idénticos"
#. IDS_BIN_FILES_DIFF
-#: Merge.rc:4699
+#: Merge.rc:4709
msgid "Binary files are different"
msgstr "Os ficheiros binarios son diferentes"
#. IDS_FILES_ARE_DIFFERENT
-#: Merge.rc:4700
+#: Merge.rc:4710
msgid "Files are different"
msgstr "Os ficheiros son diferentes"
#. IDS_FOLDERS_ARE_DIFFERENT
-#: Merge.rc:4701
+#: Merge.rc:4711
msgid "Folders are different"
msgstr "As carpetas son diferentes"
#. IDS_LEFTONLY
-#: Merge.rc:4702
+#: Merge.rc:4712
msgid "Left Only"
msgstr "Só esquerdo"
#. IDS_RIGHTONLY
-#: Merge.rc:4703
+#: Merge.rc:4713
msgid "Right Only"
msgstr "Só dereito"
#. IDS_MIDDLEONLY
-#: Merge.rc:4704
+#: Merge.rc:4714
msgid "Middle Only"
msgstr "Só central"
#. IDS_NOITEMLEFT
-#: Merge.rc:4705
+#: Merge.rc:4715
msgid "No item in left"
msgstr "Esquerdo baleiro"
#. IDS_NOITEMRIGHT
-#: Merge.rc:4706
+#: Merge.rc:4716
msgid "No item in right"
msgstr "Dereito baleiro"
#. IDS_NOITEMMIDDLE
-#: Merge.rc:4707
+#: Merge.rc:4717
msgid "No item in middle"
msgstr "Central baleiro"
#. IDS_CMPRES_ERROR
-#: Merge.rc:4709
+#: Merge.rc:4719
msgid "Error"
msgstr "Erro"
#. IDS_TEXT_FILES_SAME
-#: Merge.rc:4710
+#: Merge.rc:4720
msgid "Text files are identical"
msgstr "Os ficheiros de texto son idénticos"
#. IDS_LEFTONLY_DIFF
-#: Merge.rc:4711
+#: Merge.rc:4721
msgid " (Middle and right are identical)"
msgstr " (Central e dereito son idénticos)"
#. IDS_MIDDLEONLY_DIFF
-#: Merge.rc:4712
+#: Merge.rc:4722
msgid " (Left and right are identical)"
msgstr " (Esquerdo e dereito son idénticos)"
#. IDS_RIGHTONLY_DIFF
-#: Merge.rc:4713
+#: Merge.rc:4723
msgid " (Left and middle are identical)"
msgstr " (Esquerdo e central son idénticos)"
#. IDS_PATH_MISMATCH
-#: Merge.rc:4714
+#: Merge.rc:4724
msgid " (paths differ)"
msgstr ""
#. IDS_TEXT_FILES_DIFF
-#: Merge.rc:4715
+#: Merge.rc:4725
msgid "Text files are different"
msgstr "Os ficheiros de texto son diferentes"
#. IDS_IMAGE_FILES_SAME
-#: Merge.rc:4716
+#: Merge.rc:4726
msgid "Image files are identical"
msgstr "Os ficheiros de imaxe son iguais"
#. IDS_IMAGE_FILES_DIFF
-#: Merge.rc:4717
+#: Merge.rc:4727
msgid "Image files are different"
msgstr "Os ficheiros de imaxe son diferentes"
#. IDS_EXPR_DIFF
-#: Merge.rc:4718
+#: Merge.rc:4728
#, c-format
msgid "Files are different (expr: %1)"
msgstr ""
#. IDS_HASH_GROUP
-#: Merge.rc:4719
+#: Merge.rc:4729
#, c-format
msgid "Group%d"
msgstr "Grupo%d"
#. IDS_RENAME_MOVE_DETECTION_DISALBED
-#: Merge.rc:4720
+#: Merge.rc:4730
msgctxt "Options dialog|Compare|Folder|Detect renames and moves"
msgid "Disabled"
msgstr ""
#. IDS_RENAME_MOVE_DETECTION_RENAME
-#: Merge.rc:4721
+#: Merge.rc:4731
msgid "Detect renames"
msgstr ""
#. IDS_RENAME_MOVE_DETECTION_RENAME_MOVE
-#: Merge.rc:4722
+#: Merge.rc:4732
msgid "Detect renames and moves"
msgstr ""
#. IDS_RENAME_MOVE_MERGE_MODE_RENAME
-#: Merge.rc:4723
+#: Merge.rc:4733
msgid "Merge renames"
msgstr ""
#. IDS_RENAME_MOVE_MERGE_MODE_RENAME_MOVE
-#: Merge.rc:4724
+#: Merge.rc:4734
msgid "Merge renames and moves"
msgstr ""
#. IDS_RENAMED
-#: Merge.rc:4725
+#: Merge.rc:4735
msgid "Renamed"
msgstr ""
#. IDS_MOVED
-#: Merge.rc:4726
+#: Merge.rc:4736
msgid "Moved"
msgstr ""
#. IDS_RENAMED_MOVED
-#: Merge.rc:4727
+#: Merge.rc:4737
msgid "Renamed/Moved"
msgstr ""
#. IDS_RENAMED_MOVED_ITEMS
-#: Merge.rc:4728
+#: Merge.rc:4738
#, c-format
msgid "(%1 items)"
msgstr ""
#. IDS_RENAMED_MOVED_RESULT
-#: Merge.rc:4729
+#: Merge.rc:4739
#, c-format
msgid "%1 (set %2): "
msgstr ""
#. IDS_SWITCH_FLAT_MODE
-#: Merge.rc:4730
+#: Merge.rc:4740
msgid "Some moved items have been merged.\nIn Tree Mode, these items may appear in positions that do not reflect the actual folder structure, which can be confusing.\nSwitch to Flat Mode?"
msgstr ""
#. IDS_ELAPSED_TIME
-#: Merge.rc:4736
+#: Merge.rc:4746
#, c-format
msgid "Elapsed time: %ld ms"
msgstr "Tempo transcorrido: %ld ms"
#. IDS_STATUS_SELITEM1
-#: Merge.rc:4737
+#: Merge.rc:4747
msgid "1 item selected"
msgstr "1 elemento seleccionado"
#. IDS_STATUS_SELITEMS
-#: Merge.rc:4738
+#: Merge.rc:4748
#, c-format
msgid "%1 items selected"
msgstr "%1 elementos seleccionados"
#. IDS_COLDESC_FILENAME
-#: Merge.rc:4744
+#: Merge.rc:4754
msgid "Filename or folder name."
msgstr "Nome do ficheiro ou carpeta."
#. IDS_COLDESC_DIR
-#: Merge.rc:4745
+#: Merge.rc:4755
msgid "Subfolder name when subfolders are included."
msgstr "Nome da subcarpeta cando as subcarpetas están incluídas."
#. IDS_COLDESC_RESULT
-#: Merge.rc:4746
+#: Merge.rc:4756
msgid "Comparison result, long form."
msgstr "Resultado da comparación, formato largo."
#. IDS_COLDESC_LTIMEM
-#: Merge.rc:4751
+#: Merge.rc:4761
msgid "Left side modification date."
msgstr "Data de modificación do esquerdo."
#. IDS_COLDESC_RTIMEM
-#: Merge.rc:4752
+#: Merge.rc:4762
msgid "Right side modification date."
msgstr "Data de modificación do dereito."
#. IDS_COLDESC_MTIMEM
-#: Merge.rc:4753
+#: Merge.rc:4763
msgid "Middle side modification date."
msgstr "Data de modificación do central."
#. IDS_COLDESC_EXTENSION
-#: Merge.rc:4754
+#: Merge.rc:4764
msgid "File's extension."
msgstr "Extensión do ficheiro."
#. IDS_COLDESC_LSIZE
-#: Merge.rc:4755
+#: Merge.rc:4765
msgid "Left file size in bytes."
msgstr "Tamaño do ficheiro esquerdo en bytes."
#. IDS_COLDESC_RSIZE
-#: Merge.rc:4756
+#: Merge.rc:4766
msgid "Right file size in bytes."
msgstr "Tamaño do ficheiro dereito en bytes."
#. IDS_COLDESC_MSIZE
-#: Merge.rc:4757
+#: Merge.rc:4767
msgid "Middle file size in bytes."
msgstr "Tamaño do ficheiro central en bytes."
#. IDS_COLDESC_LSIZE_SHORT
-#: Merge.rc:4758
+#: Merge.rc:4768
msgid "Left file size abbreviated."
msgstr "Tamaño abreviado do ficheiro esquerdo."
#. IDS_COLDESC_RSIZE_SHORT
-#: Merge.rc:4759
+#: Merge.rc:4769
msgid "Right file size abbreviated."
msgstr "Tamaño abreviado do ficheiro dereito."
#. IDS_COLDESC_MSIZE_SHORT
-#: Merge.rc:4760
+#: Merge.rc:4770
msgid "Middle file size abbreviated."
msgstr "Tamaño abreviado do ficheiro central."
#. IDS_COLDESC_LTIMEC
-#: Merge.rc:4766
+#: Merge.rc:4776
msgid "Left side creation time."
msgstr "Data de creación do esquerdo."
#. IDS_COLDESC_RTIMEC
-#: Merge.rc:4767
+#: Merge.rc:4777
msgid "Right side creation time."
msgstr "Data de creación do dereito."
#. IDS_COLDESC_MTIMEC
-#: Merge.rc:4768
+#: Merge.rc:4778
msgid "Middle side creation time."
msgstr "Data de creación do central."
#. IDS_COLDESC_NEWER
-#: Merge.rc:4769
+#: Merge.rc:4779
msgid "Tells which side has newer modification date."
msgstr "Indica que lado ten a data de modificación máis recente."
#. IDS_COLDESC_LVERSION
-#: Merge.rc:4770
+#: Merge.rc:4780
msgid "Left side file version, only for some file types."
msgstr "Versión do ficheiro esquerdo, só para algúns tipos de ficheiro."
#. IDS_COLDESC_RVERSION
-#: Merge.rc:4771
+#: Merge.rc:4781
msgid "Right side file version, only for some file types."
msgstr "Versión do ficheiro dereito, só para algúns tipos de ficheiro."
#. IDS_COLDESC_MVERSION
-#: Merge.rc:4776
+#: Merge.rc:4786
msgid "Middle side file version, only for some file types."
msgstr "Versión do ficheiro central, só para algúns tipos de ficheiro."
#. IDS_COLDESC_RESULT_ABBR
-#: Merge.rc:4777
+#: Merge.rc:4787
msgid "Short comparison result."
msgstr "Resultados curtos da comparación."
#. IDS_COLDESC_LATTRIBUTES
-#: Merge.rc:4778
+#: Merge.rc:4788
msgid "Left side attributes."
msgstr "Atributos do esquerdo."
#. IDS_COLDESC_RATTRIBUTES
-#: Merge.rc:4779
+#: Merge.rc:4789
msgid "Right side attributes."
msgstr "Atributos do dereito."
#. IDS_COLDESC_MATTRIBUTES
-#: Merge.rc:4780
+#: Merge.rc:4790
msgid "Middle side attributes."
msgstr "Atributos do central."
#. IDS_COLDESC_LEOL_TYPE
-#: Merge.rc:4781
+#: Merge.rc:4791
msgid "Left side file EOL type."
msgstr "Tipo de EOL do ficheiro esquerdo."
#. IDS_COLDESC_REOL_TYPE
-#: Merge.rc:4782
+#: Merge.rc:4792
msgid "Right side file EOL type."
msgstr "Tipo de EOL do ficheiro dereito."
#. IDS_COLDESC_MEOL_TYPE
-#: Merge.rc:4783
+#: Merge.rc:4793
msgid "Middle side file EOL type."
msgstr "Tipo de EOL do ficheiro central."
#. IDS_COLDESC_LENCODING
-#: Merge.rc:4789
+#: Merge.rc:4799
msgid "Left side encoding."
msgstr "Codificación do esquerdo."
#. IDS_COLDESC_RENCODING
-#: Merge.rc:4790
+#: Merge.rc:4800
msgid "Right side encoding."
msgstr "Codificación do dereito."
#. IDS_COLDESC_MENCODING
-#: Merge.rc:4791
+#: Merge.rc:4801
msgid "Middle side encoding."
msgstr "Codificación do central."
#. IDS_COLDESC_NIDIFFS
-#: Merge.rc:4792
+#: Merge.rc:4802
msgid "Number of ignored differences in file. Ignored and cannot be merged."
msgstr "Número de diferenzas ignoradas no ficheiro. WinMerge ignora estas diferenzas e non se poden mesturar."
#. IDS_COLDESC_NSDIFFS
-#: Merge.rc:4793
+#: Merge.rc:4803
msgid "Number of differences in file (excluding ignored)."
msgstr "Número de diferenzas no ficheiro. Este número non inclúe as diferenzas ignoradas."
#. IDS_COLDESC_BINARY
-#: Merge.rc:4794
+#: Merge.rc:4804
msgid "Shows an asterisk (*) if the file is binary."
msgstr "Mostra un asterisco (*) se o ficheiro é binario."
#. IDS_COLDESC_UNPACKER
-#: Merge.rc:4795
+#: Merge.rc:4805
msgid "Unpacker plugin name or pipeline."
msgstr "Nome do complemento desempaquetador ou pipeline."
#. IDS_COLDESC_PREDIFFER
-#: Merge.rc:4796
+#: Merge.rc:4806
msgid "Prediffer plugin name or pipeline."
msgstr "Nome do complemento de precomparación ou pipeline."
#. IDS_DIRECTORY_REPORT_TITLE
-#: Merge.rc:4802
+#: Merge.rc:4812
#, c-format
msgid "Compare %1 with %2"
msgstr "Comparar %1 con %2"
#. IDS_DIRECTORY_REPORT_TITLE3
-#: Merge.rc:4803
+#: Merge.rc:4813
#, c-format
msgid "Compare %1 with %2 and %3"
msgstr "Comparar %1 con %2 e con %3"
#. IDS_REPORT_COMMALIST
-#: Merge.rc:4804
+#: Merge.rc:4814
msgid "Comma-separated list"
msgstr "Listaxe separada por comas"
#. IDS_REPORT_TABLIST
-#: Merge.rc:4805
+#: Merge.rc:4815
msgid "Tab-separated list"
msgstr "Listaxe separada por tabulacións"
#. IDS_REPORT_SIMPLEHTML
-#: Merge.rc:4806
+#: Merge.rc:4816
msgid "Simple HTML"
msgstr "HTML simple"
#. IDS_REPORT_SIMPLEXML
-#: Merge.rc:4807
+#: Merge.rc:4817
msgid "Simple XML"
msgstr "XML simple"
-#: Merge.rc:4809
+#: Merge.rc:4819
msgid "Report file already exists. Overwrite?"
msgstr "O ficheiro de informe xa existe. Quere sobrescribilo?"
#. IDS_REPORT_ERROR
-#: Merge.rc:4814
+#: Merge.rc:4824
#, c-format
msgid ""
"Error creating the report:\n"
@@ -6782,57 +6793,57 @@ msgstr ""
"%1"
#. IDS_REPORT_SUCCESS
-#: Merge.rc:4815
+#: Merge.rc:4825
msgid "Report created successfully."
msgstr "O informe creouse satisfactoriamente."
#. IDS_SYNCPOINT_LASTBLOCK
-#: Merge.rc:4821
+#: Merge.rc:4831
msgid "Cannot add a synchronization point at this line."
msgstr "Non se pode engadir un punto de sincronización nesta liña."
#. IDS_FILE_TO_ITSELF
-#: Merge.rc:4827
+#: Merge.rc:4837
msgid "Same file is opened in both panes."
msgstr "O mesmo ficheiro está aberto en ambos paneis."
#. IDS_FILESSAME
-#: Merge.rc:4828
+#: Merge.rc:4838
msgid "Selected files are identical."
msgstr "Os ficheiros escollidos son idénticos."
#. IDS_FILESSAME_CURCFG
-#: Merge.rc:4829
+#: Merge.rc:4839
msgid "Selected files are identical (with current settings).\r\nChecking binary identity..."
msgstr ""
#. IDS_FILESSAME_BINERROR
-#: Merge.rc:4830
+#: Merge.rc:4840
msgid "Selected files are identical (with current settings).\r\nBut binary comparison failed."
msgstr ""
#. IDS_FILESSAME_BINSAME
-#: Merge.rc:4831
+#: Merge.rc:4841
msgid "Selected files are identical (binary match)."
msgstr ""
#. IDS_FILESSAME_BINDIFF
-#: Merge.rc:4832
+#: Merge.rc:4842
msgid "Selected files are identical (with current settings).\r\nBut differ at the binary level."
msgstr ""
#. IDS_FILEERROR
-#: Merge.rc:4833
+#: Merge.rc:4843
msgid "An error occurred while comparing files."
msgstr "Producíuse un erro durante a comparación dos ficheiros."
#. IDS_TEMP_FILEERROR
-#: Merge.rc:4834
+#: Merge.rc:4844
msgid "Could not create temporary files. Check your temporary path settings."
msgstr "Non se puideron crear os ficheiros temporais. Comprobe a ruta para arquivos temporais."
#. IDS_SUGGEST_IGNOREEOL
-#: Merge.rc:4835
+#: Merge.rc:4845
msgid "Files use different EOL.\n\nTreat all EOL as equivalent?\n\nSet 'Ignore EOL differences (Windows/Unix/Mac)' in Compare section of Options."
msgstr ""
"Estes ficheiros empregan tipos diferentes de saltos de liña.\n"
@@ -6842,17 +6853,17 @@ msgstr ""
"Nota: si quere tratar todos os tipos de salto como equivalentes, marque a opción 'Ignorar diferenzas nos saltos de liña (Windows/Unix/Mac)' na pestana Comparar do diálogo de opcións (dispoñible en Editar/Configuración)."
#. IDS_INVALID_DIRECTORY
-#: Merge.rc:4836
+#: Merge.rc:4846
msgid "Selected folder is invalid."
msgstr "A carpeta seleccionada non é válida."
#. IDS_CANNOT_OPEN_BINARYFILE
-#: Merge.rc:4837
+#: Merge.rc:4847
msgid "Cannot open a binary file in Editor."
msgstr "Non se pode abrir un ficheiro binario no editor."
#. IDS_CREATE_PAIR_FOLDER
-#: Merge.rc:4838
+#: Merge.rc:4848
#, c-format
msgid "Create matching folder:\n%1\non the other side and open?"
msgstr ""
@@ -6863,41 +6874,41 @@ msgstr ""
"coa anterior e abrir ámbalas dúas?"
#. IDS_CONFIRM_COPY_ALL_DIFFS
-#: Merge.rc:4839
+#: Merge.rc:4849
msgid "Copy all differences to other file?"
msgstr "Seguro que quere copiar todas as diferenzas ao outro ficheiro?"
#. IDS_MOVE_TO_NEXTFILE
-#: Merge.rc:4844
+#: Merge.rc:4854
msgid "Move to next file?"
msgstr "Quere ir ao seguinte ficheiro?"
#. IDS_MOVE_TO_PREVFILE
-#: Merge.rc:4845
+#: Merge.rc:4855
msgid "Move to previous file?"
msgstr "Quere volver ao anterior ficheiro?"
#. IDS_MOVE_TO_NEXTPAGE
-#: Merge.rc:4846
+#: Merge.rc:4856
msgid "Move to next page?"
msgstr "Quere ir á seguinte páxina?"
#. IDS_MOVE_TO_PREVPAGE
-#: Merge.rc:4847
+#: Merge.rc:4857
msgid "Move to previous page?"
msgstr "Quere volver á páxina anterior?"
#. IDS_MOVE_TO_FIRSTFILE
-#: Merge.rc:4848
+#: Merge.rc:4858
msgid "Move to first file?"
msgstr "Quere ir ao primeiro ficheiro?"
#. IDS_MOVE_TO_LASTFILE
-#: Merge.rc:4849
+#: Merge.rc:4859
msgid "Move to last file?"
msgstr "Quere ir ao derradeiro ficheiro?"
-#: Merge.rc:4856
+#: Merge.rc:4866
#, c-format
msgid "Different codepages: left (cp%d), right (cp%d).\nDisplay in codepage (better display) or default Windows codepage (safer merging)?\n(Recommended: default Windows codepage)"
msgstr ""
@@ -6905,51 +6916,51 @@ msgstr ""
"Mostrar cada ficheiro coa súa codificación proporcionará unha mellor visualización, pero mesturar/copiar sería perigoso.\n"
"Prefire tratar ambos os dous ficheiros como se tivesen a codificación predeterminada de Windows (recomendado)?"
-#: Merge.rc:4858
+#: Merge.rc:4868
msgid "Information lost due to encoding errors: both files"
msgstr "Perdeuse información debido a erros de codificación: en ambos ficheiros"
-#: Merge.rc:4860
+#: Merge.rc:4870
msgid "Information lost due to encoding errors: first file"
msgstr "Perdeuse información debido a erros de codificación: no primeiro ficheiro"
-#: Merge.rc:4862
+#: Merge.rc:4872
msgid "Information lost due to encoding errors: second file"
msgstr "Perdeuse información debido a erros de codificación: no segundo ficheiro"
-#: Merge.rc:4864
+#: Merge.rc:4874
msgid "Information lost due to encoding errors: third file"
msgstr "Perdeuse información debido a erros de codificación: no terceiro ficheiro"
#. IDS_LINEDIFF_NODIFF
-#: Merge.rc:4870
+#: Merge.rc:4880
msgid "No difference"
msgstr "Non hai diferenza"
#. IDS_LINEDIFF_NODIFF_CAPTION
-#: Merge.rc:4871
+#: Merge.rc:4881
msgid "Line difference"
msgstr "Diferenza de liña"
#. IDS_NUM_REPLACED
-#: Merge.rc:4877
+#: Merge.rc:4887
#, c-format
msgid "Replaced %1 string(s)."
msgstr "Substituídas %1 cadea(s)."
#. IDS_EDIT_TEXT_NOT_FOUND
-#: Merge.rc:4878
+#: Merge.rc:4888
#, c-format
msgid "Cannot find string \"%s\"."
msgstr "Non se pode atopar a cadea \"%s\"."
#. IDS_MERGE_MODE
-#: Merge.rc:4884
+#: Merge.rc:4894
msgid "Entering Merge Mode. Press F9 to turn off."
msgstr "Vai entrar en modo mestura. Se quere desactivalo prema a tecla F9."
#. IDS_AUTO_MERGE
-#: Merge.rc:4890
+#: Merge.rc:4900
#, c-format
msgid ""
"Automatic merges: %1\n"
@@ -6959,99 +6970,99 @@ msgstr ""
"Número de conflitos sen resolver: %2"
#. IDS_CODEPAGE_MERGED
-#: Merge.rc:4891
+#: Merge.rc:4901
msgid "Codepage change merged."
msgstr "Mesturouse o cambio de codificación."
#. IDS_CODEPAGE_CONFLICT
-#: Merge.rc:4892
+#: Merge.rc:4902
msgid "Codepage changes are conflicting."
msgstr "Os cambios de codificación son conflitivos."
#. IDS_EOL_MERGED
-#: Merge.rc:4893
+#: Merge.rc:4903
msgid "EOL change merged."
msgstr "Mesturouse o cambio de EOL."
#. IDS_EOL_CONFLICT
-#: Merge.rc:4894
+#: Merge.rc:4904
msgid "EOL changes are conflicting."
msgstr "Os cambios de EOL son conflitivos."
#. IDS_LOCBAR_CAPTION
-#: Merge.rc:4900
+#: Merge.rc:4910
msgid "Location Pane"
msgstr "Panel de situación"
#. IDS_DIFFBAR_CAPTION
-#: Merge.rc:4901
+#: Merge.rc:4911
msgid "Diff Pane"
msgstr "Panel de diferenzas"
#. IDS_DIFF_SUCCEEDED
-#: Merge.rc:4908
+#: Merge.rc:4918
msgid "Patch file written."
msgstr "Escribíuse correctamente o ficheiro de parche."
#. IDS_DIFF_ITEM1NOTFOUND
-#: Merge.rc:4909
+#: Merge.rc:4919
msgid "First item not found!"
msgstr "1. ¡non se atopa o elemento!"
#. IDS_DIFF_ITEM2NOTFOUND
-#: Merge.rc:4910
+#: Merge.rc:4920
msgid "Second item not found!"
msgstr "2. ¡non se atopa o elemento!"
#. IDS_DIFF_FILEOVERWRITE
-#: Merge.rc:4911
+#: Merge.rc:4921
msgid "Patch file already exists. Overwrite?"
msgstr "O ficheiro de parche xa existe. Quere sobrescribilo?"
#. IDS_DIFF_SELECTEDFILES
-#: Merge.rc:4912
+#: Merge.rc:4922
#, c-format
msgid "[%1 files selected]"
msgstr "[%1 ficheiros seleccionados]"
#. IDS_DIFF_NORMAL
-#: Merge.rc:4913
+#: Merge.rc:4923
msgid "Normal"
msgstr "Normal"
#. IDS_DIFF_CONTEXT
-#: Merge.rc:4914
+#: Merge.rc:4924
msgid "Context"
msgstr "Contexto"
#. IDS_DIFF_UNIFIED
-#: Merge.rc:4915
+#: Merge.rc:4925
msgid "Unified"
msgstr "Unificado"
#. IDS_FILEWRITE_ERROR
-#: Merge.rc:4917
+#: Merge.rc:4927
#, c-format
msgid "Could not write to file %1."
msgstr "Non se puido escribir no ficheiro %1."
#. IDS_PATH_NOT_ABSOLUTE
-#: Merge.rc:4918
+#: Merge.rc:4928
#, c-format
msgid "Output path is not absolute: %1"
msgstr "A ruta de saída especificada non é absoluta: %1"
#. IDS_MUST_SPECIFY_OUTPUT
-#: Merge.rc:4919
+#: Merge.rc:4929
msgid "Specify an output file."
msgstr "Especifique un ficheiro de saída."
-#: Merge.rc:4921
+#: Merge.rc:4931
msgid "Cannot create patch from binary files."
msgstr "Non se pode crear un ficheiro de parche desde ficheiros binarios."
#. IDS_SAVEFILES_FORPATCH
-#: Merge.rc:4922
+#: Merge.rc:4932
msgid ""
"Save all files first.\n"
"\n"
@@ -7062,12 +7073,12 @@ msgstr ""
"Para crear un parche é necesario que non haxa cambios sin gardar."
#. IDS_FOLDER_NOTEXIST
-#: Merge.rc:4923
+#: Merge.rc:4933
msgid "Folder does not exist."
msgstr "A carpeta non existe."
#. IDS_NO_ZIP_SUPPORT
-#: Merge.rc:4928
+#: Merge.rc:4938
msgid ""
"Archive support not enabled.\n"
"7-Zip and/or Merge7z*.dll not found.\n"
@@ -7078,37 +7089,37 @@ msgstr ""
"Consulte o manual para ter máis información sobre o soporte de arquivos e como habilitalo."
#. IDS_OPT_EXPORT_CAPTION
-#: Merge.rc:4929
+#: Merge.rc:4939
msgid "Select file for export"
msgstr "Seleccione un ficheiro para exportar"
#. IDS_OPT_IMPORT_CAPTION
-#: Merge.rc:4930
+#: Merge.rc:4940
msgid "Select file for import"
msgstr "Seleccione un ficheiro para importar"
#. IDS_OPT_IMPORT_DONE
-#: Merge.rc:4931
+#: Merge.rc:4941
msgid "Options imported from file."
msgstr "Opcións importadas desde o ficheiro."
#. IDS_OPT_EXPORT_DONE
-#: Merge.rc:4932
+#: Merge.rc:4942
msgid "Options exported to file."
msgstr "Opcións exportadas ao ficheiro."
#. IDS_OPT_IMPORT_ERR
-#: Merge.rc:4933
+#: Merge.rc:4943
msgid "Failed to import options from file."
msgstr "Erro ao importar opcións do arquivo."
#. IDS_OPT_EXPORT_ERR
-#: Merge.rc:4934
+#: Merge.rc:4944
msgid "Failed to write options to file."
msgstr "Erro ao escribir as opcións ao ficheiro."
#. IDS_CLOSEALL_WINDOWS
-#: Merge.rc:4935
+#: Merge.rc:4945
msgid ""
"Close multiple compare windows?\n"
"\n"
@@ -7119,44 +7130,44 @@ msgstr ""
"Quere continuar?"
#. IDS_EOL_MIXED
-#: Merge.rc:4944
+#: Merge.rc:4954
msgid "Mixed"
msgstr "Mesturado"
#. IDS_EOL_BIN
-#: Merge.rc:4945
+#: Merge.rc:4955
msgctxt "EOL Type"
msgid "Binary"
msgstr "Binario"
#. IDS_EOL_NONE
-#: Merge.rc:4949
+#: Merge.rc:4959
msgid "None"
msgstr "Ningún"
#. IDS_MARKER_COLOR_FMT
-#: Merge.rc:4950
+#: Merge.rc:4960
#, c-format
msgid "Marker Color %d"
msgstr "Cor de marcador %d"
#. IDS_MARKER_NEW_PATTERN
-#: Merge.rc:4951
+#: Merge.rc:4961
msgid "New Pattern"
msgstr "Novo padrón"
#. IDS_PLUGINSLIST_TYPE
-#: Merge.rc:4957
+#: Merge.rc:4967
msgid "Type"
msgstr "Tipo"
#. IDS_PLUGINS_TYPE_EDITSCRIPT
-#: Merge.rc:4961
+#: Merge.rc:4971
msgid "Editor script"
msgstr "Editor de script"
#. ID_SELECTLINEDIFF
-#: Merge.rc:4967
+#: Merge.rc:4977
msgid ""
"\n"
"Difference in Current Line (F4)"
@@ -7165,7 +7176,7 @@ msgstr ""
"Diferenza na liña actual (F4)"
#. ID_OPTIONS
-#: Merge.rc:4968
+#: Merge.rc:4978
msgid ""
"\n"
"Options"
@@ -7174,7 +7185,7 @@ msgstr ""
"Configuración"
#. ID_REFRESH
-#: Merge.rc:4969
+#: Merge.rc:4979
msgid ""
"\n"
"Refresh (F5)"
@@ -7183,7 +7194,7 @@ msgstr ""
"Actualizar (F5)"
#. ID_PREVDIFF
-#: Merge.rc:4975
+#: Merge.rc:4985
msgid ""
"\n"
"Previous Difference (Alt+Up)"
@@ -7192,7 +7203,7 @@ msgstr ""
"Diferenza anterior (Alt+Arriba)"
#. ID_NEXTDIFF
-#: Merge.rc:4976
+#: Merge.rc:4986
msgid ""
"\n"
"Next Difference (Alt+Down)"
@@ -7201,7 +7212,7 @@ msgstr ""
"Diferenza seguinte (Alt+Abaixo)"
#. ID_PREVCONFLICT
-#: Merge.rc:4977
+#: Merge.rc:4987
msgid ""
"\n"
"Previous Conflict (Alt+Shift+Up)"
@@ -7210,7 +7221,7 @@ msgstr ""
"Conflito anterior (Alt+Maiús+Arriba)"
#. ID_NEXTCONFLICT
-#: Merge.rc:4978
+#: Merge.rc:4988
msgid ""
"\n"
"Next Conflict (Alt+Shift+Down)"
@@ -7219,7 +7230,7 @@ msgstr ""
"Conflito seguinte (Alt+Maiús+Abaixo)"
#. ID_FIRSTDIFF
-#: Merge.rc:4983
+#: Merge.rc:4993
msgid ""
"\n"
"First Difference (Alt+Home)"
@@ -7228,7 +7239,7 @@ msgstr ""
"Primeira diferenza (Alt+Inicio)"
#. ID_CURDIFF
-#: Merge.rc:4984
+#: Merge.rc:4994
msgid ""
"\n"
"Current Difference (Alt+Enter)"
@@ -7237,7 +7248,7 @@ msgstr ""
"Diferenza actual (Alt+Enter)"
#. ID_LASTDIFF
-#: Merge.rc:4985
+#: Merge.rc:4995
msgid ""
"\n"
"Last Difference (Alt+End)"
@@ -7246,7 +7257,7 @@ msgstr ""
"Derradeira diferenza (Alt+Fin)"
#. ID_L2R
-#: Merge.rc:4986
+#: Merge.rc:4996
msgid ""
"\n"
"Copy to Right (Alt+Right)"
@@ -7255,7 +7266,7 @@ msgstr ""
"Copiar ao dereito (Alt+Dereita)"
#. ID_R2L
-#: Merge.rc:4987
+#: Merge.rc:4997
msgid ""
"\n"
"Copy to Left (Alt+Left)"
@@ -7264,7 +7275,7 @@ msgstr ""
"Copiar ao esquerdo (Alt+Esquerda)"
#. ID_L2RNEXT
-#: Merge.rc:4988
+#: Merge.rc:4998
msgid ""
"\n"
"Copy to Right and Advance (Ctrl+Alt+Right)"
@@ -7273,7 +7284,7 @@ msgstr ""
"Copiar ao dereito e avanzar (Ctrl+Alt+Dereita)"
#. ID_R2LNEXT
-#: Merge.rc:4989
+#: Merge.rc:4999
msgid ""
"\n"
"Copy to Left and Advance (Ctrl+Alt+Left)"
@@ -7282,7 +7293,7 @@ msgstr ""
"Copiar ao esquerdo e avanzar (Ctrl+Alt+Esquerda)"
#. ID_ALL_RIGHT
-#: Merge.rc:4990
+#: Merge.rc:5000
msgid ""
"\n"
"Copy All to Right"
@@ -7291,7 +7302,7 @@ msgstr ""
"Copiar todo ao dereito"
#. ID_ALL_LEFT
-#: Merge.rc:4991
+#: Merge.rc:5001
msgid ""
"\n"
"Copy All to Left"
@@ -7300,7 +7311,7 @@ msgstr ""
"Copiar todo ao esquerdo"
#. ID_AUTO_MERGE
-#: Merge.rc:4992
+#: Merge.rc:5002
msgid ""
"\n"
"Auto Merge (Ctrl+Alt+M)"
@@ -7309,7 +7320,7 @@ msgstr ""
"Automesturar (Ctrl+Alt+M)"
#. ID_FIRSTFILE
-#: Merge.rc:4993
+#: Merge.rc:5003
msgid ""
"\n"
"First File"
@@ -7318,7 +7329,7 @@ msgstr ""
"Primeiro ficheiro"
#. ID_NEXTFILE
-#: Merge.rc:4994
+#: Merge.rc:5004
msgid ""
"\n"
"Next File (Ctrl+F8)"
@@ -7327,7 +7338,7 @@ msgstr ""
"Seguinte ficheiro (Ctrl+F8)"
#. ID_LASTFILE
-#: Merge.rc:4995
+#: Merge.rc:5005
msgid ""
"\n"
"Last File"
@@ -7336,7 +7347,7 @@ msgstr ""
"Derradeiro ficheiro"
#. ID_PREVFILE
-#: Merge.rc:4996
+#: Merge.rc:5006
msgid ""
"\n"
"Previous File (Ctrl+F7)"
@@ -7345,37 +7356,37 @@ msgstr ""
"Ficheiro anterior (Ctrl+F7)"
#. IDS_UNPACK_AUTO
-#: Merge.rc:5003
+#: Merge.rc:5013
msgid "Adapted unpacker applied to both files (one needs extension)."
msgstr "O desempaquetador escollido aplícase a ambos ficheiros (só un ficheiro precisa a extensión)."
#. IDS_NO_PREDIFFER
-#: Merge.rc:5004
+#: Merge.rc:5014
msgid "No Prediffer (Normal)"
msgstr "Sen precomparación (normal)"
#. IDS_SUGGESTED_PLUGINS
-#: Merge.rc:5005
+#: Merge.rc:5015
msgid "Suggested Plugins"
msgstr "Complementos recomendados"
#. IDS_NOT_SUGGESTED_PLUGINS
-#: Merge.rc:5006
+#: Merge.rc:5016
msgid "All Plugins"
msgstr "Todos os complementos"
#. IDS_PRIVATEBUILD_FMT
-#: Merge.rc:5012
+#: Merge.rc:5022
#, c-format
msgid "Private Build: %1"
msgstr "Compilación privada: %1"
#. IDS_CHECKFORUPDATES_UPTODATE
-#: Merge.rc:5013
+#: Merge.rc:5023
msgid "Your software is up to date."
msgstr "A súa aplicación está actualizada."
-#: Merge.rc:5015
+#: Merge.rc:5025
#, c-format
msgid ""
"WinMerge update available.\n"
@@ -7385,125 +7396,125 @@ msgstr ""
"Está dispoñible a %1 (a súa é %2). Quere descargarla agora?"
#. IDS_ALLRIGHTS_RESERVED
-#: Merge.rc:5016
+#: Merge.rc:5026
msgid " - All rights reserved."
msgstr ""
#. IDS_CHECKFORUPDATES_FAILED
-#: Merge.rc:5021
+#: Merge.rc:5031
msgid "Failed to download latest version information"
msgstr "Non se puido descargar a información da última versión"
#. IDS_TITLE_PLUGINS_SETTINGS
-#: Merge.rc:5027
+#: Merge.rc:5037
msgid "Plugin Settings"
msgstr "Configuración de complementos"
#. IDS_NO_SCT_SCRIPTS
-#: Merge.rc:5029
+#: Merge.rc:5039
msgid "WSH not found - .sct scripts disabled"
msgstr "WSH non atopado - scripts .sct desactivados"
#. IDS_LOCBAR_GOTOLINE_FMT
-#: Merge.rc:5037
+#: Merge.rc:5047
#, c-format
msgid "G&o to Line %1"
msgstr "I&r á liña %1"
#. IDS_GOTO_MOVED_LINE
-#: Merge.rc:5043
+#: Merge.rc:5053
msgid "Go to Moved Line\tCtrl+Shift+G"
msgstr "Ir á liña movida\tCtrl+Maiús+G"
#. IDS_AUTOCOMPLETE_DISABLED
-#: Merge.rc:5049
+#: Merge.rc:5059
msgctxt "Options dialog|General|Open dialog Auto completion"
msgid "Disabled"
msgstr ""
#. IDS_AUTOCOMPLETE_FILE_SYS
-#: Merge.rc:5050
+#: Merge.rc:5060
msgid "From file system"
msgstr "Do sistema de arquivos"
#. IDS_AUTOCOMPLETE_MRU
-#: Merge.rc:5051
+#: Merge.rc:5061
msgid "From Most Recently Used list"
msgstr "Da listaxe dos máis usados"
#. IDS_COLORSCHEME_PLAIN
-#: Merge.rc:5057
+#: Merge.rc:5067
msgid "No Highlighting"
msgstr "Sen resaltar"
#. IDS_COLORSCHEME_BATCH
-#: Merge.rc:5063
+#: Merge.rc:5073
msgid "Batch"
msgstr "Lote"
#. IDS_COLORSCHEME_PO
-#: Merge.rc:5090
+#: Merge.rc:5100
msgid "Portable Object"
msgstr "Obxecto portable"
#. IDS_COLORSCHEME_RSRC
-#: Merge.rc:5094
+#: Merge.rc:5104
msgid "Resources"
msgstr "Recursos"
#. IDS_COLORSCHEME_SH
-#: Merge.rc:5098
+#: Merge.rc:5108
msgid "Shell"
msgstr "Intérprete de comandos"
#. IDS_CLOSE_LEFT_TABS
-#: Merge.rc:5115
+#: Merge.rc:5125
msgid "Close &Left Tabs"
msgstr "Pechar pestanas da &esquerda"
#. IDS_CLOSE_RIGHT_TABS
-#: Merge.rc:5116
+#: Merge.rc:5126
msgid "Close R&ight Tabs"
msgstr "Pechar pestanas da dere&ita"
#. IDS_CLOSE_OTHER_TABS
-#: Merge.rc:5117
+#: Merge.rc:5127
msgid "Close &Other Tabs"
msgstr "Pechar &outras pestanas"
#. IDS_TABBAR_AUTO_MAXWIDTH
-#: Merge.rc:5118
+#: Merge.rc:5128
msgid "Enable &Auto Max Width"
msgstr "Activar &anchura máxima automática"
#. IDS_WEBPAGE_MENU
-#: Merge.rc:5128
+#: Merge.rc:5138
msgid "We&bpage"
msgstr "Páxina We&b"
#. IDS_VIEW_WRAP_TEXT
-#: Merge.rc:5133
+#: Merge.rc:5143
msgid "W&rap Text"
msgstr "Axusta&r texto"
#. IDS_NOTINSTALLED
-#: Merge.rc:5138
+#: Merge.rc:5148
msgid "%1 is not installed."
msgstr "Non está instalado %1."
#. IDS_CREATE_FOLDER
-#: Merge.rc:5143
+#: Merge.rc:5153
#, c-format
msgid "%1 does not exist. Create it?"
msgstr "%1 non existe. Quere crealo?"
#. IDS_CREATE_FOLDER_ERROR
-#: Merge.rc:5144
+#: Merge.rc:5154
msgid "Failed to create folder."
msgstr "Erro ao crear a carpeta."
#. IDC_EXT_EDITOR_PATH
-#: Merge.rc:5149
+#: Merge.rc:5159
msgid ""
"Parameters:\n"
"$file: Current file path\n"
@@ -7514,486 +7525,486 @@ msgstr ""
"$linenum: número de liña da posición actual do cursor"
#. IDS_DIFF_ALGORITHM_DEFAULT
-#: Merge.rc:5154
+#: Merge.rc:5164
msgid "default"
msgstr "predeterminado"
#. IDS_DIFF_ALGORITHM_MINIMAL
-#: Merge.rc:5155
+#: Merge.rc:5165
msgid "minimal"
msgstr "mínimo"
#. IDS_DIFF_ALGORITHM_PATIENCE
-#: Merge.rc:5156
+#: Merge.rc:5166
msgid "patience"
msgstr "solitario"
#. IDS_DIFF_ALGORITHM_HISTOGRAM
-#: Merge.rc:5157
+#: Merge.rc:5167
msgid "histogram"
msgstr "histograma"
#. IDS_DIFF_ALGORITHM_NONE
-#: Merge.rc:5158
+#: Merge.rc:5168
msgid "none"
msgstr "ningún"
#. IDS_RENDERING_MODE_GDI
-#: Merge.rc:5163
+#: Merge.rc:5173
msgid "GDI"
msgstr "GDI"
#. IDS_RENDERING_MODE_DIRECTWRITE_DEFAULT
-#: Merge.rc:5164
+#: Merge.rc:5174
msgid "DirectWrite Default"
msgstr "DirectWrite predeterminado"
#. IDS_RENDERING_MODE_DIRECTWRITE_ALIASED
-#: Merge.rc:5165
+#: Merge.rc:5175
msgid "DirectWrite Aliased"
msgstr "Alias de DirectWrite"
#. IDS_RENDERING_MODE_DIRECTWRITE_GDI_CLASSIC
-#: Merge.rc:5166
+#: Merge.rc:5176
msgid "DirectWrite GDI Classic"
msgstr "DirectWrite GDI clásico"
#. IDS_RENDERING_MODE_DIRECTWRITE_GDI_NATURAL
-#: Merge.rc:5167
+#: Merge.rc:5177
msgid "DirectWrite GDI Natural"
msgstr "DirectWrite GDI natural"
#. IDS_RENDERING_MODE_DIRECTWRITE_NATURAL
-#: Merge.rc:5168
+#: Merge.rc:5178
msgid "DirectWrite Natural"
msgstr "DirectWrite natural"
#. IDS_RENDERING_MODE_DIRECTWRITE_NATURAL_SYMMETRIC
-#: Merge.rc:5169
+#: Merge.rc:5179
msgid "DirectWrite Natural Symmetric"
msgstr "DirectWrite natural simétrico"
#. IDS_CLOSE_WINDOWS_WITH_ESC_DISABLED
-#: Merge.rc:5174
+#: Merge.rc:5184
msgctxt "Options dialog|General|Close windows with Esc"
msgid "Disabled"
msgstr ""
#. IDS_CLOSE_WINDOWS_WITH_ESC_1
-#: Merge.rc:5175
+#: Merge.rc:5185
msgid "MDI child window or main window"
msgstr "Ventá MDI secundaria ou ventá principal"
#. IDS_CLOSE_WINDOWS_WITH_ESC_2
-#: Merge.rc:5176
+#: Merge.rc:5186
msgid "MDI child window only"
msgstr "Só ventá secundaria MDI"
#. IDS_CLOSE_WINDOWS_WITH_ESC_3
-#: Merge.rc:5177
+#: Merge.rc:5187
msgid "Close main window if only one MDI child window"
msgstr "Pechar a ventá principal se só hai unha ventá MDI secundaria"
#. IDS_DIFF_GROUP
-#: Merge.rc:5182
+#: Merge.rc:5192
msgctxt "ImgMergeFrame|LocationPane"
msgid "Diff"
msgstr "Diferenza"
#. IDS_DIFF_HIGHLIGHT
-#: Merge.rc:5183
+#: Merge.rc:5193
msgctxt "ImgMergeFrame|LocationPane"
msgid "Highlight"
msgstr "Resaltado"
#. IDS_DIFF_BLINK
-#: Merge.rc:5184
+#: Merge.rc:5194
msgctxt "ImgMergeFrame|LocationPane"
msgid "Blink"
msgstr "Escintilar"
#. IDS_DIFF_BLOCKSIZE
-#: Merge.rc:5185
+#: Merge.rc:5195
msgctxt "ImgMergeFrame|LocationPane"
msgid "Block Size"
msgstr "Tamaño do bloque"
#. IDS_DIFF_BLOCKALPHA
-#: Merge.rc:5186
+#: Merge.rc:5196
msgctxt "ImgMergeFrame|LocationPane"
msgid "Block Alpha"
msgstr "Bloque Alfa"
#. IDS_DIFF_CDTHRESHOLD
-#: Merge.rc:5187
+#: Merge.rc:5197
msgctxt "ImgMergeFrame|LocationPane"
msgid "CD Threshold"
msgstr "Limiar de DC"
#. IDS_DIFF_INSERTION_DELETION_DETECTION
-#: Merge.rc:5188
+#: Merge.rc:5198
msgctxt "ImgMergeFrame|LocationPane"
msgid "Ins/Del Detection"
msgstr "Detectar Ins/Borrar"
#. IDS_OVERLAY_MODE_NONE
-#: Merge.rc:5189 Merge.rc:5194
+#: Merge.rc:5199 Merge.rc:5204
msgctxt "ImgMergeFrame|LocationPane"
msgid "None"
msgstr "Ningún"
#. IDS_DIFF_INSERTION_DELETION_DETECTION_VERTICAL
-#: Merge.rc:5190
+#: Merge.rc:5200
msgctxt "ImgMergeFrame|LocationPane"
msgid "Vertical"
msgstr "Vertical"
#. IDS_DIFF_INSERTION_DELETION_DETECTION_HORIZONTAL
-#: Merge.rc:5191
+#: Merge.rc:5201
msgctxt "ImgMergeFrame|LocationPane"
msgid "Horizontal"
msgstr "Horizontal"
#. IDS_OVERLAY_GROUP
-#: Merge.rc:5192
+#: Merge.rc:5202
msgctxt "ImgMergeFrame|LocationPane"
msgid "Overlay"
msgstr "Superpoñer"
#. IDS_OVERLAY_ALPHA
-#: Merge.rc:5193
+#: Merge.rc:5203
msgctxt "ImgMergeFrame|LocationPane"
msgid "Alpha"
msgstr "Alpha"
#. IDS_OVERLAY_MODE_XOR
-#: Merge.rc:5195
+#: Merge.rc:5205
msgctxt "ImgMergeFrame|LocationPane"
msgid "XOR"
msgstr "XOR"
#. IDS_OVERLAY_MODE_ALPHA
-#: Merge.rc:5196
+#: Merge.rc:5206
msgctxt "ImgMergeFrame|LocationPane"
msgid "Alpha Blend"
msgstr "Mestura Alpha"
#. IDS_OVERLAY_MODE_ALPHA_ANIMATION
-#: Merge.rc:5197
+#: Merge.rc:5207
msgctxt "ImgMergeFrame|LocationPane"
msgid "Alpha Animation"
msgstr "Animación Alpha"
#. IDS_ZOOM
-#: Merge.rc:5198
+#: Merge.rc:5208
msgctxt "ImgMergeFrame|LocationPane"
msgid "Zoom"
msgstr "Zoom"
#. IDS_PAGE
-#: Merge.rc:5199
+#: Merge.rc:5209
msgctxt "ImgMergeFrame|LocationPane"
msgid "Page:"
msgstr "Páxina:"
#. IDS_IMGCMP_STATUS_PT_RGBA_FMT
-#: Merge.rc:5200
+#: Merge.rc:5210
#, c-format
msgid "Pt: (%d, %d) RGBA: (%d, %d, %d, %d) "
msgstr "Pto: (%d, %d) RGBA: (%d, %d, %d, %d) "
#. IDS_IMGCMP_STATUS_DIST1_FMT
-#: Merge.rc:5201
+#: Merge.rc:5211
#, c-format
msgid "Dist: %g "
msgstr "Dist: %g "
#. IDS_IMGCMP_STATUS_DIST2_FMT
-#: Merge.rc:5202
+#: Merge.rc:5212
#, c-format
msgid "Dist: %g, %g "
msgstr "Dist: %g, %g "
#. IDS_IMGCMP_STATUS_PAGE_ZOOM_SIZE_BPP_FMT
-#: Merge.rc:5203
+#: Merge.rc:5213
#, c-format
msgid "Page: %d/%d Zoom: %d%% %dx%dpx %dbpp "
msgstr "Páxina: %d/%d Zoom: %d%% %dx%dpx %dbpp "
#. IDS_IMGCMP_STATUS_RC_FMT
-#: Merge.rc:5204
+#: Merge.rc:5214
#, c-format
msgid "Rc: (%d, %d) "
msgstr "Rc: (%d, %d) "
#. IDS_IMGCMP_STATUS_FLIPPED_FMT
-#: Merge.rc:5205
+#: Merge.rc:5215
#, c-format
msgid "Flipped: %s "
msgstr "Volteada: %s "
#. IDS_IMGCMP_STATUS_ROTATED_FMT
-#: Merge.rc:5206
+#: Merge.rc:5216
#, c-format
msgid "Rotated: %d "
msgstr "Rotada: %d "
#. IDS_IMGCMP_REPORT_ALLPAGES
-#: Merge.rc:5207
+#: Merge.rc:5217
msgid "All pages"
msgstr "Todas as páxinas"
#. IDS_IGNSUB_STR1
-#: Merge.rc:5212
+#: Merge.rc:5222
msgid ""
msgstr ""
#. IDS_IGNSUB_STR2
-#: Merge.rc:5213
+#: Merge.rc:5223
msgid "No differences found to select"
msgstr "Non se atoparon deferenzas para seleccionar"
#. IDS_IGNSUB_STR3
-#: Merge.rc:5214
+#: Merge.rc:5224
msgid "No differences found to add as substitution filter"
msgstr "Non se atoparon diferenzas para añadir como filtro de substitución"
#. IDS_IGNSUB_STR4
-#: Merge.rc:5215
+#: Merge.rc:5225
msgid "The pair is already in the Substitution Filters list"
msgstr "Esta parella xa está presente na lista de Filtros de substitución"
#. IDS_IGNSUB_STR5
-#: Merge.rc:5216
+#: Merge.rc:5226
msgid "Add this change to Substitution Filters?"
msgstr "Añadir este cambio aos Filtros de substitución?"
#. IDS_OCRRESULT_TEXTONLY
-#: Merge.rc:5221
+#: Merge.rc:5231
msgid "Text only"
msgstr "Só texto"
#. IDS_OCRRESULT_POS_LINE
-#: Merge.rc:5222
+#: Merge.rc:5232
msgid "Line-by-line position and text"
msgstr "Posición e texto liña por liña"
#. IDS_OCRRESULT_POS_WORD
-#: Merge.rc:5223
+#: Merge.rc:5233
msgid "Word-by-word position and text"
msgstr "Posición e texto palabra por palabra"
#. IDS_USERDATAFOLDER_APPDATA
-#: Merge.rc:5228
+#: Merge.rc:5238
msgid "AppData (Roaming) folder"
msgstr ""
#. IDS_USERDATAFOLDER_INSTALL
-#: Merge.rc:5229
+#: Merge.rc:5239
msgid "Install folder"
msgstr "Carpeta de instalación"
#. IDS_USERDATAFOLDER_DOCUMENTS
-#: Merge.rc:5230
+#: Merge.rc:5240
msgid "Documents folder"
msgstr ""
#. IDS_SINGLEINSTANCE_DISABLED
-#: Merge.rc:5235
+#: Merge.rc:5245
msgctxt "Options dialog|General|Single instance mode"
msgid "Disabled"
msgstr ""
#. IDS_SINGLEINSTANCE_STR1
-#: Merge.rc:5236
+#: Merge.rc:5246
msgid "Allow only one instance to run"
msgstr "Permitir executar só unha instancia"
#. IDS_SINGLEINSTANCE_STR2
-#: Merge.rc:5237
+#: Merge.rc:5247
msgid "Allow only one instance; wait for termination"
msgstr "Permitir só a execución dunha instancia e esperar hasta que remate"
#. IDS_AUTO_RELOAD_MODIFIED_FILES_DISABLED
-#: Merge.rc:5242
+#: Merge.rc:5252
msgctxt "Options dialog|General|Auto-reload modified files"
msgid "Disabled"
msgstr ""
#. IDS_AUTO_RELOAD_MODIFIED_FILES_STR1
-#: Merge.rc:5243
+#: Merge.rc:5253
msgid "Only on window activated"
msgstr "Só coa ventá activada"
#. IDS_AUTO_RELOAD_MODIFIED_FILES_STR2
-#: Merge.rc:5244
+#: Merge.rc:5254
msgid "Immediately"
msgstr "Inmediatamente"
#. IDS_PLUGIN_ALL
-#: Merge.rc:5249
+#: Merge.rc:5259
msgid "Al&l"
msgstr "&Todo"
#. IDS_PLUGIN_OTHERS
-#: Merge.rc:5250
+#: Merge.rc:5260
msgid "&Others"
msgstr "&Outros"
-#: Merge.rc:5252
+#: Merge.rc:5262
#, c-format
msgid "Missing plugin name in pipeline: %1"
msgstr "Falta o nome do complemento na canalización de complementos %1"
-#: Merge.rc:5254
+#: Merge.rc:5264
#, c-format
msgid "Missing quote in plugin pipeline: %1"
msgstr "Faltan comiñas na canalización de complementos %1"
#. IDS_PLUGIN_NAME_ALREADY_EXISTS
-#: Merge.rc:5255
+#: Merge.rc:5265
#, c-format
msgid "Plugin name '%1' already exists."
msgstr ""
#. IDS_PLUGIN_TITLE1
-#: Merge.rc:5256
+#: Merge.rc:5266
msgid "Specify plugin arguments"
msgstr "Especificar os argumentos do complemento"
-#: Merge.rc:5258
+#: Merge.rc:5268
#, c-format
msgid "Plugin not found or invalid: %1"
msgstr "Complemento non atopado ou non válido: %1"
#. IDS_PLUGIN_NOT_UNPACK
-#: Merge.rc:5259
+#: Merge.rc:5269
#, c-format
msgid "'%1' is not an unpacker plugin"
msgstr "'%1' non é un complemento desempaquetador"
#. IDS_PLUGIN_NOT_PREDIFF
-#: Merge.rc:5260
+#: Merge.rc:5270
#, c-format
msgid "'%1' is not a prediffer plugin"
msgstr "'%1' non é un complemento de precomparación"
-#: Merge.rc:5262
+#: Merge.rc:5272
#, c-format
msgid "Error prediffing '%1' with '%2'. Prediffing disabled."
msgstr "Producíuse un erro ao precomparar o ficheiro '%1' co complemento '%2'. Xa non se vai facer ningunha outra precomparación."
#. IDS_PLUGIN_CIRCULAR_REFERENCE
-#: Merge.rc:5263
+#: Merge.rc:5273
#, c-format
msgid "Circular reference in plugin pipeline: %1"
msgstr ""
#. IDS_PLUGIN_TYPE1
-#: Merge.rc:5264
+#: Merge.rc:5274
msgid "URL Handler"
msgstr ""
#. IDS_PLUGIN_TYPE2
-#: Merge.rc:5265
+#: Merge.rc:5275
msgid "File Unpacker"
msgstr ""
#. IDS_PLUGIN_TYPE3
-#: Merge.rc:5266
+#: Merge.rc:5276
msgid "File or Folder Unpacker"
msgstr ""
#. IDS_PLUGIN_TYPE5
-#: Merge.rc:5268
+#: Merge.rc:5278
msgid "Alias for Unpacker"
msgstr ""
#. IDS_PLUGIN_TYPE6
-#: Merge.rc:5269
+#: Merge.rc:5279
msgid "Alias for Prediffer"
msgstr ""
#. IDS_PLUGIN_TYPE7
-#: Merge.rc:5270
+#: Merge.rc:5280
msgid "Alias for Editor script"
msgstr ""
#. IDS_PLUGIN_ALIAS_DESC
-#: Merge.rc:5271
+#: Merge.rc:5281
#, c-format
msgid "Alias for plugin pipeline '%1'"
msgstr ""
#. IDS_PLUGIN_NEW_DESC
-#: Merge.rc:5272
+#: Merge.rc:5282
msgid "New plugin description"
msgstr ""
#. IDS_PLUGIN_TARGETS_ALL
-#: Merge.rc:5273
+#: Merge.rc:5283
msgid "All"
msgstr ""
#. IDS_PLUGIN_TARGETS_1ST
-#: Merge.rc:5274
+#: Merge.rc:5284
msgid "1st"
msgstr ""
#. IDS_PLUGIN_TARGETS_2ND
-#: Merge.rc:5275
+#: Merge.rc:5285
msgid "2nd"
msgstr ""
#. IDS_PLUGIN_TARGETS_3RD
-#: Merge.rc:5276
+#: Merge.rc:5286
msgid "3rd"
msgstr ""
#. IDS_PLUGIN_TARGETS_1ST_2ND
-#: Merge.rc:5277
+#: Merge.rc:5287
msgid "1st and 2nd"
msgstr ""
#. IDS_PLUGIN_TARGETS_1ST_3RD
-#: Merge.rc:5278
+#: Merge.rc:5288
msgid "1st and 3rd"
msgstr ""
#. IDS_PLUGIN_TARGETS_2ND_3RD
-#: Merge.rc:5279
+#: Merge.rc:5289
msgid "2nd and 3rd"
msgstr ""
#. IDS_FILTER_APPLIED
-#: Merge.rc:5284
+#: Merge.rc:5294
msgid "Filter applied"
msgstr "Filtro aplicado"
#. IDS_FILTERMENU_COMPARE
-#: Merge.rc:5289
+#: Merge.rc:5299
#, c-format
msgid "Compare %1"
msgstr ""
#. IDS_FILTERMENU_FILTER_BY_THIS_COLUMN
-#: Merge.rc:5290
+#: Merge.rc:5300
msgid "&Filter by This Column"
msgstr ""
#. IDS_FILTERMENU_FILTER_BY_THIS_COLUMN2
-#: Merge.rc:5291
+#: Merge.rc:5301
msgid "&Filter by This Column..."
msgstr ""
#. IDS_CLIPBOARDHISTORY_TIME
-#: Merge.rc:5296
+#: Merge.rc:5306
#, c-format
msgid "Clipboard at %s"
msgstr "Portapapeis en %s"
#. IDS_CLIPBOARDHISTORY_DISABLED
-#: Merge.rc:5297
+#: Merge.rc:5307
msgid ""
"Clipboard history disabled.\r\n"
"Enable: Windows logo key + V, then Turn on."
@@ -8001,395 +8012,400 @@ msgstr ""
"O historial do portapapeis está desactivado.\r\n"
"Para habilitar o historial do portapapeis, prema na tecla do logo de Windows + V e logo no botón Activar."
-#: Merge.rc:5299
+#: Merge.rc:5309
msgid "This system does not support clipboard history."
msgstr "Este sistema non soporta o historial do portapapeis."
-#: Merge.rc:5301
+#: Merge.rc:5311
msgid "32-bit WinMerge does not support Clipboard Compare"
msgstr "A versión de 32 bit de WinMerge non soporta a comparación de portapapeis"
#. IDS_WEBVIEW2_RUNTIME_NOT_INSTALLED
-#: Merge.rc:5306
+#: Merge.rc:5316
msgid "WebView2 runtime not installed. Download it?"
msgstr "O runtime WebView2 non está instalado. Quere descargalo?"
#. IDS_JUMPLIST_NEW_TEXT_COMPARE
-#: Merge.rc:5311
+#: Merge.rc:5321
msgid "New Text Compare"
msgstr "Nova comparación de texto"
#. IDS_JUMPLIST_NEW_TABLE_COMPARE
-#: Merge.rc:5312
+#: Merge.rc:5322
msgid "New Table Compare"
msgstr "Nova comparación de táboa"
#. IDS_JUMPLIST_NEW_BINARY_COMPARE
-#: Merge.rc:5313
+#: Merge.rc:5323
msgid "New Binary Compare"
msgstr "Nova comparación binaria"
#. IDS_JUMPLIST_NEW_IMAGE_COMPARE
-#: Merge.rc:5314
+#: Merge.rc:5324
msgid "New Image Compare"
msgstr "Nova comparación de imaxe"
#. IDS_JUMPLIST_NEW_WEBPAGE_COMPARE
-#: Merge.rc:5315
+#: Merge.rc:5325
msgid "New Webpage Compare"
msgstr "Nova comparación de páxina web"
+#. IDS_JUMPLIST_NEW_FOLDER_COMPARE
+#: Merge.rc:5326
+msgid "New Folder Compare"
+msgstr ""
+
#. IDS_JUMPLIST_CLIPBOARD_COMPARE
-#: Merge.rc:5316
+#: Merge.rc:5327
msgid "Clipboard Compare"
msgstr "Comparar de portapapeis"
#. IDS_PREVIEWBAR_PRINT
-#: Merge.rc:5321
+#: Merge.rc:5332
msgid "&Print..."
msgstr "Im&primir..."
#. IDS_PREVIEWBAR_PREVPAGE
-#: Merge.rc:5323
+#: Merge.rc:5334
msgid "Pre&v Page"
msgstr "Páxina an&terior"
#. IDS_PREVIEWBAR_TWOPAGE
-#: Merge.rc:5324
+#: Merge.rc:5335
msgid "&Two Page"
msgstr "&Dúas páxinas"
#. IDS_PREVIEWBAR_ONEPAGE
-#: Merge.rc:5325
+#: Merge.rc:5336
msgid "&One Page"
msgstr "Un&ha páxina"
#. IDS_PREVIEWBAR_ZOOMIN
-#: Merge.rc:5326
+#: Merge.rc:5337
msgid "Zoom &In"
msgstr "Aumentar &zoom"
#. IDS_PREVIEWBAR_ZOOMOUT
-#: Merge.rc:5327
+#: Merge.rc:5338
msgid "Zoom &Out"
msgstr "Reducir z&oom"
#. IDS_WEBPAGE_COMPARING
-#: Merge.rc:5333
+#: Merge.rc:5344
msgid "Comparing..."
msgstr ""
#. IDS_WEBPAGE_ZOOM
-#: Merge.rc:5334
+#: Merge.rc:5345
msgid "Zoom:"
msgstr ""
#. IDS_COPY_GRANULARITY_DIFFHUNK
-#: Merge.rc:5339
+#: Merge.rc:5350
msgid "Diff hunk"
msgstr ""
#. IDS_COPY_GRANULARITY_INLINE
-#: Merge.rc:5340
+#: Merge.rc:5351
msgid "Inline diff"
msgstr ""
#. IDS_COPY_GRANULARITY_LINE
-#: Merge.rc:5341
+#: Merge.rc:5352
msgid "Line"
msgstr ""
-#: Merge.rc:5342
+#: Merge.rc:5353
msgid "Character"
msgstr ""
#. ID_MICE_PREVDIFF
-#: Merge.rc:5347
+#: Merge.rc:5358
msgid "\nPrevious Difference (Alt+Up)\n(Right Button+Wheel Up)\n(Alt+Wheel Up)"
msgstr ""
#. ID_MICE_NEXTDIFF
-#: Merge.rc:5348
+#: Merge.rc:5359
msgid "\nNext Difference (Alt+Down)\n(Right Button+Wheel Down)\n(Alt+Wheel Down)"
msgstr ""
#. ID_MICE_L2R
-#: Merge.rc:5349
+#: Merge.rc:5360
msgid "\nCopy to Right (Alt+Right)\n(Right Button+Wheel Right)\n(Alt+Wheel Right)\n(Alt+Shift+Wheel Down)"
msgstr ""
#. ID_MICE_R2L
-#: Merge.rc:5350
+#: Merge.rc:5361
msgid "\nCopy to Left (Alt+Left)\n(Right Button+Wheel Left)\n(Alt+Wheel Left)\n(Alt+Shift+Wheel Up)"
msgstr ""
#. ID_MICE_L2RNEXT
-#: Merge.rc:5351
+#: Merge.rc:5362
msgid "\nCopy to Right and Advance (Ctrl+Alt+Right)\n(Ctrl+Alt+Wheel Right)\n(Ctrl+Alt+Shift+Wheel Down)"
msgstr ""
#. ID_MICE_R2LNEXT
-#: Merge.rc:5352
+#: Merge.rc:5363
msgid "\nCopy to Left and Advance (Ctrl+Alt+Left)\n(Ctrl+Alt+Wheel Left)\n(Ctrl+Alt+Shift+Wheel Up)"
msgstr ""
#. IDS_LOG_COMPARING_2
-#: Merge.rc:5362
+#: Merge.rc:5373
#, c-format
msgid "Comparing %1 with %2"
msgstr ""
#. IDS_LOG_COMPARING_3
-#: Merge.rc:5363
+#: Merge.rc:5374
#, c-format
msgid "Comparing %1 with %2 and %3"
msgstr ""
#. IDS_LOG_COMPARE_COMPLETED
-#: Merge.rc:5364
+#: Merge.rc:5375
msgid "Comparison completed"
msgstr ""
#. IDS_LOG_COMPARE_ERROR_2
-#: Merge.rc:5365
+#: Merge.rc:5376
#, c-format
msgid "Failed to compare %1 with %2: "
msgstr ""
#. IDS_LOG_COMPARE_ERROR_3
-#: Merge.rc:5366
+#: Merge.rc:5377
#, c-format
msgid "Failed to compare %1 with %2 and %3: "
msgstr ""
#. IDS_LOG_FILE_SAVED
-#: Merge.rc:5367
+#: Merge.rc:5378
msgid "File saved"
msgstr ""
#. IDS_LOG_COPYING_FILES
-#: Merge.rc:5368
+#: Merge.rc:5379
msgid "Copying files..."
msgstr ""
#. IDS_LOG_MOVING_FILES
-#: Merge.rc:5369
+#: Merge.rc:5380
msgid "Moving files..."
msgstr ""
#. IDS_LOG_DELETING_FILES
-#: Merge.rc:5370
+#: Merge.rc:5381
msgid "Deleting files..."
msgstr ""
#. IDS_LOG_RECYCLEBIN
-#: Merge.rc:5371
+#: Merge.rc:5382
msgid "Recycle Bin"
msgstr ""
#. IDS_LOG_PERMANENTLY_DELETED
-#: Merge.rc:5372
+#: Merge.rc:5383
msgid "Permanently deleted"
msgstr ""
#. IDS_LOG_FILEOPERATION_COMPLETED
-#: Merge.rc:5373
+#: Merge.rc:5384
msgid "File operation completed successfully"
msgstr ""
#. IDS_LOG_FILEOPERATION_CANCELED
-#: Merge.rc:5374
+#: Merge.rc:5385
msgid "File operation canceled"
msgstr ""
#. IDS_FILTER_ERROR_NO_ERROR
-#: Merge.rc:5379
+#: Merge.rc:5390
msgid "No error"
msgstr ""
#. IDS_FILTER_ERROR_EMPTY_EXPRESSION
-#: Merge.rc:5380
+#: Merge.rc:5391
msgid "Filter expression is empty"
msgstr ""
#. IDS_FILTER_ERROR_UNKNOWN_CHAR
-#: Merge.rc:5381
+#: Merge.rc:5392
msgid "Unknown character in filter expression"
msgstr ""
#. IDS_FILTER_ERROR_UNTERMINATED_STRING
-#: Merge.rc:5382
+#: Merge.rc:5393
msgid "Unterminated string literal"
msgstr ""
#. IDS_FILTER_ERROR_SYNTAX_ERROR
-#: Merge.rc:5383
+#: Merge.rc:5394
msgid "Syntax error in filter expression"
msgstr ""
#. IDS_FILTER_ERROR_PARSE_FAILURE
-#: Merge.rc:5384
+#: Merge.rc:5395
msgid "Failed to parse filter expression"
msgstr ""
#. IDS_FILTER_ERROR_INVALID_LITERAL
-#: Merge.rc:5385
+#: Merge.rc:5396
msgid "Invalid literal value"
msgstr ""
#. IDS_FILTER_ERROR_INVALID_REGULAR_EXPRESSION
-#: Merge.rc:5386
+#: Merge.rc:5397
msgid "Invalid regular expression"
msgstr ""
#. IDS_FILTER_ERROR_UNDEFINED_IDENTIFIER
-#: Merge.rc:5387
+#: Merge.rc:5398
msgid "Undefined identifier"
msgstr ""
#. IDS_FILTER_ERROR_INVALID_ARGUMENT_COUNT
-#: Merge.rc:5388
+#: Merge.rc:5399
msgid "Invalid number of arguments"
msgstr ""
#. IDS_FILTER_ERROR_FILTER_NAME_NOT_FOUND
-#: Merge.rc:5389
+#: Merge.rc:5400
msgid "Filter name not found"
msgstr ""
#. IDS_FILTER_ERROR_DIVIDE_BY_ZERO
-#: Merge.rc:5390
+#: Merge.rc:5401
msgid "Division by zero in filter expression"
msgstr ""
#. IDS_FILTER_ERROR_UNKNOWN_ERROR
-#: Merge.rc:5391
+#: Merge.rc:5402
msgid "Unknown error"
msgstr ""
#. IDS_FILTER_ERROR_INVALID_PROPERTY_NAME
-#: Merge.rc:5392
+#: Merge.rc:5403
msgid "Invalid property name"
msgstr ""
#. IDS_FILTER_ERROR_INVALID_DIRECTIVE
-#: Merge.rc:5393
+#: Merge.rc:5404
msgid "Invalid directive"
msgstr ""
#. IDS_FILTER_OP_EQUALS
-#: Merge.rc:5398
+#: Merge.rc:5409
msgid "Equals"
msgstr ""
#. IDS_FILTER_OP_NOT_EQUALS
-#: Merge.rc:5399
+#: Merge.rc:5410
msgid "Does not equal"
msgstr ""
#. IDS_FILTER_OP_LESS_THAN
-#: Merge.rc:5400
+#: Merge.rc:5411
msgid "Less than"
msgstr ""
#. IDS_FILTER_OP_LESS_EQUAL
-#: Merge.rc:5401
+#: Merge.rc:5412
msgid "Less than or equal to"
msgstr ""
#. IDS_FILTER_OP_GREATER_EQUAL
-#: Merge.rc:5402
+#: Merge.rc:5413
msgid "Greater than or equal to"
msgstr ""
#. IDS_FILTER_OP_GREATER_THAN
-#: Merge.rc:5403
+#: Merge.rc:5414
msgid "Greater than"
msgstr ""
#. IDS_FILTER_OP_BETWEEN
-#: Merge.rc:5404
+#: Merge.rc:5415
msgid "Between"
msgstr ""
#. IDS_FILTER_OP_NOT_BETWEEN
-#: Merge.rc:5405
+#: Merge.rc:5416
msgid "Not Between"
msgstr ""
#. IDS_FILTER_OP_CONTAINS
-#: Merge.rc:5406
+#: Merge.rc:5417
msgid "Contains"
msgstr ""
#. IDS_FILTER_OP_NOT_CONTAINS
-#: Merge.rc:5407
+#: Merge.rc:5418
msgid "Not Contains"
msgstr ""
#. IDS_FILTER_OP_RECONTAINS
-#: Merge.rc:5408
+#: Merge.rc:5419
msgid "Contains (regex)"
msgstr ""
#. IDS_FILTER_OP_NOT_RECONTAINS
-#: Merge.rc:5409
+#: Merge.rc:5420
msgid "Not Contains (regex)"
msgstr ""
#. IDS_FILTER_OP_LIKE
-#: Merge.rc:5410
+#: Merge.rc:5421
msgid "Match (wildcard)"
msgstr ""
#. IDS_FILTER_OP_NOT_LIKE
-#: Merge.rc:5411
+#: Merge.rc:5422
msgid "Not match (wildcard)"
msgstr ""
#. IDS_FILTER_OP_MATCHES
-#: Merge.rc:5412
+#: Merge.rc:5423
msgid "Match (regex)"
msgstr ""
#. IDS_FILTER_OP_NOT_MATCHES
-#: Merge.rc:5413
+#: Merge.rc:5424
msgid "Not match (regex)"
msgstr ""
#. IDS_COLORMODE_LIGHT
-#: Merge.rc:5418
+#: Merge.rc:5429
msgid "Light"
msgstr ""
#. IDS_COLORMODE_DARK
-#: Merge.rc:5419
+#: Merge.rc:5430
msgid "Dark"
msgstr ""
#. IDS_COLORMODE_FOLLOWSYSTEM
-#: Merge.rc:5420
+#: Merge.rc:5431
msgid "Follow system"
msgstr ""
#. IDS_EXAMPLE
-#: Merge.rc:5425
+#: Merge.rc:5436
#, c-format
msgid "e.g. %1"
msgstr ""
#. IDS_DETECTED_PREVIOUS_CRASH
-#: Merge.rc:5430
+#: Merge.rc:5441
msgid "WinMerge detected a previous crash. Please report this if possible."
msgstr ""
#. IDS_REGEX_REPLACE_LIST_TEMPLATE
-#: Merge.rc:5435
+#: Merge.rc:5446
msgid "# Regex replacement list\r\n# Format: regexreplacement\r\n# Backreferences like $1, $2 are supported\r\n\r\n(\\d{4})-(\\d{2})-(\\d{2})\t$1_$2_$3\r\n"
msgstr ""
#. IDS_STRING_REPLACE_LIST_TEMPLATE
-#: Merge.rc:5436
+#: Merge.rc:5447
msgid "# Replacement list\r\n# Format: searchreplacement\r\n# Lines starting with # are ignored\r\n\r\nfrom1\tto1\r\nfrom2\tto2\r\n"
msgstr ""
diff --git a/Translations/WinMerge/German.po b/Translations/WinMerge/German.po
index 92dd1f9314d..71b27c7af3b 100644
--- a/Translations/WinMerge/German.po
+++ b/Translations/WinMerge/German.po
@@ -26,7 +26,7 @@ msgstr ""
"X-Poedit-Basepath: ../../Src\n"
#. LANGUAGE, SUBLANGUAGE
-#: Merge.rc:26 Merge.rc:59 Merge.rc:5453
+#: Merge.rc:26 Merge.rc:59 Merge.rc:5464
#, c-format
msgid "LANG_ENGLISH, SUBLANG_ENGLISH_US"
msgstr "LANG_GERMAN, SUBLANG_GERMAN"
@@ -112,7 +112,7 @@ msgid "Copy Selected Diff (Right) to Clipboard\tCtrl+&3"
msgstr "Ausgewählten Unterschied (Rechts) in die Zwischenablage kopieren Strg+&3"
#. IDR_MERGEDOCTYPE, ID_SELECTLINEDIFF
-#: Merge.rc:110 Merge.rc:673
+#: Merge.rc:110 Merge.rc:680
#, c-format
msgid "Select Line &Difference\tF4"
msgstr "Zeilen&unterschied markieren\tF4"
@@ -146,7 +146,7 @@ msgid "Cu&t"
msgstr "Auss&chneiden"
#. IDR_POPUP_DIRVIEW
-#: Merge.rc:118 Merge.rc:943
+#: Merge.rc:118 Merge.rc:951
#, c-format
msgid "&Copy"
msgstr "&Kopieren"
@@ -158,21 +158,21 @@ msgid "&Paste"
msgstr "&Einfügen"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:121 Merge.rc:875 Merge.rc:882
+#: Merge.rc:121 Merge.rc:882 Merge.rc:889
#, c-format
msgid "&Scripts"
msgstr "&Skripte"
#. IDS_NO_EDIT_SCRIPTS
-#: Merge.rc:123 Merge.rc:338 Merge.rc:447 Merge.rc:654 Merge.rc:659
-#: Merge.rc:865 Merge.rc:877 Merge.rc:884 Merge.rc:940 Merge.rc:1183
-#: Merge.rc:5028
+#: Merge.rc:123 Merge.rc:340 Merge.rc:451 Merge.rc:661 Merge.rc:666
+#: Merge.rc:872 Merge.rc:884 Merge.rc:891 Merge.rc:948 Merge.rc:1193
+#: Merge.rc:5038
#, c-format
msgid "< Empty >"
msgstr "< Leer >"
#. IDR_POPUP_LOCATIONBAR, ID_EDIT_WMGOTO
-#: Merge.rc:126 Merge.rc:691 Merge.rc:1081
+#: Merge.rc:126 Merge.rc:698 Merge.rc:1089
msgid "&Go to...\tCtrl+G"
msgstr "&Gehe zu...\tStrg+G"
@@ -193,27 +193,27 @@ msgid "Op&en"
msgstr "Ö&ffnen"
#. IDR_POPUP_DIRVIEW, ID_DIR_OPEN_RIGHT
-#: Merge.rc:132 Merge.rc:981 Merge.rc:988 Merge.rc:995
+#: Merge.rc:132 Merge.rc:989 Merge.rc:996 Merge.rc:1003
msgid "With &Registered Application"
msgstr "Mit ®istrierter Anwendung"
#. IDR_POPUP_DIRVIEW, ID_DIR_OPEN_RIGHT_WITHEDITOR
-#: Merge.rc:133 Merge.rc:982 Merge.rc:989 Merge.rc:996
+#: Merge.rc:133 Merge.rc:990 Merge.rc:997 Merge.rc:1004
msgid "With &External Editor\tCtrl+Alt+E"
msgstr "Mit e&xternem Editor\tStrg+Alt+E"
#. IDR_POPUP_DIRVIEW, ID_DIR_OPEN_RIGHT_WITH
-#: Merge.rc:134 Merge.rc:983 Merge.rc:990 Merge.rc:997
+#: Merge.rc:134 Merge.rc:991 Merge.rc:998 Merge.rc:1005
msgid "&With..."
msgstr "&Mit..."
#. IDR_POPUP_DIRVIEW, ID_DIR_OPEN_RIGHT_PARENT_FOLDER
-#: Merge.rc:135 Merge.rc:984 Merge.rc:991 Merge.rc:998
+#: Merge.rc:135 Merge.rc:992 Merge.rc:999 Merge.rc:1006
msgid "Open &Parent Folder..."
msgstr "&Elternordner öffnen..."
#. IDR_POPUP_IMG_CTXT, ID_FILE_SHELLMENU
-#: Merge.rc:137 Merge.rc:1239
+#: Merge.rc:137 Merge.rc:1249
msgid "S&hell Menu"
msgstr "S&hell-Menü"
@@ -251,8 +251,8 @@ msgid "Ins&ertion/Deletion Detection"
msgstr "&Einfügen/Löschen-Erkennung"
#. IDR_MERGEDOCTYPE, ID_TOOLBAR_NONE
-#: Merge.rc:176 Merge.rc:209 Merge.rc:216 Merge.rc:358 Merge.rc:507
-#: Merge.rc:751
+#: Merge.rc:176 Merge.rc:209 Merge.rc:216 Merge.rc:360 Merge.rc:511
+#: Merge.rc:758
#, c-format
msgid "&None"
msgstr "K&eine"
@@ -268,13 +268,13 @@ msgid "&Horizontal"
msgstr "&Horizontal"
#. IDR_POPUP_IMG_CTXT, ID_IMG_CURPANE_PREVPAGE
-#: Merge.rc:181 Merge.rc:189 Merge.rc:1230
+#: Merge.rc:181 Merge.rc:189 Merge.rc:1240
#, c-format
msgid "&Previous Page"
msgstr "&Vorherige Seite"
#. IDS_PREVIEWBAR_NEXTPAGE
-#: Merge.rc:182 Merge.rc:190 Merge.rc:1231 Merge.rc:5322
+#: Merge.rc:182 Merge.rc:190 Merge.rc:1241 Merge.rc:5333
#, c-format
msgid "&Next Page"
msgstr "&Nächste Seite"
@@ -286,45 +286,45 @@ msgid "&Active Pane"
msgstr "&Aktiver Ausschnitt"
#. IDR_POPUP_IMG_CTXT, ID_IMG_CURPANE_ROTATE_RIGHT_90
-#: Merge.rc:185 Merge.rc:1225
+#: Merge.rc:185 Merge.rc:1235
msgid "Rotate &Right 90deg"
msgstr "90° nach rechts drehen"
#. IDR_POPUP_IMG_CTXT, ID_IMG_CURPANE_ROTATE_LEFT_90
-#: Merge.rc:186 Merge.rc:1226
+#: Merge.rc:186 Merge.rc:1236
msgid "Rotate &Left 90deg"
msgstr "90° nach links drehen"
#. IDR_POPUP_IMG_CTXT, ID_IMG_CURPANE_FLIP_VERTICALLY
-#: Merge.rc:187 Merge.rc:1227
+#: Merge.rc:187 Merge.rc:1237
msgid "Flip V&ertically"
msgstr "V&ertikal spiegeln"
#. IDR_POPUP_IMG_CTXT, ID_IMG_CURPANE_FLIP_HORIZONTALLY
-#: Merge.rc:188 Merge.rc:1228
+#: Merge.rc:188 Merge.rc:1238
msgid "Flip H&orizontally"
msgstr "H&orizontal spiegeln"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:193 Merge.rc:699
+#: Merge.rc:193 Merge.rc:706
#, c-format
msgid "&Zoom"
msgstr "&Zoom"
#. IDR_MERGEDOCTYPE, ID_VIEW_ZOOMIN
-#: Merge.rc:202 Merge.rc:701
+#: Merge.rc:202 Merge.rc:708
#, c-format
msgid "Zoom &In\tCtrl++"
msgstr "Ver&größern\tStrg++"
#. IDR_MERGEDOCTYPE, ID_VIEW_ZOOMOUT
-#: Merge.rc:203 Merge.rc:702
+#: Merge.rc:203 Merge.rc:709
#, c-format
msgid "Zoom &Out\tCtrl+-"
msgstr "Ver&kleinern\tStrg+-"
#. IDR_MERGEDOCTYPE, ID_VIEW_ZOOMNORMAL, Zoom to normal
-#: Merge.rc:205 Merge.rc:704
+#: Merge.rc:205 Merge.rc:711
#, c-format
msgid "&Normal\tCtrl+*"
msgstr "&Normal\tStrg+*"
@@ -354,29 +354,29 @@ msgid "Dragging &Mode"
msgstr "Ziehen-&Modus"
#. IDR_POPUP_IMG_CTXT, ID_IMG_DRAGGINGMODE_MOVE
-#: Merge.rc:217 Merge.rc:955 Merge.rc:1233
+#: Merge.rc:217 Merge.rc:963 Merge.rc:1243
#, c-format
msgid "&Move"
msgstr "&Verschieben"
#. IDR_POPUP_IMG_CTXT, ID_IMG_DRAGGINGMODE_ADJUST_OFFSET
-#: Merge.rc:218 Merge.rc:1234
+#: Merge.rc:218 Merge.rc:1244
#, c-format
msgid "&Adjust Offset"
msgstr "Ver&satz einstellen"
#. IDR_POPUP_IMG_CTXT, ID_IMG_DRAGGINGMODE_VERTICAL_WIPE
-#: Merge.rc:219 Merge.rc:1235
+#: Merge.rc:219 Merge.rc:1245
msgid "&Vertical Wipe"
msgstr "Ver&tikal wischen"
#. IDR_POPUP_IMG_CTXT, ID_IMG_DRAGGINGMODE_HORIZONTAL_WIPE
-#: Merge.rc:220 Merge.rc:1236
+#: Merge.rc:220 Merge.rc:1246
msgid "&Horizontal Wipe"
msgstr "&Horizontal wischen"
#. IDR_POPUP_IMG_CTXT, ID_IMG_DRAGGINGMODE_RECTANGLE_SELECT
-#: Merge.rc:221 Merge.rc:1237
+#: Merge.rc:221 Merge.rc:1247
msgid "Rectangle &Select"
msgstr "&Rechteck auswählen"
@@ -412,37 +412,37 @@ msgid "Compare Extracted &Text from Images"
msgstr "Extrahierten &Text aus den Bildern vergleichen"
#. IDD_OPEN, IDOK
-#: Merge.rc:272 Merge.rc:1980
+#: Merge.rc:272 Merge.rc:1990
msgid "Co&mpare"
msgstr "Vergleichen"
#. IDR_POPUP_WEBPAGE_COMPARE, ID_WEB_COMPARE_SCREENSHOTS
-#: Merge.rc:274 Merge.rc:1247
+#: Merge.rc:274 Merge.rc:1257
msgid "&Screenshots"
msgstr "&Screenshots"
#. IDR_POPUP_WEBPAGE_COMPARE, ID_WEB_COMPARE_FULLSIZE_SCREENSHOTS
-#: Merge.rc:275 Merge.rc:1248
+#: Merge.rc:275 Merge.rc:1258
msgid "&Full Size Screenshots"
msgstr "Screenshots in &voller Größe"
#. IDR_POPUP_WEBPAGE_COMPARE, ID_WEB_COMPARE_HTMLS
-#: Merge.rc:276 Merge.rc:1249
+#: Merge.rc:276 Merge.rc:1259
msgid "&HTMLs"
msgstr "&HTMLs"
#. IDR_POPUP_WEBPAGE_COMPARE, ID_WEB_COMPARE_TEXTS
-#: Merge.rc:277 Merge.rc:1250
+#: Merge.rc:277 Merge.rc:1260
msgid "&Texts"
msgstr "&Texte"
#. IDR_POPUP_WEBPAGE_COMPARE, ID_WEB_COMPARE_RESOURCETREES
-#: Merge.rc:278 Merge.rc:1251
+#: Merge.rc:278 Merge.rc:1261
msgid "&Resource Trees"
msgstr "&Ressourcenbäume"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_SIZE
-#: Merge.rc:280 Merge.rc:1775
+#: Merge.rc:280 Merge.rc:1785
msgid "&Size"
msgstr "&Größe"
@@ -457,27 +457,27 @@ msgid "&Event Sync"
msgstr "&Ereignis-Synchronisation"
#. IDR_POPUP_WEBPAGE_SYNC_EVENTS, ID_WEB_SYNC_ENABLED
-#: Merge.rc:291 Merge.rc:1259
+#: Merge.rc:291 Merge.rc:1269
msgid "&Enabled"
msgstr "&Aktiviert"
#. IDR_POPUP_WEBPAGE_SYNC_EVENTS, ID_WEB_SYNC_SCROLL
-#: Merge.rc:293 Merge.rc:1261
+#: Merge.rc:293 Merge.rc:1271
msgid "&Scroll"
msgstr "&Bildlauf"
#. IDR_POPUP_WEBPAGE_SYNC_EVENTS, ID_WEB_SYNC_CLICK
-#: Merge.rc:294 Merge.rc:1262
+#: Merge.rc:294 Merge.rc:1272
msgid "&Click"
msgstr "&Klick"
#. IDR_POPUP_WEBPAGE_SYNC_EVENTS, ID_WEB_SYNC_INPUT
-#: Merge.rc:295 Merge.rc:1263
+#: Merge.rc:295 Merge.rc:1273
msgid "&Input"
msgstr "&Eingabe"
#. IDR_POPUP_WEBPAGE_SYNC_EVENTS, ID_WEB_SYNC_GOBACKFORWARD
-#: Merge.rc:296 Merge.rc:1264
+#: Merge.rc:296 Merge.rc:1274
msgid "&Go Back/Forward"
msgstr "&Zurück/Vor"
@@ -507,3126 +507,3137 @@ msgid "&All Profiles"
msgstr "&Alle Profile"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:310 Merge.rc:411 Merge.rc:586
+#: Merge.rc:310 Merge.rc:413 Merge.rc:590
#, c-format
msgid "&File"
msgstr "&Datei"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:312 Merge.rc:413 Merge.rc:588
+#: Merge.rc:312 Merge.rc:415 Merge.rc:592
#, c-format
msgid "&New"
msgstr "&Neu"
#. IDR_POPUP_COMPARE, ID_MERGE_COMPARE_TEXT
-#: Merge.rc:314 Merge.rc:322 Merge.rc:415 Merge.rc:423 Merge.rc:590
-#: Merge.rc:598 Merge.rc:649 Merge.rc:935 Merge.rc:1159 Merge.rc:1171
+#: Merge.rc:314 Merge.rc:323 Merge.rc:417 Merge.rc:426 Merge.rc:594
+#: Merge.rc:603 Merge.rc:655 Merge.rc:942 Merge.rc:1167 Merge.rc:1180
#, c-format
msgid "&Text"
msgstr "&Text"
#. IDR_POPUP_COMPARE, ID_MERGE_COMPARE_TABLE
-#: Merge.rc:315 Merge.rc:323 Merge.rc:416 Merge.rc:424 Merge.rc:591
-#: Merge.rc:599 Merge.rc:650 Merge.rc:936 Merge.rc:1160 Merge.rc:1172
+#: Merge.rc:315 Merge.rc:324 Merge.rc:418 Merge.rc:427 Merge.rc:595
+#: Merge.rc:604 Merge.rc:656 Merge.rc:943 Merge.rc:1168 Merge.rc:1181
msgid "T&able"
msgstr "T&abelle"
#. IDR_POPUP_COMPARE, ID_MERGE_COMPARE_HEX
-#: Merge.rc:316 Merge.rc:324 Merge.rc:417 Merge.rc:425 Merge.rc:592
-#: Merge.rc:600 Merge.rc:651 Merge.rc:937 Merge.rc:1161 Merge.rc:1173
+#: Merge.rc:316 Merge.rc:325 Merge.rc:419 Merge.rc:428 Merge.rc:596
+#: Merge.rc:605 Merge.rc:657 Merge.rc:944 Merge.rc:1169 Merge.rc:1182
#, c-format
msgid "&Binary"
msgstr "&Binär"
#. IDS_IMAGE_MENU
-#: Merge.rc:317 Merge.rc:325 Merge.rc:418 Merge.rc:426 Merge.rc:593
-#: Merge.rc:601 Merge.rc:652 Merge.rc:938 Merge.rc:1162 Merge.rc:1174
-#: Merge.rc:5123
+#: Merge.rc:317 Merge.rc:326 Merge.rc:420 Merge.rc:429 Merge.rc:597
+#: Merge.rc:606 Merge.rc:658 Merge.rc:945 Merge.rc:1170 Merge.rc:1183
+#: Merge.rc:5133
#, c-format
msgid "&Image"
msgstr "Bil&d"
#. IDR_POPUP_COMPARE, ID_MERGE_COMPARE_WEBPAGE
-#: Merge.rc:318 Merge.rc:326 Merge.rc:419 Merge.rc:427 Merge.rc:594
-#: Merge.rc:602 Merge.rc:653 Merge.rc:939 Merge.rc:1163 Merge.rc:1175
+#: Merge.rc:318 Merge.rc:327 Merge.rc:421 Merge.rc:430 Merge.rc:598
+#: Merge.rc:607 Merge.rc:659 Merge.rc:946 Merge.rc:1171 Merge.rc:1184
msgid "&Webpage"
msgstr "&Webseite"
+#. IDR_POPUP_NEW, ID_FILE_NEW_FOLDER
+#: Merge.rc:319 Merge.rc:328 Merge.rc:422 Merge.rc:431 Merge.rc:599
+#: Merge.rc:608 Merge.rc:1172
+msgid "&Folder"
+msgstr ""
+
#. IDR_MERGEDOCTYPE
-#: Merge.rc:320 Merge.rc:421 Merge.rc:596
+#: Merge.rc:321 Merge.rc:424 Merge.rc:601
#, c-format
msgid "New (&3 panes)"
msgstr "Neu (&3 Ausschnitte)"
#. IDR_MERGEDOCTYPE, ID_FILE_OPEN
-#: Merge.rc:328 Merge.rc:429 Merge.rc:604
+#: Merge.rc:330 Merge.rc:433 Merge.rc:610
#, c-format
msgid "&Open...\tCtrl+O"
msgstr "Ö&ffnen...\tStrg+O"
#. IDR_MERGEDOCTYPE, ID_FILE_OPENCONFLICT
-#: Merge.rc:329 Merge.rc:430 Merge.rc:605
+#: Merge.rc:331 Merge.rc:434 Merge.rc:611
msgid "Open Conflic&t File..."
msgstr "&Konfliktdatei öffnen..."
#. IDR_MERGEDOCTYPE, ID_FILE_OPENCLIPBOARD
-#: Merge.rc:330 Merge.rc:431 Merge.rc:606
+#: Merge.rc:332 Merge.rc:435 Merge.rc:612
msgid "Open C&lipboard"
msgstr "Z&wischenablage öffnen"
#. IDR_POPUP_PROJECT, ID_FILE_OPENPROJECT
-#: Merge.rc:332 Merge.rc:433 Merge.rc:608 Merge.rc:1191
+#: Merge.rc:334 Merge.rc:437 Merge.rc:614 Merge.rc:1201
#, c-format
msgid "Open Pro&ject...\tCtrl+J"
msgstr "Pro&jekt öffnen...\tStrg+J"
#. IDD_OPEN, ID_SAVE_PROJECT
-#: Merge.rc:333 Merge.rc:434 Merge.rc:609 Merge.rc:1193 Merge.rc:1979
+#: Merge.rc:335 Merge.rc:438 Merge.rc:615 Merge.rc:1203 Merge.rc:1989
#, c-format
msgid "Sa&ve Project..."
msgstr "P&rojekt speichern..."
#. IDR_MAINFRAME, ID_FILE_PROJECT_MRU_FIRST
-#: Merge.rc:335
+#: Merge.rc:337
#, c-format
msgid "Recent Projects"
msgstr "Kürzliche Projekte"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:336 Merge.rc:445 Merge.rc:657
+#: Merge.rc:338 Merge.rc:449 Merge.rc:664
#, c-format
msgid "Recent F&iles or Folders"
msgstr "Kürzlich&e Dateien oder Ordner"
#. IDR_MERGEDOCTYPE, ID_APP_EXIT
-#: Merge.rc:341 Merge.rc:450 Merge.rc:662
+#: Merge.rc:343 Merge.rc:454 Merge.rc:669
msgid "E&xit\tCtrl+Q"
msgstr "&Beenden\tStrg+Q"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:343 Merge.rc:452 Merge.rc:664
+#: Merge.rc:345 Merge.rc:456 Merge.rc:671
#, c-format
msgid "&Edit"
msgstr "&Bearbeiten"
#. IDR_MERGEDOCTYPE, ID_EDIT_PASTE
-#: Merge.rc:345 Merge.rc:671
+#: Merge.rc:347 Merge.rc:678
#, c-format
msgid "&Paste\tCtrl+V"
msgstr "&Einfügen\tStrg+V"
#. IDR_MERGEDOCTYPE, ID_OPTIONS
-#: Merge.rc:347 Merge.rc:456 Merge.rc:693
+#: Merge.rc:349 Merge.rc:460 Merge.rc:700
#, c-format
msgid "&Options...\tCtrl+,"
msgstr "Einstellunge&n...\tStrg+,"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:349 Merge.rc:458 Merge.rc:695
+#: Merge.rc:351 Merge.rc:462 Merge.rc:702
#, c-format
msgid "&View"
msgstr "&Ansicht"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:351 Merge.rc:500 Merge.rc:744
+#: Merge.rc:353 Merge.rc:504 Merge.rc:751
#, c-format
msgid "Ta&b Bar"
msgstr "Ta&b-Leiste"
#. IDR_MERGEDOCTYPE, ID_VIEW_TAB_BAR
-#: Merge.rc:353 Merge.rc:502 Merge.rc:746
+#: Merge.rc:355 Merge.rc:506 Merge.rc:753
msgid "&View Tab Bar"
msgstr "&Tab-Leiste anzeigen"
#. IDR_MERGEDOCTYPE, ID_VIEW_TAB_BAR_ON_TITLE_BAR
-#: Merge.rc:354 Merge.rc:503 Merge.rc:747
+#: Merge.rc:356 Merge.rc:507 Merge.rc:754
msgid "&On Title Bar"
msgstr "&In der Titel-Leiste"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:356 Merge.rc:505 Merge.rc:749
+#: Merge.rc:358 Merge.rc:509 Merge.rc:756
#, c-format
msgid "&Toolbar"
msgstr "&Symbolleiste"
#. IDR_MERGEDOCTYPE, ID_TOOLBAR_SMALL
-#: Merge.rc:359 Merge.rc:508 Merge.rc:752
+#: Merge.rc:361 Merge.rc:512 Merge.rc:759
#, c-format
msgid "&Small"
msgstr "&Klein"
#. IDR_MERGEDOCTYPE, ID_TOOLBAR_MEDIUM
-#: Merge.rc:360 Merge.rc:509 Merge.rc:753
+#: Merge.rc:362 Merge.rc:513 Merge.rc:760
msgid "&Medium"
msgstr "&Medium"
#. IDR_MERGEDOCTYPE, ID_TOOLBAR_BIG
-#: Merge.rc:361 Merge.rc:510 Merge.rc:754
+#: Merge.rc:363 Merge.rc:514 Merge.rc:761
#, c-format
msgid "&Big"
msgstr "&Groß"
#. IDR_MERGEDOCTYPE, ID_TOOLBAR_HUGE
-#: Merge.rc:362 Merge.rc:511 Merge.rc:755
+#: Merge.rc:364 Merge.rc:515 Merge.rc:762
#, c-format
msgid "&Huge"
msgstr "&Riesig"
#. IDS_VIEW_MENU_BAR
-#: Merge.rc:364 Merge.rc:513 Merge.rc:757 Merge.rc:5357
+#: Merge.rc:366 Merge.rc:517 Merge.rc:764 Merge.rc:5368
msgid "Men&u Bar"
msgstr "Men&üleiste"
#. IDR_DIRDOCTYPE, ID_VIEW_OUTPUT_BAR
-#: Merge.rc:365 Merge.rc:515
+#: Merge.rc:367 Merge.rc:519
msgid "&Output Pane"
msgstr "Aus&gabeleiste"
#. IDR_MERGEDOCTYPE, ID_VIEW_STATUS_BAR
-#: Merge.rc:366 Merge.rc:516 Merge.rc:758
+#: Merge.rc:368 Merge.rc:520 Merge.rc:765
#, c-format
msgid "&Status Bar"
msgstr "S&tatusleiste"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:368 Merge.rc:539 Merge.rc:847
+#: Merge.rc:370 Merge.rc:543 Merge.rc:854
#, c-format
msgid "&Tools"
msgstr "&Tools"
#. IDR_MERGEDOCTYPE, ID_TOOLS_FILTERS
-#: Merge.rc:370 Merge.rc:542 Merge.rc:849
+#: Merge.rc:372 Merge.rc:546 Merge.rc:856
#, c-format
msgid "&Filters..."
msgstr "&Filter..."
#. IDR_MERGEDOCTYPE, ID_TOOLS_GENERATEPATCH
-#: Merge.rc:371 Merge.rc:543 Merge.rc:850
+#: Merge.rc:373 Merge.rc:547 Merge.rc:857
#, c-format
msgid "&Generate Patch..."
msgstr "&Patch generieren..."
#. IDR_MERGEDOCTYPE
-#: Merge.rc:373 Merge.rc:546 Merge.rc:853
+#: Merge.rc:375 Merge.rc:550 Merge.rc:860
#, c-format
msgid "&Plugins"
msgstr "&Plugins"
#. IDD_PLUGINS_LIST, IDC_PLUGIN_SETTINGS
-#: Merge.rc:375 Merge.rc:548 Merge.rc:855 Merge.rc:2494 Merge.rc:2926
+#: Merge.rc:377 Merge.rc:552 Merge.rc:862 Merge.rc:2504 Merge.rc:2936
#, c-format
msgid "P&lugin Settings..."
msgstr "Plu&gin-Einstellungen..."
#. IDR_MERGEDOCTYPE, ID_PREDIFFER_MANUAL
-#: Merge.rc:377 Merge.rc:550 Merge.rc:857
+#: Merge.rc:379 Merge.rc:554 Merge.rc:864
#, c-format
msgid "Ma&nual Prediffer"
msgstr "Man&ueller Prediffer"
#. IDR_MERGEDOCTYPE, ID_PREDIFFER_AUTO
-#: Merge.rc:378 Merge.rc:551 Merge.rc:858
+#: Merge.rc:380 Merge.rc:555 Merge.rc:865
#, c-format
msgid "A&utomatic Prediffer"
msgstr "Au&tomatischer Prediffer"
#. IDR_MERGEDOCTYPE, ID_UNPACK_MANUAL
-#: Merge.rc:380 Merge.rc:553 Merge.rc:860
+#: Merge.rc:382 Merge.rc:557 Merge.rc:867
#, c-format
msgid "&Manual Unpacking"
msgstr "&Manuell entpacken"
#. IDR_MERGEDOCTYPE, ID_UNPACK_AUTO
-#: Merge.rc:381 Merge.rc:554 Merge.rc:861
+#: Merge.rc:383 Merge.rc:558 Merge.rc:868
#, c-format
msgid "&Automatic Unpacking"
msgstr "&Automatisch entpacken"
#. IDR_MERGEDOCTYPE, ID_RELOAD_PLUGINS
-#: Merge.rc:383 Merge.rc:558 Merge.rc:889
+#: Merge.rc:385 Merge.rc:562 Merge.rc:896
#, c-format
msgid "&Reload Plugins"
msgstr "Plugins &neu laden"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:385 Merge.rc:560 Merge.rc:891
+#: Merge.rc:387 Merge.rc:564 Merge.rc:898
#, c-format
msgid "&Window"
msgstr "&Fenster"
#. IDR_MERGEDOCTYPE, ID_FILE_CLOSE
-#: Merge.rc:387 Merge.rc:562 Merge.rc:893
+#: Merge.rc:389 Merge.rc:566 Merge.rc:900
msgid "Cl&ose\tCtrl+W"
msgstr "&Schließen\tStrg+W"
#. IDR_MERGEDOCTYPE, ID_WINDOW_CLOSEALL
-#: Merge.rc:388 Merge.rc:563 Merge.rc:894
+#: Merge.rc:390 Merge.rc:567 Merge.rc:901
#, c-format
msgid "Clo&se All"
msgstr "Alle s&chließen"
#. IDR_MERGEDOCTYPE, ID_NEXT_PANE
-#: Merge.rc:390 Merge.rc:565 Merge.rc:896
+#: Merge.rc:392 Merge.rc:569 Merge.rc:903
#, c-format
msgid "Change &Pane\tF6"
msgstr "&Ausschnitt wechseln\tF6"
#. IDR_MERGEDOCTYPE, ID_WINDOW_TILE_HORZ
-#: Merge.rc:392 Merge.rc:567 Merge.rc:900
+#: Merge.rc:394 Merge.rc:571 Merge.rc:907
#, c-format
msgid "Tile &Horizontally"
msgstr "&Untereinander"
#. IDR_MERGEDOCTYPE, ID_WINDOW_TILE_VERT
-#: Merge.rc:393 Merge.rc:568 Merge.rc:901
+#: Merge.rc:395 Merge.rc:572 Merge.rc:908
#, c-format
msgid "Tile &Vertically"
msgstr "&Nebeneinander"
#. IDR_MERGEDOCTYPE, ID_WINDOW_CASCADE
-#: Merge.rc:394 Merge.rc:569 Merge.rc:902
+#: Merge.rc:396 Merge.rc:573 Merge.rc:909
#, c-format
msgid "&Cascade"
msgstr "Über&lappend"
#. IDS_MESSAGEBOX_HELP
-#: Merge.rc:396 Merge.rc:571 Merge.rc:904 Merge.rc:3200 Merge.rc:4189
+#: Merge.rc:398 Merge.rc:575 Merge.rc:911 Merge.rc:3210 Merge.rc:4199
#, c-format
msgid "&Help"
msgstr "&Hilfe"
#. IDR_MERGEDOCTYPE, ID_HELP_CONTENTS
-#: Merge.rc:398 Merge.rc:573 Merge.rc:906
+#: Merge.rc:400 Merge.rc:577 Merge.rc:913
#, c-format
msgid "&WinMerge Help\tF1"
msgstr "&WinMerge-Hilfe\tF1"
#. IDR_MERGEDOCTYPE, ID_HELP_RELEASENOTES
-#: Merge.rc:400 Merge.rc:575 Merge.rc:908
+#: Merge.rc:402 Merge.rc:579 Merge.rc:915
#, c-format
msgid "R&elease Notes"
msgstr "&Versionshinweise"
#. IDR_MERGEDOCTYPE, ID_HELP_TRANSLATIONS
-#: Merge.rc:401 Merge.rc:576 Merge.rc:909
+#: Merge.rc:403 Merge.rc:580 Merge.rc:916
#, c-format
msgid "&Translations"
msgstr "&Übersetzungen"
#. IDR_MERGEDOCTYPE, ID_HELP_GETCONFIG
-#: Merge.rc:402 Merge.rc:577 Merge.rc:910
+#: Merge.rc:404 Merge.rc:581 Merge.rc:917
#, c-format
msgid "C&onfiguration"
msgstr "&Konfiguration"
#. IDR_MERGEDOCTYPE, ID_HELP_GNULICENSE
-#: Merge.rc:404 Merge.rc:579 Merge.rc:912
+#: Merge.rc:406 Merge.rc:583 Merge.rc:919
#, c-format
msgid "&GNU General Public License"
msgstr "&GNU General Public License"
#. IDR_MERGEDOCTYPE, ID_APP_ABOUT
-#: Merge.rc:405 Merge.rc:580 Merge.rc:913
+#: Merge.rc:407 Merge.rc:584 Merge.rc:920
#, c-format
msgid "&About WinMerge..."
msgstr "Ü&ber WinMerge..."
#. IDR_MERGEDOCTYPE
-#: Merge.rc:436 Merge.rc:629
+#: Merge.rc:440 Merge.rc:635
#, c-format
msgid "&Read-Only"
msgstr "Schreibgesch&ützt"
#. IDR_MERGEDOCTYPE, ID_FILE_LEFT_READONLY
-#: Merge.rc:438 Merge.rc:631
+#: Merge.rc:442 Merge.rc:637
#, c-format
msgid "L&eft Read-Only"
msgstr "&Links schreibgeschützt"
#. IDR_MERGEDOCTYPE, ID_FILE_MIDDLE_READONLY
-#: Merge.rc:439 Merge.rc:632
+#: Merge.rc:443 Merge.rc:638
#, c-format
msgid "M&iddle Read-Only"
msgstr "&Mitte schreibgeschützt"
#. IDR_MERGEDOCTYPE, ID_FILE_RIGHT_READONLY
-#: Merge.rc:440 Merge.rc:633
+#: Merge.rc:444 Merge.rc:639
#, c-format
msgid "Ri&ght Read-Only"
msgstr "&Rechts schreibgeschützt"
#. IDD_ENCODINGERROR, IDC_FILEENCODING
-#: Merge.rc:443 Merge.rc:646 Merge.rc:1038 Merge.rc:3063
+#: Merge.rc:447 Merge.rc:652 Merge.rc:1046 Merge.rc:3073
#, c-format
msgid "&File Encoding..."
msgstr "Dateic&odierung..."
#. IDR_POPUP_OUTPUTVIEW, ID_EDIT_SELECT_ALL
-#: Merge.rc:454 Merge.rc:674 Merge.rc:1343
+#: Merge.rc:458 Merge.rc:681 Merge.rc:1353
#, c-format
msgid "Select &All\tCtrl+A"
msgstr "&Alles markieren\tStrg+A"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWIDENTICAL
-#: Merge.rc:460
+#: Merge.rc:464
#, c-format
msgid "Show &Identical Items"
msgstr "&Identische Objekte anzeigen"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWDIFFERENT
-#: Merge.rc:461
+#: Merge.rc:465
#, c-format
msgid "Show &Different Items"
msgstr "&Unterschiedliche Objekte anzeigen"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWUNIQUELEFT
-#: Merge.rc:462
+#: Merge.rc:466
#, c-format
msgid "Show L&eft Unique Items"
msgstr "Eindeutige Objekte &links anzeigen"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWUNIQUEMIDDLE
-#: Merge.rc:463
+#: Merge.rc:467
#, c-format
msgid "Show Midd&le Unique Items"
msgstr "Eindeutige Objekte &Mitte anzeigen"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWUNIQUERIGHT
-#: Merge.rc:464
+#: Merge.rc:468
#, c-format
msgid "Show Ri&ght Unique Items"
msgstr "Eindeutige Objekte &rechts anzeigen"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWSKIPPED
-#: Merge.rc:465
+#: Merge.rc:469
#, c-format
msgid "Show S&kipped Items"
msgstr "Übersprun&gene Objekte anzeigen"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWBINARIES
-#: Merge.rc:466
+#: Merge.rc:470
#, c-format
msgid "S&how Binary Files"
msgstr "Binär&dateien anzeigen"
#. IDR_DIRDOCTYPE
-#: Merge.rc:467
+#: Merge.rc:471
#, c-format
msgid "&3-way Compare"
msgstr "&3-Wege-Vergleich"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWDIFFERENTLEFTONLY
-#: Merge.rc:469
+#: Merge.rc:473
#, c-format
msgid "Show &Left Only Different Items"
msgstr "Unterschiedliche Objekte &links anzeigen"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWDIFFERENTMIDDLEONLY
-#: Merge.rc:470
+#: Merge.rc:474
#, c-format
msgid "Show &Middle Only Different Items"
msgstr "Unterschiedliche Objekte &Mitte anzeigen"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWDIFFERENTRIGHTONLY
-#: Merge.rc:471
+#: Merge.rc:475
#, c-format
msgid "Show &Right Only Different Items"
msgstr "Unterschiedliche Objekte &rechts anzeigen"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWMISSINGLEFTONLY
-#: Merge.rc:473
+#: Merge.rc:477
msgid "Show L&eft Only Missing Items"
msgstr "&Fehlende Objekte links anzeigen"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWMISSINGMIDDLEONLY
-#: Merge.rc:474
+#: Merge.rc:478
msgid "Show Mi&ddle Only Missing Items"
msgstr "F&ehlende Objekte Mitte anzeigen"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWMISSINGRIGHTONLY
-#: Merge.rc:475
+#: Merge.rc:479
msgid "Show Rig&ht Only Missing Items"
msgstr "Fe&hlende Objekte rechts anzeigen"
#. IDR_DIRDOCTYPE, ID_VIEW_SHOWHIDDENITEMS
-#: Merge.rc:478
+#: Merge.rc:482
#, c-format
msgid "Show Hidd&en Items"
msgstr "Verstec&kte Objekte anzeigen"
#. IDR_DIRDOCTYPE, ID_VIEW_TREEMODE
-#: Merge.rc:480
+#: Merge.rc:484
#, c-format
msgid "Tree &Mode"
msgstr "Baumm&odus"
#. IDR_DIRDOCTYPE
-#: Merge.rc:481
+#: Merge.rc:485
msgid "E&xpand Subfolders"
msgstr "Unterordner aufkla&ppen"
#. IDR_DIRDOCTYPE, ID_VIEW_EXPAND_ALLSUBDIRS
-#: Merge.rc:483
+#: Merge.rc:487
msgid "&All Subfolders"
msgstr "&Alle Unterordner"
#. IDR_DIRDOCTYPE, ID_VIEW_EXPAND_DIFFERENT_SUBDIRS
-#: Merge.rc:484
+#: Merge.rc:488
msgid "&Different Subfolders"
msgstr "&Unterschiedliche Unterordner"
#. IDR_DIRDOCTYPE, ID_VIEW_EXPAND_IDENTICAL_SUBDIRS
-#: Merge.rc:485
+#: Merge.rc:489
msgid "&Identical Subfolders"
msgstr "&Identische Unterordner"
#. IDR_DIRDOCTYPE, ID_VIEW_COLLAPSE_ALLSUBDIRS
-#: Merge.rc:487
+#: Merge.rc:491
#, c-format
msgid "&Collapse All Subfolders"
msgstr "Alle Unterordner &einklappen"
#. IDR_DIRDOCTYPE, ID_VIEW_SHOW_EMPTY_FOLDERS
-#: Merge.rc:488
+#: Merge.rc:492
msgid "Show &Empty Folders"
msgstr "L&eere Ordner anzeigen"
#. IDR_MERGEDOCTYPE, ID_VIEW_SELECTFONT
-#: Merge.rc:490 Merge.rc:697
+#: Merge.rc:494 Merge.rc:704
#, c-format
msgid "Select &Font..."
msgstr "Schrift ausw&ählen..."
#. IDR_MERGEDOCTYPE, ID_VIEW_USEDEFAULTFONT
-#: Merge.rc:491 Merge.rc:698
+#: Merge.rc:495 Merge.rc:705
#, c-format
msgid "Use Default Font"
msgstr "Standardschri&ft verwenden"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:493 Merge.rc:736
+#: Merge.rc:497 Merge.rc:743
#, c-format
msgid "Sw&ap Panes"
msgstr "&Ausschnitte vertauschen"
#. IDR_MERGEDOCTYPE, ID_SWAPPANES_SWAP12
-#: Merge.rc:495 Merge.rc:738
+#: Merge.rc:499 Merge.rc:745
msgid "Swap &1st | 2nd"
msgstr "&1. | 2. vertauschen"
#. IDR_MERGEDOCTYPE, ID_SWAPPANES_SWAP23
-#: Merge.rc:496 Merge.rc:739
+#: Merge.rc:500 Merge.rc:746
msgid "Swap &2nd | 3rd"
msgstr "&2. | 3. vertauschen"
#. IDR_MERGEDOCTYPE, ID_SWAPPANES_SWAP13
-#: Merge.rc:497 Merge.rc:740
+#: Merge.rc:501 Merge.rc:747
msgid "Swap 1st | &3rd"
msgstr "1. | &3. vertauschen"
#. IDR_DIRDOCTYPE, ID_VIEW_DISPLAY_FILTER_BAR_MENU
-#: Merge.rc:514
+#: Merge.rc:518
msgid "Displa&y Filter Bar\tCtrl+Shift+L"
msgstr "Filterleiste a&nzeigen\tStrg+Umschalt+L"
#. IDR_DIRDOCTYPE, ID_VIEW_DIR_STATISTICS
-#: Merge.rc:518
+#: Merge.rc:522
#, c-format
msgid "Com&pare Statistics..."
msgstr "&Vergleichsstatistik..."
#. IDR_MERGEDOCTYPE, ID_REFRESH
-#: Merge.rc:520 Merge.rc:763
+#: Merge.rc:524 Merge.rc:770
#, c-format
msgid "Refresh\tF5"
msgstr "Aktualisieren\tF5"
#. IDR_POPUP_DIRVIEW, ID_RESCAN
-#: Merge.rc:521 Merge.rc:1030
+#: Merge.rc:525 Merge.rc:1038
#, c-format
msgid "&Refresh Selected\tCtrl+F5"
msgstr "Ausge&wählte aktualisieren\tStrg+F5"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:523 Merge.rc:765
+#: Merge.rc:527 Merge.rc:772
#, c-format
msgid "&Merge"
msgstr "&Merge"
#. IDR_DIRDOCTYPE, ID_MERGE_COMPARE
-#: Merge.rc:525
+#: Merge.rc:529
#, c-format
msgid "Co&mpare\tEnter"
msgstr "Ver&gleichen\tEnter"
#. IDR_MERGEDOCTYPE, ID_NEXTDIFF
-#: Merge.rc:527 Merge.rc:767
+#: Merge.rc:531 Merge.rc:774
#, c-format
msgid "&Next Difference\tAlt+Down"
msgstr "&Nächster Unterschied\tAlt+Runter"
#. IDR_MERGEDOCTYPE, ID_PREVDIFF
-#: Merge.rc:528 Merge.rc:768
+#: Merge.rc:532 Merge.rc:775
#, c-format
msgid "&Previous Difference\tAlt+Up"
msgstr "&Vorheriger Unterschied\tAlt+Hoch"
#. IDR_MERGEDOCTYPE, ID_FIRSTDIFF
-#: Merge.rc:530 Merge.rc:773
+#: Merge.rc:534 Merge.rc:780
#, c-format
msgid "&First Difference\tAlt+Home"
msgstr "&Erster Unterschied\tAlt+Pos 1"
#. IDR_MERGEDOCTYPE, ID_CURDIFF
-#: Merge.rc:531 Merge.rc:774
+#: Merge.rc:535 Merge.rc:781
#, c-format
msgid "&Current Difference\tAlt+Enter"
msgstr "&Aktueller Unterschied\tAlt+Enter"
#. IDR_MERGEDOCTYPE, ID_LASTDIFF
-#: Merge.rc:532 Merge.rc:775
+#: Merge.rc:536 Merge.rc:782
#, c-format
msgid "&Last Difference\tAlt+End"
msgstr "&Letzter Unterschied\tAlt+Ende"
#. IDR_MERGEDOCTYPE, ID_L2R
-#: Merge.rc:534 Merge.rc:830
+#: Merge.rc:538 Merge.rc:837
#, c-format
msgid "Copy to &Right\tAlt+Right"
msgstr "Nach &rechts kopieren\tAlt+Rechts"
#. IDR_MERGEDOCTYPE, ID_R2L
-#: Merge.rc:535 Merge.rc:831
+#: Merge.rc:539 Merge.rc:838
#, c-format
msgid "Copy to L&eft\tAlt+Left"
msgstr "Nach l&inks kopieren\tAlt+Links"
#. IDR_DIRDOCTYPE, ID_MERGE_DELETE
-#: Merge.rc:537
+#: Merge.rc:541
#, c-format
msgid "&Delete\tDel"
msgstr "Lös&chen\tEntf"
#. IDR_POPUP_DIRVIEW, ID_TOOLS_CUSTOMIZECOLUMNS
-#: Merge.rc:541 Merge.rc:1042
+#: Merge.rc:545 Merge.rc:1050
#, c-format
msgid "&Customize Columns..."
msgstr "&Spalten anpassen..."
#. IDR_MERGEDOCTYPE, ID_TOOLS_GENERATEREPORT
-#: Merge.rc:544 Merge.rc:851
+#: Merge.rc:548 Merge.rc:858
#, c-format
msgid "Generate &Report..."
msgstr "&Bericht generieren..."
#. IDD_ENCODINGERROR, IDC_PLUGIN
-#: Merge.rc:556 Merge.rc:867 Merge.rc:3064
+#: Merge.rc:560 Merge.rc:874 Merge.rc:3074
#, c-format
msgid "&Edit with Unpacker..."
msgstr "Mit &Entpacker bearbeiten..."
#. IDR_MERGEDOCTYPE, ID_FILE_SAVE
-#: Merge.rc:611
+#: Merge.rc:617
#, c-format
msgid "&Save\tCtrl+S"
msgstr "&Speichern\tStrg+S"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:612
+#: Merge.rc:618
#, c-format
msgid "Sav&e"
msgstr "S&peichern"
#. IDR_POPUP_SAVE, ID_FILE_SAVE_LEFT
-#: Merge.rc:614 Merge.rc:1201
+#: Merge.rc:620 Merge.rc:1211
#, c-format
msgid "Save &Left"
msgstr "&Links speichern"
#. IDR_POPUP_SAVE, ID_FILE_SAVE_MIDDLE
-#: Merge.rc:615 Merge.rc:1202
+#: Merge.rc:621 Merge.rc:1212
#, c-format
msgid "Save &Middle"
msgstr "&Mitte speichern"
#. IDR_POPUP_SAVE, ID_FILE_SAVE_RIGHT
-#: Merge.rc:616 Merge.rc:1203
+#: Merge.rc:622 Merge.rc:1213
#, c-format
msgid "Save &Right"
msgstr "&Rechts speichern"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:618
+#: Merge.rc:624
#, c-format
msgid "Save &As"
msgstr "Speichern &unter"
#. IDR_POPUP_SAVE, ID_FILE_SAVEAS_LEFT
-#: Merge.rc:620 Merge.rc:1205
+#: Merge.rc:626 Merge.rc:1215
#, c-format
msgid "Save &Left As..."
msgstr "&Links speichern unter..."
#. IDR_POPUP_SAVE, ID_FILE_SAVEAS_MIDDLE
-#: Merge.rc:621 Merge.rc:1206
+#: Merge.rc:627 Merge.rc:1216
#, c-format
msgid "Save &Middle As..."
msgstr "&Mitte speichern unter..."
#. IDR_POPUP_SAVE, ID_FILE_SAVEAS_RIGHT
-#: Merge.rc:622 Merge.rc:1207
+#: Merge.rc:628 Merge.rc:1217
#, c-format
msgid "Save &Right As..."
msgstr "&Rechts speichern unter..."
#. IDR_MERGEDOCTYPE, ID_FILE_PRINT
-#: Merge.rc:625
+#: Merge.rc:631
msgid "&Print...\tCtrl+P"
msgstr "&Drucken...\tStrg+P"
#. IDR_MERGEDOCTYPE, ID_FILE_PAGE_SETUP
-#: Merge.rc:626
+#: Merge.rc:632
msgid "Page Set&up..."
msgstr "Sei&te einrichten..."
#. IDR_MERGEDOCTYPE, ID_FILE_PRINT_PREVIEW
-#: Merge.rc:627
+#: Merge.rc:633
msgid "Print Previe&w..."
msgstr "Druck&vorschau..."
#. IDR_MERGEDOCTYPE
-#: Merge.rc:636
+#: Merge.rc:642
#, c-format
msgid "&Convert Line Endings to"
msgstr "&Zeilenenden konvertieren nach"
#. IDR_MERGEDOCTYPE, ID_FILE_MERGINGMODE
-#: Merge.rc:643
+#: Merge.rc:649
#, c-format
msgid "Mer&ge Mode\tF9"
msgstr "&Merge-Modus\tF9"
#. IDR_MERGEDOCTYPE, ID_RESCAN
-#: Merge.rc:645
+#: Merge.rc:651
msgid "Reloa&d\tCtrl+F5"
msgstr "Neu&laden\tStrg+F5"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:647
+#: Merge.rc:653
#, c-format
msgid "Reco&mpare As"
msgstr "Erneut ver&gleichen als"
+#. IDR_POPUP_COMPARE, ID_MERGE_COMPARE_FOLDER
+#: Merge.rc:660 Merge.rc:947 Merge.rc:1185
+msgid "A&rchive"
+msgstr ""
+
#. IDR_MERGEDOCTYPE, ID_EDIT_UNDO
-#: Merge.rc:666
+#: Merge.rc:673
#, c-format
msgid "&Undo\tCtrl+Z"
msgstr "&Rückgängig\tStrg+Z"
#. IDR_MERGEDOCTYPE, ID_EDIT_REDO
-#: Merge.rc:667
+#: Merge.rc:674
#, c-format
msgid "&Redo\tCtrl+Y"
msgstr "&Wiederherstellen\tStrg+Y"
#. IDR_MERGEDOCTYPE, ID_EDIT_CUT
-#: Merge.rc:669
+#: Merge.rc:676
#, c-format
msgid "Cu&t\tCtrl+X"
msgstr "Auss&chneiden\tStrg+X"
#. IDR_POPUP_OUTPUTVIEW, ID_EDIT_COPY
-#: Merge.rc:670 Merge.rc:1342
+#: Merge.rc:677 Merge.rc:1352
#, c-format
msgid "&Copy\tCtrl+C"
msgstr "&Kopieren\tStrg+C"
#. IDR_MERGEDOCTYPE, ID_EDIT_FIND
-#: Merge.rc:676
+#: Merge.rc:683
#, c-format
msgid "F&ind...\tCtrl+F"
msgstr "&Suchen...\tStrg+F"
#. IDR_MERGEDOCTYPE, ID_EDIT_REPLACE
-#: Merge.rc:677
+#: Merge.rc:684
#, c-format
msgid "Repla&ce...\tCtrl+H"
msgstr "Erse&tzen...\tStrg+H"
#. IDR_MERGEDOCTYPE, ID_EDIT_MARK
-#: Merge.rc:678
+#: Merge.rc:685
#, c-format
msgid "&Marker...\tCtrl+Shift+M"
msgstr "&Markierungen...\tStrg+Umschalt+M"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:680
+#: Merge.rc:687
#, c-format
msgid "Advanced"
msgstr "Erwe&itert"
#. IDR_MERGEDOCTYPE, ID_EDIT_COPY_LINENUMBERS
-#: Merge.rc:682
+#: Merge.rc:689
#, c-format
msgid "&Copy With Line Numbers\tCtrl+Shift+C"
msgstr "&Kopieren mit Zeilennummern\tStrg+Umschalt+C"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:684
+#: Merge.rc:691
#, c-format
msgid "&Bookmarks"
msgstr "&Lesezeichen"
#. IDR_MERGEDOCTYPE, ID_EDIT_TOGGLE_BOOKMARK
-#: Merge.rc:686
+#: Merge.rc:693
#, c-format
msgid "&Toggle Bookmark\tCtrl+F2"
msgstr "&Lesezeichen ein/aus\tStrg+F2"
#. IDR_MERGEDOCTYPE, ID_EDIT_GOTO_NEXT_BOOKMARK
-#: Merge.rc:687
+#: Merge.rc:694
#, c-format
msgid "&Next Bookmark\tF2"
msgstr "&Nächstes Lesezeichen\tF2"
#. IDR_MERGEDOCTYPE, ID_EDIT_GOTO_PREV_BOOKMARK
-#: Merge.rc:688
+#: Merge.rc:695
#, c-format
msgid "&Previous Bookmark\tShift+F2"
msgstr "&Vorheriges Lesezeichen\tUmschalt+F2"
#. IDR_MERGEDOCTYPE, ID_EDIT_CLEAR_ALL_BOOKMARKS
-#: Merge.rc:689
+#: Merge.rc:696
#, c-format
msgid "&Clear All Bookmarks"
msgstr "&Alle Lesezeichen löschen"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:706
+#: Merge.rc:713
#, c-format
msgid "Syntax Highlight"
msgstr "S&yntaxhervorhebung"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:711
+#: Merge.rc:718
#, c-format
msgid "&Diff Context"
msgstr "&Diff-Kontext"
#. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_ALL
-#: Merge.rc:713
+#: Merge.rc:720
#, c-format
msgid "&All Lines"
msgstr "&Alle Zeilen"
#. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_0
-#: Merge.rc:715
+#: Merge.rc:722
#, c-format
msgid "&0 Lines"
msgstr "&0 Zeilen"
#. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_1
-#: Merge.rc:716
+#: Merge.rc:723
#, c-format
msgid "&1 Line"
msgstr "&1 Zeile"
#. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_3
-#: Merge.rc:717
+#: Merge.rc:724
#, c-format
msgid "&3 Lines"
msgstr "&3 Zeilen"
#. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_5
-#: Merge.rc:718
+#: Merge.rc:725
#, c-format
msgid "&5 Lines"
msgstr "&5 Zeilen"
#. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_7
-#: Merge.rc:719
+#: Merge.rc:726
#, c-format
msgid "&7 Lines"
msgstr "&7 Zeilen"
#. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_9
-#: Merge.rc:720
+#: Merge.rc:727
#, c-format
msgid "&9 Lines"
msgstr "&9 Zeilen"
#. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_TOGGLE
-#: Merge.rc:722
+#: Merge.rc:729
#, c-format
msgid "&Toggle All and 0-9 Lines\tCtrl+D"
msgstr "Zwischen allen und 0-9 Zeilen &wechseln\tStrg+D"
#. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_INVERT
-#: Merge.rc:724
+#: Merge.rc:731
msgid "&Invert (Hide Different Lines)"
msgstr "Umkehren (unterschiedliche Zeilen verstecken)"
#. IDR_MERGEDOCTYPE, ID_VIEW_RESIZE_PANES
-#: Merge.rc:727
+#: Merge.rc:734
#, c-format
msgid "&Lock Panes"
msgstr "Ausschnitte &fixieren"
#. IDR_MERGEDOCTYPE, ID_VIEW_WHITESPACE
-#: Merge.rc:728
+#: Merge.rc:735
#, c-format
msgid "&View Whitespace"
msgstr "&Leerzeichen anzeigen"
#. IDR_MERGEDOCTYPE, ID_VIEW_EOL
-#: Merge.rc:729
+#: Merge.rc:736
msgid "View E&OL"
msgstr "Zeilenende anzei&gen"
#. IDR_MERGEDOCTYPE, ID_VIEW_LINEDIFFS
-#: Merge.rc:730
+#: Merge.rc:737
#, c-format
msgid "Vie&w Line Differences"
msgstr "Zeilenuntersc&hiede anzeigen"
#. IDR_MERGEDOCTYPE, ID_VIEW_LINENUMBERS
-#: Merge.rc:731
+#: Merge.rc:738
#, c-format
msgid "View Line &Numbers"
msgstr "Zeilennu&mmern anzeigen"
#. IDR_MERGEDOCTYPE, ID_VIEW_SELMARGIN
-#: Merge.rc:732
+#: Merge.rc:739
#, c-format
msgid "View &Margins"
msgstr "&Ränder anzeigen"
#. IDR_MERGEDOCTYPE, ID_VIEW_TOPMARGIN
-#: Merge.rc:733
+#: Merge.rc:740
msgid "View To&p Margins"
msgstr "&Obere Ränder anzeigen"
#. IDR_MERGEDOCTYPE, ID_VIEW_WORDWRAP
-#: Merge.rc:734
+#: Merge.rc:741
#, c-format
msgid "W&rap Lines"
msgstr "Zeilen &umbrechen"
#. IDR_MERGEDOCTYPE, ID_VIEW_SPLITVERTICALLY
-#: Merge.rc:742
+#: Merge.rc:749
#, c-format
msgid "Split V&ertically"
msgstr "&Vertikal teilen"
#. IDR_MERGEDOCTYPE, ID_VIEW_DETAIL_BAR
-#: Merge.rc:759
+#: Merge.rc:766
#, c-format
msgid "Diff &Pane"
msgstr "U&nterschiedsleiste"
#. IDR_MERGEDOCTYPE, ID_VIEW_LOCATION_BAR
-#: Merge.rc:760
+#: Merge.rc:767
#, c-format
msgid "Lo&cation Pane"
msgstr "&Positionsleiste"
#. IDS_OUTPUTBAR_CAPTION
-#: Merge.rc:761 Merge.rc:4902
+#: Merge.rc:768 Merge.rc:4912
msgid "Output Pane"
msgstr "Ausgabeleiste"
#. IDR_MERGEDOCTYPE, ID_NEXTCONFLICT
-#: Merge.rc:770
+#: Merge.rc:777
#, c-format
msgid "Ne&xt Conflict\tAlt+Shift+Down"
msgstr "Nächster &Konflikt\tAlt+Umschalt+Runter"
#. IDR_MERGEDOCTYPE, ID_PREVCONFLICT
-#: Merge.rc:771
+#: Merge.rc:778
#, c-format
msgid "Pre&vious Conflict\tAlt+Shift+Up"
msgstr "Vorheri&ger Konflikt\tAlt+Umschalt+Hoch"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:777
+#: Merge.rc:784
#, c-format
msgid "A&dvanced"
msgstr "Er&weitert"
#. IDR_MERGEDOCTYPE, ID_NEXTDIFFLM
-#: Merge.rc:779
+#: Merge.rc:786
#, c-format
msgid "Next Difference (Left/Middle)\tAlt+1"
msgstr "Nächster Unterschied zwischen Links und Mitte\tAlt+1"
#. IDR_MERGEDOCTYPE, ID_PREVDIFFLM
-#: Merge.rc:780
+#: Merge.rc:787
#, c-format
msgid "Previous Difference (Left/Middle)\tAlt+Shift+1"
msgstr "Vorheriger Unterschied zwischen Links und Mitte\tAlt+Umschalt+1"
#. IDR_MERGEDOCTYPE, ID_NEXTDIFFLR
-#: Merge.rc:782
+#: Merge.rc:789
#, c-format
msgid "Next Difference (Left/Right)\tAlt+2"
msgstr "Nächster Unterschied zwischen Links und Rechts\tAlt+2"
#. IDR_MERGEDOCTYPE, ID_PREVDIFFLR
-#: Merge.rc:783
+#: Merge.rc:790
#, c-format
msgid "Previous Difference (Left/Right)\tAlt+Shift+2"
msgstr "Vorheriger Unterschied zwischen Links und Rechts\tAlt+Umschalt+2"
#. IDR_MERGEDOCTYPE, ID_NEXTDIFFMR
-#: Merge.rc:785
+#: Merge.rc:792
#, c-format
msgid "Next Difference (Middle/Right)\tAlt+3"
msgstr "Nächster Unterschied zwischen Mitte und Rechts\tAlt+3"
#. IDR_MERGEDOCTYPE, ID_PREVDIFFMR
-#: Merge.rc:786
+#: Merge.rc:793
#, c-format
msgid "Previous Difference (Middle/Right)\tAlt+Shift+3"
msgstr "Vorheriger Unterschied zwischen Mitte und Rechts\tAlt+Umschalt+3"
#. IDR_MERGEDOCTYPE, ID_NEXTDIFFLO
-#: Merge.rc:788
+#: Merge.rc:795
#, c-format
msgid "Next Left-Only Difference\tAlt+7"
msgstr "Nächster Unterschied nur links\tAlt+7"
#. IDR_MERGEDOCTYPE, ID_PREVDIFFLO
-#: Merge.rc:789
+#: Merge.rc:796
#, c-format
msgid "Previous Left-Only Difference\tAlt+Shift+7"
msgstr "Vorheriger Unterschied nur links\tAlt+Umschalt+7"
#. IDR_MERGEDOCTYPE, ID_NEXTDIFFMO
-#: Merge.rc:791
+#: Merge.rc:798
#, c-format
msgid "Next Middle-Only Difference\tAlt+8"
msgstr "Nächster Unterschied nur Mitte\tAlt+8"
#. IDR_MERGEDOCTYPE, ID_PREVDIFFMO
-#: Merge.rc:792
+#: Merge.rc:799
#, c-format
msgid "Previous Middle-Only Difference\tAlt+Shift+8"
msgstr "Vorheriger Unterschied nur Mitte\tAlt+Umschalt+8"
#. IDR_MERGEDOCTYPE, ID_NEXTDIFFRO
-#: Merge.rc:794
+#: Merge.rc:801
#, c-format
msgid "Next Right-Only Difference\tAlt+9"
msgstr "Nächster Unterschied nur rechts\tAlt+9"
#. IDR_MERGEDOCTYPE, ID_PREVDIFFRO
-#: Merge.rc:795
+#: Merge.rc:802
#, c-format
msgid "Previous Right-Only Difference\tAlt+Shift+9"
msgstr "Vorheriger Unterschied nur rechts\tAlt+Umschalt+9"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:797
+#: Merge.rc:804
msgid "Copy from &Left to"
msgstr "Von &links kopieren nach"
#. IDD_LOAD_SAVE_CODEPAGE, IDC_AFFECTS_MIDDLE_BTN
-#: Merge.rc:799 Merge.rc:810 Merge.rc:815 Merge.rc:826 Merge.rc:970
-#: Merge.rc:2545 Merge.rc:2817
+#: Merge.rc:806 Merge.rc:817 Merge.rc:822 Merge.rc:833 Merge.rc:978
+#: Merge.rc:2555 Merge.rc:2827
#, c-format
msgid "&Middle"
msgstr "&Mitte"
#. IDD_LOAD_SAVE_CODEPAGE, IDC_AFFECTS_RIGHT_BTN
-#: Merge.rc:800 Merge.rc:805 Merge.rc:816 Merge.rc:821 Merge.rc:971
-#: Merge.rc:2546 Merge.rc:2819
+#: Merge.rc:807 Merge.rc:812 Merge.rc:823 Merge.rc:828 Merge.rc:979
+#: Merge.rc:2556 Merge.rc:2829
#, c-format
msgid "&Right"
msgstr "&Rechts"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:802
+#: Merge.rc:809
msgid "Copy from &Middle to"
msgstr "Von der &Mitte kopieren nach"
#. IDD_LOAD_SAVE_CODEPAGE, IDC_AFFECTS_LEFT_BTN
-#: Merge.rc:804 Merge.rc:809 Merge.rc:820 Merge.rc:825 Merge.rc:969
-#: Merge.rc:2544 Merge.rc:2815
+#: Merge.rc:811 Merge.rc:816 Merge.rc:827 Merge.rc:832 Merge.rc:977
+#: Merge.rc:2554 Merge.rc:2825
#, c-format
msgid "&Left"
msgstr "&Links"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:807
+#: Merge.rc:814
msgid "Copy from &Right to"
msgstr "Von &rechts kopieren nach"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:813
+#: Merge.rc:820
msgid "Copy Selected Lines from Le&ft to"
msgstr "Ausgewählte Zeile(n) von l&inks kopieren nach"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:818
+#: Merge.rc:825
msgid "Copy Selected Lines from Mi&ddle to"
msgstr "Ausgewählte Zeile(n) von der Mi&tte kopieren nach"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:823
+#: Merge.rc:830
msgid "Copy Selected Lines from Ri&ght to"
msgstr "Ausgewählte Zeile(n) von r&echts kopieren nach"
#. IDR_MERGEDOCTYPE, ID_COPY_FROM_LEFT
-#: Merge.rc:833
+#: Merge.rc:840
#, c-format
msgid "Copy from Left\tAlt+Shift+Right"
msgstr "Von links kopieren\tAlt+Umschalt+Rechts"
#. IDR_MERGEDOCTYPE, ID_COPY_FROM_RIGHT
-#: Merge.rc:834
+#: Merge.rc:841
#, c-format
msgid "Copy from Right\tAlt+Shift+Left"
msgstr "Von rechts kopieren\tAlt+Umschalt+Links"
#. IDR_MERGEDOCTYPE, ID_L2RNEXT
-#: Merge.rc:836
+#: Merge.rc:843
msgid "C&opy to Right and Advance\tCtrl+Alt+Right"
msgstr "Nach rechts kopieren und &fortschreiten\tStrg+Alt+Rechts"
#. IDR_MERGEDOCTYPE, ID_R2LNEXT
-#: Merge.rc:837
+#: Merge.rc:844
msgid "Copy &to Left and Advance\tCtrl+Alt+Left"
msgstr "Nach links kopieren und f&ortschreiten\tStrg+Alt+Links"
#. IDR_MERGEDOCTYPE, ID_ALL_RIGHT
-#: Merge.rc:839
+#: Merge.rc:846
#, c-format
msgid "Copy &All to Right"
msgstr "Alles nach rec&hts kopieren"
#. IDR_MERGEDOCTYPE, ID_ALL_LEFT
-#: Merge.rc:840
+#: Merge.rc:847
#, c-format
msgid "Cop&y All to Left"
msgstr "Alles nach links ko&pieren"
#. IDR_MERGEDOCTYPE, ID_AUTO_MERGE
-#: Merge.rc:842
+#: Merge.rc:849
msgid "A&uto Merge\tCtrl+Alt+M"
msgstr "A&utomatisch mischen\tStrg+Alt+M"
#. IDR_MERGEDOCTYPE, ID_ADD_SYNCPOINT
-#: Merge.rc:844
+#: Merge.rc:851
#, c-format
msgid "Add &Synchronization Point\tAlt+S"
msgstr "&Synchronisationspunkt hinzufügen\tAlt+S"
#. IDR_MERGEDOCTYPE, ID_CLEAR_SYNCPOINTS
-#: Merge.rc:845
+#: Merge.rc:852
#, c-format
msgid "Clear Sync&hronization Points"
msgstr "S&ynchronisationspunkt entfernen"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:863
+#: Merge.rc:870
msgid "Unpac&ker"
msgstr "Entpac&ker"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:869
+#: Merge.rc:876
#, c-format
msgid "&Prediffer"
msgstr "&Prediffer"
#. IDR_MERGEDOCTYPE, ID_APPLY_PREDIFFER
-#: Merge.rc:873
+#: Merge.rc:880
msgid "Apply Pre&differ..."
msgstr "Pre&differ anwenden..."
#. IDR_MERGEDOCTYPE, ID_TRANSFORM_WITH_SCRIPT
-#: Merge.rc:879
+#: Merge.rc:886
msgid "&Transform with Editor Script..."
msgstr "Mit Editor-Skript trans&formieren..."
#. IDR_MERGEDOCTYPE
-#: Merge.rc:880
+#: Merge.rc:887
msgid "Scripts for &Copying"
msgstr "Skripte für &Kopieren"
#. IDR_MERGEDOCTYPE, ID_SELECT_EDITOR_SCRIPT_FOR_COPYING
-#: Merge.rc:886
+#: Merge.rc:893
msgid "Select &Editor Script..."
msgstr "&Editor-Skript auswählen..."
#. IDR_MERGEDOCTYPE, ID_WINDOW_SPLIT
-#: Merge.rc:898
+#: Merge.rc:905
#, c-format
msgid "Sp&lit"
msgstr "&Teilen"
#. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE
-#: Merge.rc:921
+#: Merge.rc:928
#, c-format
msgid "Comp&are"
msgstr "Ver&gleichen"
#. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE_WITH_MOVED_RENAMED
-#: Merge.rc:922
+#: Merge.rc:929
msgid "Compar&e with Renamed/Moved Items"
msgstr "V&ergleichen mit umbenannten/verschobenen Elementen"
#. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE_IN_NEW_WINDOW
-#: Merge.rc:923
+#: Merge.rc:930
msgid "Compare in New &Window"
msgstr "In neuem Fenster vergleichen"
#. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE_NONHORIZONTALLY
-#: Merge.rc:924 Merge.rc:931
+#: Merge.rc:931 Merge.rc:938
msgid "Compare Non-hor&izontally..."
msgstr "Nicht hor&izontal vergleichen..."
#. IDR_POPUP_DIRVIEW
-#: Merge.rc:925
+#: Merge.rc:932
#, c-format
msgid "Compare Non-hor&izontally"
msgstr "Nicht hor&izontal vergleichen"
#. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE_LEFT1_LEFT2
-#: Merge.rc:927
+#: Merge.rc:934
#, c-format
msgid "First &Left with Second Left"
msgstr "Erstes Objekt &links mit zweitem Objekt links"
#. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE_RIGHT1_RIGHT2
-#: Merge.rc:928
+#: Merge.rc:935
#, c-format
msgid "First &Right with Second Right"
msgstr "Erstes Objekt &rechts mit zweitem Objekt rechts"
#. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE_LEFT1_RIGHT2
-#: Merge.rc:929
+#: Merge.rc:936
#, c-format
msgid "&First Left with Second Right"
msgstr "Erstes Objekt links mit zweitem Objekt rechts"
#. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE_LEFT2_RIGHT1
-#: Merge.rc:930
+#: Merge.rc:937
#, c-format
msgid "&Second Left with First Right"
msgstr "Zweites Objekt links mit erstem Objekt rechts"
#. IDR_POPUP_DIRVIEW
-#: Merge.rc:933
+#: Merge.rc:940
#, c-format
msgid "Co&mpare As"
msgstr "Vergleichen al&s"
#. IDS_COPY_LEFT_TO_MIDDLE2
-#: Merge.rc:945 Merge.rc:957 Merge.rc:4502
+#: Merge.rc:953 Merge.rc:965 Merge.rc:4512
#, c-format
msgid "Left to Middle (%1 of %2)"
msgstr "Links nach Mitte (%1 von %2)"
#. IDS_COPY_LEFT_TO_RIGHT2
-#: Merge.rc:946 Merge.rc:958 Merge.rc:4501
+#: Merge.rc:954 Merge.rc:966 Merge.rc:4511
#, c-format
msgid "Left to Right (%1 of %2)"
msgstr "Links nach rechts (%1 von %2)"
#. IDS_MOVE_LEFT_TO2
-#: Merge.rc:947 Merge.rc:959 Merge.rc:1022 Merge.rc:4513 Merge.rc:4542
+#: Merge.rc:955 Merge.rc:967 Merge.rc:1030 Merge.rc:4523 Merge.rc:4552
#, c-format
msgid "Left to... (%1 of %2)"
msgstr "Links nach... (%1 von %2)"
#. IDS_COPY_MIDDLE_TO_LEFT2
-#: Merge.rc:948 Merge.rc:960 Merge.rc:4499
+#: Merge.rc:956 Merge.rc:968 Merge.rc:4509
#, c-format
msgid "Middle to Left (%1 of %2)"
msgstr "Mitte nach links (%1 von %2)"
#. IDS_COPY_MIDDLE_TO_RIGHT2
-#: Merge.rc:949 Merge.rc:961 Merge.rc:4500
+#: Merge.rc:957 Merge.rc:969 Merge.rc:4510
#, c-format
msgid "Middle to Right (%1 of %2)"
msgstr "Mitte nach rechts (%1 von %2)"
#. IDS_MOVE_MIDDLE_TO2
-#: Merge.rc:950 Merge.rc:962 Merge.rc:1023 Merge.rc:4514 Merge.rc:4543
+#: Merge.rc:958 Merge.rc:970 Merge.rc:1031 Merge.rc:4524 Merge.rc:4553
#, c-format
msgid "Middle to... (%1 of %2)"
msgstr "Mitte nach... (%1 von %2)"
#. IDS_COPY_RIGHT_TO_MIDDLE2
-#: Merge.rc:951 Merge.rc:963 Merge.rc:4498
+#: Merge.rc:959 Merge.rc:971 Merge.rc:4508
#, c-format
msgid "Right to Middle (%1 of %2)"
msgstr "Rechts nach Mitte (%1 von %2)"
#. IDS_COPY_RIGHT_TO_LEFT2
-#: Merge.rc:952 Merge.rc:964 Merge.rc:4497
+#: Merge.rc:960 Merge.rc:972 Merge.rc:4507
#, c-format
msgid "Right to Left (%1 of %2)"
msgstr "Rechts nach links (%1 von %2)"
#. IDS_MOVE_RIGHT_TO2
-#: Merge.rc:953 Merge.rc:965 Merge.rc:1024 Merge.rc:4515 Merge.rc:4544
+#: Merge.rc:961 Merge.rc:973 Merge.rc:1032 Merge.rc:4525 Merge.rc:4554
#, c-format
msgid "Right to... (%1 of %2)"
msgstr "Rechts nach... (%1 von %2)"
#. IDD_EDIT_MARKER, IDC_EDIT_MARKER_DELETE
-#: Merge.rc:967 Merge.rc:2036
+#: Merge.rc:975 Merge.rc:2046
#, c-format
msgid "&Delete"
msgstr "L&öschen"
#. IDR_POPUP_DIRVIEW, ID_DIR_DEL_BOTH
-#: Merge.rc:972
+#: Merge.rc:980
#, c-format
msgid "&Both"
msgstr "&Beide"
#. IDR_POPUP_DIRVIEW, ID_DIR_DEL_ALL
-#: Merge.rc:973
+#: Merge.rc:981
#, c-format
msgid "&All"
msgstr "&Alle"
#. IDD_EDIT_REPLACE, IDC_EDIT_SCOPE_SELECTION
-#: Merge.rc:974 Merge.rc:2019
+#: Merge.rc:982 Merge.rc:2029
#, c-format
msgid "&Selection"
msgstr "&Auswahl"
#. IDR_POPUP_DIRVIEW, ID_DIR_ITEM_RENAME
-#: Merge.rc:976
+#: Merge.rc:984
#, c-format
msgid "Re&name"
msgstr "&Umbenennen"
#. IDR_POPUP_DIRVIEW, ID_DIR_HIDE_FILENAMES
-#: Merge.rc:977
+#: Merge.rc:985
#, c-format
msgid "&Hide Items"
msgstr "Objekte v&erstecken"
#. IDR_POPUP_DIRVIEW
-#: Merge.rc:979
+#: Merge.rc:987
#, c-format
msgid "&Open Left"
msgstr "&Links öffnen"
#. IDR_POPUP_DIRVIEW
-#: Merge.rc:986
+#: Merge.rc:994
#, c-format
msgid "Open Midd&le"
msgstr "&Mitte öffnen"
#. IDR_POPUP_DIRVIEW
-#: Merge.rc:993
+#: Merge.rc:1001
#, c-format
msgid "O&pen Right"
msgstr "&Rechts öffnen"
#. IDR_POPUP_DIRVIEW
-#: Merge.rc:1001
+#: Merge.rc:1009
#, c-format
msgid "Cop&y Paths"
msgstr "&Pfade kopieren"
#. IDS_DEL_LEFT_FMT2
-#: Merge.rc:1003 Merge.rc:1012 Merge.rc:4530
+#: Merge.rc:1011 Merge.rc:1020 Merge.rc:4540
#, c-format
msgid "Left (%1 of %2)"
msgstr "Links (%1 von %2)"
#. IDS_DEL_MIDDLE_FMT2
-#: Merge.rc:1004 Merge.rc:1013 Merge.rc:4531
+#: Merge.rc:1012 Merge.rc:1021 Merge.rc:4541
#, c-format
msgid "Middle (%1 of %2)"
msgstr "Mitte (%1 von %2)"
#. IDS_DEL_RIGHT_FMT2
-#: Merge.rc:1005 Merge.rc:1014 Merge.rc:4532
+#: Merge.rc:1013 Merge.rc:1022 Merge.rc:4542
#, c-format
msgid "Right (%1 of %2)"
msgstr "Rechts (%1 von %2)"
#. IDS_DEL_BOTH_FMT2
-#: Merge.rc:1006 Merge.rc:1015 Merge.rc:4533
+#: Merge.rc:1014 Merge.rc:1023 Merge.rc:4543
#, c-format
msgid "Both (%1 of %2)"
msgstr "Beide (%1 von %2)"
#. IDS_DEL_ALL_FMT2
-#: Merge.rc:1007 Merge.rc:1016 Merge.rc:4538
+#: Merge.rc:1015 Merge.rc:1024 Merge.rc:4548
#, c-format
msgid "All (%1 of %2)"
msgstr "Alle (%1 von %2)"
#. IDR_POPUP_DIRVIEW, ID_DIR_COPY_FILENAMES
-#: Merge.rc:1009
+#: Merge.rc:1017
#, c-format
msgid "Copy &Filenames"
msgstr "&Dateinamen kopieren"
#. IDR_POPUP_DIRVIEW
-#: Merge.rc:1010
+#: Merge.rc:1018
#, c-format
msgid "Copy Items to Clip&board"
msgstr "Objekte in die &Zwischenablage kopieren"
#. IDR_POPUP_DIRVIEW, ID_DIR_COPY_ALL_DISP_COLUMNS
-#: Merge.rc:1018
+#: Merge.rc:1026
msgid "Copy All Di&splayed Columns"
msgstr "Alle angezeig&ten Spalten kopieren"
#. IDR_POPUP_DIRVIEW
-#: Merge.rc:1020
+#: Merge.rc:1028
#, c-format
msgid "&Zip"
msgstr "P&acken"
#. IDS_COPY_BOTH_TO2
-#: Merge.rc:1025 Merge.rc:4516
+#: Merge.rc:1033 Merge.rc:4526
#, c-format
msgid "Both to... (%1 of %2)"
msgstr "Beide nach... (%1 von %2)"
#. IDS_COPY_ALL_TO2
-#: Merge.rc:1026 Merge.rc:4517
+#: Merge.rc:1034 Merge.rc:4527
#, c-format
msgid "All to... (%1 of %2)"
msgstr "Alle nach... (%1 von %2)"
#. IDS_COPY_DIFFERENCES_TO2
-#: Merge.rc:1027 Merge.rc:4518
+#: Merge.rc:1035 Merge.rc:4528
#, c-format
msgid "Differences to... (%1 of %2)"
msgstr "Unterschiede nach... (%1 von %2)"
#. IDR_POPUP_DIRVIEW, ID_DIR_SHELL_CONTEXT_MENU_LEFT
-#: Merge.rc:1032
+#: Merge.rc:1040
#, c-format
msgid "Left Shell Menu"
msgstr "Linkes Shell-Menü"
#. IDR_POPUP_DIRVIEW, ID_DIR_SHELL_CONTEXT_MENU_MIDDLE
-#: Merge.rc:1033
+#: Merge.rc:1041
#, c-format
msgid "Middle Shell Menu"
msgstr "Mittleres Shell-Menü"
#. IDR_POPUP_DIRVIEW, ID_DIR_SHELL_CONTEXT_MENU_RIGHT
-#: Merge.rc:1034
+#: Merge.rc:1042
#, c-format
msgid "Right Shell Menu"
msgstr "Rechtes Shell-Menü"
#. IDR_POPUP_DIRVIEW, ID_DIR_SHELL_CONTEXT_MENU_BOTH
-#: Merge.rc:1035
+#: Merge.rc:1043
msgid "Both Shell Menu"
msgstr "Beide Shell-Menüs"
#. IDR_POPUP_DIRVIEW, ID_DIR_SHELL_CONTEXT_MENU_ALL
-#: Merge.rc:1036
+#: Merge.rc:1044
msgid "All Shell Menu"
msgstr "Alle Shell-Menüs"
#. IDR_POPUP_EDITOR_HEADERBAR, ID_EDITOR_COPY
-#: Merge.rc:1050
+#: Merge.rc:1058
#, c-format
msgid "Copy"
msgstr "Kopieren"
#. IDR_POPUP_EDITOR_HEADERBAR, ID_EDITOR_COPY_PATH
-#: Merge.rc:1051
+#: Merge.rc:1059
#, c-format
msgid "&Copy Full Path"
msgstr "Vollständigen Pfad kopieren"
#. IDR_POPUP_EDITOR_HEADERBAR, ID_EDITOR_COPY_FILENAME
-#: Merge.rc:1052
+#: Merge.rc:1060
#, c-format
msgid "Copy &Filename"
msgstr "Dateinamen kopieren"
#. IDR_POPUP_EDITOR_HEADERBAR, ID_EDITOR_EDIT_CAPTION
-#: Merge.rc:1053
+#: Merge.rc:1061
msgid "&Edit Caption\tF2"
msgstr "Titelzeile bearbeiten\tF2"
#. IDR_POPUP_EDITOR_HEADERBAR, ID_EDITOR_EDIT_PATH
-#: Merge.rc:1055
+#: Merge.rc:1063
msgid "Edit &Path\tCtrl+L"
msgstr "&Pfad bearbeiten\tStrg+L"
#. IDR_POPUP_EDITOR_HEADERBAR, ID_EDITOR_SELECT_FILE
-#: Merge.rc:1056
+#: Merge.rc:1064
msgid "&Open..."
msgstr "&Öffnen..."
#. IDR_POPUP_PLUGINS_SETTINGS
-#: Merge.rc:1062
+#: Merge.rc:1070
msgid "Unpacker Settings"
msgstr "Entpackereinstellungen"
#. IDS_USERCHOICE_NONE
-#: Merge.rc:1064 Merge.rc:1070 Merge.rc:1789 Merge.rc:1793 Merge.rc:5030
+#: Merge.rc:1072 Merge.rc:1078 Merge.rc:1799 Merge.rc:1803 Merge.rc:5040
#, c-format
msgid ""
msgstr ""
#. IDS_USERCHOICE_AUTOMATIC
-#: Merge.rc:1065 Merge.rc:1071 Merge.rc:5031
+#: Merge.rc:1073 Merge.rc:1079 Merge.rc:5041
#, c-format
msgid ""
msgstr ""
#. IDD_OPEN, IDC_SELECT_PREDIFFER
-#: Merge.rc:1066 Merge.rc:1072 Merge.rc:1970 Merge.rc:1974
+#: Merge.rc:1074 Merge.rc:1080 Merge.rc:1980 Merge.rc:1984
#, c-format
msgid "&Select..."
msgstr "Auswählen..."
#. IDR_POPUP_PLUGINS_SETTINGS
-#: Merge.rc:1068
+#: Merge.rc:1076
#, c-format
msgid "Prediffer Settings"
msgstr "&Prediffer-Einstellungen"
#. IDR_POPUP_LOCATIONBAR, ID_LOCBAR_GOTODIFF
-#: Merge.rc:1080
+#: Merge.rc:1088
msgid "G&o to Diff"
msgstr "Zum Unterschied g&ehen"
#. IDR_POPUP_LOCATIONBAR, ID_LOCBAR_MOVECURSOR_ONCLICK
-#: Merge.rc:1083
+#: Merge.rc:1091
msgid "Move Cursor on &Click"
msgstr "Cursor bei &Klick bewegen"
#. IDR_POPUP_LOCATIONBAR, ID_DISPLAY_MOVED_NONE
-#: Merge.rc:1085
+#: Merge.rc:1093
#, c-format
msgid "&No Moved Blocks"
msgstr "&Keine verschobenen Blöcke"
#. IDR_POPUP_LOCATIONBAR, ID_DISPLAY_MOVED_ALL
-#: Merge.rc:1086
+#: Merge.rc:1094
#, c-format
msgid "&All Moved Blocks"
msgstr "&Alle verschobenen Blöcke"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS
-#: Merge.rc:1094 Merge.rc:1127
+#: Merge.rc:1102 Merge.rc:1135
#, c-format
msgid "W&hitespaces"
msgstr "&Leerzeichen"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_WHITESPACE_COMPARE
-#: Merge.rc:1096 Merge.rc:1129
+#: Merge.rc:1104 Merge.rc:1137
#, c-format
msgid "Com&pare"
msgstr "&Vergleichen"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_WHITESPACE_IGNORE
-#: Merge.rc:1097 Merge.rc:1130
+#: Merge.rc:1105 Merge.rc:1138
#, c-format
msgid "I&gnore Changes"
msgstr "Änderung &ignorieren"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_WHITESPACE_IGNOREALL
-#: Merge.rc:1098 Merge.rc:1131
+#: Merge.rc:1106 Merge.rc:1139
#, c-format
msgid "Ig&nore All"
msgstr "&Alle ignorieren"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_IGNORE_BLANKLINES
-#: Merge.rc:1100 Merge.rc:1133
+#: Merge.rc:1108 Merge.rc:1141
#, c-format
msgid "Ignore Blan&k Lines"
msgstr "&Leerzeilen ignorieren"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_IGNORE_CASE
-#: Merge.rc:1101 Merge.rc:1134
+#: Merge.rc:1109 Merge.rc:1142
#, c-format
msgid "Ignore &Case"
msgstr "&Groß-/Kleinschreibung ignorieren"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_IGNORE_EOL
-#: Merge.rc:1102 Merge.rc:1135
+#: Merge.rc:1110 Merge.rc:1143
#, c-format
msgid "Igno&re EOL Differences (Windows/Unix/Mac)"
msgstr "&Zeilenumbruchunterschiede (Windows/Unix/Mac) ignorieren"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_IGNORE_CODEPAGE
-#: Merge.rc:1103 Merge.rc:1136
+#: Merge.rc:1111 Merge.rc:1144
#, c-format
msgid "Ignore Codepage &Differences"
msgstr "&Codeseiten-Unterschiede ignorieren"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_IGNORE_NUMBERS
-#: Merge.rc:1104 Merge.rc:1137
+#: Merge.rc:1112 Merge.rc:1145
#, c-format
msgid "Ignore Num&bers"
msgstr "&Nummern ignorieren"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_IGNORE_COMMENTS
-#: Merge.rc:1105 Merge.rc:1138
+#: Merge.rc:1113 Merge.rc:1146
msgid "Ignore C&omment Differences"
msgstr "&Kommentarunterschiede ignorieren"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_IGNORE_MISSING_TRAILING_EOL
-#: Merge.rc:1106 Merge.rc:1139
+#: Merge.rc:1114 Merge.rc:1147
msgid "Ignore &Missing Trailing EOL"
msgstr "&Fehlende abschließende EOL ignorieren"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_IGNORE_LINE_BREAKS
-#: Merge.rc:1107 Merge.rc:1140
+#: Merge.rc:1115 Merge.rc:1148
msgid "Ignore Line &Breaks (Treat as Spaces)"
msgstr "Zeilen&umbrüche ignorieren (als Leerzeichen behandeln)"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_RECURS_CHECK
-#: Merge.rc:1109 Merge.rc:2963
+#: Merge.rc:1117 Merge.rc:2973
#, c-format
msgid "&Include Subfolders"
msgstr "&Unterordner einbeziehen"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS
-#: Merge.rc:1110 Merge.rc:1142
+#: Merge.rc:1118 Merge.rc:1150
#, c-format
msgid "&Compare Method"
msgstr "Vergleichs&methode"
#. IDS_COMPMETHOD_FULL_CONTENTS
-#: Merge.rc:1112 Merge.rc:1144 Merge.rc:1328 Merge.rc:4282
+#: Merge.rc:1120 Merge.rc:1152 Merge.rc:1338 Merge.rc:4292
#, c-format
msgid "Full Contents"
msgstr "Voller Inhalt"
#. IDS_COMPMETHOD_QUICK_CONTENTS
-#: Merge.rc:1113 Merge.rc:1145 Merge.rc:1329 Merge.rc:4283
+#: Merge.rc:1121 Merge.rc:1153 Merge.rc:1339 Merge.rc:4293
#, c-format
msgid "Quick Contents"
msgstr "Schneller Inhalt"
#. IDS_COMPMETHOD_BINARY_CONTENTS
-#: Merge.rc:1114 Merge.rc:1146 Merge.rc:1330 Merge.rc:4284
+#: Merge.rc:1122 Merge.rc:1154 Merge.rc:1340 Merge.rc:4294
#, c-format
msgid "Binary Contents"
msgstr "Binärer Inhalt"
#. IDS_COMPMETHOD_MODDATE
-#: Merge.rc:1115 Merge.rc:1147 Merge.rc:1331 Merge.rc:4285
+#: Merge.rc:1123 Merge.rc:1155 Merge.rc:1341 Merge.rc:4295
#, c-format
msgid "Modified Date"
msgstr "Änderungsdatum"
#. IDS_COMPMETHOD_DATESIZE
-#: Merge.rc:1116 Merge.rc:1148 Merge.rc:1332 Merge.rc:4286
+#: Merge.rc:1124 Merge.rc:1156 Merge.rc:1342 Merge.rc:4296
#, c-format
msgid "Modified Date and Size"
msgstr "Änderungsdatum und Größe"
#. IDS_COMPMETHOD_SIZE
-#: Merge.rc:1117 Merge.rc:1149 Merge.rc:1333 Merge.rc:4287
+#: Merge.rc:1125 Merge.rc:1157 Merge.rc:1343 Merge.rc:4297
#, c-format
msgid "Size"
msgstr "Größe"
#. IDS_COMPMETHOD_EXISTENCE
-#: Merge.rc:1118 Merge.rc:1150 Merge.rc:1334 Merge.rc:4288
+#: Merge.rc:1126 Merge.rc:1158 Merge.rc:1344 Merge.rc:4298
msgid "Existence"
msgstr "Existenz"
#. IDR_POPUP_PROJECT, ID_LOAD_PROJECT
-#: Merge.rc:1192
+#: Merge.rc:1202
#, c-format
msgid "&Load Project..."
msgstr "Projekt &laden..."
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARGALL
-#: Merge.rc:1272 Merge.rc:1301
+#: Merge.rc:1282 Merge.rc:1311
msgid "${*} - All Arguments"
msgstr "${*} - Alle Argumente"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARG1
-#: Merge.rc:1273 Merge.rc:1302
+#: Merge.rc:1283 Merge.rc:1312
msgid "${1} - First Argument"
msgstr "${1} - Erstes Argument"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARG2
-#: Merge.rc:1274 Merge.rc:1303
+#: Merge.rc:1284 Merge.rc:1313
msgid "${2} - Second Argument"
msgstr "${2} - Zweites Argument"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARG3
-#: Merge.rc:1275 Merge.rc:1304
+#: Merge.rc:1285 Merge.rc:1314
msgid "${3} - Third Argument"
msgstr "${3} - Drittes Argument"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARG4
-#: Merge.rc:1276 Merge.rc:1305
+#: Merge.rc:1286 Merge.rc:1315
msgid "${4} - Fourth Argument"
msgstr "${4} - Viertes Argument"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARG5
-#: Merge.rc:1277 Merge.rc:1306
+#: Merge.rc:1287 Merge.rc:1316
msgid "${5} - Fifth Argument"
msgstr "${5} - Fünftes Argument"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARG6
-#: Merge.rc:1278 Merge.rc:1307
+#: Merge.rc:1288 Merge.rc:1317
msgid "${6} - Sixth Argument"
msgstr "${6} - Sechstes Argument"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARG7
-#: Merge.rc:1279 Merge.rc:1308
+#: Merge.rc:1289 Merge.rc:1318
msgid "${7} - Seventh Argument"
msgstr "${7} - Siebentes Argument"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARG8
-#: Merge.rc:1280 Merge.rc:1309
+#: Merge.rc:1290 Merge.rc:1319
msgid "${8} - Eighth Argument"
msgstr "${8} - Achtes Argument"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARG9
-#: Merge.rc:1281 Merge.rc:1310
+#: Merge.rc:1291 Merge.rc:1320
msgid "${9} - Ninth Argument"
msgstr "${9} - Neuntes Argument"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_SRC_FILE
-#: Merge.rc:1289
+#: Merge.rc:1299
msgid "${SRC_FILE} - Source File"
msgstr "${SRC_FILE} - Quelldatei"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_SRC_FOLDER
-#: Merge.rc:1290
+#: Merge.rc:1300
msgid "${SRC_FOLDER} - Source Folder"
msgstr "${SRC_FOLDER} - Quellordner"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_SRC_URL
-#: Merge.rc:1291
+#: Merge.rc:1301
msgid "${SRC_URL} - Source URL"
msgstr "${SRC_URL} - Quell-URL"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_SRC_URL_PROTOCOL
-#: Merge.rc:1292
+#: Merge.rc:1302
msgid "${SRC_URL_PROTOCOL} - Source URL Protocol"
msgstr "${SRC_URL_PROTOCOL} - Quell-URL Protokoll"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_SRC_URL_SUFFIX
-#: Merge.rc:1293
+#: Merge.rc:1303
msgid "${SRC_URL_SUFFIX} - Source URL Suffix"
msgstr "${SRC_URL_SUFFIX} - Quell-URL Suffix"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_DST_FILE
-#: Merge.rc:1294
+#: Merge.rc:1304
msgid "${DST_FILE} - Destination File"
msgstr "${DST_FILE} - Zieldatei"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_DST_FOLDER
-#: Merge.rc:1295
+#: Merge.rc:1305
msgid "${DST_FOLDER} - Destination Folder"
msgstr "${DST_FOLDER} - Zielordner"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_DST_URL
-#: Merge.rc:1296
+#: Merge.rc:1306
msgid "${DST_URL} - Destination URL"
msgstr "${DST_URL} - Ziel-URL"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_DST_URL_PROTOCOL
-#: Merge.rc:1297
+#: Merge.rc:1307
msgid "${DST_URL_PROTOCOL} - Destination URL Protocol"
msgstr "${DST_URL_PROTOCOL} - Ziel-URL-Protokoll"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_DST_URL_SUFFIX
-#: Merge.rc:1298
+#: Merge.rc:1308
msgid "${DST_URL_SUFFIX} - Destination URL Suffix"
msgstr "${DST_URL_SUFFIX} - Ziel-URL-Suffix"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_WINMERGE_HOME
-#: Merge.rc:1299
+#: Merge.rc:1309
msgid "${WINMERGE_HOME} - WinMerge Home Directory"
msgstr "${WINMERGE_HOME} - WinMerge-Stammverzeichnis"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_SCRIPT_FILE
-#: Merge.rc:1300
+#: Merge.rc:1310
msgid "${SCRIPT_FILE} - Script File"
msgstr "${SCRIPT_FILE} - Skript-Datei"
#. IDR_POPUP_PLUGIN_ADD_MENU, ID_PLUGIN_ADD_UNPACKER
-#: Merge.rc:1318
+#: Merge.rc:1328
msgid "Add &Unpacker Plugin..."
msgstr "&Entpacker-Plugin hinzufügen..."
#. IDR_POPUP_PLUGIN_ADD_MENU, ID_PLUGIN_ADD_PREDIFFER
-#: Merge.rc:1319
+#: Merge.rc:1329
msgid "Add &Prediffer Plugin..."
msgstr "&Prediffer-Plugin hinzufügen..."
#. IDR_POPUP_PLUGIN_ADD_MENU, ID_PLUGIN_DUPLICATE
-#: Merge.rc:1320
+#: Merge.rc:1330
msgid "&Duplicate Plugin..."
msgstr "Plugin &duplizieren..."
#. IDR_POPUP_OUTPUTVIEW, ID_EDIT_CLEAR_ALL
-#: Merge.rc:1344
+#: Merge.rc:1354
msgid "Clear &All"
msgstr "&Alles löschen"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_MASK_CLEAR
-#: Merge.rc:1352
+#: Merge.rc:1362
msgid "&Clear All"
msgstr "Alles &löschen"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_MASK_REMOVE_LAST
-#: Merge.rc:1353
+#: Merge.rc:1363
msgid "Remove Last Filter &Group"
msgstr "Letzte Filter&gruppe entfernen"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_MASK_ALL
-#: Merge.rc:1354
+#: Merge.rc:1364
msgid "R&eset to Default (*.*)"
msgstr "Auf Standard zurücks&etzen (*.*)"
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1355
+#: Merge.rc:1365
msgid "Add E&xclude File"
msgstr "A&usschlussdatei hinzufügen"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_SYS
-#: Merge.rc:1357
+#: Merge.rc:1367
msgid "&System Files"
msgstr "&Systemdateien"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_BACKUP
-#: Merge.rc:1358
+#: Merge.rc:1368
msgid "&Editor Backup Files"
msgstr "&Editor-Backup-Dateien"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_BIN
-#: Merge.rc:1359
+#: Merge.rc:1369
msgid "&Compiled Binary Files"
msgstr "&Kompilierte Binärdateien"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_LOG
-#: Merge.rc:1360
+#: Merge.rc:1370
msgid "&Log Files"
msgstr "&Log-Dateien"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_TEMP
-#: Merge.rc:1361
+#: Merge.rc:1371
msgid "&Temporary or Cache Files"
msgstr "&Temporäre oder Cache-Dateien"
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1363
+#: Merge.rc:1373
msgid "Add Excl&ude Folder"
msgstr "Au&sschlussordner hinzufügen"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FOLDER_VCS
-#: Merge.rc:1365
+#: Merge.rc:1375
msgid "&Version Control"
msgstr "&Versionskontrolle"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FOLDER_BUILD
-#: Merge.rc:1366
+#: Merge.rc:1376
msgid "&Build Artifacts"
msgstr "&Artefakte erstellen"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FOLDER_IDE
-#: Merge.rc:1367
+#: Merge.rc:1377
msgid "&IDE"
msgstr "&IDE"
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1370
+#: Merge.rc:1380
msgid "Add &File Condition"
msgstr "&Dateibedingung hinzufügen"
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1372 Merge.rc:1551
+#: Merge.rc:1382 Merge.rc:1561
msgid "File &Size"
msgstr "Datei&größe"
#. IDR_POPUP_FILTERMENU_DIFF_SIZE, ID_FILTERMENU_DIFF_SIZE_LT_1KB
-#: Merge.rc:1374 Merge.rc:1527 Merge.rc:1564 Merge.rc:1629 Merge.rc:1707
+#: Merge.rc:1384 Merge.rc:1537 Merge.rc:1574 Merge.rc:1639 Merge.rc:1717
msgid "Less than 1KB"
msgstr "Weniger als 1KB"
#. IDR_POPUP_FILTERMENU_DIFF_SIZE, ID_FILTERMENU_DIFF_SIZE_GE_1KB
-#: Merge.rc:1375 Merge.rc:1528 Merge.rc:1565 Merge.rc:1630 Merge.rc:1708
+#: Merge.rc:1385 Merge.rc:1538 Merge.rc:1575 Merge.rc:1640 Merge.rc:1718
msgid "1KB or more"
msgstr "1KB oder mehr"
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_LT_10KB
-#: Merge.rc:1376 Merge.rc:1529 Merge.rc:1631
+#: Merge.rc:1386 Merge.rc:1539 Merge.rc:1641
msgid "Less than 10KB"
msgstr "Weniger als 10KB"
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_GE_10KB
-#: Merge.rc:1377 Merge.rc:1530 Merge.rc:1632
+#: Merge.rc:1387 Merge.rc:1540 Merge.rc:1642
msgid "10KB or more"
msgstr "10KB oder mehr"
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_LT_100KB
-#: Merge.rc:1378 Merge.rc:1531 Merge.rc:1633
+#: Merge.rc:1388 Merge.rc:1541 Merge.rc:1643
msgid "Less than 100KB"
msgstr "Weniger als 100KB"
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_GE_100KB
-#: Merge.rc:1379 Merge.rc:1532 Merge.rc:1634
+#: Merge.rc:1389 Merge.rc:1542 Merge.rc:1644
msgid "100KB or more"
msgstr "100KB oder mehr"
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_LT_1MB
-#: Merge.rc:1380 Merge.rc:1533 Merge.rc:1635
+#: Merge.rc:1390 Merge.rc:1543 Merge.rc:1645
msgid "Less than 1MB"
msgstr "Weniger als 1MB"
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_GE_1MB
-#: Merge.rc:1381 Merge.rc:1534 Merge.rc:1636
+#: Merge.rc:1391 Merge.rc:1544 Merge.rc:1646
msgid "1MB or more"
msgstr "1MB oder mehr"
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_LT_10MB
-#: Merge.rc:1382 Merge.rc:1535 Merge.rc:1637
+#: Merge.rc:1392 Merge.rc:1545 Merge.rc:1647
msgid "Less than 10MB"
msgstr "Weniger als 10MB"
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_GE_10MB
-#: Merge.rc:1383 Merge.rc:1536 Merge.rc:1638
+#: Merge.rc:1393 Merge.rc:1546 Merge.rc:1648
msgid "10MB or more"
msgstr "10MB oder mehr"
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_LT_100MB
-#: Merge.rc:1384 Merge.rc:1537 Merge.rc:1639
+#: Merge.rc:1394 Merge.rc:1547 Merge.rc:1649
msgid "Less than 100MB"
msgstr "Weniger als 100MB"
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_GE_100MB
-#: Merge.rc:1385 Merge.rc:1538 Merge.rc:1640
+#: Merge.rc:1395 Merge.rc:1548 Merge.rc:1650
msgid "100MB or more"
msgstr "100MB oder mehr"
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_LT_1GB
-#: Merge.rc:1386 Merge.rc:1539 Merge.rc:1641
+#: Merge.rc:1396 Merge.rc:1549 Merge.rc:1651
msgid "Less than 1GB"
msgstr "Weniger als 1 GB"
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_GE_1GB
-#: Merge.rc:1387 Merge.rc:1642
+#: Merge.rc:1397 Merge.rc:1652
msgid "1GB or more"
msgstr "1GB oder mehr"
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_RANGE
-#: Merge.rc:1388 Merge.rc:1465 Merge.rc:1517 Merge.rc:1523 Merge.rc:1540
-#: Merge.rc:1566 Merge.rc:1587 Merge.rc:1643 Merge.rc:1709 Merge.rc:1734
+#: Merge.rc:1398 Merge.rc:1475 Merge.rc:1527 Merge.rc:1533 Merge.rc:1550
+#: Merge.rc:1576 Merge.rc:1597 Merge.rc:1653 Merge.rc:1719 Merge.rc:1744
msgid "Custom Range..."
msgstr "Benutzerdefinierter Bereich..."
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1390 Merge.rc:1471 Merge.rc:1568
+#: Merge.rc:1400 Merge.rc:1481 Merge.rc:1578
msgid "&Last Modified"
msgstr "&Letzte Änderung"
#. IDR_POPUP_FILTERMENU_DATE
-#: Merge.rc:1392 Merge.rc:1473 Merge.rc:1651
+#: Merge.rc:1402 Merge.rc:1483 Merge.rc:1661
msgid "&Hour"
msgstr "&Stunde"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_HOUR_BEFORE_1
-#: Merge.rc:1394 Merge.rc:1475 Merge.rc:1653
+#: Merge.rc:1404 Merge.rc:1485 Merge.rc:1663
msgid "More than 1 hour ago"
msgstr "Mehr als 1 Stunde vor"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_HOUR_WITHIN_1
-#: Merge.rc:1395 Merge.rc:1476 Merge.rc:1654
+#: Merge.rc:1405 Merge.rc:1486 Merge.rc:1664
msgid "Within 1 hour"
msgstr "Innerhalb von 1 Stunde"
#. IDR_POPUP_FILTERMENU_DATE
-#: Merge.rc:1397 Merge.rc:1478 Merge.rc:1656
+#: Merge.rc:1407 Merge.rc:1488 Merge.rc:1666
msgid "&Day"
msgstr "&Tag"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_DAY_BEFORE_TODAY
-#: Merge.rc:1399 Merge.rc:1480 Merge.rc:1658
+#: Merge.rc:1409 Merge.rc:1490 Merge.rc:1668
msgid "Before today"
msgstr "Vor heute"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_DAY_TODAY
-#: Merge.rc:1400 Merge.rc:1481 Merge.rc:1659
+#: Merge.rc:1410 Merge.rc:1491 Merge.rc:1669
msgid "Today"
msgstr "Heute"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_DAY_BEFORE_YESTERDAY
-#: Merge.rc:1401 Merge.rc:1482 Merge.rc:1660
+#: Merge.rc:1411 Merge.rc:1492 Merge.rc:1670
msgid "Before yesterday"
msgstr "Vorgestern"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_DAY_YESTERDAY
-#: Merge.rc:1402 Merge.rc:1483 Merge.rc:1661
+#: Merge.rc:1412 Merge.rc:1493 Merge.rc:1671
msgid "Yesterday"
msgstr "Gestern"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_DAY_SINCE_YESTERDAY
-#: Merge.rc:1403 Merge.rc:1484 Merge.rc:1662
+#: Merge.rc:1413 Merge.rc:1494 Merge.rc:1672
msgid "Since yesterday"
msgstr "Seit gestern"
#. IDR_POPUP_FILTERMENU_DATE
-#: Merge.rc:1405 Merge.rc:1486 Merge.rc:1664
+#: Merge.rc:1415 Merge.rc:1496 Merge.rc:1674
msgid "&Week"
msgstr "&Woche"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_WEEK_BEFORE_THIS
-#: Merge.rc:1407 Merge.rc:1488 Merge.rc:1666
+#: Merge.rc:1417 Merge.rc:1498 Merge.rc:1676
msgid "Before this week"
msgstr "Vor dieser Woche"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_WEEK_THIS
-#: Merge.rc:1408 Merge.rc:1489 Merge.rc:1667
+#: Merge.rc:1418 Merge.rc:1499 Merge.rc:1677
msgid "This week"
msgstr "Diese Woche"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_WEEK_BEFORE_LAST
-#: Merge.rc:1409 Merge.rc:1490 Merge.rc:1668
+#: Merge.rc:1419 Merge.rc:1500 Merge.rc:1678
msgid "Before last week"
msgstr "Vor letzter Woche"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_WEEK_LAST
-#: Merge.rc:1410 Merge.rc:1491 Merge.rc:1669
+#: Merge.rc:1420 Merge.rc:1501 Merge.rc:1679
msgid "Last week"
msgstr "Letzte Woche"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_WEEK_SINCE_LAST
-#: Merge.rc:1411 Merge.rc:1492 Merge.rc:1670
+#: Merge.rc:1421 Merge.rc:1502 Merge.rc:1680
msgid "Since last week"
msgstr "Seit letzter Woche"
#. IDR_POPUP_FILTERMENU_DATE
-#: Merge.rc:1413 Merge.rc:1494 Merge.rc:1672
+#: Merge.rc:1423 Merge.rc:1504 Merge.rc:1682
msgid "&Month"
msgstr "&Monat"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_MONTH_BEFORE_THIS
-#: Merge.rc:1415 Merge.rc:1496 Merge.rc:1674
+#: Merge.rc:1425 Merge.rc:1506 Merge.rc:1684
msgid "Before this month"
msgstr "Vor diesem Monat"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_MONTH_THIS
-#: Merge.rc:1416 Merge.rc:1497 Merge.rc:1675
+#: Merge.rc:1426 Merge.rc:1507 Merge.rc:1685
msgid "This month"
msgstr "Diesen Monat"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_MONTH_BEFORE_LAST
-#: Merge.rc:1417 Merge.rc:1498 Merge.rc:1676
+#: Merge.rc:1427 Merge.rc:1508 Merge.rc:1686
msgid "Before last month"
msgstr "Vor dem letzten Monat"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_MONTH_LAST
-#: Merge.rc:1418 Merge.rc:1499 Merge.rc:1677
+#: Merge.rc:1428 Merge.rc:1509 Merge.rc:1687
msgid "Last month"
msgstr "Letzten Monat"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_MONTH_SINCE_LAST
-#: Merge.rc:1419 Merge.rc:1500 Merge.rc:1678
+#: Merge.rc:1429 Merge.rc:1510 Merge.rc:1688
msgid "Since last month"
msgstr "Seit letztem Monat"
#. IDR_POPUP_FILTERMENU_DATE
-#: Merge.rc:1421 Merge.rc:1502 Merge.rc:1680
+#: Merge.rc:1431 Merge.rc:1512 Merge.rc:1690
msgid "&Year"
msgstr "&Jahr"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_YEAR_BEFORE_THIS
-#: Merge.rc:1423 Merge.rc:1504 Merge.rc:1682
+#: Merge.rc:1433 Merge.rc:1514 Merge.rc:1692
msgid "Before this year"
msgstr "Vor diesem Jahr"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_YEAR_THIS
-#: Merge.rc:1424 Merge.rc:1505 Merge.rc:1683
+#: Merge.rc:1434 Merge.rc:1515 Merge.rc:1693
msgid "This year"
msgstr "Dieses Jahr"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_YEAR_BEFORE_LAST
-#: Merge.rc:1425 Merge.rc:1506 Merge.rc:1684
+#: Merge.rc:1435 Merge.rc:1516 Merge.rc:1694
msgid "Before last year"
msgstr "Vor dem letzten Jahr"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_YEAR_LAST
-#: Merge.rc:1426 Merge.rc:1507 Merge.rc:1685
+#: Merge.rc:1436 Merge.rc:1517 Merge.rc:1695
msgid "Last year"
msgstr "Letztes Jahr"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_YEAR_SINCE_LAST
-#: Merge.rc:1427 Merge.rc:1508 Merge.rc:1686
+#: Merge.rc:1437 Merge.rc:1518 Merge.rc:1696
msgid "Since last year"
msgstr "Seit letztem Jahr"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_RANGE
-#: Merge.rc:1429 Merge.rc:1510 Merge.rc:1688
+#: Merge.rc:1439 Merge.rc:1520 Merge.rc:1698
msgid "&Custom Range..."
msgstr "&Benutzerdefinierter Bereich..."
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1431 Merge.rc:1589
+#: Merge.rc:1441 Merge.rc:1599
msgid "&Attributes"
msgstr "&Attribute"
#. IDR_POPUP_FILTERMENU_ATTR, ID_FILTERMENU_ATTR_READONLY
-#: Merge.rc:1433 Merge.rc:1607
+#: Merge.rc:1443 Merge.rc:1617
msgid "Read-only files"
msgstr "Schreibgeschützte Dateien"
#. IDR_POPUP_FILTERMENU_ATTR, ID_FILTERMENU_ATTR_NOT_READONLY
-#: Merge.rc:1434 Merge.rc:1608
+#: Merge.rc:1444 Merge.rc:1618
msgid "Not read-only files"
msgstr "Nicht schreibgeschützte Dateien"
#. IDR_POPUP_FILTERMENU_ATTR, ID_FILTERMENU_ATTR_HIDDEN
-#: Merge.rc:1435 Merge.rc:1609
+#: Merge.rc:1445 Merge.rc:1619
msgid "Hidden files"
msgstr "Versteckte Dateien"
#. IDR_POPUP_FILTERMENU_ATTR, ID_FILTERMENU_ATTR_NOT_HIDDEN
-#: Merge.rc:1436 Merge.rc:1610
+#: Merge.rc:1446 Merge.rc:1620
msgid "Not hidden files"
msgstr "Nicht versteckte Dateien"
#. IDR_POPUP_FILTERMENU_ATTR, ID_FILTERMENU_ATTR_SYSTEM
-#: Merge.rc:1437 Merge.rc:1611
+#: Merge.rc:1447 Merge.rc:1621
msgid "System files"
msgstr "Systemdateien"
#. IDR_POPUP_FILTERMENU_ATTR, ID_FILTERMENU_ATTR_NOT_SYSTEM
-#: Merge.rc:1438 Merge.rc:1612
+#: Merge.rc:1448 Merge.rc:1622
msgid "Not system files"
msgstr "Keine Systemdateien"
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1440
+#: Merge.rc:1450
msgid "File &Content"
msgstr "Datei&inhalt"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_CONTAINS
-#: Merge.rc:1442
+#: Merge.rc:1452
msgid "Contains string..."
msgstr "Enthält Zeichenkette..."
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_NOT_CONTAINS
-#: Merge.rc:1443
+#: Merge.rc:1453
msgid "Does not contain string..."
msgstr "Enthält keine Zeichenkette..."
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_FIRST_LINE_CONTAINS
-#: Merge.rc:1444
+#: Merge.rc:1454
msgid "First line contains string..."
msgstr "Erste Zeile enthält Zeichenkette..."
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_FIRST_LINE_NOT_CONTAINS
-#: Merge.rc:1445
+#: Merge.rc:1455
msgid "First line does not contain string..."
msgstr "Die erste Zeile enthält keine Zeichenkette..."
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_FIRST_10_CONTAINS
-#: Merge.rc:1446
+#: Merge.rc:1456
msgid "First 10 lines contain string..."
msgstr "Die ersten 10 Zeilen enthalten eine Zeichenkette..."
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_FIRST_10_NOT_CONTAINS
-#: Merge.rc:1447
+#: Merge.rc:1457
msgid "First 10 lines do not contain string..."
msgstr "Die ersten 10 Zeilen enthalten keine Zeichenkette..."
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_LAST_10_CONTAINS
-#: Merge.rc:1448
+#: Merge.rc:1458
msgid "Last 10 lines contain string..."
msgstr "Die letzten 10 Zeilen enthalten eine Zeichenkette..."
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_LAST_10_NOT_CONTAINS
-#: Merge.rc:1449
+#: Merge.rc:1459
msgid "Last 10 lines do not contain string..."
msgstr "Die letzten 10 Zeilen enthalten keine Zeichenkette..."
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_LAST_LINE_CONTAINS
-#: Merge.rc:1450
+#: Merge.rc:1460
msgid "Last line contains string..."
msgstr "Letzte Zeile enthält Zeichenkette..."
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_LAST_LINE_NOT_CONTAINS
-#: Merge.rc:1451
+#: Merge.rc:1461
msgid "Last line does not contain string..."
msgstr "Die letzte Zeile enthält keine Zeichenkette..."
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1453
+#: Merge.rc:1463
msgid "&Line Count"
msgstr "&Zeilenanzahl"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_LT_10
-#: Merge.rc:1455
+#: Merge.rc:1465
msgid "Less than 10"
msgstr "Weniger als 10"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_GE_10
-#: Merge.rc:1456
+#: Merge.rc:1466
msgid "10 or more"
msgstr "10 oder mehr"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_LT_100
-#: Merge.rc:1457
+#: Merge.rc:1467
msgid "Less than 100"
msgstr "Weniger als 100"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_GE_100
-#: Merge.rc:1458
+#: Merge.rc:1468
msgid "100 or more"
msgstr "100 oder mehr"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_LT_1000
-#: Merge.rc:1459
+#: Merge.rc:1469
msgid "Less than 1000"
msgstr "Weniger als 1000"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_GE_1000
-#: Merge.rc:1460
+#: Merge.rc:1470
msgid "1000 or more"
msgstr "1000 oder mehr"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_LT_10000
-#: Merge.rc:1461
+#: Merge.rc:1471
msgid "Less than 10000"
msgstr "Weniger als 10000"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_GE_10000
-#: Merge.rc:1462
+#: Merge.rc:1472
msgid "10000 or more"
msgstr "10000 oder mehr"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_LT_100000
-#: Merge.rc:1463
+#: Merge.rc:1473
msgid "Less than 100000"
msgstr "Weniger als 100000"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_GE_100000
-#: Merge.rc:1464
+#: Merge.rc:1474
msgid "100000 or more"
msgstr "100000 oder mehr"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_PROPS
-#: Merge.rc:1467 Merge.rc:1594 Merge.rc:1761 Merge.rc:1778
+#: Merge.rc:1477 Merge.rc:1604 Merge.rc:1771 Merge.rc:1788
msgid "Additional &Properties..."
msgstr "Zusätzliche &Eigenschaften..."
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1469
+#: Merge.rc:1479
msgid "Add F&older Condition"
msgstr "&Ordnerbedingung hinzufügen"
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1513
+#: Merge.rc:1523
msgid "&Files"
msgstr "&Dateien"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FOLDER_FILES_EQ_0
-#: Merge.rc:1515
+#: Merge.rc:1525
msgid "0 files"
msgstr "0 Dateien"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FOLDER_FILES_GE_1
-#: Merge.rc:1516
+#: Merge.rc:1526
msgid "1 file or more"
msgstr "1 Datei oder mehr"
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1519
+#: Merge.rc:1529
msgid "&Items"
msgstr "&Elemente"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FOLDER_ITEMS_EQ_0
-#: Merge.rc:1521
+#: Merge.rc:1531
msgid "0 items"
msgstr "0 Elemente"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FOLDER_ITEMS_GE_1
-#: Merge.rc:1522
+#: Merge.rc:1532
msgid "1 item or more"
msgstr "1 Element oder mehr"
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1525
+#: Merge.rc:1535
msgid "&Total Size"
msgstr "&Gesamtgröße"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FOLDER_STATS_RECURSIVE
-#: Merge.rc:1542
+#: Merge.rc:1552
msgid "&Recursive"
msgstr "&Rekursiv"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONDITION_ANY
-#: Merge.rc:1544
+#: Merge.rc:1554
msgid "Target: &Any (Left/Middle/Right)"
msgstr "Ziel: &Beliebig (Links/Mitte/Rechts)"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONDITION_LEFT
-#: Merge.rc:1545
+#: Merge.rc:1555
msgid "Target: &Left"
msgstr "Ziel: &Links"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONDITION_MIDDLE
-#: Merge.rc:1546
+#: Merge.rc:1556
msgid "Target: &Middle"
msgstr "Ziel: &Mitte"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONDITION_RIGHT
-#: Merge.rc:1547
+#: Merge.rc:1557
msgid "Target: &Right"
msgstr "Ziel: &Rechts"
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1549
+#: Merge.rc:1559
msgid "Add &Difference Condition"
msgstr "&Differenzbedingung hinzufügen"
#. IDR_POPUP_FILTERMENU_DIFF_PROP, ID_FILTERMENU_DIFF_PROP_EQUAL
-#: Merge.rc:1553 Merge.rc:1570 Merge.rc:1591 Merge.rc:1696 Merge.rc:1717
-#: Merge.rc:1742
+#: Merge.rc:1563 Merge.rc:1580 Merge.rc:1601 Merge.rc:1706 Merge.rc:1727
+#: Merge.rc:1752
msgid "Equal"
msgstr "Gleich"
#. IDR_POPUP_FILTERMENU_DIFF_PROP, ID_FILTERMENU_DIFF_PROP_NOT_EQUAL
-#: Merge.rc:1554 Merge.rc:1571 Merge.rc:1592 Merge.rc:1697 Merge.rc:1718
-#: Merge.rc:1743
+#: Merge.rc:1564 Merge.rc:1581 Merge.rc:1602 Merge.rc:1707 Merge.rc:1728
+#: Merge.rc:1753
msgid "Not Equal"
msgstr "Nicht gleich"
#. IDR_POPUP_FILTERMENU_DIFF_PROP, ID_FILTERMENU_DIFF_PROP_LESS
-#: Merge.rc:1555 Merge.rc:1572 Merge.rc:1698 Merge.rc:1719 Merge.rc:1744
+#: Merge.rc:1565 Merge.rc:1582 Merge.rc:1708 Merge.rc:1729 Merge.rc:1754
msgid "Less Than"
msgstr "Weniger als"
#. IDR_POPUP_FILTERMENU_DIFF_PROP, ID_FILTERMENU_DIFF_PROP_LESS_EQUAL
-#: Merge.rc:1556 Merge.rc:1573 Merge.rc:1699 Merge.rc:1720 Merge.rc:1745
+#: Merge.rc:1566 Merge.rc:1583 Merge.rc:1709 Merge.rc:1730 Merge.rc:1755
msgid "Less Than or Equal to"
msgstr "Gleich oder kleiner als"
#. IDR_POPUP_FILTERMENU_DIFF_PROP, ID_FILTERMENU_DIFF_PROP_GREATER
-#: Merge.rc:1557 Merge.rc:1574 Merge.rc:1700 Merge.rc:1721 Merge.rc:1746
+#: Merge.rc:1567 Merge.rc:1584 Merge.rc:1710 Merge.rc:1731 Merge.rc:1756
msgid "Greater Than"
msgstr "Größer als"
#. IDR_POPUP_FILTERMENU_DIFF_PROP, ID_FILTERMENU_DIFF_PROP_GREATER_EQUAL
-#: Merge.rc:1558 Merge.rc:1575 Merge.rc:1701 Merge.rc:1722 Merge.rc:1747
+#: Merge.rc:1568 Merge.rc:1585 Merge.rc:1711 Merge.rc:1732 Merge.rc:1757
msgid "Greater Than or Equal to"
msgstr "Größer als oder gleich wie"
#. IDR_POPUP_FILTERMENU_DIFF_SIZE, ID_FILTERMENU_DIFF_SIZE_LT_10B
-#: Merge.rc:1560 Merge.rc:1703
+#: Merge.rc:1570 Merge.rc:1713
msgid "Less than 10B"
msgstr "Weniger als 10B"
#. IDR_POPUP_FILTERMENU_DIFF_SIZE, ID_FILTERMENU_DIFF_SIZE_GE_10B
-#: Merge.rc:1561 Merge.rc:1704
+#: Merge.rc:1571 Merge.rc:1714
msgid "10B or more"
msgstr "10B oder mehr"
#. IDR_POPUP_FILTERMENU_DIFF_SIZE, ID_FILTERMENU_DIFF_SIZE_LT_100B
-#: Merge.rc:1562 Merge.rc:1705
+#: Merge.rc:1572 Merge.rc:1715
msgid "Less than 100B"
msgstr "Weniger als 100B"
#. IDR_POPUP_FILTERMENU_DIFF_SIZE, ID_FILTERMENU_DIFF_SIZE_GE_100B
-#: Merge.rc:1563 Merge.rc:1706
+#: Merge.rc:1573 Merge.rc:1716
msgid "100B or more"
msgstr "100B oder mehr"
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_LT_1SECOND
-#: Merge.rc:1577 Merge.rc:1724
+#: Merge.rc:1587 Merge.rc:1734
msgid "Less than 1 second"
msgstr "Weniger als 1 Sekunde"
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_GE_1SECOND
-#: Merge.rc:1578 Merge.rc:1725
+#: Merge.rc:1588 Merge.rc:1735
msgid "1 second or more"
msgstr "1 Sekunde oder mehr"
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_LT_1MINUTE
-#: Merge.rc:1579 Merge.rc:1726
+#: Merge.rc:1589 Merge.rc:1736
msgid "Less than 1 minute"
msgstr "Weniger als 1 Minute"
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_GE_1MINUTE
-#: Merge.rc:1580 Merge.rc:1727
+#: Merge.rc:1590 Merge.rc:1737
msgid "1 minute or more"
msgstr "1 Minute oder mehr"
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_LT_1HOUR
-#: Merge.rc:1581 Merge.rc:1728
+#: Merge.rc:1591 Merge.rc:1738
msgid "Less than 1 hour"
msgstr "Weniger als 1 Stunde"
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_GE_1HOUR
-#: Merge.rc:1582 Merge.rc:1729
+#: Merge.rc:1592 Merge.rc:1739
msgid "1 hour or more"
msgstr "1 Stunde oder mehr"
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_LT_1DAY
-#: Merge.rc:1583 Merge.rc:1730
+#: Merge.rc:1593 Merge.rc:1740
msgid "Less than 1 day"
msgstr "Weniger als 1 Tag"
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_GE_1DAY
-#: Merge.rc:1584 Merge.rc:1731
+#: Merge.rc:1594 Merge.rc:1741
msgid "1 day or more"
msgstr "1 Tag oder mehr"
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_LT_1WEEK
-#: Merge.rc:1585 Merge.rc:1732
+#: Merge.rc:1595 Merge.rc:1742
msgid "Less than 1 week"
msgstr "Weniger als 1 Woche"
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_GE_1WEEK
-#: Merge.rc:1586 Merge.rc:1733
+#: Merge.rc:1596 Merge.rc:1743
msgid "1 week or more"
msgstr "1 Woche oder länger"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_CONDITION_DIFF_LEFT_RIGHT
-#: Merge.rc:1596
+#: Merge.rc:1606
msgid "Target: &Left and Right"
msgstr "Ziel: &Links und Rechts"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_CONDITION_DIFF_LEFT_MIDDLE
-#: Merge.rc:1597
+#: Merge.rc:1607
msgid "Target: Left and &Middle"
msgstr "Ziel: Links und &Mitte"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_CONDITION_DIFF_MIDDLE_RIGHT
-#: Merge.rc:1598
+#: Merge.rc:1608
msgid "Target: Middle and &Right"
msgstr "Ziel: Mitte und &Rechts"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_CONDITION_DIFF_ALL
-#: Merge.rc:1599
+#: Merge.rc:1609
msgid "Target: &All"
msgstr "Ziel: &Alle"
#. IDR_POPUP_FILTERMENU_BINARY, ID_FILTERMENU_BINARY_ONLY
-#: Merge.rc:1620
+#: Merge.rc:1630
msgid "Binary files only"
msgstr "Nur Binärdateien"
#. IDR_POPUP_FILTERMENU_BINARY, ID_FILTERMENU_TEXT_ONLY
-#: Merge.rc:1621
+#: Merge.rc:1631
msgid "Text files only"
msgstr "Nur Textdateien"
#. IDR_POPUP_ADDCMPMENU, ID_ADDCMPMENU_CLEAR
-#: Merge.rc:1755
+#: Merge.rc:1765
msgid "&Clear conditions"
msgstr "Bedingungen &löschen"
#. IDR_POPUP_ADDCMPMENU, ID_ADDCMPMENU_CMP_SIZE
-#: Merge.rc:1757
+#: Merge.rc:1767
msgid "Compare &Size"
msgstr "&Größe vergleichen"
#. IDR_POPUP_ADDCMPMENU, ID_ADDCMPMENU_CMP_DATE
-#: Merge.rc:1758
+#: Merge.rc:1768
msgid "Compare &Date"
msgstr "&Datum vergleichen"
#. IDR_POPUP_ADDCMPMENU, ID_ADDCMPMENU_CMP_ATTR
-#: Merge.rc:1759
+#: Merge.rc:1769
msgid "Compare &Attributes"
msgstr "&Attribute vergleichen"
#. IDR_POPUP_ADDCMPMENU, ID_ADDCMPMENU_CMP_CONTENTS
-#: Merge.rc:1760
+#: Merge.rc:1770
msgid "Compare C&ontents"
msgstr "&Inhalt vergleichen"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_CLEAR
-#: Merge.rc:1769
+#: Merge.rc:1779
msgid "&Clear Keys"
msgstr "&Schlüssel löschen"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_NAME
-#: Merge.rc:1771
+#: Merge.rc:1781
msgid "&Name"
msgstr "&Name"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_BASENAME
-#: Merge.rc:1772
+#: Merge.rc:1782
msgid "&Base name (without extension)"
msgstr "&Basisname (ohne Erweiterung)"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_NORMALIZED_NAME
-#: Merge.rc:1773
+#: Merge.rc:1783
msgid "Normalized &Unicode Name"
msgstr "Normalisierter &Unicode-Name"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_RELPATH
-#: Merge.rc:1774
+#: Merge.rc:1784
msgid "&Relative Path"
msgstr "&Relativer Pfad"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_DATE
-#: Merge.rc:1776
+#: Merge.rc:1786
msgid "&Date"
msgstr "&Datum"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_HASH_MD5
-#: Merge.rc:1777
+#: Merge.rc:1787
msgid "&Hash (MD5)"
msgstr "&Hash (MD5)"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_REPLACE
-#: Merge.rc:1780
+#: Merge.rc:1790
msgid "Insert &replace() Function"
msgstr "&replace() Funktion hinzufügen"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_REGEXREPLACE
-#: Merge.rc:1781
+#: Merge.rc:1791
msgid "Insert rege&xReplace() Function"
msgstr "rege&xReplace() Funktion hinzufügen"
#. IDR_POPUP_RENAMEMOVE_MENU
-#: Merge.rc:1782
+#: Merge.rc:1792
msgid "Replace &Lists"
msgstr "Ersetzungs&listen"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_CREATE_REPLACELIST
-#: Merge.rc:1784
+#: Merge.rc:1794
msgid "&Create String Replace List and Insert..."
msgstr "Zeichenketten-Ersetzungsliste &erstellen und einfügen..."
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_CREATE_REGEXREPLACELIST
-#: Merge.rc:1785
+#: Merge.rc:1795
msgid "Create &Regex Replace List and Insert..."
msgstr "&Regex-Ersetzungsliste erstellen und einfügen..."
#. IDR_POPUP_RENAMEMOVE_MENU
-#: Merge.rc:1787
+#: Merge.rc:1797
msgid "&String Replace Lists"
msgstr "Zeichenketten-Er&setzungslisten"
#. IDR_POPUP_RENAMEMOVE_MENU
-#: Merge.rc:1791
+#: Merge.rc:1801
msgid "Re&gex Replace Lists"
msgstr "Re&gex-Ersetzungslisten"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_STRING_REPLACE_LISTS_FOLDER
-#: Merge.rc:1796
+#: Merge.rc:1806
msgid "Open String Replace Lists Folder..."
msgstr "Ordner für Zeichenketten-Ersetzungslisten öffnen..."
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_REGEX_REPLACE_LISTS_FOLDER
-#: Merge.rc:1797
+#: Merge.rc:1807
msgid "Open Regex Replace Lists Folder..."
msgstr "Ordner für Regex-Ersetzungslisten öffnen..."
#. IDD_FILTERS_CONDITION, IDC_CONDITION_MATCHCASE
-#: Merge.rc:1799 Merge.rc:1995 Merge.rc:2014 Merge.rc:2042 Merge.rc:2585
+#: Merge.rc:1809 Merge.rc:2005 Merge.rc:2024 Merge.rc:2052 Merge.rc:2595
#, c-format
msgid "Match &case"
msgstr "&Groß-/Kleinschreibung beachten"
#. IDR_POPUP_RENAMEMOVE_MENU
-#: Merge.rc:1801
+#: Merge.rc:1811
msgid "Text &Normalization"
msgstr "Text&normalisierung"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_TOLOWER
-#: Merge.rc:1803
+#: Merge.rc:1813
msgid "&Lowercase"
msgstr "K&leinbuchstaben"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_TOUPPER
-#: Merge.rc:1804
+#: Merge.rc:1814
msgid "&Uppercase"
msgstr "Großb&uchstaben"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_TOHALFWIDTH
-#: Merge.rc:1805
+#: Merge.rc:1815
msgid "&Half-width"
msgstr "&Halbe Breite"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_TOFULLWIDTH
-#: Merge.rc:1806
+#: Merge.rc:1816
msgid "&Full-width"
msgstr "&Volle Breite"
#. IDR_POPUP_RENAMEMOVE_MENU
-#: Merge.rc:1807
+#: Merge.rc:1817
msgid "&Chinese Conversion"
msgstr "&Chinesische Konvertierung"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_TOSIMPLIFIEDCHINESE
-#: Merge.rc:1809
+#: Merge.rc:1819
msgid "&Simplified Chinese"
msgstr "Vereinfachtes Chine&sisch"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_TOTRADITIONALCHINESE
-#: Merge.rc:1810
+#: Merge.rc:1820
msgid "&Traditional Chinese"
msgstr "&Traditionelles Chinesisch"
#. IDR_POPUP_RENAMEMOVE_MENU
-#: Merge.rc:1812
+#: Merge.rc:1822
msgid "&Japanese Conversion"
msgstr "&Japanische Konvertierung"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_TOHIRAGANA
-#: Merge.rc:1814
+#: Merge.rc:1824
msgid "&Hiragana"
msgstr "&Hiragana"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_TOKATAKANA
-#: Merge.rc:1815
+#: Merge.rc:1825
msgid "&Katakana"
msgstr "&Katakana"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_NORMALIZEUNICODE
-#: Merge.rc:1817
+#: Merge.rc:1827
msgid "Normalize &Unicode"
msgstr "&Unicode normalisieren"
#. IDD_ABOUTBOX
-#: Merge.rc:1932
+#: Merge.rc:1942
#, c-format
msgid "About WinMerge"
msgstr "Info über WinMerge"
#. IDD_ABOUTBOX, IDC_WWW
-#: Merge.rc:1936
+#: Merge.rc:1946
msgid "Visit the WinMerge Homepage!"
msgstr "Besuchen Sie die WinMerge-Homepage!"
#. IDD_PLUGINS_EDITPLUGIN, IDOK
-#: Merge.rc:1938 Merge.rc:2080 Merge.rc:2431 Merge.rc:2455 Merge.rc:2469
-#: Merge.rc:2497 Merge.rc:2588 Merge.rc:2613 Merge.rc:2674 Merge.rc:2691
-#: Merge.rc:2703 Merge.rc:2867 Merge.rc:2927 Merge.rc:3062 Merge.rc:3104
-#: Merge.rc:3147 Merge.rc:3197
+#: Merge.rc:1948 Merge.rc:2090 Merge.rc:2441 Merge.rc:2465 Merge.rc:2479
+#: Merge.rc:2507 Merge.rc:2598 Merge.rc:2623 Merge.rc:2684 Merge.rc:2701
+#: Merge.rc:2713 Merge.rc:2877 Merge.rc:2937 Merge.rc:3072 Merge.rc:3114
+#: Merge.rc:3157 Merge.rc:3207
#, c-format
msgid "OK"
msgstr "OK"
#. IDD_ABOUTBOX, IDC_OPEN_CONTRIBUTORS
-#: Merge.rc:1939
+#: Merge.rc:1949
#, c-format
msgid "Contributors"
msgstr "Mitwirkende"
#. IDD_SELECT_FILES_OR_FOLDERS
-#: Merge.rc:1945 Merge.rc:3070
+#: Merge.rc:1955 Merge.rc:3080
#, c-format
msgid "Select Files or Folders"
msgstr "Dateien oder Ordner auswählen"
#. IDD_OPEN, IDC_FILES_DIRS_GROUP0
-#: Merge.rc:1949
+#: Merge.rc:1959
#, c-format
msgid "&1st File or Folder"
msgstr "&1. Datei oder Ordner"
#. IDD_OPEN, IDC_PATH0_READONLY
-#: Merge.rc:1951
+#: Merge.rc:1961
#, c-format
msgid "Re&ad-only"
msgstr "Schreibgesch&ützt"
#. IDD_OPEN, IDC_SWAP01_STATIC
-#: Merge.rc:1953
+#: Merge.rc:1963
#, c-format
msgid "Swap 1st | 2nd"
msgstr "1. | 2. vertauschen"
#. IDD_GENERATE_PATCH, IDC_DIFF_BROWSE_FILE1
-#: Merge.rc:1954 Merge.rc:2310 Merge.rc:2413
+#: Merge.rc:1964 Merge.rc:2320 Merge.rc:2423
#, c-format
msgid "&Browse..."
msgstr "&Suchen..."
#. IDD_OPEN, IDC_FILES_DIRS_GROUP1
-#: Merge.rc:1955
+#: Merge.rc:1965
#, c-format
msgid "&2nd File or Folder"
msgstr "&2. Datei oder Ordner"
#. IDD_OPEN, IDC_PATH1_READONLY
-#: Merge.rc:1957
+#: Merge.rc:1967
#, c-format
msgid "Rea&d-only"
msgstr "Schreibgeschü&tzt"
#. IDD_OPEN, IDC_SWAP12_STATIC
-#: Merge.rc:1959
+#: Merge.rc:1969
#, c-format
msgid "Swap 2nd | 3rd"
msgstr "2. | 3. vertauschen"
#. IDD_PROPPAGE_SYSTEM, IDC_FILTER_USER_BROWSE
-#: Merge.rc:1960 Merge.rc:2315
+#: Merge.rc:1970 Merge.rc:2325
#, c-format
msgid "B&rowse..."
msgstr "S&uchen..."
#. IDD_OPEN, IDC_FILES_DIRS_GROUP2
-#: Merge.rc:1961
+#: Merge.rc:1971
#, c-format
msgid "&3rd File or Folder (Optional)"
msgstr "&3. Datei oder Ordner (optional)"
#. IDD_OPEN, IDC_PATH2_READONLY
-#: Merge.rc:1963
+#: Merge.rc:1973
#, c-format
msgid "Read-o&nly"
msgstr "Schreibgeschüt&zt"
#. IDD_OPEN, IDC_SWAP02_STATIC
-#: Merge.rc:1965
+#: Merge.rc:1975
#, c-format
msgid "Swap 1st | 3rd"
msgstr "1. | 3. vertauschen"
#. IDD_PROPPAGE_BACKUPS, IDC_BACKUP_BROWSE
-#: Merge.rc:1966 Merge.rc:2685 Merge.rc:2883
+#: Merge.rc:1976 Merge.rc:2695 Merge.rc:2893
#, c-format
msgid "Browse..."
msgstr "&Suchen..."
#. IDD_OPEN, IDC_FILES_DIRS_GROUP3
-#: Merge.rc:1968
+#: Merge.rc:1978
#, c-format
msgid " Folder: Filter"
msgstr " Ordner: Filter"
#. IDD_OPEN, IDC_RECURS_CHECK
-#: Merge.rc:1971
+#: Merge.rc:1981
msgid "&Include subfolders"
msgstr "&Unterordner einbeziehen"
#. IDD_OPEN, IDC_FILES_DIRS_GROUP5
-#: Merge.rc:1972
+#: Merge.rc:1982
msgid " File: Prediffer Plugin"
msgstr " Datei: Prediffer-Plugin"
#. IDD_OPEN, IDC_FILES_DIRS_GROUP4
-#: Merge.rc:1976
+#: Merge.rc:1986
#, c-format
msgid " File: Unpacker Plugin"
msgstr " Datei: Entpacker-Plugin"
#. IDD_OPEN, IDC_SELECT_UNPACKER
-#: Merge.rc:1978
+#: Merge.rc:1988
#, c-format
msgid "Se&lect..."
msgstr "Auswählen..."
#. IDD_PLUGINS_EDITPLUGIN, IDCANCEL
-#: Merge.rc:1981 Merge.rc:2001 Merge.rc:2025 Merge.rc:2046 Merge.rc:2081
-#: Merge.rc:2432 Merge.rc:2456 Merge.rc:2470 Merge.rc:2498 Merge.rc:2551
-#: Merge.rc:2589 Merge.rc:2614 Merge.rc:2675 Merge.rc:2692 Merge.rc:2704
-#: Merge.rc:2868 Merge.rc:2928 Merge.rc:3087 Merge.rc:3105 Merge.rc:3148
-#: Merge.rc:3198
+#: Merge.rc:1991 Merge.rc:2011 Merge.rc:2035 Merge.rc:2056 Merge.rc:2091
+#: Merge.rc:2442 Merge.rc:2466 Merge.rc:2480 Merge.rc:2508 Merge.rc:2561
+#: Merge.rc:2599 Merge.rc:2624 Merge.rc:2685 Merge.rc:2702 Merge.rc:2714
+#: Merge.rc:2878 Merge.rc:2938 Merge.rc:3097 Merge.rc:3115 Merge.rc:3158
+#: Merge.rc:3208
#, c-format
msgid "Cancel"
msgstr "Abbrechen"
#. IDD_OPEN, IDC_OPEN_STATUS
-#: Merge.rc:1982
+#: Merge.rc:1992
#, c-format
msgid "Status:"
msgstr "Status:"
#. IDD_PLUGINS_LIST, ID_HELP
-#: Merge.rc:1983 Merge.rc:2082 Merge.rc:2929
+#: Merge.rc:1993 Merge.rc:2092 Merge.rc:2939
#, c-format
msgid "Help"
msgstr "Hilfe"
#. IDD_OPEN, IDC_OPTIONS
-#: Merge.rc:1984
+#: Merge.rc:1994
msgid "&Options..."
msgstr "Einstellunge&n..."
#. IDD_EDIT_FIND
-#: Merge.rc:1989
+#: Merge.rc:1999
#, c-format
msgid "Find"
msgstr "Suchen"
#. IDD_EDIT_MARKER, IDC_STATIC
-#: Merge.rc:1992 Merge.rc:2009 Merge.rc:2037
+#: Merge.rc:2002 Merge.rc:2019 Merge.rc:2047
#, c-format
msgid "Fi&nd what:"
msgstr "&Suchen nach:"
#. IDD_EDIT_MARKER, IDC_EDIT_WHOLE_WORD
-#: Merge.rc:1994 Merge.rc:2013 Merge.rc:2041
+#: Merge.rc:2004 Merge.rc:2023 Merge.rc:2051
#, c-format
msgid "Match &whole word only"
msgstr "&Nur ganze Wörter"
#. IDD_EDIT_MARKER, IDC_EDIT_REGEXP
-#: Merge.rc:1996 Merge.rc:2015 Merge.rc:2043
+#: Merge.rc:2006 Merge.rc:2025 Merge.rc:2053
#, c-format
msgid "Regular &expression"
msgstr "&Reguläre Ausdrücke"
#. IDD_EDIT_FIND, IDC_FINDDLG_DONTWRAP
-#: Merge.rc:1997
+#: Merge.rc:2007
#, c-format
msgid "D&on't wrap end of file"
msgstr "Am Dateiende nicht von vorn &beginnen"
#. IDD_EDIT_FIND, IDC_FINDDLG_DONTCLOSE
-#: Merge.rc:1998
+#: Merge.rc:2008
#, c-format
msgid "&Don't close this dialog"
msgstr "Dieses &Dialogfenster nicht schließen"
#. IDD_EDIT_REPLACE, IDC_EDIT_SKIP
-#: Merge.rc:1999 Merge.rc:2021
+#: Merge.rc:2009 Merge.rc:2031
#, c-format
msgid "&Find Next"
msgstr "&Weitersuchen"
#. IDD_EDIT_FIND, IDC_EDIT_FINDPREV
-#: Merge.rc:2000
+#: Merge.rc:2010
#, c-format
msgid "Find &Prev"
msgstr "R&ückwärtssuchen"
#. IDD_EDIT_REPLACE
-#: Merge.rc:2006
+#: Merge.rc:2016
#, c-format
msgid "Replace"
msgstr "Ersetzen"
#. IDD_EDIT_REPLACE, IDC_STATIC
-#: Merge.rc:2011
+#: Merge.rc:2021
#, c-format
msgid "Re&place with:"
msgstr "&Ersetzen durch:"
#. IDD_EDIT_REPLACE, IDC_EDIT_SCOPE_DONT_WRAP
-#: Merge.rc:2016
+#: Merge.rc:2026
#, c-format
msgid "&Don't wrap at end of file"
msgstr "Am Dateiende nicht von vorn &beginnen"
#. IDD_EDIT_REPLACE, IDC_STATIC
-#: Merge.rc:2018
+#: Merge.rc:2028
#, c-format
msgid "Replace in"
msgstr "Ersetzen in"
#. IDD_EDIT_REPLACE, IDC_EDIT_SCOPE_WHOLE_FILE
-#: Merge.rc:2020
+#: Merge.rc:2030
#, c-format
msgid "Wh&ole file"
msgstr "Ganzer &Datei"
#. IDD_EDIT_REPLACE, IDC_EDIT_FINDPREV
-#: Merge.rc:2022
+#: Merge.rc:2032
msgid "Find Pre&v"
msgstr "R&ückwärtssuchen"
#. IDD_EDIT_REPLACE, IDC_EDIT_REPLACE
-#: Merge.rc:2023
+#: Merge.rc:2033
#, c-format
msgid "&Replace"
msgstr "E&rsetzen"
#. IDD_EDIT_REPLACE, IDC_EDIT_REPLACE_ALL
-#: Merge.rc:2024
+#: Merge.rc:2034
#, c-format
msgid "Replace &All"
msgstr "A&lle ersetzen"
#. IDS_OPTIONSPG_MARKERCOLORS
-#: Merge.rc:2030 Merge.rc:4209
+#: Merge.rc:2040 Merge.rc:4219
#, c-format
msgid "Markers"
msgstr "Markierungen"
#. IDD_EDIT_MARKER, IDC_EDIT_MARKERS_ENABLED
-#: Merge.rc:2033
+#: Merge.rc:2043
#, c-format
msgid "Enable &markers"
msgstr "&Markierungen aktivieren"
#. IDD_FILTERS_LINEFILTERS, IDC_LFILTER_ADDBTN
-#: Merge.rc:2035 Merge.rc:2057
+#: Merge.rc:2045 Merge.rc:2067
#, c-format
msgid "New"
msgstr "Neu"
#. IDD_EDIT_MARKER, IDC_STATIC
-#: Merge.rc:2039
+#: Merge.rc:2049
#, c-format
msgid "&Background color:"
msgstr "&Hintergrundfarbe:"
#. IDS_MESSAGEBOX_OK
-#: Merge.rc:2044 Merge.rc:2829 Merge.rc:3086 Merge.rc:4171
+#: Merge.rc:2054 Merge.rc:2839 Merge.rc:3096 Merge.rc:4181
#, c-format
msgid "&Ok"
msgstr "&OK"
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:2045 Merge.rc:2525 Merge.rc:3199
+#: Merge.rc:2055 Merge.rc:2535 Merge.rc:3209
#, c-format
msgid "&Apply"
msgstr "An&wenden"
#. IDD_FILTERS_LINEFILTERS
-#: Merge.rc:2051
+#: Merge.rc:2061
msgid "Line Filters"
msgstr "Zeilenfilter"
#. IDD_FILTERS_LINEFILTERS, IDC_IGNOREREGEXP
-#: Merge.rc:2054
+#: Merge.rc:2064
#, c-format
msgid "Enable Line Filters"
msgstr "Zeilenfilter aktivieren"
#. IDD_FILTERS_LINEFILTERS, IDC_STATIC
-#: Merge.rc:2055
+#: Merge.rc:2065
#, c-format
msgid "Regular Expressions (one per line):"
msgstr "Reguläre Ausdrücke (einer pro Zeile):"
#. IDD_PLUGINS_LIST, IDC_PLUGIN_EDIT
-#: Merge.rc:2058 Merge.rc:2924
+#: Merge.rc:2068 Merge.rc:2934
#, c-format
msgid "Edit"
msgstr "Bearbeiten"
#. IDD_PLUGINS_LIST, IDC_PLUGIN_REMOVE
-#: Merge.rc:2059 Merge.rc:2071 Merge.rc:2925
+#: Merge.rc:2069 Merge.rc:2081 Merge.rc:2935
#, c-format
msgid "Remove"
msgstr "Entfernen"
#. IDD_FILTERS_SUBSTITUTIONFILTERS
-#: Merge.rc:2064
+#: Merge.rc:2074
msgid "Substitution Filters"
msgstr "Ersetzungsfilter"
#. IDD_FILTERS_SUBSTITUTIONFILTERS, IDC_STATIC
-#: Merge.rc:2067
+#: Merge.rc:2077
msgid "Changes to the listed pairs below will be ignored or marked as insignificant. Patches are unaffected."
msgstr ""
"Änderungen, die in den Bereichen als die unten aufgeführten Paare erscheinen, werden ignoriert oder als unbedeutend markiert.\n"
"Patches sind nicht betroffen."
#. IDD_FILTERS_SUBSTITUTIONFILTERS, IDC_IGNORED_SUSBSTITUTIONS_ENABLED
-#: Merge.rc:2068
+#: Merge.rc:2078
msgid "Enable"
msgstr "Aktivieren"
#. IDD_PLUGINS_LIST, IDC_PLUGIN_ADD
-#: Merge.rc:2070 Merge.rc:2923
+#: Merge.rc:2080 Merge.rc:2933
msgid "Add"
msgstr "Hinzufügen"
#. IDD_FILTERS_SUBSTITUTIONFILTERS, IDC_LFILTER_CLEARBTN
-#: Merge.rc:2072
+#: Merge.rc:2082
msgid "Clear"
msgstr "Leeren"
#. IDD_PREFERENCES
-#: Merge.rc:2077
+#: Merge.rc:2087
#, c-format
msgid "Options"
msgstr "Einstellungen"
#. IDD_PREFERENCES, IDC_TREEOPT_IMPORT
-#: Merge.rc:2086
+#: Merge.rc:2096
#, c-format
msgid "Import..."
msgstr "Importieren..."
#. IDD_PREFERENCES, IDC_TREEOPT_EXPORT
-#: Merge.rc:2087
+#: Merge.rc:2097
#, c-format
msgid "Export..."
msgstr "Exportieren..."
#. IDS_OPTIONSPG_GENCOMPARE
-#: Merge.rc:2092 Merge.rc:4199 Merge.rc:4202 Merge.rc:4219
+#: Merge.rc:2102 Merge.rc:4209 Merge.rc:4212 Merge.rc:4229
#, c-format
msgid "General"
msgstr "Allgemein"
#. IDD_PROPPAGE_GENERAL, IDC_SCROLL_CHECK
-#: Merge.rc:2095
+#: Merge.rc:2105
#, c-format
msgid "Automatically &scroll to first difference"
msgstr "&Automatisch zum ersten Unterschied scrollen"
#. IDD_PROPPAGE_GENERAL, IDC_SCROLL_TO_FIRST_INLINE_DIFF_CHECK
-#: Merge.rc:2097
+#: Merge.rc:2107
msgid "Automatically s&croll to first inline difference"
msgstr "Automatisch zum ersten Inline-&Unterschied scrollen"
#. IDD_PROPPAGE_GENERAL, IDC_STATIC
-#: Merge.rc:2099
+#: Merge.rc:2109
msgid "Cl&ose windows with 'Esc':"
msgstr "&Fenster mit 'Esc' schließen:"
#. IDD_PROPPAGE_GENERAL, IDC_VERIFY_OPEN_PATHS
-#: Merge.rc:2101
+#: Merge.rc:2111
#, c-format
msgid "&Automatically verify paths in Open dialog"
msgstr "&Pfade im Öffnen-Dialog automatisch überprüfen"
#. IDD_PROPPAGE_GENERAL, IDC_STATIC
-#: Merge.rc:2103
+#: Merge.rc:2113
msgid "Single instance mode:"
msgstr "&Einzelinstanzmodus:"
#. IDD_PROPPAGE_GENERAL, IDC_ASK_MULTIWINDOW_CLOSE
-#: Merge.rc:2105
+#: Merge.rc:2115
#, c-format
msgid "As&k when closing multiple windows"
msgstr "&Nachfragen, wenn mehrere Fenster geschlossen werden"
#. IDD_PROPPAGE_GENERAL, IDC_PRESERVE_FILETIME
-#: Merge.rc:2107
+#: Merge.rc:2117
#, c-format
msgid "&Preserve file time in file compare"
msgstr "Datei&zeit beim Dateivergleich bewahren"
#. IDD_PROPPAGE_GENERAL, IDC_STARTUP_FOLDER_SELECT
-#: Merge.rc:2109
+#: Merge.rc:2119
#, c-format
msgid "Show \"Select Files or Folders\" dialog on startup"
msgstr "&Dialog \"Dateien oder Ordner auswählen\" beim Programmstart anzeigen"
#. IDD_PROPPAGE_GENERAL, IDC_CLOSE_WITH_OK
-#: Merge.rc:2111
+#: Merge.rc:2121
msgid "Close \"Select Files or Folders\" dialog on clicking Compare button"
msgstr "Dialog \"Dateien oder Ordner auswählen\" mit 'Vergleichen' schließen"
#. IDD_PROPPAGE_GENERAL, IDC_STATIC
-#: Merge.rc:2113
+#: Merge.rc:2123
#, c-format
msgid "Op&en dialog Auto completion:"
msgstr "Öffnen-Dialog Auto&vervollständigung:"
#. IDD_PROPPAGE_GENERAL, IDC_STATIC
-#: Merge.rc:2115
+#: Merge.rc:2125
msgid "Auto-&reload modified files:"
msgstr "&Geänderte Dateien automatisch neu laden:"
#. IDD_PROPPAGE_GENERAL, IDC_STATIC
-#: Merge.rc:2117
+#: Merge.rc:2127
#, c-format
msgid "Language:"
msgstr "&Sprache:"
#. IDD_PROPPAGE_COMPARE_WEBPAGE, IDC_COMPARE_DEFAULTS
-#: Merge.rc:2119 Merge.rc:2299 Merge.rc:2321 Merge.rc:2352 Merge.rc:2369
-#: Merge.rc:2386 Merge.rc:2394 Merge.rc:2430 Merge.rc:2454 Merge.rc:2633
-#: Merge.rc:2644 Merge.rc:2653 Merge.rc:2887 Merge.rc:2922 Merge.rc:2985
-#: Merge.rc:3010 Merge.rc:3024 Merge.rc:3038 Merge.rc:3054
+#: Merge.rc:2129 Merge.rc:2309 Merge.rc:2331 Merge.rc:2362 Merge.rc:2379
+#: Merge.rc:2396 Merge.rc:2404 Merge.rc:2440 Merge.rc:2464 Merge.rc:2643
+#: Merge.rc:2654 Merge.rc:2663 Merge.rc:2897 Merge.rc:2932 Merge.rc:2995
+#: Merge.rc:3020 Merge.rc:3034 Merge.rc:3048 Merge.rc:3064
#, c-format
msgid "Defaults"
msgstr "Vorgaben"
#. IDS_OPTIONSPG_COLORS
-#: Merge.rc:2124 Merge.rc:2140 Merge.rc:2267 Merge.rc:2292 Merge.rc:4205
+#: Merge.rc:2134 Merge.rc:2150 Merge.rc:2277 Merge.rc:2302 Merge.rc:4215
#, c-format
msgid "Colors"
msgstr "Farben"
#. IDD_PROPPAGE_COLOR_SCHEMES, IDC_STATIC
-#: Merge.rc:2127
+#: Merge.rc:2137
msgid "Color &mode:"
msgstr "&Farbmodus:"
#. IDD_PROPPAGE_COLOR_SCHEMES, IDC_STATIC
-#: Merge.rc:2129
+#: Merge.rc:2139
msgid "&Light mode scheme:"
msgstr "&Hellmodus-Schema:"
#. IDD_PROPPAGE_COLOR_SCHEMES, IDC_STATIC
-#: Merge.rc:2131
+#: Merge.rc:2141
msgid "&Dark mode scheme:"
msgstr "&Dunkelmodus-Schema:"
#. IDD_PROPPAGE_COLOR_SCHEMES, IDC_STATIC
-#: Merge.rc:2133
+#: Merge.rc:2143
msgid "Your custom schemes"
msgstr "Ihre individuellen Schemata"
#. IDD_PROPPAGE_COLOR_SCHEMES, IDC_COLOR_SCHEME_SAVE
-#: Merge.rc:2134
+#: Merge.rc:2144
msgid "&Save current scheme..."
msgstr "&Aktuelles Schema speichern..."
#. IDD_PROPPAGE_COLOR_SCHEMES, IDC_COLOR_SCHEME_DELETE
-#: Merge.rc:2135
+#: Merge.rc:2145
msgid "Delete ¤t scheme..."
msgstr "&Aktuelles Schema löschen..."
#. IDD_PROPPAGE_COLORS_DIR, IDC_BACKGROUND_COLUMN_LABEL
-#: Merge.rc:2143 Merge.rc:2238 Merge.rc:2258 Merge.rc:2272
+#: Merge.rc:2153 Merge.rc:2248 Merge.rc:2268 Merge.rc:2282
#, c-format
msgid "Background"
msgstr "Hintergrund"
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2144
+#: Merge.rc:2154
#, c-format
msgid "Deleted"
msgstr "Gelöscht"
#. IDS_OPTIONSPG_TEXTCOLORS
-#: Merge.rc:2145 Merge.rc:2207 Merge.rc:2239 Merge.rc:2273 Merge.rc:4207
+#: Merge.rc:2155 Merge.rc:2217 Merge.rc:2249 Merge.rc:2283 Merge.rc:4217
#, c-format
msgid "Text"
msgstr "Text"
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2146
+#: Merge.rc:2156
#, c-format
msgid "Difference:"
msgstr "Unterschied:"
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2151
+#: Merge.rc:2161
#, c-format
msgid "Selected Difference:"
msgstr "Markierter Unterschied:"
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2156
+#: Merge.rc:2166
#, c-format
msgid "Ignored Difference:"
msgstr "Ignorierter Unterschied:"
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2161
+#: Merge.rc:2171
#, c-format
msgid "Moved:"
msgstr "Verschoben:"
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2166
+#: Merge.rc:2176
#, c-format
msgid "Selected Moved:"
msgstr "Verschoben (markiert):"
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2171
+#: Merge.rc:2181
#, c-format
msgid "Same As Next (3 panes):"
msgstr ""
@@ -3634,850 +3645,850 @@ msgstr ""
"(3 Ausschnitte):"
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2176
+#: Merge.rc:2186
#, c-format
msgid "Same As Next (Selected):"
msgstr "Gleich wie nächster (markiert):"
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2181
+#: Merge.rc:2191
#, c-format
msgid "Word Difference:"
msgstr "Wortunterschied:"
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2186
+#: Merge.rc:2196
#, c-format
msgid "Selected Word Diff:"
msgstr "Markierter Wortunterschied:"
#. IDD_INPUTBOX
-#: Merge.rc:2195 Merge.rc:2230 Merge.rc:2251 Merge.rc:3099
+#: Merge.rc:2205 Merge.rc:2240 Merge.rc:2261 Merge.rc:3109
#, c-format
msgid "Dialog"
msgstr "Dialog"
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC
-#: Merge.rc:2198
+#: Merge.rc:2208
#, c-format
msgid "Keywords:"
msgstr "Schlüsselwörter:"
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC
-#: Merge.rc:2199
+#: Merge.rc:2209
#, c-format
msgid "Function names:"
msgstr "Funktionsnamen:"
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC
-#: Merge.rc:2200
+#: Merge.rc:2210
#, c-format
msgid "Comments:"
msgstr "Kommentare:"
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC
-#: Merge.rc:2201
+#: Merge.rc:2211
#, c-format
msgid "Numbers:"
msgstr "Nummern:"
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC
-#: Merge.rc:2202
+#: Merge.rc:2212
#, c-format
msgid "Operators:"
msgstr "Operatoren:"
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC
-#: Merge.rc:2203
+#: Merge.rc:2213
#, c-format
msgid "Strings:"
msgstr "Zeichenketten:"
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC
-#: Merge.rc:2204
+#: Merge.rc:2214
#, c-format
msgid "Preprocessor:"
msgstr "Präprozessor:"
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC
-#: Merge.rc:2205
+#: Merge.rc:2215
#, c-format
msgid "User 1:"
msgstr "Benutzer 1:"
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC
-#: Merge.rc:2206
+#: Merge.rc:2216
#, c-format
msgid "User 2:"
msgstr "Benutzer 2:"
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_SCOLOR_USER2_BOLD
-#: Merge.rc:2209 Merge.rc:2211 Merge.rc:2213 Merge.rc:2215 Merge.rc:2217
-#: Merge.rc:2219 Merge.rc:2221 Merge.rc:2223 Merge.rc:2225
+#: Merge.rc:2219 Merge.rc:2221 Merge.rc:2223 Merge.rc:2225 Merge.rc:2227
+#: Merge.rc:2229 Merge.rc:2231 Merge.rc:2233 Merge.rc:2235
#, c-format
msgid "Bold"
msgstr "Fett"
#. IDD_PROPPAGE_COLORS_TEXT, IDC_DEFAULT_STANDARD_COLORS
-#: Merge.rc:2233
+#: Merge.rc:2243
#, c-format
msgid "&Use customized text colors"
msgstr "&Benutzerdefinierte Textfarben verwenden"
#. IDD_PROPPAGE_COLORS_TEXT, IDC_WHITESPACE_COLOR_LABEL
-#: Merge.rc:2235
+#: Merge.rc:2245
#, c-format
msgid "Whitespace:"
msgstr "Leerzeichen:"
#. IDD_PROPPAGE_COLORS_TEXT, IDC_TEXT_COLOR_LABEL
-#: Merge.rc:2236
+#: Merge.rc:2246
#, c-format
msgid "Regular text:"
msgstr "Normaler Text:"
#. IDD_PROPPAGE_COLORS_TEXT, IDC_SELECTION_COLOR_LABEL
-#: Merge.rc:2237
+#: Merge.rc:2247
#, c-format
msgid "Selection:"
msgstr "Auswahl:"
#. IDD_PROPPAGE_COLORS_DIR, IDC_STATIC
-#: Merge.rc:2245 Merge.rc:2286
+#: Merge.rc:2255 Merge.rc:2296
#, c-format
msgid "Margin:"
msgstr "Rand:"
#. IDD_PROPPAGE_COLORS_MARKER, IDC_MARKER0_COLOR_LABEL
-#: Merge.rc:2254
+#: Merge.rc:2264
#, c-format
msgid "Search Marker:"
msgstr "Suchmarkierung:"
#. IDD_PROPPAGE_COLORS_MARKER, IDC_MARKER1_COLOR_LABEL
-#: Merge.rc:2255
+#: Merge.rc:2265
#, c-format
msgid "User Defined Marker 1:"
msgstr "Benutzerdefiniert 1:"
#. IDD_PROPPAGE_COLORS_MARKER, IDC_MARKER2_COLOR_LABEL
-#: Merge.rc:2256
+#: Merge.rc:2266
#, c-format
msgid "User Defined Marker 2:"
msgstr "Benutzerdefiniert 2:"
#. IDD_PROPPAGE_COLORS_MARKER, IDC_MARKER3_COLOR_LABEL
-#: Merge.rc:2257
+#: Merge.rc:2267
#, c-format
msgid "User Defined Marker 3:"
msgstr "Benutzerdefiniert 3:"
#. IDD_PROPPAGE_COLORS_DIR, IDC_USE_DIR_COMPARE_COLORS
-#: Merge.rc:2270
+#: Merge.rc:2280
msgid "&Use folder compare colors"
msgstr "&Ordnervergleichsfarben verwenden"
#. IDD_PROPPAGE_COLORS_DIR, IDC_STATIC
-#: Merge.rc:2274
+#: Merge.rc:2284
msgid "Items equal:"
msgstr "Gleiche Objekte:"
#. IDD_PROPPAGE_COLORS_DIR, IDC_STATIC
-#: Merge.rc:2277
+#: Merge.rc:2287
msgid "Items different:"
msgstr "Verschiedene Objekte:"
#. IDD_PROPPAGE_COLORS_DIR, IDC_STATIC
-#: Merge.rc:2280
+#: Merge.rc:2290
msgid "Items missing:"
msgstr "Nicht existierende Objekte:"
#. IDD_PROPPAGE_COLORS_DIR, IDC_STATIC
-#: Merge.rc:2283
+#: Merge.rc:2293
msgid "Items filtered:"
msgstr "Gefilterte Objekte:"
#. IDD_PROPPAGE_COLORS_SYSTEM, IDC_SYSCOLOR_HOOK_ENABLED
-#: Merge.rc:2295
+#: Merge.rc:2305
msgid "&Use custom system colors"
msgstr "&Benutzerdefinierte Systemfarben verwenden"
#. IDS_PRPCAT_SYSTEM
-#: Merge.rc:2304 Merge.rc:4211 Merge.rc:4212 Merge.rc:4657
+#: Merge.rc:2314 Merge.rc:4221 Merge.rc:4222 Merge.rc:4667
#, c-format
msgid "System"
msgstr "System"
#. IDD_PROPPAGE_SYSTEM, IDC_USE_RECYCLE_BIN
-#: Merge.rc:2307
+#: Merge.rc:2317
#, c-format
msgid "&Use Recycle Bin"
msgstr "&Gelöschte Dateien in den Papierkorb verschieben"
#. IDD_PROPPAGE_SYSTEM, IDC_STATIC
-#: Merge.rc:2308
+#: Merge.rc:2318
#, c-format
msgid "&External editor:"
msgstr "&Externer Editor:"
#. IDD_PROPPAGE_SYSTEM, IDC_STATIC
-#: Merge.rc:2311
+#: Merge.rc:2321
msgid "&Store user data in:"
msgstr "Benutzerdaten &speichern in:"
#. IDD_PROPPAGE_SYSTEM, IDC_STATIC
-#: Merge.rc:2313
+#: Merge.rc:2323
#, c-format
msgid "&Filter folder:"
msgstr "&Filterordner:"
#. IDD_PROPPAGE_SYSTEM, IDC_STATIC
-#: Merge.rc:2316
+#: Merge.rc:2326
#, c-format
msgid "Temporary files folder"
msgstr "Temporärer Dateienordner"
#. IDD_PROPPAGE_SYSTEM, IDC_TMPFOLDER_SYSTEM
-#: Merge.rc:2317
+#: Merge.rc:2327
#, c-format
msgid "S&ystem temp folder"
msgstr "&Temporärer Ordner des Systems"
#. IDD_PROPPAGE_SYSTEM, IDC_STATIC
-#: Merge.rc:2318
+#: Merge.rc:2328
#, c-format
msgid "C&ustom folder:"
msgstr "&Benutzerdefinierter Ordner:"
#. IDD_GENERATE_PATCH, IDC_DIFF_BROWSE_FILE2
-#: Merge.rc:2320 Merge.rc:2416
+#: Merge.rc:2330 Merge.rc:2426
#, c-format
msgid "Br&owse..."
msgstr "Su&chen..."
#. IDS_OPTIONSPG_COMPARE
-#: Merge.rc:2326 Merge.rc:4200
+#: Merge.rc:2336 Merge.rc:4210
#, c-format
msgid "Compare"
msgstr "Vergleichen"
#. IDD_PROPPAGE_COMPARE, IDC_STATIC
-#: Merge.rc:2329
+#: Merge.rc:2339
#, c-format
msgid "Whitespaces"
msgstr "Leerzeichen"
#. IDD_PROPPAGE_COMPARE, IDC_WHITESPACE
-#: Merge.rc:2330
+#: Merge.rc:2340
#, c-format
msgid "&Compare"
msgstr "&Vergleichen"
#. IDD_PROPPAGE_COMPARE, IDC_WHITE_CHANGE
-#: Merge.rc:2331
+#: Merge.rc:2341
#, c-format
msgid "&Ignore change"
msgstr "Änderung &ignorieren"
#. IDD_PROPPAGE_COMPARE, IDC_ALL_WHITE
-#: Merge.rc:2332
+#: Merge.rc:2342
#, c-format
msgid "I&gnore all"
msgstr "&Alle ignorieren"
#. IDD_PROPPAGE_COMPARE, IDC_IGNBLANKS_CHECK
-#: Merge.rc:2333
+#: Merge.rc:2343
msgid "Ignore blan&k lines"
msgstr "Leerzeilen &ignorieren"
#. IDD_PROPPAGE_COMPARE, IDC_IGNCASE_CHECK
-#: Merge.rc:2334
+#: Merge.rc:2344
msgid "Ignore &case"
msgstr "&Groß-/Kleinschreibung ignorieren"
#. IDD_PROPPAGE_COMPARE, IDC_EOL_SENSITIVE
-#: Merge.rc:2335
+#: Merge.rc:2345
msgid "Igno&re EOL differences (Windows/Unix/Mac)"
msgstr "EOL-Unterschiede igno&rieren (Windows/Unix/Mac)"
#. IDD_PROPPAGE_COMPARE, IDC_IGNORE_NUMBERS
-#: Merge.rc:2337
+#: Merge.rc:2347
msgid "Ignore num&bers"
msgstr "&Nummern ignorieren"
#. IDD_PROPPAGE_COMPARE, IDC_CP_SENSITIVE
-#: Merge.rc:2338
+#: Merge.rc:2348
msgid "Ignore codepage &differences"
msgstr "&Codeseiten-Unterschiede ignorieren"
#. IDD_PROPPAGE_COMPARE, IDC_FILTERCOMMENTS_CHECK
-#: Merge.rc:2339
+#: Merge.rc:2349
msgid "Ignore c&omment differences"
msgstr "&Kommentarunterschiede ignorieren"
#. IDD_PROPPAGE_COMPARE, IDC_IGNEOFEOL_CHECK
-#: Merge.rc:2341
+#: Merge.rc:2351
msgid "Ignore &missing trailing EOL"
msgstr "&Fehlende abschließende EOL ignorieren"
#. IDD_PROPPAGE_COMPARE, IDC_IGNLBRKS_CHECK
-#: Merge.rc:2343
+#: Merge.rc:2353
msgid "Ignore line &breaks (treat as spaces)"
msgstr "&Zeilenumbrüche ignorieren (als Leerzeichen behandeln)"
#. IDD_PROPPAGE_COMPARE, IDC_MOVED_BLOCKS
-#: Merge.rc:2345
+#: Merge.rc:2355
#, c-format
msgid "E&nable moved block detection"
msgstr "Verschobene &Blöcke erkennen"
#. IDD_PROPPAGE_COMPARE, IDC_ALIGN_SIMILAR_LINES
-#: Merge.rc:2346
+#: Merge.rc:2356
msgid "Align &similar lines"
msgstr "&Ähnliche Zeilen ausrichten"
#. IDD_PROPPAGE_COMPARE, IDC_STATIC
-#: Merge.rc:2347
+#: Merge.rc:2357
msgid "Diff &algorithm:"
msgstr "&Diff-Algorithmus:"
#. IDD_PROPPAGE_COMPARE, IDC_INDENT_HEURISTIC
-#: Merge.rc:2349
+#: Merge.rc:2359
msgid "Enable indent &heuristic"
msgstr "&Heuristischen Einzug aktivieren"
#. IDD_PROPPAGE_COMPARE, IDC_COMPLETELY_BLANK_OUT_IGNORED_DIFFERENCES
-#: Merge.rc:2350
+#: Merge.rc:2360
msgid "Completely unhighlight the ignored differences"
msgstr "Ignorierte &Unterschiede komplett nicht markieren"
#. IDS_OPTIONSPG_EDITOR
-#: Merge.rc:2357 Merge.rc:4201
+#: Merge.rc:2367 Merge.rc:4211
#, c-format
msgid "Editor"
msgstr "Editor"
#. IDD_PROPPAGE_EDITOR, IDC_HILITE_CHECK
-#: Merge.rc:2360
+#: Merge.rc:2370
#, c-format
msgid "&Highlight syntax"
msgstr "&Syntax hervorheben"
#. IDD_PROPPAGE_EDITOR, IDC_MIXED_EOL
-#: Merge.rc:2361
+#: Merge.rc:2371
#, c-format
msgid "&Preserve original EOL"
msgstr "&Ursprüngliche Zeilenende-Zeichen bewahren"
#. IDD_PROPPAGE_EDITOR, IDC_STATIC
-#: Merge.rc:2362
+#: Merge.rc:2372
#, c-format
msgid "Tabs"
msgstr "Tabulatoren"
#. IDD_PROPPAGE_EDITOR, IDC_STATIC
-#: Merge.rc:2363
+#: Merge.rc:2373
#, c-format
msgid "&Tab size:"
msgstr "&Tabulator-Größe:"
#. IDD_PROPPAGE_EDITOR, IDC_PROP_INSERT_TABS
-#: Merge.rc:2365
+#: Merge.rc:2375
#, c-format
msgid "&Insert tabs"
msgstr "Tabulatoren &einfügen"
#. IDD_PROPPAGE_EDITOR, IDC_PROP_INSERT_SPACES
-#: Merge.rc:2366
+#: Merge.rc:2376
#, c-format
msgid "Insert &spaces"
msgstr "&Leerzeichen einfügen"
#. IDD_PROPPAGE_EDITOR, IDC_STATIC
-#: Merge.rc:2367
+#: Merge.rc:2377
msgid "&Rendering mode:"
msgstr "&Darstellungsmodus:"
#. IDD_PROPPAGE_EDITOR_COMPAREMERGE, IDC_AUTOMRESCAN_CHECK
-#: Merge.rc:2376
+#: Merge.rc:2386
#, c-format
msgid "&Automatic rescan"
msgstr "&Automatisch aktualisieren"
#. IDD_PROPPAGE_EDITOR_COMPAREMERGE, IDC_STATIC
-#: Merge.rc:2377
+#: Merge.rc:2387
msgid "Copy &granularity for selected differences:"
msgstr "&Kopiergranularität für ausgewählte Unterschiede:"
#. IDD_PROPPAGE_EDITOR_COMPAREMERGE, IDC_LINE_COLORING_GROUP
-#: Merge.rc:2379
+#: Merge.rc:2389
#, c-format
msgid "Line Difference Coloring"
msgstr "Zeilenunterschied-Färbung"
#. IDD_PROPPAGE_EDITOR_COMPAREMERGE, IDC_VIEW_LINE_DIFFERENCES
-#: Merge.rc:2380
+#: Merge.rc:2390
#, c-format
msgid "View line differences"
msgstr "Ze&ilenunterschied anzeigen"
#. IDD_PROPPAGE_EDITOR_COMPAREMERGE, IDC_EDITOR_CHARLEVEL
-#: Merge.rc:2381
+#: Merge.rc:2391
#, c-format
msgid "&Character-level"
msgstr "&Zeichen-Ebene"
#. IDD_PROPPAGE_EDITOR_COMPAREMERGE, IDC_EDITOR_WORDLEVEL
-#: Merge.rc:2382
+#: Merge.rc:2392
#, c-format
msgid "&Word-level:"
msgstr "&Wort-Ebene:"
#. IDD_PROPPAGE_EDITOR_COMPAREMERGE, IDC_STATIC
-#: Merge.rc:2384
+#: Merge.rc:2394
#, c-format
msgid "W&ord break characters:"
msgstr "W&ortumbruchzeichen:"
#. IDD_PROPPAGE_MESSAGEBOXES, IDC_STATIC
-#: Merge.rc:2401
+#: Merge.rc:2411
msgid "Some messages can be hidden by the user. Press Reset to make all messages visible again."
msgstr ""
"WinMerge erlaubt das Verstecken von einigen häufigen Meldungen.\n"
"Drücken Sie 'Zurücksetzen', um alle Meldungen wieder sichtbar zu schalten."
#. IDD_SELECT_FILES_OR_FOLDERS, IDC_RESET
-#: Merge.rc:2402 Merge.rc:3085
+#: Merge.rc:2412 Merge.rc:3095
#, c-format
msgid "Reset"
msgstr "Zurücksetzen"
#. IDD_GENERATE_PATCH
-#: Merge.rc:2408
+#: Merge.rc:2418
#, c-format
msgid "Patch Generator"
msgstr "Patch-Generator"
#. IDD_GENERATE_PATCH, IDC_STATIC
-#: Merge.rc:2411
+#: Merge.rc:2421
#, c-format
msgid "File&1:"
msgstr "Datei &1:"
#. IDD_GENERATE_PATCH, IDC_STATIC
-#: Merge.rc:2414
+#: Merge.rc:2424
#, c-format
msgid "File&2:"
msgstr "Datei &2:"
#. IDD_GENERATE_PATCH, IDC_DIFF_SWAPFILES
-#: Merge.rc:2417
+#: Merge.rc:2427
#, c-format
msgid "&Swap"
msgstr "Ver&tauschen"
#. IDD_DIRCMP_REPORT, IDC_REPORT_COPYCLIPBOARD
-#: Merge.rc:2418 Merge.rc:2690
+#: Merge.rc:2428 Merge.rc:2700
#, c-format
msgid "&Copy to clipboard"
msgstr "In die &Zwischenablage kopieren"
#. IDD_GENERATE_PATCH, IDC_DIFF_APPENDFILE
-#: Merge.rc:2419
+#: Merge.rc:2429
#, c-format
msgid "&Append to existing file"
msgstr "A&n vorhandene Datei anfügen"
#. IDD_GENERATE_PATCH, IDC_STATIC
-#: Merge.rc:2420
+#: Merge.rc:2430
#, c-format
msgid "&Result:"
msgstr "&Ergebnis:"
#. IDD_GENERATE_PATCH, IDC_DIFF_BROWSE_RESULT
-#: Merge.rc:2422
+#: Merge.rc:2432
#, c-format
msgid "Bro&wse..."
msgstr "Suc&hen..."
#. IDD_GENERATE_PATCH, IDC_STATIC
-#: Merge.rc:2423
+#: Merge.rc:2433
#, c-format
msgid "&Format"
msgstr "&Format"
#. IDD_GENERATE_PATCH, IDC_STATIC
-#: Merge.rc:2424
+#: Merge.rc:2434
#, c-format
msgid "St&yle:"
msgstr "Sti&l:"
#. IDD_GENERATE_PATCH, IDC_STATIC
-#: Merge.rc:2426
+#: Merge.rc:2436
#, c-format
msgid "&Context:"
msgstr "&Kontext:"
#. IDD_GENERATE_PATCH, IDC_DIFF_INCLCMDLINE
-#: Merge.rc:2428
+#: Merge.rc:2438
#, c-format
msgid "Inclu&de command line"
msgstr "&Befehlszeile einfügen"
#. IDD_GENERATE_PATCH, IDC_DIFF_OPENTOEDITOR
-#: Merge.rc:2429
+#: Merge.rc:2439
#, c-format
msgid "Open in e&xternal editor"
msgstr "Im e&xternen Editor öffnen"
#. IDD_DIRCOLS
-#: Merge.rc:2446
+#: Merge.rc:2456
#, c-format
msgid "Display Columns"
msgstr "Spalten anpassen"
#. IDD_DIRCOLS, IDC_UP
-#: Merge.rc:2450
+#: Merge.rc:2460
#, c-format
msgid "Move &Up"
msgstr "Nach &oben"
#. IDD_DIRCOLS, IDC_DOWN
-#: Merge.rc:2451
+#: Merge.rc:2461
#, c-format
msgid "Move &Down"
msgstr "Nach &unten"
#. IDD_DIRCOLS, IDC_COLDLG_ADDITIONAL_PROPERTIES
-#: Merge.rc:2453
+#: Merge.rc:2463
msgid "&Additional Properties"
msgstr "Zusätzliche Eigenschaften"
#. IDD_DIRADDITIONALPROPS
-#: Merge.rc:2461
+#: Merge.rc:2471
msgid "Additional Properties"
msgstr "Zusätzliche Eigenschaften"
#. IDD_PLUGINS_SELECTPLUGIN
-#: Merge.rc:2475
+#: Merge.rc:2485
msgid "Select Plugin"
msgstr "Plugin auswählen"
#. IDD_PLUGINS_EDITPLUGIN, IDC_STATIC
-#: Merge.rc:2478 Merge.rc:3115
+#: Merge.rc:2488 Merge.rc:3125
msgid "Plugin &name:"
msgstr "Plugin-Name:"
#. IDD_PLUGINS_SELECTPLUGIN, IDC_STATIC
-#: Merge.rc:2480
+#: Merge.rc:2490
msgid "&Target files:"
msgstr "&Zieldateien:"
#. IDD_PLUGINS_EDITPLUGIN, IDC_STATIC
-#: Merge.rc:2482 Merge.rc:3117
+#: Merge.rc:2492 Merge.rc:3127
#, c-format
msgid "Extensions list:"
msgstr "Erweiterungsliste:"
#. IDD_PLUGINS_EDITPLUGIN, IDC_STATIC
-#: Merge.rc:2484 Merge.rc:3119
+#: Merge.rc:2494 Merge.rc:3129
#, c-format
msgid "Description:"
msgstr "Beschreibung:"
#. IDD_PLUGINS_EDITPLUGIN, IDC_STATIC
-#: Merge.rc:2486 Merge.rc:3121
+#: Merge.rc:2496 Merge.rc:3131
msgid "Default arguments:"
msgstr "Standardargumente:"
#. IDD_PLUGINS_SELECTPLUGIN, IDC_PLUGIN_ALLOW_ALL
-#: Merge.rc:2488
+#: Merge.rc:2498
msgid "Display all plugins (Ignore extension)"
msgstr "Alle Plugins anzeigen, die Erweiterung nicht überprüfen"
#. IDD_PLUGINS_SELECTPLUGIN, IDC_PLUGIN_OPEN_IN_SAME_FRAME_TYPE
-#: Merge.rc:2490
+#: Merge.rc:2500
msgid "&Open files in same window type after unpacking"
msgstr "Dateien nach dem Entpacken im gleichen Fenstertyp öffnen"
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_PIPELINE_STATIC
-#: Merge.rc:2492 Merge.rc:3129
+#: Merge.rc:2502 Merge.rc:3139
msgid "&Plugin pipeline:"
msgstr "&Plugin-Pipeline:"
#. IDD_PLUGINS_SELECTPLUGIN, IDC_PLUGIN_ALIAS
-#: Merge.rc:2495
+#: Merge.rc:2505
msgid "&Alias..."
msgstr "&Alias..."
#. IDD_DIRCOMP_PROGRESS, IDC_COMPARISON_STOP
-#: Merge.rc:2505
+#: Merge.rc:2515
#, c-format
msgid "Stop"
msgstr "Stopp"
#. IDD_DIRCOMP_PROGRESS, IDC_COMPARISON_PAUSE
-#: Merge.rc:2506
+#: Merge.rc:2516
#, c-format
msgid "Pause"
msgstr "Pause"
#. IDD_DIRCOMP_PROGRESS, IDC_COMPARISON_CONTINUE
-#: Merge.rc:2507
+#: Merge.rc:2517
#, c-format
msgid "Continue"
msgstr "Fortsetzen"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC
-#: Merge.rc:2509 Merge.rc:2973
+#: Merge.rc:2519 Merge.rc:2983
msgid "C&PU cores to use:"
msgstr "Anzahl der zu verwendenden &CPU-Kerne:"
#. IDD_DIRCOMP_PROGRESS, IDC_STATIC
-#: Merge.rc:2510
+#: Merge.rc:2520
#, c-format
msgid "Items total:"
msgstr "Objekte gesamt:"
#. IDD_DIRCOMP_PROGRESS, IDC_STATIC
-#: Merge.rc:2511
+#: Merge.rc:2521
#, c-format
msgid "Items compared:"
msgstr "Objekte verglichen:"
#. IDS_PREVIEWBAR_CLOSE
-#: Merge.rc:2526 Merge.rc:2846 Merge.rc:5328
+#: Merge.rc:2536 Merge.rc:2856 Merge.rc:5339
#, c-format
msgid "&Close"
msgstr "&Schließen"
#. IDD_WMGOTO
-#: Merge.rc:2537
+#: Merge.rc:2547
msgid "Go to"
msgstr "Gehe zu"
#. IDD_WMGOTO, IDC_STATIC
-#: Merge.rc:2540
+#: Merge.rc:2550
msgid "G&o to:"
msgstr "Zeile/Unterschied:"
#. IDD_WMGOTO, IDC_STATIC
-#: Merge.rc:2543
+#: Merge.rc:2553
#, c-format
msgid "File"
msgstr "Datei"
#. IDD_WMGOTO, IDC_STATIC
-#: Merge.rc:2547
+#: Merge.rc:2557
msgid "Go to what"
msgstr "Ziel"
#. IDD_WMGOTO, IDC_WMGOTO_TOLINE
-#: Merge.rc:2548
+#: Merge.rc:2558
#, c-format
msgid "Li&ne"
msgstr "&Zeile"
#. IDD_WMGOTO, IDC_WMGOTO_TODIFF
-#: Merge.rc:2549
+#: Merge.rc:2559
#, c-format
msgid "&Difference"
msgstr "&Unterschied"
#. IDD_WMGOTO, IDOK
-#: Merge.rc:2550
+#: Merge.rc:2560
msgid "&Go to"
msgstr "&OK"
#. IDS_PROJECT_ITEM_FILE_FILTER
-#: Merge.rc:2556 Merge.rc:4321
+#: Merge.rc:2566 Merge.rc:4331
msgid "File Filters"
msgstr "Dateifilter"
#. IDD_FILTERS_FILEFILTERS, IDC_STATIC
-#: Merge.rc:2559
+#: Merge.rc:2569
msgid "&Mask / Filter Expression"
msgstr "&Maske / Filterausdruck"
#. IDD_FILTERS_FILEFILTERS, IDC_STATIC
-#: Merge.rc:2562
+#: Merge.rc:2572
msgid "Preset &Filters"
msgstr "Voreingestellte &Filter"
#. IDD_FILTERS_FILEFILTERS, IDC_FILTERFILE_TEST_BTN
-#: Merge.rc:2564
+#: Merge.rc:2574
msgid "Test..."
msgstr "Testen..."
#. IDD_FILTERS_FILEFILTERS, IDC_FILTERFILE_INSTALL
-#: Merge.rc:2565
+#: Merge.rc:2575
#, c-format
msgid "Install..."
msgstr "Installieren..."
#. IDD_FILTERS_FILEFILTERS, IDC_FILTERFILE_NEWBTN
-#: Merge.rc:2566
+#: Merge.rc:2576
#, c-format
msgid "New..."
msgstr "Neu..."
#. IDD_FILTERS_FILEFILTERS, IDC_FILTERFILE_EDITBTN
-#: Merge.rc:2567
+#: Merge.rc:2577
#, c-format
msgid "Edit..."
msgstr "Bearbeiten..."
#. IDD_FILTERS_FILEFILTERS, IDC_FILTERFILE_DELETEBTN
-#: Merge.rc:2568
+#: Merge.rc:2578
#, c-format
msgid "Delete..."
msgstr "Löschen..."
#. IDD_FILTERS_CONDITION
-#: Merge.rc:2573
+#: Merge.rc:2583
msgid "Filter Condition"
msgstr "Filterbedingung"
#. IDD_FILTERS_CONDITION, IDC_STATIC
-#: Merge.rc:2576
+#: Merge.rc:2586
msgid "&Left-hand side:"
msgstr "&Linke Seite:"
#. IDD_FILTERS_CONDITION, IDC_STATIC
-#: Merge.rc:2578
+#: Merge.rc:2588
msgid "&Operator:"
msgstr "&Operator:"
#. IDD_FILTERS_CONDITION, IDC_STATIC
-#: Merge.rc:2580
+#: Merge.rc:2590
msgid "&Right-hand side:"
msgstr "&Rechte Seite:"
#. IDD_FILTERS_CONDITION, IDC_STATIC
-#: Merge.rc:2586
+#: Merge.rc:2596
msgid "Expression:"
msgstr "Ausdruck:"
#. IDD_COMPARISON_RESULT_FILTER
-#: Merge.rc:2595
+#: Merge.rc:2605
msgid "Filter by Comparison Result"
msgstr "Nach Vergleichsergebnissen filtern"
#. IDD_COMPARISON_RESULT_FILTER, IDC_RADIO_INCLUDE
-#: Merge.rc:2598
+#: Merge.rc:2608
msgid "&Include"
msgstr "E&inbeziehen"
#. IDD_COMPARISON_RESULT_FILTER, IDC_RADIO_EXCLUDE
-#: Merge.rc:2599
+#: Merge.rc:2609
msgid "&Exclude"
msgstr "Ausschli&eßen"
#. IDD_COMPARISON_RESULT_FILTER, IDC_STATIC
-#: Merge.rc:2600
+#: Merge.rc:2610
msgid "Comparison Results"
msgstr "Vergleichsergebnisse"
#. IDS_IDENTICAL
-#: Merge.rc:2601 Merge.rc:2733 Merge.rc:2794 Merge.rc:4698
+#: Merge.rc:2611 Merge.rc:2743 Merge.rc:2804 Merge.rc:4708
#, c-format
msgid "Identical"
msgstr "Identisch"
#. IDS_DIFFERENT
-#: Merge.rc:2602 Merge.rc:2714 Merge.rc:2755 Merge.rc:4708
+#: Merge.rc:2612 Merge.rc:2724 Merge.rc:2765 Merge.rc:4718
#, c-format
msgid "Different"
msgstr "Unterschiedlich"
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_LEFT_ONLY
-#: Merge.rc:2603
+#: Merge.rc:2613
msgid "Left only"
msgstr "Nur links"
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_RIGHT_ONLY
-#: Merge.rc:2604
+#: Merge.rc:2614
msgid "Right only"
msgstr "Nur rechts"
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_SKIPPED
-#: Merge.rc:2605
+#: Merge.rc:2615
msgid "Skipped"
msgstr "Übersprungen"
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_MIDDLE_ONLY
-#: Merge.rc:2606
+#: Merge.rc:2616
msgid "Middle only"
msgstr "Nur Mitte"
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_LEFT_ONLY_DIFFERENT
-#: Merge.rc:2607
+#: Merge.rc:2617
msgid "Left only (different)"
msgstr "Nur links (unterschiedlich)"
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_MIDDLE_ONLY_DIFFERENT
-#: Merge.rc:2608
+#: Merge.rc:2618
msgid "Middle only (different)"
msgstr "Nur Mitte (unterschiedlich)"
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_RIGHT_ONLY_DIFFERENT
-#: Merge.rc:2609
+#: Merge.rc:2619
msgid "Right only (different)"
msgstr "Nur rechts (unterschiedlich)"
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_LEFT_ONLY_MISSING
-#: Merge.rc:2610
+#: Merge.rc:2620
msgid "Left only (missing)"
msgstr "Nur links (fehlend)"
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_MIDDLE_ONLY_MISSING
-#: Merge.rc:2611
+#: Merge.rc:2621
msgid "Middle only (missing)"
msgstr "Nur Mitte (fehlend)"
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_RIGHT_ONLY_MISSING
-#: Merge.rc:2612
+#: Merge.rc:2622
msgid "Right only (missing)"
msgstr "Nur rechts (fehlend)"
#. IDS_OPTIONSPG_CODEPAGE
-#: Merge.rc:2619 Merge.rc:2811 Merge.rc:4213
+#: Merge.rc:2629 Merge.rc:2821 Merge.rc:4223
#, c-format
msgid "Codepage"
msgstr "Codeseite"
#. IDD_PROPPAGE_CODEPAGE, IDC_STATIC
-#: Merge.rc:2622
+#: Merge.rc:2632
#, c-format
msgid "Default Codepage"
msgstr "Standard-Codeseite"
#. IDD_PROPPAGE_CODEPAGE, IDC_STATIC
-#: Merge.rc:2623
+#: Merge.rc:2633
#, c-format
msgid "Select the default codepage for non-Unicode files:"
msgstr "Standard-Codeseite auswählen, die beim Laden von Nicht-Unicode-Dateien verwendet wird:"
#. IDD_PROPPAGE_CODEPAGE, IDC_CP_SYSTEM
-#: Merge.rc:2624
+#: Merge.rc:2634
#, c-format
msgid "System codepage"
msgstr "System-Codeseite"
#. IDD_PROPPAGE_CODEPAGE, IDC_CP_UI
-#: Merge.rc:2625
+#: Merge.rc:2635
#, c-format
msgid "According to WinMerge User Interface"
msgstr "Entsprechend der WinMerge-Benutzeroberfläche"
#. IDD_PROPPAGE_CODEPAGE, IDC_CP_CUSTOM
-#: Merge.rc:2626
+#: Merge.rc:2636
#, c-format
msgid "Custom codepage:"
msgstr "Benutzerdefiniert:"
#. IDD_PROPPAGE_CODEPAGE, IDC_DETECT_CODEPAGE
-#: Merge.rc:2628
+#: Merge.rc:2638
msgid ""
"Detect codepage for: .html, .rc, .xml\n"
"Restart required."
@@ -4486,7 +4497,7 @@ msgstr ""
"Benötigt einen Neustart des Programmes."
#. IDD_PROPPAGE_CODEPAGE, IDC_DETECT_CODEPAGE2
-#: Merge.rc:2630
+#: Merge.rc:2640
msgid ""
"Detect codepage for files with mlang.dll\n"
"Restart required."
@@ -4495,857 +4506,857 @@ msgstr ""
"Benötigt einen Neustart des Programmes."
#. IDS_OPTIONSPG_ARCHIVE
-#: Merge.rc:2638 Merge.rc:4214
+#: Merge.rc:2648 Merge.rc:4224
#, c-format
msgid "Archive Support"
msgstr "Archivunterstützung"
#. IDD_PROPPAGE_ARCHIVE, IDC_ARCHIVE_ENABLE
-#: Merge.rc:2641
+#: Merge.rc:2651
#, c-format
msgid "&Enable archive file support"
msgstr "&Archivunterstützung aktivieren"
#. IDD_PROPPAGE_ARCHIVE, IDC_ARCHIVE_DETECTTYPE
-#: Merge.rc:2642
+#: Merge.rc:2652
#, c-format
msgid "&Detect archive type from file signature"
msgstr "Archiv&typ aus der Dateisignatur ermitteln"
#. IDD_PROPPAGE_PROJECT, IDC_STATIC
-#: Merge.rc:2651
+#: Merge.rc:2661
msgid "Items saved to or restored from the project file:"
msgstr "In der Projektdatei gespeicherte oder aus ihr wiederhergestellte Elemente:"
#. IDD_SAVECLOSING
-#: Merge.rc:2658
+#: Merge.rc:2668
#, c-format
msgid "Save Modified Files?"
msgstr "Geänderte Dateien speichern?"
#. IDD_SAVECLOSING, IDC_SAVECLOSING_LEFTFRAME
-#: Merge.rc:2661
+#: Merge.rc:2671
#, c-format
msgid "Left side file"
msgstr "Linke Datei"
#. IDD_SAVECLOSING, IDC_SAVECLOSING_SAVELEFT
-#: Merge.rc:2663
+#: Merge.rc:2673
#, c-format
msgid "&Save changes"
msgstr "Änderungen &speichern"
#. IDD_SAVECLOSING, IDC_SAVECLOSING_DISCARDLEFT
-#: Merge.rc:2664
+#: Merge.rc:2674
#, c-format
msgid "&Discard changes"
msgstr "Änderungen &verwerfen"
#. IDD_SAVECLOSING, IDC_SAVECLOSING_MIDDLEFRAME
-#: Merge.rc:2665
+#: Merge.rc:2675
#, c-format
msgid "Middle side file"
msgstr "Mittlere Datei"
#. IDD_SAVECLOSING, IDC_SAVECLOSING_SAVEMIDDLE
-#: Merge.rc:2667
+#: Merge.rc:2677
#, c-format
msgid "Sa&ve changes"
msgstr "Änderungen sp&eichern"
#. IDD_SAVECLOSING, IDC_SAVECLOSING_DISCARDMIDDLE
-#: Merge.rc:2668
+#: Merge.rc:2678
#, c-format
msgid "Discard c&hanges"
msgstr "Änderungen verwe&rfen"
#. IDD_SAVECLOSING, IDC_SAVECLOSING_RIGHTFRAME
-#: Merge.rc:2669
+#: Merge.rc:2679
#, c-format
msgid "Right side file"
msgstr "Rechte Datei"
#. IDD_SAVECLOSING, IDC_SAVECLOSING_SAVERIGHT
-#: Merge.rc:2671
+#: Merge.rc:2681
#, c-format
msgid "S&ave changes"
msgstr "Änderungen s&peichern"
#. IDD_SAVECLOSING, IDC_SAVECLOSING_DISCARDRIGHT
-#: Merge.rc:2672
+#: Merge.rc:2682
#, c-format
msgid "Dis&card changes"
msgstr "Änderungen ver&werfen"
#. IDD_SAVECLOSING, IDC_SAVECLOSING_DISCARDALL
-#: Merge.rc:2673
+#: Merge.rc:2683
#, c-format
msgid "Disca&rd All"
msgstr "&Alle verwerfen"
#. IDD_DIRCMP_REPORT
-#: Merge.rc:2680
+#: Merge.rc:2690
#, c-format
msgid "Folder Compare Report"
msgstr "Ordnervergleichsbericht"
#. IDD_DIRCMP_REPORT, IDC_STATIC
-#: Merge.rc:2683
+#: Merge.rc:2693
#, c-format
msgid "Report &file:"
msgstr "&Berichtsdatei:"
#. IDD_DIRCMP_REPORT, IDC_STATIC
-#: Merge.rc:2686
+#: Merge.rc:2696
#, c-format
msgid "&Style:"
msgstr "&Stil:"
#. IDD_DIRCMP_REPORT, IDC_REPORT_INCLUDEFILECMPREPORT
-#: Merge.rc:2688
+#: Merge.rc:2698
#, c-format
msgid "&Include file compare report"
msgstr "Dateivergleichsbericht einschließen"
#. IDD_FILTERS_FILEFILTERS_SHARED
-#: Merge.rc:2697
+#: Merge.rc:2707
#, c-format
msgid "Shared or Private Filter"
msgstr "Gemeinsamer oder privater Filter"
#. IDD_FILTERS_FILEFILTERS_SHARED, IDC_STATIC
-#: Merge.rc:2700
+#: Merge.rc:2710
#, c-format
msgid "What type of filter do you want?"
msgstr "Welchen Filtertyp möchten Sie erzeugen?"
#. IDD_FILTERS_FILEFILTERS_SHARED, IDC_SHARED
-#: Merge.rc:2701
+#: Merge.rc:2711
#, c-format
msgid "Shared Filter (for all users)"
msgstr "Gemeinsamer Filter (für alle Benutzer auf diesem Computer)"
#. IDD_FILTERS_FILEFILTERS_SHARED, IDC_PRIVATE
-#: Merge.rc:2702
+#: Merge.rc:2712
#, c-format
msgid "Private Filter (current user only)"
msgstr "Privater Filter (nur für den aktuellen Benutzer)"
#. IDD_COMPARE_STATISTICS3
-#: Merge.rc:2709 Merge.rc:2750
+#: Merge.rc:2719 Merge.rc:2760
#, c-format
msgid "Compare Statistics"
msgstr "Vergleichsstatistik"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2712 Merge.rc:2753
+#: Merge.rc:2722 Merge.rc:2763
#, c-format
msgid "Folders:"
msgstr "Ordner:"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2713 Merge.rc:2754
+#: Merge.rc:2723 Merge.rc:2764
#, c-format
msgid "Files:"
msgstr "Dateien:"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2719 Merge.rc:2738 Merge.rc:2760 Merge.rc:2799
+#: Merge.rc:2729 Merge.rc:2748 Merge.rc:2770 Merge.rc:2809
#, c-format
msgid "Binary:"
msgstr "Binär:"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2722 Merge.rc:2763
+#: Merge.rc:2732 Merge.rc:2773
#, c-format
msgid "Unique"
msgstr "Eindeutig"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2723 Merge.rc:2764
+#: Merge.rc:2733 Merge.rc:2774
#, c-format
msgid "Left:"
msgstr "Links:"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2728 Merge.rc:2774
+#: Merge.rc:2738 Merge.rc:2784
#, c-format
msgid "Right:"
msgstr "Rechts:"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2742 Merge.rc:2803
+#: Merge.rc:2752 Merge.rc:2813
#, c-format
msgid "Total:"
msgstr "Gesamt:"
#. IDD_COMPARE_STATISTICS3, IDOK
-#: Merge.rc:2745 Merge.rc:2806
+#: Merge.rc:2755 Merge.rc:2816
#, c-format
msgid "Close"
msgstr "Schließen"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2769
+#: Merge.rc:2779
#, c-format
msgid "Middle:"
msgstr "Mitte:"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2779
+#: Merge.rc:2789
#, c-format
msgid "Missing Left:"
msgstr "Links fehlt:"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2784
+#: Merge.rc:2794
#, c-format
msgid "Missing Middle:"
msgstr "Mitte fehlt:"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2789
+#: Merge.rc:2799
#, c-format
msgid "Missing Right:"
msgstr "Rechts fehlt:"
#. IDD_LOAD_SAVE_CODEPAGE, IDC_AFFECTS_GROUP
-#: Merge.rc:2814
+#: Merge.rc:2824
#, c-format
msgid "Affects"
msgstr "Betrifft"
#. IDD_LOAD_SAVE_CODEPAGE, IDC_RIGHT_FILES_LABEL
-#: Merge.rc:2816 Merge.rc:2818 Merge.rc:2820
+#: Merge.rc:2826 Merge.rc:2828 Merge.rc:2830
#, c-format
msgid "(Affects)"
msgstr "(Betrifft)"
#. IDD_LOAD_SAVE_CODEPAGE, IDC_LOADING_GROUP
-#: Merge.rc:2821
+#: Merge.rc:2831
#, c-format
msgid "Select Codepage for"
msgstr "Codeseite auswählen für"
#. IDD_LOAD_SAVE_CODEPAGE, IDC_LOAD_FILES_LABEL
-#: Merge.rc:2822
+#: Merge.rc:2832
#, c-format
msgid "&File Loading:"
msgstr "&Datei laden:"
#. IDD_LOAD_SAVE_CODEPAGE, IDC_SAVE_FILES_LABEL
-#: Merge.rc:2824
+#: Merge.rc:2834
#, c-format
msgid "File &Saving:"
msgstr "Datei &speichern:"
#. IDD_LOAD_SAVE_CODEPAGE, IDC_LOAD_SAVE_SAME_CODEPAGE
-#: Merge.rc:2827
+#: Merge.rc:2837
#, c-format
msgid "&Use same codepage for both"
msgstr "&Gleiche Codeseite für beides verwenden"
#. IDS_MESSAGEBOX_CANCEL
-#: Merge.rc:2830 Merge.rc:4172
+#: Merge.rc:2840 Merge.rc:4182
#, c-format
msgid "&Cancel"
msgstr "&Abbrechen"
#. IDD_FILTERS_FILEFILTERS_TEST
-#: Merge.rc:2835
+#: Merge.rc:2845
#, c-format
msgid "Test Filter"
msgstr "Filter testen"
#. IDD_FILTERS_FILEFILTERS_TEST, IDC_HEADER
-#: Merge.rc:2838
+#: Merge.rc:2848
msgid "Testing filter:"
msgstr "Filter testen:"
#. IDD_FILTERS_FILEFILTERS_TEST, IDC_PROMPT_LABEL
-#: Merge.rc:2840
+#: Merge.rc:2850
#, c-format
msgid "&Enter text to test:"
msgstr "Te&xt zum Testen:"
#. IDD_FILTERS_FILEFILTERS_TEST, IDC_IS_DIRECTORY
-#: Merge.rc:2842
+#: Merge.rc:2852
#, c-format
msgid "&Folder Name"
msgstr "&Ordnername"
#. IDD_FILTERS_FILEFILTERS_TEST, IDC_STATIC
-#: Merge.rc:2843
+#: Merge.rc:2853
#, c-format
msgid "Result:"
msgstr "Ergebnis:"
#. IDD_FILTERS_FILEFILTERS_TEST, IDC_TEST_BTN
-#: Merge.rc:2845
+#: Merge.rc:2855
#, c-format
msgid "&Test"
msgstr "&Testen"
#. IDS_OPTIONSPG_TABLECOMPARE
-#: Merge.rc:2851 Merge.rc:2990 Merge.rc:4228
+#: Merge.rc:2861 Merge.rc:3000 Merge.rc:4238
msgid "Table"
msgstr "Tabelle"
#. IDD_OPEN_TABLE, IDC_STATIC
-#: Merge.rc:2854
+#: Merge.rc:2864
msgid "File type"
msgstr "Dateityp"
#. IDD_OPEN_TABLE, IDC_COMPARETABLE_CSV
-#: Merge.rc:2855
+#: Merge.rc:2865
msgid "&CSV"
msgstr "&CSV"
#. IDD_OPEN_TABLE, IDC_COMPARETABLE_TSV
-#: Merge.rc:2856
+#: Merge.rc:2866
msgid "&TSV"
msgstr "&TSV"
#. IDD_OPEN_TABLE, IDC_COMPARETABLE_DSV
-#: Merge.rc:2857
+#: Merge.rc:2867
msgid "Custom &Delimiter-Separated Values"
msgstr "&Benutzerdefinierte, durch Trennzeichen getrennte Werte"
#. IDD_PROPPAGE_COMPARE_TABLE, IDC_STATIC
-#: Merge.rc:2859 Merge.rc:2861 Merge.rc:2996 Merge.rc:3004
+#: Merge.rc:2869 Merge.rc:2871 Merge.rc:3006 Merge.rc:3014
msgid "D&elimiter character:"
msgstr "T&rennzeichen:"
#. IDD_PROPPAGE_COMPARE_TABLE, IDC_COMPARETABLE_ALLOWNEWLINE
-#: Merge.rc:2863 Merge.rc:3006
+#: Merge.rc:2873 Merge.rc:3016
msgid "&Allow newlines in quotes"
msgstr "&Zeilenumbrüche in Zitaten zulassen"
#. IDD_PROPPAGE_COMPARE_TABLE, IDC_STATIC
-#: Merge.rc:2865 Merge.rc:3008
+#: Merge.rc:2875 Merge.rc:3018
msgid "&Quote character:"
msgstr "&Anführungszeichen:"
#. IDS_OPTIONSPG_BACKUPS
-#: Merge.rc:2873 Merge.rc:4216
+#: Merge.rc:2883 Merge.rc:4226
#, c-format
msgid "Backup Files"
msgstr "Sicherungsdateien"
#. IDD_PROPPAGE_BACKUPS, IDC_STATIC
-#: Merge.rc:2876
+#: Merge.rc:2886
#, c-format
msgid "Create backup files for:"
msgstr "Sicherungsdateien erzeugen beim:"
#. IDD_PROPPAGE_BACKUPS, IDC_BACKUP_FOLDERCMP
-#: Merge.rc:2877
+#: Merge.rc:2887
#, c-format
msgid "&Folder compare"
msgstr "&Ordnervergleich"
#. IDD_PROPPAGE_BACKUPS, IDC_BACKUP_FILECMP
-#: Merge.rc:2878
+#: Merge.rc:2888
#, c-format
msgid "Fil&e compare"
msgstr "&Dateivergleich"
#. IDD_PROPPAGE_BACKUPS, IDC_STATIC
-#: Merge.rc:2879
+#: Merge.rc:2889
#, c-format
msgid "Create backup files in:"
msgstr "Sicherungsdateien erzeugen im:"
#. IDD_PROPPAGE_BACKUPS, IDC_BACKUP_ORIGFOLD
-#: Merge.rc:2880
+#: Merge.rc:2890
#, c-format
msgid "&Original file's folder"
msgstr "Ordner der &ursprünglichen Datei"
#. IDD_PROPPAGE_BACKUPS, IDC_BACKUP_GLOBALFOLD
-#: Merge.rc:2881
+#: Merge.rc:2891
#, c-format
msgid "&Global backup folder:"
msgstr "&Globalen Sicherungsordner:"
#. IDD_PROPPAGE_BACKUPS, IDC_STATIC
-#: Merge.rc:2884
+#: Merge.rc:2894
#, c-format
msgid "Backup filename:"
msgstr "Sicherungsdateiname:"
#. IDD_PROPPAGE_BACKUPS, IDC_BACKUP_APPEND_BAK
-#: Merge.rc:2885
+#: Merge.rc:2895
msgid "&Append .bak extension"
msgstr "&Erweiterung .bak anhängen"
#. IDD_PROPPAGE_BACKUPS, IDC_BACKUP_APPEND_TIME
-#: Merge.rc:2886
+#: Merge.rc:2896
#, c-format
msgid "A&ppend timestamp"
msgstr "&Zeitstempel anhängen"
#. IDS_CONFIRM_COPY_CAPTION
-#: Merge.rc:2892 Merge.rc:4565
+#: Merge.rc:2902 Merge.rc:4575
#, c-format
msgid "Confirm Copy"
msgstr "Kopieren bestätigen"
#. IDD_CONFIRM_COPY, IDC_FLDCONFIRM_QUERY
-#: Merge.rc:2896
+#: Merge.rc:2906
#, c-format
msgid "Are you sure you want to copy XXX items?"
msgstr "Wollen Sie wirklich XXX Objekte kopieren?"
#. IDD_CONFIRM_COPY, IDC_FLDCONFIRM_FROM_TEXT
-#: Merge.rc:2897
+#: Merge.rc:2907
#, c-format
msgid "From left"
msgstr "Von links"
#. IDD_CONFIRM_COPY, IDC_FLDCONFIRM_TO_TEXT
-#: Merge.rc:2899
+#: Merge.rc:2909
#, c-format
msgid "To right"
msgstr "Nach rechts"
#. IDS_MESSAGEBOX_DONT_ASK_AGAIN
-#: Merge.rc:2901 Merge.rc:4191
+#: Merge.rc:2911 Merge.rc:4201
#, c-format
msgid "Don't ask this &question again."
msgstr "Diese &Frage nicht erneut stellen."
#. IDD_CONFIRM_COPY, IDYES
-#: Merge.rc:2903
+#: Merge.rc:2913
#, c-format
msgid "Yes"
msgstr "Ja"
#. IDD_CONFIRM_COPY, IDNO
-#: Merge.rc:2904
+#: Merge.rc:2914
#, c-format
msgid "No"
msgstr "Nein"
#. IDS_PROJECT_ITEM_PLUGIN
-#: Merge.rc:2909 Merge.rc:4323
+#: Merge.rc:2919 Merge.rc:4333
#, c-format
msgid "Plugins"
msgstr "Plugins"
#. IDD_PLUGINS_LIST, IDC_PLUGINS_ENABLE
-#: Merge.rc:2912
+#: Merge.rc:2922
#, c-format
msgid "&Enable plugins"
msgstr "&Plugins aktivieren"
#. IDD_PLUGINS_EDITPLUGIN, IDC_STATIC
-#: Merge.rc:2913 Merge.rc:3113
+#: Merge.rc:2923 Merge.rc:3123
msgid "Plugin &type:"
msgstr "Plugin-&Typ:"
#. IDD_PLUGINS_LIST, IDC_STATIC
-#: Merge.rc:2916
+#: Merge.rc:2926
msgid "File filters:"
msgstr "Dateifilter:"
#. IDD_PLUGINS_LIST, IDC_STATIC
-#: Merge.rc:2918
+#: Merge.rc:2928
msgid "&Plugin arguments:"
msgstr "&Plugin-Argumente:"
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_AUTOMATIC
-#: Merge.rc:2920 Merge.rc:3134
+#: Merge.rc:2930 Merge.rc:3144
msgid "Enable &automatic unpacking/prediffing"
msgstr "&Automatisches Entpacken/Prediffing für das Plugin aktivieren"
#. IDS_OPTIONSPG_SHELL
-#: Merge.rc:2934 Merge.rc:4217
+#: Merge.rc:2944 Merge.rc:4227
#, c-format
msgid "Shell Integration"
msgstr "Shell-Integration"
#. IDD_PROPPAGE_SHELL, IDC_STATIC
-#: Merge.rc:2937
+#: Merge.rc:2947
#, c-format
msgid "Explorer"
msgstr "Explorer"
#. IDD_PROPPAGE_SHELL, IDC_EXPLORER_CONTEXT
-#: Merge.rc:2938
+#: Merge.rc:2948
#, c-format
msgid "&Add to context menu"
msgstr "&Zum Kontextmenü hinzufügen"
#. IDD_PROPPAGE_SHELL, IDC_EXPLORER_ADVANCED
-#: Merge.rc:2939
+#: Merge.rc:2949
#, c-format
msgid "E&nable advanced menu"
msgstr "&Erweitertes Menü verwenden"
#. IDD_PROPPAGE_SHELL, IDC_EXPLORER_COMPARE_AS
-#: Merge.rc:2940
+#: Merge.rc:2950
msgid "Enable &Compare As menu"
msgstr "Menü \"Vergleichen als\" verwenden"
#. IDD_PROPPAGE_SHELL, IDC_REGISTER_SHELLEXTENSION
-#: Merge.rc:2941
+#: Merge.rc:2951
#, c-format
msgid "&Register Shell Extension"
msgstr "Shell-Erweiterung registrieren"
#. IDD_PROPPAGE_SHELL, IDC_UNREGISTER_SHELLEXTENSION
-#: Merge.rc:2942
+#: Merge.rc:2952
#, c-format
msgid "&Unregister Shell Extension"
msgstr "Shell-Erweiterung nicht registrieren"
#. IDD_PROPPAGE_SHELL, IDC_REGISTER_SHELLEXTENSION_PERUSER
-#: Merge.rc:2943
+#: Merge.rc:2953
msgid "Register Shell Extension for Current User &Only"
msgstr "Shell-Erweiterung nur für aktuellen Nutzer registrieren"
#. IDD_PROPPAGE_SHELL, IDC_UNREGISTER_SHELLEXTENSION_PERUSER
-#: Merge.rc:2944
+#: Merge.rc:2954
msgid "Unregister Shell Extension for Current User On&ly"
msgstr "Shell-Erweiterung nur für aktuellen Nutzer nicht registrieren"
#. IDD_PROPPAGE_SHELL, IDC_REGISTER_WINMERGECONTEXTMENU
-#: Merge.rc:2945
+#: Merge.rc:2955
msgid "Register Shell Extension for &Windows 11"
msgstr "Shell-Erweiterung für Windows 11 und höher registrieren"
#. IDD_PROPPAGE_SHELL, IDC_UNREGISTER_WINMERGECONTEXTMENU
-#: Merge.rc:2946
+#: Merge.rc:2956
msgid "Unregister Shell Extension for W&indows 11"
msgstr "Shell-Erweiterung für Windows 11 und höher nicht registrieren"
#. IDD_PROPPAGE_SHELL, IDC_STATIC
-#: Merge.rc:2947
+#: Merge.rc:2957
msgid "Jump List"
msgstr "Sprungliste"
#. IDD_PROPPAGE_SHELL, IDC_CLEAR_ALL_RECENT_ITEMS
-#: Merge.rc:2949
+#: Merge.rc:2959
msgid "Clear all recent items"
msgstr "Alle kürzlichen Objekte löschen"
#. IDS_OPTIONSPG_FOLDERCOMPARE
-#: Merge.rc:2954 Merge.rc:4225
+#: Merge.rc:2964 Merge.rc:4235
msgctxt "Options dialog|Categories"
msgid "Folder"
msgstr "Ordner"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC
-#: Merge.rc:2957
+#: Merge.rc:2967
msgid "&Compare method:"
msgstr "Vergleichs&methode:"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_COMPARE_STOPFIRST
-#: Merge.rc:2959
+#: Merge.rc:2969
#, c-format
msgid "S&top after first difference"
msgstr "&Nach dem ersten Unterschied stoppen"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_IGNORE_SMALLTIMEDIFF
-#: Merge.rc:2961
+#: Merge.rc:2971
#, c-format
msgid "Ign&ore time differences less than 3 seconds"
msgstr "&Zeitunterschiede kleiner als 3 Sekunden ignorieren"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC
-#: Merge.rc:2964
+#: Merge.rc:2974
msgid "Expand subfolders &after comparison:"
msgstr "Unterordner nach dem Vergleich &automatisch aufklappen:"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_COMPARE_WALKSUBDIRS
-#: Merge.rc:2966
+#: Merge.rc:2976
#, c-format
msgid "Include &unique subfolders contents"
msgstr "&Eindeutige Unterordner-Inhalte einbeziehen"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_IGNORE_REPARSEPOINTS
-#: Merge.rc:2968
+#: Merge.rc:2978
#, c-format
msgid "Ignore &reparse points"
msgstr "Anal&ysepunkte ignorieren"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC
-#: Merge.rc:2969
+#: Merge.rc:2979
msgid "Switch to &quick compare when size exceeds (MB):"
msgstr "Schwellenwert für den Wechsel zum &Schnellvergleich (MB):"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC
-#: Merge.rc:2971
+#: Merge.rc:2981
msgid "Switch to &binary compare when size exceeds (MB):"
msgstr "Schwellenwert für den Wechsel zum &Binärvergleich (MB):"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC
-#: Merge.rc:2975
+#: Merge.rc:2985
msgid "Additional comparison condi&tions:"
msgstr "Zusätzliche Vergleichsbedingungen:"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC
-#: Merge.rc:2978
+#: Merge.rc:2988
msgid "&Rename/move detection:"
msgstr "Umbenennungs-/Ve&rschiebungserkennung:"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC
-#: Merge.rc:2980
+#: Merge.rc:2990
msgid "Rename/move detection &keys:"
msgstr "Umbenennungs-/Verschiebungser&kennungsschlüssel:"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC
-#: Merge.rc:2983
+#: Merge.rc:2993
msgid "M&erge renames and moves:"
msgstr "Umbenennungen und Verschiebungen &zusammenführen:"
#. IDD_PROPPAGE_COMPARE_TABLE, IDC_STATIC
-#: Merge.rc:2994 Merge.rc:2999 Merge.rc:3002
+#: Merge.rc:3004 Merge.rc:3009 Merge.rc:3012
msgid "File patterns:"
msgstr "&Dateimuster:"
#. IDD_PROPPAGE_COMPARE_TABLE, IDC_STATIC
-#: Merge.rc:3001
+#: Merge.rc:3011
msgid "Custom Delimiter-Separated Values"
msgstr "Benutzerdefinierte, durch Trennzeichen getrennte Werte"
#. IDS_OPTIONSPG_BINARYCOMPARE
-#: Merge.rc:3015 Merge.rc:4227
+#: Merge.rc:3025 Merge.rc:4237
msgctxt "Options dialog|Categories"
msgid "Binary"
msgstr "Binär"
#. IDD_PROPPAGE_COMPARE_BINARY, IDC_STATIC
-#: Merge.rc:3018
+#: Merge.rc:3028
#, c-format
msgid "Binary file &patterns:"
msgstr "Binärdatei&muster:"
#. IDD_PROPPAGE_COMPARE_BINARY, IDC_STATIC
-#: Merge.rc:3020
+#: Merge.rc:3030
#, c-format
msgid "Frhed settings"
msgstr "Frhed-Einstellungen"
#. IDD_PROPPAGE_COMPARE_BINARY, IDC_COMPAREBINARY_VIEWSETTINGS
-#: Merge.rc:3021
+#: Merge.rc:3031
#, c-format
msgid "View &Settings..."
msgstr "&Einstellungen..."
#. IDD_PROPPAGE_COMPARE_BINARY, IDC_COMPAREBINARY_BINARYMODE
-#: Merge.rc:3022
+#: Merge.rc:3032
#, c-format
msgid "&Binary Mode..."
msgstr "&Binärmodus..."
#. IDD_PROPPAGE_COMPARE_BINARY, IDC_COMPAREBINARY_CHARACTERSET
-#: Merge.rc:3023
+#: Merge.rc:3033
#, c-format
msgid "&Character Set..."
msgstr "&Zeichensatz..."
#. IDS_PRPCAT_IMAGE
-#: Merge.rc:3029 Merge.rc:4226 Merge.rc:4665
+#: Merge.rc:3039 Merge.rc:4236 Merge.rc:4675
msgid "Image"
msgstr "Bild"
#. IDD_PROPPAGE_COMPARE_IMAGE, IDC_STATIC
-#: Merge.rc:3032
+#: Merge.rc:3042
#, c-format
msgid "Image file &patterns:"
msgstr "&Bilddateimuster:"
#. IDD_PROPPAGE_COMPARE_IMAGE, IDC_ENABLE_IMGCMP_IN_DIRCMP
-#: Merge.rc:3034
+#: Merge.rc:3044
msgid "&Enable image compare in folder compare"
msgstr "&Bildvergleich im Ordnervergleich aktivieren"
#. IDD_PROPPAGE_COMPARE_IMAGE, IDC_STATIC
-#: Merge.rc:3036
+#: Merge.rc:3046
msgid "OCR result:"
msgstr "OCR-Resultat:"
#. IDS_OPTIONSPG_WEBPAGECOMPARE
-#: Merge.rc:3043 Merge.rc:4229
+#: Merge.rc:3053 Merge.rc:4239
msgid "Webpage"
msgstr "Webseite"
#. IDD_PROPPAGE_COMPARE_WEBPAGE, IDC_STATIC
-#: Merge.rc:3046
+#: Merge.rc:3056
msgid "URL pattern to &include (Regular expression):"
msgstr "Einzuschließendes URL-Muster (Regulärer Ausdruck):"
#. IDD_PROPPAGE_COMPARE_WEBPAGE, IDC_STATIC
-#: Merge.rc:3048
+#: Merge.rc:3058
msgid "URL pattern to &exclude (Regular expression):"
msgstr "Auszuschließendes URL-Muster (Regulärer Ausdruck):"
#. IDD_PROPPAGE_COMPARE_WEBPAGE, IDC_STATIC
-#: Merge.rc:3050
+#: Merge.rc:3060
msgid "&User data folder location:"
msgstr "Ort des Benutzerdatenordners:"
#. IDD_PROPPAGE_COMPARE_WEBPAGE, IDC_COMPAREWEBPAGE_USERDATAFOLDER_PERPANE
-#: Merge.rc:3052
+#: Merge.rc:3062
msgid "&Separate user data folders for each pane"
msgstr "&Separate Benutzerdatenordner für jeden Bereich"
#. IDD_ENCODINGERROR, IDC_HEXVIEW
-#: Merge.rc:3065
+#: Merge.rc:3075
#, c-format
msgid "&Hex View"
msgstr "&Hex-Ansicht"
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3110
+#: Merge.rc:3120
msgid "Edit Plugin"
msgstr "Plugin bearbeiten"
#. IDD_PLUGINS_EDITPLUGIN, IDC_STATIC
-#: Merge.rc:3123
+#: Merge.rc:3133
msgid "&Category:"
msgstr "&Kategorie:"
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_MENUCAPTION_STATIC
-#: Merge.rc:3125
+#: Merge.rc:3135
msgid "&Menu caption:"
msgstr "&Menü-Beschriftung:"
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_WINDOWTYPE_STATIC
-#: Merge.rc:3127
+#: Merge.rc:3137
msgid "&Window type:"
msgstr "&Fenstertyp:"
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_UNPACKEDFILEEXTENSION_STATIC
-#: Merge.rc:3132
+#: Merge.rc:3142
msgid "&Unpacked file extension:"
msgstr "&Entpackte Dateierweiterung:"
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_ARGUMENTSREQUIRED
-#: Merge.rc:3136
+#: Merge.rc:3146
msgid "&Require arguments"
msgstr "A&rgumente benötigt"
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_GENERATESCRIPT
-#: Merge.rc:3137
+#: Merge.rc:3147
msgid "&Generate editor script"
msgstr "&Editor-Skript generieren"
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_COMMAND_LINE_STATIC
-#: Merge.rc:3140
+#: Merge.rc:3150
msgid "Command &line:"
msgstr "&Befehlszeile:"
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_SCRIPT_FILEEXTENSION_STATIC
-#: Merge.rc:3143
+#: Merge.rc:3153
msgid "&Script file extension:"
msgstr "&Skript Dateierweiterung:"
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_SCRIPT_BODY_STATIC
-#: Merge.rc:3145
+#: Merge.rc:3155
msgid "Script &body:"
msgstr "&Skriptinhalt:"
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3154
+#: Merge.rc:3164
msgid "Font"
msgstr "Schriftart"
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3157
+#: Merge.rc:3167
msgid "&Font:"
msgstr "Schri&ftart:"
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3163
+#: Merge.rc:3173
msgid "Font st&yle:"
msgstr "Schriftart&stil:"
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3169
+#: Merge.rc:3179
msgid "&Size:"
msgstr "&Größe:"
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3175
+#: Merge.rc:3185
msgid "Effects"
msgstr "Effekte"
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3176
+#: Merge.rc:3186
msgid "Stri&keout"
msgstr "&Durchstrich"
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3177
+#: Merge.rc:3187
msgid "&Underline"
msgstr "&Unterstrich"
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3179
+#: Merge.rc:3189
msgid "&Color:"
msgstr "&Farbe:"
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3184
+#: Merge.rc:3194
msgid "Sample"
msgstr "Beispiel"
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3185
+#: Merge.rc:3195
msgid "AaBbYyZz"
msgstr "AaBbYyZz"
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3189
+#: Merge.rc:3199
msgid "Sc&ript:"
msgstr "Sk&ript:"
#. IDD_PLUGINS_EDITPLUGIN, IDC_MANAGE_LINK
-#: Merge.rc:3194
+#: Merge.rc:3204
msgid "Show more fonts"
msgstr "Weitere Schriftarten anzeigen"
#. ID_INDICATOR_EXT
-#: Merge.rc:4118
+#: Merge.rc:4128
#, c-format
msgid "EXT"
msgstr "Erw"
#. ID_INDICATOR_CAPS
-#: Merge.rc:4119
+#: Merge.rc:4129
#, c-format
msgid "CAP"
msgstr "Fest"
#. ID_INDICATOR_NUM
-#: Merge.rc:4120
+#: Merge.rc:4130
#, c-format
msgid "NUM"
msgstr "Num"
#. ID_INDICATOR_SCRL
-#: Merge.rc:4121
+#: Merge.rc:4131
#, c-format
msgid "SCRL"
msgstr "RF"
#. ID_INDICATOR_OVR
-#: Merge.rc:4122
+#: Merge.rc:4132
#, c-format
msgid "OVR"
msgstr "Üb"
#. ID_INDICATOR_REC
-#: Merge.rc:4123
+#: Merge.rc:4133
#, c-format
msgid "REC"
msgstr "MA"
#. ID_FILE_NEW
-#: Merge.rc:4129
+#: Merge.rc:4139
#, c-format
msgid ""
"\n"
@@ -5355,7 +5366,7 @@ msgstr ""
"Neue Dokumente"
#. ID_FILE_OPEN
-#: Merge.rc:4130
+#: Merge.rc:4140
#, c-format
msgid ""
"\n"
@@ -5365,7 +5376,7 @@ msgstr ""
"Öffnen (Strg+O)"
#. ID_FILE_SAVE
-#: Merge.rc:4131
+#: Merge.rc:4141
#, c-format
msgid ""
"\n"
@@ -5375,29 +5386,29 @@ msgstr ""
"Speichern (Strg+S)"
#. IDS_UNK_ERROR_READING_PROJECT
-#: Merge.rc:4137
+#: Merge.rc:4147
msgid "Unknown error opening project file."
msgstr "Unbekannter Fehler beim Versuch, die Projektdatei zu öffnen."
#. IDS_UNK_ERROR_SAVING_PROJECT
-#: Merge.rc:4138
+#: Merge.rc:4148
msgid "Unknown error saving project file."
msgstr "Unbekannter Fehler beim Versuch, die Projektdatei zu speichern."
#. IDS_PROJFILE_LOAD_SUCCESS
-#: Merge.rc:4143
+#: Merge.rc:4153
#, c-format
msgid "Project file loaded."
msgstr "Projektdatei erfolgreich geladen."
#. IDS_PROJFILE_SAVE_SUCCESS
-#: Merge.rc:4144
+#: Merge.rc:4154
#, c-format
msgid "Project file saved."
msgstr "Projektdatei erfolgreich gespeichert."
#. ID_EDIT_UNDO
-#: Merge.rc:4150
+#: Merge.rc:4160
#, c-format
msgid ""
"\n"
@@ -5407,7 +5418,7 @@ msgstr ""
"Rückgängig (Strg+Z)"
#. ID_EDIT_REDO
-#: Merge.rc:4151
+#: Merge.rc:4161
#, c-format
msgid ""
"\n"
@@ -5417,7 +5428,7 @@ msgstr ""
"Wiederherstellen (Strg+Y)"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:4158
+#: Merge.rc:4168
#, c-format
msgid ""
"\n"
@@ -5437,7 +5448,7 @@ msgstr ""
"WinMerge Dateivergleich"
#. IDR_DIRDOCTYPE
-#: Merge.rc:4159
+#: Merge.rc:4169
#, c-format
msgid ""
"\n"
@@ -5457,183 +5468,183 @@ msgstr ""
"WinMerge Ordnervergleich"
#. IDS_SPLASH_GPLTEXT
-#: Merge.rc:4165
+#: Merge.rc:4175
#, c-format
msgid "WinMerge comes with ABSOLUTELY NO WARRANTY. It is free software and can be redistributed under the conditions of the GNU General Public License - see the Help menu for details."
msgstr "WinMerge kommt mit ABSOLUT KEINER GARANTIE. Es ist freie Software und Sie können sie unter bestimmten Bedingungen weiter vertreiben. Für Details sehen Sie sich die GNU General Public License unter dem Hilfe-Menü an."
#. IDS_MESSAGEBOX_ABORT
-#: Merge.rc:4173
+#: Merge.rc:4183
#, c-format
msgid "&Abort"
msgstr "&Abbrechen"
#. IDS_MESSAGEBOX_RETRY
-#: Merge.rc:4174
+#: Merge.rc:4184
#, c-format
msgid "&Retry"
msgstr "&Wiederholen"
#. IDS_MESSAGEBOX_IGNORE
-#: Merge.rc:4175
+#: Merge.rc:4185
#, c-format
msgid "&Ignore"
msgstr "&Ignorieren"
#. IDS_MESSAGEBOX_IGNOREALL
-#: Merge.rc:4176
+#: Merge.rc:4186
#, c-format
msgid "Ignore &all"
msgstr "&Alle ignorieren"
#. IDS_MESSAGEBOX_YES
-#: Merge.rc:4177
+#: Merge.rc:4187
#, c-format
msgid "&Yes"
msgstr "&Ja"
#. IDS_MESSAGEBOX_YES_TO_ALL
-#: Merge.rc:4183
+#: Merge.rc:4193
#, c-format
msgid "Yes to &all"
msgstr "Ja für &alle"
#. IDS_MESSAGEBOX_NO
-#: Merge.rc:4184
+#: Merge.rc:4194
#, c-format
msgid "&No"
msgstr "&Nein"
#. IDS_MESSAGEBOX_NO_TO_ALL
-#: Merge.rc:4185
+#: Merge.rc:4195
#, c-format
msgid "No to a&ll"
msgstr "Nein für a&lle"
#. IDS_MESSAGEBOX_CONTINUE
-#: Merge.rc:4186
+#: Merge.rc:4196
#, c-format
msgid "&Continue"
msgstr "&Fortsetzen"
#. IDS_MESSAGEBOX_SKIP
-#: Merge.rc:4187
+#: Merge.rc:4197
#, c-format
msgid "&Skip"
msgstr "Über&springen"
#. IDS_MESSAGEBOX_SKIPALL
-#: Merge.rc:4188
+#: Merge.rc:4198
#, c-format
msgid "Skip &all"
msgstr "&Alle überspringen"
#. IDS_MESSAGEBOX_DONT_DISPLAY_AGAIN
-#: Merge.rc:4190
+#: Merge.rc:4200
#, c-format
msgid "Don't display this &message again."
msgstr "Diese &Meldung nicht erneut anzeigen."
-#: Merge.rc:4193
+#: Merge.rc:4203
msgid "To make this message box visible, press Reset on the Message Boxes page in Options."
msgstr "Um diese Meldung wieder sichtbar zu schalten, betätigen Sie die Schaltfläche 'Zurücksetzen' unter Einstellungen/Meldungen."
#. IDS_OPTIONSPG_EDITOR_COMPAREMERGE
-#: Merge.rc:4203
+#: Merge.rc:4213
msgid "Compare/Merge"
msgstr "Vergleichen/Zusammenführen"
#. IDS_OPTIONSPG_SYNTAXCOLORS
-#: Merge.rc:4204 Merge.rc:4208
+#: Merge.rc:4214 Merge.rc:4218
#, c-format
msgid "Syntax"
msgstr "Syntax"
#. IDS_OPTIONSPG_COLOR_SCHEMES
-#: Merge.rc:4206
+#: Merge.rc:4216
msgid "Color Schemes"
msgstr "Farbschema"
#. IDS_OPTIONSPG_DIRCOLORS
-#: Merge.rc:4210
+#: Merge.rc:4220
msgid "Folder Compare"
msgstr "Ordnervergleich"
#. IDS_OPTIONSPG_PROJECT
-#: Merge.rc:4215
+#: Merge.rc:4225
msgid "Project"
msgstr "Projekt"
#. IDS_COLHDR_NSDIFFS
-#: Merge.rc:4218 Merge.rc:4640
+#: Merge.rc:4228 Merge.rc:4650
#, c-format
msgid "Differences"
msgstr "Unterschiede"
#. IDS_OPTIONSPG_MESSAGEBOXES
-#: Merge.rc:4220
+#: Merge.rc:4230
msgid "Message Boxes"
msgstr "Meldungen"
#. IDS_TO
-#: Merge.rc:4235
+#: Merge.rc:4245
#, c-format
msgid "To:"
msgstr "Nach:"
#. IDS_FROM_LEFT
-#: Merge.rc:4236
+#: Merge.rc:4246
#, c-format
msgid "From left:"
msgstr "Von links:"
#. IDS_TO_LEFT
-#: Merge.rc:4237
+#: Merge.rc:4247
#, c-format
msgid "To left:"
msgstr "Nach links:"
#. IDS_FROM_RIGHT
-#: Merge.rc:4238
+#: Merge.rc:4248
#, c-format
msgid "From right:"
msgstr "Von rechts:"
#. IDS_TO_RIGHT
-#: Merge.rc:4239
+#: Merge.rc:4249
#, c-format
msgid "To right:"
msgstr "Nach rechts:"
#. IDS_FROM_MIDDLE
-#: Merge.rc:4240
+#: Merge.rc:4250
msgid "From middle:"
msgstr "Von der Mitte:"
#. IDS_TO_MIDDLE
-#: Merge.rc:4241
+#: Merge.rc:4251
msgid "To middle:"
msgstr "In die Mitte:"
#. IDS_VERSION_FMT
-#: Merge.rc:4247
+#: Merge.rc:4257
#, c-format
msgid "Version %1"
msgstr "Version %1"
#. IDS_OPTIONS_TITLE
-#: Merge.rc:4253
+#: Merge.rc:4263
#, c-format
msgid "Options (%1)"
msgstr "Eigenschaften (%1)"
#. IDS_MESSAGE_BOX_ARE_RESET
-#: Merge.rc:4254
+#: Merge.rc:4264
#, c-format
msgid "All message boxes are now displayed again."
msgstr "Alle Meldungen werden wieder angezeigt."
-#: Merge.rc:4256
+#: Merge.rc:4266
#, c-format
msgid "Tab size value is out of range. Please use 1 - %1."
msgstr ""
@@ -5642,172 +5653,172 @@ msgstr ""
"Bitte benutzen Sie Werte von 1 - %1."
#. IDS_PROJECT_OPEN
-#: Merge.rc:4262 Merge.rc:4318
+#: Merge.rc:4272 Merge.rc:4328
#, c-format
msgid "Open"
msgstr "Öffnen"
#. IDS_PROGRAMFILES
-#: Merge.rc:4263
+#: Merge.rc:4273
#, c-format
msgid "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||"
msgstr "Programme|*.exe;*.bat;*.cmd|Alle Dateien (*.*)|*.*||"
#. IDS_ALLFILES
-#: Merge.rc:4264
+#: Merge.rc:4274
#, c-format
msgid "All Files (*.*)|*.*||"
msgstr "Alle Dateien (*.*)|*.*||"
#. IDS_PROJECTFILES
-#: Merge.rc:4265
+#: Merge.rc:4275
#, c-format
msgid "WinMerge Project Files (*.WinMerge)|*.WinMerge||"
msgstr "WinMerge-Projektdatei (*.WinMerge)|*.WinMerge||"
#. IDS_INIFILES
-#: Merge.rc:4267
+#: Merge.rc:4277
#, c-format
msgid "Options files (*.ini)|*.ini|All Files (*.*)|*.*||"
msgstr "Einstellungsdateien (*.ini)|*.ini|Alle Dateien (*.*)|*.*||"
#. IDS_REPLACELIST_FILES
-#: Merge.rc:4268
+#: Merge.rc:4278
msgid "Tab-Separated Values (*.tsv;*.txt)|*.tsv;*.txt|All Files (*.*)|*.*||"
msgstr "Tabulator-getrennte Werte (*.tsv;*.txt)|*.tsv;*.txt|Alle Dateien (*.*)|*.*||"
#. IDS_TEXT_REPORT_FILES
-#: Merge.rc:4274
+#: Merge.rc:4284
#, c-format
msgid "Text Files (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|All Files (*.*)|*.*||"
msgstr "Textdateien (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|Alle Dateien (*.*)|*.*||"
#. IDS_HTML_REPORT_FILES
-#: Merge.rc:4275
+#: Merge.rc:4285
#, c-format
msgid "HTML Files (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||"
msgstr "HTML-Dateien (*.htm,*.html)|*.htm;*.html|Alle Dateien (*.*)|*.*||"
#. IDS_XML_REPORT_FILES
-#: Merge.rc:4276
+#: Merge.rc:4286
#, c-format
msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||"
msgstr "XML-Dateien (*.xml)|*.xml|Alle Dateien (*.*)|*.*||"
#. IDS_EXPANDSUBDIRS_DONOTEXPAND
-#: Merge.rc:4294
+#: Merge.rc:4304
msgid "Do not expand"
msgstr "Nicht aufklappen"
#. IDS_EXPANDSUBDIRS_ALL
-#: Merge.rc:4295
+#: Merge.rc:4305
msgid "Expand all subfolders"
msgstr "Alle Unterordner aufklappen"
#. IDS_EXPANDSUBDIRS_DIFFERENT
-#: Merge.rc:4296
+#: Merge.rc:4306
msgid "Expand different subfolders"
msgstr "Unterschiedliche Unterordner aufklappen"
#. IDS_EXPANDSUBDIRS_IDENTICAL
-#: Merge.rc:4297
+#: Merge.rc:4307
msgid "Expand identical subfolders"
msgstr "Identische Unterordner aufklappen"
#. IDS_SYNTAXTABLE_FILETYPE
-#: Merge.rc:4303
+#: Merge.rc:4313
msgid "File Type"
msgstr "Dateityp"
#. IDS_COLHDR_EXTENSION
-#: Merge.rc:4304 Merge.rc:4597
+#: Merge.rc:4314 Merge.rc:4607
#, c-format
msgid "Extension"
msgstr "Erweiterung"
#. IDS_PRPCAT_MESSAGE
-#: Merge.rc:4310 Merge.rc:4669
+#: Merge.rc:4320 Merge.rc:4679
msgid "Message"
msgstr "Meldung"
#. IDS_MESSAGEBOX_ANSWER
-#: Merge.rc:4311
+#: Merge.rc:4321
msgid "Answer"
msgstr "Antwort"
#. IDS_PROJECT_ITEM
-#: Merge.rc:4317
+#: Merge.rc:4327
msgid "Item"
msgstr "Objekt"
#. IDS_PROJECT_LOAD
-#: Merge.rc:4319
+#: Merge.rc:4329
msgid "Load"
msgstr "Laden"
#. IDS_PROJECT_SAVE
-#: Merge.rc:4320
+#: Merge.rc:4330
msgid "Save"
msgstr "Speichern"
#. IDS_PROJECT_ITEM_INCLUDE_SUBFOLDERS
-#: Merge.rc:4322
+#: Merge.rc:4332
msgid "Include Subfolders"
msgstr "Unterordner einbeziehen"
#. IDS_PROJECT_ITEM_COMPARE_OPTIONS
-#: Merge.rc:4324
+#: Merge.rc:4334
msgid "Compare Options"
msgstr "Vergleichseinstellungen"
#. IDS_PROJECT_ITEM_HIDDEN_ITEMS
-#: Merge.rc:4325
+#: Merge.rc:4335
msgid "Hidden Items"
msgstr "Ausgeblendete Objekte"
#. IDS_PLUGINSLIST_NAME
-#: Merge.rc:4331 Merge.rc:4956
+#: Merge.rc:4341 Merge.rc:4966
#, c-format
msgid "Name"
msgstr "Name"
#. IDS_FILTERFILE_PATHTITLE
-#: Merge.rc:4332
+#: Merge.rc:4342
#, c-format
msgid "Location"
msgstr "Pfad"
#. IDS_FILTER_TITLE
-#: Merge.rc:4333
+#: Merge.rc:4343
#, c-format
msgid "Filters"
msgstr "Filter"
#. IDS_FILTER_PREFIX
-#: Merge.rc:4334
+#: Merge.rc:4344
#, c-format
msgid "[F] "
msgstr "[F] "
#. IDS_PLUGINSLIST_DESC
-#: Merge.rc:4335 Merge.rc:4958
+#: Merge.rc:4345 Merge.rc:4968
#, c-format
msgid "Description"
msgstr "Beschreibung"
#. IDS_FILEFILTER_SAVENEW
-#: Merge.rc:4336
+#: Merge.rc:4346
#, c-format
msgid "Select Filename for New Filter"
msgstr "Dateinamen für neuen Filter auswählen"
#. IDS_FILEFILTER_FILEMASK
-#: Merge.rc:4337
+#: Merge.rc:4347
#, c-format
msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||"
msgstr "Dateifilter (*.flt)|*.flt|Alle Dateien (*.*)|*.*||"
-#: Merge.rc:4339
+#: Merge.rc:4349
#, c-format
msgid ""
"Cannot find filter template!\n"
@@ -5820,7 +5831,7 @@ msgstr ""
"Bitte kopieren Sie die Datei %1 in den Filterordner:\n"
"%2."
-#: Merge.rc:4341
+#: Merge.rc:4351
#, c-format
msgid ""
"Cannot copy filter template:\n"
@@ -5833,7 +5844,7 @@ msgstr ""
"\n"
"Bitte stellen Sie sicher, dass der Ordner existiert und beschreibbar ist."
-#: Merge.rc:4343
+#: Merge.rc:4353
#, c-format
msgid ""
"User's filter folder is not defined!\n"
@@ -5844,7 +5855,7 @@ msgstr ""
"\n"
"Bitte wählen Sie den Filterordner unter Einstellungen/System aus."
-#: Merge.rc:4345
+#: Merge.rc:4355
#, c-format
msgid ""
"Failed to delete filter:\n"
@@ -5858,12 +5869,12 @@ msgstr ""
"Die Datei ist möglicherweise schreibgeschützt."
#. IDS_FILEFILTER_INSTALL
-#: Merge.rc:4346
+#: Merge.rc:4356
#, c-format
msgid "Locate Filter File to Install"
msgstr "Zu installierenden Filter auswählen"
-#: Merge.rc:4348
+#: Merge.rc:4358
#, c-format
msgid ""
"Installing filter file failed.\n"
@@ -5875,19 +5886,19 @@ msgstr ""
"Die Filterdatei konnte nicht in den Filterordner kopiert werden."
#. IDS_FILEFILTER_OVERWRITE
-#: Merge.rc:4349
+#: Merge.rc:4359
#, c-format
msgid "Filter file exists. Overwrite?"
msgstr "Filterdatei existiert bereits. Existierenden Filter überschreiben?"
#. IDS_FILTERLINE_REGEXP
-#: Merge.rc:4355
+#: Merge.rc:4365
#, c-format
msgid "Regular expression"
msgstr "Regulärer Ausdruck"
#. IDS_FILTERCHANGED
-#: Merge.rc:4361
+#: Merge.rc:4371
msgid ""
"Filters updated. Refresh all open folder compares?\n"
"\n"
@@ -5898,240 +5909,240 @@ msgstr ""
"Wenn Sie jetzt nicht alle Vergleiche aktualisieren möchten, können Sie 'Nein' wählen und die Vergleiche später aktualisieren."
#. IDS_DIRECTORY_WINDOW_TITLE
-#: Merge.rc:4367
+#: Merge.rc:4377
#, c-format
msgid "Folder Comparison Results"
msgstr "Ordnervergleichsergebnisse"
#. IDS_FILE_COMPARISON_TITLE
-#: Merge.rc:4368
+#: Merge.rc:4378
#, c-format
msgid "File Comparison"
msgstr "Dateivergleich"
#. IDS_EMPTY_LEFT_FILE
-#: Merge.rc:4369
+#: Merge.rc:4379
#, c-format
msgid "Untitled Left"
msgstr "Unbenannt links"
#. IDS_EMPTY_MIDDLE_FILE
-#: Merge.rc:4370
+#: Merge.rc:4380
#, c-format
msgid "Untitled Middle"
msgstr "Unbenannt Mitte"
#. IDS_EMPTY_RIGHT_FILE
-#: Merge.rc:4371
+#: Merge.rc:4381
#, c-format
msgid "Untitled Right"
msgstr "Unbenannt rechts"
#. IDS_CONFLICT_BASE_FILE
-#: Merge.rc:4372
+#: Merge.rc:4382
msgid "Base File"
msgstr "Basisdatei"
#. IDS_CONFLICT_THEIRS_FILE
-#: Merge.rc:4373
+#: Merge.rc:4383
#, c-format
msgid "Theirs File"
msgstr "Deren Datei"
#. IDS_CONFLICT_MINE_FILE
-#: Merge.rc:4374
+#: Merge.rc:4384
#, c-format
msgid "Mine File"
msgstr "Meine Datei"
#. IDS_SELFCOMPARE_ORIGINAL_FILE
-#: Merge.rc:4375
+#: Merge.rc:4385
msgid "Original File"
msgstr "Originaldatei"
#. IDS_LINE_STATUS_INFO_EOL
-#: Merge.rc:4381
+#: Merge.rc:4391
#, c-format
msgid "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s"
msgstr "Zeile: %s Spalte: %d/%d Zeichen: %d/%d EOL: %s"
#. IDS_EMPTY_LINE_STATUS_INFO
-#: Merge.rc:4382
+#: Merge.rc:4392
#, c-format
msgid "Line: %s"
msgstr "Zeile: %s"
#. IDS_LINE_STATUS_INFO
-#: Merge.rc:4383
+#: Merge.rc:4393
#, c-format
msgid "Ln: %s Col: %d/%d Ch: %d/%d"
msgstr "Zeile: %s Spalte: %d/%d Zeichen: %d/%d"
#. IDS_LINE_STATUS_INFO_SEL
-#: Merge.rc:4384
+#: Merge.rc:4394
#, c-format
msgid " Sel: %d | %d"
msgstr " Auswahl: %d | %d"
#. IDS_MERGEMODE_MERGING
-#: Merge.rc:4385
+#: Merge.rc:4395
#, c-format
msgid "Merge"
msgstr "Merge"
#. IDS_DIFF_NUMBER_STATUS_FMT
-#: Merge.rc:4386
+#: Merge.rc:4396
#, c-format
msgid "Difference %1 of %2"
msgstr "Unterschied %1 von %2"
#. IDS_NO_DIFF_SEL_FMT
-#: Merge.rc:4387
+#: Merge.rc:4397
#, c-format
msgid "%1 Differences Found"
msgstr "%1 Unterschiede gefunden"
#. IDS_1_DIFF_FOUND
-#: Merge.rc:4388
+#: Merge.rc:4398
#, c-format
msgid "1 Difference Found"
msgstr "1 Unterschied gefunden"
#. IDS_NO_ERR_SEL_FMT
-#: Merge.rc:4389
+#: Merge.rc:4399
#, c-format
msgid "%1 Errors Found"
msgstr "%1 Fehler gefunden"
#. IDS_1_ERR_FOUND
-#: Merge.rc:4390
+#: Merge.rc:4400
msgid "1 Error Found"
msgstr "1 Fehler gefunden"
#. IDS_STATUSBAR_READONLY, Abbreviation from "Read Only"
-#: Merge.rc:4391
+#: Merge.rc:4401
#, c-format
msgid "RO"
msgstr "RO"
#. IDS_DIRVIEW_STATUS_FMT_FOCUS
-#: Merge.rc:4397
+#: Merge.rc:4407
#, c-format
msgid "Item %1 of %2"
msgstr "Objekt %1 von %2"
#. IDS_DIRVIEW_STATUS_FMT_NOFOCUS
-#: Merge.rc:4398
+#: Merge.rc:4408
#, c-format
msgid "Items: %1"
msgstr "Objekte: %1"
#. IDS_DIRVIEW_STATUS_COMPARING
-#: Merge.rc:4399
+#: Merge.rc:4409
#, c-format
msgid "Comparing items..."
msgstr "Objekte vergleichen..."
#. IDS_ITEMS_PER_SEC
-#: Merge.rc:4400
+#: Merge.rc:4410
#, c-format
msgid "%.1f[items/sec]"
msgstr "%.1f[Objekte/s]"
#. IDS_ERROR_INCOMPARABLE
-#: Merge.rc:4406
+#: Merge.rc:4416
msgid "Select two existing folders/files to compare."
msgstr "Wählen Sie zwei Dateien oder Ordner zum Vergleichen aus."
#. IDS_DIRSEL_TAG
-#: Merge.rc:4407
+#: Merge.rc:4417
#, c-format
msgid "Folder Selection"
msgstr "Ordnerauswahl"
#. IDS_OPEN_FILESDIRS
-#: Merge.rc:4408
+#: Merge.rc:4418
#, c-format
msgid "Select two (or three) folders/files to compare."
msgstr "Wählen Sie zwei (oder drei) Dateien oder Ordner zum Vergleichen aus."
#. IDS_OPEN_LEFTINVALID
-#: Merge.rc:4409
+#: Merge.rc:4419
#, c-format
msgid "Left (1st) path is invalid!"
msgstr "Linker (1.) Pfad ist ungültig!"
#. IDS_OPEN_MIDDLEINVALID
-#: Merge.rc:4410
+#: Merge.rc:4420
#, c-format
msgid "Middle (2nd) path is invalid!"
msgstr "Mittlerer (2.) Pfad ist ungültig!"
#. IDS_OPEN_RIGHTINVALID2
-#: Merge.rc:4411
+#: Merge.rc:4421
#, c-format
msgid "Right (2nd) path is invalid!"
msgstr "Rechter (2.) Pfad ist ungültig!"
#. IDS_OPEN_RIGHTINVALID3
-#: Merge.rc:4412
+#: Merge.rc:4422
#, c-format
msgid "Right (3rd) path is invalid!"
msgstr "Rechter (3.) Pfad ist ungültig!"
#. IDS_OPEN_BOTHINVALID
-#: Merge.rc:4413
+#: Merge.rc:4423
#, c-format
msgid "Both paths are invalid!"
msgstr "Beide Pfade sind ungültig!"
-#: Merge.rc:4415
+#: Merge.rc:4425
#, c-format
msgid "Left (1st) and Middle (2nd) paths are invalid!"
msgstr "Linker (1.) und mittlerer (2.) Pfad sind ungültig!"
#. IDS_OPEN_LEFTRIGHTINVALID
-#: Merge.rc:4416
+#: Merge.rc:4426
#, c-format
msgid "Left (1st) and Right (3rd) paths are invalid!"
msgstr "Linker (1.) und rechter (3.) Pfad sind ungültig!"
-#: Merge.rc:4418
+#: Merge.rc:4428
#, c-format
msgid "Middle (2nd) and Right (3rd) paths are invalid!"
msgstr "Mittlerer (2.) und rechter (3.) Pfad sind ungültig!"
#. IDS_OPEN_ALLINVALID
-#: Merge.rc:4419
+#: Merge.rc:4429
#, c-format
msgid "All paths are invalid!"
msgstr "Alle Pfade sind ungültig!"
#. IDS_OPEN_UNPACKERDISABLED
-#: Merge.rc:4420
+#: Merge.rc:4430
msgid "Only enabled for file comparisons"
msgstr "Nur für Dateivergleiche aktiviert"
#. IDS_OPEN_MISMATCH
-#: Merge.rc:4421
+#: Merge.rc:4431
#, c-format
msgid "Cannot compare file and folder!"
msgstr "Datei und Ordner können nicht verglichen werden!"
#. IDS_ERROR_FILE_NOT_FOUND
-#: Merge.rc:4427
+#: Merge.rc:4437
#, c-format
msgid "File not found: %1"
msgstr "Datei nicht gefunden: %1"
#. IDS_ERROR_FILE_NOT_UNPACKED
-#: Merge.rc:4428
+#: Merge.rc:4438
#, c-format
msgid "File not unpacked: %1"
msgstr "Datei nicht entpackt: %1"
#. IDS_ERROR_FILEOPEN
-#: Merge.rc:4429
+#: Merge.rc:4439
#, c-format
msgid ""
"Cannot open file\n"
@@ -6145,13 +6156,13 @@ msgstr ""
"%2"
#. IDS_ERROR_CONF_RESOLVE
-#: Merge.rc:4430
+#: Merge.rc:4440
#, c-format
msgid "Failed to parse conflict file."
msgstr "Fehler beim Analysieren der Konfliktdatei."
#. IDS_NOT_CONFLICT_FILE
-#: Merge.rc:4431
+#: Merge.rc:4441
#, c-format
msgid ""
"The file\n"
@@ -6163,7 +6174,7 @@ msgstr ""
"ist keine Konfliktdatei."
#. IDS_COMPARE_LARGE_FILES
-#: Merge.rc:4432
+#: Merge.rc:4442
msgid ""
"Comparing large files requires significant memory.\n"
"Show only comparison results (not file contents)?"
@@ -6172,30 +6183,30 @@ msgstr ""
"Nur Vergleichsergebnisse anzeigen (nicht den Dateiinhalt)?"
#. IDS_SAVE_AS_TITLE
-#: Merge.rc:4438
+#: Merge.rc:4448
#, c-format
msgid "Save As"
msgstr "Speichern unter"
#. IDS_SAVE_FMT
-#: Merge.rc:4439
+#: Merge.rc:4449
#, c-format
msgid "Save changes to %1?"
msgstr "Änderungen in %1 speichern?"
#. IDS_SAVEREADONLY_FMT
-#: Merge.rc:4440
+#: Merge.rc:4450
#, c-format
msgid "%1 is read-only. Override? Or '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.)"
#. IDS_ERROR_BACKUP
-#: Merge.rc:4441
+#: Merge.rc:4451
#, c-format
msgid "Error backing up file"
msgstr "Fehler beim Erstellen einer Sicherheitskopie"
-#: Merge.rc:4443
+#: Merge.rc:4453
#, c-format
msgid ""
"Unable to backup original file:\n"
@@ -6209,7 +6220,7 @@ msgstr ""
"Dennoch fortfahren?"
#. IDS_FILESAVE_FAILED
-#: Merge.rc:4444
+#: Merge.rc:4454
#, c-format
msgid ""
"Saving file failed.\n"
@@ -6225,7 +6236,7 @@ msgstr ""
"\t- einen anderen Dateinamen verwenden? ('OK' betätigen)\n"
"\t- die aktuelle Operation abbrechen? ('Abbrechen' betätigen)"
-#: Merge.rc:4446
+#: Merge.rc:4456
#, c-format
msgid ""
"Plugin '%2' cannot pack changes to left file into '%1'.\n"
@@ -6238,7 +6249,7 @@ msgstr ""
"\n"
"Möchten Sie die entpackte Version in einer anderen Datei speichern?"
-#: Merge.rc:4448
+#: Merge.rc:4458
#, c-format
msgid ""
"Plugin '%2' cannot pack changes to middle file into '%1'.\n"
@@ -6251,7 +6262,7 @@ msgstr ""
"\n"
"Möchten Sie die entpackte Version in einer anderen Datei speichern?"
-#: Merge.rc:4450
+#: Merge.rc:4460
#, c-format
msgid ""
"Plugin '%2' cannot pack changes to right file into '%1'.\n"
@@ -6265,7 +6276,7 @@ msgstr ""
"Möchten Sie die entpackte Version in einer anderen Datei speichern?"
#. IDS_FILECHANGED_ONDISK
-#: Merge.rc:4451
+#: Merge.rc:4461
#, c-format
msgid ""
"Another application updated\n"
@@ -6281,7 +6292,7 @@ msgstr ""
"Geänderte Datei überschreiben?"
#. IDS_SAVEREADONLY_MULTI
-#: Merge.rc:4452
+#: Merge.rc:4462
#, c-format
msgid ""
"%1\n"
@@ -6291,7 +6302,7 @@ msgstr ""
"ist als schreibgeschützt markiert. Möchten Sie das schreibgeschützte Objekt überschreiben?"
#. IDS_FILECHANGED_RESCAN
-#: Merge.rc:4453
+#: Merge.rc:4463
#, c-format
msgid ""
"Another application updated\n"
@@ -6307,25 +6318,25 @@ msgstr ""
"Möchten Sie die Datei neu laden?"
#. IDS_SAVE_LEFT_AS
-#: Merge.rc:4454
+#: Merge.rc:4464
#, c-format
msgid "Save Left File As"
msgstr "Linke Datei speichern unter"
#. IDS_SAVE_MIDDLE_AS
-#: Merge.rc:4455
+#: Merge.rc:4465
#, c-format
msgid "Save Middle File As"
msgstr "Mittlere Datei speichern unter"
#. IDS_SAVE_RIGHT_AS
-#: Merge.rc:4456
+#: Merge.rc:4466
#, c-format
msgid "Save Right File As"
msgstr "Rechte Datei speichern unter"
#. IDS_FILE_DISAPPEARED
-#: Merge.rc:4461
+#: Merge.rc:4471
#, c-format
msgid ""
"File\n"
@@ -6337,7 +6348,7 @@ msgstr ""
"ist verloren gegangen. Bitte speichern Sie eine Kopie der Datei, um fortzufahren."
#. IDS_VIEWS_OUTOFSYNC
-#: Merge.rc:4467
+#: Merge.rc:4477
#, c-format
msgid ""
"Cannot merge unsynched documents.\n"
@@ -6349,124 +6360,124 @@ msgstr ""
"Aktualisieren Sie die Dokumente, bevor Sie fortfahren."
#. IDS_BREAK_ON_WHITESPACE
-#: Merge.rc:4472
+#: Merge.rc:4482
msgid "Break at whitespace"
msgstr "An Leerzeichen unterbrechen"
#. IDS_BREAK_ON_PUNCTUATION
-#: Merge.rc:4473
+#: Merge.rc:4483
msgid "Break at whitespace or punctuation"
msgstr "An Leerzeichen oder Interpunktion unterbrechen"
#. IDS_L2M
-#: Merge.rc:4479
+#: Merge.rc:4489
msgid "Copy to &Middle\tAlt+Right"
msgstr "Zur &Mitte kopieren\tAlt+Rechts"
#. IDS_R2M
-#: Merge.rc:4480
+#: Merge.rc:4490
msgid "Copy to &Middle\tAlt+Left"
msgstr "Zur &Mitte kopieren\tAlt+Links"
#. IDS_COPY_FROM_MIDDLE_R
-#: Merge.rc:4481
+#: Merge.rc:4491
msgid "Copy from Middle\tAlt+Shift+Right"
msgstr "Von der Mitte kopieren\tAlt+Umschalt+Rechts"
#. IDS_COPY_FROM_MIDDLE_L
-#: Merge.rc:4482
+#: Merge.rc:4492
msgid "Copy from Middle\tAlt+Shift+Left"
msgstr "Von der Mitte kopieren\tAlt+Umschalt+Links"
#. IDS_L2MNEXT
-#: Merge.rc:4483
+#: Merge.rc:4493
msgid "Copy to Middle and Advance\tCtrl+Alt+Right"
msgstr "Zur Mitte kopieren und fortschreiten\tStrg+Alt+Rechts"
#. IDS_R2MNEXT
-#: Merge.rc:4484
+#: Merge.rc:4494
msgid "Copy to Middle and Advance\tCtrl+Alt+Left"
msgstr "Zur Mitte kopieren und fortschreiten\tStrg+Alt+Links"
#. IDS_ALL_MIDDLE
-#: Merge.rc:4485
+#: Merge.rc:4495
msgid "Copy All to Middle"
msgstr "Alles in die Mitte kopieren"
#. IDS_COPY_RIGHT_TO_LEFT
-#: Merge.rc:4491
+#: Merge.rc:4501
#, c-format
msgid "Right to Left (%1)"
msgstr "Rechts nach links (%1)"
#. IDS_COPY_RIGHT_TO_MIDDLE
-#: Merge.rc:4492
+#: Merge.rc:4502
#, c-format
msgid "Right to Middle (%1)"
msgstr "Rechts nach Mitte (%1)"
#. IDS_COPY_MIDDLE_TO_LEFT
-#: Merge.rc:4493
+#: Merge.rc:4503
#, c-format
msgid "Middle to Left (%1)"
msgstr "Mitte nach links (%1)"
#. IDS_COPY_MIDDLE_TO_RIGHT
-#: Merge.rc:4494
+#: Merge.rc:4504
#, c-format
msgid "Middle to Right (%1)"
msgstr "Mitte nach rechts (%1)"
#. IDS_COPY_LEFT_TO_RIGHT
-#: Merge.rc:4495
+#: Merge.rc:4505
#, c-format
msgid "Left to Right (%1)"
msgstr "Links nach rechts (%1)"
#. IDS_COPY_LEFT_TO_MIDDLE
-#: Merge.rc:4496
+#: Merge.rc:4506
#, c-format
msgid "Left to Middle (%1)"
msgstr "Links nach Mitte (%1)"
#. IDS_MOVE_LEFT_TO
-#: Merge.rc:4507 Merge.rc:4539
+#: Merge.rc:4517 Merge.rc:4549
#, c-format
msgid "Left to... (%1)"
msgstr "Links nach... (%1)"
#. IDS_MOVE_MIDDLE_TO
-#: Merge.rc:4508 Merge.rc:4540
+#: Merge.rc:4518 Merge.rc:4550
#, c-format
msgid "Middle to... (%1)"
msgstr "Mitte nach... (%1)"
#. IDS_MOVE_RIGHT_TO
-#: Merge.rc:4509 Merge.rc:4541
+#: Merge.rc:4519 Merge.rc:4551
#, c-format
msgid "Right to... (%1)"
msgstr "Rechts nach... (%1)"
#. IDS_COPY_BOTH_TO
-#: Merge.rc:4510
+#: Merge.rc:4520
#, c-format
msgid "Both to... (%1)"
msgstr "Beide nach... (%1)"
#. IDS_COPY_ALL_TO
-#: Merge.rc:4511
+#: Merge.rc:4521
#, c-format
msgid "All to... (%1)"
msgstr "Alle nach... (%1)"
#. IDS_COPY_DIFFERENCES_TO
-#: Merge.rc:4512
+#: Merge.rc:4522
#, c-format
msgid "Differences to... (%1)"
msgstr "Unterschiede nach... (%1)"
#. IDS_COPY_ONLYDIFFITEMS
-#: Merge.rc:4519
+#: Merge.rc:4529
msgid ""
"Some selected items are identical or skipped.\n"
"Copy only items with differences?"
@@ -6475,67 +6486,67 @@ msgstr ""
"Nur Elemente mit Unterschieden kopieren?"
#. IDS_DEL_LEFT_FMT
-#: Merge.rc:4525
+#: Merge.rc:4535
#, c-format
msgid "Left (%1)"
msgstr "Links (%1)"
#. IDS_DEL_MIDDLE_FMT
-#: Merge.rc:4526
+#: Merge.rc:4536
#, c-format
msgid "Middle (%1)"
msgstr "Mitte (%1)"
#. IDS_DEL_RIGHT_FMT
-#: Merge.rc:4527
+#: Merge.rc:4537
#, c-format
msgid "Right (%1)"
msgstr "Rechts (%1)"
#. IDS_DEL_BOTH_FMT
-#: Merge.rc:4528
+#: Merge.rc:4538
#, c-format
msgid "Both (%1)"
msgstr "Beide (%1)"
#. IDS_DEL_ALL_FMT
-#: Merge.rc:4529
+#: Merge.rc:4539
#, c-format
msgid "All (%1)"
msgstr "Alle (%1)"
#. IDS_SELECT_DEST_LEFT
-#: Merge.rc:4545
+#: Merge.rc:4555
#, c-format
msgid "Left Side - Select Destination Folder:"
msgstr "Linke Seite - Zielordner auswählen:"
#. IDS_SELECT_DEST_MIDDLE
-#: Merge.rc:4546
+#: Merge.rc:4556
#, c-format
msgid "Middle Side - Select Destination Folder:"
msgstr "Mitte - Zielordner auswählen:"
#. IDS_SELECT_DEST_RIGHT
-#: Merge.rc:4547
+#: Merge.rc:4557
#, c-format
msgid "Right Side - Select Destination Folder:"
msgstr "Rechte Seite - Zielordner auswählen:"
#. IDS_FILES_AFFECTED_FMT
-#: Merge.rc:4548
+#: Merge.rc:4558
#, c-format
msgid "(%1 Files Affected)"
msgstr "(%1 Dateien betroffen)"
#. IDS_FILES_AFFECTED_FMT2
-#: Merge.rc:4549
+#: Merge.rc:4559
#, c-format
msgid "(%1 of %2 Files Affected)"
msgstr "(%1 von %2 Dateien betroffen)"
#. IDS_CONFIRM_DELETE_SINGLE
-#: Merge.rc:4555
+#: Merge.rc:4565
#, c-format
msgid ""
"Are you sure you want to delete\n"
@@ -6548,18 +6559,18 @@ msgstr ""
"löschen?"
#. IDS_CONFIRM_SINGLE_COPY
-#: Merge.rc:4556
+#: Merge.rc:4566
msgid "Are you sure you want to copy?"
msgstr "Wollen Sie wirklich kopieren?"
#. IDS_CONFIRM_MULTIPLE_COPY
-#: Merge.rc:4557
+#: Merge.rc:4567
#, c-format
msgid "Are you sure you want to copy %d items?"
msgstr "Wollen Sie wirklich %d Objekte kopieren?"
#. IDS_DIRCMP_NOTSYNC
-#: Merge.rc:4558
+#: Merge.rc:4568
#, c-format
msgid ""
"Operation aborted!\n"
@@ -6579,28 +6590,28 @@ msgstr ""
"Bitte aktualisieren Sie den Vergleich."
#. IDS_CONFIRM_SINGLE_MOVE
-#: Merge.rc:4563
+#: Merge.rc:4573
msgid "Are you sure you want to move?"
msgstr "Wollen Sie wirklich verschieben?"
#. IDS_CONFIRM_MULTIPLE_MOVE
-#: Merge.rc:4564
+#: Merge.rc:4574
#, c-format
msgid "Are you sure you want to move %d items?"
msgstr "Wollen Sie wirklich %d Objekte verschieben?"
#. IDS_CONFIRM_MOVE_CAPTION
-#: Merge.rc:4566
+#: Merge.rc:4576
#, c-format
msgid "Confirm Move"
msgstr "Verschieben bestätigen"
-#: Merge.rc:4568
+#: Merge.rc:4578
#, c-format
msgid "Close the folder comparison window?"
msgstr "Sie schließen gerade das Fenster, in dem Ordner verglichen werden. Möchten Sie das Fenster wirklich schließen?"
-#: Merge.rc:4570
+#: Merge.rc:4580
msgid "Close the folder comparison window, which took a long time?"
msgstr ""
"Sie sind im Begriff ein Vergleichsfenster zu schließen, das mit einem erheblichen Zeitaufwand erstellt wurde.\n"
@@ -6608,23 +6619,23 @@ msgstr ""
"Möchten Sie wirklich fortfahren?"
#. IDS_ERROR_INVALID_DIR_FILE_NAME
-#: Merge.rc:4571
+#: Merge.rc:4581
msgid "The file or folder name is invalid."
msgstr "Der Datei- oder Ordnername ist ungültig."
#. IDS_ERROR_EXECUTE_FILE
-#: Merge.rc:4577
+#: Merge.rc:4587
#, c-format
msgid "Failed to execute external editor: %1"
msgstr "Konnte externen Editor nicht ausführen: %1"
#. IDS_UNKNOWN_ARCHIVE_FORMAT
-#: Merge.rc:4583
+#: Merge.rc:4593
#, c-format
msgid "Unknown archive format"
msgstr "Unbekanntes Archivformat"
-#: Merge.rc:4585
+#: Merge.rc:4595
msgid ""
"Failed to extract archive.\n"
"Compare as text file?"
@@ -6633,565 +6644,565 @@ msgstr ""
"Möchten Sie die Archivdateien als Textdateien vergleichen?"
#. IDS_COLHDR_FILENAME
-#: Merge.rc:4591
+#: Merge.rc:4601
#, c-format
msgid "Filename"
msgstr "Dateiname"
#. IDS_COLHDR_DIR
-#: Merge.rc:4592
+#: Merge.rc:4602
msgctxt "DirView|ColumnHeader"
msgid "Folder"
msgstr "Ordner"
#. IDS_COLHDR_RESULT
-#: Merge.rc:4593
+#: Merge.rc:4603
#, c-format
msgid "Comparison Result"
msgstr "Vergleichsergebnis"
#. IDS_COLHDR_LTIMEM
-#: Merge.rc:4594
+#: Merge.rc:4604
#, c-format
msgid "Left Date"
msgstr "Linkes Datum"
#. IDS_COLHDR_RTIMEM
-#: Merge.rc:4595
+#: Merge.rc:4605
#, c-format
msgid "Right Date"
msgstr "Rechtes Datum"
#. IDS_COLHDR_MTIMEM
-#: Merge.rc:4596
+#: Merge.rc:4606
#, c-format
msgid "Middle Date"
msgstr "Mittleres Datum"
#. IDS_COLHDR_LSIZE
-#: Merge.rc:4598
+#: Merge.rc:4608
#, c-format
msgid "Left Size"
msgstr "Linke Größe"
#. IDS_COLHDR_RSIZE
-#: Merge.rc:4599
+#: Merge.rc:4609
#, c-format
msgid "Right Size"
msgstr "Rechte Größe"
#. IDS_COLHDR_MSIZE
-#: Merge.rc:4604
+#: Merge.rc:4614
#, c-format
msgid "Middle Size"
msgstr "Mittlere Größe"
#. IDS_COLHDR_RSIZE_SHORT
-#: Merge.rc:4605
+#: Merge.rc:4615
#, c-format
msgid "Right Size (Short)"
msgstr "Rechte Größe (kurz)"
#. IDS_COLHDR_LSIZE_SHORT
-#: Merge.rc:4606
+#: Merge.rc:4616
#, c-format
msgid "Left Size (Short)"
msgstr "Linke Größe (kurz)"
#. IDS_COLHDR_MSIZE_SHORT
-#: Merge.rc:4607
+#: Merge.rc:4617
#, c-format
msgid "Middle Size (Short)"
msgstr "Mittlere Größe (kurz)"
#. IDS_COLHDR_LTIMEC
-#: Merge.rc:4613
+#: Merge.rc:4623
#, c-format
msgid "Left Creation Time"
msgstr "Linkes Erstellungsdatum"
#. IDS_COLHDR_RTIMEC
-#: Merge.rc:4614
+#: Merge.rc:4624
#, c-format
msgid "Right Creation Time"
msgstr "Rechtes Erstellungsdatum"
#. IDS_COLHDR_MTIMEC
-#: Merge.rc:4615
+#: Merge.rc:4625
#, c-format
msgid "Middle Creation Time"
msgstr "Mittleres Erstellungsdatum"
#. IDS_COLHDR_NEWER
-#: Merge.rc:4616
+#: Merge.rc:4626
#, c-format
msgid "Newer File"
msgstr "Neuere Datei"
#. IDS_COLHDR_LVERSION
-#: Merge.rc:4617
+#: Merge.rc:4627
#, c-format
msgid "Left File Version"
msgstr "Linke Dateiversion"
#. IDS_COLHDR_RVERSION
-#: Merge.rc:4618
+#: Merge.rc:4628
#, c-format
msgid "Right File Version"
msgstr "Rechte Dateiversion"
#. IDS_COLHDR_MVERSION
-#: Merge.rc:4619
+#: Merge.rc:4629
#, c-format
msgid "Middle File Version"
msgstr "Mittlere Dateiversion"
#. IDS_COLHDR_RESULT_ABBR
-#: Merge.rc:4620
+#: Merge.rc:4630
#, c-format
msgid "Short Result"
msgstr "Kurzes Ergebnis"
#. IDS_COLHDR_LATTRIBUTES
-#: Merge.rc:4621
+#: Merge.rc:4631
#, c-format
msgid "Left Attributes"
msgstr "Linke Attribute"
#. IDS_COLHDR_RATTRIBUTES
-#: Merge.rc:4622
+#: Merge.rc:4632
#, c-format
msgid "Right Attributes"
msgstr "Rechte Attribute"
#. IDS_COLHDR_MATTRIBUTES
-#: Merge.rc:4623
+#: Merge.rc:4633
#, c-format
msgid "Middle Attributes"
msgstr "Mittlere Attribute"
#. IDS_COLHDR_LEOL_TYPE
-#: Merge.rc:4628
+#: Merge.rc:4638
#, c-format
msgid "Left EOL"
msgstr "Linkes Zeilenende"
#. IDS_COLHDR_MEOL_TYPE
-#: Merge.rc:4629
+#: Merge.rc:4639
#, c-format
msgid "Middle EOL"
msgstr "Mittleres Zeilenende"
#. IDS_COLHDR_REOL_TYPE
-#: Merge.rc:4630
+#: Merge.rc:4640
#, c-format
msgid "Right EOL"
msgstr "Rechtes Zeilenende"
#. IDS_COLHDR_LENCODING
-#: Merge.rc:4636
+#: Merge.rc:4646
#, c-format
msgid "Left Encoding"
msgstr "Linke Codierung"
#. IDS_COLHDR_RENCODING
-#: Merge.rc:4637
+#: Merge.rc:4647
#, c-format
msgid "Right Encoding"
msgstr "Rechte Codierung"
#. IDS_COLHDR_MENCODING
-#: Merge.rc:4638
+#: Merge.rc:4648
#, c-format
msgid "Middle Encoding"
msgstr "Mittlere Codierung"
#. IDS_COLHDR_NIDIFFS
-#: Merge.rc:4639
+#: Merge.rc:4649
msgid "Ignored Diff"
msgstr "Ignorierter Unterschied"
#. IDS_COLHDR_BINARY
-#: Merge.rc:4641
+#: Merge.rc:4651
msgctxt "DirView|ColumnHeader"
msgid "Binary"
msgstr "Binär"
#. IDS_PLUGINS_TYPE_UNPACKER
-#: Merge.rc:4642 Merge.rc:4959
+#: Merge.rc:4652 Merge.rc:4969
#, c-format
msgid "Unpacker"
msgstr "Entpacker"
#. IDS_PLUGIN_TYPE4
-#: Merge.rc:4643 Merge.rc:4960 Merge.rc:5267
+#: Merge.rc:4653 Merge.rc:4970 Merge.rc:5277
#, c-format
msgid "Prediffer"
msgstr "Prediffer"
#. IDS_COLHDR_LEFT
-#: Merge.rc:4644
+#: Merge.rc:4654
msgid "Left"
msgstr "Links"
#. IDS_COLHDR_MIDDLE
-#: Merge.rc:4645
+#: Merge.rc:4655
msgid "Middle"
msgstr "Mitte"
#. IDS_COLHDR_RIGHT
-#: Merge.rc:4646
+#: Merge.rc:4656
msgid "Right"
msgstr "Rechts"
#. IDS_COLHDR_DIFF
-#: Merge.rc:4647
+#: Merge.rc:4657
msgid "Diff"
msgstr "Unterschied"
#. IDS_COLHDR_LEFT_DUPLICATE
-#: Merge.rc:4648
+#: Merge.rc:4658
msgid "Left Duplicate Count"
msgstr "Linke Duplikatanzahl"
#. IDS_COLHDR_RIGHT_DUPLICATE
-#: Merge.rc:4649
+#: Merge.rc:4659
msgid "Right Duplicate Count"
msgstr "Mittlere Duplikatanzahl"
#. IDS_COLHDR_MIDDLE_DUPLICATE
-#: Merge.rc:4650
+#: Merge.rc:4660
msgid "Middle Duplicate Count"
msgstr "Rechte Duplikatanzahl"
#. IDS_COLHDR_MOVE
-#: Merge.rc:4651
+#: Merge.rc:4661
msgid "Move"
msgstr "Verschieben"
#. IDS_PRPCAT_AUDIO
-#: Merge.rc:4658
+#: Merge.rc:4668
msgid "Audio"
msgstr "Audio"
#. IDS_PRPCAT_CALENDAR
-#: Merge.rc:4659
+#: Merge.rc:4669
msgid "Calendar"
msgstr "Kalender"
#. IDS_PRPCAT_COMMUNICATION
-#: Merge.rc:4660
+#: Merge.rc:4670
msgid "Communication"
msgstr "Kommunikation"
#. IDS_PRPCAT_CONTACT
-#: Merge.rc:4661
+#: Merge.rc:4671
msgid "Contact"
msgstr "Kontakt"
#. IDS_PRPCAT_DEVICES
-#: Merge.rc:4662
+#: Merge.rc:4672
msgid "Devices"
msgstr "Geräte"
#. IDS_PRPCAT_DOCUMENT
-#: Merge.rc:4663
+#: Merge.rc:4673
msgid "Document"
msgstr "Dokument"
#. IDS_PRPCAT_HOME
-#: Merge.rc:4664
+#: Merge.rc:4674
msgid "Home"
msgstr "Home"
#. IDS_PRPCAT_JOURNAL
-#: Merge.rc:4666
+#: Merge.rc:4676
msgid "Journal"
msgstr "Journal"
#. IDS_PRPCAT_LINK
-#: Merge.rc:4667
+#: Merge.rc:4677
msgid "Link"
msgstr "Link"
#. IDS_PRPCAT_MEDIA
-#: Merge.rc:4668
+#: Merge.rc:4678
msgid "Media"
msgstr "Medium"
#. IDS_PRPCAT_MUSIC
-#: Merge.rc:4670
+#: Merge.rc:4680
msgid "Music"
msgstr "Musik"
#. IDS_PRPCAT_NOTE
-#: Merge.rc:4671
+#: Merge.rc:4681
msgid "Note"
msgstr "Notiz"
#. IDS_PRPCAT_PHOTO
-#: Merge.rc:4672
+#: Merge.rc:4682
msgid "Photo"
msgstr "Foto"
#. IDS_PRPCAT_RECORDEDTV
-#: Merge.rc:4673
+#: Merge.rc:4683
msgid "RecordedTV"
msgstr "Aufgezeichnetes TV"
#. IDS_PRPCAT_SEARCH
-#: Merge.rc:4674
+#: Merge.rc:4684
msgid "Search"
msgstr "Suche"
#. IDS_PRPCAT_SECURITY
-#: Merge.rc:4675
+#: Merge.rc:4685
msgid "Security"
msgstr "Sicherheit"
#. IDS_PRPCAT_SOFTWARE
-#: Merge.rc:4676
+#: Merge.rc:4686
msgid "Software"
msgstr "Software"
#. IDS_PRPCAT_TASK
-#: Merge.rc:4677
+#: Merge.rc:4687
msgid "Task"
msgstr "Aufgabe"
#. IDS_PRPCAT_VIDEO
-#: Merge.rc:4678
+#: Merge.rc:4688
msgid "Video"
msgstr "Video"
#. IDS_PRPCAT_HASH
-#: Merge.rc:4679
+#: Merge.rc:4689
msgid "Hash"
msgstr "Hash"
#. IDS_CANT_COMPARE_FILES
-#: Merge.rc:4685
+#: Merge.rc:4695
#, c-format
msgid "Unable to compare files"
msgstr "Dateien können nicht verglichen werden"
#. IDS_ABORTED_ITEM
-#: Merge.rc:4686
+#: Merge.rc:4696
#, c-format
msgid "Item aborted"
msgstr "Objekt abgebrochen"
#. IDS_FILE_SKIPPED
-#: Merge.rc:4687
+#: Merge.rc:4697
#, c-format
msgid "File skipped"
msgstr "Datei übersprungen"
#. IDS_DIR_SKIPPED
-#: Merge.rc:4688
+#: Merge.rc:4698
#, c-format
msgid "Folder skipped"
msgstr "Ordner übersprungen"
#. IDS_LEFT_ONLY_IN_FMT
-#: Merge.rc:4689
+#: Merge.rc:4699
#, c-format
msgid "Left only: %1"
msgstr "Nur links: %1"
#. IDS_MIDDLE_ONLY_IN_FMT
-#: Merge.rc:4690
+#: Merge.rc:4700
#, c-format
msgid "Middle only: %1"
msgstr "Nur Mitte: %1"
#. IDS_RIGHT_ONLY_IN_FMT
-#: Merge.rc:4691
+#: Merge.rc:4701
#, c-format
msgid "Right only: %1"
msgstr "Nur rechts: %1"
#. IDS_DOES_NOT_EXIST_IN_FMT
-#: Merge.rc:4692
+#: Merge.rc:4702
#, c-format
msgid "Does not exist in %1"
msgstr "Existiert nicht in %1"
#. IDS_BIN_FILES_SAME
-#: Merge.rc:4693
+#: Merge.rc:4703
#, c-format
msgid "Binary files are identical"
msgstr "Binärdateien sind identisch"
#. IDS_BIN_FILES_DIFF
-#: Merge.rc:4699
+#: Merge.rc:4709
#, c-format
msgid "Binary files are different"
msgstr "Binärdateien sind unterschiedlich"
#. IDS_FILES_ARE_DIFFERENT
-#: Merge.rc:4700
+#: Merge.rc:4710
#, c-format
msgid "Files are different"
msgstr "Dateien sind unterschiedlich"
#. IDS_FOLDERS_ARE_DIFFERENT
-#: Merge.rc:4701
+#: Merge.rc:4711
#, c-format
msgid "Folders are different"
msgstr "Ordner sind unterschiedlich"
#. IDS_LEFTONLY
-#: Merge.rc:4702
+#: Merge.rc:4712
#, c-format
msgid "Left Only"
msgstr "Nur links"
#. IDS_RIGHTONLY
-#: Merge.rc:4703
+#: Merge.rc:4713
#, c-format
msgid "Right Only"
msgstr "Nur rechts"
#. IDS_MIDDLEONLY
-#: Merge.rc:4704
+#: Merge.rc:4714
#, c-format
msgid "Middle Only"
msgstr "Nur Mitte"
#. IDS_NOITEMLEFT
-#: Merge.rc:4705
+#: Merge.rc:4715
#, c-format
msgid "No item in left"
msgstr "Keine linken Objekte"
#. IDS_NOITEMRIGHT
-#: Merge.rc:4706
+#: Merge.rc:4716
#, c-format
msgid "No item in right"
msgstr "Keine rechten Objekte"
#. IDS_NOITEMMIDDLE
-#: Merge.rc:4707
+#: Merge.rc:4717
#, c-format
msgid "No item in middle"
msgstr "Keine mittleren Objekte"
#. IDS_CMPRES_ERROR
-#: Merge.rc:4709
+#: Merge.rc:4719
#, c-format
msgid "Error"
msgstr "Fehler"
#. IDS_TEXT_FILES_SAME
-#: Merge.rc:4710
+#: Merge.rc:4720
#, c-format
msgid "Text files are identical"
msgstr "Textdateien sind identisch"
#. IDS_LEFTONLY_DIFF
-#: Merge.rc:4711
+#: Merge.rc:4721
msgid " (Middle and right are identical)"
msgstr " (Mitte und Rechts sind identisch)"
#. IDS_MIDDLEONLY_DIFF
-#: Merge.rc:4712
+#: Merge.rc:4722
msgid " (Left and right are identical)"
msgstr " (Links und Rechts sind identisch)"
#. IDS_RIGHTONLY_DIFF
-#: Merge.rc:4713
+#: Merge.rc:4723
msgid " (Left and middle are identical)"
msgstr " (Links und Mitte sind identisch)"
#. IDS_PATH_MISMATCH
-#: Merge.rc:4714
+#: Merge.rc:4724
msgid " (paths differ)"
msgstr " (Pfade unterscheiden sich)"
#. IDS_TEXT_FILES_DIFF
-#: Merge.rc:4715
+#: Merge.rc:4725
#, c-format
msgid "Text files are different"
msgstr "Textdateien sind unterschiedlich"
#. IDS_IMAGE_FILES_SAME
-#: Merge.rc:4716
+#: Merge.rc:4726
msgid "Image files are identical"
msgstr "Bilddateien sind identisch"
#. IDS_IMAGE_FILES_DIFF
-#: Merge.rc:4717
+#: Merge.rc:4727
msgid "Image files are different"
msgstr "Bilddateien sind unterschiedlich"
#. IDS_EXPR_DIFF
-#: Merge.rc:4718
+#: Merge.rc:4728
#, c-format
msgid "Files are different (expr: %1)"
msgstr "Dateien sind unterschiedlich (Ausdruck: %1)"
#. IDS_HASH_GROUP
-#: Merge.rc:4719
+#: Merge.rc:4729
#, c-format
msgid "Group%d"
msgstr "Gruppe%d"
#. IDS_RENAME_MOVE_DETECTION_DISALBED
-#: Merge.rc:4720
+#: Merge.rc:4730
msgctxt "Options dialog|Compare|Folder|Detect renames and moves"
msgid "Disabled"
msgstr "Deaktiviert"
#. IDS_RENAME_MOVE_DETECTION_RENAME
-#: Merge.rc:4721
+#: Merge.rc:4731
msgid "Detect renames"
msgstr "Umbenennungen erkennen"
#. IDS_RENAME_MOVE_DETECTION_RENAME_MOVE
-#: Merge.rc:4722
+#: Merge.rc:4732
msgid "Detect renames and moves"
msgstr "Umbenennungen und Verschiebungen erkennen"
#. IDS_RENAME_MOVE_MERGE_MODE_RENAME
-#: Merge.rc:4723
+#: Merge.rc:4733
msgid "Merge renames"
msgstr "Umbenennungen zusammenführen"
#. IDS_RENAME_MOVE_MERGE_MODE_RENAME_MOVE
-#: Merge.rc:4724
+#: Merge.rc:4734
msgid "Merge renames and moves"
msgstr "Umbenennungen und Verschiebungen zusammenführen"
#. IDS_RENAMED
-#: Merge.rc:4725
+#: Merge.rc:4735
msgid "Renamed"
msgstr "Umbenannt"
#. IDS_MOVED
-#: Merge.rc:4726
+#: Merge.rc:4736
msgid "Moved"
msgstr "Verschoben"
#. IDS_RENAMED_MOVED
-#: Merge.rc:4727
+#: Merge.rc:4737
msgid "Renamed/Moved"
msgstr "Umbenannt/Verschoben"
#. IDS_RENAMED_MOVED_ITEMS
-#: Merge.rc:4728
+#: Merge.rc:4738
#, c-format
msgid "(%1 items)"
msgstr "(%1 Elemente)"
#. IDS_RENAMED_MOVED_RESULT
-#: Merge.rc:4729
+#: Merge.rc:4739
#, c-format
msgid "%1 (set %2): "
msgstr "%1 (Gruppe %2): "
#. IDS_SWITCH_FLAT_MODE
-#: Merge.rc:4730
+#: Merge.rc:4740
msgid ""
"Some moved items have been merged.\n"
"In Tree Mode, these items may appear in positions that do not reflect the actual folder structure, which can be confusing.\n"
@@ -7202,268 +7213,268 @@ msgstr ""
"In den Flachmodus wechseln?"
#. IDS_ELAPSED_TIME
-#: Merge.rc:4736
+#: Merge.rc:4746
#, c-format
msgid "Elapsed time: %ld ms"
msgstr "Ausführungszeit: %ld ms"
#. IDS_STATUS_SELITEM1
-#: Merge.rc:4737
+#: Merge.rc:4747
#, c-format
msgid "1 item selected"
msgstr "1 Objekt ausgewählt"
#. IDS_STATUS_SELITEMS
-#: Merge.rc:4738
+#: Merge.rc:4748
#, c-format
msgid "%1 items selected"
msgstr "%1 Objekte ausgewählt"
#. IDS_COLDESC_FILENAME
-#: Merge.rc:4744
+#: Merge.rc:4754
#, c-format
msgid "Filename or folder name."
msgstr "Datei- oder Ordnername."
#. IDS_COLDESC_DIR
-#: Merge.rc:4745
+#: Merge.rc:4755
#, c-format
msgid "Subfolder name when subfolders are included."
msgstr "Unterordnername, wenn Unterordner vorhanden sind."
#. IDS_COLDESC_RESULT
-#: Merge.rc:4746
+#: Merge.rc:4756
#, c-format
msgid "Comparison result, long form."
msgstr "Vergleichsergebnis, langes Format."
#. IDS_COLDESC_LTIMEM
-#: Merge.rc:4751
+#: Merge.rc:4761
#, c-format
msgid "Left side modification date."
msgstr "Linkes Änderungsdatum."
#. IDS_COLDESC_RTIMEM
-#: Merge.rc:4752
+#: Merge.rc:4762
#, c-format
msgid "Right side modification date."
msgstr "Rechtes Änderungsdatum."
#. IDS_COLDESC_MTIMEM
-#: Merge.rc:4753
+#: Merge.rc:4763
#, c-format
msgid "Middle side modification date."
msgstr "Mittleres Änderungsdatum."
#. IDS_COLDESC_EXTENSION
-#: Merge.rc:4754
+#: Merge.rc:4764
#, c-format
msgid "File's extension."
msgstr "Dateierweiterung."
#. IDS_COLDESC_LSIZE
-#: Merge.rc:4755
+#: Merge.rc:4765
#, c-format
msgid "Left file size in bytes."
msgstr "Linke Dateigröße in Byte."
#. IDS_COLDESC_RSIZE
-#: Merge.rc:4756
+#: Merge.rc:4766
#, c-format
msgid "Right file size in bytes."
msgstr "Rechte Dateigröße in Byte."
#. IDS_COLDESC_MSIZE
-#: Merge.rc:4757
+#: Merge.rc:4767
#, c-format
msgid "Middle file size in bytes."
msgstr "Mittlere Dateigröße in Byte."
#. IDS_COLDESC_LSIZE_SHORT
-#: Merge.rc:4758
+#: Merge.rc:4768
#, c-format
msgid "Left file size abbreviated."
msgstr "Linke Dateigröße gekürzt."
#. IDS_COLDESC_RSIZE_SHORT
-#: Merge.rc:4759
+#: Merge.rc:4769
#, c-format
msgid "Right file size abbreviated."
msgstr "Rechte Dateigröße gekürzt."
#. IDS_COLDESC_MSIZE_SHORT
-#: Merge.rc:4760
+#: Merge.rc:4770
#, c-format
msgid "Middle file size abbreviated."
msgstr "Mittlere Dateigröße gekürzt."
#. IDS_COLDESC_LTIMEC
-#: Merge.rc:4766
+#: Merge.rc:4776
#, c-format
msgid "Left side creation time."
msgstr "Linkes Erstellungsdatum."
#. IDS_COLDESC_RTIMEC
-#: Merge.rc:4767
+#: Merge.rc:4777
#, c-format
msgid "Right side creation time."
msgstr "Rechtes Erstellungsdatum."
#. IDS_COLDESC_MTIMEC
-#: Merge.rc:4768
+#: Merge.rc:4778
#, c-format
msgid "Middle side creation time."
msgstr "Mittleres Erstellungsdatum."
#. IDS_COLDESC_NEWER
-#: Merge.rc:4769
+#: Merge.rc:4779
#, c-format
msgid "Tells which side has newer modification date."
msgstr "Zeigt, welche Seite ein neueres Änderungsdatum hat."
#. IDS_COLDESC_LVERSION
-#: Merge.rc:4770
+#: Merge.rc:4780
msgid "Left side file version, only for some file types."
msgstr "Linke Dateiversion, nur für einige Dateitypen."
#. IDS_COLDESC_RVERSION
-#: Merge.rc:4771
+#: Merge.rc:4781
msgid "Right side file version, only for some file types."
msgstr "Rechte Dateiversion, nur für einige Dateitypen."
#. IDS_COLDESC_MVERSION
-#: Merge.rc:4776
+#: Merge.rc:4786
msgid "Middle side file version, only for some file types."
msgstr "Mittlere Dateiversion, nur für einige Dateitypen."
#. IDS_COLDESC_RESULT_ABBR
-#: Merge.rc:4777
+#: Merge.rc:4787
#, c-format
msgid "Short comparison result."
msgstr "Vergleichsergebnis, kurzes Format."
#. IDS_COLDESC_LATTRIBUTES
-#: Merge.rc:4778
+#: Merge.rc:4788
#, c-format
msgid "Left side attributes."
msgstr "Linke Attribute."
#. IDS_COLDESC_RATTRIBUTES
-#: Merge.rc:4779
+#: Merge.rc:4789
#, c-format
msgid "Right side attributes."
msgstr "Rechte Attribute."
#. IDS_COLDESC_MATTRIBUTES
-#: Merge.rc:4780
+#: Merge.rc:4790
#, c-format
msgid "Middle side attributes."
msgstr "Mittlere Attribute."
#. IDS_COLDESC_LEOL_TYPE
-#: Merge.rc:4781
+#: Merge.rc:4791
msgid "Left side file EOL type."
msgstr "Linker Zeilenende-Typ."
#. IDS_COLDESC_REOL_TYPE
-#: Merge.rc:4782
+#: Merge.rc:4792
msgid "Right side file EOL type."
msgstr "Rechter Zeilenende-Typ."
#. IDS_COLDESC_MEOL_TYPE
-#: Merge.rc:4783
+#: Merge.rc:4793
msgid "Middle side file EOL type."
msgstr "Mittlerer Zeilenende-Typ."
#. IDS_COLDESC_LENCODING
-#: Merge.rc:4789
+#: Merge.rc:4799
#, c-format
msgid "Left side encoding."
msgstr "Linke Zeichensatzcodierung."
#. IDS_COLDESC_RENCODING
-#: Merge.rc:4790
+#: Merge.rc:4800
#, c-format
msgid "Right side encoding."
msgstr "Rechte Zeichensatzcodierung."
#. IDS_COLDESC_MENCODING
-#: Merge.rc:4791
+#: Merge.rc:4801
#, c-format
msgid "Middle side encoding."
msgstr "Mittlere Zeichensatzcodierung."
#. IDS_COLDESC_NIDIFFS
-#: Merge.rc:4792
+#: Merge.rc:4802
#, c-format
msgid "Number of ignored differences in file. Ignored and cannot be merged."
msgstr "Anzahl der ignorierten Unterschiede in der Datei. Diese Unterschiede werden von WinMerge ignoriert und können nicht gemischt werden."
#. IDS_COLDESC_NSDIFFS
-#: Merge.rc:4793
+#: Merge.rc:4803
#, c-format
msgid "Number of differences in file (excluding ignored)."
msgstr "Anzahl der Unterschiede in der Datei. Die Zahl enthält nicht die ignorierten Unterschiede."
#. IDS_COLDESC_BINARY
-#: Merge.rc:4794
+#: Merge.rc:4804
#, c-format
msgid "Shows an asterisk (*) if the file is binary."
msgstr "Zeigt ein Asterisk (*), wenn die Datei binär ist."
#. IDS_COLDESC_UNPACKER
-#: Merge.rc:4795
+#: Merge.rc:4805
msgid "Unpacker plugin name or pipeline."
msgstr "Name des Entpacker-Plugins oder der Pipeline."
#. IDS_COLDESC_PREDIFFER
-#: Merge.rc:4796
+#: Merge.rc:4806
msgid "Prediffer plugin name or pipeline."
msgstr "Name des Prediffer-Plugins oder der Pipeline."
#. IDS_DIRECTORY_REPORT_TITLE
-#: Merge.rc:4802
+#: Merge.rc:4812
#, c-format
msgid "Compare %1 with %2"
msgstr "%1 mit %2 vergleichen"
#. IDS_DIRECTORY_REPORT_TITLE3
-#: Merge.rc:4803
+#: Merge.rc:4813
#, c-format
msgid "Compare %1 with %2 and %3"
msgstr "%1 mit %2 und %3 vergleichen"
#. IDS_REPORT_COMMALIST
-#: Merge.rc:4804
+#: Merge.rc:4814
#, c-format
msgid "Comma-separated list"
msgstr "Komma-getrennte Liste"
#. IDS_REPORT_TABLIST
-#: Merge.rc:4805
+#: Merge.rc:4815
#, c-format
msgid "Tab-separated list"
msgstr "Tab-getrennte Liste"
#. IDS_REPORT_SIMPLEHTML
-#: Merge.rc:4806
+#: Merge.rc:4816
#, c-format
msgid "Simple HTML"
msgstr "Einfaches HTML"
#. IDS_REPORT_SIMPLEXML
-#: Merge.rc:4807
+#: Merge.rc:4817
#, c-format
msgid "Simple XML"
msgstr "Einfaches XML"
-#: Merge.rc:4809
+#: Merge.rc:4819
#, c-format
msgid "Report file already exists. Overwrite?"
msgstr "Der Bericht existiert bereits. Überschreiben?"
#. IDS_REPORT_ERROR
-#: Merge.rc:4814
+#: Merge.rc:4824
#, c-format
msgid ""
"Error creating the report:\n"
@@ -7473,30 +7484,30 @@ msgstr ""
"%1"
#. IDS_REPORT_SUCCESS
-#: Merge.rc:4815
+#: Merge.rc:4825
#, c-format
msgid "Report created successfully."
msgstr "Der Bericht wurde erfolgreich geschrieben."
#. IDS_SYNCPOINT_LASTBLOCK
-#: Merge.rc:4821
+#: Merge.rc:4831
msgid "Cannot add a synchronization point at this line."
msgstr "In dieser Zeile kann kein Synchronisationspunkt hinzugefügt werden."
#. IDS_FILE_TO_ITSELF
-#: Merge.rc:4827
+#: Merge.rc:4837
#, c-format
msgid "Same file is opened in both panes."
msgstr "In beiden Bereichen ist die gleiche Datei geöffnet."
#. IDS_FILESSAME
-#: Merge.rc:4828
+#: Merge.rc:4838
#, c-format
msgid "Selected files are identical."
msgstr "Die ausgewählten Dateien sind identisch."
#. IDS_FILESSAME_CURCFG
-#: Merge.rc:4829
+#: Merge.rc:4839
msgid ""
"Selected files are identical (with current settings).\r\n"
"Checking binary identity..."
@@ -7505,7 +7516,7 @@ msgstr ""
"Die binäre Übereinstimmung wird geprüft..."
#. IDS_FILESSAME_BINERROR
-#: Merge.rc:4830
+#: Merge.rc:4840
msgid ""
"Selected files are identical (with current settings).\r\n"
"But binary comparison failed."
@@ -7514,12 +7525,12 @@ msgstr ""
"Binärvergleich fehlgeschlagen."
#. IDS_FILESSAME_BINSAME
-#: Merge.rc:4831
+#: Merge.rc:4841
msgid "Selected files are identical (binary match)."
msgstr "Die ausgewählten Dateien sind identisch (binäre Übereinstimmung)."
#. IDS_FILESSAME_BINDIFF
-#: Merge.rc:4832
+#: Merge.rc:4842
msgid ""
"Selected files are identical (with current settings).\r\n"
"But differ at the binary level."
@@ -7528,19 +7539,19 @@ msgstr ""
"Unterscheiden sich jedoch auf binärer Ebene."
#. IDS_FILEERROR
-#: Merge.rc:4833
+#: Merge.rc:4843
#, c-format
msgid "An error occurred while comparing files."
msgstr "Beim Vergleichen der Dateien ist ein Fehler aufgetreten."
#. IDS_TEMP_FILEERROR
-#: Merge.rc:4834
+#: Merge.rc:4844
#, c-format
msgid "Could not create temporary files. Check your temporary path settings."
msgstr "Temporäre Dateien konnten nicht erzeugt werden. Überprüfen Sie Ihre Einstellungen für temporäre Dateien."
#. IDS_SUGGEST_IGNOREEOL
-#: Merge.rc:4835
+#: Merge.rc:4845
msgid ""
"Files use different EOL.\n"
"\n"
@@ -7555,19 +7566,19 @@ msgstr ""
"Hinweis: Wenn Sie immer alle Zeilenumbruchformate als gleichwertig behandeln wollen, aktivieren Sie die Option 'Zeilenumbruchunterschiede (Windows/Unix/Mac) ignorieren' unter Einstellungen/Vergleichen/Allgemein."
#. IDS_INVALID_DIRECTORY
-#: Merge.rc:4836
+#: Merge.rc:4846
#, c-format
msgid "Selected folder is invalid."
msgstr "Der ausgewählte Ordner ist ungültig."
#. IDS_CANNOT_OPEN_BINARYFILE
-#: Merge.rc:4837
+#: Merge.rc:4847
#, c-format
msgid "Cannot open a binary file in Editor."
msgstr "Kann keine Binärdatei im Editor öffnen."
#. IDS_CREATE_PAIR_FOLDER
-#: Merge.rc:4838
+#: Merge.rc:4848
#, c-format
msgid ""
"Create matching folder:\n"
@@ -7581,45 +7592,45 @@ msgstr ""
"auf der anderen Seite erzeugen und die Ordner öffnen?"
#. IDS_CONFIRM_COPY_ALL_DIFFS
-#: Merge.rc:4839
+#: Merge.rc:4849
msgid "Copy all differences to other file?"
msgstr "Wollen Sie wirklich alle Unterschiede in die andere Datei kopieren?"
#. IDS_MOVE_TO_NEXTFILE
-#: Merge.rc:4844
+#: Merge.rc:4854
#, c-format
msgid "Move to next file?"
msgstr "Möchten Sie zur nächsten Datei wechseln?"
#. IDS_MOVE_TO_PREVFILE
-#: Merge.rc:4845
+#: Merge.rc:4855
#, c-format
msgid "Move to previous file?"
msgstr "Möchten Sie zur vorherigen Datei wechseln?"
#. IDS_MOVE_TO_NEXTPAGE
-#: Merge.rc:4846
+#: Merge.rc:4856
#, c-format
msgid "Move to next page?"
msgstr "Möchten Sie zur nächsten Seite wechseln?"
#. IDS_MOVE_TO_PREVPAGE
-#: Merge.rc:4847
+#: Merge.rc:4857
#, c-format
msgid "Move to previous page?"
msgstr "Möchten Sie zur vorherigen Seite wechseln?"
#. IDS_MOVE_TO_FIRSTFILE
-#: Merge.rc:4848
+#: Merge.rc:4858
msgid "Move to first file?"
msgstr "Möchten Sie zur ersten Datei wechseln?"
#. IDS_MOVE_TO_LASTFILE
-#: Merge.rc:4849
+#: Merge.rc:4859
msgid "Move to last file?"
msgstr "Möchten Sie zur letzten Datei wechseln?"
-#: Merge.rc:4856
+#: Merge.rc:4866
#, c-format
msgid ""
"Different codepages: left (cp%d), right (cp%d).\n"
@@ -7630,57 +7641,57 @@ msgstr ""
"Die Anzeige jeder Datei in ihrer Codeseite verbessert die Anzeige, das Zusammenführen/Kopieren ist jedoch gefährlich.\n"
"Möchten Sie beide Dateien mit der Standard-Windows-Codeseite behandeln (empfohlen)?"
-#: Merge.rc:4858
+#: Merge.rc:4868
#, c-format
msgid "Information lost due to encoding errors: both files"
msgstr "Informationsverlust wegen Codierungsfehlern: Beide Dateien"
-#: Merge.rc:4860
+#: Merge.rc:4870
#, c-format
msgid "Information lost due to encoding errors: first file"
msgstr "Informationsverlust wegen Codierungsfehlern: Erste Datei"
-#: Merge.rc:4862
+#: Merge.rc:4872
#, c-format
msgid "Information lost due to encoding errors: second file"
msgstr "Informationsverlust wegen Codierungsfehlern: Zweite Datei"
-#: Merge.rc:4864
+#: Merge.rc:4874
#, c-format
msgid "Information lost due to encoding errors: third file"
msgstr "Informationsverlust wegen Codierungsfehlern: Dritte Datei"
#. IDS_LINEDIFF_NODIFF
-#: Merge.rc:4870
+#: Merge.rc:4880
#, c-format
msgid "No difference"
msgstr "Kein Unterschied"
#. IDS_LINEDIFF_NODIFF_CAPTION
-#: Merge.rc:4871
+#: Merge.rc:4881
#, c-format
msgid "Line difference"
msgstr "Zeilenunterschied"
#. IDS_NUM_REPLACED
-#: Merge.rc:4877
+#: Merge.rc:4887
#, c-format
msgid "Replaced %1 string(s)."
msgstr "%1 Vorkommen ersetzt."
#. IDS_EDIT_TEXT_NOT_FOUND
-#: Merge.rc:4878
+#: Merge.rc:4888
#, c-format
msgid "Cannot find string \"%s\"."
msgstr "Kann \"%s\" nicht finden."
#. IDS_MERGE_MODE
-#: Merge.rc:4884
+#: Merge.rc:4894
msgid "Entering Merge Mode. Press F9 to turn off."
msgstr "Sie wechseln jetzt in den Merge-Modus. Wenn Sie den Merge-Modus deaktivieren möchten, betätigen Sie die Taste F9."
#. IDS_AUTO_MERGE
-#: Merge.rc:4890
+#: Merge.rc:4900
#, c-format
msgid ""
"Automatic merges: %1\n"
@@ -7690,107 +7701,107 @@ msgstr ""
"Anzahl der ungelösten Konflikte: %2"
#. IDS_CODEPAGE_MERGED
-#: Merge.rc:4891
+#: Merge.rc:4901
msgid "Codepage change merged."
msgstr "Die Änderung der Codeseite wurde zusammengeführt."
#. IDS_CODEPAGE_CONFLICT
-#: Merge.rc:4892
+#: Merge.rc:4902
msgid "Codepage changes are conflicting."
msgstr "Die Änderungen der Codeseite sind widersprüchlich."
#. IDS_EOL_MERGED
-#: Merge.rc:4893
+#: Merge.rc:4903
msgid "EOL change merged."
msgstr "Die Änderung des Zeilenendes wurde zusammengeführt."
#. IDS_EOL_CONFLICT
-#: Merge.rc:4894
+#: Merge.rc:4904
msgid "EOL changes are conflicting."
msgstr "Die Änderungen des Zeilenendes sind widersprüchlich."
#. IDS_LOCBAR_CAPTION
-#: Merge.rc:4900
+#: Merge.rc:4910
#, c-format
msgid "Location Pane"
msgstr "Positionsleiste"
#. IDS_DIFFBAR_CAPTION
-#: Merge.rc:4901
+#: Merge.rc:4911
#, c-format
msgid "Diff Pane"
msgstr "Unterschiedsleiste"
#. IDS_DIFF_SUCCEEDED
-#: Merge.rc:4908
+#: Merge.rc:4918
#, c-format
msgid "Patch file written."
msgstr "Die Patchdatei wurde erfolgreich geschrieben."
#. IDS_DIFF_ITEM1NOTFOUND
-#: Merge.rc:4909
+#: Merge.rc:4919
msgid "First item not found!"
msgstr "1. Objekt ist nicht vorhanden!"
#. IDS_DIFF_ITEM2NOTFOUND
-#: Merge.rc:4910
+#: Merge.rc:4920
msgid "Second item not found!"
msgstr "2. Objekt ist nicht vorhanden!"
#. IDS_DIFF_FILEOVERWRITE
-#: Merge.rc:4911
+#: Merge.rc:4921
#, c-format
msgid "Patch file already exists. Overwrite?"
msgstr "Die Patchdatei existiert bereits. Überschreiben?"
#. IDS_DIFF_SELECTEDFILES
-#: Merge.rc:4912
+#: Merge.rc:4922
#, c-format
msgid "[%1 files selected]"
msgstr "[%1 Dateien ausgewählt]"
#. IDS_DIFF_NORMAL
-#: Merge.rc:4913
+#: Merge.rc:4923
#, c-format
msgid "Normal"
msgstr "Normal"
#. IDS_DIFF_CONTEXT
-#: Merge.rc:4914
+#: Merge.rc:4924
#, c-format
msgid "Context"
msgstr "Kontext"
#. IDS_DIFF_UNIFIED
-#: Merge.rc:4915
+#: Merge.rc:4925
#, c-format
msgid "Unified"
msgstr "Einheitlich"
#. IDS_FILEWRITE_ERROR
-#: Merge.rc:4917
+#: Merge.rc:4927
#, c-format
msgid "Could not write to file %1."
msgstr "Konnte nicht in die Datei %1 schreiben."
#. IDS_PATH_NOT_ABSOLUTE
-#: Merge.rc:4918
+#: Merge.rc:4928
#, c-format
msgid "Output path is not absolute: %1"
msgstr "Der angegebene Ausgabepfad ist kein absoluter Pfad: %1"
#. IDS_MUST_SPECIFY_OUTPUT
-#: Merge.rc:4919
+#: Merge.rc:4929
msgid "Specify an output file."
msgstr "Geben Sie eine Ausgabedatei an."
-#: Merge.rc:4921
+#: Merge.rc:4931
#, c-format
msgid "Cannot create patch from binary files."
msgstr "Kann keine Patchdatei von Binärdateien erzeugen."
#. IDS_SAVEFILES_FORPATCH
-#: Merge.rc:4922
+#: Merge.rc:4932
#, c-format
msgid ""
"Save all files first.\n"
@@ -7802,13 +7813,13 @@ msgstr ""
"Das Erzeugen eines Patches erfordert, dass keine ungespeicherten Änderungen in den Dateien existieren."
#. IDS_FOLDER_NOTEXIST
-#: Merge.rc:4923
+#: Merge.rc:4933
#, c-format
msgid "Folder does not exist."
msgstr "Der Ordner existiert nicht."
#. IDS_NO_ZIP_SUPPORT
-#: Merge.rc:4928
+#: Merge.rc:4938
msgid ""
"Archive support not enabled.\n"
"7-Zip and/or Merge7z*.dll not found.\n"
@@ -7819,43 +7830,43 @@ msgstr ""
"Entnehmen Sie dem Handbuch mehr Informationen über die Archivunterstützung und wie sie aktiviert wird."
#. IDS_OPT_EXPORT_CAPTION
-#: Merge.rc:4929
+#: Merge.rc:4939
#, c-format
msgid "Select file for export"
msgstr "Datei zum Exportieren auswählen"
#. IDS_OPT_IMPORT_CAPTION
-#: Merge.rc:4930
+#: Merge.rc:4940
#, c-format
msgid "Select file for import"
msgstr "Datei zum Importieren auswählen"
#. IDS_OPT_IMPORT_DONE
-#: Merge.rc:4931
+#: Merge.rc:4941
#, c-format
msgid "Options imported from file."
msgstr "Einstellungen aus der Datei importiert."
#. IDS_OPT_EXPORT_DONE
-#: Merge.rc:4932
+#: Merge.rc:4942
#, c-format
msgid "Options exported to file."
msgstr "Einstellungen in die Datei exportiert."
#. IDS_OPT_IMPORT_ERR
-#: Merge.rc:4933
+#: Merge.rc:4943
#, c-format
msgid "Failed to import options from file."
msgstr "Konnte die Einstellungen nicht aus der Datei importieren."
#. IDS_OPT_EXPORT_ERR
-#: Merge.rc:4934
+#: Merge.rc:4944
#, c-format
msgid "Failed to write options to file."
msgstr "Konnte die Einstellungen nicht in die Datei exportieren."
#. IDS_CLOSEALL_WINDOWS
-#: Merge.rc:4935
+#: Merge.rc:4945
#, c-format
msgid ""
"Close multiple compare windows?\n"
@@ -7867,48 +7878,48 @@ msgstr ""
"Möchten Sie wirklich fortfahren?"
#. IDS_EOL_MIXED
-#: Merge.rc:4944
+#: Merge.rc:4954
#, c-format
msgid "Mixed"
msgstr "Gemixt"
#. IDS_EOL_BIN
-#: Merge.rc:4945
+#: Merge.rc:4955
msgctxt "EOL Type"
msgid "Binary"
msgstr "Binär"
#. IDS_EOL_NONE
-#: Merge.rc:4949
+#: Merge.rc:4959
#, c-format
msgid "None"
msgstr "Keines"
#. IDS_MARKER_COLOR_FMT
-#: Merge.rc:4950
+#: Merge.rc:4960
#, c-format
msgid "Marker Color %d"
msgstr "Markierungsfarbe %d"
#. IDS_MARKER_NEW_PATTERN
-#: Merge.rc:4951
+#: Merge.rc:4961
msgid "New Pattern"
msgstr "Neues Muster"
#. IDS_PLUGINSLIST_TYPE
-#: Merge.rc:4957
+#: Merge.rc:4967
#, c-format
msgid "Type"
msgstr "Typ"
#. IDS_PLUGINS_TYPE_EDITSCRIPT
-#: Merge.rc:4961
+#: Merge.rc:4971
#, c-format
msgid "Editor script"
msgstr "Editor-Skript"
#. ID_SELECTLINEDIFF
-#: Merge.rc:4967
+#: Merge.rc:4977
#, c-format
msgid ""
"\n"
@@ -7918,7 +7929,7 @@ msgstr ""
"Zeilenunterschied markieren (F4)"
#. ID_OPTIONS
-#: Merge.rc:4968
+#: Merge.rc:4978
#, c-format
msgid ""
"\n"
@@ -7928,7 +7939,7 @@ msgstr ""
"Einstellungen"
#. ID_REFRESH
-#: Merge.rc:4969
+#: Merge.rc:4979
#, c-format
msgid ""
"\n"
@@ -7938,7 +7949,7 @@ msgstr ""
"Aktualisieren (F5)"
#. ID_PREVDIFF
-#: Merge.rc:4975
+#: Merge.rc:4985
#, c-format
msgid ""
"\n"
@@ -7948,7 +7959,7 @@ msgstr ""
"Vorheriger Unterschied (Alt+Hoch)"
#. ID_NEXTDIFF
-#: Merge.rc:4976
+#: Merge.rc:4986
#, c-format
msgid ""
"\n"
@@ -7958,7 +7969,7 @@ msgstr ""
"Nächster Unterschied (Alt+Runter)"
#. ID_PREVCONFLICT
-#: Merge.rc:4977
+#: Merge.rc:4987
#, c-format
msgid ""
"\n"
@@ -7968,7 +7979,7 @@ msgstr ""
"Vorheriger Konflikt (Alt+Umschalt+Hoch)"
#. ID_NEXTCONFLICT
-#: Merge.rc:4978
+#: Merge.rc:4988
#, c-format
msgid ""
"\n"
@@ -7978,7 +7989,7 @@ msgstr ""
"Nächster Konflikt (Alt+Umschalt+Runter)"
#. ID_FIRSTDIFF
-#: Merge.rc:4983
+#: Merge.rc:4993
#, c-format
msgid ""
"\n"
@@ -7988,7 +7999,7 @@ msgstr ""
"Erster Unterschied (Alt+Pos 1)"
#. ID_CURDIFF
-#: Merge.rc:4984
+#: Merge.rc:4994
#, c-format
msgid ""
"\n"
@@ -7998,7 +8009,7 @@ msgstr ""
"Aktueller Unterschied (Alt+Enter)"
#. ID_LASTDIFF
-#: Merge.rc:4985
+#: Merge.rc:4995
#, c-format
msgid ""
"\n"
@@ -8008,7 +8019,7 @@ msgstr ""
"Letzter Unterschied (Alt+Ende)"
#. ID_L2R
-#: Merge.rc:4986
+#: Merge.rc:4996
msgid ""
"\n"
"Copy to Right (Alt+Right)"
@@ -8017,7 +8028,7 @@ msgstr ""
"Nach rechts kopieren (Alt+Rechts)"
#. ID_R2L
-#: Merge.rc:4987
+#: Merge.rc:4997
msgid ""
"\n"
"Copy to Left (Alt+Left)"
@@ -8026,7 +8037,7 @@ msgstr ""
"Nach links kopieren (Alt+Links)"
#. ID_L2RNEXT
-#: Merge.rc:4988
+#: Merge.rc:4998
msgid ""
"\n"
"Copy to Right and Advance (Ctrl+Alt+Right)"
@@ -8035,7 +8046,7 @@ msgstr ""
"Nach rechts kopieren und fortschreiten (Strg+Alt+Rechts)"
#. ID_R2LNEXT
-#: Merge.rc:4989
+#: Merge.rc:4999
msgid ""
"\n"
"Copy to Left and Advance (Ctrl+Alt+Left)"
@@ -8044,7 +8055,7 @@ msgstr ""
"Nach links kopieren und fortschreiten (Strg+Alt+Links)"
#. ID_ALL_RIGHT
-#: Merge.rc:4990
+#: Merge.rc:5000
msgid ""
"\n"
"Copy All to Right"
@@ -8053,7 +8064,7 @@ msgstr ""
"Alles nach rechts kopieren"
#. ID_ALL_LEFT
-#: Merge.rc:4991
+#: Merge.rc:5001
msgid ""
"\n"
"Copy All to Left"
@@ -8062,7 +8073,7 @@ msgstr ""
"Alles nach links kopieren"
#. ID_AUTO_MERGE
-#: Merge.rc:4992
+#: Merge.rc:5002
#, c-format
msgid ""
"\n"
@@ -8072,7 +8083,7 @@ msgstr ""
"Automatisch mischen (Strg+Alt+M)"
#. ID_FIRSTFILE
-#: Merge.rc:4993
+#: Merge.rc:5003
msgid ""
"\n"
"First File"
@@ -8081,7 +8092,7 @@ msgstr ""
"Erste Datei"
#. ID_NEXTFILE
-#: Merge.rc:4994
+#: Merge.rc:5004
msgid ""
"\n"
"Next File (Ctrl+F8)"
@@ -8090,7 +8101,7 @@ msgstr ""
"Nächste Datei (Strg+F8)"
#. ID_LASTFILE
-#: Merge.rc:4995
+#: Merge.rc:5005
msgid ""
"\n"
"Last File"
@@ -8099,7 +8110,7 @@ msgstr ""
"Letzte Datei"
#. ID_PREVFILE
-#: Merge.rc:4996
+#: Merge.rc:5006
msgid ""
"\n"
"Previous File (Ctrl+F7)"
@@ -8108,39 +8119,39 @@ msgstr ""
"Vorherige Datei (Strg+F7)"
#. IDS_UNPACK_AUTO
-#: Merge.rc:5003
+#: Merge.rc:5013
msgid "Adapted unpacker applied to both files (one needs extension)."
msgstr "Der passende Entpacker wird auf beide Dateien angewendet. Nur eine Datei benötigt die Erweiterung."
#. IDS_NO_PREDIFFER
-#: Merge.rc:5004
+#: Merge.rc:5014
#, c-format
msgid "No Prediffer (Normal)"
msgstr "Kein Prediffer (normal)"
#. IDS_SUGGESTED_PLUGINS
-#: Merge.rc:5005
+#: Merge.rc:5015
#, c-format
msgid "Suggested Plugins"
msgstr "Vorgeschlagene Plugins"
#. IDS_NOT_SUGGESTED_PLUGINS
-#: Merge.rc:5006
+#: Merge.rc:5016
msgid "All Plugins"
msgstr "Alle Plugins"
#. IDS_PRIVATEBUILD_FMT
-#: Merge.rc:5012
+#: Merge.rc:5022
#, c-format
msgid "Private Build: %1"
msgstr "Private Build: %1"
#. IDS_CHECKFORUPDATES_UPTODATE
-#: Merge.rc:5013
+#: Merge.rc:5023
msgid "Your software is up to date."
msgstr "Ihre Software ist aktuell."
-#: Merge.rc:5015
+#: Merge.rc:5025
#, c-format
msgid ""
"WinMerge update available.\n"
@@ -8150,140 +8161,140 @@ msgstr ""
"%1 ist jetzt verfügbar, Sie haben %2. Möchten Sie sie jetzt herunterladen?"
#. IDS_ALLRIGHTS_RESERVED
-#: Merge.rc:5016
+#: Merge.rc:5026
msgid " - All rights reserved."
msgstr " - Alle Rechte vorbehalten."
#. IDS_CHECKFORUPDATES_FAILED
-#: Merge.rc:5021
+#: Merge.rc:5031
#, c-format
msgid "Failed to download latest version information"
msgstr "Fehler beim Herunterladen der neuesten Versionsinformation"
#. IDS_TITLE_PLUGINS_SETTINGS
-#: Merge.rc:5027
+#: Merge.rc:5037
#, c-format
msgid "Plugin Settings"
msgstr "Plugin-Einstellungen"
#. IDS_NO_SCT_SCRIPTS
-#: Merge.rc:5029
+#: Merge.rc:5039
#, c-format
msgid "WSH not found - .sct scripts disabled"
msgstr "WSH nicht gefunden - SCT-Skripte deaktiviert"
#. IDS_LOCBAR_GOTOLINE_FMT
-#: Merge.rc:5037
+#: Merge.rc:5047
#, c-format
msgid "G&o to Line %1"
msgstr "Gehe zu &Zeile %1"
#. IDS_GOTO_MOVED_LINE
-#: Merge.rc:5043
+#: Merge.rc:5053
msgid "Go to Moved Line\tCtrl+Shift+G"
msgstr "Zur &verschobenen Zeile gehen\tStrg+Umschalt+G"
#. IDS_AUTOCOMPLETE_DISABLED
-#: Merge.rc:5049
+#: Merge.rc:5059
msgctxt "Options dialog|General|Open dialog Auto completion"
msgid "Disabled"
msgstr "Deaktiviert"
#. IDS_AUTOCOMPLETE_FILE_SYS
-#: Merge.rc:5050
+#: Merge.rc:5060
#, c-format
msgid "From file system"
msgstr "Vom Dateisystem"
#. IDS_AUTOCOMPLETE_MRU
-#: Merge.rc:5051
+#: Merge.rc:5061
#, c-format
msgid "From Most Recently Used list"
msgstr "Von MRU-Liste"
#. IDS_COLORSCHEME_PLAIN
-#: Merge.rc:5057
+#: Merge.rc:5067
#, c-format
msgid "No Highlighting"
msgstr "Keine Hervorhebung"
#. IDS_COLORSCHEME_BATCH
-#: Merge.rc:5063
+#: Merge.rc:5073
#, c-format
msgid "Batch"
msgstr "Batch"
#. IDS_COLORSCHEME_PO
-#: Merge.rc:5090
+#: Merge.rc:5100
#, c-format
msgid "Portable Object"
msgstr "Portable Object"
#. IDS_COLORSCHEME_RSRC
-#: Merge.rc:5094
+#: Merge.rc:5104
#, c-format
msgid "Resources"
msgstr "Ressourcen"
#. IDS_COLORSCHEME_SH
-#: Merge.rc:5098
+#: Merge.rc:5108
#, c-format
msgid "Shell"
msgstr "Shell"
#. IDS_CLOSE_LEFT_TABS
-#: Merge.rc:5115
+#: Merge.rc:5125
#, c-format
msgid "Close &Left Tabs"
msgstr "Tabs &links vom aktuellen Tab schließen"
#. IDS_CLOSE_RIGHT_TABS
-#: Merge.rc:5116
+#: Merge.rc:5126
#, c-format
msgid "Close R&ight Tabs"
msgstr "Tabs &rechts vom aktuellen Tab schließen"
#. IDS_CLOSE_OTHER_TABS
-#: Merge.rc:5117
+#: Merge.rc:5127
#, c-format
msgid "Close &Other Tabs"
msgstr "&Alle anderen Tabs schließen"
#. IDS_TABBAR_AUTO_MAXWIDTH
-#: Merge.rc:5118
+#: Merge.rc:5128
#, c-format
msgid "Enable &Auto Max Width"
msgstr "Automatisch maximale Breite aktivieren"
#. IDS_WEBPAGE_MENU
-#: Merge.rc:5128
+#: Merge.rc:5138
msgid "We&bpage"
msgstr "We&bseite"
#. IDS_VIEW_WRAP_TEXT
-#: Merge.rc:5133
+#: Merge.rc:5143
msgid "W&rap Text"
msgstr "Text umbrechen"
#. IDS_NOTINSTALLED
-#: Merge.rc:5138
+#: Merge.rc:5148
msgid "%1 is not installed."
msgstr "%1 ist nicht installiert."
#. IDS_CREATE_FOLDER
-#: Merge.rc:5143
+#: Merge.rc:5153
#, c-format
msgid "%1 does not exist. Create it?"
msgstr "%1 existiert nicht. Möchten Sie sie anlegen?"
#. IDS_CREATE_FOLDER_ERROR
-#: Merge.rc:5144
+#: Merge.rc:5154
#, c-format
msgid "Failed to create folder."
msgstr "Ordner erstellen ist fehlgeschlagen."
#. IDC_EXT_EDITOR_PATH
-#: Merge.rc:5149
+#: Merge.rc:5159
#, c-format
msgid ""
"Parameters:\n"
@@ -8295,487 +8306,487 @@ msgstr ""
"$linenum: Zeilennummer der aktuellen Cursorposition"
#. IDS_DIFF_ALGORITHM_DEFAULT
-#: Merge.rc:5154
+#: Merge.rc:5164
msgid "default"
msgstr "Standard"
#. IDS_DIFF_ALGORITHM_MINIMAL
-#: Merge.rc:5155
+#: Merge.rc:5165
msgid "minimal"
msgstr "Minimal"
#. IDS_DIFF_ALGORITHM_PATIENCE
-#: Merge.rc:5156
+#: Merge.rc:5166
msgid "patience"
msgstr "Patience"
#. IDS_DIFF_ALGORITHM_HISTOGRAM
-#: Merge.rc:5157
+#: Merge.rc:5167
msgid "histogram"
msgstr "Histogramm"
#. IDS_DIFF_ALGORITHM_NONE
-#: Merge.rc:5158
+#: Merge.rc:5168
msgid "none"
msgstr "keine"
#. IDS_RENDERING_MODE_GDI
-#: Merge.rc:5163
+#: Merge.rc:5173
msgid "GDI"
msgstr "GDI"
#. IDS_RENDERING_MODE_DIRECTWRITE_DEFAULT
-#: Merge.rc:5164
+#: Merge.rc:5174
msgid "DirectWrite Default"
msgstr "DirectWrite Standard"
#. IDS_RENDERING_MODE_DIRECTWRITE_ALIASED
-#: Merge.rc:5165
+#: Merge.rc:5175
msgid "DirectWrite Aliased"
msgstr "DirectWrite Aliasing"
#. IDS_RENDERING_MODE_DIRECTWRITE_GDI_CLASSIC
-#: Merge.rc:5166
+#: Merge.rc:5176
msgid "DirectWrite GDI Classic"
msgstr "DirectWrite GDI klassisch"
#. IDS_RENDERING_MODE_DIRECTWRITE_GDI_NATURAL
-#: Merge.rc:5167
+#: Merge.rc:5177
msgid "DirectWrite GDI Natural"
msgstr "DirectWrite GDI natürlich"
#. IDS_RENDERING_MODE_DIRECTWRITE_NATURAL
-#: Merge.rc:5168
+#: Merge.rc:5178
msgid "DirectWrite Natural"
msgstr "DirectWrite natürlich"
#. IDS_RENDERING_MODE_DIRECTWRITE_NATURAL_SYMMETRIC
-#: Merge.rc:5169
+#: Merge.rc:5179
msgid "DirectWrite Natural Symmetric"
msgstr "DirectWrite natürlich symmetrisch"
#. IDS_CLOSE_WINDOWS_WITH_ESC_DISABLED
-#: Merge.rc:5174
+#: Merge.rc:5184
msgctxt "Options dialog|General|Close windows with Esc"
msgid "Disabled"
msgstr "Deaktiviert"
#. IDS_CLOSE_WINDOWS_WITH_ESC_1
-#: Merge.rc:5175
+#: Merge.rc:5185
msgid "MDI child window or main window"
msgstr "MDI-Unter- oder MDI-Hauptfenster"
#. IDS_CLOSE_WINDOWS_WITH_ESC_2
-#: Merge.rc:5176
+#: Merge.rc:5186
msgid "MDI child window only"
msgstr "Nur MDI-Unterfenster"
#. IDS_CLOSE_WINDOWS_WITH_ESC_3
-#: Merge.rc:5177
+#: Merge.rc:5187
msgid "Close main window if only one MDI child window"
msgstr "Hauptfenster schließen, wenn nur ein MDI-Unterfenster existiert"
#. IDS_DIFF_GROUP
-#: Merge.rc:5182
+#: Merge.rc:5192
msgctxt "ImgMergeFrame|LocationPane"
msgid "Diff"
msgstr "Unterschiede"
#. IDS_DIFF_HIGHLIGHT
-#: Merge.rc:5183
+#: Merge.rc:5193
msgctxt "ImgMergeFrame|LocationPane"
msgid "Highlight"
msgstr "Markieren"
#. IDS_DIFF_BLINK
-#: Merge.rc:5184
+#: Merge.rc:5194
msgctxt "ImgMergeFrame|LocationPane"
msgid "Blink"
msgstr "Blinken"
#. IDS_DIFF_BLOCKSIZE
-#: Merge.rc:5185
+#: Merge.rc:5195
msgctxt "ImgMergeFrame|LocationPane"
msgid "Block Size"
msgstr "Blockgröße"
#. IDS_DIFF_BLOCKALPHA
-#: Merge.rc:5186
+#: Merge.rc:5196
msgctxt "ImgMergeFrame|LocationPane"
msgid "Block Alpha"
msgstr "Block Alpha"
#. IDS_DIFF_CDTHRESHOLD
-#: Merge.rc:5187
+#: Merge.rc:5197
msgctxt "ImgMergeFrame|LocationPane"
msgid "CD Threshold"
msgstr "CD Threshold"
#. IDS_DIFF_INSERTION_DELETION_DETECTION
-#: Merge.rc:5188
+#: Merge.rc:5198
msgctxt "ImgMergeFrame|LocationPane"
msgid "Ins/Del Detection"
msgstr "Einfg/Entf-Erkennung"
#. IDS_OVERLAY_MODE_NONE
-#: Merge.rc:5189 Merge.rc:5194
+#: Merge.rc:5199 Merge.rc:5204
msgctxt "ImgMergeFrame|LocationPane"
msgid "None"
msgstr "Keine"
#. IDS_DIFF_INSERTION_DELETION_DETECTION_VERTICAL
-#: Merge.rc:5190
+#: Merge.rc:5200
msgctxt "ImgMergeFrame|LocationPane"
msgid "Vertical"
msgstr "Vertikal"
#. IDS_DIFF_INSERTION_DELETION_DETECTION_HORIZONTAL
-#: Merge.rc:5191
+#: Merge.rc:5201
msgctxt "ImgMergeFrame|LocationPane"
msgid "Horizontal"
msgstr "Horizontal"
#. IDS_OVERLAY_GROUP
-#: Merge.rc:5192
+#: Merge.rc:5202
msgctxt "ImgMergeFrame|LocationPane"
msgid "Overlay"
msgstr "Überlagerung"
#. IDS_OVERLAY_ALPHA
-#: Merge.rc:5193
+#: Merge.rc:5203
msgctxt "ImgMergeFrame|LocationPane"
msgid "Alpha"
msgstr "Alpha"
#. IDS_OVERLAY_MODE_XOR
-#: Merge.rc:5195
+#: Merge.rc:5205
msgctxt "ImgMergeFrame|LocationPane"
msgid "XOR"
msgstr "XOR"
#. IDS_OVERLAY_MODE_ALPHA
-#: Merge.rc:5196
+#: Merge.rc:5206
msgctxt "ImgMergeFrame|LocationPane"
msgid "Alpha Blend"
msgstr "Alpha Blending"
#. IDS_OVERLAY_MODE_ALPHA_ANIMATION
-#: Merge.rc:5197
+#: Merge.rc:5207
msgctxt "ImgMergeFrame|LocationPane"
msgid "Alpha Animation"
msgstr "Alpha Animation"
#. IDS_ZOOM
-#: Merge.rc:5198
+#: Merge.rc:5208
msgctxt "ImgMergeFrame|LocationPane"
msgid "Zoom"
msgstr "Zoom"
#. IDS_PAGE
-#: Merge.rc:5199
+#: Merge.rc:5209
msgctxt "ImgMergeFrame|LocationPane"
msgid "Page:"
msgstr "Seite:"
#. IDS_IMGCMP_STATUS_PT_RGBA_FMT
-#: Merge.rc:5200
+#: Merge.rc:5210
#, c-format
msgid "Pt: (%d, %d) RGBA: (%d, %d, %d, %d) "
msgstr "Pt.: (%d, %d) RGBA: (%d, %d, %d, %d) "
#. IDS_IMGCMP_STATUS_DIST1_FMT
-#: Merge.rc:5201
+#: Merge.rc:5211
#, c-format
msgid "Dist: %g "
msgstr "Dist.: %g "
#. IDS_IMGCMP_STATUS_DIST2_FMT
-#: Merge.rc:5202
+#: Merge.rc:5212
#, c-format
msgid "Dist: %g, %g "
msgstr "Dist.: %g, %g "
#. IDS_IMGCMP_STATUS_PAGE_ZOOM_SIZE_BPP_FMT
-#: Merge.rc:5203
+#: Merge.rc:5213
#, c-format
msgid "Page: %d/%d Zoom: %d%% %dx%dpx %dbpp "
msgstr "Seite: %d/%d Zoom: %d%% %dx%dpx %dbpp "
#. IDS_IMGCMP_STATUS_RC_FMT
-#: Merge.rc:5204
+#: Merge.rc:5214
#, c-format
msgid "Rc: (%d, %d) "
msgstr "Re.: (%d, %d) "
#. IDS_IMGCMP_STATUS_FLIPPED_FMT
-#: Merge.rc:5205
+#: Merge.rc:5215
#, c-format
msgid "Flipped: %s "
msgstr "Umgedreht: %s "
#. IDS_IMGCMP_STATUS_ROTATED_FMT
-#: Merge.rc:5206
+#: Merge.rc:5216
#, c-format
msgid "Rotated: %d "
msgstr "Gedreht: %d "
#. IDS_IMGCMP_REPORT_ALLPAGES
-#: Merge.rc:5207
+#: Merge.rc:5217
msgid "All pages"
msgstr "Alle Seiten"
#. IDS_IGNSUB_STR1
-#: Merge.rc:5212
+#: Merge.rc:5222
msgid ""
msgstr ""
#. IDS_IGNSUB_STR2
-#: Merge.rc:5213
+#: Merge.rc:5223
msgid "No differences found to select"
msgstr "Keine Unterschiede zur Auswahl gefunden"
#. IDS_IGNSUB_STR3
-#: Merge.rc:5214
+#: Merge.rc:5224
msgid "No differences found to add as substitution filter"
msgstr "Keine Unterschiede zum Hinzufügen als Ersetzungsfilter gefunden"
#. IDS_IGNSUB_STR4
-#: Merge.rc:5215
+#: Merge.rc:5225
msgid "The pair is already in the Substitution Filters list"
msgstr "Das Paar ist bereits in der Ersetzungsfilterliste vorhanden"
#. IDS_IGNSUB_STR5
-#: Merge.rc:5216
+#: Merge.rc:5226
msgid "Add this change to Substitution Filters?"
msgstr "Diese Änderung zu den Ersetzungsfiltern hinzufügen?"
#. IDS_OCRRESULT_TEXTONLY
-#: Merge.rc:5221
+#: Merge.rc:5231
msgid "Text only"
msgstr "Nur Text"
#. IDS_OCRRESULT_POS_LINE
-#: Merge.rc:5222
+#: Merge.rc:5232
msgid "Line-by-line position and text"
msgstr "Position und Text zeilenweise"
#. IDS_OCRRESULT_POS_WORD
-#: Merge.rc:5223
+#: Merge.rc:5233
msgid "Word-by-word position and text"
msgstr "Position und Text wortweise"
#. IDS_USERDATAFOLDER_APPDATA
-#: Merge.rc:5228
+#: Merge.rc:5238
msgid "AppData (Roaming) folder"
msgstr "AppData-Ordner (Roaming)"
#. IDS_USERDATAFOLDER_INSTALL
-#: Merge.rc:5229
+#: Merge.rc:5239
msgid "Install folder"
msgstr "Installationsordner"
#. IDS_USERDATAFOLDER_DOCUMENTS
-#: Merge.rc:5230
+#: Merge.rc:5240
msgid "Documents folder"
msgstr "Dokumente-Ordner"
#. IDS_SINGLEINSTANCE_DISABLED
-#: Merge.rc:5235
+#: Merge.rc:5245
msgctxt "Options dialog|General|Single instance mode"
msgid "Disabled"
msgstr "Deaktiviert"
#. IDS_SINGLEINSTANCE_STR1
-#: Merge.rc:5236
+#: Merge.rc:5246
#, c-format
msgid "Allow only one instance to run"
msgstr "Nur eine Instanz zulassen"
#. IDS_SINGLEINSTANCE_STR2
-#: Merge.rc:5237
+#: Merge.rc:5247
msgid "Allow only one instance; wait for termination"
msgstr "Nur eine Instanz zulassen und warten, bis die Instanz beendet ist"
#. IDS_AUTO_RELOAD_MODIFIED_FILES_DISABLED
-#: Merge.rc:5242
+#: Merge.rc:5252
msgctxt "Options dialog|General|Auto-reload modified files"
msgid "Disabled"
msgstr "Deaktiviert"
#. IDS_AUTO_RELOAD_MODIFIED_FILES_STR1
-#: Merge.rc:5243
+#: Merge.rc:5253
msgid "Only on window activated"
msgstr "Nur bei aktiviertem Fenster"
#. IDS_AUTO_RELOAD_MODIFIED_FILES_STR2
-#: Merge.rc:5244
+#: Merge.rc:5254
msgid "Immediately"
msgstr "Sofort, wenn eine externe Anwendung die angezeigte Datei ändert"
#. IDS_PLUGIN_ALL
-#: Merge.rc:5249
+#: Merge.rc:5259
msgid "Al&l"
msgstr "A&lle"
#. IDS_PLUGIN_OTHERS
-#: Merge.rc:5250
+#: Merge.rc:5260
msgid "&Others"
msgstr "Andere"
-#: Merge.rc:5252
+#: Merge.rc:5262
#, c-format
msgid "Missing plugin name in pipeline: %1"
msgstr "Fehlender Plugin-Name in der Plugin-Pipeline: %1"
-#: Merge.rc:5254
+#: Merge.rc:5264
#, c-format
msgid "Missing quote in plugin pipeline: %1"
msgstr "Fehlendes Anführungszeichen in der Plugin-Pipeline: %1"
#. IDS_PLUGIN_NAME_ALREADY_EXISTS
-#: Merge.rc:5255
+#: Merge.rc:5265
#, c-format
msgid "Plugin name '%1' already exists."
msgstr "Der Plug-in Name '%1' existiert bereits."
#. IDS_PLUGIN_TITLE1
-#: Merge.rc:5256
+#: Merge.rc:5266
msgid "Specify plugin arguments"
msgstr "Plugin-Argumente angeben"
-#: Merge.rc:5258
+#: Merge.rc:5268
#, c-format
msgid "Plugin not found or invalid: %1"
msgstr "Plugin nicht gefunden oder ungültig: %1"
#. IDS_PLUGIN_NOT_UNPACK
-#: Merge.rc:5259
+#: Merge.rc:5269
#, c-format
msgid "'%1' is not an unpacker plugin"
msgstr "'%1' ist kein Entpacker-Plugin"
#. IDS_PLUGIN_NOT_PREDIFF
-#: Merge.rc:5260
+#: Merge.rc:5270
#, c-format
msgid "'%1' is not a prediffer plugin"
msgstr "'%1' ist kein Prediffer-Plugin"
-#: Merge.rc:5262
+#: Merge.rc:5272
#, c-format
msgid "Error prediffing '%1' with '%2'. Prediffing disabled."
msgstr "Beim Prediffing der Datei '%1' mit dem Plugin '%2' ist ein Fehler aufgetreten. Das Prediffing wird nicht mehr angewendet."
#. IDS_PLUGIN_CIRCULAR_REFERENCE
-#: Merge.rc:5263
+#: Merge.rc:5273
#, c-format
msgid "Circular reference in plugin pipeline: %1"
msgstr "Zirkuläre Referenz in der Plugin-Pipeline: %1"
#. IDS_PLUGIN_TYPE1
-#: Merge.rc:5264
+#: Merge.rc:5274
msgid "URL Handler"
msgstr "URL-Handler"
#. IDS_PLUGIN_TYPE2
-#: Merge.rc:5265
+#: Merge.rc:5275
msgid "File Unpacker"
msgstr "Datei Entpacker"
#. IDS_PLUGIN_TYPE3
-#: Merge.rc:5266
+#: Merge.rc:5276
msgid "File or Folder Unpacker"
msgstr "Datei oder Ordner Entpacker"
#. IDS_PLUGIN_TYPE5
-#: Merge.rc:5268
+#: Merge.rc:5278
msgid "Alias for Unpacker"
msgstr "Alias für den Entpacker"
#. IDS_PLUGIN_TYPE6
-#: Merge.rc:5269
+#: Merge.rc:5279
msgid "Alias for Prediffer"
msgstr "Alias für Prediffer"
#. IDS_PLUGIN_TYPE7
-#: Merge.rc:5270
+#: Merge.rc:5280
msgid "Alias for Editor script"
msgstr "Alias für Editor-Skript"
#. IDS_PLUGIN_ALIAS_DESC
-#: Merge.rc:5271
+#: Merge.rc:5281
#, c-format
msgid "Alias for plugin pipeline '%1'"
msgstr "Alias für Plug-in Pipeline '%1'"
#. IDS_PLUGIN_NEW_DESC
-#: Merge.rc:5272
+#: Merge.rc:5282
msgid "New plugin description"
msgstr "Neue Plug-in Beschreibung"
#. IDS_PLUGIN_TARGETS_ALL
-#: Merge.rc:5273
+#: Merge.rc:5283
msgid "All"
msgstr "Alle"
#. IDS_PLUGIN_TARGETS_1ST
-#: Merge.rc:5274
+#: Merge.rc:5284
msgid "1st"
msgstr "1."
#. IDS_PLUGIN_TARGETS_2ND
-#: Merge.rc:5275
+#: Merge.rc:5285
msgid "2nd"
msgstr "2."
#. IDS_PLUGIN_TARGETS_3RD
-#: Merge.rc:5276
+#: Merge.rc:5286
msgid "3rd"
msgstr "3."
#. IDS_PLUGIN_TARGETS_1ST_2ND
-#: Merge.rc:5277
+#: Merge.rc:5287
msgid "1st and 2nd"
msgstr "1. und 2."
#. IDS_PLUGIN_TARGETS_1ST_3RD
-#: Merge.rc:5278
+#: Merge.rc:5288
msgid "1st and 3rd"
msgstr "1. und 3."
#. IDS_PLUGIN_TARGETS_2ND_3RD
-#: Merge.rc:5279
+#: Merge.rc:5289
msgid "2nd and 3rd"
msgstr "2. und 3."
#. IDS_FILTER_APPLIED
-#: Merge.rc:5284
+#: Merge.rc:5294
msgid "Filter applied"
msgstr "Angewandter Filter"
#. IDS_FILTERMENU_COMPARE
-#: Merge.rc:5289
+#: Merge.rc:5299
#, c-format
msgid "Compare %1"
msgstr "Vergleiche %1"
#. IDS_FILTERMENU_FILTER_BY_THIS_COLUMN
-#: Merge.rc:5290
+#: Merge.rc:5300
msgid "&Filter by This Column"
msgstr "Nach dieser Spalte &filtern"
#. IDS_FILTERMENU_FILTER_BY_THIS_COLUMN2
-#: Merge.rc:5291
+#: Merge.rc:5301
msgid "&Filter by This Column..."
msgstr "Nach dieser Spalte &filtern..."
#. IDS_CLIPBOARDHISTORY_TIME
-#: Merge.rc:5296
+#: Merge.rc:5306
#, c-format
msgid "Clipboard at %s"
msgstr "Zwischenablage am %s"
#. IDS_CLIPBOARDHISTORY_DISABLED
-#: Merge.rc:5297
+#: Merge.rc:5307
msgid ""
"Clipboard history disabled.\r\n"
"Enable: Windows logo key + V, then Turn on."
@@ -8783,110 +8794,115 @@ msgstr ""
"Der Zwischenablageverlauf ist deaktiviert.\r\n"
"Um den Zwischenablageverlauf zu aktivieren, betätigen Sie 'Windows+V' und klicken dann auf die Schaltfläche 'Einschalten'."
-#: Merge.rc:5299
+#: Merge.rc:5309
msgid "This system does not support clipboard history."
msgstr "Dieses System unterstützt keinen Zwischenablageverlauf."
-#: Merge.rc:5301
+#: Merge.rc:5311
msgid "32-bit WinMerge does not support Clipboard Compare"
msgstr "Die 32-Bit-Version von WinMerge unterstützt den Zwischenablagevergleich nicht"
#. IDS_WEBVIEW2_RUNTIME_NOT_INSTALLED
-#: Merge.rc:5306
+#: Merge.rc:5316
msgid "WebView2 runtime not installed. Download it?"
msgstr "WebView2-Laufzeitumgebung ist nicht installiert. Möchten Sie sie herunterladen?"
#. IDS_JUMPLIST_NEW_TEXT_COMPARE
-#: Merge.rc:5311
+#: Merge.rc:5321
msgid "New Text Compare"
msgstr "Neuer Textvergleich"
#. IDS_JUMPLIST_NEW_TABLE_COMPARE
-#: Merge.rc:5312
+#: Merge.rc:5322
msgid "New Table Compare"
msgstr "Neuer Tabellenvergleich"
#. IDS_JUMPLIST_NEW_BINARY_COMPARE
-#: Merge.rc:5313
+#: Merge.rc:5323
msgid "New Binary Compare"
msgstr "Neuer Binärvergleich"
#. IDS_JUMPLIST_NEW_IMAGE_COMPARE
-#: Merge.rc:5314
+#: Merge.rc:5324
msgid "New Image Compare"
msgstr "Neuer Bildvergleich"
#. IDS_JUMPLIST_NEW_WEBPAGE_COMPARE
-#: Merge.rc:5315
+#: Merge.rc:5325
msgid "New Webpage Compare"
msgstr "Neuer Webseitenvergleich"
+#. IDS_JUMPLIST_NEW_FOLDER_COMPARE
+#: Merge.rc:5326
+msgid "New Folder Compare"
+msgstr ""
+
#. IDS_JUMPLIST_CLIPBOARD_COMPARE
-#: Merge.rc:5316
+#: Merge.rc:5327
msgid "Clipboard Compare"
msgstr "Zwischenablage vergleichen"
#. IDS_PREVIEWBAR_PRINT
-#: Merge.rc:5321
+#: Merge.rc:5332
msgid "&Print..."
msgstr "&Drucken"
#. IDS_PREVIEWBAR_PREVPAGE
-#: Merge.rc:5323
+#: Merge.rc:5334
msgid "Pre&v Page"
msgstr "&Vorige Seite"
#. IDS_PREVIEWBAR_TWOPAGE
-#: Merge.rc:5324
+#: Merge.rc:5335
msgid "&Two Page"
msgstr "&Zwei Seiten"
#. IDS_PREVIEWBAR_ONEPAGE
-#: Merge.rc:5325
+#: Merge.rc:5336
msgid "&One Page"
msgstr "&Eine Seite"
#. IDS_PREVIEWBAR_ZOOMIN
-#: Merge.rc:5326
+#: Merge.rc:5337
msgid "Zoom &In"
msgstr "Here&inzoomen"
#. IDS_PREVIEWBAR_ZOOMOUT
-#: Merge.rc:5327
+#: Merge.rc:5338
msgid "Zoom &Out"
msgstr "Hera&uszoomen"
#. IDS_WEBPAGE_COMPARING
-#: Merge.rc:5333
+#: Merge.rc:5344
msgid "Comparing..."
msgstr "Vergleichen..."
#. IDS_WEBPAGE_ZOOM
-#: Merge.rc:5334
+#: Merge.rc:5345
msgid "Zoom:"
msgstr "Zoom:"
#. IDS_COPY_GRANULARITY_DIFFHUNK
-#: Merge.rc:5339
+#: Merge.rc:5350
msgid "Diff hunk"
msgstr "Diff-Hunk"
#. IDS_COPY_GRANULARITY_INLINE
-#: Merge.rc:5340
+#: Merge.rc:5351
msgid "Inline diff"
msgstr "Zeilenuntersciede"
#. IDS_COPY_GRANULARITY_LINE
-#: Merge.rc:5341
+#: Merge.rc:5352
msgid "Line"
msgstr "Zeile"
-#: Merge.rc:5342
+#: Merge.rc:5353
msgid "Character"
msgstr "Zeichen"
#. ID_MICE_PREVDIFF
-#: Merge.rc:5347
+#: Merge.rc:5358
msgid ""
"\n"
"Previous Difference (Alt+Up)\n"
@@ -8899,7 +8915,7 @@ msgstr ""
"(Alt+Mausrad Hoch)"
#. ID_MICE_NEXTDIFF
-#: Merge.rc:5348
+#: Merge.rc:5359
msgid ""
"\n"
"Next Difference (Alt+Down)\n"
@@ -8912,7 +8928,7 @@ msgstr ""
"(Alt+Mausrad Runter)"
#. ID_MICE_L2R
-#: Merge.rc:5349
+#: Merge.rc:5360
msgid ""
"\n"
"Copy to Right (Alt+Right)\n"
@@ -8927,7 +8943,7 @@ msgstr ""
"(Alt+Umschalt+Mausrad Runter)"
#. ID_MICE_R2L
-#: Merge.rc:5350
+#: Merge.rc:5361
msgid ""
"\n"
"Copy to Left (Alt+Left)\n"
@@ -8942,7 +8958,7 @@ msgstr ""
"(Alt+Umschalt+Mausrad Hoch)"
#. ID_MICE_L2RNEXT
-#: Merge.rc:5351
+#: Merge.rc:5362
msgid ""
"\n"
"Copy to Right and Advance (Ctrl+Alt+Right)\n"
@@ -8955,7 +8971,7 @@ msgstr ""
"(Strg+Alt+Umschalt+Mausrad Runter)"
#. ID_MICE_R2LNEXT
-#: Merge.rc:5352
+#: Merge.rc:5363
msgid ""
"\n"
"Copy to Left and Advance (Ctrl+Alt+Left)\n"
@@ -8968,257 +8984,257 @@ msgstr ""
"(Strg+Alt+Umschalt+Mausrad Hoch)"
#. IDS_LOG_COMPARING_2
-#: Merge.rc:5362
+#: Merge.rc:5373
#, c-format
msgid "Comparing %1 with %2"
msgstr "Vergleich von %1 mit %2"
#. IDS_LOG_COMPARING_3
-#: Merge.rc:5363
+#: Merge.rc:5374
#, c-format
msgid "Comparing %1 with %2 and %3"
msgstr "Vergleich von %1 mit %2 und %3"
#. IDS_LOG_COMPARE_COMPLETED
-#: Merge.rc:5364
+#: Merge.rc:5375
msgid "Comparison completed"
msgstr "Vergleich abgeschlossen"
#. IDS_LOG_COMPARE_ERROR_2
-#: Merge.rc:5365
+#: Merge.rc:5376
#, c-format
msgid "Failed to compare %1 with %2: "
msgstr "Der Vergleich von %1 mit %2 ist fehlgeschlagen:"
#. IDS_LOG_COMPARE_ERROR_3
-#: Merge.rc:5366
+#: Merge.rc:5377
#, c-format
msgid "Failed to compare %1 with %2 and %3: "
msgstr "Der Vergleich von %1 mit %2 und %3 ist fehlgeschlagen:"
#. IDS_LOG_FILE_SAVED
-#: Merge.rc:5367
+#: Merge.rc:5378
msgid "File saved"
msgstr "Datei gespeichert"
#. IDS_LOG_COPYING_FILES
-#: Merge.rc:5368
+#: Merge.rc:5379
msgid "Copying files..."
msgstr "Dateien werden kopiert..."
#. IDS_LOG_MOVING_FILES
-#: Merge.rc:5369
+#: Merge.rc:5380
msgid "Moving files..."
msgstr "Dateien werden verschoben ..."
#. IDS_LOG_DELETING_FILES
-#: Merge.rc:5370
+#: Merge.rc:5381
msgid "Deleting files..."
msgstr "Dateien werden gelöscht..."
#. IDS_LOG_RECYCLEBIN
-#: Merge.rc:5371
+#: Merge.rc:5382
msgid "Recycle Bin"
msgstr "Papierkorb"
#. IDS_LOG_PERMANENTLY_DELETED
-#: Merge.rc:5372
+#: Merge.rc:5383
msgid "Permanently deleted"
msgstr "Dauerhaft gelöscht"
#. IDS_LOG_FILEOPERATION_COMPLETED
-#: Merge.rc:5373
+#: Merge.rc:5384
msgid "File operation completed successfully"
msgstr "Dateioperation erfolgreich abgeschlossen"
#. IDS_LOG_FILEOPERATION_CANCELED
-#: Merge.rc:5374
+#: Merge.rc:5385
msgid "File operation canceled"
msgstr "Dateioperation abgebrochen"
#. IDS_FILTER_ERROR_NO_ERROR
-#: Merge.rc:5379
+#: Merge.rc:5390
msgid "No error"
msgstr "Kein Fehler"
#. IDS_FILTER_ERROR_EMPTY_EXPRESSION
-#: Merge.rc:5380
+#: Merge.rc:5391
msgid "Filter expression is empty"
msgstr "Filterausdruck ist leer"
#. IDS_FILTER_ERROR_UNKNOWN_CHAR
-#: Merge.rc:5381
+#: Merge.rc:5392
msgid "Unknown character in filter expression"
msgstr "Unbekanntes Zeichen im Filterausdruck"
#. IDS_FILTER_ERROR_UNTERMINATED_STRING
-#: Merge.rc:5382
+#: Merge.rc:5393
msgid "Unterminated string literal"
msgstr "Zeichenfolgenliteral ohne Ende"
#. IDS_FILTER_ERROR_SYNTAX_ERROR
-#: Merge.rc:5383
+#: Merge.rc:5394
msgid "Syntax error in filter expression"
msgstr "Syntaxfehler im Filterausdruck"
#. IDS_FILTER_ERROR_PARSE_FAILURE
-#: Merge.rc:5384
+#: Merge.rc:5395
msgid "Failed to parse filter expression"
msgstr "Filterausdruck konnte nicht geparst werden"
#. IDS_FILTER_ERROR_INVALID_LITERAL
-#: Merge.rc:5385
+#: Merge.rc:5396
msgid "Invalid literal value"
msgstr "Ungültiger literaler Wert"
#. IDS_FILTER_ERROR_INVALID_REGULAR_EXPRESSION
-#: Merge.rc:5386
+#: Merge.rc:5397
msgid "Invalid regular expression"
msgstr "Ungültiger regulärer Ausdruck"
#. IDS_FILTER_ERROR_UNDEFINED_IDENTIFIER
-#: Merge.rc:5387
+#: Merge.rc:5398
msgid "Undefined identifier"
msgstr "Undefinierter Bezeichner"
#. IDS_FILTER_ERROR_INVALID_ARGUMENT_COUNT
-#: Merge.rc:5388
+#: Merge.rc:5399
msgid "Invalid number of arguments"
msgstr "Ungültige Anzahl von Argumenten"
#. IDS_FILTER_ERROR_FILTER_NAME_NOT_FOUND
-#: Merge.rc:5389
+#: Merge.rc:5400
msgid "Filter name not found"
msgstr "Filtername nicht gefunden"
#. IDS_FILTER_ERROR_DIVIDE_BY_ZERO
-#: Merge.rc:5390
+#: Merge.rc:5401
msgid "Division by zero in filter expression"
msgstr "Division durch Null im Filterausdruck"
#. IDS_FILTER_ERROR_UNKNOWN_ERROR
-#: Merge.rc:5391
+#: Merge.rc:5402
msgid "Unknown error"
msgstr "Unbekannter Fehler"
#. IDS_FILTER_ERROR_INVALID_PROPERTY_NAME
-#: Merge.rc:5392
+#: Merge.rc:5403
msgid "Invalid property name"
msgstr "Ungültiger Eigenschaftsname"
#. IDS_FILTER_ERROR_INVALID_DIRECTIVE
-#: Merge.rc:5393
+#: Merge.rc:5404
msgid "Invalid directive"
msgstr "Ungültige Anweisung"
#. IDS_FILTER_OP_EQUALS
-#: Merge.rc:5398
+#: Merge.rc:5409
msgid "Equals"
msgstr "Ist gleich"
#. IDS_FILTER_OP_NOT_EQUALS
-#: Merge.rc:5399
+#: Merge.rc:5410
msgid "Does not equal"
msgstr "Ist nicht gleich"
#. IDS_FILTER_OP_LESS_THAN
-#: Merge.rc:5400
+#: Merge.rc:5411
msgid "Less than"
msgstr "Weniger als"
#. IDS_FILTER_OP_LESS_EQUAL
-#: Merge.rc:5401
+#: Merge.rc:5412
msgid "Less than or equal to"
msgstr "Kleiner oder gleich"
#. IDS_FILTER_OP_GREATER_EQUAL
-#: Merge.rc:5402
+#: Merge.rc:5413
msgid "Greater than or equal to"
msgstr "Größer oder gleich"
#. IDS_FILTER_OP_GREATER_THAN
-#: Merge.rc:5403
+#: Merge.rc:5414
msgid "Greater than"
msgstr "Größer als"
#. IDS_FILTER_OP_BETWEEN
-#: Merge.rc:5404
+#: Merge.rc:5415
msgid "Between"
msgstr "Zwischen"
#. IDS_FILTER_OP_NOT_BETWEEN
-#: Merge.rc:5405
+#: Merge.rc:5416
msgid "Not Between"
msgstr "Nicht zwischen"
#. IDS_FILTER_OP_CONTAINS
-#: Merge.rc:5406
+#: Merge.rc:5417
msgid "Contains"
msgstr "Enthält"
#. IDS_FILTER_OP_NOT_CONTAINS
-#: Merge.rc:5407
+#: Merge.rc:5418
msgid "Not Contains"
msgstr "Enthält nicht"
#. IDS_FILTER_OP_RECONTAINS
-#: Merge.rc:5408
+#: Merge.rc:5419
msgid "Contains (regex)"
msgstr "Enthält (Regex)"
#. IDS_FILTER_OP_NOT_RECONTAINS
-#: Merge.rc:5409
+#: Merge.rc:5420
msgid "Not Contains (regex)"
msgstr "Enthält nicht (Regex)"
#. IDS_FILTER_OP_LIKE
-#: Merge.rc:5410
+#: Merge.rc:5421
msgid "Match (wildcard)"
msgstr "Entspricht (Platzhalter)"
#. IDS_FILTER_OP_NOT_LIKE
-#: Merge.rc:5411
+#: Merge.rc:5422
msgid "Not match (wildcard)"
msgstr "Entspricht nicht (Platzhalter)"
#. IDS_FILTER_OP_MATCHES
-#: Merge.rc:5412
+#: Merge.rc:5423
msgid "Match (regex)"
msgstr "Entspricht (Regex)"
#. IDS_FILTER_OP_NOT_MATCHES
-#: Merge.rc:5413
+#: Merge.rc:5424
msgid "Not match (regex)"
msgstr "Entspricht nicht (Regex)"
#. IDS_COLORMODE_LIGHT
-#: Merge.rc:5418
+#: Merge.rc:5429
msgid "Light"
msgstr "Hell"
#. IDS_COLORMODE_DARK
-#: Merge.rc:5419
+#: Merge.rc:5430
msgid "Dark"
msgstr "Dunkel"
#. IDS_COLORMODE_FOLLOWSYSTEM
-#: Merge.rc:5420
+#: Merge.rc:5431
msgid "Follow system"
msgstr "Systemeinstellung verwenden"
#. IDS_EXAMPLE
-#: Merge.rc:5425
+#: Merge.rc:5436
#, c-format
msgid "e.g. %1"
msgstr "z. B. %1"
#. IDS_DETECTED_PREVIOUS_CRASH
-#: Merge.rc:5430
+#: Merge.rc:5441
msgid "WinMerge detected a previous crash. Please report this if possible."
msgstr "WinMerge hat einen vorherigen Absturz festgestellt. Bitte melden Sie ihn, wenn möglich."
#. IDS_REGEX_REPLACE_LIST_TEMPLATE
-#: Merge.rc:5435
+#: Merge.rc:5446
msgid ""
"# Regex replacement list\r\n"
"# Format: regexreplacement\r\n"
@@ -9233,7 +9249,7 @@ msgstr ""
"(\\d{4})-(\\d{2})-(\\d{2})\t$1_$2_$3\r\n"
#. IDS_STRING_REPLACE_LIST_TEMPLATE
-#: Merge.rc:5436
+#: Merge.rc:5447
msgid ""
"# Replacement list\r\n"
"# Format: searchreplacement\r\n"
diff --git a/Translations/WinMerge/Greek.po b/Translations/WinMerge/Greek.po
index c5feac5fbb5..56d28c49275 100644
--- a/Translations/WinMerge/Greek.po
+++ b/Translations/WinMerge/Greek.po
@@ -20,7 +20,7 @@ msgstr ""
"X-Poedit-Basepath: ../../Src/\n"
#. LANGUAGE, SUBLANGUAGE
-#: Merge.rc:26 Merge.rc:59 Merge.rc:5453
+#: Merge.rc:26 Merge.rc:59 Merge.rc:5464
#, c-format
msgid "LANG_ENGLISH, SUBLANG_ENGLISH_US"
msgstr "LANG_GREEK, SUBLANG_DEFAULT"
@@ -106,7 +106,7 @@ msgid "Copy Selected Diff (Right) to Clipboard\tCtrl+&3"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_SELECTLINEDIFF
-#: Merge.rc:110 Merge.rc:673
+#: Merge.rc:110 Merge.rc:680
#, c-format
msgid "Select Line &Difference\tF4"
msgstr "Επιλο&γή Διαφοράς Γραμμής\tF4"
@@ -140,7 +140,7 @@ msgid "Cu&t"
msgstr "Απο&κοπή"
#. IDR_POPUP_DIRVIEW
-#: Merge.rc:118 Merge.rc:943
+#: Merge.rc:118 Merge.rc:951
#, c-format
msgid "&Copy"
msgstr "Αντι&γραφή"
@@ -152,21 +152,21 @@ msgid "&Paste"
msgstr "Προ&σάρτηση"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:121 Merge.rc:875 Merge.rc:882
+#: Merge.rc:121 Merge.rc:882 Merge.rc:889
#, c-format
msgid "&Scripts"
msgstr "Μακ&ροεντολές"
#. IDS_NO_EDIT_SCRIPTS
-#: Merge.rc:123 Merge.rc:338 Merge.rc:447 Merge.rc:654 Merge.rc:659
-#: Merge.rc:865 Merge.rc:877 Merge.rc:884 Merge.rc:940 Merge.rc:1183
-#: Merge.rc:5028
+#: Merge.rc:123 Merge.rc:340 Merge.rc:451 Merge.rc:661 Merge.rc:666
+#: Merge.rc:872 Merge.rc:884 Merge.rc:891 Merge.rc:948 Merge.rc:1193
+#: Merge.rc:5038
#, c-format
msgid "< Empty >"
msgstr "< Άδειο >"
#. IDR_POPUP_LOCATIONBAR, ID_EDIT_WMGOTO
-#: Merge.rc:126 Merge.rc:691 Merge.rc:1081
+#: Merge.rc:126 Merge.rc:698 Merge.rc:1089
msgid "&Go to...\tCtrl+G"
msgstr "Μετά&βαση...\tCtrl+G"
@@ -187,27 +187,27 @@ msgid "Op&en"
msgstr "Άν&οιγμα"
#. IDR_POPUP_DIRVIEW, ID_DIR_OPEN_RIGHT
-#: Merge.rc:132 Merge.rc:981 Merge.rc:988 Merge.rc:995
+#: Merge.rc:132 Merge.rc:989 Merge.rc:996 Merge.rc:1003
msgid "With &Registered Application"
msgstr "Με Αντιστοιχισμένη Ε&φαρμογή"
#. IDR_POPUP_DIRVIEW, ID_DIR_OPEN_RIGHT_WITHEDITOR
-#: Merge.rc:133 Merge.rc:982 Merge.rc:989 Merge.rc:996
+#: Merge.rc:133 Merge.rc:990 Merge.rc:997 Merge.rc:1004
msgid "With &External Editor\tCtrl+Alt+E"
msgstr "Μ&ε άλλη Εφαρμογή\tCtrl+Alt+E"
#. IDR_POPUP_DIRVIEW, ID_DIR_OPEN_RIGHT_WITH
-#: Merge.rc:134 Merge.rc:983 Merge.rc:990 Merge.rc:997
+#: Merge.rc:134 Merge.rc:991 Merge.rc:998 Merge.rc:1005
msgid "&With..."
msgstr "Με..."
#. IDR_POPUP_DIRVIEW, ID_DIR_OPEN_RIGHT_PARENT_FOLDER
-#: Merge.rc:135 Merge.rc:984 Merge.rc:991 Merge.rc:998
+#: Merge.rc:135 Merge.rc:992 Merge.rc:999 Merge.rc:1006
msgid "Open &Parent Folder..."
msgstr ""
#. IDR_POPUP_IMG_CTXT, ID_FILE_SHELLMENU
-#: Merge.rc:137 Merge.rc:1239
+#: Merge.rc:137 Merge.rc:1249
msgid "S&hell Menu"
msgstr ""
@@ -245,8 +245,8 @@ msgid "Ins&ertion/Deletion Detection"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_TOOLBAR_NONE
-#: Merge.rc:176 Merge.rc:209 Merge.rc:216 Merge.rc:358 Merge.rc:507
-#: Merge.rc:751
+#: Merge.rc:176 Merge.rc:209 Merge.rc:216 Merge.rc:360 Merge.rc:511
+#: Merge.rc:758
#, c-format
msgid "&None"
msgstr "&Απόκρυψη"
@@ -262,13 +262,13 @@ msgid "&Horizontal"
msgstr ""
#. IDR_POPUP_IMG_CTXT, ID_IMG_CURPANE_PREVPAGE
-#: Merge.rc:181 Merge.rc:189 Merge.rc:1230
+#: Merge.rc:181 Merge.rc:189 Merge.rc:1240
#, c-format
msgid "&Previous Page"
msgstr ""
#. IDS_PREVIEWBAR_NEXTPAGE
-#: Merge.rc:182 Merge.rc:190 Merge.rc:1231 Merge.rc:5322
+#: Merge.rc:182 Merge.rc:190 Merge.rc:1241 Merge.rc:5333
#, c-format
msgid "&Next Page"
msgstr ""
@@ -280,45 +280,45 @@ msgid "&Active Pane"
msgstr ""
#. IDR_POPUP_IMG_CTXT, ID_IMG_CURPANE_ROTATE_RIGHT_90
-#: Merge.rc:185 Merge.rc:1225
+#: Merge.rc:185 Merge.rc:1235
msgid "Rotate &Right 90deg"
msgstr ""
#. IDR_POPUP_IMG_CTXT, ID_IMG_CURPANE_ROTATE_LEFT_90
-#: Merge.rc:186 Merge.rc:1226
+#: Merge.rc:186 Merge.rc:1236
msgid "Rotate &Left 90deg"
msgstr ""
#. IDR_POPUP_IMG_CTXT, ID_IMG_CURPANE_FLIP_VERTICALLY
-#: Merge.rc:187 Merge.rc:1227
+#: Merge.rc:187 Merge.rc:1237
msgid "Flip V&ertically"
msgstr ""
#. IDR_POPUP_IMG_CTXT, ID_IMG_CURPANE_FLIP_HORIZONTALLY
-#: Merge.rc:188 Merge.rc:1228
+#: Merge.rc:188 Merge.rc:1238
msgid "Flip H&orizontally"
msgstr ""
#. IDR_MERGEDOCTYPE
-#: Merge.rc:193 Merge.rc:699
+#: Merge.rc:193 Merge.rc:706
#, c-format
msgid "&Zoom"
msgstr "&Ζουμ"
#. IDR_MERGEDOCTYPE, ID_VIEW_ZOOMIN
-#: Merge.rc:202 Merge.rc:701
+#: Merge.rc:202 Merge.rc:708
#, c-format
msgid "Zoom &In\tCtrl++"
msgstr "Ζουμ &Μεγέθυνση\tCtrl++"
#. IDR_MERGEDOCTYPE, ID_VIEW_ZOOMOUT
-#: Merge.rc:203 Merge.rc:702
+#: Merge.rc:203 Merge.rc:709
#, c-format
msgid "Zoom &Out\tCtrl+-"
msgstr "Ζουμ &Σμίκρυνση\tCtrl+-"
#. IDR_MERGEDOCTYPE, ID_VIEW_ZOOMNORMAL, Zoom to normal
-#: Merge.rc:205 Merge.rc:704
+#: Merge.rc:205 Merge.rc:711
#, c-format
msgid "&Normal\tCtrl+*"
msgstr "&Κανονικό\tCtrl+*"
@@ -348,29 +348,29 @@ msgid "Dragging &Mode"
msgstr ""
#. IDR_POPUP_IMG_CTXT, ID_IMG_DRAGGINGMODE_MOVE
-#: Merge.rc:217 Merge.rc:955 Merge.rc:1233
+#: Merge.rc:217 Merge.rc:963 Merge.rc:1243
#, c-format
msgid "&Move"
msgstr "&Μετακίνηση"
#. IDR_POPUP_IMG_CTXT, ID_IMG_DRAGGINGMODE_ADJUST_OFFSET
-#: Merge.rc:218 Merge.rc:1234
+#: Merge.rc:218 Merge.rc:1244
#, c-format
msgid "&Adjust Offset"
msgstr ""
#. IDR_POPUP_IMG_CTXT, ID_IMG_DRAGGINGMODE_VERTICAL_WIPE
-#: Merge.rc:219 Merge.rc:1235
+#: Merge.rc:219 Merge.rc:1245
msgid "&Vertical Wipe"
msgstr ""
#. IDR_POPUP_IMG_CTXT, ID_IMG_DRAGGINGMODE_HORIZONTAL_WIPE
-#: Merge.rc:220 Merge.rc:1236
+#: Merge.rc:220 Merge.rc:1246
msgid "&Horizontal Wipe"
msgstr ""
#. IDR_POPUP_IMG_CTXT, ID_IMG_DRAGGINGMODE_RECTANGLE_SELECT
-#: Merge.rc:221 Merge.rc:1237
+#: Merge.rc:221 Merge.rc:1247
msgid "Rectangle &Select"
msgstr ""
@@ -406,37 +406,37 @@ msgid "Compare Extracted &Text from Images"
msgstr ""
#. IDD_OPEN, IDOK
-#: Merge.rc:272 Merge.rc:1980
+#: Merge.rc:272 Merge.rc:1990
msgid "Co&mpare"
msgstr ""
#. IDR_POPUP_WEBPAGE_COMPARE, ID_WEB_COMPARE_SCREENSHOTS
-#: Merge.rc:274 Merge.rc:1247
+#: Merge.rc:274 Merge.rc:1257
msgid "&Screenshots"
msgstr ""
#. IDR_POPUP_WEBPAGE_COMPARE, ID_WEB_COMPARE_FULLSIZE_SCREENSHOTS
-#: Merge.rc:275 Merge.rc:1248
+#: Merge.rc:275 Merge.rc:1258
msgid "&Full Size Screenshots"
msgstr ""
#. IDR_POPUP_WEBPAGE_COMPARE, ID_WEB_COMPARE_HTMLS
-#: Merge.rc:276 Merge.rc:1249
+#: Merge.rc:276 Merge.rc:1259
msgid "&HTMLs"
msgstr ""
#. IDR_POPUP_WEBPAGE_COMPARE, ID_WEB_COMPARE_TEXTS
-#: Merge.rc:277 Merge.rc:1250
+#: Merge.rc:277 Merge.rc:1260
msgid "&Texts"
msgstr ""
#. IDR_POPUP_WEBPAGE_COMPARE, ID_WEB_COMPARE_RESOURCETREES
-#: Merge.rc:278 Merge.rc:1251
+#: Merge.rc:278 Merge.rc:1261
msgid "&Resource Trees"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_SIZE
-#: Merge.rc:280 Merge.rc:1775
+#: Merge.rc:280 Merge.rc:1785
msgid "&Size"
msgstr ""
@@ -451,27 +451,27 @@ msgid "&Event Sync"
msgstr ""
#. IDR_POPUP_WEBPAGE_SYNC_EVENTS, ID_WEB_SYNC_ENABLED
-#: Merge.rc:291 Merge.rc:1259
+#: Merge.rc:291 Merge.rc:1269
msgid "&Enabled"
msgstr ""
#. IDR_POPUP_WEBPAGE_SYNC_EVENTS, ID_WEB_SYNC_SCROLL
-#: Merge.rc:293 Merge.rc:1261
+#: Merge.rc:293 Merge.rc:1271
msgid "&Scroll"
msgstr ""
#. IDR_POPUP_WEBPAGE_SYNC_EVENTS, ID_WEB_SYNC_CLICK
-#: Merge.rc:294 Merge.rc:1262
+#: Merge.rc:294 Merge.rc:1272
msgid "&Click"
msgstr ""
#. IDR_POPUP_WEBPAGE_SYNC_EVENTS, ID_WEB_SYNC_INPUT
-#: Merge.rc:295 Merge.rc:1263
+#: Merge.rc:295 Merge.rc:1273
msgid "&Input"
msgstr ""
#. IDR_POPUP_WEBPAGE_SYNC_EVENTS, ID_WEB_SYNC_GOBACKFORWARD
-#: Merge.rc:296 Merge.rc:1264
+#: Merge.rc:296 Merge.rc:1274
msgid "&Go Back/Forward"
msgstr ""
@@ -501,4882 +501,4893 @@ msgid "&All Profiles"
msgstr ""
#. IDR_MERGEDOCTYPE
-#: Merge.rc:310 Merge.rc:411 Merge.rc:586
+#: Merge.rc:310 Merge.rc:413 Merge.rc:590
#, c-format
msgid "&File"
msgstr "&Αρχείο"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:312 Merge.rc:413 Merge.rc:588
+#: Merge.rc:312 Merge.rc:415 Merge.rc:592
#, c-format
msgid "&New"
msgstr "&Δημιουργία"
#. IDR_POPUP_COMPARE, ID_MERGE_COMPARE_TEXT
-#: Merge.rc:314 Merge.rc:322 Merge.rc:415 Merge.rc:423 Merge.rc:590
-#: Merge.rc:598 Merge.rc:649 Merge.rc:935 Merge.rc:1159 Merge.rc:1171
+#: Merge.rc:314 Merge.rc:323 Merge.rc:417 Merge.rc:426 Merge.rc:594
+#: Merge.rc:603 Merge.rc:655 Merge.rc:942 Merge.rc:1167 Merge.rc:1180
#, c-format
msgid "&Text"
msgstr ""
#. IDR_POPUP_COMPARE, ID_MERGE_COMPARE_TABLE
-#: Merge.rc:315 Merge.rc:323 Merge.rc:416 Merge.rc:424 Merge.rc:591
-#: Merge.rc:599 Merge.rc:650 Merge.rc:936 Merge.rc:1160 Merge.rc:1172
+#: Merge.rc:315 Merge.rc:324 Merge.rc:418 Merge.rc:427 Merge.rc:595
+#: Merge.rc:604 Merge.rc:656 Merge.rc:943 Merge.rc:1168 Merge.rc:1181
msgid "T&able"
msgstr ""
#. IDR_POPUP_COMPARE, ID_MERGE_COMPARE_HEX
-#: Merge.rc:316 Merge.rc:324 Merge.rc:417 Merge.rc:425 Merge.rc:592
-#: Merge.rc:600 Merge.rc:651 Merge.rc:937 Merge.rc:1161 Merge.rc:1173
+#: Merge.rc:316 Merge.rc:325 Merge.rc:419 Merge.rc:428 Merge.rc:596
+#: Merge.rc:605 Merge.rc:657 Merge.rc:944 Merge.rc:1169 Merge.rc:1182
#, c-format
msgid "&Binary"
msgstr ""
#. IDS_IMAGE_MENU
-#: Merge.rc:317 Merge.rc:325 Merge.rc:418 Merge.rc:426 Merge.rc:593
-#: Merge.rc:601 Merge.rc:652 Merge.rc:938 Merge.rc:1162 Merge.rc:1174
-#: Merge.rc:5123
+#: Merge.rc:317 Merge.rc:326 Merge.rc:420 Merge.rc:429 Merge.rc:597
+#: Merge.rc:606 Merge.rc:658 Merge.rc:945 Merge.rc:1170 Merge.rc:1183
+#: Merge.rc:5133
#, c-format
msgid "&Image"
msgstr ""
#. IDR_POPUP_COMPARE, ID_MERGE_COMPARE_WEBPAGE
-#: Merge.rc:318 Merge.rc:326 Merge.rc:419 Merge.rc:427 Merge.rc:594
-#: Merge.rc:602 Merge.rc:653 Merge.rc:939 Merge.rc:1163 Merge.rc:1175
+#: Merge.rc:318 Merge.rc:327 Merge.rc:421 Merge.rc:430 Merge.rc:598
+#: Merge.rc:607 Merge.rc:659 Merge.rc:946 Merge.rc:1171 Merge.rc:1184
msgid "&Webpage"
msgstr ""
+#. IDR_POPUP_NEW, ID_FILE_NEW_FOLDER
+#: Merge.rc:319 Merge.rc:328 Merge.rc:422 Merge.rc:431 Merge.rc:599
+#: Merge.rc:608 Merge.rc:1172
+msgid "&Folder"
+msgstr ""
+
#. IDR_MERGEDOCTYPE
-#: Merge.rc:320 Merge.rc:421 Merge.rc:596
+#: Merge.rc:321 Merge.rc:424 Merge.rc:601
#, c-format
msgid "New (&3 panes)"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_FILE_OPEN
-#: Merge.rc:328 Merge.rc:429 Merge.rc:604
+#: Merge.rc:330 Merge.rc:433 Merge.rc:610
#, c-format
msgid "&Open...\tCtrl+O"
msgstr "Άν&οιγμα...\tCtrl+O"
#. IDR_MERGEDOCTYPE, ID_FILE_OPENCONFLICT
-#: Merge.rc:329 Merge.rc:430 Merge.rc:605
+#: Merge.rc:331 Merge.rc:434 Merge.rc:611
msgid "Open Conflic&t File..."
msgstr "Άνοιγμα Αρχείου &Διενέξεων..."
#. IDR_MERGEDOCTYPE, ID_FILE_OPENCLIPBOARD
-#: Merge.rc:330 Merge.rc:431 Merge.rc:606
+#: Merge.rc:332 Merge.rc:435 Merge.rc:612
msgid "Open C&lipboard"
msgstr ""
#. IDR_POPUP_PROJECT, ID_FILE_OPENPROJECT
-#: Merge.rc:332 Merge.rc:433 Merge.rc:608 Merge.rc:1191
+#: Merge.rc:334 Merge.rc:437 Merge.rc:614 Merge.rc:1201
#, c-format
msgid "Open Pro&ject...\tCtrl+J"
msgstr "Άνοιγμα Έρ&γου...\tCtrl+J"
#. IDD_OPEN, ID_SAVE_PROJECT
-#: Merge.rc:333 Merge.rc:434 Merge.rc:609 Merge.rc:1193 Merge.rc:1979
+#: Merge.rc:335 Merge.rc:438 Merge.rc:615 Merge.rc:1203 Merge.rc:1989
#, c-format
msgid "Sa&ve Project..."
msgstr "Απο&θήκευση Έργου..."
#. IDR_MAINFRAME, ID_FILE_PROJECT_MRU_FIRST
-#: Merge.rc:335
+#: Merge.rc:337
#, c-format
msgid "Recent Projects"
msgstr "Πρόσ&φατα Έργα"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:336 Merge.rc:445 Merge.rc:657
+#: Merge.rc:338 Merge.rc:449 Merge.rc:664
#, c-format
msgid "Recent F&iles or Folders"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_APP_EXIT
-#: Merge.rc:341 Merge.rc:450 Merge.rc:662
+#: Merge.rc:343 Merge.rc:454 Merge.rc:669
msgid "E&xit\tCtrl+Q"
msgstr "Έξοδο&ς\tCtrl+Q"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:343 Merge.rc:452 Merge.rc:664
+#: Merge.rc:345 Merge.rc:456 Merge.rc:671
#, c-format
msgid "&Edit"
msgstr "&Επεξεργασία"
#. IDR_MERGEDOCTYPE, ID_EDIT_PASTE
-#: Merge.rc:345 Merge.rc:671
+#: Merge.rc:347 Merge.rc:678
#, c-format
msgid "&Paste\tCtrl+V"
msgstr "Προ&σάρτηση\tCtrl+V"
#. IDR_MERGEDOCTYPE, ID_OPTIONS
-#: Merge.rc:347 Merge.rc:456 Merge.rc:693
+#: Merge.rc:349 Merge.rc:460 Merge.rc:700
#, c-format
msgid "&Options...\tCtrl+,"
msgstr "Επιλ&ογές...\tCtrl+,"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:349 Merge.rc:458 Merge.rc:695
+#: Merge.rc:351 Merge.rc:462 Merge.rc:702
#, c-format
msgid "&View"
msgstr "Πρ&οβολή"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:351 Merge.rc:500 Merge.rc:744
+#: Merge.rc:353 Merge.rc:504 Merge.rc:751
#, c-format
msgid "Ta&b Bar"
msgstr "Γραμμή Σε&λιδοδεικτών"
#. IDR_MERGEDOCTYPE, ID_VIEW_TAB_BAR
-#: Merge.rc:353 Merge.rc:502 Merge.rc:746
+#: Merge.rc:355 Merge.rc:506 Merge.rc:753
msgid "&View Tab Bar"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_VIEW_TAB_BAR_ON_TITLE_BAR
-#: Merge.rc:354 Merge.rc:503 Merge.rc:747
+#: Merge.rc:356 Merge.rc:507 Merge.rc:754
msgid "&On Title Bar"
msgstr ""
#. IDR_MERGEDOCTYPE
-#: Merge.rc:356 Merge.rc:505 Merge.rc:749
+#: Merge.rc:358 Merge.rc:509 Merge.rc:756
#, c-format
msgid "&Toolbar"
msgstr "Γραμμή Ε&ργαλείων"
#. IDR_MERGEDOCTYPE, ID_TOOLBAR_SMALL
-#: Merge.rc:359 Merge.rc:508 Merge.rc:752
+#: Merge.rc:361 Merge.rc:512 Merge.rc:759
#, c-format
msgid "&Small"
msgstr "Μι&κρή"
#. IDR_MERGEDOCTYPE, ID_TOOLBAR_MEDIUM
-#: Merge.rc:360 Merge.rc:509 Merge.rc:753
+#: Merge.rc:362 Merge.rc:513 Merge.rc:760
msgid "&Medium"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_TOOLBAR_BIG
-#: Merge.rc:361 Merge.rc:510 Merge.rc:754
+#: Merge.rc:363 Merge.rc:514 Merge.rc:761
#, c-format
msgid "&Big"
msgstr "Με&γάλη"
#. IDR_MERGEDOCTYPE, ID_TOOLBAR_HUGE
-#: Merge.rc:362 Merge.rc:511 Merge.rc:755
+#: Merge.rc:364 Merge.rc:515 Merge.rc:762
#, c-format
msgid "&Huge"
msgstr ""
#. IDS_VIEW_MENU_BAR
-#: Merge.rc:364 Merge.rc:513 Merge.rc:757 Merge.rc:5357
+#: Merge.rc:366 Merge.rc:517 Merge.rc:764 Merge.rc:5368
msgid "Men&u Bar"
msgstr ""
#. IDR_DIRDOCTYPE, ID_VIEW_OUTPUT_BAR
-#: Merge.rc:365 Merge.rc:515
+#: Merge.rc:367 Merge.rc:519
msgid "&Output Pane"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_VIEW_STATUS_BAR
-#: Merge.rc:366 Merge.rc:516 Merge.rc:758
+#: Merge.rc:368 Merge.rc:520 Merge.rc:765
#, c-format
msgid "&Status Bar"
msgstr "Γραμμή &Καταστάσεως"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:368 Merge.rc:539 Merge.rc:847
+#: Merge.rc:370 Merge.rc:543 Merge.rc:854
#, c-format
msgid "&Tools"
msgstr "Εργα&λεία"
#. IDR_MERGEDOCTYPE, ID_TOOLS_FILTERS
-#: Merge.rc:370 Merge.rc:542 Merge.rc:849
+#: Merge.rc:372 Merge.rc:546 Merge.rc:856
#, c-format
msgid "&Filters..."
msgstr "&Φίλτρα..."
#. IDR_MERGEDOCTYPE, ID_TOOLS_GENERATEPATCH
-#: Merge.rc:371 Merge.rc:543 Merge.rc:850
+#: Merge.rc:373 Merge.rc:547 Merge.rc:857
#, c-format
msgid "&Generate Patch..."
msgstr "&Δημιουργία Patch..."
#. IDR_MERGEDOCTYPE
-#: Merge.rc:373 Merge.rc:546 Merge.rc:853
+#: Merge.rc:375 Merge.rc:550 Merge.rc:860
#, c-format
msgid "&Plugins"
msgstr "Αρ&θρώματα"
#. IDD_PLUGINS_LIST, IDC_PLUGIN_SETTINGS
-#: Merge.rc:375 Merge.rc:548 Merge.rc:855 Merge.rc:2494 Merge.rc:2926
+#: Merge.rc:377 Merge.rc:552 Merge.rc:862 Merge.rc:2504 Merge.rc:2936
#, c-format
msgid "P&lugin Settings..."
msgstr ""
#. IDR_MERGEDOCTYPE, ID_PREDIFFER_MANUAL
-#: Merge.rc:377 Merge.rc:550 Merge.rc:857
+#: Merge.rc:379 Merge.rc:554 Merge.rc:864
#, c-format
msgid "Ma&nual Prediffer"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_PREDIFFER_AUTO
-#: Merge.rc:378 Merge.rc:551 Merge.rc:858
+#: Merge.rc:380 Merge.rc:555 Merge.rc:865
#, c-format
msgid "A&utomatic Prediffer"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_UNPACK_MANUAL
-#: Merge.rc:380 Merge.rc:553 Merge.rc:860
+#: Merge.rc:382 Merge.rc:557 Merge.rc:867
#, c-format
msgid "&Manual Unpacking"
msgstr "Α&ποσυμπίεση από το Χρήστη"
#. IDR_MERGEDOCTYPE, ID_UNPACK_AUTO
-#: Merge.rc:381 Merge.rc:554 Merge.rc:861
+#: Merge.rc:383 Merge.rc:558 Merge.rc:868
#, c-format
msgid "&Automatic Unpacking"
msgstr "Α&υτόματη Αποσυμπίεση"
#. IDR_MERGEDOCTYPE, ID_RELOAD_PLUGINS
-#: Merge.rc:383 Merge.rc:558 Merge.rc:889
+#: Merge.rc:385 Merge.rc:562 Merge.rc:896
#, c-format
msgid "&Reload Plugins"
msgstr "Επανέ&λεγχος Αρθρωμάτων"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:385 Merge.rc:560 Merge.rc:891
+#: Merge.rc:387 Merge.rc:564 Merge.rc:898
#, c-format
msgid "&Window"
msgstr "&Παράθυρο"
#. IDR_MERGEDOCTYPE, ID_FILE_CLOSE
-#: Merge.rc:387 Merge.rc:562 Merge.rc:893
+#: Merge.rc:389 Merge.rc:566 Merge.rc:900
msgid "Cl&ose\tCtrl+W"
msgstr "Κ&λείσιμο\tCtrl+W"
#. IDR_MERGEDOCTYPE, ID_WINDOW_CLOSEALL
-#: Merge.rc:388 Merge.rc:563 Merge.rc:894
+#: Merge.rc:390 Merge.rc:567 Merge.rc:901
#, c-format
msgid "Clo&se All"
msgstr "Κλείσιμο όλ&ων"
#. IDR_MERGEDOCTYPE, ID_NEXT_PANE
-#: Merge.rc:390 Merge.rc:565 Merge.rc:896
+#: Merge.rc:392 Merge.rc:569 Merge.rc:903
#, c-format
msgid "Change &Pane\tF6"
msgstr "Εναλλαγή μεταξύ Πε&δίων\tF6"
#. IDR_MERGEDOCTYPE, ID_WINDOW_TILE_HORZ
-#: Merge.rc:392 Merge.rc:567 Merge.rc:900
+#: Merge.rc:394 Merge.rc:571 Merge.rc:907
#, c-format
msgid "Tile &Horizontally"
msgstr "Παράθεση Ορι&ζοντίως"
#. IDR_MERGEDOCTYPE, ID_WINDOW_TILE_VERT
-#: Merge.rc:393 Merge.rc:568 Merge.rc:901
+#: Merge.rc:395 Merge.rc:572 Merge.rc:908
#, c-format
msgid "Tile &Vertically"
msgstr "Παράθεση Κατα&κορύφως"
#. IDR_MERGEDOCTYPE, ID_WINDOW_CASCADE
-#: Merge.rc:394 Merge.rc:569 Merge.rc:902
+#: Merge.rc:396 Merge.rc:573 Merge.rc:909
#, c-format
msgid "&Cascade"
msgstr "Επικάλυ&ψη"
#. IDS_MESSAGEBOX_HELP
-#: Merge.rc:396 Merge.rc:571 Merge.rc:904 Merge.rc:3200 Merge.rc:4189
+#: Merge.rc:398 Merge.rc:575 Merge.rc:911 Merge.rc:3210 Merge.rc:4199
#, c-format
msgid "&Help"
msgstr "&Βοήθεια"
#. IDR_MERGEDOCTYPE, ID_HELP_CONTENTS
-#: Merge.rc:398 Merge.rc:573 Merge.rc:906
+#: Merge.rc:400 Merge.rc:577 Merge.rc:913
#, c-format
msgid "&WinMerge Help\tF1"
msgstr "Βοήθεια WinMerge\tF1"
#. IDR_MERGEDOCTYPE, ID_HELP_RELEASENOTES
-#: Merge.rc:400 Merge.rc:575 Merge.rc:908
+#: Merge.rc:402 Merge.rc:579 Merge.rc:915
#, c-format
msgid "R&elease Notes"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_HELP_TRANSLATIONS
-#: Merge.rc:401 Merge.rc:576 Merge.rc:909
+#: Merge.rc:403 Merge.rc:580 Merge.rc:916
#, c-format
msgid "&Translations"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_HELP_GETCONFIG
-#: Merge.rc:402 Merge.rc:577 Merge.rc:910
+#: Merge.rc:404 Merge.rc:581 Merge.rc:917
#, c-format
msgid "C&onfiguration"
msgstr "&Ρυθμίσεις"
#. IDR_MERGEDOCTYPE, ID_HELP_GNULICENSE
-#: Merge.rc:404 Merge.rc:579 Merge.rc:912
+#: Merge.rc:406 Merge.rc:583 Merge.rc:919
#, c-format
msgid "&GNU General Public License"
msgstr "Γενική Δημοσία Άδεια &GNU"
#. IDR_MERGEDOCTYPE, ID_APP_ABOUT
-#: Merge.rc:405 Merge.rc:580 Merge.rc:913
+#: Merge.rc:407 Merge.rc:584 Merge.rc:920
#, c-format
msgid "&About WinMerge..."
msgstr "&Περί του WinMerge..."
#. IDR_MERGEDOCTYPE
-#: Merge.rc:436 Merge.rc:629
+#: Merge.rc:440 Merge.rc:635
#, c-format
msgid "&Read-Only"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_FILE_LEFT_READONLY
-#: Merge.rc:438 Merge.rc:631
+#: Merge.rc:442 Merge.rc:637
#, c-format
msgid "L&eft Read-Only"
msgstr "Αριστερό για Ανάγ&νωση μόνο"
#. IDR_MERGEDOCTYPE, ID_FILE_MIDDLE_READONLY
-#: Merge.rc:439 Merge.rc:632
+#: Merge.rc:443 Merge.rc:638
#, c-format
msgid "M&iddle Read-Only"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_FILE_RIGHT_READONLY
-#: Merge.rc:440 Merge.rc:633
+#: Merge.rc:444 Merge.rc:639
#, c-format
msgid "Ri&ght Read-Only"
msgstr "Δεξιό για Ανάγν&ωση μόνο"
#. IDD_ENCODINGERROR, IDC_FILEENCODING
-#: Merge.rc:443 Merge.rc:646 Merge.rc:1038 Merge.rc:3063
+#: Merge.rc:447 Merge.rc:652 Merge.rc:1046 Merge.rc:3073
#, c-format
msgid "&File Encoding..."
msgstr "&Κωδικοσελίδα Αρχείου..."
#. IDR_POPUP_OUTPUTVIEW, ID_EDIT_SELECT_ALL
-#: Merge.rc:454 Merge.rc:674 Merge.rc:1343
+#: Merge.rc:458 Merge.rc:681 Merge.rc:1353
#, c-format
msgid "Select &All\tCtrl+A"
msgstr "Επιλογή Ό&λων\tCtrl+A"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWIDENTICAL
-#: Merge.rc:460
+#: Merge.rc:464
#, c-format
msgid "Show &Identical Items"
msgstr "Εμφάνιση Πανομοιο&τύπων Στοιχείων"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWDIFFERENT
-#: Merge.rc:461
+#: Merge.rc:465
#, c-format
msgid "Show &Different Items"
msgstr "Εμφάνιση &Διαφορετικών Στοιχείων"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWUNIQUELEFT
-#: Merge.rc:462
+#: Merge.rc:466
#, c-format
msgid "Show L&eft Unique Items"
msgstr "Εμφάνιση Ορφανών Στοιχείων Α&ριστερού"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWUNIQUEMIDDLE
-#: Merge.rc:463
+#: Merge.rc:467
#, c-format
msgid "Show Midd&le Unique Items"
msgstr ""
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWUNIQUERIGHT
-#: Merge.rc:464
+#: Merge.rc:468
#, c-format
msgid "Show Ri&ght Unique Items"
msgstr "Εμφάνιση Ορφανών Στοιχείων Δε&ξιού"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWSKIPPED
-#: Merge.rc:465
+#: Merge.rc:469
#, c-format
msgid "Show S&kipped Items"
msgstr "Εμφάνιση Αντι&παρελθέντων Στοιχείων"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWBINARIES
-#: Merge.rc:466
+#: Merge.rc:470
#, c-format
msgid "S&how Binary Files"
msgstr "Εμφάνιση &Δυαδικών Αρχείων"
#. IDR_DIRDOCTYPE
-#: Merge.rc:467
+#: Merge.rc:471
#, c-format
msgid "&3-way Compare"
msgstr ""
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWDIFFERENTLEFTONLY
-#: Merge.rc:469
+#: Merge.rc:473
#, c-format
msgid "Show &Left Only Different Items"
msgstr ""
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWDIFFERENTMIDDLEONLY
-#: Merge.rc:470
+#: Merge.rc:474
#, c-format
msgid "Show &Middle Only Different Items"
msgstr ""
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWDIFFERENTRIGHTONLY
-#: Merge.rc:471
+#: Merge.rc:475
#, c-format
msgid "Show &Right Only Different Items"
msgstr ""
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWMISSINGLEFTONLY
-#: Merge.rc:473
+#: Merge.rc:477
msgid "Show L&eft Only Missing Items"
msgstr ""
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWMISSINGMIDDLEONLY
-#: Merge.rc:474
+#: Merge.rc:478
msgid "Show Mi&ddle Only Missing Items"
msgstr ""
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWMISSINGRIGHTONLY
-#: Merge.rc:475
+#: Merge.rc:479
msgid "Show Rig&ht Only Missing Items"
msgstr ""
#. IDR_DIRDOCTYPE, ID_VIEW_SHOWHIDDENITEMS
-#: Merge.rc:478
+#: Merge.rc:482
#, c-format
msgid "Show Hidd&en Items"
msgstr "Εμφάνιση Κρυ&φών Στοιχείων"
#. IDR_DIRDOCTYPE, ID_VIEW_TREEMODE
-#: Merge.rc:480
+#: Merge.rc:484
#, c-format
msgid "Tree &Mode"
msgstr ""
#. IDR_DIRDOCTYPE
-#: Merge.rc:481
+#: Merge.rc:485
msgid "E&xpand Subfolders"
msgstr ""
#. IDR_DIRDOCTYPE, ID_VIEW_EXPAND_ALLSUBDIRS
-#: Merge.rc:483
+#: Merge.rc:487
msgid "&All Subfolders"
msgstr ""
#. IDR_DIRDOCTYPE, ID_VIEW_EXPAND_DIFFERENT_SUBDIRS
-#: Merge.rc:484
+#: Merge.rc:488
msgid "&Different Subfolders"
msgstr ""
#. IDR_DIRDOCTYPE, ID_VIEW_EXPAND_IDENTICAL_SUBDIRS
-#: Merge.rc:485
+#: Merge.rc:489
msgid "&Identical Subfolders"
msgstr ""
#. IDR_DIRDOCTYPE, ID_VIEW_COLLAPSE_ALLSUBDIRS
-#: Merge.rc:487
+#: Merge.rc:491
#, c-format
msgid "&Collapse All Subfolders"
msgstr ""
#. IDR_DIRDOCTYPE, ID_VIEW_SHOW_EMPTY_FOLDERS
-#: Merge.rc:488
+#: Merge.rc:492
msgid "Show &Empty Folders"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_VIEW_SELECTFONT
-#: Merge.rc:490 Merge.rc:697
+#: Merge.rc:494 Merge.rc:704
#, c-format
msgid "Select &Font..."
msgstr "Επιλογή &Γραμματοσειράς..."
#. IDR_MERGEDOCTYPE, ID_VIEW_USEDEFAULTFONT
-#: Merge.rc:491 Merge.rc:698
+#: Merge.rc:495 Merge.rc:705
#, c-format
msgid "Use Default Font"
msgstr "Χρήση Προκα&θορισμένης Γραμματοσειράς"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:493 Merge.rc:736
+#: Merge.rc:497 Merge.rc:743
#, c-format
msgid "Sw&ap Panes"
msgstr "Αντι&μετάθεση Πεδίων"
#. IDR_MERGEDOCTYPE, ID_SWAPPANES_SWAP12
-#: Merge.rc:495 Merge.rc:738
+#: Merge.rc:499 Merge.rc:745
msgid "Swap &1st | 2nd"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_SWAPPANES_SWAP23
-#: Merge.rc:496 Merge.rc:739
+#: Merge.rc:500 Merge.rc:746
msgid "Swap &2nd | 3rd"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_SWAPPANES_SWAP13
-#: Merge.rc:497 Merge.rc:740
+#: Merge.rc:501 Merge.rc:747
msgid "Swap 1st | &3rd"
msgstr ""
#. IDR_DIRDOCTYPE, ID_VIEW_DISPLAY_FILTER_BAR_MENU
-#: Merge.rc:514
+#: Merge.rc:518
msgid "Displa&y Filter Bar\tCtrl+Shift+L"
msgstr ""
#. IDR_DIRDOCTYPE, ID_VIEW_DIR_STATISTICS
-#: Merge.rc:518
+#: Merge.rc:522
#, c-format
msgid "Com&pare Statistics..."
msgstr "Στατιστικά Συγκρίσεως..."
#. IDR_MERGEDOCTYPE, ID_REFRESH
-#: Merge.rc:520 Merge.rc:763
+#: Merge.rc:524 Merge.rc:770
#, c-format
msgid "Refresh\tF5"
msgstr "Ανα&νέωση\tF5"
#. IDR_POPUP_DIRVIEW, ID_RESCAN
-#: Merge.rc:521 Merge.rc:1030
+#: Merge.rc:525 Merge.rc:1038
#, c-format
msgid "&Refresh Selected\tCtrl+F5"
msgstr "Ανα&νέωση Επιλεγμένων\tCtrl+F5"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:523 Merge.rc:765
+#: Merge.rc:527 Merge.rc:772
#, c-format
msgid "&Merge"
msgstr "Συγ&χώνευση"
#. IDR_DIRDOCTYPE, ID_MERGE_COMPARE
-#: Merge.rc:525
+#: Merge.rc:529
#, c-format
msgid "Co&mpare\tEnter"
msgstr "&Σύγκριση\tEnter"
#. IDR_MERGEDOCTYPE, ID_NEXTDIFF
-#: Merge.rc:527 Merge.rc:767
+#: Merge.rc:531 Merge.rc:774
#, c-format
msgid "&Next Difference\tAlt+Down"
msgstr "&Επομένη Διαφορά\tAlt+Down"
#. IDR_MERGEDOCTYPE, ID_PREVDIFF
-#: Merge.rc:528 Merge.rc:768
+#: Merge.rc:532 Merge.rc:775
#, c-format
msgid "&Previous Difference\tAlt+Up"
msgstr "Π&ροηγουμένη Διαφορά\tAlt+Up"
#. IDR_MERGEDOCTYPE, ID_FIRSTDIFF
-#: Merge.rc:530 Merge.rc:773
+#: Merge.rc:534 Merge.rc:780
#, c-format
msgid "&First Difference\tAlt+Home"
msgstr "&Πρώτη Διαφορά\tAlt+Home"
#. IDR_MERGEDOCTYPE, ID_CURDIFF
-#: Merge.rc:531 Merge.rc:774
+#: Merge.rc:535 Merge.rc:781
#, c-format
msgid "&Current Difference\tAlt+Enter"
msgstr "Τ&ρέχουσα Διαφορά\tAlt+Enter"
#. IDR_MERGEDOCTYPE, ID_LASTDIFF
-#: Merge.rc:532 Merge.rc:775
+#: Merge.rc:536 Merge.rc:782
#, c-format
msgid "&Last Difference\tAlt+End"
msgstr "&Τελευταία Διαφορά\tAlt+End"
#. IDR_MERGEDOCTYPE, ID_L2R
-#: Merge.rc:534 Merge.rc:830
+#: Merge.rc:538 Merge.rc:837
#, c-format
msgid "Copy to &Right\tAlt+Right"
msgstr "Αντιγραφή Δε&ξιά\tAlt+Right"
#. IDR_MERGEDOCTYPE, ID_R2L
-#: Merge.rc:535 Merge.rc:831
+#: Merge.rc:539 Merge.rc:838
#, c-format
msgid "Copy to L&eft\tAlt+Left"
msgstr "Αντιγραφή Α&ριστερά\tAlt+Left"
#. IDR_DIRDOCTYPE, ID_MERGE_DELETE
-#: Merge.rc:537
+#: Merge.rc:541
#, c-format
msgid "&Delete\tDel"
msgstr "&Διαγραφή\tDel"
#. IDR_POPUP_DIRVIEW, ID_TOOLS_CUSTOMIZECOLUMNS
-#: Merge.rc:541 Merge.rc:1042
+#: Merge.rc:545 Merge.rc:1050
#, c-format
msgid "&Customize Columns..."
msgstr "&Προσαρμογή Στηλών..."
#. IDR_MERGEDOCTYPE, ID_TOOLS_GENERATEREPORT
-#: Merge.rc:544 Merge.rc:851
+#: Merge.rc:548 Merge.rc:858
#, c-format
msgid "Generate &Report..."
msgstr "Δημιουργία Ανα&φοράς..."
#. IDD_ENCODINGERROR, IDC_PLUGIN
-#: Merge.rc:556 Merge.rc:867 Merge.rc:3064
+#: Merge.rc:560 Merge.rc:874 Merge.rc:3074
#, c-format
msgid "&Edit with Unpacker..."
msgstr ""
#. IDR_MERGEDOCTYPE, ID_FILE_SAVE
-#: Merge.rc:611
+#: Merge.rc:617
#, c-format
msgid "&Save\tCtrl+S"
msgstr "Απο&θήκευση\tCtrl+S"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:612
+#: Merge.rc:618
#, c-format
msgid "Sav&e"
msgstr ""
#. IDR_POPUP_SAVE, ID_FILE_SAVE_LEFT
-#: Merge.rc:614 Merge.rc:1201
+#: Merge.rc:620 Merge.rc:1211
#, c-format
msgid "Save &Left"
msgstr "Αποθήκευση Α&ριστερού"
#. IDR_POPUP_SAVE, ID_FILE_SAVE_MIDDLE
-#: Merge.rc:615 Merge.rc:1202
+#: Merge.rc:621 Merge.rc:1212
#, c-format
msgid "Save &Middle"
msgstr ""
#. IDR_POPUP_SAVE, ID_FILE_SAVE_RIGHT
-#: Merge.rc:616 Merge.rc:1203
+#: Merge.rc:622 Merge.rc:1213
#, c-format
msgid "Save &Right"
msgstr "Αποθήκευση Δε&ξιού"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:618
+#: Merge.rc:624
#, c-format
msgid "Save &As"
msgstr ""
#. IDR_POPUP_SAVE, ID_FILE_SAVEAS_LEFT
-#: Merge.rc:620 Merge.rc:1205
+#: Merge.rc:626 Merge.rc:1215
#, c-format
msgid "Save &Left As..."
msgstr ""
#. IDR_POPUP_SAVE, ID_FILE_SAVEAS_MIDDLE
-#: Merge.rc:621 Merge.rc:1206
+#: Merge.rc:627 Merge.rc:1216
#, c-format
msgid "Save &Middle As..."
msgstr ""
#. IDR_POPUP_SAVE, ID_FILE_SAVEAS_RIGHT
-#: Merge.rc:622 Merge.rc:1207
+#: Merge.rc:628 Merge.rc:1217
#, c-format
msgid "Save &Right As..."
msgstr ""
#. IDR_MERGEDOCTYPE, ID_FILE_PRINT
-#: Merge.rc:625
+#: Merge.rc:631
msgid "&Print...\tCtrl+P"
msgstr "Εκ&τύπωση...\tCtrl+P"
#. IDR_MERGEDOCTYPE, ID_FILE_PAGE_SETUP
-#: Merge.rc:626
+#: Merge.rc:632
msgid "Page Set&up..."
msgstr "Διάταξη &Σελίδας..."
#. IDR_MERGEDOCTYPE, ID_FILE_PRINT_PREVIEW
-#: Merge.rc:627
+#: Merge.rc:633
msgid "Print Previe&w..."
msgstr "Προε&πισκόπηση Εκτυπώσεως..."
#. IDR_MERGEDOCTYPE
-#: Merge.rc:636
+#: Merge.rc:642
#, c-format
msgid "&Convert Line Endings to"
msgstr "&Μετατροπή Χαρακτήρων Τερματισμού"
#. IDR_MERGEDOCTYPE, ID_FILE_MERGINGMODE
-#: Merge.rc:643
+#: Merge.rc:649
#, c-format
msgid "Mer&ge Mode\tF9"
msgstr "Λειτουργία Συγ&χωνεύσεως\tF9"
#. IDR_MERGEDOCTYPE, ID_RESCAN
-#: Merge.rc:645
+#: Merge.rc:651
msgid "Reloa&d\tCtrl+F5"
msgstr ""
#. IDR_MERGEDOCTYPE
-#: Merge.rc:647
+#: Merge.rc:653
#, c-format
msgid "Reco&mpare As"
msgstr ""
+#. IDR_POPUP_COMPARE, ID_MERGE_COMPARE_FOLDER
+#: Merge.rc:660 Merge.rc:947 Merge.rc:1185
+msgid "A&rchive"
+msgstr ""
+
#. IDR_MERGEDOCTYPE, ID_EDIT_UNDO
-#: Merge.rc:666
+#: Merge.rc:673
#, c-format
msgid "&Undo\tCtrl+Z"
msgstr "Α&ναίρεση\tCtrl+Z"
#. IDR_MERGEDOCTYPE, ID_EDIT_REDO
-#: Merge.rc:667
+#: Merge.rc:674
#, c-format
msgid "&Redo\tCtrl+Y"
msgstr "Επανάλη&ψη\tCtrl+Y"
#. IDR_MERGEDOCTYPE, ID_EDIT_CUT
-#: Merge.rc:669
+#: Merge.rc:676
#, c-format
msgid "Cu&t\tCtrl+X"
msgstr "Απο&κοπή\tCtrl+X"
#. IDR_POPUP_OUTPUTVIEW, ID_EDIT_COPY
-#: Merge.rc:670 Merge.rc:1342
+#: Merge.rc:677 Merge.rc:1352
#, c-format
msgid "&Copy\tCtrl+C"
msgstr "Αντι&γραφή\tCtrl+C"
#. IDR_MERGEDOCTYPE, ID_EDIT_FIND
-#: Merge.rc:676
+#: Merge.rc:683
#, c-format
msgid "F&ind...\tCtrl+F"
msgstr "Ανα&ζήτηση...\tCtrl+F"
#. IDR_MERGEDOCTYPE, ID_EDIT_REPLACE
-#: Merge.rc:677
+#: Merge.rc:684
#, c-format
msgid "Repla&ce...\tCtrl+H"
msgstr "Αντικατά&σταση...\tCtrl+H"
#. IDR_MERGEDOCTYPE, ID_EDIT_MARK
-#: Merge.rc:678
+#: Merge.rc:685
#, c-format
msgid "&Marker...\tCtrl+Shift+M"
msgstr ""
#. IDR_MERGEDOCTYPE
-#: Merge.rc:680
+#: Merge.rc:687
#, c-format
msgid "Advanced"
msgstr "Ει&δικές Εντολές"
#. IDR_MERGEDOCTYPE, ID_EDIT_COPY_LINENUMBERS
-#: Merge.rc:682
+#: Merge.rc:689
#, c-format
msgid "&Copy With Line Numbers\tCtrl+Shift+C"
msgstr "Αντιγραφή με &Αρίθμηση Γραμμών\tCtrl+Shift+C"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:684
+#: Merge.rc:691
#, c-format
msgid "&Bookmarks"
msgstr "Σημάν&σεις"
#. IDR_MERGEDOCTYPE, ID_EDIT_TOGGLE_BOOKMARK
-#: Merge.rc:686
+#: Merge.rc:693
#, c-format
msgid "&Toggle Bookmark\tCtrl+F2"
msgstr "Μεταβολή Σημάν&σεως\tCtrl+F2"
#. IDR_MERGEDOCTYPE, ID_EDIT_GOTO_NEXT_BOOKMARK
-#: Merge.rc:687
+#: Merge.rc:694
#, c-format
msgid "&Next Bookmark\tF2"
msgstr "Επο&μένη Σήμανση\tF2"
#. IDR_MERGEDOCTYPE, ID_EDIT_GOTO_PREV_BOOKMARK
-#: Merge.rc:688
+#: Merge.rc:695
#, c-format
msgid "&Previous Bookmark\tShift+F2"
msgstr "Π&ροηγουμένη Σήμανση\tShift+F2"
#. IDR_MERGEDOCTYPE, ID_EDIT_CLEAR_ALL_BOOKMARKS
-#: Merge.rc:689
+#: Merge.rc:696
#, c-format
msgid "&Clear All Bookmarks"
msgstr "Κα&τάργηση όλων των Σημάνσεων"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:706
+#: Merge.rc:713
#, c-format
msgid "Syntax Highlight"
msgstr "&Χρωματισμός Κώδικα"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:711
+#: Merge.rc:718
#, c-format
msgid "&Diff Context"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_ALL
-#: Merge.rc:713
+#: Merge.rc:720
#, c-format
msgid "&All Lines"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_0
-#: Merge.rc:715
+#: Merge.rc:722
#, c-format
msgid "&0 Lines"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_1
-#: Merge.rc:716
+#: Merge.rc:723
#, c-format
msgid "&1 Line"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_3
-#: Merge.rc:717
+#: Merge.rc:724
#, c-format
msgid "&3 Lines"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_5
-#: Merge.rc:718
+#: Merge.rc:725
#, c-format
msgid "&5 Lines"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_7
-#: Merge.rc:719
+#: Merge.rc:726
#, c-format
msgid "&7 Lines"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_9
-#: Merge.rc:720
+#: Merge.rc:727
#, c-format
msgid "&9 Lines"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_TOGGLE
-#: Merge.rc:722
+#: Merge.rc:729
#, c-format
msgid "&Toggle All and 0-9 Lines\tCtrl+D"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_INVERT
-#: Merge.rc:724
+#: Merge.rc:731
msgid "&Invert (Hide Different Lines)"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_VIEW_RESIZE_PANES
-#: Merge.rc:727
+#: Merge.rc:734
#, c-format
msgid "&Lock Panes"
msgstr "&Πάγωμα Πεδίων"
#. IDR_MERGEDOCTYPE, ID_VIEW_WHITESPACE
-#: Merge.rc:728
+#: Merge.rc:735
#, c-format
msgid "&View Whitespace"
msgstr "Εμ&φάνιση Χαρακτήρων Διαστήματος"
#. IDR_MERGEDOCTYPE, ID_VIEW_EOL
-#: Merge.rc:729
+#: Merge.rc:736
msgid "View E&OL"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_VIEW_LINEDIFFS
-#: Merge.rc:730
+#: Merge.rc:737
#, c-format
msgid "Vie&w Line Differences"
msgstr "Εμ&φάνιση Διαφορών Γραμμών"
#. IDR_MERGEDOCTYPE, ID_VIEW_LINENUMBERS
-#: Merge.rc:731
+#: Merge.rc:738
#, c-format
msgid "View Line &Numbers"
msgstr "Εμφάνιση &Αριθμήσεως Γραμμών"
#. IDR_MERGEDOCTYPE, ID_VIEW_SELMARGIN
-#: Merge.rc:732
+#: Merge.rc:739
#, c-format
msgid "View &Margins"
msgstr "Εμφάνιση Περι&θωρίων"
#. IDR_MERGEDOCTYPE, ID_VIEW_TOPMARGIN
-#: Merge.rc:733
+#: Merge.rc:740
msgid "View To&p Margins"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_VIEW_WORDWRAP
-#: Merge.rc:734
+#: Merge.rc:741
#, c-format
msgid "W&rap Lines"
msgstr "Ανα&δίπλωση Γραμμών"
#. IDR_MERGEDOCTYPE, ID_VIEW_SPLITVERTICALLY
-#: Merge.rc:742
+#: Merge.rc:749
#, c-format
msgid "Split V&ertically"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_VIEW_DETAIL_BAR
-#: Merge.rc:759
+#: Merge.rc:766
#, c-format
msgid "Diff &Pane"
msgstr "&Πεδίο Διαφορών"
#. IDR_MERGEDOCTYPE, ID_VIEW_LOCATION_BAR
-#: Merge.rc:760
+#: Merge.rc:767
#, c-format
msgid "Lo&cation Pane"
msgstr "Πεδίο &Εντοπισμού"
#. IDS_OUTPUTBAR_CAPTION
-#: Merge.rc:761 Merge.rc:4902
+#: Merge.rc:768 Merge.rc:4912
msgid "Output Pane"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_NEXTCONFLICT
-#: Merge.rc:770
+#: Merge.rc:777
#, c-format
msgid "Ne&xt Conflict\tAlt+Shift+Down"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_PREVCONFLICT
-#: Merge.rc:771
+#: Merge.rc:778
#, c-format
msgid "Pre&vious Conflict\tAlt+Shift+Up"
msgstr ""
#. IDR_MERGEDOCTYPE
-#: Merge.rc:777
+#: Merge.rc:784
#, c-format
msgid "A&dvanced"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_NEXTDIFFLM
-#: Merge.rc:779
+#: Merge.rc:786
#, c-format
msgid "Next Difference (Left/Middle)\tAlt+1"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_PREVDIFFLM
-#: Merge.rc:780
+#: Merge.rc:787
#, c-format
msgid "Previous Difference (Left/Middle)\tAlt+Shift+1"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_NEXTDIFFLR
-#: Merge.rc:782
+#: Merge.rc:789
#, c-format
msgid "Next Difference (Left/Right)\tAlt+2"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_PREVDIFFLR
-#: Merge.rc:783
+#: Merge.rc:790
#, c-format
msgid "Previous Difference (Left/Right)\tAlt+Shift+2"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_NEXTDIFFMR
-#: Merge.rc:785
+#: Merge.rc:792
#, c-format
msgid "Next Difference (Middle/Right)\tAlt+3"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_PREVDIFFMR
-#: Merge.rc:786
+#: Merge.rc:793
#, c-format
msgid "Previous Difference (Middle/Right)\tAlt+Shift+3"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_NEXTDIFFLO
-#: Merge.rc:788
+#: Merge.rc:795
#, c-format
msgid "Next Left-Only Difference\tAlt+7"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_PREVDIFFLO
-#: Merge.rc:789
+#: Merge.rc:796
#, c-format
msgid "Previous Left-Only Difference\tAlt+Shift+7"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_NEXTDIFFMO
-#: Merge.rc:791
+#: Merge.rc:798
#, c-format
msgid "Next Middle-Only Difference\tAlt+8"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_PREVDIFFMO
-#: Merge.rc:792
+#: Merge.rc:799
#, c-format
msgid "Previous Middle-Only Difference\tAlt+Shift+8"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_NEXTDIFFRO
-#: Merge.rc:794
+#: Merge.rc:801
#, c-format
msgid "Next Right-Only Difference\tAlt+9"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_PREVDIFFRO
-#: Merge.rc:795
+#: Merge.rc:802
#, c-format
msgid "Previous Right-Only Difference\tAlt+Shift+9"
msgstr ""
#. IDR_MERGEDOCTYPE
-#: Merge.rc:797
+#: Merge.rc:804
msgid "Copy from &Left to"
msgstr ""
#. IDD_LOAD_SAVE_CODEPAGE, IDC_AFFECTS_MIDDLE_BTN
-#: Merge.rc:799 Merge.rc:810 Merge.rc:815 Merge.rc:826 Merge.rc:970
-#: Merge.rc:2545 Merge.rc:2817
+#: Merge.rc:806 Merge.rc:817 Merge.rc:822 Merge.rc:833 Merge.rc:978
+#: Merge.rc:2555 Merge.rc:2827
#, c-format
msgid "&Middle"
msgstr ""
#. IDD_LOAD_SAVE_CODEPAGE, IDC_AFFECTS_RIGHT_BTN
-#: Merge.rc:800 Merge.rc:805 Merge.rc:816 Merge.rc:821 Merge.rc:971
-#: Merge.rc:2546 Merge.rc:2819
+#: Merge.rc:807 Merge.rc:812 Merge.rc:823 Merge.rc:828 Merge.rc:979
+#: Merge.rc:2556 Merge.rc:2829
#, c-format
msgid "&Right"
msgstr "Δε&ξιό"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:802
+#: Merge.rc:809
msgid "Copy from &Middle to"
msgstr ""
#. IDD_LOAD_SAVE_CODEPAGE, IDC_AFFECTS_LEFT_BTN
-#: Merge.rc:804 Merge.rc:809 Merge.rc:820 Merge.rc:825 Merge.rc:969
-#: Merge.rc:2544 Merge.rc:2815
+#: Merge.rc:811 Merge.rc:816 Merge.rc:827 Merge.rc:832 Merge.rc:977
+#: Merge.rc:2554 Merge.rc:2825
#, c-format
msgid "&Left"
msgstr "Α&ριστερό"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:807
+#: Merge.rc:814
msgid "Copy from &Right to"
msgstr ""
#. IDR_MERGEDOCTYPE
-#: Merge.rc:813
+#: Merge.rc:820
msgid "Copy Selected Lines from Le&ft to"
msgstr ""
#. IDR_MERGEDOCTYPE
-#: Merge.rc:818
+#: Merge.rc:825
msgid "Copy Selected Lines from Mi&ddle to"
msgstr ""
#. IDR_MERGEDOCTYPE
-#: Merge.rc:823
+#: Merge.rc:830
msgid "Copy Selected Lines from Ri&ght to"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_COPY_FROM_LEFT
-#: Merge.rc:833
+#: Merge.rc:840
#, c-format
msgid "Copy from Left\tAlt+Shift+Right"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_COPY_FROM_RIGHT
-#: Merge.rc:834
+#: Merge.rc:841
#, c-format
msgid "Copy from Right\tAlt+Shift+Left"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_L2RNEXT
-#: Merge.rc:836
+#: Merge.rc:843
msgid "C&opy to Right and Advance\tCtrl+Alt+Right"
msgstr "Αντιγραφή Δε&ξιά και Μετάβαση σε επομένη\tCtrl+Alt+Right"
#. IDR_MERGEDOCTYPE, ID_R2LNEXT
-#: Merge.rc:837
+#: Merge.rc:844
msgid "Copy &to Left and Advance\tCtrl+Alt+Left"
msgstr "Αντιγραφή Α&ριστερά και Μετάβαση σε επομένη\tCtrl+Alt+Left"
#. IDR_MERGEDOCTYPE, ID_ALL_RIGHT
-#: Merge.rc:839
+#: Merge.rc:846
#, c-format
msgid "Copy &All to Right"
msgstr "Αντιγραφή όλων &Δεξιά"
#. IDR_MERGEDOCTYPE, ID_ALL_LEFT
-#: Merge.rc:840
+#: Merge.rc:847
#, c-format
msgid "Cop&y All to Left"
msgstr "Αντιγραφή όλων &Αριστερά"
#. IDR_MERGEDOCTYPE, ID_AUTO_MERGE
-#: Merge.rc:842
+#: Merge.rc:849
msgid "A&uto Merge\tCtrl+Alt+M"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_ADD_SYNCPOINT
-#: Merge.rc:844
+#: Merge.rc:851
#, c-format
msgid "Add &Synchronization Point\tAlt+S"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_CLEAR_SYNCPOINTS
-#: Merge.rc:845
+#: Merge.rc:852
#, c-format
msgid "Clear Sync&hronization Points"
msgstr ""
#. IDR_MERGEDOCTYPE
-#: Merge.rc:863
+#: Merge.rc:870
msgid "Unpac&ker"
msgstr ""
#. IDR_MERGEDOCTYPE
-#: Merge.rc:869
+#: Merge.rc:876
#, c-format
msgid "&Prediffer"
msgstr "Προεπε&ξεργαστής Διαφορών"
#. IDR_MERGEDOCTYPE, ID_APPLY_PREDIFFER
-#: Merge.rc:873
+#: Merge.rc:880
msgid "Apply Pre&differ..."
msgstr ""
#. IDR_MERGEDOCTYPE, ID_TRANSFORM_WITH_SCRIPT
-#: Merge.rc:879
+#: Merge.rc:886
msgid "&Transform with Editor Script..."
msgstr ""
#. IDR_MERGEDOCTYPE
-#: Merge.rc:880
+#: Merge.rc:887
msgid "Scripts for &Copying"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_SELECT_EDITOR_SCRIPT_FOR_COPYING
-#: Merge.rc:886
+#: Merge.rc:893
msgid "Select &Editor Script..."
msgstr ""
#. IDR_MERGEDOCTYPE, ID_WINDOW_SPLIT
-#: Merge.rc:898
+#: Merge.rc:905
#, c-format
msgid "Sp&lit"
msgstr ""
#. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE
-#: Merge.rc:921
+#: Merge.rc:928
#, c-format
msgid "Comp&are"
msgstr "&Σύγκριση"
#. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE_WITH_MOVED_RENAMED
-#: Merge.rc:922
+#: Merge.rc:929
msgid "Compar&e with Renamed/Moved Items"
msgstr ""
#. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE_IN_NEW_WINDOW
-#: Merge.rc:923
+#: Merge.rc:930
msgid "Compare in New &Window"
msgstr ""
#. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE_NONHORIZONTALLY
-#: Merge.rc:924 Merge.rc:931
+#: Merge.rc:931 Merge.rc:938
msgid "Compare Non-hor&izontally..."
msgstr ""
#. IDR_POPUP_DIRVIEW
-#: Merge.rc:925
+#: Merge.rc:932
#, c-format
msgid "Compare Non-hor&izontally"
msgstr ""
#. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE_LEFT1_LEFT2
-#: Merge.rc:927
+#: Merge.rc:934
#, c-format
msgid "First &Left with Second Left"
msgstr ""
#. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE_RIGHT1_RIGHT2
-#: Merge.rc:928
+#: Merge.rc:935
#, c-format
msgid "First &Right with Second Right"
msgstr ""
#. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE_LEFT1_RIGHT2
-#: Merge.rc:929
+#: Merge.rc:936
#, c-format
msgid "&First Left with Second Right"
msgstr ""
#. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE_LEFT2_RIGHT1
-#: Merge.rc:930
+#: Merge.rc:937
#, c-format
msgid "&Second Left with First Right"
msgstr ""
#. IDR_POPUP_DIRVIEW
-#: Merge.rc:933
+#: Merge.rc:940
#, c-format
msgid "Co&mpare As"
msgstr ""
#. IDS_COPY_LEFT_TO_MIDDLE2
-#: Merge.rc:945 Merge.rc:957 Merge.rc:4502
+#: Merge.rc:953 Merge.rc:965 Merge.rc:4512
#, c-format
msgid "Left to Middle (%1 of %2)"
msgstr ""
#. IDS_COPY_LEFT_TO_RIGHT2
-#: Merge.rc:946 Merge.rc:958 Merge.rc:4501
+#: Merge.rc:954 Merge.rc:966 Merge.rc:4511
#, c-format
msgid "Left to Right (%1 of %2)"
msgstr "Αριστερό στο Δεξιό (%1 από %2)"
#. IDS_MOVE_LEFT_TO2
-#: Merge.rc:947 Merge.rc:959 Merge.rc:1022 Merge.rc:4513 Merge.rc:4542
+#: Merge.rc:955 Merge.rc:967 Merge.rc:1030 Merge.rc:4523 Merge.rc:4552
#, c-format
msgid "Left to... (%1 of %2)"
msgstr "Αριστερό στο... (%1 από %2)"
#. IDS_COPY_MIDDLE_TO_LEFT2
-#: Merge.rc:948 Merge.rc:960 Merge.rc:4499
+#: Merge.rc:956 Merge.rc:968 Merge.rc:4509
#, c-format
msgid "Middle to Left (%1 of %2)"
msgstr ""
#. IDS_COPY_MIDDLE_TO_RIGHT2
-#: Merge.rc:949 Merge.rc:961 Merge.rc:4500
+#: Merge.rc:957 Merge.rc:969 Merge.rc:4510
#, c-format
msgid "Middle to Right (%1 of %2)"
msgstr ""
#. IDS_MOVE_MIDDLE_TO2
-#: Merge.rc:950 Merge.rc:962 Merge.rc:1023 Merge.rc:4514 Merge.rc:4543
+#: Merge.rc:958 Merge.rc:970 Merge.rc:1031 Merge.rc:4524 Merge.rc:4553
#, c-format
msgid "Middle to... (%1 of %2)"
msgstr ""
#. IDS_COPY_RIGHT_TO_MIDDLE2
-#: Merge.rc:951 Merge.rc:963 Merge.rc:4498
+#: Merge.rc:959 Merge.rc:971 Merge.rc:4508
#, c-format
msgid "Right to Middle (%1 of %2)"
msgstr ""
#. IDS_COPY_RIGHT_TO_LEFT2
-#: Merge.rc:952 Merge.rc:964 Merge.rc:4497
+#: Merge.rc:960 Merge.rc:972 Merge.rc:4507
#, c-format
msgid "Right to Left (%1 of %2)"
msgstr "Δεξιό στο Αριστερό (%1 από %2)"
#. IDS_MOVE_RIGHT_TO2
-#: Merge.rc:953 Merge.rc:965 Merge.rc:1024 Merge.rc:4515 Merge.rc:4544
+#: Merge.rc:961 Merge.rc:973 Merge.rc:1032 Merge.rc:4525 Merge.rc:4554
#, c-format
msgid "Right to... (%1 of %2)"
msgstr "Δεξιό στο... (%1 από %2)"
#. IDD_EDIT_MARKER, IDC_EDIT_MARKER_DELETE
-#: Merge.rc:967 Merge.rc:2036
+#: Merge.rc:975 Merge.rc:2046
#, c-format
msgid "&Delete"
msgstr "&Διαγραφή"
#. IDR_POPUP_DIRVIEW, ID_DIR_DEL_BOTH
-#: Merge.rc:972
+#: Merge.rc:980
#, c-format
msgid "&Both"
msgstr "Αμ&φότερα"
#. IDR_POPUP_DIRVIEW, ID_DIR_DEL_ALL
-#: Merge.rc:973
+#: Merge.rc:981
#, c-format
msgid "&All"
msgstr ""
#. IDD_EDIT_REPLACE, IDC_EDIT_SCOPE_SELECTION
-#: Merge.rc:974 Merge.rc:2019
+#: Merge.rc:982 Merge.rc:2029
#, c-format
msgid "&Selection"
msgstr "&Επιλογής"
#. IDR_POPUP_DIRVIEW, ID_DIR_ITEM_RENAME
-#: Merge.rc:976
+#: Merge.rc:984
#, c-format
msgid "Re&name"
msgstr "Μετο&νομασία"
#. IDR_POPUP_DIRVIEW, ID_DIR_HIDE_FILENAMES
-#: Merge.rc:977
+#: Merge.rc:985
#, c-format
msgid "&Hide Items"
msgstr "Απόκρυ&ψη Αντικειμένων"
#. IDR_POPUP_DIRVIEW
-#: Merge.rc:979
+#: Merge.rc:987
#, c-format
msgid "&Open Left"
msgstr "Άνοιγμα Α&ριστερού"
#. IDR_POPUP_DIRVIEW
-#: Merge.rc:986
+#: Merge.rc:994
#, c-format
msgid "Open Midd&le"
msgstr ""
#. IDR_POPUP_DIRVIEW
-#: Merge.rc:993
+#: Merge.rc:1001
#, c-format
msgid "O&pen Right"
msgstr "Άνοιγμα Δε&ξιού"
#. IDR_POPUP_DIRVIEW
-#: Merge.rc:1001
+#: Merge.rc:1009
#, c-format
msgid "Cop&y Paths"
msgstr "Αντιγραφή Δια&δρομών"
#. IDS_DEL_LEFT_FMT2
-#: Merge.rc:1003 Merge.rc:1012 Merge.rc:4530
+#: Merge.rc:1011 Merge.rc:1020 Merge.rc:4540
#, c-format
msgid "Left (%1 of %2)"
msgstr "Αριστερό (%1 από %2)"
#. IDS_DEL_MIDDLE_FMT2
-#: Merge.rc:1004 Merge.rc:1013 Merge.rc:4531
+#: Merge.rc:1012 Merge.rc:1021 Merge.rc:4541
#, c-format
msgid "Middle (%1 of %2)"
msgstr ""
#. IDS_DEL_RIGHT_FMT2
-#: Merge.rc:1005 Merge.rc:1014 Merge.rc:4532
+#: Merge.rc:1013 Merge.rc:1022 Merge.rc:4542
#, c-format
msgid "Right (%1 of %2)"
msgstr "Δεξιό (%1 από %2)"
#. IDS_DEL_BOTH_FMT2
-#: Merge.rc:1006 Merge.rc:1015 Merge.rc:4533
+#: Merge.rc:1014 Merge.rc:1023 Merge.rc:4543
#, c-format
msgid "Both (%1 of %2)"
msgstr "Αμφότερα (%1από %2)"
#. IDS_DEL_ALL_FMT2
-#: Merge.rc:1007 Merge.rc:1016 Merge.rc:4538
+#: Merge.rc:1015 Merge.rc:1024 Merge.rc:4548
#, c-format
msgid "All (%1 of %2)"
msgstr ""
#. IDR_POPUP_DIRVIEW, ID_DIR_COPY_FILENAMES
-#: Merge.rc:1009
+#: Merge.rc:1017
#, c-format
msgid "Copy &Filenames"
msgstr "Αντιγραφή Ο&νομάτων"
#. IDR_POPUP_DIRVIEW
-#: Merge.rc:1010
+#: Merge.rc:1018
#, c-format
msgid "Copy Items to Clip&board"
msgstr ""
#. IDR_POPUP_DIRVIEW, ID_DIR_COPY_ALL_DISP_COLUMNS
-#: Merge.rc:1018
+#: Merge.rc:1026
msgid "Copy All Di&splayed Columns"
msgstr ""
#. IDR_POPUP_DIRVIEW
-#: Merge.rc:1020
+#: Merge.rc:1028
#, c-format
msgid "&Zip"
msgstr ""
#. IDS_COPY_BOTH_TO2
-#: Merge.rc:1025 Merge.rc:4516
+#: Merge.rc:1033 Merge.rc:4526
#, c-format
msgid "Both to... (%1 of %2)"
msgstr ""
#. IDS_COPY_ALL_TO2
-#: Merge.rc:1026 Merge.rc:4517
+#: Merge.rc:1034 Merge.rc:4527
#, c-format
msgid "All to... (%1 of %2)"
msgstr ""
#. IDS_COPY_DIFFERENCES_TO2
-#: Merge.rc:1027 Merge.rc:4518
+#: Merge.rc:1035 Merge.rc:4528
#, c-format
msgid "Differences to... (%1 of %2)"
msgstr ""
#. IDR_POPUP_DIRVIEW, ID_DIR_SHELL_CONTEXT_MENU_LEFT
-#: Merge.rc:1032
+#: Merge.rc:1040
#, c-format
msgid "Left Shell Menu"
msgstr ""
#. IDR_POPUP_DIRVIEW, ID_DIR_SHELL_CONTEXT_MENU_MIDDLE
-#: Merge.rc:1033
+#: Merge.rc:1041
#, c-format
msgid "Middle Shell Menu"
msgstr ""
#. IDR_POPUP_DIRVIEW, ID_DIR_SHELL_CONTEXT_MENU_RIGHT
-#: Merge.rc:1034
+#: Merge.rc:1042
#, c-format
msgid "Right Shell Menu"
msgstr ""
#. IDR_POPUP_DIRVIEW, ID_DIR_SHELL_CONTEXT_MENU_BOTH
-#: Merge.rc:1035
+#: Merge.rc:1043
msgid "Both Shell Menu"
msgstr ""
#. IDR_POPUP_DIRVIEW, ID_DIR_SHELL_CONTEXT_MENU_ALL
-#: Merge.rc:1036
+#: Merge.rc:1044
msgid "All Shell Menu"
msgstr ""
#. IDR_POPUP_EDITOR_HEADERBAR, ID_EDITOR_COPY
-#: Merge.rc:1050
+#: Merge.rc:1058
#, c-format
msgid "Copy"
msgstr ""
#. IDR_POPUP_EDITOR_HEADERBAR, ID_EDITOR_COPY_PATH
-#: Merge.rc:1051
+#: Merge.rc:1059
#, c-format
msgid "&Copy Full Path"
msgstr "Αντιγραφή πλήρους Δια&δρομής"
#. IDR_POPUP_EDITOR_HEADERBAR, ID_EDITOR_COPY_FILENAME
-#: Merge.rc:1052
+#: Merge.rc:1060
#, c-format
msgid "Copy &Filename"
msgstr "Αντιγραφή Ο&νόματος"
#. IDR_POPUP_EDITOR_HEADERBAR, ID_EDITOR_EDIT_CAPTION
-#: Merge.rc:1053
+#: Merge.rc:1061
msgid "&Edit Caption\tF2"
msgstr ""
#. IDR_POPUP_EDITOR_HEADERBAR, ID_EDITOR_EDIT_PATH
-#: Merge.rc:1055
+#: Merge.rc:1063
msgid "Edit &Path\tCtrl+L"
msgstr ""
#. IDR_POPUP_EDITOR_HEADERBAR, ID_EDITOR_SELECT_FILE
-#: Merge.rc:1056
+#: Merge.rc:1064
msgid "&Open..."
msgstr ""
#. IDR_POPUP_PLUGINS_SETTINGS
-#: Merge.rc:1062
+#: Merge.rc:1070
msgid "Unpacker Settings"
msgstr ""
#. IDS_USERCHOICE_NONE
-#: Merge.rc:1064 Merge.rc:1070 Merge.rc:1789 Merge.rc:1793 Merge.rc:5030
+#: Merge.rc:1072 Merge.rc:1078 Merge.rc:1799 Merge.rc:1803 Merge.rc:5040
#, c-format
msgid ""
msgstr "<Ουδέν>"
#. IDS_USERCHOICE_AUTOMATIC
-#: Merge.rc:1065 Merge.rc:1071 Merge.rc:5031
+#: Merge.rc:1073 Merge.rc:1079 Merge.rc:5041
#, c-format
msgid ""
msgstr "<Αυτόματο>"
#. IDD_OPEN, IDC_SELECT_PREDIFFER
-#: Merge.rc:1066 Merge.rc:1072 Merge.rc:1970 Merge.rc:1974
+#: Merge.rc:1074 Merge.rc:1080 Merge.rc:1980 Merge.rc:1984
#, c-format
msgid "&Select..."
msgstr "&Επιλογή..."
#. IDR_POPUP_PLUGINS_SETTINGS
-#: Merge.rc:1068
+#: Merge.rc:1076
#, c-format
msgid "Prediffer Settings"
msgstr "Ρυθμίσεις Προεπεξεργαστή Διαφορών"
#. IDR_POPUP_LOCATIONBAR, ID_LOCBAR_GOTODIFF
-#: Merge.rc:1080
+#: Merge.rc:1088
msgid "G&o to Diff"
msgstr "Μετά&βαση σε Διαφορά"
#. IDR_POPUP_LOCATIONBAR, ID_LOCBAR_MOVECURSOR_ONCLICK
-#: Merge.rc:1083
+#: Merge.rc:1091
msgid "Move Cursor on &Click"
msgstr ""
#. IDR_POPUP_LOCATIONBAR, ID_DISPLAY_MOVED_NONE
-#: Merge.rc:1085
+#: Merge.rc:1093
#, c-format
msgid "&No Moved Blocks"
msgstr "Όχι μετακινηθέντα Τμήματα"
#. IDR_POPUP_LOCATIONBAR, ID_DISPLAY_MOVED_ALL
-#: Merge.rc:1086
+#: Merge.rc:1094
#, c-format
msgid "&All Moved Blocks"
msgstr "Ό&λα τα μετακινηθέντα Τμήματα"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS
-#: Merge.rc:1094 Merge.rc:1127
+#: Merge.rc:1102 Merge.rc:1135
#, c-format
msgid "W&hitespaces"
msgstr "Χαρακτήρες &Διαστήματος"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_WHITESPACE_COMPARE
-#: Merge.rc:1096 Merge.rc:1129
+#: Merge.rc:1104 Merge.rc:1137
#, c-format
msgid "Com&pare"
msgstr "Σύγ&κριση"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_WHITESPACE_IGNORE
-#: Merge.rc:1097 Merge.rc:1130
+#: Merge.rc:1105 Merge.rc:1138
#, c-format
msgid "I&gnore Changes"
msgstr "Οι μεταβολές να Α&γνοηθούν"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_WHITESPACE_IGNOREALL
-#: Merge.rc:1098 Merge.rc:1131
+#: Merge.rc:1106 Merge.rc:1139
#, c-format
msgid "Ig&nore All"
msgstr "Να Αγνοηθούν Ό&λα"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_IGNORE_BLANKLINES
-#: Merge.rc:1100 Merge.rc:1133
+#: Merge.rc:1108 Merge.rc:1141
#, c-format
msgid "Ignore Blan&k Lines"
msgstr "Οι &κενές γραμμές να αγνοούνται"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_IGNORE_CASE
-#: Merge.rc:1101 Merge.rc:1134
+#: Merge.rc:1109 Merge.rc:1142
#, c-format
msgid "Ignore &Case"
msgstr "Διάκριση μεταξύ Πεζών/&Κεφαλαίων ανενεργός"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_IGNORE_EOL
-#: Merge.rc:1102 Merge.rc:1135
+#: Merge.rc:1110 Merge.rc:1143
#, c-format
msgid "Igno&re EOL Differences (Windows/Unix/Mac)"
msgstr "Διαφορές χαρακτήρων &τερματισμού (Win/Unix/Mac) να αγνοούνται"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_IGNORE_CODEPAGE
-#: Merge.rc:1103 Merge.rc:1136
+#: Merge.rc:1111 Merge.rc:1144
#, c-format
msgid "Ignore Codepage &Differences"
msgstr ""
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_IGNORE_NUMBERS
-#: Merge.rc:1104 Merge.rc:1137
+#: Merge.rc:1112 Merge.rc:1145
msgid "Ignore Num&bers"
msgstr ""
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_IGNORE_COMMENTS
-#: Merge.rc:1105 Merge.rc:1138
+#: Merge.rc:1113 Merge.rc:1146
msgid "Ignore C&omment Differences"
msgstr ""
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_IGNORE_MISSING_TRAILING_EOL
-#: Merge.rc:1106 Merge.rc:1139
+#: Merge.rc:1114 Merge.rc:1147
msgid "Ignore &Missing Trailing EOL"
msgstr ""
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_IGNORE_LINE_BREAKS
-#: Merge.rc:1107 Merge.rc:1140
+#: Merge.rc:1115 Merge.rc:1148
msgid "Ignore Line &Breaks (Treat as Spaces)"
msgstr ""
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_RECURS_CHECK
-#: Merge.rc:1109 Merge.rc:2963
+#: Merge.rc:1117 Merge.rc:2973
#, c-format
msgid "&Include Subfolders"
msgstr "Οι Υποφάκελοι να &συμπεριληφθούν"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS
-#: Merge.rc:1110 Merge.rc:1142
+#: Merge.rc:1118 Merge.rc:1150
#, c-format
msgid "&Compare Method"
msgstr ""
#. IDS_COMPMETHOD_FULL_CONTENTS
-#: Merge.rc:1112 Merge.rc:1144 Merge.rc:1328 Merge.rc:4282
+#: Merge.rc:1120 Merge.rc:1152 Merge.rc:1338 Merge.rc:4292
#, c-format
msgid "Full Contents"
msgstr "Πλήρης Περιεχομένων"
#. IDS_COMPMETHOD_QUICK_CONTENTS
-#: Merge.rc:1113 Merge.rc:1145 Merge.rc:1329 Merge.rc:4283
+#: Merge.rc:1121 Merge.rc:1153 Merge.rc:1339 Merge.rc:4293
#, c-format
msgid "Quick Contents"
msgstr "Σύντομη Περιεχομένων"
#. IDS_COMPMETHOD_BINARY_CONTENTS
-#: Merge.rc:1114 Merge.rc:1146 Merge.rc:1330 Merge.rc:4284
+#: Merge.rc:1122 Merge.rc:1154 Merge.rc:1340 Merge.rc:4294
#, c-format
msgid "Binary Contents"
msgstr ""
#. IDS_COMPMETHOD_MODDATE
-#: Merge.rc:1115 Merge.rc:1147 Merge.rc:1331 Merge.rc:4285
+#: Merge.rc:1123 Merge.rc:1155 Merge.rc:1341 Merge.rc:4295
#, c-format
msgid "Modified Date"
msgstr "Ημερομηνία Τροποποιήσεως"
#. IDS_COMPMETHOD_DATESIZE
-#: Merge.rc:1116 Merge.rc:1148 Merge.rc:1332 Merge.rc:4286
+#: Merge.rc:1124 Merge.rc:1156 Merge.rc:1342 Merge.rc:4296
#, c-format
msgid "Modified Date and Size"
msgstr "Ημερομηνία Τροποποιήσεως και Μέγεθος"
#. IDS_COMPMETHOD_SIZE
-#: Merge.rc:1117 Merge.rc:1149 Merge.rc:1333 Merge.rc:4287
+#: Merge.rc:1125 Merge.rc:1157 Merge.rc:1343 Merge.rc:4297
#, c-format
msgid "Size"
msgstr "Μέγεθος"
#. IDS_COMPMETHOD_EXISTENCE
-#: Merge.rc:1118 Merge.rc:1150 Merge.rc:1334 Merge.rc:4288
+#: Merge.rc:1126 Merge.rc:1158 Merge.rc:1344 Merge.rc:4298
msgid "Existence"
msgstr ""
#. IDR_POPUP_PROJECT, ID_LOAD_PROJECT
-#: Merge.rc:1192
+#: Merge.rc:1202
#, c-format
msgid "&Load Project..."
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARGALL
-#: Merge.rc:1272 Merge.rc:1301
+#: Merge.rc:1282 Merge.rc:1311
msgid "${*} - All Arguments"
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARG1
-#: Merge.rc:1273 Merge.rc:1302
+#: Merge.rc:1283 Merge.rc:1312
msgid "${1} - First Argument"
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARG2
-#: Merge.rc:1274 Merge.rc:1303
+#: Merge.rc:1284 Merge.rc:1313
msgid "${2} - Second Argument"
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARG3
-#: Merge.rc:1275 Merge.rc:1304
+#: Merge.rc:1285 Merge.rc:1314
msgid "${3} - Third Argument"
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARG4
-#: Merge.rc:1276 Merge.rc:1305
+#: Merge.rc:1286 Merge.rc:1315
msgid "${4} - Fourth Argument"
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARG5
-#: Merge.rc:1277 Merge.rc:1306
+#: Merge.rc:1287 Merge.rc:1316
msgid "${5} - Fifth Argument"
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARG6
-#: Merge.rc:1278 Merge.rc:1307
+#: Merge.rc:1288 Merge.rc:1317
msgid "${6} - Sixth Argument"
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARG7
-#: Merge.rc:1279 Merge.rc:1308
+#: Merge.rc:1289 Merge.rc:1318
msgid "${7} - Seventh Argument"
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARG8
-#: Merge.rc:1280 Merge.rc:1309
+#: Merge.rc:1290 Merge.rc:1319
msgid "${8} - Eighth Argument"
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARG9
-#: Merge.rc:1281 Merge.rc:1310
+#: Merge.rc:1291 Merge.rc:1320
msgid "${9} - Ninth Argument"
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_SRC_FILE
-#: Merge.rc:1289
+#: Merge.rc:1299
msgid "${SRC_FILE} - Source File"
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_SRC_FOLDER
-#: Merge.rc:1290
+#: Merge.rc:1300
msgid "${SRC_FOLDER} - Source Folder"
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_SRC_URL
-#: Merge.rc:1291
+#: Merge.rc:1301
msgid "${SRC_URL} - Source URL"
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_SRC_URL_PROTOCOL
-#: Merge.rc:1292
+#: Merge.rc:1302
msgid "${SRC_URL_PROTOCOL} - Source URL Protocol"
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_SRC_URL_SUFFIX
-#: Merge.rc:1293
+#: Merge.rc:1303
msgid "${SRC_URL_SUFFIX} - Source URL Suffix"
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_DST_FILE
-#: Merge.rc:1294
+#: Merge.rc:1304
msgid "${DST_FILE} - Destination File"
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_DST_FOLDER
-#: Merge.rc:1295
+#: Merge.rc:1305
msgid "${DST_FOLDER} - Destination Folder"
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_DST_URL
-#: Merge.rc:1296
+#: Merge.rc:1306
msgid "${DST_URL} - Destination URL"
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_DST_URL_PROTOCOL
-#: Merge.rc:1297
+#: Merge.rc:1307
msgid "${DST_URL_PROTOCOL} - Destination URL Protocol"
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_DST_URL_SUFFIX
-#: Merge.rc:1298
+#: Merge.rc:1308
msgid "${DST_URL_SUFFIX} - Destination URL Suffix"
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_WINMERGE_HOME
-#: Merge.rc:1299
+#: Merge.rc:1309
msgid "${WINMERGE_HOME} - WinMerge Home Directory"
msgstr ""
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_SCRIPT_FILE
-#: Merge.rc:1300
+#: Merge.rc:1310
msgid "${SCRIPT_FILE} - Script File"
msgstr ""
#. IDR_POPUP_PLUGIN_ADD_MENU, ID_PLUGIN_ADD_UNPACKER
-#: Merge.rc:1318
+#: Merge.rc:1328
msgid "Add &Unpacker Plugin..."
msgstr ""
#. IDR_POPUP_PLUGIN_ADD_MENU, ID_PLUGIN_ADD_PREDIFFER
-#: Merge.rc:1319
+#: Merge.rc:1329
msgid "Add &Prediffer Plugin..."
msgstr ""
#. IDR_POPUP_PLUGIN_ADD_MENU, ID_PLUGIN_DUPLICATE
-#: Merge.rc:1320
+#: Merge.rc:1330
msgid "&Duplicate Plugin..."
msgstr ""
#. IDR_POPUP_OUTPUTVIEW, ID_EDIT_CLEAR_ALL
-#: Merge.rc:1344
+#: Merge.rc:1354
msgid "Clear &All"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_MASK_CLEAR
-#: Merge.rc:1352
+#: Merge.rc:1362
msgid "&Clear All"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_MASK_REMOVE_LAST
-#: Merge.rc:1353
+#: Merge.rc:1363
msgid "Remove Last Filter &Group"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_MASK_ALL
-#: Merge.rc:1354
+#: Merge.rc:1364
msgid "R&eset to Default (*.*)"
msgstr ""
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1355
+#: Merge.rc:1365
msgid "Add E&xclude File"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_SYS
-#: Merge.rc:1357
+#: Merge.rc:1367
msgid "&System Files"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_BACKUP
-#: Merge.rc:1358
+#: Merge.rc:1368
msgid "&Editor Backup Files"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_BIN
-#: Merge.rc:1359
+#: Merge.rc:1369
msgid "&Compiled Binary Files"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_LOG
-#: Merge.rc:1360
+#: Merge.rc:1370
msgid "&Log Files"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_TEMP
-#: Merge.rc:1361
+#: Merge.rc:1371
msgid "&Temporary or Cache Files"
msgstr ""
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1363
+#: Merge.rc:1373
msgid "Add Excl&ude Folder"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FOLDER_VCS
-#: Merge.rc:1365
+#: Merge.rc:1375
msgid "&Version Control"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FOLDER_BUILD
-#: Merge.rc:1366
+#: Merge.rc:1376
msgid "&Build Artifacts"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FOLDER_IDE
-#: Merge.rc:1367
+#: Merge.rc:1377
msgid "&IDE"
msgstr ""
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1370
+#: Merge.rc:1380
msgid "Add &File Condition"
msgstr ""
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1372 Merge.rc:1551
+#: Merge.rc:1382 Merge.rc:1561
msgid "File &Size"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_SIZE, ID_FILTERMENU_DIFF_SIZE_LT_1KB
-#: Merge.rc:1374 Merge.rc:1527 Merge.rc:1564 Merge.rc:1629 Merge.rc:1707
+#: Merge.rc:1384 Merge.rc:1537 Merge.rc:1574 Merge.rc:1639 Merge.rc:1717
msgid "Less than 1KB"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_SIZE, ID_FILTERMENU_DIFF_SIZE_GE_1KB
-#: Merge.rc:1375 Merge.rc:1528 Merge.rc:1565 Merge.rc:1630 Merge.rc:1708
+#: Merge.rc:1385 Merge.rc:1538 Merge.rc:1575 Merge.rc:1640 Merge.rc:1718
msgid "1KB or more"
msgstr ""
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_LT_10KB
-#: Merge.rc:1376 Merge.rc:1529 Merge.rc:1631
+#: Merge.rc:1386 Merge.rc:1539 Merge.rc:1641
msgid "Less than 10KB"
msgstr ""
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_GE_10KB
-#: Merge.rc:1377 Merge.rc:1530 Merge.rc:1632
+#: Merge.rc:1387 Merge.rc:1540 Merge.rc:1642
msgid "10KB or more"
msgstr ""
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_LT_100KB
-#: Merge.rc:1378 Merge.rc:1531 Merge.rc:1633
+#: Merge.rc:1388 Merge.rc:1541 Merge.rc:1643
msgid "Less than 100KB"
msgstr ""
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_GE_100KB
-#: Merge.rc:1379 Merge.rc:1532 Merge.rc:1634
+#: Merge.rc:1389 Merge.rc:1542 Merge.rc:1644
msgid "100KB or more"
msgstr ""
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_LT_1MB
-#: Merge.rc:1380 Merge.rc:1533 Merge.rc:1635
+#: Merge.rc:1390 Merge.rc:1543 Merge.rc:1645
msgid "Less than 1MB"
msgstr ""
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_GE_1MB
-#: Merge.rc:1381 Merge.rc:1534 Merge.rc:1636
+#: Merge.rc:1391 Merge.rc:1544 Merge.rc:1646
msgid "1MB or more"
msgstr ""
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_LT_10MB
-#: Merge.rc:1382 Merge.rc:1535 Merge.rc:1637
+#: Merge.rc:1392 Merge.rc:1545 Merge.rc:1647
msgid "Less than 10MB"
msgstr ""
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_GE_10MB
-#: Merge.rc:1383 Merge.rc:1536 Merge.rc:1638
+#: Merge.rc:1393 Merge.rc:1546 Merge.rc:1648
msgid "10MB or more"
msgstr ""
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_LT_100MB
-#: Merge.rc:1384 Merge.rc:1537 Merge.rc:1639
+#: Merge.rc:1394 Merge.rc:1547 Merge.rc:1649
msgid "Less than 100MB"
msgstr ""
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_GE_100MB
-#: Merge.rc:1385 Merge.rc:1538 Merge.rc:1640
+#: Merge.rc:1395 Merge.rc:1548 Merge.rc:1650
msgid "100MB or more"
msgstr ""
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_LT_1GB
-#: Merge.rc:1386 Merge.rc:1539 Merge.rc:1641
+#: Merge.rc:1396 Merge.rc:1549 Merge.rc:1651
msgid "Less than 1GB"
msgstr ""
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_GE_1GB
-#: Merge.rc:1387 Merge.rc:1642
+#: Merge.rc:1397 Merge.rc:1652
msgid "1GB or more"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_RANGE
-#: Merge.rc:1388 Merge.rc:1465 Merge.rc:1517 Merge.rc:1523 Merge.rc:1540
-#: Merge.rc:1566 Merge.rc:1587 Merge.rc:1643 Merge.rc:1709 Merge.rc:1734
+#: Merge.rc:1398 Merge.rc:1475 Merge.rc:1527 Merge.rc:1533 Merge.rc:1550
+#: Merge.rc:1576 Merge.rc:1597 Merge.rc:1653 Merge.rc:1719 Merge.rc:1744
msgid "Custom Range..."
msgstr ""
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1390 Merge.rc:1471 Merge.rc:1568
+#: Merge.rc:1400 Merge.rc:1481 Merge.rc:1578
msgid "&Last Modified"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE
-#: Merge.rc:1392 Merge.rc:1473 Merge.rc:1651
+#: Merge.rc:1402 Merge.rc:1483 Merge.rc:1661
msgid "&Hour"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_HOUR_BEFORE_1
-#: Merge.rc:1394 Merge.rc:1475 Merge.rc:1653
+#: Merge.rc:1404 Merge.rc:1485 Merge.rc:1663
msgid "More than 1 hour ago"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_HOUR_WITHIN_1
-#: Merge.rc:1395 Merge.rc:1476 Merge.rc:1654
+#: Merge.rc:1405 Merge.rc:1486 Merge.rc:1664
msgid "Within 1 hour"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE
-#: Merge.rc:1397 Merge.rc:1478 Merge.rc:1656
+#: Merge.rc:1407 Merge.rc:1488 Merge.rc:1666
msgid "&Day"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_DAY_BEFORE_TODAY
-#: Merge.rc:1399 Merge.rc:1480 Merge.rc:1658
+#: Merge.rc:1409 Merge.rc:1490 Merge.rc:1668
msgid "Before today"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_DAY_TODAY
-#: Merge.rc:1400 Merge.rc:1481 Merge.rc:1659
+#: Merge.rc:1410 Merge.rc:1491 Merge.rc:1669
msgid "Today"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_DAY_BEFORE_YESTERDAY
-#: Merge.rc:1401 Merge.rc:1482 Merge.rc:1660
+#: Merge.rc:1411 Merge.rc:1492 Merge.rc:1670
msgid "Before yesterday"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_DAY_YESTERDAY
-#: Merge.rc:1402 Merge.rc:1483 Merge.rc:1661
+#: Merge.rc:1412 Merge.rc:1493 Merge.rc:1671
msgid "Yesterday"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_DAY_SINCE_YESTERDAY
-#: Merge.rc:1403 Merge.rc:1484 Merge.rc:1662
+#: Merge.rc:1413 Merge.rc:1494 Merge.rc:1672
msgid "Since yesterday"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE
-#: Merge.rc:1405 Merge.rc:1486 Merge.rc:1664
+#: Merge.rc:1415 Merge.rc:1496 Merge.rc:1674
msgid "&Week"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_WEEK_BEFORE_THIS
-#: Merge.rc:1407 Merge.rc:1488 Merge.rc:1666
+#: Merge.rc:1417 Merge.rc:1498 Merge.rc:1676
msgid "Before this week"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_WEEK_THIS
-#: Merge.rc:1408 Merge.rc:1489 Merge.rc:1667
+#: Merge.rc:1418 Merge.rc:1499 Merge.rc:1677
msgid "This week"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_WEEK_BEFORE_LAST
-#: Merge.rc:1409 Merge.rc:1490 Merge.rc:1668
+#: Merge.rc:1419 Merge.rc:1500 Merge.rc:1678
msgid "Before last week"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_WEEK_LAST
-#: Merge.rc:1410 Merge.rc:1491 Merge.rc:1669
+#: Merge.rc:1420 Merge.rc:1501 Merge.rc:1679
msgid "Last week"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_WEEK_SINCE_LAST
-#: Merge.rc:1411 Merge.rc:1492 Merge.rc:1670
+#: Merge.rc:1421 Merge.rc:1502 Merge.rc:1680
msgid "Since last week"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE
-#: Merge.rc:1413 Merge.rc:1494 Merge.rc:1672
+#: Merge.rc:1423 Merge.rc:1504 Merge.rc:1682
msgid "&Month"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_MONTH_BEFORE_THIS
-#: Merge.rc:1415 Merge.rc:1496 Merge.rc:1674
+#: Merge.rc:1425 Merge.rc:1506 Merge.rc:1684
msgid "Before this month"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_MONTH_THIS
-#: Merge.rc:1416 Merge.rc:1497 Merge.rc:1675
+#: Merge.rc:1426 Merge.rc:1507 Merge.rc:1685
msgid "This month"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_MONTH_BEFORE_LAST
-#: Merge.rc:1417 Merge.rc:1498 Merge.rc:1676
+#: Merge.rc:1427 Merge.rc:1508 Merge.rc:1686
msgid "Before last month"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_MONTH_LAST
-#: Merge.rc:1418 Merge.rc:1499 Merge.rc:1677
+#: Merge.rc:1428 Merge.rc:1509 Merge.rc:1687
msgid "Last month"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_MONTH_SINCE_LAST
-#: Merge.rc:1419 Merge.rc:1500 Merge.rc:1678
+#: Merge.rc:1429 Merge.rc:1510 Merge.rc:1688
msgid "Since last month"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE
-#: Merge.rc:1421 Merge.rc:1502 Merge.rc:1680
+#: Merge.rc:1431 Merge.rc:1512 Merge.rc:1690
msgid "&Year"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_YEAR_BEFORE_THIS
-#: Merge.rc:1423 Merge.rc:1504 Merge.rc:1682
+#: Merge.rc:1433 Merge.rc:1514 Merge.rc:1692
msgid "Before this year"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_YEAR_THIS
-#: Merge.rc:1424 Merge.rc:1505 Merge.rc:1683
+#: Merge.rc:1434 Merge.rc:1515 Merge.rc:1693
msgid "This year"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_YEAR_BEFORE_LAST
-#: Merge.rc:1425 Merge.rc:1506 Merge.rc:1684
+#: Merge.rc:1435 Merge.rc:1516 Merge.rc:1694
msgid "Before last year"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_YEAR_LAST
-#: Merge.rc:1426 Merge.rc:1507 Merge.rc:1685
+#: Merge.rc:1436 Merge.rc:1517 Merge.rc:1695
msgid "Last year"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_YEAR_SINCE_LAST
-#: Merge.rc:1427 Merge.rc:1508 Merge.rc:1686
+#: Merge.rc:1437 Merge.rc:1518 Merge.rc:1696
msgid "Since last year"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_RANGE
-#: Merge.rc:1429 Merge.rc:1510 Merge.rc:1688
+#: Merge.rc:1439 Merge.rc:1520 Merge.rc:1698
msgid "&Custom Range..."
msgstr ""
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1431 Merge.rc:1589
+#: Merge.rc:1441 Merge.rc:1599
msgid "&Attributes"
msgstr ""
#. IDR_POPUP_FILTERMENU_ATTR, ID_FILTERMENU_ATTR_READONLY
-#: Merge.rc:1433 Merge.rc:1607
+#: Merge.rc:1443 Merge.rc:1617
msgid "Read-only files"
msgstr ""
#. IDR_POPUP_FILTERMENU_ATTR, ID_FILTERMENU_ATTR_NOT_READONLY
-#: Merge.rc:1434 Merge.rc:1608
+#: Merge.rc:1444 Merge.rc:1618
msgid "Not read-only files"
msgstr ""
#. IDR_POPUP_FILTERMENU_ATTR, ID_FILTERMENU_ATTR_HIDDEN
-#: Merge.rc:1435 Merge.rc:1609
+#: Merge.rc:1445 Merge.rc:1619
msgid "Hidden files"
msgstr ""
#. IDR_POPUP_FILTERMENU_ATTR, ID_FILTERMENU_ATTR_NOT_HIDDEN
-#: Merge.rc:1436 Merge.rc:1610
+#: Merge.rc:1446 Merge.rc:1620
msgid "Not hidden files"
msgstr ""
#. IDR_POPUP_FILTERMENU_ATTR, ID_FILTERMENU_ATTR_SYSTEM
-#: Merge.rc:1437 Merge.rc:1611
+#: Merge.rc:1447 Merge.rc:1621
msgid "System files"
msgstr ""
#. IDR_POPUP_FILTERMENU_ATTR, ID_FILTERMENU_ATTR_NOT_SYSTEM
-#: Merge.rc:1438 Merge.rc:1612
+#: Merge.rc:1448 Merge.rc:1622
msgid "Not system files"
msgstr ""
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1440
+#: Merge.rc:1450
msgid "File &Content"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_CONTAINS
-#: Merge.rc:1442
+#: Merge.rc:1452
msgid "Contains string..."
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_NOT_CONTAINS
-#: Merge.rc:1443
+#: Merge.rc:1453
msgid "Does not contain string..."
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_FIRST_LINE_CONTAINS
-#: Merge.rc:1444
+#: Merge.rc:1454
msgid "First line contains string..."
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_FIRST_LINE_NOT_CONTAINS
-#: Merge.rc:1445
+#: Merge.rc:1455
msgid "First line does not contain string..."
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_FIRST_10_CONTAINS
-#: Merge.rc:1446
+#: Merge.rc:1456
msgid "First 10 lines contain string..."
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_FIRST_10_NOT_CONTAINS
-#: Merge.rc:1447
+#: Merge.rc:1457
msgid "First 10 lines do not contain string..."
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_LAST_10_CONTAINS
-#: Merge.rc:1448
+#: Merge.rc:1458
msgid "Last 10 lines contain string..."
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_LAST_10_NOT_CONTAINS
-#: Merge.rc:1449
+#: Merge.rc:1459
msgid "Last 10 lines do not contain string..."
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_LAST_LINE_CONTAINS
-#: Merge.rc:1450
+#: Merge.rc:1460
msgid "Last line contains string..."
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_LAST_LINE_NOT_CONTAINS
-#: Merge.rc:1451
+#: Merge.rc:1461
msgid "Last line does not contain string..."
msgstr ""
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1453
+#: Merge.rc:1463
msgid "&Line Count"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_LT_10
-#: Merge.rc:1455
+#: Merge.rc:1465
msgid "Less than 10"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_GE_10
-#: Merge.rc:1456
+#: Merge.rc:1466
msgid "10 or more"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_LT_100
-#: Merge.rc:1457
+#: Merge.rc:1467
msgid "Less than 100"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_GE_100
-#: Merge.rc:1458
+#: Merge.rc:1468
msgid "100 or more"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_LT_1000
-#: Merge.rc:1459
+#: Merge.rc:1469
msgid "Less than 1000"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_GE_1000
-#: Merge.rc:1460
+#: Merge.rc:1470
msgid "1000 or more"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_LT_10000
-#: Merge.rc:1461
+#: Merge.rc:1471
msgid "Less than 10000"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_GE_10000
-#: Merge.rc:1462
+#: Merge.rc:1472
msgid "10000 or more"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_LT_100000
-#: Merge.rc:1463
+#: Merge.rc:1473
msgid "Less than 100000"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_GE_100000
-#: Merge.rc:1464
+#: Merge.rc:1474
msgid "100000 or more"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_PROPS
-#: Merge.rc:1467 Merge.rc:1594 Merge.rc:1761 Merge.rc:1778
+#: Merge.rc:1477 Merge.rc:1604 Merge.rc:1771 Merge.rc:1788
msgid "Additional &Properties..."
msgstr ""
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1469
+#: Merge.rc:1479
msgid "Add F&older Condition"
msgstr ""
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1513
+#: Merge.rc:1523
msgid "&Files"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FOLDER_FILES_EQ_0
-#: Merge.rc:1515
+#: Merge.rc:1525
msgid "0 files"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FOLDER_FILES_GE_1
-#: Merge.rc:1516
+#: Merge.rc:1526
msgid "1 file or more"
msgstr ""
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1519
+#: Merge.rc:1529
msgid "&Items"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FOLDER_ITEMS_EQ_0
-#: Merge.rc:1521
+#: Merge.rc:1531
msgid "0 items"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FOLDER_ITEMS_GE_1
-#: Merge.rc:1522
+#: Merge.rc:1532
msgid "1 item or more"
msgstr ""
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1525
+#: Merge.rc:1535
msgid "&Total Size"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FOLDER_STATS_RECURSIVE
-#: Merge.rc:1542
+#: Merge.rc:1552
msgid "&Recursive"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONDITION_ANY
-#: Merge.rc:1544
+#: Merge.rc:1554
msgid "Target: &Any (Left/Middle/Right)"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONDITION_LEFT
-#: Merge.rc:1545
+#: Merge.rc:1555
msgid "Target: &Left"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONDITION_MIDDLE
-#: Merge.rc:1546
+#: Merge.rc:1556
msgid "Target: &Middle"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONDITION_RIGHT
-#: Merge.rc:1547
+#: Merge.rc:1557
msgid "Target: &Right"
msgstr ""
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1549
+#: Merge.rc:1559
msgid "Add &Difference Condition"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_PROP, ID_FILTERMENU_DIFF_PROP_EQUAL
-#: Merge.rc:1553 Merge.rc:1570 Merge.rc:1591 Merge.rc:1696 Merge.rc:1717
-#: Merge.rc:1742
+#: Merge.rc:1563 Merge.rc:1580 Merge.rc:1601 Merge.rc:1706 Merge.rc:1727
+#: Merge.rc:1752
msgid "Equal"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_PROP, ID_FILTERMENU_DIFF_PROP_NOT_EQUAL
-#: Merge.rc:1554 Merge.rc:1571 Merge.rc:1592 Merge.rc:1697 Merge.rc:1718
-#: Merge.rc:1743
+#: Merge.rc:1564 Merge.rc:1581 Merge.rc:1602 Merge.rc:1707 Merge.rc:1728
+#: Merge.rc:1753
msgid "Not Equal"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_PROP, ID_FILTERMENU_DIFF_PROP_LESS
-#: Merge.rc:1555 Merge.rc:1572 Merge.rc:1698 Merge.rc:1719 Merge.rc:1744
+#: Merge.rc:1565 Merge.rc:1582 Merge.rc:1708 Merge.rc:1729 Merge.rc:1754
msgid "Less Than"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_PROP, ID_FILTERMENU_DIFF_PROP_LESS_EQUAL
-#: Merge.rc:1556 Merge.rc:1573 Merge.rc:1699 Merge.rc:1720 Merge.rc:1745
+#: Merge.rc:1566 Merge.rc:1583 Merge.rc:1709 Merge.rc:1730 Merge.rc:1755
msgid "Less Than or Equal to"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_PROP, ID_FILTERMENU_DIFF_PROP_GREATER
-#: Merge.rc:1557 Merge.rc:1574 Merge.rc:1700 Merge.rc:1721 Merge.rc:1746
+#: Merge.rc:1567 Merge.rc:1584 Merge.rc:1710 Merge.rc:1731 Merge.rc:1756
msgid "Greater Than"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_PROP, ID_FILTERMENU_DIFF_PROP_GREATER_EQUAL
-#: Merge.rc:1558 Merge.rc:1575 Merge.rc:1701 Merge.rc:1722 Merge.rc:1747
+#: Merge.rc:1568 Merge.rc:1585 Merge.rc:1711 Merge.rc:1732 Merge.rc:1757
msgid "Greater Than or Equal to"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_SIZE, ID_FILTERMENU_DIFF_SIZE_LT_10B
-#: Merge.rc:1560 Merge.rc:1703
+#: Merge.rc:1570 Merge.rc:1713
msgid "Less than 10B"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_SIZE, ID_FILTERMENU_DIFF_SIZE_GE_10B
-#: Merge.rc:1561 Merge.rc:1704
+#: Merge.rc:1571 Merge.rc:1714
msgid "10B or more"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_SIZE, ID_FILTERMENU_DIFF_SIZE_LT_100B
-#: Merge.rc:1562 Merge.rc:1705
+#: Merge.rc:1572 Merge.rc:1715
msgid "Less than 100B"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_SIZE, ID_FILTERMENU_DIFF_SIZE_GE_100B
-#: Merge.rc:1563 Merge.rc:1706
+#: Merge.rc:1573 Merge.rc:1716
msgid "100B or more"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_LT_1SECOND
-#: Merge.rc:1577 Merge.rc:1724
+#: Merge.rc:1587 Merge.rc:1734
msgid "Less than 1 second"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_GE_1SECOND
-#: Merge.rc:1578 Merge.rc:1725
+#: Merge.rc:1588 Merge.rc:1735
msgid "1 second or more"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_LT_1MINUTE
-#: Merge.rc:1579 Merge.rc:1726
+#: Merge.rc:1589 Merge.rc:1736
msgid "Less than 1 minute"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_GE_1MINUTE
-#: Merge.rc:1580 Merge.rc:1727
+#: Merge.rc:1590 Merge.rc:1737
msgid "1 minute or more"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_LT_1HOUR
-#: Merge.rc:1581 Merge.rc:1728
+#: Merge.rc:1591 Merge.rc:1738
msgid "Less than 1 hour"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_GE_1HOUR
-#: Merge.rc:1582 Merge.rc:1729
+#: Merge.rc:1592 Merge.rc:1739
msgid "1 hour or more"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_LT_1DAY
-#: Merge.rc:1583 Merge.rc:1730
+#: Merge.rc:1593 Merge.rc:1740
msgid "Less than 1 day"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_GE_1DAY
-#: Merge.rc:1584 Merge.rc:1731
+#: Merge.rc:1594 Merge.rc:1741
msgid "1 day or more"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_LT_1WEEK
-#: Merge.rc:1585 Merge.rc:1732
+#: Merge.rc:1595 Merge.rc:1742
msgid "Less than 1 week"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_GE_1WEEK
-#: Merge.rc:1586 Merge.rc:1733
+#: Merge.rc:1596 Merge.rc:1743
msgid "1 week or more"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_CONDITION_DIFF_LEFT_RIGHT
-#: Merge.rc:1596
+#: Merge.rc:1606
msgid "Target: &Left and Right"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_CONDITION_DIFF_LEFT_MIDDLE
-#: Merge.rc:1597
+#: Merge.rc:1607
msgid "Target: Left and &Middle"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_CONDITION_DIFF_MIDDLE_RIGHT
-#: Merge.rc:1598
+#: Merge.rc:1608
msgid "Target: Middle and &Right"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_CONDITION_DIFF_ALL
-#: Merge.rc:1599
+#: Merge.rc:1609
msgid "Target: &All"
msgstr ""
#. IDR_POPUP_FILTERMENU_BINARY, ID_FILTERMENU_BINARY_ONLY
-#: Merge.rc:1620
+#: Merge.rc:1630
msgid "Binary files only"
msgstr ""
#. IDR_POPUP_FILTERMENU_BINARY, ID_FILTERMENU_TEXT_ONLY
-#: Merge.rc:1621
+#: Merge.rc:1631
msgid "Text files only"
msgstr ""
#. IDR_POPUP_ADDCMPMENU, ID_ADDCMPMENU_CLEAR
-#: Merge.rc:1755
+#: Merge.rc:1765
msgid "&Clear conditions"
msgstr ""
#. IDR_POPUP_ADDCMPMENU, ID_ADDCMPMENU_CMP_SIZE
-#: Merge.rc:1757
+#: Merge.rc:1767
msgid "Compare &Size"
msgstr ""
#. IDR_POPUP_ADDCMPMENU, ID_ADDCMPMENU_CMP_DATE
-#: Merge.rc:1758
+#: Merge.rc:1768
msgid "Compare &Date"
msgstr ""
#. IDR_POPUP_ADDCMPMENU, ID_ADDCMPMENU_CMP_ATTR
-#: Merge.rc:1759
+#: Merge.rc:1769
msgid "Compare &Attributes"
msgstr ""
#. IDR_POPUP_ADDCMPMENU, ID_ADDCMPMENU_CMP_CONTENTS
-#: Merge.rc:1760
+#: Merge.rc:1770
msgid "Compare C&ontents"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_CLEAR
-#: Merge.rc:1769
+#: Merge.rc:1779
msgid "&Clear Keys"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_NAME
-#: Merge.rc:1771
+#: Merge.rc:1781
msgid "&Name"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_BASENAME
-#: Merge.rc:1772
+#: Merge.rc:1782
msgid "&Base name (without extension)"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_NORMALIZED_NAME
-#: Merge.rc:1773
+#: Merge.rc:1783
msgid "Normalized &Unicode Name"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_RELPATH
-#: Merge.rc:1774
+#: Merge.rc:1784
msgid "&Relative Path"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_DATE
-#: Merge.rc:1776
+#: Merge.rc:1786
msgid "&Date"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_HASH_MD5
-#: Merge.rc:1777
+#: Merge.rc:1787
msgid "&Hash (MD5)"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_REPLACE
-#: Merge.rc:1780
+#: Merge.rc:1790
msgid "Insert &replace() Function"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_REGEXREPLACE
-#: Merge.rc:1781
+#: Merge.rc:1791
msgid "Insert rege&xReplace() Function"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU
-#: Merge.rc:1782
+#: Merge.rc:1792
msgid "Replace &Lists"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_CREATE_REPLACELIST
-#: Merge.rc:1784
+#: Merge.rc:1794
msgid "&Create String Replace List and Insert..."
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_CREATE_REGEXREPLACELIST
-#: Merge.rc:1785
+#: Merge.rc:1795
msgid "Create &Regex Replace List and Insert..."
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU
-#: Merge.rc:1787
+#: Merge.rc:1797
msgid "&String Replace Lists"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU
-#: Merge.rc:1791
+#: Merge.rc:1801
msgid "Re&gex Replace Lists"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_STRING_REPLACE_LISTS_FOLDER
-#: Merge.rc:1796
+#: Merge.rc:1806
msgid "Open String Replace Lists Folder..."
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_REGEX_REPLACE_LISTS_FOLDER
-#: Merge.rc:1797
+#: Merge.rc:1807
msgid "Open Regex Replace Lists Folder..."
msgstr ""
#. IDD_FILTERS_CONDITION, IDC_CONDITION_MATCHCASE
-#: Merge.rc:1799 Merge.rc:1995 Merge.rc:2014 Merge.rc:2042 Merge.rc:2585
+#: Merge.rc:1809 Merge.rc:2005 Merge.rc:2024 Merge.rc:2052 Merge.rc:2595
#, c-format
msgid "Match &case"
msgstr "Διάκριση Πεζών/&Κεφαλαίων"
#. IDR_POPUP_RENAMEMOVE_MENU
-#: Merge.rc:1801
+#: Merge.rc:1811
msgid "Text &Normalization"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_TOLOWER
-#: Merge.rc:1803
+#: Merge.rc:1813
msgid "&Lowercase"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_TOUPPER
-#: Merge.rc:1804
+#: Merge.rc:1814
msgid "&Uppercase"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_TOHALFWIDTH
-#: Merge.rc:1805
+#: Merge.rc:1815
msgid "&Half-width"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_TOFULLWIDTH
-#: Merge.rc:1806
+#: Merge.rc:1816
msgid "&Full-width"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU
-#: Merge.rc:1807
+#: Merge.rc:1817
msgid "&Chinese Conversion"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_TOSIMPLIFIEDCHINESE
-#: Merge.rc:1809
+#: Merge.rc:1819
msgid "&Simplified Chinese"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_TOTRADITIONALCHINESE
-#: Merge.rc:1810
+#: Merge.rc:1820
msgid "&Traditional Chinese"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU
-#: Merge.rc:1812
+#: Merge.rc:1822
msgid "&Japanese Conversion"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_TOHIRAGANA
-#: Merge.rc:1814
+#: Merge.rc:1824
msgid "&Hiragana"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_TOKATAKANA
-#: Merge.rc:1815
+#: Merge.rc:1825
msgid "&Katakana"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_NORMALIZEUNICODE
-#: Merge.rc:1817
+#: Merge.rc:1827
msgid "Normalize &Unicode"
msgstr ""
#. IDD_ABOUTBOX
-#: Merge.rc:1932
+#: Merge.rc:1942
#, c-format
msgid "About WinMerge"
msgstr "Περί του WinMerge"
#. IDD_ABOUTBOX, IDC_WWW
-#: Merge.rc:1936
+#: Merge.rc:1946
msgid "Visit the WinMerge Homepage!"
msgstr "Επισκεφθείτε το Σταθμό του WinMerge!"
#. IDD_PLUGINS_EDITPLUGIN, IDOK
-#: Merge.rc:1938 Merge.rc:2080 Merge.rc:2431 Merge.rc:2455 Merge.rc:2469
-#: Merge.rc:2497 Merge.rc:2588 Merge.rc:2613 Merge.rc:2674 Merge.rc:2691
-#: Merge.rc:2703 Merge.rc:2867 Merge.rc:2927 Merge.rc:3062 Merge.rc:3104
-#: Merge.rc:3147 Merge.rc:3197
+#: Merge.rc:1948 Merge.rc:2090 Merge.rc:2441 Merge.rc:2465 Merge.rc:2479
+#: Merge.rc:2507 Merge.rc:2598 Merge.rc:2623 Merge.rc:2684 Merge.rc:2701
+#: Merge.rc:2713 Merge.rc:2877 Merge.rc:2937 Merge.rc:3072 Merge.rc:3114
+#: Merge.rc:3157 Merge.rc:3207
#, c-format
msgid "OK"
msgstr "ΟΚ"
#. IDD_ABOUTBOX, IDC_OPEN_CONTRIBUTORS
-#: Merge.rc:1939
+#: Merge.rc:1949
#, c-format
msgid "Contributors"
msgstr "Συντελεστές"
#. IDD_SELECT_FILES_OR_FOLDERS
-#: Merge.rc:1945 Merge.rc:3070
+#: Merge.rc:1955 Merge.rc:3080
#, c-format
msgid "Select Files or Folders"
msgstr "Επιλογή Αρχείων ή Φακέλων"
#. IDD_OPEN, IDC_FILES_DIRS_GROUP0
-#: Merge.rc:1949
+#: Merge.rc:1959
#, c-format
msgid "&1st File or Folder"
msgstr ""
#. IDD_OPEN, IDC_PATH0_READONLY
-#: Merge.rc:1951
+#: Merge.rc:1961
#, c-format
msgid "Re&ad-only"
msgstr "Μόνο για Ανά&γνωση"
#. IDD_OPEN, IDC_SWAP01_STATIC
-#: Merge.rc:1953
+#: Merge.rc:1963
#, c-format
msgid "Swap 1st | 2nd"
msgstr ""
#. IDD_GENERATE_PATCH, IDC_DIFF_BROWSE_FILE1
-#: Merge.rc:1954 Merge.rc:2310 Merge.rc:2413
+#: Merge.rc:1964 Merge.rc:2320 Merge.rc:2423
#, c-format
msgid "&Browse..."
msgstr "Ανα&ζήτηση..."
#. IDD_OPEN, IDC_FILES_DIRS_GROUP1
-#: Merge.rc:1955
+#: Merge.rc:1965
#, c-format
msgid "&2nd File or Folder"
msgstr ""
#. IDD_OPEN, IDC_PATH1_READONLY
-#: Merge.rc:1957
+#: Merge.rc:1967
#, c-format
msgid "Rea&d-only"
msgstr ""
#. IDD_OPEN, IDC_SWAP12_STATIC
-#: Merge.rc:1959
+#: Merge.rc:1969
#, c-format
msgid "Swap 2nd | 3rd"
msgstr ""
#. IDD_PROPPAGE_SYSTEM, IDC_FILTER_USER_BROWSE
-#: Merge.rc:1960 Merge.rc:2315
+#: Merge.rc:1970 Merge.rc:2325
#, c-format
msgid "B&rowse..."
msgstr "Ανα&ζήτηση..."
#. IDD_OPEN, IDC_FILES_DIRS_GROUP2
-#: Merge.rc:1961
+#: Merge.rc:1971
#, c-format
msgid "&3rd File or Folder (Optional)"
msgstr ""
#. IDD_OPEN, IDC_PATH2_READONLY
-#: Merge.rc:1963
+#: Merge.rc:1973
#, c-format
msgid "Read-o&nly"
msgstr ""
#. IDD_OPEN, IDC_SWAP02_STATIC
-#: Merge.rc:1965
+#: Merge.rc:1975
#, c-format
msgid "Swap 1st | 3rd"
msgstr ""
#. IDD_PROPPAGE_BACKUPS, IDC_BACKUP_BROWSE
-#: Merge.rc:1966 Merge.rc:2685 Merge.rc:2883
+#: Merge.rc:1976 Merge.rc:2695 Merge.rc:2893
#, c-format
msgid "Browse..."
msgstr "Ανα&ζήτηση..."
#. IDD_OPEN, IDC_FILES_DIRS_GROUP3
-#: Merge.rc:1968
+#: Merge.rc:1978
#, c-format
msgid " Folder: Filter"
msgstr ""
#. IDD_OPEN, IDC_RECURS_CHECK
-#: Merge.rc:1971
+#: Merge.rc:1981
msgid "&Include subfolders"
msgstr "Οι Υποφάκελοι να &συμπεριληφθούν"
#. IDD_OPEN, IDC_FILES_DIRS_GROUP5
-#: Merge.rc:1972
+#: Merge.rc:1982
msgid " File: Prediffer Plugin"
msgstr ""
#. IDD_OPEN, IDC_FILES_DIRS_GROUP4
-#: Merge.rc:1976
+#: Merge.rc:1986
#, c-format
msgid " File: Unpacker Plugin"
msgstr ""
#. IDD_OPEN, IDC_SELECT_UNPACKER
-#: Merge.rc:1978
+#: Merge.rc:1988
#, c-format
msgid "Se&lect..."
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN, IDCANCEL
-#: Merge.rc:1981 Merge.rc:2001 Merge.rc:2025 Merge.rc:2046 Merge.rc:2081
-#: Merge.rc:2432 Merge.rc:2456 Merge.rc:2470 Merge.rc:2498 Merge.rc:2551
-#: Merge.rc:2589 Merge.rc:2614 Merge.rc:2675 Merge.rc:2692 Merge.rc:2704
-#: Merge.rc:2868 Merge.rc:2928 Merge.rc:3087 Merge.rc:3105 Merge.rc:3148
-#: Merge.rc:3198
+#: Merge.rc:1991 Merge.rc:2011 Merge.rc:2035 Merge.rc:2056 Merge.rc:2091
+#: Merge.rc:2442 Merge.rc:2466 Merge.rc:2480 Merge.rc:2508 Merge.rc:2561
+#: Merge.rc:2599 Merge.rc:2624 Merge.rc:2685 Merge.rc:2702 Merge.rc:2714
+#: Merge.rc:2878 Merge.rc:2938 Merge.rc:3097 Merge.rc:3115 Merge.rc:3158
+#: Merge.rc:3208
#, c-format
msgid "Cancel"
msgstr "Ά&κυρο"
#. IDD_OPEN, IDC_OPEN_STATUS
-#: Merge.rc:1982
+#: Merge.rc:1992
#, c-format
msgid "Status:"
msgstr "Κατάσταση:"
#. IDD_PLUGINS_LIST, ID_HELP
-#: Merge.rc:1983 Merge.rc:2082 Merge.rc:2929
+#: Merge.rc:1993 Merge.rc:2092 Merge.rc:2939
#, c-format
msgid "Help"
msgstr "Βοήθεια"
#. IDD_OPEN, IDC_OPTIONS
-#: Merge.rc:1984
+#: Merge.rc:1994
msgid "&Options..."
msgstr "Επιλ&ογές..."
#. IDD_EDIT_FIND
-#: Merge.rc:1989
+#: Merge.rc:1999
#, c-format
msgid "Find"
msgstr "Αναζήτηση"
#. IDD_EDIT_MARKER, IDC_STATIC
-#: Merge.rc:1992 Merge.rc:2009 Merge.rc:2037
+#: Merge.rc:2002 Merge.rc:2019 Merge.rc:2047
#, c-format
msgid "Fi&nd what:"
msgstr "Ανα&ζήτηση για:"
#. IDD_EDIT_MARKER, IDC_EDIT_WHOLE_WORD
-#: Merge.rc:1994 Merge.rc:2013 Merge.rc:2041
+#: Merge.rc:2004 Merge.rc:2023 Merge.rc:2051
#, c-format
msgid "Match &whole word only"
msgstr "Εύρεση ολοκλήρων &λέξεων μόνο"
#. IDD_EDIT_MARKER, IDC_EDIT_REGEXP
-#: Merge.rc:1996 Merge.rc:2015 Merge.rc:2043
+#: Merge.rc:2006 Merge.rc:2025 Merge.rc:2053
#, c-format
msgid "Regular &expression"
msgstr "Τυποποιημένη Έκ&φραση"
#. IDD_EDIT_FIND, IDC_FINDDLG_DONTWRAP
-#: Merge.rc:1997
+#: Merge.rc:2007
#, c-format
msgid "D&on't wrap end of file"
msgstr "Χωρίς ανα&δίπλωση στο τέλος του αρχείου"
#. IDD_EDIT_FIND, IDC_FINDDLG_DONTCLOSE
-#: Merge.rc:1998
+#: Merge.rc:2008
#, c-format
msgid "&Don't close this dialog"
msgstr ""
#. IDD_EDIT_REPLACE, IDC_EDIT_SKIP
-#: Merge.rc:1999 Merge.rc:2021
+#: Merge.rc:2009 Merge.rc:2031
#, c-format
msgid "&Find Next"
msgstr "Εύρεση &Επομένου"
#. IDD_EDIT_FIND, IDC_EDIT_FINDPREV
-#: Merge.rc:2000
+#: Merge.rc:2010
#, c-format
msgid "Find &Prev"
msgstr ""
#. IDD_EDIT_REPLACE
-#: Merge.rc:2006
+#: Merge.rc:2016
#, c-format
msgid "Replace"
msgstr "Αντικατάσταση"
#. IDD_EDIT_REPLACE, IDC_STATIC
-#: Merge.rc:2011
+#: Merge.rc:2021
#, c-format
msgid "Re&place with:"
msgstr "Αντι&κατάσταση με:"
#. IDD_EDIT_REPLACE, IDC_EDIT_SCOPE_DONT_WRAP
-#: Merge.rc:2016
+#: Merge.rc:2026
#, c-format
msgid "&Don't wrap at end of file"
msgstr "Χωρίς ανα&δίπλωση στο τέλος του αρχείου"
#. IDD_EDIT_REPLACE, IDC_STATIC
-#: Merge.rc:2018
+#: Merge.rc:2028
#, c-format
msgid "Replace in"
msgstr "Αντικατάσταση εντός"
#. IDD_EDIT_REPLACE, IDC_EDIT_SCOPE_WHOLE_FILE
-#: Merge.rc:2020
+#: Merge.rc:2030
#, c-format
msgid "Wh&ole file"
msgstr "Ό&λου του Αρχείου"
#. IDD_EDIT_REPLACE, IDC_EDIT_FINDPREV
-#: Merge.rc:2022
+#: Merge.rc:2032
msgid "Find Pre&v"
msgstr ""
#. IDD_EDIT_REPLACE, IDC_EDIT_REPLACE
-#: Merge.rc:2023
+#: Merge.rc:2033
#, c-format
msgid "&Replace"
msgstr "Αντι&κατάσταση"
#. IDD_EDIT_REPLACE, IDC_EDIT_REPLACE_ALL
-#: Merge.rc:2024
+#: Merge.rc:2034
#, c-format
msgid "Replace &All"
msgstr "Αντικατάσταση Ό&λων"
#. IDS_OPTIONSPG_MARKERCOLORS
-#: Merge.rc:2030 Merge.rc:4209
+#: Merge.rc:2040 Merge.rc:4219
#, c-format
msgid "Markers"
msgstr ""
#. IDD_EDIT_MARKER, IDC_EDIT_MARKERS_ENABLED
-#: Merge.rc:2033
+#: Merge.rc:2043
#, c-format
msgid "Enable &markers"
msgstr ""
#. IDD_FILTERS_LINEFILTERS, IDC_LFILTER_ADDBTN
-#: Merge.rc:2035 Merge.rc:2057
+#: Merge.rc:2045 Merge.rc:2067
#, c-format
msgid "New"
msgstr "Δημιουργία"
#. IDD_EDIT_MARKER, IDC_STATIC
-#: Merge.rc:2039
+#: Merge.rc:2049
#, c-format
msgid "&Background color:"
msgstr ""
#. IDS_MESSAGEBOX_OK
-#: Merge.rc:2044 Merge.rc:2829 Merge.rc:3086 Merge.rc:4171
+#: Merge.rc:2054 Merge.rc:2839 Merge.rc:3096 Merge.rc:4181
#, c-format
msgid "&Ok"
msgstr "&ΟΚ"
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:2045 Merge.rc:2525 Merge.rc:3199
+#: Merge.rc:2055 Merge.rc:2535 Merge.rc:3209
#, c-format
msgid "&Apply"
msgstr "Ε&φαρμογή"
#. IDD_FILTERS_LINEFILTERS
-#: Merge.rc:2051
+#: Merge.rc:2061
msgid "Line Filters"
msgstr ""
#. IDD_FILTERS_LINEFILTERS, IDC_IGNOREREGEXP
-#: Merge.rc:2054
+#: Merge.rc:2064
#, c-format
msgid "Enable Line Filters"
msgstr "Ενεργοποίηση Φίλτρων Γραμμών"
#. IDD_FILTERS_LINEFILTERS, IDC_STATIC
-#: Merge.rc:2055
+#: Merge.rc:2065
#, c-format
msgid "Regular Expressions (one per line):"
msgstr "Τυποποιημένες Εκ&φράσεις (μία ανά γραμμή):"
#. IDD_PLUGINS_LIST, IDC_PLUGIN_EDIT
-#: Merge.rc:2058 Merge.rc:2924
+#: Merge.rc:2068 Merge.rc:2934
#, c-format
msgid "Edit"
msgstr "Επεξεργασία"
#. IDD_PLUGINS_LIST, IDC_PLUGIN_REMOVE
-#: Merge.rc:2059 Merge.rc:2071 Merge.rc:2925
+#: Merge.rc:2069 Merge.rc:2081 Merge.rc:2935
#, c-format
msgid "Remove"
msgstr "Διαγραφή"
#. IDD_FILTERS_SUBSTITUTIONFILTERS
-#: Merge.rc:2064
+#: Merge.rc:2074
msgid "Substitution Filters"
msgstr ""
#. IDD_FILTERS_SUBSTITUTIONFILTERS, IDC_STATIC
-#: Merge.rc:2067
+#: Merge.rc:2077
msgid "Changes to the listed pairs below will be ignored or marked as insignificant. Patches are unaffected."
msgstr ""
#. IDD_FILTERS_SUBSTITUTIONFILTERS, IDC_IGNORED_SUSBSTITUTIONS_ENABLED
-#: Merge.rc:2068
+#: Merge.rc:2078
msgid "Enable"
msgstr ""
#. IDD_PLUGINS_LIST, IDC_PLUGIN_ADD
-#: Merge.rc:2070 Merge.rc:2923
+#: Merge.rc:2080 Merge.rc:2933
msgid "Add"
msgstr ""
#. IDD_FILTERS_SUBSTITUTIONFILTERS, IDC_LFILTER_CLEARBTN
-#: Merge.rc:2072
+#: Merge.rc:2082
msgid "Clear"
msgstr ""
#. IDD_PREFERENCES
-#: Merge.rc:2077
+#: Merge.rc:2087
#, c-format
msgid "Options"
msgstr "Επιλογές"
#. IDD_PREFERENCES, IDC_TREEOPT_IMPORT
-#: Merge.rc:2086
+#: Merge.rc:2096
#, c-format
msgid "Import..."
msgstr "Εισαγωγή..."
#. IDD_PREFERENCES, IDC_TREEOPT_EXPORT
-#: Merge.rc:2087
+#: Merge.rc:2097
#, c-format
msgid "Export..."
msgstr "Εξαγωγή..."
#. IDS_OPTIONSPG_GENCOMPARE
-#: Merge.rc:2092 Merge.rc:4199 Merge.rc:4202 Merge.rc:4219
+#: Merge.rc:2102 Merge.rc:4209 Merge.rc:4212 Merge.rc:4229
#, c-format
msgid "General"
msgstr "Γενικά"
#. IDD_PROPPAGE_GENERAL, IDC_SCROLL_CHECK
-#: Merge.rc:2095
+#: Merge.rc:2105
#, c-format
msgid "Automatically &scroll to first difference"
msgstr "Αυτόματη &κύλιση στην πρώτη διαφορά"
#. IDD_PROPPAGE_GENERAL, IDC_SCROLL_TO_FIRST_INLINE_DIFF_CHECK
-#: Merge.rc:2097
+#: Merge.rc:2107
msgid "Automatically s&croll to first inline difference"
msgstr ""
#. IDD_PROPPAGE_GENERAL, IDC_STATIC
-#: Merge.rc:2099
+#: Merge.rc:2109
msgid "Cl&ose windows with 'Esc':"
msgstr "Κ&λείσιμο παραθύρων με 'Esc':"
#. IDD_PROPPAGE_GENERAL, IDC_VERIFY_OPEN_PATHS
-#: Merge.rc:2101
+#: Merge.rc:2111
#, c-format
msgid "&Automatically verify paths in Open dialog"
msgstr "&Αυτόματη επαλήθευση διαδρομών στο διάλογο ανοίγματος"
#. IDD_PROPPAGE_GENERAL, IDC_STATIC
-#: Merge.rc:2103
+#: Merge.rc:2113
msgid "Single instance mode:"
msgstr ""
#. IDD_PROPPAGE_GENERAL, IDC_ASK_MULTIWINDOW_CLOSE
-#: Merge.rc:2105
+#: Merge.rc:2115
#, c-format
msgid "As&k when closing multiple windows"
msgstr "Ερώτηση πριν από το κλείσιμο πολλαπλών παραθύρων"
#. IDD_PROPPAGE_GENERAL, IDC_PRESERVE_FILETIME
-#: Merge.rc:2107
+#: Merge.rc:2117
#, c-format
msgid "&Preserve file time in file compare"
msgstr "Δια&τήρηση της ώρας τροποποιήσεως κατά τη σύγκριση αρχείων"
#. IDD_PROPPAGE_GENERAL, IDC_STARTUP_FOLDER_SELECT
-#: Merge.rc:2109
+#: Merge.rc:2119
#, c-format
msgid "Show \"Select Files or Folders\" dialog on startup"
msgstr ""
#. IDD_PROPPAGE_GENERAL, IDC_CLOSE_WITH_OK
-#: Merge.rc:2111
+#: Merge.rc:2121
msgid "Close \"Select Files or Folders\" dialog on clicking Compare button"
msgstr ""
#. IDD_PROPPAGE_GENERAL, IDC_STATIC
-#: Merge.rc:2113
+#: Merge.rc:2123
#, c-format
msgid "Op&en dialog Auto completion:"
msgstr "Αυτόματη συμπλήρωση διαλόγου αν&οίγματος"
#. IDD_PROPPAGE_GENERAL, IDC_STATIC
-#: Merge.rc:2115
+#: Merge.rc:2125
msgid "Auto-&reload modified files:"
msgstr ""
#. IDD_PROPPAGE_GENERAL, IDC_STATIC
-#: Merge.rc:2117
+#: Merge.rc:2127
#, c-format
msgid "Language:"
msgstr ""
#. IDD_PROPPAGE_COMPARE_WEBPAGE, IDC_COMPARE_DEFAULTS
-#: Merge.rc:2119 Merge.rc:2299 Merge.rc:2321 Merge.rc:2352 Merge.rc:2369
-#: Merge.rc:2386 Merge.rc:2394 Merge.rc:2430 Merge.rc:2454 Merge.rc:2633
-#: Merge.rc:2644 Merge.rc:2653 Merge.rc:2887 Merge.rc:2922 Merge.rc:2985
-#: Merge.rc:3010 Merge.rc:3024 Merge.rc:3038 Merge.rc:3054
+#: Merge.rc:2129 Merge.rc:2309 Merge.rc:2331 Merge.rc:2362 Merge.rc:2379
+#: Merge.rc:2396 Merge.rc:2404 Merge.rc:2440 Merge.rc:2464 Merge.rc:2643
+#: Merge.rc:2654 Merge.rc:2663 Merge.rc:2897 Merge.rc:2932 Merge.rc:2995
+#: Merge.rc:3020 Merge.rc:3034 Merge.rc:3048 Merge.rc:3064
#, c-format
msgid "Defaults"
msgstr "&Αρχικές Ρυθμίσεις"
#. IDS_OPTIONSPG_COLORS
-#: Merge.rc:2124 Merge.rc:2140 Merge.rc:2267 Merge.rc:2292 Merge.rc:4205
+#: Merge.rc:2134 Merge.rc:2150 Merge.rc:2277 Merge.rc:2302 Merge.rc:4215
#, c-format
msgid "Colors"
msgstr "Χρώματα"
#. IDD_PROPPAGE_COLOR_SCHEMES, IDC_STATIC
-#: Merge.rc:2127
+#: Merge.rc:2137
msgid "Color &mode:"
msgstr ""
#. IDD_PROPPAGE_COLOR_SCHEMES, IDC_STATIC
-#: Merge.rc:2129
+#: Merge.rc:2139
msgid "&Light mode scheme:"
msgstr ""
#. IDD_PROPPAGE_COLOR_SCHEMES, IDC_STATIC
-#: Merge.rc:2131
+#: Merge.rc:2141
msgid "&Dark mode scheme:"
msgstr ""
#. IDD_PROPPAGE_COLOR_SCHEMES, IDC_STATIC
-#: Merge.rc:2133
+#: Merge.rc:2143
msgid "Your custom schemes"
msgstr ""
#. IDD_PROPPAGE_COLOR_SCHEMES, IDC_COLOR_SCHEME_SAVE
-#: Merge.rc:2134
+#: Merge.rc:2144
msgid "&Save current scheme..."
msgstr ""
#. IDD_PROPPAGE_COLOR_SCHEMES, IDC_COLOR_SCHEME_DELETE
-#: Merge.rc:2135
+#: Merge.rc:2145
msgid "Delete ¤t scheme..."
msgstr ""
#. IDD_PROPPAGE_COLORS_DIR, IDC_BACKGROUND_COLUMN_LABEL
-#: Merge.rc:2143 Merge.rc:2238 Merge.rc:2258 Merge.rc:2272
+#: Merge.rc:2153 Merge.rc:2248 Merge.rc:2268 Merge.rc:2282
#, c-format
msgid "Background"
msgstr "Φόντο"
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2144
+#: Merge.rc:2154
#, c-format
msgid "Deleted"
msgstr "Διαγραφέντα"
#. IDS_OPTIONSPG_TEXTCOLORS
-#: Merge.rc:2145 Merge.rc:2207 Merge.rc:2239 Merge.rc:2273 Merge.rc:4207
+#: Merge.rc:2155 Merge.rc:2217 Merge.rc:2249 Merge.rc:2283 Merge.rc:4217
#, c-format
msgid "Text"
msgstr "Κείμενο"
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2146
+#: Merge.rc:2156
#, c-format
msgid "Difference:"
msgstr "Διαφορά:"
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2151
+#: Merge.rc:2161
#, c-format
msgid "Selected Difference:"
msgstr "Επιλεγμένη Διαφορά:"
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2156
+#: Merge.rc:2166
#, c-format
msgid "Ignored Difference:"
msgstr "Αγνοηθείσα Διαφορά"
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2161
+#: Merge.rc:2171
#, c-format
msgid "Moved:"
msgstr "Μετακινηθέντα:"
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2166
+#: Merge.rc:2176
#, c-format
msgid "Selected Moved:"
msgstr "Επιλεγμένα Μετακινηθέντα:"
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2171
+#: Merge.rc:2181
#, c-format
msgid "Same As Next (3 panes):"
msgstr ""
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2176
+#: Merge.rc:2186
#, c-format
msgid "Same As Next (Selected):"
msgstr ""
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2181
+#: Merge.rc:2191
#, c-format
msgid "Word Difference:"
msgstr "Διαφορά Λέξεως:"
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2186
+#: Merge.rc:2196
#, c-format
msgid "Selected Word Diff:"
msgstr "Επιλεγμένη Διαφορά Λέξεως:"
#. IDD_INPUTBOX
-#: Merge.rc:2195 Merge.rc:2230 Merge.rc:2251 Merge.rc:3099
+#: Merge.rc:2205 Merge.rc:2240 Merge.rc:2261 Merge.rc:3109
#, c-format
msgid "Dialog"
msgstr "Διάλογος"
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC
-#: Merge.rc:2198
+#: Merge.rc:2208
#, c-format
msgid "Keywords:"
msgstr "Ειδικές Λέξεις:"
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC
-#: Merge.rc:2199
+#: Merge.rc:2209
#, c-format
msgid "Function names:"
msgstr "Ονόματα Διεργασιών:"
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC
-#: Merge.rc:2200
+#: Merge.rc:2210
#, c-format
msgid "Comments:"
msgstr "Σχόλια:"
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC
-#: Merge.rc:2201
+#: Merge.rc:2211
#, c-format
msgid "Numbers:"
msgstr "Αριθμοί:"
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC
-#: Merge.rc:2202
+#: Merge.rc:2212
#, c-format
msgid "Operators:"
msgstr "Τελεστές:"
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC
-#: Merge.rc:2203
+#: Merge.rc:2213
#, c-format
msgid "Strings:"
msgstr "Αυτούσιο Κείμενο:"
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC
-#: Merge.rc:2204
+#: Merge.rc:2214
#, c-format
msgid "Preprocessor:"
msgstr "Προεπεξεργαστής:"
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC
-#: Merge.rc:2205
+#: Merge.rc:2215
#, c-format
msgid "User 1:"
msgstr "από Χρήστη 1:"
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC
-#: Merge.rc:2206
+#: Merge.rc:2216
#, c-format
msgid "User 2:"
msgstr "από Χρήστη 2:"
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_SCOLOR_USER2_BOLD
-#: Merge.rc:2209 Merge.rc:2211 Merge.rc:2213 Merge.rc:2215 Merge.rc:2217
-#: Merge.rc:2219 Merge.rc:2221 Merge.rc:2223 Merge.rc:2225
+#: Merge.rc:2219 Merge.rc:2221 Merge.rc:2223 Merge.rc:2225 Merge.rc:2227
+#: Merge.rc:2229 Merge.rc:2231 Merge.rc:2233 Merge.rc:2235
#, c-format
msgid "Bold"
msgstr "Έντονα"
#. IDD_PROPPAGE_COLORS_TEXT, IDC_DEFAULT_STANDARD_COLORS
-#: Merge.rc:2233
+#: Merge.rc:2243
#, c-format
msgid "&Use customized text colors"
msgstr "Χρήση προ&τιμωμένων χρωματισμών κειμένου"
#. IDD_PROPPAGE_COLORS_TEXT, IDC_WHITESPACE_COLOR_LABEL
-#: Merge.rc:2235
+#: Merge.rc:2245
#, c-format
msgid "Whitespace:"
msgstr "Χαρακτήρες Διαστήματος:"
#. IDD_PROPPAGE_COLORS_TEXT, IDC_TEXT_COLOR_LABEL
-#: Merge.rc:2236
+#: Merge.rc:2246
#, c-format
msgid "Regular text:"
msgstr "Απλό κείμενο:"
#. IDD_PROPPAGE_COLORS_TEXT, IDC_SELECTION_COLOR_LABEL
-#: Merge.rc:2237
+#: Merge.rc:2247
#, c-format
msgid "Selection:"
msgstr "Επιλογή:"
#. IDD_PROPPAGE_COLORS_DIR, IDC_STATIC
-#: Merge.rc:2245 Merge.rc:2286
+#: Merge.rc:2255 Merge.rc:2296
#, c-format
msgid "Margin:"
msgstr ""
#. IDD_PROPPAGE_COLORS_MARKER, IDC_MARKER0_COLOR_LABEL
-#: Merge.rc:2254
+#: Merge.rc:2264
#, c-format
msgid "Search Marker:"
msgstr ""
#. IDD_PROPPAGE_COLORS_MARKER, IDC_MARKER1_COLOR_LABEL
-#: Merge.rc:2255
+#: Merge.rc:2265
#, c-format
msgid "User Defined Marker 1:"
msgstr ""
#. IDD_PROPPAGE_COLORS_MARKER, IDC_MARKER2_COLOR_LABEL
-#: Merge.rc:2256
+#: Merge.rc:2266
#, c-format
msgid "User Defined Marker 2:"
msgstr ""
#. IDD_PROPPAGE_COLORS_MARKER, IDC_MARKER3_COLOR_LABEL
-#: Merge.rc:2257
+#: Merge.rc:2267
#, c-format
msgid "User Defined Marker 3:"
msgstr ""
#. IDD_PROPPAGE_COLORS_DIR, IDC_USE_DIR_COMPARE_COLORS
-#: Merge.rc:2270
+#: Merge.rc:2280
msgid "&Use folder compare colors"
msgstr ""
#. IDD_PROPPAGE_COLORS_DIR, IDC_STATIC
-#: Merge.rc:2274
+#: Merge.rc:2284
msgid "Items equal:"
msgstr ""
#. IDD_PROPPAGE_COLORS_DIR, IDC_STATIC
-#: Merge.rc:2277
+#: Merge.rc:2287
msgid "Items different:"
msgstr ""
#. IDD_PROPPAGE_COLORS_DIR, IDC_STATIC
-#: Merge.rc:2280
+#: Merge.rc:2290
msgid "Items missing:"
msgstr ""
#. IDD_PROPPAGE_COLORS_DIR, IDC_STATIC
-#: Merge.rc:2283
+#: Merge.rc:2293
msgid "Items filtered:"
msgstr ""
#. IDD_PROPPAGE_COLORS_SYSTEM, IDC_SYSCOLOR_HOOK_ENABLED
-#: Merge.rc:2295
+#: Merge.rc:2305
msgid "&Use custom system colors"
msgstr ""
#. IDS_PRPCAT_SYSTEM
-#: Merge.rc:2304 Merge.rc:4211 Merge.rc:4212 Merge.rc:4657
+#: Merge.rc:2314 Merge.rc:4221 Merge.rc:4222 Merge.rc:4667
#, c-format
msgid "System"
msgstr "Σύστημα"
#. IDD_PROPPAGE_SYSTEM, IDC_USE_RECYCLE_BIN
-#: Merge.rc:2307
+#: Merge.rc:2317
#, c-format
msgid "&Use Recycle Bin"
msgstr "Αποστολή διαγραφέντων αρχείων στον &Κάδο Ανακυκλώσεως"
#. IDD_PROPPAGE_SYSTEM, IDC_STATIC
-#: Merge.rc:2308
+#: Merge.rc:2318
#, c-format
msgid "&External editor:"
msgstr "Επεξεργασία με &άλλη εφαρμογή:"
#. IDD_PROPPAGE_SYSTEM, IDC_STATIC
-#: Merge.rc:2311
+#: Merge.rc:2321
msgid "&Store user data in:"
msgstr ""
#. IDD_PROPPAGE_SYSTEM, IDC_STATIC
-#: Merge.rc:2313
+#: Merge.rc:2323
#, c-format
msgid "&Filter folder:"
msgstr "Φάκελος &Φίλτρων:"
#. IDD_PROPPAGE_SYSTEM, IDC_STATIC
-#: Merge.rc:2316
+#: Merge.rc:2326
#, c-format
msgid "Temporary files folder"
msgstr "Φάκελος προσωρινών αρχείων"
#. IDD_PROPPAGE_SYSTEM, IDC_TMPFOLDER_SYSTEM
-#: Merge.rc:2317
+#: Merge.rc:2327
#, c-format
msgid "S&ystem temp folder"
msgstr "Φάκελος προσωρινών αρχείων ορίζεται από το &Σύστημα"
#. IDD_PROPPAGE_SYSTEM, IDC_STATIC
-#: Merge.rc:2318
+#: Merge.rc:2328
#, c-format
msgid "C&ustom folder:"
msgstr "Προ&τιμώμενος Φάκελος:"
#. IDD_GENERATE_PATCH, IDC_DIFF_BROWSE_FILE2
-#: Merge.rc:2320 Merge.rc:2416
+#: Merge.rc:2330 Merge.rc:2426
#, c-format
msgid "Br&owse..."
msgstr "Ανα&ζήτηση..."
#. IDS_OPTIONSPG_COMPARE
-#: Merge.rc:2326 Merge.rc:4200
+#: Merge.rc:2336 Merge.rc:4210
#, c-format
msgid "Compare"
msgstr "Σύγκριση"
#. IDD_PROPPAGE_COMPARE, IDC_STATIC
-#: Merge.rc:2329
+#: Merge.rc:2339
#, c-format
msgid "Whitespaces"
msgstr "Χαρακτήρες Διαστήματος"
#. IDD_PROPPAGE_COMPARE, IDC_WHITESPACE
-#: Merge.rc:2330
+#: Merge.rc:2340
#, c-format
msgid "&Compare"
msgstr "&Σύγκριση"
#. IDD_PROPPAGE_COMPARE, IDC_WHITE_CHANGE
-#: Merge.rc:2331
+#: Merge.rc:2341
#, c-format
msgid "&Ignore change"
msgstr "Η μεταβολή να α&γνοείται"
#. IDD_PROPPAGE_COMPARE, IDC_ALL_WHITE
-#: Merge.rc:2332
+#: Merge.rc:2342
#, c-format
msgid "I&gnore all"
msgstr "Να αγνοούνται τα &πάντα"
#. IDD_PROPPAGE_COMPARE, IDC_IGNBLANKS_CHECK
-#: Merge.rc:2333
+#: Merge.rc:2343
msgid "Ignore blan&k lines"
msgstr "Οι &κενές γραμμές να αγνοούνται"
#. IDD_PROPPAGE_COMPARE, IDC_IGNCASE_CHECK
-#: Merge.rc:2334
+#: Merge.rc:2344
msgid "Ignore &case"
msgstr "Διάκριση μεταξύ Πεζών/&Κεφαλαίων ανενεργός"
#. IDD_PROPPAGE_COMPARE, IDC_EOL_SENSITIVE
-#: Merge.rc:2335
+#: Merge.rc:2345
msgid "Igno&re EOL differences (Windows/Unix/Mac)"
msgstr ""
#. IDD_PROPPAGE_COMPARE, IDC_IGNORE_NUMBERS
-#: Merge.rc:2337
+#: Merge.rc:2347
msgid "Ignore num&bers"
msgstr ""
#. IDD_PROPPAGE_COMPARE, IDC_CP_SENSITIVE
-#: Merge.rc:2338
+#: Merge.rc:2348
msgid "Ignore codepage &differences"
msgstr ""
#. IDD_PROPPAGE_COMPARE, IDC_FILTERCOMMENTS_CHECK
-#: Merge.rc:2339
+#: Merge.rc:2349
msgid "Ignore c&omment differences"
msgstr ""
#. IDD_PROPPAGE_COMPARE, IDC_IGNEOFEOL_CHECK
-#: Merge.rc:2341
+#: Merge.rc:2351
msgid "Ignore &missing trailing EOL"
msgstr ""
#. IDD_PROPPAGE_COMPARE, IDC_IGNLBRKS_CHECK
-#: Merge.rc:2343
+#: Merge.rc:2353
msgid "Ignore line &breaks (treat as spaces)"
msgstr ""
#. IDD_PROPPAGE_COMPARE, IDC_MOVED_BLOCKS
-#: Merge.rc:2345
+#: Merge.rc:2355
#, c-format
msgid "E&nable moved block detection"
msgstr "Ενεργοποίηση ανι&χνεύσεως μετακινηθέντων τμημάτων"
#. IDD_PROPPAGE_COMPARE, IDC_ALIGN_SIMILAR_LINES
-#: Merge.rc:2346
+#: Merge.rc:2356
msgid "Align &similar lines"
msgstr ""
#. IDD_PROPPAGE_COMPARE, IDC_STATIC
-#: Merge.rc:2347
+#: Merge.rc:2357
msgid "Diff &algorithm:"
msgstr ""
#. IDD_PROPPAGE_COMPARE, IDC_INDENT_HEURISTIC
-#: Merge.rc:2349
+#: Merge.rc:2359
msgid "Enable indent &heuristic"
msgstr ""
#. IDD_PROPPAGE_COMPARE, IDC_COMPLETELY_BLANK_OUT_IGNORED_DIFFERENCES
-#: Merge.rc:2350
+#: Merge.rc:2360
msgid "Completely unhighlight the ignored differences"
msgstr ""
#. IDS_OPTIONSPG_EDITOR
-#: Merge.rc:2357 Merge.rc:4201
+#: Merge.rc:2367 Merge.rc:4211
#, c-format
msgid "Editor"
msgstr "Επεξεργασία Κειμένου"
#. IDD_PROPPAGE_EDITOR, IDC_HILITE_CHECK
-#: Merge.rc:2360
+#: Merge.rc:2370
#, c-format
msgid "&Highlight syntax"
msgstr "&Χρωματισμός Κώδικα"
#. IDD_PROPPAGE_EDITOR, IDC_MIXED_EOL
-#: Merge.rc:2361
+#: Merge.rc:2371
#, c-format
msgid "&Preserve original EOL"
msgstr "Δια&τήρηση αρχικών χαρακτήρων τερματισμού"
#. IDD_PROPPAGE_EDITOR, IDC_STATIC
-#: Merge.rc:2362
+#: Merge.rc:2372
#, c-format
msgid "Tabs"
msgstr "Στηλοθέτες"
#. IDD_PROPPAGE_EDITOR, IDC_STATIC
-#: Merge.rc:2363
+#: Merge.rc:2373
#, c-format
msgid "&Tab size:"
msgstr "Πλάτος Στηλο&θετών"
#. IDD_PROPPAGE_EDITOR, IDC_PROP_INSERT_TABS
-#: Merge.rc:2365
+#: Merge.rc:2375
#, c-format
msgid "&Insert tabs"
msgstr "Ε&ισαγωγή Στηλοθετών"
#. IDD_PROPPAGE_EDITOR, IDC_PROP_INSERT_SPACES
-#: Merge.rc:2366
+#: Merge.rc:2376
#, c-format
msgid "Insert &spaces"
msgstr "Εισαγωγή Κενών &Διαστημάτων"
#. IDD_PROPPAGE_EDITOR, IDC_STATIC
-#: Merge.rc:2367
+#: Merge.rc:2377
msgid "&Rendering mode:"
msgstr ""
#. IDD_PROPPAGE_EDITOR_COMPAREMERGE, IDC_AUTOMRESCAN_CHECK
-#: Merge.rc:2376
+#: Merge.rc:2386
#, c-format
msgid "&Automatic rescan"
msgstr "Α&υτόματη Επανεξέταση"
#. IDD_PROPPAGE_EDITOR_COMPAREMERGE, IDC_STATIC
-#: Merge.rc:2377
+#: Merge.rc:2387
msgid "Copy &granularity for selected differences:"
msgstr ""
#. IDD_PROPPAGE_EDITOR_COMPAREMERGE, IDC_LINE_COLORING_GROUP
-#: Merge.rc:2379
+#: Merge.rc:2389
#, c-format
msgid "Line Difference Coloring"
msgstr "Χρωματισμός Διαφορών Γραμμών"
#. IDD_PROPPAGE_EDITOR_COMPAREMERGE, IDC_VIEW_LINE_DIFFERENCES
-#: Merge.rc:2380
+#: Merge.rc:2390
#, c-format
msgid "View line differences"
msgstr "Εμφάνιση διαφορών γραμμών"
#. IDD_PROPPAGE_EDITOR_COMPAREMERGE, IDC_EDITOR_CHARLEVEL
-#: Merge.rc:2381
+#: Merge.rc:2391
#, c-format
msgid "&Character-level"
msgstr "Επίπεδο &Χαρακτήρων"
#. IDD_PROPPAGE_EDITOR_COMPAREMERGE, IDC_EDITOR_WORDLEVEL
-#: Merge.rc:2382
+#: Merge.rc:2392
#, c-format
msgid "&Word-level:"
msgstr "Επίπεδο &Λέξεων"
#. IDD_PROPPAGE_EDITOR_COMPAREMERGE, IDC_STATIC
-#: Merge.rc:2384
+#: Merge.rc:2394
#, c-format
msgid "W&ord break characters:"
msgstr ""
#. IDD_PROPPAGE_MESSAGEBOXES, IDC_STATIC
-#: Merge.rc:2401
+#: Merge.rc:2411
msgid "Some messages can be hidden by the user. Press Reset to make all messages visible again."
msgstr "Το WinMerge επιτρέπει την απόκρυψη ορισμένων κοινών πλαισίων μηνυμάτων. Πατήστε το κουμπί Επαναφορά για να ξανακάνετε όλα τα μηνύματα ορατά."
#. IDD_SELECT_FILES_OR_FOLDERS, IDC_RESET
-#: Merge.rc:2402 Merge.rc:3085
+#: Merge.rc:2412 Merge.rc:3095
#, c-format
msgid "Reset"
msgstr "Επαναφορά"
#. IDD_GENERATE_PATCH
-#: Merge.rc:2408
+#: Merge.rc:2418
#, c-format
msgid "Patch Generator"
msgstr "Εφαρμογή Δημιουργίας Patch"
#. IDD_GENERATE_PATCH, IDC_STATIC
-#: Merge.rc:2411
+#: Merge.rc:2421
#, c-format
msgid "File&1:"
msgstr "Αρχείο&1:"
#. IDD_GENERATE_PATCH, IDC_STATIC
-#: Merge.rc:2414
+#: Merge.rc:2424
#, c-format
msgid "File&2:"
msgstr "Αρχείο&2:"
#. IDD_GENERATE_PATCH, IDC_DIFF_SWAPFILES
-#: Merge.rc:2417
+#: Merge.rc:2427
#, c-format
msgid "&Swap"
msgstr "Αντιμετά&θεση"
#. IDD_DIRCMP_REPORT, IDC_REPORT_COPYCLIPBOARD
-#: Merge.rc:2418 Merge.rc:2690
+#: Merge.rc:2428 Merge.rc:2700
#, c-format
msgid "&Copy to clipboard"
msgstr "Αντι&γραφή στο Πρόχειρο"
#. IDD_GENERATE_PATCH, IDC_DIFF_APPENDFILE
-#: Merge.rc:2419
+#: Merge.rc:2429
#, c-format
msgid "&Append to existing file"
msgstr "Προσάρτηση σε υπάρχον αρχείο"
#. IDD_GENERATE_PATCH, IDC_STATIC
-#: Merge.rc:2420
+#: Merge.rc:2430
#, c-format
msgid "&Result:"
msgstr "&Αποτέλεσμα:"
#. IDD_GENERATE_PATCH, IDC_DIFF_BROWSE_RESULT
-#: Merge.rc:2422
+#: Merge.rc:2432
#, c-format
msgid "Bro&wse..."
msgstr "Ανα&ζήτηση..."
#. IDD_GENERATE_PATCH, IDC_STATIC
-#: Merge.rc:2423
+#: Merge.rc:2433
#, c-format
msgid "&Format"
msgstr "Μορ&φή"
#. IDD_GENERATE_PATCH, IDC_STATIC
-#: Merge.rc:2424
+#: Merge.rc:2434
#, c-format
msgid "St&yle:"
msgstr "Στ&υλ:"
#. IDD_GENERATE_PATCH, IDC_STATIC
-#: Merge.rc:2426
+#: Merge.rc:2436
#, c-format
msgid "&Context:"
msgstr "&Περιβ. Κείμ.:"
#. IDD_GENERATE_PATCH, IDC_DIFF_INCLCMDLINE
-#: Merge.rc:2428
+#: Merge.rc:2438
#, c-format
msgid "Inclu&de command line"
msgstr "Η γραμμή εντολής να συμπεριλαμβάνεται"
#. IDD_GENERATE_PATCH, IDC_DIFF_OPENTOEDITOR
-#: Merge.rc:2429
+#: Merge.rc:2439
#, c-format
msgid "Open in e&xternal editor"
msgstr "Άν&οιγμα με άλλη εφαρμογή επεξεργασίας"
#. IDD_DIRCOLS
-#: Merge.rc:2446
+#: Merge.rc:2456
#, c-format
msgid "Display Columns"
msgstr "Εμφάνιση Στηλών"
#. IDD_DIRCOLS, IDC_UP
-#: Merge.rc:2450
+#: Merge.rc:2460
#, c-format
msgid "Move &Up"
msgstr "Μετακίνηση προς τα &άνω"
#. IDD_DIRCOLS, IDC_DOWN
-#: Merge.rc:2451
+#: Merge.rc:2461
#, c-format
msgid "Move &Down"
msgstr "Μετακίνηση προς τα &κάτω"
#. IDD_DIRCOLS, IDC_COLDLG_ADDITIONAL_PROPERTIES
-#: Merge.rc:2453
+#: Merge.rc:2463
msgid "&Additional Properties"
msgstr ""
#. IDD_DIRADDITIONALPROPS
-#: Merge.rc:2461
+#: Merge.rc:2471
msgid "Additional Properties"
msgstr ""
#. IDD_PLUGINS_SELECTPLUGIN
-#: Merge.rc:2475
+#: Merge.rc:2485
msgid "Select Plugin"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN, IDC_STATIC
-#: Merge.rc:2478 Merge.rc:3115
+#: Merge.rc:2488 Merge.rc:3125
msgid "Plugin &name:"
msgstr ""
#. IDD_PLUGINS_SELECTPLUGIN, IDC_STATIC
-#: Merge.rc:2480
+#: Merge.rc:2490
msgid "&Target files:"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN, IDC_STATIC
-#: Merge.rc:2482 Merge.rc:3117
+#: Merge.rc:2492 Merge.rc:3127
#, c-format
msgid "Extensions list:"
msgstr "Κατάλογος Επεκτάσεων:"
#. IDD_PLUGINS_EDITPLUGIN, IDC_STATIC
-#: Merge.rc:2484 Merge.rc:3119
+#: Merge.rc:2494 Merge.rc:3129
#, c-format
msgid "Description:"
msgstr "Περιγραφή:"
#. IDD_PLUGINS_EDITPLUGIN, IDC_STATIC
-#: Merge.rc:2486 Merge.rc:3121
+#: Merge.rc:2496 Merge.rc:3131
msgid "Default arguments:"
msgstr ""
#. IDD_PLUGINS_SELECTPLUGIN, IDC_PLUGIN_ALLOW_ALL
-#: Merge.rc:2488
+#: Merge.rc:2498
msgid "Display all plugins (Ignore extension)"
msgstr ""
#. IDD_PLUGINS_SELECTPLUGIN, IDC_PLUGIN_OPEN_IN_SAME_FRAME_TYPE
-#: Merge.rc:2490
+#: Merge.rc:2500
msgid "&Open files in same window type after unpacking"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_PIPELINE_STATIC
-#: Merge.rc:2492 Merge.rc:3129
+#: Merge.rc:2502 Merge.rc:3139
msgid "&Plugin pipeline:"
msgstr ""
#. IDD_PLUGINS_SELECTPLUGIN, IDC_PLUGIN_ALIAS
-#: Merge.rc:2495
+#: Merge.rc:2505
msgid "&Alias..."
msgstr ""
#. IDD_DIRCOMP_PROGRESS, IDC_COMPARISON_STOP
-#: Merge.rc:2505
+#: Merge.rc:2515
#, c-format
msgid "Stop"
msgstr "Τερματισμός"
#. IDD_DIRCOMP_PROGRESS, IDC_COMPARISON_PAUSE
-#: Merge.rc:2506
+#: Merge.rc:2516
#, c-format
msgid "Pause"
msgstr ""
#. IDD_DIRCOMP_PROGRESS, IDC_COMPARISON_CONTINUE
-#: Merge.rc:2507
+#: Merge.rc:2517
#, c-format
msgid "Continue"
msgstr ""
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC
-#: Merge.rc:2509 Merge.rc:2973
+#: Merge.rc:2519 Merge.rc:2983
msgid "C&PU cores to use:"
msgstr ""
#. IDD_DIRCOMP_PROGRESS, IDC_STATIC
-#: Merge.rc:2510
+#: Merge.rc:2520
#, c-format
msgid "Items total:"
msgstr "Σύνολο αντικειμένων:"
#. IDD_DIRCOMP_PROGRESS, IDC_STATIC
-#: Merge.rc:2511
+#: Merge.rc:2521
#, c-format
msgid "Items compared:"
msgstr "Συγκριθέντα αντικείμενα:"
#. IDS_PREVIEWBAR_CLOSE
-#: Merge.rc:2526 Merge.rc:2846 Merge.rc:5328
+#: Merge.rc:2536 Merge.rc:2856 Merge.rc:5339
#, c-format
msgid "&Close"
msgstr "Κ&λείσιμο"
#. IDD_WMGOTO
-#: Merge.rc:2537
+#: Merge.rc:2547
msgid "Go to"
msgstr "Μετάβαση"
#. IDD_WMGOTO, IDC_STATIC
-#: Merge.rc:2540
+#: Merge.rc:2550
msgid "G&o to:"
msgstr "&Μετάβαση:"
#. IDD_WMGOTO, IDC_STATIC
-#: Merge.rc:2543
+#: Merge.rc:2553
#, c-format
msgid "File"
msgstr "Αρχείο"
#. IDD_WMGOTO, IDC_STATIC
-#: Merge.rc:2547
+#: Merge.rc:2557
msgid "Go to what"
msgstr "Μετάβαση σε"
#. IDD_WMGOTO, IDC_WMGOTO_TOLINE
-#: Merge.rc:2548
+#: Merge.rc:2558
#, c-format
msgid "Li&ne"
msgstr "&Γραμμή"
#. IDD_WMGOTO, IDC_WMGOTO_TODIFF
-#: Merge.rc:2549
+#: Merge.rc:2559
#, c-format
msgid "&Difference"
msgstr "&Διαφορά"
#. IDD_WMGOTO, IDOK
-#: Merge.rc:2550
+#: Merge.rc:2560
msgid "&Go to"
msgstr "Μετά&βαση"
#. IDS_PROJECT_ITEM_FILE_FILTER
-#: Merge.rc:2556 Merge.rc:4321
+#: Merge.rc:2566 Merge.rc:4331
msgid "File Filters"
msgstr ""
#. IDD_FILTERS_FILEFILTERS, IDC_STATIC
-#: Merge.rc:2559
+#: Merge.rc:2569
msgid "&Mask / Filter Expression"
msgstr ""
#. IDD_FILTERS_FILEFILTERS, IDC_STATIC
-#: Merge.rc:2562
+#: Merge.rc:2572
msgid "Preset &Filters"
msgstr ""
#. IDD_FILTERS_FILEFILTERS, IDC_FILTERFILE_TEST_BTN
-#: Merge.rc:2564
+#: Merge.rc:2574
msgid "Test..."
msgstr "Δοκιμή..."
#. IDD_FILTERS_FILEFILTERS, IDC_FILTERFILE_INSTALL
-#: Merge.rc:2565
+#: Merge.rc:2575
#, c-format
msgid "Install..."
msgstr "Εγκατάσταση..."
#. IDD_FILTERS_FILEFILTERS, IDC_FILTERFILE_NEWBTN
-#: Merge.rc:2566
+#: Merge.rc:2576
#, c-format
msgid "New..."
msgstr "Δημιουργία..."
#. IDD_FILTERS_FILEFILTERS, IDC_FILTERFILE_EDITBTN
-#: Merge.rc:2567
+#: Merge.rc:2577
#, c-format
msgid "Edit..."
msgstr "Επεξεργασία..."
#. IDD_FILTERS_FILEFILTERS, IDC_FILTERFILE_DELETEBTN
-#: Merge.rc:2568
+#: Merge.rc:2578
#, c-format
msgid "Delete..."
msgstr "Διαγραφή..."
#. IDD_FILTERS_CONDITION
-#: Merge.rc:2573
+#: Merge.rc:2583
msgid "Filter Condition"
msgstr ""
#. IDD_FILTERS_CONDITION, IDC_STATIC
-#: Merge.rc:2576
+#: Merge.rc:2586
msgid "&Left-hand side:"
msgstr ""
#. IDD_FILTERS_CONDITION, IDC_STATIC
-#: Merge.rc:2578
+#: Merge.rc:2588
msgid "&Operator:"
msgstr ""
#. IDD_FILTERS_CONDITION, IDC_STATIC
-#: Merge.rc:2580
+#: Merge.rc:2590
msgid "&Right-hand side:"
msgstr ""
#. IDD_FILTERS_CONDITION, IDC_STATIC
-#: Merge.rc:2586
+#: Merge.rc:2596
msgid "Expression:"
msgstr ""
#. IDD_COMPARISON_RESULT_FILTER
-#: Merge.rc:2595
+#: Merge.rc:2605
msgid "Filter by Comparison Result"
msgstr ""
#. IDD_COMPARISON_RESULT_FILTER, IDC_RADIO_INCLUDE
-#: Merge.rc:2598
+#: Merge.rc:2608
msgid "&Include"
msgstr ""
#. IDD_COMPARISON_RESULT_FILTER, IDC_RADIO_EXCLUDE
-#: Merge.rc:2599
+#: Merge.rc:2609
msgid "&Exclude"
msgstr ""
#. IDD_COMPARISON_RESULT_FILTER, IDC_STATIC
-#: Merge.rc:2600
+#: Merge.rc:2610
msgid "Comparison Results"
msgstr ""
#. IDS_IDENTICAL
-#: Merge.rc:2601 Merge.rc:2733 Merge.rc:2794 Merge.rc:4698
+#: Merge.rc:2611 Merge.rc:2743 Merge.rc:2804 Merge.rc:4708
#, c-format
msgid "Identical"
msgstr "Πανομοιότυπα"
#. IDS_DIFFERENT
-#: Merge.rc:2602 Merge.rc:2714 Merge.rc:2755 Merge.rc:4708
+#: Merge.rc:2612 Merge.rc:2724 Merge.rc:2765 Merge.rc:4718
#, c-format
msgid "Different"
msgstr "Διαφορετικά"
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_LEFT_ONLY
-#: Merge.rc:2603
+#: Merge.rc:2613
msgid "Left only"
msgstr ""
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_RIGHT_ONLY
-#: Merge.rc:2604
+#: Merge.rc:2614
msgid "Right only"
msgstr ""
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_SKIPPED
-#: Merge.rc:2605
+#: Merge.rc:2615
msgid "Skipped"
msgstr ""
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_MIDDLE_ONLY
-#: Merge.rc:2606
+#: Merge.rc:2616
msgid "Middle only"
msgstr ""
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_LEFT_ONLY_DIFFERENT
-#: Merge.rc:2607
+#: Merge.rc:2617
msgid "Left only (different)"
msgstr ""
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_MIDDLE_ONLY_DIFFERENT
-#: Merge.rc:2608
+#: Merge.rc:2618
msgid "Middle only (different)"
msgstr ""
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_RIGHT_ONLY_DIFFERENT
-#: Merge.rc:2609
+#: Merge.rc:2619
msgid "Right only (different)"
msgstr ""
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_LEFT_ONLY_MISSING
-#: Merge.rc:2610
+#: Merge.rc:2620
msgid "Left only (missing)"
msgstr ""
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_MIDDLE_ONLY_MISSING
-#: Merge.rc:2611
+#: Merge.rc:2621
msgid "Middle only (missing)"
msgstr ""
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_RIGHT_ONLY_MISSING
-#: Merge.rc:2612
+#: Merge.rc:2622
msgid "Right only (missing)"
msgstr ""
#. IDS_OPTIONSPG_CODEPAGE
-#: Merge.rc:2619 Merge.rc:2811 Merge.rc:4213
+#: Merge.rc:2629 Merge.rc:2821 Merge.rc:4223
#, c-format
msgid "Codepage"
msgstr "Κωδικοσελίδα"
#. IDD_PROPPAGE_CODEPAGE, IDC_STATIC
-#: Merge.rc:2622
+#: Merge.rc:2632
#, c-format
msgid "Default Codepage"
msgstr "Προκαθορισμένη Κωδικοσελίδα"
#. IDD_PROPPAGE_CODEPAGE, IDC_STATIC
-#: Merge.rc:2623
+#: Merge.rc:2633
#, c-format
msgid "Select the default codepage for non-Unicode files:"
msgstr "Επιλέξατε την προκαθορισμένη κωδικοσελίδα νοουμένη κατά το άνοιγμα αρχείων χωρίς κωδικοποίηση Unicode"
#. IDD_PROPPAGE_CODEPAGE, IDC_CP_SYSTEM
-#: Merge.rc:2624
+#: Merge.rc:2634
#, c-format
msgid "System codepage"
msgstr "Κωδικοσελίδα συστήματος"
#. IDD_PROPPAGE_CODEPAGE, IDC_CP_UI
-#: Merge.rc:2625
+#: Merge.rc:2635
#, c-format
msgid "According to WinMerge User Interface"
msgstr "Σύμφωνα με το Περιβάλλον Εργασίας του WinMerge"
#. IDD_PROPPAGE_CODEPAGE, IDC_CP_CUSTOM
-#: Merge.rc:2626
+#: Merge.rc:2636
#, c-format
msgid "Custom codepage:"
msgstr ""
#. IDD_PROPPAGE_CODEPAGE, IDC_DETECT_CODEPAGE
-#: Merge.rc:2628
+#: Merge.rc:2638
msgid "Detect codepage for: .html, .rc, .xml\nRestart required."
msgstr ""
#. IDD_PROPPAGE_CODEPAGE, IDC_DETECT_CODEPAGE2
-#: Merge.rc:2630
+#: Merge.rc:2640
msgid "Detect codepage for files with mlang.dll\nRestart required."
msgstr ""
#. IDS_OPTIONSPG_ARCHIVE
-#: Merge.rc:2638 Merge.rc:4214
+#: Merge.rc:2648 Merge.rc:4224
#, c-format
msgid "Archive Support"
msgstr "Υποστήριξη Συμπιεσμένων"
#. IDD_PROPPAGE_ARCHIVE, IDC_ARCHIVE_ENABLE
-#: Merge.rc:2641
+#: Merge.rc:2651
#, c-format
msgid "&Enable archive file support"
msgstr "&Ενεργοποίηση υποστηρίξεως συμπιεσμένων αρχείων"
#. IDD_PROPPAGE_ARCHIVE, IDC_ARCHIVE_DETECTTYPE
-#: Merge.rc:2642
+#: Merge.rc:2652
#, c-format
msgid "&Detect archive type from file signature"
msgstr "Ανί&χνευση τύπου συμπιεσμένου αρχείου από την υπογραφή του"
#. IDD_PROPPAGE_PROJECT, IDC_STATIC
-#: Merge.rc:2651
+#: Merge.rc:2661
msgid "Items saved to or restored from the project file:"
msgstr ""
#. IDD_SAVECLOSING
-#: Merge.rc:2658
+#: Merge.rc:2668
#, c-format
msgid "Save Modified Files?"
msgstr "Αποθήκευση τροποποιημένων αρχείων;"
#. IDD_SAVECLOSING, IDC_SAVECLOSING_LEFTFRAME
-#: Merge.rc:2661
+#: Merge.rc:2671
#, c-format
msgid "Left side file"
msgstr "Αρχείο αριστερής πλευράς"
#. IDD_SAVECLOSING, IDC_SAVECLOSING_SAVELEFT
-#: Merge.rc:2663
+#: Merge.rc:2673
#, c-format
msgid "&Save changes"
msgstr "Απο&θήκευση αλλαγών"
#. IDD_SAVECLOSING, IDC_SAVECLOSING_DISCARDLEFT
-#: Merge.rc:2664
+#: Merge.rc:2674
#, c-format
msgid "&Discard changes"
msgstr "Από&ρριψη αλλαγών"
#. IDD_SAVECLOSING, IDC_SAVECLOSING_MIDDLEFRAME
-#: Merge.rc:2665
+#: Merge.rc:2675
#, c-format
msgid "Middle side file"
msgstr ""
#. IDD_SAVECLOSING, IDC_SAVECLOSING_SAVEMIDDLE
-#: Merge.rc:2667
+#: Merge.rc:2677
#, c-format
msgid "Sa&ve changes"
msgstr ""
#. IDD_SAVECLOSING, IDC_SAVECLOSING_DISCARDMIDDLE
-#: Merge.rc:2668
+#: Merge.rc:2678
#, c-format
msgid "Discard c&hanges"
msgstr ""
#. IDD_SAVECLOSING, IDC_SAVECLOSING_RIGHTFRAME
-#: Merge.rc:2669
+#: Merge.rc:2679
#, c-format
msgid "Right side file"
msgstr "Αρχείο δεξιάς πλευράς"
#. IDD_SAVECLOSING, IDC_SAVECLOSING_SAVERIGHT
-#: Merge.rc:2671
+#: Merge.rc:2681
#, c-format
msgid "S&ave changes"
msgstr "Απο&θήκευση αλλαγών"
#. IDD_SAVECLOSING, IDC_SAVECLOSING_DISCARDRIGHT
-#: Merge.rc:2672
+#: Merge.rc:2682
#, c-format
msgid "Dis&card changes"
msgstr "Από&ρριψη αλλαγών"
#. IDD_SAVECLOSING, IDC_SAVECLOSING_DISCARDALL
-#: Merge.rc:2673
+#: Merge.rc:2683
#, c-format
msgid "Disca&rd All"
msgstr ""
#. IDD_DIRCMP_REPORT
-#: Merge.rc:2680
+#: Merge.rc:2690
#, c-format
msgid "Folder Compare Report"
msgstr "Αναφορά Συγκρίσεως Φακέλων"
#. IDD_DIRCMP_REPORT, IDC_STATIC
-#: Merge.rc:2683
+#: Merge.rc:2693
#, c-format
msgid "Report &file:"
msgstr "Αρχείο Ανα&φοράς"
#. IDD_DIRCMP_REPORT, IDC_STATIC
-#: Merge.rc:2686
+#: Merge.rc:2696
#, c-format
msgid "&Style:"
msgstr "&Στυλ:"
#. IDD_DIRCMP_REPORT, IDC_REPORT_INCLUDEFILECMPREPORT
-#: Merge.rc:2688
+#: Merge.rc:2698
#, c-format
msgid "&Include file compare report"
msgstr ""
#. IDD_FILTERS_FILEFILTERS_SHARED
-#: Merge.rc:2697
+#: Merge.rc:2707
#, c-format
msgid "Shared or Private Filter"
msgstr "Κοινό ή Ιδιωτικό Φίλτρο"
#. IDD_FILTERS_FILEFILTERS_SHARED, IDC_STATIC
-#: Merge.rc:2700
+#: Merge.rc:2710
#, c-format
msgid "What type of filter do you want?"
msgstr "Τι τύπο φίλτρου επιθυμείτε να δημιουργήσετε;"
#. IDD_FILTERS_FILEFILTERS_SHARED, IDC_SHARED
-#: Merge.rc:2701
+#: Merge.rc:2711
#, c-format
msgid "Shared Filter (for all users)"
msgstr "Κοινό Φίλτρο (για όλους τους χρήστες αυτού του συστήματος)"
#. IDD_FILTERS_FILEFILTERS_SHARED, IDC_PRIVATE
-#: Merge.rc:2702
+#: Merge.rc:2712
#, c-format
msgid "Private Filter (current user only)"
msgstr "Ιδιωτικό Φίλτρο (μόνο για τον παρόντα χρήστη)"
#. IDD_COMPARE_STATISTICS3
-#: Merge.rc:2709 Merge.rc:2750
+#: Merge.rc:2719 Merge.rc:2760
#, c-format
msgid "Compare Statistics"
msgstr "Στατιστικά Συγκρίσεων"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2712 Merge.rc:2753
+#: Merge.rc:2722 Merge.rc:2763
#, c-format
msgid "Folders:"
msgstr "Φάκελοι:"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2713 Merge.rc:2754
+#: Merge.rc:2723 Merge.rc:2764
#, c-format
msgid "Files:"
msgstr "Αρχεία:"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2719 Merge.rc:2738 Merge.rc:2760 Merge.rc:2799
+#: Merge.rc:2729 Merge.rc:2748 Merge.rc:2770 Merge.rc:2809
#, c-format
msgid "Binary:"
msgstr "Δυαδικά:"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2722 Merge.rc:2763
+#: Merge.rc:2732 Merge.rc:2773
#, c-format
msgid "Unique"
msgstr "Ορφανά"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2723 Merge.rc:2764
+#: Merge.rc:2733 Merge.rc:2774
#, c-format
msgid "Left:"
msgstr "Αριστερά:"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2728 Merge.rc:2774
+#: Merge.rc:2738 Merge.rc:2784
#, c-format
msgid "Right:"
msgstr "Δεξιά:"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2742 Merge.rc:2803
+#: Merge.rc:2752 Merge.rc:2813
#, c-format
msgid "Total:"
msgstr "Σύνολο:"
#. IDD_COMPARE_STATISTICS3, IDOK
-#: Merge.rc:2745 Merge.rc:2806
+#: Merge.rc:2755 Merge.rc:2816
#, c-format
msgid "Close"
msgstr "Κλείσιμο"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2769
+#: Merge.rc:2779
#, c-format
msgid "Middle:"
msgstr ""
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2779
+#: Merge.rc:2789
#, c-format
msgid "Missing Left:"
msgstr ""
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2784
+#: Merge.rc:2794
#, c-format
msgid "Missing Middle:"
msgstr ""
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2789
+#: Merge.rc:2799
#, c-format
msgid "Missing Right:"
msgstr ""
#. IDD_LOAD_SAVE_CODEPAGE, IDC_AFFECTS_GROUP
-#: Merge.rc:2814
+#: Merge.rc:2824
#, c-format
msgid "Affects"
msgstr "Επηρεάζει"
#. IDD_LOAD_SAVE_CODEPAGE, IDC_RIGHT_FILES_LABEL
-#: Merge.rc:2816 Merge.rc:2818 Merge.rc:2820
+#: Merge.rc:2826 Merge.rc:2828 Merge.rc:2830
#, c-format
msgid "(Affects)"
msgstr "(Επηρεάζει)"
#. IDD_LOAD_SAVE_CODEPAGE, IDC_LOADING_GROUP
-#: Merge.rc:2821
+#: Merge.rc:2831
#, c-format
msgid "Select Codepage for"
msgstr "Επιλογή Κωδικοσελίδας για"
#. IDD_LOAD_SAVE_CODEPAGE, IDC_LOAD_FILES_LABEL
-#: Merge.rc:2822
+#: Merge.rc:2832
#, c-format
msgid "&File Loading:"
msgstr "Ανά&γνωση Αρχείου:"
#. IDD_LOAD_SAVE_CODEPAGE, IDC_SAVE_FILES_LABEL
-#: Merge.rc:2824
+#: Merge.rc:2834
#, c-format
msgid "File &Saving:"
msgstr "Απο&θήκ. Αρχείου:"
#. IDD_LOAD_SAVE_CODEPAGE, IDC_LOAD_SAVE_SAME_CODEPAGE
-#: Merge.rc:2827
+#: Merge.rc:2837
#, c-format
msgid "&Use same codepage for both"
msgstr "Χρήση ιδίας κωδικοσελίδας για αμφότερα"
#. IDS_MESSAGEBOX_CANCEL
-#: Merge.rc:2830 Merge.rc:4172
+#: Merge.rc:2840 Merge.rc:4182
#, c-format
msgid "&Cancel"
msgstr "Ά&κυρο"
#. IDD_FILTERS_FILEFILTERS_TEST
-#: Merge.rc:2835
+#: Merge.rc:2845
#, c-format
msgid "Test Filter"
msgstr "Δοκιμή Φίλτρου"
#. IDD_FILTERS_FILEFILTERS_TEST, IDC_HEADER
-#: Merge.rc:2838
+#: Merge.rc:2848
msgid "Testing filter:"
msgstr "Δοκιμή Φίλτρου:"
#. IDD_FILTERS_FILEFILTERS_TEST, IDC_PROMPT_LABEL
-#: Merge.rc:2840
+#: Merge.rc:2850
#, c-format
msgid "&Enter text to test:"
msgstr "&Εισαγωγή κειμένου για δοκιμή:"
#. IDD_FILTERS_FILEFILTERS_TEST, IDC_IS_DIRECTORY
-#: Merge.rc:2842
+#: Merge.rc:2852
#, c-format
msgid "&Folder Name"
msgstr "Όνομα &Φακέλου"
#. IDD_FILTERS_FILEFILTERS_TEST, IDC_STATIC
-#: Merge.rc:2843
+#: Merge.rc:2853
#, c-format
msgid "Result:"
msgstr "Αποτέλεσμα:"
#. IDD_FILTERS_FILEFILTERS_TEST, IDC_TEST_BTN
-#: Merge.rc:2845
+#: Merge.rc:2855
#, c-format
msgid "&Test"
msgstr "&Δοκιμή"
#. IDS_OPTIONSPG_TABLECOMPARE
-#: Merge.rc:2851 Merge.rc:2990 Merge.rc:4228
+#: Merge.rc:2861 Merge.rc:3000 Merge.rc:4238
msgid "Table"
msgstr ""
#. IDD_OPEN_TABLE, IDC_STATIC
-#: Merge.rc:2854
+#: Merge.rc:2864
msgid "File type"
msgstr ""
#. IDD_OPEN_TABLE, IDC_COMPARETABLE_CSV
-#: Merge.rc:2855
+#: Merge.rc:2865
msgid "&CSV"
msgstr ""
#. IDD_OPEN_TABLE, IDC_COMPARETABLE_TSV
-#: Merge.rc:2856
+#: Merge.rc:2866
msgid "&TSV"
msgstr ""
#. IDD_OPEN_TABLE, IDC_COMPARETABLE_DSV
-#: Merge.rc:2857
+#: Merge.rc:2867
msgid "Custom &Delimiter-Separated Values"
msgstr ""
#. IDD_PROPPAGE_COMPARE_TABLE, IDC_STATIC
-#: Merge.rc:2859 Merge.rc:2861 Merge.rc:2996 Merge.rc:3004
+#: Merge.rc:2869 Merge.rc:2871 Merge.rc:3006 Merge.rc:3014
msgid "D&elimiter character:"
msgstr ""
#. IDD_PROPPAGE_COMPARE_TABLE, IDC_COMPARETABLE_ALLOWNEWLINE
-#: Merge.rc:2863 Merge.rc:3006
+#: Merge.rc:2873 Merge.rc:3016
msgid "&Allow newlines in quotes"
msgstr ""
#. IDD_PROPPAGE_COMPARE_TABLE, IDC_STATIC
-#: Merge.rc:2865 Merge.rc:3008
+#: Merge.rc:2875 Merge.rc:3018
msgid "&Quote character:"
msgstr ""
#. IDS_OPTIONSPG_BACKUPS
-#: Merge.rc:2873 Merge.rc:4216
+#: Merge.rc:2883 Merge.rc:4226
#, c-format
msgid "Backup Files"
msgstr "Εφεδρικά Αρχεία"
#. IDD_PROPPAGE_BACKUPS, IDC_STATIC
-#: Merge.rc:2876
+#: Merge.rc:2886
#, c-format
msgid "Create backup files for:"
msgstr "Δημιουργία εφεδρικών αρχείων ενώ γίνεται:"
#. IDD_PROPPAGE_BACKUPS, IDC_BACKUP_FOLDERCMP
-#: Merge.rc:2877
+#: Merge.rc:2887
#, c-format
msgid "&Folder compare"
msgstr "Σύγκριση &Φακέλων"
#. IDD_PROPPAGE_BACKUPS, IDC_BACKUP_FILECMP
-#: Merge.rc:2878
+#: Merge.rc:2888
#, c-format
msgid "Fil&e compare"
msgstr "Σύγκριση &Αρχείων"
#. IDD_PROPPAGE_BACKUPS, IDC_STATIC
-#: Merge.rc:2879
+#: Merge.rc:2889
#, c-format
msgid "Create backup files in:"
msgstr "Δημιουργία εφεδρικών αρχείων εντός:"
#. IDD_PROPPAGE_BACKUPS, IDC_BACKUP_ORIGFOLD
-#: Merge.rc:2880
+#: Merge.rc:2890
#, c-format
msgid "&Original file's folder"
msgstr "Αρ&χικού φακέλου αρχείου"
#. IDD_PROPPAGE_BACKUPS, IDC_BACKUP_GLOBALFOLD
-#: Merge.rc:2881
+#: Merge.rc:2891
#, c-format
msgid "&Global backup folder:"
msgstr "&Καθολικού φακέλου εφεδρειών:"
#. IDD_PROPPAGE_BACKUPS, IDC_STATIC
-#: Merge.rc:2884
+#: Merge.rc:2894
#, c-format
msgid "Backup filename:"
msgstr "Όνομα εφεδρικού αρχείου:"
#. IDD_PROPPAGE_BACKUPS, IDC_BACKUP_APPEND_BAK
-#: Merge.rc:2885
+#: Merge.rc:2895
msgid "&Append .bak extension"
msgstr "Προσ&θήκη επεκτάσεως .bak"
#. IDD_PROPPAGE_BACKUPS, IDC_BACKUP_APPEND_TIME
-#: Merge.rc:2886
+#: Merge.rc:2896
#, c-format
msgid "A&ppend timestamp"
msgstr "Προσθήκη &ημερομηνίας κ΄ ώρας"
#. IDS_CONFIRM_COPY_CAPTION
-#: Merge.rc:2892 Merge.rc:4565
+#: Merge.rc:2902 Merge.rc:4575
#, c-format
msgid "Confirm Copy"
msgstr "Επιβεβαίωση Αντιγραφής"
#. IDD_CONFIRM_COPY, IDC_FLDCONFIRM_QUERY
-#: Merge.rc:2896
+#: Merge.rc:2906
#, c-format
msgid "Are you sure you want to copy XXX items?"
msgstr "Είσθε βέβαιοι ότι επιθυμείτε να αντιγράψετε XXX αντικείμενα;"
#. IDD_CONFIRM_COPY, IDC_FLDCONFIRM_FROM_TEXT
-#: Merge.rc:2897
+#: Merge.rc:2907
#, c-format
msgid "From left"
msgstr "Εξ αριστερών"
#. IDD_CONFIRM_COPY, IDC_FLDCONFIRM_TO_TEXT
-#: Merge.rc:2899
+#: Merge.rc:2909
#, c-format
msgid "To right"
msgstr "Προς τα δεξιά"
#. IDS_MESSAGEBOX_DONT_ASK_AGAIN
-#: Merge.rc:2901 Merge.rc:4191
+#: Merge.rc:2911 Merge.rc:4201
#, c-format
msgid "Don't ask this &question again."
msgstr "Να μην ξαναγίνει αυτή η &ερώτηση."
#. IDD_CONFIRM_COPY, IDYES
-#: Merge.rc:2903
+#: Merge.rc:2913
#, c-format
msgid "Yes"
msgstr "Ναι"
#. IDD_CONFIRM_COPY, IDNO
-#: Merge.rc:2904
+#: Merge.rc:2914
#, c-format
msgid "No"
msgstr "Όχι"
#. IDS_PROJECT_ITEM_PLUGIN
-#: Merge.rc:2909 Merge.rc:4323
+#: Merge.rc:2919 Merge.rc:4333
#, c-format
msgid "Plugins"
msgstr "Αρθρώματα"
#. IDD_PLUGINS_LIST, IDC_PLUGINS_ENABLE
-#: Merge.rc:2912
+#: Merge.rc:2922
#, c-format
msgid "&Enable plugins"
msgstr "Ενεργοποίηση Αρθρωμάτων"
#. IDD_PLUGINS_EDITPLUGIN, IDC_STATIC
-#: Merge.rc:2913 Merge.rc:3113
+#: Merge.rc:2923 Merge.rc:3123
msgid "Plugin &type:"
msgstr ""
#. IDD_PLUGINS_LIST, IDC_STATIC
-#: Merge.rc:2916
+#: Merge.rc:2926
msgid "File filters:"
msgstr ""
#. IDD_PLUGINS_LIST, IDC_STATIC
-#: Merge.rc:2918
+#: Merge.rc:2928
msgid "&Plugin arguments:"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_AUTOMATIC
-#: Merge.rc:2920 Merge.rc:3134
+#: Merge.rc:2930 Merge.rc:3144
msgid "Enable &automatic unpacking/prediffing"
msgstr ""
#. IDS_OPTIONSPG_SHELL
-#: Merge.rc:2934 Merge.rc:4217
+#: Merge.rc:2944 Merge.rc:4227
#, c-format
msgid "Shell Integration"
msgstr ""
#. IDD_PROPPAGE_SHELL, IDC_STATIC
-#: Merge.rc:2937
+#: Merge.rc:2947
#, c-format
msgid "Explorer"
msgstr ""
#. IDD_PROPPAGE_SHELL, IDC_EXPLORER_CONTEXT
-#: Merge.rc:2938
+#: Merge.rc:2948
#, c-format
msgid "&Add to context menu"
msgstr ""
#. IDD_PROPPAGE_SHELL, IDC_EXPLORER_ADVANCED
-#: Merge.rc:2939
+#: Merge.rc:2949
#, c-format
msgid "E&nable advanced menu"
msgstr "Ενεργοποίηση εξειδικευμένων επιλογών"
#. IDD_PROPPAGE_SHELL, IDC_EXPLORER_COMPARE_AS
-#: Merge.rc:2940
+#: Merge.rc:2950
msgid "Enable &Compare As menu"
msgstr ""
#. IDD_PROPPAGE_SHELL, IDC_REGISTER_SHELLEXTENSION
-#: Merge.rc:2941
+#: Merge.rc:2951
#, c-format
msgid "&Register Shell Extension"
msgstr ""
#. IDD_PROPPAGE_SHELL, IDC_UNREGISTER_SHELLEXTENSION
-#: Merge.rc:2942
+#: Merge.rc:2952
#, c-format
msgid "&Unregister Shell Extension"
msgstr ""
#. IDD_PROPPAGE_SHELL, IDC_REGISTER_SHELLEXTENSION_PERUSER
-#: Merge.rc:2943
+#: Merge.rc:2953
msgid "Register Shell Extension for Current User &Only"
msgstr ""
#. IDD_PROPPAGE_SHELL, IDC_UNREGISTER_SHELLEXTENSION_PERUSER
-#: Merge.rc:2944
+#: Merge.rc:2954
msgid "Unregister Shell Extension for Current User On&ly"
msgstr ""
#. IDD_PROPPAGE_SHELL, IDC_REGISTER_WINMERGECONTEXTMENU
-#: Merge.rc:2945
+#: Merge.rc:2955
msgid "Register Shell Extension for &Windows 11"
msgstr ""
#. IDD_PROPPAGE_SHELL, IDC_UNREGISTER_WINMERGECONTEXTMENU
-#: Merge.rc:2946
+#: Merge.rc:2956
msgid "Unregister Shell Extension for W&indows 11"
msgstr ""
#. IDD_PROPPAGE_SHELL, IDC_STATIC
-#: Merge.rc:2947
+#: Merge.rc:2957
msgid "Jump List"
msgstr ""
#. IDD_PROPPAGE_SHELL, IDC_CLEAR_ALL_RECENT_ITEMS
-#: Merge.rc:2949
+#: Merge.rc:2959
msgid "Clear all recent items"
msgstr ""
#. IDS_OPTIONSPG_FOLDERCOMPARE
-#: Merge.rc:2954 Merge.rc:4225
+#: Merge.rc:2964 Merge.rc:4235
msgctxt "Options dialog|Categories"
msgid "Folder"
msgstr "Φάκελος"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC
-#: Merge.rc:2957
+#: Merge.rc:2967
msgid "&Compare method:"
msgstr ""
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_COMPARE_STOPFIRST
-#: Merge.rc:2959
+#: Merge.rc:2969
#, c-format
msgid "S&top after first difference"
msgstr "&Τερματισμός μετά την πρώτη διαφορά"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_IGNORE_SMALLTIMEDIFF
-#: Merge.rc:2961
+#: Merge.rc:2971
#, c-format
msgid "Ign&ore time differences less than 3 seconds"
msgstr "Διαφορές ώρας μικρότερες των &3 δευτερολέπτων να αγνοούνται"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC
-#: Merge.rc:2964
+#: Merge.rc:2974
msgid "Expand subfolders &after comparison:"
msgstr ""
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_COMPARE_WALKSUBDIRS
-#: Merge.rc:2966
+#: Merge.rc:2976
#, c-format
msgid "Include &unique subfolders contents"
msgstr ""
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_IGNORE_REPARSEPOINTS
-#: Merge.rc:2968
+#: Merge.rc:2978
#, c-format
msgid "Ignore &reparse points"
msgstr ""
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC
-#: Merge.rc:2969
+#: Merge.rc:2979
msgid "Switch to &quick compare when size exceeds (MB):"
msgstr ""
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC
-#: Merge.rc:2971
+#: Merge.rc:2981
msgid "Switch to &binary compare when size exceeds (MB):"
msgstr ""
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC
-#: Merge.rc:2975
+#: Merge.rc:2985
msgid "Additional comparison condi&tions:"
msgstr ""
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC
-#: Merge.rc:2978
+#: Merge.rc:2988
msgid "&Rename/move detection:"
msgstr ""
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC
-#: Merge.rc:2980
+#: Merge.rc:2990
msgid "Rename/move detection &keys:"
msgstr ""
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC
-#: Merge.rc:2983
+#: Merge.rc:2993
msgid "M&erge renames and moves:"
msgstr ""
#. IDD_PROPPAGE_COMPARE_TABLE, IDC_STATIC
-#: Merge.rc:2994 Merge.rc:2999 Merge.rc:3002
+#: Merge.rc:3004 Merge.rc:3009 Merge.rc:3012
msgid "File patterns:"
msgstr ""
#. IDD_PROPPAGE_COMPARE_TABLE, IDC_STATIC
-#: Merge.rc:3001
+#: Merge.rc:3011
msgid "Custom Delimiter-Separated Values"
msgstr ""
#. IDS_OPTIONSPG_BINARYCOMPARE
-#: Merge.rc:3015 Merge.rc:4227
+#: Merge.rc:3025 Merge.rc:4237
msgctxt "Options dialog|Categories"
msgid "Binary"
msgstr "Δυαδικό"
#. IDD_PROPPAGE_COMPARE_BINARY, IDC_STATIC
-#: Merge.rc:3018
+#: Merge.rc:3028
#, c-format
msgid "Binary file &patterns:"
msgstr ""
#. IDD_PROPPAGE_COMPARE_BINARY, IDC_STATIC
-#: Merge.rc:3020
+#: Merge.rc:3030
#, c-format
msgid "Frhed settings"
msgstr ""
#. IDD_PROPPAGE_COMPARE_BINARY, IDC_COMPAREBINARY_VIEWSETTINGS
-#: Merge.rc:3021
+#: Merge.rc:3031
#, c-format
msgid "View &Settings..."
msgstr ""
#. IDD_PROPPAGE_COMPARE_BINARY, IDC_COMPAREBINARY_BINARYMODE
-#: Merge.rc:3022
+#: Merge.rc:3032
#, c-format
msgid "&Binary Mode..."
msgstr ""
#. IDD_PROPPAGE_COMPARE_BINARY, IDC_COMPAREBINARY_CHARACTERSET
-#: Merge.rc:3023
+#: Merge.rc:3033
#, c-format
msgid "&Character Set..."
msgstr ""
#. IDS_PRPCAT_IMAGE
-#: Merge.rc:3029 Merge.rc:4226 Merge.rc:4665
+#: Merge.rc:3039 Merge.rc:4236 Merge.rc:4675
msgid "Image"
msgstr ""
#. IDD_PROPPAGE_COMPARE_IMAGE, IDC_STATIC
-#: Merge.rc:3032
+#: Merge.rc:3042
#, c-format
msgid "Image file &patterns:"
msgstr ""
#. IDD_PROPPAGE_COMPARE_IMAGE, IDC_ENABLE_IMGCMP_IN_DIRCMP
-#: Merge.rc:3034
+#: Merge.rc:3044
msgid "&Enable image compare in folder compare"
msgstr ""
#. IDD_PROPPAGE_COMPARE_IMAGE, IDC_STATIC
-#: Merge.rc:3036
+#: Merge.rc:3046
msgid "OCR result:"
msgstr ""
#. IDS_OPTIONSPG_WEBPAGECOMPARE
-#: Merge.rc:3043 Merge.rc:4229
+#: Merge.rc:3053 Merge.rc:4239
msgid "Webpage"
msgstr ""
#. IDD_PROPPAGE_COMPARE_WEBPAGE, IDC_STATIC
-#: Merge.rc:3046
+#: Merge.rc:3056
msgid "URL pattern to &include (Regular expression):"
msgstr ""
#. IDD_PROPPAGE_COMPARE_WEBPAGE, IDC_STATIC
-#: Merge.rc:3048
+#: Merge.rc:3058
msgid "URL pattern to &exclude (Regular expression):"
msgstr ""
#. IDD_PROPPAGE_COMPARE_WEBPAGE, IDC_STATIC
-#: Merge.rc:3050
+#: Merge.rc:3060
msgid "&User data folder location:"
msgstr ""
#. IDD_PROPPAGE_COMPARE_WEBPAGE, IDC_COMPAREWEBPAGE_USERDATAFOLDER_PERPANE
-#: Merge.rc:3052
+#: Merge.rc:3062
msgid "&Separate user data folders for each pane"
msgstr ""
#. IDD_ENCODINGERROR, IDC_HEXVIEW
-#: Merge.rc:3065
+#: Merge.rc:3075
#, c-format
msgid "&Hex View"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3110
+#: Merge.rc:3120
msgid "Edit Plugin"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN, IDC_STATIC
-#: Merge.rc:3123
+#: Merge.rc:3133
msgid "&Category:"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_MENUCAPTION_STATIC
-#: Merge.rc:3125
+#: Merge.rc:3135
msgid "&Menu caption:"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_WINDOWTYPE_STATIC
-#: Merge.rc:3127
+#: Merge.rc:3137
msgid "&Window type:"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_UNPACKEDFILEEXTENSION_STATIC
-#: Merge.rc:3132
+#: Merge.rc:3142
msgid "&Unpacked file extension:"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_ARGUMENTSREQUIRED
-#: Merge.rc:3136
+#: Merge.rc:3146
msgid "&Require arguments"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_GENERATESCRIPT
-#: Merge.rc:3137
+#: Merge.rc:3147
msgid "&Generate editor script"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_COMMAND_LINE_STATIC
-#: Merge.rc:3140
+#: Merge.rc:3150
msgid "Command &line:"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_SCRIPT_FILEEXTENSION_STATIC
-#: Merge.rc:3143
+#: Merge.rc:3153
msgid "&Script file extension:"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_SCRIPT_BODY_STATIC
-#: Merge.rc:3145
+#: Merge.rc:3155
msgid "Script &body:"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3154
+#: Merge.rc:3164
msgid "Font"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3157
+#: Merge.rc:3167
msgid "&Font:"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3163
+#: Merge.rc:3173
msgid "Font st&yle:"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3169
+#: Merge.rc:3179
msgid "&Size:"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3175
+#: Merge.rc:3185
msgid "Effects"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3176
+#: Merge.rc:3186
msgid "Stri&keout"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3177
+#: Merge.rc:3187
msgid "&Underline"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3179
+#: Merge.rc:3189
msgid "&Color:"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3184
+#: Merge.rc:3194
msgid "Sample"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3185
+#: Merge.rc:3195
msgid "AaBbYyZz"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3189
+#: Merge.rc:3199
msgid "Sc&ript:"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN, IDC_MANAGE_LINK
-#: Merge.rc:3194
+#: Merge.rc:3204
msgid "Show more fonts"
msgstr ""
#. ID_INDICATOR_EXT
-#: Merge.rc:4118
+#: Merge.rc:4128
#, c-format
msgid "EXT"
msgstr ""
#. ID_INDICATOR_CAPS
-#: Merge.rc:4119
+#: Merge.rc:4129
#, c-format
msgid "CAP"
msgstr ""
#. ID_INDICATOR_NUM
-#: Merge.rc:4120
+#: Merge.rc:4130
#, c-format
msgid "NUM"
msgstr ""
#. ID_INDICATOR_SCRL
-#: Merge.rc:4121
+#: Merge.rc:4131
#, c-format
msgid "SCRL"
msgstr ""
#. ID_INDICATOR_OVR
-#: Merge.rc:4122
+#: Merge.rc:4132
#, c-format
msgid "OVR"
msgstr ""
#. ID_INDICATOR_REC
-#: Merge.rc:4123
+#: Merge.rc:4133
#, c-format
msgid "REC"
msgstr ""
#. ID_FILE_NEW
-#: Merge.rc:4129
+#: Merge.rc:4139
#, c-format
msgid "\nNew Documents (Ctrl+N)"
msgstr ""
#. ID_FILE_OPEN
-#: Merge.rc:4130
+#: Merge.rc:4140
#, c-format
msgid "\nOpen (Ctrl+O)"
msgstr ""
#. ID_FILE_SAVE
-#: Merge.rc:4131
+#: Merge.rc:4141
#, c-format
msgid "\nSave (Ctrl+S)"
msgstr ""
#. IDS_UNK_ERROR_READING_PROJECT
-#: Merge.rc:4137
+#: Merge.rc:4147
msgid "Unknown error opening project file."
msgstr "Παρουσιάσθηκε κάποιο σφάλμα κατά το άνοιγμα του αρχείου έργου."
#. IDS_UNK_ERROR_SAVING_PROJECT
-#: Merge.rc:4138
+#: Merge.rc:4148
msgid "Unknown error saving project file."
msgstr "Παρουσιάσθηκε κάποιο σφάλμα κατά την αποθήκευση του αρχείου έργου."
#. IDS_PROJFILE_LOAD_SUCCESS
-#: Merge.rc:4143
+#: Merge.rc:4153
#, c-format
msgid "Project file loaded."
msgstr "Αρχείο Έργου ανοίχθηκε επιτυχώς."
#. IDS_PROJFILE_SAVE_SUCCESS
-#: Merge.rc:4144
+#: Merge.rc:4154
#, c-format
msgid "Project file saved."
msgstr "Αρχείο Έργου αποθηκεύθηκε επιτυχώς."
#. ID_EDIT_UNDO
-#: Merge.rc:4150
+#: Merge.rc:4160
#, c-format
msgid "\nUndo (Ctrl+Z)"
msgstr ""
#. ID_EDIT_REDO
-#: Merge.rc:4151
+#: Merge.rc:4161
#, c-format
msgid "\nRedo (Ctrl+Y)"
msgstr ""
#. IDR_MERGEDOCTYPE
-#: Merge.rc:4158
+#: Merge.rc:4168
#, c-format
msgid ""
"\n"
@@ -5396,7 +5407,7 @@ msgstr ""
"Σύγκριση Αρχείων WinMerge"
#. IDR_DIRDOCTYPE
-#: Merge.rc:4159
+#: Merge.rc:4169
#, c-format
msgid ""
"\n"
@@ -5416,183 +5427,183 @@ msgstr ""
"Σύγκριση Φακέλων WinMerge"
#. IDS_SPLASH_GPLTEXT
-#: Merge.rc:4165
+#: Merge.rc:4175
#, c-format
msgid "WinMerge comes with ABSOLUTELY NO WARRANTY. It is free software and can be redistributed under the conditions of the GNU General Public License - see the Help menu for details."
msgstr "Το WinMerge προσφέρεται χωρίς ΚΑΜΜΙΑ ΑΠΟΛΥΤΩΣ ΕΓΓΥΗΣΗ. Είναι ελεύθερο λογισμικό και είσθε ευπρόσδεκτος να το αναδιανείμετε υπό ορισμένες περιστάσεις· δείτε τη Γενική Δημοσία Άδεια GNU στις επιλογές της Βοηθείας για λεπτομέρειες."
#. IDS_MESSAGEBOX_ABORT
-#: Merge.rc:4173
+#: Merge.rc:4183
#, c-format
msgid "&Abort"
msgstr "&Ματαίωση"
#. IDS_MESSAGEBOX_RETRY
-#: Merge.rc:4174
+#: Merge.rc:4184
#, c-format
msgid "&Retry"
msgstr "&Επανάληψη"
#. IDS_MESSAGEBOX_IGNORE
-#: Merge.rc:4175
+#: Merge.rc:4185
#, c-format
msgid "&Ignore"
msgstr "Να &αγνοηθεί"
#. IDS_MESSAGEBOX_IGNOREALL
-#: Merge.rc:4176
+#: Merge.rc:4186
#, c-format
msgid "Ignore &all"
msgstr "Να αγνοηθούν &όλα"
#. IDS_MESSAGEBOX_YES
-#: Merge.rc:4177
+#: Merge.rc:4187
#, c-format
msgid "&Yes"
msgstr "&Ναι"
#. IDS_MESSAGEBOX_YES_TO_ALL
-#: Merge.rc:4183
+#: Merge.rc:4193
#, c-format
msgid "Yes to &all"
msgstr "Ναι σε &όλα"
#. IDS_MESSAGEBOX_NO
-#: Merge.rc:4184
+#: Merge.rc:4194
#, c-format
msgid "&No"
msgstr "&Όχι"
#. IDS_MESSAGEBOX_NO_TO_ALL
-#: Merge.rc:4185
+#: Merge.rc:4195
#, c-format
msgid "No to a&ll"
msgstr "Όχι σε ό&λα"
#. IDS_MESSAGEBOX_CONTINUE
-#: Merge.rc:4186
+#: Merge.rc:4196
#, c-format
msgid "&Continue"
msgstr "&Συνέχεια"
#. IDS_MESSAGEBOX_SKIP
-#: Merge.rc:4187
+#: Merge.rc:4197
#, c-format
msgid "&Skip"
msgstr "&Παράλειψη"
#. IDS_MESSAGEBOX_SKIPALL
-#: Merge.rc:4188
+#: Merge.rc:4198
#, c-format
msgid "Skip &all"
msgstr "Παράλειψη Ό&λων"
#. IDS_MESSAGEBOX_DONT_DISPLAY_AGAIN
-#: Merge.rc:4190
+#: Merge.rc:4200
#, c-format
msgid "Don't display this &message again."
msgstr "Να μην εμφανισθεί ξανά αυτό το &Μήνυμα."
-#: Merge.rc:4193
+#: Merge.rc:4203
msgid "To make this message box visible, press Reset on the Message Boxes page in Options."
msgstr ""
#. IDS_OPTIONSPG_EDITOR_COMPAREMERGE
-#: Merge.rc:4203
+#: Merge.rc:4213
msgid "Compare/Merge"
msgstr ""
#. IDS_OPTIONSPG_SYNTAXCOLORS
-#: Merge.rc:4204 Merge.rc:4208
+#: Merge.rc:4214 Merge.rc:4218
#, c-format
msgid "Syntax"
msgstr ""
#. IDS_OPTIONSPG_COLOR_SCHEMES
-#: Merge.rc:4206
+#: Merge.rc:4216
msgid "Color Schemes"
msgstr ""
#. IDS_OPTIONSPG_DIRCOLORS
-#: Merge.rc:4210
+#: Merge.rc:4220
msgid "Folder Compare"
msgstr ""
#. IDS_OPTIONSPG_PROJECT
-#: Merge.rc:4215
+#: Merge.rc:4225
msgid "Project"
msgstr ""
#. IDS_COLHDR_NSDIFFS
-#: Merge.rc:4218 Merge.rc:4640
+#: Merge.rc:4228 Merge.rc:4650
#, c-format
msgid "Differences"
msgstr "Διαφορές"
#. IDS_OPTIONSPG_MESSAGEBOXES
-#: Merge.rc:4220
+#: Merge.rc:4230
msgid "Message Boxes"
msgstr ""
#. IDS_TO
-#: Merge.rc:4235
+#: Merge.rc:4245
#, c-format
msgid "To:"
msgstr "Προς:"
#. IDS_FROM_LEFT
-#: Merge.rc:4236
+#: Merge.rc:4246
#, c-format
msgid "From left:"
msgstr "Εξ αριστερών:"
#. IDS_TO_LEFT
-#: Merge.rc:4237
+#: Merge.rc:4247
#, c-format
msgid "To left:"
msgstr "Προς τα αριστερά:"
#. IDS_FROM_RIGHT
-#: Merge.rc:4238
+#: Merge.rc:4248
#, c-format
msgid "From right:"
msgstr "Εκ δεξιών:"
#. IDS_TO_RIGHT
-#: Merge.rc:4239
+#: Merge.rc:4249
#, c-format
msgid "To right:"
msgstr "Προς τα δεξιά:"
#. IDS_FROM_MIDDLE
-#: Merge.rc:4240
+#: Merge.rc:4250
msgid "From middle:"
msgstr ""
#. IDS_TO_MIDDLE
-#: Merge.rc:4241
+#: Merge.rc:4251
msgid "To middle:"
msgstr ""
#. IDS_VERSION_FMT
-#: Merge.rc:4247
+#: Merge.rc:4257
#, c-format
msgid "Version %1"
msgstr "Έκδοση %1"
#. IDS_OPTIONS_TITLE
-#: Merge.rc:4253
+#: Merge.rc:4263
#, c-format
msgid "Options (%1)"
msgstr "Επιλογές (%1)"
#. IDS_MESSAGE_BOX_ARE_RESET
-#: Merge.rc:4254
+#: Merge.rc:4264
#, c-format
msgid "All message boxes are now displayed again."
msgstr "Όλα τα πλαίσια μηνυμάτων είναι πάλι ορατά."
-#: Merge.rc:4256
+#: Merge.rc:4266
#, c-format
msgid "Tab size value is out of range. Please use 1 - %1."
msgstr ""
@@ -5601,177 +5612,177 @@ msgstr ""
"Παρακαλώ χρησιμοποιείστε τιμές 1 - %1."
#. IDS_PROJECT_OPEN
-#: Merge.rc:4262 Merge.rc:4318
+#: Merge.rc:4272 Merge.rc:4328
#, c-format
msgid "Open"
msgstr "Άνοιγμα"
#. IDS_PROGRAMFILES
-#: Merge.rc:4263
+#: Merge.rc:4273
#, c-format
msgid "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||"
msgstr "Προγράμματα|*.exe;*.bat;*.cmd|Όλα τα Αρχεία (*.*)|*.*||"
#. IDS_ALLFILES
-#: Merge.rc:4264
+#: Merge.rc:4274
#, c-format
msgid "All Files (*.*)|*.*||"
msgstr "Όλα τα Αρχεία (*.*)|*.*||"
#. IDS_PROJECTFILES
-#: Merge.rc:4265
+#: Merge.rc:4275
#, c-format
msgid "WinMerge Project Files (*.WinMerge)|*.WinMerge||"
msgstr "Αρχεία Έργου του WinMerge (*.WinMerge)|*.WinMerge||"
#. IDS_INIFILES
-#: Merge.rc:4267
+#: Merge.rc:4277
#, c-format
msgid "Options files (*.ini)|*.ini|All Files (*.*)|*.*||"
msgstr "Αρχεία ρυθμίσεων (*.ini)|*.ini|Όλα τα Αρχεία (*.*)|*.*||"
#. IDS_REPLACELIST_FILES
-#: Merge.rc:4268
+#: Merge.rc:4278
msgid "Tab-Separated Values (*.tsv;*.txt)|*.tsv;*.txt|All Files (*.*)|*.*||"
msgstr ""
#. IDS_TEXT_REPORT_FILES
-#: Merge.rc:4274
+#: Merge.rc:4284
#, c-format
msgid "Text Files (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|All Files (*.*)|*.*||"
msgstr "Αρχεία απλού Κειμένου (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|Όλα τα Αρχεία (*.*)|*.*||"
#. IDS_HTML_REPORT_FILES
-#: Merge.rc:4275
+#: Merge.rc:4285
#, c-format
msgid "HTML Files (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||"
msgstr "Αρχεία HTML (*.htm,*.html)|*.htm;*.html|Όλα τα Αρχεία (*.*)|*.*||"
#. IDS_XML_REPORT_FILES
-#: Merge.rc:4276
+#: Merge.rc:4286
#, c-format
msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||"
msgstr "Αρχεία XML (*.xml)|*.xml|All Files (*.*)|*.*||"
#. IDS_EXPANDSUBDIRS_DONOTEXPAND
-#: Merge.rc:4294
+#: Merge.rc:4304
msgid "Do not expand"
msgstr ""
#. IDS_EXPANDSUBDIRS_ALL
-#: Merge.rc:4295
+#: Merge.rc:4305
msgid "Expand all subfolders"
msgstr ""
#. IDS_EXPANDSUBDIRS_DIFFERENT
-#: Merge.rc:4296
+#: Merge.rc:4306
msgid "Expand different subfolders"
msgstr ""
#. IDS_EXPANDSUBDIRS_IDENTICAL
-#: Merge.rc:4297
+#: Merge.rc:4307
msgid "Expand identical subfolders"
msgstr ""
#. IDS_SYNTAXTABLE_FILETYPE
-#: Merge.rc:4303
+#: Merge.rc:4313
msgid "File Type"
msgstr ""
#. IDS_COLHDR_EXTENSION
-#: Merge.rc:4304 Merge.rc:4597
+#: Merge.rc:4314 Merge.rc:4607
#, c-format
msgid "Extension"
msgstr "Επέκταση"
#. IDS_PRPCAT_MESSAGE
-#: Merge.rc:4310 Merge.rc:4669
+#: Merge.rc:4320 Merge.rc:4679
msgid "Message"
msgstr ""
#. IDS_MESSAGEBOX_ANSWER
-#: Merge.rc:4311
+#: Merge.rc:4321
msgid "Answer"
msgstr ""
#. IDS_PROJECT_ITEM
-#: Merge.rc:4317
+#: Merge.rc:4327
msgid "Item"
msgstr ""
#. IDS_PROJECT_LOAD
-#: Merge.rc:4319
+#: Merge.rc:4329
msgid "Load"
msgstr ""
#. IDS_PROJECT_SAVE
-#: Merge.rc:4320
+#: Merge.rc:4330
msgid "Save"
msgstr ""
#. IDS_PROJECT_ITEM_INCLUDE_SUBFOLDERS
-#: Merge.rc:4322
+#: Merge.rc:4332
msgid "Include Subfolders"
msgstr ""
#. IDS_PROJECT_ITEM_COMPARE_OPTIONS
-#: Merge.rc:4324
+#: Merge.rc:4334
msgid "Compare Options"
msgstr ""
#. IDS_PROJECT_ITEM_HIDDEN_ITEMS
-#: Merge.rc:4325
+#: Merge.rc:4335
msgid "Hidden Items"
msgstr ""
#. IDS_PLUGINSLIST_NAME
-#: Merge.rc:4331 Merge.rc:4956
+#: Merge.rc:4341 Merge.rc:4966
#, c-format
msgid "Name"
msgstr "Όνομα"
#. IDS_FILTERFILE_PATHTITLE
-#: Merge.rc:4332
+#: Merge.rc:4342
#, c-format
msgid "Location"
msgstr "Τοποθεσία"
#. IDS_FILTER_TITLE
-#: Merge.rc:4333
+#: Merge.rc:4343
#, c-format
msgid "Filters"
msgstr "Φίλτρα"
#. IDS_FILTER_PREFIX
-#: Merge.rc:4334
+#: Merge.rc:4344
#, c-format
msgid "[F] "
msgstr ""
#. IDS_PLUGINSLIST_DESC
-#: Merge.rc:4335 Merge.rc:4958
+#: Merge.rc:4345 Merge.rc:4968
#, c-format
msgid "Description"
msgstr "Περιγραφή"
#. IDS_FILEFILTER_SAVENEW
-#: Merge.rc:4336
+#: Merge.rc:4346
#, c-format
msgid "Select Filename for New Filter"
msgstr "Επιλέξατε όνομα αρχείου για το νέο φίλτρο"
#. IDS_FILEFILTER_FILEMASK
-#: Merge.rc:4337
+#: Merge.rc:4347
#, c-format
msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||"
msgstr "Φίλτρα Αρχείων (*.flt)|*.flt|Όλα τα αρχεία (*.*)|*.*||"
-#: Merge.rc:4339
+#: Merge.rc:4349
#, c-format
msgid "Cannot find filter template!\n\nCopy %1 to WinMerge/Filters Folder:\n%2."
msgstr "Το πρότυπο αρχείο φίλτρων αρχείων δεν είναι δυνατόν να βρεθεί!\n\nΠαρακαλώ αντιγράψατε το αρχείο %1 στο φάκελο WinMerge/Filters:\n%2."
-#: Merge.rc:4341
+#: Merge.rc:4351
#, c-format
msgid ""
"Cannot copy filter template:\n"
@@ -5784,7 +5795,7 @@ msgstr ""
"\n"
"Παρακαλώ βεβαιωθείτε ότι ο φάκελος υπάρχει και δεν έχει την ιδιότητα \"Μόνο για Ανάγνωση\"."
-#: Merge.rc:4343
+#: Merge.rc:4353
#, c-format
msgid ""
"User's filter folder is not defined!\n"
@@ -5795,7 +5806,7 @@ msgstr ""
"\n"
"Παρακαλώ επιλέξτε φάκελο αρχείων από Επιλογές/Σύστημα."
-#: Merge.rc:4345
+#: Merge.rc:4355
#, c-format
msgid ""
"Failed to delete filter:\n"
@@ -5809,12 +5820,12 @@ msgstr ""
"Μήπως το αρχείο έχει την ιδιότητα \"Μόνο για Ανάγνωση\";"
#. IDS_FILEFILTER_INSTALL
-#: Merge.rc:4346
+#: Merge.rc:4356
#, c-format
msgid "Locate Filter File to Install"
msgstr "Εντοπισμός αρχείου φίλτρου προς εγκατάσταση"
-#: Merge.rc:4348
+#: Merge.rc:4358
#, c-format
msgid ""
"Installing filter file failed.\n"
@@ -5826,257 +5837,257 @@ msgstr ""
"Η αντιγραφή του νέου αρχείου φίλτρου στο φάκελο φίλτρων ήταν αδύνατη."
#. IDS_FILEFILTER_OVERWRITE
-#: Merge.rc:4349
+#: Merge.rc:4359
#, c-format
msgid "Filter file exists. Overwrite?"
msgstr "Το αρχείο φίλτρου υπάρχει ήδη. Αντικατάσταση του υπάρχοντος φίλτρου;"
#. IDS_FILTERLINE_REGEXP
-#: Merge.rc:4355
+#: Merge.rc:4365
#, c-format
msgid "Regular expression"
msgstr "Τυποποιημένη Έκφραση"
#. IDS_FILTERCHANGED
-#: Merge.rc:4361
+#: Merge.rc:4371
msgid "Filters updated. Refresh all open folder compares?\n\nSelect 'No' to refresh later."
msgstr "Τα φίλτρα ενημερώθηκαν. Επιθυμείτε να ανανεωθούν όλες οι ανοικτές συγκρίσεις φακέλων;\n\nΕάν δεν επιθυμείτε να ανανεωθούν όλες οι συγκρίσεις τώρα, μπορείτε να επιλέξετε 'Όχι' και να ανανεώσετε τις συγκρίσεις αργότερα."
#. IDS_DIRECTORY_WINDOW_TITLE
-#: Merge.rc:4367
+#: Merge.rc:4377
#, c-format
msgid "Folder Comparison Results"
msgstr "Αποτελέσματα Συγκρίσεως Φακέλων"
#. IDS_FILE_COMPARISON_TITLE
-#: Merge.rc:4368
+#: Merge.rc:4378
#, c-format
msgid "File Comparison"
msgstr "Σύγκριση Αρχείων"
#. IDS_EMPTY_LEFT_FILE
-#: Merge.rc:4369
+#: Merge.rc:4379
#, c-format
msgid "Untitled Left"
msgstr "Χωρίς τίτλο αριστερά"
#. IDS_EMPTY_MIDDLE_FILE
-#: Merge.rc:4370
+#: Merge.rc:4380
#, c-format
msgid "Untitled Middle"
msgstr ""
#. IDS_EMPTY_RIGHT_FILE
-#: Merge.rc:4371
+#: Merge.rc:4381
#, c-format
msgid "Untitled Right"
msgstr "Χωρίς τίτλο δεξιά"
#. IDS_CONFLICT_BASE_FILE
-#: Merge.rc:4372
+#: Merge.rc:4382
msgid "Base File"
msgstr ""
#. IDS_CONFLICT_THEIRS_FILE
-#: Merge.rc:4373
+#: Merge.rc:4383
#, c-format
msgid "Theirs File"
msgstr "Αρχείο Αυτών"
#. IDS_CONFLICT_MINE_FILE
-#: Merge.rc:4374
+#: Merge.rc:4384
#, c-format
msgid "Mine File"
msgstr "Αρχείο Δικό μου"
#. IDS_SELFCOMPARE_ORIGINAL_FILE
-#: Merge.rc:4375
+#: Merge.rc:4385
msgid "Original File"
msgstr ""
#. IDS_LINE_STATUS_INFO_EOL
-#: Merge.rc:4381
+#: Merge.rc:4391
#, c-format
msgid "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s"
msgstr ""
#. IDS_EMPTY_LINE_STATUS_INFO
-#: Merge.rc:4382
+#: Merge.rc:4392
#, c-format
msgid "Line: %s"
msgstr "Γραμμή: %s"
#. IDS_LINE_STATUS_INFO
-#: Merge.rc:4383
+#: Merge.rc:4393
#, c-format
msgid "Ln: %s Col: %d/%d Ch: %d/%d"
msgstr ""
#. IDS_LINE_STATUS_INFO_SEL
-#: Merge.rc:4384
+#: Merge.rc:4394
#, c-format
msgid " Sel: %d | %d"
msgstr ""
#. IDS_MERGEMODE_MERGING
-#: Merge.rc:4385
+#: Merge.rc:4395
#, c-format
msgid "Merge"
msgstr "Συγχώνευση"
#. IDS_DIFF_NUMBER_STATUS_FMT
-#: Merge.rc:4386
+#: Merge.rc:4396
#, c-format
msgid "Difference %1 of %2"
msgstr "Διαφορά %1 από %2"
#. IDS_NO_DIFF_SEL_FMT
-#: Merge.rc:4387
+#: Merge.rc:4397
#, c-format
msgid "%1 Differences Found"
msgstr "%1 Διαφορές βρέθηκαν"
#. IDS_1_DIFF_FOUND
-#: Merge.rc:4388
+#: Merge.rc:4398
#, c-format
msgid "1 Difference Found"
msgstr "1 Διαφορά βρέθηκε"
#. IDS_NO_ERR_SEL_FMT
-#: Merge.rc:4389
+#: Merge.rc:4399
#, c-format
msgid "%1 Errors Found"
msgstr ""
#. IDS_1_ERR_FOUND
-#: Merge.rc:4390
+#: Merge.rc:4400
msgid "1 Error Found"
msgstr ""
#. IDS_STATUSBAR_READONLY, Abbreviation from "Read Only"
-#: Merge.rc:4391
+#: Merge.rc:4401
#, c-format
msgid "RO"
msgstr "ΜγΑ"
#. IDS_DIRVIEW_STATUS_FMT_FOCUS
-#: Merge.rc:4397
+#: Merge.rc:4407
#, c-format
msgid "Item %1 of %2"
msgstr "Αντικείμενο %1 από %2"
#. IDS_DIRVIEW_STATUS_FMT_NOFOCUS
-#: Merge.rc:4398
+#: Merge.rc:4408
#, c-format
msgid "Items: %1"
msgstr "Αντικείμενα: %1"
#. IDS_DIRVIEW_STATUS_COMPARING
-#: Merge.rc:4399
+#: Merge.rc:4409
#, c-format
msgid "Comparing items..."
msgstr "Σύγκριση αντικειμένων..."
#. IDS_ITEMS_PER_SEC
-#: Merge.rc:4400
+#: Merge.rc:4410
#, c-format
msgid "%.1f[items/sec]"
msgstr ""
#. IDS_ERROR_INCOMPARABLE
-#: Merge.rc:4406
+#: Merge.rc:4416
msgid "Select two existing folders/files to compare."
msgstr "Επιλέξατε δύο υπάρχοντες φακέλους ή αρχεία προς σύγκριση."
#. IDS_DIRSEL_TAG
-#: Merge.rc:4407
+#: Merge.rc:4417
#, c-format
msgid "Folder Selection"
msgstr "Επιλογή Φακέλων"
#. IDS_OPEN_FILESDIRS
-#: Merge.rc:4408
+#: Merge.rc:4418
#, c-format
msgid "Select two (or three) folders/files to compare."
msgstr ""
#. IDS_OPEN_LEFTINVALID
-#: Merge.rc:4409
+#: Merge.rc:4419
#, c-format
msgid "Left (1st) path is invalid!"
msgstr ""
#. IDS_OPEN_MIDDLEINVALID
-#: Merge.rc:4410
+#: Merge.rc:4420
#, c-format
msgid "Middle (2nd) path is invalid!"
msgstr ""
#. IDS_OPEN_RIGHTINVALID2
-#: Merge.rc:4411
+#: Merge.rc:4421
#, c-format
msgid "Right (2nd) path is invalid!"
msgstr ""
#. IDS_OPEN_RIGHTINVALID3
-#: Merge.rc:4412
+#: Merge.rc:4422
#, c-format
msgid "Right (3rd) path is invalid!"
msgstr ""
#. IDS_OPEN_BOTHINVALID
-#: Merge.rc:4413
+#: Merge.rc:4423
#, c-format
msgid "Both paths are invalid!"
msgstr "Σφάλμα σε αμφότερες τις διαδρομές!"
-#: Merge.rc:4415
+#: Merge.rc:4425
#, c-format
msgid "Left (1st) and Middle (2nd) paths are invalid!"
msgstr ""
#. IDS_OPEN_LEFTRIGHTINVALID
-#: Merge.rc:4416
+#: Merge.rc:4426
#, c-format
msgid "Left (1st) and Right (3rd) paths are invalid!"
msgstr ""
-#: Merge.rc:4418
+#: Merge.rc:4428
#, c-format
msgid "Middle (2nd) and Right (3rd) paths are invalid!"
msgstr ""
#. IDS_OPEN_ALLINVALID
-#: Merge.rc:4419
+#: Merge.rc:4429
#, c-format
msgid "All paths are invalid!"
msgstr ""
#. IDS_OPEN_UNPACKERDISABLED
-#: Merge.rc:4420
+#: Merge.rc:4430
msgid "Only enabled for file comparisons"
msgstr ""
#. IDS_OPEN_MISMATCH
-#: Merge.rc:4421
+#: Merge.rc:4431
#, c-format
msgid "Cannot compare file and folder!"
msgstr "Η σύγκριση αρχείου και φακέλου δεν είναι δυνατή!"
#. IDS_ERROR_FILE_NOT_FOUND
-#: Merge.rc:4427
+#: Merge.rc:4437
#, c-format
msgid "File not found: %1"
msgstr "Το αρχείο δε βρέθηκε: %1"
#. IDS_ERROR_FILE_NOT_UNPACKED
-#: Merge.rc:4428
+#: Merge.rc:4438
#, c-format
msgid "File not unpacked: %1"
msgstr "Το αρχείο δεν αποσυμπιέσθηκε: %1"
#. IDS_ERROR_FILEOPEN
-#: Merge.rc:4429
+#: Merge.rc:4439
#, c-format
msgid ""
"Cannot open file\n"
@@ -6090,13 +6101,13 @@ msgstr ""
"%2"
#. IDS_ERROR_CONF_RESOLVE
-#: Merge.rc:4430
+#: Merge.rc:4440
#, c-format
msgid "Failed to parse conflict file."
msgstr "Αποτυχία αναλύσεως αρχείου διενέξεων."
#. IDS_NOT_CONFLICT_FILE
-#: Merge.rc:4431
+#: Merge.rc:4441
#, c-format
msgid "The file\n%1\nis not a conflict file."
msgstr ""
@@ -6105,35 +6116,35 @@ msgstr ""
"δεν είναι αρχείο διενέξεων."
#. IDS_COMPARE_LARGE_FILES
-#: Merge.rc:4432
+#: Merge.rc:4442
msgid "Comparing large files requires significant memory.\nShow only comparison results (not file contents)?"
msgstr ""
#. IDS_SAVE_AS_TITLE
-#: Merge.rc:4438
+#: Merge.rc:4448
#, c-format
msgid "Save As"
msgstr "Αποθήκευση Ως"
#. IDS_SAVE_FMT
-#: Merge.rc:4439
+#: Merge.rc:4449
#, c-format
msgid "Save changes to %1?"
msgstr "Αποθήκευση μεταβολών στο %1;"
#. IDS_SAVEREADONLY_FMT
-#: Merge.rc:4440
+#: Merge.rc:4450
#, c-format
msgid "%1 is read-only. Override? Or 'No' to save as new filename?"
msgstr "Το %1 έχει την ιδιότητα \"Μόνο για Ανάγνωση\". Θα θέλατε να αντικαταστήσετε το αρχείο; (Όχι για αποθήκευση ως διαφορετικό αρχείο.)"
#. IDS_ERROR_BACKUP
-#: Merge.rc:4441
+#: Merge.rc:4451
#, c-format
msgid "Error backing up file"
msgstr "Αποτυχία δημιουργίας εφεδρικού αρχείου"
-#: Merge.rc:4443
+#: Merge.rc:4453
#, c-format
msgid ""
"Unable to backup original file:\n"
@@ -6147,7 +6158,7 @@ msgstr ""
"Συνέχεια ως έχει;"
#. IDS_FILESAVE_FAILED
-#: Merge.rc:4444
+#: Merge.rc:4454
#, c-format
msgid "Saving file failed.\n%1\n%2\n\t- Use different filename (OK)\n\t- Abort (Cancel)?"
msgstr ""
@@ -6158,7 +6169,7 @@ msgstr ""
"\t- χρησιμοποιήσετε ένα διαφορετικό όνομα (Πιέστε ΟΚ)\n"
"\t- ματαιώσετε την τρέχουσα ενέργεια (Πιέστε Άκυρο);"
-#: Merge.rc:4446
+#: Merge.rc:4456
#, c-format
msgid "Plugin '%2' cannot pack changes to left file into '%1'.\n\nOriginal unchanged. Save unpacked version?"
msgstr ""
@@ -6168,12 +6179,12 @@ msgstr ""
"\n"
"Επιθυμείτε να αποθηκεύσετε το αποσυμπιεσμένο αρχείο ως διαφορετικό αρχείο;"
-#: Merge.rc:4448
+#: Merge.rc:4458
#, c-format
msgid "Plugin '%2' cannot pack changes to middle file into '%1'.\n\nOriginal unchanged. Save unpacked version?"
msgstr ""
-#: Merge.rc:4450
+#: Merge.rc:4460
#, c-format
msgid "Plugin '%2' cannot pack changes to right file into '%1'.\n\nOriginal unchanged. Save unpacked version?"
msgstr ""
@@ -6184,7 +6195,7 @@ msgstr ""
"Επιθυμείτε να αποθηκεύσετε το αποσυμπιεσμένο αρχείο ως διαφορετικό αρχείο;"
#. IDS_FILECHANGED_ONDISK
-#: Merge.rc:4451
+#: Merge.rc:4461
#, c-format
msgid ""
"Another application updated\n"
@@ -6200,7 +6211,7 @@ msgstr ""
"Αντικατάσταση μεταβληθέντος αρχείου?"
#. IDS_SAVEREADONLY_MULTI
-#: Merge.rc:4452
+#: Merge.rc:4462
#, c-format
msgid ""
"%1\n"
@@ -6210,37 +6221,37 @@ msgstr ""
"έχει την ιδιότητα \"Μόνο για Ανάγνωση\". Επιθυμείτε να αντικαταστήσετε το αρχείο;"
#. IDS_FILECHANGED_RESCAN
-#: Merge.rc:4453
+#: Merge.rc:4463
#, c-format
msgid "Another application updated\n%1\nsince last scan.\n\nReload?"
msgstr ""
#. IDS_SAVE_LEFT_AS
-#: Merge.rc:4454
+#: Merge.rc:4464
#, c-format
msgid "Save Left File As"
msgstr "Αποθήκευση Αριστερού Αρχείου Ως"
#. IDS_SAVE_MIDDLE_AS
-#: Merge.rc:4455
+#: Merge.rc:4465
#, c-format
msgid "Save Middle File As"
msgstr ""
#. IDS_SAVE_RIGHT_AS
-#: Merge.rc:4456
+#: Merge.rc:4466
#, c-format
msgid "Save Right File As"
msgstr "Αποθήκευση Δεξιού Αρχείου Ως"
#. IDS_FILE_DISAPPEARED
-#: Merge.rc:4461
+#: Merge.rc:4471
#, c-format
msgid "File\n%1\nnot found. Save a copy to continue."
msgstr ""
#. IDS_VIEWS_OUTOFSYNC
-#: Merge.rc:4467
+#: Merge.rc:4477
#, c-format
msgid ""
"Cannot merge unsynched documents.\n"
@@ -6252,189 +6263,189 @@ msgstr ""
"Ανανεώστε τα αρχεία πριν συνεχίσετε."
#. IDS_BREAK_ON_WHITESPACE
-#: Merge.rc:4472
+#: Merge.rc:4482
msgid "Break at whitespace"
msgstr "Στάση στα κενά"
#. IDS_BREAK_ON_PUNCTUATION
-#: Merge.rc:4473
+#: Merge.rc:4483
msgid "Break at whitespace or punctuation"
msgstr "Στάση στα κενά ή στα σημεία στίξεως"
#. IDS_L2M
-#: Merge.rc:4479
+#: Merge.rc:4489
msgid "Copy to &Middle\tAlt+Right"
msgstr ""
#. IDS_R2M
-#: Merge.rc:4480
+#: Merge.rc:4490
msgid "Copy to &Middle\tAlt+Left"
msgstr ""
#. IDS_COPY_FROM_MIDDLE_R
-#: Merge.rc:4481
+#: Merge.rc:4491
msgid "Copy from Middle\tAlt+Shift+Right"
msgstr ""
#. IDS_COPY_FROM_MIDDLE_L
-#: Merge.rc:4482
+#: Merge.rc:4492
msgid "Copy from Middle\tAlt+Shift+Left"
msgstr ""
#. IDS_L2MNEXT
-#: Merge.rc:4483
+#: Merge.rc:4493
msgid "Copy to Middle and Advance\tCtrl+Alt+Right"
msgstr ""
#. IDS_R2MNEXT
-#: Merge.rc:4484
+#: Merge.rc:4494
msgid "Copy to Middle and Advance\tCtrl+Alt+Left"
msgstr ""
#. IDS_ALL_MIDDLE
-#: Merge.rc:4485
+#: Merge.rc:4495
msgid "Copy All to Middle"
msgstr ""
#. IDS_COPY_RIGHT_TO_LEFT
-#: Merge.rc:4491
+#: Merge.rc:4501
#, c-format
msgid "Right to Left (%1)"
msgstr "Δεξιό στο Αριστερό (%1)"
#. IDS_COPY_RIGHT_TO_MIDDLE
-#: Merge.rc:4492
+#: Merge.rc:4502
#, c-format
msgid "Right to Middle (%1)"
msgstr ""
#. IDS_COPY_MIDDLE_TO_LEFT
-#: Merge.rc:4493
+#: Merge.rc:4503
#, c-format
msgid "Middle to Left (%1)"
msgstr ""
#. IDS_COPY_MIDDLE_TO_RIGHT
-#: Merge.rc:4494
+#: Merge.rc:4504
#, c-format
msgid "Middle to Right (%1)"
msgstr ""
#. IDS_COPY_LEFT_TO_RIGHT
-#: Merge.rc:4495
+#: Merge.rc:4505
#, c-format
msgid "Left to Right (%1)"
msgstr "Αριστερό στο Δεξιό (%1)"
#. IDS_COPY_LEFT_TO_MIDDLE
-#: Merge.rc:4496
+#: Merge.rc:4506
#, c-format
msgid "Left to Middle (%1)"
msgstr ""
#. IDS_MOVE_LEFT_TO
-#: Merge.rc:4507 Merge.rc:4539
+#: Merge.rc:4517 Merge.rc:4549
#, c-format
msgid "Left to... (%1)"
msgstr "Αριστερό στο... (%1)"
#. IDS_MOVE_MIDDLE_TO
-#: Merge.rc:4508 Merge.rc:4540
+#: Merge.rc:4518 Merge.rc:4550
#, c-format
msgid "Middle to... (%1)"
msgstr ""
#. IDS_MOVE_RIGHT_TO
-#: Merge.rc:4509 Merge.rc:4541
+#: Merge.rc:4519 Merge.rc:4551
#, c-format
msgid "Right to... (%1)"
msgstr "Δεξιό στο... (%1)"
#. IDS_COPY_BOTH_TO
-#: Merge.rc:4510
+#: Merge.rc:4520
#, c-format
msgid "Both to... (%1)"
msgstr ""
#. IDS_COPY_ALL_TO
-#: Merge.rc:4511
+#: Merge.rc:4521
#, c-format
msgid "All to... (%1)"
msgstr ""
#. IDS_COPY_DIFFERENCES_TO
-#: Merge.rc:4512
+#: Merge.rc:4522
#, c-format
msgid "Differences to... (%1)"
msgstr ""
#. IDS_COPY_ONLYDIFFITEMS
-#: Merge.rc:4519
+#: Merge.rc:4529
msgid "Some selected items are identical or skipped.\nCopy only items with differences?"
msgstr ""
#. IDS_DEL_LEFT_FMT
-#: Merge.rc:4525
+#: Merge.rc:4535
#, c-format
msgid "Left (%1)"
msgstr "Αριστερό (%1)"
#. IDS_DEL_MIDDLE_FMT
-#: Merge.rc:4526
+#: Merge.rc:4536
#, c-format
msgid "Middle (%1)"
msgstr ""
#. IDS_DEL_RIGHT_FMT
-#: Merge.rc:4527
+#: Merge.rc:4537
#, c-format
msgid "Right (%1)"
msgstr "Δεξιό (%1)"
#. IDS_DEL_BOTH_FMT
-#: Merge.rc:4528
+#: Merge.rc:4538
#, c-format
msgid "Both (%1)"
msgstr "Αμφότερα (%1)"
#. IDS_DEL_ALL_FMT
-#: Merge.rc:4529
+#: Merge.rc:4539
#, c-format
msgid "All (%1)"
msgstr ""
#. IDS_SELECT_DEST_LEFT
-#: Merge.rc:4545
+#: Merge.rc:4555
#, c-format
msgid "Left Side - Select Destination Folder:"
msgstr "Αριστερή πλευρά - επιλογή φακέλου προορισμού:"
#. IDS_SELECT_DEST_MIDDLE
-#: Merge.rc:4546
+#: Merge.rc:4556
#, c-format
msgid "Middle Side - Select Destination Folder:"
msgstr ""
#. IDS_SELECT_DEST_RIGHT
-#: Merge.rc:4547
+#: Merge.rc:4557
#, c-format
msgid "Right Side - Select Destination Folder:"
msgstr "Δεξιά πλευρά - επιλογή φακέλου προορισμού:"
#. IDS_FILES_AFFECTED_FMT
-#: Merge.rc:4548
+#: Merge.rc:4558
#, c-format
msgid "(%1 Files Affected)"
msgstr "(%1 Αρχεία Μεταβλήθηκαν)"
#. IDS_FILES_AFFECTED_FMT2
-#: Merge.rc:4549
+#: Merge.rc:4559
#, c-format
msgid "(%1 of %2 Files Affected)"
msgstr "(%1 από %2 Αρχεία Μεταβλήθηκαν)"
#. IDS_CONFIRM_DELETE_SINGLE
-#: Merge.rc:4555
+#: Merge.rc:4565
#, c-format
msgid ""
"Are you sure you want to delete\n"
@@ -6446,18 +6457,18 @@ msgstr ""
"%1 ;"
#. IDS_CONFIRM_SINGLE_COPY
-#: Merge.rc:4556
+#: Merge.rc:4566
msgid "Are you sure you want to copy?"
msgstr "Είσθε βέβαιοι ότι επιθυμείτε να αντιγράψετε?"
#. IDS_CONFIRM_MULTIPLE_COPY
-#: Merge.rc:4557
+#: Merge.rc:4567
#, c-format
msgid "Are you sure you want to copy %d items?"
msgstr "Είσθε βέβαιοι ότι επιθυμείτε να αντιγράψετε %d αντικείμενα?"
#. IDS_DIRCMP_NOTSYNC
-#: Merge.rc:4558
+#: Merge.rc:4568
#, c-format
msgid ""
"Operation aborted!\n"
@@ -6477,878 +6488,878 @@ msgstr ""
"Παρακαλώ ανανεώστε τη σύγκριση."
#. IDS_CONFIRM_SINGLE_MOVE
-#: Merge.rc:4563
+#: Merge.rc:4573
msgid "Are you sure you want to move?"
msgstr "Είσθε βέβαιος ότι επιθυμείτε να μετακινήσετε?"
#. IDS_CONFIRM_MULTIPLE_MOVE
-#: Merge.rc:4564
+#: Merge.rc:4574
#, c-format
msgid "Are you sure you want to move %d items?"
msgstr "Είσθε βέβαιος ότι επιθυμείτε να μετακινήσετε %d αντικείμενα?"
#. IDS_CONFIRM_MOVE_CAPTION
-#: Merge.rc:4566
+#: Merge.rc:4576
#, c-format
msgid "Confirm Move"
msgstr "Επιβεβαιώσατε Μετακίνηση"
-#: Merge.rc:4568
+#: Merge.rc:4578
#, c-format
msgid "Close the folder comparison window?"
msgstr ""
-#: Merge.rc:4570
+#: Merge.rc:4580
msgid "Close the folder comparison window, which took a long time?"
msgstr ""
#. IDS_ERROR_INVALID_DIR_FILE_NAME
-#: Merge.rc:4571
+#: Merge.rc:4581
msgid "The file or folder name is invalid."
msgstr ""
#. IDS_ERROR_EXECUTE_FILE
-#: Merge.rc:4577
+#: Merge.rc:4587
#, c-format
msgid "Failed to execute external editor: %1"
msgstr "Αποτυχία κατά το άνοιγμα άλλης εφαρμογής: %1"
#. IDS_UNKNOWN_ARCHIVE_FORMAT
-#: Merge.rc:4583
+#: Merge.rc:4593
#, c-format
msgid "Unknown archive format"
msgstr "Άγνωστη μορφή συμπιεσμένου αρχείου"
-#: Merge.rc:4585
+#: Merge.rc:4595
msgid "Failed to extract archive.\nCompare as text file?"
msgstr ""
#. IDS_COLHDR_FILENAME
-#: Merge.rc:4591
+#: Merge.rc:4601
#, c-format
msgid "Filename"
msgstr "Όνομα Αρχείου"
#. IDS_COLHDR_DIR
-#: Merge.rc:4592
+#: Merge.rc:4602
msgctxt "DirView|ColumnHeader"
msgid "Folder"
msgstr "Φάκελος"
#. IDS_COLHDR_RESULT
-#: Merge.rc:4593
+#: Merge.rc:4603
#, c-format
msgid "Comparison Result"
msgstr "Αποτέλεσμα Συγκρίσεως"
#. IDS_COLHDR_LTIMEM
-#: Merge.rc:4594
+#: Merge.rc:4604
#, c-format
msgid "Left Date"
msgstr "Ημερομηνία Αριστερού"
#. IDS_COLHDR_RTIMEM
-#: Merge.rc:4595
+#: Merge.rc:4605
#, c-format
msgid "Right Date"
msgstr "Ημερομηνία Δεξιού"
#. IDS_COLHDR_MTIMEM
-#: Merge.rc:4596
+#: Merge.rc:4606
#, c-format
msgid "Middle Date"
msgstr ""
#. IDS_COLHDR_LSIZE
-#: Merge.rc:4598
+#: Merge.rc:4608
#, c-format
msgid "Left Size"
msgstr "Μέγεθος Αριστερού"
#. IDS_COLHDR_RSIZE
-#: Merge.rc:4599
+#: Merge.rc:4609
#, c-format
msgid "Right Size"
msgstr "Μέγεθος Δεξιού"
#. IDS_COLHDR_MSIZE
-#: Merge.rc:4604
+#: Merge.rc:4614
#, c-format
msgid "Middle Size"
msgstr ""
#. IDS_COLHDR_RSIZE_SHORT
-#: Merge.rc:4605
+#: Merge.rc:4615
#, c-format
msgid "Right Size (Short)"
msgstr "Μέγεθος Δεξιού (Σύντομο)"
#. IDS_COLHDR_LSIZE_SHORT
-#: Merge.rc:4606
+#: Merge.rc:4616
#, c-format
msgid "Left Size (Short)"
msgstr "Μέγεθος Αριστερού (Σύντομο)"
#. IDS_COLHDR_MSIZE_SHORT
-#: Merge.rc:4607
+#: Merge.rc:4617
#, c-format
msgid "Middle Size (Short)"
msgstr ""
#. IDS_COLHDR_LTIMEC
-#: Merge.rc:4613
+#: Merge.rc:4623
#, c-format
msgid "Left Creation Time"
msgstr "Χρόνος Δημιουργίας Αριστερού"
#. IDS_COLHDR_RTIMEC
-#: Merge.rc:4614
+#: Merge.rc:4624
#, c-format
msgid "Right Creation Time"
msgstr "Χρόνος Δημιουργίας Δεξιού"
#. IDS_COLHDR_MTIMEC
-#: Merge.rc:4615
+#: Merge.rc:4625
#, c-format
msgid "Middle Creation Time"
msgstr ""
#. IDS_COLHDR_NEWER
-#: Merge.rc:4616
+#: Merge.rc:4626
#, c-format
msgid "Newer File"
msgstr "Νεώτερο Αρχείο"
#. IDS_COLHDR_LVERSION
-#: Merge.rc:4617
+#: Merge.rc:4627
#, c-format
msgid "Left File Version"
msgstr "Έκδοση Αριστερού Αρχείου"
#. IDS_COLHDR_RVERSION
-#: Merge.rc:4618
+#: Merge.rc:4628
#, c-format
msgid "Right File Version"
msgstr "Έκδοση Δεξιού Αρχείου"
#. IDS_COLHDR_MVERSION
-#: Merge.rc:4619
+#: Merge.rc:4629
#, c-format
msgid "Middle File Version"
msgstr ""
#. IDS_COLHDR_RESULT_ABBR
-#: Merge.rc:4620
+#: Merge.rc:4630
#, c-format
msgid "Short Result"
msgstr "Σύντομο Αποτέλεσμα"
#. IDS_COLHDR_LATTRIBUTES
-#: Merge.rc:4621
+#: Merge.rc:4631
#, c-format
msgid "Left Attributes"
msgstr "Ιδιότητες Αριστερού"
#. IDS_COLHDR_RATTRIBUTES
-#: Merge.rc:4622
+#: Merge.rc:4632
#, c-format
msgid "Right Attributes"
msgstr "Ιδιότητες Δεξιού"
#. IDS_COLHDR_MATTRIBUTES
-#: Merge.rc:4623
+#: Merge.rc:4633
#, c-format
msgid "Middle Attributes"
msgstr ""
#. IDS_COLHDR_LEOL_TYPE
-#: Merge.rc:4628
+#: Merge.rc:4638
#, c-format
msgid "Left EOL"
msgstr "Χαρακτήρας Τερματισμού Αριστερού"
#. IDS_COLHDR_MEOL_TYPE
-#: Merge.rc:4629
+#: Merge.rc:4639
#, c-format
msgid "Middle EOL"
msgstr ""
#. IDS_COLHDR_REOL_TYPE
-#: Merge.rc:4630
+#: Merge.rc:4640
#, c-format
msgid "Right EOL"
msgstr "Χαρακτήρας Τερματισμού Δεξιού"
#. IDS_COLHDR_LENCODING
-#: Merge.rc:4636
+#: Merge.rc:4646
#, c-format
msgid "Left Encoding"
msgstr "Κωδικοσελίδα Αριστερού"
#. IDS_COLHDR_RENCODING
-#: Merge.rc:4637
+#: Merge.rc:4647
#, c-format
msgid "Right Encoding"
msgstr "Κωδικοσελίδα Δεξιού"
#. IDS_COLHDR_MENCODING
-#: Merge.rc:4638
+#: Merge.rc:4648
#, c-format
msgid "Middle Encoding"
msgstr ""
#. IDS_COLHDR_NIDIFFS
-#: Merge.rc:4639
+#: Merge.rc:4649
msgid "Ignored Diff"
msgstr "Αγνοηθείσα Διαφορά"
#. IDS_COLHDR_BINARY
-#: Merge.rc:4641
+#: Merge.rc:4651
msgctxt "DirView|ColumnHeader"
msgid "Binary"
msgstr "Δυαδικό"
#. IDS_PLUGINS_TYPE_UNPACKER
-#: Merge.rc:4642 Merge.rc:4959
+#: Merge.rc:4652 Merge.rc:4969
#, c-format
msgid "Unpacker"
msgstr "Αποσυμπιεστικό"
#. IDS_PLUGIN_TYPE4
-#: Merge.rc:4643 Merge.rc:4960 Merge.rc:5267
+#: Merge.rc:4653 Merge.rc:4970 Merge.rc:5277
#, c-format
msgid "Prediffer"
msgstr "Προεπεξεργαστής Διαφορών"
#. IDS_COLHDR_LEFT
-#: Merge.rc:4644
+#: Merge.rc:4654
msgid "Left"
msgstr ""
#. IDS_COLHDR_MIDDLE
-#: Merge.rc:4645
+#: Merge.rc:4655
msgid "Middle"
msgstr ""
#. IDS_COLHDR_RIGHT
-#: Merge.rc:4646
+#: Merge.rc:4656
msgid "Right"
msgstr ""
#. IDS_COLHDR_DIFF
-#: Merge.rc:4647
+#: Merge.rc:4657
msgid "Diff"
msgstr ""
#. IDS_COLHDR_LEFT_DUPLICATE
-#: Merge.rc:4648
+#: Merge.rc:4658
msgid "Left Duplicate Count"
msgstr ""
#. IDS_COLHDR_RIGHT_DUPLICATE
-#: Merge.rc:4649
+#: Merge.rc:4659
msgid "Right Duplicate Count"
msgstr ""
#. IDS_COLHDR_MIDDLE_DUPLICATE
-#: Merge.rc:4650
+#: Merge.rc:4660
msgid "Middle Duplicate Count"
msgstr ""
#. IDS_COLHDR_MOVE
-#: Merge.rc:4651
+#: Merge.rc:4661
msgid "Move"
msgstr ""
#. IDS_PRPCAT_AUDIO
-#: Merge.rc:4658
+#: Merge.rc:4668
msgid "Audio"
msgstr ""
#. IDS_PRPCAT_CALENDAR
-#: Merge.rc:4659
+#: Merge.rc:4669
msgid "Calendar"
msgstr ""
#. IDS_PRPCAT_COMMUNICATION
-#: Merge.rc:4660
+#: Merge.rc:4670
msgid "Communication"
msgstr ""
#. IDS_PRPCAT_CONTACT
-#: Merge.rc:4661
+#: Merge.rc:4671
msgid "Contact"
msgstr ""
#. IDS_PRPCAT_DEVICES
-#: Merge.rc:4662
+#: Merge.rc:4672
msgid "Devices"
msgstr ""
#. IDS_PRPCAT_DOCUMENT
-#: Merge.rc:4663
+#: Merge.rc:4673
msgid "Document"
msgstr ""
#. IDS_PRPCAT_HOME
-#: Merge.rc:4664
+#: Merge.rc:4674
msgid "Home"
msgstr ""
#. IDS_PRPCAT_JOURNAL
-#: Merge.rc:4666
+#: Merge.rc:4676
msgid "Journal"
msgstr ""
#. IDS_PRPCAT_LINK
-#: Merge.rc:4667
+#: Merge.rc:4677
msgid "Link"
msgstr ""
#. IDS_PRPCAT_MEDIA
-#: Merge.rc:4668
+#: Merge.rc:4678
msgid "Media"
msgstr ""
#. IDS_PRPCAT_MUSIC
-#: Merge.rc:4670
+#: Merge.rc:4680
msgid "Music"
msgstr ""
#. IDS_PRPCAT_NOTE
-#: Merge.rc:4671
+#: Merge.rc:4681
msgid "Note"
msgstr ""
#. IDS_PRPCAT_PHOTO
-#: Merge.rc:4672
+#: Merge.rc:4682
msgid "Photo"
msgstr ""
#. IDS_PRPCAT_RECORDEDTV
-#: Merge.rc:4673
+#: Merge.rc:4683
msgid "RecordedTV"
msgstr ""
#. IDS_PRPCAT_SEARCH
-#: Merge.rc:4674
+#: Merge.rc:4684
msgid "Search"
msgstr ""
#. IDS_PRPCAT_SECURITY
-#: Merge.rc:4675
+#: Merge.rc:4685
msgid "Security"
msgstr ""
#. IDS_PRPCAT_SOFTWARE
-#: Merge.rc:4676
+#: Merge.rc:4686
msgid "Software"
msgstr ""
#. IDS_PRPCAT_TASK
-#: Merge.rc:4677
+#: Merge.rc:4687
msgid "Task"
msgstr ""
#. IDS_PRPCAT_VIDEO
-#: Merge.rc:4678
+#: Merge.rc:4688
msgid "Video"
msgstr ""
#. IDS_PRPCAT_HASH
-#: Merge.rc:4679
+#: Merge.rc:4689
msgid "Hash"
msgstr ""
#. IDS_CANT_COMPARE_FILES
-#: Merge.rc:4685
+#: Merge.rc:4695
#, c-format
msgid "Unable to compare files"
msgstr "Η σύγκριση των αρχείων είναι αδύνατη"
#. IDS_ABORTED_ITEM
-#: Merge.rc:4686
+#: Merge.rc:4696
#, c-format
msgid "Item aborted"
msgstr "Το αντικείμενο ματαιώθηκε"
#. IDS_FILE_SKIPPED
-#: Merge.rc:4687
+#: Merge.rc:4697
#, c-format
msgid "File skipped"
msgstr "Το αρχείο παρελείφθη"
#. IDS_DIR_SKIPPED
-#: Merge.rc:4688
+#: Merge.rc:4698
#, c-format
msgid "Folder skipped"
msgstr "Ο φάκελος παρελείφθη"
#. IDS_LEFT_ONLY_IN_FMT
-#: Merge.rc:4689
+#: Merge.rc:4699
#, c-format
msgid "Left only: %1"
msgstr "Αριστερά μόνο: %1"
#. IDS_MIDDLE_ONLY_IN_FMT
-#: Merge.rc:4690
+#: Merge.rc:4700
#, c-format
msgid "Middle only: %1"
msgstr ""
#. IDS_RIGHT_ONLY_IN_FMT
-#: Merge.rc:4691
+#: Merge.rc:4701
#, c-format
msgid "Right only: %1"
msgstr "Δεξιά μόνο: %1"
#. IDS_DOES_NOT_EXIST_IN_FMT
-#: Merge.rc:4692
+#: Merge.rc:4702
#, c-format
msgid "Does not exist in %1"
msgstr ""
#. IDS_BIN_FILES_SAME
-#: Merge.rc:4693
+#: Merge.rc:4703
#, c-format
msgid "Binary files are identical"
msgstr "Τα δυαδικά αρχεία είναι πανομοιότυπα"
#. IDS_BIN_FILES_DIFF
-#: Merge.rc:4699
+#: Merge.rc:4709
#, c-format
msgid "Binary files are different"
msgstr "Τα δυαδικά αρχεία είναι διαφορετικά"
#. IDS_FILES_ARE_DIFFERENT
-#: Merge.rc:4700
+#: Merge.rc:4710
#, c-format
msgid "Files are different"
msgstr "Τα αρχεία είναι διαφορετικά"
#. IDS_FOLDERS_ARE_DIFFERENT
-#: Merge.rc:4701
+#: Merge.rc:4711
#, c-format
msgid "Folders are different"
msgstr ""
#. IDS_LEFTONLY
-#: Merge.rc:4702
+#: Merge.rc:4712
#, c-format
msgid "Left Only"
msgstr "Αριστερά μόνο"
#. IDS_RIGHTONLY
-#: Merge.rc:4703
+#: Merge.rc:4713
#, c-format
msgid "Right Only"
msgstr "Δεξιά μόνο"
#. IDS_MIDDLEONLY
-#: Merge.rc:4704
+#: Merge.rc:4714
#, c-format
msgid "Middle Only"
msgstr ""
#. IDS_NOITEMLEFT
-#: Merge.rc:4705
+#: Merge.rc:4715
#, c-format
msgid "No item in left"
msgstr ""
#. IDS_NOITEMRIGHT
-#: Merge.rc:4706
+#: Merge.rc:4716
#, c-format
msgid "No item in right"
msgstr ""
#. IDS_NOITEMMIDDLE
-#: Merge.rc:4707
+#: Merge.rc:4717
#, c-format
msgid "No item in middle"
msgstr ""
#. IDS_CMPRES_ERROR
-#: Merge.rc:4709
+#: Merge.rc:4719
#, c-format
msgid "Error"
msgstr "Σφάλμα"
#. IDS_TEXT_FILES_SAME
-#: Merge.rc:4710
+#: Merge.rc:4720
#, c-format
msgid "Text files are identical"
msgstr ""
#. IDS_LEFTONLY_DIFF
-#: Merge.rc:4711
+#: Merge.rc:4721
msgid " (Middle and right are identical)"
msgstr ""
#. IDS_MIDDLEONLY_DIFF
-#: Merge.rc:4712
+#: Merge.rc:4722
msgid " (Left and right are identical)"
msgstr ""
#. IDS_RIGHTONLY_DIFF
-#: Merge.rc:4713
+#: Merge.rc:4723
msgid " (Left and middle are identical)"
msgstr ""
#. IDS_PATH_MISMATCH
-#: Merge.rc:4714
+#: Merge.rc:4724
msgid " (paths differ)"
msgstr ""
#. IDS_TEXT_FILES_DIFF
-#: Merge.rc:4715
+#: Merge.rc:4725
#, c-format
msgid "Text files are different"
msgstr ""
#. IDS_IMAGE_FILES_SAME
-#: Merge.rc:4716
+#: Merge.rc:4726
msgid "Image files are identical"
msgstr ""
#. IDS_IMAGE_FILES_DIFF
-#: Merge.rc:4717
+#: Merge.rc:4727
msgid "Image files are different"
msgstr ""
#. IDS_EXPR_DIFF
-#: Merge.rc:4718
+#: Merge.rc:4728
#, c-format
msgid "Files are different (expr: %1)"
msgstr ""
#. IDS_HASH_GROUP
-#: Merge.rc:4719
+#: Merge.rc:4729
#, c-format
msgid "Group%d"
msgstr ""
#. IDS_RENAME_MOVE_DETECTION_DISALBED
-#: Merge.rc:4720
+#: Merge.rc:4730
msgctxt "Options dialog|Compare|Folder|Detect renames and moves"
msgid "Disabled"
msgstr ""
#. IDS_RENAME_MOVE_DETECTION_RENAME
-#: Merge.rc:4721
+#: Merge.rc:4731
msgid "Detect renames"
msgstr ""
#. IDS_RENAME_MOVE_DETECTION_RENAME_MOVE
-#: Merge.rc:4722
+#: Merge.rc:4732
msgid "Detect renames and moves"
msgstr ""
#. IDS_RENAME_MOVE_MERGE_MODE_RENAME
-#: Merge.rc:4723
+#: Merge.rc:4733
msgid "Merge renames"
msgstr ""
#. IDS_RENAME_MOVE_MERGE_MODE_RENAME_MOVE
-#: Merge.rc:4724
+#: Merge.rc:4734
msgid "Merge renames and moves"
msgstr ""
#. IDS_RENAMED
-#: Merge.rc:4725
+#: Merge.rc:4735
msgid "Renamed"
msgstr ""
#. IDS_MOVED
-#: Merge.rc:4726
+#: Merge.rc:4736
msgid "Moved"
msgstr ""
#. IDS_RENAMED_MOVED
-#: Merge.rc:4727
+#: Merge.rc:4737
msgid "Renamed/Moved"
msgstr ""
#. IDS_RENAMED_MOVED_ITEMS
-#: Merge.rc:4728
+#: Merge.rc:4738
#, c-format
msgid "(%1 items)"
msgstr ""
#. IDS_RENAMED_MOVED_RESULT
-#: Merge.rc:4729
+#: Merge.rc:4739
#, c-format
msgid "%1 (set %2): "
msgstr ""
#. IDS_SWITCH_FLAT_MODE
-#: Merge.rc:4730
+#: Merge.rc:4740
msgid "Some moved items have been merged.\nIn Tree Mode, these items may appear in positions that do not reflect the actual folder structure, which can be confusing.\nSwitch to Flat Mode?"
msgstr ""
#. IDS_ELAPSED_TIME
-#: Merge.rc:4736
+#: Merge.rc:4746
#, c-format
msgid "Elapsed time: %ld ms"
msgstr "Παρελθών χρόνος: %ld ms"
#. IDS_STATUS_SELITEM1
-#: Merge.rc:4737
+#: Merge.rc:4747
#, c-format
msgid "1 item selected"
msgstr "1 αντικείμενο επιλεγμένο"
#. IDS_STATUS_SELITEMS
-#: Merge.rc:4738
+#: Merge.rc:4748
#, c-format
msgid "%1 items selected"
msgstr "%1 αντικείμενα επιλεγμένα"
#. IDS_COLDESC_FILENAME
-#: Merge.rc:4744
+#: Merge.rc:4754
#, c-format
msgid "Filename or folder name."
msgstr "Όνομα αρχείου ή όνομα φακέλου."
#. IDS_COLDESC_DIR
-#: Merge.rc:4745
+#: Merge.rc:4755
#, c-format
msgid "Subfolder name when subfolders are included."
msgstr "Όνομα υποφακέλου όταν οι υποφάκελοι περιλαμβάνονται."
#. IDS_COLDESC_RESULT
-#: Merge.rc:4746
+#: Merge.rc:4756
#, c-format
msgid "Comparison result, long form."
msgstr "Αποτέλεσμα συγκρίσεως, πλήρης ανάπτυξη"
#. IDS_COLDESC_LTIMEM
-#: Merge.rc:4751
+#: Merge.rc:4761
#, c-format
msgid "Left side modification date."
msgstr "Ημερομηνία τροποποιήσεως αριστερής πλευράς."
#. IDS_COLDESC_RTIMEM
-#: Merge.rc:4752
+#: Merge.rc:4762
#, c-format
msgid "Right side modification date."
msgstr "Ημερομηνία τροποποιήσεως δεξιάς πλευράς."
#. IDS_COLDESC_MTIMEM
-#: Merge.rc:4753
+#: Merge.rc:4763
#, c-format
msgid "Middle side modification date."
msgstr ""
#. IDS_COLDESC_EXTENSION
-#: Merge.rc:4754
+#: Merge.rc:4764
#, c-format
msgid "File's extension."
msgstr "Επέκταση αρχείου."
#. IDS_COLDESC_LSIZE
-#: Merge.rc:4755
+#: Merge.rc:4765
#, c-format
msgid "Left file size in bytes."
msgstr "Μέγεθος αριστερού αρχείου σε byte."
#. IDS_COLDESC_RSIZE
-#: Merge.rc:4756
+#: Merge.rc:4766
#, c-format
msgid "Right file size in bytes."
msgstr "Μέγεθος δεξιού αρχείου σε byte."
#. IDS_COLDESC_MSIZE
-#: Merge.rc:4757
+#: Merge.rc:4767
#, c-format
msgid "Middle file size in bytes."
msgstr ""
#. IDS_COLDESC_LSIZE_SHORT
-#: Merge.rc:4758
+#: Merge.rc:4768
#, c-format
msgid "Left file size abbreviated."
msgstr "Μέγεθος αριστερού αρχείου συντομευμένο."
#. IDS_COLDESC_RSIZE_SHORT
-#: Merge.rc:4759
+#: Merge.rc:4769
#, c-format
msgid "Right file size abbreviated."
msgstr "Μέγεθος δεξιού αρχείου συντομευμένο."
#. IDS_COLDESC_MSIZE_SHORT
-#: Merge.rc:4760
+#: Merge.rc:4770
#, c-format
msgid "Middle file size abbreviated."
msgstr ""
#. IDS_COLDESC_LTIMEC
-#: Merge.rc:4766
+#: Merge.rc:4776
#, c-format
msgid "Left side creation time."
msgstr "Χρόνος δημιουργίας αριστερής πλευράς."
#. IDS_COLDESC_RTIMEC
-#: Merge.rc:4767
+#: Merge.rc:4777
#, c-format
msgid "Right side creation time."
msgstr "Χρόνος δημιουργίας δεξιάς πλευράς."
#. IDS_COLDESC_MTIMEC
-#: Merge.rc:4768
+#: Merge.rc:4778
#, c-format
msgid "Middle side creation time."
msgstr ""
#. IDS_COLDESC_NEWER
-#: Merge.rc:4769
+#: Merge.rc:4779
#, c-format
msgid "Tells which side has newer modification date."
msgstr "Πληροφορεί ποια πλευρά έχει την πλέον πρόσφατη ημερομηνία τροποποιήσεως."
#. IDS_COLDESC_LVERSION
-#: Merge.rc:4770
+#: Merge.rc:4780
msgid "Left side file version, only for some file types."
msgstr "Έκδοση αρχείου αριστερής πλευράς, μόνο για ορισμένους τύπους αρχείων."
#. IDS_COLDESC_RVERSION
-#: Merge.rc:4771
+#: Merge.rc:4781
msgid "Right side file version, only for some file types."
msgstr "Έκδοση αρχείου δεξιάς πλευράς, μόνο για ορισμένους τύπους αρχείων."
#. IDS_COLDESC_MVERSION
-#: Merge.rc:4776
+#: Merge.rc:4786
msgid "Middle side file version, only for some file types."
msgstr ""
#. IDS_COLDESC_RESULT_ABBR
-#: Merge.rc:4777
+#: Merge.rc:4787
#, c-format
msgid "Short comparison result."
msgstr "Βραχύ αποτέλεσμα συγκρίσεως."
#. IDS_COLDESC_LATTRIBUTES
-#: Merge.rc:4778
+#: Merge.rc:4788
#, c-format
msgid "Left side attributes."
msgstr "Ιδιότητες αριστερής πλευράς."
#. IDS_COLDESC_RATTRIBUTES
-#: Merge.rc:4779
+#: Merge.rc:4789
#, c-format
msgid "Right side attributes."
msgstr "Ιδιότητες δεξιάς πλευράς."
#. IDS_COLDESC_MATTRIBUTES
-#: Merge.rc:4780
+#: Merge.rc:4790
#, c-format
msgid "Middle side attributes."
msgstr ""
#. IDS_COLDESC_LEOL_TYPE
-#: Merge.rc:4781
+#: Merge.rc:4791
msgid "Left side file EOL type."
msgstr "Τύπος χαρακτήρα τερματισμού αριστερής πλευράς."
#. IDS_COLDESC_REOL_TYPE
-#: Merge.rc:4782
+#: Merge.rc:4792
msgid "Right side file EOL type."
msgstr "Τύπος χαρακτήρα τερματισμού δεξιάς πλευράς."
#. IDS_COLDESC_MEOL_TYPE
-#: Merge.rc:4783
+#: Merge.rc:4793
msgid "Middle side file EOL type."
msgstr ""
#. IDS_COLDESC_LENCODING
-#: Merge.rc:4789
+#: Merge.rc:4799
#, c-format
msgid "Left side encoding."
msgstr "Κωδικοσελίδα αριστερής πλευράς."
#. IDS_COLDESC_RENCODING
-#: Merge.rc:4790
+#: Merge.rc:4800
#, c-format
msgid "Right side encoding."
msgstr "Κωδικοσελίδα δεξιάς πλευράς."
#. IDS_COLDESC_MENCODING
-#: Merge.rc:4791
+#: Merge.rc:4801
#, c-format
msgid "Middle side encoding."
msgstr ""
#. IDS_COLDESC_NIDIFFS
-#: Merge.rc:4792
+#: Merge.rc:4802
#, c-format
msgid "Number of ignored differences in file. Ignored and cannot be merged."
msgstr "Αριθμός αγνοηθεισών διαφορών στο αρχείο. Αυτές οι διαφορές αγνοούνται από το WinMerge και δεν είναι δυνατόν να συγχωνευθούν."
#. IDS_COLDESC_NSDIFFS
-#: Merge.rc:4793
+#: Merge.rc:4803
#, c-format
msgid "Number of differences in file (excluding ignored)."
msgstr "Αριθμός διαφορών στο αρχείο. Αυτός ο αριθμός δεν περιλαμβάνει αγνοηθείσες διαφορές."
#. IDS_COLDESC_BINARY
-#: Merge.rc:4794
+#: Merge.rc:4804
#, c-format
msgid "Shows an asterisk (*) if the file is binary."
msgstr "Εμφανίζει έναν αστερίσκο (*) εάν το αρχείο είναι δυαδικό."
#. IDS_COLDESC_UNPACKER
-#: Merge.rc:4795
+#: Merge.rc:4805
msgid "Unpacker plugin name or pipeline."
msgstr ""
#. IDS_COLDESC_PREDIFFER
-#: Merge.rc:4796
+#: Merge.rc:4806
msgid "Prediffer plugin name or pipeline."
msgstr ""
#. IDS_DIRECTORY_REPORT_TITLE
-#: Merge.rc:4802
+#: Merge.rc:4812
#, c-format
msgid "Compare %1 with %2"
msgstr "Σύγκριση %1 με %2"
#. IDS_DIRECTORY_REPORT_TITLE3
-#: Merge.rc:4803
+#: Merge.rc:4813
#, c-format
msgid "Compare %1 with %2 and %3"
msgstr ""
#. IDS_REPORT_COMMALIST
-#: Merge.rc:4804
+#: Merge.rc:4814
#, c-format
msgid "Comma-separated list"
msgstr "Κατάλογος με κόμμα ως χαρακτήρα διαχωρισμού"
#. IDS_REPORT_TABLIST
-#: Merge.rc:4805
+#: Merge.rc:4815
#, c-format
msgid "Tab-separated list"
msgstr "Κατάλογος με στηλοθέτη ως χαρακτήρα διαχωρισμού"
#. IDS_REPORT_SIMPLEHTML
-#: Merge.rc:4806
+#: Merge.rc:4816
#, c-format
msgid "Simple HTML"
msgstr "Απλό HTML"
#. IDS_REPORT_SIMPLEXML
-#: Merge.rc:4807
+#: Merge.rc:4817
#, c-format
msgid "Simple XML"
msgstr "Απλό XML"
-#: Merge.rc:4809
+#: Merge.rc:4819
#, c-format
msgid "Report file already exists. Overwrite?"
msgstr "Το αρχείο αναφοράς αποτελεσμάτων υπάρχει ήδη. Επιθυμείτε να αντικαταστήσετε το υπάρχον αρχείο;"
#. IDS_REPORT_ERROR
-#: Merge.rc:4814
+#: Merge.rc:4824
#, c-format
msgid ""
"Error creating the report:\n"
@@ -7358,62 +7369,62 @@ msgstr ""
"%1"
#. IDS_REPORT_SUCCESS
-#: Merge.rc:4815
+#: Merge.rc:4825
#, c-format
msgid "Report created successfully."
msgstr "Η αναφορά αποτελεσμάτων δημιουργήθηκε επιτυχώς."
#. IDS_SYNCPOINT_LASTBLOCK
-#: Merge.rc:4821
+#: Merge.rc:4831
msgid "Cannot add a synchronization point at this line."
msgstr ""
#. IDS_FILE_TO_ITSELF
-#: Merge.rc:4827
+#: Merge.rc:4837
#, c-format
msgid "Same file is opened in both panes."
msgstr "Το ίδιο αρχείο ανοίχθηκε σε αμφότερα τα πεδία."
#. IDS_FILESSAME
-#: Merge.rc:4828
+#: Merge.rc:4838
#, c-format
msgid "Selected files are identical."
msgstr "Τα επιλεγμένα αρχεία είναι πανομοιότυπα."
#. IDS_FILESSAME_CURCFG
-#: Merge.rc:4829
+#: Merge.rc:4839
msgid "Selected files are identical (with current settings).\r\nChecking binary identity..."
msgstr ""
#. IDS_FILESSAME_BINERROR
-#: Merge.rc:4830
+#: Merge.rc:4840
msgid "Selected files are identical (with current settings).\r\nBut binary comparison failed."
msgstr ""
#. IDS_FILESSAME_BINSAME
-#: Merge.rc:4831
+#: Merge.rc:4841
msgid "Selected files are identical (binary match)."
msgstr ""
#. IDS_FILESSAME_BINDIFF
-#: Merge.rc:4832
+#: Merge.rc:4842
msgid "Selected files are identical (with current settings).\r\nBut differ at the binary level."
msgstr ""
#. IDS_FILEERROR
-#: Merge.rc:4833
+#: Merge.rc:4843
#, c-format
msgid "An error occurred while comparing files."
msgstr "Παρουσιάσθηκε κάποιο σφάλμα κατά τη σύγκριση των αρχείων."
#. IDS_TEMP_FILEERROR
-#: Merge.rc:4834
+#: Merge.rc:4844
#, c-format
msgid "Could not create temporary files. Check your temporary path settings."
msgstr "Η δημιουργία προσωρινών αρχείων δεν ήταν δυνατή. Ελέγξτε τις ρυθμίσεις σας τις σχετικές με την προσωρινή διαδρομή."
#. IDS_SUGGEST_IGNOREEOL
-#: Merge.rc:4835
+#: Merge.rc:4845
msgid "Files use different EOL.\n\nTreat all EOL as equivalent?\n\nSet 'Ignore EOL differences (Windows/Unix/Mac)' in Compare section of Options."
msgstr ""
"Αυτά τα αρχεία χρησιμοποιούν διαφορετικό χαρακτήρα τερματισμού.\n"
@@ -7423,19 +7434,19 @@ msgstr ""
"Σημείωση: Εάν επιθυμείτε οι χαρακτήρες τερματισμού να θεωρούνται πάντοτε ισοδύναμοι, ενεργοποιείστε την επιλογή \"Διαφορές χαρακτήρων τερματισμού (Win/Unix/Mac) να αγνοούνται...\" στην καρτέλα Σύγκριση του διαλόγου επιλογών (εμφανίζεται με την επιλογή Επεξεργασία/Επιλογές)."
#. IDS_INVALID_DIRECTORY
-#: Merge.rc:4836
+#: Merge.rc:4846
#, c-format
msgid "Selected folder is invalid."
msgstr "Ο επιλεγμένος φάκελος δεν είναι έγκυρος."
#. IDS_CANNOT_OPEN_BINARYFILE
-#: Merge.rc:4837
+#: Merge.rc:4847
#, c-format
msgid "Cannot open a binary file in Editor."
msgstr "Το άνοιγμα δυαδικού αρχείου στο πεδίο επεξεργασίας δεν είναι δυνατόν."
#. IDS_CREATE_PAIR_FOLDER
-#: Merge.rc:4838
+#: Merge.rc:4848
#, c-format
msgid "Create matching folder:\n%1\non the other side and open?"
msgstr ""
@@ -7446,45 +7457,45 @@ msgstr ""
"στην άλλη πλευρά και να ανοίξετε αυτούς τους φακέλους;"
#. IDS_CONFIRM_COPY_ALL_DIFFS
-#: Merge.rc:4839
+#: Merge.rc:4849
msgid "Copy all differences to other file?"
msgstr ""
#. IDS_MOVE_TO_NEXTFILE
-#: Merge.rc:4844
+#: Merge.rc:4854
#, c-format
msgid "Move to next file?"
msgstr ""
#. IDS_MOVE_TO_PREVFILE
-#: Merge.rc:4845
+#: Merge.rc:4855
#, c-format
msgid "Move to previous file?"
msgstr ""
#. IDS_MOVE_TO_NEXTPAGE
-#: Merge.rc:4846
+#: Merge.rc:4856
#, c-format
msgid "Move to next page?"
msgstr ""
#. IDS_MOVE_TO_PREVPAGE
-#: Merge.rc:4847
+#: Merge.rc:4857
#, c-format
msgid "Move to previous page?"
msgstr ""
#. IDS_MOVE_TO_FIRSTFILE
-#: Merge.rc:4848
+#: Merge.rc:4858
msgid "Move to first file?"
msgstr ""
#. IDS_MOVE_TO_LASTFILE
-#: Merge.rc:4849
+#: Merge.rc:4859
msgid "Move to last file?"
msgstr ""
-#: Merge.rc:4856
+#: Merge.rc:4866
#, c-format
msgid "Different codepages: left (cp%d), right (cp%d).\nDisplay in codepage (better display) or default Windows codepage (safer merging)?\n(Recommended: default Windows codepage)"
msgstr ""
@@ -7492,163 +7503,163 @@ msgstr ""
"Η εμφάνιση κάθε φακέλου με τη δική του κωδικοσελίδα θα έχει εμφανισιακά καλύτερα αποτελέσματα αλλά η συγχώνευση/αντιγραφή θα είναι επικίνδυνη.\n"
"Επιθυμείτε να θεωρηθεί ότι αμφότερα τα αρχεία χρησιμοποιούν την προκαθορισμένη κωδικοσελίδα του windows (συνιστάται);"
-#: Merge.rc:4858
+#: Merge.rc:4868
#, c-format
msgid "Information lost due to encoding errors: both files"
msgstr "Απώλεια πληροφοριών λόγω σφαλμάτος κωδικοσελίδας: αμφότερα τα αρχεία"
-#: Merge.rc:4860
+#: Merge.rc:4870
#, c-format
msgid "Information lost due to encoding errors: first file"
msgstr ""
-#: Merge.rc:4862
+#: Merge.rc:4872
#, c-format
msgid "Information lost due to encoding errors: second file"
msgstr ""
-#: Merge.rc:4864
+#: Merge.rc:4874
#, c-format
msgid "Information lost due to encoding errors: third file"
msgstr ""
#. IDS_LINEDIFF_NODIFF
-#: Merge.rc:4870
+#: Merge.rc:4880
#, c-format
msgid "No difference"
msgstr "Χωρίς διαφορά"
#. IDS_LINEDIFF_NODIFF_CAPTION
-#: Merge.rc:4871
+#: Merge.rc:4881
#, c-format
msgid "Line difference"
msgstr "Διαφορά γραμμής"
#. IDS_NUM_REPLACED
-#: Merge.rc:4877
+#: Merge.rc:4887
#, c-format
msgid "Replaced %1 string(s)."
msgstr "Αντικαταστάθηκαν %1 ακολουθίες χαρακτήρων."
#. IDS_EDIT_TEXT_NOT_FOUND
-#: Merge.rc:4878
+#: Merge.rc:4888
#, c-format
msgid "Cannot find string \"%s\"."
msgstr "Η ακολουθία χαρακτήρων \"%s\"
#. IDS_MERGE_MODE
-#: Merge.rc:4884
+#: Merge.rc:4894
msgid "Entering Merge Mode. Press F9 to turn off."
msgstr ""
#. IDS_AUTO_MERGE
-#: Merge.rc:4890
+#: Merge.rc:4900
#, c-format
msgid "Automatic merges: %1\nUnresolved conflicts: %2"
msgstr ""
#. IDS_CODEPAGE_MERGED
-#: Merge.rc:4891
+#: Merge.rc:4901
msgid "Codepage change merged."
msgstr ""
#. IDS_CODEPAGE_CONFLICT
-#: Merge.rc:4892
+#: Merge.rc:4902
msgid "Codepage changes are conflicting."
msgstr ""
#. IDS_EOL_MERGED
-#: Merge.rc:4893
+#: Merge.rc:4903
msgid "EOL change merged."
msgstr ""
#. IDS_EOL_CONFLICT
-#: Merge.rc:4894
+#: Merge.rc:4904
msgid "EOL changes are conflicting."
msgstr ""
#. IDS_LOCBAR_CAPTION
-#: Merge.rc:4900
+#: Merge.rc:4910
#, c-format
msgid "Location Pane"
msgstr "Πεδίο Εντοπισμού"
#. IDS_DIFFBAR_CAPTION
-#: Merge.rc:4901
+#: Merge.rc:4911
#, c-format
msgid "Diff Pane"
msgstr "Πεδίο Διαφορών"
#. IDS_DIFF_SUCCEEDED
-#: Merge.rc:4908
+#: Merge.rc:4918
#, c-format
msgid "Patch file written."
msgstr "Η εγγραφή του αρχείου patch ολοκληρώθηκε επιτυχώς."
#. IDS_DIFF_ITEM1NOTFOUND
-#: Merge.rc:4909
+#: Merge.rc:4919
msgid "First item not found!"
msgstr ""
#. IDS_DIFF_ITEM2NOTFOUND
-#: Merge.rc:4910
+#: Merge.rc:4920
msgid "Second item not found!"
msgstr ""
#. IDS_DIFF_FILEOVERWRITE
-#: Merge.rc:4911
+#: Merge.rc:4921
#, c-format
msgid "Patch file already exists. Overwrite?"
msgstr "Το αρχείο patch υπάρχει ήδη. Επιθυμείτε να το αντικαταστήσετε;"
#. IDS_DIFF_SELECTEDFILES
-#: Merge.rc:4912
+#: Merge.rc:4922
#, c-format
msgid "[%1 files selected]"
msgstr "[%1 επιλεγμένα αρχεία]"
#. IDS_DIFF_NORMAL
-#: Merge.rc:4913
+#: Merge.rc:4923
#, c-format
msgid "Normal"
msgstr "Κανονικό"
#. IDS_DIFF_CONTEXT
-#: Merge.rc:4914
+#: Merge.rc:4924
#, c-format
msgid "Context"
msgstr "Με περιβάλλον κείμενο"
#. IDS_DIFF_UNIFIED
-#: Merge.rc:4915
+#: Merge.rc:4925
#, c-format
msgid "Unified"
msgstr "Ενοποιημένο"
#. IDS_FILEWRITE_ERROR
-#: Merge.rc:4917
+#: Merge.rc:4927
#, c-format
msgid "Could not write to file %1."
msgstr "Η εγγραφή στο αρχείο %1 δεν ήταν δυνατή."
#. IDS_PATH_NOT_ABSOLUTE
-#: Merge.rc:4918
+#: Merge.rc:4928
#, c-format
msgid "Output path is not absolute: %1"
msgstr "Η ορισθείσα διαδρομή εξόδου δεν είναι απόλυτη διαδρομή: %1"
#. IDS_MUST_SPECIFY_OUTPUT
-#: Merge.rc:4919
+#: Merge.rc:4929
msgid "Specify an output file."
msgstr "Ορίσατε ένα αρχείο εξόδου."
-#: Merge.rc:4921
+#: Merge.rc:4931
#, c-format
msgid "Cannot create patch from binary files."
msgstr "Η δημιουργία αρχείου patch από δυαδικά αρχεία δεν είναι δυνατή."
#. IDS_SAVEFILES_FORPATCH
-#: Merge.rc:4922
+#: Merge.rc:4932
#, c-format
msgid ""
"Save all files first.\n"
@@ -7660,13 +7671,13 @@ msgstr ""
"Η δημιουργία patch απαιτεί να μην υπάρχουν σε αρχεία αλλαγές οι οποίες δεν έχουν αποθηκευθεί."
#. IDS_FOLDER_NOTEXIST
-#: Merge.rc:4923
+#: Merge.rc:4933
#, c-format
msgid "Folder does not exist."
msgstr "Ο φάκελος δεν υπάρχει."
#. IDS_NO_ZIP_SUPPORT
-#: Merge.rc:4928
+#: Merge.rc:4938
msgid "Archive support not enabled.\n7-Zip and/or Merge7z*.dll not found.\nSee manual for archive support."
msgstr ""
"Η υποστήριξη συμπιεσμένων αρχείων δεν είναι ενεργοποιημένη.\n"
@@ -7674,43 +7685,43 @@ msgstr ""
"Δείτε στο εγχειρίδιο για περισσότερες πληροφορίες σχετικά με την υποστήριξη συμπιεσμένων αρχείων και με τον τρόπο ενεργοποιήσεως αυτής."
#. IDS_OPT_EXPORT_CAPTION
-#: Merge.rc:4929
+#: Merge.rc:4939
#, c-format
msgid "Select file for export"
msgstr "Επιλέξατε αρχείο προς εξαγωγή"
#. IDS_OPT_IMPORT_CAPTION
-#: Merge.rc:4930
+#: Merge.rc:4940
#, c-format
msgid "Select file for import"
msgstr "Επιλέξατε αρχείο προς εισαγωγή"
#. IDS_OPT_IMPORT_DONE
-#: Merge.rc:4931
+#: Merge.rc:4941
#, c-format
msgid "Options imported from file."
msgstr "Οι ρυθμίσεις εισήχθησαν από το αρχείο."
#. IDS_OPT_EXPORT_DONE
-#: Merge.rc:4932
+#: Merge.rc:4942
#, c-format
msgid "Options exported to file."
msgstr "Οι ρυθμίσεις εξήχθησαν στο αρχείο."
#. IDS_OPT_IMPORT_ERR
-#: Merge.rc:4933
+#: Merge.rc:4943
#, c-format
msgid "Failed to import options from file."
msgstr "Αποτυχία εισαγωγής ρυθμίσεων από το αρχείο."
#. IDS_OPT_EXPORT_ERR
-#: Merge.rc:4934
+#: Merge.rc:4944
#, c-format
msgid "Failed to write options to file."
msgstr "Αποτυχία εγγραφής ρυθμίσεων στο αρχείο."
#. IDS_CLOSEALL_WINDOWS
-#: Merge.rc:4935
+#: Merge.rc:4945
#, c-format
msgid ""
"Close multiple compare windows?\n"
@@ -7722,1213 +7733,1218 @@ msgstr ""
"Επιθυμείτε να συνεχίσετε;"
#. IDS_EOL_MIXED
-#: Merge.rc:4944
+#: Merge.rc:4954
#, c-format
msgid "Mixed"
msgstr "Μικτό"
#. IDS_EOL_BIN
-#: Merge.rc:4945
+#: Merge.rc:4955
msgctxt "EOL Type"
msgid "Binary"
msgstr "Δυαδικό"
#. IDS_EOL_NONE
-#: Merge.rc:4949
+#: Merge.rc:4959
#, c-format
msgid "None"
msgstr "Χωρίς"
#. IDS_MARKER_COLOR_FMT
-#: Merge.rc:4950
+#: Merge.rc:4960
#, c-format
msgid "Marker Color %d"
msgstr ""
#. IDS_MARKER_NEW_PATTERN
-#: Merge.rc:4951
+#: Merge.rc:4961
msgid "New Pattern"
msgstr ""
#. IDS_PLUGINSLIST_TYPE
-#: Merge.rc:4957
+#: Merge.rc:4967
#, c-format
msgid "Type"
msgstr "Τύπος"
#. IDS_PLUGINS_TYPE_EDITSCRIPT
-#: Merge.rc:4961
+#: Merge.rc:4971
#, c-format
msgid "Editor script"
msgstr "Μακροεντολές Επεξεργαστή Κειμένου"
#. ID_SELECTLINEDIFF
-#: Merge.rc:4967
+#: Merge.rc:4977
#, c-format
msgid "\nDifference in Current Line (F4)"
msgstr ""
#. ID_OPTIONS
-#: Merge.rc:4968
+#: Merge.rc:4978
#, c-format
msgid "\nOptions"
msgstr ""
#. ID_REFRESH
-#: Merge.rc:4969
+#: Merge.rc:4979
#, c-format
msgid "\nRefresh (F5)"
msgstr ""
#. ID_PREVDIFF
-#: Merge.rc:4975
+#: Merge.rc:4985
#, c-format
msgid "\nPrevious Difference (Alt+Up)"
msgstr ""
#. ID_NEXTDIFF
-#: Merge.rc:4976
+#: Merge.rc:4986
#, c-format
msgid "\nNext Difference (Alt+Down)"
msgstr ""
#. ID_PREVCONFLICT
-#: Merge.rc:4977
+#: Merge.rc:4987
#, c-format
msgid "\nPrevious Conflict (Alt+Shift+Up)"
msgstr ""
#. ID_NEXTCONFLICT
-#: Merge.rc:4978
+#: Merge.rc:4988
#, c-format
msgid "\nNext Conflict (Alt+Shift+Down)"
msgstr ""
#. ID_FIRSTDIFF
-#: Merge.rc:4983
+#: Merge.rc:4993
#, c-format
msgid "\nFirst Difference (Alt+Home)"
msgstr ""
#. ID_CURDIFF
-#: Merge.rc:4984
+#: Merge.rc:4994
#, c-format
msgid "\nCurrent Difference (Alt+Enter)"
msgstr ""
#. ID_LASTDIFF
-#: Merge.rc:4985
+#: Merge.rc:4995
#, c-format
msgid "\nLast Difference (Alt+End)"
msgstr ""
#. ID_L2R
-#: Merge.rc:4986
+#: Merge.rc:4996
msgid "\nCopy to Right (Alt+Right)"
msgstr ""
#. ID_R2L
-#: Merge.rc:4987
+#: Merge.rc:4997
msgid "\nCopy to Left (Alt+Left)"
msgstr ""
#. ID_L2RNEXT
-#: Merge.rc:4988
+#: Merge.rc:4998
msgid "\nCopy to Right and Advance (Ctrl+Alt+Right)"
msgstr ""
#. ID_R2LNEXT
-#: Merge.rc:4989
+#: Merge.rc:4999
msgid "\nCopy to Left and Advance (Ctrl+Alt+Left)"
msgstr ""
#. ID_ALL_RIGHT
-#: Merge.rc:4990
+#: Merge.rc:5000
msgid "\nCopy All to Right"
msgstr "\nΑντιγραφή όλων Δεξιά"
#. ID_ALL_LEFT
-#: Merge.rc:4991
+#: Merge.rc:5001
msgid "\nCopy All to Left"
msgstr "\nΑντιγραφή όλων Αριστερά"
#. ID_AUTO_MERGE
-#: Merge.rc:4992
+#: Merge.rc:5002
#, c-format
msgid "\nAuto Merge (Ctrl+Alt+M)"
msgstr ""
#. ID_FIRSTFILE
-#: Merge.rc:4993
+#: Merge.rc:5003
msgid "\nFirst File"
msgstr ""
#. ID_NEXTFILE
-#: Merge.rc:4994
+#: Merge.rc:5004
msgid "\nNext File (Ctrl+F8)"
msgstr ""
#. ID_LASTFILE
-#: Merge.rc:4995
+#: Merge.rc:5005
msgid "\nLast File"
msgstr ""
#. ID_PREVFILE
-#: Merge.rc:4996
+#: Merge.rc:5006
msgid "\nPrevious File (Ctrl+F7)"
msgstr ""
#. IDS_UNPACK_AUTO
-#: Merge.rc:5003
+#: Merge.rc:5013
msgid "Adapted unpacker applied to both files (one needs extension)."
msgstr "Το συνεργαζόμενο αποσυμπιεστικό ενεργεί σε αμφότερα τα αρχεία (μόνο ένα αρχείο χρειάζεται να έχει την επέκταση)."
#. IDS_NO_PREDIFFER
-#: Merge.rc:5004
+#: Merge.rc:5014
#, c-format
msgid "No Prediffer (Normal)"
msgstr "Χωρίς προεπεξεργασία διαφορών (Κανονική Λειτουργία)"
#. IDS_SUGGESTED_PLUGINS
-#: Merge.rc:5005
+#: Merge.rc:5015
#, c-format
msgid "Suggested Plugins"
msgstr "Προτεινόμενα Αρθρώματα"
#. IDS_NOT_SUGGESTED_PLUGINS
-#: Merge.rc:5006
+#: Merge.rc:5016
msgid "All Plugins"
msgstr ""
#. IDS_PRIVATEBUILD_FMT
-#: Merge.rc:5012
+#: Merge.rc:5022
#, c-format
msgid "Private Build: %1"
msgstr "Ιδιωτική Μεταγλώττιση: %1"
#. IDS_CHECKFORUPDATES_UPTODATE
-#: Merge.rc:5013
+#: Merge.rc:5023
msgid "Your software is up to date."
msgstr ""
-#: Merge.rc:5015
+#: Merge.rc:5025
#, c-format
msgid "WinMerge update available.\n%1 available (you have %2). Download now?"
msgstr ""
#. IDS_ALLRIGHTS_RESERVED
-#: Merge.rc:5016
+#: Merge.rc:5026
msgid " - All rights reserved."
msgstr ""
#. IDS_CHECKFORUPDATES_FAILED
-#: Merge.rc:5021
+#: Merge.rc:5031
#, c-format
msgid "Failed to download latest version information"
msgstr ""
#. IDS_TITLE_PLUGINS_SETTINGS
-#: Merge.rc:5027
+#: Merge.rc:5037
#, c-format
msgid "Plugin Settings"
msgstr "Ρυθμίσεις Αρθρωμάτων"
#. IDS_NO_SCT_SCRIPTS
-#: Merge.rc:5029
+#: Merge.rc:5039
#, c-format
msgid "WSH not found - .sct scripts disabled"
msgstr "Το Περιβάλλον Διερμηνείας Windows (WSH) δε βρέθηκε - η χρήση αρχείων δέσμης ενεργειών .sct είναι απενεργοποιημένη"
#. IDS_LOCBAR_GOTOLINE_FMT
-#: Merge.rc:5037
+#: Merge.rc:5047
#, c-format
msgid "G&o to Line %1"
msgstr "Μετά&βαση στη Γραμμή %1"
#. IDS_GOTO_MOVED_LINE
-#: Merge.rc:5043
+#: Merge.rc:5053
msgid "Go to Moved Line\tCtrl+Shift+G"
msgstr ""
#. IDS_AUTOCOMPLETE_DISABLED
-#: Merge.rc:5049
+#: Merge.rc:5059
msgctxt "Options dialog|General|Open dialog Auto completion"
msgid "Disabled"
msgstr ""
#. IDS_AUTOCOMPLETE_FILE_SYS
-#: Merge.rc:5050
+#: Merge.rc:5060
#, c-format
msgid "From file system"
msgstr "Από Αρχειοσύστημα"
#. IDS_AUTOCOMPLETE_MRU
-#: Merge.rc:5051
+#: Merge.rc:5061
#, c-format
msgid "From Most Recently Used list"
msgstr "Από Κατάλογο προσφάτως χρησιμοποιηθέντων"
#. IDS_COLORSCHEME_PLAIN
-#: Merge.rc:5057
+#: Merge.rc:5067
#, c-format
msgid "No Highlighting"
msgstr "Χωρίς Χρωματισμό Κώδικα"
#. IDS_COLORSCHEME_BATCH
-#: Merge.rc:5063
+#: Merge.rc:5073
#, c-format
msgid "Batch"
msgstr ""
#. IDS_COLORSCHEME_PO
-#: Merge.rc:5090
+#: Merge.rc:5100
#, c-format
msgid "Portable Object"
msgstr ""
#. IDS_COLORSCHEME_RSRC
-#: Merge.rc:5094
+#: Merge.rc:5104
#, c-format
msgid "Resources"
msgstr ""
#. IDS_COLORSCHEME_SH
-#: Merge.rc:5098
+#: Merge.rc:5108
#, c-format
msgid "Shell"
msgstr ""
#. IDS_CLOSE_LEFT_TABS
-#: Merge.rc:5115
+#: Merge.rc:5125
#, c-format
msgid "Close &Left Tabs"
msgstr ""
#. IDS_CLOSE_RIGHT_TABS
-#: Merge.rc:5116
+#: Merge.rc:5126
#, c-format
msgid "Close R&ight Tabs"
msgstr ""
#. IDS_CLOSE_OTHER_TABS
-#: Merge.rc:5117
+#: Merge.rc:5127
#, c-format
msgid "Close &Other Tabs"
msgstr ""
#. IDS_TABBAR_AUTO_MAXWIDTH
-#: Merge.rc:5118
+#: Merge.rc:5128
#, c-format
msgid "Enable &Auto Max Width"
msgstr ""
#. IDS_WEBPAGE_MENU
-#: Merge.rc:5128
+#: Merge.rc:5138
msgid "We&bpage"
msgstr ""
#. IDS_VIEW_WRAP_TEXT
-#: Merge.rc:5133
+#: Merge.rc:5143
msgid "W&rap Text"
msgstr ""
#. IDS_NOTINSTALLED
-#: Merge.rc:5138
+#: Merge.rc:5148
msgid "%1 is not installed."
msgstr ""
#. IDS_CREATE_FOLDER
-#: Merge.rc:5143
+#: Merge.rc:5153
#, c-format
msgid "%1 does not exist. Create it?"
msgstr ""
#. IDS_CREATE_FOLDER_ERROR
-#: Merge.rc:5144
+#: Merge.rc:5154
#, c-format
msgid "Failed to create folder."
msgstr ""
#. IDC_EXT_EDITOR_PATH
-#: Merge.rc:5149
+#: Merge.rc:5159
#, c-format
msgid "Parameters:\n$file: Current file path\n$linenum: Current cursor line number"
msgstr ""
#. IDS_DIFF_ALGORITHM_DEFAULT
-#: Merge.rc:5154
+#: Merge.rc:5164
msgid "default"
msgstr ""
#. IDS_DIFF_ALGORITHM_MINIMAL
-#: Merge.rc:5155
+#: Merge.rc:5165
msgid "minimal"
msgstr ""
#. IDS_DIFF_ALGORITHM_PATIENCE
-#: Merge.rc:5156
+#: Merge.rc:5166
msgid "patience"
msgstr ""
#. IDS_DIFF_ALGORITHM_HISTOGRAM
-#: Merge.rc:5157
+#: Merge.rc:5167
msgid "histogram"
msgstr ""
#. IDS_DIFF_ALGORITHM_NONE
-#: Merge.rc:5158
+#: Merge.rc:5168
msgid "none"
msgstr ""
#. IDS_RENDERING_MODE_GDI
-#: Merge.rc:5163
+#: Merge.rc:5173
msgid "GDI"
msgstr ""
#. IDS_RENDERING_MODE_DIRECTWRITE_DEFAULT
-#: Merge.rc:5164
+#: Merge.rc:5174
msgid "DirectWrite Default"
msgstr ""
#. IDS_RENDERING_MODE_DIRECTWRITE_ALIASED
-#: Merge.rc:5165
+#: Merge.rc:5175
msgid "DirectWrite Aliased"
msgstr ""
#. IDS_RENDERING_MODE_DIRECTWRITE_GDI_CLASSIC
-#: Merge.rc:5166
+#: Merge.rc:5176
msgid "DirectWrite GDI Classic"
msgstr ""
#. IDS_RENDERING_MODE_DIRECTWRITE_GDI_NATURAL
-#: Merge.rc:5167
+#: Merge.rc:5177
msgid "DirectWrite GDI Natural"
msgstr ""
#. IDS_RENDERING_MODE_DIRECTWRITE_NATURAL
-#: Merge.rc:5168
+#: Merge.rc:5178
msgid "DirectWrite Natural"
msgstr ""
#. IDS_RENDERING_MODE_DIRECTWRITE_NATURAL_SYMMETRIC
-#: Merge.rc:5169
+#: Merge.rc:5179
msgid "DirectWrite Natural Symmetric"
msgstr ""
#. IDS_CLOSE_WINDOWS_WITH_ESC_DISABLED
-#: Merge.rc:5174
+#: Merge.rc:5184
msgctxt "Options dialog|General|Close windows with Esc"
msgid "Disabled"
msgstr ""
#. IDS_CLOSE_WINDOWS_WITH_ESC_1
-#: Merge.rc:5175
+#: Merge.rc:5185
msgid "MDI child window or main window"
msgstr ""
#. IDS_CLOSE_WINDOWS_WITH_ESC_2
-#: Merge.rc:5176
+#: Merge.rc:5186
msgid "MDI child window only"
msgstr ""
#. IDS_CLOSE_WINDOWS_WITH_ESC_3
-#: Merge.rc:5177
+#: Merge.rc:5187
msgid "Close main window if only one MDI child window"
msgstr ""
#. IDS_DIFF_GROUP
-#: Merge.rc:5182
+#: Merge.rc:5192
msgctxt "ImgMergeFrame|LocationPane"
msgid "Diff"
msgstr ""
#. IDS_DIFF_HIGHLIGHT
-#: Merge.rc:5183
+#: Merge.rc:5193
msgctxt "ImgMergeFrame|LocationPane"
msgid "Highlight"
msgstr ""
#. IDS_DIFF_BLINK
-#: Merge.rc:5184
+#: Merge.rc:5194
msgctxt "ImgMergeFrame|LocationPane"
msgid "Blink"
msgstr ""
#. IDS_DIFF_BLOCKSIZE
-#: Merge.rc:5185
+#: Merge.rc:5195
msgctxt "ImgMergeFrame|LocationPane"
msgid "Block Size"
msgstr ""
#. IDS_DIFF_BLOCKALPHA
-#: Merge.rc:5186
+#: Merge.rc:5196
msgctxt "ImgMergeFrame|LocationPane"
msgid "Block Alpha"
msgstr ""
#. IDS_DIFF_CDTHRESHOLD
-#: Merge.rc:5187
+#: Merge.rc:5197
msgctxt "ImgMergeFrame|LocationPane"
msgid "CD Threshold"
msgstr ""
#. IDS_DIFF_INSERTION_DELETION_DETECTION
-#: Merge.rc:5188
+#: Merge.rc:5198
msgctxt "ImgMergeFrame|LocationPane"
msgid "Ins/Del Detection"
msgstr ""
#. IDS_OVERLAY_MODE_NONE
-#: Merge.rc:5189 Merge.rc:5194
+#: Merge.rc:5199 Merge.rc:5204
msgctxt "ImgMergeFrame|LocationPane"
msgid "None"
msgstr ""
#. IDS_DIFF_INSERTION_DELETION_DETECTION_VERTICAL
-#: Merge.rc:5190
+#: Merge.rc:5200
msgctxt "ImgMergeFrame|LocationPane"
msgid "Vertical"
msgstr ""
#. IDS_DIFF_INSERTION_DELETION_DETECTION_HORIZONTAL
-#: Merge.rc:5191
+#: Merge.rc:5201
msgctxt "ImgMergeFrame|LocationPane"
msgid "Horizontal"
msgstr ""
#. IDS_OVERLAY_GROUP
-#: Merge.rc:5192
+#: Merge.rc:5202
msgctxt "ImgMergeFrame|LocationPane"
msgid "Overlay"
msgstr ""
#. IDS_OVERLAY_ALPHA
-#: Merge.rc:5193
+#: Merge.rc:5203
msgctxt "ImgMergeFrame|LocationPane"
msgid "Alpha"
msgstr ""
#. IDS_OVERLAY_MODE_XOR
-#: Merge.rc:5195
+#: Merge.rc:5205
msgctxt "ImgMergeFrame|LocationPane"
msgid "XOR"
msgstr ""
#. IDS_OVERLAY_MODE_ALPHA
-#: Merge.rc:5196
+#: Merge.rc:5206
msgctxt "ImgMergeFrame|LocationPane"
msgid "Alpha Blend"
msgstr ""
#. IDS_OVERLAY_MODE_ALPHA_ANIMATION
-#: Merge.rc:5197
+#: Merge.rc:5207
msgctxt "ImgMergeFrame|LocationPane"
msgid "Alpha Animation"
msgstr ""
#. IDS_ZOOM
-#: Merge.rc:5198
+#: Merge.rc:5208
msgctxt "ImgMergeFrame|LocationPane"
msgid "Zoom"
msgstr ""
#. IDS_PAGE
-#: Merge.rc:5199
+#: Merge.rc:5209
msgctxt "ImgMergeFrame|LocationPane"
msgid "Page:"
msgstr ""
#. IDS_IMGCMP_STATUS_PT_RGBA_FMT
-#: Merge.rc:5200
+#: Merge.rc:5210
#, c-format
msgid "Pt: (%d, %d) RGBA: (%d, %d, %d, %d) "
msgstr ""
#. IDS_IMGCMP_STATUS_DIST1_FMT
-#: Merge.rc:5201
+#: Merge.rc:5211
#, c-format
msgid "Dist: %g "
msgstr ""
#. IDS_IMGCMP_STATUS_DIST2_FMT
-#: Merge.rc:5202
+#: Merge.rc:5212
#, c-format
msgid "Dist: %g, %g "
msgstr ""
#. IDS_IMGCMP_STATUS_PAGE_ZOOM_SIZE_BPP_FMT
-#: Merge.rc:5203
+#: Merge.rc:5213
#, c-format
msgid "Page: %d/%d Zoom: %d%% %dx%dpx %dbpp "
msgstr ""
#. IDS_IMGCMP_STATUS_RC_FMT
-#: Merge.rc:5204
+#: Merge.rc:5214
#, c-format
msgid "Rc: (%d, %d) "
msgstr ""
#. IDS_IMGCMP_STATUS_FLIPPED_FMT
-#: Merge.rc:5205
+#: Merge.rc:5215
#, c-format
msgid "Flipped: %s "
msgstr ""
#. IDS_IMGCMP_STATUS_ROTATED_FMT
-#: Merge.rc:5206
+#: Merge.rc:5216
#, c-format
msgid "Rotated: %d "
msgstr ""
#. IDS_IMGCMP_REPORT_ALLPAGES
-#: Merge.rc:5207
+#: Merge.rc:5217
msgid "All pages"
msgstr ""
#. IDS_IGNSUB_STR1
-#: Merge.rc:5212
+#: Merge.rc:5222
msgid ""
msgstr ""
#. IDS_IGNSUB_STR2
-#: Merge.rc:5213
+#: Merge.rc:5223
msgid "No differences found to select"
msgstr ""
#. IDS_IGNSUB_STR3
-#: Merge.rc:5214
+#: Merge.rc:5224
msgid "No differences found to add as substitution filter"
msgstr ""
#. IDS_IGNSUB_STR4
-#: Merge.rc:5215
+#: Merge.rc:5225
msgid "The pair is already in the Substitution Filters list"
msgstr ""
#. IDS_IGNSUB_STR5
-#: Merge.rc:5216
+#: Merge.rc:5226
msgid "Add this change to Substitution Filters?"
msgstr ""
#. IDS_OCRRESULT_TEXTONLY
-#: Merge.rc:5221
+#: Merge.rc:5231
msgid "Text only"
msgstr ""
#. IDS_OCRRESULT_POS_LINE
-#: Merge.rc:5222
+#: Merge.rc:5232
msgid "Line-by-line position and text"
msgstr ""
#. IDS_OCRRESULT_POS_WORD
-#: Merge.rc:5223
+#: Merge.rc:5233
msgid "Word-by-word position and text"
msgstr ""
#. IDS_USERDATAFOLDER_APPDATA
-#: Merge.rc:5228
+#: Merge.rc:5238
msgid "AppData (Roaming) folder"
msgstr ""
#. IDS_USERDATAFOLDER_INSTALL
-#: Merge.rc:5229
+#: Merge.rc:5239
msgid "Install folder"
msgstr ""
#. IDS_USERDATAFOLDER_DOCUMENTS
-#: Merge.rc:5230
+#: Merge.rc:5240
msgid "Documents folder"
msgstr ""
#. IDS_SINGLEINSTANCE_DISABLED
-#: Merge.rc:5235
+#: Merge.rc:5245
msgctxt "Options dialog|General|Single instance mode"
msgid "Disabled"
msgstr ""
#. IDS_SINGLEINSTANCE_STR1
-#: Merge.rc:5236
+#: Merge.rc:5246
#, c-format
msgid "Allow only one instance to run"
msgstr "Επιτρέπεται μόνο μία υπόσταση του WinMerge ανοικτή"
#. IDS_SINGLEINSTANCE_STR2
-#: Merge.rc:5237
+#: Merge.rc:5247
msgid "Allow only one instance; wait for termination"
msgstr ""
#. IDS_AUTO_RELOAD_MODIFIED_FILES_DISABLED
-#: Merge.rc:5242
+#: Merge.rc:5252
msgctxt "Options dialog|General|Auto-reload modified files"
msgid "Disabled"
msgstr ""
#. IDS_AUTO_RELOAD_MODIFIED_FILES_STR1
-#: Merge.rc:5243
+#: Merge.rc:5253
msgid "Only on window activated"
msgstr ""
#. IDS_AUTO_RELOAD_MODIFIED_FILES_STR2
-#: Merge.rc:5244
+#: Merge.rc:5254
msgid "Immediately"
msgstr ""
#. IDS_PLUGIN_ALL
-#: Merge.rc:5249
+#: Merge.rc:5259
msgid "Al&l"
msgstr ""
#. IDS_PLUGIN_OTHERS
-#: Merge.rc:5250
+#: Merge.rc:5260
msgid "&Others"
msgstr ""
-#: Merge.rc:5252
+#: Merge.rc:5262
#, c-format
msgid "Missing plugin name in pipeline: %1"
msgstr ""
-#: Merge.rc:5254
+#: Merge.rc:5264
#, c-format
msgid "Missing quote in plugin pipeline: %1"
msgstr ""
#. IDS_PLUGIN_NAME_ALREADY_EXISTS
-#: Merge.rc:5255
+#: Merge.rc:5265
#, c-format
msgid "Plugin name '%1' already exists."
msgstr ""
#. IDS_PLUGIN_TITLE1
-#: Merge.rc:5256
+#: Merge.rc:5266
msgid "Specify plugin arguments"
msgstr ""
-#: Merge.rc:5258
+#: Merge.rc:5268
#, c-format
msgid "Plugin not found or invalid: %1"
msgstr ""
#. IDS_PLUGIN_NOT_UNPACK
-#: Merge.rc:5259
+#: Merge.rc:5269
#, c-format
msgid "'%1' is not an unpacker plugin"
msgstr ""
#. IDS_PLUGIN_NOT_PREDIFF
-#: Merge.rc:5260
+#: Merge.rc:5270
#, c-format
msgid "'%1' is not a prediffer plugin"
msgstr ""
-#: Merge.rc:5262
+#: Merge.rc:5272
#, c-format
msgid "Error prediffing '%1' with '%2'. Prediffing disabled."
msgstr ""
#. IDS_PLUGIN_CIRCULAR_REFERENCE
-#: Merge.rc:5263
+#: Merge.rc:5273
#, c-format
msgid "Circular reference in plugin pipeline: %1"
msgstr ""
#. IDS_PLUGIN_TYPE1
-#: Merge.rc:5264
+#: Merge.rc:5274
msgid "URL Handler"
msgstr ""
#. IDS_PLUGIN_TYPE2
-#: Merge.rc:5265
+#: Merge.rc:5275
msgid "File Unpacker"
msgstr ""
#. IDS_PLUGIN_TYPE3
-#: Merge.rc:5266
+#: Merge.rc:5276
msgid "File or Folder Unpacker"
msgstr ""
#. IDS_PLUGIN_TYPE5
-#: Merge.rc:5268
+#: Merge.rc:5278
msgid "Alias for Unpacker"
msgstr ""
#. IDS_PLUGIN_TYPE6
-#: Merge.rc:5269
+#: Merge.rc:5279
msgid "Alias for Prediffer"
msgstr ""
#. IDS_PLUGIN_TYPE7
-#: Merge.rc:5270
+#: Merge.rc:5280
msgid "Alias for Editor script"
msgstr ""
#. IDS_PLUGIN_ALIAS_DESC
-#: Merge.rc:5271
+#: Merge.rc:5281
#, c-format
msgid "Alias for plugin pipeline '%1'"
msgstr ""
#. IDS_PLUGIN_NEW_DESC
-#: Merge.rc:5272
+#: Merge.rc:5282
msgid "New plugin description"
msgstr ""
#. IDS_PLUGIN_TARGETS_ALL
-#: Merge.rc:5273
+#: Merge.rc:5283
msgid "All"
msgstr ""
#. IDS_PLUGIN_TARGETS_1ST
-#: Merge.rc:5274
+#: Merge.rc:5284
msgid "1st"
msgstr ""
#. IDS_PLUGIN_TARGETS_2ND
-#: Merge.rc:5275
+#: Merge.rc:5285
msgid "2nd"
msgstr ""
#. IDS_PLUGIN_TARGETS_3RD
-#: Merge.rc:5276
+#: Merge.rc:5286
msgid "3rd"
msgstr ""
#. IDS_PLUGIN_TARGETS_1ST_2ND
-#: Merge.rc:5277
+#: Merge.rc:5287
msgid "1st and 2nd"
msgstr ""
#. IDS_PLUGIN_TARGETS_1ST_3RD
-#: Merge.rc:5278
+#: Merge.rc:5288
msgid "1st and 3rd"
msgstr ""
#. IDS_PLUGIN_TARGETS_2ND_3RD
-#: Merge.rc:5279
+#: Merge.rc:5289
msgid "2nd and 3rd"
msgstr ""
#. IDS_FILTER_APPLIED
-#: Merge.rc:5284
+#: Merge.rc:5294
msgid "Filter applied"
msgstr ""
#. IDS_FILTERMENU_COMPARE
-#: Merge.rc:5289
+#: Merge.rc:5299
#, c-format
msgid "Compare %1"
msgstr ""
#. IDS_FILTERMENU_FILTER_BY_THIS_COLUMN
-#: Merge.rc:5290
+#: Merge.rc:5300
msgid "&Filter by This Column"
msgstr ""
#. IDS_FILTERMENU_FILTER_BY_THIS_COLUMN2
-#: Merge.rc:5291
+#: Merge.rc:5301
msgid "&Filter by This Column..."
msgstr ""
#. IDS_CLIPBOARDHISTORY_TIME
-#: Merge.rc:5296
+#: Merge.rc:5306
#, c-format
msgid "Clipboard at %s"
msgstr ""
#. IDS_CLIPBOARDHISTORY_DISABLED
-#: Merge.rc:5297
+#: Merge.rc:5307
msgid "Clipboard history disabled.\r\nEnable: Windows logo key + V, then Turn on."
msgstr ""
-#: Merge.rc:5299
+#: Merge.rc:5309
msgid "This system does not support clipboard history."
msgstr ""
-#: Merge.rc:5301
+#: Merge.rc:5311
msgid "32-bit WinMerge does not support Clipboard Compare"
msgstr ""
#. IDS_WEBVIEW2_RUNTIME_NOT_INSTALLED
-#: Merge.rc:5306
+#: Merge.rc:5316
msgid "WebView2 runtime not installed. Download it?"
msgstr ""
#. IDS_JUMPLIST_NEW_TEXT_COMPARE
-#: Merge.rc:5311
+#: Merge.rc:5321
msgid "New Text Compare"
msgstr ""
#. IDS_JUMPLIST_NEW_TABLE_COMPARE
-#: Merge.rc:5312
+#: Merge.rc:5322
msgid "New Table Compare"
msgstr ""
#. IDS_JUMPLIST_NEW_BINARY_COMPARE
-#: Merge.rc:5313
+#: Merge.rc:5323
msgid "New Binary Compare"
msgstr ""
#. IDS_JUMPLIST_NEW_IMAGE_COMPARE
-#: Merge.rc:5314
+#: Merge.rc:5324
msgid "New Image Compare"
msgstr ""
#. IDS_JUMPLIST_NEW_WEBPAGE_COMPARE
-#: Merge.rc:5315
+#: Merge.rc:5325
msgid "New Webpage Compare"
msgstr ""
+#. IDS_JUMPLIST_NEW_FOLDER_COMPARE
+#: Merge.rc:5326
+msgid "New Folder Compare"
+msgstr ""
+
#. IDS_JUMPLIST_CLIPBOARD_COMPARE
-#: Merge.rc:5316
+#: Merge.rc:5327
msgid "Clipboard Compare"
msgstr ""
#. IDS_PREVIEWBAR_PRINT
-#: Merge.rc:5321
+#: Merge.rc:5332
msgid "&Print..."
msgstr ""
#. IDS_PREVIEWBAR_PREVPAGE
-#: Merge.rc:5323
+#: Merge.rc:5334
msgid "Pre&v Page"
msgstr ""
#. IDS_PREVIEWBAR_TWOPAGE
-#: Merge.rc:5324
+#: Merge.rc:5335
msgid "&Two Page"
msgstr ""
#. IDS_PREVIEWBAR_ONEPAGE
-#: Merge.rc:5325
+#: Merge.rc:5336
msgid "&One Page"
msgstr ""
#. IDS_PREVIEWBAR_ZOOMIN
-#: Merge.rc:5326
+#: Merge.rc:5337
msgid "Zoom &In"
msgstr ""
#. IDS_PREVIEWBAR_ZOOMOUT
-#: Merge.rc:5327
+#: Merge.rc:5338
msgid "Zoom &Out"
msgstr ""
#. IDS_WEBPAGE_COMPARING
-#: Merge.rc:5333
+#: Merge.rc:5344
msgid "Comparing..."
msgstr ""
#. IDS_WEBPAGE_ZOOM
-#: Merge.rc:5334
+#: Merge.rc:5345
msgid "Zoom:"
msgstr ""
#. IDS_COPY_GRANULARITY_DIFFHUNK
-#: Merge.rc:5339
+#: Merge.rc:5350
msgid "Diff hunk"
msgstr ""
#. IDS_COPY_GRANULARITY_INLINE
-#: Merge.rc:5340
+#: Merge.rc:5351
msgid "Inline diff"
msgstr ""
#. IDS_COPY_GRANULARITY_LINE
-#: Merge.rc:5341
+#: Merge.rc:5352
msgid "Line"
msgstr ""
-#: Merge.rc:5342
+#: Merge.rc:5353
msgid "Character"
msgstr ""
#. ID_MICE_PREVDIFF
-#: Merge.rc:5347
+#: Merge.rc:5358
msgid "\nPrevious Difference (Alt+Up)\n(Right Button+Wheel Up)\n(Alt+Wheel Up)"
msgstr ""
#. ID_MICE_NEXTDIFF
-#: Merge.rc:5348
+#: Merge.rc:5359
msgid "\nNext Difference (Alt+Down)\n(Right Button+Wheel Down)\n(Alt+Wheel Down)"
msgstr ""
#. ID_MICE_L2R
-#: Merge.rc:5349
+#: Merge.rc:5360
msgid "\nCopy to Right (Alt+Right)\n(Right Button+Wheel Right)\n(Alt+Wheel Right)\n(Alt+Shift+Wheel Down)"
msgstr ""
#. ID_MICE_R2L
-#: Merge.rc:5350
+#: Merge.rc:5361
msgid "\nCopy to Left (Alt+Left)\n(Right Button+Wheel Left)\n(Alt+Wheel Left)\n(Alt+Shift+Wheel Up)"
msgstr ""
#. ID_MICE_L2RNEXT
-#: Merge.rc:5351
+#: Merge.rc:5362
msgid "\nCopy to Right and Advance (Ctrl+Alt+Right)\n(Ctrl+Alt+Wheel Right)\n(Ctrl+Alt+Shift+Wheel Down)"
msgstr ""
#. ID_MICE_R2LNEXT
-#: Merge.rc:5352
+#: Merge.rc:5363
msgid "\nCopy to Left and Advance (Ctrl+Alt+Left)\n(Ctrl+Alt+Wheel Left)\n(Ctrl+Alt+Shift+Wheel Up)"
msgstr ""
#. IDS_LOG_COMPARING_2
-#: Merge.rc:5362
+#: Merge.rc:5373
#, c-format
msgid "Comparing %1 with %2"
msgstr ""
#. IDS_LOG_COMPARING_3
-#: Merge.rc:5363
+#: Merge.rc:5374
#, c-format
msgid "Comparing %1 with %2 and %3"
msgstr ""
#. IDS_LOG_COMPARE_COMPLETED
-#: Merge.rc:5364
+#: Merge.rc:5375
msgid "Comparison completed"
msgstr ""
#. IDS_LOG_COMPARE_ERROR_2
-#: Merge.rc:5365
+#: Merge.rc:5376
#, c-format
msgid "Failed to compare %1 with %2: "
msgstr ""
#. IDS_LOG_COMPARE_ERROR_3
-#: Merge.rc:5366
+#: Merge.rc:5377
#, c-format
msgid "Failed to compare %1 with %2 and %3: "
msgstr ""
#. IDS_LOG_FILE_SAVED
-#: Merge.rc:5367
+#: Merge.rc:5378
msgid "File saved"
msgstr ""
#. IDS_LOG_COPYING_FILES
-#: Merge.rc:5368
+#: Merge.rc:5379
msgid "Copying files..."
msgstr ""
#. IDS_LOG_MOVING_FILES
-#: Merge.rc:5369
+#: Merge.rc:5380
msgid "Moving files..."
msgstr ""
#. IDS_LOG_DELETING_FILES
-#: Merge.rc:5370
+#: Merge.rc:5381
msgid "Deleting files..."
msgstr ""
#. IDS_LOG_RECYCLEBIN
-#: Merge.rc:5371
+#: Merge.rc:5382
msgid "Recycle Bin"
msgstr ""
#. IDS_LOG_PERMANENTLY_DELETED
-#: Merge.rc:5372
+#: Merge.rc:5383
msgid "Permanently deleted"
msgstr ""
#. IDS_LOG_FILEOPERATION_COMPLETED
-#: Merge.rc:5373
+#: Merge.rc:5384
msgid "File operation completed successfully"
msgstr ""
#. IDS_LOG_FILEOPERATION_CANCELED
-#: Merge.rc:5374
+#: Merge.rc:5385
msgid "File operation canceled"
msgstr ""
#. IDS_FILTER_ERROR_NO_ERROR
-#: Merge.rc:5379
+#: Merge.rc:5390
msgid "No error"
msgstr ""
#. IDS_FILTER_ERROR_EMPTY_EXPRESSION
-#: Merge.rc:5380
+#: Merge.rc:5391
msgid "Filter expression is empty"
msgstr ""
#. IDS_FILTER_ERROR_UNKNOWN_CHAR
-#: Merge.rc:5381
+#: Merge.rc:5392
msgid "Unknown character in filter expression"
msgstr ""
#. IDS_FILTER_ERROR_UNTERMINATED_STRING
-#: Merge.rc:5382
+#: Merge.rc:5393
msgid "Unterminated string literal"
msgstr ""
#. IDS_FILTER_ERROR_SYNTAX_ERROR
-#: Merge.rc:5383
+#: Merge.rc:5394
msgid "Syntax error in filter expression"
msgstr ""
#. IDS_FILTER_ERROR_PARSE_FAILURE
-#: Merge.rc:5384
+#: Merge.rc:5395
msgid "Failed to parse filter expression"
msgstr ""
#. IDS_FILTER_ERROR_INVALID_LITERAL
-#: Merge.rc:5385
+#: Merge.rc:5396
msgid "Invalid literal value"
msgstr ""
#. IDS_FILTER_ERROR_INVALID_REGULAR_EXPRESSION
-#: Merge.rc:5386
+#: Merge.rc:5397
msgid "Invalid regular expression"
msgstr ""
#. IDS_FILTER_ERROR_UNDEFINED_IDENTIFIER
-#: Merge.rc:5387
+#: Merge.rc:5398
msgid "Undefined identifier"
msgstr ""
#. IDS_FILTER_ERROR_INVALID_ARGUMENT_COUNT
-#: Merge.rc:5388
+#: Merge.rc:5399
msgid "Invalid number of arguments"
msgstr ""
#. IDS_FILTER_ERROR_FILTER_NAME_NOT_FOUND
-#: Merge.rc:5389
+#: Merge.rc:5400
msgid "Filter name not found"
msgstr ""
#. IDS_FILTER_ERROR_DIVIDE_BY_ZERO
-#: Merge.rc:5390
+#: Merge.rc:5401
msgid "Division by zero in filter expression"
msgstr ""
#. IDS_FILTER_ERROR_UNKNOWN_ERROR
-#: Merge.rc:5391
+#: Merge.rc:5402
msgid "Unknown error"
msgstr ""
#. IDS_FILTER_ERROR_INVALID_PROPERTY_NAME
-#: Merge.rc:5392
+#: Merge.rc:5403
msgid "Invalid property name"
msgstr ""
#. IDS_FILTER_ERROR_INVALID_DIRECTIVE
-#: Merge.rc:5393
+#: Merge.rc:5404
msgid "Invalid directive"
msgstr ""
#. IDS_FILTER_OP_EQUALS
-#: Merge.rc:5398
+#: Merge.rc:5409
msgid "Equals"
msgstr ""
#. IDS_FILTER_OP_NOT_EQUALS
-#: Merge.rc:5399
+#: Merge.rc:5410
msgid "Does not equal"
msgstr ""
#. IDS_FILTER_OP_LESS_THAN
-#: Merge.rc:5400
+#: Merge.rc:5411
msgid "Less than"
msgstr ""
#. IDS_FILTER_OP_LESS_EQUAL
-#: Merge.rc:5401
+#: Merge.rc:5412
msgid "Less than or equal to"
msgstr ""
#. IDS_FILTER_OP_GREATER_EQUAL
-#: Merge.rc:5402
+#: Merge.rc:5413
msgid "Greater than or equal to"
msgstr ""
#. IDS_FILTER_OP_GREATER_THAN
-#: Merge.rc:5403
+#: Merge.rc:5414
msgid "Greater than"
msgstr ""
#. IDS_FILTER_OP_BETWEEN
-#: Merge.rc:5404
+#: Merge.rc:5415
msgid "Between"
msgstr ""
#. IDS_FILTER_OP_NOT_BETWEEN
-#: Merge.rc:5405
+#: Merge.rc:5416
msgid "Not Between"
msgstr ""
#. IDS_FILTER_OP_CONTAINS
-#: Merge.rc:5406
+#: Merge.rc:5417
msgid "Contains"
msgstr ""
#. IDS_FILTER_OP_NOT_CONTAINS
-#: Merge.rc:5407
+#: Merge.rc:5418
msgid "Not Contains"
msgstr ""
#. IDS_FILTER_OP_RECONTAINS
-#: Merge.rc:5408
+#: Merge.rc:5419
msgid "Contains (regex)"
msgstr ""
#. IDS_FILTER_OP_NOT_RECONTAINS
-#: Merge.rc:5409
+#: Merge.rc:5420
msgid "Not Contains (regex)"
msgstr ""
#. IDS_FILTER_OP_LIKE
-#: Merge.rc:5410
+#: Merge.rc:5421
msgid "Match (wildcard)"
msgstr ""
#. IDS_FILTER_OP_NOT_LIKE
-#: Merge.rc:5411
+#: Merge.rc:5422
msgid "Not match (wildcard)"
msgstr ""
#. IDS_FILTER_OP_MATCHES
-#: Merge.rc:5412
+#: Merge.rc:5423
msgid "Match (regex)"
msgstr ""
#. IDS_FILTER_OP_NOT_MATCHES
-#: Merge.rc:5413
+#: Merge.rc:5424
msgid "Not match (regex)"
msgstr ""
#. IDS_COLORMODE_LIGHT
-#: Merge.rc:5418
+#: Merge.rc:5429
msgid "Light"
msgstr ""
#. IDS_COLORMODE_DARK
-#: Merge.rc:5419
+#: Merge.rc:5430
msgid "Dark"
msgstr ""
#. IDS_COLORMODE_FOLLOWSYSTEM
-#: Merge.rc:5420
+#: Merge.rc:5431
msgid "Follow system"
msgstr ""
#. IDS_EXAMPLE
-#: Merge.rc:5425
+#: Merge.rc:5436
#, c-format
msgid "e.g. %1"
msgstr ""
#. IDS_DETECTED_PREVIOUS_CRASH
-#: Merge.rc:5430
+#: Merge.rc:5441
msgid "WinMerge detected a previous crash. Please report this if possible."
msgstr ""
#. IDS_REGEX_REPLACE_LIST_TEMPLATE
-#: Merge.rc:5435
+#: Merge.rc:5446
msgid "# Regex replacement list\r\n# Format: regexreplacement\r\n# Backreferences like $1, $2 are supported\r\n\r\n(\\d{4})-(\\d{2})-(\\d{2})\t$1_$2_$3\r\n"
msgstr ""
#. IDS_STRING_REPLACE_LIST_TEMPLATE
-#: Merge.rc:5436
+#: Merge.rc:5447
msgid "# Replacement list\r\n# Format: searchreplacement\r\n# Lines starting with # are ignored\r\n\r\nfrom1\tto1\r\nfrom2\tto2\r\n"
msgstr ""
diff --git a/Translations/WinMerge/Hebrew.po b/Translations/WinMerge/Hebrew.po
index 38832c8b35a..398a156aece 100644
--- a/Translations/WinMerge/Hebrew.po
+++ b/Translations/WinMerge/Hebrew.po
@@ -21,7 +21,7 @@ msgstr ""
"X-Generator: Poedit 3.5\n"
#. LANGUAGE, SUBLANGUAGE
-#: Merge.rc:26 Merge.rc:59 Merge.rc:5453
+#: Merge.rc:26 Merge.rc:59 Merge.rc:5464
msgid "LANG_ENGLISH, SUBLANG_ENGLISH_US"
msgstr "LANG_HEBREW, SUBLANG_HEBREW_ISRAEL"
@@ -106,7 +106,7 @@ msgid "Copy Selected Diff (Right) to Clipboard\tCtrl+&3"
msgstr "העתק שינוי נבחר (ימין) ללוח\tCtrl+3"
#. IDR_MERGEDOCTYPE, ID_SELECTLINEDIFF
-#: Merge.rc:110 Merge.rc:673
+#: Merge.rc:110 Merge.rc:680
msgid "Select Line &Difference\tF4"
msgstr "בחר הבדל בשורה\tF4"
@@ -136,7 +136,7 @@ msgid "Cu&t"
msgstr "גזור"
#. IDR_POPUP_DIRVIEW
-#: Merge.rc:118 Merge.rc:943
+#: Merge.rc:118 Merge.rc:951
msgid "&Copy"
msgstr "העתק"
@@ -146,19 +146,19 @@ msgid "&Paste"
msgstr "הדבק"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:121 Merge.rc:875 Merge.rc:882
+#: Merge.rc:121 Merge.rc:882 Merge.rc:889
msgid "&Scripts"
msgstr "סקריפטים"
#. IDS_NO_EDIT_SCRIPTS
-#: Merge.rc:123 Merge.rc:338 Merge.rc:447 Merge.rc:654 Merge.rc:659
-#: Merge.rc:865 Merge.rc:877 Merge.rc:884 Merge.rc:940 Merge.rc:1183
-#: Merge.rc:5028
+#: Merge.rc:123 Merge.rc:340 Merge.rc:451 Merge.rc:661 Merge.rc:666
+#: Merge.rc:872 Merge.rc:884 Merge.rc:891 Merge.rc:948 Merge.rc:1193
+#: Merge.rc:5038
msgid "< Empty >"
msgstr "< ריק >"
#. IDR_POPUP_LOCATIONBAR, ID_EDIT_WMGOTO
-#: Merge.rc:126 Merge.rc:691 Merge.rc:1081
+#: Merge.rc:126 Merge.rc:698 Merge.rc:1089
msgid "&Go to...\tCtrl+G"
msgstr "עבור אל...\tCtrl+G"
@@ -178,27 +178,27 @@ msgid "Op&en"
msgstr "פתח"
#. IDR_POPUP_DIRVIEW, ID_DIR_OPEN_RIGHT
-#: Merge.rc:132 Merge.rc:981 Merge.rc:988 Merge.rc:995
+#: Merge.rc:132 Merge.rc:989 Merge.rc:996 Merge.rc:1003
msgid "With &Registered Application"
msgstr "פתח עם יישום רשום"
#. IDR_POPUP_DIRVIEW, ID_DIR_OPEN_RIGHT_WITHEDITOR
-#: Merge.rc:133 Merge.rc:982 Merge.rc:989 Merge.rc:996
+#: Merge.rc:133 Merge.rc:990 Merge.rc:997 Merge.rc:1004
msgid "With &External Editor\tCtrl+Alt+E"
msgstr "פתח עם עורך חיצוני\tCtrl+Alt+E"
#. IDR_POPUP_DIRVIEW, ID_DIR_OPEN_RIGHT_WITH
-#: Merge.rc:134 Merge.rc:983 Merge.rc:990 Merge.rc:997
+#: Merge.rc:134 Merge.rc:991 Merge.rc:998 Merge.rc:1005
msgid "&With..."
msgstr "פתח עם..."
#. IDR_POPUP_DIRVIEW, ID_DIR_OPEN_RIGHT_PARENT_FOLDER
-#: Merge.rc:135 Merge.rc:984 Merge.rc:991 Merge.rc:998
+#: Merge.rc:135 Merge.rc:992 Merge.rc:999 Merge.rc:1006
msgid "Open &Parent Folder..."
msgstr "פתח תיקייה אב..."
#. IDR_POPUP_IMG_CTXT, ID_FILE_SHELLMENU
-#: Merge.rc:137 Merge.rc:1239
+#: Merge.rc:137 Merge.rc:1249
msgid "S&hell Menu"
msgstr "תפריט מעטפת"
@@ -233,8 +233,8 @@ msgid "Ins&ertion/Deletion Detection"
msgstr "זיהוי הוספה/מחיקה"
#. IDR_MERGEDOCTYPE, ID_TOOLBAR_NONE
-#: Merge.rc:176 Merge.rc:209 Merge.rc:216 Merge.rc:358 Merge.rc:507
-#: Merge.rc:751
+#: Merge.rc:176 Merge.rc:209 Merge.rc:216 Merge.rc:360 Merge.rc:511
+#: Merge.rc:758
msgid "&None"
msgstr "ללא"
@@ -249,12 +249,12 @@ msgid "&Horizontal"
msgstr "אופקי"
#. IDR_POPUP_IMG_CTXT, ID_IMG_CURPANE_PREVPAGE
-#: Merge.rc:181 Merge.rc:189 Merge.rc:1230
+#: Merge.rc:181 Merge.rc:189 Merge.rc:1240
msgid "&Previous Page"
msgstr "עמוד קודם"
#. IDS_PREVIEWBAR_NEXTPAGE
-#: Merge.rc:182 Merge.rc:190 Merge.rc:1231 Merge.rc:5322
+#: Merge.rc:182 Merge.rc:190 Merge.rc:1241 Merge.rc:5333
msgid "&Next Page"
msgstr "עמוד הבא"
@@ -264,42 +264,42 @@ msgid "&Active Pane"
msgstr "חלונית פעילה"
#. IDR_POPUP_IMG_CTXT, ID_IMG_CURPANE_ROTATE_RIGHT_90
-#: Merge.rc:185 Merge.rc:1225
+#: Merge.rc:185 Merge.rc:1235
msgid "Rotate &Right 90deg"
msgstr "סובב ימינה 90°"
#. IDR_POPUP_IMG_CTXT, ID_IMG_CURPANE_ROTATE_LEFT_90
-#: Merge.rc:186 Merge.rc:1226
+#: Merge.rc:186 Merge.rc:1236
msgid "Rotate &Left 90deg"
msgstr "סובב שמאלה 90°"
#. IDR_POPUP_IMG_CTXT, ID_IMG_CURPANE_FLIP_VERTICALLY
-#: Merge.rc:187 Merge.rc:1227
+#: Merge.rc:187 Merge.rc:1237
msgid "Flip V&ertically"
msgstr "הפוך אנכית"
#. IDR_POPUP_IMG_CTXT, ID_IMG_CURPANE_FLIP_HORIZONTALLY
-#: Merge.rc:188 Merge.rc:1228
+#: Merge.rc:188 Merge.rc:1238
msgid "Flip H&orizontally"
msgstr "הפוך אופקית"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:193 Merge.rc:699
+#: Merge.rc:193 Merge.rc:706
msgid "&Zoom"
msgstr "התקרב/התרחק"
#. IDR_MERGEDOCTYPE, ID_VIEW_ZOOMIN
-#: Merge.rc:202 Merge.rc:701
+#: Merge.rc:202 Merge.rc:708
msgid "Zoom &In\tCtrl++"
msgstr "התקרב\tCtrl++"
#. IDR_MERGEDOCTYPE, ID_VIEW_ZOOMOUT
-#: Merge.rc:203 Merge.rc:702
+#: Merge.rc:203 Merge.rc:709
msgid "Zoom &Out\tCtrl+-"
msgstr "התרחק\tCtrl+-"
#. IDR_MERGEDOCTYPE, ID_VIEW_ZOOMNORMAL, Zoom to normal
-#: Merge.rc:205 Merge.rc:704
+#: Merge.rc:205 Merge.rc:711
msgid "&Normal\tCtrl+*"
msgstr "רגיל\tCtrl+*"
@@ -324,27 +324,27 @@ msgid "Dragging &Mode"
msgstr "מצב גרירה"
#. IDR_POPUP_IMG_CTXT, ID_IMG_DRAGGINGMODE_MOVE
-#: Merge.rc:217 Merge.rc:955 Merge.rc:1233
+#: Merge.rc:217 Merge.rc:963 Merge.rc:1243
msgid "&Move"
msgstr "הזז"
#. IDR_POPUP_IMG_CTXT, ID_IMG_DRAGGINGMODE_ADJUST_OFFSET
-#: Merge.rc:218 Merge.rc:1234
+#: Merge.rc:218 Merge.rc:1244
msgid "&Adjust Offset"
msgstr "התאם היסט"
#. IDR_POPUP_IMG_CTXT, ID_IMG_DRAGGINGMODE_VERTICAL_WIPE
-#: Merge.rc:219 Merge.rc:1235
+#: Merge.rc:219 Merge.rc:1245
msgid "&Vertical Wipe"
msgstr "מחיקה אנכית"
#. IDR_POPUP_IMG_CTXT, ID_IMG_DRAGGINGMODE_HORIZONTAL_WIPE
-#: Merge.rc:220 Merge.rc:1236
+#: Merge.rc:220 Merge.rc:1246
msgid "&Horizontal Wipe"
msgstr "מחיקה אופקית"
#. IDR_POPUP_IMG_CTXT, ID_IMG_DRAGGINGMODE_RECTANGLE_SELECT
-#: Merge.rc:221 Merge.rc:1237
+#: Merge.rc:221 Merge.rc:1247
msgid "Rectangle &Select"
msgstr "בחירה מלבנית"
@@ -379,37 +379,37 @@ msgid "Compare Extracted &Text from Images"
msgstr "השווה טקסט שחולץ מתמונות"
#. IDD_OPEN, IDOK
-#: Merge.rc:272 Merge.rc:1980
+#: Merge.rc:272 Merge.rc:1990
msgid "Co&mpare"
msgstr "השווה"
#. IDR_POPUP_WEBPAGE_COMPARE, ID_WEB_COMPARE_SCREENSHOTS
-#: Merge.rc:274 Merge.rc:1247
+#: Merge.rc:274 Merge.rc:1257
msgid "&Screenshots"
msgstr "צילומי מסך"
#. IDR_POPUP_WEBPAGE_COMPARE, ID_WEB_COMPARE_FULLSIZE_SCREENSHOTS
-#: Merge.rc:275 Merge.rc:1248
+#: Merge.rc:275 Merge.rc:1258
msgid "&Full Size Screenshots"
msgstr "צילומי מסך בגודל מלא"
#. IDR_POPUP_WEBPAGE_COMPARE, ID_WEB_COMPARE_HTMLS
-#: Merge.rc:276 Merge.rc:1249
+#: Merge.rc:276 Merge.rc:1259
msgid "&HTMLs"
msgstr "מסמכי HTML"
#. IDR_POPUP_WEBPAGE_COMPARE, ID_WEB_COMPARE_TEXTS
-#: Merge.rc:277 Merge.rc:1250
+#: Merge.rc:277 Merge.rc:1260
msgid "&Texts"
msgstr "טקסטים"
#. IDR_POPUP_WEBPAGE_COMPARE, ID_WEB_COMPARE_RESOURCETREES
-#: Merge.rc:278 Merge.rc:1251
+#: Merge.rc:278 Merge.rc:1261
msgid "&Resource Trees"
msgstr "עצים משאביים"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_SIZE
-#: Merge.rc:280 Merge.rc:1775
+#: Merge.rc:280 Merge.rc:1785
msgid "&Size"
msgstr "גודל"
@@ -424,27 +424,27 @@ msgid "&Event Sync"
msgstr "סנכרון אירועים"
#. IDR_POPUP_WEBPAGE_SYNC_EVENTS, ID_WEB_SYNC_ENABLED
-#: Merge.rc:291 Merge.rc:1259
+#: Merge.rc:291 Merge.rc:1269
msgid "&Enabled"
msgstr "מופעל"
#. IDR_POPUP_WEBPAGE_SYNC_EVENTS, ID_WEB_SYNC_SCROLL
-#: Merge.rc:293 Merge.rc:1261
+#: Merge.rc:293 Merge.rc:1271
msgid "&Scroll"
msgstr "גלילה"
#. IDR_POPUP_WEBPAGE_SYNC_EVENTS, ID_WEB_SYNC_CLICK
-#: Merge.rc:294 Merge.rc:1262
+#: Merge.rc:294 Merge.rc:1272
msgid "&Click"
msgstr "לחיצה"
#. IDR_POPUP_WEBPAGE_SYNC_EVENTS, ID_WEB_SYNC_INPUT
-#: Merge.rc:295 Merge.rc:1263
+#: Merge.rc:295 Merge.rc:1273
msgid "&Input"
msgstr "קלט"
#. IDR_POPUP_WEBPAGE_SYNC_EVENTS, ID_WEB_SYNC_GOBACKFORWARD
-#: Merge.rc:296 Merge.rc:1264
+#: Merge.rc:296 Merge.rc:1274
msgid "&Go Back/Forward"
msgstr "חזור/התקדם"
@@ -474,3607 +474,3618 @@ msgid "&All Profiles"
msgstr "כל הפרופיל"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:310 Merge.rc:411 Merge.rc:586
+#: Merge.rc:310 Merge.rc:413 Merge.rc:590
msgid "&File"
msgstr "קובץ"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:312 Merge.rc:413 Merge.rc:588
+#: Merge.rc:312 Merge.rc:415 Merge.rc:592
msgid "&New"
msgstr "חדש"
#. IDR_POPUP_COMPARE, ID_MERGE_COMPARE_TEXT
-#: Merge.rc:314 Merge.rc:322 Merge.rc:415 Merge.rc:423 Merge.rc:590
-#: Merge.rc:598 Merge.rc:649 Merge.rc:935 Merge.rc:1159 Merge.rc:1171
+#: Merge.rc:314 Merge.rc:323 Merge.rc:417 Merge.rc:426 Merge.rc:594
+#: Merge.rc:603 Merge.rc:655 Merge.rc:942 Merge.rc:1167 Merge.rc:1180
msgid "&Text"
msgstr "טקסט"
#. IDR_POPUP_COMPARE, ID_MERGE_COMPARE_TABLE
-#: Merge.rc:315 Merge.rc:323 Merge.rc:416 Merge.rc:424 Merge.rc:591
-#: Merge.rc:599 Merge.rc:650 Merge.rc:936 Merge.rc:1160 Merge.rc:1172
+#: Merge.rc:315 Merge.rc:324 Merge.rc:418 Merge.rc:427 Merge.rc:595
+#: Merge.rc:604 Merge.rc:656 Merge.rc:943 Merge.rc:1168 Merge.rc:1181
msgid "T&able"
msgstr "טבלה"
#. IDR_POPUP_COMPARE, ID_MERGE_COMPARE_HEX
-#: Merge.rc:316 Merge.rc:324 Merge.rc:417 Merge.rc:425 Merge.rc:592
-#: Merge.rc:600 Merge.rc:651 Merge.rc:937 Merge.rc:1161 Merge.rc:1173
+#: Merge.rc:316 Merge.rc:325 Merge.rc:419 Merge.rc:428 Merge.rc:596
+#: Merge.rc:605 Merge.rc:657 Merge.rc:944 Merge.rc:1169 Merge.rc:1182
msgid "&Binary"
msgstr "בינארי"
#. IDS_IMAGE_MENU
-#: Merge.rc:317 Merge.rc:325 Merge.rc:418 Merge.rc:426 Merge.rc:593
-#: Merge.rc:601 Merge.rc:652 Merge.rc:938 Merge.rc:1162 Merge.rc:1174
-#: Merge.rc:5123
+#: Merge.rc:317 Merge.rc:326 Merge.rc:420 Merge.rc:429 Merge.rc:597
+#: Merge.rc:606 Merge.rc:658 Merge.rc:945 Merge.rc:1170 Merge.rc:1183
+#: Merge.rc:5133
msgid "&Image"
msgstr "תמונה"
#. IDR_POPUP_COMPARE, ID_MERGE_COMPARE_WEBPAGE
-#: Merge.rc:318 Merge.rc:326 Merge.rc:419 Merge.rc:427 Merge.rc:594
-#: Merge.rc:602 Merge.rc:653 Merge.rc:939 Merge.rc:1163 Merge.rc:1175
+#: Merge.rc:318 Merge.rc:327 Merge.rc:421 Merge.rc:430 Merge.rc:598
+#: Merge.rc:607 Merge.rc:659 Merge.rc:946 Merge.rc:1171 Merge.rc:1184
msgid "&Webpage"
msgstr "דף אינטרנט"
+#. IDR_POPUP_NEW, ID_FILE_NEW_FOLDER
+#: Merge.rc:319 Merge.rc:328 Merge.rc:422 Merge.rc:431 Merge.rc:599
+#: Merge.rc:608 Merge.rc:1172
+msgid "&Folder"
+msgstr ""
+
#. IDR_MERGEDOCTYPE
-#: Merge.rc:320 Merge.rc:421 Merge.rc:596
+#: Merge.rc:321 Merge.rc:424 Merge.rc:601
msgid "New (&3 panes)"
msgstr "חדש (3 חלוניות)"
#. IDR_MERGEDOCTYPE, ID_FILE_OPEN
-#: Merge.rc:328 Merge.rc:429 Merge.rc:604
+#: Merge.rc:330 Merge.rc:433 Merge.rc:610
msgid "&Open...\tCtrl+O"
msgstr "פתח...\tCtrl+O"
#. IDR_MERGEDOCTYPE, ID_FILE_OPENCONFLICT
-#: Merge.rc:329 Merge.rc:430 Merge.rc:605
+#: Merge.rc:331 Merge.rc:434 Merge.rc:611
msgid "Open Conflic&t File..."
msgstr "פתח קובץ סתירה..."
#. IDR_MERGEDOCTYPE, ID_FILE_OPENCLIPBOARD
-#: Merge.rc:330 Merge.rc:431 Merge.rc:606
+#: Merge.rc:332 Merge.rc:435 Merge.rc:612
msgid "Open C&lipboard"
msgstr "פתח לוח"
#. IDR_POPUP_PROJECT, ID_FILE_OPENPROJECT
-#: Merge.rc:332 Merge.rc:433 Merge.rc:608 Merge.rc:1191
+#: Merge.rc:334 Merge.rc:437 Merge.rc:614 Merge.rc:1201
msgid "Open Pro&ject...\tCtrl+J"
msgstr "פתח פרויקט...\tCtrl+J"
#. IDD_OPEN, ID_SAVE_PROJECT
-#: Merge.rc:333 Merge.rc:434 Merge.rc:609 Merge.rc:1193 Merge.rc:1979
+#: Merge.rc:335 Merge.rc:438 Merge.rc:615 Merge.rc:1203 Merge.rc:1989
msgid "Sa&ve Project..."
msgstr "שמור פרויקט..."
#. IDR_MAINFRAME, ID_FILE_PROJECT_MRU_FIRST
-#: Merge.rc:335
+#: Merge.rc:337
msgid "Recent Projects"
msgstr "פרויקטים אחרונים"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:336 Merge.rc:445 Merge.rc:657
+#: Merge.rc:338 Merge.rc:449 Merge.rc:664
msgid "Recent F&iles or Folders"
msgstr "קבצים או תיקיות אחרונים"
#. IDR_MERGEDOCTYPE, ID_APP_EXIT
-#: Merge.rc:341 Merge.rc:450 Merge.rc:662
+#: Merge.rc:343 Merge.rc:454 Merge.rc:669
msgid "E&xit\tCtrl+Q"
msgstr "צא\tCtrl+Q"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:343 Merge.rc:452 Merge.rc:664
+#: Merge.rc:345 Merge.rc:456 Merge.rc:671
msgid "&Edit"
msgstr "עריכה"
#. IDR_MERGEDOCTYPE, ID_EDIT_PASTE
-#: Merge.rc:345 Merge.rc:671
+#: Merge.rc:347 Merge.rc:678
msgid "&Paste\tCtrl+V"
msgstr "הדבק\tCtrl+V"
#. IDR_MERGEDOCTYPE, ID_OPTIONS
-#: Merge.rc:347 Merge.rc:456 Merge.rc:693
+#: Merge.rc:349 Merge.rc:460 Merge.rc:700
msgid "&Options...\tCtrl+,"
msgstr "אפשרויות...\tCtrl+,"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:349 Merge.rc:458 Merge.rc:695
+#: Merge.rc:351 Merge.rc:462 Merge.rc:702
msgid "&View"
msgstr "תצוגה"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:351 Merge.rc:500 Merge.rc:744
+#: Merge.rc:353 Merge.rc:504 Merge.rc:751
msgid "Ta&b Bar"
msgstr "סרגל לשוניות"
#. IDR_MERGEDOCTYPE, ID_VIEW_TAB_BAR
-#: Merge.rc:353 Merge.rc:502 Merge.rc:746
+#: Merge.rc:355 Merge.rc:506 Merge.rc:753
msgid "&View Tab Bar"
msgstr "הצג סרגל לשוניות"
#. IDR_MERGEDOCTYPE, ID_VIEW_TAB_BAR_ON_TITLE_BAR
-#: Merge.rc:354 Merge.rc:503 Merge.rc:747
+#: Merge.rc:356 Merge.rc:507 Merge.rc:754
msgid "&On Title Bar"
msgstr "בסרגל הכותרת"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:356 Merge.rc:505 Merge.rc:749
+#: Merge.rc:358 Merge.rc:509 Merge.rc:756
msgid "&Toolbar"
msgstr "סרגל כלים"
#. IDR_MERGEDOCTYPE, ID_TOOLBAR_SMALL
-#: Merge.rc:359 Merge.rc:508 Merge.rc:752
+#: Merge.rc:361 Merge.rc:512 Merge.rc:759
msgid "&Small"
msgstr "קטן"
#. IDR_MERGEDOCTYPE, ID_TOOLBAR_MEDIUM
-#: Merge.rc:360 Merge.rc:509 Merge.rc:753
+#: Merge.rc:362 Merge.rc:513 Merge.rc:760
msgid "&Medium"
msgstr "בינוני"
#. IDR_MERGEDOCTYPE, ID_TOOLBAR_BIG
-#: Merge.rc:361 Merge.rc:510 Merge.rc:754
+#: Merge.rc:363 Merge.rc:514 Merge.rc:761
msgid "&Big"
msgstr "גדול"
#. IDR_MERGEDOCTYPE, ID_TOOLBAR_HUGE
-#: Merge.rc:362 Merge.rc:511 Merge.rc:755
+#: Merge.rc:364 Merge.rc:515 Merge.rc:762
msgid "&Huge"
msgstr "ענק"
#. IDS_VIEW_MENU_BAR
-#: Merge.rc:364 Merge.rc:513 Merge.rc:757 Merge.rc:5357
+#: Merge.rc:366 Merge.rc:517 Merge.rc:764 Merge.rc:5368
msgid "Men&u Bar"
msgstr "סרגל תפריטים"
#. IDR_DIRDOCTYPE, ID_VIEW_OUTPUT_BAR
-#: Merge.rc:365 Merge.rc:515
+#: Merge.rc:367 Merge.rc:519
msgid "&Output Pane"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_VIEW_STATUS_BAR
-#: Merge.rc:366 Merge.rc:516 Merge.rc:758
+#: Merge.rc:368 Merge.rc:520 Merge.rc:765
msgid "&Status Bar"
msgstr "סרגל מצב"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:368 Merge.rc:539 Merge.rc:847
+#: Merge.rc:370 Merge.rc:543 Merge.rc:854
msgid "&Tools"
msgstr "כלים"
#. IDR_MERGEDOCTYPE, ID_TOOLS_FILTERS
-#: Merge.rc:370 Merge.rc:542 Merge.rc:849
+#: Merge.rc:372 Merge.rc:546 Merge.rc:856
msgid "&Filters..."
msgstr "מסננים..."
#. IDR_MERGEDOCTYPE, ID_TOOLS_GENERATEPATCH
-#: Merge.rc:371 Merge.rc:543 Merge.rc:850
+#: Merge.rc:373 Merge.rc:547 Merge.rc:857
msgid "&Generate Patch..."
msgstr "צור טלאי..."
#. IDR_MERGEDOCTYPE
-#: Merge.rc:373 Merge.rc:546 Merge.rc:853
+#: Merge.rc:375 Merge.rc:550 Merge.rc:860
msgid "&Plugins"
msgstr "תוספים"
#. IDD_PLUGINS_LIST, IDC_PLUGIN_SETTINGS
-#: Merge.rc:375 Merge.rc:548 Merge.rc:855 Merge.rc:2494 Merge.rc:2926
+#: Merge.rc:377 Merge.rc:552 Merge.rc:862 Merge.rc:2504 Merge.rc:2936
msgid "P&lugin Settings..."
msgstr "הגדרות תוספים..."
#. IDR_MERGEDOCTYPE, ID_PREDIFFER_MANUAL
-#: Merge.rc:377 Merge.rc:550 Merge.rc:857
+#: Merge.rc:379 Merge.rc:554 Merge.rc:864
msgid "Ma&nual Prediffer"
msgstr "השוואה ידנית מוקדמת"
#. IDR_MERGEDOCTYPE, ID_PREDIFFER_AUTO
-#: Merge.rc:378 Merge.rc:551 Merge.rc:858
+#: Merge.rc:380 Merge.rc:555 Merge.rc:865
msgid "A&utomatic Prediffer"
msgstr "השוואה אוטומטית מוקדמת"
#. IDR_MERGEDOCTYPE, ID_UNPACK_MANUAL
-#: Merge.rc:380 Merge.rc:553 Merge.rc:860
+#: Merge.rc:382 Merge.rc:557 Merge.rc:867
msgid "&Manual Unpacking"
msgstr "פריסה ידנית"
#. IDR_MERGEDOCTYPE, ID_UNPACK_AUTO
-#: Merge.rc:381 Merge.rc:554 Merge.rc:861
+#: Merge.rc:383 Merge.rc:558 Merge.rc:868
msgid "&Automatic Unpacking"
msgstr "פריסה אוטומטית"
#. IDR_MERGEDOCTYPE, ID_RELOAD_PLUGINS
-#: Merge.rc:383 Merge.rc:558 Merge.rc:889
+#: Merge.rc:385 Merge.rc:562 Merge.rc:896
msgid "&Reload Plugins"
msgstr "טען מחדש תוספים"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:385 Merge.rc:560 Merge.rc:891
+#: Merge.rc:387 Merge.rc:564 Merge.rc:898
msgid "&Window"
msgstr "חלון"
#. IDR_MERGEDOCTYPE, ID_FILE_CLOSE
-#: Merge.rc:387 Merge.rc:562 Merge.rc:893
+#: Merge.rc:389 Merge.rc:566 Merge.rc:900
msgid "Cl&ose\tCtrl+W"
msgstr "סגור\tCtrl+W"
#. IDR_MERGEDOCTYPE, ID_WINDOW_CLOSEALL
-#: Merge.rc:388 Merge.rc:563 Merge.rc:894
+#: Merge.rc:390 Merge.rc:567 Merge.rc:901
msgid "Clo&se All"
msgstr "סגור הכול"
#. IDR_MERGEDOCTYPE, ID_NEXT_PANE
-#: Merge.rc:390 Merge.rc:565 Merge.rc:896
+#: Merge.rc:392 Merge.rc:569 Merge.rc:903
msgid "Change &Pane\tF6"
msgstr "החלף חלונית\tF6"
#. IDR_MERGEDOCTYPE, ID_WINDOW_TILE_HORZ
-#: Merge.rc:392 Merge.rc:567 Merge.rc:900
+#: Merge.rc:394 Merge.rc:571 Merge.rc:907
msgid "Tile &Horizontally"
msgstr "סדר אופקית"
#. IDR_MERGEDOCTYPE, ID_WINDOW_TILE_VERT
-#: Merge.rc:393 Merge.rc:568 Merge.rc:901
+#: Merge.rc:395 Merge.rc:572 Merge.rc:908
msgid "Tile &Vertically"
msgstr "סדר אנכית"
#. IDR_MERGEDOCTYPE, ID_WINDOW_CASCADE
-#: Merge.rc:394 Merge.rc:569 Merge.rc:902
+#: Merge.rc:396 Merge.rc:573 Merge.rc:909
msgid "&Cascade"
msgstr "פרוש מדורג"
#. IDS_MESSAGEBOX_HELP
-#: Merge.rc:396 Merge.rc:571 Merge.rc:904 Merge.rc:3200 Merge.rc:4189
+#: Merge.rc:398 Merge.rc:575 Merge.rc:911 Merge.rc:3210 Merge.rc:4199
msgid "&Help"
msgstr "עזרה"
#. IDR_MERGEDOCTYPE, ID_HELP_CONTENTS
-#: Merge.rc:398 Merge.rc:573 Merge.rc:906
+#: Merge.rc:400 Merge.rc:577 Merge.rc:913
msgid "&WinMerge Help\tF1"
msgstr "עזרה WinMerge\tF1"
#. IDR_MERGEDOCTYPE, ID_HELP_RELEASENOTES
-#: Merge.rc:400 Merge.rc:575 Merge.rc:908
+#: Merge.rc:402 Merge.rc:579 Merge.rc:915
msgid "R&elease Notes"
msgstr "הערות גרסה"
#. IDR_MERGEDOCTYPE, ID_HELP_TRANSLATIONS
-#: Merge.rc:401 Merge.rc:576 Merge.rc:909
+#: Merge.rc:403 Merge.rc:580 Merge.rc:916
msgid "&Translations"
msgstr "תרגומים"
#. IDR_MERGEDOCTYPE, ID_HELP_GETCONFIG
-#: Merge.rc:402 Merge.rc:577 Merge.rc:910
+#: Merge.rc:404 Merge.rc:581 Merge.rc:917
msgid "C&onfiguration"
msgstr "תצורה"
#. IDR_MERGEDOCTYPE, ID_HELP_GNULICENSE
-#: Merge.rc:404 Merge.rc:579 Merge.rc:912
+#: Merge.rc:406 Merge.rc:583 Merge.rc:919
msgid "&GNU General Public License"
msgstr "רישיון ציבורי כללי של GNU"
#. IDR_MERGEDOCTYPE, ID_APP_ABOUT
-#: Merge.rc:405 Merge.rc:580 Merge.rc:913
+#: Merge.rc:407 Merge.rc:584 Merge.rc:920
msgid "&About WinMerge..."
msgstr "אודות WinMerge..."
#. IDR_MERGEDOCTYPE
-#: Merge.rc:436 Merge.rc:629
+#: Merge.rc:440 Merge.rc:635
msgid "&Read-Only"
msgstr "קריאה בלבד"
#. IDR_MERGEDOCTYPE, ID_FILE_LEFT_READONLY
-#: Merge.rc:438 Merge.rc:631
+#: Merge.rc:442 Merge.rc:637
msgid "L&eft Read-Only"
msgstr "שמאל לקריאה בלבד"
#. IDR_MERGEDOCTYPE, ID_FILE_MIDDLE_READONLY
-#: Merge.rc:439 Merge.rc:632
+#: Merge.rc:443 Merge.rc:638
msgid "M&iddle Read-Only"
msgstr "אמצע לקריאה בלבד"
#. IDR_MERGEDOCTYPE, ID_FILE_RIGHT_READONLY
-#: Merge.rc:440 Merge.rc:633
+#: Merge.rc:444 Merge.rc:639
msgid "Ri&ght Read-Only"
msgstr "ימין לקריאה בלבד"
#. IDD_ENCODINGERROR, IDC_FILEENCODING
-#: Merge.rc:443 Merge.rc:646 Merge.rc:1038 Merge.rc:3063
+#: Merge.rc:447 Merge.rc:652 Merge.rc:1046 Merge.rc:3073
msgid "&File Encoding..."
msgstr "קידוד קובץ..."
#. IDR_POPUP_OUTPUTVIEW, ID_EDIT_SELECT_ALL
-#: Merge.rc:454 Merge.rc:674 Merge.rc:1343
+#: Merge.rc:458 Merge.rc:681 Merge.rc:1353
msgid "Select &All\tCtrl+A"
msgstr "בחר הכול\tCtrl+A"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWIDENTICAL
-#: Merge.rc:460
+#: Merge.rc:464
msgid "Show &Identical Items"
msgstr "הצג פריטים זהים"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWDIFFERENT
-#: Merge.rc:461
+#: Merge.rc:465
msgid "Show &Different Items"
msgstr "הצג פריטים שונים"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWUNIQUELEFT
-#: Merge.rc:462
+#: Merge.rc:466
msgid "Show L&eft Unique Items"
msgstr "הצג פריטים ייחודיים בשמאל"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWUNIQUEMIDDLE
-#: Merge.rc:463
+#: Merge.rc:467
msgid "Show Midd&le Unique Items"
msgstr "הצג פריטים ייחודיים באמצע"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWUNIQUERIGHT
-#: Merge.rc:464
+#: Merge.rc:468
msgid "Show Ri&ght Unique Items"
msgstr "הצג פריטים ייחודיים בימין"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWSKIPPED
-#: Merge.rc:465
+#: Merge.rc:469
msgid "Show S&kipped Items"
msgstr "הצג פריטים שהוחמצו"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWBINARIES
-#: Merge.rc:466
+#: Merge.rc:470
msgid "S&how Binary Files"
msgstr "הצג קבצים בינאריים"
#. IDR_DIRDOCTYPE
-#: Merge.rc:467
+#: Merge.rc:471
msgid "&3-way Compare"
msgstr "השוואה תלת-כיוונית"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWDIFFERENTLEFTONLY
-#: Merge.rc:469
+#: Merge.rc:473
msgid "Show &Left Only Different Items"
msgstr "הצג פריטים שונים רק בשמאל"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWDIFFERENTMIDDLEONLY
-#: Merge.rc:470
+#: Merge.rc:474
msgid "Show &Middle Only Different Items"
msgstr "הצג פריטים שונים רק באמצע"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWDIFFERENTRIGHTONLY
-#: Merge.rc:471
+#: Merge.rc:475
msgid "Show &Right Only Different Items"
msgstr "הצג פריטים שונים רק בימין"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWMISSINGLEFTONLY
-#: Merge.rc:473
+#: Merge.rc:477
msgid "Show L&eft Only Missing Items"
msgstr "הצג פריטים חסרים רק בשמאל"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWMISSINGMIDDLEONLY
-#: Merge.rc:474
+#: Merge.rc:478
msgid "Show Mi&ddle Only Missing Items"
msgstr "הצג פריטים חסרים רק באמצע"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWMISSINGRIGHTONLY
-#: Merge.rc:475
+#: Merge.rc:479
msgid "Show Rig&ht Only Missing Items"
msgstr "הצג פריטים חסרים רק בימין"
#. IDR_DIRDOCTYPE, ID_VIEW_SHOWHIDDENITEMS
-#: Merge.rc:478
+#: Merge.rc:482
msgid "Show Hidd&en Items"
msgstr "הצג פריטים מוסתרים"
#. IDR_DIRDOCTYPE, ID_VIEW_TREEMODE
-#: Merge.rc:480
+#: Merge.rc:484
msgid "Tree &Mode"
msgstr "מצב עץ"
#. IDR_DIRDOCTYPE
-#: Merge.rc:481
+#: Merge.rc:485
msgid "E&xpand Subfolders"
msgstr "הרחב תיקיות משנה"
#. IDR_DIRDOCTYPE, ID_VIEW_EXPAND_ALLSUBDIRS
-#: Merge.rc:483
+#: Merge.rc:487
msgid "&All Subfolders"
msgstr "כל תיקיות המשנה"
#. IDR_DIRDOCTYPE, ID_VIEW_EXPAND_DIFFERENT_SUBDIRS
-#: Merge.rc:484
+#: Merge.rc:488
msgid "&Different Subfolders"
msgstr "תיקיות משנה שונות"
#. IDR_DIRDOCTYPE, ID_VIEW_EXPAND_IDENTICAL_SUBDIRS
-#: Merge.rc:485
+#: Merge.rc:489
msgid "&Identical Subfolders"
msgstr "תיקיות משנה זהות"
#. IDR_DIRDOCTYPE, ID_VIEW_COLLAPSE_ALLSUBDIRS
-#: Merge.rc:487
+#: Merge.rc:491
msgid "&Collapse All Subfolders"
msgstr "כווץ את כל תיקיות המשנה"
#. IDR_DIRDOCTYPE, ID_VIEW_SHOW_EMPTY_FOLDERS
-#: Merge.rc:488
+#: Merge.rc:492
msgid "Show &Empty Folders"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_VIEW_SELECTFONT
-#: Merge.rc:490 Merge.rc:697
+#: Merge.rc:494 Merge.rc:704
msgid "Select &Font..."
msgstr "בחר גופן..."
#. IDR_MERGEDOCTYPE, ID_VIEW_USEDEFAULTFONT
-#: Merge.rc:491 Merge.rc:698
+#: Merge.rc:495 Merge.rc:705
msgid "Use Default Font"
msgstr "השתמש בגופן ברירת מחדל"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:493 Merge.rc:736
+#: Merge.rc:497 Merge.rc:743
msgid "Sw&ap Panes"
msgstr "החלף חלוניות"
#. IDR_MERGEDOCTYPE, ID_SWAPPANES_SWAP12
-#: Merge.rc:495 Merge.rc:738
+#: Merge.rc:499 Merge.rc:745
msgid "Swap &1st | 2nd"
msgstr "החלף 1 | 2"
#. IDR_MERGEDOCTYPE, ID_SWAPPANES_SWAP23
-#: Merge.rc:496 Merge.rc:739
+#: Merge.rc:500 Merge.rc:746
msgid "Swap &2nd | 3rd"
msgstr "החלף 2 | 3"
#. IDR_MERGEDOCTYPE, ID_SWAPPANES_SWAP13
-#: Merge.rc:497 Merge.rc:740
+#: Merge.rc:501 Merge.rc:747
msgid "Swap 1st | &3rd"
msgstr "החלף 1 | 3"
#. IDR_DIRDOCTYPE, ID_VIEW_DISPLAY_FILTER_BAR_MENU
-#: Merge.rc:514
+#: Merge.rc:518
msgid "Displa&y Filter Bar\tCtrl+Shift+L"
msgstr ""
#. IDR_DIRDOCTYPE, ID_VIEW_DIR_STATISTICS
-#: Merge.rc:518
+#: Merge.rc:522
msgid "Com&pare Statistics..."
msgstr "השווה נתונים סטטיסטיים..."
#. IDR_MERGEDOCTYPE, ID_REFRESH
-#: Merge.rc:520 Merge.rc:763
+#: Merge.rc:524 Merge.rc:770
msgid "Refresh\tF5"
msgstr "רענן\tF5"
#. IDR_POPUP_DIRVIEW, ID_RESCAN
-#: Merge.rc:521 Merge.rc:1030
+#: Merge.rc:525 Merge.rc:1038
msgid "&Refresh Selected\tCtrl+F5"
msgstr "רענן נבחרים\tCtrl+F5"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:523 Merge.rc:765
+#: Merge.rc:527 Merge.rc:772
msgid "&Merge"
msgstr "מזג"
#. IDR_DIRDOCTYPE, ID_MERGE_COMPARE
-#: Merge.rc:525
+#: Merge.rc:529
msgid "Co&mpare\tEnter"
msgstr "השווה\tEnter"
#. IDR_MERGEDOCTYPE, ID_NEXTDIFF
-#: Merge.rc:527 Merge.rc:767
+#: Merge.rc:531 Merge.rc:774
msgid "&Next Difference\tAlt+Down"
msgstr "הבדל הבא\tAlt+Down"
#. IDR_MERGEDOCTYPE, ID_PREVDIFF
-#: Merge.rc:528 Merge.rc:768
+#: Merge.rc:532 Merge.rc:775
msgid "&Previous Difference\tAlt+Up"
msgstr "הבדל קודם\tAlt+Up"
#. IDR_MERGEDOCTYPE, ID_FIRSTDIFF
-#: Merge.rc:530 Merge.rc:773
+#: Merge.rc:534 Merge.rc:780
msgid "&First Difference\tAlt+Home"
msgstr "הבדל ראשון\tAlt+Home"
#. IDR_MERGEDOCTYPE, ID_CURDIFF
-#: Merge.rc:531 Merge.rc:774
+#: Merge.rc:535 Merge.rc:781
msgid "&Current Difference\tAlt+Enter"
msgstr "הבדל נוכחי\tAlt+Enter"
#. IDR_MERGEDOCTYPE, ID_LASTDIFF
-#: Merge.rc:532 Merge.rc:775
+#: Merge.rc:536 Merge.rc:782
msgid "&Last Difference\tAlt+End"
msgstr "הבדל אחרון\tAlt+End"
#. IDR_MERGEDOCTYPE, ID_L2R
-#: Merge.rc:534 Merge.rc:830
+#: Merge.rc:538 Merge.rc:837
msgid "Copy to &Right\tAlt+Right"
msgstr "העתק לימין\tAlt+Right"
#. IDR_MERGEDOCTYPE, ID_R2L
-#: Merge.rc:535 Merge.rc:831
+#: Merge.rc:539 Merge.rc:838
msgid "Copy to L&eft\tAlt+Left"
msgstr "העתק לשמאל\tAlt+Left"
#. IDR_DIRDOCTYPE, ID_MERGE_DELETE
-#: Merge.rc:537
+#: Merge.rc:541
msgid "&Delete\tDel"
msgstr "מחק\tDel"
#. IDR_POPUP_DIRVIEW, ID_TOOLS_CUSTOMIZECOLUMNS
-#: Merge.rc:541 Merge.rc:1042
+#: Merge.rc:545 Merge.rc:1050
msgid "&Customize Columns..."
msgstr "התאם עמודות..."
#. IDR_MERGEDOCTYPE, ID_TOOLS_GENERATEREPORT
-#: Merge.rc:544 Merge.rc:851
+#: Merge.rc:548 Merge.rc:858
msgid "Generate &Report..."
msgstr "צור דוח..."
#. IDD_ENCODINGERROR, IDC_PLUGIN
-#: Merge.rc:556 Merge.rc:867 Merge.rc:3064
+#: Merge.rc:560 Merge.rc:874 Merge.rc:3074
msgid "&Edit with Unpacker..."
msgstr "ערוך עם מפענח..."
#. IDR_MERGEDOCTYPE, ID_FILE_SAVE
-#: Merge.rc:611
+#: Merge.rc:617
msgid "&Save\tCtrl+S"
msgstr "שמור\tCtrl+S"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:612
+#: Merge.rc:618
msgid "Sav&e"
msgstr "שמור"
#. IDR_POPUP_SAVE, ID_FILE_SAVE_LEFT
-#: Merge.rc:614 Merge.rc:1201
+#: Merge.rc:620 Merge.rc:1211
msgid "Save &Left"
msgstr "שמור שמאל"
#. IDR_POPUP_SAVE, ID_FILE_SAVE_MIDDLE
-#: Merge.rc:615 Merge.rc:1202
+#: Merge.rc:621 Merge.rc:1212
msgid "Save &Middle"
msgstr "שמור אמצע"
#. IDR_POPUP_SAVE, ID_FILE_SAVE_RIGHT
-#: Merge.rc:616 Merge.rc:1203
+#: Merge.rc:622 Merge.rc:1213
msgid "Save &Right"
msgstr "שמור ימין"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:618
+#: Merge.rc:624
msgid "Save &As"
msgstr "שמור בשם"
#. IDR_POPUP_SAVE, ID_FILE_SAVEAS_LEFT
-#: Merge.rc:620 Merge.rc:1205
+#: Merge.rc:626 Merge.rc:1215
msgid "Save &Left As..."
msgstr "שמור שמאל בשם..."
#. IDR_POPUP_SAVE, ID_FILE_SAVEAS_MIDDLE
-#: Merge.rc:621 Merge.rc:1206
+#: Merge.rc:627 Merge.rc:1216
msgid "Save &Middle As..."
msgstr "שמור אמצע בשם..."
#. IDR_POPUP_SAVE, ID_FILE_SAVEAS_RIGHT
-#: Merge.rc:622 Merge.rc:1207
+#: Merge.rc:628 Merge.rc:1217
msgid "Save &Right As..."
msgstr "שמור ימין בשם..."
#. IDR_MERGEDOCTYPE, ID_FILE_PRINT
-#: Merge.rc:625
+#: Merge.rc:631
msgid "&Print...\tCtrl+P"
msgstr "הדפס...\tCtrl+P"
#. IDR_MERGEDOCTYPE, ID_FILE_PAGE_SETUP
-#: Merge.rc:626
+#: Merge.rc:632
msgid "Page Set&up..."
msgstr "הגדרת עמוד..."
#. IDR_MERGEDOCTYPE, ID_FILE_PRINT_PREVIEW
-#: Merge.rc:627
+#: Merge.rc:633
msgid "Print Previe&w..."
msgstr "תצוגה מקדימה להדפסה..."
#. IDR_MERGEDOCTYPE
-#: Merge.rc:636
+#: Merge.rc:642
msgid "&Convert Line Endings to"
msgstr "המר סיומות שורות ל"
#. IDR_MERGEDOCTYPE, ID_FILE_MERGINGMODE
-#: Merge.rc:643
+#: Merge.rc:649
msgid "Mer&ge Mode\tF9"
msgstr "מצב מיזוג\tF9"
#. IDR_MERGEDOCTYPE, ID_RESCAN
-#: Merge.rc:645
+#: Merge.rc:651
msgid "Reloa&d\tCtrl+F5"
msgstr "טען מחדש\tCtrl+F5"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:647
+#: Merge.rc:653
msgid "Reco&mpare As"
msgstr "השווה מחדש כ"
+#. IDR_POPUP_COMPARE, ID_MERGE_COMPARE_FOLDER
+#: Merge.rc:660 Merge.rc:947 Merge.rc:1185
+msgid "A&rchive"
+msgstr ""
+
#. IDR_MERGEDOCTYPE, ID_EDIT_UNDO
-#: Merge.rc:666
+#: Merge.rc:673
msgid "&Undo\tCtrl+Z"
msgstr "בטל\tCtrl+Z"
#. IDR_MERGEDOCTYPE, ID_EDIT_REDO
-#: Merge.rc:667
+#: Merge.rc:674
msgid "&Redo\tCtrl+Y"
msgstr "בצע שוב\tCtrl+Y"
#. IDR_MERGEDOCTYPE, ID_EDIT_CUT
-#: Merge.rc:669
+#: Merge.rc:676
msgid "Cu&t\tCtrl+X"
msgstr "גזור\tCtrl+X"
#. IDR_POPUP_OUTPUTVIEW, ID_EDIT_COPY
-#: Merge.rc:670 Merge.rc:1342
+#: Merge.rc:677 Merge.rc:1352
msgid "&Copy\tCtrl+C"
msgstr "העתק\tCtrl+C"
#. IDR_MERGEDOCTYPE, ID_EDIT_FIND
-#: Merge.rc:676
+#: Merge.rc:683
msgid "F&ind...\tCtrl+F"
msgstr "חפש...\tCtrl+F"
#. IDR_MERGEDOCTYPE, ID_EDIT_REPLACE
-#: Merge.rc:677
+#: Merge.rc:684
msgid "Repla&ce...\tCtrl+H"
msgstr "החלף...\tCtrl+H"
#. IDR_MERGEDOCTYPE, ID_EDIT_MARK
-#: Merge.rc:678
+#: Merge.rc:685
msgid "&Marker...\tCtrl+Shift+M"
msgstr "סמן...\tCtrl+Shift+M"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:680
+#: Merge.rc:687
msgid "Advanced"
msgstr "מתקדם"
#. IDR_MERGEDOCTYPE, ID_EDIT_COPY_LINENUMBERS
-#: Merge.rc:682
+#: Merge.rc:689
msgid "&Copy With Line Numbers\tCtrl+Shift+C"
msgstr "העתק עם מספרי שורות\tCtrl+Shift+C"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:684
+#: Merge.rc:691
msgid "&Bookmarks"
msgstr "סימניות"
#. IDR_MERGEDOCTYPE, ID_EDIT_TOGGLE_BOOKMARK
-#: Merge.rc:686
+#: Merge.rc:693
msgid "&Toggle Bookmark\tCtrl+F2"
msgstr "הפעל/כבה סימניה\tCtrl+F2"
#. IDR_MERGEDOCTYPE, ID_EDIT_GOTO_NEXT_BOOKMARK
-#: Merge.rc:687
+#: Merge.rc:694
msgid "&Next Bookmark\tF2"
msgstr "סימניה הבאה\tF2"
#. IDR_MERGEDOCTYPE, ID_EDIT_GOTO_PREV_BOOKMARK
-#: Merge.rc:688
+#: Merge.rc:695
msgid "&Previous Bookmark\tShift+F2"
msgstr "סימניה קודמת\tShift+F2"
#. IDR_MERGEDOCTYPE, ID_EDIT_CLEAR_ALL_BOOKMARKS
-#: Merge.rc:689
+#: Merge.rc:696
msgid "&Clear All Bookmarks"
msgstr "נקה את כל הסימניות"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:706
+#: Merge.rc:713
msgid "Syntax Highlight"
msgstr "הדגשת תחביר"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:711
+#: Merge.rc:718
msgid "&Diff Context"
msgstr "הקשר הבדלים"
#. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_ALL
-#: Merge.rc:713
+#: Merge.rc:720
msgid "&All Lines"
msgstr "כל השורות"
#. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_0
-#: Merge.rc:715
+#: Merge.rc:722
msgid "&0 Lines"
msgstr "0 שורות"
#. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_1
-#: Merge.rc:716
+#: Merge.rc:723
msgid "&1 Line"
msgstr "1 שורה"
#. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_3
-#: Merge.rc:717
+#: Merge.rc:724
msgid "&3 Lines"
msgstr "3 שורות"
#. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_5
-#: Merge.rc:718
+#: Merge.rc:725
msgid "&5 Lines"
msgstr "5 שורות"
#. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_7
-#: Merge.rc:719
+#: Merge.rc:726
msgid "&7 Lines"
msgstr "7 שורות"
#. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_9
-#: Merge.rc:720
+#: Merge.rc:727
msgid "&9 Lines"
msgstr "9 שורות"
#. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_TOGGLE
-#: Merge.rc:722
+#: Merge.rc:729
msgid "&Toggle All and 0-9 Lines\tCtrl+D"
msgstr "הפעל/כבה הכל ו-0-9 שורות\tCtrl+D"
#. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_INVERT
-#: Merge.rc:724
+#: Merge.rc:731
msgid "&Invert (Hide Different Lines)"
msgstr "הפוך (הסתר שורות שונות)"
#. IDR_MERGEDOCTYPE, ID_VIEW_RESIZE_PANES
-#: Merge.rc:727
+#: Merge.rc:734
msgid "&Lock Panes"
msgstr "נעל חלוניות"
#. IDR_MERGEDOCTYPE, ID_VIEW_WHITESPACE
-#: Merge.rc:728
+#: Merge.rc:735
msgid "&View Whitespace"
msgstr "הצג רווחים"
#. IDR_MERGEDOCTYPE, ID_VIEW_EOL
-#: Merge.rc:729
+#: Merge.rc:736
msgid "View E&OL"
msgstr "הצג סיומות שורות"
#. IDR_MERGEDOCTYPE, ID_VIEW_LINEDIFFS
-#: Merge.rc:730
+#: Merge.rc:737
msgid "Vie&w Line Differences"
msgstr "הצג הבדלים בשורות"
#. IDR_MERGEDOCTYPE, ID_VIEW_LINENUMBERS
-#: Merge.rc:731
+#: Merge.rc:738
msgid "View Line &Numbers"
msgstr "הצג מספרי שורות"
#. IDR_MERGEDOCTYPE, ID_VIEW_SELMARGIN
-#: Merge.rc:732
+#: Merge.rc:739
msgid "View &Margins"
msgstr "הצג שוליים"
#. IDR_MERGEDOCTYPE, ID_VIEW_TOPMARGIN
-#: Merge.rc:733
+#: Merge.rc:740
msgid "View To&p Margins"
msgstr "הצג שוליים עליונים"
#. IDR_MERGEDOCTYPE, ID_VIEW_WORDWRAP
-#: Merge.rc:734
+#: Merge.rc:741
msgid "W&rap Lines"
msgstr "גלישת שורות"
#. IDR_MERGEDOCTYPE, ID_VIEW_SPLITVERTICALLY
-#: Merge.rc:742
+#: Merge.rc:749
msgid "Split V&ertically"
msgstr "פצל אנכית"
#. IDR_MERGEDOCTYPE, ID_VIEW_DETAIL_BAR
-#: Merge.rc:759
+#: Merge.rc:766
msgid "Diff &Pane"
msgstr "חלונית הבדלים"
#. IDR_MERGEDOCTYPE, ID_VIEW_LOCATION_BAR
-#: Merge.rc:760
+#: Merge.rc:767
msgid "Lo&cation Pane"
msgstr "חלונית מיקום"
#. IDS_OUTPUTBAR_CAPTION
-#: Merge.rc:761 Merge.rc:4902
+#: Merge.rc:768 Merge.rc:4912
msgid "Output Pane"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_NEXTCONFLICT
-#: Merge.rc:770
+#: Merge.rc:777
msgid "Ne&xt Conflict\tAlt+Shift+Down"
msgstr "סתירה הבאה\tAlt+Shift+Down"
#. IDR_MERGEDOCTYPE, ID_PREVCONFLICT
-#: Merge.rc:771
+#: Merge.rc:778
msgid "Pre&vious Conflict\tAlt+Shift+Up"
msgstr "סתירה קודמת\tAlt+Shift+Up"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:777
+#: Merge.rc:784
msgid "A&dvanced"
msgstr "מתקדם"
#. IDR_MERGEDOCTYPE, ID_NEXTDIFFLM
-#: Merge.rc:779
+#: Merge.rc:786
msgid "Next Difference (Left/Middle)\tAlt+1"
msgstr "הבדל הבא בין השמאל לאמצע\tAlt+1"
#. IDR_MERGEDOCTYPE, ID_PREVDIFFLM
-#: Merge.rc:780
+#: Merge.rc:787
msgid "Previous Difference (Left/Middle)\tAlt+Shift+1"
msgstr "הבדל קודם בין השמאל לאמצע\tAlt+Shift+1"
#. IDR_MERGEDOCTYPE, ID_NEXTDIFFLR
-#: Merge.rc:782
+#: Merge.rc:789
msgid "Next Difference (Left/Right)\tAlt+2"
msgstr "הבדל הבא בין השמאל לימין\tAlt+2"
#. IDR_MERGEDOCTYPE, ID_PREVDIFFLR
-#: Merge.rc:783
+#: Merge.rc:790
msgid "Previous Difference (Left/Right)\tAlt+Shift+2"
msgstr "הבדל קודם בין השמאל לימין\tAlt+Shift+2"
#. IDR_MERGEDOCTYPE, ID_NEXTDIFFMR
-#: Merge.rc:785
+#: Merge.rc:792
msgid "Next Difference (Middle/Right)\tAlt+3"
msgstr "הבדל הבא בין האמצע לימין\tAlt+3"
#. IDR_MERGEDOCTYPE, ID_PREVDIFFMR
-#: Merge.rc:786
+#: Merge.rc:793
msgid "Previous Difference (Middle/Right)\tAlt+Shift+3"
msgstr "הבדל קודם בין האמצע לימין\tAlt+Shift+3"
#. IDR_MERGEDOCTYPE, ID_NEXTDIFFLO
-#: Merge.rc:788
+#: Merge.rc:795
msgid "Next Left-Only Difference\tAlt+7"
msgstr "הבדל הבא בשמאל בלבד\tAlt+7"
#. IDR_MERGEDOCTYPE, ID_PREVDIFFLO
-#: Merge.rc:789
+#: Merge.rc:796
msgid "Previous Left-Only Difference\tAlt+Shift+7"
msgstr "הבדל קודם בשמאל בלבד\tAlt+Shift+7"
#. IDR_MERGEDOCTYPE, ID_NEXTDIFFMO
-#: Merge.rc:791
+#: Merge.rc:798
msgid "Next Middle-Only Difference\tAlt+8"
msgstr "הבדל הבא באמצע בלבד\tAlt+8"
#. IDR_MERGEDOCTYPE, ID_PREVDIFFMO
-#: Merge.rc:792
+#: Merge.rc:799
msgid "Previous Middle-Only Difference\tAlt+Shift+8"
msgstr "הבדל קודם באמצע בלבד\tAlt+Shift+8"
#. IDR_MERGEDOCTYPE, ID_NEXTDIFFRO
-#: Merge.rc:794
+#: Merge.rc:801
msgid "Next Right-Only Difference\tAlt+9"
msgstr "הבדל הבא בימין בלבד\tAlt+9"
#. IDR_MERGEDOCTYPE, ID_PREVDIFFRO
-#: Merge.rc:795
+#: Merge.rc:802
msgid "Previous Right-Only Difference\tAlt+Shift+9"
msgstr "הבדל קודם בימין בלבד\tAlt+Shift+9"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:797
+#: Merge.rc:804
msgid "Copy from &Left to"
msgstr "העתק מהשמאל אל"
#. IDD_LOAD_SAVE_CODEPAGE, IDC_AFFECTS_MIDDLE_BTN
-#: Merge.rc:799 Merge.rc:810 Merge.rc:815 Merge.rc:826 Merge.rc:970
-#: Merge.rc:2545 Merge.rc:2817
+#: Merge.rc:806 Merge.rc:817 Merge.rc:822 Merge.rc:833 Merge.rc:978
+#: Merge.rc:2555 Merge.rc:2827
msgid "&Middle"
msgstr "האמצע"
#. IDD_LOAD_SAVE_CODEPAGE, IDC_AFFECTS_RIGHT_BTN
-#: Merge.rc:800 Merge.rc:805 Merge.rc:816 Merge.rc:821 Merge.rc:971
-#: Merge.rc:2546 Merge.rc:2819
+#: Merge.rc:807 Merge.rc:812 Merge.rc:823 Merge.rc:828 Merge.rc:979
+#: Merge.rc:2556 Merge.rc:2829
msgid "&Right"
msgstr "הימין"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:802
+#: Merge.rc:809
msgid "Copy from &Middle to"
msgstr "העתק מהאמצע אל"
#. IDD_LOAD_SAVE_CODEPAGE, IDC_AFFECTS_LEFT_BTN
-#: Merge.rc:804 Merge.rc:809 Merge.rc:820 Merge.rc:825 Merge.rc:969
-#: Merge.rc:2544 Merge.rc:2815
+#: Merge.rc:811 Merge.rc:816 Merge.rc:827 Merge.rc:832 Merge.rc:977
+#: Merge.rc:2554 Merge.rc:2825
msgid "&Left"
msgstr "השמאל"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:807
+#: Merge.rc:814
msgid "Copy from &Right to"
msgstr "העתק מהימין אל"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:813
+#: Merge.rc:820
msgid "Copy Selected Lines from Le&ft to"
msgstr "העתק שורה(ות) נבחרות מהשמאל אל"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:818
+#: Merge.rc:825
msgid "Copy Selected Lines from Mi&ddle to"
msgstr "העתק שורה(ות) נבחרות מהאמצע אל"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:823
+#: Merge.rc:830
msgid "Copy Selected Lines from Ri&ght to"
msgstr "העתק שורה(ות) נבחרות מהימין אל"
#. IDR_MERGEDOCTYPE, ID_COPY_FROM_LEFT
-#: Merge.rc:833
+#: Merge.rc:840
msgid "Copy from Left\tAlt+Shift+Right"
msgstr "העתק מהשמאל\tAlt+Shift+Right"
#. IDR_MERGEDOCTYPE, ID_COPY_FROM_RIGHT
-#: Merge.rc:834
+#: Merge.rc:841
msgid "Copy from Right\tAlt+Shift+Left"
msgstr "העתק מהימין\tAlt+Shift+Left"
#. IDR_MERGEDOCTYPE, ID_L2RNEXT
-#: Merge.rc:836
+#: Merge.rc:843
msgid "C&opy to Right and Advance\tCtrl+Alt+Right"
msgstr "העתק לימין והתקדם\tCtrl+Alt+Right"
#. IDR_MERGEDOCTYPE, ID_R2LNEXT
-#: Merge.rc:837
+#: Merge.rc:844
msgid "Copy &to Left and Advance\tCtrl+Alt+Left"
msgstr "העתק לשמאל והתקדם\tCtrl+Alt+Left"
#. IDR_MERGEDOCTYPE, ID_ALL_RIGHT
-#: Merge.rc:839
+#: Merge.rc:846
msgid "Copy &All to Right"
msgstr "העתק הכל לימין"
#. IDR_MERGEDOCTYPE, ID_ALL_LEFT
-#: Merge.rc:840
+#: Merge.rc:847
msgid "Cop&y All to Left"
msgstr "העתק הכל לשמאל"
#. IDR_MERGEDOCTYPE, ID_AUTO_MERGE
-#: Merge.rc:842
+#: Merge.rc:849
msgid "A&uto Merge\tCtrl+Alt+M"
msgstr "מיזוג אוטומטי\tCtrl+Alt+M"
#. IDR_MERGEDOCTYPE, ID_ADD_SYNCPOINT
-#: Merge.rc:844
+#: Merge.rc:851
msgid "Add &Synchronization Point\tAlt+S"
msgstr "הוסף נקודת סנכרון\tAlt+S"
#. IDR_MERGEDOCTYPE, ID_CLEAR_SYNCPOINTS
-#: Merge.rc:845
+#: Merge.rc:852
msgid "Clear Sync&hronization Points"
msgstr "נקה נקודות סנכרון"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:863
+#: Merge.rc:870
msgid "Unpac&ker"
msgstr "מפענח"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:869
+#: Merge.rc:876
msgid "&Prediffer"
msgstr "השוואה מוקדמת"
#. IDR_MERGEDOCTYPE, ID_APPLY_PREDIFFER
-#: Merge.rc:873
+#: Merge.rc:880
msgid "Apply Pre&differ..."
msgstr "הפעל השוואה מוקדמת..."
#. IDR_MERGEDOCTYPE, ID_TRANSFORM_WITH_SCRIPT
-#: Merge.rc:879
+#: Merge.rc:886
msgid "&Transform with Editor Script..."
msgstr "המר באמצעות סקריפט עורך..."
#. IDR_MERGEDOCTYPE
-#: Merge.rc:880
+#: Merge.rc:887
msgid "Scripts for &Copying"
msgstr "סקריפטים להעתקה"
#. IDR_MERGEDOCTYPE, ID_SELECT_EDITOR_SCRIPT_FOR_COPYING
-#: Merge.rc:886
+#: Merge.rc:893
msgid "Select &Editor Script..."
msgstr "בחר סקריפט עורך..."
#. IDR_MERGEDOCTYPE, ID_WINDOW_SPLIT
-#: Merge.rc:898
+#: Merge.rc:905
msgid "Sp&lit"
msgstr "פצל"
#. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE
-#: Merge.rc:921
+#: Merge.rc:928
msgid "Comp&are"
msgstr "השווה"
#. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE_WITH_MOVED_RENAMED
-#: Merge.rc:922
+#: Merge.rc:929
msgid "Compar&e with Renamed/Moved Items"
msgstr ""
#. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE_IN_NEW_WINDOW
-#: Merge.rc:923
+#: Merge.rc:930
msgid "Compare in New &Window"
msgstr "השווה בחלון חדש"
#. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE_NONHORIZONTALLY
-#: Merge.rc:924 Merge.rc:931
+#: Merge.rc:931 Merge.rc:938
msgid "Compare Non-hor&izontally..."
msgstr "השווה לא אופקית..."
#. IDR_POPUP_DIRVIEW
-#: Merge.rc:925
+#: Merge.rc:932
msgid "Compare Non-hor&izontally"
msgstr ""
#. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE_LEFT1_LEFT2
-#: Merge.rc:927
+#: Merge.rc:934
msgid "First &Left with Second Left"
msgstr ""
#. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE_RIGHT1_RIGHT2
-#: Merge.rc:928
+#: Merge.rc:935
msgid "First &Right with Second Right"
msgstr ""
#. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE_LEFT1_RIGHT2
-#: Merge.rc:929
+#: Merge.rc:936
msgid "&First Left with Second Right"
msgstr ""
#. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE_LEFT2_RIGHT1
-#: Merge.rc:930
+#: Merge.rc:937
msgid "&Second Left with First Right"
msgstr ""
#. IDR_POPUP_DIRVIEW
-#: Merge.rc:933
+#: Merge.rc:940
msgid "Co&mpare As"
msgstr ""
#. IDS_COPY_LEFT_TO_MIDDLE2
-#: Merge.rc:945 Merge.rc:957 Merge.rc:4502
+#: Merge.rc:953 Merge.rc:965 Merge.rc:4512
#, c-format
msgid "Left to Middle (%1 of %2)"
msgstr ""
#. IDS_COPY_LEFT_TO_RIGHT2
-#: Merge.rc:946 Merge.rc:958 Merge.rc:4501
+#: Merge.rc:954 Merge.rc:966 Merge.rc:4511
#, c-format
msgid "Left to Right (%1 of %2)"
msgstr ""
#. IDS_MOVE_LEFT_TO2
-#: Merge.rc:947 Merge.rc:959 Merge.rc:1022 Merge.rc:4513 Merge.rc:4542
+#: Merge.rc:955 Merge.rc:967 Merge.rc:1030 Merge.rc:4523 Merge.rc:4552
#, c-format
msgid "Left to... (%1 of %2)"
msgstr ""
#. IDS_COPY_MIDDLE_TO_LEFT2
-#: Merge.rc:948 Merge.rc:960 Merge.rc:4499
+#: Merge.rc:956 Merge.rc:968 Merge.rc:4509
#, c-format
msgid "Middle to Left (%1 of %2)"
msgstr ""
#. IDS_COPY_MIDDLE_TO_RIGHT2
-#: Merge.rc:949 Merge.rc:961 Merge.rc:4500
+#: Merge.rc:957 Merge.rc:969 Merge.rc:4510
#, c-format
msgid "Middle to Right (%1 of %2)"
msgstr ""
#. IDS_MOVE_MIDDLE_TO2
-#: Merge.rc:950 Merge.rc:962 Merge.rc:1023 Merge.rc:4514 Merge.rc:4543
+#: Merge.rc:958 Merge.rc:970 Merge.rc:1031 Merge.rc:4524 Merge.rc:4553
#, c-format
msgid "Middle to... (%1 of %2)"
msgstr ""
#. IDS_COPY_RIGHT_TO_MIDDLE2
-#: Merge.rc:951 Merge.rc:963 Merge.rc:4498
+#: Merge.rc:959 Merge.rc:971 Merge.rc:4508
#, c-format
msgid "Right to Middle (%1 of %2)"
msgstr ""
#. IDS_COPY_RIGHT_TO_LEFT2
-#: Merge.rc:952 Merge.rc:964 Merge.rc:4497
+#: Merge.rc:960 Merge.rc:972 Merge.rc:4507
#, c-format
msgid "Right to Left (%1 of %2)"
msgstr ""
#. IDS_MOVE_RIGHT_TO2
-#: Merge.rc:953 Merge.rc:965 Merge.rc:1024 Merge.rc:4515 Merge.rc:4544
+#: Merge.rc:961 Merge.rc:973 Merge.rc:1032 Merge.rc:4525 Merge.rc:4554
#, c-format
msgid "Right to... (%1 of %2)"
msgstr ""
#. IDD_EDIT_MARKER, IDC_EDIT_MARKER_DELETE
-#: Merge.rc:967 Merge.rc:2036
+#: Merge.rc:975 Merge.rc:2046
msgid "&Delete"
msgstr "מחק"
#. IDR_POPUP_DIRVIEW, ID_DIR_DEL_BOTH
-#: Merge.rc:972
+#: Merge.rc:980
msgid "&Both"
msgstr "שניהם"
#. IDR_POPUP_DIRVIEW, ID_DIR_DEL_ALL
-#: Merge.rc:973
+#: Merge.rc:981
msgid "&All"
msgstr "הכל"
#. IDD_EDIT_REPLACE, IDC_EDIT_SCOPE_SELECTION
-#: Merge.rc:974 Merge.rc:2019
+#: Merge.rc:982 Merge.rc:2029
msgid "&Selection"
msgstr "בחירה"
#. IDR_POPUP_DIRVIEW, ID_DIR_ITEM_RENAME
-#: Merge.rc:976
+#: Merge.rc:984
msgid "Re&name"
msgstr "שנה שם"
#. IDR_POPUP_DIRVIEW, ID_DIR_HIDE_FILENAMES
-#: Merge.rc:977
+#: Merge.rc:985
msgid "&Hide Items"
msgstr "הסתר פריטים"
#. IDR_POPUP_DIRVIEW
-#: Merge.rc:979
+#: Merge.rc:987
msgid "&Open Left"
msgstr "פתח שמאל"
#. IDR_POPUP_DIRVIEW
-#: Merge.rc:986
+#: Merge.rc:994
msgid "Open Midd&le"
msgstr "פתח אמצע"
#. IDR_POPUP_DIRVIEW
-#: Merge.rc:993
+#: Merge.rc:1001
msgid "O&pen Right"
msgstr "פתח ימין"
#. IDR_POPUP_DIRVIEW
-#: Merge.rc:1001
+#: Merge.rc:1009
msgid "Cop&y Paths"
msgstr "העתק נתיבי קבצים"
#. IDS_DEL_LEFT_FMT2
-#: Merge.rc:1003 Merge.rc:1012 Merge.rc:4530
+#: Merge.rc:1011 Merge.rc:1020 Merge.rc:4540
#, c-format
msgid "Left (%1 of %2)"
msgstr ""
#. IDS_DEL_MIDDLE_FMT2
-#: Merge.rc:1004 Merge.rc:1013 Merge.rc:4531
+#: Merge.rc:1012 Merge.rc:1021 Merge.rc:4541
#, c-format
msgid "Middle (%1 of %2)"
msgstr ""
#. IDS_DEL_RIGHT_FMT2
-#: Merge.rc:1005 Merge.rc:1014 Merge.rc:4532
+#: Merge.rc:1013 Merge.rc:1022 Merge.rc:4542
#, c-format
msgid "Right (%1 of %2)"
msgstr ""
#. IDS_DEL_BOTH_FMT2
-#: Merge.rc:1006 Merge.rc:1015 Merge.rc:4533
+#: Merge.rc:1014 Merge.rc:1023 Merge.rc:4543
#, c-format
msgid "Both (%1 of %2)"
msgstr ""
#. IDS_DEL_ALL_FMT2
-#: Merge.rc:1007 Merge.rc:1016 Merge.rc:4538
+#: Merge.rc:1015 Merge.rc:1024 Merge.rc:4548
#, c-format
msgid "All (%1 of %2)"
msgstr ""
#. IDR_POPUP_DIRVIEW, ID_DIR_COPY_FILENAMES
-#: Merge.rc:1009
+#: Merge.rc:1017
msgid "Copy &Filenames"
msgstr "העתק שמות קבצים"
#. IDR_POPUP_DIRVIEW
-#: Merge.rc:1010
+#: Merge.rc:1018
msgid "Copy Items to Clip&board"
msgstr "העתק פריטים ללוח"
#. IDR_POPUP_DIRVIEW, ID_DIR_COPY_ALL_DISP_COLUMNS
-#: Merge.rc:1018
+#: Merge.rc:1026
msgid "Copy All Di&splayed Columns"
msgstr "העתק את כל העמודות המוצגות"
#. IDR_POPUP_DIRVIEW
-#: Merge.rc:1020
+#: Merge.rc:1028
msgid "&Zip"
msgstr "כיווץ"
#. IDS_COPY_BOTH_TO2
-#: Merge.rc:1025 Merge.rc:4516
+#: Merge.rc:1033 Merge.rc:4526
#, c-format
msgid "Both to... (%1 of %2)"
msgstr "שניהם אל... (%1 מתוך %2)"
#. IDS_COPY_ALL_TO2
-#: Merge.rc:1026 Merge.rc:4517
+#: Merge.rc:1034 Merge.rc:4527
#, c-format
msgid "All to... (%1 of %2)"
msgstr "הכל אל... (%1 מתוך %2)"
#. IDS_COPY_DIFFERENCES_TO2
-#: Merge.rc:1027 Merge.rc:4518
+#: Merge.rc:1035 Merge.rc:4528
#, c-format
msgid "Differences to... (%1 of %2)"
msgstr "הבדלים אל... (%1 מתוך %2)"
#. IDR_POPUP_DIRVIEW, ID_DIR_SHELL_CONTEXT_MENU_LEFT
-#: Merge.rc:1032
+#: Merge.rc:1040
msgid "Left Shell Menu"
msgstr "תפריט מעטפת שמאל"
#. IDR_POPUP_DIRVIEW, ID_DIR_SHELL_CONTEXT_MENU_MIDDLE
-#: Merge.rc:1033
+#: Merge.rc:1041
msgid "Middle Shell Menu"
msgstr "תפריט מעטפת אמצע"
#. IDR_POPUP_DIRVIEW, ID_DIR_SHELL_CONTEXT_MENU_RIGHT
-#: Merge.rc:1034
+#: Merge.rc:1042
msgid "Right Shell Menu"
msgstr "תפריט מעטפת ימין"
#. IDR_POPUP_DIRVIEW, ID_DIR_SHELL_CONTEXT_MENU_BOTH
-#: Merge.rc:1035
+#: Merge.rc:1043
msgid "Both Shell Menu"
msgstr "תפריט מעטפת שניהם"
#. IDR_POPUP_DIRVIEW, ID_DIR_SHELL_CONTEXT_MENU_ALL
-#: Merge.rc:1036
+#: Merge.rc:1044
msgid "All Shell Menu"
msgstr "תפריט מעטפת הכל"
#. IDR_POPUP_EDITOR_HEADERBAR, ID_EDITOR_COPY
-#: Merge.rc:1050
+#: Merge.rc:1058
msgid "Copy"
msgstr "העתק"
#. IDR_POPUP_EDITOR_HEADERBAR, ID_EDITOR_COPY_PATH
-#: Merge.rc:1051
+#: Merge.rc:1059
msgid "&Copy Full Path"
msgstr "העתק נתיב מלא"
#. IDR_POPUP_EDITOR_HEADERBAR, ID_EDITOR_COPY_FILENAME
-#: Merge.rc:1052
+#: Merge.rc:1060
msgid "Copy &Filename"
msgstr "העתק שם קובץ"
#. IDR_POPUP_EDITOR_HEADERBAR, ID_EDITOR_EDIT_CAPTION
-#: Merge.rc:1053
+#: Merge.rc:1061
msgid "&Edit Caption\tF2"
msgstr "ערוך כותרת\tF2"
#. IDR_POPUP_EDITOR_HEADERBAR, ID_EDITOR_EDIT_PATH
-#: Merge.rc:1055
+#: Merge.rc:1063
msgid "Edit &Path\tCtrl+L"
msgstr ""
#. IDR_POPUP_EDITOR_HEADERBAR, ID_EDITOR_SELECT_FILE
-#: Merge.rc:1056
+#: Merge.rc:1064
msgid "&Open..."
msgstr "פתח..."
#. IDR_POPUP_PLUGINS_SETTINGS
-#: Merge.rc:1062
+#: Merge.rc:1070
msgid "Unpacker Settings"
msgstr "הגדרות מפענח"
#. IDS_USERCHOICE_NONE
-#: Merge.rc:1064 Merge.rc:1070 Merge.rc:1789 Merge.rc:1793 Merge.rc:5030
+#: Merge.rc:1072 Merge.rc:1078 Merge.rc:1799 Merge.rc:1803 Merge.rc:5040
msgid ""
msgstr "<ללא>"
#. IDS_USERCHOICE_AUTOMATIC
-#: Merge.rc:1065 Merge.rc:1071 Merge.rc:5031
+#: Merge.rc:1073 Merge.rc:1079 Merge.rc:5041
msgid ""
msgstr "<אוטומטי>"
#. IDD_OPEN, IDC_SELECT_PREDIFFER
-#: Merge.rc:1066 Merge.rc:1072 Merge.rc:1970 Merge.rc:1974
+#: Merge.rc:1074 Merge.rc:1080 Merge.rc:1980 Merge.rc:1984
msgid "&Select..."
msgstr "בחר..."
#. IDR_POPUP_PLUGINS_SETTINGS
-#: Merge.rc:1068
+#: Merge.rc:1076
msgid "Prediffer Settings"
msgstr "הגדרות השוואה מוקדמת"
#. IDR_POPUP_LOCATIONBAR, ID_LOCBAR_GOTODIFF
-#: Merge.rc:1080
+#: Merge.rc:1088
msgid "G&o to Diff"
msgstr "עבור להבדל"
#. IDR_POPUP_LOCATIONBAR, ID_LOCBAR_MOVECURSOR_ONCLICK
-#: Merge.rc:1083
+#: Merge.rc:1091
msgid "Move Cursor on &Click"
msgstr ""
#. IDR_POPUP_LOCATIONBAR, ID_DISPLAY_MOVED_NONE
-#: Merge.rc:1085
+#: Merge.rc:1093
msgid "&No Moved Blocks"
msgstr "ללא בלוקים שהוזזו"
#. IDR_POPUP_LOCATIONBAR, ID_DISPLAY_MOVED_ALL
-#: Merge.rc:1086
+#: Merge.rc:1094
msgid "&All Moved Blocks"
msgstr "כל הבלוקים שהוזזו"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS
-#: Merge.rc:1094 Merge.rc:1127
+#: Merge.rc:1102 Merge.rc:1135
msgid "W&hitespaces"
msgstr "רווחים"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_WHITESPACE_COMPARE
-#: Merge.rc:1096 Merge.rc:1129
+#: Merge.rc:1104 Merge.rc:1137
msgid "Com&pare"
msgstr "השווה"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_WHITESPACE_IGNORE
-#: Merge.rc:1097 Merge.rc:1130
+#: Merge.rc:1105 Merge.rc:1138
msgid "I&gnore Changes"
msgstr "התעלם משינויים"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_WHITESPACE_IGNOREALL
-#: Merge.rc:1098 Merge.rc:1131
+#: Merge.rc:1106 Merge.rc:1139
msgid "Ig&nore All"
msgstr "התעלם מהכל"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_IGNORE_BLANKLINES
-#: Merge.rc:1100 Merge.rc:1133
+#: Merge.rc:1108 Merge.rc:1141
msgid "Ignore Blan&k Lines"
msgstr "התעלם משורות ריקות"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_IGNORE_CASE
-#: Merge.rc:1101 Merge.rc:1134
+#: Merge.rc:1109 Merge.rc:1142
msgid "Ignore &Case"
msgstr "התעלם מרישיות"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_IGNORE_EOL
-#: Merge.rc:1102 Merge.rc:1135
+#: Merge.rc:1110 Merge.rc:1143
msgid "Igno&re EOL Differences (Windows/Unix/Mac)"
msgstr "התעלם מהבדלים בהחזרת שורה (Windows/Unix/Mac)"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_IGNORE_CODEPAGE
-#: Merge.rc:1103 Merge.rc:1136
+#: Merge.rc:1111 Merge.rc:1144
msgid "Ignore Codepage &Differences"
msgstr "התעלם מהבדלי קידוד תווים"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_IGNORE_NUMBERS
-#: Merge.rc:1104 Merge.rc:1137
+#: Merge.rc:1112 Merge.rc:1145
msgid "Ignore Num&bers"
msgstr "התעלם ממספרים"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_IGNORE_COMMENTS
-#: Merge.rc:1105 Merge.rc:1138
+#: Merge.rc:1113 Merge.rc:1146
msgid "Ignore C&omment Differences"
msgstr "התעלם מהבדלי הערות"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_IGNORE_MISSING_TRAILING_EOL
-#: Merge.rc:1106 Merge.rc:1139
+#: Merge.rc:1114 Merge.rc:1147
msgid "Ignore &Missing Trailing EOL"
msgstr "התעלם מהיעדר סיום שורה"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_IGNORE_LINE_BREAKS
-#: Merge.rc:1107 Merge.rc:1140
+#: Merge.rc:1115 Merge.rc:1148
msgid "Ignore Line &Breaks (Treat as Spaces)"
msgstr ""
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_RECURS_CHECK
-#: Merge.rc:1109 Merge.rc:2963
+#: Merge.rc:1117 Merge.rc:2973
msgid "&Include Subfolders"
msgstr "כלול תיקיות משנה"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS
-#: Merge.rc:1110 Merge.rc:1142
+#: Merge.rc:1118 Merge.rc:1150
msgid "&Compare Method"
msgstr "שיטת השוואה"
#. IDS_COMPMETHOD_FULL_CONTENTS
-#: Merge.rc:1112 Merge.rc:1144 Merge.rc:1328 Merge.rc:4282
+#: Merge.rc:1120 Merge.rc:1152 Merge.rc:1338 Merge.rc:4292
msgid "Full Contents"
msgstr "תוכן מלא"
#. IDS_COMPMETHOD_QUICK_CONTENTS
-#: Merge.rc:1113 Merge.rc:1145 Merge.rc:1329 Merge.rc:4283
+#: Merge.rc:1121 Merge.rc:1153 Merge.rc:1339 Merge.rc:4293
msgid "Quick Contents"
msgstr "תוכן מהיר"
#. IDS_COMPMETHOD_BINARY_CONTENTS
-#: Merge.rc:1114 Merge.rc:1146 Merge.rc:1330 Merge.rc:4284
+#: Merge.rc:1122 Merge.rc:1154 Merge.rc:1340 Merge.rc:4294
msgid "Binary Contents"
msgstr "תוכן בינארי"
#. IDS_COMPMETHOD_MODDATE
-#: Merge.rc:1115 Merge.rc:1147 Merge.rc:1331 Merge.rc:4285
+#: Merge.rc:1123 Merge.rc:1155 Merge.rc:1341 Merge.rc:4295
msgid "Modified Date"
msgstr "תאריך שינוי"
#. IDS_COMPMETHOD_DATESIZE
-#: Merge.rc:1116 Merge.rc:1148 Merge.rc:1332 Merge.rc:4286
+#: Merge.rc:1124 Merge.rc:1156 Merge.rc:1342 Merge.rc:4296
msgid "Modified Date and Size"
msgstr "תאריך שינוי וגודל"
#. IDS_COMPMETHOD_SIZE
-#: Merge.rc:1117 Merge.rc:1149 Merge.rc:1333 Merge.rc:4287
+#: Merge.rc:1125 Merge.rc:1157 Merge.rc:1343 Merge.rc:4297
msgid "Size"
msgstr "גודל"
#. IDS_COMPMETHOD_EXISTENCE
-#: Merge.rc:1118 Merge.rc:1150 Merge.rc:1334 Merge.rc:4288
+#: Merge.rc:1126 Merge.rc:1158 Merge.rc:1344 Merge.rc:4298
msgid "Existence"
msgstr ""
#. IDR_POPUP_PROJECT, ID_LOAD_PROJECT
-#: Merge.rc:1192
+#: Merge.rc:1202
msgid "&Load Project..."
msgstr "טען פרויקט..."
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARGALL
-#: Merge.rc:1272 Merge.rc:1301
+#: Merge.rc:1282 Merge.rc:1311
msgid "${*} - All Arguments"
msgstr "${*} - כל הפרמטרים"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARG1
-#: Merge.rc:1273 Merge.rc:1302
+#: Merge.rc:1283 Merge.rc:1312
msgid "${1} - First Argument"
msgstr "${1} - הפרמטר הראשון"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARG2
-#: Merge.rc:1274 Merge.rc:1303
+#: Merge.rc:1284 Merge.rc:1313
msgid "${2} - Second Argument"
msgstr "${2} - הפרמטר השני"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARG3
-#: Merge.rc:1275 Merge.rc:1304
+#: Merge.rc:1285 Merge.rc:1314
msgid "${3} - Third Argument"
msgstr "${3} - הפרמטר השלישי"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARG4
-#: Merge.rc:1276 Merge.rc:1305
+#: Merge.rc:1286 Merge.rc:1315
msgid "${4} - Fourth Argument"
msgstr "${4} - הפרמטר הרביעי"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARG5
-#: Merge.rc:1277 Merge.rc:1306
+#: Merge.rc:1287 Merge.rc:1316
msgid "${5} - Fifth Argument"
msgstr "${5} - הפרמטר החמישי"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARG6
-#: Merge.rc:1278 Merge.rc:1307
+#: Merge.rc:1288 Merge.rc:1317
msgid "${6} - Sixth Argument"
msgstr "${6} - הפרמטר השישי"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARG7
-#: Merge.rc:1279 Merge.rc:1308
+#: Merge.rc:1289 Merge.rc:1318
msgid "${7} - Seventh Argument"
msgstr "${7} - הפרמטר השביעי"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARG8
-#: Merge.rc:1280 Merge.rc:1309
+#: Merge.rc:1290 Merge.rc:1319
msgid "${8} - Eighth Argument"
msgstr "${8} - הפרמטר השמיני"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARG9
-#: Merge.rc:1281 Merge.rc:1310
+#: Merge.rc:1291 Merge.rc:1320
msgid "${9} - Ninth Argument"
msgstr "${9} - הפרמטר התשיעי"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_SRC_FILE
-#: Merge.rc:1289
+#: Merge.rc:1299
msgid "${SRC_FILE} - Source File"
msgstr "${SRC_FILE} - קובץ מקור"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_SRC_FOLDER
-#: Merge.rc:1290
+#: Merge.rc:1300
msgid "${SRC_FOLDER} - Source Folder"
msgstr "${SRC_FOLDER} - תיקיית מקור"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_SRC_URL
-#: Merge.rc:1291
+#: Merge.rc:1301
msgid "${SRC_URL} - Source URL"
msgstr "${SRC_URL} - כתובת URL מקורית"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_SRC_URL_PROTOCOL
-#: Merge.rc:1292
+#: Merge.rc:1302
msgid "${SRC_URL_PROTOCOL} - Source URL Protocol"
msgstr "${SRC_URL_PROTOCOL} - פרוטוקול כתובת מקורית"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_SRC_URL_SUFFIX
-#: Merge.rc:1293
+#: Merge.rc:1303
msgid "${SRC_URL_SUFFIX} - Source URL Suffix"
msgstr "${SRC_URL_SUFFIX} - סיומת כתובת מקורית"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_DST_FILE
-#: Merge.rc:1294
+#: Merge.rc:1304
msgid "${DST_FILE} - Destination File"
msgstr "${DST_FILE} - קובץ יעד"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_DST_FOLDER
-#: Merge.rc:1295
+#: Merge.rc:1305
msgid "${DST_FOLDER} - Destination Folder"
msgstr "${DST_FOLDER} - תיקיית יעד"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_DST_URL
-#: Merge.rc:1296
+#: Merge.rc:1306
msgid "${DST_URL} - Destination URL"
msgstr "${DST_URL} - כתובת URL יעד"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_DST_URL_PROTOCOL
-#: Merge.rc:1297
+#: Merge.rc:1307
msgid "${DST_URL_PROTOCOL} - Destination URL Protocol"
msgstr "${DST_URL_PROTOCOL} - פרוטוקול כתובת יעד"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_DST_URL_SUFFIX
-#: Merge.rc:1298
+#: Merge.rc:1308
msgid "${DST_URL_SUFFIX} - Destination URL Suffix"
msgstr "${DST_URL_SUFFIX} - סיומת כתובת יעד"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_WINMERGE_HOME
-#: Merge.rc:1299
+#: Merge.rc:1309
msgid "${WINMERGE_HOME} - WinMerge Home Directory"
msgstr "${WINMERGE_HOME} - תיקיית הבית של WinMerge"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_SCRIPT_FILE
-#: Merge.rc:1300
+#: Merge.rc:1310
msgid "${SCRIPT_FILE} - Script File"
msgstr "${SCRIPT_FILE} - קובץ סקריפט"
#. IDR_POPUP_PLUGIN_ADD_MENU, ID_PLUGIN_ADD_UNPACKER
-#: Merge.rc:1318
+#: Merge.rc:1328
msgid "Add &Unpacker Plugin..."
msgstr "הוסף תוסף מפענח..."
#. IDR_POPUP_PLUGIN_ADD_MENU, ID_PLUGIN_ADD_PREDIFFER
-#: Merge.rc:1319
+#: Merge.rc:1329
msgid "Add &Prediffer Plugin..."
msgstr "הוסף תוסף השוואה מוקדמת..."
#. IDR_POPUP_PLUGIN_ADD_MENU, ID_PLUGIN_DUPLICATE
-#: Merge.rc:1320
+#: Merge.rc:1330
msgid "&Duplicate Plugin..."
msgstr "שכפל תוסף..."
#. IDR_POPUP_OUTPUTVIEW, ID_EDIT_CLEAR_ALL
-#: Merge.rc:1344
+#: Merge.rc:1354
msgid "Clear &All"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_MASK_CLEAR
-#: Merge.rc:1352
+#: Merge.rc:1362
msgid "&Clear All"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_MASK_REMOVE_LAST
-#: Merge.rc:1353
+#: Merge.rc:1363
msgid "Remove Last Filter &Group"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_MASK_ALL
-#: Merge.rc:1354
+#: Merge.rc:1364
msgid "R&eset to Default (*.*)"
msgstr ""
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1355
+#: Merge.rc:1365
msgid "Add E&xclude File"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_SYS
-#: Merge.rc:1357
+#: Merge.rc:1367
msgid "&System Files"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_BACKUP
-#: Merge.rc:1358
+#: Merge.rc:1368
msgid "&Editor Backup Files"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_BIN
-#: Merge.rc:1359
+#: Merge.rc:1369
msgid "&Compiled Binary Files"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_LOG
-#: Merge.rc:1360
+#: Merge.rc:1370
msgid "&Log Files"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_TEMP
-#: Merge.rc:1361
+#: Merge.rc:1371
msgid "&Temporary or Cache Files"
msgstr ""
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1363
+#: Merge.rc:1373
msgid "Add Excl&ude Folder"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FOLDER_VCS
-#: Merge.rc:1365
+#: Merge.rc:1375
msgid "&Version Control"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FOLDER_BUILD
-#: Merge.rc:1366
+#: Merge.rc:1376
msgid "&Build Artifacts"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FOLDER_IDE
-#: Merge.rc:1367
+#: Merge.rc:1377
msgid "&IDE"
msgstr ""
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1370
+#: Merge.rc:1380
msgid "Add &File Condition"
msgstr ""
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1372 Merge.rc:1551
+#: Merge.rc:1382 Merge.rc:1561
msgid "File &Size"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_SIZE, ID_FILTERMENU_DIFF_SIZE_LT_1KB
-#: Merge.rc:1374 Merge.rc:1527 Merge.rc:1564 Merge.rc:1629 Merge.rc:1707
+#: Merge.rc:1384 Merge.rc:1537 Merge.rc:1574 Merge.rc:1639 Merge.rc:1717
msgid "Less than 1KB"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_SIZE, ID_FILTERMENU_DIFF_SIZE_GE_1KB
-#: Merge.rc:1375 Merge.rc:1528 Merge.rc:1565 Merge.rc:1630 Merge.rc:1708
+#: Merge.rc:1385 Merge.rc:1538 Merge.rc:1575 Merge.rc:1640 Merge.rc:1718
msgid "1KB or more"
msgstr ""
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_LT_10KB
-#: Merge.rc:1376 Merge.rc:1529 Merge.rc:1631
+#: Merge.rc:1386 Merge.rc:1539 Merge.rc:1641
msgid "Less than 10KB"
msgstr ""
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_GE_10KB
-#: Merge.rc:1377 Merge.rc:1530 Merge.rc:1632
+#: Merge.rc:1387 Merge.rc:1540 Merge.rc:1642
msgid "10KB or more"
msgstr ""
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_LT_100KB
-#: Merge.rc:1378 Merge.rc:1531 Merge.rc:1633
+#: Merge.rc:1388 Merge.rc:1541 Merge.rc:1643
msgid "Less than 100KB"
msgstr ""
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_GE_100KB
-#: Merge.rc:1379 Merge.rc:1532 Merge.rc:1634
+#: Merge.rc:1389 Merge.rc:1542 Merge.rc:1644
msgid "100KB or more"
msgstr ""
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_LT_1MB
-#: Merge.rc:1380 Merge.rc:1533 Merge.rc:1635
+#: Merge.rc:1390 Merge.rc:1543 Merge.rc:1645
msgid "Less than 1MB"
msgstr ""
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_GE_1MB
-#: Merge.rc:1381 Merge.rc:1534 Merge.rc:1636
+#: Merge.rc:1391 Merge.rc:1544 Merge.rc:1646
msgid "1MB or more"
msgstr ""
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_LT_10MB
-#: Merge.rc:1382 Merge.rc:1535 Merge.rc:1637
+#: Merge.rc:1392 Merge.rc:1545 Merge.rc:1647
msgid "Less than 10MB"
msgstr ""
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_GE_10MB
-#: Merge.rc:1383 Merge.rc:1536 Merge.rc:1638
+#: Merge.rc:1393 Merge.rc:1546 Merge.rc:1648
msgid "10MB or more"
msgstr ""
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_LT_100MB
-#: Merge.rc:1384 Merge.rc:1537 Merge.rc:1639
+#: Merge.rc:1394 Merge.rc:1547 Merge.rc:1649
msgid "Less than 100MB"
msgstr ""
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_GE_100MB
-#: Merge.rc:1385 Merge.rc:1538 Merge.rc:1640
+#: Merge.rc:1395 Merge.rc:1548 Merge.rc:1650
msgid "100MB or more"
msgstr ""
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_LT_1GB
-#: Merge.rc:1386 Merge.rc:1539 Merge.rc:1641
+#: Merge.rc:1396 Merge.rc:1549 Merge.rc:1651
msgid "Less than 1GB"
msgstr ""
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_GE_1GB
-#: Merge.rc:1387 Merge.rc:1642
+#: Merge.rc:1397 Merge.rc:1652
msgid "1GB or more"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_RANGE
-#: Merge.rc:1388 Merge.rc:1465 Merge.rc:1517 Merge.rc:1523 Merge.rc:1540
-#: Merge.rc:1566 Merge.rc:1587 Merge.rc:1643 Merge.rc:1709 Merge.rc:1734
+#: Merge.rc:1398 Merge.rc:1475 Merge.rc:1527 Merge.rc:1533 Merge.rc:1550
+#: Merge.rc:1576 Merge.rc:1597 Merge.rc:1653 Merge.rc:1719 Merge.rc:1744
msgid "Custom Range..."
msgstr ""
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1390 Merge.rc:1471 Merge.rc:1568
+#: Merge.rc:1400 Merge.rc:1481 Merge.rc:1578
msgid "&Last Modified"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE
-#: Merge.rc:1392 Merge.rc:1473 Merge.rc:1651
+#: Merge.rc:1402 Merge.rc:1483 Merge.rc:1661
msgid "&Hour"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_HOUR_BEFORE_1
-#: Merge.rc:1394 Merge.rc:1475 Merge.rc:1653
+#: Merge.rc:1404 Merge.rc:1485 Merge.rc:1663
msgid "More than 1 hour ago"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_HOUR_WITHIN_1
-#: Merge.rc:1395 Merge.rc:1476 Merge.rc:1654
+#: Merge.rc:1405 Merge.rc:1486 Merge.rc:1664
msgid "Within 1 hour"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE
-#: Merge.rc:1397 Merge.rc:1478 Merge.rc:1656
+#: Merge.rc:1407 Merge.rc:1488 Merge.rc:1666
msgid "&Day"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_DAY_BEFORE_TODAY
-#: Merge.rc:1399 Merge.rc:1480 Merge.rc:1658
+#: Merge.rc:1409 Merge.rc:1490 Merge.rc:1668
msgid "Before today"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_DAY_TODAY
-#: Merge.rc:1400 Merge.rc:1481 Merge.rc:1659
+#: Merge.rc:1410 Merge.rc:1491 Merge.rc:1669
msgid "Today"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_DAY_BEFORE_YESTERDAY
-#: Merge.rc:1401 Merge.rc:1482 Merge.rc:1660
+#: Merge.rc:1411 Merge.rc:1492 Merge.rc:1670
msgid "Before yesterday"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_DAY_YESTERDAY
-#: Merge.rc:1402 Merge.rc:1483 Merge.rc:1661
+#: Merge.rc:1412 Merge.rc:1493 Merge.rc:1671
msgid "Yesterday"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_DAY_SINCE_YESTERDAY
-#: Merge.rc:1403 Merge.rc:1484 Merge.rc:1662
+#: Merge.rc:1413 Merge.rc:1494 Merge.rc:1672
msgid "Since yesterday"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE
-#: Merge.rc:1405 Merge.rc:1486 Merge.rc:1664
+#: Merge.rc:1415 Merge.rc:1496 Merge.rc:1674
msgid "&Week"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_WEEK_BEFORE_THIS
-#: Merge.rc:1407 Merge.rc:1488 Merge.rc:1666
+#: Merge.rc:1417 Merge.rc:1498 Merge.rc:1676
msgid "Before this week"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_WEEK_THIS
-#: Merge.rc:1408 Merge.rc:1489 Merge.rc:1667
+#: Merge.rc:1418 Merge.rc:1499 Merge.rc:1677
msgid "This week"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_WEEK_BEFORE_LAST
-#: Merge.rc:1409 Merge.rc:1490 Merge.rc:1668
+#: Merge.rc:1419 Merge.rc:1500 Merge.rc:1678
msgid "Before last week"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_WEEK_LAST
-#: Merge.rc:1410 Merge.rc:1491 Merge.rc:1669
+#: Merge.rc:1420 Merge.rc:1501 Merge.rc:1679
msgid "Last week"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_WEEK_SINCE_LAST
-#: Merge.rc:1411 Merge.rc:1492 Merge.rc:1670
+#: Merge.rc:1421 Merge.rc:1502 Merge.rc:1680
msgid "Since last week"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE
-#: Merge.rc:1413 Merge.rc:1494 Merge.rc:1672
+#: Merge.rc:1423 Merge.rc:1504 Merge.rc:1682
msgid "&Month"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_MONTH_BEFORE_THIS
-#: Merge.rc:1415 Merge.rc:1496 Merge.rc:1674
+#: Merge.rc:1425 Merge.rc:1506 Merge.rc:1684
msgid "Before this month"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_MONTH_THIS
-#: Merge.rc:1416 Merge.rc:1497 Merge.rc:1675
+#: Merge.rc:1426 Merge.rc:1507 Merge.rc:1685
msgid "This month"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_MONTH_BEFORE_LAST
-#: Merge.rc:1417 Merge.rc:1498 Merge.rc:1676
+#: Merge.rc:1427 Merge.rc:1508 Merge.rc:1686
msgid "Before last month"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_MONTH_LAST
-#: Merge.rc:1418 Merge.rc:1499 Merge.rc:1677
+#: Merge.rc:1428 Merge.rc:1509 Merge.rc:1687
msgid "Last month"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_MONTH_SINCE_LAST
-#: Merge.rc:1419 Merge.rc:1500 Merge.rc:1678
+#: Merge.rc:1429 Merge.rc:1510 Merge.rc:1688
msgid "Since last month"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE
-#: Merge.rc:1421 Merge.rc:1502 Merge.rc:1680
+#: Merge.rc:1431 Merge.rc:1512 Merge.rc:1690
msgid "&Year"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_YEAR_BEFORE_THIS
-#: Merge.rc:1423 Merge.rc:1504 Merge.rc:1682
+#: Merge.rc:1433 Merge.rc:1514 Merge.rc:1692
msgid "Before this year"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_YEAR_THIS
-#: Merge.rc:1424 Merge.rc:1505 Merge.rc:1683
+#: Merge.rc:1434 Merge.rc:1515 Merge.rc:1693
msgid "This year"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_YEAR_BEFORE_LAST
-#: Merge.rc:1425 Merge.rc:1506 Merge.rc:1684
+#: Merge.rc:1435 Merge.rc:1516 Merge.rc:1694
msgid "Before last year"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_YEAR_LAST
-#: Merge.rc:1426 Merge.rc:1507 Merge.rc:1685
+#: Merge.rc:1436 Merge.rc:1517 Merge.rc:1695
msgid "Last year"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_YEAR_SINCE_LAST
-#: Merge.rc:1427 Merge.rc:1508 Merge.rc:1686
+#: Merge.rc:1437 Merge.rc:1518 Merge.rc:1696
msgid "Since last year"
msgstr ""
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_RANGE
-#: Merge.rc:1429 Merge.rc:1510 Merge.rc:1688
+#: Merge.rc:1439 Merge.rc:1520 Merge.rc:1698
msgid "&Custom Range..."
msgstr ""
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1431 Merge.rc:1589
+#: Merge.rc:1441 Merge.rc:1599
msgid "&Attributes"
msgstr ""
#. IDR_POPUP_FILTERMENU_ATTR, ID_FILTERMENU_ATTR_READONLY
-#: Merge.rc:1433 Merge.rc:1607
+#: Merge.rc:1443 Merge.rc:1617
msgid "Read-only files"
msgstr ""
#. IDR_POPUP_FILTERMENU_ATTR, ID_FILTERMENU_ATTR_NOT_READONLY
-#: Merge.rc:1434 Merge.rc:1608
+#: Merge.rc:1444 Merge.rc:1618
msgid "Not read-only files"
msgstr ""
#. IDR_POPUP_FILTERMENU_ATTR, ID_FILTERMENU_ATTR_HIDDEN
-#: Merge.rc:1435 Merge.rc:1609
+#: Merge.rc:1445 Merge.rc:1619
msgid "Hidden files"
msgstr ""
#. IDR_POPUP_FILTERMENU_ATTR, ID_FILTERMENU_ATTR_NOT_HIDDEN
-#: Merge.rc:1436 Merge.rc:1610
+#: Merge.rc:1446 Merge.rc:1620
msgid "Not hidden files"
msgstr ""
#. IDR_POPUP_FILTERMENU_ATTR, ID_FILTERMENU_ATTR_SYSTEM
-#: Merge.rc:1437 Merge.rc:1611
+#: Merge.rc:1447 Merge.rc:1621
msgid "System files"
msgstr ""
#. IDR_POPUP_FILTERMENU_ATTR, ID_FILTERMENU_ATTR_NOT_SYSTEM
-#: Merge.rc:1438 Merge.rc:1612
+#: Merge.rc:1448 Merge.rc:1622
msgid "Not system files"
msgstr ""
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1440
+#: Merge.rc:1450
msgid "File &Content"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_CONTAINS
-#: Merge.rc:1442
+#: Merge.rc:1452
msgid "Contains string..."
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_NOT_CONTAINS
-#: Merge.rc:1443
+#: Merge.rc:1453
msgid "Does not contain string..."
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_FIRST_LINE_CONTAINS
-#: Merge.rc:1444
+#: Merge.rc:1454
msgid "First line contains string..."
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_FIRST_LINE_NOT_CONTAINS
-#: Merge.rc:1445
+#: Merge.rc:1455
msgid "First line does not contain string..."
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_FIRST_10_CONTAINS
-#: Merge.rc:1446
+#: Merge.rc:1456
msgid "First 10 lines contain string..."
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_FIRST_10_NOT_CONTAINS
-#: Merge.rc:1447
+#: Merge.rc:1457
msgid "First 10 lines do not contain string..."
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_LAST_10_CONTAINS
-#: Merge.rc:1448
+#: Merge.rc:1458
msgid "Last 10 lines contain string..."
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_LAST_10_NOT_CONTAINS
-#: Merge.rc:1449
+#: Merge.rc:1459
msgid "Last 10 lines do not contain string..."
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_LAST_LINE_CONTAINS
-#: Merge.rc:1450
+#: Merge.rc:1460
msgid "Last line contains string..."
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_LAST_LINE_NOT_CONTAINS
-#: Merge.rc:1451
+#: Merge.rc:1461
msgid "Last line does not contain string..."
msgstr ""
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1453
+#: Merge.rc:1463
msgid "&Line Count"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_LT_10
-#: Merge.rc:1455
+#: Merge.rc:1465
msgid "Less than 10"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_GE_10
-#: Merge.rc:1456
+#: Merge.rc:1466
msgid "10 or more"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_LT_100
-#: Merge.rc:1457
+#: Merge.rc:1467
msgid "Less than 100"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_GE_100
-#: Merge.rc:1458
+#: Merge.rc:1468
msgid "100 or more"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_LT_1000
-#: Merge.rc:1459
+#: Merge.rc:1469
msgid "Less than 1000"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_GE_1000
-#: Merge.rc:1460
+#: Merge.rc:1470
msgid "1000 or more"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_LT_10000
-#: Merge.rc:1461
+#: Merge.rc:1471
msgid "Less than 10000"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_GE_10000
-#: Merge.rc:1462
+#: Merge.rc:1472
msgid "10000 or more"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_LT_100000
-#: Merge.rc:1463
+#: Merge.rc:1473
msgid "Less than 100000"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_GE_100000
-#: Merge.rc:1464
+#: Merge.rc:1474
msgid "100000 or more"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_PROPS
-#: Merge.rc:1467 Merge.rc:1594 Merge.rc:1761 Merge.rc:1778
+#: Merge.rc:1477 Merge.rc:1604 Merge.rc:1771 Merge.rc:1788
msgid "Additional &Properties..."
msgstr ""
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1469
+#: Merge.rc:1479
msgid "Add F&older Condition"
msgstr ""
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1513
+#: Merge.rc:1523
msgid "&Files"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FOLDER_FILES_EQ_0
-#: Merge.rc:1515
+#: Merge.rc:1525
msgid "0 files"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FOLDER_FILES_GE_1
-#: Merge.rc:1516
+#: Merge.rc:1526
msgid "1 file or more"
msgstr ""
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1519
+#: Merge.rc:1529
msgid "&Items"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FOLDER_ITEMS_EQ_0
-#: Merge.rc:1521
+#: Merge.rc:1531
msgid "0 items"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FOLDER_ITEMS_GE_1
-#: Merge.rc:1522
+#: Merge.rc:1532
msgid "1 item or more"
msgstr ""
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1525
+#: Merge.rc:1535
msgid "&Total Size"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FOLDER_STATS_RECURSIVE
-#: Merge.rc:1542
+#: Merge.rc:1552
msgid "&Recursive"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONDITION_ANY
-#: Merge.rc:1544
+#: Merge.rc:1554
msgid "Target: &Any (Left/Middle/Right)"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONDITION_LEFT
-#: Merge.rc:1545
+#: Merge.rc:1555
msgid "Target: &Left"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONDITION_MIDDLE
-#: Merge.rc:1546
+#: Merge.rc:1556
msgid "Target: &Middle"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONDITION_RIGHT
-#: Merge.rc:1547
+#: Merge.rc:1557
msgid "Target: &Right"
msgstr ""
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1549
+#: Merge.rc:1559
msgid "Add &Difference Condition"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_PROP, ID_FILTERMENU_DIFF_PROP_EQUAL
-#: Merge.rc:1553 Merge.rc:1570 Merge.rc:1591 Merge.rc:1696 Merge.rc:1717
-#: Merge.rc:1742
+#: Merge.rc:1563 Merge.rc:1580 Merge.rc:1601 Merge.rc:1706 Merge.rc:1727
+#: Merge.rc:1752
msgid "Equal"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_PROP, ID_FILTERMENU_DIFF_PROP_NOT_EQUAL
-#: Merge.rc:1554 Merge.rc:1571 Merge.rc:1592 Merge.rc:1697 Merge.rc:1718
-#: Merge.rc:1743
+#: Merge.rc:1564 Merge.rc:1581 Merge.rc:1602 Merge.rc:1707 Merge.rc:1728
+#: Merge.rc:1753
msgid "Not Equal"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_PROP, ID_FILTERMENU_DIFF_PROP_LESS
-#: Merge.rc:1555 Merge.rc:1572 Merge.rc:1698 Merge.rc:1719 Merge.rc:1744
+#: Merge.rc:1565 Merge.rc:1582 Merge.rc:1708 Merge.rc:1729 Merge.rc:1754
msgid "Less Than"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_PROP, ID_FILTERMENU_DIFF_PROP_LESS_EQUAL
-#: Merge.rc:1556 Merge.rc:1573 Merge.rc:1699 Merge.rc:1720 Merge.rc:1745
+#: Merge.rc:1566 Merge.rc:1583 Merge.rc:1709 Merge.rc:1730 Merge.rc:1755
msgid "Less Than or Equal to"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_PROP, ID_FILTERMENU_DIFF_PROP_GREATER
-#: Merge.rc:1557 Merge.rc:1574 Merge.rc:1700 Merge.rc:1721 Merge.rc:1746
+#: Merge.rc:1567 Merge.rc:1584 Merge.rc:1710 Merge.rc:1731 Merge.rc:1756
msgid "Greater Than"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_PROP, ID_FILTERMENU_DIFF_PROP_GREATER_EQUAL
-#: Merge.rc:1558 Merge.rc:1575 Merge.rc:1701 Merge.rc:1722 Merge.rc:1747
+#: Merge.rc:1568 Merge.rc:1585 Merge.rc:1711 Merge.rc:1732 Merge.rc:1757
msgid "Greater Than or Equal to"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_SIZE, ID_FILTERMENU_DIFF_SIZE_LT_10B
-#: Merge.rc:1560 Merge.rc:1703
+#: Merge.rc:1570 Merge.rc:1713
msgid "Less than 10B"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_SIZE, ID_FILTERMENU_DIFF_SIZE_GE_10B
-#: Merge.rc:1561 Merge.rc:1704
+#: Merge.rc:1571 Merge.rc:1714
msgid "10B or more"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_SIZE, ID_FILTERMENU_DIFF_SIZE_LT_100B
-#: Merge.rc:1562 Merge.rc:1705
+#: Merge.rc:1572 Merge.rc:1715
msgid "Less than 100B"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_SIZE, ID_FILTERMENU_DIFF_SIZE_GE_100B
-#: Merge.rc:1563 Merge.rc:1706
+#: Merge.rc:1573 Merge.rc:1716
msgid "100B or more"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_LT_1SECOND
-#: Merge.rc:1577 Merge.rc:1724
+#: Merge.rc:1587 Merge.rc:1734
msgid "Less than 1 second"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_GE_1SECOND
-#: Merge.rc:1578 Merge.rc:1725
+#: Merge.rc:1588 Merge.rc:1735
msgid "1 second or more"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_LT_1MINUTE
-#: Merge.rc:1579 Merge.rc:1726
+#: Merge.rc:1589 Merge.rc:1736
msgid "Less than 1 minute"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_GE_1MINUTE
-#: Merge.rc:1580 Merge.rc:1727
+#: Merge.rc:1590 Merge.rc:1737
msgid "1 minute or more"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_LT_1HOUR
-#: Merge.rc:1581 Merge.rc:1728
+#: Merge.rc:1591 Merge.rc:1738
msgid "Less than 1 hour"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_GE_1HOUR
-#: Merge.rc:1582 Merge.rc:1729
+#: Merge.rc:1592 Merge.rc:1739
msgid "1 hour or more"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_LT_1DAY
-#: Merge.rc:1583 Merge.rc:1730
+#: Merge.rc:1593 Merge.rc:1740
msgid "Less than 1 day"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_GE_1DAY
-#: Merge.rc:1584 Merge.rc:1731
+#: Merge.rc:1594 Merge.rc:1741
msgid "1 day or more"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_LT_1WEEK
-#: Merge.rc:1585 Merge.rc:1732
+#: Merge.rc:1595 Merge.rc:1742
msgid "Less than 1 week"
msgstr ""
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_GE_1WEEK
-#: Merge.rc:1586 Merge.rc:1733
+#: Merge.rc:1596 Merge.rc:1743
msgid "1 week or more"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_CONDITION_DIFF_LEFT_RIGHT
-#: Merge.rc:1596
+#: Merge.rc:1606
msgid "Target: &Left and Right"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_CONDITION_DIFF_LEFT_MIDDLE
-#: Merge.rc:1597
+#: Merge.rc:1607
msgid "Target: Left and &Middle"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_CONDITION_DIFF_MIDDLE_RIGHT
-#: Merge.rc:1598
+#: Merge.rc:1608
msgid "Target: Middle and &Right"
msgstr ""
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_CONDITION_DIFF_ALL
-#: Merge.rc:1599
+#: Merge.rc:1609
msgid "Target: &All"
msgstr ""
#. IDR_POPUP_FILTERMENU_BINARY, ID_FILTERMENU_BINARY_ONLY
-#: Merge.rc:1620
+#: Merge.rc:1630
msgid "Binary files only"
msgstr ""
#. IDR_POPUP_FILTERMENU_BINARY, ID_FILTERMENU_TEXT_ONLY
-#: Merge.rc:1621
+#: Merge.rc:1631
msgid "Text files only"
msgstr ""
#. IDR_POPUP_ADDCMPMENU, ID_ADDCMPMENU_CLEAR
-#: Merge.rc:1755
+#: Merge.rc:1765
msgid "&Clear conditions"
msgstr ""
#. IDR_POPUP_ADDCMPMENU, ID_ADDCMPMENU_CMP_SIZE
-#: Merge.rc:1757
+#: Merge.rc:1767
msgid "Compare &Size"
msgstr ""
#. IDR_POPUP_ADDCMPMENU, ID_ADDCMPMENU_CMP_DATE
-#: Merge.rc:1758
+#: Merge.rc:1768
msgid "Compare &Date"
msgstr ""
#. IDR_POPUP_ADDCMPMENU, ID_ADDCMPMENU_CMP_ATTR
-#: Merge.rc:1759
+#: Merge.rc:1769
msgid "Compare &Attributes"
msgstr ""
#. IDR_POPUP_ADDCMPMENU, ID_ADDCMPMENU_CMP_CONTENTS
-#: Merge.rc:1760
+#: Merge.rc:1770
msgid "Compare C&ontents"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_CLEAR
-#: Merge.rc:1769
+#: Merge.rc:1779
msgid "&Clear Keys"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_NAME
-#: Merge.rc:1771
+#: Merge.rc:1781
msgid "&Name"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_BASENAME
-#: Merge.rc:1772
+#: Merge.rc:1782
msgid "&Base name (without extension)"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_NORMALIZED_NAME
-#: Merge.rc:1773
+#: Merge.rc:1783
msgid "Normalized &Unicode Name"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_RELPATH
-#: Merge.rc:1774
+#: Merge.rc:1784
msgid "&Relative Path"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_DATE
-#: Merge.rc:1776
+#: Merge.rc:1786
msgid "&Date"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_HASH_MD5
-#: Merge.rc:1777
+#: Merge.rc:1787
msgid "&Hash (MD5)"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_REPLACE
-#: Merge.rc:1780
+#: Merge.rc:1790
msgid "Insert &replace() Function"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_REGEXREPLACE
-#: Merge.rc:1781
+#: Merge.rc:1791
msgid "Insert rege&xReplace() Function"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU
-#: Merge.rc:1782
+#: Merge.rc:1792
msgid "Replace &Lists"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_CREATE_REPLACELIST
-#: Merge.rc:1784
+#: Merge.rc:1794
msgid "&Create String Replace List and Insert..."
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_CREATE_REGEXREPLACELIST
-#: Merge.rc:1785
+#: Merge.rc:1795
msgid "Create &Regex Replace List and Insert..."
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU
-#: Merge.rc:1787
+#: Merge.rc:1797
msgid "&String Replace Lists"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU
-#: Merge.rc:1791
+#: Merge.rc:1801
msgid "Re&gex Replace Lists"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_STRING_REPLACE_LISTS_FOLDER
-#: Merge.rc:1796
+#: Merge.rc:1806
msgid "Open String Replace Lists Folder..."
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_REGEX_REPLACE_LISTS_FOLDER
-#: Merge.rc:1797
+#: Merge.rc:1807
msgid "Open Regex Replace Lists Folder..."
msgstr ""
#. IDD_FILTERS_CONDITION, IDC_CONDITION_MATCHCASE
-#: Merge.rc:1799 Merge.rc:1995 Merge.rc:2014 Merge.rc:2042 Merge.rc:2585
+#: Merge.rc:1809 Merge.rc:2005 Merge.rc:2024 Merge.rc:2052 Merge.rc:2595
msgid "Match &case"
msgstr "התאם רישיות"
#. IDR_POPUP_RENAMEMOVE_MENU
-#: Merge.rc:1801
+#: Merge.rc:1811
msgid "Text &Normalization"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_TOLOWER
-#: Merge.rc:1803
+#: Merge.rc:1813
msgid "&Lowercase"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_TOUPPER
-#: Merge.rc:1804
+#: Merge.rc:1814
msgid "&Uppercase"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_TOHALFWIDTH
-#: Merge.rc:1805
+#: Merge.rc:1815
msgid "&Half-width"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_TOFULLWIDTH
-#: Merge.rc:1806
+#: Merge.rc:1816
msgid "&Full-width"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU
-#: Merge.rc:1807
+#: Merge.rc:1817
msgid "&Chinese Conversion"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_TOSIMPLIFIEDCHINESE
-#: Merge.rc:1809
+#: Merge.rc:1819
msgid "&Simplified Chinese"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_TOTRADITIONALCHINESE
-#: Merge.rc:1810
+#: Merge.rc:1820
msgid "&Traditional Chinese"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU
-#: Merge.rc:1812
+#: Merge.rc:1822
msgid "&Japanese Conversion"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_TOHIRAGANA
-#: Merge.rc:1814
+#: Merge.rc:1824
msgid "&Hiragana"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_TOKATAKANA
-#: Merge.rc:1815
+#: Merge.rc:1825
msgid "&Katakana"
msgstr ""
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_NORMALIZEUNICODE
-#: Merge.rc:1817
+#: Merge.rc:1827
msgid "Normalize &Unicode"
msgstr ""
#. IDD_ABOUTBOX
-#: Merge.rc:1932
+#: Merge.rc:1942
msgid "About WinMerge"
msgstr "אודות WinMerge"
#. IDD_ABOUTBOX, IDC_WWW
-#: Merge.rc:1936
+#: Merge.rc:1946
msgid "Visit the WinMerge Homepage!"
msgstr "בקר בדף הבית של WinMerge!"
#. IDD_PLUGINS_EDITPLUGIN, IDOK
-#: Merge.rc:1938 Merge.rc:2080 Merge.rc:2431 Merge.rc:2455 Merge.rc:2469
-#: Merge.rc:2497 Merge.rc:2588 Merge.rc:2613 Merge.rc:2674 Merge.rc:2691
-#: Merge.rc:2703 Merge.rc:2867 Merge.rc:2927 Merge.rc:3062 Merge.rc:3104
-#: Merge.rc:3147 Merge.rc:3197
+#: Merge.rc:1948 Merge.rc:2090 Merge.rc:2441 Merge.rc:2465 Merge.rc:2479
+#: Merge.rc:2507 Merge.rc:2598 Merge.rc:2623 Merge.rc:2684 Merge.rc:2701
+#: Merge.rc:2713 Merge.rc:2877 Merge.rc:2937 Merge.rc:3072 Merge.rc:3114
+#: Merge.rc:3157 Merge.rc:3207
msgid "OK"
msgstr "אישור"
#. IDD_ABOUTBOX, IDC_OPEN_CONTRIBUTORS
-#: Merge.rc:1939
+#: Merge.rc:1949
msgid "Contributors"
msgstr "תורמים"
#. IDD_SELECT_FILES_OR_FOLDERS
-#: Merge.rc:1945 Merge.rc:3070
+#: Merge.rc:1955 Merge.rc:3080
msgid "Select Files or Folders"
msgstr "בחר קבצים או תיקיות"
#. IDD_OPEN, IDC_FILES_DIRS_GROUP0
-#: Merge.rc:1949
+#: Merge.rc:1959
msgid "&1st File or Folder"
msgstr "קובץ או תיקיה ראשונה"
#. IDD_OPEN, IDC_PATH0_READONLY
-#: Merge.rc:1951
+#: Merge.rc:1961
msgid "Re&ad-only"
msgstr "קריאה בלבד"
#. IDD_OPEN, IDC_SWAP01_STATIC
-#: Merge.rc:1953
+#: Merge.rc:1963
msgid "Swap 1st | 2nd"
msgstr "החלף 1 | 2"
#. IDD_GENERATE_PATCH, IDC_DIFF_BROWSE_FILE1
-#: Merge.rc:1954 Merge.rc:2310 Merge.rc:2413
+#: Merge.rc:1964 Merge.rc:2320 Merge.rc:2423
msgid "&Browse..."
msgstr "עיון..."
#. IDD_OPEN, IDC_FILES_DIRS_GROUP1
-#: Merge.rc:1955
+#: Merge.rc:1965
msgid "&2nd File or Folder"
msgstr "קובץ או תיקיה שנייה"
#. IDD_OPEN, IDC_PATH1_READONLY
-#: Merge.rc:1957
+#: Merge.rc:1967
msgid "Rea&d-only"
msgstr "קריאה בלבד"
#. IDD_OPEN, IDC_SWAP12_STATIC
-#: Merge.rc:1959
+#: Merge.rc:1969
msgid "Swap 2nd | 3rd"
msgstr "החלף 2 | 3"
#. IDD_PROPPAGE_SYSTEM, IDC_FILTER_USER_BROWSE
-#: Merge.rc:1960 Merge.rc:2315
+#: Merge.rc:1970 Merge.rc:2325
msgid "B&rowse..."
msgstr "עיון..."
#. IDD_OPEN, IDC_FILES_DIRS_GROUP2
-#: Merge.rc:1961
+#: Merge.rc:1971
msgid "&3rd File or Folder (Optional)"
msgstr "קובץ או תיקיה שלישית (אופציונלי)"
#. IDD_OPEN, IDC_PATH2_READONLY
-#: Merge.rc:1963
+#: Merge.rc:1973
msgid "Read-o&nly"
msgstr "קריאה בלבד"
#. IDD_OPEN, IDC_SWAP02_STATIC
-#: Merge.rc:1965
+#: Merge.rc:1975
msgid "Swap 1st | 3rd"
msgstr "החלף 1 | 3"
#. IDD_PROPPAGE_BACKUPS, IDC_BACKUP_BROWSE
-#: Merge.rc:1966 Merge.rc:2685 Merge.rc:2883
+#: Merge.rc:1976 Merge.rc:2695 Merge.rc:2893
msgid "Browse..."
msgstr "עיון..."
#. IDD_OPEN, IDC_FILES_DIRS_GROUP3
-#: Merge.rc:1968
+#: Merge.rc:1978
msgid " Folder: Filter"
msgstr "תיקיה: סינון"
#. IDD_OPEN, IDC_RECURS_CHECK
-#: Merge.rc:1971
+#: Merge.rc:1981
msgid "&Include subfolders"
msgstr "כלול תיקיות משנה"
#. IDD_OPEN, IDC_FILES_DIRS_GROUP5
-#: Merge.rc:1972
+#: Merge.rc:1982
msgid " File: Prediffer Plugin"
msgstr "קובץ: תוסף השוואה מוקדמת"
#. IDD_OPEN, IDC_FILES_DIRS_GROUP4
-#: Merge.rc:1976
+#: Merge.rc:1986
msgid " File: Unpacker Plugin"
msgstr "קובץ: תוסף מפענח"
#. IDD_OPEN, IDC_SELECT_UNPACKER
-#: Merge.rc:1978
+#: Merge.rc:1988
msgid "Se&lect..."
msgstr "בחר..."
#. IDD_PLUGINS_EDITPLUGIN, IDCANCEL
-#: Merge.rc:1981 Merge.rc:2001 Merge.rc:2025 Merge.rc:2046 Merge.rc:2081
-#: Merge.rc:2432 Merge.rc:2456 Merge.rc:2470 Merge.rc:2498 Merge.rc:2551
-#: Merge.rc:2589 Merge.rc:2614 Merge.rc:2675 Merge.rc:2692 Merge.rc:2704
-#: Merge.rc:2868 Merge.rc:2928 Merge.rc:3087 Merge.rc:3105 Merge.rc:3148
-#: Merge.rc:3198
+#: Merge.rc:1991 Merge.rc:2011 Merge.rc:2035 Merge.rc:2056 Merge.rc:2091
+#: Merge.rc:2442 Merge.rc:2466 Merge.rc:2480 Merge.rc:2508 Merge.rc:2561
+#: Merge.rc:2599 Merge.rc:2624 Merge.rc:2685 Merge.rc:2702 Merge.rc:2714
+#: Merge.rc:2878 Merge.rc:2938 Merge.rc:3097 Merge.rc:3115 Merge.rc:3158
+#: Merge.rc:3208
msgid "Cancel"
msgstr "ביטול"
#. IDD_OPEN, IDC_OPEN_STATUS
-#: Merge.rc:1982
+#: Merge.rc:1992
msgid "Status:"
msgstr "מצב:"
#. IDD_PLUGINS_LIST, ID_HELP
-#: Merge.rc:1983 Merge.rc:2082 Merge.rc:2929
+#: Merge.rc:1993 Merge.rc:2092 Merge.rc:2939
msgid "Help"
msgstr "עזרה"
#. IDD_OPEN, IDC_OPTIONS
-#: Merge.rc:1984
+#: Merge.rc:1994
msgid "&Options..."
msgstr "אפשרויות..."
#. IDD_EDIT_FIND
-#: Merge.rc:1989
+#: Merge.rc:1999
msgid "Find"
msgstr "חפש"
#. IDD_EDIT_MARKER, IDC_STATIC
-#: Merge.rc:1992 Merge.rc:2009 Merge.rc:2037
+#: Merge.rc:2002 Merge.rc:2019 Merge.rc:2047
msgid "Fi&nd what:"
msgstr "חפש את:"
#. IDD_EDIT_MARKER, IDC_EDIT_WHOLE_WORD
-#: Merge.rc:1994 Merge.rc:2013 Merge.rc:2041
+#: Merge.rc:2004 Merge.rc:2023 Merge.rc:2051
msgid "Match &whole word only"
msgstr "התאם רק מילים שלמות"
#. IDD_EDIT_MARKER, IDC_EDIT_REGEXP
-#: Merge.rc:1996 Merge.rc:2015 Merge.rc:2043
+#: Merge.rc:2006 Merge.rc:2025 Merge.rc:2053
msgid "Regular &expression"
msgstr "ביטוי רגולרי"
#. IDD_EDIT_FIND, IDC_FINDDLG_DONTWRAP
-#: Merge.rc:1997
+#: Merge.rc:2007
msgid "D&on't wrap end of file"
msgstr "אל תגלוש לסוף הקובץ"
#. IDD_EDIT_FIND, IDC_FINDDLG_DONTCLOSE
-#: Merge.rc:1998
+#: Merge.rc:2008
msgid "&Don't close this dialog"
msgstr "אל תסגור חלון זה"
#. IDD_EDIT_REPLACE, IDC_EDIT_SKIP
-#: Merge.rc:1999 Merge.rc:2021
+#: Merge.rc:2009 Merge.rc:2031
msgid "&Find Next"
msgstr "חפש הבא"
#. IDD_EDIT_FIND, IDC_EDIT_FINDPREV
-#: Merge.rc:2000
+#: Merge.rc:2010
msgid "Find &Prev"
msgstr "חפש קודם"
#. IDD_EDIT_REPLACE
-#: Merge.rc:2006
+#: Merge.rc:2016
msgid "Replace"
msgstr "החלף"
#. IDD_EDIT_REPLACE, IDC_STATIC
-#: Merge.rc:2011
+#: Merge.rc:2021
msgid "Re&place with:"
msgstr "החלף ב:"
#. IDD_EDIT_REPLACE, IDC_EDIT_SCOPE_DONT_WRAP
-#: Merge.rc:2016
+#: Merge.rc:2026
msgid "&Don't wrap at end of file"
msgstr "אל תגלוש לסוף הקובץ"
#. IDD_EDIT_REPLACE, IDC_STATIC
-#: Merge.rc:2018
+#: Merge.rc:2028
msgid "Replace in"
msgstr "החלפה ב"
#. IDD_EDIT_REPLACE, IDC_EDIT_SCOPE_WHOLE_FILE
-#: Merge.rc:2020
+#: Merge.rc:2030
msgid "Wh&ole file"
msgstr "כל הקובץ"
#. IDD_EDIT_REPLACE, IDC_EDIT_FINDPREV
-#: Merge.rc:2022
+#: Merge.rc:2032
msgid "Find Pre&v"
msgstr "חפש קודם"
#. IDD_EDIT_REPLACE, IDC_EDIT_REPLACE
-#: Merge.rc:2023
+#: Merge.rc:2033
msgid "&Replace"
msgstr "החלף"
#. IDD_EDIT_REPLACE, IDC_EDIT_REPLACE_ALL
-#: Merge.rc:2024
+#: Merge.rc:2034
msgid "Replace &All"
msgstr "החלף הכל"
#. IDS_OPTIONSPG_MARKERCOLORS
-#: Merge.rc:2030 Merge.rc:4209
+#: Merge.rc:2040 Merge.rc:4219
msgid "Markers"
msgstr "סמנים"
#. IDD_EDIT_MARKER, IDC_EDIT_MARKERS_ENABLED
-#: Merge.rc:2033
+#: Merge.rc:2043
msgid "Enable &markers"
msgstr "הפעל סמנים"
#. IDD_FILTERS_LINEFILTERS, IDC_LFILTER_ADDBTN
-#: Merge.rc:2035 Merge.rc:2057
+#: Merge.rc:2045 Merge.rc:2067
msgid "New"
msgstr "חדש"
#. IDD_EDIT_MARKER, IDC_STATIC
-#: Merge.rc:2039
+#: Merge.rc:2049
msgid "&Background color:"
msgstr "צבע רקע:"
#. IDS_MESSAGEBOX_OK
-#: Merge.rc:2044 Merge.rc:2829 Merge.rc:3086 Merge.rc:4171
+#: Merge.rc:2054 Merge.rc:2839 Merge.rc:3096 Merge.rc:4181
msgid "&Ok"
msgstr "אישור"
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:2045 Merge.rc:2525 Merge.rc:3199
+#: Merge.rc:2055 Merge.rc:2535 Merge.rc:3209
msgid "&Apply"
msgstr "החל"
#. IDD_FILTERS_LINEFILTERS
-#: Merge.rc:2051
+#: Merge.rc:2061
msgid "Line Filters"
msgstr "מסנני שורות"
#. IDD_FILTERS_LINEFILTERS, IDC_IGNOREREGEXP
-#: Merge.rc:2054
+#: Merge.rc:2064
msgid "Enable Line Filters"
msgstr "הפעל מסנני שורות"
#. IDD_FILTERS_LINEFILTERS, IDC_STATIC
-#: Merge.rc:2055
+#: Merge.rc:2065
msgid "Regular Expressions (one per line):"
msgstr "ביטויים רגולריים (אחד בכל שורה):"
#. IDD_PLUGINS_LIST, IDC_PLUGIN_EDIT
-#: Merge.rc:2058 Merge.rc:2924
+#: Merge.rc:2068 Merge.rc:2934
msgid "Edit"
msgstr "ערוך"
#. IDD_PLUGINS_LIST, IDC_PLUGIN_REMOVE
-#: Merge.rc:2059 Merge.rc:2071 Merge.rc:2925
+#: Merge.rc:2069 Merge.rc:2081 Merge.rc:2935
msgid "Remove"
msgstr "הסר"
#. IDD_FILTERS_SUBSTITUTIONFILTERS
-#: Merge.rc:2064
+#: Merge.rc:2074
msgid "Substitution Filters"
msgstr "מסנני החלפה"
#. IDD_FILTERS_SUBSTITUTIONFILTERS, IDC_STATIC
-#: Merge.rc:2067
+#: Merge.rc:2077
msgid "Changes to the listed pairs below will be ignored or marked as insignificant. Patches are unaffected."
msgstr "השינויים שמופיעים בלוחות כזוגות הרשומים מטה יתעלמו או יסומנו כבלתי משמעותיים. טלאים לא יושפעו."
#. IDD_FILTERS_SUBSTITUTIONFILTERS, IDC_IGNORED_SUSBSTITUTIONS_ENABLED
-#: Merge.rc:2068
+#: Merge.rc:2078
msgid "Enable"
msgstr "הפעל"
#. IDD_PLUGINS_LIST, IDC_PLUGIN_ADD
-#: Merge.rc:2070 Merge.rc:2923
+#: Merge.rc:2080 Merge.rc:2933
msgid "Add"
msgstr "הוסף"
#. IDD_FILTERS_SUBSTITUTIONFILTERS, IDC_LFILTER_CLEARBTN
-#: Merge.rc:2072
+#: Merge.rc:2082
msgid "Clear"
msgstr "נקה"
#. IDD_PREFERENCES
-#: Merge.rc:2077
+#: Merge.rc:2087
msgid "Options"
msgstr "אפשרויות"
#. IDD_PREFERENCES, IDC_TREEOPT_IMPORT
-#: Merge.rc:2086
+#: Merge.rc:2096
msgid "Import..."
msgstr "ייבוא..."
#. IDD_PREFERENCES, IDC_TREEOPT_EXPORT
-#: Merge.rc:2087
+#: Merge.rc:2097
msgid "Export..."
msgstr "ייצוא..."
#. IDS_OPTIONSPG_GENCOMPARE
-#: Merge.rc:2092 Merge.rc:4199 Merge.rc:4202 Merge.rc:4219
+#: Merge.rc:2102 Merge.rc:4209 Merge.rc:4212 Merge.rc:4229
msgid "General"
msgstr "כללי"
#. IDD_PROPPAGE_GENERAL, IDC_SCROLL_CHECK
-#: Merge.rc:2095
+#: Merge.rc:2105
msgid "Automatically &scroll to first difference"
msgstr "גלול אוטומטית להבדל הראשון"
#. IDD_PROPPAGE_GENERAL, IDC_SCROLL_TO_FIRST_INLINE_DIFF_CHECK
-#: Merge.rc:2097
+#: Merge.rc:2107
msgid "Automatically s&croll to first inline difference"
msgstr "גלול אוטומטית להבדל בשורה הראשונה"
#. IDD_PROPPAGE_GENERAL, IDC_STATIC
-#: Merge.rc:2099
+#: Merge.rc:2109
msgid "Cl&ose windows with 'Esc':"
msgstr "סגור חלונות עם 'Esc':"
#. IDD_PROPPAGE_GENERAL, IDC_VERIFY_OPEN_PATHS
-#: Merge.rc:2101
+#: Merge.rc:2111
msgid "&Automatically verify paths in Open dialog"
msgstr "בדוק אוטומטית נתיבים בדיאלוג פתיחה"
#. IDD_PROPPAGE_GENERAL, IDC_STATIC
-#: Merge.rc:2103
+#: Merge.rc:2113
msgid "Single instance mode:"
msgstr "מצב מופע יחיד:"
#. IDD_PROPPAGE_GENERAL, IDC_ASK_MULTIWINDOW_CLOSE
-#: Merge.rc:2105
+#: Merge.rc:2115
msgid "As&k when closing multiple windows"
msgstr "שאל בעת סגירת מספר חלונות"
#. IDD_PROPPAGE_GENERAL, IDC_PRESERVE_FILETIME
-#: Merge.rc:2107
+#: Merge.rc:2117
msgid "&Preserve file time in file compare"
msgstr "שמור זמן קובץ בהשוואת קבצים"
#. IDD_PROPPAGE_GENERAL, IDC_STARTUP_FOLDER_SELECT
-#: Merge.rc:2109
+#: Merge.rc:2119
msgid "Show \"Select Files or Folders\" dialog on startup"
msgstr "הצג חלון 'בחר קבצים או תיקיות' בעת ההפעלה"
#. IDD_PROPPAGE_GENERAL, IDC_CLOSE_WITH_OK
-#: Merge.rc:2111
+#: Merge.rc:2121
msgid "Close \"Select Files or Folders\" dialog on clicking Compare button"
msgstr "סגור את חלון 'בחר קבצים או תיקיות' בלחיצה על כפתור השוואה"
#. IDD_PROPPAGE_GENERAL, IDC_STATIC
-#: Merge.rc:2113
+#: Merge.rc:2123
msgid "Op&en dialog Auto completion:"
msgstr "השלמה אוטומטית בחלון פתיחה:"
#. IDD_PROPPAGE_GENERAL, IDC_STATIC
-#: Merge.rc:2115
+#: Merge.rc:2125
msgid "Auto-&reload modified files:"
msgstr "טען מחדש קבצים ששונו אוטומטית:"
#. IDD_PROPPAGE_GENERAL, IDC_STATIC
-#: Merge.rc:2117
+#: Merge.rc:2127
msgid "Language:"
msgstr "שפה:"
#. IDD_PROPPAGE_COMPARE_WEBPAGE, IDC_COMPARE_DEFAULTS
-#: Merge.rc:2119 Merge.rc:2299 Merge.rc:2321 Merge.rc:2352 Merge.rc:2369
-#: Merge.rc:2386 Merge.rc:2394 Merge.rc:2430 Merge.rc:2454 Merge.rc:2633
-#: Merge.rc:2644 Merge.rc:2653 Merge.rc:2887 Merge.rc:2922 Merge.rc:2985
-#: Merge.rc:3010 Merge.rc:3024 Merge.rc:3038 Merge.rc:3054
+#: Merge.rc:2129 Merge.rc:2309 Merge.rc:2331 Merge.rc:2362 Merge.rc:2379
+#: Merge.rc:2396 Merge.rc:2404 Merge.rc:2440 Merge.rc:2464 Merge.rc:2643
+#: Merge.rc:2654 Merge.rc:2663 Merge.rc:2897 Merge.rc:2932 Merge.rc:2995
+#: Merge.rc:3020 Merge.rc:3034 Merge.rc:3048 Merge.rc:3064
msgid "Defaults"
msgstr "ברירות מחדל"
#. IDS_OPTIONSPG_COLORS
-#: Merge.rc:2124 Merge.rc:2140 Merge.rc:2267 Merge.rc:2292 Merge.rc:4205
+#: Merge.rc:2134 Merge.rc:2150 Merge.rc:2277 Merge.rc:2302 Merge.rc:4215
msgid "Colors"
msgstr "צבעים"
#. IDD_PROPPAGE_COLOR_SCHEMES, IDC_STATIC
-#: Merge.rc:2127
+#: Merge.rc:2137
msgid "Color &mode:"
msgstr ""
#. IDD_PROPPAGE_COLOR_SCHEMES, IDC_STATIC
-#: Merge.rc:2129
+#: Merge.rc:2139
msgid "&Light mode scheme:"
msgstr ""
#. IDD_PROPPAGE_COLOR_SCHEMES, IDC_STATIC
-#: Merge.rc:2131
+#: Merge.rc:2141
msgid "&Dark mode scheme:"
msgstr ""
#. IDD_PROPPAGE_COLOR_SCHEMES, IDC_STATIC
-#: Merge.rc:2133
+#: Merge.rc:2143
msgid "Your custom schemes"
msgstr ""
#. IDD_PROPPAGE_COLOR_SCHEMES, IDC_COLOR_SCHEME_SAVE
-#: Merge.rc:2134
+#: Merge.rc:2144
msgid "&Save current scheme..."
msgstr ""
#. IDD_PROPPAGE_COLOR_SCHEMES, IDC_COLOR_SCHEME_DELETE
-#: Merge.rc:2135
+#: Merge.rc:2145
msgid "Delete ¤t scheme..."
msgstr ""
#. IDD_PROPPAGE_COLORS_DIR, IDC_BACKGROUND_COLUMN_LABEL
-#: Merge.rc:2143 Merge.rc:2238 Merge.rc:2258 Merge.rc:2272
+#: Merge.rc:2153 Merge.rc:2248 Merge.rc:2268 Merge.rc:2282
msgid "Background"
msgstr "רקע"
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2144
+#: Merge.rc:2154
msgid "Deleted"
msgstr "נמחק"
#. IDS_OPTIONSPG_TEXTCOLORS
-#: Merge.rc:2145 Merge.rc:2207 Merge.rc:2239 Merge.rc:2273 Merge.rc:4207
+#: Merge.rc:2155 Merge.rc:2217 Merge.rc:2249 Merge.rc:2283 Merge.rc:4217
msgid "Text"
msgstr "טקסט"
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2146
+#: Merge.rc:2156
msgid "Difference:"
msgstr "הבדל:"
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2151
+#: Merge.rc:2161
msgid "Selected Difference:"
msgstr "הבדל נבחר:"
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2156
+#: Merge.rc:2166
msgid "Ignored Difference:"
msgstr "הבדל שהתעלמו ממנו:"
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2161
+#: Merge.rc:2171
msgid "Moved:"
msgstr "הוזז:"
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2166
+#: Merge.rc:2176
msgid "Selected Moved:"
msgstr "הוזז נבחר:"
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2171
+#: Merge.rc:2181
msgid "Same As Next (3 panes):"
msgstr "זהה להבא (3 חלוניות):"
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2176
+#: Merge.rc:2186
msgid "Same As Next (Selected):"
msgstr "זהה להבא (נבחר):"
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2181
+#: Merge.rc:2191
msgid "Word Difference:"
msgstr "הבדל מילים:"
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2186
+#: Merge.rc:2196
msgid "Selected Word Diff:"
msgstr "הבדל מילים נבחר:"
#. IDD_INPUTBOX
-#: Merge.rc:2195 Merge.rc:2230 Merge.rc:2251 Merge.rc:3099
+#: Merge.rc:2205 Merge.rc:2240 Merge.rc:2261 Merge.rc:3109
msgid "Dialog"
msgstr "חלונית"
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC
-#: Merge.rc:2198
+#: Merge.rc:2208
msgid "Keywords:"
msgstr "מילות מפתח:"
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC
-#: Merge.rc:2199
+#: Merge.rc:2209
msgid "Function names:"
msgstr "שמות פונקציות:"
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC
-#: Merge.rc:2200
+#: Merge.rc:2210
msgid "Comments:"
msgstr "הערות:"
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC
-#: Merge.rc:2201
+#: Merge.rc:2211
msgid "Numbers:"
msgstr "מספרים:"
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC
-#: Merge.rc:2202
+#: Merge.rc:2212
msgid "Operators:"
msgstr "אופרטורים:"
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC
-#: Merge.rc:2203
+#: Merge.rc:2213
msgid "Strings:"
msgstr "מחרוזות:"
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC
-#: Merge.rc:2204
+#: Merge.rc:2214
msgid "Preprocessor:"
msgstr "מעבד מוקדם:"
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC
-#: Merge.rc:2205
+#: Merge.rc:2215
msgid "User 1:"
msgstr "משתמש 1:"
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC
-#: Merge.rc:2206
+#: Merge.rc:2216
msgid "User 2:"
msgstr "משתמש 2:"
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_SCOLOR_USER2_BOLD
-#: Merge.rc:2209 Merge.rc:2211 Merge.rc:2213 Merge.rc:2215 Merge.rc:2217
-#: Merge.rc:2219 Merge.rc:2221 Merge.rc:2223 Merge.rc:2225
+#: Merge.rc:2219 Merge.rc:2221 Merge.rc:2223 Merge.rc:2225 Merge.rc:2227
+#: Merge.rc:2229 Merge.rc:2231 Merge.rc:2233 Merge.rc:2235
msgid "Bold"
msgstr "מודגש"
#. IDD_PROPPAGE_COLORS_TEXT, IDC_DEFAULT_STANDARD_COLORS
-#: Merge.rc:2233
+#: Merge.rc:2243
msgid "&Use customized text colors"
msgstr "השתמש בצבעי טקסט מותאמים אישית"
#. IDD_PROPPAGE_COLORS_TEXT, IDC_WHITESPACE_COLOR_LABEL
-#: Merge.rc:2235
+#: Merge.rc:2245
msgid "Whitespace:"
msgstr "רווחים:"
#. IDD_PROPPAGE_COLORS_TEXT, IDC_TEXT_COLOR_LABEL
-#: Merge.rc:2236
+#: Merge.rc:2246
msgid "Regular text:"
msgstr "טקסט רגיל:"
#. IDD_PROPPAGE_COLORS_TEXT, IDC_SELECTION_COLOR_LABEL
-#: Merge.rc:2237
+#: Merge.rc:2247
msgid "Selection:"
msgstr "בחירה:"
#. IDD_PROPPAGE_COLORS_DIR, IDC_STATIC
-#: Merge.rc:2245 Merge.rc:2286
+#: Merge.rc:2255 Merge.rc:2296
msgid "Margin:"
msgstr "שוליים:"
#. IDD_PROPPAGE_COLORS_MARKER, IDC_MARKER0_COLOR_LABEL
-#: Merge.rc:2254
+#: Merge.rc:2264
msgid "Search Marker:"
msgstr "סמן חיפוש:"
#. IDD_PROPPAGE_COLORS_MARKER, IDC_MARKER1_COLOR_LABEL
-#: Merge.rc:2255
+#: Merge.rc:2265
msgid "User Defined Marker 1:"
msgstr "סמן מותאם אישית 1:"
#. IDD_PROPPAGE_COLORS_MARKER, IDC_MARKER2_COLOR_LABEL
-#: Merge.rc:2256
+#: Merge.rc:2266
msgid "User Defined Marker 2:"
msgstr "סמן מותאם אישית 2:"
#. IDD_PROPPAGE_COLORS_MARKER, IDC_MARKER3_COLOR_LABEL
-#: Merge.rc:2257
+#: Merge.rc:2267
msgid "User Defined Marker 3:"
msgstr "סמן מותאם אישית 3:"
#. IDD_PROPPAGE_COLORS_DIR, IDC_USE_DIR_COMPARE_COLORS
-#: Merge.rc:2270
+#: Merge.rc:2280
msgid "&Use folder compare colors"
msgstr "השתמש בצבעי השוואת תיקיות"
#. IDD_PROPPAGE_COLORS_DIR, IDC_STATIC
-#: Merge.rc:2274
+#: Merge.rc:2284
msgid "Items equal:"
msgstr "פריטים זהים:"
#. IDD_PROPPAGE_COLORS_DIR, IDC_STATIC
-#: Merge.rc:2277
+#: Merge.rc:2287
msgid "Items different:"
msgstr "פריטים שונים:"
#. IDD_PROPPAGE_COLORS_DIR, IDC_STATIC
-#: Merge.rc:2280
+#: Merge.rc:2290
msgid "Items missing:"
msgstr "פריטים שלא קיימים כולם:"
#. IDD_PROPPAGE_COLORS_DIR, IDC_STATIC
-#: Merge.rc:2283
+#: Merge.rc:2293
msgid "Items filtered:"
msgstr "פריטים שסוננו:"
#. IDD_PROPPAGE_COLORS_SYSTEM, IDC_SYSCOLOR_HOOK_ENABLED
-#: Merge.rc:2295
+#: Merge.rc:2305
msgid "&Use custom system colors"
msgstr "השתמש בצבעי מערכת מותאמים אישית (ייתכן שחלק מרכיבי הממשק לא יחולו)"
#. IDS_PRPCAT_SYSTEM
-#: Merge.rc:2304 Merge.rc:4211 Merge.rc:4212 Merge.rc:4657
+#: Merge.rc:2314 Merge.rc:4221 Merge.rc:4222 Merge.rc:4667
msgid "System"
msgstr "מערכת"
#. IDD_PROPPAGE_SYSTEM, IDC_USE_RECYCLE_BIN
-#: Merge.rc:2307
+#: Merge.rc:2317
msgid "&Use Recycle Bin"
msgstr "שלח קבצים שנמחקו לסל המיחזור"
#. IDD_PROPPAGE_SYSTEM, IDC_STATIC
-#: Merge.rc:2308
+#: Merge.rc:2318
msgid "&External editor:"
msgstr "עורך חיצוני:"
#. IDD_PROPPAGE_SYSTEM, IDC_STATIC
-#: Merge.rc:2311
+#: Merge.rc:2321
msgid "&Store user data in:"
msgstr ""
#. IDD_PROPPAGE_SYSTEM, IDC_STATIC
-#: Merge.rc:2313
+#: Merge.rc:2323
msgid "&Filter folder:"
msgstr "סינון תיקיה:"
#. IDD_PROPPAGE_SYSTEM, IDC_STATIC
-#: Merge.rc:2316
+#: Merge.rc:2326
msgid "Temporary files folder"
msgstr "תיקיית קבצים זמניים"
#. IDD_PROPPAGE_SYSTEM, IDC_TMPFOLDER_SYSTEM
-#: Merge.rc:2317
+#: Merge.rc:2327
msgid "S&ystem temp folder"
msgstr "תיקיית קבצים זמניים של המערכת"
#. IDD_PROPPAGE_SYSTEM, IDC_STATIC
-#: Merge.rc:2318
+#: Merge.rc:2328
msgid "C&ustom folder:"
msgstr "תיקיה מותאמת אישית:"
#. IDD_GENERATE_PATCH, IDC_DIFF_BROWSE_FILE2
-#: Merge.rc:2320 Merge.rc:2416
+#: Merge.rc:2330 Merge.rc:2426
msgid "Br&owse..."
msgstr "עיון..."
#. IDS_OPTIONSPG_COMPARE
-#: Merge.rc:2326 Merge.rc:4200
+#: Merge.rc:2336 Merge.rc:4210
msgid "Compare"
msgstr "השווה"
#. IDD_PROPPAGE_COMPARE, IDC_STATIC
-#: Merge.rc:2329
+#: Merge.rc:2339
msgid "Whitespaces"
msgstr "רווחים"
#. IDD_PROPPAGE_COMPARE, IDC_WHITESPACE
-#: Merge.rc:2330
+#: Merge.rc:2340
msgid "&Compare"
msgstr "השווה"
#. IDD_PROPPAGE_COMPARE, IDC_WHITE_CHANGE
-#: Merge.rc:2331
+#: Merge.rc:2341
msgid "&Ignore change"
msgstr "התעלם משינוי"
#. IDD_PROPPAGE_COMPARE, IDC_ALL_WHITE
-#: Merge.rc:2332
+#: Merge.rc:2342
msgid "I&gnore all"
msgstr "התעלם מהכל"
#. IDD_PROPPAGE_COMPARE, IDC_IGNBLANKS_CHECK
-#: Merge.rc:2333
+#: Merge.rc:2343
msgid "Ignore blan&k lines"
msgstr "התעלם משורות ריקות"
#. IDD_PROPPAGE_COMPARE, IDC_IGNCASE_CHECK
-#: Merge.rc:2334
+#: Merge.rc:2344
msgid "Ignore &case"
msgstr "התעלם מרישיות"
#. IDD_PROPPAGE_COMPARE, IDC_EOL_SENSITIVE
-#: Merge.rc:2335
+#: Merge.rc:2345
msgid "Igno&re EOL differences (Windows/Unix/Mac)"
msgstr ""
#. IDD_PROPPAGE_COMPARE, IDC_IGNORE_NUMBERS
-#: Merge.rc:2337
+#: Merge.rc:2347
msgid "Ignore num&bers"
msgstr "התעלם ממספרים"
#. IDD_PROPPAGE_COMPARE, IDC_CP_SENSITIVE
-#: Merge.rc:2338
+#: Merge.rc:2348
msgid "Ignore codepage &differences"
msgstr "התעלם מהבדלי קידוד תווים"
#. IDD_PROPPAGE_COMPARE, IDC_FILTERCOMMENTS_CHECK
-#: Merge.rc:2339
+#: Merge.rc:2349
msgid "Ignore c&omment differences"
msgstr "התעלם מהבדלי הערות"
#. IDD_PROPPAGE_COMPARE, IDC_IGNEOFEOL_CHECK
-#: Merge.rc:2341
+#: Merge.rc:2351
msgid "Ignore &missing trailing EOL"
msgstr "התעלם מהיעדר סיום שורה"
#. IDD_PROPPAGE_COMPARE, IDC_IGNLBRKS_CHECK
-#: Merge.rc:2343
+#: Merge.rc:2353
msgid "Ignore line &breaks (treat as spaces)"
msgstr ""
#. IDD_PROPPAGE_COMPARE, IDC_MOVED_BLOCKS
-#: Merge.rc:2345
+#: Merge.rc:2355
msgid "E&nable moved block detection"
msgstr "הפעל זיהוי בלוקים שהוזזו"
#. IDD_PROPPAGE_COMPARE, IDC_ALIGN_SIMILAR_LINES
-#: Merge.rc:2346
+#: Merge.rc:2356
msgid "Align &similar lines"
msgstr "יישר שורות דומות"
#. IDD_PROPPAGE_COMPARE, IDC_STATIC
-#: Merge.rc:2347
+#: Merge.rc:2357
msgid "Diff &algorithm:"
msgstr "אלגוריתם השוואה:"
#. IDD_PROPPAGE_COMPARE, IDC_INDENT_HEURISTIC
-#: Merge.rc:2349
+#: Merge.rc:2359
msgid "Enable indent &heuristic"
msgstr "הפעל היגיון הזחה"
#. IDD_PROPPAGE_COMPARE, IDC_COMPLETELY_BLANK_OUT_IGNORED_DIFFERENCES
-#: Merge.rc:2350
+#: Merge.rc:2360
msgid "Completely unhighlight the ignored differences"
msgstr "בטל הדגשה לחלוטין עבור הבדלים שהתעלמו מהם"
#. IDS_OPTIONSPG_EDITOR
-#: Merge.rc:2357 Merge.rc:4201
+#: Merge.rc:2367 Merge.rc:4211
msgid "Editor"
msgstr "עורך"
#. IDD_PROPPAGE_EDITOR, IDC_HILITE_CHECK
-#: Merge.rc:2360
+#: Merge.rc:2370
msgid "&Highlight syntax"
msgstr "הדגש תחביר"
#. IDD_PROPPAGE_EDITOR, IDC_MIXED_EOL
-#: Merge.rc:2361
+#: Merge.rc:2371
msgid "&Preserve original EOL"
msgstr "שמור על תווי סיום שורה מקוריים"
#. IDD_PROPPAGE_EDITOR, IDC_STATIC
-#: Merge.rc:2362
+#: Merge.rc:2372
msgid "Tabs"
msgstr "טאבים"
#. IDD_PROPPAGE_EDITOR, IDC_STATIC
-#: Merge.rc:2363
+#: Merge.rc:2373
msgid "&Tab size:"
msgstr "גודל טאבים:"
#. IDD_PROPPAGE_EDITOR, IDC_PROP_INSERT_TABS
-#: Merge.rc:2365
+#: Merge.rc:2375
msgid "&Insert tabs"
msgstr "הוסף טאבים"
#. IDD_PROPPAGE_EDITOR, IDC_PROP_INSERT_SPACES
-#: Merge.rc:2366
+#: Merge.rc:2376
msgid "Insert &spaces"
msgstr "הוסף רווחים"
#. IDD_PROPPAGE_EDITOR, IDC_STATIC
-#: Merge.rc:2367
+#: Merge.rc:2377
msgid "&Rendering mode:"
msgstr "מצב עיבוד:"
#. IDD_PROPPAGE_EDITOR_COMPAREMERGE, IDC_AUTOMRESCAN_CHECK
-#: Merge.rc:2376
+#: Merge.rc:2386
msgid "&Automatic rescan"
msgstr "סריקה מחדש אוטומטית"
#. IDD_PROPPAGE_EDITOR_COMPAREMERGE, IDC_STATIC
-#: Merge.rc:2377
+#: Merge.rc:2387
msgid "Copy &granularity for selected differences:"
msgstr "רמת פירוט העתקה עבור הבדלים נבחרים:"
#. IDD_PROPPAGE_EDITOR_COMPAREMERGE, IDC_LINE_COLORING_GROUP
-#: Merge.rc:2379
+#: Merge.rc:2389
msgid "Line Difference Coloring"
msgstr "צביעת הבדלים בשורות"
#. IDD_PROPPAGE_EDITOR_COMPAREMERGE, IDC_VIEW_LINE_DIFFERENCES
-#: Merge.rc:2380
+#: Merge.rc:2390
msgid "View line differences"
msgstr "הצג הבדלים בשורות"
#. IDD_PROPPAGE_EDITOR_COMPAREMERGE, IDC_EDITOR_CHARLEVEL
-#: Merge.rc:2381
+#: Merge.rc:2391
msgid "&Character-level"
msgstr "רמת תו"
#. IDD_PROPPAGE_EDITOR_COMPAREMERGE, IDC_EDITOR_WORDLEVEL
-#: Merge.rc:2382
+#: Merge.rc:2392
msgid "&Word-level:"
msgstr "רמת מילה:"
#. IDD_PROPPAGE_EDITOR_COMPAREMERGE, IDC_STATIC
-#: Merge.rc:2384
+#: Merge.rc:2394
msgid "W&ord break characters:"
msgstr "תווים לפיצול מילים:"
#. IDD_PROPPAGE_MESSAGEBOXES, IDC_STATIC
-#: Merge.rc:2401
+#: Merge.rc:2411
msgid "Some messages can be hidden by the user. Press Reset to make all messages visible again."
msgstr "WinMerge מאפשר הסתרת חלונות הודעה נפוצים. לחץ על כפתור איפוס כדי להחזיר את כל ההודעות."
#. IDD_SELECT_FILES_OR_FOLDERS, IDC_RESET
-#: Merge.rc:2402 Merge.rc:3085
+#: Merge.rc:2412 Merge.rc:3095
msgid "Reset"
msgstr "אפס"
#. IDD_GENERATE_PATCH
-#: Merge.rc:2408
+#: Merge.rc:2418
msgid "Patch Generator"
msgstr "יוצר טלאים"
#. IDD_GENERATE_PATCH, IDC_STATIC
-#: Merge.rc:2411
+#: Merge.rc:2421
msgid "File&1:"
msgstr "קובץ 1:"
#. IDD_GENERATE_PATCH, IDC_STATIC
-#: Merge.rc:2414
+#: Merge.rc:2424
msgid "File&2:"
msgstr "קובץ 2:"
#. IDD_GENERATE_PATCH, IDC_DIFF_SWAPFILES
-#: Merge.rc:2417
+#: Merge.rc:2427
msgid "&Swap"
msgstr "החלף"
#. IDD_DIRCMP_REPORT, IDC_REPORT_COPYCLIPBOARD
-#: Merge.rc:2418 Merge.rc:2690
+#: Merge.rc:2428 Merge.rc:2700
msgid "&Copy to clipboard"
msgstr "העתק ללוח"
#. IDD_GENERATE_PATCH, IDC_DIFF_APPENDFILE
-#: Merge.rc:2419
+#: Merge.rc:2429
msgid "&Append to existing file"
msgstr "צרף לקובץ קיים"
#. IDD_GENERATE_PATCH, IDC_STATIC
-#: Merge.rc:2420
+#: Merge.rc:2430
msgid "&Result:"
msgstr "תוצאה:"
#. IDD_GENERATE_PATCH, IDC_DIFF_BROWSE_RESULT
-#: Merge.rc:2422
+#: Merge.rc:2432
msgid "Bro&wse..."
msgstr "עיון..."
#. IDD_GENERATE_PATCH, IDC_STATIC
-#: Merge.rc:2423
+#: Merge.rc:2433
msgid "&Format"
msgstr "תבנית"
#. IDD_GENERATE_PATCH, IDC_STATIC
-#: Merge.rc:2424
+#: Merge.rc:2434
msgid "St&yle:"
msgstr "סגנון:"
#. IDD_GENERATE_PATCH, IDC_STATIC
-#: Merge.rc:2426
+#: Merge.rc:2436
msgid "&Context:"
msgstr "הקשר:"
#. IDD_GENERATE_PATCH, IDC_DIFF_INCLCMDLINE
-#: Merge.rc:2428
+#: Merge.rc:2438
msgid "Inclu&de command line"
msgstr "כלול שורת פקודה"
#. IDD_GENERATE_PATCH, IDC_DIFF_OPENTOEDITOR
-#: Merge.rc:2429
+#: Merge.rc:2439
msgid "Open in e&xternal editor"
msgstr "פתח בעורך חיצוני"
#. IDD_DIRCOLS
-#: Merge.rc:2446
+#: Merge.rc:2456
msgid "Display Columns"
msgstr "הצגת עמודות"
#. IDD_DIRCOLS, IDC_UP
-#: Merge.rc:2450
+#: Merge.rc:2460
msgid "Move &Up"
msgstr "העבר למעלה"
#. IDD_DIRCOLS, IDC_DOWN
-#: Merge.rc:2451
+#: Merge.rc:2461
msgid "Move &Down"
msgstr "העבר למטה"
#. IDD_DIRCOLS, IDC_COLDLG_ADDITIONAL_PROPERTIES
-#: Merge.rc:2453
+#: Merge.rc:2463
msgid "&Additional Properties"
msgstr "מאפיינים נוספים"
#. IDD_DIRADDITIONALPROPS
-#: Merge.rc:2461
+#: Merge.rc:2471
msgid "Additional Properties"
msgstr "מאפיינים נוספים"
#. IDD_PLUGINS_SELECTPLUGIN
-#: Merge.rc:2475
+#: Merge.rc:2485
msgid "Select Plugin"
msgstr "בחר תוסף"
#. IDD_PLUGINS_EDITPLUGIN, IDC_STATIC
-#: Merge.rc:2478 Merge.rc:3115
+#: Merge.rc:2488 Merge.rc:3125
msgid "Plugin &name:"
msgstr "שם התוסף:"
#. IDD_PLUGINS_SELECTPLUGIN, IDC_STATIC
-#: Merge.rc:2480
+#: Merge.rc:2490
msgid "&Target files:"
msgstr "קבצי יעד:"
#. IDD_PLUGINS_EDITPLUGIN, IDC_STATIC
-#: Merge.rc:2482 Merge.rc:3117
+#: Merge.rc:2492 Merge.rc:3127
msgid "Extensions list:"
msgstr "רשימת סיומות:"
#. IDD_PLUGINS_EDITPLUGIN, IDC_STATIC
-#: Merge.rc:2484 Merge.rc:3119
+#: Merge.rc:2494 Merge.rc:3129
msgid "Description:"
msgstr "תיאור:"
#. IDD_PLUGINS_EDITPLUGIN, IDC_STATIC
-#: Merge.rc:2486 Merge.rc:3121
+#: Merge.rc:2496 Merge.rc:3131
msgid "Default arguments:"
msgstr "פרמטרים ברירת מחדל:"
#. IDD_PLUGINS_SELECTPLUGIN, IDC_PLUGIN_ALLOW_ALL
-#: Merge.rc:2488
+#: Merge.rc:2498
msgid "Display all plugins (Ignore extension)"
msgstr "הצג את כל התוספים, אל תבדוק את הסיומת"
#. IDD_PLUGINS_SELECTPLUGIN, IDC_PLUGIN_OPEN_IN_SAME_FRAME_TYPE
-#: Merge.rc:2490
+#: Merge.rc:2500
msgid "&Open files in same window type after unpacking"
msgstr "פתח קבצים באותו סוג חלון לאחר פריסה"
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_PIPELINE_STATIC
-#: Merge.rc:2492 Merge.rc:3129
+#: Merge.rc:2502 Merge.rc:3139
msgid "&Plugin pipeline:"
msgstr "צינור תוספים:"
#. IDD_PLUGINS_SELECTPLUGIN, IDC_PLUGIN_ALIAS
-#: Merge.rc:2495
+#: Merge.rc:2505
msgid "&Alias..."
msgstr "כינוי..."
#. IDD_DIRCOMP_PROGRESS, IDC_COMPARISON_STOP
-#: Merge.rc:2505
+#: Merge.rc:2515
msgid "Stop"
msgstr "עצור"
#. IDD_DIRCOMP_PROGRESS, IDC_COMPARISON_PAUSE
-#: Merge.rc:2506
+#: Merge.rc:2516
msgid "Pause"
msgstr "השהה"
#. IDD_DIRCOMP_PROGRESS, IDC_COMPARISON_CONTINUE
-#: Merge.rc:2507
+#: Merge.rc:2517
msgid "Continue"
msgstr "המשך"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC
-#: Merge.rc:2509 Merge.rc:2973
+#: Merge.rc:2519 Merge.rc:2983
msgid "C&PU cores to use:"
msgstr "מספר ליבות מעבד לשימוש:"
#. IDD_DIRCOMP_PROGRESS, IDC_STATIC
-#: Merge.rc:2510
+#: Merge.rc:2520
msgid "Items total:"
msgstr "סה\"כ פריטים:"
#. IDD_DIRCOMP_PROGRESS, IDC_STATIC
-#: Merge.rc:2511
+#: Merge.rc:2521
msgid "Items compared:"
msgstr "פריטים שהושוו:"
#. IDS_PREVIEWBAR_CLOSE
-#: Merge.rc:2526 Merge.rc:2846 Merge.rc:5328
+#: Merge.rc:2536 Merge.rc:2856 Merge.rc:5339
msgid "&Close"
msgstr "סגור"
#. IDD_WMGOTO
-#: Merge.rc:2537
+#: Merge.rc:2547
msgid "Go to"
msgstr "עבור אל"
#. IDD_WMGOTO, IDC_STATIC
-#: Merge.rc:2540
+#: Merge.rc:2550
msgid "G&o to:"
msgstr "עבור אל:"
#. IDD_WMGOTO, IDC_STATIC
-#: Merge.rc:2543
+#: Merge.rc:2553
msgid "File"
msgstr "קובץ"
#. IDD_WMGOTO, IDC_STATIC
-#: Merge.rc:2547
+#: Merge.rc:2557
msgid "Go to what"
msgstr "עבור אל מה"
#. IDD_WMGOTO, IDC_WMGOTO_TOLINE
-#: Merge.rc:2548
+#: Merge.rc:2558
msgid "Li&ne"
msgstr "שורה"
#. IDD_WMGOTO, IDC_WMGOTO_TODIFF
-#: Merge.rc:2549
+#: Merge.rc:2559
msgid "&Difference"
msgstr "הבדל"
#. IDD_WMGOTO, IDOK
-#: Merge.rc:2550
+#: Merge.rc:2560
msgid "&Go to"
msgstr "עבור אל"
#. IDS_PROJECT_ITEM_FILE_FILTER
-#: Merge.rc:2556 Merge.rc:4321
+#: Merge.rc:2566 Merge.rc:4331
msgid "File Filters"
msgstr "מסנני קבצים"
#. IDD_FILTERS_FILEFILTERS, IDC_STATIC
-#: Merge.rc:2559
+#: Merge.rc:2569
msgid "&Mask / Filter Expression"
msgstr ""
#. IDD_FILTERS_FILEFILTERS, IDC_STATIC
-#: Merge.rc:2562
+#: Merge.rc:2572
msgid "Preset &Filters"
msgstr ""
#. IDD_FILTERS_FILEFILTERS, IDC_FILTERFILE_TEST_BTN
-#: Merge.rc:2564
+#: Merge.rc:2574
msgid "Test..."
msgstr "בדיקה..."
#. IDD_FILTERS_FILEFILTERS, IDC_FILTERFILE_INSTALL
-#: Merge.rc:2565
+#: Merge.rc:2575
msgid "Install..."
msgstr "התקן..."
#. IDD_FILTERS_FILEFILTERS, IDC_FILTERFILE_NEWBTN
-#: Merge.rc:2566
+#: Merge.rc:2576
msgid "New..."
msgstr "חדש..."
#. IDD_FILTERS_FILEFILTERS, IDC_FILTERFILE_EDITBTN
-#: Merge.rc:2567
+#: Merge.rc:2577
msgid "Edit..."
msgstr "ערוך..."
#. IDD_FILTERS_FILEFILTERS, IDC_FILTERFILE_DELETEBTN
-#: Merge.rc:2568
+#: Merge.rc:2578
msgid "Delete..."
msgstr "מחק..."
#. IDD_FILTERS_CONDITION
-#: Merge.rc:2573
+#: Merge.rc:2583
msgid "Filter Condition"
msgstr ""
#. IDD_FILTERS_CONDITION, IDC_STATIC
-#: Merge.rc:2576
+#: Merge.rc:2586
msgid "&Left-hand side:"
msgstr ""
#. IDD_FILTERS_CONDITION, IDC_STATIC
-#: Merge.rc:2578
+#: Merge.rc:2588
msgid "&Operator:"
msgstr ""
#. IDD_FILTERS_CONDITION, IDC_STATIC
-#: Merge.rc:2580
+#: Merge.rc:2590
msgid "&Right-hand side:"
msgstr ""
#. IDD_FILTERS_CONDITION, IDC_STATIC
-#: Merge.rc:2586
+#: Merge.rc:2596
msgid "Expression:"
msgstr ""
#. IDD_COMPARISON_RESULT_FILTER
-#: Merge.rc:2595
+#: Merge.rc:2605
msgid "Filter by Comparison Result"
msgstr ""
#. IDD_COMPARISON_RESULT_FILTER, IDC_RADIO_INCLUDE
-#: Merge.rc:2598
+#: Merge.rc:2608
msgid "&Include"
msgstr ""
#. IDD_COMPARISON_RESULT_FILTER, IDC_RADIO_EXCLUDE
-#: Merge.rc:2599
+#: Merge.rc:2609
msgid "&Exclude"
msgstr ""
#. IDD_COMPARISON_RESULT_FILTER, IDC_STATIC
-#: Merge.rc:2600
+#: Merge.rc:2610
msgid "Comparison Results"
msgstr ""
#. IDS_IDENTICAL
-#: Merge.rc:2601 Merge.rc:2733 Merge.rc:2794 Merge.rc:4698
+#: Merge.rc:2611 Merge.rc:2743 Merge.rc:2804 Merge.rc:4708
msgid "Identical"
msgstr "זהה"
#. IDS_DIFFERENT
-#: Merge.rc:2602 Merge.rc:2714 Merge.rc:2755 Merge.rc:4708
+#: Merge.rc:2612 Merge.rc:2724 Merge.rc:2765 Merge.rc:4718
msgid "Different"
msgstr "שונה"
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_LEFT_ONLY
-#: Merge.rc:2603
+#: Merge.rc:2613
msgid "Left only"
msgstr ""
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_RIGHT_ONLY
-#: Merge.rc:2604
+#: Merge.rc:2614
msgid "Right only"
msgstr ""
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_SKIPPED
-#: Merge.rc:2605
+#: Merge.rc:2615
msgid "Skipped"
msgstr ""
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_MIDDLE_ONLY
-#: Merge.rc:2606
+#: Merge.rc:2616
msgid "Middle only"
msgstr ""
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_LEFT_ONLY_DIFFERENT
-#: Merge.rc:2607
+#: Merge.rc:2617
msgid "Left only (different)"
msgstr ""
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_MIDDLE_ONLY_DIFFERENT
-#: Merge.rc:2608
+#: Merge.rc:2618
msgid "Middle only (different)"
msgstr ""
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_RIGHT_ONLY_DIFFERENT
-#: Merge.rc:2609
+#: Merge.rc:2619
msgid "Right only (different)"
msgstr ""
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_LEFT_ONLY_MISSING
-#: Merge.rc:2610
+#: Merge.rc:2620
msgid "Left only (missing)"
msgstr ""
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_MIDDLE_ONLY_MISSING
-#: Merge.rc:2611
+#: Merge.rc:2621
msgid "Middle only (missing)"
msgstr ""
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_RIGHT_ONLY_MISSING
-#: Merge.rc:2612
+#: Merge.rc:2622
msgid "Right only (missing)"
msgstr ""
#. IDS_OPTIONSPG_CODEPAGE
-#: Merge.rc:2619 Merge.rc:2811 Merge.rc:4213
+#: Merge.rc:2629 Merge.rc:2821 Merge.rc:4223
msgid "Codepage"
msgstr "קידוד תווים"
#. IDD_PROPPAGE_CODEPAGE, IDC_STATIC
-#: Merge.rc:2622
+#: Merge.rc:2632
msgid "Default Codepage"
msgstr "קידוד ברירת מחדל"
#. IDD_PROPPAGE_CODEPAGE, IDC_STATIC
-#: Merge.rc:2623
+#: Merge.rc:2633
msgid "Select the default codepage for non-Unicode files:"
msgstr "בחר קידוד ברירת מחדל בעת טעינת קבצים שאינם Unicode:"
#. IDD_PROPPAGE_CODEPAGE, IDC_CP_SYSTEM
-#: Merge.rc:2624
+#: Merge.rc:2634
msgid "System codepage"
msgstr "קידוד מערכת"
#. IDD_PROPPAGE_CODEPAGE, IDC_CP_UI
-#: Merge.rc:2625
+#: Merge.rc:2635
msgid "According to WinMerge User Interface"
msgstr "בהתאם לממשק המשתמש של WinMerge"
#. IDD_PROPPAGE_CODEPAGE, IDC_CP_CUSTOM
-#: Merge.rc:2626
+#: Merge.rc:2636
msgid "Custom codepage:"
msgstr "קידוד מותאם אישית:"
#. IDD_PROPPAGE_CODEPAGE, IDC_DETECT_CODEPAGE
-#: Merge.rc:2628
+#: Merge.rc:2638
msgid ""
"Detect codepage for: .html, .rc, .xml\n"
"Restart required."
@@ -4083,7 +4094,7 @@ msgstr ""
"נדרש להפעיל מחדש את ההפעלה."
#. IDD_PROPPAGE_CODEPAGE, IDC_DETECT_CODEPAGE2
-#: Merge.rc:2630
+#: Merge.rc:2640
msgid ""
"Detect codepage for files with mlang.dll\n"
"Restart required."
@@ -4092,804 +4103,804 @@ msgstr ""
"נדרש להפעיל מחדש את ההפעלה."
#. IDS_OPTIONSPG_ARCHIVE
-#: Merge.rc:2638 Merge.rc:4214
+#: Merge.rc:2648 Merge.rc:4224
msgid "Archive Support"
msgstr "תמיכה בארכיון"
#. IDD_PROPPAGE_ARCHIVE, IDC_ARCHIVE_ENABLE
-#: Merge.rc:2641
+#: Merge.rc:2651
msgid "&Enable archive file support"
msgstr "הפעל תמיכה בקבצי ארכיון"
#. IDD_PROPPAGE_ARCHIVE, IDC_ARCHIVE_DETECTTYPE
-#: Merge.rc:2642
+#: Merge.rc:2652
msgid "&Detect archive type from file signature"
msgstr "זהה סוג ארכיון מחתימת הקובץ"
#. IDD_PROPPAGE_PROJECT, IDC_STATIC
-#: Merge.rc:2651
+#: Merge.rc:2661
msgid "Items saved to or restored from the project file:"
msgstr "פריטים שנשמרו או שוחזרו מקובץ הפרויקט:"
#. IDD_SAVECLOSING
-#: Merge.rc:2658
+#: Merge.rc:2668
msgid "Save Modified Files?"
msgstr "לשמור קבצים ששונו?"
#. IDD_SAVECLOSING, IDC_SAVECLOSING_LEFTFRAME
-#: Merge.rc:2661
+#: Merge.rc:2671
msgid "Left side file"
msgstr "קובץ צד שמאל"
#. IDD_SAVECLOSING, IDC_SAVECLOSING_SAVELEFT
-#: Merge.rc:2663
+#: Merge.rc:2673
msgid "&Save changes"
msgstr "שמור שינויים"
#. IDD_SAVECLOSING, IDC_SAVECLOSING_DISCARDLEFT
-#: Merge.rc:2664
+#: Merge.rc:2674
msgid "&Discard changes"
msgstr "בטל שינויים"
#. IDD_SAVECLOSING, IDC_SAVECLOSING_MIDDLEFRAME
-#: Merge.rc:2665
+#: Merge.rc:2675
msgid "Middle side file"
msgstr "קובץ צד אמצע"
#. IDD_SAVECLOSING, IDC_SAVECLOSING_SAVEMIDDLE
-#: Merge.rc:2667
+#: Merge.rc:2677
msgid "Sa&ve changes"
msgstr "שמור שינויים"
#. IDD_SAVECLOSING, IDC_SAVECLOSING_DISCARDMIDDLE
-#: Merge.rc:2668
+#: Merge.rc:2678
msgid "Discard c&hanges"
msgstr "בטל שינויים"
#. IDD_SAVECLOSING, IDC_SAVECLOSING_RIGHTFRAME
-#: Merge.rc:2669
+#: Merge.rc:2679
msgid "Right side file"
msgstr "קובץ צד ימין"
#. IDD_SAVECLOSING, IDC_SAVECLOSING_SAVERIGHT
-#: Merge.rc:2671
+#: Merge.rc:2681
msgid "S&ave changes"
msgstr "שמור שינויים"
#. IDD_SAVECLOSING, IDC_SAVECLOSING_DISCARDRIGHT
-#: Merge.rc:2672
+#: Merge.rc:2682
msgid "Dis&card changes"
msgstr "בטל שינויים"
#. IDD_SAVECLOSING, IDC_SAVECLOSING_DISCARDALL
-#: Merge.rc:2673
+#: Merge.rc:2683
msgid "Disca&rd All"
msgstr "בטל הכל"
#. IDD_DIRCMP_REPORT
-#: Merge.rc:2680
+#: Merge.rc:2690
msgid "Folder Compare Report"
msgstr "דוח השוואת תיקיות"
#. IDD_DIRCMP_REPORT, IDC_STATIC
-#: Merge.rc:2683
+#: Merge.rc:2693
msgid "Report &file:"
msgstr "קובץ דוח:"
#. IDD_DIRCMP_REPORT, IDC_STATIC
-#: Merge.rc:2686
+#: Merge.rc:2696
msgid "&Style:"
msgstr "סגנון:"
#. IDD_DIRCMP_REPORT, IDC_REPORT_INCLUDEFILECMPREPORT
-#: Merge.rc:2688
+#: Merge.rc:2698
msgid "&Include file compare report"
msgstr "כלול דוח השוואת קבצים"
#. IDD_FILTERS_FILEFILTERS_SHARED
-#: Merge.rc:2697
+#: Merge.rc:2707
msgid "Shared or Private Filter"
msgstr "מסנן משותף או פרטי"
#. IDD_FILTERS_FILEFILTERS_SHARED, IDC_STATIC
-#: Merge.rc:2700
+#: Merge.rc:2710
msgid "What type of filter do you want?"
msgstr "איזה סוג מסנן ברצונך ליצור?"
#. IDD_FILTERS_FILEFILTERS_SHARED, IDC_SHARED
-#: Merge.rc:2701
+#: Merge.rc:2711
msgid "Shared Filter (for all users)"
msgstr "מסנן משותף (לכל המשתמשים במחשב זה)"
#. IDD_FILTERS_FILEFILTERS_SHARED, IDC_PRIVATE
-#: Merge.rc:2702
+#: Merge.rc:2712
msgid "Private Filter (current user only)"
msgstr "מסנן פרטי (רק עבור המשתמש הנוכחי)"
#. IDD_COMPARE_STATISTICS3
-#: Merge.rc:2709 Merge.rc:2750
+#: Merge.rc:2719 Merge.rc:2760
msgid "Compare Statistics"
msgstr "סטטיסטיקות השוואה"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2712 Merge.rc:2753
+#: Merge.rc:2722 Merge.rc:2763
msgid "Folders:"
msgstr "תיקיות:"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2713 Merge.rc:2754
+#: Merge.rc:2723 Merge.rc:2764
msgid "Files:"
msgstr "קבצים:"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2719 Merge.rc:2738 Merge.rc:2760 Merge.rc:2799
+#: Merge.rc:2729 Merge.rc:2748 Merge.rc:2770 Merge.rc:2809
msgid "Binary:"
msgstr "בינארי:"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2722 Merge.rc:2763
+#: Merge.rc:2732 Merge.rc:2773
msgid "Unique"
msgstr "ייחודי"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2723 Merge.rc:2764
+#: Merge.rc:2733 Merge.rc:2774
msgid "Left:"
msgstr "שמאל:"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2728 Merge.rc:2774
+#: Merge.rc:2738 Merge.rc:2784
msgid "Right:"
msgstr "ימין:"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2742 Merge.rc:2803
+#: Merge.rc:2752 Merge.rc:2813
msgid "Total:"
msgstr "סה\"כ:"
#. IDD_COMPARE_STATISTICS3, IDOK
-#: Merge.rc:2745 Merge.rc:2806
+#: Merge.rc:2755 Merge.rc:2816
msgid "Close"
msgstr "סגור"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2769
+#: Merge.rc:2779
msgid "Middle:"
msgstr "אמצע:"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2779
+#: Merge.rc:2789
msgid "Missing Left:"
msgstr "חסר בשמאל:"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2784
+#: Merge.rc:2794
msgid "Missing Middle:"
msgstr "חסר באמצע:"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2789
+#: Merge.rc:2799
msgid "Missing Right:"
msgstr "חסר בימין:"
#. IDD_LOAD_SAVE_CODEPAGE, IDC_AFFECTS_GROUP
-#: Merge.rc:2814
+#: Merge.rc:2824
msgid "Affects"
msgstr "משפיע"
#. IDD_LOAD_SAVE_CODEPAGE, IDC_RIGHT_FILES_LABEL
-#: Merge.rc:2816 Merge.rc:2818 Merge.rc:2820
+#: Merge.rc:2826 Merge.rc:2828 Merge.rc:2830
msgid "(Affects)"
msgstr "(משפיע)"
#. IDD_LOAD_SAVE_CODEPAGE, IDC_LOADING_GROUP
-#: Merge.rc:2821
+#: Merge.rc:2831
msgid "Select Codepage for"
msgstr "בחר קידוד עבור"
#. IDD_LOAD_SAVE_CODEPAGE, IDC_LOAD_FILES_LABEL
-#: Merge.rc:2822
+#: Merge.rc:2832
msgid "&File Loading:"
msgstr "טעינת קובץ:"
#. IDD_LOAD_SAVE_CODEPAGE, IDC_SAVE_FILES_LABEL
-#: Merge.rc:2824
+#: Merge.rc:2834
msgid "File &Saving:"
msgstr "שמירת קובץ:"
#. IDD_LOAD_SAVE_CODEPAGE, IDC_LOAD_SAVE_SAME_CODEPAGE
-#: Merge.rc:2827
+#: Merge.rc:2837
msgid "&Use same codepage for both"
msgstr "השתמש באותו קידוד עבור שניהם"
#. IDS_MESSAGEBOX_CANCEL
-#: Merge.rc:2830 Merge.rc:4172
+#: Merge.rc:2840 Merge.rc:4182
msgid "&Cancel"
msgstr "ביטול"
#. IDD_FILTERS_FILEFILTERS_TEST
-#: Merge.rc:2835
+#: Merge.rc:2845
msgid "Test Filter"
msgstr "בדוק מסנן"
#. IDD_FILTERS_FILEFILTERS_TEST, IDC_HEADER
-#: Merge.rc:2838
+#: Merge.rc:2848
msgid "Testing filter:"
msgstr "בדיקת מסנן:"
#. IDD_FILTERS_FILEFILTERS_TEST, IDC_PROMPT_LABEL
-#: Merge.rc:2840
+#: Merge.rc:2850
msgid "&Enter text to test:"
msgstr "הזן טקסט לבדיקה:"
#. IDD_FILTERS_FILEFILTERS_TEST, IDC_IS_DIRECTORY
-#: Merge.rc:2842
+#: Merge.rc:2852
msgid "&Folder Name"
msgstr "שם תיקיה"
#. IDD_FILTERS_FILEFILTERS_TEST, IDC_STATIC
-#: Merge.rc:2843
+#: Merge.rc:2853
msgid "Result:"
msgstr "תוצאה:"
#. IDD_FILTERS_FILEFILTERS_TEST, IDC_TEST_BTN
-#: Merge.rc:2845
+#: Merge.rc:2855
msgid "&Test"
msgstr "בדיקה"
#. IDS_OPTIONSPG_TABLECOMPARE
-#: Merge.rc:2851 Merge.rc:2990 Merge.rc:4228
+#: Merge.rc:2861 Merge.rc:3000 Merge.rc:4238
msgid "Table"
msgstr "טבלה"
#. IDD_OPEN_TABLE, IDC_STATIC
-#: Merge.rc:2854
+#: Merge.rc:2864
msgid "File type"
msgstr "סוג קובץ"
#. IDD_OPEN_TABLE, IDC_COMPARETABLE_CSV
-#: Merge.rc:2855
+#: Merge.rc:2865
msgid "&CSV"
msgstr "CSV"
#. IDD_OPEN_TABLE, IDC_COMPARETABLE_TSV
-#: Merge.rc:2856
+#: Merge.rc:2866
msgid "&TSV"
msgstr "TSV"
#. IDD_OPEN_TABLE, IDC_COMPARETABLE_DSV
-#: Merge.rc:2857
+#: Merge.rc:2867
msgid "Custom &Delimiter-Separated Values"
msgstr "ערכים מופרדים במפריד מותאם אישית"
#. IDD_PROPPAGE_COMPARE_TABLE, IDC_STATIC
-#: Merge.rc:2859 Merge.rc:2861 Merge.rc:2996 Merge.rc:3004
+#: Merge.rc:2869 Merge.rc:2871 Merge.rc:3006 Merge.rc:3014
msgid "D&elimiter character:"
msgstr "תו מפריד:"
#. IDD_PROPPAGE_COMPARE_TABLE, IDC_COMPARETABLE_ALLOWNEWLINE
-#: Merge.rc:2863 Merge.rc:3006
+#: Merge.rc:2873 Merge.rc:3016
msgid "&Allow newlines in quotes"
msgstr "אפשר שורות חדשות במרכאות"
#. IDD_PROPPAGE_COMPARE_TABLE, IDC_STATIC
-#: Merge.rc:2865 Merge.rc:3008
+#: Merge.rc:2875 Merge.rc:3018
msgid "&Quote character:"
msgstr "תו ציטוט:"
#. IDS_OPTIONSPG_BACKUPS
-#: Merge.rc:2873 Merge.rc:4216
+#: Merge.rc:2883 Merge.rc:4226
msgid "Backup Files"
msgstr "קבצי גיבוי"
#. IDD_PROPPAGE_BACKUPS, IDC_STATIC
-#: Merge.rc:2876
+#: Merge.rc:2886
msgid "Create backup files for:"
msgstr "צור קבצי גיבוי ב:"
#. IDD_PROPPAGE_BACKUPS, IDC_BACKUP_FOLDERCMP
-#: Merge.rc:2877
+#: Merge.rc:2887
msgid "&Folder compare"
msgstr "השוואת תיקיות"
#. IDD_PROPPAGE_BACKUPS, IDC_BACKUP_FILECMP
-#: Merge.rc:2878
+#: Merge.rc:2888
msgid "Fil&e compare"
msgstr "השוואת קבצים"
#. IDD_PROPPAGE_BACKUPS, IDC_STATIC
-#: Merge.rc:2879
+#: Merge.rc:2889
msgid "Create backup files in:"
msgstr "צור קבצי גיבוי אל:"
#. IDD_PROPPAGE_BACKUPS, IDC_BACKUP_ORIGFOLD
-#: Merge.rc:2880
+#: Merge.rc:2890
msgid "&Original file's folder"
msgstr "תיקיית הקובץ המקורי"
#. IDD_PROPPAGE_BACKUPS, IDC_BACKUP_GLOBALFOLD
-#: Merge.rc:2881
+#: Merge.rc:2891
msgid "&Global backup folder:"
msgstr "תיקיית גיבוי גלובלית:"
#. IDD_PROPPAGE_BACKUPS, IDC_STATIC
-#: Merge.rc:2884
+#: Merge.rc:2894
msgid "Backup filename:"
msgstr "שם קובץ הגיבוי:"
#. IDD_PROPPAGE_BACKUPS, IDC_BACKUP_APPEND_BAK
-#: Merge.rc:2885
+#: Merge.rc:2895
msgid "&Append .bak extension"
msgstr "הוסף סיומת .bak"
#. IDD_PROPPAGE_BACKUPS, IDC_BACKUP_APPEND_TIME
-#: Merge.rc:2886
+#: Merge.rc:2896
msgid "A&ppend timestamp"
msgstr "הוסף חותמת זמן"
#. IDS_CONFIRM_COPY_CAPTION
-#: Merge.rc:2892 Merge.rc:4565
+#: Merge.rc:2902 Merge.rc:4575
msgid "Confirm Copy"
msgstr "אישור העתקה"
#. IDD_CONFIRM_COPY, IDC_FLDCONFIRM_QUERY
-#: Merge.rc:2896
+#: Merge.rc:2906
msgid "Are you sure you want to copy XXX items?"
msgstr "האם אתה בטוח שברצונך להעתיק XXX פריטים?"
#. IDD_CONFIRM_COPY, IDC_FLDCONFIRM_FROM_TEXT
-#: Merge.rc:2897
+#: Merge.rc:2907
msgid "From left"
msgstr "משמאל"
#. IDD_CONFIRM_COPY, IDC_FLDCONFIRM_TO_TEXT
-#: Merge.rc:2899
+#: Merge.rc:2909
msgid "To right"
msgstr "לימין"
#. IDS_MESSAGEBOX_DONT_ASK_AGAIN
-#: Merge.rc:2901 Merge.rc:4191
+#: Merge.rc:2911 Merge.rc:4201
msgid "Don't ask this &question again."
msgstr "אל תשאל שאלה זו שוב."
#. IDD_CONFIRM_COPY, IDYES
-#: Merge.rc:2903
+#: Merge.rc:2913
msgid "Yes"
msgstr "כן"
#. IDD_CONFIRM_COPY, IDNO
-#: Merge.rc:2904
+#: Merge.rc:2914
msgid "No"
msgstr "לא"
#. IDS_PROJECT_ITEM_PLUGIN
-#: Merge.rc:2909 Merge.rc:4323
+#: Merge.rc:2919 Merge.rc:4333
msgid "Plugins"
msgstr "תוספים"
#. IDD_PLUGINS_LIST, IDC_PLUGINS_ENABLE
-#: Merge.rc:2912
+#: Merge.rc:2922
msgid "&Enable plugins"
msgstr "הפעל תוספים"
#. IDD_PLUGINS_EDITPLUGIN, IDC_STATIC
-#: Merge.rc:2913 Merge.rc:3113
+#: Merge.rc:2923 Merge.rc:3123
msgid "Plugin &type:"
msgstr "סוג תוסף:"
#. IDD_PLUGINS_LIST, IDC_STATIC
-#: Merge.rc:2916
+#: Merge.rc:2926
msgid "File filters:"
msgstr "מסנני קבצים:"
#. IDD_PLUGINS_LIST, IDC_STATIC
-#: Merge.rc:2918
+#: Merge.rc:2928
msgid "&Plugin arguments:"
msgstr "פרמטרים לתוסף:"
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_AUTOMATIC
-#: Merge.rc:2920 Merge.rc:3134
+#: Merge.rc:2930 Merge.rc:3144
msgid "Enable &automatic unpacking/prediffing"
msgstr "אפשר פריסה/השוואה מוקדמת אוטומטית עבור התוסף"
#. IDS_OPTIONSPG_SHELL
-#: Merge.rc:2934 Merge.rc:4217
+#: Merge.rc:2944 Merge.rc:4227
msgid "Shell Integration"
msgstr "שילוב מעטפת"
#. IDD_PROPPAGE_SHELL, IDC_STATIC
-#: Merge.rc:2937
+#: Merge.rc:2947
msgid "Explorer"
msgstr "סייר"
#. IDD_PROPPAGE_SHELL, IDC_EXPLORER_CONTEXT
-#: Merge.rc:2938
+#: Merge.rc:2948
msgid "&Add to context menu"
msgstr "הוסף לתפריט ההקשר"
#. IDD_PROPPAGE_SHELL, IDC_EXPLORER_ADVANCED
-#: Merge.rc:2939
+#: Merge.rc:2949
msgid "E&nable advanced menu"
msgstr "הפעל תפריט מתקדם"
#. IDD_PROPPAGE_SHELL, IDC_EXPLORER_COMPARE_AS
-#: Merge.rc:2940
+#: Merge.rc:2950
msgid "Enable &Compare As menu"
msgstr "הפעל תפריט 'השווה כ'"
#. IDD_PROPPAGE_SHELL, IDC_REGISTER_SHELLEXTENSION
-#: Merge.rc:2941
+#: Merge.rc:2951
msgid "&Register Shell Extension"
msgstr "רשום הרחבת מעטפת"
#. IDD_PROPPAGE_SHELL, IDC_UNREGISTER_SHELLEXTENSION
-#: Merge.rc:2942
+#: Merge.rc:2952
msgid "&Unregister Shell Extension"
msgstr "הסר רישום הרחבת מעטפת"
#. IDD_PROPPAGE_SHELL, IDC_REGISTER_SHELLEXTENSION_PERUSER
-#: Merge.rc:2943
+#: Merge.rc:2953
msgid "Register Shell Extension for Current User &Only"
msgstr "רשום הרחבת מעטפת רק עבור המשתמש הנוכחי"
#. IDD_PROPPAGE_SHELL, IDC_UNREGISTER_SHELLEXTENSION_PERUSER
-#: Merge.rc:2944
+#: Merge.rc:2954
msgid "Unregister Shell Extension for Current User On&ly"
msgstr "הסר רישום הרחבת מעטפת רק עבור המשתמש הנוכחי"
#. IDD_PROPPAGE_SHELL, IDC_REGISTER_WINMERGECONTEXTMENU
-#: Merge.rc:2945
+#: Merge.rc:2955
msgid "Register Shell Extension for &Windows 11"
msgstr "רשום הרחבת מעטפת עבור Windows 11 ואילך"
#. IDD_PROPPAGE_SHELL, IDC_UNREGISTER_WINMERGECONTEXTMENU
-#: Merge.rc:2946
+#: Merge.rc:2956
msgid "Unregister Shell Extension for W&indows 11"
msgstr "הסר רישום הרחבת מעטפת עבור Windows 11 ואילך"
#. IDD_PROPPAGE_SHELL, IDC_STATIC
-#: Merge.rc:2947
+#: Merge.rc:2957
msgid "Jump List"
msgstr "רשימת קפיצה"
#. IDD_PROPPAGE_SHELL, IDC_CLEAR_ALL_RECENT_ITEMS
-#: Merge.rc:2949
+#: Merge.rc:2959
msgid "Clear all recent items"
msgstr "נקה את כל הפריטים האחרונים"
#. IDS_OPTIONSPG_FOLDERCOMPARE
-#: Merge.rc:2954 Merge.rc:4225
+#: Merge.rc:2964 Merge.rc:4235
msgctxt "Options dialog|Categories"
msgid "Folder"
msgstr "תיקיה"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC
-#: Merge.rc:2957
+#: Merge.rc:2967
msgid "&Compare method:"
msgstr "שיטת השוואה:"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_COMPARE_STOPFIRST
-#: Merge.rc:2959
+#: Merge.rc:2969
msgid "S&top after first difference"
msgstr "עצור לאחר ההבדל הראשון"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_IGNORE_SMALLTIMEDIFF
-#: Merge.rc:2961
+#: Merge.rc:2971
msgid "Ign&ore time differences less than 3 seconds"
msgstr "התעלם מהבדלי זמן קטנים מ-3 שניות"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC
-#: Merge.rc:2964
+#: Merge.rc:2974
msgid "Expand subfolders &after comparison:"
msgstr "הרחב תיקיות משנה אוטומטית לאחר השוואה:"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_COMPARE_WALKSUBDIRS
-#: Merge.rc:2966
+#: Merge.rc:2976
msgid "Include &unique subfolders contents"
msgstr "כלול תוכן תיקיות משנה ייחודיות"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_IGNORE_REPARSEPOINTS
-#: Merge.rc:2968
+#: Merge.rc:2978
msgid "Ignore &reparse points"
msgstr "התעלם מנקודות הפניה מחדש"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC
-#: Merge.rc:2969
+#: Merge.rc:2979
msgid "Switch to &quick compare when size exceeds (MB):"
msgstr "סף למעבר להשוואה מהירה (MB):"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC
-#: Merge.rc:2971
+#: Merge.rc:2981
msgid "Switch to &binary compare when size exceeds (MB):"
msgstr "סף למעבר להשוואה בינארית (MB):"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC
-#: Merge.rc:2975
+#: Merge.rc:2985
msgid "Additional comparison condi&tions:"
msgstr ""
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC
-#: Merge.rc:2978
+#: Merge.rc:2988
msgid "&Rename/move detection:"
msgstr ""
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC
-#: Merge.rc:2980
+#: Merge.rc:2990
msgid "Rename/move detection &keys:"
msgstr ""
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC
-#: Merge.rc:2983
+#: Merge.rc:2993
msgid "M&erge renames and moves:"
msgstr ""
#. IDD_PROPPAGE_COMPARE_TABLE, IDC_STATIC
-#: Merge.rc:2994 Merge.rc:2999 Merge.rc:3002
+#: Merge.rc:3004 Merge.rc:3009 Merge.rc:3012
msgid "File patterns:"
msgstr "תבניות קבצים:"
#. IDD_PROPPAGE_COMPARE_TABLE, IDC_STATIC
-#: Merge.rc:3001
+#: Merge.rc:3011
msgid "Custom Delimiter-Separated Values"
msgstr "ערכים מופרדים במפריד מותאם אישית"
#. IDS_OPTIONSPG_BINARYCOMPARE
-#: Merge.rc:3015 Merge.rc:4227
+#: Merge.rc:3025 Merge.rc:4237
msgctxt "Options dialog|Categories"
msgid "Binary"
msgstr "בינארי"
#. IDD_PROPPAGE_COMPARE_BINARY, IDC_STATIC
-#: Merge.rc:3018
+#: Merge.rc:3028
msgid "Binary file &patterns:"
msgstr "תבניות קבצים בינאריים:"
#. IDD_PROPPAGE_COMPARE_BINARY, IDC_STATIC
-#: Merge.rc:3020
+#: Merge.rc:3030
msgid "Frhed settings"
msgstr "הגדרות Frhed"
#. IDD_PROPPAGE_COMPARE_BINARY, IDC_COMPAREBINARY_VIEWSETTINGS
-#: Merge.rc:3021
+#: Merge.rc:3031
msgid "View &Settings..."
msgstr "הצג הגדרות..."
#. IDD_PROPPAGE_COMPARE_BINARY, IDC_COMPAREBINARY_BINARYMODE
-#: Merge.rc:3022
+#: Merge.rc:3032
msgid "&Binary Mode..."
msgstr "מצב בינארי..."
#. IDD_PROPPAGE_COMPARE_BINARY, IDC_COMPAREBINARY_CHARACTERSET
-#: Merge.rc:3023
+#: Merge.rc:3033
msgid "&Character Set..."
msgstr "ערכת תווים..."
#. IDS_PRPCAT_IMAGE
-#: Merge.rc:3029 Merge.rc:4226 Merge.rc:4665
+#: Merge.rc:3039 Merge.rc:4236 Merge.rc:4675
msgid "Image"
msgstr "תמונה"
#. IDD_PROPPAGE_COMPARE_IMAGE, IDC_STATIC
-#: Merge.rc:3032
+#: Merge.rc:3042
msgid "Image file &patterns:"
msgstr "תבניות קובצי תמונה:"
#. IDD_PROPPAGE_COMPARE_IMAGE, IDC_ENABLE_IMGCMP_IN_DIRCMP
-#: Merge.rc:3034
+#: Merge.rc:3044
msgid "&Enable image compare in folder compare"
msgstr "אפשר השוואת תמונות בהשוואת תיקיות"
#. IDD_PROPPAGE_COMPARE_IMAGE, IDC_STATIC
-#: Merge.rc:3036
+#: Merge.rc:3046
msgid "OCR result:"
msgstr "תוצאת OCR:"
#. IDS_OPTIONSPG_WEBPAGECOMPARE
-#: Merge.rc:3043 Merge.rc:4229
+#: Merge.rc:3053 Merge.rc:4239
msgid "Webpage"
msgstr "דף אינטרנט"
#. IDD_PROPPAGE_COMPARE_WEBPAGE, IDC_STATIC
-#: Merge.rc:3046
+#: Merge.rc:3056
msgid "URL pattern to &include (Regular expression):"
msgstr "תבנית URL לכלילה (ביטוי רגולרי):"
#. IDD_PROPPAGE_COMPARE_WEBPAGE, IDC_STATIC
-#: Merge.rc:3048
+#: Merge.rc:3058
msgid "URL pattern to &exclude (Regular expression):"
msgstr "תבנית URL להחרגה (ביטוי רגולרי):"
#. IDD_PROPPAGE_COMPARE_WEBPAGE, IDC_STATIC
-#: Merge.rc:3050
+#: Merge.rc:3060
msgid "&User data folder location:"
msgstr "מיקום תיקיית נתוני משתמש:"
#. IDD_PROPPAGE_COMPARE_WEBPAGE, IDC_COMPAREWEBPAGE_USERDATAFOLDER_PERPANE
-#: Merge.rc:3052
+#: Merge.rc:3062
msgid "&Separate user data folders for each pane"
msgstr "הפרד תיקיות נתוני משתמש לכל חלונית"
#. IDD_ENCODINGERROR, IDC_HEXVIEW
-#: Merge.rc:3065
+#: Merge.rc:3075
msgid "&Hex View"
msgstr "תצוגת הקס"
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3110
+#: Merge.rc:3120
msgid "Edit Plugin"
msgstr "ערוך תוסף"
#. IDD_PLUGINS_EDITPLUGIN, IDC_STATIC
-#: Merge.rc:3123
+#: Merge.rc:3133
msgid "&Category:"
msgstr "קטגוריה:"
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_MENUCAPTION_STATIC
-#: Merge.rc:3125
+#: Merge.rc:3135
msgid "&Menu caption:"
msgstr "כיתוב בתפריט:"
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_WINDOWTYPE_STATIC
-#: Merge.rc:3127
+#: Merge.rc:3137
msgid "&Window type:"
msgstr "סוג חלון:"
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_UNPACKEDFILEEXTENSION_STATIC
-#: Merge.rc:3132
+#: Merge.rc:3142
msgid "&Unpacked file extension:"
msgstr "סיומת קובץ לאחר פריסה:"
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_ARGUMENTSREQUIRED
-#: Merge.rc:3136
+#: Merge.rc:3146
msgid "&Require arguments"
msgstr "דורש פרמטרים"
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_GENERATESCRIPT
-#: Merge.rc:3137
+#: Merge.rc:3147
msgid "&Generate editor script"
msgstr "צור סקריפט עורך"
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_COMMAND_LINE_STATIC
-#: Merge.rc:3140
+#: Merge.rc:3150
msgid "Command &line:"
msgstr "שורת פקודה:"
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_SCRIPT_FILEEXTENSION_STATIC
-#: Merge.rc:3143
+#: Merge.rc:3153
msgid "&Script file extension:"
msgstr "סיומת קובץ סקריפט:"
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_SCRIPT_BODY_STATIC
-#: Merge.rc:3145
+#: Merge.rc:3155
msgid "Script &body:"
msgstr "תוכן סקריפט:"
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3154
+#: Merge.rc:3164
msgid "Font"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3157
+#: Merge.rc:3167
msgid "&Font:"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3163
+#: Merge.rc:3173
msgid "Font st&yle:"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3169
+#: Merge.rc:3179
msgid "&Size:"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3175
+#: Merge.rc:3185
msgid "Effects"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3176
+#: Merge.rc:3186
msgid "Stri&keout"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3177
+#: Merge.rc:3187
msgid "&Underline"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3179
+#: Merge.rc:3189
msgid "&Color:"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3184
+#: Merge.rc:3194
msgid "Sample"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3185
+#: Merge.rc:3195
msgid "AaBbYyZz"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3189
+#: Merge.rc:3199
msgid "Sc&ript:"
msgstr ""
#. IDD_PLUGINS_EDITPLUGIN, IDC_MANAGE_LINK
-#: Merge.rc:3194
+#: Merge.rc:3204
msgid "Show more fonts"
msgstr ""
#. ID_INDICATOR_EXT
-#: Merge.rc:4118
+#: Merge.rc:4128
msgid "EXT"
msgstr ""
#. ID_INDICATOR_CAPS
-#: Merge.rc:4119
+#: Merge.rc:4129
msgid "CAP"
msgstr ""
#. ID_INDICATOR_NUM
-#: Merge.rc:4120
+#: Merge.rc:4130
msgid "NUM"
msgstr ""
#. ID_INDICATOR_SCRL
-#: Merge.rc:4121
+#: Merge.rc:4131
msgid "SCRL"
msgstr ""
#. ID_INDICATOR_OVR
-#: Merge.rc:4122
+#: Merge.rc:4132
msgid "OVR"
msgstr ""
#. ID_INDICATOR_REC
-#: Merge.rc:4123
+#: Merge.rc:4133
msgid "REC"
msgstr ""
#. ID_FILE_NEW
-#: Merge.rc:4129
+#: Merge.rc:4139
msgid "\nNew Documents (Ctrl+N)"
msgstr ""
#. ID_FILE_OPEN
-#: Merge.rc:4130
+#: Merge.rc:4140
msgid "\nOpen (Ctrl+O)"
msgstr ""
#. ID_FILE_SAVE
-#: Merge.rc:4131
+#: Merge.rc:4141
msgid "\nSave (Ctrl+S)"
msgstr ""
#. IDS_UNK_ERROR_READING_PROJECT
-#: Merge.rc:4137
+#: Merge.rc:4147
msgid "Unknown error opening project file."
msgstr "שגיאה לא ידועה בעת ניסיון לפתוח קובץ פרויקט."
#. IDS_UNK_ERROR_SAVING_PROJECT
-#: Merge.rc:4138
+#: Merge.rc:4148
msgid "Unknown error saving project file."
msgstr "שגיאה לא ידועה בעת ניסיון לשמור קובץ פרויקט."
#. IDS_PROJFILE_LOAD_SUCCESS
-#: Merge.rc:4143
+#: Merge.rc:4153
msgid "Project file loaded."
msgstr "קובץ הפרויקט נטען בהצלחה."
#. IDS_PROJFILE_SAVE_SUCCESS
-#: Merge.rc:4144
+#: Merge.rc:4154
msgid "Project file saved."
msgstr "קובץ הפרויקט נשמר בהצלחה."
#. ID_EDIT_UNDO
-#: Merge.rc:4150
+#: Merge.rc:4160
msgid ""
"\n"
"Undo (Ctrl+Z)"
@@ -4898,7 +4909,7 @@ msgstr ""
"ביטול (Ctrl+Z)"
#. ID_EDIT_REDO
-#: Merge.rc:4151
+#: Merge.rc:4161
msgid ""
"\n"
"Redo (Ctrl+Y)"
@@ -4907,7 +4918,7 @@ msgstr ""
"חזור (Ctrl+Y)"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:4158
+#: Merge.rc:4168
msgid ""
"\n"
"FileCompare\n"
@@ -4926,7 +4937,7 @@ msgstr ""
"WinMerge השוואת קבצים"
#. IDR_DIRDOCTYPE
-#: Merge.rc:4159
+#: Merge.rc:4169
msgid ""
"\n"
"FolderCompare\n"
@@ -4945,162 +4956,162 @@ msgstr ""
"WinMerge השוואת תיקיות"
#. IDS_SPLASH_GPLTEXT
-#: Merge.rc:4165
+#: Merge.rc:4175
msgid "WinMerge comes with ABSOLUTELY NO WARRANTY. It is free software and can be redistributed under the conditions of the GNU General Public License - see the Help menu for details."
msgstr ""
#. IDS_MESSAGEBOX_ABORT
-#: Merge.rc:4173
+#: Merge.rc:4183
msgid "&Abort"
msgstr "בטל"
#. IDS_MESSAGEBOX_RETRY
-#: Merge.rc:4174
+#: Merge.rc:4184
msgid "&Retry"
msgstr "נסה שוב"
#. IDS_MESSAGEBOX_IGNORE
-#: Merge.rc:4175
+#: Merge.rc:4185
msgid "&Ignore"
msgstr "התעלם"
#. IDS_MESSAGEBOX_IGNOREALL
-#: Merge.rc:4176
+#: Merge.rc:4186
msgid "Ignore &all"
msgstr "התעלם מהכל"
#. IDS_MESSAGEBOX_YES
-#: Merge.rc:4177
+#: Merge.rc:4187
msgid "&Yes"
msgstr "כן"
#. IDS_MESSAGEBOX_YES_TO_ALL
-#: Merge.rc:4183
+#: Merge.rc:4193
msgid "Yes to &all"
msgstr "כן להכל"
#. IDS_MESSAGEBOX_NO
-#: Merge.rc:4184
+#: Merge.rc:4194
msgid "&No"
msgstr "לא"
#. IDS_MESSAGEBOX_NO_TO_ALL
-#: Merge.rc:4185
+#: Merge.rc:4195
msgid "No to a&ll"
msgstr "לא להכל"
#. IDS_MESSAGEBOX_CONTINUE
-#: Merge.rc:4186
+#: Merge.rc:4196
msgid "&Continue"
msgstr "המשך"
#. IDS_MESSAGEBOX_SKIP
-#: Merge.rc:4187
+#: Merge.rc:4197
msgid "&Skip"
msgstr "דלג"
#. IDS_MESSAGEBOX_SKIPALL
-#: Merge.rc:4188
+#: Merge.rc:4198
msgid "Skip &all"
msgstr "דלג על הכל"
#. IDS_MESSAGEBOX_DONT_DISPLAY_AGAIN
-#: Merge.rc:4190
+#: Merge.rc:4200
msgid "Don't display this &message again."
msgstr "אל תציג הודעה זו שוב."
-#: Merge.rc:4193
+#: Merge.rc:4203
msgid "To make this message box visible, press Reset on the Message Boxes page in Options."
msgstr "כדי להציג מחדש את חלון ההודעה, לחץ על כפתור האיפוס בלשונית הודעות בתיבת הדו-שיח אפשרויות."
#. IDS_OPTIONSPG_EDITOR_COMPAREMERGE
-#: Merge.rc:4203
+#: Merge.rc:4213
msgid "Compare/Merge"
msgstr "השוואה/מיזוג"
#. IDS_OPTIONSPG_SYNTAXCOLORS
-#: Merge.rc:4204 Merge.rc:4208
+#: Merge.rc:4214 Merge.rc:4218
msgid "Syntax"
msgstr "תחביר"
#. IDS_OPTIONSPG_COLOR_SCHEMES
-#: Merge.rc:4206
+#: Merge.rc:4216
msgid "Color Schemes"
msgstr "ערכות צבעים"
#. IDS_OPTIONSPG_DIRCOLORS
-#: Merge.rc:4210
+#: Merge.rc:4220
msgid "Folder Compare"
msgstr "השוואת תיקיות"
#. IDS_OPTIONSPG_PROJECT
-#: Merge.rc:4215
+#: Merge.rc:4225
msgid "Project"
msgstr "פרויקט"
#. IDS_COLHDR_NSDIFFS
-#: Merge.rc:4218 Merge.rc:4640
+#: Merge.rc:4228 Merge.rc:4650
msgid "Differences"
msgstr "הבדלים"
#. IDS_OPTIONSPG_MESSAGEBOXES
-#: Merge.rc:4220
+#: Merge.rc:4230
msgid "Message Boxes"
msgstr "חלונות הודעה"
#. IDS_TO
-#: Merge.rc:4235
+#: Merge.rc:4245
msgid "To:"
msgstr "אל:"
#. IDS_FROM_LEFT
-#: Merge.rc:4236
+#: Merge.rc:4246
msgid "From left:"
msgstr "משמאל:"
#. IDS_TO_LEFT
-#: Merge.rc:4237
+#: Merge.rc:4247
msgid "To left:"
msgstr "אל שמאל:"
#. IDS_FROM_RIGHT
-#: Merge.rc:4238
+#: Merge.rc:4248
msgid "From right:"
msgstr "מימין:"
#. IDS_TO_RIGHT
-#: Merge.rc:4239
+#: Merge.rc:4249
msgid "To right:"
msgstr "אל ימין:"
#. IDS_FROM_MIDDLE
-#: Merge.rc:4240
+#: Merge.rc:4250
msgid "From middle:"
msgstr "מאמצע:"
#. IDS_TO_MIDDLE
-#: Merge.rc:4241
+#: Merge.rc:4251
msgid "To middle:"
msgstr "אל אמצע:"
#. IDS_VERSION_FMT
-#: Merge.rc:4247
+#: Merge.rc:4257
#, c-format
msgid "Version %1"
msgstr "גרסה %1"
#. IDS_OPTIONS_TITLE
-#: Merge.rc:4253
+#: Merge.rc:4263
#, c-format
msgid "Options (%1)"
msgstr "אפשרויות (%1)"
#. IDS_MESSAGE_BOX_ARE_RESET
-#: Merge.rc:4254
+#: Merge.rc:4264
msgid "All message boxes are now displayed again."
msgstr "כל חלונות ההודעות מוצגים שוב."
-#: Merge.rc:4256
+#: Merge.rc:4266
#, c-format
msgid "Tab size value is out of range. Please use 1 - %1."
msgstr ""
@@ -5109,156 +5120,156 @@ msgstr ""
"אנא השתמש בערכים בין 1 ל-%1."
#. IDS_PROJECT_OPEN
-#: Merge.rc:4262 Merge.rc:4318
+#: Merge.rc:4272 Merge.rc:4328
msgid "Open"
msgstr "פתח"
#. IDS_PROGRAMFILES
-#: Merge.rc:4263
+#: Merge.rc:4273
msgid "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||"
msgstr "תוכניות|*.exe;*.bat;*.cmd|כל הקבצים (*.*)|*.*||"
#. IDS_ALLFILES
-#: Merge.rc:4264
+#: Merge.rc:4274
msgid "All Files (*.*)|*.*||"
msgstr "כל הקבצים (*.*)|*.*||"
#. IDS_PROJECTFILES
-#: Merge.rc:4265
+#: Merge.rc:4275
msgid "WinMerge Project Files (*.WinMerge)|*.WinMerge||"
msgstr "קובצי פרויקט WinMerge (*.WinMerge)|*.WinMerge||"
#. IDS_INIFILES
-#: Merge.rc:4267
+#: Merge.rc:4277
msgid "Options files (*.ini)|*.ini|All Files (*.*)|*.*||"
msgstr "קובצי אפשרויות (*.ini)|*.ini|כל הקבצים (*.*)|*.*||"
#. IDS_REPLACELIST_FILES
-#: Merge.rc:4268
+#: Merge.rc:4278
msgid "Tab-Separated Values (*.tsv;*.txt)|*.tsv;*.txt|All Files (*.*)|*.*||"
msgstr ""
#. IDS_TEXT_REPORT_FILES
-#: Merge.rc:4274
+#: Merge.rc:4284
msgid "Text Files (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|All Files (*.*)|*.*||"
msgstr "קובצי טקסט (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|כל הקבצים (*.*)|*.*||"
#. IDS_HTML_REPORT_FILES
-#: Merge.rc:4275
+#: Merge.rc:4285
msgid "HTML Files (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||"
msgstr "קובצי HTML (*.htm,*.html)|*.htm;*.html|כל הקבצים (*.*)|*.*||"
#. IDS_XML_REPORT_FILES
-#: Merge.rc:4276
+#: Merge.rc:4286
msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||"
msgstr "קובצי XML (*.xml)|*.xml|כל הקבצים (*.*)|*.*||"
#. IDS_EXPANDSUBDIRS_DONOTEXPAND
-#: Merge.rc:4294
+#: Merge.rc:4304
msgid "Do not expand"
msgstr "אל תרחיב"
#. IDS_EXPANDSUBDIRS_ALL
-#: Merge.rc:4295
+#: Merge.rc:4305
msgid "Expand all subfolders"
msgstr "הרחב את כל תיקיות המשנה"
#. IDS_EXPANDSUBDIRS_DIFFERENT
-#: Merge.rc:4296
+#: Merge.rc:4306
msgid "Expand different subfolders"
msgstr "הרחב תיקיות משנה שונות"
#. IDS_EXPANDSUBDIRS_IDENTICAL
-#: Merge.rc:4297
+#: Merge.rc:4307
msgid "Expand identical subfolders"
msgstr "הרחב תיקיות משנה זהות"
#. IDS_SYNTAXTABLE_FILETYPE
-#: Merge.rc:4303
+#: Merge.rc:4313
msgid "File Type"
msgstr "סוג קובץ"
#. IDS_COLHDR_EXTENSION
-#: Merge.rc:4304 Merge.rc:4597
+#: Merge.rc:4314 Merge.rc:4607
msgid "Extension"
msgstr "סיומת"
#. IDS_PRPCAT_MESSAGE
-#: Merge.rc:4310 Merge.rc:4669
+#: Merge.rc:4320 Merge.rc:4679
msgid "Message"
msgstr "הודעה"
#. IDS_MESSAGEBOX_ANSWER
-#: Merge.rc:4311
+#: Merge.rc:4321
msgid "Answer"
msgstr "תשובה"
#. IDS_PROJECT_ITEM
-#: Merge.rc:4317
+#: Merge.rc:4327
msgid "Item"
msgstr "פריט"
#. IDS_PROJECT_LOAD
-#: Merge.rc:4319
+#: Merge.rc:4329
msgid "Load"
msgstr "טען"
#. IDS_PROJECT_SAVE
-#: Merge.rc:4320
+#: Merge.rc:4330
msgid "Save"
msgstr "שמור"
#. IDS_PROJECT_ITEM_INCLUDE_SUBFOLDERS
-#: Merge.rc:4322
+#: Merge.rc:4332
msgid "Include Subfolders"
msgstr "כלול תיקיות משנה"
#. IDS_PROJECT_ITEM_COMPARE_OPTIONS
-#: Merge.rc:4324
+#: Merge.rc:4334
msgid "Compare Options"
msgstr "אפשרויות השוואה"
#. IDS_PROJECT_ITEM_HIDDEN_ITEMS
-#: Merge.rc:4325
+#: Merge.rc:4335
msgid "Hidden Items"
msgstr "פריטים מוסתרים"
#. IDS_PLUGINSLIST_NAME
-#: Merge.rc:4331 Merge.rc:4956
+#: Merge.rc:4341 Merge.rc:4966
msgid "Name"
msgstr "שם"
#. IDS_FILTERFILE_PATHTITLE
-#: Merge.rc:4332
+#: Merge.rc:4342
msgid "Location"
msgstr "מיקום"
#. IDS_FILTER_TITLE
-#: Merge.rc:4333
+#: Merge.rc:4343
msgid "Filters"
msgstr "מסננים"
#. IDS_FILTER_PREFIX
-#: Merge.rc:4334
+#: Merge.rc:4344
msgid "[F] "
msgstr "[F] "
#. IDS_PLUGINSLIST_DESC
-#: Merge.rc:4335 Merge.rc:4958
+#: Merge.rc:4345 Merge.rc:4968
msgid "Description"
msgstr "תיאור"
#. IDS_FILEFILTER_SAVENEW
-#: Merge.rc:4336
+#: Merge.rc:4346
msgid "Select Filename for New Filter"
msgstr "בחר שם קובץ למסנן חדש"
#. IDS_FILEFILTER_FILEMASK
-#: Merge.rc:4337
+#: Merge.rc:4347
msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||"
msgstr "מסנני קבצים (*.flt)|*.flt|כל הקבצים (*.*)|*.*||"
-#: Merge.rc:4339
+#: Merge.rc:4349
#, c-format
msgid ""
"Cannot find filter template!\n"
@@ -5271,7 +5282,7 @@ msgstr ""
"אנא העתק את הקובץ %1 לתיקיית WinMerge/Filters:\n"
"%2."
-#: Merge.rc:4341
+#: Merge.rc:4351
#, c-format
msgid ""
"Cannot copy filter template:\n"
@@ -5284,7 +5295,7 @@ msgstr ""
"\n"
"אנא ודא שהתיקיה קיימת וניתן לכתוב בה."
-#: Merge.rc:4343
+#: Merge.rc:4353
msgid ""
"User's filter folder is not defined!\n"
"\n"
@@ -5294,7 +5305,7 @@ msgstr ""
"\n"
"אנא בחר תיקיית מסננים באפשרויות/מערכת."
-#: Merge.rc:4345
+#: Merge.rc:4355
#, c-format
msgid ""
"Failed to delete filter:\n"
@@ -5308,241 +5319,241 @@ msgstr ""
"ייתכן שהקובץ לקריאה בלבד?"
#. IDS_FILEFILTER_INSTALL
-#: Merge.rc:4346
+#: Merge.rc:4356
msgid "Locate Filter File to Install"
msgstr "אתר קובץ מסנן להתקנה"
-#: Merge.rc:4348
+#: Merge.rc:4358
msgid "Installing filter file failed.\n\nCould not copy new filter to folder."
msgstr ""
#. IDS_FILEFILTER_OVERWRITE
-#: Merge.rc:4349
+#: Merge.rc:4359
msgid "Filter file exists. Overwrite?"
msgstr "קובץ המסנן כבר קיים. להחליף את המסנן הקיים?"
#. IDS_FILTERLINE_REGEXP
-#: Merge.rc:4355
+#: Merge.rc:4365
msgid "Regular expression"
msgstr "ביטוי רגולרי"
#. IDS_FILTERCHANGED
-#: Merge.rc:4361
+#: Merge.rc:4371
msgid "Filters updated. Refresh all open folder compares?\n\nSelect 'No' to refresh later."
msgstr ""
#. IDS_DIRECTORY_WINDOW_TITLE
-#: Merge.rc:4367
+#: Merge.rc:4377
msgid "Folder Comparison Results"
msgstr "תוצאות השוואת תיקיות"
#. IDS_FILE_COMPARISON_TITLE
-#: Merge.rc:4368
+#: Merge.rc:4378
msgid "File Comparison"
msgstr "השוואת קבצים"
#. IDS_EMPTY_LEFT_FILE
-#: Merge.rc:4369
+#: Merge.rc:4379
msgid "Untitled Left"
msgstr "ללא שם - שמאל"
#. IDS_EMPTY_MIDDLE_FILE
-#: Merge.rc:4370
+#: Merge.rc:4380
msgid "Untitled Middle"
msgstr "ללא שם - אמצע"
#. IDS_EMPTY_RIGHT_FILE
-#: Merge.rc:4371
+#: Merge.rc:4381
msgid "Untitled Right"
msgstr "ללא שם - ימין"
#. IDS_CONFLICT_BASE_FILE
-#: Merge.rc:4372
+#: Merge.rc:4382
msgid "Base File"
msgstr ""
#. IDS_CONFLICT_THEIRS_FILE
-#: Merge.rc:4373
+#: Merge.rc:4383
msgid "Theirs File"
msgstr ""
#. IDS_CONFLICT_MINE_FILE
-#: Merge.rc:4374
+#: Merge.rc:4384
msgid "Mine File"
msgstr ""
#. IDS_SELFCOMPARE_ORIGINAL_FILE
-#: Merge.rc:4375
+#: Merge.rc:4385
msgid "Original File"
msgstr ""
#. IDS_LINE_STATUS_INFO_EOL
-#: Merge.rc:4381
+#: Merge.rc:4391
#, c-format
msgid "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s"
msgstr ""
#. IDS_EMPTY_LINE_STATUS_INFO
-#: Merge.rc:4382
+#: Merge.rc:4392
#, c-format
msgid "Line: %s"
msgstr ""
#. IDS_LINE_STATUS_INFO
-#: Merge.rc:4383
+#: Merge.rc:4393
#, c-format
msgid "Ln: %s Col: %d/%d Ch: %d/%d"
msgstr ""
#. IDS_LINE_STATUS_INFO_SEL
-#: Merge.rc:4384
+#: Merge.rc:4394
#, c-format
msgid " Sel: %d | %d"
msgstr ""
#. IDS_MERGEMODE_MERGING
-#: Merge.rc:4385
+#: Merge.rc:4395
msgid "Merge"
msgstr "מזג"
#. IDS_DIFF_NUMBER_STATUS_FMT
-#: Merge.rc:4386
+#: Merge.rc:4396
#, c-format
msgid "Difference %1 of %2"
msgstr ""
#. IDS_NO_DIFF_SEL_FMT
-#: Merge.rc:4387
+#: Merge.rc:4397
#, c-format
msgid "%1 Differences Found"
msgstr ""
#. IDS_1_DIFF_FOUND
-#: Merge.rc:4388
+#: Merge.rc:4398
msgid "1 Difference Found"
msgstr "נמצא הבדל אחד"
#. IDS_NO_ERR_SEL_FMT
-#: Merge.rc:4389
+#: Merge.rc:4399
#, c-format
msgid "%1 Errors Found"
msgstr ""
#. IDS_1_ERR_FOUND
-#: Merge.rc:4390
+#: Merge.rc:4400
msgid "1 Error Found"
msgstr ""
#. IDS_STATUSBAR_READONLY, Abbreviation from "Read Only"
-#: Merge.rc:4391
+#: Merge.rc:4401
msgid "RO"
msgstr "לקריאה בלבד"
#. IDS_DIRVIEW_STATUS_FMT_FOCUS
-#: Merge.rc:4397
+#: Merge.rc:4407
#, c-format
msgid "Item %1 of %2"
msgstr "פריט %1 מתוך %2"
#. IDS_DIRVIEW_STATUS_FMT_NOFOCUS
-#: Merge.rc:4398
+#: Merge.rc:4408
#, c-format
msgid "Items: %1"
msgstr "פריטים: %1"
#. IDS_DIRVIEW_STATUS_COMPARING
-#: Merge.rc:4399
+#: Merge.rc:4409
msgid "Comparing items..."
msgstr "משווה פריטים..."
#. IDS_ITEMS_PER_SEC
-#: Merge.rc:4400
+#: Merge.rc:4410
#, c-format
msgid "%.1f[items/sec]"
msgstr "%.1f[פריטים/שנייה]"
#. IDS_ERROR_INCOMPARABLE
-#: Merge.rc:4406
+#: Merge.rc:4416
msgid "Select two existing folders/files to compare."
msgstr "בחר שתי תיקיות או קבצים קיימים להשוואה."
#. IDS_DIRSEL_TAG
-#: Merge.rc:4407
+#: Merge.rc:4417
msgid "Folder Selection"
msgstr "בחירת תיקיה"
#. IDS_OPEN_FILESDIRS
-#: Merge.rc:4408
+#: Merge.rc:4418
msgid "Select two (or three) folders/files to compare."
msgstr "בחר שתי (או שלוש) תיקיות או שניים (או שלושה) קבצים להשוואה."
#. IDS_OPEN_LEFTINVALID
-#: Merge.rc:4409
+#: Merge.rc:4419
msgid "Left (1st) path is invalid!"
msgstr "הנתיב השמאלי (1) אינו חוקי!"
#. IDS_OPEN_MIDDLEINVALID
-#: Merge.rc:4410
+#: Merge.rc:4420
msgid "Middle (2nd) path is invalid!"
msgstr "הנתיב האמצעי (2) אינו חוקי!"
#. IDS_OPEN_RIGHTINVALID2
-#: Merge.rc:4411
+#: Merge.rc:4421
msgid "Right (2nd) path is invalid!"
msgstr "הנתיב הימני (2) אינו חוקי!"
#. IDS_OPEN_RIGHTINVALID3
-#: Merge.rc:4412
+#: Merge.rc:4422
msgid "Right (3rd) path is invalid!"
msgstr "הנתיב הימני (3) אינו חוקי!"
#. IDS_OPEN_BOTHINVALID
-#: Merge.rc:4413
+#: Merge.rc:4423
msgid "Both paths are invalid!"
msgstr "שני הנתיבים אינם חוקיים!"
-#: Merge.rc:4415
+#: Merge.rc:4425
msgid "Left (1st) and Middle (2nd) paths are invalid!"
msgstr "הנתיבים השמאלי (1) והאמצעי (2) אינם חוקיים!"
#. IDS_OPEN_LEFTRIGHTINVALID
-#: Merge.rc:4416
+#: Merge.rc:4426
msgid "Left (1st) and Right (3rd) paths are invalid!"
msgstr "הנתיבים השמאלי (1) והימני (3) אינם חוקיים!"
-#: Merge.rc:4418
+#: Merge.rc:4428
msgid "Middle (2nd) and Right (3rd) paths are invalid!"
msgstr "הנתיבים האמצעי (2) והימני (3) אינם חוקיים!"
#. IDS_OPEN_ALLINVALID
-#: Merge.rc:4419
+#: Merge.rc:4429
msgid "All paths are invalid!"
msgstr "כל הנתיבים אינם חוקיים!"
#. IDS_OPEN_UNPACKERDISABLED
-#: Merge.rc:4420
+#: Merge.rc:4430
msgid "Only enabled for file comparisons"
msgstr "מאופשר רק להשוואת קבצים"
#. IDS_OPEN_MISMATCH
-#: Merge.rc:4421
+#: Merge.rc:4431
msgid "Cannot compare file and folder!"
msgstr "לא ניתן להשוות בין קובץ לתיקיה!"
#. IDS_ERROR_FILE_NOT_FOUND
-#: Merge.rc:4427
+#: Merge.rc:4437
#, c-format
msgid "File not found: %1"
msgstr "קובץ לא נמצא: %1"
#. IDS_ERROR_FILE_NOT_UNPACKED
-#: Merge.rc:4428
+#: Merge.rc:4438
#, c-format
msgid "File not unpacked: %1"
msgstr "הקובץ לא נפרס: %1"
#. IDS_ERROR_FILEOPEN
-#: Merge.rc:4429
+#: Merge.rc:4439
#, c-format
msgid ""
"Cannot open file\n"
@@ -5556,12 +5567,12 @@ msgstr ""
"%2"
#. IDS_ERROR_CONF_RESOLVE
-#: Merge.rc:4430
+#: Merge.rc:4440
msgid "Failed to parse conflict file."
msgstr "כשל בניתוח קובץ הסתירה."
#. IDS_NOT_CONFLICT_FILE
-#: Merge.rc:4431
+#: Merge.rc:4441
#, c-format
msgid "The file\n%1\nis not a conflict file."
msgstr ""
@@ -5570,7 +5581,7 @@ msgstr ""
"אינו קובץ סתירה."
#. IDS_COMPARE_LARGE_FILES
-#: Merge.rc:4432
+#: Merge.rc:4442
msgid "Comparing large files requires significant memory.\nShow only comparison results (not file contents)?"
msgstr ""
"אתה עומד להשוות קבצים גדולים מאוד.\n"
@@ -5579,28 +5590,28 @@ msgstr ""
"\n"
#. IDS_SAVE_AS_TITLE
-#: Merge.rc:4438
+#: Merge.rc:4448
msgid "Save As"
msgstr "שמור בשם"
#. IDS_SAVE_FMT
-#: Merge.rc:4439
+#: Merge.rc:4449
#, c-format
msgid "Save changes to %1?"
msgstr "לשמור שינויים ב-%1?"
#. IDS_SAVEREADONLY_FMT
-#: Merge.rc:4440
+#: Merge.rc:4450
#, c-format
msgid "%1 is read-only. Override? Or 'No' to save as new filename?"
msgstr "%1 מסומן כקובץ לקריאה בלבד. האם ברצונך לדרוס את הקובץ? (בחר לא כדי לשמור בשם אחר.)"
#. IDS_ERROR_BACKUP
-#: Merge.rc:4441
+#: Merge.rc:4451
msgid "Error backing up file"
msgstr "שגיאה בגיבוי הקובץ"
-#: Merge.rc:4443
+#: Merge.rc:4453
#, c-format
msgid ""
"Unable to backup original file:\n"
@@ -5614,7 +5625,7 @@ msgstr ""
"להמשיך בכל זאת?"
#. IDS_FILESAVE_FAILED
-#: Merge.rc:4444
+#: Merge.rc:4454
#, c-format
msgid "Saving file failed.\n%1\n%2\n\t- Use different filename (OK)\n\t- Abort (Cancel)?"
msgstr ""
@@ -5625,1057 +5636,1057 @@ msgstr ""
"\t- להשתמש בשם קובץ אחר (לחץ על אישור)\n"
"\t- לבטל את הפעולה (לחץ על ביטול)?"
-#: Merge.rc:4446
+#: Merge.rc:4456
#, c-format
msgid "Plugin '%2' cannot pack changes to left file into '%1'.\n\nOriginal unchanged. Save unpacked version?"
msgstr ""
-#: Merge.rc:4448
+#: Merge.rc:4458
#, c-format
msgid "Plugin '%2' cannot pack changes to middle file into '%1'.\n\nOriginal unchanged. Save unpacked version?"
msgstr ""
-#: Merge.rc:4450
+#: Merge.rc:4460
#, c-format
msgid "Plugin '%2' cannot pack changes to right file into '%1'.\n\nOriginal unchanged. Save unpacked version?"
msgstr ""
#. IDS_FILECHANGED_ONDISK
-#: Merge.rc:4451
+#: Merge.rc:4461
#, c-format
msgid "Another application updated\n%1\nsince WinMerge loaded it.\n\nOverwrite?"
msgstr ""
#. IDS_SAVEREADONLY_MULTI
-#: Merge.rc:4452
+#: Merge.rc:4462
#, c-format
msgid "%1\nis read-only. Override?"
msgstr ""
#. IDS_FILECHANGED_RESCAN
-#: Merge.rc:4453
+#: Merge.rc:4463
#, c-format
msgid "Another application updated\n%1\nsince last scan.\n\nReload?"
msgstr ""
#. IDS_SAVE_LEFT_AS
-#: Merge.rc:4454
+#: Merge.rc:4464
msgid "Save Left File As"
msgstr "שמור קובץ שמאל בשם"
#. IDS_SAVE_MIDDLE_AS
-#: Merge.rc:4455
+#: Merge.rc:4465
msgid "Save Middle File As"
msgstr "שמור קובץ אמצע בשם"
#. IDS_SAVE_RIGHT_AS
-#: Merge.rc:4456
+#: Merge.rc:4466
msgid "Save Right File As"
msgstr "שמור קובץ ימין בשם"
#. IDS_FILE_DISAPPEARED
-#: Merge.rc:4461
+#: Merge.rc:4471
#, c-format
msgid "File\n%1\nnot found. Save a copy to continue."
msgstr ""
#. IDS_VIEWS_OUTOFSYNC
-#: Merge.rc:4467
+#: Merge.rc:4477
msgid "Cannot merge unsynched documents.\n\nRefresh before continuing."
msgstr ""
#. IDS_BREAK_ON_WHITESPACE
-#: Merge.rc:4472
+#: Merge.rc:4482
msgid "Break at whitespace"
msgstr "פיצול ברווחים"
#. IDS_BREAK_ON_PUNCTUATION
-#: Merge.rc:4473
+#: Merge.rc:4483
msgid "Break at whitespace or punctuation"
msgstr "פיצול ברווחים או סימני פיסוק"
#. IDS_L2M
-#: Merge.rc:4479
+#: Merge.rc:4489
msgid "Copy to &Middle\tAlt+Right"
msgstr "העתק לאמצע\tAlt+Right"
#. IDS_R2M
-#: Merge.rc:4480
+#: Merge.rc:4490
msgid "Copy to &Middle\tAlt+Left"
msgstr "העתק לאמצע\tAlt+Left"
#. IDS_COPY_FROM_MIDDLE_R
-#: Merge.rc:4481
+#: Merge.rc:4491
msgid "Copy from Middle\tAlt+Shift+Right"
msgstr "העתק מהאמצע\tAlt+Shift+Right"
#. IDS_COPY_FROM_MIDDLE_L
-#: Merge.rc:4482
+#: Merge.rc:4492
msgid "Copy from Middle\tAlt+Shift+Left"
msgstr "העתק מהאמצע\tAlt+Shift+Left"
#. IDS_L2MNEXT
-#: Merge.rc:4483
+#: Merge.rc:4493
msgid "Copy to Middle and Advance\tCtrl+Alt+Right"
msgstr "העתק לאמצע והתקדם\tCtrl+Alt+Right"
#. IDS_R2MNEXT
-#: Merge.rc:4484
+#: Merge.rc:4494
msgid "Copy to Middle and Advance\tCtrl+Alt+Left"
msgstr "העתק לאמצע והתקדם\tCtrl+Alt+Left"
#. IDS_ALL_MIDDLE
-#: Merge.rc:4485
+#: Merge.rc:4495
msgid "Copy All to Middle"
msgstr "העתק הכל לאמצע"
#. IDS_COPY_RIGHT_TO_LEFT
-#: Merge.rc:4491
+#: Merge.rc:4501
#, c-format
msgid "Right to Left (%1)"
msgstr ""
#. IDS_COPY_RIGHT_TO_MIDDLE
-#: Merge.rc:4492
+#: Merge.rc:4502
#, c-format
msgid "Right to Middle (%1)"
msgstr ""
#. IDS_COPY_MIDDLE_TO_LEFT
-#: Merge.rc:4493
+#: Merge.rc:4503
#, c-format
msgid "Middle to Left (%1)"
msgstr ""
#. IDS_COPY_MIDDLE_TO_RIGHT
-#: Merge.rc:4494
+#: Merge.rc:4504
#, c-format
msgid "Middle to Right (%1)"
msgstr ""
#. IDS_COPY_LEFT_TO_RIGHT
-#: Merge.rc:4495
+#: Merge.rc:4505
#, c-format
msgid "Left to Right (%1)"
msgstr ""
#. IDS_COPY_LEFT_TO_MIDDLE
-#: Merge.rc:4496
+#: Merge.rc:4506
#, c-format
msgid "Left to Middle (%1)"
msgstr ""
#. IDS_MOVE_LEFT_TO
-#: Merge.rc:4507 Merge.rc:4539
+#: Merge.rc:4517 Merge.rc:4549
#, c-format
msgid "Left to... (%1)"
msgstr ""
#. IDS_MOVE_MIDDLE_TO
-#: Merge.rc:4508 Merge.rc:4540
+#: Merge.rc:4518 Merge.rc:4550
#, c-format
msgid "Middle to... (%1)"
msgstr ""
#. IDS_MOVE_RIGHT_TO
-#: Merge.rc:4509 Merge.rc:4541
+#: Merge.rc:4519 Merge.rc:4551
#, c-format
msgid "Right to... (%1)"
msgstr ""
#. IDS_COPY_BOTH_TO
-#: Merge.rc:4510
+#: Merge.rc:4520
#, c-format
msgid "Both to... (%1)"
msgstr ""
#. IDS_COPY_ALL_TO
-#: Merge.rc:4511
+#: Merge.rc:4521
#, c-format
msgid "All to... (%1)"
msgstr ""
#. IDS_COPY_DIFFERENCES_TO
-#: Merge.rc:4512
+#: Merge.rc:4522
#, c-format
msgid "Differences to... (%1)"
msgstr ""
#. IDS_COPY_ONLYDIFFITEMS
-#: Merge.rc:4519
+#: Merge.rc:4529
msgid "Some selected items are identical or skipped.\nCopy only items with differences?"
msgstr ""
#. IDS_DEL_LEFT_FMT
-#: Merge.rc:4525
+#: Merge.rc:4535
#, c-format
msgid "Left (%1)"
msgstr ""
#. IDS_DEL_MIDDLE_FMT
-#: Merge.rc:4526
+#: Merge.rc:4536
#, c-format
msgid "Middle (%1)"
msgstr ""
#. IDS_DEL_RIGHT_FMT
-#: Merge.rc:4527
+#: Merge.rc:4537
#, c-format
msgid "Right (%1)"
msgstr ""
#. IDS_DEL_BOTH_FMT
-#: Merge.rc:4528
+#: Merge.rc:4538
#, c-format
msgid "Both (%1)"
msgstr ""
#. IDS_DEL_ALL_FMT
-#: Merge.rc:4529
+#: Merge.rc:4539
#, c-format
msgid "All (%1)"
msgstr ""
#. IDS_SELECT_DEST_LEFT
-#: Merge.rc:4545
+#: Merge.rc:4555
msgid "Left Side - Select Destination Folder:"
msgstr ""
#. IDS_SELECT_DEST_MIDDLE
-#: Merge.rc:4546
+#: Merge.rc:4556
msgid "Middle Side - Select Destination Folder:"
msgstr ""
#. IDS_SELECT_DEST_RIGHT
-#: Merge.rc:4547
+#: Merge.rc:4557
msgid "Right Side - Select Destination Folder:"
msgstr ""
#. IDS_FILES_AFFECTED_FMT
-#: Merge.rc:4548
+#: Merge.rc:4558
#, c-format
msgid "(%1 Files Affected)"
msgstr ""
#. IDS_FILES_AFFECTED_FMT2
-#: Merge.rc:4549
+#: Merge.rc:4559
#, c-format
msgid "(%1 of %2 Files Affected)"
msgstr ""
#. IDS_CONFIRM_DELETE_SINGLE
-#: Merge.rc:4555
+#: Merge.rc:4565
#, c-format
msgid "Are you sure you want to delete\n\n%1 ?"
msgstr ""
#. IDS_CONFIRM_SINGLE_COPY
-#: Merge.rc:4556
+#: Merge.rc:4566
msgid "Are you sure you want to copy?"
msgstr "האם אתה בטוח שברצונך להעתיק?"
#. IDS_CONFIRM_MULTIPLE_COPY
-#: Merge.rc:4557
+#: Merge.rc:4567
#, c-format
msgid "Are you sure you want to copy %d items?"
msgstr "האם אתה בטוח שברצונך להעתיק %d פריטים?"
#. IDS_DIRCMP_NOTSYNC
-#: Merge.rc:4558
+#: Merge.rc:4568
#, c-format
msgid "Operation aborted!\n\nFolder contents changed, path\n%1\nnot found.\n\nRefresh the compare."
msgstr ""
#. IDS_CONFIRM_SINGLE_MOVE
-#: Merge.rc:4563
+#: Merge.rc:4573
msgid "Are you sure you want to move?"
msgstr ""
#. IDS_CONFIRM_MULTIPLE_MOVE
-#: Merge.rc:4564
+#: Merge.rc:4574
#, c-format
msgid "Are you sure you want to move %d items?"
msgstr ""
#. IDS_CONFIRM_MOVE_CAPTION
-#: Merge.rc:4566
+#: Merge.rc:4576
msgid "Confirm Move"
msgstr "אישור העברה"
-#: Merge.rc:4568
+#: Merge.rc:4578
msgid "Close the folder comparison window?"
msgstr ""
-#: Merge.rc:4570
+#: Merge.rc:4580
msgid "Close the folder comparison window, which took a long time?"
msgstr ""
#. IDS_ERROR_INVALID_DIR_FILE_NAME
-#: Merge.rc:4571
+#: Merge.rc:4581
msgid "The file or folder name is invalid."
msgstr "שם הקובץ או התיקיה אינו חוקי."
#. IDS_ERROR_EXECUTE_FILE
-#: Merge.rc:4577
+#: Merge.rc:4587
#, c-format
msgid "Failed to execute external editor: %1"
msgstr ""
#. IDS_UNKNOWN_ARCHIVE_FORMAT
-#: Merge.rc:4583
+#: Merge.rc:4593
msgid "Unknown archive format"
msgstr "פורמט ארכיון לא ידוע"
-#: Merge.rc:4585
+#: Merge.rc:4595
msgid "Failed to extract archive.\nCompare as text file?"
msgstr ""
#. IDS_COLHDR_FILENAME
-#: Merge.rc:4591
+#: Merge.rc:4601
msgid "Filename"
msgstr "שם קובץ"
#. IDS_COLHDR_DIR
-#: Merge.rc:4592
+#: Merge.rc:4602
msgctxt "DirView|ColumnHeader"
msgid "Folder"
msgstr "תיקיה"
#. IDS_COLHDR_RESULT
-#: Merge.rc:4593
+#: Merge.rc:4603
msgid "Comparison Result"
msgstr "תוצאת השוואה"
#. IDS_COLHDR_LTIMEM
-#: Merge.rc:4594
+#: Merge.rc:4604
msgid "Left Date"
msgstr "תאריך שמאל"
#. IDS_COLHDR_RTIMEM
-#: Merge.rc:4595
+#: Merge.rc:4605
msgid "Right Date"
msgstr "תאריך ימין"
#. IDS_COLHDR_MTIMEM
-#: Merge.rc:4596
+#: Merge.rc:4606
msgid "Middle Date"
msgstr "תאריך אמצע"
#. IDS_COLHDR_LSIZE
-#: Merge.rc:4598
+#: Merge.rc:4608
msgid "Left Size"
msgstr "גודל שמאל"
#. IDS_COLHDR_RSIZE
-#: Merge.rc:4599
+#: Merge.rc:4609
msgid "Right Size"
msgstr "גודל ימין"
#. IDS_COLHDR_MSIZE
-#: Merge.rc:4604
+#: Merge.rc:4614
msgid "Middle Size"
msgstr "גודל אמצע"
#. IDS_COLHDR_RSIZE_SHORT
-#: Merge.rc:4605
+#: Merge.rc:4615
msgid "Right Size (Short)"
msgstr "גודל ימין (מקוצר)"
#. IDS_COLHDR_LSIZE_SHORT
-#: Merge.rc:4606
+#: Merge.rc:4616
msgid "Left Size (Short)"
msgstr "גודל שמאל (מקוצר)"
#. IDS_COLHDR_MSIZE_SHORT
-#: Merge.rc:4607
+#: Merge.rc:4617
msgid "Middle Size (Short)"
msgstr "גודל אמצע (מקוצר)"
#. IDS_COLHDR_LTIMEC
-#: Merge.rc:4613
+#: Merge.rc:4623
msgid "Left Creation Time"
msgstr "זמן יצירה שמאל"
#. IDS_COLHDR_RTIMEC
-#: Merge.rc:4614
+#: Merge.rc:4624
msgid "Right Creation Time"
msgstr "זמן יצירה ימין"
#. IDS_COLHDR_MTIMEC
-#: Merge.rc:4615
+#: Merge.rc:4625
msgid "Middle Creation Time"
msgstr "זמן יצירה אמצע"
#. IDS_COLHDR_NEWER
-#: Merge.rc:4616
+#: Merge.rc:4626
msgid "Newer File"
msgstr "קובץ חדש יותר"
#. IDS_COLHDR_LVERSION
-#: Merge.rc:4617
+#: Merge.rc:4627
msgid "Left File Version"
msgstr "גרסת קובץ שמאל"
#. IDS_COLHDR_RVERSION
-#: Merge.rc:4618
+#: Merge.rc:4628
msgid "Right File Version"
msgstr "גרסת קובץ ימין"
#. IDS_COLHDR_MVERSION
-#: Merge.rc:4619
+#: Merge.rc:4629
msgid "Middle File Version"
msgstr "גרסת קובץ אמצע"
#. IDS_COLHDR_RESULT_ABBR
-#: Merge.rc:4620
+#: Merge.rc:4630
msgid "Short Result"
msgstr "תוצאה מקוצרת"
#. IDS_COLHDR_LATTRIBUTES
-#: Merge.rc:4621
+#: Merge.rc:4631
msgid "Left Attributes"
msgstr "מאפייני שמאל"
#. IDS_COLHDR_RATTRIBUTES
-#: Merge.rc:4622
+#: Merge.rc:4632
msgid "Right Attributes"
msgstr "מאפייני ימין"
#. IDS_COLHDR_MATTRIBUTES
-#: Merge.rc:4623
+#: Merge.rc:4633
msgid "Middle Attributes"
msgstr "מאפייני אמצע"
#. IDS_COLHDR_LEOL_TYPE
-#: Merge.rc:4628
+#: Merge.rc:4638
msgid "Left EOL"
msgstr "סוף שורה שמאל"
#. IDS_COLHDR_MEOL_TYPE
-#: Merge.rc:4629
+#: Merge.rc:4639
msgid "Middle EOL"
msgstr "סוף שורה אמצע"
#. IDS_COLHDR_REOL_TYPE
-#: Merge.rc:4630
+#: Merge.rc:4640
msgid "Right EOL"
msgstr "סוף שורה ימין"
#. IDS_COLHDR_LENCODING
-#: Merge.rc:4636
+#: Merge.rc:4646
msgid "Left Encoding"
msgstr "קידוד שמאל"
#. IDS_COLHDR_RENCODING
-#: Merge.rc:4637
+#: Merge.rc:4647
msgid "Right Encoding"
msgstr "קידוד ימין"
#. IDS_COLHDR_MENCODING
-#: Merge.rc:4638
+#: Merge.rc:4648
msgid "Middle Encoding"
msgstr "קידוד אמצע"
#. IDS_COLHDR_NIDIFFS
-#: Merge.rc:4639
+#: Merge.rc:4649
msgid "Ignored Diff"
msgstr "הבדל שהתעלמו ממנו"
#. IDS_COLHDR_BINARY
-#: Merge.rc:4641
+#: Merge.rc:4651
msgctxt "DirView|ColumnHeader"
msgid "Binary"
msgstr "בינארי"
#. IDS_PLUGINS_TYPE_UNPACKER
-#: Merge.rc:4642 Merge.rc:4959
+#: Merge.rc:4652 Merge.rc:4969
msgid "Unpacker"
msgstr "מחלץ"
#. IDS_PLUGIN_TYPE4
-#: Merge.rc:4643 Merge.rc:4960 Merge.rc:5267
+#: Merge.rc:4653 Merge.rc:4970 Merge.rc:5277
msgid "Prediffer"
msgstr "השוואה מוקדמת"
#. IDS_COLHDR_LEFT
-#: Merge.rc:4644
+#: Merge.rc:4654
msgid "Left"
msgstr "שמאל"
#. IDS_COLHDR_MIDDLE
-#: Merge.rc:4645
+#: Merge.rc:4655
msgid "Middle"
msgstr "אמצע"
#. IDS_COLHDR_RIGHT
-#: Merge.rc:4646
+#: Merge.rc:4656
msgid "Right"
msgstr "ימין"
#. IDS_COLHDR_DIFF
-#: Merge.rc:4647
+#: Merge.rc:4657
msgid "Diff"
msgstr "הבדל"
#. IDS_COLHDR_LEFT_DUPLICATE
-#: Merge.rc:4648
+#: Merge.rc:4658
msgid "Left Duplicate Count"
msgstr "מספר כפילויות שמאל"
#. IDS_COLHDR_RIGHT_DUPLICATE
-#: Merge.rc:4649
+#: Merge.rc:4659
msgid "Right Duplicate Count"
msgstr "מספר כפילויות ימין"
#. IDS_COLHDR_MIDDLE_DUPLICATE
-#: Merge.rc:4650
+#: Merge.rc:4660
msgid "Middle Duplicate Count"
msgstr "מספר כפילויות אמצע"
#. IDS_COLHDR_MOVE
-#: Merge.rc:4651
+#: Merge.rc:4661
msgid "Move"
msgstr "העבר"
#. IDS_PRPCAT_AUDIO
-#: Merge.rc:4658
+#: Merge.rc:4668
msgid "Audio"
msgstr "שמע"
#. IDS_PRPCAT_CALENDAR
-#: Merge.rc:4659
+#: Merge.rc:4669
msgid "Calendar"
msgstr "לוח שנה"
#. IDS_PRPCAT_COMMUNICATION
-#: Merge.rc:4660
+#: Merge.rc:4670
msgid "Communication"
msgstr "תקשורת"
#. IDS_PRPCAT_CONTACT
-#: Merge.rc:4661
+#: Merge.rc:4671
msgid "Contact"
msgstr "איש קשר"
#. IDS_PRPCAT_DEVICES
-#: Merge.rc:4662
+#: Merge.rc:4672
msgid "Devices"
msgstr "התקנים"
#. IDS_PRPCAT_DOCUMENT
-#: Merge.rc:4663
+#: Merge.rc:4673
msgid "Document"
msgstr "מסמך"
#. IDS_PRPCAT_HOME
-#: Merge.rc:4664
+#: Merge.rc:4674
msgid "Home"
msgstr "בית"
#. IDS_PRPCAT_JOURNAL
-#: Merge.rc:4666
+#: Merge.rc:4676
msgid "Journal"
msgstr "יומן"
#. IDS_PRPCAT_LINK
-#: Merge.rc:4667
+#: Merge.rc:4677
msgid "Link"
msgstr "קישור"
#. IDS_PRPCAT_MEDIA
-#: Merge.rc:4668
+#: Merge.rc:4678
msgid "Media"
msgstr "מדיה"
#. IDS_PRPCAT_MUSIC
-#: Merge.rc:4670
+#: Merge.rc:4680
msgid "Music"
msgstr "מוזיקה"
#. IDS_PRPCAT_NOTE
-#: Merge.rc:4671
+#: Merge.rc:4681
msgid "Note"
msgstr "פתק"
#. IDS_PRPCAT_PHOTO
-#: Merge.rc:4672
+#: Merge.rc:4682
msgid "Photo"
msgstr "תמונה"
#. IDS_PRPCAT_RECORDEDTV
-#: Merge.rc:4673
+#: Merge.rc:4683
msgid "RecordedTV"
msgstr "טלוויזיה מוקלטת"
#. IDS_PRPCAT_SEARCH
-#: Merge.rc:4674
+#: Merge.rc:4684
msgid "Search"
msgstr "חיפוש"
#. IDS_PRPCAT_SECURITY
-#: Merge.rc:4675
+#: Merge.rc:4685
msgid "Security"
msgstr "אבטחה"
#. IDS_PRPCAT_SOFTWARE
-#: Merge.rc:4676
+#: Merge.rc:4686
msgid "Software"
msgstr "תוכנה"
#. IDS_PRPCAT_TASK
-#: Merge.rc:4677
+#: Merge.rc:4687
msgid "Task"
msgstr "משימה"
#. IDS_PRPCAT_VIDEO
-#: Merge.rc:4678
+#: Merge.rc:4688
msgid "Video"
msgstr "וידאו"
#. IDS_PRPCAT_HASH
-#: Merge.rc:4679
+#: Merge.rc:4689
msgid "Hash"
msgstr "גיבוב"
#. IDS_CANT_COMPARE_FILES
-#: Merge.rc:4685
+#: Merge.rc:4695
msgid "Unable to compare files"
msgstr "לא ניתן להשוות קבצים"
#. IDS_ABORTED_ITEM
-#: Merge.rc:4686
+#: Merge.rc:4696
msgid "Item aborted"
msgstr "הפריט בוטל"
#. IDS_FILE_SKIPPED
-#: Merge.rc:4687
+#: Merge.rc:4697
msgid "File skipped"
msgstr "הקובץ דולג"
#. IDS_DIR_SKIPPED
-#: Merge.rc:4688
+#: Merge.rc:4698
msgid "Folder skipped"
msgstr "התיקיה דולגה"
#. IDS_LEFT_ONLY_IN_FMT
-#: Merge.rc:4689
+#: Merge.rc:4699
#, c-format
msgid "Left only: %1"
msgstr "רק בשמאל: %1"
#. IDS_MIDDLE_ONLY_IN_FMT
-#: Merge.rc:4690
+#: Merge.rc:4700
#, c-format
msgid "Middle only: %1"
msgstr "רק באמצע: %1"
#. IDS_RIGHT_ONLY_IN_FMT
-#: Merge.rc:4691
+#: Merge.rc:4701
#, c-format
msgid "Right only: %1"
msgstr "רק בימין: %1"
#. IDS_DOES_NOT_EXIST_IN_FMT
-#: Merge.rc:4692
+#: Merge.rc:4702
#, c-format
msgid "Does not exist in %1"
msgstr "לא קיים ב-%1"
#. IDS_BIN_FILES_SAME
-#: Merge.rc:4693
+#: Merge.rc:4703
msgid "Binary files are identical"
msgstr "קבצים בינאריים זהים"
#. IDS_BIN_FILES_DIFF
-#: Merge.rc:4699
+#: Merge.rc:4709
msgid "Binary files are different"
msgstr "קבצים בינאריים שונים"
#. IDS_FILES_ARE_DIFFERENT
-#: Merge.rc:4700
+#: Merge.rc:4710
msgid "Files are different"
msgstr "קבצים שונים"
#. IDS_FOLDERS_ARE_DIFFERENT
-#: Merge.rc:4701
+#: Merge.rc:4711
msgid "Folders are different"
msgstr "תיקיות שונות"
#. IDS_LEFTONLY
-#: Merge.rc:4702
+#: Merge.rc:4712
msgid "Left Only"
msgstr "רק בשמאל"
#. IDS_RIGHTONLY
-#: Merge.rc:4703
+#: Merge.rc:4713
msgid "Right Only"
msgstr "רק בימין"
#. IDS_MIDDLEONLY
-#: Merge.rc:4704
+#: Merge.rc:4714
msgid "Middle Only"
msgstr "רק באמצע"
#. IDS_NOITEMLEFT
-#: Merge.rc:4705
+#: Merge.rc:4715
msgid "No item in left"
msgstr "אין פריט בשמאל"
#. IDS_NOITEMRIGHT
-#: Merge.rc:4706
+#: Merge.rc:4716
msgid "No item in right"
msgstr "אין פריט בימין"
#. IDS_NOITEMMIDDLE
-#: Merge.rc:4707
+#: Merge.rc:4717
msgid "No item in middle"
msgstr "אין פריט באמצע"
#. IDS_CMPRES_ERROR
-#: Merge.rc:4709
+#: Merge.rc:4719
msgid "Error"
msgstr "שגיאה"
#. IDS_TEXT_FILES_SAME
-#: Merge.rc:4710
+#: Merge.rc:4720
msgid "Text files are identical"
msgstr "קבצי טקסט זהים"
#. IDS_LEFTONLY_DIFF
-#: Merge.rc:4711
+#: Merge.rc:4721
msgid " (Middle and right are identical)"
msgstr ""
#. IDS_MIDDLEONLY_DIFF
-#: Merge.rc:4712
+#: Merge.rc:4722
msgid " (Left and right are identical)"
msgstr ""
#. IDS_RIGHTONLY_DIFF
-#: Merge.rc:4713
+#: Merge.rc:4723
msgid " (Left and middle are identical)"
msgstr ""
#. IDS_PATH_MISMATCH
-#: Merge.rc:4714
+#: Merge.rc:4724
msgid " (paths differ)"
msgstr ""
#. IDS_TEXT_FILES_DIFF
-#: Merge.rc:4715
+#: Merge.rc:4725
msgid "Text files are different"
msgstr "קבצי טקסט שונים"
#. IDS_IMAGE_FILES_SAME
-#: Merge.rc:4716
+#: Merge.rc:4726
msgid "Image files are identical"
msgstr "קבצי תמונה זהים"
#. IDS_IMAGE_FILES_DIFF
-#: Merge.rc:4717
+#: Merge.rc:4727
msgid "Image files are different"
msgstr "קבצי תמונה שונים"
#. IDS_EXPR_DIFF
-#: Merge.rc:4718
+#: Merge.rc:4728
#, c-format
msgid "Files are different (expr: %1)"
msgstr ""
#. IDS_HASH_GROUP
-#: Merge.rc:4719
+#: Merge.rc:4729
#, c-format
msgid "Group%d"
msgstr "קבוצה %d"
#. IDS_RENAME_MOVE_DETECTION_DISALBED
-#: Merge.rc:4720
+#: Merge.rc:4730
msgctxt "Options dialog|Compare|Folder|Detect renames and moves"
msgid "Disabled"
msgstr ""
#. IDS_RENAME_MOVE_DETECTION_RENAME
-#: Merge.rc:4721
+#: Merge.rc:4731
msgid "Detect renames"
msgstr ""
#. IDS_RENAME_MOVE_DETECTION_RENAME_MOVE
-#: Merge.rc:4722
+#: Merge.rc:4732
msgid "Detect renames and moves"
msgstr ""
#. IDS_RENAME_MOVE_MERGE_MODE_RENAME
-#: Merge.rc:4723
+#: Merge.rc:4733
msgid "Merge renames"
msgstr ""
#. IDS_RENAME_MOVE_MERGE_MODE_RENAME_MOVE
-#: Merge.rc:4724
+#: Merge.rc:4734
msgid "Merge renames and moves"
msgstr ""
#. IDS_RENAMED
-#: Merge.rc:4725
+#: Merge.rc:4735
msgid "Renamed"
msgstr ""
#. IDS_MOVED
-#: Merge.rc:4726
+#: Merge.rc:4736
msgid "Moved"
msgstr ""
#. IDS_RENAMED_MOVED
-#: Merge.rc:4727
+#: Merge.rc:4737
msgid "Renamed/Moved"
msgstr ""
#. IDS_RENAMED_MOVED_ITEMS
-#: Merge.rc:4728
+#: Merge.rc:4738
#, c-format
msgid "(%1 items)"
msgstr ""
#. IDS_RENAMED_MOVED_RESULT
-#: Merge.rc:4729
+#: Merge.rc:4739
#, c-format
msgid "%1 (set %2): "
msgstr ""
#. IDS_SWITCH_FLAT_MODE
-#: Merge.rc:4730
+#: Merge.rc:4740
msgid "Some moved items have been merged.\nIn Tree Mode, these items may appear in positions that do not reflect the actual folder structure, which can be confusing.\nSwitch to Flat Mode?"
msgstr ""
#. IDS_ELAPSED_TIME
-#: Merge.rc:4736
+#: Merge.rc:4746
#, c-format
msgid "Elapsed time: %ld ms"
msgstr "זמן שחלף: %ld מילישניות"
#. IDS_STATUS_SELITEM1
-#: Merge.rc:4737
+#: Merge.rc:4747
msgid "1 item selected"
msgstr "פריט אחד נבחר"
#. IDS_STATUS_SELITEMS
-#: Merge.rc:4738
+#: Merge.rc:4748
#, c-format
msgid "%1 items selected"
msgstr "%1 פריטים נבחרו"
#. IDS_COLDESC_FILENAME
-#: Merge.rc:4744
+#: Merge.rc:4754
msgid "Filename or folder name."
msgstr "שם קובץ או תיקיה."
#. IDS_COLDESC_DIR
-#: Merge.rc:4745
+#: Merge.rc:4755
msgid "Subfolder name when subfolders are included."
msgstr "שם תיקיית משנה כאשר תיקיות משנה כלולות."
#. IDS_COLDESC_RESULT
-#: Merge.rc:4746
+#: Merge.rc:4756
msgid "Comparison result, long form."
msgstr "תוצאת השוואה, תצורה מלאה."
#. IDS_COLDESC_LTIMEM
-#: Merge.rc:4751
+#: Merge.rc:4761
msgid "Left side modification date."
msgstr "תאריך שינוי צד שמאל."
#. IDS_COLDESC_RTIMEM
-#: Merge.rc:4752
+#: Merge.rc:4762
msgid "Right side modification date."
msgstr "תאריך שינוי צד ימין."
#. IDS_COLDESC_MTIMEM
-#: Merge.rc:4753
+#: Merge.rc:4763
msgid "Middle side modification date."
msgstr "תאריך שינוי צד אמצע."
#. IDS_COLDESC_EXTENSION
-#: Merge.rc:4754
+#: Merge.rc:4764
msgid "File's extension."
msgstr "סיומת קובץ."
#. IDS_COLDESC_LSIZE
-#: Merge.rc:4755
+#: Merge.rc:4765
msgid "Left file size in bytes."
msgstr "גודל קובץ שמאל בבייטים."
#. IDS_COLDESC_RSIZE
-#: Merge.rc:4756
+#: Merge.rc:4766
msgid "Right file size in bytes."
msgstr "גודל קובץ ימין בבייטים."
#. IDS_COLDESC_MSIZE
-#: Merge.rc:4757
+#: Merge.rc:4767
msgid "Middle file size in bytes."
msgstr "גודל קובץ אמצע בבייטים."
#. IDS_COLDESC_LSIZE_SHORT
-#: Merge.rc:4758
+#: Merge.rc:4768
msgid "Left file size abbreviated."
msgstr "גודל קובץ שמאל (מקוצר)."
#. IDS_COLDESC_RSIZE_SHORT
-#: Merge.rc:4759
+#: Merge.rc:4769
msgid "Right file size abbreviated."
msgstr "גודל קובץ ימין (מקוצר)."
#. IDS_COLDESC_MSIZE_SHORT
-#: Merge.rc:4760
+#: Merge.rc:4770
msgid "Middle file size abbreviated."
msgstr "גודל קובץ אמצע (מקוצר)."
#. IDS_COLDESC_LTIMEC
-#: Merge.rc:4766
+#: Merge.rc:4776
msgid "Left side creation time."
msgstr "זמן יצירה צד שמאל."
#. IDS_COLDESC_RTIMEC
-#: Merge.rc:4767
+#: Merge.rc:4777
msgid "Right side creation time."
msgstr "זמן יצירה צד ימין."
#. IDS_COLDESC_MTIMEC
-#: Merge.rc:4768
+#: Merge.rc:4778
msgid "Middle side creation time."
msgstr "זמן יצירה צד אמצע."
#. IDS_COLDESC_NEWER
-#: Merge.rc:4769
+#: Merge.rc:4779
msgid "Tells which side has newer modification date."
msgstr "מציין איזה צד בעל תאריך שינוי חדש יותר."
#. IDS_COLDESC_LVERSION
-#: Merge.rc:4770
+#: Merge.rc:4780
msgid "Left side file version, only for some file types."
msgstr ""
#. IDS_COLDESC_RVERSION
-#: Merge.rc:4771
+#: Merge.rc:4781
msgid "Right side file version, only for some file types."
msgstr ""
#. IDS_COLDESC_MVERSION
-#: Merge.rc:4776
+#: Merge.rc:4786
msgid "Middle side file version, only for some file types."
msgstr ""
#. IDS_COLDESC_RESULT_ABBR
-#: Merge.rc:4777
+#: Merge.rc:4787
msgid "Short comparison result."
msgstr "תוצאת השוואה מקוצרת."
#. IDS_COLDESC_LATTRIBUTES
-#: Merge.rc:4778
+#: Merge.rc:4788
msgid "Left side attributes."
msgstr "מאפייני צד שמאל."
#. IDS_COLDESC_RATTRIBUTES
-#: Merge.rc:4779
+#: Merge.rc:4789
msgid "Right side attributes."
msgstr "מאפייני צד ימין."
#. IDS_COLDESC_MATTRIBUTES
-#: Merge.rc:4780
+#: Merge.rc:4790
msgid "Middle side attributes."
msgstr "מאפייני צד אמצע."
#. IDS_COLDESC_LEOL_TYPE
-#: Merge.rc:4781
+#: Merge.rc:4791
msgid "Left side file EOL type."
msgstr "סוג סוף שורה של קובץ בצד שמאל."
#. IDS_COLDESC_REOL_TYPE
-#: Merge.rc:4782
+#: Merge.rc:4792
msgid "Right side file EOL type."
msgstr "סוג סוף שורה של קובץ בצד ימין."
#. IDS_COLDESC_MEOL_TYPE
-#: Merge.rc:4783
+#: Merge.rc:4793
msgid "Middle side file EOL type."
msgstr "סוג סוף שורה של קובץ בצד אמצע."
#. IDS_COLDESC_LENCODING
-#: Merge.rc:4789
+#: Merge.rc:4799
msgid "Left side encoding."
msgstr "קידוד צד שמאל."
#. IDS_COLDESC_RENCODING
-#: Merge.rc:4790
+#: Merge.rc:4800
msgid "Right side encoding."
msgstr "קידוד צד ימין."
#. IDS_COLDESC_MENCODING
-#: Merge.rc:4791
+#: Merge.rc:4801
msgid "Middle side encoding."
msgstr "קידוד צד אמצע."
#. IDS_COLDESC_NIDIFFS
-#: Merge.rc:4792
+#: Merge.rc:4802
msgid "Number of ignored differences in file. Ignored and cannot be merged."
msgstr "מספר ההבדלים שהתעלמו מהם בקובץ. הבדלים אלו מתעלמים על ידי WinMerge ולא ניתן למזג אותם."
#. IDS_COLDESC_NSDIFFS
-#: Merge.rc:4793
+#: Merge.rc:4803
msgid "Number of differences in file (excluding ignored)."
msgstr "מספר ההבדלים בקובץ. מספר זה אינו כולל הבדלים שהתעלמו מהם."
#. IDS_COLDESC_BINARY
-#: Merge.rc:4794
+#: Merge.rc:4804
msgid "Shows an asterisk (*) if the file is binary."
msgstr "מציג כוכבית (*) אם הקובץ בינארי."
#. IDS_COLDESC_UNPACKER
-#: Merge.rc:4795
+#: Merge.rc:4805
msgid "Unpacker plugin name or pipeline."
msgstr "שם תוסף מחלץ או צינור עיבוד."
#. IDS_COLDESC_PREDIFFER
-#: Merge.rc:4796
+#: Merge.rc:4806
msgid "Prediffer plugin name or pipeline."
msgstr "שם תוסף השוואה מוקדמת או צינור עיבוד."
#. IDS_DIRECTORY_REPORT_TITLE
-#: Merge.rc:4802
+#: Merge.rc:4812
#, c-format
msgid "Compare %1 with %2"
msgstr "השווה %1 עם %2"
#. IDS_DIRECTORY_REPORT_TITLE3
-#: Merge.rc:4803
+#: Merge.rc:4813
#, c-format
msgid "Compare %1 with %2 and %3"
msgstr "השווה %1 עם %2 ו-%3"
#. IDS_REPORT_COMMALIST
-#: Merge.rc:4804
+#: Merge.rc:4814
msgid "Comma-separated list"
msgstr "רשימה מופרדת בפסיקים"
#. IDS_REPORT_TABLIST
-#: Merge.rc:4805
+#: Merge.rc:4815
msgid "Tab-separated list"
msgstr "רשימה מופרדת בטאבים"
#. IDS_REPORT_SIMPLEHTML
-#: Merge.rc:4806
+#: Merge.rc:4816
msgid "Simple HTML"
msgstr "HTML פשוט"
#. IDS_REPORT_SIMPLEXML
-#: Merge.rc:4807
+#: Merge.rc:4817
msgid "Simple XML"
msgstr "XML פשוט"
-#: Merge.rc:4809
+#: Merge.rc:4819
msgid "Report file already exists. Overwrite?"
msgstr "קובץ הדוח כבר קיים. האם ברצונך להחליף את הקובץ הקיים?"
#. IDS_REPORT_ERROR
-#: Merge.rc:4814
+#: Merge.rc:4824
#, c-format
msgid ""
"Error creating the report:\n"
@@ -6685,259 +6696,259 @@ msgstr ""
"%1"
#. IDS_REPORT_SUCCESS
-#: Merge.rc:4815
+#: Merge.rc:4825
msgid "Report created successfully."
msgstr "הדוח נוצר בהצלחה."
#. IDS_SYNCPOINT_LASTBLOCK
-#: Merge.rc:4821
+#: Merge.rc:4831
msgid "Cannot add a synchronization point at this line."
msgstr "לא ניתן להוסיף נקודת סנכרון בשורה זו."
#. IDS_FILE_TO_ITSELF
-#: Merge.rc:4827
+#: Merge.rc:4837
msgid "Same file is opened in both panes."
msgstr "אותו קובץ פתוח בשתי החלוניות."
#. IDS_FILESSAME
-#: Merge.rc:4828
+#: Merge.rc:4838
msgid "Selected files are identical."
msgstr "הקבצים שנבחרו זהים."
#. IDS_FILESSAME_CURCFG
-#: Merge.rc:4829
+#: Merge.rc:4839
msgid "Selected files are identical (with current settings).\r\nChecking binary identity..."
msgstr ""
#. IDS_FILESSAME_BINERROR
-#: Merge.rc:4830
+#: Merge.rc:4840
msgid "Selected files are identical (with current settings).\r\nBut binary comparison failed."
msgstr ""
#. IDS_FILESSAME_BINSAME
-#: Merge.rc:4831
+#: Merge.rc:4841
msgid "Selected files are identical (binary match)."
msgstr ""
#. IDS_FILESSAME_BINDIFF
-#: Merge.rc:4832
+#: Merge.rc:4842
msgid "Selected files are identical (with current settings).\r\nBut differ at the binary level."
msgstr ""
#. IDS_FILEERROR
-#: Merge.rc:4833
+#: Merge.rc:4843
msgid "An error occurred while comparing files."
msgstr "אירעה שגיאה בעת השוואת הקבצים."
#. IDS_TEMP_FILEERROR
-#: Merge.rc:4834
+#: Merge.rc:4844
msgid "Could not create temporary files. Check your temporary path settings."
msgstr "לא ניתן ליצור קבצים זמניים. בדוק את הגדרות נתיב הקבצים הזמניים שלך."
#. IDS_SUGGEST_IGNOREEOL
-#: Merge.rc:4835
+#: Merge.rc:4845
msgid "Files use different EOL.\n\nTreat all EOL as equivalent?\n\nSet 'Ignore EOL differences (Windows/Unix/Mac)' in Compare section of Options."
msgstr ""
#. IDS_INVALID_DIRECTORY
-#: Merge.rc:4836
+#: Merge.rc:4846
msgid "Selected folder is invalid."
msgstr "התיקיה שנבחרה אינה חוקית."
#. IDS_CANNOT_OPEN_BINARYFILE
-#: Merge.rc:4837
+#: Merge.rc:4847
msgid "Cannot open a binary file in Editor."
msgstr "לא ניתן לפתוח קובץ בינארי בעורך."
#. IDS_CREATE_PAIR_FOLDER
-#: Merge.rc:4838
+#: Merge.rc:4848
#, c-format
msgid "Create matching folder:\n%1\non the other side and open?"
msgstr ""
#. IDS_CONFIRM_COPY_ALL_DIFFS
-#: Merge.rc:4839
+#: Merge.rc:4849
msgid "Copy all differences to other file?"
msgstr "האם אתה בטוח שברצונך להעתיק את כל ההבדלים לקובץ השני?"
#. IDS_MOVE_TO_NEXTFILE
-#: Merge.rc:4844
+#: Merge.rc:4854
msgid "Move to next file?"
msgstr "האם לעבור לקובץ הבא?"
#. IDS_MOVE_TO_PREVFILE
-#: Merge.rc:4845
+#: Merge.rc:4855
msgid "Move to previous file?"
msgstr "האם לעבור לקובץ הקודם?"
#. IDS_MOVE_TO_NEXTPAGE
-#: Merge.rc:4846
+#: Merge.rc:4856
msgid "Move to next page?"
msgstr "האם לעבור לעמוד הבא?"
#. IDS_MOVE_TO_PREVPAGE
-#: Merge.rc:4847
+#: Merge.rc:4857
msgid "Move to previous page?"
msgstr "האם לעבור לעמוד הקודם?"
#. IDS_MOVE_TO_FIRSTFILE
-#: Merge.rc:4848
+#: Merge.rc:4858
msgid "Move to first file?"
msgstr "האם לעבור לקובץ הראשון?"
#. IDS_MOVE_TO_LASTFILE
-#: Merge.rc:4849
+#: Merge.rc:4859
msgid "Move to last file?"
msgstr "האם לעבור לקובץ האחרון?"
-#: Merge.rc:4856
+#: Merge.rc:4866
#, c-format
msgid "Different codepages: left (cp%d), right (cp%d).\nDisplay in codepage (better display) or default Windows codepage (safer merging)?\n(Recommended: default Windows codepage)"
msgstr ""
-#: Merge.rc:4858
+#: Merge.rc:4868
msgid "Information lost due to encoding errors: both files"
msgstr ""
-#: Merge.rc:4860
+#: Merge.rc:4870
msgid "Information lost due to encoding errors: first file"
msgstr ""
-#: Merge.rc:4862
+#: Merge.rc:4872
msgid "Information lost due to encoding errors: second file"
msgstr ""
-#: Merge.rc:4864
+#: Merge.rc:4874
msgid "Information lost due to encoding errors: third file"
msgstr ""
#. IDS_LINEDIFF_NODIFF
-#: Merge.rc:4870
+#: Merge.rc:4880
msgid "No difference"
msgstr "אין הבדל"
#. IDS_LINEDIFF_NODIFF_CAPTION
-#: Merge.rc:4871
+#: Merge.rc:4881
msgid "Line difference"
msgstr "הבדל בשורה"
#. IDS_NUM_REPLACED
-#: Merge.rc:4877
+#: Merge.rc:4887
#, c-format
msgid "Replaced %1 string(s)."
msgstr "הוחלפו %1 מחרוזות."
#. IDS_EDIT_TEXT_NOT_FOUND
-#: Merge.rc:4878
+#: Merge.rc:4888
#, c-format
msgid "Cannot find string \"%s\"."
msgstr "לא ניתן למצוא את המחרוזת \"%s\"."
#. IDS_MERGE_MODE
-#: Merge.rc:4884
+#: Merge.rc:4894
msgid "Entering Merge Mode. Press F9 to turn off."
msgstr "אתה נכנס כעת למצב מיזוג. כדי לכבות את מצב המיזוג, לחץ על מקש F9."
#. IDS_AUTO_MERGE
-#: Merge.rc:4890
+#: Merge.rc:4900
#, c-format
msgid "Automatic merges: %1\nUnresolved conflicts: %2"
msgstr ""
#. IDS_CODEPAGE_MERGED
-#: Merge.rc:4891
+#: Merge.rc:4901
msgid "Codepage change merged."
msgstr "השינוי בקידוד הדף מוזג."
#. IDS_CODEPAGE_CONFLICT
-#: Merge.rc:4892
+#: Merge.rc:4902
msgid "Codepage changes are conflicting."
msgstr "השינויים בקידוד הדף מתנגשים."
#. IDS_EOL_MERGED
-#: Merge.rc:4893
+#: Merge.rc:4903
msgid "EOL change merged."
msgstr "השינוי בסוג סוף השורה מוזג."
#. IDS_EOL_CONFLICT
-#: Merge.rc:4894
+#: Merge.rc:4904
msgid "EOL changes are conflicting."
msgstr "השינויים בסוג סוף השורה מתנגשים."
#. IDS_LOCBAR_CAPTION
-#: Merge.rc:4900
+#: Merge.rc:4910
msgid "Location Pane"
msgstr "חלונית מיקום"
#. IDS_DIFFBAR_CAPTION
-#: Merge.rc:4901
+#: Merge.rc:4911
msgid "Diff Pane"
msgstr "חלונית השוואה"
#. IDS_DIFF_SUCCEEDED
-#: Merge.rc:4908
+#: Merge.rc:4918
msgid "Patch file written."
msgstr "קובץ התיקון נכתב בהצלחה."
#. IDS_DIFF_ITEM1NOTFOUND
-#: Merge.rc:4909
+#: Merge.rc:4919
msgid "First item not found!"
msgstr "הפריט הראשון לא נמצא!"
#. IDS_DIFF_ITEM2NOTFOUND
-#: Merge.rc:4910
+#: Merge.rc:4920
msgid "Second item not found!"
msgstr "הפריט השני לא נמצא!"
#. IDS_DIFF_FILEOVERWRITE
-#: Merge.rc:4911
+#: Merge.rc:4921
msgid "Patch file already exists. Overwrite?"
msgstr "קובץ התיקון כבר קיים. האם להחליף אותו?"
#. IDS_DIFF_SELECTEDFILES
-#: Merge.rc:4912
+#: Merge.rc:4922
#, c-format
msgid "[%1 files selected]"
msgstr ""
#. IDS_DIFF_NORMAL
-#: Merge.rc:4913
+#: Merge.rc:4923
msgid "Normal"
msgstr "רגיל"
#. IDS_DIFF_CONTEXT
-#: Merge.rc:4914
+#: Merge.rc:4924
msgid "Context"
msgstr "הקשר"
#. IDS_DIFF_UNIFIED
-#: Merge.rc:4915
+#: Merge.rc:4925
msgid "Unified"
msgstr "מאוחד"
#. IDS_FILEWRITE_ERROR
-#: Merge.rc:4917
+#: Merge.rc:4927
#, c-format
msgid "Could not write to file %1."
msgstr "לא ניתן לכתוב לקובץ %1."
#. IDS_PATH_NOT_ABSOLUTE
-#: Merge.rc:4918
+#: Merge.rc:4928
#, c-format
msgid "Output path is not absolute: %1"
msgstr "נתיב הפלט שצוין אינו נתיב מוחלט: %1"
#. IDS_MUST_SPECIFY_OUTPUT
-#: Merge.rc:4919
+#: Merge.rc:4929
msgid "Specify an output file."
msgstr "ציין קובץ פלט."
-#: Merge.rc:4921
+#: Merge.rc:4931
msgid "Cannot create patch from binary files."
msgstr "לא ניתן ליצור קובץ תיקון מקבצים בינאריים."
#. IDS_SAVEFILES_FORPATCH
-#: Merge.rc:4922
+#: Merge.rc:4932
msgid ""
"Save all files first.\n"
"\n"
@@ -6948,12 +6959,12 @@ msgstr ""
"יצירת קובץ תיקון מחייבת שלא יהיו שינויים שלא נשמרו בקבצים."
#. IDS_FOLDER_NOTEXIST
-#: Merge.rc:4923
+#: Merge.rc:4933
msgid "Folder does not exist."
msgstr "התיקיה אינה קיימת."
#. IDS_NO_ZIP_SUPPORT
-#: Merge.rc:4928
+#: Merge.rc:4938
msgid ""
"Archive support not enabled.\n"
"7-Zip and/or Merge7z*.dll not found.\n"
@@ -6964,37 +6975,37 @@ msgstr ""
"ראה את המדריך למידע נוסף על תמיכת ארכיונים וכיצד להפעיל אותה."
#. IDS_OPT_EXPORT_CAPTION
-#: Merge.rc:4929
+#: Merge.rc:4939
msgid "Select file for export"
msgstr "בחר קובץ לייצוא"
#. IDS_OPT_IMPORT_CAPTION
-#: Merge.rc:4930
+#: Merge.rc:4940
msgid "Select file for import"
msgstr "בחר קובץ לייבוא"
#. IDS_OPT_IMPORT_DONE
-#: Merge.rc:4931
+#: Merge.rc:4941
msgid "Options imported from file."
msgstr "אפשרויות יובאו מהקובץ."
#. IDS_OPT_EXPORT_DONE
-#: Merge.rc:4932
+#: Merge.rc:4942
msgid "Options exported to file."
msgstr "אפשרויות יוצאו לקובץ."
#. IDS_OPT_IMPORT_ERR
-#: Merge.rc:4933
+#: Merge.rc:4943
msgid "Failed to import options from file."
msgstr "ייבוא האפשרויות מהקובץ נכשל."
#. IDS_OPT_EXPORT_ERR
-#: Merge.rc:4934
+#: Merge.rc:4944
msgid "Failed to write options to file."
msgstr "כתיבת האפשרויות לקובץ נכשלה."
#. IDS_CLOSEALL_WINDOWS
-#: Merge.rc:4935
+#: Merge.rc:4945
msgid ""
"Close multiple compare windows?\n"
"\n"
@@ -7005,44 +7016,44 @@ msgstr ""
"האם להמשיך?"
#. IDS_EOL_MIXED
-#: Merge.rc:4944
+#: Merge.rc:4954
msgid "Mixed"
msgstr "מעורב"
#. IDS_EOL_BIN
-#: Merge.rc:4945
+#: Merge.rc:4955
msgctxt "EOL Type"
msgid "Binary"
msgstr "בינארי"
#. IDS_EOL_NONE
-#: Merge.rc:4949
+#: Merge.rc:4959
msgid "None"
msgstr "ללא"
#. IDS_MARKER_COLOR_FMT
-#: Merge.rc:4950
+#: Merge.rc:4960
#, c-format
msgid "Marker Color %d"
msgstr "צבע סימון %d"
#. IDS_MARKER_NEW_PATTERN
-#: Merge.rc:4951
+#: Merge.rc:4961
msgid "New Pattern"
msgstr "תבנית חדשה"
#. IDS_PLUGINSLIST_TYPE
-#: Merge.rc:4957
+#: Merge.rc:4967
msgid "Type"
msgstr "סוג"
#. IDS_PLUGINS_TYPE_EDITSCRIPT
-#: Merge.rc:4961
+#: Merge.rc:4971
msgid "Editor script"
msgstr "סקריפט עורך"
#. ID_SELECTLINEDIFF
-#: Merge.rc:4967
+#: Merge.rc:4977
msgid ""
"\n"
"Difference in Current Line (F4)"
@@ -7051,7 +7062,7 @@ msgstr ""
"הבדל בשורה הנוכחית (F4)"
#. ID_OPTIONS
-#: Merge.rc:4968
+#: Merge.rc:4978
msgid ""
"\n"
"Options"
@@ -7060,7 +7071,7 @@ msgstr ""
"אפשרויות"
#. ID_REFRESH
-#: Merge.rc:4969
+#: Merge.rc:4979
msgid ""
"\n"
"Refresh (F5)"
@@ -7069,7 +7080,7 @@ msgstr ""
"רענן (F5)"
#. ID_PREVDIFF
-#: Merge.rc:4975
+#: Merge.rc:4985
msgid ""
"\n"
"Previous Difference (Alt+Up)"
@@ -7078,7 +7089,7 @@ msgstr ""
"הבדל קודם (Alt+Up)"
#. ID_NEXTDIFF
-#: Merge.rc:4976
+#: Merge.rc:4986
msgid ""
"\n"
"Next Difference (Alt+Down)"
@@ -7087,7 +7098,7 @@ msgstr ""
"הבדל הבא (Alt+Down)"
#. ID_PREVCONFLICT
-#: Merge.rc:4977
+#: Merge.rc:4987
msgid ""
"\n"
"Previous Conflict (Alt+Shift+Up)"
@@ -7096,7 +7107,7 @@ msgstr ""
"סתירה קודמת (Alt+Shift+Up)"
#. ID_NEXTCONFLICT
-#: Merge.rc:4978
+#: Merge.rc:4988
msgid ""
"\n"
"Next Conflict (Alt+Shift+Down)"
@@ -7105,7 +7116,7 @@ msgstr ""
"סתירה הבאה (Alt+Shift+Down)"
#. ID_FIRSTDIFF
-#: Merge.rc:4983
+#: Merge.rc:4993
msgid ""
"\n"
"First Difference (Alt+Home)"
@@ -7114,7 +7125,7 @@ msgstr ""
"הבדל ראשון (Alt+Home)"
#. ID_CURDIFF
-#: Merge.rc:4984
+#: Merge.rc:4994
msgid ""
"\n"
"Current Difference (Alt+Enter)"
@@ -7123,7 +7134,7 @@ msgstr ""
"הבדל נוכחי (Alt+Enter)"
#. ID_LASTDIFF
-#: Merge.rc:4985
+#: Merge.rc:4995
msgid ""
"\n"
"Last Difference (Alt+End)"
@@ -7132,7 +7143,7 @@ msgstr ""
"הבדל אחרון (Alt+End)"
#. ID_L2R
-#: Merge.rc:4986
+#: Merge.rc:4996
msgid ""
"\n"
"Copy to Right (Alt+Right)"
@@ -7141,7 +7152,7 @@ msgstr ""
"העתק לימין (Alt+Right)"
#. ID_R2L
-#: Merge.rc:4987
+#: Merge.rc:4997
msgid ""
"\n"
"Copy to Left (Alt+Left)"
@@ -7150,7 +7161,7 @@ msgstr ""
"העתק לשמאל (Alt+Left)"
#. ID_L2RNEXT
-#: Merge.rc:4988
+#: Merge.rc:4998
msgid ""
"\n"
"Copy to Right and Advance (Ctrl+Alt+Right)"
@@ -7159,7 +7170,7 @@ msgstr ""
"העתק לימין והתקדם (Ctrl+Alt+Right)"
#. ID_R2LNEXT
-#: Merge.rc:4989
+#: Merge.rc:4999
msgid ""
"\n"
"Copy to Left and Advance (Ctrl+Alt+Left)"
@@ -7168,7 +7179,7 @@ msgstr ""
"העתק לשמאל והתקדם (Ctrl+Alt+Left)"
#. ID_ALL_RIGHT
-#: Merge.rc:4990
+#: Merge.rc:5000
msgid ""
"\n"
"Copy All to Right"
@@ -7177,7 +7188,7 @@ msgstr ""
"העתק הכל לימין"
#. ID_ALL_LEFT
-#: Merge.rc:4991
+#: Merge.rc:5001
msgid ""
"\n"
"Copy All to Left"
@@ -7186,7 +7197,7 @@ msgstr ""
"העתק הכל לשמאל"
#. ID_AUTO_MERGE
-#: Merge.rc:4992
+#: Merge.rc:5002
msgid ""
"\n"
"Auto Merge (Ctrl+Alt+M)"
@@ -7195,57 +7206,57 @@ msgstr ""
"מיזוג אוטומטי (Ctrl+Alt+M)"
#. ID_FIRSTFILE
-#: Merge.rc:4993
+#: Merge.rc:5003
msgid "\nFirst File"
msgstr ""
#. ID_NEXTFILE
-#: Merge.rc:4994
+#: Merge.rc:5004
msgid "\nNext File (Ctrl+F8)"
msgstr ""
#. ID_LASTFILE
-#: Merge.rc:4995
+#: Merge.rc:5005
msgid "\nLast File"
msgstr ""
#. ID_PREVFILE
-#: Merge.rc:4996
+#: Merge.rc:5006
msgid "\nPrevious File (Ctrl+F7)"
msgstr ""
#. IDS_UNPACK_AUTO
-#: Merge.rc:5003
+#: Merge.rc:5013
msgid "Adapted unpacker applied to both files (one needs extension)."
msgstr ""
#. IDS_NO_PREDIFFER
-#: Merge.rc:5004
+#: Merge.rc:5014
msgid "No Prediffer (Normal)"
msgstr "ללא השוואה מוקדמת (רגיל)"
#. IDS_SUGGESTED_PLUGINS
-#: Merge.rc:5005
+#: Merge.rc:5015
msgid "Suggested Plugins"
msgstr "תוספים מוצעים"
#. IDS_NOT_SUGGESTED_PLUGINS
-#: Merge.rc:5006
+#: Merge.rc:5016
msgid "All Plugins"
msgstr "כל התוספים"
#. IDS_PRIVATEBUILD_FMT
-#: Merge.rc:5012
+#: Merge.rc:5022
#, c-format
msgid "Private Build: %1"
msgstr "בנייה פרטית: %1"
#. IDS_CHECKFORUPDATES_UPTODATE
-#: Merge.rc:5013
+#: Merge.rc:5023
msgid "Your software is up to date."
msgstr "התוכנה שלך מעודכנת."
-#: Merge.rc:5015
+#: Merge.rc:5025
#, c-format
msgid ""
"WinMerge update available.\n"
@@ -7255,610 +7266,610 @@ msgstr ""
"%1 זמינה כעת (ברשותך %2). האם להוריד אותה כעת?"
#. IDS_ALLRIGHTS_RESERVED
-#: Merge.rc:5016
+#: Merge.rc:5026
msgid " - All rights reserved."
msgstr ""
#. IDS_CHECKFORUPDATES_FAILED
-#: Merge.rc:5021
+#: Merge.rc:5031
msgid "Failed to download latest version information"
msgstr "הורדת מידע על הגרסה העדכנית נכשלה"
#. IDS_TITLE_PLUGINS_SETTINGS
-#: Merge.rc:5027
+#: Merge.rc:5037
msgid "Plugin Settings"
msgstr "הגדרות תוסף"
#. IDS_NO_SCT_SCRIPTS
-#: Merge.rc:5029
+#: Merge.rc:5039
msgid "WSH not found - .sct scripts disabled"
msgstr "WSH לא נמצא - סקריפטים מסוג .sct הושבתו"
#. IDS_LOCBAR_GOTOLINE_FMT
-#: Merge.rc:5037
+#: Merge.rc:5047
#, c-format
msgid "G&o to Line %1"
msgstr "עבור לשורה %1"
#. IDS_GOTO_MOVED_LINE
-#: Merge.rc:5043
+#: Merge.rc:5053
msgid "Go to Moved Line\tCtrl+Shift+G"
msgstr "עבור לשורה שהוזזה\tCtrl+Shift+G"
#. IDS_AUTOCOMPLETE_DISABLED
-#: Merge.rc:5049
+#: Merge.rc:5059
msgctxt "Options dialog|General|Open dialog Auto completion"
msgid "Disabled"
msgstr ""
#. IDS_AUTOCOMPLETE_FILE_SYS
-#: Merge.rc:5050
+#: Merge.rc:5060
msgid "From file system"
msgstr "ממערכת הקבצים"
#. IDS_AUTOCOMPLETE_MRU
-#: Merge.rc:5051
+#: Merge.rc:5061
msgid "From Most Recently Used list"
msgstr "מרשימת הקבצים שנעשה בהם שימוש לאחרונה"
#. IDS_COLORSCHEME_PLAIN
-#: Merge.rc:5057
+#: Merge.rc:5067
msgid "No Highlighting"
msgstr "ללא הדגשה"
#. IDS_COLORSCHEME_BATCH
-#: Merge.rc:5063
+#: Merge.rc:5073
msgid "Batch"
msgstr "אצווה"
#. IDS_COLORSCHEME_PO
-#: Merge.rc:5090
+#: Merge.rc:5100
msgid "Portable Object"
msgstr "אובייקט נייד"
#. IDS_COLORSCHEME_RSRC
-#: Merge.rc:5094
+#: Merge.rc:5104
msgid "Resources"
msgstr "משאבים"
#. IDS_COLORSCHEME_SH
-#: Merge.rc:5098
+#: Merge.rc:5108
msgid "Shell"
msgstr "מעטפת"
#. IDS_CLOSE_LEFT_TABS
-#: Merge.rc:5115
+#: Merge.rc:5125
msgid "Close &Left Tabs"
msgstr "סגור כרטיסיות שמאל"
#. IDS_CLOSE_RIGHT_TABS
-#: Merge.rc:5116
+#: Merge.rc:5126
msgid "Close R&ight Tabs"
msgstr "סגור כרטיסיות ימין"
#. IDS_CLOSE_OTHER_TABS
-#: Merge.rc:5117
+#: Merge.rc:5127
msgid "Close &Other Tabs"
msgstr "סגור כרטיסיות אחרות"
#. IDS_TABBAR_AUTO_MAXWIDTH
-#: Merge.rc:5118
+#: Merge.rc:5128
msgid "Enable &Auto Max Width"
msgstr "אפשר רוחב מקסימלי אוטומטי"
#. IDS_WEBPAGE_MENU
-#: Merge.rc:5128
+#: Merge.rc:5138
msgid "We&bpage"
msgstr "דף אינטרנט"
#. IDS_VIEW_WRAP_TEXT
-#: Merge.rc:5133
+#: Merge.rc:5143
msgid "W&rap Text"
msgstr "גלישת טקסט"
#. IDS_NOTINSTALLED
-#: Merge.rc:5138
+#: Merge.rc:5148
#, c-format
msgid "%1 is not installed."
msgstr "%1 אינו מותקן."
#. IDS_CREATE_FOLDER
-#: Merge.rc:5143
+#: Merge.rc:5153
#, c-format
msgid "%1 does not exist. Create it?"
msgstr "%1 אינו קיים. האם ליצור אותו?"
#. IDS_CREATE_FOLDER_ERROR
-#: Merge.rc:5144
+#: Merge.rc:5154
msgid "Failed to create folder."
msgstr "יצירת התיקיה נכשלה."
#. IDC_EXT_EDITOR_PATH
-#: Merge.rc:5149
+#: Merge.rc:5159
msgid "Parameters:\n$file: Current file path\n$linenum: Current cursor line number"
msgstr ""
#. IDS_DIFF_ALGORITHM_DEFAULT
-#: Merge.rc:5154
+#: Merge.rc:5164
msgid "default"
msgstr "ברירת מחדל"
#. IDS_DIFF_ALGORITHM_MINIMAL
-#: Merge.rc:5155
+#: Merge.rc:5165
msgid "minimal"
msgstr "מינימלי"
#. IDS_DIFF_ALGORITHM_PATIENCE
-#: Merge.rc:5156
+#: Merge.rc:5166
msgid "patience"
msgstr "סבלנות"
#. IDS_DIFF_ALGORITHM_HISTOGRAM
-#: Merge.rc:5157
+#: Merge.rc:5167
msgid "histogram"
msgstr "היסטוגרמה"
#. IDS_DIFF_ALGORITHM_NONE
-#: Merge.rc:5158
+#: Merge.rc:5168
msgid "none"
msgstr "ללא"
#. IDS_RENDERING_MODE_GDI
-#: Merge.rc:5163
+#: Merge.rc:5173
msgid "GDI"
msgstr "GDI"
#. IDS_RENDERING_MODE_DIRECTWRITE_DEFAULT
-#: Merge.rc:5164
+#: Merge.rc:5174
msgid "DirectWrite Default"
msgstr "ברירת מחדל של DirectWrite"
#. IDS_RENDERING_MODE_DIRECTWRITE_ALIASED
-#: Merge.rc:5165
+#: Merge.rc:5175
msgid "DirectWrite Aliased"
msgstr "DirectWrite עם החלקה"
#. IDS_RENDERING_MODE_DIRECTWRITE_GDI_CLASSIC
-#: Merge.rc:5166
+#: Merge.rc:5176
msgid "DirectWrite GDI Classic"
msgstr "DirectWrite GDI קלאסי"
#. IDS_RENDERING_MODE_DIRECTWRITE_GDI_NATURAL
-#: Merge.rc:5167
+#: Merge.rc:5177
msgid "DirectWrite GDI Natural"
msgstr "DirectWrite GDI טבעי"
#. IDS_RENDERING_MODE_DIRECTWRITE_NATURAL
-#: Merge.rc:5168
+#: Merge.rc:5178
msgid "DirectWrite Natural"
msgstr "DirectWrite טבעי"
#. IDS_RENDERING_MODE_DIRECTWRITE_NATURAL_SYMMETRIC
-#: Merge.rc:5169
+#: Merge.rc:5179
msgid "DirectWrite Natural Symmetric"
msgstr "DirectWrite טבעי סימטרי"
#. IDS_CLOSE_WINDOWS_WITH_ESC_DISABLED
-#: Merge.rc:5174
+#: Merge.rc:5184
msgctxt "Options dialog|General|Close windows with Esc"
msgid "Disabled"
msgstr ""
#. IDS_CLOSE_WINDOWS_WITH_ESC_1
-#: Merge.rc:5175
+#: Merge.rc:5185
msgid "MDI child window or main window"
msgstr "חלון בן MDI או חלון ראשי"
#. IDS_CLOSE_WINDOWS_WITH_ESC_2
-#: Merge.rc:5176
+#: Merge.rc:5186
msgid "MDI child window only"
msgstr "רק חלון בן MDI"
#. IDS_CLOSE_WINDOWS_WITH_ESC_3
-#: Merge.rc:5177
+#: Merge.rc:5187
msgid "Close main window if only one MDI child window"
msgstr "סגור את החלון הראשי אם יש רק חלון בן MDI אחד"
#. IDS_DIFF_GROUP
-#: Merge.rc:5182
+#: Merge.rc:5192
msgctxt "ImgMergeFrame|LocationPane"
msgid "Diff"
msgstr "הבדל"
#. IDS_DIFF_HIGHLIGHT
-#: Merge.rc:5183
+#: Merge.rc:5193
msgctxt "ImgMergeFrame|LocationPane"
msgid "Highlight"
msgstr "הדגשה"
#. IDS_DIFF_BLINK
-#: Merge.rc:5184
+#: Merge.rc:5194
msgctxt "ImgMergeFrame|LocationPane"
msgid "Blink"
msgstr "הבהוב"
#. IDS_DIFF_BLOCKSIZE
-#: Merge.rc:5185
+#: Merge.rc:5195
msgctxt "ImgMergeFrame|LocationPane"
msgid "Block Size"
msgstr "גודל בלוק"
#. IDS_DIFF_BLOCKALPHA
-#: Merge.rc:5186
+#: Merge.rc:5196
msgctxt "ImgMergeFrame|LocationPane"
msgid "Block Alpha"
msgstr "אלפא של בלוק"
#. IDS_DIFF_CDTHRESHOLD
-#: Merge.rc:5187
+#: Merge.rc:5197
msgctxt "ImgMergeFrame|LocationPane"
msgid "CD Threshold"
msgstr "סף CD"
#. IDS_DIFF_INSERTION_DELETION_DETECTION
-#: Merge.rc:5188
+#: Merge.rc:5198
msgctxt "ImgMergeFrame|LocationPane"
msgid "Ins/Del Detection"
msgstr "זיהוי הוספה/מחיקה"
#. IDS_OVERLAY_MODE_NONE
-#: Merge.rc:5189 Merge.rc:5194
+#: Merge.rc:5199 Merge.rc:5204
msgctxt "ImgMergeFrame|LocationPane"
msgid "None"
msgstr "ללא"
#. IDS_DIFF_INSERTION_DELETION_DETECTION_VERTICAL
-#: Merge.rc:5190
+#: Merge.rc:5200
msgctxt "ImgMergeFrame|LocationPane"
msgid "Vertical"
msgstr "אנכי"
#. IDS_DIFF_INSERTION_DELETION_DETECTION_HORIZONTAL
-#: Merge.rc:5191
+#: Merge.rc:5201
msgctxt "ImgMergeFrame|LocationPane"
msgid "Horizontal"
msgstr "אופקי"
#. IDS_OVERLAY_GROUP
-#: Merge.rc:5192
+#: Merge.rc:5202
msgctxt "ImgMergeFrame|LocationPane"
msgid "Overlay"
msgstr "חפיפה"
#. IDS_OVERLAY_ALPHA
-#: Merge.rc:5193
+#: Merge.rc:5203
msgctxt "ImgMergeFrame|LocationPane"
msgid "Alpha"
msgstr "אלפא"
#. IDS_OVERLAY_MODE_XOR
-#: Merge.rc:5195
+#: Merge.rc:5205
msgctxt "ImgMergeFrame|LocationPane"
msgid "XOR"
msgstr "XOR"
#. IDS_OVERLAY_MODE_ALPHA
-#: Merge.rc:5196
+#: Merge.rc:5206
msgctxt "ImgMergeFrame|LocationPane"
msgid "Alpha Blend"
msgstr "שילוב אלפא"
#. IDS_OVERLAY_MODE_ALPHA_ANIMATION
-#: Merge.rc:5197
+#: Merge.rc:5207
msgctxt "ImgMergeFrame|LocationPane"
msgid "Alpha Animation"
msgstr "אנימציית אלפא"
#. IDS_ZOOM
-#: Merge.rc:5198
+#: Merge.rc:5208
msgctxt "ImgMergeFrame|LocationPane"
msgid "Zoom"
msgstr "התקרבות"
#. IDS_PAGE
-#: Merge.rc:5199
+#: Merge.rc:5209
msgctxt "ImgMergeFrame|LocationPane"
msgid "Page:"
msgstr "עמוד:"
#. IDS_IMGCMP_STATUS_PT_RGBA_FMT
-#: Merge.rc:5200
+#: Merge.rc:5210
#, c-format
msgid "Pt: (%d, %d) RGBA: (%d, %d, %d, %d) "
msgstr "נקודה: (%d, %d) RGBA: (%d, %d, %d, %d) "
#. IDS_IMGCMP_STATUS_DIST1_FMT
-#: Merge.rc:5201
+#: Merge.rc:5211
#, c-format
msgid "Dist: %g "
msgstr "מרחק: %g "
#. IDS_IMGCMP_STATUS_DIST2_FMT
-#: Merge.rc:5202
+#: Merge.rc:5212
#, c-format
msgid "Dist: %g, %g "
msgstr "מרחק: %g, %g "
#. IDS_IMGCMP_STATUS_PAGE_ZOOM_SIZE_BPP_FMT
-#: Merge.rc:5203
+#: Merge.rc:5213
#, c-format
msgid "Page: %d/%d Zoom: %d%% %dx%dpx %dbpp "
msgstr "עמוד: %d/%d התקרבות: %d%% %dx%dpx %dbpp "
#. IDS_IMGCMP_STATUS_RC_FMT
-#: Merge.rc:5204
+#: Merge.rc:5214
#, c-format
msgid "Rc: (%d, %d) "
msgstr "Rc: (%d, %d) "
#. IDS_IMGCMP_STATUS_FLIPPED_FMT
-#: Merge.rc:5205
+#: Merge.rc:5215
#, c-format
msgid "Flipped: %s "
msgstr "הפוך: %s "
#. IDS_IMGCMP_STATUS_ROTATED_FMT
-#: Merge.rc:5206
+#: Merge.rc:5216
#, c-format
msgid "Rotated: %d "
msgstr "מסובב: %d "
#. IDS_IMGCMP_REPORT_ALLPAGES
-#: Merge.rc:5207
+#: Merge.rc:5217
msgid "All pages"
msgstr "כל העמודים"
#. IDS_IGNSUB_STR1
-#: Merge.rc:5212
+#: Merge.rc:5222
msgid ""
msgstr "<ערוך כאן>"
#. IDS_IGNSUB_STR2
-#: Merge.rc:5213
+#: Merge.rc:5223
msgid "No differences found to select"
msgstr "לא נמצאו הבדלים לבחירה"
#. IDS_IGNSUB_STR3
-#: Merge.rc:5214
+#: Merge.rc:5224
msgid "No differences found to add as substitution filter"
msgstr "לא נמצאו הבדלים להוספה כמסנן החלפה"
#. IDS_IGNSUB_STR4
-#: Merge.rc:5215
+#: Merge.rc:5225
msgid "The pair is already in the Substitution Filters list"
msgstr "הזוג כבר קיים ברשימת מסנני ההחלפה"
#. IDS_IGNSUB_STR5
-#: Merge.rc:5216
+#: Merge.rc:5226
msgid "Add this change to Substitution Filters?"
msgstr "להוסיף שינוי זה למסנני ההחלפה?"
#. IDS_OCRRESULT_TEXTONLY
-#: Merge.rc:5221
+#: Merge.rc:5231
msgid "Text only"
msgstr "טקסט בלבד"
#. IDS_OCRRESULT_POS_LINE
-#: Merge.rc:5222
+#: Merge.rc:5232
msgid "Line-by-line position and text"
msgstr "מיקום וטקסט שורה-אחר-שורה"
#. IDS_OCRRESULT_POS_WORD
-#: Merge.rc:5223
+#: Merge.rc:5233
msgid "Word-by-word position and text"
msgstr "מיקום וטקסט מילה-אחר-מילה"
#. IDS_USERDATAFOLDER_APPDATA
-#: Merge.rc:5228
+#: Merge.rc:5238
msgid "AppData (Roaming) folder"
msgstr ""
#. IDS_USERDATAFOLDER_INSTALL
-#: Merge.rc:5229
+#: Merge.rc:5239
msgid "Install folder"
msgstr "תיקיית התקנה"
#. IDS_USERDATAFOLDER_DOCUMENTS
-#: Merge.rc:5230
+#: Merge.rc:5240
msgid "Documents folder"
msgstr ""
#. IDS_SINGLEINSTANCE_DISABLED
-#: Merge.rc:5235
+#: Merge.rc:5245
msgctxt "Options dialog|General|Single instance mode"
msgid "Disabled"
msgstr ""
#. IDS_SINGLEINSTANCE_STR1
-#: Merge.rc:5236
+#: Merge.rc:5246
msgid "Allow only one instance to run"
msgstr "אפשר להריץ מופע אחד בלבד"
#. IDS_SINGLEINSTANCE_STR2
-#: Merge.rc:5237
+#: Merge.rc:5247
msgid "Allow only one instance; wait for termination"
msgstr "אפשר להריץ מופע אחד בלבד והמתן לסיומו"
#. IDS_AUTO_RELOAD_MODIFIED_FILES_DISABLED
-#: Merge.rc:5242
+#: Merge.rc:5252
msgctxt "Options dialog|General|Auto-reload modified files"
msgid "Disabled"
msgstr ""
#. IDS_AUTO_RELOAD_MODIFIED_FILES_STR1
-#: Merge.rc:5243
+#: Merge.rc:5253
msgid "Only on window activated"
msgstr "רק כאשר חלון מופעל"
#. IDS_AUTO_RELOAD_MODIFIED_FILES_STR2
-#: Merge.rc:5244
+#: Merge.rc:5254
msgid "Immediately"
msgstr "מיידית"
#. IDS_PLUGIN_ALL
-#: Merge.rc:5249
+#: Merge.rc:5259
msgid "Al&l"
msgstr "הכ&ל"
#. IDS_PLUGIN_OTHERS
-#: Merge.rc:5250
+#: Merge.rc:5260
msgid "&Others"
msgstr "&אחרים"
-#: Merge.rc:5252
+#: Merge.rc:5262
#, c-format
msgid "Missing plugin name in pipeline: %1"
msgstr "שם התוסף חסר בצינור התוספים: %1"
-#: Merge.rc:5254
+#: Merge.rc:5264
#, c-format
msgid "Missing quote in plugin pipeline: %1"
msgstr "מרכאות חסרות בצינור התוספים: %1"
#. IDS_PLUGIN_NAME_ALREADY_EXISTS
-#: Merge.rc:5255
+#: Merge.rc:5265
#, c-format
msgid "Plugin name '%1' already exists."
msgstr "שם התוסף '%1' כבר קיים."
#. IDS_PLUGIN_TITLE1
-#: Merge.rc:5256
+#: Merge.rc:5266
msgid "Specify plugin arguments"
msgstr "ציין פרמטרים לתוסף"
-#: Merge.rc:5258
+#: Merge.rc:5268
#, c-format
msgid "Plugin not found or invalid: %1"
msgstr "התוסף לא נמצא או לא תקין: %1"
#. IDS_PLUGIN_NOT_UNPACK
-#: Merge.rc:5259
+#: Merge.rc:5269
#, c-format
msgid "'%1' is not an unpacker plugin"
msgstr "'%1' אינו תוסף מחלץ"
#. IDS_PLUGIN_NOT_PREDIFF
-#: Merge.rc:5260
+#: Merge.rc:5270
#, c-format
msgid "'%1' is not a prediffer plugin"
msgstr "'%1' אינו תוסף השוואה מוקדמת"
-#: Merge.rc:5262
+#: Merge.rc:5272
#, c-format
msgid "Error prediffing '%1' with '%2'. Prediffing disabled."
msgstr "אירעה שגיאה בעת השוואה מוקדמת של הקובץ '%1' עם התוסף '%2'. ההשוואה המוקדמת לא תיושם עוד."
#. IDS_PLUGIN_CIRCULAR_REFERENCE
-#: Merge.rc:5263
+#: Merge.rc:5273
#, c-format
msgid "Circular reference in plugin pipeline: %1"
msgstr "ייחוס מעגלי בצינור התוספים: %1"
#. IDS_PLUGIN_TYPE1
-#: Merge.rc:5264
+#: Merge.rc:5274
msgid "URL Handler"
msgstr "מטפל בכתובות URL"
#. IDS_PLUGIN_TYPE2
-#: Merge.rc:5265
+#: Merge.rc:5275
msgid "File Unpacker"
msgstr "מחלץ קבצים"
#. IDS_PLUGIN_TYPE3
-#: Merge.rc:5266
+#: Merge.rc:5276
msgid "File or Folder Unpacker"
msgstr "מחלץ קובץ או תיקיה"
#. IDS_PLUGIN_TYPE5
-#: Merge.rc:5268
+#: Merge.rc:5278
msgid "Alias for Unpacker"
msgstr "כינוי למחלץ"
#. IDS_PLUGIN_TYPE6
-#: Merge.rc:5269
+#: Merge.rc:5279
msgid "Alias for Prediffer"
msgstr "כינוי לתוסף השוואה מוקדמת"
#. IDS_PLUGIN_TYPE7
-#: Merge.rc:5270
+#: Merge.rc:5280
msgid "Alias for Editor script"
msgstr "כינוי לסקריפט עורך"
#. IDS_PLUGIN_ALIAS_DESC
-#: Merge.rc:5271
+#: Merge.rc:5281
#, c-format
msgid "Alias for plugin pipeline '%1'"
msgstr "כינוי לצינור תוספים '%1'"
#. IDS_PLUGIN_NEW_DESC
-#: Merge.rc:5272
+#: Merge.rc:5282
msgid "New plugin description"
msgstr "תיאור תוסף חדש"
#. IDS_PLUGIN_TARGETS_ALL
-#: Merge.rc:5273
+#: Merge.rc:5283
msgid "All"
msgstr "הכל"
#. IDS_PLUGIN_TARGETS_1ST
-#: Merge.rc:5274
+#: Merge.rc:5284
msgid "1st"
msgstr "ראשון"
#. IDS_PLUGIN_TARGETS_2ND
-#: Merge.rc:5275
+#: Merge.rc:5285
msgid "2nd"
msgstr "שני"
#. IDS_PLUGIN_TARGETS_3RD
-#: Merge.rc:5276
+#: Merge.rc:5286
msgid "3rd"
msgstr "שלישי"
#. IDS_PLUGIN_TARGETS_1ST_2ND
-#: Merge.rc:5277
+#: Merge.rc:5287
msgid "1st and 2nd"
msgstr "ראשון ושני"
#. IDS_PLUGIN_TARGETS_1ST_3RD
-#: Merge.rc:5278
+#: Merge.rc:5288
msgid "1st and 3rd"
msgstr "ראשון ושלישי"
#. IDS_PLUGIN_TARGETS_2ND_3RD
-#: Merge.rc:5279
+#: Merge.rc:5289
msgid "2nd and 3rd"
msgstr "שני ושלישי"
#. IDS_FILTER_APPLIED
-#: Merge.rc:5284
+#: Merge.rc:5294
msgid "Filter applied"
msgstr "המסנן הופעל"
#. IDS_FILTERMENU_COMPARE
-#: Merge.rc:5289
+#: Merge.rc:5299
#, c-format
msgid "Compare %1"
msgstr ""
#. IDS_FILTERMENU_FILTER_BY_THIS_COLUMN
-#: Merge.rc:5290
+#: Merge.rc:5300
msgid "&Filter by This Column"
msgstr ""
#. IDS_FILTERMENU_FILTER_BY_THIS_COLUMN2
-#: Merge.rc:5291
+#: Merge.rc:5301
msgid "&Filter by This Column..."
msgstr ""
#. IDS_CLIPBOARDHISTORY_TIME
-#: Merge.rc:5296
+#: Merge.rc:5306
#, c-format
msgid "Clipboard at %s"
msgstr "לוח גזירים ב-%s"
#. IDS_CLIPBOARDHISTORY_DISABLED
-#: Merge.rc:5297
+#: Merge.rc:5307
msgid ""
"Clipboard history disabled.\r\n"
"Enable: Windows logo key + V, then Turn on."
@@ -7866,110 +7877,115 @@ msgstr ""
"היסטוריית לוח גזירים מושבתת.\r\n"
"כדי להפעיל אותה, לחץ על מקש Windows + V ולאחר מכן לחץ על כפתור 'הפעל'."
-#: Merge.rc:5299
+#: Merge.rc:5309
msgid "This system does not support clipboard history."
msgstr "מערכת זו אינה תומכת בהיסטוריית לוח גזירים."
-#: Merge.rc:5301
+#: Merge.rc:5311
msgid "32-bit WinMerge does not support Clipboard Compare"
msgstr "גרסת 32 ביט של WinMerge אינה תומכת בהשוואת לוח גזירים"
#. IDS_WEBVIEW2_RUNTIME_NOT_INSTALLED
-#: Merge.rc:5306
+#: Merge.rc:5316
msgid "WebView2 runtime not installed. Download it?"
msgstr "WebView2 Runtime אינו מותקן. האם ברצונך להוריד אותו?"
#. IDS_JUMPLIST_NEW_TEXT_COMPARE
-#: Merge.rc:5311
+#: Merge.rc:5321
msgid "New Text Compare"
msgstr "השוואת טקסט חדשה"
#. IDS_JUMPLIST_NEW_TABLE_COMPARE
-#: Merge.rc:5312
+#: Merge.rc:5322
msgid "New Table Compare"
msgstr "השוואת טבלה חדשה"
#. IDS_JUMPLIST_NEW_BINARY_COMPARE
-#: Merge.rc:5313
+#: Merge.rc:5323
msgid "New Binary Compare"
msgstr "השוואה בינארית חדשה"
#. IDS_JUMPLIST_NEW_IMAGE_COMPARE
-#: Merge.rc:5314
+#: Merge.rc:5324
msgid "New Image Compare"
msgstr "השוואת תמונה חדשה"
#. IDS_JUMPLIST_NEW_WEBPAGE_COMPARE
-#: Merge.rc:5315
+#: Merge.rc:5325
msgid "New Webpage Compare"
msgstr "השוואת דף אינטרנט חדשה"
+#. IDS_JUMPLIST_NEW_FOLDER_COMPARE
+#: Merge.rc:5326
+msgid "New Folder Compare"
+msgstr ""
+
#. IDS_JUMPLIST_CLIPBOARD_COMPARE
-#: Merge.rc:5316
+#: Merge.rc:5327
msgid "Clipboard Compare"
msgstr "השוואת לוח גזירים"
#. IDS_PREVIEWBAR_PRINT
-#: Merge.rc:5321
+#: Merge.rc:5332
msgid "&Print..."
msgstr "&הדפס..."
#. IDS_PREVIEWBAR_PREVPAGE
-#: Merge.rc:5323
+#: Merge.rc:5334
msgid "Pre&v Page"
msgstr "עמוד קו&דם"
#. IDS_PREVIEWBAR_TWOPAGE
-#: Merge.rc:5324
+#: Merge.rc:5335
msgid "&Two Page"
msgstr "&שני עמודים"
#. IDS_PREVIEWBAR_ONEPAGE
-#: Merge.rc:5325
+#: Merge.rc:5336
msgid "&One Page"
msgstr "&עמוד אחד"
#. IDS_PREVIEWBAR_ZOOMIN
-#: Merge.rc:5326
+#: Merge.rc:5337
msgid "Zoom &In"
msgstr "התקרבות &פנימה"
#. IDS_PREVIEWBAR_ZOOMOUT
-#: Merge.rc:5327
+#: Merge.rc:5338
msgid "Zoom &Out"
msgstr "התרחקות &החוצה"
#. IDS_WEBPAGE_COMPARING
-#: Merge.rc:5333
+#: Merge.rc:5344
msgid "Comparing..."
msgstr "משווה..."
#. IDS_WEBPAGE_ZOOM
-#: Merge.rc:5334
+#: Merge.rc:5345
msgid "Zoom:"
msgstr "התקרבות:"
#. IDS_COPY_GRANULARITY_DIFFHUNK
-#: Merge.rc:5339
+#: Merge.rc:5350
msgid "Diff hunk"
msgstr "גוש הבדלים"
#. IDS_COPY_GRANULARITY_INLINE
-#: Merge.rc:5340
+#: Merge.rc:5351
msgid "Inline diff"
msgstr "הבדלים פנימיים"
#. IDS_COPY_GRANULARITY_LINE
-#: Merge.rc:5341
+#: Merge.rc:5352
msgid "Line"
msgstr "שורה"
-#: Merge.rc:5342
+#: Merge.rc:5353
msgid "Character"
msgstr "תו"
#. ID_MICE_PREVDIFF
-#: Merge.rc:5347
+#: Merge.rc:5358
msgid ""
"\n"
"Previous Difference (Alt+Up)\n"
@@ -7982,7 +7998,7 @@ msgstr ""
"(Alt+גלגלת למעלה)"
#. ID_MICE_NEXTDIFF
-#: Merge.rc:5348
+#: Merge.rc:5359
msgid ""
"\n"
"Next Difference (Alt+Down)\n"
@@ -7995,7 +8011,7 @@ msgstr ""
"(Alt+גלגלת למטה)"
#. ID_MICE_L2R
-#: Merge.rc:5349
+#: Merge.rc:5360
msgid ""
"\n"
"Copy to Right (Alt+Right)\n"
@@ -8010,7 +8026,7 @@ msgstr ""
"(Alt+Shift+גלגלת למטה)"
#. ID_MICE_R2L
-#: Merge.rc:5350
+#: Merge.rc:5361
msgid ""
"\n"
"Copy to Left (Alt+Left)\n"
@@ -8025,7 +8041,7 @@ msgstr ""
"(Alt+Shift+גלגלת למעלה)"
#. ID_MICE_L2RNEXT
-#: Merge.rc:5351
+#: Merge.rc:5362
msgid ""
"\n"
"Copy to Right and Advance (Ctrl+Alt+Right)\n"
@@ -8038,7 +8054,7 @@ msgstr ""
"(Ctrl+Alt+Shift+גלגלת למטה)"
#. ID_MICE_R2LNEXT
-#: Merge.rc:5352
+#: Merge.rc:5363
msgid ""
"\n"
"Copy to Left and Advance (Ctrl+Alt+Left)\n"
@@ -8051,262 +8067,262 @@ msgstr ""
"(Ctrl+Alt+Shift+גלגלת למעלה)"
#. IDS_LOG_COMPARING_2
-#: Merge.rc:5362
+#: Merge.rc:5373
#, c-format
msgid "Comparing %1 with %2"
msgstr ""
#. IDS_LOG_COMPARING_3
-#: Merge.rc:5363
+#: Merge.rc:5374
#, c-format
msgid "Comparing %1 with %2 and %3"
msgstr ""
#. IDS_LOG_COMPARE_COMPLETED
-#: Merge.rc:5364
+#: Merge.rc:5375
msgid "Comparison completed"
msgstr ""
#. IDS_LOG_COMPARE_ERROR_2
-#: Merge.rc:5365
+#: Merge.rc:5376
#, c-format
msgid "Failed to compare %1 with %2: "
msgstr ""
#. IDS_LOG_COMPARE_ERROR_3
-#: Merge.rc:5366
+#: Merge.rc:5377
#, c-format
msgid "Failed to compare %1 with %2 and %3: "
msgstr ""
#. IDS_LOG_FILE_SAVED
-#: Merge.rc:5367
+#: Merge.rc:5378
msgid "File saved"
msgstr ""
#. IDS_LOG_COPYING_FILES
-#: Merge.rc:5368
+#: Merge.rc:5379
msgid "Copying files..."
msgstr ""
#. IDS_LOG_MOVING_FILES
-#: Merge.rc:5369
+#: Merge.rc:5380
msgid "Moving files..."
msgstr ""
#. IDS_LOG_DELETING_FILES
-#: Merge.rc:5370
+#: Merge.rc:5381
msgid "Deleting files..."
msgstr ""
#. IDS_LOG_RECYCLEBIN
-#: Merge.rc:5371
+#: Merge.rc:5382
msgid "Recycle Bin"
msgstr ""
#. IDS_LOG_PERMANENTLY_DELETED
-#: Merge.rc:5372
+#: Merge.rc:5383
msgid "Permanently deleted"
msgstr ""
#. IDS_LOG_FILEOPERATION_COMPLETED
-#: Merge.rc:5373
+#: Merge.rc:5384
msgid "File operation completed successfully"
msgstr ""
#. IDS_LOG_FILEOPERATION_CANCELED
-#: Merge.rc:5374
+#: Merge.rc:5385
msgid "File operation canceled"
msgstr ""
#. IDS_FILTER_ERROR_NO_ERROR
-#: Merge.rc:5379
+#: Merge.rc:5390
msgid "No error"
msgstr ""
#. IDS_FILTER_ERROR_EMPTY_EXPRESSION
-#: Merge.rc:5380
+#: Merge.rc:5391
msgid "Filter expression is empty"
msgstr ""
#. IDS_FILTER_ERROR_UNKNOWN_CHAR
-#: Merge.rc:5381
+#: Merge.rc:5392
msgid "Unknown character in filter expression"
msgstr ""
#. IDS_FILTER_ERROR_UNTERMINATED_STRING
-#: Merge.rc:5382
+#: Merge.rc:5393
msgid "Unterminated string literal"
msgstr ""
#. IDS_FILTER_ERROR_SYNTAX_ERROR
-#: Merge.rc:5383
+#: Merge.rc:5394
msgid "Syntax error in filter expression"
msgstr ""
#. IDS_FILTER_ERROR_PARSE_FAILURE
-#: Merge.rc:5384
+#: Merge.rc:5395
msgid "Failed to parse filter expression"
msgstr ""
#. IDS_FILTER_ERROR_INVALID_LITERAL
-#: Merge.rc:5385
+#: Merge.rc:5396
msgid "Invalid literal value"
msgstr ""
#. IDS_FILTER_ERROR_INVALID_REGULAR_EXPRESSION
-#: Merge.rc:5386
+#: Merge.rc:5397
msgid "Invalid regular expression"
msgstr ""
#. IDS_FILTER_ERROR_UNDEFINED_IDENTIFIER
-#: Merge.rc:5387
+#: Merge.rc:5398
msgid "Undefined identifier"
msgstr ""
#. IDS_FILTER_ERROR_INVALID_ARGUMENT_COUNT
-#: Merge.rc:5388
+#: Merge.rc:5399
msgid "Invalid number of arguments"
msgstr ""
#. IDS_FILTER_ERROR_FILTER_NAME_NOT_FOUND
-#: Merge.rc:5389
+#: Merge.rc:5400
msgid "Filter name not found"
msgstr ""
#. IDS_FILTER_ERROR_DIVIDE_BY_ZERO
-#: Merge.rc:5390
+#: Merge.rc:5401
msgid "Division by zero in filter expression"
msgstr ""
#. IDS_FILTER_ERROR_UNKNOWN_ERROR
-#: Merge.rc:5391
+#: Merge.rc:5402
msgid "Unknown error"
msgstr ""
#. IDS_FILTER_ERROR_INVALID_PROPERTY_NAME
-#: Merge.rc:5392
+#: Merge.rc:5403
msgid "Invalid property name"
msgstr ""
#. IDS_FILTER_ERROR_INVALID_DIRECTIVE
-#: Merge.rc:5393
+#: Merge.rc:5404
msgid "Invalid directive"
msgstr ""
#. IDS_FILTER_OP_EQUALS
-#: Merge.rc:5398
+#: Merge.rc:5409
msgid "Equals"
msgstr ""
#. IDS_FILTER_OP_NOT_EQUALS
-#: Merge.rc:5399
+#: Merge.rc:5410
msgid "Does not equal"
msgstr ""
#. IDS_FILTER_OP_LESS_THAN
-#: Merge.rc:5400
+#: Merge.rc:5411
msgid "Less than"
msgstr ""
#. IDS_FILTER_OP_LESS_EQUAL
-#: Merge.rc:5401
+#: Merge.rc:5412
msgid "Less than or equal to"
msgstr ""
#. IDS_FILTER_OP_GREATER_EQUAL
-#: Merge.rc:5402
+#: Merge.rc:5413
msgid "Greater than or equal to"
msgstr ""
#. IDS_FILTER_OP_GREATER_THAN
-#: Merge.rc:5403
+#: Merge.rc:5414
msgid "Greater than"
msgstr ""
#. IDS_FILTER_OP_BETWEEN
-#: Merge.rc:5404
+#: Merge.rc:5415
msgid "Between"
msgstr ""
#. IDS_FILTER_OP_NOT_BETWEEN
-#: Merge.rc:5405
+#: Merge.rc:5416
msgid "Not Between"
msgstr ""
#. IDS_FILTER_OP_CONTAINS
-#: Merge.rc:5406
+#: Merge.rc:5417
msgid "Contains"
msgstr ""
#. IDS_FILTER_OP_NOT_CONTAINS
-#: Merge.rc:5407
+#: Merge.rc:5418
msgid "Not Contains"
msgstr ""
#. IDS_FILTER_OP_RECONTAINS
-#: Merge.rc:5408
+#: Merge.rc:5419
msgid "Contains (regex)"
msgstr ""
#. IDS_FILTER_OP_NOT_RECONTAINS
-#: Merge.rc:5409
+#: Merge.rc:5420
msgid "Not Contains (regex)"
msgstr ""
#. IDS_FILTER_OP_LIKE
-#: Merge.rc:5410
+#: Merge.rc:5421
msgid "Match (wildcard)"
msgstr ""
#. IDS_FILTER_OP_NOT_LIKE
-#: Merge.rc:5411
+#: Merge.rc:5422
msgid "Not match (wildcard)"
msgstr ""
#. IDS_FILTER_OP_MATCHES
-#: Merge.rc:5412
+#: Merge.rc:5423
msgid "Match (regex)"
msgstr ""
#. IDS_FILTER_OP_NOT_MATCHES
-#: Merge.rc:5413
+#: Merge.rc:5424
msgid "Not match (regex)"
msgstr ""
#. IDS_COLORMODE_LIGHT
-#: Merge.rc:5418
+#: Merge.rc:5429
msgid "Light"
msgstr ""
#. IDS_COLORMODE_DARK
-#: Merge.rc:5419
+#: Merge.rc:5430
msgid "Dark"
msgstr ""
#. IDS_COLORMODE_FOLLOWSYSTEM
-#: Merge.rc:5420
+#: Merge.rc:5431
msgid "Follow system"
msgstr ""
#. IDS_EXAMPLE
-#: Merge.rc:5425
+#: Merge.rc:5436
#, c-format
msgid "e.g. %1"
msgstr ""
#. IDS_DETECTED_PREVIOUS_CRASH
-#: Merge.rc:5430
+#: Merge.rc:5441
msgid "WinMerge detected a previous crash. Please report this if possible."
msgstr ""
#. IDS_REGEX_REPLACE_LIST_TEMPLATE
-#: Merge.rc:5435
+#: Merge.rc:5446
msgid "# Regex replacement list\r\n# Format: regexreplacement\r\n# Backreferences like $1, $2 are supported\r\n\r\n(\\d{4})-(\\d{2})-(\\d{2})\t$1_$2_$3\r\n"
msgstr ""
#. IDS_STRING_REPLACE_LIST_TEMPLATE
-#: Merge.rc:5436
+#: Merge.rc:5447
msgid "# Replacement list\r\n# Format: searchreplacement\r\n# Lines starting with # are ignored\r\n\r\nfrom1\tto1\r\nfrom2\tto2\r\n"
msgstr ""
diff --git a/Translations/WinMerge/Hungarian.po b/Translations/WinMerge/Hungarian.po
index f7b77d327cc..ff940e75b60 100644
--- a/Translations/WinMerge/Hungarian.po
+++ b/Translations/WinMerge/Hungarian.po
@@ -23,7 +23,7 @@ msgstr ""
"X-Generator: Poedit 2.4.2\n"
#. LANGUAGE, SUBLANGUAGE
-#: Merge.rc:26 Merge.rc:59 Merge.rc:5453
+#: Merge.rc:26 Merge.rc:59 Merge.rc:5464
#, c-format
msgid "LANG_ENGLISH, SUBLANG_ENGLISH_US"
msgstr "LANG_HUNGARIAN, SUBLANG_DEFAULT"
@@ -109,7 +109,7 @@ msgid "Copy Selected Diff (Right) to Clipboard\tCtrl+&3"
msgstr "A kijelölt különbség (jobb) vágólapra másolása\tCtrl+&3"
#. IDR_MERGEDOCTYPE, ID_SELECTLINEDIFF
-#: Merge.rc:110 Merge.rc:673
+#: Merge.rc:110 Merge.rc:680
#, c-format
msgid "Select Line &Difference\tF4"
msgstr "Eltérés kijelölése\tF4"
@@ -143,7 +143,7 @@ msgid "Cu&t"
msgstr "&Kivágás"
#. IDR_POPUP_DIRVIEW
-#: Merge.rc:118 Merge.rc:943
+#: Merge.rc:118 Merge.rc:951
#, c-format
msgid "&Copy"
msgstr "&Másolás"
@@ -155,21 +155,21 @@ msgid "&Paste"
msgstr "&Beillesztés"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:121 Merge.rc:875 Merge.rc:882
+#: Merge.rc:121 Merge.rc:882 Merge.rc:889
#, c-format
msgid "&Scripts"
msgstr "&Szkriptek"
#. IDS_NO_EDIT_SCRIPTS
-#: Merge.rc:123 Merge.rc:338 Merge.rc:447 Merge.rc:654 Merge.rc:659
-#: Merge.rc:865 Merge.rc:877 Merge.rc:884 Merge.rc:940 Merge.rc:1183
-#: Merge.rc:5028
+#: Merge.rc:123 Merge.rc:340 Merge.rc:451 Merge.rc:661 Merge.rc:666
+#: Merge.rc:872 Merge.rc:884 Merge.rc:891 Merge.rc:948 Merge.rc:1193
+#: Merge.rc:5038
#, c-format
msgid "< Empty >"
msgstr "< Üres >"
#. IDR_POPUP_LOCATIONBAR, ID_EDIT_WMGOTO
-#: Merge.rc:126 Merge.rc:691 Merge.rc:1081
+#: Merge.rc:126 Merge.rc:698 Merge.rc:1089
msgid "&Go to...\tCtrl+G"
msgstr "&Ugrás...\tCtrl+G"
@@ -190,27 +190,27 @@ msgid "Op&en"
msgstr "Meg&nyitás"
#. IDR_POPUP_DIRVIEW, ID_DIR_OPEN_RIGHT
-#: Merge.rc:132 Merge.rc:981 Merge.rc:988 Merge.rc:995
+#: Merge.rc:132 Merge.rc:989 Merge.rc:996 Merge.rc:1003
msgid "With &Registered Application"
msgstr "&Társított programmal"
#. IDR_POPUP_DIRVIEW, ID_DIR_OPEN_RIGHT_WITHEDITOR
-#: Merge.rc:133 Merge.rc:982 Merge.rc:989 Merge.rc:996
+#: Merge.rc:133 Merge.rc:990 Merge.rc:997 Merge.rc:1004
msgid "With &External Editor\tCtrl+Alt+E"
msgstr "Külső szerkesztővel\tCtrl+Alt+E"
#. IDR_POPUP_DIRVIEW, ID_DIR_OPEN_RIGHT_WITH
-#: Merge.rc:134 Merge.rc:983 Merge.rc:990 Merge.rc:997
+#: Merge.rc:134 Merge.rc:991 Merge.rc:998 Merge.rc:1005
msgid "&With..."
msgstr "&Egyéb programmal..."
#. IDR_POPUP_DIRVIEW, ID_DIR_OPEN_RIGHT_PARENT_FOLDER
-#: Merge.rc:135 Merge.rc:984 Merge.rc:991 Merge.rc:998
+#: Merge.rc:135 Merge.rc:992 Merge.rc:999 Merge.rc:1006
msgid "Open &Parent Folder..."
msgstr "Szölőkönyvtár megnyitása..."
#. IDR_POPUP_IMG_CTXT, ID_FILE_SHELLMENU
-#: Merge.rc:137 Merge.rc:1239
+#: Merge.rc:137 Merge.rc:1249
msgid "S&hell Menu"
msgstr "Intéző menü"
@@ -248,8 +248,8 @@ msgid "Ins&ertion/Deletion Detection"
msgstr "Védelem beszúrás/törlés ellen"
#. IDR_MERGEDOCTYPE, ID_TOOLBAR_NONE
-#: Merge.rc:176 Merge.rc:209 Merge.rc:216 Merge.rc:358 Merge.rc:507
-#: Merge.rc:751
+#: Merge.rc:176 Merge.rc:209 Merge.rc:216 Merge.rc:360 Merge.rc:511
+#: Merge.rc:758
#, c-format
msgid "&None"
msgstr "Nincs"
@@ -265,13 +265,13 @@ msgid "&Horizontal"
msgstr "Vízszintes"
#. IDR_POPUP_IMG_CTXT, ID_IMG_CURPANE_PREVPAGE
-#: Merge.rc:181 Merge.rc:189 Merge.rc:1230
+#: Merge.rc:181 Merge.rc:189 Merge.rc:1240
#, c-format
msgid "&Previous Page"
msgstr "Előző oldal"
#. IDS_PREVIEWBAR_NEXTPAGE
-#: Merge.rc:182 Merge.rc:190 Merge.rc:1231 Merge.rc:5322
+#: Merge.rc:182 Merge.rc:190 Merge.rc:1241 Merge.rc:5333
#, c-format
msgid "&Next Page"
msgstr "Következő oldal"
@@ -283,45 +283,45 @@ msgid "&Active Pane"
msgstr "AKtív panel"
#. IDR_POPUP_IMG_CTXT, ID_IMG_CURPANE_ROTATE_RIGHT_90
-#: Merge.rc:185 Merge.rc:1225
+#: Merge.rc:185 Merge.rc:1235
msgid "Rotate &Right 90deg"
msgstr "Forgatás jobbra 90 fokkal"
#. IDR_POPUP_IMG_CTXT, ID_IMG_CURPANE_ROTATE_LEFT_90
-#: Merge.rc:186 Merge.rc:1226
+#: Merge.rc:186 Merge.rc:1236
msgid "Rotate &Left 90deg"
msgstr "Forgatás balra 90 fokkal"
#. IDR_POPUP_IMG_CTXT, ID_IMG_CURPANE_FLIP_VERTICALLY
-#: Merge.rc:187 Merge.rc:1227
+#: Merge.rc:187 Merge.rc:1237
msgid "Flip V&ertically"
msgstr "Függőleges megfordítás"
#. IDR_POPUP_IMG_CTXT, ID_IMG_CURPANE_FLIP_HORIZONTALLY
-#: Merge.rc:188 Merge.rc:1228
+#: Merge.rc:188 Merge.rc:1238
msgid "Flip H&orizontally"
msgstr "Vízszintes megfordítás"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:193 Merge.rc:699
+#: Merge.rc:193 Merge.rc:706
#, c-format
msgid "&Zoom"
msgstr "Nagyítás"
#. IDR_MERGEDOCTYPE, ID_VIEW_ZOOMIN
-#: Merge.rc:202 Merge.rc:701
+#: Merge.rc:202 Merge.rc:708
#, c-format
msgid "Zoom &In\tCtrl++"
msgstr "Nagyítás\tCtrl++"
#. IDR_MERGEDOCTYPE, ID_VIEW_ZOOMOUT
-#: Merge.rc:203 Merge.rc:702
+#: Merge.rc:203 Merge.rc:709
#, c-format
msgid "Zoom &Out\tCtrl+-"
msgstr "Kicsinyítés\tCtrl+-"
#. IDR_MERGEDOCTYPE, ID_VIEW_ZOOMNORMAL, Zoom to normal
-#: Merge.rc:205 Merge.rc:704
+#: Merge.rc:205 Merge.rc:711
#, c-format
msgid "&Normal\tCtrl+*"
msgstr "Normál\tCtrl+*"
@@ -351,29 +351,29 @@ msgid "Dragging &Mode"
msgstr "Húzás mód"
#. IDR_POPUP_IMG_CTXT, ID_IMG_DRAGGINGMODE_MOVE
-#: Merge.rc:217 Merge.rc:955 Merge.rc:1233
+#: Merge.rc:217 Merge.rc:963 Merge.rc:1243
#, c-format
msgid "&Move"
msgstr "&Áthelyezés"
#. IDR_POPUP_IMG_CTXT, ID_IMG_DRAGGINGMODE_ADJUST_OFFSET
-#: Merge.rc:218 Merge.rc:1234
+#: Merge.rc:218 Merge.rc:1244
#, c-format
msgid "&Adjust Offset"
msgstr "Eltolás beállítása"
#. IDR_POPUP_IMG_CTXT, ID_IMG_DRAGGINGMODE_VERTICAL_WIPE
-#: Merge.rc:219 Merge.rc:1235
+#: Merge.rc:219 Merge.rc:1245
msgid "&Vertical Wipe"
msgstr "Függőleges tördelés"
#. IDR_POPUP_IMG_CTXT, ID_IMG_DRAGGINGMODE_HORIZONTAL_WIPE
-#: Merge.rc:220 Merge.rc:1236
+#: Merge.rc:220 Merge.rc:1246
msgid "&Horizontal Wipe"
msgstr "Vízszintes tördelés"
#. IDR_POPUP_IMG_CTXT, ID_IMG_DRAGGINGMODE_RECTANGLE_SELECT
-#: Merge.rc:221 Merge.rc:1237
+#: Merge.rc:221 Merge.rc:1247
msgid "Rectangle &Select"
msgstr "Kijelölő téglalap"
@@ -409,37 +409,37 @@ msgid "Compare Extracted &Text from Images"
msgstr "Hasonlítsa össze a képekből kinyert szöveget"
#. IDD_OPEN, IDOK
-#: Merge.rc:272 Merge.rc:1980
+#: Merge.rc:272 Merge.rc:1990
msgid "Co&mpare"
msgstr "Összehasonlít"
#. IDR_POPUP_WEBPAGE_COMPARE, ID_WEB_COMPARE_SCREENSHOTS
-#: Merge.rc:274 Merge.rc:1247
+#: Merge.rc:274 Merge.rc:1257
msgid "&Screenshots"
msgstr "Képernyőmentések"
#. IDR_POPUP_WEBPAGE_COMPARE, ID_WEB_COMPARE_FULLSIZE_SCREENSHOTS
-#: Merge.rc:275 Merge.rc:1248
+#: Merge.rc:275 Merge.rc:1258
msgid "&Full Size Screenshots"
msgstr "Teljes méretű képernyőmentések"
#. IDR_POPUP_WEBPAGE_COMPARE, ID_WEB_COMPARE_HTMLS
-#: Merge.rc:276 Merge.rc:1249
+#: Merge.rc:276 Merge.rc:1259
msgid "&HTMLs"
msgstr "HTML-ek"
#. IDR_POPUP_WEBPAGE_COMPARE, ID_WEB_COMPARE_TEXTS
-#: Merge.rc:277 Merge.rc:1250
+#: Merge.rc:277 Merge.rc:1260
msgid "&Texts"
msgstr "Szövegek"
#. IDR_POPUP_WEBPAGE_COMPARE, ID_WEB_COMPARE_RESOURCETREES
-#: Merge.rc:278 Merge.rc:1251
+#: Merge.rc:278 Merge.rc:1261
msgid "&Resource Trees"
msgstr "Erőforrásfák"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_SIZE
-#: Merge.rc:280 Merge.rc:1775
+#: Merge.rc:280 Merge.rc:1785
msgid "&Size"
msgstr "Méret"
@@ -454,27 +454,27 @@ msgid "&Event Sync"
msgstr "Szinkronizálás esemény"
#. IDR_POPUP_WEBPAGE_SYNC_EVENTS, ID_WEB_SYNC_ENABLED
-#: Merge.rc:291 Merge.rc:1259
+#: Merge.rc:291 Merge.rc:1269
msgid "&Enabled"
msgstr "&Engedélyezve"
#. IDR_POPUP_WEBPAGE_SYNC_EVENTS, ID_WEB_SYNC_SCROLL
-#: Merge.rc:293 Merge.rc:1261
+#: Merge.rc:293 Merge.rc:1271
msgid "&Scroll"
msgstr "&Görgetés"
#. IDR_POPUP_WEBPAGE_SYNC_EVENTS, ID_WEB_SYNC_CLICK
-#: Merge.rc:294 Merge.rc:1262
+#: Merge.rc:294 Merge.rc:1272
msgid "&Click"
msgstr "&Kattintás"
#. IDR_POPUP_WEBPAGE_SYNC_EVENTS, ID_WEB_SYNC_INPUT
-#: Merge.rc:295 Merge.rc:1263
+#: Merge.rc:295 Merge.rc:1273
msgid "&Input"
msgstr "&Bevitel"
#. IDR_POPUP_WEBPAGE_SYNC_EVENTS, ID_WEB_SYNC_GOBACKFORWARD
-#: Merge.rc:296 Merge.rc:1264
+#: Merge.rc:296 Merge.rc:1274
msgid "&Go Back/Forward"
msgstr "&Ugrás vissza/előre"
@@ -504,3970 +504,3981 @@ msgid "&All Profiles"
msgstr "Minden profil"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:310 Merge.rc:411 Merge.rc:586
+#: Merge.rc:310 Merge.rc:413 Merge.rc:590
#, c-format
msgid "&File"
msgstr "&Fájl"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:312 Merge.rc:413 Merge.rc:588
+#: Merge.rc:312 Merge.rc:415 Merge.rc:592
#, c-format
msgid "&New"
msgstr "&Új"
#. IDR_POPUP_COMPARE, ID_MERGE_COMPARE_TEXT
-#: Merge.rc:314 Merge.rc:322 Merge.rc:415 Merge.rc:423 Merge.rc:590
-#: Merge.rc:598 Merge.rc:649 Merge.rc:935 Merge.rc:1159 Merge.rc:1171
+#: Merge.rc:314 Merge.rc:323 Merge.rc:417 Merge.rc:426 Merge.rc:594
+#: Merge.rc:603 Merge.rc:655 Merge.rc:942 Merge.rc:1167 Merge.rc:1180
#, c-format
msgid "&Text"
msgstr "Szöveg"
#. IDR_POPUP_COMPARE, ID_MERGE_COMPARE_TABLE
-#: Merge.rc:315 Merge.rc:323 Merge.rc:416 Merge.rc:424 Merge.rc:591
-#: Merge.rc:599 Merge.rc:650 Merge.rc:936 Merge.rc:1160 Merge.rc:1172
+#: Merge.rc:315 Merge.rc:324 Merge.rc:418 Merge.rc:427 Merge.rc:595
+#: Merge.rc:604 Merge.rc:656 Merge.rc:943 Merge.rc:1168 Merge.rc:1181
msgid "T&able"
msgstr "Táblázat"
#. IDR_POPUP_COMPARE, ID_MERGE_COMPARE_HEX
-#: Merge.rc:316 Merge.rc:324 Merge.rc:417 Merge.rc:425 Merge.rc:592
-#: Merge.rc:600 Merge.rc:651 Merge.rc:937 Merge.rc:1161 Merge.rc:1173
+#: Merge.rc:316 Merge.rc:325 Merge.rc:419 Merge.rc:428 Merge.rc:596
+#: Merge.rc:605 Merge.rc:657 Merge.rc:944 Merge.rc:1169 Merge.rc:1182
#, c-format
msgid "&Binary"
msgstr "Bináris"
#. IDS_IMAGE_MENU
-#: Merge.rc:317 Merge.rc:325 Merge.rc:418 Merge.rc:426 Merge.rc:593
-#: Merge.rc:601 Merge.rc:652 Merge.rc:938 Merge.rc:1162 Merge.rc:1174
-#: Merge.rc:5123
+#: Merge.rc:317 Merge.rc:326 Merge.rc:420 Merge.rc:429 Merge.rc:597
+#: Merge.rc:606 Merge.rc:658 Merge.rc:945 Merge.rc:1170 Merge.rc:1183
+#: Merge.rc:5133
#, c-format
msgid "&Image"
msgstr "Kép"
#. IDR_POPUP_COMPARE, ID_MERGE_COMPARE_WEBPAGE
-#: Merge.rc:318 Merge.rc:326 Merge.rc:419 Merge.rc:427 Merge.rc:594
-#: Merge.rc:602 Merge.rc:653 Merge.rc:939 Merge.rc:1163 Merge.rc:1175
+#: Merge.rc:318 Merge.rc:327 Merge.rc:421 Merge.rc:430 Merge.rc:598
+#: Merge.rc:607 Merge.rc:659 Merge.rc:946 Merge.rc:1171 Merge.rc:1184
msgid "&Webpage"
msgstr "Weboldal"
+#. IDR_POPUP_NEW, ID_FILE_NEW_FOLDER
+#: Merge.rc:319 Merge.rc:328 Merge.rc:422 Merge.rc:431 Merge.rc:599
+#: Merge.rc:608 Merge.rc:1172
+msgid "&Folder"
+msgstr ""
+
#. IDR_MERGEDOCTYPE
-#: Merge.rc:320 Merge.rc:421 Merge.rc:596
+#: Merge.rc:321 Merge.rc:424 Merge.rc:601
#, c-format
msgid "New (&3 panes)"
msgstr "Új (3 paneles)"
#. IDR_MERGEDOCTYPE, ID_FILE_OPEN
-#: Merge.rc:328 Merge.rc:429 Merge.rc:604
+#: Merge.rc:330 Merge.rc:433 Merge.rc:610
#, c-format
msgid "&Open...\tCtrl+O"
msgstr "M&egnyitás...\tCtrl+O"
#. IDR_MERGEDOCTYPE, ID_FILE_OPENCONFLICT
-#: Merge.rc:329 Merge.rc:430 Merge.rc:605
+#: Merge.rc:331 Merge.rc:434 Merge.rc:611
msgid "Open Conflic&t File..."
msgstr "Konfliktus fájl megnyitása..."
#. IDR_MERGEDOCTYPE, ID_FILE_OPENCLIPBOARD
-#: Merge.rc:330 Merge.rc:431 Merge.rc:606
+#: Merge.rc:332 Merge.rc:435 Merge.rc:612
msgid "Open C&lipboard"
msgstr "Vágólap megnyitása"
#. IDR_POPUP_PROJECT, ID_FILE_OPENPROJECT
-#: Merge.rc:332 Merge.rc:433 Merge.rc:608 Merge.rc:1191
+#: Merge.rc:334 Merge.rc:437 Merge.rc:614 Merge.rc:1201
#, c-format
msgid "Open Pro&ject...\tCtrl+J"
msgstr "Projekt megnyitása...\tCtrl+J"
#. IDD_OPEN, ID_SAVE_PROJECT
-#: Merge.rc:333 Merge.rc:434 Merge.rc:609 Merge.rc:1193 Merge.rc:1979
+#: Merge.rc:335 Merge.rc:438 Merge.rc:615 Merge.rc:1203 Merge.rc:1989
#, c-format
msgid "Sa&ve Project..."
msgstr "Projekt mentése..."
#. IDR_MAINFRAME, ID_FILE_PROJECT_MRU_FIRST
-#: Merge.rc:335
+#: Merge.rc:337
#, c-format
msgid "Recent Projects"
msgstr "Legutóbbi projektek"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:336 Merge.rc:445 Merge.rc:657
+#: Merge.rc:338 Merge.rc:449 Merge.rc:664
#, c-format
msgid "Recent F&iles or Folders"
msgstr "Legutóbbi fájlok és mappák"
#. IDR_MERGEDOCTYPE, ID_APP_EXIT
-#: Merge.rc:341 Merge.rc:450 Merge.rc:662
+#: Merge.rc:343 Merge.rc:454 Merge.rc:669
msgid "E&xit\tCtrl+Q"
msgstr "&Kilépés\tCtrl+Q"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:343 Merge.rc:452 Merge.rc:664
+#: Merge.rc:345 Merge.rc:456 Merge.rc:671
#, c-format
msgid "&Edit"
msgstr "S&zerkesztés"
#. IDR_MERGEDOCTYPE, ID_EDIT_PASTE
-#: Merge.rc:345 Merge.rc:671
+#: Merge.rc:347 Merge.rc:678
#, c-format
msgid "&Paste\tCtrl+V"
msgstr "&Beillesztés\tCtrl+V"
#. IDR_MERGEDOCTYPE, ID_OPTIONS
-#: Merge.rc:347 Merge.rc:456 Merge.rc:693
+#: Merge.rc:349 Merge.rc:460 Merge.rc:700
#, c-format
msgid "&Options...\tCtrl+,"
msgstr "&Beállítások...\tCtrl+,"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:349 Merge.rc:458 Merge.rc:695
+#: Merge.rc:351 Merge.rc:462 Merge.rc:702
#, c-format
msgid "&View"
msgstr "&Nézet"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:351 Merge.rc:500 Merge.rc:744
+#: Merge.rc:353 Merge.rc:504 Merge.rc:751
#, c-format
msgid "Ta&b Bar"
msgstr "Lapsáv"
#. IDR_MERGEDOCTYPE, ID_VIEW_TAB_BAR
-#: Merge.rc:353 Merge.rc:502 Merge.rc:746
+#: Merge.rc:355 Merge.rc:506 Merge.rc:753
msgid "&View Tab Bar"
msgstr "&Nézet lapsáv"
#. IDR_MERGEDOCTYPE, ID_VIEW_TAB_BAR_ON_TITLE_BAR
-#: Merge.rc:354 Merge.rc:503 Merge.rc:747
+#: Merge.rc:356 Merge.rc:507 Merge.rc:754
msgid "&On Title Bar"
msgstr "&A címsoron"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:356 Merge.rc:505 Merge.rc:749
+#: Merge.rc:358 Merge.rc:509 Merge.rc:756
#, c-format
msgid "&Toolbar"
msgstr "Eszköztár"
#. IDR_MERGEDOCTYPE, ID_TOOLBAR_SMALL
-#: Merge.rc:359 Merge.rc:508 Merge.rc:752
+#: Merge.rc:361 Merge.rc:512 Merge.rc:759
#, c-format
msgid "&Small"
msgstr "Kicsi"
#. IDR_MERGEDOCTYPE, ID_TOOLBAR_MEDIUM
-#: Merge.rc:360 Merge.rc:509 Merge.rc:753
+#: Merge.rc:362 Merge.rc:513 Merge.rc:760
msgid "&Medium"
msgstr "Közepes"
#. IDR_MERGEDOCTYPE, ID_TOOLBAR_BIG
-#: Merge.rc:361 Merge.rc:510 Merge.rc:754
+#: Merge.rc:363 Merge.rc:514 Merge.rc:761
#, c-format
msgid "&Big"
msgstr "Nagy"
#. IDR_MERGEDOCTYPE, ID_TOOLBAR_HUGE
-#: Merge.rc:362 Merge.rc:511 Merge.rc:755
+#: Merge.rc:364 Merge.rc:515 Merge.rc:762
#, c-format
msgid "&Huge"
msgstr "Hatalmas"
#. IDS_VIEW_MENU_BAR
-#: Merge.rc:364 Merge.rc:513 Merge.rc:757 Merge.rc:5357
+#: Merge.rc:366 Merge.rc:517 Merge.rc:764 Merge.rc:5368
msgid "Men&u Bar"
msgstr "Menü sáv"
#. IDR_DIRDOCTYPE, ID_VIEW_OUTPUT_BAR
-#: Merge.rc:365 Merge.rc:515
+#: Merge.rc:367 Merge.rc:519
msgid "&Output Pane"
msgstr "&Kimenet panel"
#. IDR_MERGEDOCTYPE, ID_VIEW_STATUS_BAR
-#: Merge.rc:366 Merge.rc:516 Merge.rc:758
+#: Merge.rc:368 Merge.rc:520 Merge.rc:765
#, c-format
msgid "&Status Bar"
msgstr "&Állapotsor"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:368 Merge.rc:539 Merge.rc:847
+#: Merge.rc:370 Merge.rc:543 Merge.rc:854
#, c-format
msgid "&Tools"
msgstr "&Eszközök"
#. IDR_MERGEDOCTYPE, ID_TOOLS_FILTERS
-#: Merge.rc:370 Merge.rc:542 Merge.rc:849
+#: Merge.rc:372 Merge.rc:546 Merge.rc:856
#, c-format
msgid "&Filters..."
msgstr "&Szűrők..."
#. IDR_MERGEDOCTYPE, ID_TOOLS_GENERATEPATCH
-#: Merge.rc:371 Merge.rc:543 Merge.rc:850
+#: Merge.rc:373 Merge.rc:547 Merge.rc:857
#, c-format
msgid "&Generate Patch..."
msgstr "&Patch generálása..."
#. IDR_MERGEDOCTYPE
-#: Merge.rc:373 Merge.rc:546 Merge.rc:853
+#: Merge.rc:375 Merge.rc:550 Merge.rc:860
#, c-format
msgid "&Plugins"
msgstr "&Bővítmények"
#. IDD_PLUGINS_LIST, IDC_PLUGIN_SETTINGS
-#: Merge.rc:375 Merge.rc:548 Merge.rc:855 Merge.rc:2494 Merge.rc:2926
+#: Merge.rc:377 Merge.rc:552 Merge.rc:862 Merge.rc:2504 Merge.rc:2936
#, c-format
msgid "P&lugin Settings..."
msgstr "Bővitmény beállítások..."
#. IDR_MERGEDOCTYPE, ID_PREDIFFER_MANUAL
-#: Merge.rc:377 Merge.rc:550 Merge.rc:857
+#: Merge.rc:379 Merge.rc:554 Merge.rc:864
#, c-format
msgid "Ma&nual Prediffer"
msgstr "Kézi Elővizsgáló"
#. IDR_MERGEDOCTYPE, ID_PREDIFFER_AUTO
-#: Merge.rc:378 Merge.rc:551 Merge.rc:858
+#: Merge.rc:380 Merge.rc:555 Merge.rc:865
#, c-format
msgid "A&utomatic Prediffer"
msgstr "Automatikus Elővizsgáló"
#. IDR_MERGEDOCTYPE, ID_UNPACK_MANUAL
-#: Merge.rc:380 Merge.rc:553 Merge.rc:860
+#: Merge.rc:382 Merge.rc:557 Merge.rc:867
#, c-format
msgid "&Manual Unpacking"
msgstr "&Kézi kicsomagolás"
#. IDR_MERGEDOCTYPE, ID_UNPACK_AUTO
-#: Merge.rc:381 Merge.rc:554 Merge.rc:861
+#: Merge.rc:383 Merge.rc:558 Merge.rc:868
#, c-format
msgid "&Automatic Unpacking"
msgstr "&Automatikus kicsomagolás"
#. IDR_MERGEDOCTYPE, ID_RELOAD_PLUGINS
-#: Merge.rc:383 Merge.rc:558 Merge.rc:889
+#: Merge.rc:385 Merge.rc:562 Merge.rc:896
#, c-format
msgid "&Reload Plugins"
msgstr "&Bővítmények újratöltése"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:385 Merge.rc:560 Merge.rc:891
+#: Merge.rc:387 Merge.rc:564 Merge.rc:898
#, c-format
msgid "&Window"
msgstr "&Ablak"
#. IDR_MERGEDOCTYPE, ID_FILE_CLOSE
-#: Merge.rc:387 Merge.rc:562 Merge.rc:893
+#: Merge.rc:389 Merge.rc:566 Merge.rc:900
msgid "Cl&ose\tCtrl+W"
msgstr "&Bezárás\tCtrl+W"
#. IDR_MERGEDOCTYPE, ID_WINDOW_CLOSEALL
-#: Merge.rc:388 Merge.rc:563 Merge.rc:894
+#: Merge.rc:390 Merge.rc:567 Merge.rc:901
#, c-format
msgid "Clo&se All"
msgstr "&Mindegyik bezárása"
#. IDR_MERGEDOCTYPE, ID_NEXT_PANE
-#: Merge.rc:390 Merge.rc:565 Merge.rc:896
+#: Merge.rc:392 Merge.rc:569 Merge.rc:903
#, c-format
msgid "Change &Pane\tF6"
msgstr "&Aktív panel váltása\tF6"
#. IDR_MERGEDOCTYPE, ID_WINDOW_TILE_HORZ
-#: Merge.rc:392 Merge.rc:567 Merge.rc:900
+#: Merge.rc:394 Merge.rc:571 Merge.rc:907
#, c-format
msgid "Tile &Horizontally"
msgstr "Elrendezés &vízszintesen"
#. IDR_MERGEDOCTYPE, ID_WINDOW_TILE_VERT
-#: Merge.rc:393 Merge.rc:568 Merge.rc:901
+#: Merge.rc:395 Merge.rc:572 Merge.rc:908
#, c-format
msgid "Tile &Vertically"
msgstr "Elrendezés &függőlegesen"
#. IDR_MERGEDOCTYPE, ID_WINDOW_CASCADE
-#: Merge.rc:394 Merge.rc:569 Merge.rc:902
+#: Merge.rc:396 Merge.rc:573 Merge.rc:909
#, c-format
msgid "&Cascade"
msgstr "Egymás mögött"
#. IDS_MESSAGEBOX_HELP
-#: Merge.rc:396 Merge.rc:571 Merge.rc:904 Merge.rc:3200 Merge.rc:4189
+#: Merge.rc:398 Merge.rc:575 Merge.rc:911 Merge.rc:3210 Merge.rc:4199
#, c-format
msgid "&Help"
msgstr "&Súgó"
#. IDR_MERGEDOCTYPE, ID_HELP_CONTENTS
-#: Merge.rc:398 Merge.rc:573 Merge.rc:906
+#: Merge.rc:400 Merge.rc:577 Merge.rc:913
#, c-format
msgid "&WinMerge Help\tF1"
msgstr "&WinMerge Súgó\tF1"
#. IDR_MERGEDOCTYPE, ID_HELP_RELEASENOTES
-#: Merge.rc:400 Merge.rc:575 Merge.rc:908
+#: Merge.rc:402 Merge.rc:579 Merge.rc:915
#, c-format
msgid "R&elease Notes"
msgstr "Változási jegyzék"
#. IDR_MERGEDOCTYPE, ID_HELP_TRANSLATIONS
-#: Merge.rc:401 Merge.rc:576 Merge.rc:909
+#: Merge.rc:403 Merge.rc:580 Merge.rc:916
#, c-format
msgid "&Translations"
msgstr "Fordítások"
#. IDR_MERGEDOCTYPE, ID_HELP_GETCONFIG
-#: Merge.rc:402 Merge.rc:577 Merge.rc:910
+#: Merge.rc:404 Merge.rc:581 Merge.rc:917
#, c-format
msgid "C&onfiguration"
msgstr "Konfigurációs fájl"
#. IDR_MERGEDOCTYPE, ID_HELP_GNULICENSE
-#: Merge.rc:404 Merge.rc:579 Merge.rc:912
+#: Merge.rc:406 Merge.rc:583 Merge.rc:919
#, c-format
msgid "&GNU General Public License"
msgstr "GNU Általános Nyilvános Licenc"
#. IDR_MERGEDOCTYPE, ID_APP_ABOUT
-#: Merge.rc:405 Merge.rc:580 Merge.rc:913
+#: Merge.rc:407 Merge.rc:584 Merge.rc:920
#, c-format
msgid "&About WinMerge..."
msgstr "&A Winmerge névjegye..."
#. IDR_MERGEDOCTYPE
-#: Merge.rc:436 Merge.rc:629
+#: Merge.rc:440 Merge.rc:635
#, c-format
msgid "&Read-Only"
msgstr "Csak olvasható"
#. IDR_MERGEDOCTYPE, ID_FILE_LEFT_READONLY
-#: Merge.rc:438 Merge.rc:631
+#: Merge.rc:442 Merge.rc:637
#, c-format
msgid "L&eft Read-Only"
msgstr "Bal oldal csak olvasható"
#. IDR_MERGEDOCTYPE, ID_FILE_MIDDLE_READONLY
-#: Merge.rc:439 Merge.rc:632
+#: Merge.rc:443 Merge.rc:638
#, c-format
msgid "M&iddle Read-Only"
msgstr "A középső csak olvasható"
#. IDR_MERGEDOCTYPE, ID_FILE_RIGHT_READONLY
-#: Merge.rc:440 Merge.rc:633
+#: Merge.rc:444 Merge.rc:639
#, c-format
msgid "Ri&ght Read-Only"
msgstr "Jobb oldal csak olvasható"
#. IDD_ENCODINGERROR, IDC_FILEENCODING
-#: Merge.rc:443 Merge.rc:646 Merge.rc:1038 Merge.rc:3063
+#: Merge.rc:447 Merge.rc:652 Merge.rc:1046 Merge.rc:3073
#, c-format
msgid "&File Encoding..."
msgstr "&Fájl kódolás..."
#. IDR_POPUP_OUTPUTVIEW, ID_EDIT_SELECT_ALL
-#: Merge.rc:454 Merge.rc:674 Merge.rc:1343
+#: Merge.rc:458 Merge.rc:681 Merge.rc:1353
#, c-format
msgid "Select &All\tCtrl+A"
msgstr "Összes kijelölése\tCtrl+A"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWIDENTICAL
-#: Merge.rc:460
+#: Merge.rc:464
#, c-format
msgid "Show &Identical Items"
msgstr "Egyező elemek mutatása"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWDIFFERENT
-#: Merge.rc:461
+#: Merge.rc:465
#, c-format
msgid "Show &Different Items"
msgstr "Különböző elemek mutatása"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWUNIQUELEFT
-#: Merge.rc:462
+#: Merge.rc:466
#, c-format
msgid "Show L&eft Unique Items"
msgstr "Csak bal egyedi elemek mutatása"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWUNIQUEMIDDLE
-#: Merge.rc:463
+#: Merge.rc:467
#, c-format
msgid "Show Midd&le Unique Items"
msgstr "Középső egyedi elemek megjelenítése"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWUNIQUERIGHT
-#: Merge.rc:464
+#: Merge.rc:468
#, c-format
msgid "Show Ri&ght Unique Items"
msgstr "Csak jobb egyedi elemek mutatása"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWSKIPPED
-#: Merge.rc:465
+#: Merge.rc:469
#, c-format
msgid "Show S&kipped Items"
msgstr "Kihagyott elemek mutatása"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWBINARIES
-#: Merge.rc:466
+#: Merge.rc:470
#, c-format
msgid "S&how Binary Files"
msgstr "Bináris fájlok mutatása"
#. IDR_DIRDOCTYPE
-#: Merge.rc:467
+#: Merge.rc:471
#, c-format
msgid "&3-way Compare"
msgstr "3-utas összehasonlítás"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWDIFFERENTLEFTONLY
-#: Merge.rc:469
+#: Merge.rc:473
#, c-format
msgid "Show &Left Only Different Items"
msgstr "Csak a bal különböző elemeinek megjelenítése"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWDIFFERENTMIDDLEONLY
-#: Merge.rc:470
+#: Merge.rc:474
#, c-format
msgid "Show &Middle Only Different Items"
msgstr "Csak a középső különböző elemeinek megjelenítése"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWDIFFERENTRIGHTONLY
-#: Merge.rc:471
+#: Merge.rc:475
#, c-format
msgid "Show &Right Only Different Items"
msgstr "Csak a jobb különböző elemeinek megjelenítése"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWMISSINGLEFTONLY
-#: Merge.rc:473
+#: Merge.rc:477
msgid "Show L&eft Only Missing Items"
msgstr "Csak a bal hiányzó elemeinek megjelenítése"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWMISSINGMIDDLEONLY
-#: Merge.rc:474
+#: Merge.rc:478
msgid "Show Mi&ddle Only Missing Items"
msgstr "Csak a középső hiányzó elemeinek megjelenítése"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWMISSINGRIGHTONLY
-#: Merge.rc:475
+#: Merge.rc:479
msgid "Show Rig&ht Only Missing Items"
msgstr "Csak a jobb hiányzó elemeinek megjelenítése"
#. IDR_DIRDOCTYPE, ID_VIEW_SHOWHIDDENITEMS
-#: Merge.rc:478
+#: Merge.rc:482
#, c-format
msgid "Show Hidd&en Items"
msgstr "&Rejtett elemek mutatása"
#. IDR_DIRDOCTYPE, ID_VIEW_TREEMODE
-#: Merge.rc:480
+#: Merge.rc:484
#, c-format
msgid "Tree &Mode"
msgstr "Fa &mód"
#. IDR_DIRDOCTYPE
-#: Merge.rc:481
+#: Merge.rc:485
msgid "E&xpand Subfolders"
msgstr "Almappák ki&bontása"
#. IDR_DIRDOCTYPE, ID_VIEW_EXPAND_ALLSUBDIRS
-#: Merge.rc:483
+#: Merge.rc:487
msgid "&All Subfolders"
msgstr "&Összes almappa"
#. IDR_DIRDOCTYPE, ID_VIEW_EXPAND_DIFFERENT_SUBDIRS
-#: Merge.rc:484
+#: Merge.rc:488
msgid "&Different Subfolders"
msgstr "&Különböző almappák"
#. IDR_DIRDOCTYPE, ID_VIEW_EXPAND_IDENTICAL_SUBDIRS
-#: Merge.rc:485
+#: Merge.rc:489
msgid "&Identical Subfolders"
msgstr "&Azonos almappák"
#. IDR_DIRDOCTYPE, ID_VIEW_COLLAPSE_ALLSUBDIRS
-#: Merge.rc:487
+#: Merge.rc:491
#, c-format
msgid "&Collapse All Subfolders"
msgstr "Minden alkönyvtár bezárása"
#. IDR_DIRDOCTYPE, ID_VIEW_SHOW_EMPTY_FOLDERS
-#: Merge.rc:488
+#: Merge.rc:492
msgid "Show &Empty Folders"
msgstr ""
#. IDR_MERGEDOCTYPE, ID_VIEW_SELECTFONT
-#: Merge.rc:490 Merge.rc:697
+#: Merge.rc:494 Merge.rc:704
#, c-format
msgid "Select &Font..."
msgstr "Betűtípus..."
#. IDR_MERGEDOCTYPE, ID_VIEW_USEDEFAULTFONT
-#: Merge.rc:491 Merge.rc:698
+#: Merge.rc:495 Merge.rc:705
#, c-format
msgid "Use Default Font"
msgstr "Alapértelmezett betűtípus használata"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:493 Merge.rc:736
+#: Merge.rc:497 Merge.rc:743
#, c-format
msgid "Sw&ap Panes"
msgstr "Panelek megcserélése"
#. IDR_MERGEDOCTYPE, ID_SWAPPANES_SWAP12
-#: Merge.rc:495 Merge.rc:738
+#: Merge.rc:499 Merge.rc:745
msgid "Swap &1st | 2nd"
msgstr "Csere 1-2"
#. IDR_MERGEDOCTYPE, ID_SWAPPANES_SWAP23
-#: Merge.rc:496 Merge.rc:739
+#: Merge.rc:500 Merge.rc:746
msgid "Swap &2nd | 3rd"
msgstr "Csere 2-3"
#. IDR_MERGEDOCTYPE, ID_SWAPPANES_SWAP13
-#: Merge.rc:497 Merge.rc:740
+#: Merge.rc:501 Merge.rc:747
msgid "Swap 1st | &3rd"
msgstr "Csere 1-3"
#. IDR_DIRDOCTYPE, ID_VIEW_DISPLAY_FILTER_BAR_MENU
-#: Merge.rc:514
+#: Merge.rc:518
msgid "Displa&y Filter Bar\tCtrl+Shift+L"
msgstr "Szűrősáv &megjelenítése\tCtrl+Shift+L"
#. IDR_DIRDOCTYPE, ID_VIEW_DIR_STATISTICS
-#: Merge.rc:518
+#: Merge.rc:522
#, c-format
msgid "Com&pare Statistics..."
msgstr "Összehasonlítási statisztika..."
#. IDR_MERGEDOCTYPE, ID_REFRESH
-#: Merge.rc:520 Merge.rc:763
+#: Merge.rc:524 Merge.rc:770
#, c-format
msgid "Refresh\tF5"
msgstr "&Frissítés\tF5"
#. IDR_POPUP_DIRVIEW, ID_RESCAN
-#: Merge.rc:521 Merge.rc:1030
+#: Merge.rc:525 Merge.rc:1038
#, c-format
msgid "&Refresh Selected\tCtrl+F5"
msgstr "Kijelöltek frissítése\tCtrl+F5"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:523 Merge.rc:765
+#: Merge.rc:527 Merge.rc:772
#, c-format
msgid "&Merge"
msgstr "Egyesítés"
#. IDR_DIRDOCTYPE, ID_MERGE_COMPARE
-#: Merge.rc:525
+#: Merge.rc:529
#, c-format
msgid "Co&mpare\tEnter"
msgstr "&Összehasonlítás\tEnter"
#. IDR_MERGEDOCTYPE, ID_NEXTDIFF
-#: Merge.rc:527 Merge.rc:767
+#: Merge.rc:531 Merge.rc:774
#, c-format
msgid "&Next Difference\tAlt+Down"
msgstr "&Következő eltérés\tAlt+Le"
#. IDR_MERGEDOCTYPE, ID_PREVDIFF
-#: Merge.rc:528 Merge.rc:768
+#: Merge.rc:532 Merge.rc:775
#, c-format
msgid "&Previous Difference\tAlt+Up"
msgstr "&Előző eltérés\tAlt+Fel"
#. IDR_MERGEDOCTYPE, ID_FIRSTDIFF
-#: Merge.rc:530 Merge.rc:773
+#: Merge.rc:534 Merge.rc:780
#, c-format
msgid "&First Difference\tAlt+Home"
msgstr "E&lső eltérés\tAlt+Home"
#. IDR_MERGEDOCTYPE, ID_CURDIFF
-#: Merge.rc:531 Merge.rc:774
+#: Merge.rc:535 Merge.rc:781
#, c-format
msgid "&Current Difference\tAlt+Enter"
msgstr "&Aktuális eltérés\tAlt+Enter"
#. IDR_MERGEDOCTYPE, ID_LASTDIFF
-#: Merge.rc:532 Merge.rc:775
+#: Merge.rc:536 Merge.rc:782
#, c-format
msgid "&Last Difference\tAlt+End"
msgstr "&Utolsó eltérés\tAlt+End"
#. IDR_MERGEDOCTYPE, ID_L2R
-#: Merge.rc:534 Merge.rc:830
+#: Merge.rc:538 Merge.rc:837
#, c-format
msgid "Copy to &Right\tAlt+Right"
msgstr "Másolás jobbra\tAlt+Jobbra"
#. IDR_MERGEDOCTYPE, ID_R2L
-#: Merge.rc:535 Merge.rc:831
+#: Merge.rc:539 Merge.rc:838
#, c-format
msgid "Copy to L&eft\tAlt+Left"
msgstr "Másolás balra\tAlt+Balra"
#. IDR_DIRDOCTYPE, ID_MERGE_DELETE
-#: Merge.rc:537
+#: Merge.rc:541
#, c-format
msgid "&Delete\tDel"
msgstr "&Törlés\tDel"
#. IDR_POPUP_DIRVIEW, ID_TOOLS_CUSTOMIZECOLUMNS
-#: Merge.rc:541 Merge.rc:1042
+#: Merge.rc:545 Merge.rc:1050
#, c-format
msgid "&Customize Columns..."
msgstr "&Oszlopok testreszabása..."
#. IDR_MERGEDOCTYPE, ID_TOOLS_GENERATEREPORT
-#: Merge.rc:544 Merge.rc:851
+#: Merge.rc:548 Merge.rc:858
#, c-format
msgid "Generate &Report..."
msgstr "&Jelentés készítése..."
#. IDD_ENCODINGERROR, IDC_PLUGIN
-#: Merge.rc:556 Merge.rc:867 Merge.rc:3064
+#: Merge.rc:560 Merge.rc:874 Merge.rc:3074
#, c-format
msgid "&Edit with Unpacker..."
msgstr "Szerkesztés kicsomagolóval..."
#. IDR_MERGEDOCTYPE, ID_FILE_SAVE
-#: Merge.rc:611
+#: Merge.rc:617
#, c-format
msgid "&Save\tCtrl+S"
msgstr "&Mentés\tCtrl+S"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:612
+#: Merge.rc:618
#, c-format
msgid "Sav&e"
msgstr "Mentés"
#. IDR_POPUP_SAVE, ID_FILE_SAVE_LEFT
-#: Merge.rc:614 Merge.rc:1201
+#: Merge.rc:620 Merge.rc:1211
#, c-format
msgid "Save &Left"
msgstr "&Bal oldal mentése"
#. IDR_POPUP_SAVE, ID_FILE_SAVE_MIDDLE
-#: Merge.rc:615 Merge.rc:1202
+#: Merge.rc:621 Merge.rc:1212
#, c-format
msgid "Save &Middle"
msgstr "Középső mentése"
#. IDR_POPUP_SAVE, ID_FILE_SAVE_RIGHT
-#: Merge.rc:616 Merge.rc:1203
+#: Merge.rc:622 Merge.rc:1213
#, c-format
msgid "Save &Right"
msgstr "&Jobb oldal mentése"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:618
+#: Merge.rc:624
#, c-format
msgid "Save &As"
msgstr "Mentés másként"
#. IDR_POPUP_SAVE, ID_FILE_SAVEAS_LEFT
-#: Merge.rc:620 Merge.rc:1205
+#: Merge.rc:626 Merge.rc:1215
#, c-format
msgid "Save &Left As..."
msgstr "Bal mentése mint..."
#. IDR_POPUP_SAVE, ID_FILE_SAVEAS_MIDDLE
-#: Merge.rc:621 Merge.rc:1206
+#: Merge.rc:627 Merge.rc:1216
#, c-format
msgid "Save &Middle As..."
msgstr "Középső mentése mint..."
#. IDR_POPUP_SAVE, ID_FILE_SAVEAS_RIGHT
-#: Merge.rc:622 Merge.rc:1207
+#: Merge.rc:628 Merge.rc:1217
#, c-format
msgid "Save &Right As..."
msgstr "Jobb mentése mint..."
#. IDR_MERGEDOCTYPE, ID_FILE_PRINT
-#: Merge.rc:625
+#: Merge.rc:631
msgid "&Print...\tCtrl+P"
msgstr "Nyomtatás...\tCtrl+P"
#. IDR_MERGEDOCTYPE, ID_FILE_PAGE_SETUP
-#: Merge.rc:626
+#: Merge.rc:632
msgid "Page Set&up..."
msgstr "Oldalbeállítás..."
#. IDR_MERGEDOCTYPE, ID_FILE_PRINT_PREVIEW
-#: Merge.rc:627
+#: Merge.rc:633
msgid "Print Previe&w..."
msgstr "Nyomtatási kép..."
#. IDR_MERGEDOCTYPE
-#: Merge.rc:636
+#: Merge.rc:642
#, c-format
msgid "&Convert Line Endings to"
msgstr "Sorvégek átalakítása erre"
#. IDR_MERGEDOCTYPE, ID_FILE_MERGINGMODE
-#: Merge.rc:643
+#: Merge.rc:649
#, c-format
msgid "Mer&ge Mode\tF9"
msgstr "&Egyesítési mód\tF9"
#. IDR_MERGEDOCTYPE, ID_RESCAN
-#: Merge.rc:645
+#: Merge.rc:651
msgid "Reloa&d\tCtrl+F5"
msgstr "Újratöltés\tCtrl+F5"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:647
+#: Merge.rc:653
#, c-format
msgid "Reco&mpare As"
msgstr "Újra összehasonlítás mint"
+#. IDR_POPUP_COMPARE, ID_MERGE_COMPARE_FOLDER
+#: Merge.rc:660 Merge.rc:947 Merge.rc:1185
+msgid "A&rchive"
+msgstr ""
+
#. IDR_MERGEDOCTYPE, ID_EDIT_UNDO
-#: Merge.rc:666
+#: Merge.rc:673
#, c-format
msgid "&Undo\tCtrl+Z"
msgstr "&Visszavonás\tCtrl+Z"
#. IDR_MERGEDOCTYPE, ID_EDIT_REDO
-#: Merge.rc:667
+#: Merge.rc:674
#, c-format
msgid "&Redo\tCtrl+Y"
msgstr "Még&is\tCtrl+Y"
#. IDR_MERGEDOCTYPE, ID_EDIT_CUT
-#: Merge.rc:669
+#: Merge.rc:676
#, c-format
msgid "Cu&t\tCtrl+X"
msgstr "&Kivágás\tCtrl+X"
#. IDR_POPUP_OUTPUTVIEW, ID_EDIT_COPY
-#: Merge.rc:670 Merge.rc:1342
+#: Merge.rc:677 Merge.rc:1352
#, c-format
msgid "&Copy\tCtrl+C"
msgstr "&Másolás\tCtrl+C"
#. IDR_MERGEDOCTYPE, ID_EDIT_FIND
-#: Merge.rc:676
+#: Merge.rc:683
#, c-format
msgid "F&ind...\tCtrl+F"
msgstr "Keresé&s...\tCtrl+F"
#. IDR_MERGEDOCTYPE, ID_EDIT_REPLACE
-#: Merge.rc:677
+#: Merge.rc:684
#, c-format
msgid "Repla&ce...\tCtrl+H"
msgstr "&Csere...\tCtrl+H"
#. IDR_MERGEDOCTYPE, ID_EDIT_MARK
-#: Merge.rc:678
+#: Merge.rc:685
#, c-format
msgid "&Marker...\tCtrl+Shift+M"
msgstr "Jelölő...\tCtrl+Shift+M"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:680
+#: Merge.rc:687
#, c-format
msgid "Advanced"
msgstr "Haladó"
#. IDR_MERGEDOCTYPE, ID_EDIT_COPY_LINENUMBERS
-#: Merge.rc:682
+#: Merge.rc:689
#, c-format
msgid "&Copy With Line Numbers\tCtrl+Shift+C"
msgstr "&Másolás sorszámokkal együtt\tCtrl+Shift+C"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:684
+#: Merge.rc:691
#, c-format
msgid "&Bookmarks"
msgstr "Könyvjelzők"
#. IDR_MERGEDOCTYPE, ID_EDIT_TOGGLE_BOOKMARK
-#: Merge.rc:686
+#: Merge.rc:693
#, c-format
msgid "&Toggle Bookmark\tCtrl+F2"
msgstr "Könyvjelző ki/be\tCtrl+F2"
#. IDR_MERGEDOCTYPE, ID_EDIT_GOTO_NEXT_BOOKMARK
-#: Merge.rc:687
+#: Merge.rc:694
#, c-format
msgid "&Next Bookmark\tF2"
msgstr "Következő könyvjelző\tF2"
#. IDR_MERGEDOCTYPE, ID_EDIT_GOTO_PREV_BOOKMARK
-#: Merge.rc:688
+#: Merge.rc:695
#, c-format
msgid "&Previous Bookmark\tShift+F2"
msgstr "Előző könyvjelző\tShift+F2"
#. IDR_MERGEDOCTYPE, ID_EDIT_CLEAR_ALL_BOOKMARKS
-#: Merge.rc:689
+#: Merge.rc:696
#, c-format
msgid "&Clear All Bookmarks"
msgstr "Összes könyvjelző törlése"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:706
+#: Merge.rc:713
#, c-format
msgid "Syntax Highlight"
msgstr "Szintaxis kiemelés"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:711
+#: Merge.rc:718
#, c-format
msgid "&Diff Context"
msgstr "Különbség összefüggés"
#. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_ALL
-#: Merge.rc:713
+#: Merge.rc:720
#, c-format
msgid "&All Lines"
msgstr "Minden sor"
#. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_0
-#: Merge.rc:715
+#: Merge.rc:722
#, c-format
msgid "&0 Lines"
msgstr "0 sor"
#. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_1
-#: Merge.rc:716
+#: Merge.rc:723
#, c-format
msgid "&1 Line"
msgstr "1 sor"
#. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_3
-#: Merge.rc:717
+#: Merge.rc:724
#, c-format
msgid "&3 Lines"
msgstr "3 sor"
#. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_5
-#: Merge.rc:718
+#: Merge.rc:725
#, c-format
msgid "&5 Lines"
msgstr "5 sor"
#. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_7
-#: Merge.rc:719
+#: Merge.rc:726
#, c-format
msgid "&7 Lines"
msgstr "7 sor"
#. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_9
-#: Merge.rc:720
+#: Merge.rc:727
#, c-format
msgid "&9 Lines"
msgstr "9 sor"
#. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_TOGGLE
-#: Merge.rc:722
+#: Merge.rc:729
#, c-format
msgid "&Toggle All and 0-9 Lines\tCtrl+D"
msgstr "Váltás a minden és a 0-9 számú sorok között"
#. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_INVERT
-#: Merge.rc:724
+#: Merge.rc:731
msgid "&Invert (Hide Different Lines)"
msgstr "Invertálás (a nem egyforma sorok rejtése)"
#. IDR_MERGEDOCTYPE, ID_VIEW_RESIZE_PANES
-#: Merge.rc:727
+#: Merge.rc:734
#, c-format
msgid "&Lock Panes"
msgstr "Pane&lek rögzítése"
#. IDR_MERGEDOCTYPE, ID_VIEW_WHITESPACE
-#: Merge.rc:728
+#: Merge.rc:735
#, c-format
msgid "&View Whitespace"
msgstr "&Szóközök mutatása"
#. IDR_MERGEDOCTYPE, ID_VIEW_EOL
-#: Merge.rc:729
+#: Merge.rc:736
msgid "View E&OL"
msgstr "Sorvég jel mutatása"
#. IDR_MERGEDOCTYPE, ID_VIEW_LINEDIFFS
-#: Merge.rc:730
+#: Merge.rc:737
#, c-format
msgid "Vie&w Line Differences"
msgstr "Eltérő sorok mutatása"
#. IDR_MERGEDOCTYPE, ID_VIEW_LINENUMBERS
-#: Merge.rc:731
+#: Merge.rc:738
#, c-format
msgid "View Line &Numbers"
msgstr "Sorszámok megjelenítése"
#. IDR_MERGEDOCTYPE, ID_VIEW_SELMARGIN
-#: Merge.rc:732
+#: Merge.rc:739
#, c-format
msgid "View &Margins"
msgstr "Margók megjelenítése"
#. IDR_MERGEDOCTYPE, ID_VIEW_TOPMARGIN
-#: Merge.rc:733
+#: Merge.rc:740
msgid "View To&p Margins"
msgstr "Felső margók megjelenítése"
#. IDR_MERGEDOCTYPE, ID_VIEW_WORDWRAP
-#: Merge.rc:734
+#: Merge.rc:741
#, c-format
msgid "W&rap Lines"
msgstr "Sortördelés"
#. IDR_MERGEDOCTYPE, ID_VIEW_SPLITVERTICALLY
-#: Merge.rc:742
+#: Merge.rc:749
#, c-format
msgid "Split V&ertically"
msgstr "Függőlegesen felosztva"
#. IDR_MERGEDOCTYPE, ID_VIEW_DETAIL_BAR
-#: Merge.rc:759
+#: Merge.rc:766
#, c-format
msgid "Diff &Pane"
msgstr "Eltérés panel"
#. IDR_MERGEDOCTYPE, ID_VIEW_LOCATION_BAR
-#: Merge.rc:760
+#: Merge.rc:767
#, c-format
msgid "Lo&cation Pane"
msgstr "Eltérések helye"
#. IDS_OUTPUTBAR_CAPTION
-#: Merge.rc:761 Merge.rc:4902
+#: Merge.rc:768 Merge.rc:4912
msgid "Output Pane"
msgstr "Kimenet panel"
#. IDR_MERGEDOCTYPE, ID_NEXTCONFLICT
-#: Merge.rc:770
+#: Merge.rc:777
#, c-format
msgid "Ne&xt Conflict\tAlt+Shift+Down"
msgstr "Következő konfliktus\tAlt+Shift+Le"
#. IDR_MERGEDOCTYPE, ID_PREVCONFLICT
-#: Merge.rc:771
+#: Merge.rc:778
#, c-format
msgid "Pre&vious Conflict\tAlt+Shift+Up"
msgstr "Előző konfliktus\tAlt+Shift+Fel"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:777
+#: Merge.rc:784
#, c-format
msgid "A&dvanced"
msgstr "Haladó"
#. IDR_MERGEDOCTYPE, ID_NEXTDIFFLM
-#: Merge.rc:779
+#: Merge.rc:786
#, c-format
msgid "Next Difference (Left/Middle)\tAlt+1"
msgstr "Következő különbség a bal és a középső között\tAlt+1"
#. IDR_MERGEDOCTYPE, ID_PREVDIFFLM
-#: Merge.rc:780
+#: Merge.rc:787
#, c-format
msgid "Previous Difference (Left/Middle)\tAlt+Shift+1"
msgstr "Előző különbség a bal és a középső között\tAlt+Shift+1"
#. IDR_MERGEDOCTYPE, ID_NEXTDIFFLR
-#: Merge.rc:782
+#: Merge.rc:789
#, c-format
msgid "Next Difference (Left/Right)\tAlt+2"
msgstr "Következő különbség a bal és a jobb között\tAlt+2"
#. IDR_MERGEDOCTYPE, ID_PREVDIFFLR
-#: Merge.rc:783
+#: Merge.rc:790
#, c-format
msgid "Previous Difference (Left/Right)\tAlt+Shift+2"
msgstr "Előző különbség a bal és a jobb között\tAlt+Shift+2"
#. IDR_MERGEDOCTYPE, ID_NEXTDIFFMR
-#: Merge.rc:785
+#: Merge.rc:792
#, c-format
msgid "Next Difference (Middle/Right)\tAlt+3"
msgstr "Következő különbség a középső és a jobb között\tAlt+3"
#. IDR_MERGEDOCTYPE, ID_PREVDIFFMR
-#: Merge.rc:786
+#: Merge.rc:793
#, c-format
msgid "Previous Difference (Middle/Right)\tAlt+Shift+3"
msgstr "Előző különbség a középső és a jobb között\tAlt+Shift+3"
#. IDR_MERGEDOCTYPE, ID_NEXTDIFFLO
-#: Merge.rc:788
+#: Merge.rc:795
#, c-format
msgid "Next Left-Only Difference\tAlt+7"
msgstr "A következő csak bal oldali különbség\tAlt+7"
#. IDR_MERGEDOCTYPE, ID_PREVDIFFLO
-#: Merge.rc:789
+#: Merge.rc:796
#, c-format
msgid "Previous Left-Only Difference\tAlt+Shift+7"
msgstr "Az előző csak bal oldali különbség\tAlt+Shift+7"
#. IDR_MERGEDOCTYPE, ID_NEXTDIFFMO
-#: Merge.rc:791
+#: Merge.rc:798
#, c-format
msgid "Next Middle-Only Difference\tAlt+8"
msgstr "A következő csak középső különbség\tAlt+8"
#. IDR_MERGEDOCTYPE, ID_PREVDIFFMO
-#: Merge.rc:792
+#: Merge.rc:799
#, c-format
msgid "Previous Middle-Only Difference\tAlt+Shift+8"
msgstr "Az előző csak középső különbség\tAlt+Shift+8"
#. IDR_MERGEDOCTYPE, ID_NEXTDIFFRO
-#: Merge.rc:794
+#: Merge.rc:801
#, c-format
msgid "Next Right-Only Difference\tAlt+9"
msgstr "A következő csak jobb oldali különbség\tAlt+9"
#. IDR_MERGEDOCTYPE, ID_PREVDIFFRO
-#: Merge.rc:795
+#: Merge.rc:802
#, c-format
msgid "Previous Right-Only Difference\tAlt+Shift+9"
msgstr "Az előző csak jobb oldali különbség\tAlt+Shift+9"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:797
+#: Merge.rc:804
msgid "Copy from &Left to"
msgstr "Másolás balról ide:"
#. IDD_LOAD_SAVE_CODEPAGE, IDC_AFFECTS_MIDDLE_BTN
-#: Merge.rc:799 Merge.rc:810 Merge.rc:815 Merge.rc:826 Merge.rc:970
-#: Merge.rc:2545 Merge.rc:2817
+#: Merge.rc:806 Merge.rc:817 Merge.rc:822 Merge.rc:833 Merge.rc:978
+#: Merge.rc:2555 Merge.rc:2827
#, c-format
msgid "&Middle"
msgstr "Középső"
#. IDD_LOAD_SAVE_CODEPAGE, IDC_AFFECTS_RIGHT_BTN
-#: Merge.rc:800 Merge.rc:805 Merge.rc:816 Merge.rc:821 Merge.rc:971
-#: Merge.rc:2546 Merge.rc:2819
+#: Merge.rc:807 Merge.rc:812 Merge.rc:823 Merge.rc:828 Merge.rc:979
+#: Merge.rc:2556 Merge.rc:2829
#, c-format
msgid "&Right"
msgstr "Jobb"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:802
+#: Merge.rc:809
msgid "Copy from &Middle to"
msgstr "Másolás középről ide:"
#. IDD_LOAD_SAVE_CODEPAGE, IDC_AFFECTS_LEFT_BTN
-#: Merge.rc:804 Merge.rc:809 Merge.rc:820 Merge.rc:825 Merge.rc:969
-#: Merge.rc:2544 Merge.rc:2815
+#: Merge.rc:811 Merge.rc:816 Merge.rc:827 Merge.rc:832 Merge.rc:977
+#: Merge.rc:2554 Merge.rc:2825
#, c-format
msgid "&Left"
msgstr "Bal"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:807
+#: Merge.rc:814
msgid "Copy from &Right to"
msgstr "Másolás jobbról ide:"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:813
+#: Merge.rc:820
msgid "Copy Selected Lines from Le&ft to"
msgstr "A kijelölt sor(ok)másolása balról ide:"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:818
+#: Merge.rc:825
msgid "Copy Selected Lines from Mi&ddle to"
msgstr "A kijelölt sor(ok)másolása középről ide:"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:823
+#: Merge.rc:830
msgid "Copy Selected Lines from Ri&ght to"
msgstr "A kijelölt sor(ok)másolása jobbról ide:"
#. IDR_MERGEDOCTYPE, ID_COPY_FROM_LEFT
-#: Merge.rc:833
+#: Merge.rc:840
#, c-format
msgid "Copy from Left\tAlt+Shift+Right"
msgstr "Másolás balról\tAlt+Shift+Jobbra"
#. IDR_MERGEDOCTYPE, ID_COPY_FROM_RIGHT
-#: Merge.rc:834
+#: Merge.rc:841
#, c-format
msgid "Copy from Right\tAlt+Shift+Left"
msgstr "Másolás jobbról\tAlt+Shift+Balra"
#. IDR_MERGEDOCTYPE, ID_L2RNEXT
-#: Merge.rc:836
+#: Merge.rc:843
msgid "C&opy to Right and Advance\tCtrl+Alt+Right"
msgstr "Másolás jobbra és továbblépés\tCtrl+Alt+Jobbra"
#. IDR_MERGEDOCTYPE, ID_R2LNEXT
-#: Merge.rc:837
+#: Merge.rc:844
msgid "Copy &to Left and Advance\tCtrl+Alt+Left"
msgstr "Másolás balra és továbblépés\tCtrl+Alt+Balra"
#. IDR_MERGEDOCTYPE, ID_ALL_RIGHT
-#: Merge.rc:839
+#: Merge.rc:846
#, c-format
msgid "Copy &All to Right"
msgstr "Az összes másolása jobbra"
#. IDR_MERGEDOCTYPE, ID_ALL_LEFT
-#: Merge.rc:840
+#: Merge.rc:847
#, c-format
msgid "Cop&y All to Left"
msgstr "Az összes másolása balra"
#. IDR_MERGEDOCTYPE, ID_AUTO_MERGE
-#: Merge.rc:842
+#: Merge.rc:849
msgid "A&uto Merge\tCtrl+Alt+M"
msgstr "Automatikus egyesítés\tCtrl+Alt+M"
#. IDR_MERGEDOCTYPE, ID_ADD_SYNCPOINT
-#: Merge.rc:844
+#: Merge.rc:851
#, c-format
msgid "Add &Synchronization Point\tAlt+S"
msgstr "Hozzáadás és szinkronizációs pont\tAlt+S"
#. IDR_MERGEDOCTYPE, ID_CLEAR_SYNCPOINTS
-#: Merge.rc:845
+#: Merge.rc:852
#, c-format
msgid "Clear Sync&hronization Points"
msgstr "Szinkronizációs pontok törlése"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:863
+#: Merge.rc:870
msgid "Unpac&ker"
msgstr "Kicsomagoló"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:869
+#: Merge.rc:876
#, c-format
msgid "&Prediffer"
msgstr "&Elővizsgáló"
#. IDR_MERGEDOCTYPE, ID_APPLY_PREDIFFER
-#: Merge.rc:873
+#: Merge.rc:880
msgid "Apply Pre&differ..."
msgstr "Elővizsgáló alkalmazása..."
#. IDR_MERGEDOCTYPE, ID_TRANSFORM_WITH_SCRIPT
-#: Merge.rc:879
+#: Merge.rc:886
msgid "&Transform with Editor Script..."
msgstr "Átalakítás a szerkesztő szkriptjével ..."
#. IDR_MERGEDOCTYPE
-#: Merge.rc:880
+#: Merge.rc:887
msgid "Scripts for &Copying"
msgstr "Szkriptek &másoláshoz"
#. IDR_MERGEDOCTYPE, ID_SELECT_EDITOR_SCRIPT_FOR_COPYING
-#: Merge.rc:886
+#: Merge.rc:893
msgid "Select &Editor Script..."
msgstr "Válassz szerkesztő szkriptet..."
#. IDR_MERGEDOCTYPE, ID_WINDOW_SPLIT
-#: Merge.rc:898
+#: Merge.rc:905
#, c-format
msgid "Sp&lit"
msgstr "Felosztás"
#. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE
-#: Merge.rc:921
+#: Merge.rc:928
#, c-format
msgid "Comp&are"
msgstr "&Összehasonlít"
#. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE_WITH_MOVED_RENAMED
-#: Merge.rc:922
+#: Merge.rc:929
msgid "Compar&e with Renamed/Moved Items"
msgstr "Összehasonlítá&s átnevezett/áthelyezett elemekkel"
#. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE_IN_NEW_WINDOW
-#: Merge.rc:923
+#: Merge.rc:930
msgid "Compare in New &Window"
msgstr "Összehasonlítás új ablakban"
#. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE_NONHORIZONTALLY
-#: Merge.rc:924 Merge.rc:931
+#: Merge.rc:931 Merge.rc:938
msgid "Compare Non-hor&izontally..."
msgstr "Nem vízszintes összehasonlítás..."
#. IDR_POPUP_DIRVIEW
-#: Merge.rc:925
+#: Merge.rc:932
#, c-format
msgid "Compare Non-hor&izontally"
msgstr "Nem vízszintes összehasonlítás"
#. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE_LEFT1_LEFT2
-#: Merge.rc:927
+#: Merge.rc:934
#, c-format
msgid "First &Left with Second Left"
msgstr "Első bal elem a második bal elemmel"
#. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE_RIGHT1_RIGHT2
-#: Merge.rc:928
+#: Merge.rc:935
#, c-format
msgid "First &Right with Second Right"
msgstr "Első jobb elem a második jobb elemmel"
#. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE_LEFT1_RIGHT2
-#: Merge.rc:929
+#: Merge.rc:936
#, c-format
msgid "&First Left with Second Right"
msgstr "Első bal elem a második jobb elemmel"
#. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE_LEFT2_RIGHT1
-#: Merge.rc:930
+#: Merge.rc:937
#, c-format
msgid "&Second Left with First Right"
msgstr "Második bal elem az első jobb elemmel"
#. IDR_POPUP_DIRVIEW
-#: Merge.rc:933
+#: Merge.rc:940
#, c-format
msgid "Co&mpare As"
msgstr "Összehasonlítás mint"
#. IDS_COPY_LEFT_TO_MIDDLE2
-#: Merge.rc:945 Merge.rc:957 Merge.rc:4502
+#: Merge.rc:953 Merge.rc:965 Merge.rc:4512
#, c-format
msgid "Left to Middle (%1 of %2)"
msgstr "Bal a középsővel (%1 / %2)"
#. IDS_COPY_LEFT_TO_RIGHT2
-#: Merge.rc:946 Merge.rc:958 Merge.rc:4501
+#: Merge.rc:954 Merge.rc:966 Merge.rc:4511
#, c-format
msgid "Left to Right (%1 of %2)"
msgstr "Bal a jobbal (%1 / %2)"
#. IDS_MOVE_LEFT_TO2
-#: Merge.rc:947 Merge.rc:959 Merge.rc:1022 Merge.rc:4513 Merge.rc:4542
+#: Merge.rc:955 Merge.rc:967 Merge.rc:1030 Merge.rc:4523 Merge.rc:4552
#, c-format
msgid "Left to... (%1 of %2)"
msgstr "Bal a... (%1 / %2)"
#. IDS_COPY_MIDDLE_TO_LEFT2
-#: Merge.rc:948 Merge.rc:960 Merge.rc:4499
+#: Merge.rc:956 Merge.rc:968 Merge.rc:4509
#, c-format
msgid "Middle to Left (%1 of %2)"
msgstr "Középső a ballal (%1 / %2)"
#. IDS_COPY_MIDDLE_TO_RIGHT2
-#: Merge.rc:949 Merge.rc:961 Merge.rc:4500
+#: Merge.rc:957 Merge.rc:969 Merge.rc:4510
#, c-format
msgid "Middle to Right (%1 of %2)"
msgstr "Középső a jobbal (%1 / %2)"
#. IDS_MOVE_MIDDLE_TO2
-#: Merge.rc:950 Merge.rc:962 Merge.rc:1023 Merge.rc:4514 Merge.rc:4543
+#: Merge.rc:958 Merge.rc:970 Merge.rc:1031 Merge.rc:4524 Merge.rc:4553
#, c-format
msgid "Middle to... (%1 of %2)"
msgstr "A középső a... (%1 / %2)"
#. IDS_COPY_RIGHT_TO_MIDDLE2
-#: Merge.rc:951 Merge.rc:963 Merge.rc:4498
+#: Merge.rc:959 Merge.rc:971 Merge.rc:4508
#, c-format
msgid "Right to Middle (%1 of %2)"
msgstr "Jobb a középsővel (%1 / %2)"
#. IDS_COPY_RIGHT_TO_LEFT2
-#: Merge.rc:952 Merge.rc:964 Merge.rc:4497
+#: Merge.rc:960 Merge.rc:972 Merge.rc:4507
#, c-format
msgid "Right to Left (%1 of %2)"
msgstr "Jobb a ballal (%1 / %2)"
#. IDS_MOVE_RIGHT_TO2
-#: Merge.rc:953 Merge.rc:965 Merge.rc:1024 Merge.rc:4515 Merge.rc:4544
+#: Merge.rc:961 Merge.rc:973 Merge.rc:1032 Merge.rc:4525 Merge.rc:4554
#, c-format
msgid "Right to... (%1 of %2)"
msgstr "Jobb a... (%1 of %2)"
#. IDD_EDIT_MARKER, IDC_EDIT_MARKER_DELETE
-#: Merge.rc:967 Merge.rc:2036
+#: Merge.rc:975 Merge.rc:2046
#, c-format
msgid "&Delete"
msgstr "&Törlés"
#. IDR_POPUP_DIRVIEW, ID_DIR_DEL_BOTH
-#: Merge.rc:972
+#: Merge.rc:980
#, c-format
msgid "&Both"
msgstr "Mindkettő"
#. IDR_POPUP_DIRVIEW, ID_DIR_DEL_ALL
-#: Merge.rc:973
+#: Merge.rc:981
#, c-format
msgid "&All"
msgstr "Mind"
#. IDD_EDIT_REPLACE, IDC_EDIT_SCOPE_SELECTION
-#: Merge.rc:974 Merge.rc:2019
+#: Merge.rc:982 Merge.rc:2029
#, c-format
msgid "&Selection"
msgstr "&Kijelölés"
#. IDR_POPUP_DIRVIEW, ID_DIR_ITEM_RENAME
-#: Merge.rc:976
+#: Merge.rc:984
#, c-format
msgid "Re&name"
msgstr "Át&nevezés"
#. IDR_POPUP_DIRVIEW, ID_DIR_HIDE_FILENAMES
-#: Merge.rc:977
+#: Merge.rc:985
#, c-format
msgid "&Hide Items"
msgstr "Elemek &rejtése"
#. IDR_POPUP_DIRVIEW
-#: Merge.rc:979
+#: Merge.rc:987
#, c-format
msgid "&Open Left"
msgstr "Bal megnyitása"
#. IDR_POPUP_DIRVIEW
-#: Merge.rc:986
+#: Merge.rc:994
#, c-format
msgid "Open Midd&le"
msgstr "Középső megnyitása"
#. IDR_POPUP_DIRVIEW
-#: Merge.rc:993
+#: Merge.rc:1001
#, c-format
msgid "O&pen Right"
msgstr "Jobb megnyitása"
#. IDR_POPUP_DIRVIEW
-#: Merge.rc:1001
+#: Merge.rc:1009
#, c-format
msgid "Cop&y Paths"
msgstr "Elérési utak másolása"
#. IDS_DEL_LEFT_FMT2
-#: Merge.rc:1003 Merge.rc:1012 Merge.rc:4530
+#: Merge.rc:1011 Merge.rc:1020 Merge.rc:4540
#, c-format
msgid "Left (%1 of %2)"
msgstr "Bal (%1 / %2)"
#. IDS_DEL_MIDDLE_FMT2
-#: Merge.rc:1004 Merge.rc:1013 Merge.rc:4531
+#: Merge.rc:1012 Merge.rc:1021 Merge.rc:4541
#, c-format
msgid "Middle (%1 of %2)"
msgstr "Középső (%1 / %2)"
#. IDS_DEL_RIGHT_FMT2
-#: Merge.rc:1005 Merge.rc:1014 Merge.rc:4532
+#: Merge.rc:1013 Merge.rc:1022 Merge.rc:4542
#, c-format
msgid "Right (%1 of %2)"
msgstr "Jobb (%1 / %2)"
#. IDS_DEL_BOTH_FMT2
-#: Merge.rc:1006 Merge.rc:1015 Merge.rc:4533
+#: Merge.rc:1014 Merge.rc:1023 Merge.rc:4543
#, c-format
msgid "Both (%1 of %2)"
msgstr "Mindkettő (%1 ennyiből: %2)"
#. IDS_DEL_ALL_FMT2
-#: Merge.rc:1007 Merge.rc:1016 Merge.rc:4538
+#: Merge.rc:1015 Merge.rc:1024 Merge.rc:4548
#, c-format
msgid "All (%1 of %2)"
msgstr "Mind (%1 / %2)"
#. IDR_POPUP_DIRVIEW, ID_DIR_COPY_FILENAMES
-#: Merge.rc:1009
+#: Merge.rc:1017
#, c-format
msgid "Copy &Filenames"
msgstr "&Fájlnevek másolása"
#. IDR_POPUP_DIRVIEW
-#: Merge.rc:1010
+#: Merge.rc:1018
#, c-format
msgid "Copy Items to Clip&board"
msgstr "Elemek másolása a vágólapra"
#. IDR_POPUP_DIRVIEW, ID_DIR_COPY_ALL_DISP_COLUMNS
-#: Merge.rc:1018
+#: Merge.rc:1026
msgid "Copy All Di&splayed Columns"
msgstr "Minden látható oszlop másolása"
#. IDR_POPUP_DIRVIEW
-#: Merge.rc:1020
+#: Merge.rc:1028
#, c-format
msgid "&Zip"
msgstr "&Zip"
#. IDS_COPY_BOTH_TO2
-#: Merge.rc:1025 Merge.rc:4516
+#: Merge.rc:1033 Merge.rc:4526
#, c-format
msgid "Both to... (%1 of %2)"
msgstr "Mindkettő a... (%1 / %2)"
#. IDS_COPY_ALL_TO2
-#: Merge.rc:1026 Merge.rc:4517
+#: Merge.rc:1034 Merge.rc:4527
#, c-format
msgid "All to... (%1 of %2)"
msgstr "Mind a... (%1 / %2)"
#. IDS_COPY_DIFFERENCES_TO2
-#: Merge.rc:1027 Merge.rc:4518
+#: Merge.rc:1035 Merge.rc:4528
#, c-format
msgid "Differences to... (%1 of %2)"
msgstr "Különbség ezzel... (%1 / %2)"
#. IDR_POPUP_DIRVIEW, ID_DIR_SHELL_CONTEXT_MENU_LEFT
-#: Merge.rc:1032
+#: Merge.rc:1040
#, c-format
msgid "Left Shell Menu"
msgstr "Bal intéző menü"
#. IDR_POPUP_DIRVIEW, ID_DIR_SHELL_CONTEXT_MENU_MIDDLE
-#: Merge.rc:1033
+#: Merge.rc:1041
#, c-format
msgid "Middle Shell Menu"
msgstr "Középső intéző menü"
#. IDR_POPUP_DIRVIEW, ID_DIR_SHELL_CONTEXT_MENU_RIGHT
-#: Merge.rc:1034
+#: Merge.rc:1042
#, c-format
msgid "Right Shell Menu"
msgstr "Jobb intéző menü"
#. IDR_POPUP_DIRVIEW, ID_DIR_SHELL_CONTEXT_MENU_BOTH
-#: Merge.rc:1035
+#: Merge.rc:1043
msgid "Both Shell Menu"
msgstr "Mindkét intéző menü"
#. IDR_POPUP_DIRVIEW, ID_DIR_SHELL_CONTEXT_MENU_ALL
-#: Merge.rc:1036
+#: Merge.rc:1044
msgid "All Shell Menu"
msgstr "Összes intéző menü"
#. IDR_POPUP_EDITOR_HEADERBAR, ID_EDITOR_COPY
-#: Merge.rc:1050
+#: Merge.rc:1058
#, c-format
msgid "Copy"
msgstr "Másolás"
#. IDR_POPUP_EDITOR_HEADERBAR, ID_EDITOR_COPY_PATH
-#: Merge.rc:1051
+#: Merge.rc:1059
#, c-format
msgid "&Copy Full Path"
msgstr "&Teljes útvonal másolása"
#. IDR_POPUP_EDITOR_HEADERBAR, ID_EDITOR_COPY_FILENAME
-#: Merge.rc:1052
+#: Merge.rc:1060
#, c-format
msgid "Copy &Filename"
msgstr "&Fájlnév másolása"
#. IDR_POPUP_EDITOR_HEADERBAR, ID_EDITOR_EDIT_CAPTION
-#: Merge.rc:1053
+#: Merge.rc:1061
msgid "&Edit Caption\tF2"
msgstr "Felirat szerkesztése\tF2"
#. IDR_POPUP_EDITOR_HEADERBAR, ID_EDITOR_EDIT_PATH
-#: Merge.rc:1055
+#: Merge.rc:1063
msgid "Edit &Path\tCtrl+L"
msgstr "&Elérési út szerkesztése\tCtrl+L"
#. IDR_POPUP_EDITOR_HEADERBAR, ID_EDITOR_SELECT_FILE
-#: Merge.rc:1056
+#: Merge.rc:1064
msgid "&Open..."
msgstr "Megnyitás..."
#. IDR_POPUP_PLUGINS_SETTINGS
-#: Merge.rc:1062
+#: Merge.rc:1070
msgid "Unpacker Settings"
msgstr "Kicsomagoló beállításai"
#. IDS_USERCHOICE_NONE
-#: Merge.rc:1064 Merge.rc:1070 Merge.rc:1789 Merge.rc:1793 Merge.rc:5030
+#: Merge.rc:1072 Merge.rc:1078 Merge.rc:1799 Merge.rc:1803 Merge.rc:5040
#, c-format
msgid ""
msgstr ""
#. IDS_USERCHOICE_AUTOMATIC
-#: Merge.rc:1065 Merge.rc:1071 Merge.rc:5031
+#: Merge.rc:1073 Merge.rc:1079 Merge.rc:5041
#, c-format
msgid ""
msgstr ""
#. IDD_OPEN, IDC_SELECT_PREDIFFER
-#: Merge.rc:1066 Merge.rc:1072 Merge.rc:1970 Merge.rc:1974
+#: Merge.rc:1074 Merge.rc:1080 Merge.rc:1980 Merge.rc:1984
#, c-format
msgid "&Select..."
msgstr "&Kiválasztás..."
#. IDR_POPUP_PLUGINS_SETTINGS
-#: Merge.rc:1068
+#: Merge.rc:1076
#, c-format
msgid "Prediffer Settings"
msgstr "Elővizsgáló beállítások"
#. IDR_POPUP_LOCATIONBAR, ID_LOCBAR_GOTODIFF
-#: Merge.rc:1080
+#: Merge.rc:1088
msgid "G&o to Diff"
msgstr "Ugrás &eltérésre"
#. IDR_POPUP_LOCATIONBAR, ID_LOCBAR_MOVECURSOR_ONCLICK
-#: Merge.rc:1083
+#: Merge.rc:1091
msgid "Move Cursor on &Click"
msgstr "Kurzor mozgatása &Kattintásra"
#. IDR_POPUP_LOCATIONBAR, ID_DISPLAY_MOVED_NONE
-#: Merge.rc:1085
+#: Merge.rc:1093
#, c-format
msgid "&No Moved Blocks"
msgstr "&Nem mozgatott blokkok"
#. IDR_POPUP_LOCATIONBAR, ID_DISPLAY_MOVED_ALL
-#: Merge.rc:1086
+#: Merge.rc:1094
#, c-format
msgid "&All Moved Blocks"
msgstr "&Minden mozgatott blokk"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS
-#: Merge.rc:1094 Merge.rc:1127
+#: Merge.rc:1102 Merge.rc:1135
#, c-format
msgid "W&hitespaces"
msgstr "&Szóközök"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_WHITESPACE_COMPARE
-#: Merge.rc:1096 Merge.rc:1129
+#: Merge.rc:1104 Merge.rc:1137
#, c-format
msgid "Com&pare"
msgstr "&Összehasonlít"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_WHITESPACE_IGNORE
-#: Merge.rc:1097 Merge.rc:1130
+#: Merge.rc:1105 Merge.rc:1138
#, c-format
msgid "I&gnore Changes"
msgstr "&Változások mellőzése"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_WHITESPACE_IGNOREALL
-#: Merge.rc:1098 Merge.rc:1131
+#: Merge.rc:1106 Merge.rc:1139
#, c-format
msgid "Ig&nore All"
msgstr "Összes mellőzése"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_IGNORE_BLANKLINES
-#: Merge.rc:1100 Merge.rc:1133
+#: Merge.rc:1108 Merge.rc:1141
#, c-format
msgid "Ignore Blan&k Lines"
msgstr "Üres sorok mellőzése"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_IGNORE_CASE
-#: Merge.rc:1101 Merge.rc:1134
+#: Merge.rc:1109 Merge.rc:1142
#, c-format
msgid "Ignore &Case"
msgstr "&Kis-nagybetű különbségek mellőzése"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_IGNORE_EOL
-#: Merge.rc:1102 Merge.rc:1135
+#: Merge.rc:1110 Merge.rc:1143
#, c-format
msgid "Igno&re EOL Differences (Windows/Unix/Mac)"
msgstr "Sorvég különbségek mellőzése"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_IGNORE_CODEPAGE
-#: Merge.rc:1103 Merge.rc:1136
+#: Merge.rc:1111 Merge.rc:1144
#, c-format
msgid "Ignore Codepage &Differences"
msgstr "Kódtábla különbségek mellőzése"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_IGNORE_NUMBERS
-#: Merge.rc:1104 Merge.rc:1137
+#: Merge.rc:1112 Merge.rc:1145
msgid "Ignore Num&bers"
msgstr "Számok mellőzése"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_IGNORE_COMMENTS
-#: Merge.rc:1105 Merge.rc:1138
+#: Merge.rc:1113 Merge.rc:1146
msgid "Ignore C&omment Differences"
msgstr "Megjegyzés különbségek mellőzése"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_IGNORE_MISSING_TRAILING_EOL
-#: Merge.rc:1106 Merge.rc:1139
+#: Merge.rc:1114 Merge.rc:1147
msgid "Ignore &Missing Trailing EOL"
msgstr "&Hiányzó sorvégzáró figyelmen kívül hagyása"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_IGNORE_LINE_BREAKS
-#: Merge.rc:1107 Merge.rc:1140
+#: Merge.rc:1115 Merge.rc:1148
msgid "Ignore Line &Breaks (Treat as Spaces)"
msgstr "&Sortörések figyelmen kívül hagyása (szóközként kezelése)"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_RECURS_CHECK
-#: Merge.rc:1109 Merge.rc:2963
+#: Merge.rc:1117 Merge.rc:2973
#, c-format
msgid "&Include Subfolders"
msgstr "&Alkönyvtárakkal együtt"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS
-#: Merge.rc:1110 Merge.rc:1142
+#: Merge.rc:1118 Merge.rc:1150
#, c-format
msgid "&Compare Method"
msgstr "&Összehasonlító módszer:"
#. IDS_COMPMETHOD_FULL_CONTENTS
-#: Merge.rc:1112 Merge.rc:1144 Merge.rc:1328 Merge.rc:4282
+#: Merge.rc:1120 Merge.rc:1152 Merge.rc:1338 Merge.rc:4292
#, c-format
msgid "Full Contents"
msgstr "Teljes tartalmi"
#. IDS_COMPMETHOD_QUICK_CONTENTS
-#: Merge.rc:1113 Merge.rc:1145 Merge.rc:1329 Merge.rc:4283
+#: Merge.rc:1121 Merge.rc:1153 Merge.rc:1339 Merge.rc:4293
#, c-format
msgid "Quick Contents"
msgstr "Gyors tartalmi"
#. IDS_COMPMETHOD_BINARY_CONTENTS
-#: Merge.rc:1114 Merge.rc:1146 Merge.rc:1330 Merge.rc:4284
+#: Merge.rc:1122 Merge.rc:1154 Merge.rc:1340 Merge.rc:4294
#, c-format
msgid "Binary Contents"
msgstr "Bináris tartalom"
#. IDS_COMPMETHOD_MODDATE
-#: Merge.rc:1115 Merge.rc:1147 Merge.rc:1331 Merge.rc:4285
+#: Merge.rc:1123 Merge.rc:1155 Merge.rc:1341 Merge.rc:4295
#, c-format
msgid "Modified Date"
msgstr "Módosítási dátum"
#. IDS_COMPMETHOD_DATESIZE
-#: Merge.rc:1116 Merge.rc:1148 Merge.rc:1332 Merge.rc:4286
+#: Merge.rc:1124 Merge.rc:1156 Merge.rc:1342 Merge.rc:4296
#, c-format
msgid "Modified Date and Size"
msgstr "Módosítási dátum és méret"
#. IDS_COMPMETHOD_SIZE
-#: Merge.rc:1117 Merge.rc:1149 Merge.rc:1333 Merge.rc:4287
+#: Merge.rc:1125 Merge.rc:1157 Merge.rc:1343 Merge.rc:4297
#, c-format
msgid "Size"
msgstr "Méret"
#. IDS_COMPMETHOD_EXISTENCE
-#: Merge.rc:1118 Merge.rc:1150 Merge.rc:1334 Merge.rc:4288
+#: Merge.rc:1126 Merge.rc:1158 Merge.rc:1344 Merge.rc:4298
msgid "Existence"
msgstr "Létezés"
#. IDR_POPUP_PROJECT, ID_LOAD_PROJECT
-#: Merge.rc:1192
+#: Merge.rc:1202
#, c-format
msgid "&Load Project..."
msgstr "Projekt betöltése..."
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARGALL
-#: Merge.rc:1272 Merge.rc:1301
+#: Merge.rc:1282 Merge.rc:1311
msgid "${*} - All Arguments"
msgstr "Minden argumentum"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARG1
-#: Merge.rc:1273 Merge.rc:1302
+#: Merge.rc:1283 Merge.rc:1312
msgid "${1} - First Argument"
msgstr "Az 1. argumentum "
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARG2
-#: Merge.rc:1274 Merge.rc:1303
+#: Merge.rc:1284 Merge.rc:1313
msgid "${2} - Second Argument"
msgstr "A 2. argumentum"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARG3
-#: Merge.rc:1275 Merge.rc:1304
+#: Merge.rc:1285 Merge.rc:1314
msgid "${3} - Third Argument"
msgstr "A 3. argumentum"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARG4
-#: Merge.rc:1276 Merge.rc:1305
+#: Merge.rc:1286 Merge.rc:1315
msgid "${4} - Fourth Argument"
msgstr "A 4. argumentum"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARG5
-#: Merge.rc:1277 Merge.rc:1306
+#: Merge.rc:1287 Merge.rc:1316
msgid "${5} - Fifth Argument"
msgstr "Az 5. argumentum"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARG6
-#: Merge.rc:1278 Merge.rc:1307
+#: Merge.rc:1288 Merge.rc:1317
msgid "${6} - Sixth Argument"
msgstr "A 6. argumentum"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARG7
-#: Merge.rc:1279 Merge.rc:1308
+#: Merge.rc:1289 Merge.rc:1318
msgid "${7} - Seventh Argument"
msgstr "A 7. argumentum"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARG8
-#: Merge.rc:1280 Merge.rc:1309
+#: Merge.rc:1290 Merge.rc:1319
msgid "${8} - Eighth Argument"
msgstr "A 8. argumentum"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARG9
-#: Merge.rc:1281 Merge.rc:1310
+#: Merge.rc:1291 Merge.rc:1320
msgid "${9} - Ninth Argument"
msgstr "A 9. argumentum"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_SRC_FILE
-#: Merge.rc:1289
+#: Merge.rc:1299
msgid "${SRC_FILE} - Source File"
msgstr "${SRC_FILE} - Forrásfájl"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_SRC_FOLDER
-#: Merge.rc:1290
+#: Merge.rc:1300
msgid "${SRC_FOLDER} - Source Folder"
msgstr "${SRC_FOLDER} - Forrásmappa"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_SRC_URL
-#: Merge.rc:1291
+#: Merge.rc:1301
msgid "${SRC_URL} - Source URL"
msgstr "${SRC_URL} - Forrás URL"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_SRC_URL_PROTOCOL
-#: Merge.rc:1292
+#: Merge.rc:1302
msgid "${SRC_URL_PROTOCOL} - Source URL Protocol"
msgstr "${SRC_URL_PROTOCOL} - Forrás URL protokoll"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_SRC_URL_SUFFIX
-#: Merge.rc:1293
+#: Merge.rc:1303
msgid "${SRC_URL_SUFFIX} - Source URL Suffix"
msgstr "${SRC_URL_SUFFIX} - Forrás URL utótag"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_DST_FILE
-#: Merge.rc:1294
+#: Merge.rc:1304
msgid "${DST_FILE} - Destination File"
msgstr "${DST_FILE} - Célfájl"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_DST_FOLDER
-#: Merge.rc:1295
+#: Merge.rc:1305
msgid "${DST_FOLDER} - Destination Folder"
msgstr "${DST_FOLDER} - Célmappa"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_DST_URL
-#: Merge.rc:1296
+#: Merge.rc:1306
msgid "${DST_URL} - Destination URL"
msgstr "${DST_URL} - Cél URL"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_DST_URL_PROTOCOL
-#: Merge.rc:1297
+#: Merge.rc:1307
msgid "${DST_URL_PROTOCOL} - Destination URL Protocol"
msgstr "${DST_URL_PROTOCOL} - Cél URL protokoll"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_DST_URL_SUFFIX
-#: Merge.rc:1298
+#: Merge.rc:1308
msgid "${DST_URL_SUFFIX} - Destination URL Suffix"
msgstr "${DST_URL_SUFFIX} - Cél URL utótag"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_WINMERGE_HOME
-#: Merge.rc:1299
+#: Merge.rc:1309
msgid "${WINMERGE_HOME} - WinMerge Home Directory"
msgstr "${WINMERGE_HOME} - Winmerge gyökérkönyvtár"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_SCRIPT_FILE
-#: Merge.rc:1300
+#: Merge.rc:1310
msgid "${SCRIPT_FILE} - Script File"
msgstr "${SCRIPT_FILE} - Szkriptfájl"
#. IDR_POPUP_PLUGIN_ADD_MENU, ID_PLUGIN_ADD_UNPACKER
-#: Merge.rc:1318
+#: Merge.rc:1328
msgid "Add &Unpacker Plugin..."
msgstr "&Kitömörítő bővítmény hozzáadása..."
#. IDR_POPUP_PLUGIN_ADD_MENU, ID_PLUGIN_ADD_PREDIFFER
-#: Merge.rc:1319
+#: Merge.rc:1329
msgid "Add &Prediffer Plugin..."
msgstr "&Elővizsgáló bővítmény hozzáadása..."
#. IDR_POPUP_PLUGIN_ADD_MENU, ID_PLUGIN_DUPLICATE
-#: Merge.rc:1320
+#: Merge.rc:1330
msgid "&Duplicate Plugin..."
msgstr "Bővítmény &duplikálása..."
#. IDR_POPUP_OUTPUTVIEW, ID_EDIT_CLEAR_ALL
-#: Merge.rc:1344
+#: Merge.rc:1354
msgid "Clear &All"
msgstr "&Összes törlése"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_MASK_CLEAR
-#: Merge.rc:1352
+#: Merge.rc:1362
msgid "&Clear All"
msgstr "Összes &törlése"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_MASK_REMOVE_LAST
-#: Merge.rc:1353
+#: Merge.rc:1363
msgid "Remove Last Filter &Group"
msgstr "Utolsó szűrő &csoport eltávolítása"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_MASK_ALL
-#: Merge.rc:1354
+#: Merge.rc:1364
msgid "R&eset to Default (*.*)"
msgstr "Alapértelmezettre &állítás (*.*)"
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1355
+#: Merge.rc:1365
msgid "Add E&xclude File"
msgstr "&Kizárandó fájl hozzáadása"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_SYS
-#: Merge.rc:1357
+#: Merge.rc:1367
msgid "&System Files"
msgstr "&Rendszerfájlok"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_BACKUP
-#: Merge.rc:1358
+#: Merge.rc:1368
msgid "&Editor Backup Files"
msgstr "&Szerkesztő biztonsági mentési fájlok"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_BIN
-#: Merge.rc:1359
+#: Merge.rc:1369
msgid "&Compiled Binary Files"
msgstr "&Fordított bináris fájlok"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_LOG
-#: Merge.rc:1360
+#: Merge.rc:1370
msgid "&Log Files"
msgstr "&Naplófájlok"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_TEMP
-#: Merge.rc:1361
+#: Merge.rc:1371
msgid "&Temporary or Cache Files"
msgstr "&Ideiglenes vagy gyorsítótárfájlok"
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1363
+#: Merge.rc:1373
msgid "Add Excl&ude Folder"
msgstr "&Kizárandó mappa hozzáadása"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FOLDER_VCS
-#: Merge.rc:1365
+#: Merge.rc:1375
msgid "&Version Control"
msgstr "&Verziókövetés"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FOLDER_BUILD
-#: Merge.rc:1366
+#: Merge.rc:1376
msgid "&Build Artifacts"
msgstr "&Build összetevők"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FOLDER_IDE
-#: Merge.rc:1367
+#: Merge.rc:1377
msgid "&IDE"
msgstr "&IDE"
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1370
+#: Merge.rc:1380
msgid "Add &File Condition"
msgstr "Fájl feltétel Fájl &hozzáadása"
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1372 Merge.rc:1551
+#: Merge.rc:1382 Merge.rc:1561
msgid "File &Size"
msgstr "Fájl &mérete"
#. IDR_POPUP_FILTERMENU_DIFF_SIZE, ID_FILTERMENU_DIFF_SIZE_LT_1KB
-#: Merge.rc:1374 Merge.rc:1527 Merge.rc:1564 Merge.rc:1629 Merge.rc:1707
+#: Merge.rc:1384 Merge.rc:1537 Merge.rc:1574 Merge.rc:1639 Merge.rc:1717
msgid "Less than 1KB"
msgstr "Kevesebb, mint 1 KB"
#. IDR_POPUP_FILTERMENU_DIFF_SIZE, ID_FILTERMENU_DIFF_SIZE_GE_1KB
-#: Merge.rc:1375 Merge.rc:1528 Merge.rc:1565 Merge.rc:1630 Merge.rc:1708
+#: Merge.rc:1385 Merge.rc:1538 Merge.rc:1575 Merge.rc:1640 Merge.rc:1718
msgid "1KB or more"
msgstr "1 KB vagy több"
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_LT_10KB
-#: Merge.rc:1376 Merge.rc:1529 Merge.rc:1631
+#: Merge.rc:1386 Merge.rc:1539 Merge.rc:1641
msgid "Less than 10KB"
msgstr "Kevesebb, mint 10 KB"
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_GE_10KB
-#: Merge.rc:1377 Merge.rc:1530 Merge.rc:1632
+#: Merge.rc:1387 Merge.rc:1540 Merge.rc:1642
msgid "10KB or more"
msgstr "10 KB vagy több"
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_LT_100KB
-#: Merge.rc:1378 Merge.rc:1531 Merge.rc:1633
+#: Merge.rc:1388 Merge.rc:1541 Merge.rc:1643
msgid "Less than 100KB"
msgstr "Kevesebb, mint 100 KB"
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_GE_100KB
-#: Merge.rc:1379 Merge.rc:1532 Merge.rc:1634
+#: Merge.rc:1389 Merge.rc:1542 Merge.rc:1644
msgid "100KB or more"
msgstr "100 KB vagy több"
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_LT_1MB
-#: Merge.rc:1380 Merge.rc:1533 Merge.rc:1635
+#: Merge.rc:1390 Merge.rc:1543 Merge.rc:1645
msgid "Less than 1MB"
msgstr "Kevesebb, mint 1 MB"
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_GE_1MB
-#: Merge.rc:1381 Merge.rc:1534 Merge.rc:1636
+#: Merge.rc:1391 Merge.rc:1544 Merge.rc:1646
msgid "1MB or more"
msgstr "1 MB vagy több"
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_LT_10MB
-#: Merge.rc:1382 Merge.rc:1535 Merge.rc:1637
+#: Merge.rc:1392 Merge.rc:1545 Merge.rc:1647
msgid "Less than 10MB"
msgstr "Kevesebb, mint 10 MB"
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_GE_10MB
-#: Merge.rc:1383 Merge.rc:1536 Merge.rc:1638
+#: Merge.rc:1393 Merge.rc:1546 Merge.rc:1648
msgid "10MB or more"
msgstr "10 MB vagy több"
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_LT_100MB
-#: Merge.rc:1384 Merge.rc:1537 Merge.rc:1639
+#: Merge.rc:1394 Merge.rc:1547 Merge.rc:1649
msgid "Less than 100MB"
msgstr "Kevesebb, mint 100 MB"
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_GE_100MB
-#: Merge.rc:1385 Merge.rc:1538 Merge.rc:1640
+#: Merge.rc:1395 Merge.rc:1548 Merge.rc:1650
msgid "100MB or more"
msgstr "100 MB vagy több"
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_LT_1GB
-#: Merge.rc:1386 Merge.rc:1539 Merge.rc:1641
+#: Merge.rc:1396 Merge.rc:1549 Merge.rc:1651
msgid "Less than 1GB"
msgstr "Kevesebb, mint 1 GB"
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_GE_1GB
-#: Merge.rc:1387 Merge.rc:1642
+#: Merge.rc:1397 Merge.rc:1652
msgid "1GB or more"
msgstr "1 GB vagy több"
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_RANGE
-#: Merge.rc:1388 Merge.rc:1465 Merge.rc:1517 Merge.rc:1523 Merge.rc:1540
-#: Merge.rc:1566 Merge.rc:1587 Merge.rc:1643 Merge.rc:1709 Merge.rc:1734
+#: Merge.rc:1398 Merge.rc:1475 Merge.rc:1527 Merge.rc:1533 Merge.rc:1550
+#: Merge.rc:1576 Merge.rc:1597 Merge.rc:1653 Merge.rc:1719 Merge.rc:1744
msgid "Custom Range..."
msgstr "Egyéni tartomány..."
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1390 Merge.rc:1471 Merge.rc:1568
+#: Merge.rc:1400 Merge.rc:1481 Merge.rc:1578
msgid "&Last Modified"
msgstr "&Utolsó módosítás"
#. IDR_POPUP_FILTERMENU_DATE
-#: Merge.rc:1392 Merge.rc:1473 Merge.rc:1651
+#: Merge.rc:1402 Merge.rc:1483 Merge.rc:1661
msgid "&Hour"
msgstr "&Óra"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_HOUR_BEFORE_1
-#: Merge.rc:1394 Merge.rc:1475 Merge.rc:1653
+#: Merge.rc:1404 Merge.rc:1485 Merge.rc:1663
msgid "More than 1 hour ago"
msgstr "Több mint 1 órája"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_HOUR_WITHIN_1
-#: Merge.rc:1395 Merge.rc:1476 Merge.rc:1654
+#: Merge.rc:1405 Merge.rc:1486 Merge.rc:1664
msgid "Within 1 hour"
msgstr "1 órán belül"
#. IDR_POPUP_FILTERMENU_DATE
-#: Merge.rc:1397 Merge.rc:1478 Merge.rc:1656
+#: Merge.rc:1407 Merge.rc:1488 Merge.rc:1666
msgid "&Day"
msgstr "&Nap"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_DAY_BEFORE_TODAY
-#: Merge.rc:1399 Merge.rc:1480 Merge.rc:1658
+#: Merge.rc:1409 Merge.rc:1490 Merge.rc:1668
msgid "Before today"
msgstr "Mai nap előtt"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_DAY_TODAY
-#: Merge.rc:1400 Merge.rc:1481 Merge.rc:1659
+#: Merge.rc:1410 Merge.rc:1491 Merge.rc:1669
msgid "Today"
msgstr "Ma"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_DAY_BEFORE_YESTERDAY
-#: Merge.rc:1401 Merge.rc:1482 Merge.rc:1660
+#: Merge.rc:1411 Merge.rc:1492 Merge.rc:1670
msgid "Before yesterday"
msgstr "Tegnapi nap előtt"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_DAY_YESTERDAY
-#: Merge.rc:1402 Merge.rc:1483 Merge.rc:1661
+#: Merge.rc:1412 Merge.rc:1493 Merge.rc:1671
msgid "Yesterday"
msgstr "Tegnap"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_DAY_SINCE_YESTERDAY
-#: Merge.rc:1403 Merge.rc:1484 Merge.rc:1662
+#: Merge.rc:1413 Merge.rc:1494 Merge.rc:1672
msgid "Since yesterday"
msgstr "Tegnapig"
#. IDR_POPUP_FILTERMENU_DATE
-#: Merge.rc:1405 Merge.rc:1486 Merge.rc:1664
+#: Merge.rc:1415 Merge.rc:1496 Merge.rc:1674
msgid "&Week"
msgstr "&Hét"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_WEEK_BEFORE_THIS
-#: Merge.rc:1407 Merge.rc:1488 Merge.rc:1666
+#: Merge.rc:1417 Merge.rc:1498 Merge.rc:1676
msgid "Before this week"
msgstr "Ezelőtt a hét előtt"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_WEEK_THIS
-#: Merge.rc:1408 Merge.rc:1489 Merge.rc:1667
+#: Merge.rc:1418 Merge.rc:1499 Merge.rc:1677
msgid "This week"
msgstr "Ezen a héten"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_WEEK_BEFORE_LAST
-#: Merge.rc:1409 Merge.rc:1490 Merge.rc:1668
+#: Merge.rc:1419 Merge.rc:1500 Merge.rc:1678
msgid "Before last week"
msgstr "Múlt hét előtt"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_WEEK_LAST
-#: Merge.rc:1410 Merge.rc:1491 Merge.rc:1669
+#: Merge.rc:1420 Merge.rc:1501 Merge.rc:1679
msgid "Last week"
msgstr "Múlt héten"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_WEEK_SINCE_LAST
-#: Merge.rc:1411 Merge.rc:1492 Merge.rc:1670
+#: Merge.rc:1421 Merge.rc:1502 Merge.rc:1680
msgid "Since last week"
msgstr "Múlt hétig"
#. IDR_POPUP_FILTERMENU_DATE
-#: Merge.rc:1413 Merge.rc:1494 Merge.rc:1672
+#: Merge.rc:1423 Merge.rc:1504 Merge.rc:1682
msgid "&Month"
msgstr "&Hónap"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_MONTH_BEFORE_THIS
-#: Merge.rc:1415 Merge.rc:1496 Merge.rc:1674
+#: Merge.rc:1425 Merge.rc:1506 Merge.rc:1684
msgid "Before this month"
msgstr "Mostani hónap előtt"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_MONTH_THIS
-#: Merge.rc:1416 Merge.rc:1497 Merge.rc:1675
+#: Merge.rc:1426 Merge.rc:1507 Merge.rc:1685
msgid "This month"
msgstr "Ebben a hónapban"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_MONTH_BEFORE_LAST
-#: Merge.rc:1417 Merge.rc:1498 Merge.rc:1676
+#: Merge.rc:1427 Merge.rc:1508 Merge.rc:1686
msgid "Before last month"
msgstr "A múlt hónap előtt"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_MONTH_LAST
-#: Merge.rc:1418 Merge.rc:1499 Merge.rc:1677
+#: Merge.rc:1428 Merge.rc:1509 Merge.rc:1687
msgid "Last month"
msgstr "Múlt hónap"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_MONTH_SINCE_LAST
-#: Merge.rc:1419 Merge.rc:1500 Merge.rc:1678
+#: Merge.rc:1429 Merge.rc:1510 Merge.rc:1688
msgid "Since last month"
msgstr "A múlt hónap óta"
#. IDR_POPUP_FILTERMENU_DATE
-#: Merge.rc:1421 Merge.rc:1502 Merge.rc:1680
+#: Merge.rc:1431 Merge.rc:1512 Merge.rc:1690
msgid "&Year"
msgstr "&Év"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_YEAR_BEFORE_THIS
-#: Merge.rc:1423 Merge.rc:1504 Merge.rc:1682
+#: Merge.rc:1433 Merge.rc:1514 Merge.rc:1692
msgid "Before this year"
msgstr "Idei év előtt"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_YEAR_THIS
-#: Merge.rc:1424 Merge.rc:1505 Merge.rc:1683
+#: Merge.rc:1434 Merge.rc:1515 Merge.rc:1693
msgid "This year"
msgstr "Idén"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_YEAR_BEFORE_LAST
-#: Merge.rc:1425 Merge.rc:1506 Merge.rc:1684
+#: Merge.rc:1435 Merge.rc:1516 Merge.rc:1694
msgid "Before last year"
msgstr "Tavalyi év előtt"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_YEAR_LAST
-#: Merge.rc:1426 Merge.rc:1507 Merge.rc:1685
+#: Merge.rc:1436 Merge.rc:1517 Merge.rc:1695
msgid "Last year"
msgstr "Tavaly"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_YEAR_SINCE_LAST
-#: Merge.rc:1427 Merge.rc:1508 Merge.rc:1686
+#: Merge.rc:1437 Merge.rc:1518 Merge.rc:1696
msgid "Since last year"
msgstr "Tavalyi év óta"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_RANGE
-#: Merge.rc:1429 Merge.rc:1510 Merge.rc:1688
+#: Merge.rc:1439 Merge.rc:1520 Merge.rc:1698
msgid "&Custom Range..."
msgstr "&Egyéni tartomány..."
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1431 Merge.rc:1589
+#: Merge.rc:1441 Merge.rc:1599
msgid "&Attributes"
msgstr "&Attribútumok"
#. IDR_POPUP_FILTERMENU_ATTR, ID_FILTERMENU_ATTR_READONLY
-#: Merge.rc:1433 Merge.rc:1607
+#: Merge.rc:1443 Merge.rc:1617
msgid "Read-only files"
msgstr "Írásvédett fájlok"
#. IDR_POPUP_FILTERMENU_ATTR, ID_FILTERMENU_ATTR_NOT_READONLY
-#: Merge.rc:1434 Merge.rc:1608
+#: Merge.rc:1444 Merge.rc:1618
msgid "Not read-only files"
msgstr "Nem írásvédett fájlok"
#. IDR_POPUP_FILTERMENU_ATTR, ID_FILTERMENU_ATTR_HIDDEN
-#: Merge.rc:1435 Merge.rc:1609
+#: Merge.rc:1445 Merge.rc:1619
msgid "Hidden files"
msgstr "Rejtett fájlok"
#. IDR_POPUP_FILTERMENU_ATTR, ID_FILTERMENU_ATTR_NOT_HIDDEN
-#: Merge.rc:1436 Merge.rc:1610
+#: Merge.rc:1446 Merge.rc:1620
msgid "Not hidden files"
msgstr "Nem rejtett fájlok"
#. IDR_POPUP_FILTERMENU_ATTR, ID_FILTERMENU_ATTR_SYSTEM
-#: Merge.rc:1437 Merge.rc:1611
+#: Merge.rc:1447 Merge.rc:1621
msgid "System files"
msgstr "Rendszerfájlok"
#. IDR_POPUP_FILTERMENU_ATTR, ID_FILTERMENU_ATTR_NOT_SYSTEM
-#: Merge.rc:1438 Merge.rc:1612
+#: Merge.rc:1448 Merge.rc:1622
msgid "Not system files"
msgstr "Nem rendszerfájlok"
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1440
+#: Merge.rc:1450
msgid "File &Content"
msgstr "Fájl &tartalma"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_CONTAINS
-#: Merge.rc:1442
+#: Merge.rc:1452
msgid "Contains string..."
msgstr "Tartalmazza a sztringet..."
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_NOT_CONTAINS
-#: Merge.rc:1443
+#: Merge.rc:1453
msgid "Does not contain string..."
msgstr "Nem tartalmazza a sztringet..."
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_FIRST_LINE_CONTAINS
-#: Merge.rc:1444
+#: Merge.rc:1454
msgid "First line contains string..."
msgstr "Az első sor tartalmazza a sztringet..."
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_FIRST_LINE_NOT_CONTAINS
-#: Merge.rc:1445
+#: Merge.rc:1455
msgid "First line does not contain string..."
msgstr "Az első sor nem tartalmazza a sztringet..."
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_FIRST_10_CONTAINS
-#: Merge.rc:1446
+#: Merge.rc:1456
msgid "First 10 lines contain string..."
msgstr "Az első 10 sor tartalmazza a sztringet..."
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_FIRST_10_NOT_CONTAINS
-#: Merge.rc:1447
+#: Merge.rc:1457
msgid "First 10 lines do not contain string..."
msgstr "Az első 10 sor nem tartalmazza a sztringet..."
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_LAST_10_CONTAINS
-#: Merge.rc:1448
+#: Merge.rc:1458
msgid "Last 10 lines contain string..."
msgstr "Az utolsó 10 sor tartalmazza a sztringet..."
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_LAST_10_NOT_CONTAINS
-#: Merge.rc:1449
+#: Merge.rc:1459
msgid "Last 10 lines do not contain string..."
msgstr "Az utolsó 10 sor nem tartalmazza a sztringet..."
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_LAST_LINE_CONTAINS
-#: Merge.rc:1450
+#: Merge.rc:1460
msgid "Last line contains string..."
msgstr "Az utolsó sor tartalmazza a sztringet..."
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_LAST_LINE_NOT_CONTAINS
-#: Merge.rc:1451
+#: Merge.rc:1461
msgid "Last line does not contain string..."
msgstr "Az utolsó sor nem tartalmazza a sztringet..."
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1453
+#: Merge.rc:1463
msgid "&Line Count"
msgstr "&Sorok száma"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_LT_10
-#: Merge.rc:1455
+#: Merge.rc:1465
msgid "Less than 10"
msgstr "Kevesebb, mint 10"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_GE_10
-#: Merge.rc:1456
+#: Merge.rc:1466
msgid "10 or more"
msgstr "10 vagy több"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_LT_100
-#: Merge.rc:1457
+#: Merge.rc:1467
msgid "Less than 100"
msgstr "Kevesebb, mint 100"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_GE_100
-#: Merge.rc:1458
+#: Merge.rc:1468
msgid "100 or more"
msgstr "100 vagy több"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_LT_1000
-#: Merge.rc:1459
+#: Merge.rc:1469
msgid "Less than 1000"
msgstr "Kevesebb, mint 1000"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_GE_1000
-#: Merge.rc:1460
+#: Merge.rc:1470
msgid "1000 or more"
msgstr "1000 vagy több"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_LT_10000
-#: Merge.rc:1461
+#: Merge.rc:1471
msgid "Less than 10000"
msgstr "Kevesebb, mint 10000"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_GE_10000
-#: Merge.rc:1462
+#: Merge.rc:1472
msgid "10000 or more"
msgstr "10000 vagy több"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_LT_100000
-#: Merge.rc:1463
+#: Merge.rc:1473
msgid "Less than 100000"
msgstr "Kevesebb, mint 100000"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_GE_100000
-#: Merge.rc:1464
+#: Merge.rc:1474
msgid "100000 or more"
msgstr "100000 vagy több"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_PROPS
-#: Merge.rc:1467 Merge.rc:1594 Merge.rc:1761 Merge.rc:1778
+#: Merge.rc:1477 Merge.rc:1604 Merge.rc:1771 Merge.rc:1788
msgid "Additional &Properties..."
msgstr "További &tulajdonságok..."
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1469
+#: Merge.rc:1479
msgid "Add F&older Condition"
msgstr "&Mappa feltétel hozzáadása"
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1513
+#: Merge.rc:1523
msgid "&Files"
msgstr "&Fájlok"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FOLDER_FILES_EQ_0
-#: Merge.rc:1515
+#: Merge.rc:1525
msgid "0 files"
msgstr "0 fájl"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FOLDER_FILES_GE_1
-#: Merge.rc:1516
+#: Merge.rc:1526
msgid "1 file or more"
msgstr "1 vagy több fájl"
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1519
+#: Merge.rc:1529
msgid "&Items"
msgstr "&Elemek"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FOLDER_ITEMS_EQ_0
-#: Merge.rc:1521
+#: Merge.rc:1531
msgid "0 items"
msgstr "0 elem"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FOLDER_ITEMS_GE_1
-#: Merge.rc:1522
+#: Merge.rc:1532
msgid "1 item or more"
msgstr "1 vagy több elem"
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1525
+#: Merge.rc:1535
msgid "&Total Size"
msgstr "&Teljes méret"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FOLDER_STATS_RECURSIVE
-#: Merge.rc:1542
+#: Merge.rc:1552
msgid "&Recursive"
msgstr "&Ismétlődő"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONDITION_ANY
-#: Merge.rc:1544
+#: Merge.rc:1554
msgid "Target: &Any (Left/Middle/Right)"
msgstr "Cél: &Bármelyik (Bal/Középső/Jobb)"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONDITION_LEFT
-#: Merge.rc:1545
+#: Merge.rc:1555
msgid "Target: &Left"
msgstr "Cél: &Bal"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONDITION_MIDDLE
-#: Merge.rc:1546
+#: Merge.rc:1556
msgid "Target: &Middle"
msgstr "Cél: &Középső"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONDITION_RIGHT
-#: Merge.rc:1547
+#: Merge.rc:1557
msgid "Target: &Right"
msgstr "Cél: &Jobb"
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1549
+#: Merge.rc:1559
msgid "Add &Difference Condition"
msgstr "&Különbségi feltétel hozzáadása"
#. IDR_POPUP_FILTERMENU_DIFF_PROP, ID_FILTERMENU_DIFF_PROP_EQUAL
-#: Merge.rc:1553 Merge.rc:1570 Merge.rc:1591 Merge.rc:1696 Merge.rc:1717
-#: Merge.rc:1742
+#: Merge.rc:1563 Merge.rc:1580 Merge.rc:1601 Merge.rc:1706 Merge.rc:1727
+#: Merge.rc:1752
msgid "Equal"
msgstr "Egyenlő"
#. IDR_POPUP_FILTERMENU_DIFF_PROP, ID_FILTERMENU_DIFF_PROP_NOT_EQUAL
-#: Merge.rc:1554 Merge.rc:1571 Merge.rc:1592 Merge.rc:1697 Merge.rc:1718
-#: Merge.rc:1743
+#: Merge.rc:1564 Merge.rc:1581 Merge.rc:1602 Merge.rc:1707 Merge.rc:1728
+#: Merge.rc:1753
msgid "Not Equal"
msgstr "Nem egyenlő"
#. IDR_POPUP_FILTERMENU_DIFF_PROP, ID_FILTERMENU_DIFF_PROP_LESS
-#: Merge.rc:1555 Merge.rc:1572 Merge.rc:1698 Merge.rc:1719 Merge.rc:1744
+#: Merge.rc:1565 Merge.rc:1582 Merge.rc:1708 Merge.rc:1729 Merge.rc:1754
msgid "Less Than"
msgstr "Kevesebb, mint"
#. IDR_POPUP_FILTERMENU_DIFF_PROP, ID_FILTERMENU_DIFF_PROP_LESS_EQUAL
-#: Merge.rc:1556 Merge.rc:1573 Merge.rc:1699 Merge.rc:1720 Merge.rc:1745
+#: Merge.rc:1566 Merge.rc:1583 Merge.rc:1709 Merge.rc:1730 Merge.rc:1755
msgid "Less Than or Equal to"
msgstr "Kisebb vagy egyenlő, mint"
#. IDR_POPUP_FILTERMENU_DIFF_PROP, ID_FILTERMENU_DIFF_PROP_GREATER
-#: Merge.rc:1557 Merge.rc:1574 Merge.rc:1700 Merge.rc:1721 Merge.rc:1746
+#: Merge.rc:1567 Merge.rc:1584 Merge.rc:1710 Merge.rc:1731 Merge.rc:1756
msgid "Greater Than"
msgstr "Nagyobb, mint"
#. IDR_POPUP_FILTERMENU_DIFF_PROP, ID_FILTERMENU_DIFF_PROP_GREATER_EQUAL
-#: Merge.rc:1558 Merge.rc:1575 Merge.rc:1701 Merge.rc:1722 Merge.rc:1747
+#: Merge.rc:1568 Merge.rc:1585 Merge.rc:1711 Merge.rc:1732 Merge.rc:1757
msgid "Greater Than or Equal to"
msgstr "Nagyobb vagy egyenlő, mint"
#. IDR_POPUP_FILTERMENU_DIFF_SIZE, ID_FILTERMENU_DIFF_SIZE_LT_10B
-#: Merge.rc:1560 Merge.rc:1703
+#: Merge.rc:1570 Merge.rc:1713
msgid "Less than 10B"
msgstr "Kevesebb, mint 10 B"
#. IDR_POPUP_FILTERMENU_DIFF_SIZE, ID_FILTERMENU_DIFF_SIZE_GE_10B
-#: Merge.rc:1561 Merge.rc:1704
+#: Merge.rc:1571 Merge.rc:1714
msgid "10B or more"
msgstr "10 B vagy több"
#. IDR_POPUP_FILTERMENU_DIFF_SIZE, ID_FILTERMENU_DIFF_SIZE_LT_100B
-#: Merge.rc:1562 Merge.rc:1705
+#: Merge.rc:1572 Merge.rc:1715
msgid "Less than 100B"
msgstr "Kevesebb, mint 100 B"
#. IDR_POPUP_FILTERMENU_DIFF_SIZE, ID_FILTERMENU_DIFF_SIZE_GE_100B
-#: Merge.rc:1563 Merge.rc:1706
+#: Merge.rc:1573 Merge.rc:1716
msgid "100B or more"
msgstr "100 B vagy több"
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_LT_1SECOND
-#: Merge.rc:1577 Merge.rc:1724
+#: Merge.rc:1587 Merge.rc:1734
msgid "Less than 1 second"
msgstr "Kevesebb mint 1 mp"
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_GE_1SECOND
-#: Merge.rc:1578 Merge.rc:1725
+#: Merge.rc:1588 Merge.rc:1735
msgid "1 second or more"
msgstr "1 mp vagy több"
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_LT_1MINUTE
-#: Merge.rc:1579 Merge.rc:1726
+#: Merge.rc:1589 Merge.rc:1736
msgid "Less than 1 minute"
msgstr "Kevesebb mint 1 perc"
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_GE_1MINUTE
-#: Merge.rc:1580 Merge.rc:1727
+#: Merge.rc:1590 Merge.rc:1737
msgid "1 minute or more"
msgstr "1 perc vagy több"
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_LT_1HOUR
-#: Merge.rc:1581 Merge.rc:1728
+#: Merge.rc:1591 Merge.rc:1738
msgid "Less than 1 hour"
msgstr "Kevesebb mint 1 óra"
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_GE_1HOUR
-#: Merge.rc:1582 Merge.rc:1729
+#: Merge.rc:1592 Merge.rc:1739
msgid "1 hour or more"
msgstr "1 óra vagy több"
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_LT_1DAY
-#: Merge.rc:1583 Merge.rc:1730
+#: Merge.rc:1593 Merge.rc:1740
msgid "Less than 1 day"
msgstr "Kevesebb mint 1 nap"
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_GE_1DAY
-#: Merge.rc:1584 Merge.rc:1731
+#: Merge.rc:1594 Merge.rc:1741
msgid "1 day or more"
msgstr "1 nap vagy több"
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_LT_1WEEK
-#: Merge.rc:1585 Merge.rc:1732
+#: Merge.rc:1595 Merge.rc:1742
msgid "Less than 1 week"
msgstr "Kevesebb mint 1 hét"
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_GE_1WEEK
-#: Merge.rc:1586 Merge.rc:1733
+#: Merge.rc:1596 Merge.rc:1743
msgid "1 week or more"
msgstr "1 hét vagy több"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_CONDITION_DIFF_LEFT_RIGHT
-#: Merge.rc:1596
+#: Merge.rc:1606
msgid "Target: &Left and Right"
msgstr "Cél: &Bal és jobb"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_CONDITION_DIFF_LEFT_MIDDLE
-#: Merge.rc:1597
+#: Merge.rc:1607
msgid "Target: Left and &Middle"
msgstr "Cél: Bal és &középső"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_CONDITION_DIFF_MIDDLE_RIGHT
-#: Merge.rc:1598
+#: Merge.rc:1608
msgid "Target: Middle and &Right"
msgstr "Cél: Középső és &jobb"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_CONDITION_DIFF_ALL
-#: Merge.rc:1599
+#: Merge.rc:1609
msgid "Target: &All"
msgstr "Cél: &Összes"
#. IDR_POPUP_FILTERMENU_BINARY, ID_FILTERMENU_BINARY_ONLY
-#: Merge.rc:1620
+#: Merge.rc:1630
msgid "Binary files only"
msgstr ""
#. IDR_POPUP_FILTERMENU_BINARY, ID_FILTERMENU_TEXT_ONLY
-#: Merge.rc:1621
+#: Merge.rc:1631
msgid "Text files only"
msgstr ""
#. IDR_POPUP_ADDCMPMENU, ID_ADDCMPMENU_CLEAR
-#: Merge.rc:1755
+#: Merge.rc:1765
msgid "&Clear conditions"
msgstr "Feltételek &törlése"
#. IDR_POPUP_ADDCMPMENU, ID_ADDCMPMENU_CMP_SIZE
-#: Merge.rc:1757
+#: Merge.rc:1767
msgid "Compare &Size"
msgstr "&Méret összehasonlítása"
#. IDR_POPUP_ADDCMPMENU, ID_ADDCMPMENU_CMP_DATE
-#: Merge.rc:1758
+#: Merge.rc:1768
msgid "Compare &Date"
msgstr "&Dátum összehasonlítása"
#. IDR_POPUP_ADDCMPMENU, ID_ADDCMPMENU_CMP_ATTR
-#: Merge.rc:1759
+#: Merge.rc:1769
msgid "Compare &Attributes"
msgstr "&Attribútumok összehasonlítása"
#. IDR_POPUP_ADDCMPMENU, ID_ADDCMPMENU_CMP_CONTENTS
-#: Merge.rc:1760
+#: Merge.rc:1770
msgid "Compare C&ontents"
msgstr "&Tartalom összehasonlítása"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_CLEAR
-#: Merge.rc:1769
+#: Merge.rc:1779
msgid "&Clear Keys"
msgstr "&Kulcsok törlése"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_NAME
-#: Merge.rc:1771
+#: Merge.rc:1781
msgid "&Name"
msgstr "&Név"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_BASENAME
-#: Merge.rc:1772
+#: Merge.rc:1782
msgid "&Base name (without extension)"
msgstr "&Alapnév (kiterjesztés nélkül)"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_NORMALIZED_NAME
-#: Merge.rc:1773
+#: Merge.rc:1783
msgid "Normalized &Unicode Name"
msgstr "Normalizált &Unicode név"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_RELPATH
-#: Merge.rc:1774
+#: Merge.rc:1784
msgid "&Relative Path"
msgstr "&Relatív elérési út"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_DATE
-#: Merge.rc:1776
+#: Merge.rc:1786
msgid "&Date"
msgstr "&Dátum"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_HASH_MD5
-#: Merge.rc:1777
+#: Merge.rc:1787
msgid "&Hash (MD5)"
msgstr "&Hash (MD5)"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_REPLACE
-#: Merge.rc:1780
+#: Merge.rc:1790
msgid "Insert &replace() Function"
msgstr "&csere() függvény beszúrása"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_REGEXREPLACE
-#: Merge.rc:1781
+#: Merge.rc:1791
msgid "Insert rege&xReplace() Function"
msgstr "rege&xCsere() függvény beszúrása"
#. IDR_POPUP_RENAMEMOVE_MENU
-#: Merge.rc:1782
+#: Merge.rc:1792
msgid "Replace &Lists"
msgstr "&Listák cseréje"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_CREATE_REPLACELIST
-#: Merge.rc:1784
+#: Merge.rc:1794
msgid "&Create String Replace List and Insert..."
msgstr "&Karakterlánc-cserelista létrehozása és beszúrása..."
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_CREATE_REGEXREPLACELIST
-#: Merge.rc:1785
+#: Merge.rc:1795
msgid "Create &Regex Replace List and Insert..."
msgstr "&Regex cserelista létrehozása és beszúrása..."
#. IDR_POPUP_RENAMEMOVE_MENU
-#: Merge.rc:1787
+#: Merge.rc:1797
msgid "&String Replace Lists"
msgstr "&Karakterlánc-cserelisták"
#. IDR_POPUP_RENAMEMOVE_MENU
-#: Merge.rc:1791
+#: Merge.rc:1801
msgid "Re&gex Replace Lists"
msgstr "Re&gex kifejezések cserelistái"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_STRING_REPLACE_LISTS_FOLDER
-#: Merge.rc:1796
+#: Merge.rc:1806
msgid "Open String Replace Lists Folder..."
msgstr "Karakterlánc-cserelisták mappájának megnyitása..."
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_REGEX_REPLACE_LISTS_FOLDER
-#: Merge.rc:1797
+#: Merge.rc:1807
msgid "Open Regex Replace Lists Folder..."
msgstr "Regex cserelisták mappájának megnyitása..."
#. IDD_FILTERS_CONDITION, IDC_CONDITION_MATCHCASE
-#: Merge.rc:1799 Merge.rc:1995 Merge.rc:2014 Merge.rc:2042 Merge.rc:2585
+#: Merge.rc:1809 Merge.rc:2005 Merge.rc:2024 Merge.rc:2052 Merge.rc:2595
#, c-format
msgid "Match &case"
msgstr "Kis-nagybetű &érzékenység"
#. IDR_POPUP_RENAMEMOVE_MENU
-#: Merge.rc:1801
+#: Merge.rc:1811
msgid "Text &Normalization"
msgstr "Szöveg &normalizálás"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_TOLOWER
-#: Merge.rc:1803
+#: Merge.rc:1813
msgid "&Lowercase"
msgstr "&Kisbetűs"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_TOUPPER
-#: Merge.rc:1804
+#: Merge.rc:1814
msgid "&Uppercase"
msgstr "&Nagybetűs"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_TOHALFWIDTH
-#: Merge.rc:1805
+#: Merge.rc:1815
msgid "&Half-width"
msgstr "&Fél szélességű"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_TOFULLWIDTH
-#: Merge.rc:1806
+#: Merge.rc:1816
msgid "&Full-width"
msgstr "&Teljes szélességű"
#. IDR_POPUP_RENAMEMOVE_MENU
-#: Merge.rc:1807
+#: Merge.rc:1817
msgid "&Chinese Conversion"
msgstr "&Konvertálás kínaira"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_TOSIMPLIFIEDCHINESE
-#: Merge.rc:1809
+#: Merge.rc:1819
msgid "&Simplified Chinese"
msgstr "&Egyszerűsített kínai"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_TOTRADITIONALCHINESE
-#: Merge.rc:1810
+#: Merge.rc:1820
msgid "&Traditional Chinese"
msgstr "&Hagyományos kínai"
#. IDR_POPUP_RENAMEMOVE_MENU
-#: Merge.rc:1812
+#: Merge.rc:1822
msgid "&Japanese Conversion"
msgstr "&Konvertálás japánra"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_TOHIRAGANA
-#: Merge.rc:1814
+#: Merge.rc:1824
msgid "&Hiragana"
msgstr "&Hiragana"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_TOKATAKANA
-#: Merge.rc:1815
+#: Merge.rc:1825
msgid "&Katakana"
msgstr "&Katakana"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_NORMALIZEUNICODE
-#: Merge.rc:1817
+#: Merge.rc:1827
msgid "Normalize &Unicode"
msgstr "&Unicode normalizálása"
#. IDD_ABOUTBOX
-#: Merge.rc:1932
+#: Merge.rc:1942
#, c-format
msgid "About WinMerge"
msgstr "A WinMerge névjegye"
#. IDD_ABOUTBOX, IDC_WWW
-#: Merge.rc:1936
+#: Merge.rc:1946
msgid "Visit the WinMerge Homepage!"
msgstr "Látogass el a WinMerge honlapjára!"
#. IDD_PLUGINS_EDITPLUGIN, IDOK
-#: Merge.rc:1938 Merge.rc:2080 Merge.rc:2431 Merge.rc:2455 Merge.rc:2469
-#: Merge.rc:2497 Merge.rc:2588 Merge.rc:2613 Merge.rc:2674 Merge.rc:2691
-#: Merge.rc:2703 Merge.rc:2867 Merge.rc:2927 Merge.rc:3062 Merge.rc:3104
-#: Merge.rc:3147 Merge.rc:3197
+#: Merge.rc:1948 Merge.rc:2090 Merge.rc:2441 Merge.rc:2465 Merge.rc:2479
+#: Merge.rc:2507 Merge.rc:2598 Merge.rc:2623 Merge.rc:2684 Merge.rc:2701
+#: Merge.rc:2713 Merge.rc:2877 Merge.rc:2937 Merge.rc:3072 Merge.rc:3114
+#: Merge.rc:3157 Merge.rc:3207
#, c-format
msgid "OK"
msgstr "OK"
#. IDD_ABOUTBOX, IDC_OPEN_CONTRIBUTORS
-#: Merge.rc:1939
+#: Merge.rc:1949
#, c-format
msgid "Contributors"
msgstr "Közreműködők"
#. IDD_SELECT_FILES_OR_FOLDERS
-#: Merge.rc:1945 Merge.rc:3070
+#: Merge.rc:1955 Merge.rc:3080
#, c-format
msgid "Select Files or Folders"
msgstr "Fájlok vagy könyvtárak választása"
#. IDD_OPEN, IDC_FILES_DIRS_GROUP0
-#: Merge.rc:1949
+#: Merge.rc:1959
#, c-format
msgid "&1st File or Folder"
msgstr "1. fájl vagy mappa"
#. IDD_OPEN, IDC_PATH0_READONLY
-#: Merge.rc:1951
+#: Merge.rc:1961
#, c-format
msgid "Re&ad-only"
msgstr "Cs&ak olvasható"
#. IDD_OPEN, IDC_SWAP01_STATIC
-#: Merge.rc:1953
+#: Merge.rc:1963
#, c-format
msgid "Swap 1st | 2nd"
msgstr "1.-2. cseréje"
#. IDD_GENERATE_PATCH, IDC_DIFF_BROWSE_FILE1
-#: Merge.rc:1954 Merge.rc:2310 Merge.rc:2413
+#: Merge.rc:1964 Merge.rc:2320 Merge.rc:2423
#, c-format
msgid "&Browse..."
msgstr "&Tallózás..."
#. IDD_OPEN, IDC_FILES_DIRS_GROUP1
-#: Merge.rc:1955
+#: Merge.rc:1965
#, c-format
msgid "&2nd File or Folder"
msgstr "2. fájl vagy mappa"
#. IDD_OPEN, IDC_PATH1_READONLY
-#: Merge.rc:1957
+#: Merge.rc:1967
#, c-format
msgid "Rea&d-only"
msgstr "Csak olvasható"
#. IDD_OPEN, IDC_SWAP12_STATIC
-#: Merge.rc:1959
+#: Merge.rc:1969
#, c-format
msgid "Swap 2nd | 3rd"
msgstr "2.-3. cseréje"
#. IDD_PROPPAGE_SYSTEM, IDC_FILTER_USER_BROWSE
-#: Merge.rc:1960 Merge.rc:2315
+#: Merge.rc:1970 Merge.rc:2325
#, c-format
msgid "B&rowse..."
msgstr "Tallózás..."
#. IDD_OPEN, IDC_FILES_DIRS_GROUP2
-#: Merge.rc:1961
+#: Merge.rc:1971
#, c-format
msgid "&3rd File or Folder (Optional)"
msgstr "3. fájl vagy mappa (opcionális)"
#. IDD_OPEN, IDC_PATH2_READONLY
-#: Merge.rc:1963
+#: Merge.rc:1973
#, c-format
msgid "Read-o&nly"
msgstr "Csak olvasható"
#. IDD_OPEN, IDC_SWAP02_STATIC
-#: Merge.rc:1965
+#: Merge.rc:1975
#, c-format
msgid "Swap 1st | 3rd"
msgstr "1.-3. cseréje"
#. IDD_PROPPAGE_BACKUPS, IDC_BACKUP_BROWSE
-#: Merge.rc:1966 Merge.rc:2685 Merge.rc:2883
+#: Merge.rc:1976 Merge.rc:2695 Merge.rc:2893
#, c-format
msgid "Browse..."
msgstr "Tallózás..."
#. IDD_OPEN, IDC_FILES_DIRS_GROUP3
-#: Merge.rc:1968
+#: Merge.rc:1978
#, c-format
msgid " Folder: Filter"
msgstr " Mappa: Szűrő"
#. IDD_OPEN, IDC_RECURS_CHECK
-#: Merge.rc:1971
+#: Merge.rc:1981
msgid "&Include subfolders"
msgstr "&Alkönyvtárakkal együtt"
#. IDD_OPEN, IDC_FILES_DIRS_GROUP5
-#: Merge.rc:1972
+#: Merge.rc:1982
msgid " File: Prediffer Plugin"
msgstr " Fájl: Elővizsgáló bővítmény"
#. IDD_OPEN, IDC_FILES_DIRS_GROUP4
-#: Merge.rc:1976
+#: Merge.rc:1986
#, c-format
msgid " File: Unpacker Plugin"
msgstr " Fájl: Kitömörítő bővítmény"
#. IDD_OPEN, IDC_SELECT_UNPACKER
-#: Merge.rc:1978
+#: Merge.rc:1988
#, c-format
msgid "Se&lect..."
msgstr "Kiválasztás..."
#. IDD_PLUGINS_EDITPLUGIN, IDCANCEL
-#: Merge.rc:1981 Merge.rc:2001 Merge.rc:2025 Merge.rc:2046 Merge.rc:2081
-#: Merge.rc:2432 Merge.rc:2456 Merge.rc:2470 Merge.rc:2498 Merge.rc:2551
-#: Merge.rc:2589 Merge.rc:2614 Merge.rc:2675 Merge.rc:2692 Merge.rc:2704
-#: Merge.rc:2868 Merge.rc:2928 Merge.rc:3087 Merge.rc:3105 Merge.rc:3148
-#: Merge.rc:3198
+#: Merge.rc:1991 Merge.rc:2011 Merge.rc:2035 Merge.rc:2056 Merge.rc:2091
+#: Merge.rc:2442 Merge.rc:2466 Merge.rc:2480 Merge.rc:2508 Merge.rc:2561
+#: Merge.rc:2599 Merge.rc:2624 Merge.rc:2685 Merge.rc:2702 Merge.rc:2714
+#: Merge.rc:2878 Merge.rc:2938 Merge.rc:3097 Merge.rc:3115 Merge.rc:3158
+#: Merge.rc:3208
#, c-format
msgid "Cancel"
msgstr "Mégsem"
#. IDD_OPEN, IDC_OPEN_STATUS
-#: Merge.rc:1982
+#: Merge.rc:1992
#, c-format
msgid "Status:"
msgstr "Állapot:"
#. IDD_PLUGINS_LIST, ID_HELP
-#: Merge.rc:1983 Merge.rc:2082 Merge.rc:2929
+#: Merge.rc:1993 Merge.rc:2092 Merge.rc:2939
#, c-format
msgid "Help"
msgstr "Súgó"
#. IDD_OPEN, IDC_OPTIONS
-#: Merge.rc:1984
+#: Merge.rc:1994
msgid "&Options..."
msgstr "&Beállítások..."
#. IDD_EDIT_FIND
-#: Merge.rc:1989
+#: Merge.rc:1999
#, c-format
msgid "Find"
msgstr "Keresés"
#. IDD_EDIT_MARKER, IDC_STATIC
-#: Merge.rc:1992 Merge.rc:2009 Merge.rc:2037
+#: Merge.rc:2002 Merge.rc:2019 Merge.rc:2047
#, c-format
msgid "Fi&nd what:"
msgstr "Keresés erre:"
#. IDD_EDIT_MARKER, IDC_EDIT_WHOLE_WORD
-#: Merge.rc:1994 Merge.rc:2013 Merge.rc:2041
+#: Merge.rc:2004 Merge.rc:2023 Merge.rc:2051
#, c-format
msgid "Match &whole word only"
msgstr "Pontos egyezés"
#. IDD_EDIT_MARKER, IDC_EDIT_REGEXP
-#: Merge.rc:1996 Merge.rc:2015 Merge.rc:2043
+#: Merge.rc:2006 Merge.rc:2025 Merge.rc:2053
#, c-format
msgid "Regular &expression"
msgstr "&Reguláris kifejezések"
#. IDD_EDIT_FIND, IDC_FINDDLG_DONTWRAP
-#: Merge.rc:1997
+#: Merge.rc:2007
#, c-format
msgid "D&on't wrap end of file"
msgstr "Álljon meg a fájl végénél"
#. IDD_EDIT_FIND, IDC_FINDDLG_DONTCLOSE
-#: Merge.rc:1998
+#: Merge.rc:2008
#, c-format
msgid "&Don't close this dialog"
msgstr "Ne csukja be ezt az ablakot"
#. IDD_EDIT_REPLACE, IDC_EDIT_SKIP
-#: Merge.rc:1999 Merge.rc:2021
+#: Merge.rc:2009 Merge.rc:2031
#, c-format
msgid "&Find Next"
msgstr "Kere&sés"
#. IDD_EDIT_FIND, IDC_EDIT_FINDPREV
-#: Merge.rc:2000
+#: Merge.rc:2010
#, c-format
msgid "Find &Prev"
msgstr "Következő"
#. IDD_EDIT_REPLACE
-#: Merge.rc:2006
+#: Merge.rc:2016
#, c-format
msgid "Replace"
msgstr "Csere"
#. IDD_EDIT_REPLACE, IDC_STATIC
-#: Merge.rc:2011
+#: Merge.rc:2021
#, c-format
msgid "Re&place with:"
msgstr "Cs&ere erre:"
#. IDD_EDIT_REPLACE, IDC_EDIT_SCOPE_DONT_WRAP
-#: Merge.rc:2016
+#: Merge.rc:2026
#, c-format
msgid "&Don't wrap at end of file"
msgstr "&Álljon meg a fájl végénél"
#. IDD_EDIT_REPLACE, IDC_STATIC
-#: Merge.rc:2018
+#: Merge.rc:2028
#, c-format
msgid "Replace in"
msgstr "Csere itt"
#. IDD_EDIT_REPLACE, IDC_EDIT_SCOPE_WHOLE_FILE
-#: Merge.rc:2020
+#: Merge.rc:2030
#, c-format
msgid "Wh&ole file"
msgstr "Teljes &fájl"
#. IDD_EDIT_REPLACE, IDC_EDIT_FINDPREV
-#: Merge.rc:2022
+#: Merge.rc:2032
msgid "Find Pre&v"
msgstr "Következő"
#. IDD_EDIT_REPLACE, IDC_EDIT_REPLACE
-#: Merge.rc:2023
+#: Merge.rc:2033
#, c-format
msgid "&Replace"
msgstr "Csere"
#. IDD_EDIT_REPLACE, IDC_EDIT_REPLACE_ALL
-#: Merge.rc:2024
+#: Merge.rc:2034
#, c-format
msgid "Replace &All"
msgstr "Összes cseréje"
#. IDS_OPTIONSPG_MARKERCOLORS
-#: Merge.rc:2030 Merge.rc:4209
+#: Merge.rc:2040 Merge.rc:4219
#, c-format
msgid "Markers"
msgstr "Jelölők"
#. IDD_EDIT_MARKER, IDC_EDIT_MARKERS_ENABLED
-#: Merge.rc:2033
+#: Merge.rc:2043
#, c-format
msgid "Enable &markers"
msgstr "Jelölők engedélyezése"
#. IDD_FILTERS_LINEFILTERS, IDC_LFILTER_ADDBTN
-#: Merge.rc:2035 Merge.rc:2057
+#: Merge.rc:2045 Merge.rc:2067
#, c-format
msgid "New"
msgstr "Új"
#. IDD_EDIT_MARKER, IDC_STATIC
-#: Merge.rc:2039
+#: Merge.rc:2049
#, c-format
msgid "&Background color:"
msgstr "Háttérszín:"
#. IDS_MESSAGEBOX_OK
-#: Merge.rc:2044 Merge.rc:2829 Merge.rc:3086 Merge.rc:4171
+#: Merge.rc:2054 Merge.rc:2839 Merge.rc:3096 Merge.rc:4181
#, c-format
msgid "&Ok"
msgstr "&OK"
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:2045 Merge.rc:2525 Merge.rc:3199
+#: Merge.rc:2055 Merge.rc:2535 Merge.rc:3209
#, c-format
msgid "&Apply"
msgstr "Alkalmaz"
#. IDD_FILTERS_LINEFILTERS
-#: Merge.rc:2051
+#: Merge.rc:2061
msgid "Line Filters"
msgstr "Sorszűrők"
#. IDD_FILTERS_LINEFILTERS, IDC_IGNOREREGEXP
-#: Merge.rc:2054
+#: Merge.rc:2064
#, c-format
msgid "Enable Line Filters"
msgstr "Sorszűrők engedélyezése"
#. IDD_FILTERS_LINEFILTERS, IDC_STATIC
-#: Merge.rc:2055
+#: Merge.rc:2065
#, c-format
msgid "Regular Expressions (one per line):"
msgstr "Reguláris kifejezések (soronként egy):"
#. IDD_PLUGINS_LIST, IDC_PLUGIN_EDIT
-#: Merge.rc:2058 Merge.rc:2924
+#: Merge.rc:2068 Merge.rc:2934
#, c-format
msgid "Edit"
msgstr "Szerkesztés"
#. IDD_PLUGINS_LIST, IDC_PLUGIN_REMOVE
-#: Merge.rc:2059 Merge.rc:2071 Merge.rc:2925
+#: Merge.rc:2069 Merge.rc:2081 Merge.rc:2935
#, c-format
msgid "Remove"
msgstr "Eltávolítás"
#. IDD_FILTERS_SUBSTITUTIONFILTERS
-#: Merge.rc:2064
+#: Merge.rc:2074
msgid "Substitution Filters"
msgstr "Helyettesítő szűrők"
#. IDD_FILTERS_SUBSTITUTIONFILTERS, IDC_STATIC
-#: Merge.rc:2067
+#: Merge.rc:2077
msgid "Changes to the listed pairs below will be ignored or marked as insignificant. Patches are unaffected."
msgstr "Az alább felsorolt módosításpárok figyelmen kívül lesznek hagyva vagy jelentéktelennek lesznek megjelölve. A javítások nem érintettek."
#. IDD_FILTERS_SUBSTITUTIONFILTERS, IDC_IGNORED_SUSBSTITUTIONS_ENABLED
-#: Merge.rc:2068
+#: Merge.rc:2078
msgid "Enable"
msgstr "Engedélyezés"
#. IDD_PLUGINS_LIST, IDC_PLUGIN_ADD
-#: Merge.rc:2070 Merge.rc:2923
+#: Merge.rc:2080 Merge.rc:2933
msgid "Add"
msgstr "Hozzáadás"
#. IDD_FILTERS_SUBSTITUTIONFILTERS, IDC_LFILTER_CLEARBTN
-#: Merge.rc:2072
+#: Merge.rc:2082
msgid "Clear"
msgstr "Törlés"
#. IDD_PREFERENCES
-#: Merge.rc:2077
+#: Merge.rc:2087
#, c-format
msgid "Options"
msgstr "Opciók"
#. IDD_PREFERENCES, IDC_TREEOPT_IMPORT
-#: Merge.rc:2086
+#: Merge.rc:2096
#, c-format
msgid "Import..."
msgstr "Importálás..."
#. IDD_PREFERENCES, IDC_TREEOPT_EXPORT
-#: Merge.rc:2087
+#: Merge.rc:2097
#, c-format
msgid "Export..."
msgstr "Exportálás..."
#. IDS_OPTIONSPG_GENCOMPARE
-#: Merge.rc:2092 Merge.rc:4199 Merge.rc:4202 Merge.rc:4219
+#: Merge.rc:2102 Merge.rc:4209 Merge.rc:4212 Merge.rc:4229
#, c-format
msgid "General"
msgstr "Általános"
#. IDD_PROPPAGE_GENERAL, IDC_SCROLL_CHECK
-#: Merge.rc:2095
+#: Merge.rc:2105
#, c-format
msgid "Automatically &scroll to first difference"
msgstr "Automatikus ugrás az első eltérésre"
#. IDD_PROPPAGE_GENERAL, IDC_SCROLL_TO_FIRST_INLINE_DIFF_CHECK
-#: Merge.rc:2097
+#: Merge.rc:2107
msgid "Automatically s&croll to first inline difference"
msgstr "Automatikus ugrás az első soron belüli különbséghez"
#. IDD_PROPPAGE_GENERAL, IDC_STATIC
-#: Merge.rc:2099
+#: Merge.rc:2109
msgid "Cl&ose windows with 'Esc':"
msgstr "Ablakok bezárása az '&Esc' billentyűvel:"
#. IDD_PROPPAGE_GENERAL, IDC_VERIFY_OPEN_PATHS
-#: Merge.rc:2101
+#: Merge.rc:2111
#, c-format
msgid "&Automatically verify paths in Open dialog"
msgstr "Automatikus elérési út ellenőrzés a Megnyitás ablakban"
#. IDD_PROPPAGE_GENERAL, IDC_STATIC
-#: Merge.rc:2103
+#: Merge.rc:2113
msgid "Single instance mode:"
msgstr "Egypéldányos mód:"
#. IDD_PROPPAGE_GENERAL, IDC_ASK_MULTIWINDOW_CLOSE
-#: Merge.rc:2105
+#: Merge.rc:2115
#, c-format
msgid "As&k when closing multiple windows"
msgstr "Rá&kérdezés több ablak bezárásakor"
#. IDD_PROPPAGE_GENERAL, IDC_PRESERVE_FILETIME
-#: Merge.rc:2107
+#: Merge.rc:2117
#, c-format
msgid "&Preserve file time in file compare"
msgstr "Fájl idők megőrzése összehasonlításkor"
#. IDD_PROPPAGE_GENERAL, IDC_STARTUP_FOLDER_SELECT
-#: Merge.rc:2109
+#: Merge.rc:2119
#, c-format
msgid "Show \"Select Files or Folders\" dialog on startup"
msgstr "\"Fájlok vagy könyvtárak választása\" ablak induláskor"
#. IDD_PROPPAGE_GENERAL, IDC_CLOSE_WITH_OK
-#: Merge.rc:2111
+#: Merge.rc:2121
msgid "Close \"Select Files or Folders\" dialog on clicking Compare button"
msgstr "\"Fájlok vagy könyvtárak választása\" ablak bezárása az Összehasonlít gombbal"
#. IDD_PROPPAGE_GENERAL, IDC_STATIC
-#: Merge.rc:2113
+#: Merge.rc:2123
#, c-format
msgid "Op&en dialog Auto completion:"
msgstr "Automatikus kiegészítés fájl megnyitásánál:"
#. IDD_PROPPAGE_GENERAL, IDC_STATIC
-#: Merge.rc:2115
+#: Merge.rc:2125
msgid "Auto-&reload modified files:"
msgstr "Módosított fájlok automatikus újratöltése:"
#. IDD_PROPPAGE_GENERAL, IDC_STATIC
-#: Merge.rc:2117
+#: Merge.rc:2127
#, c-format
msgid "Language:"
msgstr "Nyelv:"
#. IDD_PROPPAGE_COMPARE_WEBPAGE, IDC_COMPARE_DEFAULTS
-#: Merge.rc:2119 Merge.rc:2299 Merge.rc:2321 Merge.rc:2352 Merge.rc:2369
-#: Merge.rc:2386 Merge.rc:2394 Merge.rc:2430 Merge.rc:2454 Merge.rc:2633
-#: Merge.rc:2644 Merge.rc:2653 Merge.rc:2887 Merge.rc:2922 Merge.rc:2985
-#: Merge.rc:3010 Merge.rc:3024 Merge.rc:3038 Merge.rc:3054
+#: Merge.rc:2129 Merge.rc:2309 Merge.rc:2331 Merge.rc:2362 Merge.rc:2379
+#: Merge.rc:2396 Merge.rc:2404 Merge.rc:2440 Merge.rc:2464 Merge.rc:2643
+#: Merge.rc:2654 Merge.rc:2663 Merge.rc:2897 Merge.rc:2932 Merge.rc:2995
+#: Merge.rc:3020 Merge.rc:3034 Merge.rc:3048 Merge.rc:3064
#, c-format
msgid "Defaults"
msgstr "Alaphelyzetbe"
#. IDS_OPTIONSPG_COLORS
-#: Merge.rc:2124 Merge.rc:2140 Merge.rc:2267 Merge.rc:2292 Merge.rc:4205
+#: Merge.rc:2134 Merge.rc:2150 Merge.rc:2277 Merge.rc:2302 Merge.rc:4215
#, c-format
msgid "Colors"
msgstr "Színek"
#. IDD_PROPPAGE_COLOR_SCHEMES, IDC_STATIC
-#: Merge.rc:2127
+#: Merge.rc:2137
msgid "Color &mode:"
msgstr "Szín&mód"
#. IDD_PROPPAGE_COLOR_SCHEMES, IDC_STATIC
-#: Merge.rc:2129
+#: Merge.rc:2139
msgid "&Light mode scheme:"
msgstr "&Világos mód sémája:"
#. IDD_PROPPAGE_COLOR_SCHEMES, IDC_STATIC
-#: Merge.rc:2131
+#: Merge.rc:2141
msgid "&Dark mode scheme:"
msgstr "@Sötét mód sémája"
#. IDD_PROPPAGE_COLOR_SCHEMES, IDC_STATIC
-#: Merge.rc:2133
+#: Merge.rc:2143
msgid "Your custom schemes"
msgstr "Saját egyéni séma"
#. IDD_PROPPAGE_COLOR_SCHEMES, IDC_COLOR_SCHEME_SAVE
-#: Merge.rc:2134
+#: Merge.rc:2144
msgid "&Save current scheme..."
msgstr "Jelenlegi séma &mentése..."
#. IDD_PROPPAGE_COLOR_SCHEMES, IDC_COLOR_SCHEME_DELETE
-#: Merge.rc:2135
+#: Merge.rc:2145
msgid "Delete ¤t scheme..."
msgstr "&Jelenlegi séma törlése..."
#. IDD_PROPPAGE_COLORS_DIR, IDC_BACKGROUND_COLUMN_LABEL
-#: Merge.rc:2143 Merge.rc:2238 Merge.rc:2258 Merge.rc:2272
+#: Merge.rc:2153 Merge.rc:2248 Merge.rc:2268 Merge.rc:2282
#, c-format
msgid "Background"
msgstr "Háttér"
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2144
+#: Merge.rc:2154
#, c-format
msgid "Deleted"
msgstr "Törölt"
#. IDS_OPTIONSPG_TEXTCOLORS
-#: Merge.rc:2145 Merge.rc:2207 Merge.rc:2239 Merge.rc:2273 Merge.rc:4207
+#: Merge.rc:2155 Merge.rc:2217 Merge.rc:2249 Merge.rc:2283 Merge.rc:4217
#, c-format
msgid "Text"
msgstr "Szöveg"
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2146
+#: Merge.rc:2156
#, c-format
msgid "Difference:"
msgstr "Eltérés:"
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2151
+#: Merge.rc:2161
#, c-format
msgid "Selected Difference:"
msgstr "Kijelölt eltérés:"
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2156
+#: Merge.rc:2166
#, c-format
msgid "Ignored Difference:"
msgstr "Mellőzött eltérés:"
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2161
+#: Merge.rc:2171
#, c-format
msgid "Moved:"
msgstr "Áthelyezett:"
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2166
+#: Merge.rc:2176
#, c-format
msgid "Selected Moved:"
msgstr "Kijelölt áthelyezett:"
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2171
+#: Merge.rc:2181
#, c-format
msgid "Same As Next (3 panes):"
msgstr "Ugyanaz, mint a következő (3 paneles)"
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2176
+#: Merge.rc:2186
#, c-format
msgid "Same As Next (Selected):"
msgstr "Ugyanaz, mint a következő (kijelölt)"
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2181
+#: Merge.rc:2191
#, c-format
msgid "Word Difference:"
msgstr "Szó eltérés:"
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2186
+#: Merge.rc:2196
#, c-format
msgid "Selected Word Diff:"
msgstr "Kijelölt szó eltérés:"
#. IDD_INPUTBOX
-#: Merge.rc:2195 Merge.rc:2230 Merge.rc:2251 Merge.rc:3099
+#: Merge.rc:2205 Merge.rc:2240 Merge.rc:2261 Merge.rc:3109
#, c-format
msgid "Dialog"
msgstr "Párbeszédablak"
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC
-#: Merge.rc:2198
+#: Merge.rc:2208
#, c-format
msgid "Keywords:"
msgstr "Kulcsszavak:"
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC
-#: Merge.rc:2199
+#: Merge.rc:2209
#, c-format
msgid "Function names:"
msgstr "Függvény nevek:"
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC
-#: Merge.rc:2200
+#: Merge.rc:2210
#, c-format
msgid "Comments:"
msgstr "Megjegyzések:"
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC
-#: Merge.rc:2201
+#: Merge.rc:2211
#, c-format
msgid "Numbers:"
msgstr "Számok:"
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC
-#: Merge.rc:2202
+#: Merge.rc:2212
#, c-format
msgid "Operators:"
msgstr "Operátorok:"
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC
-#: Merge.rc:2203
+#: Merge.rc:2213
#, c-format
msgid "Strings:"
msgstr "Sztringek:"
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC
-#: Merge.rc:2204
+#: Merge.rc:2214
#, c-format
msgid "Preprocessor:"
msgstr "Előfeldolgozó:"
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC
-#: Merge.rc:2205
+#: Merge.rc:2215
#, c-format
msgid "User 1:"
msgstr "Felhasználó 1:"
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC
-#: Merge.rc:2206
+#: Merge.rc:2216
#, c-format
msgid "User 2:"
msgstr "Felhasználó 2:"
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_SCOLOR_USER2_BOLD
-#: Merge.rc:2209 Merge.rc:2211 Merge.rc:2213 Merge.rc:2215 Merge.rc:2217
-#: Merge.rc:2219 Merge.rc:2221 Merge.rc:2223 Merge.rc:2225
+#: Merge.rc:2219 Merge.rc:2221 Merge.rc:2223 Merge.rc:2225 Merge.rc:2227
+#: Merge.rc:2229 Merge.rc:2231 Merge.rc:2233 Merge.rc:2235
#, c-format
msgid "Bold"
msgstr "Félkövér"
#. IDD_PROPPAGE_COLORS_TEXT, IDC_DEFAULT_STANDARD_COLORS
-#: Merge.rc:2233
+#: Merge.rc:2243
#, c-format
msgid "&Use customized text colors"
msgstr "Egyéni szövegszínek használata"
#. IDD_PROPPAGE_COLORS_TEXT, IDC_WHITESPACE_COLOR_LABEL
-#: Merge.rc:2235
+#: Merge.rc:2245
#, c-format
msgid "Whitespace:"
msgstr "Szóköz:"
#. IDD_PROPPAGE_COLORS_TEXT, IDC_TEXT_COLOR_LABEL
-#: Merge.rc:2236
+#: Merge.rc:2246
#, c-format
msgid "Regular text:"
msgstr "Sima szöveg:"
#. IDD_PROPPAGE_COLORS_TEXT, IDC_SELECTION_COLOR_LABEL
-#: Merge.rc:2237
+#: Merge.rc:2247
#, c-format
msgid "Selection:"
msgstr "Kijelölés:"
#. IDD_PROPPAGE_COLORS_DIR, IDC_STATIC
-#: Merge.rc:2245 Merge.rc:2286
+#: Merge.rc:2255 Merge.rc:2296
#, c-format
msgid "Margin:"
msgstr "Margó:"
#. IDD_PROPPAGE_COLORS_MARKER, IDC_MARKER0_COLOR_LABEL
-#: Merge.rc:2254
+#: Merge.rc:2264
#, c-format
msgid "Search Marker:"
msgstr "Keresés jelölő:"
#. IDD_PROPPAGE_COLORS_MARKER, IDC_MARKER1_COLOR_LABEL
-#: Merge.rc:2255
+#: Merge.rc:2265
#, c-format
msgid "User Defined Marker 1:"
msgstr "Saját jelölő 1:"
#. IDD_PROPPAGE_COLORS_MARKER, IDC_MARKER2_COLOR_LABEL
-#: Merge.rc:2256
+#: Merge.rc:2266
#, c-format
msgid "User Defined Marker 2:"
msgstr "Saját jelölő 2:"
#. IDD_PROPPAGE_COLORS_MARKER, IDC_MARKER3_COLOR_LABEL
-#: Merge.rc:2257
+#: Merge.rc:2267
#, c-format
msgid "User Defined Marker 3:"
msgstr "Saját jelölő 3:"
#. IDD_PROPPAGE_COLORS_DIR, IDC_USE_DIR_COMPARE_COLORS
-#: Merge.rc:2270
+#: Merge.rc:2280
msgid "&Use folder compare colors"
msgstr "Színek használata"
#. IDD_PROPPAGE_COLORS_DIR, IDC_STATIC
-#: Merge.rc:2274
+#: Merge.rc:2284
msgid "Items equal:"
msgstr "Egyforma elemek:"
#. IDD_PROPPAGE_COLORS_DIR, IDC_STATIC
-#: Merge.rc:2277
+#: Merge.rc:2287
msgid "Items different:"
msgstr "Különböző elemek:"
#. IDD_PROPPAGE_COLORS_DIR, IDC_STATIC
-#: Merge.rc:2280
+#: Merge.rc:2290
msgid "Items missing:"
msgstr "Hiányzó elemek:"
#. IDD_PROPPAGE_COLORS_DIR, IDC_STATIC
-#: Merge.rc:2283
+#: Merge.rc:2293
msgid "Items filtered:"
msgstr "Szűrt elemek:"
#. IDD_PROPPAGE_COLORS_SYSTEM, IDC_SYSCOLOR_HOOK_ENABLED
-#: Merge.rc:2295
+#: Merge.rc:2305
msgid "&Use custom system colors"
msgstr "&Egyéni rendszerszínek használata (egyes UI elemek nem alkalmazhatók)"
#. IDS_PRPCAT_SYSTEM
-#: Merge.rc:2304 Merge.rc:4211 Merge.rc:4212 Merge.rc:4657
+#: Merge.rc:2314 Merge.rc:4221 Merge.rc:4222 Merge.rc:4667
#, c-format
msgid "System"
msgstr "Rendszer"
#. IDD_PROPPAGE_SYSTEM, IDC_USE_RECYCLE_BIN
-#: Merge.rc:2307
+#: Merge.rc:2317
#, c-format
msgid "&Use Recycle Bin"
msgstr "A törölt fájlok a &Lomtárba kerüljenek"
#. IDD_PROPPAGE_SYSTEM, IDC_STATIC
-#: Merge.rc:2308
+#: Merge.rc:2318
#, c-format
msgid "&External editor:"
msgstr "Külső szerkesztő:"
#. IDD_PROPPAGE_SYSTEM, IDC_STATIC
-#: Merge.rc:2311
+#: Merge.rc:2321
msgid "&Store user data in:"
msgstr "&Felhasználói adatok tárolása itt:"
#. IDD_PROPPAGE_SYSTEM, IDC_STATIC
-#: Merge.rc:2313
+#: Merge.rc:2323
#, c-format
msgid "&Filter folder:"
msgstr "Szűrők mappája:"
#. IDD_PROPPAGE_SYSTEM, IDC_STATIC
-#: Merge.rc:2316
+#: Merge.rc:2326
#, c-format
msgid "Temporary files folder"
msgstr "Átmeneti fájlok könyvtára"
#. IDD_PROPPAGE_SYSTEM, IDC_TMPFOLDER_SYSTEM
-#: Merge.rc:2317
+#: Merge.rc:2327
#, c-format
msgid "S&ystem temp folder"
msgstr "A rendszer Temp könyvtára"
#. IDD_PROPPAGE_SYSTEM, IDC_STATIC
-#: Merge.rc:2318
+#: Merge.rc:2328
#, c-format
msgid "C&ustom folder:"
msgstr "Egyéni könyvtár:"
#. IDD_GENERATE_PATCH, IDC_DIFF_BROWSE_FILE2
-#: Merge.rc:2320 Merge.rc:2416
+#: Merge.rc:2330 Merge.rc:2426
#, c-format
msgid "Br&owse..."
msgstr "T&allózás..."
#. IDS_OPTIONSPG_COMPARE
-#: Merge.rc:2326 Merge.rc:4200
+#: Merge.rc:2336 Merge.rc:4210
#, c-format
msgid "Compare"
msgstr "Összehasonlít"
#. IDD_PROPPAGE_COMPARE, IDC_STATIC
-#: Merge.rc:2329
+#: Merge.rc:2339
#, c-format
msgid "Whitespaces"
msgstr "Szóközök"
#. IDD_PROPPAGE_COMPARE, IDC_WHITESPACE
-#: Merge.rc:2330
+#: Merge.rc:2340
#, c-format
msgid "&Compare"
msgstr "&Összehasonlít"
#. IDD_PROPPAGE_COMPARE, IDC_WHITE_CHANGE
-#: Merge.rc:2331
+#: Merge.rc:2341
#, c-format
msgid "&Ignore change"
msgstr "&Változtatás mellőzése"
#. IDD_PROPPAGE_COMPARE, IDC_ALL_WHITE
-#: Merge.rc:2332
+#: Merge.rc:2342
#, c-format
msgid "I&gnore all"
msgstr "Összes mellőzése"
#. IDD_PROPPAGE_COMPARE, IDC_IGNBLANKS_CHECK
-#: Merge.rc:2333
+#: Merge.rc:2343
msgid "Ignore blan&k lines"
msgstr "Üres sorok mellőzése"
#. IDD_PROPPAGE_COMPARE, IDC_IGNCASE_CHECK
-#: Merge.rc:2334
+#: Merge.rc:2344
msgid "Ignore &case"
msgstr "&Kis-nagybetű különbségek mellőzése"
#. IDD_PROPPAGE_COMPARE, IDC_EOL_SENSITIVE
-#: Merge.rc:2335
+#: Merge.rc:2345
msgid "Igno&re EOL differences (Windows/Unix/Mac)"
msgstr "Sorvégzáró különbségek &figyelmen kívül hagyása (Windows/Unix/Mac)"
#. IDD_PROPPAGE_COMPARE, IDC_IGNORE_NUMBERS
-#: Merge.rc:2337
+#: Merge.rc:2347
msgid "Ignore num&bers"
msgstr "Számok mellőzése"
#. IDD_PROPPAGE_COMPARE, IDC_CP_SENSITIVE
-#: Merge.rc:2338
+#: Merge.rc:2348
msgid "Ignore codepage &differences"
msgstr "Kódtábla különbségek mellőzése"
#. IDD_PROPPAGE_COMPARE, IDC_FILTERCOMMENTS_CHECK
-#: Merge.rc:2339
+#: Merge.rc:2349
msgid "Ignore c&omment differences"
msgstr "Megjegyzés különbségek mellőzése"
#. IDD_PROPPAGE_COMPARE, IDC_IGNEOFEOL_CHECK
-#: Merge.rc:2341
+#: Merge.rc:2351
msgid "Ignore &missing trailing EOL"
msgstr "&Hiányzó sorvégzáró figyelmen kívül hagyása"
#. IDD_PROPPAGE_COMPARE, IDC_IGNLBRKS_CHECK
-#: Merge.rc:2343
+#: Merge.rc:2353
msgid "Ignore line &breaks (treat as spaces)"
msgstr "&Sortörések figyelmen kívül hagyása (szóközként kezelés)"
#. IDD_PROPPAGE_COMPARE, IDC_MOVED_BLOCKS
-#: Merge.rc:2345
+#: Merge.rc:2355
#, c-format
msgid "E&nable moved block detection"
msgstr "Mozgatott &blokk észlelés bekapcsolása"
#. IDD_PROPPAGE_COMPARE, IDC_ALIGN_SIMILAR_LINES
-#: Merge.rc:2346
+#: Merge.rc:2356
msgid "Align &similar lines"
msgstr "Hasonló sorok igazítása"
#. IDD_PROPPAGE_COMPARE, IDC_STATIC
-#: Merge.rc:2347
+#: Merge.rc:2357
msgid "Diff &algorithm:"
msgstr "Különbségkereső algoritmus:"
#. IDD_PROPPAGE_COMPARE, IDC_INDENT_HEURISTIC
-#: Merge.rc:2349
+#: Merge.rc:2359
msgid "Enable indent &heuristic"
msgstr "Heurisztika engedélyezése"
#. IDD_PROPPAGE_COMPARE, IDC_COMPLETELY_BLANK_OUT_IGNORED_DIFFERENCES
-#: Merge.rc:2350
+#: Merge.rc:2360
msgid "Completely unhighlight the ignored differences"
msgstr "Ne emelje ki a figyelmen kívül hagyott különbségeket"
#. IDS_OPTIONSPG_EDITOR
-#: Merge.rc:2357 Merge.rc:4201
+#: Merge.rc:2367 Merge.rc:4211
#, c-format
msgid "Editor"
msgstr "Szerkesztő"
#. IDD_PROPPAGE_EDITOR, IDC_HILITE_CHECK
-#: Merge.rc:2360
+#: Merge.rc:2370
#, c-format
msgid "&Highlight syntax"
msgstr "&Szintaxis kiemelés"
#. IDD_PROPPAGE_EDITOR, IDC_MIXED_EOL
-#: Merge.rc:2361
+#: Merge.rc:2371
#, c-format
msgid "&Preserve original EOL"
msgstr "&Eredeti sorvég karakterek megőrzése"
#. IDD_PROPPAGE_EDITOR, IDC_STATIC
-#: Merge.rc:2362
+#: Merge.rc:2372
#, c-format
msgid "Tabs"
msgstr "Tabulátorok"
#. IDD_PROPPAGE_EDITOR, IDC_STATIC
-#: Merge.rc:2363
+#: Merge.rc:2373
#, c-format
msgid "&Tab size:"
msgstr "Tabulátor mérete:"
#. IDD_PROPPAGE_EDITOR, IDC_PROP_INSERT_TABS
-#: Merge.rc:2365
+#: Merge.rc:2375
#, c-format
msgid "&Insert tabs"
msgstr "&Tabulátorok használata"
#. IDD_PROPPAGE_EDITOR, IDC_PROP_INSERT_SPACES
-#: Merge.rc:2366
+#: Merge.rc:2376
#, c-format
msgid "Insert &spaces"
msgstr "&Szóközök használata"
#. IDD_PROPPAGE_EDITOR, IDC_STATIC
-#: Merge.rc:2367
+#: Merge.rc:2377
msgid "&Rendering mode:"
msgstr "Renderelési mód:"
#. IDD_PROPPAGE_EDITOR_COMPAREMERGE, IDC_AUTOMRESCAN_CHECK
-#: Merge.rc:2376
+#: Merge.rc:2386
#, c-format
msgid "&Automatic rescan"
msgstr "&Automatikus újraolvasás"
#. IDD_PROPPAGE_EDITOR_COMPAREMERGE, IDC_STATIC
-#: Merge.rc:2377
+#: Merge.rc:2387
msgid "Copy &granularity for selected differences:"
msgstr "Kiválasztott eltérések &részletességének másolása:"
#. IDD_PROPPAGE_EDITOR_COMPAREMERGE, IDC_LINE_COLORING_GROUP
-#: Merge.rc:2379
+#: Merge.rc:2389
#, c-format
msgid "Line Difference Coloring"
msgstr "Eltérő sorok színezése"
#. IDD_PROPPAGE_EDITOR_COMPAREMERGE, IDC_VIEW_LINE_DIFFERENCES
-#: Merge.rc:2380
+#: Merge.rc:2390
#, c-format
msgid "View line differences"
msgstr "Sorok eltérésének mutatása"
#. IDD_PROPPAGE_EDITOR_COMPAREMERGE, IDC_EDITOR_CHARLEVEL
-#: Merge.rc:2381
+#: Merge.rc:2391
#, c-format
msgid "&Character-level"
msgstr "Karakter szintű"
#. IDD_PROPPAGE_EDITOR_COMPAREMERGE, IDC_EDITOR_WORDLEVEL
-#: Merge.rc:2382
+#: Merge.rc:2392
#, c-format
msgid "&Word-level:"
msgstr "Szóköz, írásjel szintű:"
#. IDD_PROPPAGE_EDITOR_COMPAREMERGE, IDC_STATIC
-#: Merge.rc:2384
+#: Merge.rc:2394
#, c-format
msgid "W&ord break characters:"
msgstr "Szótörés karakterek:"
#. IDD_PROPPAGE_MESSAGEBOXES, IDC_STATIC
-#: Merge.rc:2401
+#: Merge.rc:2411
msgid "Some messages can be hidden by the user. Press Reset to make all messages visible again."
msgstr "A WinMerge lehetővé teszi általános üzenetablakok elrejtését. A Visszaállítás gombbal minden üzenetablak újra láthatóvá tehető."
#. IDD_SELECT_FILES_OR_FOLDERS, IDC_RESET
-#: Merge.rc:2402 Merge.rc:3085
+#: Merge.rc:2412 Merge.rc:3095
#, c-format
msgid "Reset"
msgstr "Visszaállítás"
#. IDD_GENERATE_PATCH
-#: Merge.rc:2408
+#: Merge.rc:2418
#, c-format
msgid "Patch Generator"
msgstr "Patch Generátor"
#. IDD_GENERATE_PATCH, IDC_STATIC
-#: Merge.rc:2411
+#: Merge.rc:2421
#, c-format
msgid "File&1:"
msgstr "1.fájl:"
#. IDD_GENERATE_PATCH, IDC_STATIC
-#: Merge.rc:2414
+#: Merge.rc:2424
#, c-format
msgid "File&2:"
msgstr "2.fájl:"
#. IDD_GENERATE_PATCH, IDC_DIFF_SWAPFILES
-#: Merge.rc:2417
+#: Merge.rc:2427
#, c-format
msgid "&Swap"
msgstr "Csere"
#. IDD_DIRCMP_REPORT, IDC_REPORT_COPYCLIPBOARD
-#: Merge.rc:2418 Merge.rc:2690
+#: Merge.rc:2428 Merge.rc:2700
#, c-format
msgid "&Copy to clipboard"
msgstr "Másolás vágólapra"
#. IDD_GENERATE_PATCH, IDC_DIFF_APPENDFILE
-#: Merge.rc:2419
+#: Merge.rc:2429
#, c-format
msgid "&Append to existing file"
msgstr "&Hozzáfűzés a létező fájlhoz"
#. IDD_GENERATE_PATCH, IDC_STATIC
-#: Merge.rc:2420
+#: Merge.rc:2430
#, c-format
msgid "&Result:"
msgstr "&Kimenet:"
#. IDD_GENERATE_PATCH, IDC_DIFF_BROWSE_RESULT
-#: Merge.rc:2422
+#: Merge.rc:2432
#, c-format
msgid "Bro&wse..."
msgstr "T&allózás..."
#. IDD_GENERATE_PATCH, IDC_STATIC
-#: Merge.rc:2423
+#: Merge.rc:2433
#, c-format
msgid "&Format"
msgstr "&Formátum"
#. IDD_GENERATE_PATCH, IDC_STATIC
-#: Merge.rc:2424
+#: Merge.rc:2434
#, c-format
msgid "St&yle:"
msgstr "St&ílus:"
#. IDD_GENERATE_PATCH, IDC_STATIC
-#: Merge.rc:2426
+#: Merge.rc:2436
#, c-format
msgid "&Context:"
msgstr "&Környezet:"
#. IDD_GENERATE_PATCH, IDC_DIFF_INCLCMDLINE
-#: Merge.rc:2428
+#: Merge.rc:2438
#, c-format
msgid "Inclu&de command line"
msgstr "&Parancssor is"
#. IDD_GENERATE_PATCH, IDC_DIFF_OPENTOEDITOR
-#: Merge.rc:2429
+#: Merge.rc:2439
#, c-format
msgid "Open in e&xternal editor"
msgstr "Megnyitás a külső szerkesztővel"
#. IDD_DIRCOLS
-#: Merge.rc:2446
+#: Merge.rc:2456
#, c-format
msgid "Display Columns"
msgstr "Oszlopok mutatása"
#. IDD_DIRCOLS, IDC_UP
-#: Merge.rc:2450
+#: Merge.rc:2460
#, c-format
msgid "Move &Up"
msgstr "Mozgatás fel"
#. IDD_DIRCOLS, IDC_DOWN
-#: Merge.rc:2451
+#: Merge.rc:2461
#, c-format
msgid "Move &Down"
msgstr "Mozgatás le"
#. IDD_DIRCOLS, IDC_COLDLG_ADDITIONAL_PROPERTIES
-#: Merge.rc:2453
+#: Merge.rc:2463
msgid "&Additional Properties"
msgstr "További tulajdonságok"
#. IDD_DIRADDITIONALPROPS
-#: Merge.rc:2461
+#: Merge.rc:2471
msgid "Additional Properties"
msgstr "További tulajdonságok"
#. IDD_PLUGINS_SELECTPLUGIN
-#: Merge.rc:2475
+#: Merge.rc:2485
msgid "Select Plugin"
msgstr "Bővítmény kiválasztása"
#. IDD_PLUGINS_EDITPLUGIN, IDC_STATIC
-#: Merge.rc:2478 Merge.rc:3115
+#: Merge.rc:2488 Merge.rc:3125
msgid "Plugin &name:"
msgstr "Bővítmény neve:"
#. IDD_PLUGINS_SELECTPLUGIN, IDC_STATIC
-#: Merge.rc:2480
+#: Merge.rc:2490
msgid "&Target files:"
msgstr "&Célfájlok:"
#. IDD_PLUGINS_EDITPLUGIN, IDC_STATIC
-#: Merge.rc:2482 Merge.rc:3117
+#: Merge.rc:2492 Merge.rc:3127
#, c-format
msgid "Extensions list:"
msgstr "Kiterjesztések listája:"
#. IDD_PLUGINS_EDITPLUGIN, IDC_STATIC
-#: Merge.rc:2484 Merge.rc:3119
+#: Merge.rc:2494 Merge.rc:3129
#, c-format
msgid "Description:"
msgstr "Leírás:"
#. IDD_PLUGINS_EDITPLUGIN, IDC_STATIC
-#: Merge.rc:2486 Merge.rc:3121
+#: Merge.rc:2496 Merge.rc:3131
msgid "Default arguments:"
msgstr "Alapértelmezett argumentumok:"
#. IDD_PLUGINS_SELECTPLUGIN, IDC_PLUGIN_ALLOW_ALL
-#: Merge.rc:2488
+#: Merge.rc:2498
msgid "Display all plugins (Ignore extension)"
msgstr "Az összes bővítmény megjelenítése, ne ellenőrizze a kiterjesztést"
#. IDD_PLUGINS_SELECTPLUGIN, IDC_PLUGIN_OPEN_IN_SAME_FRAME_TYPE
-#: Merge.rc:2490
+#: Merge.rc:2500
msgid "&Open files in same window type after unpacking"
msgstr "Kicsomagolás után a fájlok megnyitása ugyanabban az ablakban"
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_PIPELINE_STATIC
-#: Merge.rc:2492 Merge.rc:3129
+#: Merge.rc:2502 Merge.rc:3139
msgid "&Plugin pipeline:"
msgstr "Bővítmény pipeline"
#. IDD_PLUGINS_SELECTPLUGIN, IDC_PLUGIN_ALIAS
-#: Merge.rc:2495
+#: Merge.rc:2505
msgid "&Alias..."
msgstr "&Alias..."
#. IDD_DIRCOMP_PROGRESS, IDC_COMPARISON_STOP
-#: Merge.rc:2505
+#: Merge.rc:2515
#, c-format
msgid "Stop"
msgstr "Leállítás"
#. IDD_DIRCOMP_PROGRESS, IDC_COMPARISON_PAUSE
-#: Merge.rc:2506
+#: Merge.rc:2516
#, c-format
msgid "Pause"
msgstr "Szünet"
#. IDD_DIRCOMP_PROGRESS, IDC_COMPARISON_CONTINUE
-#: Merge.rc:2507
+#: Merge.rc:2517
#, c-format
msgid "Continue"
msgstr "Folytatás"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC
-#: Merge.rc:2509 Merge.rc:2973
+#: Merge.rc:2519 Merge.rc:2983
msgid "C&PU cores to use:"
msgstr "Használandó CPU magok száma:"
#. IDD_DIRCOMP_PROGRESS, IDC_STATIC
-#: Merge.rc:2510
+#: Merge.rc:2520
#, c-format
msgid "Items total:"
msgstr "Összes elem:"
#. IDD_DIRCOMP_PROGRESS, IDC_STATIC
-#: Merge.rc:2511
+#: Merge.rc:2521
#, c-format
msgid "Items compared:"
msgstr "Összehasonlított elemek:"
#. IDS_PREVIEWBAR_CLOSE
-#: Merge.rc:2526 Merge.rc:2846 Merge.rc:5328
+#: Merge.rc:2536 Merge.rc:2856 Merge.rc:5339
#, c-format
msgid "&Close"
msgstr "&Bezárás"
#. IDD_WMGOTO
-#: Merge.rc:2537
+#: Merge.rc:2547
msgid "Go to"
msgstr "Ugrás"
#. IDD_WMGOTO, IDC_STATIC
-#: Merge.rc:2540
+#: Merge.rc:2550
msgid "G&o to:"
msgstr "U&grás:"
#. IDD_WMGOTO, IDC_STATIC
-#: Merge.rc:2543
+#: Merge.rc:2553
#, c-format
msgid "File"
msgstr "Fájl"
#. IDD_WMGOTO, IDC_STATIC
-#: Merge.rc:2547
+#: Merge.rc:2557
msgid "Go to what"
msgstr "Mire ugorjon"
#. IDD_WMGOTO, IDC_WMGOTO_TOLINE
-#: Merge.rc:2548
+#: Merge.rc:2558
#, c-format
msgid "Li&ne"
msgstr "&Sorra"
#. IDD_WMGOTO, IDC_WMGOTO_TODIFF
-#: Merge.rc:2549
+#: Merge.rc:2559
#, c-format
msgid "&Difference"
msgstr "&Eltérésre"
#. IDD_WMGOTO, IDOK
-#: Merge.rc:2550
+#: Merge.rc:2560
msgid "&Go to"
msgstr "&Ugrás"
#. IDS_PROJECT_ITEM_FILE_FILTER
-#: Merge.rc:2556 Merge.rc:4321
+#: Merge.rc:2566 Merge.rc:4331
msgid "File Filters"
msgstr "Fájlszűrők"
#. IDD_FILTERS_FILEFILTERS, IDC_STATIC
-#: Merge.rc:2559
+#: Merge.rc:2569
msgid "&Mask / Filter Expression"
msgstr "&Maszk / Szűrő kifejezés"
#. IDD_FILTERS_FILEFILTERS, IDC_STATIC
-#: Merge.rc:2562
+#: Merge.rc:2572
msgid "Preset &Filters"
msgstr "Előre beállított &szűrők"
#. IDD_FILTERS_FILEFILTERS, IDC_FILTERFILE_TEST_BTN
-#: Merge.rc:2564
+#: Merge.rc:2574
msgid "Test..."
msgstr "Teszt..."
#. IDD_FILTERS_FILEFILTERS, IDC_FILTERFILE_INSTALL
-#: Merge.rc:2565
+#: Merge.rc:2575
#, c-format
msgid "Install..."
msgstr "Telepítés..."
#. IDD_FILTERS_FILEFILTERS, IDC_FILTERFILE_NEWBTN
-#: Merge.rc:2566
+#: Merge.rc:2576
#, c-format
msgid "New..."
msgstr "Új..."
#. IDD_FILTERS_FILEFILTERS, IDC_FILTERFILE_EDITBTN
-#: Merge.rc:2567
+#: Merge.rc:2577
#, c-format
msgid "Edit..."
msgstr "Szerkesztés..."
#. IDD_FILTERS_FILEFILTERS, IDC_FILTERFILE_DELETEBTN
-#: Merge.rc:2568
+#: Merge.rc:2578
#, c-format
msgid "Delete..."
msgstr "Törlés..."
#. IDD_FILTERS_CONDITION
-#: Merge.rc:2573
+#: Merge.rc:2583
msgid "Filter Condition"
msgstr "Szűrő állapota"
#. IDD_FILTERS_CONDITION, IDC_STATIC
-#: Merge.rc:2576
+#: Merge.rc:2586
msgid "&Left-hand side:"
msgstr "&Balkezes oldal:"
#. IDD_FILTERS_CONDITION, IDC_STATIC
-#: Merge.rc:2578
+#: Merge.rc:2588
msgid "&Operator:"
msgstr "&Operátor:"
#. IDD_FILTERS_CONDITION, IDC_STATIC
-#: Merge.rc:2580
+#: Merge.rc:2590
msgid "&Right-hand side:"
msgstr "&Jobbkezes oldal:"
#. IDD_FILTERS_CONDITION, IDC_STATIC
-#: Merge.rc:2586
+#: Merge.rc:2596
msgid "Expression:"
msgstr "Kifejezés:"
#. IDD_COMPARISON_RESULT_FILTER
-#: Merge.rc:2595
+#: Merge.rc:2605
msgid "Filter by Comparison Result"
msgstr ""
#. IDD_COMPARISON_RESULT_FILTER, IDC_RADIO_INCLUDE
-#: Merge.rc:2598
+#: Merge.rc:2608
msgid "&Include"
msgstr ""
#. IDD_COMPARISON_RESULT_FILTER, IDC_RADIO_EXCLUDE
-#: Merge.rc:2599
+#: Merge.rc:2609
msgid "&Exclude"
msgstr ""
#. IDD_COMPARISON_RESULT_FILTER, IDC_STATIC
-#: Merge.rc:2600
+#: Merge.rc:2610
msgid "Comparison Results"
msgstr ""
#. IDS_IDENTICAL
-#: Merge.rc:2601 Merge.rc:2733 Merge.rc:2794 Merge.rc:4698
+#: Merge.rc:2611 Merge.rc:2743 Merge.rc:2804 Merge.rc:4708
#, c-format
msgid "Identical"
msgstr "Egyező"
#. IDS_DIFFERENT
-#: Merge.rc:2602 Merge.rc:2714 Merge.rc:2755 Merge.rc:4708
+#: Merge.rc:2612 Merge.rc:2724 Merge.rc:2765 Merge.rc:4718
#, c-format
msgid "Different"
msgstr "Különböző"
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_LEFT_ONLY
-#: Merge.rc:2603
+#: Merge.rc:2613
msgid "Left only"
msgstr ""
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_RIGHT_ONLY
-#: Merge.rc:2604
+#: Merge.rc:2614
msgid "Right only"
msgstr ""
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_SKIPPED
-#: Merge.rc:2605
+#: Merge.rc:2615
msgid "Skipped"
msgstr ""
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_MIDDLE_ONLY
-#: Merge.rc:2606
+#: Merge.rc:2616
msgid "Middle only"
msgstr ""
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_LEFT_ONLY_DIFFERENT
-#: Merge.rc:2607
+#: Merge.rc:2617
msgid "Left only (different)"
msgstr ""
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_MIDDLE_ONLY_DIFFERENT
-#: Merge.rc:2608
+#: Merge.rc:2618
msgid "Middle only (different)"
msgstr ""
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_RIGHT_ONLY_DIFFERENT
-#: Merge.rc:2609
+#: Merge.rc:2619
msgid "Right only (different)"
msgstr ""
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_LEFT_ONLY_MISSING
-#: Merge.rc:2610
+#: Merge.rc:2620
msgid "Left only (missing)"
msgstr ""
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_MIDDLE_ONLY_MISSING
-#: Merge.rc:2611
+#: Merge.rc:2621
msgid "Middle only (missing)"
msgstr ""
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_RIGHT_ONLY_MISSING
-#: Merge.rc:2612
+#: Merge.rc:2622
msgid "Right only (missing)"
msgstr ""
#. IDS_OPTIONSPG_CODEPAGE
-#: Merge.rc:2619 Merge.rc:2811 Merge.rc:4213
+#: Merge.rc:2629 Merge.rc:2821 Merge.rc:4223
#, c-format
msgid "Codepage"
msgstr "Kódlap"
#. IDD_PROPPAGE_CODEPAGE, IDC_STATIC
-#: Merge.rc:2622
+#: Merge.rc:2632
#, c-format
msgid "Default Codepage"
msgstr "Alapértelmezett kódlap"
#. IDD_PROPPAGE_CODEPAGE, IDC_STATIC
-#: Merge.rc:2623
+#: Merge.rc:2633
#, c-format
msgid "Select the default codepage for non-Unicode files:"
msgstr "Válaszd ki az alapértelmezett kódlapot a nem-Unicode fájlokhoz:"
#. IDD_PROPPAGE_CODEPAGE, IDC_CP_SYSTEM
-#: Merge.rc:2624
+#: Merge.rc:2634
#, c-format
msgid "System codepage"
msgstr "Rendszer kódlap"
#. IDD_PROPPAGE_CODEPAGE, IDC_CP_UI
-#: Merge.rc:2625
+#: Merge.rc:2635
#, c-format
msgid "According to WinMerge User Interface"
msgstr "A Winmerge felhasználói felületéhez igazodva"
#. IDD_PROPPAGE_CODEPAGE, IDC_CP_CUSTOM
-#: Merge.rc:2626
+#: Merge.rc:2636
#, c-format
msgid "Custom codepage:"
msgstr "Egyéni kódlap:"
#. IDD_PROPPAGE_CODEPAGE, IDC_DETECT_CODEPAGE
-#: Merge.rc:2628
+#: Merge.rc:2638
msgid ""
"Detect codepage for: .html, .rc, .xml\n"
"Restart required."
@@ -4476,7 +4487,7 @@ msgstr ""
"A program újraindítása szükséges."
#. IDD_PROPPAGE_CODEPAGE, IDC_DETECT_CODEPAGE2
-#: Merge.rc:2630
+#: Merge.rc:2640
msgid ""
"Detect codepage for files with mlang.dll\n"
"Restart required."
@@ -4485,857 +4496,857 @@ msgstr ""
"A program újraindítása szükséges."
#. IDS_OPTIONSPG_ARCHIVE
-#: Merge.rc:2638 Merge.rc:4214
+#: Merge.rc:2648 Merge.rc:4224
#, c-format
msgid "Archive Support"
msgstr "Archívum támogatás"
#. IDD_PROPPAGE_ARCHIVE, IDC_ARCHIVE_ENABLE
-#: Merge.rc:2641
+#: Merge.rc:2651
#, c-format
msgid "&Enable archive file support"
msgstr "Archív fájlok támogatásának &engedélyezése"
#. IDD_PROPPAGE_ARCHIVE, IDC_ARCHIVE_DETECTTYPE
-#: Merge.rc:2642
+#: Merge.rc:2652
#, c-format
msgid "&Detect archive type from file signature"
msgstr "Archív fájl típusának megállapítása a fájl &szignatúrája alapján"
#. IDD_PROPPAGE_PROJECT, IDC_STATIC
-#: Merge.rc:2651
+#: Merge.rc:2661
msgid "Items saved to or restored from the project file:"
msgstr "A projektfájlba mentett vagy onnan visszaállított elemek:"
#. IDD_SAVECLOSING
-#: Merge.rc:2658
+#: Merge.rc:2668
#, c-format
msgid "Save Modified Files?"
msgstr "Módosított fájlok mentése?"
#. IDD_SAVECLOSING, IDC_SAVECLOSING_LEFTFRAME
-#: Merge.rc:2661
+#: Merge.rc:2671
#, c-format
msgid "Left side file"
msgstr "Bal oldali fájl"
#. IDD_SAVECLOSING, IDC_SAVECLOSING_SAVELEFT
-#: Merge.rc:2663
+#: Merge.rc:2673
#, c-format
msgid "&Save changes"
msgstr "&Változtatások mentése"
#. IDD_SAVECLOSING, IDC_SAVECLOSING_DISCARDLEFT
-#: Merge.rc:2664
+#: Merge.rc:2674
#, c-format
msgid "&Discard changes"
msgstr "Változtatások &elvetése"
#. IDD_SAVECLOSING, IDC_SAVECLOSING_MIDDLEFRAME
-#: Merge.rc:2665
+#: Merge.rc:2675
#, c-format
msgid "Middle side file"
msgstr "Középső fájl"
#. IDD_SAVECLOSING, IDC_SAVECLOSING_SAVEMIDDLE
-#: Merge.rc:2667
+#: Merge.rc:2677
#, c-format
msgid "Sa&ve changes"
msgstr "Változások mentése"
#. IDD_SAVECLOSING, IDC_SAVECLOSING_DISCARDMIDDLE
-#: Merge.rc:2668
+#: Merge.rc:2678
#, c-format
msgid "Discard c&hanges"
msgstr "Változások elvetése"
#. IDD_SAVECLOSING, IDC_SAVECLOSING_RIGHTFRAME
-#: Merge.rc:2669
+#: Merge.rc:2679
#, c-format
msgid "Right side file"
msgstr "Jobb oldali fájl"
#. IDD_SAVECLOSING, IDC_SAVECLOSING_SAVERIGHT
-#: Merge.rc:2671
+#: Merge.rc:2681
#, c-format
msgid "S&ave changes"
msgstr "V&áltoztatások mentése"
#. IDD_SAVECLOSING, IDC_SAVECLOSING_DISCARDRIGHT
-#: Merge.rc:2672
+#: Merge.rc:2682
#, c-format
msgid "Dis&card changes"
msgstr "Változtatások e&lvetése"
#. IDD_SAVECLOSING, IDC_SAVECLOSING_DISCARDALL
-#: Merge.rc:2673
+#: Merge.rc:2683
#, c-format
msgid "Disca&rd All"
msgstr "Összes elvetése"
#. IDD_DIRCMP_REPORT
-#: Merge.rc:2680
+#: Merge.rc:2690
#, c-format
msgid "Folder Compare Report"
msgstr "Könyvtár összehasonítási jelentés"
#. IDD_DIRCMP_REPORT, IDC_STATIC
-#: Merge.rc:2683
+#: Merge.rc:2693
#, c-format
msgid "Report &file:"
msgstr "Riportfájl:"
#. IDD_DIRCMP_REPORT, IDC_STATIC
-#: Merge.rc:2686
+#: Merge.rc:2696
#, c-format
msgid "&Style:"
msgstr "&Stílus:"
#. IDD_DIRCMP_REPORT, IDC_REPORT_INCLUDEFILECMPREPORT
-#: Merge.rc:2688
+#: Merge.rc:2698
#, c-format
msgid "&Include file compare report"
msgstr "Fájl-összehasonlító jelentés hozzáadása"
#. IDD_FILTERS_FILEFILTERS_SHARED
-#: Merge.rc:2697
+#: Merge.rc:2707
#, c-format
msgid "Shared or Private Filter"
msgstr "Megosztott vagy saját szűrő"
#. IDD_FILTERS_FILEFILTERS_SHARED, IDC_STATIC
-#: Merge.rc:2700
+#: Merge.rc:2710
#, c-format
msgid "What type of filter do you want?"
msgstr "Milyen típusú szűrőt szeretnél létrehozni?"
#. IDD_FILTERS_FILEFILTERS_SHARED, IDC_SHARED
-#: Merge.rc:2701
+#: Merge.rc:2711
#, c-format
msgid "Shared Filter (for all users)"
msgstr "Megosztott szűrő (a gép minden felhasználójának)"
#. IDD_FILTERS_FILEFILTERS_SHARED, IDC_PRIVATE
-#: Merge.rc:2702
+#: Merge.rc:2712
#, c-format
msgid "Private Filter (current user only)"
msgstr "Saját szűrő (csak a jelenlegi felhasználónak)"
#. IDD_COMPARE_STATISTICS3
-#: Merge.rc:2709 Merge.rc:2750
+#: Merge.rc:2719 Merge.rc:2760
#, c-format
msgid "Compare Statistics"
msgstr "Összehasonlítási statisztika"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2712 Merge.rc:2753
+#: Merge.rc:2722 Merge.rc:2763
#, c-format
msgid "Folders:"
msgstr "Könyvtárak:"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2713 Merge.rc:2754
+#: Merge.rc:2723 Merge.rc:2764
#, c-format
msgid "Files:"
msgstr "Fájlok:"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2719 Merge.rc:2738 Merge.rc:2760 Merge.rc:2799
+#: Merge.rc:2729 Merge.rc:2748 Merge.rc:2770 Merge.rc:2809
#, c-format
msgid "Binary:"
msgstr "Bináris:"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2722 Merge.rc:2763
+#: Merge.rc:2732 Merge.rc:2773
#, c-format
msgid "Unique"
msgstr "Egyedi"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2723 Merge.rc:2764
+#: Merge.rc:2733 Merge.rc:2774
#, c-format
msgid "Left:"
msgstr "Bal:"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2728 Merge.rc:2774
+#: Merge.rc:2738 Merge.rc:2784
#, c-format
msgid "Right:"
msgstr "Jobb:"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2742 Merge.rc:2803
+#: Merge.rc:2752 Merge.rc:2813
#, c-format
msgid "Total:"
msgstr "Összesen:"
#. IDD_COMPARE_STATISTICS3, IDOK
-#: Merge.rc:2745 Merge.rc:2806
+#: Merge.rc:2755 Merge.rc:2816
#, c-format
msgid "Close"
msgstr "Bezár"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2769
+#: Merge.rc:2779
#, c-format
msgid "Middle:"
msgstr "Középső:"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2779
+#: Merge.rc:2789
#, c-format
msgid "Missing Left:"
msgstr "Hiányzó bal:"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2784
+#: Merge.rc:2794
#, c-format
msgid "Missing Middle:"
msgstr "Hiányzó középső:"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2789
+#: Merge.rc:2799
#, c-format
msgid "Missing Right:"
msgstr "Hiányzó jobb:"
#. IDD_LOAD_SAVE_CODEPAGE, IDC_AFFECTS_GROUP
-#: Merge.rc:2814
+#: Merge.rc:2824
#, c-format
msgid "Affects"
msgstr "Hatások"
#. IDD_LOAD_SAVE_CODEPAGE, IDC_RIGHT_FILES_LABEL
-#: Merge.rc:2816 Merge.rc:2818 Merge.rc:2820
+#: Merge.rc:2826 Merge.rc:2828 Merge.rc:2830
#, c-format
msgid "(Affects)"
msgstr "(Hatások)"
#. IDD_LOAD_SAVE_CODEPAGE, IDC_LOADING_GROUP
-#: Merge.rc:2821
+#: Merge.rc:2831
#, c-format
msgid "Select Codepage for"
msgstr "Kódlap kiválasztása"
#. IDD_LOAD_SAVE_CODEPAGE, IDC_LOAD_FILES_LABEL
-#: Merge.rc:2822
+#: Merge.rc:2832
#, c-format
msgid "&File Loading:"
msgstr "Fájl betöltése:"
#. IDD_LOAD_SAVE_CODEPAGE, IDC_SAVE_FILES_LABEL
-#: Merge.rc:2824
+#: Merge.rc:2834
#, c-format
msgid "File &Saving:"
msgstr "Fájl mentése:"
#. IDD_LOAD_SAVE_CODEPAGE, IDC_LOAD_SAVE_SAME_CODEPAGE
-#: Merge.rc:2827
+#: Merge.rc:2837
#, c-format
msgid "&Use same codepage for both"
msgstr "&Ugyanazon kódlap használata mindkettőhöz"
#. IDS_MESSAGEBOX_CANCEL
-#: Merge.rc:2830 Merge.rc:4172
+#: Merge.rc:2840 Merge.rc:4182
#, c-format
msgid "&Cancel"
msgstr "&Mégsem"
#. IDD_FILTERS_FILEFILTERS_TEST
-#: Merge.rc:2835
+#: Merge.rc:2845
#, c-format
msgid "Test Filter"
msgstr "Szűrő tesztelése"
#. IDD_FILTERS_FILEFILTERS_TEST, IDC_HEADER
-#: Merge.rc:2838
+#: Merge.rc:2848
msgid "Testing filter:"
msgstr "Tesztelendő szűrő:"
#. IDD_FILTERS_FILEFILTERS_TEST, IDC_PROMPT_LABEL
-#: Merge.rc:2840
+#: Merge.rc:2850
#, c-format
msgid "&Enter text to test:"
msgstr "Add meg a szöveget a teszteléshez:"
#. IDD_FILTERS_FILEFILTERS_TEST, IDC_IS_DIRECTORY
-#: Merge.rc:2842
+#: Merge.rc:2852
#, c-format
msgid "&Folder Name"
msgstr "Könyvtár neve"
#. IDD_FILTERS_FILEFILTERS_TEST, IDC_STATIC
-#: Merge.rc:2843
+#: Merge.rc:2853
#, c-format
msgid "Result:"
msgstr "Kimenet:"
#. IDD_FILTERS_FILEFILTERS_TEST, IDC_TEST_BTN
-#: Merge.rc:2845
+#: Merge.rc:2855
#, c-format
msgid "&Test"
msgstr "Tesztelés"
#. IDS_OPTIONSPG_TABLECOMPARE
-#: Merge.rc:2851 Merge.rc:2990 Merge.rc:4228
+#: Merge.rc:2861 Merge.rc:3000 Merge.rc:4238
msgid "Table"
msgstr "Táblázat"
#. IDD_OPEN_TABLE, IDC_STATIC
-#: Merge.rc:2854
+#: Merge.rc:2864
msgid "File type"
msgstr "Fájltípus"
#. IDD_OPEN_TABLE, IDC_COMPARETABLE_CSV
-#: Merge.rc:2855
+#: Merge.rc:2865
msgid "&CSV"
msgstr "CSV"
#. IDD_OPEN_TABLE, IDC_COMPARETABLE_TSV
-#: Merge.rc:2856
+#: Merge.rc:2866
msgid "&TSV"
msgstr "TSV"
#. IDD_OPEN_TABLE, IDC_COMPARETABLE_DSV
-#: Merge.rc:2857
+#: Merge.rc:2867
msgid "Custom &Delimiter-Separated Values"
msgstr "Egyéni elválasztójelek"
#. IDD_PROPPAGE_COMPARE_TABLE, IDC_STATIC
-#: Merge.rc:2859 Merge.rc:2861 Merge.rc:2996 Merge.rc:3004
+#: Merge.rc:2869 Merge.rc:2871 Merge.rc:3006 Merge.rc:3014
msgid "D&elimiter character:"
msgstr "Elválasztójel:"
#. IDD_PROPPAGE_COMPARE_TABLE, IDC_COMPARETABLE_ALLOWNEWLINE
-#: Merge.rc:2863 Merge.rc:3006
+#: Merge.rc:2873 Merge.rc:3016
msgid "&Allow newlines in quotes"
msgstr "Sorugrás idézőjelek között is lehet"
#. IDD_PROPPAGE_COMPARE_TABLE, IDC_STATIC
-#: Merge.rc:2865 Merge.rc:3008
+#: Merge.rc:2875 Merge.rc:3018
msgid "&Quote character:"
msgstr "Idézőjel:"
#. IDS_OPTIONSPG_BACKUPS
-#: Merge.rc:2873 Merge.rc:4216
+#: Merge.rc:2883 Merge.rc:4226
#, c-format
msgid "Backup Files"
msgstr "Visszaállítási fájlok"
#. IDD_PROPPAGE_BACKUPS, IDC_STATIC
-#: Merge.rc:2876
+#: Merge.rc:2886
#, c-format
msgid "Create backup files for:"
msgstr "Visszaállítási fájlok készítése ehhez:"
#. IDD_PROPPAGE_BACKUPS, IDC_BACKUP_FOLDERCMP
-#: Merge.rc:2877
+#: Merge.rc:2887
#, c-format
msgid "&Folder compare"
msgstr "&Mappa összehasonlításkor"
#. IDD_PROPPAGE_BACKUPS, IDC_BACKUP_FILECMP
-#: Merge.rc:2878
+#: Merge.rc:2888
#, c-format
msgid "Fil&e compare"
msgstr "&Fájl összehasonlításkor"
#. IDD_PROPPAGE_BACKUPS, IDC_STATIC
-#: Merge.rc:2879
+#: Merge.rc:2889
#, c-format
msgid "Create backup files in:"
msgstr "Visszaállítási fájlok készítése itt:"
#. IDD_PROPPAGE_BACKUPS, IDC_BACKUP_ORIGFOLD
-#: Merge.rc:2880
+#: Merge.rc:2890
#, c-format
msgid "&Original file's folder"
msgstr "A fájl eredeti könyvtára"
#. IDD_PROPPAGE_BACKUPS, IDC_BACKUP_GLOBALFOLD
-#: Merge.rc:2881
+#: Merge.rc:2891
#, c-format
msgid "&Global backup folder:"
msgstr "Általános archívum könyvtár:"
#. IDD_PROPPAGE_BACKUPS, IDC_STATIC
-#: Merge.rc:2884
+#: Merge.rc:2894
#, c-format
msgid "Backup filename:"
msgstr "Visszaállítási fájl neve:"
#. IDD_PROPPAGE_BACKUPS, IDC_BACKUP_APPEND_BAK
-#: Merge.rc:2885
+#: Merge.rc:2895
msgid "&Append .bak extension"
msgstr ".bak kiterjesztés hozzáfűzése"
#. IDD_PROPPAGE_BACKUPS, IDC_BACKUP_APPEND_TIME
-#: Merge.rc:2886
+#: Merge.rc:2896
#, c-format
msgid "A&ppend timestamp"
msgstr "Időpecsét hozzáfűzése"
#. IDS_CONFIRM_COPY_CAPTION
-#: Merge.rc:2892 Merge.rc:4565
+#: Merge.rc:2902 Merge.rc:4575
#, c-format
msgid "Confirm Copy"
msgstr "Másolás megerősítése"
#. IDD_CONFIRM_COPY, IDC_FLDCONFIRM_QUERY
-#: Merge.rc:2896
+#: Merge.rc:2906
#, c-format
msgid "Are you sure you want to copy XXX items?"
msgstr "Biztosan másolni szeretnél XXX elemet?"
#. IDD_CONFIRM_COPY, IDC_FLDCONFIRM_FROM_TEXT
-#: Merge.rc:2897
+#: Merge.rc:2907
#, c-format
msgid "From left"
msgstr "Balról"
#. IDD_CONFIRM_COPY, IDC_FLDCONFIRM_TO_TEXT
-#: Merge.rc:2899
+#: Merge.rc:2909
#, c-format
msgid "To right"
msgstr "Jobbra"
#. IDS_MESSAGEBOX_DONT_ASK_AGAIN
-#: Merge.rc:2901 Merge.rc:4191
+#: Merge.rc:2911 Merge.rc:4201
#, c-format
msgid "Don't ask this &question again."
msgstr "&Ne jelenjen meg többet ez a kérdés."
#. IDD_CONFIRM_COPY, IDYES
-#: Merge.rc:2903
+#: Merge.rc:2913
#, c-format
msgid "Yes"
msgstr "Igen"
#. IDD_CONFIRM_COPY, IDNO
-#: Merge.rc:2904
+#: Merge.rc:2914
#, c-format
msgid "No"
msgstr "Nem"
#. IDS_PROJECT_ITEM_PLUGIN
-#: Merge.rc:2909 Merge.rc:4323
+#: Merge.rc:2919 Merge.rc:4333
#, c-format
msgid "Plugins"
msgstr "Bővítmények"
#. IDD_PLUGINS_LIST, IDC_PLUGINS_ENABLE
-#: Merge.rc:2912
+#: Merge.rc:2922
#, c-format
msgid "&Enable plugins"
msgstr "Bővítmények bekapcsolása"
#. IDD_PLUGINS_EDITPLUGIN, IDC_STATIC
-#: Merge.rc:2913 Merge.rc:3113
+#: Merge.rc:2923 Merge.rc:3123
msgid "Plugin &type:"
msgstr "Bővítmény &típusa:"
#. IDD_PLUGINS_LIST, IDC_STATIC
-#: Merge.rc:2916
+#: Merge.rc:2926
msgid "File filters:"
msgstr "Fájlszűrők:"
#. IDD_PLUGINS_LIST, IDC_STATIC
-#: Merge.rc:2918
+#: Merge.rc:2928
msgid "&Plugin arguments:"
msgstr "Bővítmény argumentumok:"
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_AUTOMATIC
-#: Merge.rc:2920 Merge.rc:3134
+#: Merge.rc:2930 Merge.rc:3144
msgid "Enable &automatic unpacking/prediffing"
msgstr "Automatikus kicsomagolás/elővizsgálat engedélyezése a bővítmény számára"
#. IDS_OPTIONSPG_SHELL
-#: Merge.rc:2934 Merge.rc:4217
+#: Merge.rc:2944 Merge.rc:4227
#, c-format
msgid "Shell Integration"
msgstr "Integrálás az Intézőbe"
#. IDD_PROPPAGE_SHELL, IDC_STATIC
-#: Merge.rc:2937
+#: Merge.rc:2947
#, c-format
msgid "Explorer"
msgstr "Intéző"
#. IDD_PROPPAGE_SHELL, IDC_EXPLORER_CONTEXT
-#: Merge.rc:2938
+#: Merge.rc:2948
#, c-format
msgid "&Add to context menu"
msgstr "Hozzáadás a helyi menühöz"
#. IDD_PROPPAGE_SHELL, IDC_EXPLORER_ADVANCED
-#: Merge.rc:2939
+#: Merge.rc:2949
#, c-format
msgid "E&nable advanced menu"
msgstr "&Bővített menü engedélyezése"
#. IDD_PROPPAGE_SHELL, IDC_EXPLORER_COMPARE_AS
-#: Merge.rc:2940
+#: Merge.rc:2950
msgid "Enable &Compare As menu"
msgstr "Az Összehasonlítás mint menü engedélyezése"
#. IDD_PROPPAGE_SHELL, IDC_REGISTER_SHELLEXTENSION
-#: Merge.rc:2941
+#: Merge.rc:2951
#, c-format
msgid "&Register Shell Extension"
msgstr "Regisztrálás a helyi menübe"
#. IDD_PROPPAGE_SHELL, IDC_UNREGISTER_SHELLEXTENSION
-#: Merge.rc:2942
+#: Merge.rc:2952
#, c-format
msgid "&Unregister Shell Extension"
msgstr "Eltávolítás a helyi menüből"
#. IDD_PROPPAGE_SHELL, IDC_REGISTER_SHELLEXTENSION_PERUSER
-#: Merge.rc:2943
+#: Merge.rc:2953
msgid "Register Shell Extension for Current User &Only"
msgstr "Regisztrálás a helyi menübe (csak ez a felhasználó)"
#. IDD_PROPPAGE_SHELL, IDC_UNREGISTER_SHELLEXTENSION_PERUSER
-#: Merge.rc:2944
+#: Merge.rc:2954
msgid "Unregister Shell Extension for Current User On&ly"
msgstr "Eltávolítás a helyi menüből (csak ez a felhasználó)"
#. IDD_PROPPAGE_SHELL, IDC_REGISTER_WINMERGECONTEXTMENU
-#: Merge.rc:2945
+#: Merge.rc:2955
msgid "Register Shell Extension for &Windows 11"
msgstr "Shellbővítmény regisztrálása Windows 11-hez"
#. IDD_PROPPAGE_SHELL, IDC_UNREGISTER_WINMERGECONTEXTMENU
-#: Merge.rc:2946
+#: Merge.rc:2956
msgid "Unregister Shell Extension for W&indows 11"
msgstr "Shellbővítmény regisztrálás törlése Windows 11-hez"
#. IDD_PROPPAGE_SHELL, IDC_STATIC
-#: Merge.rc:2947
+#: Merge.rc:2957
msgid "Jump List"
msgstr "Ugráslista"
#. IDD_PROPPAGE_SHELL, IDC_CLEAR_ALL_RECENT_ITEMS
-#: Merge.rc:2949
+#: Merge.rc:2959
msgid "Clear all recent items"
msgstr "Az összes legutóbbi elem törlése"
#. IDS_OPTIONSPG_FOLDERCOMPARE
-#: Merge.rc:2954 Merge.rc:4225
+#: Merge.rc:2964 Merge.rc:4235
msgctxt "Options dialog|Categories"
msgid "Folder"
msgstr "Könyvtár"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC
-#: Merge.rc:2957
+#: Merge.rc:2967
msgid "&Compare method:"
msgstr "Összehasonlító módszer"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_COMPARE_STOPFIRST
-#: Merge.rc:2959
+#: Merge.rc:2969
#, c-format
msgid "S&top after first difference"
msgstr "Megállás az &első különbségnél"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_IGNORE_SMALLTIMEDIFF
-#: Merge.rc:2961
+#: Merge.rc:2971
#, c-format
msgid "Ign&ore time differences less than 3 seconds"
msgstr "3 másodperc alatti időkülönbségek mellőzése"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC
-#: Merge.rc:2964
+#: Merge.rc:2974
msgid "Expand subfolders &after comparison:"
msgstr "&Almappák automatikus kibontása összehasonlítás után:"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_COMPARE_WALKSUBDIRS
-#: Merge.rc:2966
+#: Merge.rc:2976
#, c-format
msgid "Include &unique subfolders contents"
msgstr "Egyedi almappák tartalmai is"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_IGNORE_REPARSEPOINTS
-#: Merge.rc:2968
+#: Merge.rc:2978
#, c-format
msgid "Ignore &reparse points"
msgstr "Elemzési pontok mellőzése"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC
-#: Merge.rc:2969
+#: Merge.rc:2979
msgid "Switch to &quick compare when size exceeds (MB):"
msgstr "A gyors összehasonlítás méretkorlátja (MB):"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC
-#: Merge.rc:2971
+#: Merge.rc:2981
msgid "Switch to &binary compare when size exceeds (MB):"
msgstr "A bináris összehasonlítás méretkorlátja (MB):"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC
-#: Merge.rc:2975
+#: Merge.rc:2985
msgid "Additional comparison condi&tions:"
msgstr "További összehasonlítási &feltételek:"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC
-#: Merge.rc:2978
+#: Merge.rc:2988
msgid "&Rename/move detection:"
msgstr "&Átnevezés/áthelyezés észlelése:"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC
-#: Merge.rc:2980
+#: Merge.rc:2990
msgid "Rename/move detection &keys:"
msgstr "Átnevezési/áthelyezési érzékelési &kulcsok:"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC
-#: Merge.rc:2983
+#: Merge.rc:2993
msgid "M&erge renames and moves:"
msgstr "Átnevezések és áthelyezések &egyesítése:"
#. IDD_PROPPAGE_COMPARE_TABLE, IDC_STATIC
-#: Merge.rc:2994 Merge.rc:2999 Merge.rc:3002
+#: Merge.rc:3004 Merge.rc:3009 Merge.rc:3012
msgid "File patterns:"
msgstr "Fájlfajták:"
#. IDD_PROPPAGE_COMPARE_TABLE, IDC_STATIC
-#: Merge.rc:3001
+#: Merge.rc:3011
msgid "Custom Delimiter-Separated Values"
msgstr "Egyéni elválasztójelek"
#. IDS_OPTIONSPG_BINARYCOMPARE
-#: Merge.rc:3015 Merge.rc:4227
+#: Merge.rc:3025 Merge.rc:4237
msgctxt "Options dialog|Categories"
msgid "Binary"
msgstr "Bináris"
#. IDD_PROPPAGE_COMPARE_BINARY, IDC_STATIC
-#: Merge.rc:3018
+#: Merge.rc:3028
#, c-format
msgid "Binary file &patterns:"
msgstr "Bináris fájltípusok:"
#. IDD_PROPPAGE_COMPARE_BINARY, IDC_STATIC
-#: Merge.rc:3020
+#: Merge.rc:3030
#, c-format
msgid "Frhed settings"
msgstr "Frhed hexa szerkesztő beállítások"
#. IDD_PROPPAGE_COMPARE_BINARY, IDC_COMPAREBINARY_VIEWSETTINGS
-#: Merge.rc:3021
+#: Merge.rc:3031
#, c-format
msgid "View &Settings..."
msgstr "Nézet beállítások..."
#. IDD_PROPPAGE_COMPARE_BINARY, IDC_COMPAREBINARY_BINARYMODE
-#: Merge.rc:3022
+#: Merge.rc:3032
#, c-format
msgid "&Binary Mode..."
msgstr "Bináris mód..."
#. IDD_PROPPAGE_COMPARE_BINARY, IDC_COMPAREBINARY_CHARACTERSET
-#: Merge.rc:3023
+#: Merge.rc:3033
#, c-format
msgid "&Character Set..."
msgstr "Karakterkészlet..."
#. IDS_PRPCAT_IMAGE
-#: Merge.rc:3029 Merge.rc:4226 Merge.rc:4665
+#: Merge.rc:3039 Merge.rc:4236 Merge.rc:4675
msgid "Image"
msgstr "Kép"
#. IDD_PROPPAGE_COMPARE_IMAGE, IDC_STATIC
-#: Merge.rc:3032
+#: Merge.rc:3042
#, c-format
msgid "Image file &patterns:"
msgstr "Képfájl típusok:"
#. IDD_PROPPAGE_COMPARE_IMAGE, IDC_ENABLE_IMGCMP_IN_DIRCMP
-#: Merge.rc:3034
+#: Merge.rc:3044
msgid "&Enable image compare in folder compare"
msgstr "Képösszehasonlítás mappák összehasonlításakor is"
#. IDD_PROPPAGE_COMPARE_IMAGE, IDC_STATIC
-#: Merge.rc:3036
+#: Merge.rc:3046
msgid "OCR result:"
msgstr "Karakterfelismerő találatai:"
#. IDS_OPTIONSPG_WEBPAGECOMPARE
-#: Merge.rc:3043 Merge.rc:4229
+#: Merge.rc:3053 Merge.rc:4239
msgid "Webpage"
msgstr "Weboldal"
#. IDD_PROPPAGE_COMPARE_WEBPAGE, IDC_STATIC
-#: Merge.rc:3046
+#: Merge.rc:3056
msgid "URL pattern to &include (Regular expression):"
msgstr "Beleveendő URL minta (reguláris kifejezés):"
#. IDD_PROPPAGE_COMPARE_WEBPAGE, IDC_STATIC
-#: Merge.rc:3048
+#: Merge.rc:3058
msgid "URL pattern to &exclude (Regular expression):"
msgstr "Kihagyandó URL minta (reguláris kifejezés):"
#. IDD_PROPPAGE_COMPARE_WEBPAGE, IDC_STATIC
-#: Merge.rc:3050
+#: Merge.rc:3060
msgid "&User data folder location:"
msgstr "Felhasználói adatmappa helye:"
#. IDD_PROPPAGE_COMPARE_WEBPAGE, IDC_COMPAREWEBPAGE_USERDATAFOLDER_PERPANE
-#: Merge.rc:3052
+#: Merge.rc:3062
msgid "&Separate user data folders for each pane"
msgstr "Önálló felhasználói adatmappa minden panelhez"
#. IDD_ENCODINGERROR, IDC_HEXVIEW
-#: Merge.rc:3065
+#: Merge.rc:3075
#, c-format
msgid "&Hex View"
msgstr "Hexadecimális nézet"
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3110
+#: Merge.rc:3120
msgid "Edit Plugin"
msgstr "Bővítmény szerkesztése"
#. IDD_PLUGINS_EDITPLUGIN, IDC_STATIC
-#: Merge.rc:3123
+#: Merge.rc:3133
msgid "&Category:"
msgstr "&Kategória:"
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_MENUCAPTION_STATIC
-#: Merge.rc:3125
+#: Merge.rc:3135
msgid "&Menu caption:"
msgstr "&Menü felirata:"
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_WINDOWTYPE_STATIC
-#: Merge.rc:3127
+#: Merge.rc:3137
msgid "&Window type:"
msgstr "&Ablak típusa:"
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_UNPACKEDFILEEXTENSION_STATIC
-#: Merge.rc:3132
+#: Merge.rc:3142
msgid "&Unpacked file extension:"
msgstr "&Kibontott fájl kiterjesztése:"
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_ARGUMENTSREQUIRED
-#: Merge.rc:3136
+#: Merge.rc:3146
msgid "&Require arguments"
msgstr "Argumentumokat &igényel"
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_GENERATESCRIPT
-#: Merge.rc:3137
+#: Merge.rc:3147
msgid "&Generate editor script"
msgstr "Szerkesztőszkript &generálása"
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_COMMAND_LINE_STATIC
-#: Merge.rc:3140
+#: Merge.rc:3150
msgid "Command &line:"
msgstr "Parancs&sor:"
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_SCRIPT_FILEEXTENSION_STATIC
-#: Merge.rc:3143
+#: Merge.rc:3153
msgid "&Script file extension:"
msgstr "&Szkriptfájl kiterjesztése:"
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_SCRIPT_BODY_STATIC
-#: Merge.rc:3145
+#: Merge.rc:3155
msgid "Script &body:"
msgstr "Szkript &törzs:"
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3154
+#: Merge.rc:3164
msgid "Font"
msgstr "Betűtípus"
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3157
+#: Merge.rc:3167
msgid "&Font:"
msgstr "&Betűtípus"
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3163
+#: Merge.rc:3173
msgid "Font st&yle:"
msgstr "Betűtípus &stílusa:"
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3169
+#: Merge.rc:3179
msgid "&Size:"
msgstr "&Méret:"
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3175
+#: Merge.rc:3185
msgid "Effects"
msgstr "Effektek"
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3176
+#: Merge.rc:3186
msgid "Stri&keout"
msgstr "&Áthúzás"
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3177
+#: Merge.rc:3187
msgid "&Underline"
msgstr "&Aláhúzás"
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3179
+#: Merge.rc:3189
msgid "&Color:"
msgstr "&Szín"
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3184
+#: Merge.rc:3194
msgid "Sample"
msgstr "Minta"
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3185
+#: Merge.rc:3195
msgid "AaBbYyZz"
msgstr "AaBbYyZz"
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3189
+#: Merge.rc:3199
msgid "Sc&ript:"
msgstr "&Szkript:"
#. IDD_PLUGINS_EDITPLUGIN, IDC_MANAGE_LINK
-#: Merge.rc:3194
+#: Merge.rc:3204
msgid "Show more fonts"
msgstr "További betűtípusok mutatása"
#. ID_INDICATOR_EXT
-#: Merge.rc:4118
+#: Merge.rc:4128
#, c-format
msgid "EXT"
msgstr "EXT"
#. ID_INDICATOR_CAPS
-#: Merge.rc:4119
+#: Merge.rc:4129
#, c-format
msgid "CAP"
msgstr "NAGY"
#. ID_INDICATOR_NUM
-#: Merge.rc:4120
+#: Merge.rc:4130
#, c-format
msgid "NUM"
msgstr "SZÁM"
#. ID_INDICATOR_SCRL
-#: Merge.rc:4121
+#: Merge.rc:4131
#, c-format
msgid "SCRL"
msgstr "GÖRGKI"
#. ID_INDICATOR_OVR
-#: Merge.rc:4122
+#: Merge.rc:4132
#, c-format
msgid "OVR"
msgstr "ÁTÍR"
#. ID_INDICATOR_REC
-#: Merge.rc:4123
+#: Merge.rc:4133
#, c-format
msgid "REC"
msgstr "REC"
#. ID_FILE_NEW
-#: Merge.rc:4129
+#: Merge.rc:4139
#, c-format
msgid ""
"\n"
@@ -5345,7 +5356,7 @@ msgstr ""
"Új dokumentumok (Ctrl+N)"
#. ID_FILE_OPEN
-#: Merge.rc:4130
+#: Merge.rc:4140
#, c-format
msgid ""
"\n"
@@ -5355,7 +5366,7 @@ msgstr ""
"Megnyitás (Ctrl+O)"
#. ID_FILE_SAVE
-#: Merge.rc:4131
+#: Merge.rc:4141
#, c-format
msgid ""
"\n"
@@ -5365,29 +5376,29 @@ msgstr ""
"Mentés (Ctrl+S)"
#. IDS_UNK_ERROR_READING_PROJECT
-#: Merge.rc:4137
+#: Merge.rc:4147
msgid "Unknown error opening project file."
msgstr "Ismeretlen hiba a projekt fájl megnyitásakor."
#. IDS_UNK_ERROR_SAVING_PROJECT
-#: Merge.rc:4138
+#: Merge.rc:4148
msgid "Unknown error saving project file."
msgstr "Ismeretlen hiba a projekt fájl mentésekor."
#. IDS_PROJFILE_LOAD_SUCCESS
-#: Merge.rc:4143
+#: Merge.rc:4153
#, c-format
msgid "Project file loaded."
msgstr "Projekt fájl sikeresen betöltve."
#. IDS_PROJFILE_SAVE_SUCCESS
-#: Merge.rc:4144
+#: Merge.rc:4154
#, c-format
msgid "Project file saved."
msgstr "Projekt fájl sikeresen elmentve."
#. ID_EDIT_UNDO
-#: Merge.rc:4150
+#: Merge.rc:4160
#, c-format
msgid ""
"\n"
@@ -5397,7 +5408,7 @@ msgstr ""
"Visszavonás (Ctrl+Z)"
#. ID_EDIT_REDO
-#: Merge.rc:4151
+#: Merge.rc:4161
#, c-format
msgid ""
"\n"
@@ -5407,7 +5418,7 @@ msgstr ""
"Mégis (Ctrl+Y)"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:4158
+#: Merge.rc:4168
#, c-format
msgid ""
"\n"
@@ -5427,7 +5438,7 @@ msgstr ""
"WinMerge Fájl összehasonlító"
#. IDR_DIRDOCTYPE
-#: Merge.rc:4159
+#: Merge.rc:4169
#, c-format
msgid ""
"\n"
@@ -5447,358 +5458,358 @@ msgstr ""
"WinMerge Mappa összehasonlító"
#. IDS_SPLASH_GPLTEXT
-#: Merge.rc:4165
+#: Merge.rc:4175
#, c-format
msgid "WinMerge comes with ABSOLUTELY NO WARRANTY. It is free software and can be redistributed under the conditions of the GNU General Public License - see the Help menu for details."
msgstr "A WinMerge TELJESEN GARANCIA NÉLKÜLI. Ez egy ingyenes szoftver, amelyet bizonyos feltételek mellett terjeszthetsz; a részletekért tekintsd meg a Súgó menü GNU Általános Nyilvános Licenszét."
#. IDS_MESSAGEBOX_ABORT
-#: Merge.rc:4173
+#: Merge.rc:4183
#, c-format
msgid "&Abort"
msgstr "&Leállít"
#. IDS_MESSAGEBOX_RETRY
-#: Merge.rc:4174
+#: Merge.rc:4184
#, c-format
msgid "&Retry"
msgstr "&Ismét"
#. IDS_MESSAGEBOX_IGNORE
-#: Merge.rc:4175
+#: Merge.rc:4185
#, c-format
msgid "&Ignore"
msgstr "Mellőzés"
#. IDS_MESSAGEBOX_IGNOREALL
-#: Merge.rc:4176
+#: Merge.rc:4186
#, c-format
msgid "Ignore &all"
msgstr "Összes mellőzés"
#. IDS_MESSAGEBOX_YES
-#: Merge.rc:4177
+#: Merge.rc:4187
#, c-format
msgid "&Yes"
msgstr "&Igen"
#. IDS_MESSAGEBOX_YES_TO_ALL
-#: Merge.rc:4183
+#: Merge.rc:4193
#, c-format
msgid "Yes to &all"
msgstr "Igen &mindenre"
#. IDS_MESSAGEBOX_NO
-#: Merge.rc:4184
+#: Merge.rc:4194
#, c-format
msgid "&No"
msgstr "&Nem"
#. IDS_MESSAGEBOX_NO_TO_ALL
-#: Merge.rc:4185
+#: Merge.rc:4195
#, c-format
msgid "No to a&ll"
msgstr "Nem m&indenre"
#. IDS_MESSAGEBOX_CONTINUE
-#: Merge.rc:4186
+#: Merge.rc:4196
#, c-format
msgid "&Continue"
msgstr "&Folytatás"
#. IDS_MESSAGEBOX_SKIP
-#: Merge.rc:4187
+#: Merge.rc:4197
#, c-format
msgid "&Skip"
msgstr "&Kihagyás"
#. IDS_MESSAGEBOX_SKIPALL
-#: Merge.rc:4188
+#: Merge.rc:4198
#, c-format
msgid "Skip &all"
msgstr "Összes kihagyása"
#. IDS_MESSAGEBOX_DONT_DISPLAY_AGAIN
-#: Merge.rc:4190
+#: Merge.rc:4200
#, c-format
msgid "Don't display this &message again."
msgstr "&Ne jelenjen meg többet ez az üzenet."
-#: Merge.rc:4193
+#: Merge.rc:4203
msgid "To make this message box visible, press Reset on the Message Boxes page in Options."
msgstr "Ahhoz, hogy ez az üzenetablak újra látható legyen, nyomja meg a Beállítások Üzenetablakok oldalán a visszaállítás gombot."
#. IDS_OPTIONSPG_EDITOR_COMPAREMERGE
-#: Merge.rc:4203
+#: Merge.rc:4213
msgid "Compare/Merge"
msgstr "Összehasonlítás/egyesítés"
#. IDS_OPTIONSPG_SYNTAXCOLORS
-#: Merge.rc:4204 Merge.rc:4208
+#: Merge.rc:4214 Merge.rc:4218
#, c-format
msgid "Syntax"
msgstr "Kifejezéstípusok"
#. IDS_OPTIONSPG_COLOR_SCHEMES
-#: Merge.rc:4206
+#: Merge.rc:4216
msgid "Color Schemes"
msgstr "Színsémák"
#. IDS_OPTIONSPG_DIRCOLORS
-#: Merge.rc:4210
+#: Merge.rc:4220
msgid "Folder Compare"
msgstr "Mappa összehasonlítás"
#. IDS_OPTIONSPG_PROJECT
-#: Merge.rc:4215
+#: Merge.rc:4225
msgid "Project"
msgstr "Projekt"
#. IDS_COLHDR_NSDIFFS
-#: Merge.rc:4218 Merge.rc:4640
+#: Merge.rc:4228 Merge.rc:4650
#, c-format
msgid "Differences"
msgstr "Eltérések"
#. IDS_OPTIONSPG_MESSAGEBOXES
-#: Merge.rc:4220
+#: Merge.rc:4230
msgid "Message Boxes"
msgstr "Üzenetablakok"
#. IDS_TO
-#: Merge.rc:4235
+#: Merge.rc:4245
#, c-format
msgid "To:"
msgstr "Ehhez:"
#. IDS_FROM_LEFT
-#: Merge.rc:4236
+#: Merge.rc:4246
#, c-format
msgid "From left:"
msgstr "Balról:"
#. IDS_TO_LEFT
-#: Merge.rc:4237
+#: Merge.rc:4247
#, c-format
msgid "To left:"
msgstr "Balra:"
#. IDS_FROM_RIGHT
-#: Merge.rc:4238
+#: Merge.rc:4248
#, c-format
msgid "From right:"
msgstr "Jobbról:"
#. IDS_TO_RIGHT
-#: Merge.rc:4239
+#: Merge.rc:4249
#, c-format
msgid "To right:"
msgstr "Jobbra:"
#. IDS_FROM_MIDDLE
-#: Merge.rc:4240
+#: Merge.rc:4250
msgid "From middle:"
msgstr "A középsőből:"
#. IDS_TO_MIDDLE
-#: Merge.rc:4241
+#: Merge.rc:4251
msgid "To middle:"
msgstr "A középsőbe:"
#. IDS_VERSION_FMT
-#: Merge.rc:4247
+#: Merge.rc:4257
#, c-format
msgid "Version %1"
msgstr "%1 verzió"
#. IDS_OPTIONS_TITLE
-#: Merge.rc:4253
+#: Merge.rc:4263
#, c-format
msgid "Options (%1)"
msgstr "Opciók (%1)"
#. IDS_MESSAGE_BOX_ARE_RESET
-#: Merge.rc:4254
+#: Merge.rc:4264
#, c-format
msgid "All message boxes are now displayed again."
msgstr "Minden üzenet ezentúl újra megjelenik."
-#: Merge.rc:4256
+#: Merge.rc:4266
#, c-format
msgid "Tab size value is out of range. Please use 1 - %1."
msgstr "A tabulátorméret értéke nincs a megfelelő tartományban.\n\n1 és %1 közötti értéket használj."
#. IDS_PROJECT_OPEN
-#: Merge.rc:4262 Merge.rc:4318
+#: Merge.rc:4272 Merge.rc:4328
#, c-format
msgid "Open"
msgstr "Megnyitás"
#. IDS_PROGRAMFILES
-#: Merge.rc:4263
+#: Merge.rc:4273
#, c-format
msgid "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||"
msgstr "Programok|*.exe;*.bat;*.cmd|Minden fájl (*.*)|*.*||"
#. IDS_ALLFILES
-#: Merge.rc:4264
+#: Merge.rc:4274
#, c-format
msgid "All Files (*.*)|*.*||"
msgstr "Minden fájl (*.*)|*.*||"
#. IDS_PROJECTFILES
-#: Merge.rc:4265
+#: Merge.rc:4275
msgid "WinMerge Project Files (*.WinMerge)|*.WinMerge||"
msgstr "WinMerge Projekt fájlok (*.WinMerge)|*.WinMerge||"
#. IDS_INIFILES
-#: Merge.rc:4267
+#: Merge.rc:4277
#, c-format
msgid "Options files (*.ini)|*.ini|All Files (*.*)|*.*||"
msgstr "Ini fájlok (*.ini)|*.ini|Minden fájl (*.*)|*.*||"
#. IDS_REPLACELIST_FILES
-#: Merge.rc:4268
+#: Merge.rc:4278
msgid "Tab-Separated Values (*.tsv;*.txt)|*.tsv;*.txt|All Files (*.*)|*.*||"
msgstr "Tabulátorral elválasztott értékek (*.tsv;*.txt)|*.tsv;*.txt|Összes fájl (*.*)|*.*||"
#. IDS_TEXT_REPORT_FILES
-#: Merge.rc:4274
+#: Merge.rc:4284
#, c-format
msgid "Text Files (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|All Files (*.*)|*.*||"
msgstr "Szöveges fájlok (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|Minden fájl (*.*)|*.*||"
#. IDS_HTML_REPORT_FILES
-#: Merge.rc:4275
+#: Merge.rc:4285
#, c-format
msgid "HTML Files (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||"
msgstr "HTML fájlok (*.htm,*.html)|*.htm;*.html|Minden fájl (*.*)|*.*||"
#. IDS_XML_REPORT_FILES
-#: Merge.rc:4276
+#: Merge.rc:4286
#, c-format
msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||"
msgstr "XML fájlok (*.xml)|*.xml|Minden fájl (*.*)|*.*||"
#. IDS_EXPANDSUBDIRS_DONOTEXPAND
-#: Merge.rc:4294
+#: Merge.rc:4304
msgid "Do not expand"
msgstr "Ne bontsa ki"
#. IDS_EXPANDSUBDIRS_ALL
-#: Merge.rc:4295
+#: Merge.rc:4305
msgid "Expand all subfolders"
msgstr "Minden almappa kibontása"
#. IDS_EXPANDSUBDIRS_DIFFERENT
-#: Merge.rc:4296
+#: Merge.rc:4306
msgid "Expand different subfolders"
msgstr "Különböző almappák kibontása"
#. IDS_EXPANDSUBDIRS_IDENTICAL
-#: Merge.rc:4297
+#: Merge.rc:4307
msgid "Expand identical subfolders"
msgstr "Azonos almappák kibontása"
#. IDS_SYNTAXTABLE_FILETYPE
-#: Merge.rc:4303
+#: Merge.rc:4313
msgid "File Type"
msgstr "Fájltípus"
#. IDS_COLHDR_EXTENSION
-#: Merge.rc:4304 Merge.rc:4597
+#: Merge.rc:4314 Merge.rc:4607
#, c-format
msgid "Extension"
msgstr "Kiterjesztés"
#. IDS_PRPCAT_MESSAGE
-#: Merge.rc:4310 Merge.rc:4669
+#: Merge.rc:4320 Merge.rc:4679
msgid "Message"
msgstr "Üzenet"
#. IDS_MESSAGEBOX_ANSWER
-#: Merge.rc:4311
+#: Merge.rc:4321
msgid "Answer"
msgstr "Válasz"
#. IDS_PROJECT_ITEM
-#: Merge.rc:4317
+#: Merge.rc:4327
msgid "Item"
msgstr "Elem"
#. IDS_PROJECT_LOAD
-#: Merge.rc:4319
+#: Merge.rc:4329
msgid "Load"
msgstr "Betöltés"
#. IDS_PROJECT_SAVE
-#: Merge.rc:4320
+#: Merge.rc:4330
msgid "Save"
msgstr "Mentés"
#. IDS_PROJECT_ITEM_INCLUDE_SUBFOLDERS
-#: Merge.rc:4322
+#: Merge.rc:4332
msgid "Include Subfolders"
msgstr "Almappák is"
#. IDS_PROJECT_ITEM_COMPARE_OPTIONS
-#: Merge.rc:4324
+#: Merge.rc:4334
msgid "Compare Options"
msgstr "Összehasonlító opciók"
#. IDS_PROJECT_ITEM_HIDDEN_ITEMS
-#: Merge.rc:4325
+#: Merge.rc:4335
msgid "Hidden Items"
msgstr "Rejtett elemek"
#. IDS_PLUGINSLIST_NAME
-#: Merge.rc:4331 Merge.rc:4956
+#: Merge.rc:4341 Merge.rc:4966
#, c-format
msgid "Name"
msgstr "Név"
#. IDS_FILTERFILE_PATHTITLE
-#: Merge.rc:4332
+#: Merge.rc:4342
#, c-format
msgid "Location"
msgstr "Hely"
#. IDS_FILTER_TITLE
-#: Merge.rc:4333
+#: Merge.rc:4343
#, c-format
msgid "Filters"
msgstr "Szűrők"
#. IDS_FILTER_PREFIX
-#: Merge.rc:4334
+#: Merge.rc:4344
#, c-format
msgid "[F] "
msgstr "[F] "
#. IDS_PLUGINSLIST_DESC
-#: Merge.rc:4335 Merge.rc:4958
+#: Merge.rc:4345 Merge.rc:4968
#, c-format
msgid "Description"
msgstr "Leírás"
#. IDS_FILEFILTER_SAVENEW
-#: Merge.rc:4336
+#: Merge.rc:4346
#, c-format
msgid "Select Filename for New Filter"
msgstr "Válassz fájlnevet az új szűrőhöz"
#. IDS_FILEFILTER_FILEMASK
-#: Merge.rc:4337
+#: Merge.rc:4347
#, c-format
msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||"
msgstr "Fájlszűrők (*.flt)|*.flt|Minden fájl (*.*)|*.*||"
-#: Merge.rc:4339
+#: Merge.rc:4349
#, c-format
msgid "Cannot find filter template!\n\nCopy %1 to WinMerge/Filters Folder:\n%2."
msgstr "Nem található a fájlszűrő sablonfájl!\n\nMásold a(z) %1 fájlt a WinMerge/Filters mappába:\n%2."
-#: Merge.rc:4341
+#: Merge.rc:4351
#, c-format
msgid ""
"Cannot copy filter template:\n"
@@ -5811,7 +5822,7 @@ msgstr ""
"\n"
"Győzödj meg róla, hogy a mappa létezik és nem írásvédett."
-#: Merge.rc:4343
+#: Merge.rc:4353
#, c-format
msgid ""
"User's filter folder is not defined!\n"
@@ -5822,7 +5833,7 @@ msgstr ""
"\n"
"Válassz egy mappát a szűrőknek a Beállítások/Rendszer alatt."
-#: Merge.rc:4345
+#: Merge.rc:4355
#, c-format
msgid ""
"Failed to delete filter:\n"
@@ -5836,12 +5847,12 @@ msgstr ""
"Lehet, hogy a fájl írásvédett."
#. IDS_FILEFILTER_INSTALL
-#: Merge.rc:4346
+#: Merge.rc:4356
#, c-format
msgid "Locate Filter File to Install"
msgstr "A telepítendő szűrőfájl megkeresése"
-#: Merge.rc:4348
+#: Merge.rc:4358
#, c-format
msgid ""
"Installing filter file failed.\n"
@@ -5853,19 +5864,19 @@ msgstr ""
"Nem sikerült az új szűrőfájlt bemásolni a szűrőmappába."
#. IDS_FILEFILTER_OVERWRITE
-#: Merge.rc:4349
+#: Merge.rc:4359
#, c-format
msgid "Filter file exists. Overwrite?"
msgstr "A szűrőfájl már létezik. Felülírod?"
#. IDS_FILTERLINE_REGEXP
-#: Merge.rc:4355
+#: Merge.rc:4365
#, c-format
msgid "Regular expression"
msgstr "Reguláris kifejezés"
#. IDS_FILTERCHANGED
-#: Merge.rc:4361
+#: Merge.rc:4371
msgid ""
"Filters updated. Refresh all open folder compares?\n"
"\n"
@@ -5876,240 +5887,240 @@ msgstr ""
"Ha most nem akarod, a későbbi frissítéshez válaszd a \"Nem\" lehetőséget."
#. IDS_DIRECTORY_WINDOW_TITLE
-#: Merge.rc:4367
+#: Merge.rc:4377
#, c-format
msgid "Folder Comparison Results"
msgstr "Könyvtár összehasonlítási eredmények"
#. IDS_FILE_COMPARISON_TITLE
-#: Merge.rc:4368
+#: Merge.rc:4378
#, c-format
msgid "File Comparison"
msgstr "Fájl összehasonlítás"
#. IDS_EMPTY_LEFT_FILE
-#: Merge.rc:4369
+#: Merge.rc:4379
#, c-format
msgid "Untitled Left"
msgstr "Névtelen bal oldal"
#. IDS_EMPTY_MIDDLE_FILE
-#: Merge.rc:4370
+#: Merge.rc:4380
#, c-format
msgid "Untitled Middle"
msgstr "Névtelen középső"
#. IDS_EMPTY_RIGHT_FILE
-#: Merge.rc:4371
+#: Merge.rc:4381
#, c-format
msgid "Untitled Right"
msgstr "Névtelen jobb oldal"
#. IDS_CONFLICT_BASE_FILE
-#: Merge.rc:4372
+#: Merge.rc:4382
msgid "Base File"
msgstr "Forrásfájl"
#. IDS_CONFLICT_THEIRS_FILE
-#: Merge.rc:4373
+#: Merge.rc:4383
#, c-format
msgid "Theirs File"
msgstr "Mások fájlja"
#. IDS_CONFLICT_MINE_FILE
-#: Merge.rc:4374
+#: Merge.rc:4384
#, c-format
msgid "Mine File"
msgstr "Az én fájlom"
#. IDS_SELFCOMPARE_ORIGINAL_FILE
-#: Merge.rc:4375
+#: Merge.rc:4385
msgid "Original File"
msgstr "Eredeti fájl"
#. IDS_LINE_STATUS_INFO_EOL
-#: Merge.rc:4381
+#: Merge.rc:4391
#, c-format
msgid "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s"
msgstr "Sor: %s Oszlop: %d/%d Karakter: %d/%d Sorvég: %s"
#. IDS_EMPTY_LINE_STATUS_INFO
-#: Merge.rc:4382
+#: Merge.rc:4392
#, c-format
msgid "Line: %s"
msgstr "Sor: %s"
#. IDS_LINE_STATUS_INFO
-#: Merge.rc:4383
+#: Merge.rc:4393
#, c-format
msgid "Ln: %s Col: %d/%d Ch: %d/%d"
msgstr "Sor: %s Oszlop: %d/%d Karakter: %d/%d"
#. IDS_LINE_STATUS_INFO_SEL
-#: Merge.rc:4384
+#: Merge.rc:4394
#, c-format
msgid " Sel: %d | %d"
msgstr " Kiv.: %d | %d"
#. IDS_MERGEMODE_MERGING
-#: Merge.rc:4385
+#: Merge.rc:4395
#, c-format
msgid "Merge"
msgstr "Egyesítés"
#. IDS_DIFF_NUMBER_STATUS_FMT
-#: Merge.rc:4386
+#: Merge.rc:4396
#, c-format
msgid "Difference %1 of %2"
msgstr "Különbség: %1 / %2"
#. IDS_NO_DIFF_SEL_FMT
-#: Merge.rc:4387
+#: Merge.rc:4397
#, c-format
msgid "%1 Differences Found"
msgstr "%1 különbség található"
#. IDS_1_DIFF_FOUND
-#: Merge.rc:4388
+#: Merge.rc:4398
#, c-format
msgid "1 Difference Found"
msgstr "1 különbség található"
#. IDS_NO_ERR_SEL_FMT
-#: Merge.rc:4389
+#: Merge.rc:4399
#, c-format
msgid "%1 Errors Found"
msgstr "%1 hiba található"
#. IDS_1_ERR_FOUND
-#: Merge.rc:4390
+#: Merge.rc:4400
msgid "1 Error Found"
msgstr "1 hiba található"
#. IDS_STATUSBAR_READONLY, Abbreviation from "Read Only"
-#: Merge.rc:4391
+#: Merge.rc:4401
#, c-format
msgid "RO"
msgstr "RO"
#. IDS_DIRVIEW_STATUS_FMT_FOCUS
-#: Merge.rc:4397
+#: Merge.rc:4407
#, c-format
msgid "Item %1 of %2"
msgstr "elem: %1 / %2"
#. IDS_DIRVIEW_STATUS_FMT_NOFOCUS
-#: Merge.rc:4398
+#: Merge.rc:4408
#, c-format
msgid "Items: %1"
msgstr "%1 elem"
#. IDS_DIRVIEW_STATUS_COMPARING
-#: Merge.rc:4399
+#: Merge.rc:4409
#, c-format
msgid "Comparing items..."
msgstr "Elemek összehasonlítása..."
#. IDS_ITEMS_PER_SEC
-#: Merge.rc:4400
+#: Merge.rc:4410
#, c-format
msgid "%.1f[items/sec]"
msgstr "%.1f[elem/smp]"
#. IDS_ERROR_INCOMPARABLE
-#: Merge.rc:4406
+#: Merge.rc:4416
msgid "Select two existing folders/files to compare."
msgstr "Válassz ki két összehasonlítandó fájlt vagy könyvtárat."
#. IDS_DIRSEL_TAG
-#: Merge.rc:4407
+#: Merge.rc:4417
#, c-format
msgid "Folder Selection"
msgstr "Könytár kiválasztás"
#. IDS_OPEN_FILESDIRS
-#: Merge.rc:4408
+#: Merge.rc:4418
#, c-format
msgid "Select two (or three) folders/files to compare."
msgstr "Válassz 2 (vagy 3) fájlt (vagy mappát) az összehasonlításhoz."
#. IDS_OPEN_LEFTINVALID
-#: Merge.rc:4409
+#: Merge.rc:4419
#, c-format
msgid "Left (1st) path is invalid!"
msgstr "A bal (1.) elérési út érvénytelen!"
#. IDS_OPEN_MIDDLEINVALID
-#: Merge.rc:4410
+#: Merge.rc:4420
#, c-format
msgid "Middle (2nd) path is invalid!"
msgstr "A középső (2.) elérési út érvénytelen!"
#. IDS_OPEN_RIGHTINVALID2
-#: Merge.rc:4411
+#: Merge.rc:4421
#, c-format
msgid "Right (2nd) path is invalid!"
msgstr "A jobb (2.) elérési út érvénytelen!"
#. IDS_OPEN_RIGHTINVALID3
-#: Merge.rc:4412
+#: Merge.rc:4422
#, c-format
msgid "Right (3rd) path is invalid!"
msgstr "A jobb (3.) elérési út érvénytelen!"
#. IDS_OPEN_BOTHINVALID
-#: Merge.rc:4413
+#: Merge.rc:4423
#, c-format
msgid "Both paths are invalid!"
msgstr "Mindkét elérési út érvénytelen!"
-#: Merge.rc:4415
+#: Merge.rc:4425
#, c-format
msgid "Left (1st) and Middle (2nd) paths are invalid!"
msgstr "A bal (1.) és a középső(2.) elérési út érvénytelen!"
#. IDS_OPEN_LEFTRIGHTINVALID
-#: Merge.rc:4416
+#: Merge.rc:4426
#, c-format
msgid "Left (1st) and Right (3rd) paths are invalid!"
msgstr "A bal (1.) és a jobb(3.) elérési út érvénytelen!"
-#: Merge.rc:4418
+#: Merge.rc:4428
#, c-format
msgid "Middle (2nd) and Right (3rd) paths are invalid!"
msgstr "A középső(2.) és a jobb(3.) elérési út érvénytelen!"
#. IDS_OPEN_ALLINVALID
-#: Merge.rc:4419
+#: Merge.rc:4429
#, c-format
msgid "All paths are invalid!"
msgstr "Mindegyik elérési út érvénytelen!"
#. IDS_OPEN_UNPACKERDISABLED
-#: Merge.rc:4420
+#: Merge.rc:4430
msgid "Only enabled for file comparisons"
msgstr "Csak fájlok összahasonlításánál elérhető"
#. IDS_OPEN_MISMATCH
-#: Merge.rc:4421
+#: Merge.rc:4431
#, c-format
msgid "Cannot compare file and folder!"
msgstr "Nem lehet fájlt könyvtárral összehasonlítani!"
#. IDS_ERROR_FILE_NOT_FOUND
-#: Merge.rc:4427
+#: Merge.rc:4437
#, c-format
msgid "File not found: %1"
msgstr "Ez a fájl nem található: %1"
#. IDS_ERROR_FILE_NOT_UNPACKED
-#: Merge.rc:4428
+#: Merge.rc:4438
#, c-format
msgid "File not unpacked: %1"
msgstr "Ez a fájl nincs kicsomagolva: %1"
#. IDS_ERROR_FILEOPEN
-#: Merge.rc:4429
+#: Merge.rc:4439
#, c-format
msgid ""
"Cannot open file\n"
@@ -6123,48 +6134,48 @@ msgstr ""
"%2"
#. IDS_ERROR_CONF_RESOLVE
-#: Merge.rc:4430
+#: Merge.rc:4440
#, c-format
msgid "Failed to parse conflict file."
msgstr "Hiba a konfliktusfájl elemzésekor."
#. IDS_NOT_CONFLICT_FILE
-#: Merge.rc:4431
+#: Merge.rc:4441
#, c-format
msgid "The file\n%1\nis not a conflict file."
msgstr "A fájl\n%1\nnem egy konfliktus fájl."
#. IDS_COMPARE_LARGE_FILES
-#: Merge.rc:4432
+#: Merge.rc:4442
msgid "Comparing large files requires significant memory.\nShow only comparison results (not file contents)?"
msgstr "Nagy fájlok összehasonlítása sok memóriát igényel.\nCsak az összehasonlítás eredményét szeretnéd megjeleníteni, (a fájlok tartalmát nem)?\n"
"\n"
#. IDS_SAVE_AS_TITLE
-#: Merge.rc:4438
+#: Merge.rc:4448
#, c-format
msgid "Save As"
msgstr "Mentés másként"
#. IDS_SAVE_FMT
-#: Merge.rc:4439
+#: Merge.rc:4449
#, c-format
msgid "Save changes to %1?"
msgstr "Mentsem a változtatásokat %1 néven?"
#. IDS_SAVEREADONLY_FMT
-#: Merge.rc:4440
+#: Merge.rc:4450
#, c-format
msgid "%1 is read-only. Override? Or 'No' to save as new filename?"
msgstr "%1 csak olvasható. Szeretnéd felülírni a csak olvasható fájlt? (Kattints a Nem gombra a fájl új néven való mentéséhez.)"
#. IDS_ERROR_BACKUP
-#: Merge.rc:4441
+#: Merge.rc:4451
#, c-format
msgid "Error backing up file"
msgstr "Hiba a fájl biztonsági másolatának készítésekor"
-#: Merge.rc:4443
+#: Merge.rc:4453
#, c-format
msgid ""
"Unable to backup original file:\n"
@@ -6178,7 +6189,7 @@ msgstr ""
"Folytatod mindenképp?"
#. IDS_FILESAVE_FAILED
-#: Merge.rc:4444
+#: Merge.rc:4454
#, c-format
msgid "Saving file failed.\n%1\n%2\n\t- Use different filename (OK)\n\t- Abort (Cancel)?"
msgstr ""
@@ -6189,12 +6200,12 @@ msgstr ""
"\t- másik fájlnév választása (OK)\n"
"\t- a jelenlegi folyamat megszakítása (Mégsem)?"
-#: Merge.rc:4446
+#: Merge.rc:4456
#, c-format
msgid "Plugin '%2' cannot pack changes to left file into '%1'.\n\nOriginal unchanged. Save unpacked version?"
msgstr "A(z) %2 bővítmény nem tudja becsomagolni a bal fájlban végzett módosításokat itt: %1.\n\nAz eredeti fájl nem változott. Elmented a be nem csomagolt verziót?"
-#: Merge.rc:4448
+#: Merge.rc:4458
#, c-format
msgid "Plugin '%2' cannot pack changes to middle file into '%1'.\n\nOriginal unchanged. Save unpacked version?"
msgstr ""
@@ -6204,7 +6215,7 @@ msgstr ""
"\n"
"Elmented a be nem csomagolt verziót egy másik fájlba?"
-#: Merge.rc:4450
+#: Merge.rc:4460
#, c-format
msgid "Plugin '%2' cannot pack changes to right file into '%1'.\n\nOriginal unchanged. Save unpacked version?"
msgstr ""
@@ -6215,7 +6226,7 @@ msgstr ""
"Elmented a be nem csomagolt verziót egy másik fájlba?"
#. IDS_FILECHANGED_ONDISK
-#: Merge.rc:4451
+#: Merge.rc:4461
#, c-format
msgid ""
"Another application updated\n"
@@ -6231,7 +6242,7 @@ msgstr ""
"Felülírjuk a megváltoztatott fájlt?"
#. IDS_SAVEREADONLY_MULTI
-#: Merge.rc:4452
+#: Merge.rc:4462
#, c-format
msgid ""
"%1\n"
@@ -6241,7 +6252,7 @@ msgstr ""
"csak olvasható. Szeretnéd ezt megváltoztatni?"
#. IDS_FILECHANGED_RESCAN
-#: Merge.rc:4453
+#: Merge.rc:4463
#, c-format
msgid "Another application updated\n%1\nsince last scan.\n\nReload?"
msgstr ""
@@ -6252,25 +6263,25 @@ msgstr ""
"Szeretnéd újra betölteni a fájlt?"
#. IDS_SAVE_LEFT_AS
-#: Merge.rc:4454
+#: Merge.rc:4464
#, c-format
msgid "Save Left File As"
msgstr "Bal oldali fájl mentése mint"
#. IDS_SAVE_MIDDLE_AS
-#: Merge.rc:4455
+#: Merge.rc:4465
#, c-format
msgid "Save Middle File As"
msgstr "Középső fájl mentése mint"
#. IDS_SAVE_RIGHT_AS
-#: Merge.rc:4456
+#: Merge.rc:4466
#, c-format
msgid "Save Right File As"
msgstr "Jobb oldali fájl mentése mint"
#. IDS_FILE_DISAPPEARED
-#: Merge.rc:4461
+#: Merge.rc:4471
#, c-format
msgid ""
"File\n"
@@ -6282,7 +6293,7 @@ msgstr ""
"eltűnt. A folytatáshoz mentsd el a fájlt."
#. IDS_VIEWS_OUTOFSYNC
-#: Merge.rc:4467
+#: Merge.rc:4477
#, c-format
msgid ""
"Cannot merge unsynched documents.\n"
@@ -6294,189 +6305,189 @@ msgstr ""
"Frissítsd a dokumentumokat, mielőtt folytatnád."
#. IDS_BREAK_ON_WHITESPACE
-#: Merge.rc:4472
+#: Merge.rc:4482
msgid "Break at whitespace"
msgstr "Megállás szóközöknél"
#. IDS_BREAK_ON_PUNCTUATION
-#: Merge.rc:4473
+#: Merge.rc:4483
msgid "Break at whitespace or punctuation"
msgstr "Megállás szóközöknél vagy írásjeleknél"
#. IDS_L2M
-#: Merge.rc:4479
+#: Merge.rc:4489
msgid "Copy to &Middle\tAlt+Right"
msgstr "Másolás a középsőbe\tAlt+Right"
#. IDS_R2M
-#: Merge.rc:4480
+#: Merge.rc:4490
msgid "Copy to &Middle\tAlt+Left"
msgstr "Másolás a középsőbe\tAlt+Left"
#. IDS_COPY_FROM_MIDDLE_R
-#: Merge.rc:4481
+#: Merge.rc:4491
msgid "Copy from Middle\tAlt+Shift+Right"
msgstr "Másolás a középsőből\tAlt+Shift+Right"
#. IDS_COPY_FROM_MIDDLE_L
-#: Merge.rc:4482
+#: Merge.rc:4492
msgid "Copy from Middle\tAlt+Shift+Left"
msgstr "Másolás a középsőből\Alt+Shift+Left"
#. IDS_L2MNEXT
-#: Merge.rc:4483
+#: Merge.rc:4493
msgid "Copy to Middle and Advance\tCtrl+Alt+Right"
msgstr "Másolás a középsőbe, majd tovább\tCtrl+Alt+Right"
#. IDS_R2MNEXT
-#: Merge.rc:4484
+#: Merge.rc:4494
msgid "Copy to Middle and Advance\tCtrl+Alt+Left"
msgstr "Másolás a középsőbe, majd tovább\tCtrl+Alt+Left"
#. IDS_ALL_MIDDLE
-#: Merge.rc:4485
+#: Merge.rc:4495
msgid "Copy All to Middle"
msgstr "Az összes másolása a középsőbe"
#. IDS_COPY_RIGHT_TO_LEFT
-#: Merge.rc:4491
+#: Merge.rc:4501
#, c-format
msgid "Right to Left (%1)"
msgstr "Jobbról a balba (%1)"
#. IDS_COPY_RIGHT_TO_MIDDLE
-#: Merge.rc:4492
+#: Merge.rc:4502
#, c-format
msgid "Right to Middle (%1)"
msgstr "Jobbról a középsőbe (%1)"
#. IDS_COPY_MIDDLE_TO_LEFT
-#: Merge.rc:4493
+#: Merge.rc:4503
#, c-format
msgid "Middle to Left (%1)"
msgstr "Középső a balba (%1)"
#. IDS_COPY_MIDDLE_TO_RIGHT
-#: Merge.rc:4494
+#: Merge.rc:4504
#, c-format
msgid "Middle to Right (%1)"
msgstr "Középső a jobba (%1)"
#. IDS_COPY_LEFT_TO_RIGHT
-#: Merge.rc:4495
+#: Merge.rc:4505
#, c-format
msgid "Left to Right (%1)"
msgstr "Bal a jobba (%1)"
#. IDS_COPY_LEFT_TO_MIDDLE
-#: Merge.rc:4496
+#: Merge.rc:4506
#, c-format
msgid "Left to Middle (%1)"
msgstr "Bal a középsőbe(%1)"
#. IDS_MOVE_LEFT_TO
-#: Merge.rc:4507 Merge.rc:4539
+#: Merge.rc:4517 Merge.rc:4549
#, c-format
msgid "Left to... (%1)"
msgstr "Balból a... (%1)"
#. IDS_MOVE_MIDDLE_TO
-#: Merge.rc:4508 Merge.rc:4540
+#: Merge.rc:4518 Merge.rc:4550
#, c-format
msgid "Middle to... (%1)"
msgstr "A középsőből a...(%1)"
#. IDS_MOVE_RIGHT_TO
-#: Merge.rc:4509 Merge.rc:4541
+#: Merge.rc:4519 Merge.rc:4551
#, c-format
msgid "Right to... (%1)"
msgstr "Jobból a... (%1)"
#. IDS_COPY_BOTH_TO
-#: Merge.rc:4510
+#: Merge.rc:4520
#, c-format
msgid "Both to... (%1)"
msgstr "Mindkettőből a...(%1)"
#. IDS_COPY_ALL_TO
-#: Merge.rc:4511
+#: Merge.rc:4521
#, c-format
msgid "All to... (%1)"
msgstr "Az összesből a...(%1)"
#. IDS_COPY_DIFFERENCES_TO
-#: Merge.rc:4512
+#: Merge.rc:4522
#, c-format
msgid "Differences to... (%1)"
msgstr "Különbségek ehhez...(%1)"
#. IDS_COPY_ONLYDIFFITEMS
-#: Merge.rc:4519
+#: Merge.rc:4529
msgid "Some selected items are identical or skipped.\nCopy only items with differences?"
msgstr "Néhány kiválasztott elem azonos vagy kimaradt.\nCsak a különbségeket tartalmazó elemeket szeretné másolni?"
#. IDS_DEL_LEFT_FMT
-#: Merge.rc:4525
+#: Merge.rc:4535
#, c-format
msgid "Left (%1)"
msgstr "Bal (%1)"
#. IDS_DEL_MIDDLE_FMT
-#: Merge.rc:4526
+#: Merge.rc:4536
#, c-format
msgid "Middle (%1)"
msgstr "Középső (%1)"
#. IDS_DEL_RIGHT_FMT
-#: Merge.rc:4527
+#: Merge.rc:4537
#, c-format
msgid "Right (%1)"
msgstr "Jobb (%1)"
#. IDS_DEL_BOTH_FMT
-#: Merge.rc:4528
+#: Merge.rc:4538
#, c-format
msgid "Both (%1)"
msgstr "Mindkettő (%1)"
#. IDS_DEL_ALL_FMT
-#: Merge.rc:4529
+#: Merge.rc:4539
#, c-format
msgid "All (%1)"
msgstr "Összes (%1)"
#. IDS_SELECT_DEST_LEFT
-#: Merge.rc:4545
+#: Merge.rc:4555
#, c-format
msgid "Left Side - Select Destination Folder:"
msgstr "Bal oldal - célmappa választása:"
#. IDS_SELECT_DEST_MIDDLE
-#: Merge.rc:4546
+#: Merge.rc:4556
#, c-format
msgid "Middle Side - Select Destination Folder:"
msgstr "Középső oldal - célmappa választása:"
#. IDS_SELECT_DEST_RIGHT
-#: Merge.rc:4547
+#: Merge.rc:4557
#, c-format
msgid "Right Side - Select Destination Folder:"
msgstr "Jobb oldal - célmappa választása:"
#. IDS_FILES_AFFECTED_FMT
-#: Merge.rc:4548
+#: Merge.rc:4558
#, c-format
msgid "(%1 Files Affected)"
msgstr "(%1 fájl érintve)"
#. IDS_FILES_AFFECTED_FMT2
-#: Merge.rc:4549
+#: Merge.rc:4559
#, c-format
msgid "(%1 of %2 Files Affected)"
msgstr "(%1 / %2 fájl érintve)"
#. IDS_CONFIRM_DELETE_SINGLE
-#: Merge.rc:4555
+#: Merge.rc:4565
#, c-format
msgid ""
"Are you sure you want to delete\n"
@@ -6488,18 +6499,18 @@ msgstr ""
"%1 ?"
#. IDS_CONFIRM_SINGLE_COPY
-#: Merge.rc:4556
+#: Merge.rc:4566
msgid "Are you sure you want to copy?"
msgstr "Biztosan másolod?"
#. IDS_CONFIRM_MULTIPLE_COPY
-#: Merge.rc:4557
+#: Merge.rc:4567
#, c-format
msgid "Are you sure you want to copy %d items?"
msgstr "Biztosan másolsz %d elemet?"
#. IDS_DIRCMP_NOTSYNC
-#: Merge.rc:4558
+#: Merge.rc:4568
#, c-format
msgid ""
"Operation aborted!\n"
@@ -6519,878 +6530,878 @@ msgstr ""
"Frissítsd az összehasonlítást."
#. IDS_CONFIRM_SINGLE_MOVE
-#: Merge.rc:4563
+#: Merge.rc:4573
msgid "Are you sure you want to move?"
msgstr "Biztosan áthelyezed?"
#. IDS_CONFIRM_MULTIPLE_MOVE
-#: Merge.rc:4564
+#: Merge.rc:4574
#, c-format
msgid "Are you sure you want to move %d items?"
msgstr "Biztosan áthelyezel %d elemet?"
#. IDS_CONFIRM_MOVE_CAPTION
-#: Merge.rc:4566
+#: Merge.rc:4576
#, c-format
msgid "Confirm Move"
msgstr "Áthelyezés megerősítése"
-#: Merge.rc:4568
+#: Merge.rc:4578
#, c-format
msgid "Close the folder comparison window?"
msgstr "Bezárni készülsz a mappákat összehasonlító ablakot. Biztosan bezárod az ablakot?"
-#: Merge.rc:4570
+#: Merge.rc:4580
msgid "Close the folder comparison window, which took a long time?"
msgstr "Bezárni készülsz a mappa összehasonlító ablakot, ami meglehetősen sok időt vett igénybe. Biztosan bezárod az ablakot?"
#. IDS_ERROR_INVALID_DIR_FILE_NAME
-#: Merge.rc:4571
+#: Merge.rc:4581
msgid "The file or folder name is invalid."
msgstr "A fájl- vagy a mappanév érvénytelen"
#. IDS_ERROR_EXECUTE_FILE
-#: Merge.rc:4577
+#: Merge.rc:4587
#, c-format
msgid "Failed to execute external editor: %1"
msgstr "Nem sikerült elindítani a külső szerkesztőt: %1"
#. IDS_UNKNOWN_ARCHIVE_FORMAT
-#: Merge.rc:4583
+#: Merge.rc:4593
#, c-format
msgid "Unknown archive format"
msgstr "Ismeretlen archívum formátum"
-#: Merge.rc:4585
+#: Merge.rc:4595
msgid "Failed to extract archive.\nCompare as text file?"
msgstr "Nem sikerült kibontani az archív fájlokat.\nSzeretnéd összehasonlítani az archív fájlokat szöveges fájlokként?"
#. IDS_COLHDR_FILENAME
-#: Merge.rc:4591
+#: Merge.rc:4601
#, c-format
msgid "Filename"
msgstr "Fájlnév"
#. IDS_COLHDR_DIR
-#: Merge.rc:4592
+#: Merge.rc:4602
msgctxt "DirView|ColumnHeader"
msgid "Folder"
msgstr "Mappa"
#. IDS_COLHDR_RESULT
-#: Merge.rc:4593
+#: Merge.rc:4603
#, c-format
msgid "Comparison Result"
msgstr "Összehasonlítási eredmények"
#. IDS_COLHDR_LTIMEM
-#: Merge.rc:4594
+#: Merge.rc:4604
#, c-format
msgid "Left Date"
msgstr "Bal dátuma"
#. IDS_COLHDR_RTIMEM
-#: Merge.rc:4595
+#: Merge.rc:4605
#, c-format
msgid "Right Date"
msgstr "Jobb dátuma"
#. IDS_COLHDR_MTIMEM
-#: Merge.rc:4596
+#: Merge.rc:4606
#, c-format
msgid "Middle Date"
msgstr "Középső dátuma"
#. IDS_COLHDR_LSIZE
-#: Merge.rc:4598
+#: Merge.rc:4608
#, c-format
msgid "Left Size"
msgstr "Bal mérete"
#. IDS_COLHDR_RSIZE
-#: Merge.rc:4599
+#: Merge.rc:4609
#, c-format
msgid "Right Size"
msgstr "Jobb mérete"
#. IDS_COLHDR_MSIZE
-#: Merge.rc:4604
+#: Merge.rc:4614
#, c-format
msgid "Middle Size"
msgstr "Középső mérete"
#. IDS_COLHDR_RSIZE_SHORT
-#: Merge.rc:4605
+#: Merge.rc:4615
#, c-format
msgid "Right Size (Short)"
msgstr "Jobb mérete (rövid)"
#. IDS_COLHDR_LSIZE_SHORT
-#: Merge.rc:4606
+#: Merge.rc:4616
#, c-format
msgid "Left Size (Short)"
msgstr "Bal mérete (rövid)"
#. IDS_COLHDR_MSIZE_SHORT
-#: Merge.rc:4607
+#: Merge.rc:4617
#, c-format
msgid "Middle Size (Short)"
msgstr "Középső mérete (rövid)"
#. IDS_COLHDR_LTIMEC
-#: Merge.rc:4613
+#: Merge.rc:4623
#, c-format
msgid "Left Creation Time"
msgstr "Bal létrehozási ideje"
#. IDS_COLHDR_RTIMEC
-#: Merge.rc:4614
+#: Merge.rc:4624
#, c-format
msgid "Right Creation Time"
msgstr "Jobb létrehozási ideje"
#. IDS_COLHDR_MTIMEC
-#: Merge.rc:4615
+#: Merge.rc:4625
#, c-format
msgid "Middle Creation Time"
msgstr "Középső létrehozási ideje"
#. IDS_COLHDR_NEWER
-#: Merge.rc:4616
+#: Merge.rc:4626
#, c-format
msgid "Newer File"
msgstr "Újabb fájl"
#. IDS_COLHDR_LVERSION
-#: Merge.rc:4617
+#: Merge.rc:4627
#, c-format
msgid "Left File Version"
msgstr "Bal fájlverziója"
#. IDS_COLHDR_RVERSION
-#: Merge.rc:4618
+#: Merge.rc:4628
#, c-format
msgid "Right File Version"
msgstr "Jobb fájlverziója"
#. IDS_COLHDR_MVERSION
-#: Merge.rc:4619
+#: Merge.rc:4629
#, c-format
msgid "Middle File Version"
msgstr "Középső fájlverziója"
#. IDS_COLHDR_RESULT_ABBR
-#: Merge.rc:4620
+#: Merge.rc:4630
#, c-format
msgid "Short Result"
msgstr "Rövid eredmények"
#. IDS_COLHDR_LATTRIBUTES
-#: Merge.rc:4621
+#: Merge.rc:4631
#, c-format
msgid "Left Attributes"
msgstr "Bal attribútumai"
#. IDS_COLHDR_RATTRIBUTES
-#: Merge.rc:4622
+#: Merge.rc:4632
#, c-format
msgid "Right Attributes"
msgstr "Jobb attribútumai"
#. IDS_COLHDR_MATTRIBUTES
-#: Merge.rc:4623
+#: Merge.rc:4633
#, c-format
msgid "Middle Attributes"
msgstr "Középső attribúumai"
#. IDS_COLHDR_LEOL_TYPE
-#: Merge.rc:4628
+#: Merge.rc:4638
#, c-format
msgid "Left EOL"
msgstr "Bal sorugrásai"
#. IDS_COLHDR_MEOL_TYPE
-#: Merge.rc:4629
+#: Merge.rc:4639
#, c-format
msgid "Middle EOL"
msgstr "Középső sorugrásai"
#. IDS_COLHDR_REOL_TYPE
-#: Merge.rc:4630
+#: Merge.rc:4640
#, c-format
msgid "Right EOL"
msgstr "Jobb sorugrásai"
#. IDS_COLHDR_LENCODING
-#: Merge.rc:4636
+#: Merge.rc:4646
#, c-format
msgid "Left Encoding"
msgstr "Bal kódolása"
#. IDS_COLHDR_RENCODING
-#: Merge.rc:4637
+#: Merge.rc:4647
#, c-format
msgid "Right Encoding"
msgstr "Jobb kódolása"
#. IDS_COLHDR_MENCODING
-#: Merge.rc:4638
+#: Merge.rc:4648
#, c-format
msgid "Middle Encoding"
msgstr "Középső kódolása"
#. IDS_COLHDR_NIDIFFS
-#: Merge.rc:4639
+#: Merge.rc:4649
msgid "Ignored Diff"
msgstr "Eltérések mellőzése"
#. IDS_COLHDR_BINARY
-#: Merge.rc:4641
+#: Merge.rc:4651
msgctxt "DirView|ColumnHeader"
msgid "Binary"
msgstr "Bináris"
#. IDS_PLUGINS_TYPE_UNPACKER
-#: Merge.rc:4642 Merge.rc:4959
+#: Merge.rc:4652 Merge.rc:4969
#, c-format
msgid "Unpacker"
msgstr "Kitömörítő"
#. IDS_PLUGIN_TYPE4
-#: Merge.rc:4643 Merge.rc:4960 Merge.rc:5267
+#: Merge.rc:4653 Merge.rc:4970 Merge.rc:5277
#, c-format
msgid "Prediffer"
msgstr "Elővizsgáló"
#. IDS_COLHDR_LEFT
-#: Merge.rc:4644
+#: Merge.rc:4654
msgid "Left"
msgstr "Bal"
#. IDS_COLHDR_MIDDLE
-#: Merge.rc:4645
+#: Merge.rc:4655
msgid "Middle"
msgstr "Középső"
#. IDS_COLHDR_RIGHT
-#: Merge.rc:4646
+#: Merge.rc:4656
msgid "Right"
msgstr "Jobb"
#. IDS_COLHDR_DIFF
-#: Merge.rc:4647
+#: Merge.rc:4657
msgid "Diff"
msgstr "Különbség"
#. IDS_COLHDR_LEFT_DUPLICATE
-#: Merge.rc:4648
+#: Merge.rc:4658
msgid "Left Duplicate Count"
msgstr "Bal duplikátum számláló"
#. IDS_COLHDR_RIGHT_DUPLICATE
-#: Merge.rc:4649
+#: Merge.rc:4659
msgid "Right Duplicate Count"
msgstr "Jöbb duplikátum számláló"
#. IDS_COLHDR_MIDDLE_DUPLICATE
-#: Merge.rc:4650
+#: Merge.rc:4660
msgid "Middle Duplicate Count"
msgstr "Középső duplikátum számláló"
#. IDS_COLHDR_MOVE
-#: Merge.rc:4651
+#: Merge.rc:4661
msgid "Move"
msgstr "Áthelyezés"
#. IDS_PRPCAT_AUDIO
-#: Merge.rc:4658
+#: Merge.rc:4668
msgid "Audio"
msgstr "Hang"
#. IDS_PRPCAT_CALENDAR
-#: Merge.rc:4659
+#: Merge.rc:4669
msgid "Calendar"
msgstr "Naptár"
#. IDS_PRPCAT_COMMUNICATION
-#: Merge.rc:4660
+#: Merge.rc:4670
msgid "Communication"
msgstr "Kommunikáció"
#. IDS_PRPCAT_CONTACT
-#: Merge.rc:4661
+#: Merge.rc:4671
msgid "Contact"
msgstr "Névjegy"
#. IDS_PRPCAT_DEVICES
-#: Merge.rc:4662
+#: Merge.rc:4672
msgid "Devices"
msgstr "Eszközök"
#. IDS_PRPCAT_DOCUMENT
-#: Merge.rc:4663
+#: Merge.rc:4673
msgid "Document"
msgstr "Dokumentum"
#. IDS_PRPCAT_HOME
-#: Merge.rc:4664
+#: Merge.rc:4674
msgid "Home"
msgstr "Otthon"
#. IDS_PRPCAT_JOURNAL
-#: Merge.rc:4666
+#: Merge.rc:4676
msgid "Journal"
msgstr "Napló"
#. IDS_PRPCAT_LINK
-#: Merge.rc:4667
+#: Merge.rc:4677
msgid "Link"
msgstr "Hivatkozás"
#. IDS_PRPCAT_MEDIA
-#: Merge.rc:4668
+#: Merge.rc:4678
msgid "Media"
msgstr "Média"
#. IDS_PRPCAT_MUSIC
-#: Merge.rc:4670
+#: Merge.rc:4680
msgid "Music"
msgstr "Zene"
#. IDS_PRPCAT_NOTE
-#: Merge.rc:4671
+#: Merge.rc:4681
msgid "Note"
msgstr "Megjegyzés"
#. IDS_PRPCAT_PHOTO
-#: Merge.rc:4672
+#: Merge.rc:4682
msgid "Photo"
msgstr "Fénykép"
#. IDS_PRPCAT_RECORDEDTV
-#: Merge.rc:4673
+#: Merge.rc:4683
msgid "RecordedTV"
msgstr "TV felvétel"
#. IDS_PRPCAT_SEARCH
-#: Merge.rc:4674
+#: Merge.rc:4684
msgid "Search"
msgstr "Keresés"
#. IDS_PRPCAT_SECURITY
-#: Merge.rc:4675
+#: Merge.rc:4685
msgid "Security"
msgstr "Biztonság"
#. IDS_PRPCAT_SOFTWARE
-#: Merge.rc:4676
+#: Merge.rc:4686
msgid "Software"
msgstr "Szoftver"
#. IDS_PRPCAT_TASK
-#: Merge.rc:4677
+#: Merge.rc:4687
msgid "Task"
msgstr "Feladat"
#. IDS_PRPCAT_VIDEO
-#: Merge.rc:4678
+#: Merge.rc:4688
msgid "Video"
msgstr "Videó"
#. IDS_PRPCAT_HASH
-#: Merge.rc:4679
+#: Merge.rc:4689
msgid "Hash"
msgstr "Hash"
#. IDS_CANT_COMPARE_FILES
-#: Merge.rc:4685
+#: Merge.rc:4695
#, c-format
msgid "Unable to compare files"
msgstr "Nem lehet összehasonlítani a fájlokat"
#. IDS_ABORTED_ITEM
-#: Merge.rc:4686
+#: Merge.rc:4696
#, c-format
msgid "Item aborted"
msgstr "Elem leállítva"
#. IDS_FILE_SKIPPED
-#: Merge.rc:4687
+#: Merge.rc:4697
#, c-format
msgid "File skipped"
msgstr "A fájl kihagyva"
#. IDS_DIR_SKIPPED
-#: Merge.rc:4688
+#: Merge.rc:4698
#, c-format
msgid "Folder skipped"
msgstr "A könyvtár kihagyva"
#. IDS_LEFT_ONLY_IN_FMT
-#: Merge.rc:4689
+#: Merge.rc:4699
#, c-format
msgid "Left only: %1"
msgstr "Csak bal: %1"
#. IDS_MIDDLE_ONLY_IN_FMT
-#: Merge.rc:4690
+#: Merge.rc:4700
#, c-format
msgid "Middle only: %1"
msgstr "Csak középső: %1"
#. IDS_RIGHT_ONLY_IN_FMT
-#: Merge.rc:4691
+#: Merge.rc:4701
#, c-format
msgid "Right only: %1"
msgstr "Csak jobb: %1"
#. IDS_DOES_NOT_EXIST_IN_FMT
-#: Merge.rc:4692
+#: Merge.rc:4702
#, c-format
msgid "Does not exist in %1"
msgstr "Nincs benne ebben: %1"
#. IDS_BIN_FILES_SAME
-#: Merge.rc:4693
+#: Merge.rc:4703
#, c-format
msgid "Binary files are identical"
msgstr "A bináris fájlok megegyezőek"
#. IDS_BIN_FILES_DIFF
-#: Merge.rc:4699
+#: Merge.rc:4709
#, c-format
msgid "Binary files are different"
msgstr "A bináris fájlok különbözőek"
#. IDS_FILES_ARE_DIFFERENT
-#: Merge.rc:4700
+#: Merge.rc:4710
#, c-format
msgid "Files are different"
msgstr "A fájlok különbözőek"
#. IDS_FOLDERS_ARE_DIFFERENT
-#: Merge.rc:4701
+#: Merge.rc:4711
#, c-format
msgid "Folders are different"
msgstr "A könyvtárak különböznek"
#. IDS_LEFTONLY
-#: Merge.rc:4702
+#: Merge.rc:4712
#, c-format
msgid "Left Only"
msgstr "Csak a bal"
#. IDS_RIGHTONLY
-#: Merge.rc:4703
+#: Merge.rc:4713
#, c-format
msgid "Right Only"
msgstr "Csak a jobb"
#. IDS_MIDDLEONLY
-#: Merge.rc:4704
+#: Merge.rc:4714
#, c-format
msgid "Middle Only"
msgstr "Csak a középső"
#. IDS_NOITEMLEFT
-#: Merge.rc:4705
+#: Merge.rc:4715
#, c-format
msgid "No item in left"
msgstr "Nincs elem a balban"
#. IDS_NOITEMRIGHT
-#: Merge.rc:4706
+#: Merge.rc:4716
#, c-format
msgid "No item in right"
msgstr "Nincs elem a jobban"
#. IDS_NOITEMMIDDLE
-#: Merge.rc:4707
+#: Merge.rc:4717
#, c-format
msgid "No item in middle"
msgstr "Nincs elem a középsőben"
#. IDS_CMPRES_ERROR
-#: Merge.rc:4709
+#: Merge.rc:4719
#, c-format
msgid "Error"
msgstr "Hiba"
#. IDS_TEXT_FILES_SAME
-#: Merge.rc:4710
+#: Merge.rc:4720
#, c-format
msgid "Text files are identical"
msgstr "A szövegfájlok megegyeznek"
#. IDS_LEFTONLY_DIFF
-#: Merge.rc:4711
+#: Merge.rc:4721
msgid " (Middle and right are identical)"
msgstr " (Középső és jobb egyforma)"
#. IDS_MIDDLEONLY_DIFF
-#: Merge.rc:4712
+#: Merge.rc:4722
msgid " (Left and right are identical)"
msgstr " (Bal és jobb egyforma)"
#. IDS_RIGHTONLY_DIFF
-#: Merge.rc:4713
+#: Merge.rc:4723
msgid " (Left and middle are identical)"
msgstr " (Bal és középső egyforma)"
#. IDS_PATH_MISMATCH
-#: Merge.rc:4714
+#: Merge.rc:4724
msgid " (paths differ)"
msgstr " (utak különbözősége)"
#. IDS_TEXT_FILES_DIFF
-#: Merge.rc:4715
+#: Merge.rc:4725
#, c-format
msgid "Text files are different"
msgstr "A szövegfájlok különböznek"
#. IDS_IMAGE_FILES_SAME
-#: Merge.rc:4716
+#: Merge.rc:4726
msgid "Image files are identical"
msgstr "A képfájlok egyformák"
#. IDS_IMAGE_FILES_DIFF
-#: Merge.rc:4717
+#: Merge.rc:4727
msgid "Image files are different"
msgstr "A képfájlok különböznek"
#. IDS_EXPR_DIFF
-#: Merge.rc:4718
+#: Merge.rc:4728
#, c-format
msgid "Files are different (expr: %1)"
msgstr "A fájlok eltérőek (kifejezés: %1)"
#. IDS_HASH_GROUP
-#: Merge.rc:4719
+#: Merge.rc:4729
#, c-format
msgid "Group%d"
msgstr "Csoport%d"
#. IDS_RENAME_MOVE_DETECTION_DISALBED
-#: Merge.rc:4720
+#: Merge.rc:4730
msgctxt "Options dialog|Compare|Folder|Detect renames and moves"
msgid "Disabled"
msgstr "Letiltva"
#. IDS_RENAME_MOVE_DETECTION_RENAME
-#: Merge.rc:4721
+#: Merge.rc:4731
msgid "Detect renames"
msgstr "Átnevezések észlelése"
#. IDS_RENAME_MOVE_DETECTION_RENAME_MOVE
-#: Merge.rc:4722
+#: Merge.rc:4732
msgid "Detect renames and moves"
msgstr "Átnevezések és áthelyezések észlelése"
#. IDS_RENAME_MOVE_MERGE_MODE_RENAME
-#: Merge.rc:4723
+#: Merge.rc:4733
msgid "Merge renames"
msgstr "Átnevezések egyesítése"
#. IDS_RENAME_MOVE_MERGE_MODE_RENAME_MOVE
-#: Merge.rc:4724
+#: Merge.rc:4734
msgid "Merge renames and moves"
msgstr "Átnevezések és áthelyezések egyesítése"
#. IDS_RENAMED
-#: Merge.rc:4725
+#: Merge.rc:4735
msgid "Renamed"
msgstr "Átnevezve"
#. IDS_MOVED
-#: Merge.rc:4726
+#: Merge.rc:4736
msgid "Moved"
msgstr "Áthelyezve"
#. IDS_RENAMED_MOVED
-#: Merge.rc:4727
+#: Merge.rc:4737
msgid "Renamed/Moved"
msgstr "Átnevezve/Áthelyezve"
#. IDS_RENAMED_MOVED_ITEMS
-#: Merge.rc:4728
+#: Merge.rc:4738
#, c-format
msgid "(%1 items)"
msgstr "(%1 elem)"
#. IDS_RENAMED_MOVED_RESULT
-#: Merge.rc:4729
+#: Merge.rc:4739
#, c-format
msgid "%1 (set %2): "
msgstr "%1 (készlet %2)"
#. IDS_SWITCH_FLAT_MODE
-#: Merge.rc:4730
+#: Merge.rc:4740
msgid "Some moved items have been merged.\nIn Tree Mode, these items may appear in positions that do not reflect the actual folder structure, which can be confusing.\nSwitch to Flat Mode?"
msgstr "Néhány áthelyezett elem egyesítésre került.\nFa nézetben ezek az elemek olyan pozíciókban jelenhetnek meg, amelyek nem tükrözik a tényleges mappastruktúrát, ami zavaró lehet.\nVáltás sík nézetre?"
#. IDS_ELAPSED_TIME
-#: Merge.rc:4736
+#: Merge.rc:4746
#, c-format
msgid "Elapsed time: %ld ms"
msgstr "Eltelt idő: %ld ms"
#. IDS_STATUS_SELITEM1
-#: Merge.rc:4737
+#: Merge.rc:4747
#, c-format
msgid "1 item selected"
msgstr "1 elem kiválasztva"
#. IDS_STATUS_SELITEMS
-#: Merge.rc:4738
+#: Merge.rc:4748
#, c-format
msgid "%1 items selected"
msgstr "%1 elem kiválasztva"
#. IDS_COLDESC_FILENAME
-#: Merge.rc:4744
+#: Merge.rc:4754
#, c-format
msgid "Filename or folder name."
msgstr "Fájlnév vagy könyvtárnév."
#. IDS_COLDESC_DIR
-#: Merge.rc:4745
+#: Merge.rc:4755
#, c-format
msgid "Subfolder name when subfolders are included."
msgstr "Alkönyvtár neve ha az alkönyvtárak is ki vannak választva."
#. IDS_COLDESC_RESULT
-#: Merge.rc:4746
+#: Merge.rc:4756
#, c-format
msgid "Comparison result, long form."
msgstr "Összehasonlítási eredmény bővebb formában."
#. IDS_COLDESC_LTIMEM
-#: Merge.rc:4751
+#: Merge.rc:4761
#, c-format
msgid "Left side modification date."
msgstr "Bal módosítási ideje."
#. IDS_COLDESC_RTIMEM
-#: Merge.rc:4752
+#: Merge.rc:4762
#, c-format
msgid "Right side modification date."
msgstr "Jobb módosítási ideje."
#. IDS_COLDESC_MTIMEM
-#: Merge.rc:4753
+#: Merge.rc:4763
#, c-format
msgid "Middle side modification date."
msgstr "Középső módosítási ideje."
#. IDS_COLDESC_EXTENSION
-#: Merge.rc:4754
+#: Merge.rc:4764
#, c-format
msgid "File's extension."
msgstr "Fájlok kiterjesztése."
#. IDS_COLDESC_LSIZE
-#: Merge.rc:4755
+#: Merge.rc:4765
#, c-format
msgid "Left file size in bytes."
msgstr "Bal fájlmérete bájtban."
#. IDS_COLDESC_RSIZE
-#: Merge.rc:4756
+#: Merge.rc:4766
#, c-format
msgid "Right file size in bytes."
msgstr "Jobb fájlmérete bájtban."
#. IDS_COLDESC_MSIZE
-#: Merge.rc:4757
+#: Merge.rc:4767
#, c-format
msgid "Middle file size in bytes."
msgstr "Középső fájlmérete bájtban."
#. IDS_COLDESC_LSIZE_SHORT
-#: Merge.rc:4758
+#: Merge.rc:4768
#, c-format
msgid "Left file size abbreviated."
msgstr "Bal fájlmérete rövidítve."
#. IDS_COLDESC_RSIZE_SHORT
-#: Merge.rc:4759
+#: Merge.rc:4769
#, c-format
msgid "Right file size abbreviated."
msgstr "Jobb fájlmérete rövidítve."
#. IDS_COLDESC_MSIZE_SHORT
-#: Merge.rc:4760
+#: Merge.rc:4770
#, c-format
msgid "Middle file size abbreviated."
msgstr "Középső fájlmérete rövidítve."
#. IDS_COLDESC_LTIMEC
-#: Merge.rc:4766
+#: Merge.rc:4776
#, c-format
msgid "Left side creation time."
msgstr "Bal létrehozási ideje."
#. IDS_COLDESC_RTIMEC
-#: Merge.rc:4767
+#: Merge.rc:4777
#, c-format
msgid "Right side creation time."
msgstr "Jobb létrehozási ideje."
#. IDS_COLDESC_MTIMEC
-#: Merge.rc:4768
+#: Merge.rc:4778
#, c-format
msgid "Middle side creation time."
msgstr "A középső létrehozásának ideje."
#. IDS_COLDESC_NEWER
-#: Merge.rc:4769
+#: Merge.rc:4779
#, c-format
msgid "Tells which side has newer modification date."
msgstr "Megmutatja, melyik oldalnak újabb a létrehozási dátuma."
#. IDS_COLDESC_LVERSION
-#: Merge.rc:4770
+#: Merge.rc:4780
msgid "Left side file version, only for some file types."
msgstr "Bal fájlverziója, csak egyes fájltípusoknál."
#. IDS_COLDESC_RVERSION
-#: Merge.rc:4771
+#: Merge.rc:4781
msgid "Right side file version, only for some file types."
msgstr "Jobb fájlverziója, csak egyes fájltípusoknál."
#. IDS_COLDESC_MVERSION
-#: Merge.rc:4776
+#: Merge.rc:4786
msgid "Middle side file version, only for some file types."
msgstr "Középső fájlverziója, csak egyes fájltípusoknál."
#. IDS_COLDESC_RESULT_ABBR
-#: Merge.rc:4777
+#: Merge.rc:4787
#, c-format
msgid "Short comparison result."
msgstr "Rövid összehasonlítási eredmények."
#. IDS_COLDESC_LATTRIBUTES
-#: Merge.rc:4778
+#: Merge.rc:4788
#, c-format
msgid "Left side attributes."
msgstr "Bal attribútumai."
#. IDS_COLDESC_RATTRIBUTES
-#: Merge.rc:4779
+#: Merge.rc:4789
#, c-format
msgid "Right side attributes."
msgstr "Jobb attribútumai."
#. IDS_COLDESC_MATTRIBUTES
-#: Merge.rc:4780
+#: Merge.rc:4790
#, c-format
msgid "Middle side attributes."
msgstr "Középső attribútumai."
#. IDS_COLDESC_LEOL_TYPE
-#: Merge.rc:4781
+#: Merge.rc:4791
msgid "Left side file EOL type."
msgstr "Bal oldali fájl sorvég típus."
#. IDS_COLDESC_REOL_TYPE
-#: Merge.rc:4782
+#: Merge.rc:4792
msgid "Right side file EOL type."
msgstr "Jobb oldali fájl sorvég típus."
#. IDS_COLDESC_MEOL_TYPE
-#: Merge.rc:4783
+#: Merge.rc:4793
msgid "Middle side file EOL type."
msgstr "Középső oldali fájl sorvég típus."
#. IDS_COLDESC_LENCODING
-#: Merge.rc:4789
+#: Merge.rc:4799
#, c-format
msgid "Left side encoding."
msgstr "Bal kódolása."
#. IDS_COLDESC_RENCODING
-#: Merge.rc:4790
+#: Merge.rc:4800
#, c-format
msgid "Right side encoding."
msgstr "Jobb kódolása."
#. IDS_COLDESC_MENCODING
-#: Merge.rc:4791
+#: Merge.rc:4801
#, c-format
msgid "Middle side encoding."
msgstr "Középső kódolása."
#. IDS_COLDESC_NIDIFFS
-#: Merge.rc:4792
+#: Merge.rc:4802
#, c-format
msgid "Number of ignored differences in file. Ignored 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 is egyesíthetőek."
#. IDS_COLDESC_NSDIFFS
-#: Merge.rc:4793
+#: Merge.rc:4803
#, c-format
msgid "Number of differences in file (excluding ignored)."
msgstr "Különbségek száma a fájlban. Ez a szám nem tartalmazza a mellőzött különbségeket."
#. IDS_COLDESC_BINARY
-#: Merge.rc:4794
+#: Merge.rc:4804
#, c-format
msgid "Shows an asterisk (*) if the file is binary."
msgstr "(*) látható, ha a fájl bináris."
#. IDS_COLDESC_UNPACKER
-#: Merge.rc:4795
+#: Merge.rc:4805
msgid "Unpacker plugin name or pipeline."
msgstr "Kicsomagoló bővítmény név vagy pipeline"
#. IDS_COLDESC_PREDIFFER
-#: Merge.rc:4796
+#: Merge.rc:4806
msgid "Prediffer plugin name or pipeline."
msgstr "Elővizsgáló bővítmény név vagy pipeline"
#. IDS_DIRECTORY_REPORT_TITLE
-#: Merge.rc:4802
+#: Merge.rc:4812
#, c-format
msgid "Compare %1 with %2"
msgstr "%1 összehasonlítása ezzel: %2"
#. IDS_DIRECTORY_REPORT_TITLE3
-#: Merge.rc:4803
+#: Merge.rc:4813
#, c-format
msgid "Compare %1 with %2 and %3"
msgstr "%1 összehasonlítása ezekkel: %2 és %3"
#. IDS_REPORT_COMMALIST
-#: Merge.rc:4804
+#: Merge.rc:4814
#, c-format
msgid "Comma-separated list"
msgstr "Vesszővel elválasztott lista"
#. IDS_REPORT_TABLIST
-#: Merge.rc:4805
+#: Merge.rc:4815
#, c-format
msgid "Tab-separated list"
msgstr "Tabulált lista"
#. IDS_REPORT_SIMPLEHTML
-#: Merge.rc:4806
+#: Merge.rc:4816
#, c-format
msgid "Simple HTML"
msgstr "Egyszerű HTML"
#. IDS_REPORT_SIMPLEXML
-#: Merge.rc:4807
+#: Merge.rc:4817
#, c-format
msgid "Simple XML"
msgstr "Egyszerű XML"
-#: Merge.rc:4809
+#: Merge.rc:4819
#, c-format
msgid "Report file already exists. Overwrite?"
msgstr "A jelentés fájl már létezik. Szeretnéd felülírni a létező fájlt?"
#. IDS_REPORT_ERROR
-#: Merge.rc:4814
+#: Merge.rc:4824
#, c-format
msgid ""
"Error creating the report:\n"
@@ -7400,62 +7411,62 @@ msgstr ""
"%1"
#. IDS_REPORT_SUCCESS
-#: Merge.rc:4815
+#: Merge.rc:4825
#, c-format
msgid "Report created successfully."
msgstr "A jelentés sikeresen elkészült."
#. IDS_SYNCPOINT_LASTBLOCK
-#: Merge.rc:4821
+#: Merge.rc:4831
msgid "Cannot add a synchronization point at this line."
msgstr "Itt nem adható hozzá szinkronizálási pont ehhez a sorhoz."
#. IDS_FILE_TO_ITSELF
-#: Merge.rc:4827
+#: Merge.rc:4837
#, c-format
msgid "Same file is opened in both panes."
msgstr "Ugyanaz a fájl van megnyitva mindkét panelen."
#. IDS_FILESSAME
-#: Merge.rc:4828
+#: Merge.rc:4838
#, c-format
msgid "Selected files are identical."
msgstr "A kijelölt fájlok egyformák."
#. IDS_FILESSAME_CURCFG
-#: Merge.rc:4829
+#: Merge.rc:4839
msgid "Selected files are identical (with current settings).\r\nChecking binary identity..."
msgstr "A kijelölt fájlok egyformák (a jelenlegi beállításokkal).\r\nBináris azonosság ellenőrzése..."
#. IDS_FILESSAME_BINERROR
-#: Merge.rc:4830
+#: Merge.rc:4840
msgid "Selected files are identical (with current settings).\r\nBut binary comparison failed."
msgstr "A kijelölt fájlok egyformák (a jelenlegi beállításokkal).\r\nDe a bináris összehasonlítás sikertelen."
#. IDS_FILESSAME_BINSAME
-#: Merge.rc:4831
+#: Merge.rc:4841
msgid "Selected files are identical (binary match)."
msgstr "A kijelölt fájlok egyformák (bináris egyezés)."
#. IDS_FILESSAME_BINDIFF
-#: Merge.rc:4832
+#: Merge.rc:4842
msgid "Selected files are identical (with current settings).\r\nBut differ at the binary level."
msgstr "A kijelölt fájlok egyformák (a jelenlegi beállításokkal).\r\nDe bináris szinten különböznek."
#. IDS_FILEERROR
-#: Merge.rc:4833
+#: Merge.rc:4843
#, c-format
msgid "An error occurred while comparing files."
msgstr "Hiba történt a fájlok összehasonlításakor."
#. IDS_TEMP_FILEERROR
-#: Merge.rc:4834
+#: Merge.rc:4844
#, c-format
msgid "Could not create temporary files. 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."
#. IDS_SUGGEST_IGNOREEOL
-#: Merge.rc:4835
+#: Merge.rc:4845
msgid "Files use different EOL.\n\nTreat all EOL as equivalent?\n\nSet 'Ignore EOL differences (Windows/Unix/Mac)' in Compare section of Options."
msgstr ""
"Ezek a fájlok eltérő sorvége-karaktereket tartalmaznak.\n"
@@ -7465,19 +7476,19 @@ msgstr ""
"Megjegyzés: Amennyiben minden esetben ezt az opciót szeretnéd használni, kapcsold be a 'Sorvég különbségek mellőzése' opciót az Összehasonlítás menüpontban (a Szerkesztés/Beállítások menüpont alatt találod meg)."
#. IDS_INVALID_DIRECTORY
-#: Merge.rc:4836
+#: Merge.rc:4846
#, c-format
msgid "Selected folder is invalid."
msgstr "A kiválasztott mappa érvénytelen."
#. IDS_CANNOT_OPEN_BINARYFILE
-#: Merge.rc:4837
+#: Merge.rc:4847
#, c-format
msgid "Cannot open a binary file in Editor."
msgstr "A bináris fájl nem volt megnyitható a szerkesztővel."
#. IDS_CREATE_PAIR_FOLDER
-#: Merge.rc:4838
+#: Merge.rc:4848
#, c-format
msgid "Create matching folder:\n%1\non the other side and open?"
msgstr ""
@@ -7488,45 +7499,45 @@ msgstr ""
"a másik oldalhoz és megnyitod ezeket a mappákat?"
#. IDS_CONFIRM_COPY_ALL_DIFFS
-#: Merge.rc:4839
+#: Merge.rc:4849
msgid "Copy all differences to other file?"
msgstr "Biztos, hogy minden eltérést át akarsz másolni a másik fájlba?"
#. IDS_MOVE_TO_NEXTFILE
-#: Merge.rc:4844
+#: Merge.rc:4854
#, c-format
msgid "Move to next file?"
msgstr "Továbblépsz a következő fájlra?"
#. IDS_MOVE_TO_PREVFILE
-#: Merge.rc:4845
+#: Merge.rc:4855
#, c-format
msgid "Move to previous file?"
msgstr "Visszalépsz az előző fájlra?"
#. IDS_MOVE_TO_NEXTPAGE
-#: Merge.rc:4846
+#: Merge.rc:4856
#, c-format
msgid "Move to next page?"
msgstr "Továbblépsz a következő oldalra?"
#. IDS_MOVE_TO_PREVPAGE
-#: Merge.rc:4847
+#: Merge.rc:4857
#, c-format
msgid "Move to previous page?"
msgstr "Visszalépsz az előző oldalra?"
#. IDS_MOVE_TO_FIRSTFILE
-#: Merge.rc:4848
+#: Merge.rc:4858
msgid "Move to first file?"
msgstr "Átlépés az első fájlhoz?"
#. IDS_MOVE_TO_LASTFILE
-#: Merge.rc:4849
+#: Merge.rc:4859
msgid "Move to last file?"
msgstr "Átlépés az utolsó fájlhoz?"
-#: Merge.rc:4856
+#: Merge.rc:4866
#, c-format
msgid "Different codepages: left (cp%d), right (cp%d).\nDisplay in codepage (better display) or default Windows codepage (safer merging)?\n(Recommended: default Windows codepage)"
msgstr ""
@@ -7534,57 +7545,57 @@ msgstr ""
"A különböző kódlapokkal történő kijelzés könnyebben áttekinthető de az egyesítés/törlés kockázatos lehet.\n"
"Szeretnéd mindkét fájlt az alapértelmezett Windows kódlapként kezelni (ajánlott)?"
-#: Merge.rc:4858
+#: Merge.rc:4868
#, c-format
msgid "Information lost due to encoding errors: both files"
msgstr "Kódolási hibák miatt elveszett információk: mindkét fájl"
-#: Merge.rc:4860
+#: Merge.rc:4870
#, c-format
msgid "Information lost due to encoding errors: first file"
msgstr "Kódolási hibák miatt elveszett információk: 1.fájl"
-#: Merge.rc:4862
+#: Merge.rc:4872
#, c-format
msgid "Information lost due to encoding errors: second file"
msgstr "Kódolási hibák miatt elveszett információk: 2.fájl"
-#: Merge.rc:4864
+#: Merge.rc:4874
#, c-format
msgid "Information lost due to encoding errors: third file"
msgstr "Kódolási hibák miatt elveszett információk: 3.fájl"
#. IDS_LINEDIFF_NODIFF
-#: Merge.rc:4870
+#: Merge.rc:4880
#, c-format
msgid "No difference"
msgstr "Nincs eltérés"
#. IDS_LINEDIFF_NODIFF_CAPTION
-#: Merge.rc:4871
+#: Merge.rc:4881
#, c-format
msgid "Line difference"
msgstr "Sor eltérés"
#. IDS_NUM_REPLACED
-#: Merge.rc:4877
+#: Merge.rc:4887
#, c-format
msgid "Replaced %1 string(s)."
msgstr "Cserélve lett %1 sztring."
#. IDS_EDIT_TEXT_NOT_FOUND
-#: Merge.rc:4878
+#: Merge.rc:4888
#, c-format
msgid "Cannot find string \"%s\"."
msgstr "Nem található ez a sztring: \"%s\"."
#. IDS_MERGE_MODE
-#: Merge.rc:4884
+#: Merge.rc:4894
msgid "Entering Merge Mode. Press F9 to turn off."
msgstr "Most belépsz az egyesítési módba. Ha ki akarod kapcsolni, nyomd meg az F9-et."
#. IDS_AUTO_MERGE
-#: Merge.rc:4890
+#: Merge.rc:4900
#, c-format
msgid ""
"Automatic merges: %1\n"
@@ -7594,107 +7605,107 @@ msgstr ""
"A megoldatlan konfliktusok száma: %2"
#. IDS_CODEPAGE_MERGED
-#: Merge.rc:4891
+#: Merge.rc:4901
msgid "Codepage change merged."
msgstr "A kódlap változása egyesítésre került."
#. IDS_CODEPAGE_CONFLICT
-#: Merge.rc:4892
+#: Merge.rc:4902
msgid "Codepage changes are conflicting."
msgstr "A kódlap változásai ellentmondásosak."
#. IDS_EOL_MERGED
-#: Merge.rc:4893
+#: Merge.rc:4903
msgid "EOL change merged."
msgstr "A sorvég változás egyesítésre került."
#. IDS_EOL_CONFLICT
-#: Merge.rc:4894
+#: Merge.rc:4904
msgid "EOL changes are conflicting."
msgstr "A sorvég változások ellentmondásosak."
#. IDS_LOCBAR_CAPTION
-#: Merge.rc:4900
+#: Merge.rc:4910
#, c-format
msgid "Location Pane"
msgstr "Eltérések helye"
#. IDS_DIFFBAR_CAPTION
-#: Merge.rc:4901
+#: Merge.rc:4911
#, c-format
msgid "Diff Pane"
msgstr "Eltérés panel"
#. IDS_DIFF_SUCCEEDED
-#: Merge.rc:4908
+#: Merge.rc:4918
#, c-format
msgid "Patch file written."
msgstr "A Patch fájl sikeresen elkészült."
#. IDS_DIFF_ITEM1NOTFOUND
-#: Merge.rc:4909
+#: Merge.rc:4919
msgid "First item not found!"
msgstr "1.elem nem található!"
#. IDS_DIFF_ITEM2NOTFOUND
-#: Merge.rc:4910
+#: Merge.rc:4920
msgid "Second item not found!"
msgstr "2.elem nem található!"
#. IDS_DIFF_FILEOVERWRITE
-#: Merge.rc:4911
+#: Merge.rc:4921
#, c-format
msgid "Patch file already exists. Overwrite?"
msgstr "A patch fájl már létezik. Szeretnéd felülírni azt?"
#. IDS_DIFF_SELECTEDFILES
-#: Merge.rc:4912
+#: Merge.rc:4922
#, c-format
msgid "[%1 files selected]"
msgstr "[%1 kijelölt fájl]"
#. IDS_DIFF_NORMAL
-#: Merge.rc:4913
+#: Merge.rc:4923
#, c-format
msgid "Normal"
msgstr "Normál"
#. IDS_DIFF_CONTEXT
-#: Merge.rc:4914
+#: Merge.rc:4924
#, c-format
msgid "Context"
msgstr "Szövegkörnyezet"
#. IDS_DIFF_UNIFIED
-#: Merge.rc:4915
+#: Merge.rc:4925
#, c-format
msgid "Unified"
msgstr "Egységesített"
#. IDS_FILEWRITE_ERROR
-#: Merge.rc:4917
+#: Merge.rc:4927
#, c-format
msgid "Could not write to file %1."
msgstr "Nem lehetett ebbe a fájlba írni: %1."
#. IDS_PATH_NOT_ABSOLUTE
-#: Merge.rc:4918
+#: Merge.rc:4928
#, c-format
msgid "Output path is not absolute: %1"
msgstr "A megadott kimeneti útvonal nem abszolút elérési út: %1"
#. IDS_MUST_SPECIFY_OUTPUT
-#: Merge.rc:4919
+#: Merge.rc:4929
msgid "Specify an output file."
msgstr "Adj meg egy kimeneti fájlt."
-#: Merge.rc:4921
+#: Merge.rc:4931
#, c-format
msgid "Cannot create patch from binary files."
msgstr "Nem lehet patch fájlt létrehozni bináris fájlokból."
#. IDS_SAVEFILES_FORPATCH
-#: Merge.rc:4922
+#: Merge.rc:4932
#, c-format
msgid ""
"Save all files first.\n"
@@ -7706,13 +7717,13 @@ msgstr ""
"A patch létrehozásához szükséges, hogy ne legyenek el nem mentett változtatások a fájlokban."
#. IDS_FOLDER_NOTEXIST
-#: Merge.rc:4923
+#: Merge.rc:4933
#, c-format
msgid "Folder does not exist."
msgstr "A mappa nem létezik."
#. IDS_NO_ZIP_SUPPORT
-#: Merge.rc:4928
+#: Merge.rc:4938
msgid ""
"Archive support not enabled.\n"
"7-Zip and/or Merge7z*.dll not found.\n"
@@ -7723,43 +7734,43 @@ msgstr ""
"Olvasd el a kézikönyv archívum támogatásról szóló részét."
#. IDS_OPT_EXPORT_CAPTION
-#: Merge.rc:4929
+#: Merge.rc:4939
#, c-format
msgid "Select file for export"
msgstr "Fájl kiválasztása az exportáláshoz"
#. IDS_OPT_IMPORT_CAPTION
-#: Merge.rc:4930
+#: Merge.rc:4940
#, c-format
msgid "Select file for import"
msgstr "Fájl kiválasztása az importáláshoz"
#. IDS_OPT_IMPORT_DONE
-#: Merge.rc:4931
+#: Merge.rc:4941
#, c-format
msgid "Options imported from file."
msgstr "Beállítások importálva a fájlból."
#. IDS_OPT_EXPORT_DONE
-#: Merge.rc:4932
+#: Merge.rc:4942
#, c-format
msgid "Options exported to file."
msgstr "Beállítások exportálva a fájlba."
#. IDS_OPT_IMPORT_ERR
-#: Merge.rc:4933
+#: Merge.rc:4943
#, c-format
msgid "Failed to import options from file."
msgstr "Beállítások importálása a fájlból sikertelen."
#. IDS_OPT_EXPORT_ERR
-#: Merge.rc:4934
+#: Merge.rc:4944
#, c-format
msgid "Failed to write options to file."
msgstr "Beállítások exportálása a fájlba sikertelen."
#. IDS_CLOSEALL_WINDOWS
-#: Merge.rc:4935
+#: Merge.rc:4945
#, c-format
msgid ""
"Close multiple compare windows?\n"
@@ -7771,48 +7782,48 @@ msgstr ""
"Biztosan folytatod?"
#. IDS_EOL_MIXED
-#: Merge.rc:4944
+#: Merge.rc:4954
#, c-format
msgid "Mixed"
msgstr "Vegyes"
#. IDS_EOL_BIN
-#: Merge.rc:4945
+#: Merge.rc:4955
msgctxt "EOL Type"
msgid "Binary"
msgstr "Bináris"
#. IDS_EOL_NONE
-#: Merge.rc:4949
+#: Merge.rc:4959
#, c-format
msgid "None"
msgstr "Nincs"
#. IDS_MARKER_COLOR_FMT
-#: Merge.rc:4950
+#: Merge.rc:4960
#, c-format
msgid "Marker Color %d"
msgstr "Jelölőszín %d"
#. IDS_MARKER_NEW_PATTERN
-#: Merge.rc:4951
+#: Merge.rc:4961
msgid "New Pattern"
msgstr "Új fajta"
#. IDS_PLUGINSLIST_TYPE
-#: Merge.rc:4957
+#: Merge.rc:4967
#, c-format
msgid "Type"
msgstr "Típus"
#. IDS_PLUGINS_TYPE_EDITSCRIPT
-#: Merge.rc:4961
+#: Merge.rc:4971
#, c-format
msgid "Editor script"
msgstr "Szkript szerkesztő"
#. ID_SELECTLINEDIFF
-#: Merge.rc:4967
+#: Merge.rc:4977
#, c-format
msgid ""
"\n"
@@ -7822,7 +7833,7 @@ msgstr ""
"Az eltérés az aktuális sorban (F4)"
#. ID_OPTIONS
-#: Merge.rc:4968
+#: Merge.rc:4978
#, c-format
msgid ""
"\n"
@@ -7832,7 +7843,7 @@ msgstr ""
"Lehetőségek"
#. ID_REFRESH
-#: Merge.rc:4969
+#: Merge.rc:4979
#, c-format
msgid ""
"\n"
@@ -7842,7 +7853,7 @@ msgstr ""
"Frissítés (F5)"
#. ID_PREVDIFF
-#: Merge.rc:4975
+#: Merge.rc:4985
#, c-format
msgid ""
"\n"
@@ -7852,7 +7863,7 @@ msgstr ""
"Előző különbség (Alt+Fel)"
#. ID_NEXTDIFF
-#: Merge.rc:4976
+#: Merge.rc:4986
#, c-format
msgid ""
"\n"
@@ -7862,7 +7873,7 @@ msgstr ""
"Következő különbség (Alt+Le)"
#. ID_PREVCONFLICT
-#: Merge.rc:4977
+#: Merge.rc:4987
#, c-format
msgid ""
"\n"
@@ -7872,7 +7883,7 @@ msgstr ""
"Előző konfliktus (Alt+Shift+Fel)"
#. ID_NEXTCONFLICT
-#: Merge.rc:4978
+#: Merge.rc:4988
#, c-format
msgid ""
"\n"
@@ -7882,7 +7893,7 @@ msgstr ""
"Következő konfliktus (Alt+Shift+Le)"
#. ID_FIRSTDIFF
-#: Merge.rc:4983
+#: Merge.rc:4993
#, c-format
msgid ""
"\n"
@@ -7892,7 +7903,7 @@ msgstr ""
"Első különbség (Alt+Home)"
#. ID_CURDIFF
-#: Merge.rc:4984
+#: Merge.rc:4994
#, c-format
msgid ""
"\n"
@@ -7902,7 +7913,7 @@ msgstr ""
"Aktuális különbség (Alt+Enter)"
#. ID_LASTDIFF
-#: Merge.rc:4985
+#: Merge.rc:4995
#, c-format
msgid ""
"\n"
@@ -7912,37 +7923,37 @@ msgstr ""
"Utolsó különbség (Alt+End)"
#. ID_L2R
-#: Merge.rc:4986
+#: Merge.rc:4996
msgid "\nCopy to Right (Alt+Right)"
msgstr "\nMásolás jobbra (Alt+Jobbra)"
#. ID_R2L
-#: Merge.rc:4987
+#: Merge.rc:4997
msgid "\nCopy to Left (Alt+Left)"
msgstr "\nMásolás balra (Alt+Balra)"
#. ID_L2RNEXT
-#: Merge.rc:4988
+#: Merge.rc:4998
msgid "\nCopy to Right and Advance (Ctrl+Alt+Right)"
msgstr "\nMásolás jobbra, továbblépés (Ctrl+Alt+Jobbra)"
#. ID_R2LNEXT
-#: Merge.rc:4989
+#: Merge.rc:4999
msgid "\nCopy to Left and Advance (Ctrl+Alt+Left)"
msgstr "\nMásolás balra, továbblépés (Ctrl+Alt+Balra)"
#. ID_ALL_RIGHT
-#: Merge.rc:4990
+#: Merge.rc:5000
msgid "\nCopy All to Right"
msgstr "\nAz összes másolása jobbra"
#. ID_ALL_LEFT
-#: Merge.rc:4991
+#: Merge.rc:5001
msgid "\nCopy All to Left"
msgstr "\nAz összes másolása balra"
#. ID_AUTO_MERGE
-#: Merge.rc:4992
+#: Merge.rc:5002
#, c-format
msgid ""
"\n"
@@ -7952,7 +7963,7 @@ msgstr ""
"Automatikus egyesítés (Ctrl+Alt+M)"
#. ID_FIRSTFILE
-#: Merge.rc:4993
+#: Merge.rc:5003
msgid ""
"\n"
"First File"
@@ -7961,7 +7972,7 @@ msgstr ""
"Első fájl"
#. ID_NEXTFILE
-#: Merge.rc:4994
+#: Merge.rc:5004
msgid ""
"\n"
"Next File (Ctrl+F8)"
@@ -7970,7 +7981,7 @@ msgstr ""
"Következő fájl (Ctrl+F8)"
#. ID_LASTFILE
-#: Merge.rc:4995
+#: Merge.rc:5005
msgid ""
"\n"
"Last File"
@@ -7979,7 +7990,7 @@ msgstr ""
"Utolsó fájl"
#. ID_PREVFILE
-#: Merge.rc:4996
+#: Merge.rc:5006
msgid ""
"\n"
"Previous File (Ctrl+F7)"
@@ -7988,39 +7999,39 @@ msgstr ""
"Előző fájl (Ctrl+F7)"
#. IDS_UNPACK_AUTO
-#: Merge.rc:5003
+#: Merge.rc:5013
msgid "Adapted unpacker applied to both files (one needs extension)."
msgstr "A választott kicsomagoló lesz használva mindkét fájlnál (az egyik fájlnak csak a kiterjesztése lényeges)."
#. IDS_NO_PREDIFFER
-#: Merge.rc:5004
+#: Merge.rc:5014
#, c-format
msgid "No Prediffer (Normal)"
msgstr "Nincs elővizsgálat (normál)"
#. IDS_SUGGESTED_PLUGINS
-#: Merge.rc:5005
+#: Merge.rc:5015
#, c-format
msgid "Suggested Plugins"
msgstr "Javasolt bővítmények"
#. IDS_NOT_SUGGESTED_PLUGINS
-#: Merge.rc:5006
+#: Merge.rc:5016
msgid "All Plugins"
msgstr "Minden bővítmény"
#. IDS_PRIVATEBUILD_FMT
-#: Merge.rc:5012
+#: Merge.rc:5022
#, c-format
msgid "Private Build: %1"
msgstr "Saját verzió: %1"
#. IDS_CHECKFORUPDATES_UPTODATE
-#: Merge.rc:5013
+#: Merge.rc:5023
msgid "Your software is up to date."
msgstr "A program naprakész."
-#: Merge.rc:5015
+#: Merge.rc:5025
#, c-format
msgid ""
"WinMerge update available.\n"
@@ -8030,140 +8041,140 @@ msgstr ""
"Új: %1 (jelenlegi: %2). Letöltöd most?"
#. IDS_ALLRIGHTS_RESERVED
-#: Merge.rc:5016
+#: Merge.rc:5026
msgid " - All rights reserved."
msgstr "- Minden jog fenntartva."
#. IDS_CHECKFORUPDATES_FAILED
-#: Merge.rc:5021
+#: Merge.rc:5031
#, c-format
msgid "Failed to download latest version information"
msgstr "Nem sikerült ellenőrizni a verzióinformációkat"
#. IDS_TITLE_PLUGINS_SETTINGS
-#: Merge.rc:5027
+#: Merge.rc:5037
#, c-format
msgid "Plugin Settings"
msgstr "Bővítmény beállítások"
#. IDS_NO_SCT_SCRIPTS
-#: Merge.rc:5029
+#: Merge.rc:5039
#, c-format
msgid "WSH not found - .sct scripts disabled"
msgstr "A WSH nem található - Az .sct szkriptek le lesznek tiltva"
#. IDS_LOCBAR_GOTOLINE_FMT
-#: Merge.rc:5037
+#: Merge.rc:5047
#, c-format
msgid "G&o to Line %1"
msgstr "&Ugrás a(z) %1. sorra"
#. IDS_GOTO_MOVED_LINE
-#: Merge.rc:5043
+#: Merge.rc:5053
msgid "Go to Moved Line\tCtrl+Shift+G"
msgstr "Ugrás az áthelyezett sorhoz\tCtrl+Shift+G"
#. IDS_AUTOCOMPLETE_DISABLED
-#: Merge.rc:5049
+#: Merge.rc:5059
msgctxt "Options dialog|General|Open dialog Auto completion"
msgid "Disabled"
msgstr "Letiltva"
#. IDS_AUTOCOMPLETE_FILE_SYS
-#: Merge.rc:5050
+#: Merge.rc:5060
#, c-format
msgid "From file system"
msgstr "A fájlrendszerből"
#. IDS_AUTOCOMPLETE_MRU
-#: Merge.rc:5051
+#: Merge.rc:5061
#, c-format
msgid "From Most Recently Used list"
msgstr "A legutóbb használtakból"
#. IDS_COLORSCHEME_PLAIN
-#: Merge.rc:5057
+#: Merge.rc:5067
#, c-format
msgid "No Highlighting"
msgstr "Nincs kiemelés"
#. IDS_COLORSCHEME_BATCH
-#: Merge.rc:5063
+#: Merge.rc:5073
#, c-format
msgid "Batch"
msgstr "Kötegelt"
#. IDS_COLORSCHEME_PO
-#: Merge.rc:5090
+#: Merge.rc:5100
#, c-format
msgid "Portable Object"
msgstr "Hordozható objektum"
#. IDS_COLORSCHEME_RSRC
-#: Merge.rc:5094
+#: Merge.rc:5104
#, c-format
msgid "Resources"
msgstr "Erőforrások"
#. IDS_COLORSCHEME_SH
-#: Merge.rc:5098
+#: Merge.rc:5108
#, c-format
msgid "Shell"
msgstr "Shell"
#. IDS_CLOSE_LEFT_TABS
-#: Merge.rc:5115
+#: Merge.rc:5125
#, c-format
msgid "Close &Left Tabs"
msgstr "Bal tabulátorok bezárása"
#. IDS_CLOSE_RIGHT_TABS
-#: Merge.rc:5116
+#: Merge.rc:5126
#, c-format
msgid "Close R&ight Tabs"
msgstr "Jobb tabulátorok bezárása"
#. IDS_CLOSE_OTHER_TABS
-#: Merge.rc:5117
+#: Merge.rc:5127
#, c-format
msgid "Close &Other Tabs"
msgstr "Többi tabulátor bezárása"
#. IDS_TABBAR_AUTO_MAXWIDTH
-#: Merge.rc:5118
+#: Merge.rc:5128
#, c-format
msgid "Enable &Auto Max Width"
msgstr "Auto oszlopszélesség be"
#. IDS_WEBPAGE_MENU
-#: Merge.rc:5128
+#: Merge.rc:5138
msgid "We&bpage"
msgstr "Weboldal"
#. IDS_VIEW_WRAP_TEXT
-#: Merge.rc:5133
+#: Merge.rc:5143
msgid "W&rap Text"
msgstr "Szöveg tördelése"
#. IDS_NOTINSTALLED
-#: Merge.rc:5138
+#: Merge.rc:5148
msgid "%1 is not installed."
msgstr "Az %1 hexa szerkesztő nincs telepítve."
#. IDS_CREATE_FOLDER
-#: Merge.rc:5143
+#: Merge.rc:5153
#, c-format
msgid "%1 does not exist. Create it?"
msgstr "%1 nem létezik. Létrehozod?"
#. IDS_CREATE_FOLDER_ERROR
-#: Merge.rc:5144
+#: Merge.rc:5154
#, c-format
msgid "Failed to create folder."
msgstr "Nem sikerült a mappa létrehozása."
#. IDC_EXT_EDITOR_PATH
-#: Merge.rc:5149
+#: Merge.rc:5159
#, c-format
msgid ""
"Parameters:\n"
@@ -8175,878 +8186,883 @@ msgstr ""
"$linenum: A kurzor aktuális pozíciója sorának száma"
#. IDS_DIFF_ALGORITHM_DEFAULT
-#: Merge.rc:5154
+#: Merge.rc:5164
msgid "default"
msgstr "alapbeállítás"
#. IDS_DIFF_ALGORITHM_MINIMAL
-#: Merge.rc:5155
+#: Merge.rc:5165
msgid "minimal"
msgstr "minimális"
#. IDS_DIFF_ALGORITHM_PATIENCE
-#: Merge.rc:5156
+#: Merge.rc:5166
msgid "patience"
msgstr "kitartó"
#. IDS_DIFF_ALGORITHM_HISTOGRAM
-#: Merge.rc:5157
+#: Merge.rc:5167
msgid "histogram"
msgstr "hisztogram"
#. IDS_DIFF_ALGORITHM_NONE
-#: Merge.rc:5158
+#: Merge.rc:5168
msgid "none"
msgstr "nincs"
#. IDS_RENDERING_MODE_GDI
-#: Merge.rc:5163
+#: Merge.rc:5173
msgid "GDI"
msgstr "GDI"
#. IDS_RENDERING_MODE_DIRECTWRITE_DEFAULT
-#: Merge.rc:5164
+#: Merge.rc:5174
msgid "DirectWrite Default"
msgstr "DirectWrite Default"
#. IDS_RENDERING_MODE_DIRECTWRITE_ALIASED
-#: Merge.rc:5165
+#: Merge.rc:5175
msgid "DirectWrite Aliased"
msgstr "DirectWrite Aliased"
#. IDS_RENDERING_MODE_DIRECTWRITE_GDI_CLASSIC
-#: Merge.rc:5166
+#: Merge.rc:5176
msgid "DirectWrite GDI Classic"
msgstr "DirectWrite GDI Classic"
#. IDS_RENDERING_MODE_DIRECTWRITE_GDI_NATURAL
-#: Merge.rc:5167
+#: Merge.rc:5177
msgid "DirectWrite GDI Natural"
msgstr "DirectWrite GDI Natural"
#. IDS_RENDERING_MODE_DIRECTWRITE_NATURAL
-#: Merge.rc:5168
+#: Merge.rc:5178
msgid "DirectWrite Natural"
msgstr "DirectWrite Natural"
#. IDS_RENDERING_MODE_DIRECTWRITE_NATURAL_SYMMETRIC
-#: Merge.rc:5169
+#: Merge.rc:5179
msgid "DirectWrite Natural Symmetric"
msgstr "DirectWrite Natural Symmetric"
#. IDS_CLOSE_WINDOWS_WITH_ESC_DISABLED
-#: Merge.rc:5174
+#: Merge.rc:5184
msgctxt "Options dialog|General|Close windows with Esc"
msgid "Disabled"
msgstr "Letiltva"
#. IDS_CLOSE_WINDOWS_WITH_ESC_1
-#: Merge.rc:5175
+#: Merge.rc:5185
msgid "MDI child window or main window"
msgstr "MDI gyermekablak vagy főablak"
#. IDS_CLOSE_WINDOWS_WITH_ESC_2
-#: Merge.rc:5176
+#: Merge.rc:5186
msgid "MDI child window only"
msgstr "Csak MDI gyermekablak"
#. IDS_CLOSE_WINDOWS_WITH_ESC_3
-#: Merge.rc:5177
+#: Merge.rc:5187
msgid "Close main window if only one MDI child window"
msgstr "A főablak bezárása, ha csak 1 MDI gyermekablak van?"
#. IDS_DIFF_GROUP
-#: Merge.rc:5182
+#: Merge.rc:5192
msgctxt "ImgMergeFrame|LocationPane"
msgid "Diff"
msgstr "Különbség"
#. IDS_DIFF_HIGHLIGHT
-#: Merge.rc:5183
+#: Merge.rc:5193
msgctxt "ImgMergeFrame|LocationPane"
msgid "Highlight"
msgstr "Kiemelés"
#. IDS_DIFF_BLINK
-#: Merge.rc:5184
+#: Merge.rc:5194
msgctxt "ImgMergeFrame|LocationPane"
msgid "Blink"
msgstr "Villogás"
#. IDS_DIFF_BLOCKSIZE
-#: Merge.rc:5185
+#: Merge.rc:5195
msgctxt "ImgMergeFrame|LocationPane"
msgid "Block Size"
msgstr "Blokkméret"
#. IDS_DIFF_BLOCKALPHA
-#: Merge.rc:5186
+#: Merge.rc:5196
msgctxt "ImgMergeFrame|LocationPane"
msgid "Block Alpha"
msgstr "Alfa blokk"
#. IDS_DIFF_CDTHRESHOLD
-#: Merge.rc:5187
+#: Merge.rc:5197
msgctxt "ImgMergeFrame|LocationPane"
msgid "CD Threshold"
msgstr "CD küszöbérték"
#. IDS_DIFF_INSERTION_DELETION_DETECTION
-#: Merge.rc:5188
+#: Merge.rc:5198
msgctxt "ImgMergeFrame|LocationPane"
msgid "Ins/Del Detection"
msgstr "Beszúrás/Törlés érzékelés"
#. IDS_OVERLAY_MODE_NONE
-#: Merge.rc:5189 Merge.rc:5194
+#: Merge.rc:5199 Merge.rc:5204
msgctxt "ImgMergeFrame|LocationPane"
msgid "None"
msgstr "Nincs"
#. IDS_DIFF_INSERTION_DELETION_DETECTION_VERTICAL
-#: Merge.rc:5190
+#: Merge.rc:5200
msgctxt "ImgMergeFrame|LocationPane"
msgid "Vertical"
msgstr "Függőleges"
#. IDS_DIFF_INSERTION_DELETION_DETECTION_HORIZONTAL
-#: Merge.rc:5191
+#: Merge.rc:5201
msgctxt "ImgMergeFrame|LocationPane"
msgid "Horizontal"
msgstr "Vízszintes"
#. IDS_OVERLAY_GROUP
-#: Merge.rc:5192
+#: Merge.rc:5202
msgctxt "ImgMergeFrame|LocationPane"
msgid "Overlay"
msgstr "Átfedés"
#. IDS_OVERLAY_ALPHA
-#: Merge.rc:5193
+#: Merge.rc:5203
msgctxt "ImgMergeFrame|LocationPane"
msgid "Alpha"
msgstr "Alfa"
#. IDS_OVERLAY_MODE_XOR
-#: Merge.rc:5195
+#: Merge.rc:5205
msgctxt "ImgMergeFrame|LocationPane"
msgid "XOR"
msgstr "XOR"
#. IDS_OVERLAY_MODE_ALPHA
-#: Merge.rc:5196
+#: Merge.rc:5206
msgctxt "ImgMergeFrame|LocationPane"
msgid "Alpha Blend"
msgstr "Átlátszóság"
#. IDS_OVERLAY_MODE_ALPHA_ANIMATION
-#: Merge.rc:5197
+#: Merge.rc:5207
msgctxt "ImgMergeFrame|LocationPane"
msgid "Alpha Animation"
msgstr "Átlátszóság animáció"
#. IDS_ZOOM
-#: Merge.rc:5198
+#: Merge.rc:5208
msgctxt "ImgMergeFrame|LocationPane"
msgid "Zoom"
msgstr "Nagyítás"
#. IDS_PAGE
-#: Merge.rc:5199
+#: Merge.rc:5209
msgctxt "ImgMergeFrame|LocationPane"
msgid "Page:"
msgstr "Oldal:"
#. IDS_IMGCMP_STATUS_PT_RGBA_FMT
-#: Merge.rc:5200
+#: Merge.rc:5210
#, c-format
msgid "Pt: (%d, %d) RGBA: (%d, %d, %d, %d) "
msgstr "Pont: (%d, %d) RGBA: (%d, %d, %d, %d) "
#. IDS_IMGCMP_STATUS_DIST1_FMT
-#: Merge.rc:5201
+#: Merge.rc:5211
#, c-format
msgid "Dist: %g "
msgstr "Táv: %g "
#. IDS_IMGCMP_STATUS_DIST2_FMT
-#: Merge.rc:5202
+#: Merge.rc:5212
#, c-format
msgid "Dist: %g, %g "
msgstr "Táv: %g, %g "
#. IDS_IMGCMP_STATUS_PAGE_ZOOM_SIZE_BPP_FMT
-#: Merge.rc:5203
+#: Merge.rc:5213
#, c-format
msgid "Page: %d/%d Zoom: %d%% %dx%dpx %dbpp "
msgstr "Oldal: %d/%d Nagyítás: %d%% %dx%dképpont %dbpp "
#. IDS_IMGCMP_STATUS_RC_FMT
-#: Merge.rc:5204
+#: Merge.rc:5214
#, c-format
msgid "Rc: (%d, %d) "
msgstr "Rc: (%d, %d) "
#. IDS_IMGCMP_STATUS_FLIPPED_FMT
-#: Merge.rc:5205
+#: Merge.rc:5215
#, c-format
msgid "Flipped: %s "
msgstr "Megfordítva: %s "
#. IDS_IMGCMP_STATUS_ROTATED_FMT
-#: Merge.rc:5206
+#: Merge.rc:5216
#, c-format
msgid "Rotated: %d "
msgstr "Elforgatva: %d "
#. IDS_IMGCMP_REPORT_ALLPAGES
-#: Merge.rc:5207
+#: Merge.rc:5217
msgid "All pages"
msgstr "Minden oldal"
#. IDS_IGNSUB_STR1
-#: Merge.rc:5212
+#: Merge.rc:5222
msgid ""
msgstr ""
#. IDS_IGNSUB_STR2
-#: Merge.rc:5213
+#: Merge.rc:5223
msgid "No differences found to select"
msgstr "Nem található kijelölhető különbség"
#. IDS_IGNSUB_STR3
-#: Merge.rc:5214
+#: Merge.rc:5224
msgid "No differences found to add as substitution filter"
msgstr "Nem található helyettesítő szűrőként megadható különbség"
#. IDS_IGNSUB_STR4
-#: Merge.rc:5215
+#: Merge.rc:5225
msgid "The pair is already in the Substitution Filters list"
msgstr "Ez a páros már szerepel a helyettesítő szűrők listáján"
#. IDS_IGNSUB_STR5
-#: Merge.rc:5216
+#: Merge.rc:5226
msgid "Add this change to Substitution Filters?"
msgstr "Hozzáadod ezt a változást a helyettesítési szűrőkhöz?"
#. IDS_OCRRESULT_TEXTONLY
-#: Merge.rc:5221
+#: Merge.rc:5231
msgid "Text only"
msgstr "Csak szöveg"
#. IDS_OCRRESULT_POS_LINE
-#: Merge.rc:5222
+#: Merge.rc:5232
msgid "Line-by-line position and text"
msgstr "Pozíció és szöveg sorról sorra"
#. IDS_OCRRESULT_POS_WORD
-#: Merge.rc:5223
+#: Merge.rc:5233
msgid "Word-by-word position and text"
msgstr "Pozíció és szöveg szóról szóra"
#. IDS_USERDATAFOLDER_APPDATA
-#: Merge.rc:5228
+#: Merge.rc:5238
msgid "AppData (Roaming) folder"
msgstr "AppData (Roaming) mappa"
#. IDS_USERDATAFOLDER_INSTALL
-#: Merge.rc:5229
+#: Merge.rc:5239
msgid "Install folder"
msgstr "Telepítési mappa"
#. IDS_USERDATAFOLDER_DOCUMENTS
-#: Merge.rc:5230
+#: Merge.rc:5240
msgid "Documents folder"
msgstr "Dokumentumok mappa"
#. IDS_SINGLEINSTANCE_DISABLED
-#: Merge.rc:5235
+#: Merge.rc:5245
msgctxt "Options dialog|General|Single instance mode"
msgid "Disabled"
msgstr "Letiltva"
#. IDS_SINGLEINSTANCE_STR1
-#: Merge.rc:5236
+#: Merge.rc:5246
msgid "Allow only one instance to run"
msgstr "Csak egy példány futhat egyszerre"
#. IDS_SINGLEINSTANCE_STR2
-#: Merge.rc:5237
+#: Merge.rc:5247
msgid "Allow only one instance; wait for termination"
msgstr "Csak egy példány futhat és megvárja, amíg a példány leáll"
#. IDS_AUTO_RELOAD_MODIFIED_FILES_DISABLED
-#: Merge.rc:5242
+#: Merge.rc:5252
msgctxt "Options dialog|General|Auto-reload modified files"
msgid "Disabled"
msgstr "Letiltva"
#. IDS_AUTO_RELOAD_MODIFIED_FILES_STR1
-#: Merge.rc:5243
+#: Merge.rc:5253
msgid "Only on window activated"
msgstr "Csak ablakon aktivált"
#. IDS_AUTO_RELOAD_MODIFIED_FILES_STR2
-#: Merge.rc:5244
+#: Merge.rc:5254
msgid "Immediately"
msgstr "Azonnal"
#. IDS_PLUGIN_ALL
-#: Merge.rc:5249
+#: Merge.rc:5259
msgid "Al&l"
msgstr "Összes"
#. IDS_PLUGIN_OTHERS
-#: Merge.rc:5250
+#: Merge.rc:5260
msgid "&Others"
msgstr "Egyéb"
-#: Merge.rc:5252
+#: Merge.rc:5262
#, c-format
msgid "Missing plugin name in pipeline: %1"
msgstr "Hiányzó bővítménynév a bővítmény pipeline-ban: %1"
-#: Merge.rc:5254
+#: Merge.rc:5264
#, c-format
msgid "Missing quote in plugin pipeline: %1"
msgstr "Hiányzó idézőjel a bővítmény pipeline-ban: %1"
#. IDS_PLUGIN_NAME_ALREADY_EXISTS
-#: Merge.rc:5255
+#: Merge.rc:5265
#, c-format
msgid "Plugin name '%1' already exists."
msgstr "Ez a bővítménynév már létezik: '%1' "
#. IDS_PLUGIN_TITLE1
-#: Merge.rc:5256
+#: Merge.rc:5266
msgid "Specify plugin arguments"
msgstr "Bővítmény argumentumok megadása"
-#: Merge.rc:5258
+#: Merge.rc:5268
#, c-format
msgid "Plugin not found or invalid: %1"
msgstr "A bővítmény nem található vagy érvénytelen: %1"
#. IDS_PLUGIN_NOT_UNPACK
-#: Merge.rc:5259
+#: Merge.rc:5269
#, c-format
msgid "'%1' is not an unpacker plugin"
msgstr "A(z) '%1' nem kitömörítő bővítmény"
#. IDS_PLUGIN_NOT_PREDIFF
-#: Merge.rc:5260
+#: Merge.rc:5270
#, c-format
msgid "'%1' is not a prediffer plugin"
msgstr "A(z) '%1' nem elővizsgáló bővítmény""
-#: Merge.rc:5262
+#: Merge.rc:5272
#, c-format
msgid "Error prediffing '%1' with '%2'. Prediffing disabled."
msgstr "Hiba történt a(z) „%1” fájl „%2” bővítménnyel történő elővizsgálatakor. Az elővizsgálat többé nem kerül alkalmazásra."
#. IDS_PLUGIN_CIRCULAR_REFERENCE
-#: Merge.rc:5263
+#: Merge.rc:5273
#, c-format
msgid "Circular reference in plugin pipeline: %1"
msgstr "Körkörös hivatkozás a beépülő bővítményben: %1"
#. IDS_PLUGIN_TYPE1
-#: Merge.rc:5264
+#: Merge.rc:5274
msgid "URL Handler"
msgstr "URL Kezelő"
#. IDS_PLUGIN_TYPE2
-#: Merge.rc:5265
+#: Merge.rc:5275
msgid "File Unpacker"
msgstr "Fájl kitömörítő"
#. IDS_PLUGIN_TYPE3
-#: Merge.rc:5266
+#: Merge.rc:5276
msgid "File or Folder Unpacker"
msgstr "Fájl vagy mappa kitömörítő"
#. IDS_PLUGIN_TYPE5
-#: Merge.rc:5268
+#: Merge.rc:5278
msgid "Alias for Unpacker"
msgstr "Kitömörítő alias"
#. IDS_PLUGIN_TYPE6
-#: Merge.rc:5269
+#: Merge.rc:5279
msgid "Alias for Prediffer"
msgstr "Elővizsgáló alias"
#. IDS_PLUGIN_TYPE7
-#: Merge.rc:5270
+#: Merge.rc:5280
msgid "Alias for Editor script"
msgstr "Szerkesztőszkript alias"
#. IDS_PLUGIN_ALIAS_DESC
-#: Merge.rc:5271
+#: Merge.rc:5281
#, c-format
msgid "Alias for plugin pipeline '%1'"
msgstr "'%1' bővítmény pipeline alias"
#. IDS_PLUGIN_NEW_DESC
-#: Merge.rc:5272
+#: Merge.rc:5282
msgid "New plugin description"
msgstr "Új bővítmény leírás"
#. IDS_PLUGIN_TARGETS_ALL
-#: Merge.rc:5273
+#: Merge.rc:5283
msgid "All"
msgstr "Összes"
#. IDS_PLUGIN_TARGETS_1ST
-#: Merge.rc:5274
+#: Merge.rc:5284
msgid "1st"
msgstr "1."
#. IDS_PLUGIN_TARGETS_2ND
-#: Merge.rc:5275
+#: Merge.rc:5285
msgid "2nd"
msgstr "2."
#. IDS_PLUGIN_TARGETS_3RD
-#: Merge.rc:5276
+#: Merge.rc:5286
msgid "3rd"
msgstr "3."
#. IDS_PLUGIN_TARGETS_1ST_2ND
-#: Merge.rc:5277
+#: Merge.rc:5287
msgid "1st and 2nd"
msgstr "1. és 2."
#. IDS_PLUGIN_TARGETS_1ST_3RD
-#: Merge.rc:5278
+#: Merge.rc:5288
msgid "1st and 3rd"
msgstr "1. és 3."
#. IDS_PLUGIN_TARGETS_2ND_3RD
-#: Merge.rc:5279
+#: Merge.rc:5289
msgid "2nd and 3rd"
msgstr "2. és 3."
#. IDS_FILTER_APPLIED
-#: Merge.rc:5284
+#: Merge.rc:5294
msgid "Filter applied"
msgstr "Szűrő alkalmazva"
#. IDS_FILTERMENU_COMPARE
-#: Merge.rc:5289
+#: Merge.rc:5299
#, c-format
msgid "Compare %1"
msgstr "Összehasonlítás %1"
#. IDS_FILTERMENU_FILTER_BY_THIS_COLUMN
-#: Merge.rc:5290
+#: Merge.rc:5300
msgid "&Filter by This Column"
msgstr ""
#. IDS_FILTERMENU_FILTER_BY_THIS_COLUMN2
-#: Merge.rc:5291
+#: Merge.rc:5301
msgid "&Filter by This Column..."
msgstr ""
#. IDS_CLIPBOARDHISTORY_TIME
-#: Merge.rc:5296
+#: Merge.rc:5306
#, c-format
msgid "Clipboard at %s"
msgstr "Vágólap itt: %s"
#. IDS_CLIPBOARDHISTORY_DISABLED
-#: Merge.rc:5297
+#: Merge.rc:5307
msgid "Clipboard history disabled.\r\nEnable: Windows logo key + V, then Turn on."
msgstr "Vágólap előzmények letiltva.\r\nAz engedélyezéshez nyomd meg a Win+V gombokat, majd kattints a bekapcsolás gombra"
-#: Merge.rc:5299
+#: Merge.rc:5309
msgid "This system does not support clipboard history."
msgstr "Ez a rendszer nem támogatja a vágólap előzményeket"
-#: Merge.rc:5301
+#: Merge.rc:5311
msgid "32-bit WinMerge does not support Clipboard Compare"
msgstr "A WinMerge 32 bites verziója nem támogatja a vágólap összehasonlítást"
#. IDS_WEBVIEW2_RUNTIME_NOT_INSTALLED
-#: Merge.rc:5306
+#: Merge.rc:5316
msgid "WebView2 runtime not installed. Download it?"
msgstr "A WebView2 runtime nincs telepítve. Le akarod tölteni?"
#. IDS_JUMPLIST_NEW_TEXT_COMPARE
-#: Merge.rc:5311
+#: Merge.rc:5321
msgid "New Text Compare"
msgstr "Új szöveg összehasonlítás"
#. IDS_JUMPLIST_NEW_TABLE_COMPARE
-#: Merge.rc:5312
+#: Merge.rc:5322
msgid "New Table Compare"
msgstr "Új táblázat összehasonlítás"
#. IDS_JUMPLIST_NEW_BINARY_COMPARE
-#: Merge.rc:5313
+#: Merge.rc:5323
msgid "New Binary Compare"
msgstr "Új bináris összehasonlítás"
#. IDS_JUMPLIST_NEW_IMAGE_COMPARE
-#: Merge.rc:5314
+#: Merge.rc:5324
msgid "New Image Compare"
msgstr "Új kép összehasonlítás"
#. IDS_JUMPLIST_NEW_WEBPAGE_COMPARE
-#: Merge.rc:5315
+#: Merge.rc:5325
msgid "New Webpage Compare"
msgstr "Új weboldal összehasonlítás"
+#. IDS_JUMPLIST_NEW_FOLDER_COMPARE
+#: Merge.rc:5326
+msgid "New Folder Compare"
+msgstr ""
+
#. IDS_JUMPLIST_CLIPBOARD_COMPARE
-#: Merge.rc:5316
+#: Merge.rc:5327
msgid "Clipboard Compare"
msgstr "Vágólap összehasonlítás"
#. IDS_PREVIEWBAR_PRINT
-#: Merge.rc:5321
+#: Merge.rc:5332
msgid "&Print..."
msgstr "&Nyomtatás..."
#. IDS_PREVIEWBAR_PREVPAGE
-#: Merge.rc:5323
+#: Merge.rc:5334
msgid "Pre&v Page"
msgstr "Kö&vetkező oldal"
#. IDS_PREVIEWBAR_TWOPAGE
-#: Merge.rc:5324
+#: Merge.rc:5335
msgid "&Two Page"
msgstr "&Két oldal"
#. IDS_PREVIEWBAR_ONEPAGE
-#: Merge.rc:5325
+#: Merge.rc:5336
msgid "&One Page"
msgstr "&Egy oldal"
#. IDS_PREVIEWBAR_ZOOMIN
-#: Merge.rc:5326
+#: Merge.rc:5337
msgid "Zoom &In"
msgstr "&Nagyítás"
#. IDS_PREVIEWBAR_ZOOMOUT
-#: Merge.rc:5327
+#: Merge.rc:5338
msgid "Zoom &Out"
msgstr "K&icsinyítés"
#. IDS_WEBPAGE_COMPARING
-#: Merge.rc:5333
+#: Merge.rc:5344
msgid "Comparing..."
msgstr "Összehasonlítás..."
#. IDS_WEBPAGE_ZOOM
-#: Merge.rc:5334
+#: Merge.rc:5345
msgid "Zoom:"
msgstr "Nagyítás:"
#. IDS_COPY_GRANULARITY_DIFFHUNK
-#: Merge.rc:5339
+#: Merge.rc:5350
msgid "Diff hunk"
msgstr "Különb.nagyság"
#. IDS_COPY_GRANULARITY_INLINE
-#: Merge.rc:5340
+#: Merge.rc:5351
msgid "Inline diff"
msgstr "Soron belüli kül."
#. IDS_COPY_GRANULARITY_LINE
-#: Merge.rc:5341
+#: Merge.rc:5352
msgid "Line"
msgstr "Sor"
-#: Merge.rc:5342
+#: Merge.rc:5353
msgid "Character"
msgstr "Karakter"
#. ID_MICE_PREVDIFF
-#: Merge.rc:5347
+#: Merge.rc:5358
msgid "\nPrevious Difference (Alt+Up)\n(Right Button+Wheel Up)\n(Alt+Wheel Up)"
msgstr "\nElőző különbség (Alt+fel)\n(Jobb gomb+görgő fel)\n(Alt+görgő fel)"
#. ID_MICE_NEXTDIFF
-#: Merge.rc:5348
+#: Merge.rc:5359
msgid "\nNext Difference (Alt+Down)\n(Right Button+Wheel Down)\n(Alt+Wheel Down)"
msgstr "\nKövetkező különbség (Alt+le)\n(Jobb gomb+görgő le)\n(Alt+görgő le)"
#. ID_MICE_L2R
-#: Merge.rc:5349
+#: Merge.rc:5360
msgid "\nCopy to Right (Alt+Right)\n(Right Button+Wheel Right)\n(Alt+Wheel Right)\n(Alt+Shift+Wheel Down)"
msgstr "\nMásolás jobbra (Alt+jobbra)\n(Jobb gomb+görgő jobbra)\n(Alt+görgő jobbra)\n(Alt+Shift+görgő le)"
#. ID_MICE_R2L
-#: Merge.rc:5350
+#: Merge.rc:5361
msgid "\nCopy to Left (Alt+Left)\n(Right Button+Wheel Left)\n(Alt+Wheel Left)\n(Alt+Shift+Wheel Up)"
msgstr "\nMásolás balra (Alt+balra)\n(Jobb gomb+görgő balra)\n(Alt+görgő balra)\n(Alt+Shift+görgő fel)"
#. ID_MICE_L2RNEXT
-#: Merge.rc:5351
+#: Merge.rc:5362
msgid "\nCopy to Right and Advance (Ctrl+Alt+Right)\n(Ctrl+Alt+Wheel Right)\n(Ctrl+Alt+Shift+Wheel Down)"
msgstr "\nMásolás jobbra és előre (Ctrl+Alt+jobbra)\n(Ctrl+Alt+görgő jobbra)\n(Ctrl+Alt+Shift+görgő le)"
#. ID_MICE_R2LNEXT
-#: Merge.rc:5352
+#: Merge.rc:5363
msgid "\nCopy to Left and Advance (Ctrl+Alt+Left)\n(Ctrl+Alt+Wheel Left)\n(Ctrl+Alt+Shift+Wheel Up)"
msgstr "\nMásolás balra és előre (Ctrl+Alt+balra)\n(Ctrl+Alt+görgő balra)\n(Ctrl+Alt+Shift+görgő fel)"
#. IDS_LOG_COMPARING_2
-#: Merge.rc:5362
+#: Merge.rc:5373
#, c-format
msgid "Comparing %1 with %2"
msgstr "%1 összehasonlítása ezzel: %2"
#. IDS_LOG_COMPARING_3
-#: Merge.rc:5363
+#: Merge.rc:5374
#, c-format
msgid "Comparing %1 with %2 and %3"
msgstr "%1 összehasonlítása ezekkel: %2 és %3"
#. IDS_LOG_COMPARE_COMPLETED
-#: Merge.rc:5364
+#: Merge.rc:5375
msgid "Comparison completed"
msgstr "Összehasonlítás kész"
#. IDS_LOG_COMPARE_ERROR_2
-#: Merge.rc:5365
+#: Merge.rc:5376
#, c-format
msgid "Failed to compare %1 with %2: "
msgstr "Nem sikerült %1 összehasonlítása ezzel: %2"
#. IDS_LOG_COMPARE_ERROR_3
-#: Merge.rc:5366
+#: Merge.rc:5377
#, c-format
msgid "Failed to compare %1 with %2 and %3: "
msgstr "Nem sikerült %1 összehasonlítása ezekkel: %2 és %3"
#. IDS_LOG_FILE_SAVED
-#: Merge.rc:5367
+#: Merge.rc:5378
msgid "File saved"
msgstr "Fájl mentve"
#. IDS_LOG_COPYING_FILES
-#: Merge.rc:5368
+#: Merge.rc:5379
msgid "Copying files..."
msgstr "Fájlok másolása..."
#. IDS_LOG_MOVING_FILES
-#: Merge.rc:5369
+#: Merge.rc:5380
msgid "Moving files..."
msgstr "Fájlok áthelyezése..."
#. IDS_LOG_DELETING_FILES
-#: Merge.rc:5370
+#: Merge.rc:5381
msgid "Deleting files..."
msgstr "Fájlok törlése..."
#. IDS_LOG_RECYCLEBIN
-#: Merge.rc:5371
+#: Merge.rc:5382
msgid "Recycle Bin"
msgstr "Lomtár"
#. IDS_LOG_PERMANENTLY_DELETED
-#: Merge.rc:5372
+#: Merge.rc:5383
msgid "Permanently deleted"
msgstr "Véglegesen törölve"
#. IDS_LOG_FILEOPERATION_COMPLETED
-#: Merge.rc:5373
+#: Merge.rc:5384
msgid "File operation completed successfully"
msgstr "A fájlművelet sikeresen befejeződött"
#. IDS_LOG_FILEOPERATION_CANCELED
-#: Merge.rc:5374
+#: Merge.rc:5385
msgid "File operation canceled"
msgstr "A fájlművelet megszakítva"
#. IDS_FILTER_ERROR_NO_ERROR
-#: Merge.rc:5379
+#: Merge.rc:5390
msgid "No error"
msgstr "Nincs hiba"
#. IDS_FILTER_ERROR_EMPTY_EXPRESSION
-#: Merge.rc:5380
+#: Merge.rc:5391
msgid "Filter expression is empty"
msgstr "A szűrőkifejezés üres"
#. IDS_FILTER_ERROR_UNKNOWN_CHAR
-#: Merge.rc:5381
+#: Merge.rc:5392
msgid "Unknown character in filter expression"
msgstr "Ismeretlen karakter a szűrőkifejezésben"
#. IDS_FILTER_ERROR_UNTERMINATED_STRING
-#: Merge.rc:5382
+#: Merge.rc:5393
msgid "Unterminated string literal"
msgstr "Le nem zárt szting literális"
#. IDS_FILTER_ERROR_SYNTAX_ERROR
-#: Merge.rc:5383
+#: Merge.rc:5394
msgid "Syntax error in filter expression"
msgstr "Szintaxishiba a szűrőkifejezésben"
#. IDS_FILTER_ERROR_PARSE_FAILURE
-#: Merge.rc:5384
+#: Merge.rc:5395
msgid "Failed to parse filter expression"
msgstr "Nem sikerült elemezni a szűrőkifejezést"
#. IDS_FILTER_ERROR_INVALID_LITERAL
-#: Merge.rc:5385
+#: Merge.rc:5396
msgid "Invalid literal value"
msgstr "Érvénytelen literális érték"
#. IDS_FILTER_ERROR_INVALID_REGULAR_EXPRESSION
-#: Merge.rc:5386
+#: Merge.rc:5397
msgid "Invalid regular expression"
msgstr "Érvénytelen reguláris kifejezés"
#. IDS_FILTER_ERROR_UNDEFINED_IDENTIFIER
-#: Merge.rc:5387
+#: Merge.rc:5398
msgid "Undefined identifier"
msgstr "Meghatározatlan azonosító"
#. IDS_FILTER_ERROR_INVALID_ARGUMENT_COUNT
-#: Merge.rc:5388
+#: Merge.rc:5399
msgid "Invalid number of arguments"
msgstr "Érvénytelen számú argumentum"
#. IDS_FILTER_ERROR_FILTER_NAME_NOT_FOUND
-#: Merge.rc:5389
+#: Merge.rc:5400
msgid "Filter name not found"
msgstr "A szűrő neve nem található"
#. IDS_FILTER_ERROR_DIVIDE_BY_ZERO
-#: Merge.rc:5390
+#: Merge.rc:5401
msgid "Division by zero in filter expression"
msgstr "Nullával való osztás a szűrőkifejezésben"
#. IDS_FILTER_ERROR_UNKNOWN_ERROR
-#: Merge.rc:5391
+#: Merge.rc:5402
msgid "Unknown error"
msgstr "Ismeretlen hiba"
#. IDS_FILTER_ERROR_INVALID_PROPERTY_NAME
-#: Merge.rc:5392
+#: Merge.rc:5403
msgid "Invalid property name"
msgstr "Érvénytelen tulajdonságnév"
#. IDS_FILTER_ERROR_INVALID_DIRECTIVE
-#: Merge.rc:5393
+#: Merge.rc:5404
msgid "Invalid directive"
msgstr ""
#. IDS_FILTER_OP_EQUALS
-#: Merge.rc:5398
+#: Merge.rc:5409
msgid "Equals"
msgstr "Egyenlők"
#. IDS_FILTER_OP_NOT_EQUALS
-#: Merge.rc:5399
+#: Merge.rc:5410
msgid "Does not equal"
msgstr "Nem egyenlő"
#. IDS_FILTER_OP_LESS_THAN
-#: Merge.rc:5400
+#: Merge.rc:5411
msgid "Less than"
msgstr "Kevesebb, mint"
#. IDS_FILTER_OP_LESS_EQUAL
-#: Merge.rc:5401
+#: Merge.rc:5412
msgid "Less than or equal to"
msgstr "Kevesebb vagy egyenlő, mint"
#. IDS_FILTER_OP_GREATER_EQUAL
-#: Merge.rc:5402
+#: Merge.rc:5413
msgid "Greater than or equal to"
msgstr "Nagyobb vagy egyenlő, mint"
#. IDS_FILTER_OP_GREATER_THAN
-#: Merge.rc:5403
+#: Merge.rc:5414
msgid "Greater than"
msgstr "Nagyobb , mint"
#. IDS_FILTER_OP_BETWEEN
-#: Merge.rc:5404
+#: Merge.rc:5415
msgid "Between"
msgstr "Ezek között"
#. IDS_FILTER_OP_NOT_BETWEEN
-#: Merge.rc:5405
+#: Merge.rc:5416
msgid "Not Between"
msgstr "Nem ezek között"
#. IDS_FILTER_OP_CONTAINS
-#: Merge.rc:5406
+#: Merge.rc:5417
msgid "Contains"
msgstr "Tartalmazza"
#. IDS_FILTER_OP_NOT_CONTAINS
-#: Merge.rc:5407
+#: Merge.rc:5418
msgid "Not Contains"
msgstr "Nem tartalmazza"
#. IDS_FILTER_OP_RECONTAINS
-#: Merge.rc:5408
+#: Merge.rc:5419
msgid "Contains (regex)"
msgstr "Tartalmazza (regex)"
#. IDS_FILTER_OP_NOT_RECONTAINS
-#: Merge.rc:5409
+#: Merge.rc:5420
msgid "Not Contains (regex)"
msgstr "Nem tartalmazza (regex)"
#. IDS_FILTER_OP_LIKE
-#: Merge.rc:5410
+#: Merge.rc:5421
msgid "Match (wildcard)"
msgstr ""
#. IDS_FILTER_OP_NOT_LIKE
-#: Merge.rc:5411
+#: Merge.rc:5422
msgid "Not match (wildcard)"
msgstr ""
#. IDS_FILTER_OP_MATCHES
-#: Merge.rc:5412
+#: Merge.rc:5423
msgid "Match (regex)"
msgstr ""
#. IDS_FILTER_OP_NOT_MATCHES
-#: Merge.rc:5413
+#: Merge.rc:5424
msgid "Not match (regex)"
msgstr ""
#. IDS_COLORMODE_LIGHT
-#: Merge.rc:5418
+#: Merge.rc:5429
msgid "Light"
msgstr "Világos"
#. IDS_COLORMODE_DARK
-#: Merge.rc:5419
+#: Merge.rc:5430
msgid "Dark"
msgstr "Sötét"
#. IDS_COLORMODE_FOLLOWSYSTEM
-#: Merge.rc:5420
+#: Merge.rc:5431
msgid "Follow system"
msgstr "Rendszert követi"
#. IDS_EXAMPLE
-#: Merge.rc:5425
+#: Merge.rc:5436
#, c-format
msgid "e.g. %1"
msgstr "pl %1"
#. IDS_DETECTED_PREVIOUS_CRASH
-#: Merge.rc:5430
+#: Merge.rc:5441
msgid "WinMerge detected a previous crash. Please report this if possible."
msgstr "A WinMerge egy korábbi összeomlást észlelt. Kérjük, jelentse ezt, ha lehetséges."
#. IDS_REGEX_REPLACE_LIST_TEMPLATE
-#: Merge.rc:5435
+#: Merge.rc:5446
msgid "# Regex replacement list\r\n# Format: regexreplacement\r\n# Backreferences like $1, $2 are supported\r\n\r\n(\\d{4})-(\\d{2})-(\\d{2})\t$1_$2_$3\r\n"
msgstr "# Regex helyettesítési lista\r\n# Formátum: regexcsere\r\n# A $1 és $2-hez hasonló visszahivatkozások támogatottak\r\n\r\n(\\d{4})-(\\d{2})-(\\d{2})\t$1_$2_$3\r\n"
#. IDS_STRING_REPLACE_LIST_TEMPLATE
-#: Merge.rc:5436
+#: Merge.rc:5447
msgid "# Replacement list\r\n# Format: searchreplacement\r\n# Lines starting with # are ignored\r\n\r\nfrom1\tto1\r\nfrom2\tto2\r\n"
msgstr "# Cserelista\r\n# Formátum: searchreplacement\r\n# A # karakterrel kezdődő sorokat figyelmen kívül hagyja\r\n\r\n1-től 1-ig\r\n2-től 2-ig\r\n"
diff --git a/Translations/WinMerge/Italian.po b/Translations/WinMerge/Italian.po
index 4ebd0fa9e5a..998cef9b5ec 100644
--- a/Translations/WinMerge/Italian.po
+++ b/Translations/WinMerge/Italian.po
@@ -24,7 +24,7 @@ msgstr ""
"X-Poedit-SourceCharset: UTF-8\n"
#. LANGUAGE, SUBLANGUAGE
-#: Merge.rc:26 Merge.rc:59 Merge.rc:5453
+#: Merge.rc:26 Merge.rc:59 Merge.rc:5464
msgid "LANG_ENGLISH, SUBLANG_ENGLISH_US"
msgstr "LANG_ITALIAN, SUBLANG_ITALIAN"
@@ -109,7 +109,7 @@ msgid "Copy Selected Diff (Right) to Clipboard\tCtrl+&3"
msgstr "Copia differenze selezionate (a destra) negli appunti\tCtrl+&3"
#. IDR_MERGEDOCTYPE, ID_SELECTLINEDIFF
-#: Merge.rc:110 Merge.rc:673
+#: Merge.rc:110 Merge.rc:680
msgid "Select Line &Difference\tF4"
msgstr "Seleziona &differenze di riga\tF4"
@@ -139,7 +139,7 @@ msgid "Cu&t"
msgstr "&Taglia"
#. IDR_POPUP_DIRVIEW
-#: Merge.rc:118 Merge.rc:943
+#: Merge.rc:118 Merge.rc:951
msgid "&Copy"
msgstr "C&opia"
@@ -149,19 +149,19 @@ msgid "&Paste"
msgstr "I&ncolla"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:121 Merge.rc:875 Merge.rc:882
+#: Merge.rc:121 Merge.rc:882 Merge.rc:889
msgid "&Scripts"
msgstr "&Script"
#. IDS_NO_EDIT_SCRIPTS
-#: Merge.rc:123 Merge.rc:338 Merge.rc:447 Merge.rc:654 Merge.rc:659
-#: Merge.rc:865 Merge.rc:877 Merge.rc:884 Merge.rc:940 Merge.rc:1183
-#: Merge.rc:5028
+#: Merge.rc:123 Merge.rc:340 Merge.rc:451 Merge.rc:661 Merge.rc:666
+#: Merge.rc:872 Merge.rc:884 Merge.rc:891 Merge.rc:948 Merge.rc:1193
+#: Merge.rc:5038
msgid "< Empty >"
msgstr "< Vuoto >"
#. IDR_POPUP_LOCATIONBAR, ID_EDIT_WMGOTO
-#: Merge.rc:126 Merge.rc:691 Merge.rc:1081
+#: Merge.rc:126 Merge.rc:698 Merge.rc:1089
msgid "&Go to...\tCtrl+G"
msgstr "&Vai a...\tCtrl+G"
@@ -181,27 +181,27 @@ msgid "Op&en"
msgstr "&Apri"
#. IDR_POPUP_DIRVIEW, ID_DIR_OPEN_RIGHT
-#: Merge.rc:132 Merge.rc:981 Merge.rc:988 Merge.rc:995
+#: Merge.rc:132 Merge.rc:989 Merge.rc:996 Merge.rc:1003
msgid "With &Registered Application"
msgstr "Con l'applicazione ®istrata"
#. IDR_POPUP_DIRVIEW, ID_DIR_OPEN_RIGHT_WITHEDITOR
-#: Merge.rc:133 Merge.rc:982 Merge.rc:989 Merge.rc:996
+#: Merge.rc:133 Merge.rc:990 Merge.rc:997 Merge.rc:1004
msgid "With &External Editor\tCtrl+Alt+E"
msgstr "Con l'&editor esterno\tCtrl+Alt+E"
#. IDR_POPUP_DIRVIEW, ID_DIR_OPEN_RIGHT_WITH
-#: Merge.rc:134 Merge.rc:983 Merge.rc:990 Merge.rc:997
+#: Merge.rc:134 Merge.rc:991 Merge.rc:998 Merge.rc:1005
msgid "&With..."
msgstr "&Con..."
#. IDR_POPUP_DIRVIEW, ID_DIR_OPEN_RIGHT_PARENT_FOLDER
-#: Merge.rc:135 Merge.rc:984 Merge.rc:991 Merge.rc:998
+#: Merge.rc:135 Merge.rc:992 Merge.rc:999 Merge.rc:1006
msgid "Open &Parent Folder..."
msgstr "Apri la cartella &superiore..."
#. IDR_POPUP_IMG_CTXT, ID_FILE_SHELLMENU
-#: Merge.rc:137 Merge.rc:1239
+#: Merge.rc:137 Merge.rc:1249
msgid "S&hell Menu"
msgstr "Men&u shell"
@@ -236,8 +236,8 @@ msgid "Ins&ertion/Deletion Detection"
msgstr "Rilevamento ins&erzione/rimozione"
#. IDR_MERGEDOCTYPE, ID_TOOLBAR_NONE
-#: Merge.rc:176 Merge.rc:209 Merge.rc:216 Merge.rc:358 Merge.rc:507
-#: Merge.rc:751
+#: Merge.rc:176 Merge.rc:209 Merge.rc:216 Merge.rc:360 Merge.rc:511
+#: Merge.rc:758
msgid "&None"
msgstr "&Nessuna"
@@ -252,12 +252,12 @@ msgid "&Horizontal"
msgstr "&Orizzontale"
#. IDR_POPUP_IMG_CTXT, ID_IMG_CURPANE_PREVPAGE
-#: Merge.rc:181 Merge.rc:189 Merge.rc:1230
+#: Merge.rc:181 Merge.rc:189 Merge.rc:1240
msgid "&Previous Page"
msgstr "Pagina &precedente"
#. IDS_PREVIEWBAR_NEXTPAGE
-#: Merge.rc:182 Merge.rc:190 Merge.rc:1231 Merge.rc:5322
+#: Merge.rc:182 Merge.rc:190 Merge.rc:1241 Merge.rc:5333
msgid "&Next Page"
msgstr "Pagina s&uccessiva"
@@ -267,42 +267,42 @@ msgid "&Active Pane"
msgstr "Pannello &attivo"
#. IDR_POPUP_IMG_CTXT, ID_IMG_CURPANE_ROTATE_RIGHT_90
-#: Merge.rc:185 Merge.rc:1225
+#: Merge.rc:185 Merge.rc:1235
msgid "Rotate &Right 90deg"
msgstr "Ruota a &destra 90°"
#. IDR_POPUP_IMG_CTXT, ID_IMG_CURPANE_ROTATE_LEFT_90
-#: Merge.rc:186 Merge.rc:1226
+#: Merge.rc:186 Merge.rc:1236
msgid "Rotate &Left 90deg"
msgstr "Ruota a s&inistra 90°"
#. IDR_POPUP_IMG_CTXT, ID_IMG_CURPANE_FLIP_VERTICALLY
-#: Merge.rc:187 Merge.rc:1227
+#: Merge.rc:187 Merge.rc:1237
msgid "Flip V&ertically"
msgstr "Rifletti v&erticalmente"
#. IDR_POPUP_IMG_CTXT, ID_IMG_CURPANE_FLIP_HORIZONTALLY
-#: Merge.rc:188 Merge.rc:1228
+#: Merge.rc:188 Merge.rc:1238
msgid "Flip H&orizontally"
msgstr "RIfletti o&rizzontalmente"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:193 Merge.rc:699
+#: Merge.rc:193 Merge.rc:706
msgid "&Zoom"
msgstr "&Zoom"
#. IDR_MERGEDOCTYPE, ID_VIEW_ZOOMIN
-#: Merge.rc:202 Merge.rc:701
+#: Merge.rc:202 Merge.rc:708
msgid "Zoom &In\tCtrl++"
msgstr "&Ingrandisci\tCtrl++"
#. IDR_MERGEDOCTYPE, ID_VIEW_ZOOMOUT
-#: Merge.rc:203 Merge.rc:702
+#: Merge.rc:203 Merge.rc:709
msgid "Zoom &Out\tCtrl+-"
msgstr "Rid&uci\tCtrl+-"
#. IDR_MERGEDOCTYPE, ID_VIEW_ZOOMNORMAL, Zoom to normal
-#: Merge.rc:205 Merge.rc:704
+#: Merge.rc:205 Merge.rc:711
msgid "&Normal\tCtrl+*"
msgstr "&Normale\tCtrl+*"
@@ -327,27 +327,27 @@ msgid "Dragging &Mode"
msgstr "&Modalità trascinamento"
#. IDR_POPUP_IMG_CTXT, ID_IMG_DRAGGINGMODE_MOVE
-#: Merge.rc:217 Merge.rc:955 Merge.rc:1233
+#: Merge.rc:217 Merge.rc:963 Merge.rc:1243
msgid "&Move"
msgstr "&Sposta"
#. IDR_POPUP_IMG_CTXT, ID_IMG_DRAGGINGMODE_ADJUST_OFFSET
-#: Merge.rc:218 Merge.rc:1234
+#: Merge.rc:218 Merge.rc:1244
msgid "&Adjust Offset"
msgstr "Correggi s&costamento"
#. IDR_POPUP_IMG_CTXT, ID_IMG_DRAGGINGMODE_VERTICAL_WIPE
-#: Merge.rc:219 Merge.rc:1235
+#: Merge.rc:219 Merge.rc:1245
msgid "&Vertical Wipe"
msgstr "Trascina &Verticalmente"
#. IDR_POPUP_IMG_CTXT, ID_IMG_DRAGGINGMODE_HORIZONTAL_WIPE
-#: Merge.rc:220 Merge.rc:1236
+#: Merge.rc:220 Merge.rc:1246
msgid "&Horizontal Wipe"
msgstr "Trascina &Orizzontalmente"
#. IDR_POPUP_IMG_CTXT, ID_IMG_DRAGGINGMODE_RECTANGLE_SELECT
-#: Merge.rc:221 Merge.rc:1237
+#: Merge.rc:221 Merge.rc:1247
msgid "Rectangle &Select"
msgstr "Selezione &Rettangolare"
@@ -382,37 +382,37 @@ msgid "Compare Extracted &Text from Images"
msgstr "Confronta il &testo estratto dalle immagini"
#. IDD_OPEN, IDOK
-#: Merge.rc:272 Merge.rc:1980
+#: Merge.rc:272 Merge.rc:1990
msgid "Co&mpare"
msgstr "Co&nfronta"
#. IDR_POPUP_WEBPAGE_COMPARE, ID_WEB_COMPARE_SCREENSHOTS
-#: Merge.rc:274 Merge.rc:1247
+#: Merge.rc:274 Merge.rc:1257
msgid "&Screenshots"
msgstr "&Schermata"
#. IDR_POPUP_WEBPAGE_COMPARE, ID_WEB_COMPARE_FULLSIZE_SCREENSHOTS
-#: Merge.rc:275 Merge.rc:1248
+#: Merge.rc:275 Merge.rc:1258
msgid "&Full Size Screenshots"
msgstr "Schermata a dimensione &intera"
#. IDR_POPUP_WEBPAGE_COMPARE, ID_WEB_COMPARE_HTMLS
-#: Merge.rc:276 Merge.rc:1249
+#: Merge.rc:276 Merge.rc:1259
msgid "&HTMLs"
msgstr "&HTML"
#. IDR_POPUP_WEBPAGE_COMPARE, ID_WEB_COMPARE_TEXTS
-#: Merge.rc:277 Merge.rc:1250
+#: Merge.rc:277 Merge.rc:1260
msgid "&Texts"
msgstr "&Testi"
#. IDR_POPUP_WEBPAGE_COMPARE, ID_WEB_COMPARE_RESOURCETREES
-#: Merge.rc:278 Merge.rc:1251
+#: Merge.rc:278 Merge.rc:1261
msgid "&Resource Trees"
msgstr "Alberi di &risorse"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_SIZE
-#: Merge.rc:280 Merge.rc:1775
+#: Merge.rc:280 Merge.rc:1785
msgid "&Size"
msgstr "&Dimensione"
@@ -427,27 +427,27 @@ msgid "&Event Sync"
msgstr "Sincronizzazione &evento"
#. IDR_POPUP_WEBPAGE_SYNC_EVENTS, ID_WEB_SYNC_ENABLED
-#: Merge.rc:291 Merge.rc:1259
+#: Merge.rc:291 Merge.rc:1269
msgid "&Enabled"
msgstr "&Abilitato"
#. IDR_POPUP_WEBPAGE_SYNC_EVENTS, ID_WEB_SYNC_SCROLL
-#: Merge.rc:293 Merge.rc:1261
+#: Merge.rc:293 Merge.rc:1271
msgid "&Scroll"
msgstr "&Scorri"
#. IDR_POPUP_WEBPAGE_SYNC_EVENTS, ID_WEB_SYNC_CLICK
-#: Merge.rc:294 Merge.rc:1262
+#: Merge.rc:294 Merge.rc:1272
msgid "&Click"
msgstr "&Clic"
#. IDR_POPUP_WEBPAGE_SYNC_EVENTS, ID_WEB_SYNC_INPUT
-#: Merge.rc:295 Merge.rc:1263
+#: Merge.rc:295 Merge.rc:1273
msgid "&Input"
msgstr "&Input"
#. IDR_POPUP_WEBPAGE_SYNC_EVENTS, ID_WEB_SYNC_GOBACKFORWARD
-#: Merge.rc:296 Merge.rc:1264
+#: Merge.rc:296 Merge.rc:1274
msgid "&Go Back/Forward"
msgstr "&Vai Indietro/avanti"
@@ -477,2668 +477,2679 @@ msgid "&All Profiles"
msgstr "&Tutti i profili"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:310 Merge.rc:411 Merge.rc:586
+#: Merge.rc:310 Merge.rc:413 Merge.rc:590
msgid "&File"
msgstr "&File"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:312 Merge.rc:413 Merge.rc:588
+#: Merge.rc:312 Merge.rc:415 Merge.rc:592
msgid "&New"
msgstr "&Nuovo"
#. IDR_POPUP_COMPARE, ID_MERGE_COMPARE_TEXT
-#: Merge.rc:314 Merge.rc:322 Merge.rc:415 Merge.rc:423 Merge.rc:590
-#: Merge.rc:598 Merge.rc:649 Merge.rc:935 Merge.rc:1159 Merge.rc:1171
+#: Merge.rc:314 Merge.rc:323 Merge.rc:417 Merge.rc:426 Merge.rc:594
+#: Merge.rc:603 Merge.rc:655 Merge.rc:942 Merge.rc:1167 Merge.rc:1180
msgid "&Text"
msgstr "&Testo"
#. IDR_POPUP_COMPARE, ID_MERGE_COMPARE_TABLE
-#: Merge.rc:315 Merge.rc:323 Merge.rc:416 Merge.rc:424 Merge.rc:591
-#: Merge.rc:599 Merge.rc:650 Merge.rc:936 Merge.rc:1160 Merge.rc:1172
+#: Merge.rc:315 Merge.rc:324 Merge.rc:418 Merge.rc:427 Merge.rc:595
+#: Merge.rc:604 Merge.rc:656 Merge.rc:943 Merge.rc:1168 Merge.rc:1181
msgid "T&able"
msgstr "T&abella"
#. IDR_POPUP_COMPARE, ID_MERGE_COMPARE_HEX
-#: Merge.rc:316 Merge.rc:324 Merge.rc:417 Merge.rc:425 Merge.rc:592
-#: Merge.rc:600 Merge.rc:651 Merge.rc:937 Merge.rc:1161 Merge.rc:1173
+#: Merge.rc:316 Merge.rc:325 Merge.rc:419 Merge.rc:428 Merge.rc:596
+#: Merge.rc:605 Merge.rc:657 Merge.rc:944 Merge.rc:1169 Merge.rc:1182
msgid "&Binary"
msgstr "&Binario"
#. IDS_IMAGE_MENU
-#: Merge.rc:317 Merge.rc:325 Merge.rc:418 Merge.rc:426 Merge.rc:593
-#: Merge.rc:601 Merge.rc:652 Merge.rc:938 Merge.rc:1162 Merge.rc:1174
-#: Merge.rc:5123
+#: Merge.rc:317 Merge.rc:326 Merge.rc:420 Merge.rc:429 Merge.rc:597
+#: Merge.rc:606 Merge.rc:658 Merge.rc:945 Merge.rc:1170 Merge.rc:1183
+#: Merge.rc:5133
msgid "&Image"
msgstr "&Immagine"
#. IDR_POPUP_COMPARE, ID_MERGE_COMPARE_WEBPAGE
-#: Merge.rc:318 Merge.rc:326 Merge.rc:419 Merge.rc:427 Merge.rc:594
-#: Merge.rc:602 Merge.rc:653 Merge.rc:939 Merge.rc:1163 Merge.rc:1175
+#: Merge.rc:318 Merge.rc:327 Merge.rc:421 Merge.rc:430 Merge.rc:598
+#: Merge.rc:607 Merge.rc:659 Merge.rc:946 Merge.rc:1171 Merge.rc:1184
msgid "&Webpage"
msgstr "Pagina &web"
+#. IDR_POPUP_NEW, ID_FILE_NEW_FOLDER
+#: Merge.rc:319 Merge.rc:328 Merge.rc:422 Merge.rc:431 Merge.rc:599
+#: Merge.rc:608 Merge.rc:1172
+msgid "&Folder"
+msgstr ""
+
#. IDR_MERGEDOCTYPE
-#: Merge.rc:320 Merge.rc:421 Merge.rc:596
+#: Merge.rc:321 Merge.rc:424 Merge.rc:601
msgid "New (&3 panes)"
msgstr "Nuovo (&3 pannelli)"
#. IDR_MERGEDOCTYPE, ID_FILE_OPEN
-#: Merge.rc:328 Merge.rc:429 Merge.rc:604
+#: Merge.rc:330 Merge.rc:433 Merge.rc:610
msgid "&Open...\tCtrl+O"
msgstr "&Apri...\tCtrl+A"
#. IDR_MERGEDOCTYPE, ID_FILE_OPENCONFLICT
-#: Merge.rc:329 Merge.rc:430 Merge.rc:605
+#: Merge.rc:331 Merge.rc:434 Merge.rc:611
msgid "Open Conflic&t File..."
msgstr "Apr&i file conflittuale..."
#. IDR_MERGEDOCTYPE, ID_FILE_OPENCLIPBOARD
-#: Merge.rc:330 Merge.rc:431 Merge.rc:606
+#: Merge.rc:332 Merge.rc:435 Merge.rc:612
msgid "Open C&lipboard"
msgstr "Apri gli &appunti"
#. IDR_POPUP_PROJECT, ID_FILE_OPENPROJECT
-#: Merge.rc:332 Merge.rc:433 Merge.rc:608 Merge.rc:1191
+#: Merge.rc:334 Merge.rc:437 Merge.rc:614 Merge.rc:1201
msgid "Open Pro&ject...\tCtrl+J"
msgstr "Apri pro&getto...\tCtrl+J"
#. IDD_OPEN, ID_SAVE_PROJECT
-#: Merge.rc:333 Merge.rc:434 Merge.rc:609 Merge.rc:1193 Merge.rc:1979
+#: Merge.rc:335 Merge.rc:438 Merge.rc:615 Merge.rc:1203 Merge.rc:1989
msgid "Sa&ve Project..."
msgstr "Sal&va progetto..."
#. IDR_MAINFRAME, ID_FILE_PROJECT_MRU_FIRST
-#: Merge.rc:335
+#: Merge.rc:337
msgid "Recent Projects"
msgstr "Progetti recenti"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:336 Merge.rc:445 Merge.rc:657
+#: Merge.rc:338 Merge.rc:449 Merge.rc:664
msgid "Recent F&iles or Folders"
msgstr "F&ile o cartelle recenti"
#. IDR_MERGEDOCTYPE, ID_APP_EXIT
-#: Merge.rc:341 Merge.rc:450 Merge.rc:662
+#: Merge.rc:343 Merge.rc:454 Merge.rc:669
msgid "E&xit\tCtrl+Q"
msgstr "&Esci\tCtrl+Q"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:343 Merge.rc:452 Merge.rc:664
+#: Merge.rc:345 Merge.rc:456 Merge.rc:671
msgid "&Edit"
msgstr "&Modifica"
#. IDR_MERGEDOCTYPE, ID_EDIT_PASTE
-#: Merge.rc:345 Merge.rc:671
+#: Merge.rc:347 Merge.rc:678
msgid "&Paste\tCtrl+V"
msgstr "I&ncolla\tCtrl+V"
#. IDR_MERGEDOCTYPE, ID_OPTIONS
-#: Merge.rc:347 Merge.rc:456 Merge.rc:693
+#: Merge.rc:349 Merge.rc:460 Merge.rc:700
msgid "&Options...\tCtrl+,"
msgstr "Op&zioni...\tCtrl+,"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:349 Merge.rc:458 Merge.rc:695
+#: Merge.rc:351 Merge.rc:462 Merge.rc:702
msgid "&View"
msgstr "&Visualizza"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:351 Merge.rc:500 Merge.rc:744
+#: Merge.rc:353 Merge.rc:504 Merge.rc:751
msgid "Ta&b Bar"
msgstr "&Barra schede"
#. IDR_MERGEDOCTYPE, ID_VIEW_TAB_BAR
-#: Merge.rc:353 Merge.rc:502 Merge.rc:746
+#: Merge.rc:355 Merge.rc:506 Merge.rc:753
msgid "&View Tab Bar"
msgstr "&Visualizza barra schede"
#. IDR_MERGEDOCTYPE, ID_VIEW_TAB_BAR_ON_TITLE_BAR
-#: Merge.rc:354 Merge.rc:503 Merge.rc:747
+#: Merge.rc:356 Merge.rc:507 Merge.rc:754
msgid "&On Title Bar"
msgstr "Nella barra del tit&olo"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:356 Merge.rc:505 Merge.rc:749
+#: Merge.rc:358 Merge.rc:509 Merge.rc:756
msgid "&Toolbar"
msgstr "Barra s&trumenti"
#. IDR_MERGEDOCTYPE, ID_TOOLBAR_SMALL
-#: Merge.rc:359 Merge.rc:508 Merge.rc:752
+#: Merge.rc:361 Merge.rc:512 Merge.rc:759
msgid "&Small"
msgstr "&Piccola"
#. IDR_MERGEDOCTYPE, ID_TOOLBAR_MEDIUM
-#: Merge.rc:360 Merge.rc:509 Merge.rc:753
+#: Merge.rc:362 Merge.rc:513 Merge.rc:760
msgid "&Medium"
msgstr "&Media"
#. IDR_MERGEDOCTYPE, ID_TOOLBAR_BIG
-#: Merge.rc:361 Merge.rc:510 Merge.rc:754
+#: Merge.rc:363 Merge.rc:514 Merge.rc:761
msgid "&Big"
msgstr "&Grande"
#. IDR_MERGEDOCTYPE, ID_TOOLBAR_HUGE
-#: Merge.rc:362 Merge.rc:511 Merge.rc:755
+#: Merge.rc:364 Merge.rc:515 Merge.rc:762
msgid "&Huge"
msgstr "&Gigantesca"
#. IDS_VIEW_MENU_BAR
-#: Merge.rc:364 Merge.rc:513 Merge.rc:757 Merge.rc:5357
+#: Merge.rc:366 Merge.rc:517 Merge.rc:764 Merge.rc:5368
msgid "Men&u Bar"
msgstr "Barra men&u"
#. IDR_DIRDOCTYPE, ID_VIEW_OUTPUT_BAR
-#: Merge.rc:365 Merge.rc:515
+#: Merge.rc:367 Merge.rc:519
msgid "&Output Pane"
msgstr "Riquadro &output"
#. IDR_MERGEDOCTYPE, ID_VIEW_STATUS_BAR
-#: Merge.rc:366 Merge.rc:516 Merge.rc:758
+#: Merge.rc:368 Merge.rc:520 Merge.rc:765
msgid "&Status Bar"
msgstr "&Barra stato"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:368 Merge.rc:539 Merge.rc:847
+#: Merge.rc:370 Merge.rc:543 Merge.rc:854
msgid "&Tools"
msgstr "&Strumenti"
#. IDR_MERGEDOCTYPE, ID_TOOLS_FILTERS
-#: Merge.rc:370 Merge.rc:542 Merge.rc:849
+#: Merge.rc:372 Merge.rc:546 Merge.rc:856
msgid "&Filters..."
msgstr "&Filtri..."
#. IDR_MERGEDOCTYPE, ID_TOOLS_GENERATEPATCH
-#: Merge.rc:371 Merge.rc:543 Merge.rc:850
+#: Merge.rc:373 Merge.rc:547 Merge.rc:857
msgid "&Generate Patch..."
msgstr "&Crea patch..."
#. IDR_MERGEDOCTYPE
-#: Merge.rc:373 Merge.rc:546 Merge.rc:853
+#: Merge.rc:375 Merge.rc:550 Merge.rc:860
msgid "&Plugins"
msgstr "&Plugin"
#. IDD_PLUGINS_LIST, IDC_PLUGIN_SETTINGS
-#: Merge.rc:375 Merge.rc:548 Merge.rc:855 Merge.rc:2494 Merge.rc:2926
+#: Merge.rc:377 Merge.rc:552 Merge.rc:862 Merge.rc:2504 Merge.rc:2936
msgid "P&lugin Settings..."
msgstr "Im&postazioni plugin..."
#. IDR_MERGEDOCTYPE, ID_PREDIFFER_MANUAL
-#: Merge.rc:377 Merge.rc:550 Merge.rc:857
+#: Merge.rc:379 Merge.rc:554 Merge.rc:864
msgid "Ma&nual Prediffer"
msgstr "Prediffer m&anuale"
#. IDR_MERGEDOCTYPE, ID_PREDIFFER_AUTO
-#: Merge.rc:378 Merge.rc:551 Merge.rc:858
+#: Merge.rc:380 Merge.rc:555 Merge.rc:865
msgid "A&utomatic Prediffer"
msgstr "Prediffer &automatico"
#. IDR_MERGEDOCTYPE, ID_UNPACK_MANUAL
-#: Merge.rc:380 Merge.rc:553 Merge.rc:860
+#: Merge.rc:382 Merge.rc:557 Merge.rc:867
msgid "&Manual Unpacking"
msgstr "Decompressione &manuale"
#. IDR_MERGEDOCTYPE, ID_UNPACK_AUTO
-#: Merge.rc:381 Merge.rc:554 Merge.rc:861
+#: Merge.rc:383 Merge.rc:558 Merge.rc:868
msgid "&Automatic Unpacking"
msgstr "Decompressione &automatica"
#. IDR_MERGEDOCTYPE, ID_RELOAD_PLUGINS
-#: Merge.rc:383 Merge.rc:558 Merge.rc:889
+#: Merge.rc:385 Merge.rc:562 Merge.rc:896
msgid "&Reload Plugins"
msgstr "&Ricarica plugin"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:385 Merge.rc:560 Merge.rc:891
+#: Merge.rc:387 Merge.rc:564 Merge.rc:898
msgid "&Window"
msgstr "Fi&nestra"
#. IDR_MERGEDOCTYPE, ID_FILE_CLOSE
-#: Merge.rc:387 Merge.rc:562 Merge.rc:893
+#: Merge.rc:389 Merge.rc:566 Merge.rc:900
msgid "Cl&ose\tCtrl+W"
msgstr "&Chiudi\tCtrl+W"
#. IDR_MERGEDOCTYPE, ID_WINDOW_CLOSEALL
-#: Merge.rc:388 Merge.rc:563 Merge.rc:894
+#: Merge.rc:390 Merge.rc:567 Merge.rc:901
msgid "Clo&se All"
msgstr "Chiudi &tutto"
#. IDR_MERGEDOCTYPE, ID_NEXT_PANE
-#: Merge.rc:390 Merge.rc:565 Merge.rc:896
+#: Merge.rc:392 Merge.rc:569 Merge.rc:903
msgid "Change &Pane\tF6"
msgstr "Cambia &pannello\tF6"
#. IDR_MERGEDOCTYPE, ID_WINDOW_TILE_HORZ
-#: Merge.rc:392 Merge.rc:567 Merge.rc:900
+#: Merge.rc:394 Merge.rc:571 Merge.rc:907
msgid "Tile &Horizontally"
msgstr "Affianca &orizzontalmente"
#. IDR_MERGEDOCTYPE, ID_WINDOW_TILE_VERT
-#: Merge.rc:393 Merge.rc:568 Merge.rc:901
+#: Merge.rc:395 Merge.rc:572 Merge.rc:908
msgid "Tile &Vertically"
msgstr "Affianca &verticalmente"
#. IDR_MERGEDOCTYPE, ID_WINDOW_CASCADE
-#: Merge.rc:394 Merge.rc:569 Merge.rc:902
+#: Merge.rc:396 Merge.rc:573 Merge.rc:909
msgid "&Cascade"
msgstr "&Sovrapponi"
#. IDS_MESSAGEBOX_HELP
-#: Merge.rc:396 Merge.rc:571 Merge.rc:904 Merge.rc:3200 Merge.rc:4189
+#: Merge.rc:398 Merge.rc:575 Merge.rc:911 Merge.rc:3210 Merge.rc:4199
msgid "&Help"
msgstr "&Aiuto"
#. IDR_MERGEDOCTYPE, ID_HELP_CONTENTS
-#: Merge.rc:398 Merge.rc:573 Merge.rc:906
+#: Merge.rc:400 Merge.rc:577 Merge.rc:913
msgid "&WinMerge Help\tF1"
msgstr "Guida &WinMerge\tF1"
#. IDR_MERGEDOCTYPE, ID_HELP_RELEASENOTES
-#: Merge.rc:400 Merge.rc:575 Merge.rc:908
+#: Merge.rc:402 Merge.rc:579 Merge.rc:915
msgid "R&elease Notes"
msgstr "Note di &rilascio"
#. IDR_MERGEDOCTYPE, ID_HELP_TRANSLATIONS
-#: Merge.rc:401 Merge.rc:576 Merge.rc:909
+#: Merge.rc:403 Merge.rc:580 Merge.rc:916
msgid "&Translations"
msgstr "&Traduzioni"
#. IDR_MERGEDOCTYPE, ID_HELP_GETCONFIG
-#: Merge.rc:402 Merge.rc:577 Merge.rc:910
+#: Merge.rc:404 Merge.rc:581 Merge.rc:917
msgid "C&onfiguration"
msgstr "C&onfigurazione"
#. IDR_MERGEDOCTYPE, ID_HELP_GNULICENSE
-#: Merge.rc:404 Merge.rc:579 Merge.rc:912
+#: Merge.rc:406 Merge.rc:583 Merge.rc:919
msgid "&GNU General Public License"
msgstr "Licenza &GNU General Public"
#. IDR_MERGEDOCTYPE, ID_APP_ABOUT
-#: Merge.rc:405 Merge.rc:580 Merge.rc:913
+#: Merge.rc:407 Merge.rc:584 Merge.rc:920
msgid "&About WinMerge..."
msgstr "Info su &WinMerge..."
#. IDR_MERGEDOCTYPE
-#: Merge.rc:436 Merge.rc:629
+#: Merge.rc:440 Merge.rc:635
msgid "&Read-Only"
msgstr "&Sola lettura"
#. IDR_MERGEDOCTYPE, ID_FILE_LEFT_READONLY
-#: Merge.rc:438 Merge.rc:631
+#: Merge.rc:442 Merge.rc:637
msgid "L&eft Read-Only"
msgstr "Fil&e di sinistra in sola lettura"
#. IDR_MERGEDOCTYPE, ID_FILE_MIDDLE_READONLY
-#: Merge.rc:439 Merge.rc:632
+#: Merge.rc:443 Merge.rc:638
msgid "M&iddle Read-Only"
msgstr "File ¢rale in sola lettura"
#. IDR_MERGEDOCTYPE, ID_FILE_RIGHT_READONLY
-#: Merge.rc:440 Merge.rc:633
+#: Merge.rc:444 Merge.rc:639
msgid "Ri&ght Read-Only"
msgstr "F&ile di destra in sola lettura"
#. IDD_ENCODINGERROR, IDC_FILEENCODING
-#: Merge.rc:443 Merge.rc:646 Merge.rc:1038 Merge.rc:3063
+#: Merge.rc:447 Merge.rc:652 Merge.rc:1046 Merge.rc:3073
msgid "&File Encoding..."
msgstr "Codifica &file..."
#. IDR_POPUP_OUTPUTVIEW, ID_EDIT_SELECT_ALL
-#: Merge.rc:454 Merge.rc:674 Merge.rc:1343
+#: Merge.rc:458 Merge.rc:681 Merge.rc:1353
msgid "Select &All\tCtrl+A"
msgstr "Se&leziona tutto\tCtrl+A"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWIDENTICAL
-#: Merge.rc:460
+#: Merge.rc:464
msgid "Show &Identical Items"
msgstr "Visualizza elementi &identici"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWDIFFERENT
-#: Merge.rc:461
+#: Merge.rc:465
msgid "Show &Different Items"
msgstr "Visualizza elementi di&fferenti"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWUNIQUELEFT
-#: Merge.rc:462
+#: Merge.rc:466
msgid "Show L&eft Unique Items"
msgstr "Visualizza elementi unici di &sinistra"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWUNIQUEMIDDLE
-#: Merge.rc:463
+#: Merge.rc:467
msgid "Show Midd&le Unique Items"
msgstr "Visualizza elementi unici del ¢ro"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWUNIQUERIGHT
-#: Merge.rc:464
+#: Merge.rc:468
msgid "Show Ri&ght Unique Items"
msgstr "Visualizza elementi unici di &destra"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWSKIPPED
-#: Merge.rc:465
+#: Merge.rc:469
msgid "Show S&kipped Items"
msgstr "Visualizza elementi sa<ati"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWBINARIES
-#: Merge.rc:466
+#: Merge.rc:470
msgid "S&how Binary Files"
msgstr "Visualizza file &binari"
#. IDR_DIRDOCTYPE
-#: Merge.rc:467
+#: Merge.rc:471
msgid "&3-way Compare"
msgstr "Confronto a &3"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWDIFFERENTLEFTONLY
-#: Merge.rc:469
+#: Merge.rc:473
msgid "Show &Left Only Different Items"
msgstr "Visualizza solo elementi differenti a &sinistra"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWDIFFERENTMIDDLEONLY
-#: Merge.rc:470
+#: Merge.rc:474
msgid "Show &Middle Only Different Items"
msgstr "Visualizza solo elementi differenti al ¢ro"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWDIFFERENTRIGHTONLY
-#: Merge.rc:471
+#: Merge.rc:475
msgid "Show &Right Only Different Items"
msgstr "Visualizza solo elementi differenti a &destra"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWMISSINGLEFTONLY
-#: Merge.rc:473
+#: Merge.rc:477
msgid "Show L&eft Only Missing Items"
msgstr "Visualizza solo elementi mancanti a &sinistra"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWMISSINGMIDDLEONLY
-#: Merge.rc:474
+#: Merge.rc:478
msgid "Show Mi&ddle Only Missing Items"
msgstr "Visualizza solo elementi mancanti al ¢ro"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWMISSINGRIGHTONLY
-#: Merge.rc:475
+#: Merge.rc:479
msgid "Show Rig&ht Only Missing Items"
msgstr "Visualizza solo elementi mancanti a &destra"
#. IDR_DIRDOCTYPE, ID_VIEW_SHOWHIDDENITEMS
-#: Merge.rc:478
+#: Merge.rc:482
msgid "Show Hidd&en Items"
msgstr "Visualizza elementi nasc&osti"
#. IDR_DIRDOCTYPE, ID_VIEW_TREEMODE
-#: Merge.rc:480
+#: Merge.rc:484
msgid "Tree &Mode"
msgstr "Modalità &struttura"
#. IDR_DIRDOCTYPE
-#: Merge.rc:481
+#: Merge.rc:485
msgid "E&xpand Subfolders"
msgstr "E&spandi sottocartelle"
#. IDR_DIRDOCTYPE, ID_VIEW_EXPAND_ALLSUBDIRS
-#: Merge.rc:483
+#: Merge.rc:487
msgid "&All Subfolders"
msgstr "Tutte le sottoc&artelle"
#. IDR_DIRDOCTYPE, ID_VIEW_EXPAND_DIFFERENT_SUBDIRS
-#: Merge.rc:484
+#: Merge.rc:488
msgid "&Different Subfolders"
msgstr "Sottocartelle &diverse"
#. IDR_DIRDOCTYPE, ID_VIEW_EXPAND_IDENTICAL_SUBDIRS
-#: Merge.rc:485
+#: Merge.rc:489
msgid "&Identical Subfolders"
msgstr "Sottocartelle &identiche"
#. IDR_DIRDOCTYPE, ID_VIEW_COLLAPSE_ALLSUBDIRS
-#: Merge.rc:487
+#: Merge.rc:491
msgid "&Collapse All Subfolders"
msgstr "C&ontrai tutte le sotto cartelle"
#. IDR_DIRDOCTYPE, ID_VIEW_SHOW_EMPTY_FOLDERS
-#: Merge.rc:488
+#: Merge.rc:492
msgid "Show &Empty Folders"
msgstr "Visualizza cart&elle vuote"
#. IDR_MERGEDOCTYPE, ID_VIEW_SELECTFONT
-#: Merge.rc:490 Merge.rc:697
+#: Merge.rc:494 Merge.rc:704
msgid "Select &Font..."
msgstr "Seleziona &font..."
#. IDR_MERGEDOCTYPE, ID_VIEW_USEDEFAULTFONT
-#: Merge.rc:491 Merge.rc:698
+#: Merge.rc:495 Merge.rc:705
msgid "Use Default Font"
msgstr "&Usa carattere predefinito"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:493 Merge.rc:736
+#: Merge.rc:497 Merge.rc:743
msgid "Sw&ap Panes"
msgstr "Sc&ambia pannelli"
#. IDR_MERGEDOCTYPE, ID_SWAPPANES_SWAP12
-#: Merge.rc:495 Merge.rc:738
+#: Merge.rc:499 Merge.rc:745
msgid "Swap &1st | 2nd"
msgstr "Scambia &1° | 2°"
#. IDR_MERGEDOCTYPE, ID_SWAPPANES_SWAP23
-#: Merge.rc:496 Merge.rc:739
+#: Merge.rc:500 Merge.rc:746
msgid "Swap &2nd | 3rd"
msgstr "Scambia &2° | 3°"
#. IDR_MERGEDOCTYPE, ID_SWAPPANES_SWAP13
-#: Merge.rc:497 Merge.rc:740
+#: Merge.rc:501 Merge.rc:747
msgid "Swap 1st | &3rd"
msgstr "Scambia 1° | &3°"
#. IDR_DIRDOCTYPE, ID_VIEW_DISPLAY_FILTER_BAR_MENU
-#: Merge.rc:514
+#: Merge.rc:518
msgid "Displa&y Filter Bar\tCtrl+Shift+L"
msgstr "Visualizza barra filtro\tCtrl+Maiusc+L"
#. IDR_DIRDOCTYPE, ID_VIEW_DIR_STATISTICS
-#: Merge.rc:518
+#: Merge.rc:522
msgid "Com&pare Statistics..."
msgstr "Statistic&he confronto..."
#. IDR_MERGEDOCTYPE, ID_REFRESH
-#: Merge.rc:520 Merge.rc:763
+#: Merge.rc:524 Merge.rc:770
msgid "Refresh\tF5"
msgstr "A&ggiorna\tF5"
#. IDR_POPUP_DIRVIEW, ID_RESCAN
-#: Merge.rc:521 Merge.rc:1030
+#: Merge.rc:525 Merge.rc:1038
msgid "&Refresh Selected\tCtrl+F5"
msgstr "Aggio&rna selezionati\tCtrl+F5"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:523 Merge.rc:765
+#: Merge.rc:527 Merge.rc:772
msgid "&Merge"
msgstr "&Unisci"
#. IDR_DIRDOCTYPE, ID_MERGE_COMPARE
-#: Merge.rc:525
+#: Merge.rc:529
msgid "Co&mpare\tEnter"
msgstr "Co&nfronta\tInvio"
#. IDR_MERGEDOCTYPE, ID_NEXTDIFF
-#: Merge.rc:527 Merge.rc:767
+#: Merge.rc:531 Merge.rc:774
msgid "&Next Difference\tAlt+Down"
msgstr "&Differenza successiva\tAlt+Su"
#. IDR_MERGEDOCTYPE, ID_PREVDIFF
-#: Merge.rc:528 Merge.rc:768
+#: Merge.rc:532 Merge.rc:775
msgid "&Previous Difference\tAlt+Up"
msgstr "Di&fferenza precedente\tAlt+Giù"
#. IDR_MERGEDOCTYPE, ID_FIRSTDIFF
-#: Merge.rc:530 Merge.rc:773
+#: Merge.rc:534 Merge.rc:780
msgid "&First Difference\tAlt+Home"
msgstr "Prima differen&za\tAlt+Home"
#. IDR_MERGEDOCTYPE, ID_CURDIFF
-#: Merge.rc:531 Merge.rc:774
+#: Merge.rc:535 Merge.rc:781
msgid "&Current Difference\tAlt+Enter"
msgstr "Differenza &attuale\tAlt+Invio"
#. IDR_MERGEDOCTYPE, ID_LASTDIFF
-#: Merge.rc:532 Merge.rc:775
+#: Merge.rc:536 Merge.rc:782
msgid "&Last Difference\tAlt+End"
msgstr "&Ultima differenza\tAlt+Fine"
#. IDR_MERGEDOCTYPE, ID_L2R
-#: Merge.rc:534 Merge.rc:830
+#: Merge.rc:538 Merge.rc:837
msgid "Copy to &Right\tAlt+Right"
msgstr "C&opia a destra\tAlt+Destra"
#. IDR_MERGEDOCTYPE, ID_R2L
-#: Merge.rc:535 Merge.rc:831
+#: Merge.rc:539 Merge.rc:838
msgid "Copy to L&eft\tAlt+Left"
msgstr "Co&pia a sinistra\tAlt+Sinistra"
#. IDR_DIRDOCTYPE, ID_MERGE_DELETE
-#: Merge.rc:537
+#: Merge.rc:541
msgid "&Delete\tDel"
msgstr "&Elimina\tCanc"
#. IDR_POPUP_DIRVIEW, ID_TOOLS_CUSTOMIZECOLUMNS
-#: Merge.rc:541 Merge.rc:1042
+#: Merge.rc:545 Merge.rc:1050
msgid "&Customize Columns..."
msgstr "&Personalizza colonne..."
#. IDR_MERGEDOCTYPE, ID_TOOLS_GENERATEREPORT
-#: Merge.rc:544 Merge.rc:851
+#: Merge.rc:548 Merge.rc:858
msgid "Generate &Report..."
msgstr "Genera &rapporto..."
#. IDD_ENCODINGERROR, IDC_PLUGIN
-#: Merge.rc:556 Merge.rc:867 Merge.rc:3064
+#: Merge.rc:560 Merge.rc:874 Merge.rc:3074
msgid "&Edit with Unpacker..."
msgstr "Modifica con decompressore..."
#. IDR_MERGEDOCTYPE, ID_FILE_SAVE
-#: Merge.rc:611
+#: Merge.rc:617
msgid "&Save\tCtrl+S"
msgstr "&Salva\tCtrl+S"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:612
+#: Merge.rc:618
msgid "Sav&e"
msgstr "Sal&va"
#. IDR_POPUP_SAVE, ID_FILE_SAVE_LEFT
-#: Merge.rc:614 Merge.rc:1201
+#: Merge.rc:620 Merge.rc:1211
msgid "Save &Left"
msgstr "Sa&lva sinistro"
#. IDR_POPUP_SAVE, ID_FILE_SAVE_MIDDLE
-#: Merge.rc:615 Merge.rc:1202
+#: Merge.rc:621 Merge.rc:1212
msgid "Save &Middle"
msgstr "Salv&a centrale"
#. IDR_POPUP_SAVE, ID_FILE_SAVE_RIGHT
-#: Merge.rc:616 Merge.rc:1203
+#: Merge.rc:622 Merge.rc:1213
msgid "Save &Right"
msgstr "Salva dest&ro"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:618
+#: Merge.rc:624
msgid "Save &As"
msgstr "Salva &con nome"
#. IDR_POPUP_SAVE, ID_FILE_SAVEAS_LEFT
-#: Merge.rc:620 Merge.rc:1205
+#: Merge.rc:626 Merge.rc:1215
msgid "Save &Left As..."
msgstr "Salva sinistro &con nome..."
#. IDR_POPUP_SAVE, ID_FILE_SAVEAS_MIDDLE
-#: Merge.rc:621 Merge.rc:1206
+#: Merge.rc:627 Merge.rc:1216
msgid "Save &Middle As..."
msgstr "Salva ¢rale con nome..."
#. IDR_POPUP_SAVE, ID_FILE_SAVEAS_RIGHT
-#: Merge.rc:622 Merge.rc:1207
+#: Merge.rc:628 Merge.rc:1217
msgid "Save &Right As..."
msgstr "Salva &destro con nome..."
#. IDR_MERGEDOCTYPE, ID_FILE_PRINT
-#: Merge.rc:625
+#: Merge.rc:631
msgid "&Print...\tCtrl+P"
msgstr "Stam&pa...\tCtrl+P"
#. IDR_MERGEDOCTYPE, ID_FILE_PAGE_SETUP
-#: Merge.rc:626
+#: Merge.rc:632
msgid "Page Set&up..."
msgstr "Impos&ta pagina..."
#. IDR_MERGEDOCTYPE, ID_FILE_PRINT_PREVIEW
-#: Merge.rc:627
+#: Merge.rc:633
msgid "Print Previe&w..."
msgstr "Anteprima &di stampa..."
#. IDR_MERGEDOCTYPE
-#: Merge.rc:636
+#: Merge.rc:642
msgid "&Convert Line Endings to"
msgstr "&Converti caratteri di fine linea in"
#. IDR_MERGEDOCTYPE, ID_FILE_MERGINGMODE
-#: Merge.rc:643
+#: Merge.rc:649
msgid "Mer&ge Mode\tF9"
msgstr "&Modalità unione\tF9"
#. IDR_MERGEDOCTYPE, ID_RESCAN
-#: Merge.rc:645
+#: Merge.rc:651
msgid "Reloa&d\tCtrl+F5"
msgstr "&Ricarica\tCtrl+F5"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:647
+#: Merge.rc:653
msgid "Reco&mpare As"
msgstr "Riconfronta come"
+#. IDR_POPUP_COMPARE, ID_MERGE_COMPARE_FOLDER
+#: Merge.rc:660 Merge.rc:947 Merge.rc:1185
+msgid "A&rchive"
+msgstr ""
+
#. IDR_MERGEDOCTYPE, ID_EDIT_UNDO
-#: Merge.rc:666
+#: Merge.rc:673
msgid "&Undo\tCtrl+Z"
msgstr "&Annulla\tCtrl+Z"
#. IDR_MERGEDOCTYPE, ID_EDIT_REDO
-#: Merge.rc:667
+#: Merge.rc:674
msgid "&Redo\tCtrl+Y"
msgstr "&Ripristina\tCtrl+Y"
#. IDR_MERGEDOCTYPE, ID_EDIT_CUT
-#: Merge.rc:669
+#: Merge.rc:676
msgid "Cu&t\tCtrl+X"
msgstr "&Taglia\tCtrl+X"
#. IDR_POPUP_OUTPUTVIEW, ID_EDIT_COPY
-#: Merge.rc:670 Merge.rc:1342
+#: Merge.rc:677 Merge.rc:1352
msgid "&Copy\tCtrl+C"
msgstr "C&opia\tCtrl+C"
#. IDR_MERGEDOCTYPE, ID_EDIT_FIND
-#: Merge.rc:676
+#: Merge.rc:683
msgid "F&ind...\tCtrl+F"
msgstr "Tro&va...\tCtrl+F"
#. IDR_MERGEDOCTYPE, ID_EDIT_REPLACE
-#: Merge.rc:677
+#: Merge.rc:684
msgid "Repla&ce...\tCtrl+H"
msgstr "Sostit&uisci...\tCtrl+H"
#. IDR_MERGEDOCTYPE, ID_EDIT_MARK
-#: Merge.rc:678
+#: Merge.rc:685
msgid "&Marker...\tCtrl+Shift+M"
msgstr "&Segnaposto...\tCtrl+Maiusc+M"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:680
+#: Merge.rc:687
msgid "Advanced"
msgstr "Avanzat&e"
#. IDR_MERGEDOCTYPE, ID_EDIT_COPY_LINENUMBERS
-#: Merge.rc:682
+#: Merge.rc:689
msgid "&Copy With Line Numbers\tCtrl+Shift+C"
msgstr "&Copia con numeri di linea\tCtrl+Maiusc+C"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:684
+#: Merge.rc:691
msgid "&Bookmarks"
msgstr "Segnali&bri"
#. IDR_MERGEDOCTYPE, ID_EDIT_TOGGLE_BOOKMARK
-#: Merge.rc:686
+#: Merge.rc:693
msgid "&Toggle Bookmark\tCtrl+F2"
msgstr "&Aggiungi/rimuovi segnalibro\tCtrl+F2"
#. IDR_MERGEDOCTYPE, ID_EDIT_GOTO_NEXT_BOOKMARK
-#: Merge.rc:687
+#: Merge.rc:694
msgid "&Next Bookmark\tF2"
msgstr "Segnalibro successi&vo\tF2"
#. IDR_MERGEDOCTYPE, ID_EDIT_GOTO_PREV_BOOKMARK
-#: Merge.rc:688
+#: Merge.rc:695
msgid "&Previous Bookmark\tShift+F2"
msgstr "&Segnalibro precedente\tMaiusc+F2"
#. IDR_MERGEDOCTYPE, ID_EDIT_CLEAR_ALL_BOOKMARKS
-#: Merge.rc:689
+#: Merge.rc:696
msgid "&Clear All Bookmarks"
msgstr "&Elimina tutti i segnalibri"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:706
+#: Merge.rc:713
msgid "Syntax Highlight"
msgstr "Evidenziazione sintassi"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:711
+#: Merge.rc:718
msgid "&Diff Context"
msgstr "Contesto &differenze"
#. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_ALL
-#: Merge.rc:713
+#: Merge.rc:720
msgid "&All Lines"
msgstr "&Tutte le linee"
#. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_0
-#: Merge.rc:715
+#: Merge.rc:722
msgid "&0 Lines"
msgstr "&0 linee"
#. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_1
-#: Merge.rc:716
+#: Merge.rc:723
msgid "&1 Line"
msgstr "&1 linea"
#. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_3
-#: Merge.rc:717
+#: Merge.rc:724
msgid "&3 Lines"
msgstr "&3 linee"
#. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_5
-#: Merge.rc:718
+#: Merge.rc:725
msgid "&5 Lines"
msgstr "&5 linee"
#. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_7
-#: Merge.rc:719
+#: Merge.rc:726
msgid "&7 Lines"
msgstr "&7 linee"
#. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_9
-#: Merge.rc:720
+#: Merge.rc:727
msgid "&9 Lines"
msgstr "&9 linee"
#. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_TOGGLE
-#: Merge.rc:722
+#: Merge.rc:729
msgid "&Toggle All and 0-9 Lines\tCtrl+D"
msgstr "Attiva/disattiva tutto e linee 0-9\tCtrl+D"
#. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_INVERT
-#: Merge.rc:724
+#: Merge.rc:731
msgid "&Invert (Hide Different Lines)"
msgstr "&Inverti (nascondi le righe con differenze)"
#. IDR_MERGEDOCTYPE, ID_VIEW_RESIZE_PANES
-#: Merge.rc:727
+#: Merge.rc:734
msgid "&Lock Panes"
msgstr "B&locca pannelli"
#. IDR_MERGEDOCTYPE, ID_VIEW_WHITESPACE
-#: Merge.rc:728
+#: Merge.rc:735
msgid "&View Whitespace"
msgstr "&Visualizza spazi"
#. IDR_MERGEDOCTYPE, ID_VIEW_EOL
-#: Merge.rc:729
+#: Merge.rc:736
msgid "View E&OL"
msgstr "Visualizza E&OL"
#. IDR_MERGEDOCTYPE, ID_VIEW_LINEDIFFS
-#: Merge.rc:730
+#: Merge.rc:737
msgid "Vie&w Line Differences"
msgstr "Visualizza &differenze linee"
#. IDR_MERGEDOCTYPE, ID_VIEW_LINENUMBERS
-#: Merge.rc:731
+#: Merge.rc:738
msgid "View Line &Numbers"
msgstr "Visualizza &numeri righe"
#. IDR_MERGEDOCTYPE, ID_VIEW_SELMARGIN
-#: Merge.rc:732
+#: Merge.rc:739
msgid "View &Margins"
msgstr "Visualizza &margini"
#. IDR_MERGEDOCTYPE, ID_VIEW_TOPMARGIN
-#: Merge.rc:733
+#: Merge.rc:740
msgid "View To&p Margins"
msgstr "Visualizza margini superiori"
#. IDR_MERGEDOCTYPE, ID_VIEW_WORDWRAP
-#: Merge.rc:734
+#: Merge.rc:741
msgid "W&rap Lines"
msgstr "A capo a&utomatico"
#. IDR_MERGEDOCTYPE, ID_VIEW_SPLITVERTICALLY
-#: Merge.rc:742
+#: Merge.rc:749
msgid "Split V&ertically"
msgstr "Dividi v&erticalmente"
#. IDR_MERGEDOCTYPE, ID_VIEW_DETAIL_BAR
-#: Merge.rc:759
+#: Merge.rc:766
msgid "Diff &Pane"
msgstr "&Pannello differenze"
#. IDR_MERGEDOCTYPE, ID_VIEW_LOCATION_BAR
-#: Merge.rc:760
+#: Merge.rc:767
msgid "Lo&cation Pane"
msgstr "Pannello posi&zione"
#. IDS_OUTPUTBAR_CAPTION
-#: Merge.rc:761 Merge.rc:4902
+#: Merge.rc:768 Merge.rc:4912
msgid "Output Pane"
msgstr "Pannello output"
#. IDR_MERGEDOCTYPE, ID_NEXTCONFLICT
-#: Merge.rc:770
+#: Merge.rc:777
msgid "Ne&xt Conflict\tAlt+Shift+Down"
msgstr "Conflitto &successivo\tAlt+Maiusc+Giù"
#. IDR_MERGEDOCTYPE, ID_PREVCONFLICT
-#: Merge.rc:771
+#: Merge.rc:778
msgid "Pre&vious Conflict\tAlt+Shift+Up"
msgstr "Conflitto &precedente\tAlt+Maiusc+Su"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:777
+#: Merge.rc:784
msgid "A&dvanced"
msgstr "A&vanzate"
#. IDR_MERGEDOCTYPE, ID_NEXTDIFFLM
-#: Merge.rc:779
+#: Merge.rc:786
msgid "Next Difference (Left/Middle)\tAlt+1"
msgstr "Differenza successiva tra sinistra e centro\tAlt+1"
#. IDR_MERGEDOCTYPE, ID_PREVDIFFLM
-#: Merge.rc:780
+#: Merge.rc:787
msgid "Previous Difference (Left/Middle)\tAlt+Shift+1"
msgstr "Differenza precedente tra sinistra e centro\tAlt+Maiusc+1"
#. IDR_MERGEDOCTYPE, ID_NEXTDIFFLR
-#: Merge.rc:782
+#: Merge.rc:789
msgid "Next Difference (Left/Right)\tAlt+2"
msgstr "Differenza successiva tra sinistra e destra\tAlt+2"
#. IDR_MERGEDOCTYPE, ID_PREVDIFFLR
-#: Merge.rc:783
+#: Merge.rc:790
msgid "Previous Difference (Left/Right)\tAlt+Shift+2"
msgstr "Differenza precedente tra sinistra e destra\tAlt+Maiusc+2"
#. IDR_MERGEDOCTYPE, ID_NEXTDIFFMR
-#: Merge.rc:785
+#: Merge.rc:792
msgid "Next Difference (Middle/Right)\tAlt+3"
msgstr "Differenza successiva tra centro e destra\tAlt+3"
#. IDR_MERGEDOCTYPE, ID_PREVDIFFMR
-#: Merge.rc:786
+#: Merge.rc:793
msgid "Previous Difference (Middle/Right)\tAlt+Shift+3"
msgstr "Differenza precedente tra centro e destra\tAlt+Maiusc+3"
#. IDR_MERGEDOCTYPE, ID_NEXTDIFFLO
-#: Merge.rc:788
+#: Merge.rc:795
msgid "Next Left-Only Difference\tAlt+7"
msgstr "Differenza successiva solo a sinistra\tAlt+7"
#. IDR_MERGEDOCTYPE, ID_PREVDIFFLO
-#: Merge.rc:789
+#: Merge.rc:796
msgid "Previous Left-Only Difference\tAlt+Shift+7"
msgstr "Differenza precedente solo a sinistra\tAlt+Maiusc+7"
#. IDR_MERGEDOCTYPE, ID_NEXTDIFFMO
-#: Merge.rc:791
+#: Merge.rc:798
msgid "Next Middle-Only Difference\tAlt+8"
msgstr "Differenza successiva solo al centro\tAlt+8"
#. IDR_MERGEDOCTYPE, ID_PREVDIFFMO
-#: Merge.rc:792
+#: Merge.rc:799
msgid "Previous Middle-Only Difference\tAlt+Shift+8"
msgstr "Differenza precedente solo al centro\tAlt+Maiusc+8"
#. IDR_MERGEDOCTYPE, ID_NEXTDIFFRO
-#: Merge.rc:794
+#: Merge.rc:801
msgid "Next Right-Only Difference\tAlt+9"
msgstr "Differenza successiva solo a destra\tAlt+7"
#. IDR_MERGEDOCTYPE, ID_PREVDIFFRO
-#: Merge.rc:795
+#: Merge.rc:802
msgid "Previous Right-Only Difference\tAlt+Shift+9"
msgstr "Differenza precedente solo a destra\tAlt+Maiusc+9"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:797
+#: Merge.rc:804
msgid "Copy from &Left to"
msgstr "Copia da &sinistra a"
#. IDD_LOAD_SAVE_CODEPAGE, IDC_AFFECTS_MIDDLE_BTN
-#: Merge.rc:799 Merge.rc:810 Merge.rc:815 Merge.rc:826 Merge.rc:970
-#: Merge.rc:2545 Merge.rc:2817
+#: Merge.rc:806 Merge.rc:817 Merge.rc:822 Merge.rc:833 Merge.rc:978
+#: Merge.rc:2555 Merge.rc:2827
msgid "&Middle"
msgstr "&Centro"
#. IDD_LOAD_SAVE_CODEPAGE, IDC_AFFECTS_RIGHT_BTN
-#: Merge.rc:800 Merge.rc:805 Merge.rc:816 Merge.rc:821 Merge.rc:971
-#: Merge.rc:2546 Merge.rc:2819
+#: Merge.rc:807 Merge.rc:812 Merge.rc:823 Merge.rc:828 Merge.rc:979
+#: Merge.rc:2556 Merge.rc:2829
msgid "&Right"
msgstr "&Destra"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:802
+#: Merge.rc:809
msgid "Copy from &Middle to"
msgstr "Copia dal ¢ro a"
#. IDD_LOAD_SAVE_CODEPAGE, IDC_AFFECTS_LEFT_BTN
-#: Merge.rc:804 Merge.rc:809 Merge.rc:820 Merge.rc:825 Merge.rc:969
-#: Merge.rc:2544 Merge.rc:2815
+#: Merge.rc:811 Merge.rc:816 Merge.rc:827 Merge.rc:832 Merge.rc:977
+#: Merge.rc:2554 Merge.rc:2825
msgid "&Left"
msgstr "&Sinistra"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:807
+#: Merge.rc:814
msgid "Copy from &Right to"
msgstr "Copia da &destra a"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:813
+#: Merge.rc:820
msgid "Copy Selected Lines from Le&ft to"
msgstr "Copia le righe selezionate da si&nistra a"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:818
+#: Merge.rc:825
msgid "Copy Selected Lines from Mi&ddle to"
msgstr "Copia le righe selezionate dal cen&tro a"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:823
+#: Merge.rc:830
msgid "Copy Selected Lines from Ri&ght to"
msgstr "Copia le righe selezionate da dest&ra a"
#. IDR_MERGEDOCTYPE, ID_COPY_FROM_LEFT
-#: Merge.rc:833
+#: Merge.rc:840
msgid "Copy from Left\tAlt+Shift+Right"
msgstr "Copia da sinistra\tAlt+Maiusc+Destra"
#. IDR_MERGEDOCTYPE, ID_COPY_FROM_RIGHT
-#: Merge.rc:834
+#: Merge.rc:841
msgid "Copy from Right\tAlt+Shift+Left"
msgstr "Copia da destra\tAlt+Maiusc+Sinistra"
#. IDR_MERGEDOCTYPE, ID_L2RNEXT
-#: Merge.rc:836
+#: Merge.rc:843
msgid "C&opy to Right and Advance\tCtrl+Alt+Right"
msgstr "Copia a des&tra e avanza\tCtrl+Alt+Destra"
#. IDR_MERGEDOCTYPE, ID_R2LNEXT
-#: Merge.rc:837
+#: Merge.rc:844
msgid "Copy &to Left and Advance\tCtrl+Alt+Left"
msgstr "Copia &a sinistra e avanza\tCtrl+Alt+Sinistra"
#. IDR_MERGEDOCTYPE, ID_ALL_RIGHT
-#: Merge.rc:839
+#: Merge.rc:846
msgid "Copy &All to Right"
msgstr "Cop&ia tutto a destra"
#. IDR_MERGEDOCTYPE, ID_ALL_LEFT
-#: Merge.rc:840
+#: Merge.rc:847
msgid "Cop&y All to Left"
msgstr "C&opia tutto a sinistra"
#. IDR_MERGEDOCTYPE, ID_AUTO_MERGE
-#: Merge.rc:842
+#: Merge.rc:849
msgid "A&uto Merge\tCtrl+Alt+M"
msgstr "Unione a&utomatica\tCtrl+Alt+M"
#. IDR_MERGEDOCTYPE, ID_ADD_SYNCPOINT
-#: Merge.rc:844
+#: Merge.rc:851
msgid "Add &Synchronization Point\tAlt+S"
msgstr "Aggiungi punto di &sincronizzazione\tAlt+S"
#. IDR_MERGEDOCTYPE, ID_CLEAR_SYNCPOINTS
-#: Merge.rc:845
+#: Merge.rc:852
msgid "Clear Sync&hronization Points"
msgstr "A&zzera punti sincronizzazione"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:863
+#: Merge.rc:870
msgid "Unpac&ker"
msgstr "De&compressore"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:869
+#: Merge.rc:876
msgid "&Prediffer"
msgstr "&Prediffer"
#. IDR_MERGEDOCTYPE, ID_APPLY_PREDIFFER
-#: Merge.rc:873
+#: Merge.rc:880
msgid "Apply Pre&differ..."
msgstr "Applica Pre&differ..."
#. IDR_MERGEDOCTYPE, ID_TRANSFORM_WITH_SCRIPT
-#: Merge.rc:879
+#: Merge.rc:886
msgid "&Transform with Editor Script..."
msgstr "&Trasforma con script editor..."
#. IDR_MERGEDOCTYPE
-#: Merge.rc:880
+#: Merge.rc:887
msgid "Scripts for &Copying"
msgstr "Script per &copia"
#. IDR_MERGEDOCTYPE, ID_SELECT_EDITOR_SCRIPT_FOR_COPYING
-#: Merge.rc:886
+#: Merge.rc:893
msgid "Select &Editor Script..."
msgstr "Seleziona script &editor..."
#. IDR_MERGEDOCTYPE, ID_WINDOW_SPLIT
-#: Merge.rc:898
+#: Merge.rc:905
msgid "Sp&lit"
msgstr "&Dividi"
#. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE
-#: Merge.rc:921
+#: Merge.rc:928
msgid "Comp&are"
msgstr "&Confronta"
#. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE_WITH_MOVED_RENAMED
-#: Merge.rc:922
+#: Merge.rc:929
msgid "Compar&e with Renamed/Moved Items"
msgstr "Confronta con &elementi rinominati/spostati"
#. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE_IN_NEW_WINDOW
-#: Merge.rc:923
+#: Merge.rc:930
msgid "Compare in New &Window"
msgstr "Confronta in una nuova &finestra"
#. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE_NONHORIZONTALLY
-#: Merge.rc:924 Merge.rc:931
+#: Merge.rc:931 Merge.rc:938
msgid "Compare Non-hor&izontally..."
msgstr "Confronta non orizzontalmente..."
#. IDR_POPUP_DIRVIEW
-#: Merge.rc:925
+#: Merge.rc:932
msgid "Compare Non-hor&izontally"
msgstr "Confronta non or&izzontalmente"
#. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE_LEFT1_LEFT2
-#: Merge.rc:927
+#: Merge.rc:934
msgid "First &Left with Second Left"
msgstr "Primo elemento di &sinistra con secondo elemento di sinistra"
#. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE_RIGHT1_RIGHT2
-#: Merge.rc:928
+#: Merge.rc:935
msgid "First &Right with Second Right"
msgstr "Primo elemento di &destra con secondo elemento di destra"
#. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE_LEFT1_RIGHT2
-#: Merge.rc:929
+#: Merge.rc:936
msgid "&First Left with Second Right"
msgstr "&Primo elemento di &sinistra con secondo elemento di destra"
#. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE_LEFT2_RIGHT1
-#: Merge.rc:930
+#: Merge.rc:937
msgid "&Second Left with First Right"
msgstr "&Secondo elemento di sinistra con primo elemento di destra"
#. IDR_POPUP_DIRVIEW
-#: Merge.rc:933
+#: Merge.rc:940
msgid "Co&mpare As"
msgstr "Con&fronta come"
#. IDS_COPY_LEFT_TO_MIDDLE2
-#: Merge.rc:945 Merge.rc:957 Merge.rc:4502
+#: Merge.rc:953 Merge.rc:965 Merge.rc:4512
#, c-format
msgid "Left to Middle (%1 of %2)"
msgstr "Da sinistra al centro (%1 di %2)"
#. IDS_COPY_LEFT_TO_RIGHT2
-#: Merge.rc:946 Merge.rc:958 Merge.rc:4501
+#: Merge.rc:954 Merge.rc:966 Merge.rc:4511
#, c-format
msgid "Left to Right (%1 of %2)"
msgstr "Da sinistra a destra (%1 di %2)"
#. IDS_MOVE_LEFT_TO2
-#: Merge.rc:947 Merge.rc:959 Merge.rc:1022 Merge.rc:4513 Merge.rc:4542
+#: Merge.rc:955 Merge.rc:967 Merge.rc:1030 Merge.rc:4523 Merge.rc:4552
#, c-format
msgid "Left to... (%1 of %2)"
msgstr "Da sinistra a... (%1 di %2)"
#. IDS_COPY_MIDDLE_TO_LEFT2
-#: Merge.rc:948 Merge.rc:960 Merge.rc:4499
+#: Merge.rc:956 Merge.rc:968 Merge.rc:4509
#, c-format
msgid "Middle to Left (%1 of %2)"
msgstr "Dal centro a sinistra (%1 di %2)"
#. IDS_COPY_MIDDLE_TO_RIGHT2
-#: Merge.rc:949 Merge.rc:961 Merge.rc:4500
+#: Merge.rc:957 Merge.rc:969 Merge.rc:4510
#, c-format
msgid "Middle to Right (%1 of %2)"
msgstr "Dal centro a destra (%1 di %2)"
#. IDS_MOVE_MIDDLE_TO2
-#: Merge.rc:950 Merge.rc:962 Merge.rc:1023 Merge.rc:4514 Merge.rc:4543
+#: Merge.rc:958 Merge.rc:970 Merge.rc:1031 Merge.rc:4524 Merge.rc:4553
#, c-format
msgid "Middle to... (%1 of %2)"
msgstr "Dal centro a... (%1 di %2)"
#. IDS_COPY_RIGHT_TO_MIDDLE2
-#: Merge.rc:951 Merge.rc:963 Merge.rc:4498
+#: Merge.rc:959 Merge.rc:971 Merge.rc:4508
#, c-format
msgid "Right to Middle (%1 of %2)"
msgstr "Da destra al centro (%1 di %2)"
#. IDS_COPY_RIGHT_TO_LEFT2
-#: Merge.rc:952 Merge.rc:964 Merge.rc:4497
+#: Merge.rc:960 Merge.rc:972 Merge.rc:4507
#, c-format
msgid "Right to Left (%1 of %2)"
msgstr "Da destra a sinistra (%1 di %2)"
#. IDS_MOVE_RIGHT_TO2
-#: Merge.rc:953 Merge.rc:965 Merge.rc:1024 Merge.rc:4515 Merge.rc:4544
+#: Merge.rc:961 Merge.rc:973 Merge.rc:1032 Merge.rc:4525 Merge.rc:4554
#, c-format
msgid "Right to... (%1 of %2)"
msgstr "Da destra a... (%1 di %2)"
#. IDD_EDIT_MARKER, IDC_EDIT_MARKER_DELETE
-#: Merge.rc:967 Merge.rc:2036
+#: Merge.rc:975 Merge.rc:2046
msgid "&Delete"
msgstr "&Elimina"
#. IDR_POPUP_DIRVIEW, ID_DIR_DEL_BOTH
-#: Merge.rc:972
+#: Merge.rc:980
msgid "&Both"
msgstr "&Entrambi"
#. IDR_POPUP_DIRVIEW, ID_DIR_DEL_ALL
-#: Merge.rc:973
+#: Merge.rc:981
msgid "&All"
msgstr "&Tutti"
#. IDD_EDIT_REPLACE, IDC_EDIT_SCOPE_SELECTION
-#: Merge.rc:974 Merge.rc:2019
+#: Merge.rc:982 Merge.rc:2029
msgid "&Selection"
msgstr "Sele&zione"
#. IDR_POPUP_DIRVIEW, ID_DIR_ITEM_RENAME
-#: Merge.rc:976
+#: Merge.rc:984
msgid "Re&name"
msgstr "&Rinomina"
#. IDR_POPUP_DIRVIEW, ID_DIR_HIDE_FILENAMES
-#: Merge.rc:977
+#: Merge.rc:985
msgid "&Hide Items"
msgstr "&Nascondi elementi"
#. IDR_POPUP_DIRVIEW
-#: Merge.rc:979
+#: Merge.rc:987
msgid "&Open Left"
msgstr "Apri &file a sinistra"
#. IDR_POPUP_DIRVIEW
-#: Merge.rc:986
+#: Merge.rc:994
msgid "Open Midd&le"
msgstr "Apri file ¢rale"
#. IDR_POPUP_DIRVIEW
-#: Merge.rc:993
+#: Merge.rc:1001
msgid "O&pen Right"
msgstr "A&pri file a destra"
#. IDR_POPUP_DIRVIEW
-#: Merge.rc:1001
+#: Merge.rc:1009
msgid "Cop&y Paths"
msgstr "Cop&ia percorsi"
#. IDS_DEL_LEFT_FMT2
-#: Merge.rc:1003 Merge.rc:1012 Merge.rc:4530
+#: Merge.rc:1011 Merge.rc:1020 Merge.rc:4540
#, c-format
msgid "Left (%1 of %2)"
msgstr "Sinistra (%1 di %2)"
#. IDS_DEL_MIDDLE_FMT2
-#: Merge.rc:1004 Merge.rc:1013 Merge.rc:4531
+#: Merge.rc:1012 Merge.rc:1021 Merge.rc:4541
#, c-format
msgid "Middle (%1 of %2)"
msgstr "Centro (%1 di %2)"
#. IDS_DEL_RIGHT_FMT2
-#: Merge.rc:1005 Merge.rc:1014 Merge.rc:4532
+#: Merge.rc:1013 Merge.rc:1022 Merge.rc:4542
#, c-format
msgid "Right (%1 of %2)"
msgstr "Destra (%1 di %2)"
#. IDS_DEL_BOTH_FMT2
-#: Merge.rc:1006 Merge.rc:1015 Merge.rc:4533
+#: Merge.rc:1014 Merge.rc:1023 Merge.rc:4543
#, c-format
msgid "Both (%1 of %2)"
msgstr "Entrambi (%1 di %2)"
#. IDS_DEL_ALL_FMT2
-#: Merge.rc:1007 Merge.rc:1016 Merge.rc:4538
+#: Merge.rc:1015 Merge.rc:1024 Merge.rc:4548
#, c-format
msgid "All (%1 of %2)"
msgstr "Tutti (%1 di %2)"
#. IDR_POPUP_DIRVIEW, ID_DIR_COPY_FILENAMES
-#: Merge.rc:1009
+#: Merge.rc:1017
msgid "Copy &Filenames"
msgstr "Copia nomi dei fi&le"
#. IDR_POPUP_DIRVIEW
-#: Merge.rc:1010
+#: Merge.rc:1018
msgid "Copy Items to Clip&board"
msgstr "Copia elementi negli A&ppunti"
#. IDR_POPUP_DIRVIEW, ID_DIR_COPY_ALL_DISP_COLUMNS
-#: Merge.rc:1018
+#: Merge.rc:1026
msgid "Copy All Di&splayed Columns"
msgstr "Copia tutte le colonne vi&sualizzate"
#. IDR_POPUP_DIRVIEW
-#: Merge.rc:1020
+#: Merge.rc:1028
msgid "&Zip"
msgstr "Crea &zip"
#. IDS_COPY_BOTH_TO2
-#: Merge.rc:1025 Merge.rc:4516
+#: Merge.rc:1033 Merge.rc:4526
#, c-format
msgid "Both to... (%1 of %2)"
msgstr "Entrambi a... (%1 di %2)"
#. IDS_COPY_ALL_TO2
-#: Merge.rc:1026 Merge.rc:4517
+#: Merge.rc:1034 Merge.rc:4527
#, c-format
msgid "All to... (%1 of %2)"
msgstr "Tutti a... (%1 di %2)"
#. IDS_COPY_DIFFERENCES_TO2
-#: Merge.rc:1027 Merge.rc:4518
+#: Merge.rc:1035 Merge.rc:4528
#, c-format
msgid "Differences to... (%1 of %2)"
msgstr "Differenza a... (%1 di %2)"
#. IDR_POPUP_DIRVIEW, ID_DIR_SHELL_CONTEXT_MENU_LEFT
-#: Merge.rc:1032
+#: Merge.rc:1040
msgid "Left Shell Menu"
msgstr "Menu shell sinistro"
#. IDR_POPUP_DIRVIEW, ID_DIR_SHELL_CONTEXT_MENU_MIDDLE
-#: Merge.rc:1033
+#: Merge.rc:1041
msgid "Middle Shell Menu"
msgstr "Menu shell centrale"
#. IDR_POPUP_DIRVIEW, ID_DIR_SHELL_CONTEXT_MENU_RIGHT
-#: Merge.rc:1034
+#: Merge.rc:1042
msgid "Right Shell Menu"
msgstr "Menu shell destra"
#. IDR_POPUP_DIRVIEW, ID_DIR_SHELL_CONTEXT_MENU_BOTH
-#: Merge.rc:1035
+#: Merge.rc:1043
msgid "Both Shell Menu"
msgstr "Entrambi i menu Shell"
#. IDR_POPUP_DIRVIEW, ID_DIR_SHELL_CONTEXT_MENU_ALL
-#: Merge.rc:1036
+#: Merge.rc:1044
msgid "All Shell Menu"
msgstr "Tutti i menu shell"
#. IDR_POPUP_EDITOR_HEADERBAR, ID_EDITOR_COPY
-#: Merge.rc:1050
+#: Merge.rc:1058
msgid "Copy"
msgstr "Copia"
#. IDR_POPUP_EDITOR_HEADERBAR, ID_EDITOR_COPY_PATH
-#: Merge.rc:1051
+#: Merge.rc:1059
msgid "&Copy Full Path"
msgstr "Copia &percorso completo"
#. IDR_POPUP_EDITOR_HEADERBAR, ID_EDITOR_COPY_FILENAME
-#: Merge.rc:1052
+#: Merge.rc:1060
msgid "Copy &Filename"
msgstr "Copia nome &file"
#. IDR_POPUP_EDITOR_HEADERBAR, ID_EDITOR_EDIT_CAPTION
-#: Merge.rc:1053
+#: Merge.rc:1061
msgid "&Edit Caption\tF2"
msgstr "Mo&difica didascalia\tF2"
#. IDR_POPUP_EDITOR_HEADERBAR, ID_EDITOR_EDIT_PATH
-#: Merge.rc:1055
+#: Merge.rc:1063
msgid "Edit &Path\tCtrl+L"
msgstr "Modifica &percorso\tCtrl+L"
#. IDR_POPUP_EDITOR_HEADERBAR, ID_EDITOR_SELECT_FILE
-#: Merge.rc:1056
+#: Merge.rc:1064
msgid "&Open..."
msgstr "&Apri..."
#. IDR_POPUP_PLUGINS_SETTINGS
-#: Merge.rc:1062
+#: Merge.rc:1070
msgid "Unpacker Settings"
msgstr "Impostazioni decompressione"
#. IDS_USERCHOICE_NONE
-#: Merge.rc:1064 Merge.rc:1070 Merge.rc:1789 Merge.rc:1793 Merge.rc:5030
+#: Merge.rc:1072 Merge.rc:1078 Merge.rc:1799 Merge.rc:1803 Merge.rc:5040
msgid ""
msgstr ""
#. IDS_USERCHOICE_AUTOMATIC
-#: Merge.rc:1065 Merge.rc:1071 Merge.rc:5031
+#: Merge.rc:1073 Merge.rc:1079 Merge.rc:5041
msgid ""
msgstr ""
#. IDD_OPEN, IDC_SELECT_PREDIFFER
-#: Merge.rc:1066 Merge.rc:1072 Merge.rc:1970 Merge.rc:1974
+#: Merge.rc:1074 Merge.rc:1080 Merge.rc:1980 Merge.rc:1984
msgid "&Select..."
msgstr "Sele&ziona..."
#. IDR_POPUP_PLUGINS_SETTINGS
-#: Merge.rc:1068
+#: Merge.rc:1076
msgid "Prediffer Settings"
msgstr "Impostazioni prediffer"
#. IDR_POPUP_LOCATIONBAR, ID_LOCBAR_GOTODIFF
-#: Merge.rc:1080
+#: Merge.rc:1088
msgid "G&o to Diff"
msgstr "Vai alla &differenza"
#. IDR_POPUP_LOCATIONBAR, ID_LOCBAR_MOVECURSOR_ONCLICK
-#: Merge.rc:1083
+#: Merge.rc:1091
msgid "Move Cursor on &Click"
msgstr "Sposta cursore con &clic"
#. IDR_POPUP_LOCATIONBAR, ID_DISPLAY_MOVED_NONE
-#: Merge.rc:1085
+#: Merge.rc:1093
msgid "&No Moved Blocks"
msgstr "&Nessun blocco spostato"
#. IDR_POPUP_LOCATIONBAR, ID_DISPLAY_MOVED_ALL
-#: Merge.rc:1086
+#: Merge.rc:1094
msgid "&All Moved Blocks"
msgstr "&Tutti i blocchi spostati"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS
-#: Merge.rc:1094 Merge.rc:1127
+#: Merge.rc:1102 Merge.rc:1135
msgid "W&hitespaces"
msgstr "Spa&zi"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_WHITESPACE_COMPARE
-#: Merge.rc:1096 Merge.rc:1129
+#: Merge.rc:1104 Merge.rc:1137
msgid "Com&pare"
msgstr "Conf&ronta"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_WHITESPACE_IGNORE
-#: Merge.rc:1097 Merge.rc:1130
+#: Merge.rc:1105 Merge.rc:1138
msgid "I&gnore Changes"
msgstr "Ignora ca&mbiamenti"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_WHITESPACE_IGNOREALL
-#: Merge.rc:1098 Merge.rc:1131
+#: Merge.rc:1106 Merge.rc:1139
msgid "Ig&nore All"
msgstr "Ig&nora tutto"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_IGNORE_BLANKLINES
-#: Merge.rc:1100 Merge.rc:1133
+#: Merge.rc:1108 Merge.rc:1141
msgid "Ignore Blan&k Lines"
msgstr "Ign&ora le linee vuote"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_IGNORE_CASE
-#: Merge.rc:1101 Merge.rc:1134
+#: Merge.rc:1109 Merge.rc:1142
msgid "Ignore &Case"
msgstr "Ig&nora differenze maiuscole/minuscole"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_IGNORE_EOL
-#: Merge.rc:1102 Merge.rc:1135
+#: Merge.rc:1110 Merge.rc:1143
msgid "Igno&re EOL Differences (Windows/Unix/Mac)"
msgstr "I&gnora differenze nei fine riga (Windows/Unix/Mac)"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_IGNORE_CODEPAGE
-#: Merge.rc:1103 Merge.rc:1136
+#: Merge.rc:1111 Merge.rc:1144
msgid "Ignore Codepage &Differences"
msgstr "Ignora differenze di codice di &pagina"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_IGNORE_NUMBERS
-#: Merge.rc:1104 Merge.rc:1137
+#: Merge.rc:1112 Merge.rc:1145
msgid "Ignore Num&bers"
msgstr "Ignora i nu&meri"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_IGNORE_COMMENTS
-#: Merge.rc:1105 Merge.rc:1138
+#: Merge.rc:1113 Merge.rc:1146
msgid "Ignore C&omment Differences"
msgstr "Ignora le differenze nei c&ommenti"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_IGNORE_MISSING_TRAILING_EOL
-#: Merge.rc:1106 Merge.rc:1139
+#: Merge.rc:1114 Merge.rc:1147
msgid "Ignore &Missing Trailing EOL"
msgstr "Ignora EOL finale &mancante"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_IGNORE_LINE_BREAKS
-#: Merge.rc:1107 Merge.rc:1140
+#: Merge.rc:1115 Merge.rc:1148
msgid "Ignore Line &Breaks (Treat as Spaces)"
msgstr "Ignora interru&zioni linea (trattale come spazi)"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_RECURS_CHECK
-#: Merge.rc:1109 Merge.rc:2963
+#: Merge.rc:1117 Merge.rc:2973
msgid "&Include Subfolders"
msgstr "&Includi sotto cartelle"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS
-#: Merge.rc:1110 Merge.rc:1142
+#: Merge.rc:1118 Merge.rc:1150
msgid "&Compare Method"
msgstr "&Modalità confronto"
#. IDS_COMPMETHOD_FULL_CONTENTS
-#: Merge.rc:1112 Merge.rc:1144 Merge.rc:1328 Merge.rc:4282
+#: Merge.rc:1120 Merge.rc:1152 Merge.rc:1338 Merge.rc:4292
msgid "Full Contents"
msgstr "Contenuti completi"
#. IDS_COMPMETHOD_QUICK_CONTENTS
-#: Merge.rc:1113 Merge.rc:1145 Merge.rc:1329 Merge.rc:4283
+#: Merge.rc:1121 Merge.rc:1153 Merge.rc:1339 Merge.rc:4293
msgid "Quick Contents"
msgstr "Contenuti rapidi"
#. IDS_COMPMETHOD_BINARY_CONTENTS
-#: Merge.rc:1114 Merge.rc:1146 Merge.rc:1330 Merge.rc:4284
+#: Merge.rc:1122 Merge.rc:1154 Merge.rc:1340 Merge.rc:4294
msgid "Binary Contents"
msgstr "Contenuti binari"
#. IDS_COMPMETHOD_MODDATE
-#: Merge.rc:1115 Merge.rc:1147 Merge.rc:1331 Merge.rc:4285
+#: Merge.rc:1123 Merge.rc:1155 Merge.rc:1341 Merge.rc:4295
msgid "Modified Date"
msgstr "Data ultima modifica"
#. IDS_COMPMETHOD_DATESIZE
-#: Merge.rc:1116 Merge.rc:1148 Merge.rc:1332 Merge.rc:4286
+#: Merge.rc:1124 Merge.rc:1156 Merge.rc:1342 Merge.rc:4296
msgid "Modified Date and Size"
msgstr "Data ultima modifica e dimensioni"
#. IDS_COMPMETHOD_SIZE
-#: Merge.rc:1117 Merge.rc:1149 Merge.rc:1333 Merge.rc:4287
+#: Merge.rc:1125 Merge.rc:1157 Merge.rc:1343 Merge.rc:4297
msgid "Size"
msgstr "Dimensioni"
#. IDS_COMPMETHOD_EXISTENCE
-#: Merge.rc:1118 Merge.rc:1150 Merge.rc:1334 Merge.rc:4288
+#: Merge.rc:1126 Merge.rc:1158 Merge.rc:1344 Merge.rc:4298
msgid "Existence"
msgstr "Esistenza"
#. IDR_POPUP_PROJECT, ID_LOAD_PROJECT
-#: Merge.rc:1192
+#: Merge.rc:1202
msgid "&Load Project..."
msgstr "&Carica progetto..."
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARGALL
-#: Merge.rc:1272 Merge.rc:1301
+#: Merge.rc:1282 Merge.rc:1311
msgid "${*} - All Arguments"
msgstr "${*} - Tutti gli argomenti"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARG1
-#: Merge.rc:1273 Merge.rc:1302
+#: Merge.rc:1283 Merge.rc:1312
msgid "${1} - First Argument"
msgstr "${1} - Il primo argomento"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARG2
-#: Merge.rc:1274 Merge.rc:1303
+#: Merge.rc:1284 Merge.rc:1313
msgid "${2} - Second Argument"
msgstr "${2} - Il secondo argomento"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARG3
-#: Merge.rc:1275 Merge.rc:1304
+#: Merge.rc:1285 Merge.rc:1314
msgid "${3} - Third Argument"
msgstr "${3} - Il terzo argomento"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARG4
-#: Merge.rc:1276 Merge.rc:1305
+#: Merge.rc:1286 Merge.rc:1315
msgid "${4} - Fourth Argument"
msgstr "${4} - Il quarto argomento"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARG5
-#: Merge.rc:1277 Merge.rc:1306
+#: Merge.rc:1287 Merge.rc:1316
msgid "${5} - Fifth Argument"
msgstr "${5} - Il quinto argomento"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARG6
-#: Merge.rc:1278 Merge.rc:1307
+#: Merge.rc:1288 Merge.rc:1317
msgid "${6} - Sixth Argument"
msgstr "${6} - Il sesto argomento"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARG7
-#: Merge.rc:1279 Merge.rc:1308
+#: Merge.rc:1289 Merge.rc:1318
msgid "${7} - Seventh Argument"
msgstr "${7} - Il settimo argomento"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARG8
-#: Merge.rc:1280 Merge.rc:1309
+#: Merge.rc:1290 Merge.rc:1319
msgid "${8} - Eighth Argument"
msgstr "${8} - L'ottavo argomento"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARG9
-#: Merge.rc:1281 Merge.rc:1310
+#: Merge.rc:1291 Merge.rc:1320
msgid "${9} - Ninth Argument"
msgstr "${9} - Il nono argomento"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_SRC_FILE
-#: Merge.rc:1289
+#: Merge.rc:1299
msgid "${SRC_FILE} - Source File"
msgstr "${SRC_FILE} - File sorgente"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_SRC_FOLDER
-#: Merge.rc:1290
+#: Merge.rc:1300
msgid "${SRC_FOLDER} - Source Folder"
msgstr "${SRC_FOLDER} - Cartella sorgente"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_SRC_URL
-#: Merge.rc:1291
+#: Merge.rc:1301
msgid "${SRC_URL} - Source URL"
msgstr "${SRC_URL} - URL sorgente"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_SRC_URL_PROTOCOL
-#: Merge.rc:1292
+#: Merge.rc:1302
msgid "${SRC_URL_PROTOCOL} - Source URL Protocol"
msgstr "${SRC_URL_PROTOCOL} - Protocollo URL sorgente"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_SRC_URL_SUFFIX
-#: Merge.rc:1293
+#: Merge.rc:1303
msgid "${SRC_URL_SUFFIX} - Source URL Suffix"
msgstr "${SRC_URL_SUFFIX} - Suffisso URL sorgente"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_DST_FILE
-#: Merge.rc:1294
+#: Merge.rc:1304
msgid "${DST_FILE} - Destination File"
msgstr "${DST_FILE} - File destinazione"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_DST_FOLDER
-#: Merge.rc:1295
+#: Merge.rc:1305
msgid "${DST_FOLDER} - Destination Folder"
msgstr "${DST_FOLDER} - Cartella destinazione"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_DST_URL
-#: Merge.rc:1296
+#: Merge.rc:1306
msgid "${DST_URL} - Destination URL"
msgstr "${DST_URL} - URL destinazione"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_DST_URL_PROTOCOL
-#: Merge.rc:1297
+#: Merge.rc:1307
msgid "${DST_URL_PROTOCOL} - Destination URL Protocol"
msgstr "${DST_URL_PROTOCOL} - Protocollo URL destinazione"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_DST_URL_SUFFIX
-#: Merge.rc:1298
+#: Merge.rc:1308
msgid "${DST_URL_SUFFIX} - Destination URL Suffix"
msgstr "${DST_URL_SUFFIX} - Suffisso URL destinazione"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_WINMERGE_HOME
-#: Merge.rc:1299
+#: Merge.rc:1309
msgid "${WINMERGE_HOME} - WinMerge Home Directory"
msgstr "${WINMERGE_HOME} - Cartella home WinMerge"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_SCRIPT_FILE
-#: Merge.rc:1300
+#: Merge.rc:1310
msgid "${SCRIPT_FILE} - Script File"
msgstr "${SCRIPT_FILE} - File script"
#. IDR_POPUP_PLUGIN_ADD_MENU, ID_PLUGIN_ADD_UNPACKER
-#: Merge.rc:1318
+#: Merge.rc:1328
msgid "Add &Unpacker Plugin..."
msgstr "Aggiungi plugin &decompressione..."
#. IDR_POPUP_PLUGIN_ADD_MENU, ID_PLUGIN_ADD_PREDIFFER
-#: Merge.rc:1319
+#: Merge.rc:1329
msgid "Add &Prediffer Plugin..."
msgstr "Aggiungi plugin &pre-differenza..."
#. IDR_POPUP_PLUGIN_ADD_MENU, ID_PLUGIN_DUPLICATE
-#: Merge.rc:1320
+#: Merge.rc:1330
msgid "&Duplicate Plugin..."
msgstr "Plugin &duplicato..."
#. IDR_POPUP_OUTPUTVIEW, ID_EDIT_CLEAR_ALL
-#: Merge.rc:1344
+#: Merge.rc:1354
msgid "Clear &All"
msgstr "&Azzera tutto"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_MASK_CLEAR
-#: Merge.rc:1352
+#: Merge.rc:1362
msgid "&Clear All"
msgstr "A&zzera tutto"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_MASK_REMOVE_LAST
-#: Merge.rc:1353
+#: Merge.rc:1363
msgid "Remove Last Filter &Group"
msgstr "Rimuovi l'ultimo filtro ed il &gruppo"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_MASK_ALL
-#: Merge.rc:1354
+#: Merge.rc:1364
msgid "R&eset to Default (*.*)"
msgstr "Ripristina a pr&edefinito (*.*)"
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1355
+#: Merge.rc:1365
msgid "Add E&xclude File"
msgstr "Aggiungi file da e&scludere"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_SYS
-#: Merge.rc:1357
+#: Merge.rc:1367
msgid "&System Files"
msgstr "File di &sistema"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_BACKUP
-#: Merge.rc:1358
+#: Merge.rc:1368
msgid "&Editor Backup Files"
msgstr "File backup &editor"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_BIN
-#: Merge.rc:1359
+#: Merge.rc:1369
msgid "&Compiled Binary Files"
msgstr "File binari &compilati"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_LOG
-#: Merge.rc:1360
+#: Merge.rc:1370
msgid "&Log Files"
msgstr "File registro e&venti"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_TEMP
-#: Merge.rc:1361
+#: Merge.rc:1371
msgid "&Temporary or Cache Files"
msgstr "File &temporanei o cache"
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1363
+#: Merge.rc:1373
msgid "Add Excl&ude Folder"
msgstr "Aggiungi cartella da escl&udere"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FOLDER_VCS
-#: Merge.rc:1365
+#: Merge.rc:1375
msgid "&Version Control"
msgstr "Controllo &versione"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FOLDER_BUILD
-#: Merge.rc:1366
+#: Merge.rc:1376
msgid "&Build Artifacts"
msgstr "Compila ar&tefatti"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FOLDER_IDE
-#: Merge.rc:1367
+#: Merge.rc:1377
msgid "&IDE"
msgstr "&IDE"
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1370
+#: Merge.rc:1380
msgid "Add &File Condition"
msgstr "Aggiungi condizione &file"
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1372 Merge.rc:1551
+#: Merge.rc:1382 Merge.rc:1561
msgid "File &Size"
msgstr "Dimen&sione file"
#. IDR_POPUP_FILTERMENU_DIFF_SIZE, ID_FILTERMENU_DIFF_SIZE_LT_1KB
-#: Merge.rc:1374 Merge.rc:1527 Merge.rc:1564 Merge.rc:1629 Merge.rc:1707
+#: Merge.rc:1384 Merge.rc:1537 Merge.rc:1574 Merge.rc:1639 Merge.rc:1717
msgid "Less than 1KB"
msgstr "Inferiore a 1KB"
#. IDR_POPUP_FILTERMENU_DIFF_SIZE, ID_FILTERMENU_DIFF_SIZE_GE_1KB
-#: Merge.rc:1375 Merge.rc:1528 Merge.rc:1565 Merge.rc:1630 Merge.rc:1708
+#: Merge.rc:1385 Merge.rc:1538 Merge.rc:1575 Merge.rc:1640 Merge.rc:1718
msgid "1KB or more"
msgstr "1KB o maggiore"
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_LT_10KB
-#: Merge.rc:1376 Merge.rc:1529 Merge.rc:1631
+#: Merge.rc:1386 Merge.rc:1539 Merge.rc:1641
msgid "Less than 10KB"
msgstr "Inferiore a 10KB"
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_GE_10KB
-#: Merge.rc:1377 Merge.rc:1530 Merge.rc:1632
+#: Merge.rc:1387 Merge.rc:1540 Merge.rc:1642
msgid "10KB or more"
msgstr "10KB o superiore"
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_LT_100KB
-#: Merge.rc:1378 Merge.rc:1531 Merge.rc:1633
+#: Merge.rc:1388 Merge.rc:1541 Merge.rc:1643
msgid "Less than 100KB"
msgstr "Inferiore a 100KB"
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_GE_100KB
-#: Merge.rc:1379 Merge.rc:1532 Merge.rc:1634
+#: Merge.rc:1389 Merge.rc:1542 Merge.rc:1644
msgid "100KB or more"
msgstr "100KB o superiore"
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_LT_1MB
-#: Merge.rc:1380 Merge.rc:1533 Merge.rc:1635
+#: Merge.rc:1390 Merge.rc:1543 Merge.rc:1645
msgid "Less than 1MB"
msgstr "Inferiore a 1MB"
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_GE_1MB
-#: Merge.rc:1381 Merge.rc:1534 Merge.rc:1636
+#: Merge.rc:1391 Merge.rc:1544 Merge.rc:1646
msgid "1MB or more"
msgstr "1MB o superiore"
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_LT_10MB
-#: Merge.rc:1382 Merge.rc:1535 Merge.rc:1637
+#: Merge.rc:1392 Merge.rc:1545 Merge.rc:1647
msgid "Less than 10MB"
msgstr "Inferiore a 10MB"
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_GE_10MB
-#: Merge.rc:1383 Merge.rc:1536 Merge.rc:1638
+#: Merge.rc:1393 Merge.rc:1546 Merge.rc:1648
msgid "10MB or more"
msgstr "10MB o superiore"
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_LT_100MB
-#: Merge.rc:1384 Merge.rc:1537 Merge.rc:1639
+#: Merge.rc:1394 Merge.rc:1547 Merge.rc:1649
msgid "Less than 100MB"
msgstr "Inferiore a 100MB"
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_GE_100MB
-#: Merge.rc:1385 Merge.rc:1538 Merge.rc:1640
+#: Merge.rc:1395 Merge.rc:1548 Merge.rc:1650
msgid "100MB or more"
msgstr "100MB o superiore"
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_LT_1GB
-#: Merge.rc:1386 Merge.rc:1539 Merge.rc:1641
+#: Merge.rc:1396 Merge.rc:1549 Merge.rc:1651
msgid "Less than 1GB"
msgstr "Inferiore a 1GB"
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_GE_1GB
-#: Merge.rc:1387 Merge.rc:1642
+#: Merge.rc:1397 Merge.rc:1652
msgid "1GB or more"
msgstr "1GB o superiore"
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_RANGE
-#: Merge.rc:1388 Merge.rc:1465 Merge.rc:1517 Merge.rc:1523 Merge.rc:1540
-#: Merge.rc:1566 Merge.rc:1587 Merge.rc:1643 Merge.rc:1709 Merge.rc:1734
+#: Merge.rc:1398 Merge.rc:1475 Merge.rc:1527 Merge.rc:1533 Merge.rc:1550
+#: Merge.rc:1576 Merge.rc:1597 Merge.rc:1653 Merge.rc:1719 Merge.rc:1744
msgid "Custom Range..."
msgstr "Intervallo personalizzato..."
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1390 Merge.rc:1471 Merge.rc:1568
+#: Merge.rc:1400 Merge.rc:1481 Merge.rc:1578
msgid "&Last Modified"
msgstr "U<ima modifica"
#. IDR_POPUP_FILTERMENU_DATE
-#: Merge.rc:1392 Merge.rc:1473 Merge.rc:1651
+#: Merge.rc:1402 Merge.rc:1483 Merge.rc:1661
msgid "&Hour"
msgstr "&Ore"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_HOUR_BEFORE_1
-#: Merge.rc:1394 Merge.rc:1475 Merge.rc:1653
+#: Merge.rc:1404 Merge.rc:1485 Merge.rc:1663
msgid "More than 1 hour ago"
msgstr "Più di 1 ora fa"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_HOUR_WITHIN_1
-#: Merge.rc:1395 Merge.rc:1476 Merge.rc:1654
+#: Merge.rc:1405 Merge.rc:1486 Merge.rc:1664
msgid "Within 1 hour"
msgstr "Entro 1 ora"
#. IDR_POPUP_FILTERMENU_DATE
-#: Merge.rc:1397 Merge.rc:1478 Merge.rc:1656
+#: Merge.rc:1407 Merge.rc:1488 Merge.rc:1666
msgid "&Day"
msgstr "&Giorno"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_DAY_BEFORE_TODAY
-#: Merge.rc:1399 Merge.rc:1480 Merge.rc:1658
+#: Merge.rc:1409 Merge.rc:1490 Merge.rc:1668
msgid "Before today"
msgstr "Prima di oggi"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_DAY_TODAY
-#: Merge.rc:1400 Merge.rc:1481 Merge.rc:1659
+#: Merge.rc:1410 Merge.rc:1491 Merge.rc:1669
msgid "Today"
msgstr "Oggi"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_DAY_BEFORE_YESTERDAY
-#: Merge.rc:1401 Merge.rc:1482 Merge.rc:1660
+#: Merge.rc:1411 Merge.rc:1492 Merge.rc:1670
msgid "Before yesterday"
msgstr "Prima di ieri"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_DAY_YESTERDAY
-#: Merge.rc:1402 Merge.rc:1483 Merge.rc:1661
+#: Merge.rc:1412 Merge.rc:1493 Merge.rc:1671
msgid "Yesterday"
msgstr "Ieri"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_DAY_SINCE_YESTERDAY
-#: Merge.rc:1403 Merge.rc:1484 Merge.rc:1662
+#: Merge.rc:1413 Merge.rc:1494 Merge.rc:1672
msgid "Since yesterday"
msgstr "Da ieri"
#. IDR_POPUP_FILTERMENU_DATE
-#: Merge.rc:1405 Merge.rc:1486 Merge.rc:1664
+#: Merge.rc:1415 Merge.rc:1496 Merge.rc:1674
msgid "&Week"
msgstr "&Settimana"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_WEEK_BEFORE_THIS
-#: Merge.rc:1407 Merge.rc:1488 Merge.rc:1666
+#: Merge.rc:1417 Merge.rc:1498 Merge.rc:1676
msgid "Before this week"
msgstr "Prima di questa settimana"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_WEEK_THIS
-#: Merge.rc:1408 Merge.rc:1489 Merge.rc:1667
+#: Merge.rc:1418 Merge.rc:1499 Merge.rc:1677
msgid "This week"
msgstr "Questa settimana"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_WEEK_BEFORE_LAST
-#: Merge.rc:1409 Merge.rc:1490 Merge.rc:1668
+#: Merge.rc:1419 Merge.rc:1500 Merge.rc:1678
msgid "Before last week"
msgstr "Prima dell'ultima settimana"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_WEEK_LAST
-#: Merge.rc:1410 Merge.rc:1491 Merge.rc:1669
+#: Merge.rc:1420 Merge.rc:1501 Merge.rc:1679
msgid "Last week"
msgstr "Ultima settimana"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_WEEK_SINCE_LAST
-#: Merge.rc:1411 Merge.rc:1492 Merge.rc:1670
+#: Merge.rc:1421 Merge.rc:1502 Merge.rc:1680
msgid "Since last week"
msgstr "Dalla scorsa settimana"
#. IDR_POPUP_FILTERMENU_DATE
-#: Merge.rc:1413 Merge.rc:1494 Merge.rc:1672
+#: Merge.rc:1423 Merge.rc:1504 Merge.rc:1682
msgid "&Month"
msgstr "&Mese"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_MONTH_BEFORE_THIS
-#: Merge.rc:1415 Merge.rc:1496 Merge.rc:1674
+#: Merge.rc:1425 Merge.rc:1506 Merge.rc:1684
msgid "Before this month"
msgstr "Prima di questo mese"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_MONTH_THIS
-#: Merge.rc:1416 Merge.rc:1497 Merge.rc:1675
+#: Merge.rc:1426 Merge.rc:1507 Merge.rc:1685
msgid "This month"
msgstr "Questo mese"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_MONTH_BEFORE_LAST
-#: Merge.rc:1417 Merge.rc:1498 Merge.rc:1676
+#: Merge.rc:1427 Merge.rc:1508 Merge.rc:1686
msgid "Before last month"
msgstr "Prima del mese scorso"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_MONTH_LAST
-#: Merge.rc:1418 Merge.rc:1499 Merge.rc:1677
+#: Merge.rc:1428 Merge.rc:1509 Merge.rc:1687
msgid "Last month"
msgstr "Mese scorso"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_MONTH_SINCE_LAST
-#: Merge.rc:1419 Merge.rc:1500 Merge.rc:1678
+#: Merge.rc:1429 Merge.rc:1510 Merge.rc:1688
msgid "Since last month"
msgstr "Dal mese scorso"
#. IDR_POPUP_FILTERMENU_DATE
-#: Merge.rc:1421 Merge.rc:1502 Merge.rc:1680
+#: Merge.rc:1431 Merge.rc:1512 Merge.rc:1690
msgid "&Year"
msgstr "&anno"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_YEAR_BEFORE_THIS
-#: Merge.rc:1423 Merge.rc:1504 Merge.rc:1682
+#: Merge.rc:1433 Merge.rc:1514 Merge.rc:1692
msgid "Before this year"
msgstr "Prima di quet'anno"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_YEAR_THIS
-#: Merge.rc:1424 Merge.rc:1505 Merge.rc:1683
+#: Merge.rc:1434 Merge.rc:1515 Merge.rc:1693
msgid "This year"
msgstr "Quest'anno"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_YEAR_BEFORE_LAST
-#: Merge.rc:1425 Merge.rc:1506 Merge.rc:1684
+#: Merge.rc:1435 Merge.rc:1516 Merge.rc:1694
msgid "Before last year"
msgstr "Prima dell'anno scorso"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_YEAR_LAST
-#: Merge.rc:1426 Merge.rc:1507 Merge.rc:1685
+#: Merge.rc:1436 Merge.rc:1517 Merge.rc:1695
msgid "Last year"
msgstr "Anno scorso"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_YEAR_SINCE_LAST
-#: Merge.rc:1427 Merge.rc:1508 Merge.rc:1686
+#: Merge.rc:1437 Merge.rc:1518 Merge.rc:1696
msgid "Since last year"
msgstr "Dall'anno scorso"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_RANGE
-#: Merge.rc:1429 Merge.rc:1510 Merge.rc:1688
+#: Merge.rc:1439 Merge.rc:1520 Merge.rc:1698
msgid "&Custom Range..."
msgstr "Inter&vallo personalizzato..."
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1431 Merge.rc:1589
+#: Merge.rc:1441 Merge.rc:1599
msgid "&Attributes"
msgstr "&Attributi"
#. IDR_POPUP_FILTERMENU_ATTR, ID_FILTERMENU_ATTR_READONLY
-#: Merge.rc:1433 Merge.rc:1607
+#: Merge.rc:1443 Merge.rc:1617
msgid "Read-only files"
msgstr "File di sola lettura"
#. IDR_POPUP_FILTERMENU_ATTR, ID_FILTERMENU_ATTR_NOT_READONLY
-#: Merge.rc:1434 Merge.rc:1608
+#: Merge.rc:1444 Merge.rc:1618
msgid "Not read-only files"
msgstr "File di non sola lettura"
#. IDR_POPUP_FILTERMENU_ATTR, ID_FILTERMENU_ATTR_HIDDEN
-#: Merge.rc:1435 Merge.rc:1609
+#: Merge.rc:1445 Merge.rc:1619
msgid "Hidden files"
msgstr "File nascosti"
#. IDR_POPUP_FILTERMENU_ATTR, ID_FILTERMENU_ATTR_NOT_HIDDEN
-#: Merge.rc:1436 Merge.rc:1610
+#: Merge.rc:1446 Merge.rc:1620
msgid "Not hidden files"
msgstr "File non nascosti"
#. IDR_POPUP_FILTERMENU_ATTR, ID_FILTERMENU_ATTR_SYSTEM
-#: Merge.rc:1437 Merge.rc:1611
+#: Merge.rc:1447 Merge.rc:1621
msgid "System files"
msgstr "File di sistema"
#. IDR_POPUP_FILTERMENU_ATTR, ID_FILTERMENU_ATTR_NOT_SYSTEM
-#: Merge.rc:1438 Merge.rc:1612
+#: Merge.rc:1448 Merge.rc:1622
msgid "Not system files"
msgstr "File non di sistema"
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1440
+#: Merge.rc:1450
msgid "File &Content"
msgstr "&Contenuto file"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_CONTAINS
-#: Merge.rc:1442
+#: Merge.rc:1452
msgid "Contains string..."
msgstr "Contiene stringa..."
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_NOT_CONTAINS
-#: Merge.rc:1443
+#: Merge.rc:1453
msgid "Does not contain string..."
msgstr "Non contiene la stringa ..."
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_FIRST_LINE_CONTAINS
-#: Merge.rc:1444
+#: Merge.rc:1454
msgid "First line contains string..."
msgstr "La prima riga contiene la stringa ..."
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_FIRST_LINE_NOT_CONTAINS
-#: Merge.rc:1445
+#: Merge.rc:1455
msgid "First line does not contain string..."
msgstr "La prima riga non contiene la stringa ..."
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_FIRST_10_CONTAINS
-#: Merge.rc:1446
+#: Merge.rc:1456
msgid "First 10 lines contain string..."
msgstr "Le prime 10 righe contengono la stringa ..."
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_FIRST_10_NOT_CONTAINS
-#: Merge.rc:1447
+#: Merge.rc:1457
msgid "First 10 lines do not contain string..."
msgstr "Le prime 10 righe non contengono la stringa ..."
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_LAST_10_CONTAINS
-#: Merge.rc:1448
+#: Merge.rc:1458
msgid "Last 10 lines contain string..."
msgstr "Le ultime 10 righe contengono la stringa ..."
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_LAST_10_NOT_CONTAINS
-#: Merge.rc:1449
+#: Merge.rc:1459
msgid "Last 10 lines do not contain string..."
msgstr "Le ultime 10 righe non contengono la stringa ..."
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_LAST_LINE_CONTAINS
-#: Merge.rc:1450
+#: Merge.rc:1460
msgid "Last line contains string..."
msgstr "L'ultima riga contiene la stringa ..."
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_LAST_LINE_NOT_CONTAINS
-#: Merge.rc:1451
+#: Merge.rc:1461
msgid "Last line does not contain string..."
msgstr "L'ultima riga non contiene la stringa ..."
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1453
+#: Merge.rc:1463
msgid "&Line Count"
msgstr "Conteggio rig&he"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_LT_10
-#: Merge.rc:1455
+#: Merge.rc:1465
msgid "Less than 10"
msgstr "Inferiori a10"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_GE_10
-#: Merge.rc:1456
+#: Merge.rc:1466
msgid "10 or more"
msgstr "10 o maggiore"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_LT_100
-#: Merge.rc:1457
+#: Merge.rc:1467
msgid "Less than 100"
msgstr "Inferiori a 100"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_GE_100
-#: Merge.rc:1458
+#: Merge.rc:1468
msgid "100 or more"
msgstr "100 o maggiore"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_LT_1000
-#: Merge.rc:1459
+#: Merge.rc:1469
msgid "Less than 1000"
msgstr "Inferiori a 1.000"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_GE_1000
-#: Merge.rc:1460
+#: Merge.rc:1470
msgid "1000 or more"
msgstr "1.000 o maggiore"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_LT_10000
-#: Merge.rc:1461
+#: Merge.rc:1471
msgid "Less than 10000"
msgstr "Inferiori a 10.000"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_GE_10000
-#: Merge.rc:1462
+#: Merge.rc:1472
msgid "10000 or more"
msgstr "10.000 o maggiore"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_LT_100000
-#: Merge.rc:1463
+#: Merge.rc:1473
msgid "Less than 100000"
msgstr "Inferiori a 100.000"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_GE_100000
-#: Merge.rc:1464
+#: Merge.rc:1474
msgid "100000 or more"
msgstr "100.000 o maggiore"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_PROPS
-#: Merge.rc:1467 Merge.rc:1594 Merge.rc:1761 Merge.rc:1778
+#: Merge.rc:1477 Merge.rc:1604 Merge.rc:1771 Merge.rc:1788
msgid "Additional &Properties..."
msgstr "&Proprietà aggiuntive..."
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1469
+#: Merge.rc:1479
msgid "Add F&older Condition"
msgstr "Aggiungi c&ondizione cartella"
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1513
+#: Merge.rc:1523
msgid "&Files"
msgstr "&File"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FOLDER_FILES_EQ_0
-#: Merge.rc:1515
+#: Merge.rc:1525
msgid "0 files"
msgstr "0 file"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FOLDER_FILES_GE_1
-#: Merge.rc:1516
+#: Merge.rc:1526
msgid "1 file or more"
msgstr "1 file o più"
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1519
+#: Merge.rc:1529
msgid "&Items"
msgstr "Element&i"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FOLDER_ITEMS_EQ_0
-#: Merge.rc:1521
+#: Merge.rc:1531
msgid "0 items"
msgstr "0 elementi"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FOLDER_ITEMS_GE_1
-#: Merge.rc:1522
+#: Merge.rc:1532
msgid "1 item or more"
msgstr "1 elemento o più"
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1525
+#: Merge.rc:1535
msgid "&Total Size"
msgstr "Dimensione &totale"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FOLDER_STATS_RECURSIVE
-#: Merge.rc:1542
+#: Merge.rc:1552
msgid "&Recursive"
msgstr "&Ricorsivo"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONDITION_ANY
-#: Merge.rc:1544
+#: Merge.rc:1554
msgid "Target: &Any (Left/Middle/Right)"
msgstr "Obiettivo: &qualsiasi (sinistra/centrale/destra)"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONDITION_LEFT
-#: Merge.rc:1545
+#: Merge.rc:1555
msgid "Target: &Left"
msgstr "Obiettivo: &sinistra"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONDITION_MIDDLE
-#: Merge.rc:1546
+#: Merge.rc:1556
msgid "Target: &Middle"
msgstr "Obiettivo: ¢rale"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONDITION_RIGHT
-#: Merge.rc:1547
+#: Merge.rc:1557
msgid "Target: &Right"
msgstr "Obiettivo: &destra"
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1549
+#: Merge.rc:1559
msgid "Add &Difference Condition"
msgstr "Aggiungi condizione &differenza"
#. IDR_POPUP_FILTERMENU_DIFF_PROP, ID_FILTERMENU_DIFF_PROP_EQUAL
-#: Merge.rc:1553 Merge.rc:1570 Merge.rc:1591 Merge.rc:1696 Merge.rc:1717
-#: Merge.rc:1742
+#: Merge.rc:1563 Merge.rc:1580 Merge.rc:1601 Merge.rc:1706 Merge.rc:1727
+#: Merge.rc:1752
msgid "Equal"
msgstr "Uguale"
#. IDR_POPUP_FILTERMENU_DIFF_PROP, ID_FILTERMENU_DIFF_PROP_NOT_EQUAL
-#: Merge.rc:1554 Merge.rc:1571 Merge.rc:1592 Merge.rc:1697 Merge.rc:1718
-#: Merge.rc:1743
+#: Merge.rc:1564 Merge.rc:1581 Merge.rc:1602 Merge.rc:1707 Merge.rc:1728
+#: Merge.rc:1753
msgid "Not Equal"
msgstr "Non uguale"
#. IDR_POPUP_FILTERMENU_DIFF_PROP, ID_FILTERMENU_DIFF_PROP_LESS
-#: Merge.rc:1555 Merge.rc:1572 Merge.rc:1698 Merge.rc:1719 Merge.rc:1744
+#: Merge.rc:1565 Merge.rc:1582 Merge.rc:1708 Merge.rc:1729 Merge.rc:1754
msgid "Less Than"
msgstr "Inferiore a"
#. IDR_POPUP_FILTERMENU_DIFF_PROP, ID_FILTERMENU_DIFF_PROP_LESS_EQUAL
-#: Merge.rc:1556 Merge.rc:1573 Merge.rc:1699 Merge.rc:1720 Merge.rc:1745
+#: Merge.rc:1566 Merge.rc:1583 Merge.rc:1709 Merge.rc:1730 Merge.rc:1755
msgid "Less Than or Equal to"
msgstr "Uguale o inferiore a"
#. IDR_POPUP_FILTERMENU_DIFF_PROP, ID_FILTERMENU_DIFF_PROP_GREATER
-#: Merge.rc:1557 Merge.rc:1574 Merge.rc:1700 Merge.rc:1721 Merge.rc:1746
+#: Merge.rc:1567 Merge.rc:1584 Merge.rc:1710 Merge.rc:1731 Merge.rc:1756
msgid "Greater Than"
msgstr "Maggiore di"
#. IDR_POPUP_FILTERMENU_DIFF_PROP, ID_FILTERMENU_DIFF_PROP_GREATER_EQUAL
-#: Merge.rc:1558 Merge.rc:1575 Merge.rc:1701 Merge.rc:1722 Merge.rc:1747
+#: Merge.rc:1568 Merge.rc:1585 Merge.rc:1711 Merge.rc:1732 Merge.rc:1757
msgid "Greater Than or Equal to"
msgstr "Uguale o maggiore di"
#. IDR_POPUP_FILTERMENU_DIFF_SIZE, ID_FILTERMENU_DIFF_SIZE_LT_10B
-#: Merge.rc:1560 Merge.rc:1703
+#: Merge.rc:1570 Merge.rc:1713
msgid "Less than 10B"
msgstr "Inferiore a 10B"
#. IDR_POPUP_FILTERMENU_DIFF_SIZE, ID_FILTERMENU_DIFF_SIZE_GE_10B
-#: Merge.rc:1561 Merge.rc:1704
+#: Merge.rc:1571 Merge.rc:1714
msgid "10B or more"
msgstr "10B o maggiore"
#. IDR_POPUP_FILTERMENU_DIFF_SIZE, ID_FILTERMENU_DIFF_SIZE_LT_100B
-#: Merge.rc:1562 Merge.rc:1705
+#: Merge.rc:1572 Merge.rc:1715
msgid "Less than 100B"
msgstr "Inferiore a 100B"
#. IDR_POPUP_FILTERMENU_DIFF_SIZE, ID_FILTERMENU_DIFF_SIZE_GE_100B
-#: Merge.rc:1563 Merge.rc:1706
+#: Merge.rc:1573 Merge.rc:1716
msgid "100B or more"
msgstr "100B o maggiore"
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_LT_1SECOND
-#: Merge.rc:1577 Merge.rc:1724
+#: Merge.rc:1587 Merge.rc:1734
msgid "Less than 1 second"
msgstr "Inferiore ad 1 secondo"
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_GE_1SECOND
-#: Merge.rc:1578 Merge.rc:1725
+#: Merge.rc:1588 Merge.rc:1735
msgid "1 second or more"
msgstr "1 secondo o maggiore"
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_LT_1MINUTE
-#: Merge.rc:1579 Merge.rc:1726
+#: Merge.rc:1589 Merge.rc:1736
msgid "Less than 1 minute"
msgstr "Inferiore ad 1 minuto"
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_GE_1MINUTE
-#: Merge.rc:1580 Merge.rc:1727
+#: Merge.rc:1590 Merge.rc:1737
msgid "1 minute or more"
msgstr "1 minuto o maggiore"
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_LT_1HOUR
-#: Merge.rc:1581 Merge.rc:1728
+#: Merge.rc:1591 Merge.rc:1738
msgid "Less than 1 hour"
msgstr "Inferiore ad un 1 ora"
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_GE_1HOUR
-#: Merge.rc:1582 Merge.rc:1729
+#: Merge.rc:1592 Merge.rc:1739
msgid "1 hour or more"
msgstr "1 ora o maggiore"
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_LT_1DAY
-#: Merge.rc:1583 Merge.rc:1730
+#: Merge.rc:1593 Merge.rc:1740
msgid "Less than 1 day"
msgstr "Inferiore ad 1 giorno"
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_GE_1DAY
-#: Merge.rc:1584 Merge.rc:1731
+#: Merge.rc:1594 Merge.rc:1741
msgid "1 day or more"
msgstr "1 giorno o maggiore"
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_LT_1WEEK
-#: Merge.rc:1585 Merge.rc:1732
+#: Merge.rc:1595 Merge.rc:1742
msgid "Less than 1 week"
msgstr "Inferiore ad 1 settimana"
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_GE_1WEEK
-#: Merge.rc:1586 Merge.rc:1733
+#: Merge.rc:1596 Merge.rc:1743
msgid "1 week or more"
msgstr "1 settimana o maggiore"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_CONDITION_DIFF_LEFT_RIGHT
-#: Merge.rc:1596
+#: Merge.rc:1606
msgid "Target: &Left and Right"
msgstr "Obiettivo: &sinistra e destra"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_CONDITION_DIFF_LEFT_MIDDLE
-#: Merge.rc:1597
+#: Merge.rc:1607
msgid "Target: Left and &Middle"
msgstr "Obiettivo: sinistra e ¢rale"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_CONDITION_DIFF_MIDDLE_RIGHT
-#: Merge.rc:1598
+#: Merge.rc:1608
msgid "Target: Middle and &Right"
msgstr "Obiettivo: centrale e &destra"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_CONDITION_DIFF_ALL
-#: Merge.rc:1599
+#: Merge.rc:1609
msgid "Target: &All"
msgstr "Obiettivo: &tutti"
#. IDR_POPUP_FILTERMENU_BINARY, ID_FILTERMENU_BINARY_ONLY
-#: Merge.rc:1620
+#: Merge.rc:1630
msgid "Binary files only"
msgstr "Solo file binari"
#. IDR_POPUP_FILTERMENU_BINARY, ID_FILTERMENU_TEXT_ONLY
-#: Merge.rc:1621
+#: Merge.rc:1631
msgid "Text files only"
msgstr "Solo file testo"
#. IDR_POPUP_ADDCMPMENU, ID_ADDCMPMENU_CLEAR
-#: Merge.rc:1755
+#: Merge.rc:1765
msgid "&Clear conditions"
msgstr "Azzera &condizioni"
#. IDR_POPUP_ADDCMPMENU, ID_ADDCMPMENU_CMP_SIZE
-#: Merge.rc:1757
+#: Merge.rc:1767
msgid "Compare &Size"
msgstr "Confronta dimen&sione"
#. IDR_POPUP_ADDCMPMENU, ID_ADDCMPMENU_CMP_DATE
-#: Merge.rc:1758
+#: Merge.rc:1768
msgid "Compare &Date"
msgstr "Confronta &data"
#. IDR_POPUP_ADDCMPMENU, ID_ADDCMPMENU_CMP_ATTR
-#: Merge.rc:1759
+#: Merge.rc:1769
msgid "Compare &Attributes"
msgstr "Confronta &attributi"
#. IDR_POPUP_ADDCMPMENU, ID_ADDCMPMENU_CMP_CONTENTS
-#: Merge.rc:1760
+#: Merge.rc:1770
msgid "Compare C&ontents"
msgstr "Confronta c&ontenuto"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_CLEAR
-#: Merge.rc:1769
+#: Merge.rc:1779
msgid "&Clear Keys"
msgstr "A&zzera tasti"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_NAME
-#: Merge.rc:1771
+#: Merge.rc:1781
msgid "&Name"
msgstr "&Nome"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_BASENAME
-#: Merge.rc:1772
+#: Merge.rc:1782
msgid "&Base name (without extension)"
msgstr "Nome base (senza estensione)"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_NORMALIZED_NAME
-#: Merge.rc:1773
+#: Merge.rc:1783
msgid "Normalized &Unicode Name"
msgstr "Nome &Unicode normalizzato"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_RELPATH
-#: Merge.rc:1774
+#: Merge.rc:1784
msgid "&Relative Path"
msgstr "Percorso &relativo"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_DATE
-#: Merge.rc:1776
+#: Merge.rc:1786
msgid "&Date"
msgstr "&Data"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_HASH_MD5
-#: Merge.rc:1777
+#: Merge.rc:1787
msgid "&Hash (MD5)"
msgstr "Hash (MD5)"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_REPLACE
-#: Merge.rc:1780
+#: Merge.rc:1790
msgid "Insert &replace() Function"
msgstr "Inserisci funzione &replace()"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_REGEXREPLACE
-#: Merge.rc:1781
+#: Merge.rc:1791
msgid "Insert rege&xReplace() Function"
msgstr "Inserisci funzione rege&xReplace()"
#. IDR_POPUP_RENAMEMOVE_MENU
-#: Merge.rc:1782
+#: Merge.rc:1792
msgid "Replace &Lists"
msgstr "Sostituisci e&lenchi"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_CREATE_REPLACELIST
-#: Merge.rc:1784
+#: Merge.rc:1794
msgid "&Create String Replace List and Insert..."
msgstr "&Crea elenco sostituzione stringa ed inserisci..."
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_CREATE_REGEXREPLACELIST
-#: Merge.rc:1785
+#: Merge.rc:1795
msgid "Create &Regex Replace List and Insert..."
msgstr "Crea elenco sostituzione &Regex ed inserisci..."
#. IDR_POPUP_RENAMEMOVE_MENU
-#: Merge.rc:1787
+#: Merge.rc:1797
msgid "&String Replace Lists"
msgstr "Crea elenchi sostituzione"
#. IDR_POPUP_RENAMEMOVE_MENU
-#: Merge.rc:1791
+#: Merge.rc:1801
msgid "Re&gex Replace Lists"
msgstr "Elenchi sostituzione Re&gex"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_STRING_REPLACE_LISTS_FOLDER
-#: Merge.rc:1796
+#: Merge.rc:1806
msgid "Open String Replace Lists Folder..."
msgstr "Apri cartella elenchi sostituzione stringhe..."
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_REGEX_REPLACE_LISTS_FOLDER
-#: Merge.rc:1797
+#: Merge.rc:1807
msgid "Open Regex Replace Lists Folder..."
msgstr "Apri cartella elenchi sostituzione Regex..."
#. IDD_FILTERS_CONDITION, IDC_CONDITION_MATCHCASE
-#: Merge.rc:1799 Merge.rc:1995 Merge.rc:2014 Merge.rc:2042 Merge.rc:2585
+#: Merge.rc:1809 Merge.rc:2005 Merge.rc:2024 Merge.rc:2052 Merge.rc:2595
msgid "Match &case"
msgstr "&Maiuscolo/minuscolo"
#. IDR_POPUP_RENAMEMOVE_MENU
-#: Merge.rc:1801
+#: Merge.rc:1811
msgid "Text &Normalization"
msgstr "&Normalizzazione testo"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_TOLOWER
-#: Merge.rc:1803
+#: Merge.rc:1813
msgid "&Lowercase"
msgstr "Miniusco&lo"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_TOUPPER
-#: Merge.rc:1804
+#: Merge.rc:1814
msgid "&Uppercase"
msgstr "Mai&uscolo"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_TOHALFWIDTH
-#: Merge.rc:1805
+#: Merge.rc:1815
msgid "&Half-width"
msgstr "&Mezza larg&hezza"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_TOFULLWIDTH
-#: Merge.rc:1806
+#: Merge.rc:1816
msgid "&Full-width"
msgstr "&Larghezza intera"
#. IDR_POPUP_RENAMEMOVE_MENU
-#: Merge.rc:1807
+#: Merge.rc:1817
msgid "&Chinese Conversion"
msgstr "Conversione &cinese"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_TOSIMPLIFIEDCHINESE
-#: Merge.rc:1809
+#: Merge.rc:1819
msgid "&Simplified Chinese"
msgstr "Cinese &semplificato"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_TOTRADITIONALCHINESE
-#: Merge.rc:1810
+#: Merge.rc:1820
msgid "&Traditional Chinese"
msgstr "Cinese &tradizionale"
#. IDR_POPUP_RENAMEMOVE_MENU
-#: Merge.rc:1812
+#: Merge.rc:1822
msgid "&Japanese Conversion"
msgstr "Conversione &giapponese"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_TOHIRAGANA
-#: Merge.rc:1814
+#: Merge.rc:1824
msgid "&Hiragana"
msgstr "&Hiragana"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_TOKATAKANA
-#: Merge.rc:1815
+#: Merge.rc:1825
msgid "&Katakana"
msgstr "&Katakana"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_NORMALIZEUNICODE
-#: Merge.rc:1817
+#: Merge.rc:1827
msgid "Normalize &Unicode"
msgstr "Normalizza &Unicode"
#. IDD_ABOUTBOX
-#: Merge.rc:1932
+#: Merge.rc:1942
msgid "About WinMerge"
msgstr "Info su WinMerge"
#. IDD_ABOUTBOX, IDC_WWW
-#: Merge.rc:1936
+#: Merge.rc:1946
msgid "Visit the WinMerge Homepage!"
msgstr "Visita il sito web di WinMerge!"
#. IDD_PLUGINS_EDITPLUGIN, IDOK
-#: Merge.rc:1938 Merge.rc:2080 Merge.rc:2431 Merge.rc:2455 Merge.rc:2469
-#: Merge.rc:2497 Merge.rc:2588 Merge.rc:2613 Merge.rc:2674 Merge.rc:2691
-#: Merge.rc:2703 Merge.rc:2867 Merge.rc:2927 Merge.rc:3062 Merge.rc:3104
-#: Merge.rc:3147 Merge.rc:3197
+#: Merge.rc:1948 Merge.rc:2090 Merge.rc:2441 Merge.rc:2465 Merge.rc:2479
+#: Merge.rc:2507 Merge.rc:2598 Merge.rc:2623 Merge.rc:2684 Merge.rc:2701
+#: Merge.rc:2713 Merge.rc:2877 Merge.rc:2937 Merge.rc:3072 Merge.rc:3114
+#: Merge.rc:3157 Merge.rc:3207
msgid "OK"
msgstr "OK"
#. IDD_ABOUTBOX, IDC_OPEN_CONTRIBUTORS
-#: Merge.rc:1939
+#: Merge.rc:1949
msgid "Contributors"
msgstr "Collaboratori"
#. IDD_SELECT_FILES_OR_FOLDERS
-#: Merge.rc:1945 Merge.rc:3070
+#: Merge.rc:1955 Merge.rc:3080
msgid "Select Files or Folders"
msgstr "Seleziona file o cartelle"
#. IDD_OPEN, IDC_FILES_DIRS_GROUP0
-#: Merge.rc:1949
+#: Merge.rc:1959
msgid "&1st File or Folder"
msgstr "&1° file o cartella"
#. IDD_OPEN, IDC_PATH0_READONLY
-#: Merge.rc:1951
+#: Merge.rc:1961
msgid "Re&ad-only"
msgstr "Sola lett&ura"
#. IDD_OPEN, IDC_SWAP01_STATIC
-#: Merge.rc:1953
+#: Merge.rc:1963
msgid "Swap 1st | 2nd"
msgstr "Scambia 1° | 2°"
#. IDD_GENERATE_PATCH, IDC_DIFF_BROWSE_FILE1
-#: Merge.rc:1954 Merge.rc:2310 Merge.rc:2413
+#: Merge.rc:1964 Merge.rc:2320 Merge.rc:2423
msgid "&Browse..."
msgstr "S&foglia..."
#. IDD_OPEN, IDC_FILES_DIRS_GROUP1
-#: Merge.rc:1955
+#: Merge.rc:1965
msgid "&2nd File or Folder"
msgstr "&2° file o cartella"
#. IDD_OPEN, IDC_PATH1_READONLY
-#: Merge.rc:1957
+#: Merge.rc:1967
msgid "Rea&d-only"
msgstr "Sola lettu&ra"
#. IDD_OPEN, IDC_SWAP12_STATIC
-#: Merge.rc:1959
+#: Merge.rc:1969
msgid "Swap 2nd | 3rd"
msgstr "Scambia 2° | 3°"
#. IDD_PROPPAGE_SYSTEM, IDC_FILTER_USER_BROWSE
-#: Merge.rc:1960 Merge.rc:2315
+#: Merge.rc:1970 Merge.rc:2325
msgid "B&rowse..."
msgstr "&Sfoglia..."
#. IDD_OPEN, IDC_FILES_DIRS_GROUP2
-#: Merge.rc:1961
+#: Merge.rc:1971
msgid "&3rd File or Folder (Optional)"
msgstr "&3° file o cartella"
#. IDD_OPEN, IDC_PATH2_READONLY
-#: Merge.rc:1963
+#: Merge.rc:1973
msgid "Read-o&nly"
msgstr "Sola lettur&a"
#. IDD_OPEN, IDC_SWAP02_STATIC
-#: Merge.rc:1965
+#: Merge.rc:1975
msgid "Swap 1st | 3rd"
msgstr "Scambia 1° | 3°"
#. IDD_PROPPAGE_BACKUPS, IDC_BACKUP_BROWSE
-#: Merge.rc:1966 Merge.rc:2685 Merge.rc:2883
+#: Merge.rc:1976 Merge.rc:2695 Merge.rc:2893
msgid "Browse..."
msgstr "Sfoglia..."
#. IDD_OPEN, IDC_FILES_DIRS_GROUP3
-#: Merge.rc:1968
+#: Merge.rc:1978
msgid " Folder: Filter"
msgstr " Cartella: Filtro"
#. IDD_OPEN, IDC_RECURS_CHECK
-#: Merge.rc:1971
+#: Merge.rc:1981
msgid "&Include subfolders"
msgstr "&Includi sotto cartelle"
#. IDD_OPEN, IDC_FILES_DIRS_GROUP5
-#: Merge.rc:1972
+#: Merge.rc:1982
msgid " File: Prediffer Plugin"
msgstr " File: plugin Prediffer"
#. IDD_OPEN, IDC_FILES_DIRS_GROUP4
-#: Merge.rc:1976
+#: Merge.rc:1986
msgid " File: Unpacker Plugin"
msgstr " File: plugin Decompressore"
#. IDD_OPEN, IDC_SELECT_UNPACKER
-#: Merge.rc:1978
+#: Merge.rc:1988
msgid "Se&lect..."
msgstr "Se&leziona..."
#. IDD_PLUGINS_EDITPLUGIN, IDCANCEL
-#: Merge.rc:1981 Merge.rc:2001 Merge.rc:2025 Merge.rc:2046 Merge.rc:2081
-#: Merge.rc:2432 Merge.rc:2456 Merge.rc:2470 Merge.rc:2498 Merge.rc:2551
-#: Merge.rc:2589 Merge.rc:2614 Merge.rc:2675 Merge.rc:2692 Merge.rc:2704
-#: Merge.rc:2868 Merge.rc:2928 Merge.rc:3087 Merge.rc:3105 Merge.rc:3148
-#: Merge.rc:3198
+#: Merge.rc:1991 Merge.rc:2011 Merge.rc:2035 Merge.rc:2056 Merge.rc:2091
+#: Merge.rc:2442 Merge.rc:2466 Merge.rc:2480 Merge.rc:2508 Merge.rc:2561
+#: Merge.rc:2599 Merge.rc:2624 Merge.rc:2685 Merge.rc:2702 Merge.rc:2714
+#: Merge.rc:2878 Merge.rc:2938 Merge.rc:3097 Merge.rc:3115 Merge.rc:3158
+#: Merge.rc:3208
msgid "Cancel"
msgstr "Annulla"
#. IDD_OPEN, IDC_OPEN_STATUS
-#: Merge.rc:1982
+#: Merge.rc:1992
msgid "Status:"
msgstr "Stato:"
#. IDD_PLUGINS_LIST, ID_HELP
-#: Merge.rc:1983 Merge.rc:2082 Merge.rc:2929
+#: Merge.rc:1993 Merge.rc:2092 Merge.rc:2939
msgid "Help"
msgstr "Aiuto"
#. IDD_OPEN, IDC_OPTIONS
-#: Merge.rc:1984
+#: Merge.rc:1994
msgid "&Options..."
msgstr "&Opzioni..."
#. IDD_EDIT_FIND
-#: Merge.rc:1989
+#: Merge.rc:1999
msgid "Find"
msgstr "Trova"
#. IDD_EDIT_MARKER, IDC_STATIC
-#: Merge.rc:1992 Merge.rc:2009 Merge.rc:2037
+#: Merge.rc:2002 Merge.rc:2019 Merge.rc:2047
msgid "Fi&nd what:"
msgstr "Tro&va:"
#. IDD_EDIT_MARKER, IDC_EDIT_WHOLE_WORD
-#: Merge.rc:1994 Merge.rc:2013 Merge.rc:2041
+#: Merge.rc:2004 Merge.rc:2023 Merge.rc:2051
msgid "Match &whole word only"
msgstr "Solo &parole intere"
#. IDD_EDIT_MARKER, IDC_EDIT_REGEXP
-#: Merge.rc:1996 Merge.rc:2015 Merge.rc:2043
+#: Merge.rc:2006 Merge.rc:2025 Merge.rc:2053
msgid "Regular &expression"
msgstr "&Espressione regolare"
#. IDD_EDIT_FIND, IDC_FINDDLG_DONTWRAP
-#: Merge.rc:1997
+#: Merge.rc:2007
msgid "D&on't wrap end of file"
msgstr "&Fermati alla fine del file"
#. IDD_EDIT_FIND, IDC_FINDDLG_DONTCLOSE
-#: Merge.rc:1998
+#: Merge.rc:2008
msgid "&Don't close this dialog"
msgstr "&Non chiudere questa finestra"
#. IDD_EDIT_REPLACE, IDC_EDIT_SKIP
-#: Merge.rc:1999 Merge.rc:2021
+#: Merge.rc:2009 Merge.rc:2031
msgid "&Find Next"
msgstr "Trova &successivo"
#. IDD_EDIT_FIND, IDC_EDIT_FINDPREV
-#: Merge.rc:2000
+#: Merge.rc:2010
msgid "Find &Prev"
msgstr "Trova &precedente"
#. IDD_EDIT_REPLACE
-#: Merge.rc:2006
+#: Merge.rc:2016
msgid "Replace"
msgstr "Sostituisci"
#. IDD_EDIT_REPLACE, IDC_STATIC
-#: Merge.rc:2011
+#: Merge.rc:2021
msgid "Re&place with:"
msgstr "Sostituisci &con:"
#. IDD_EDIT_REPLACE, IDC_EDIT_SCOPE_DONT_WRAP
-#: Merge.rc:2016
+#: Merge.rc:2026
msgid "&Don't wrap at end of file"
msgstr "&Fermati alla fine del file"
#. IDD_EDIT_REPLACE, IDC_STATIC
-#: Merge.rc:2018
+#: Merge.rc:2028
msgid "Replace in"
msgstr "Sostituisci in"
#. IDD_EDIT_REPLACE, IDC_EDIT_SCOPE_WHOLE_FILE
-#: Merge.rc:2020
+#: Merge.rc:2030
msgid "Wh&ole file"
msgstr "T&utto il file"
#. IDD_EDIT_REPLACE, IDC_EDIT_FINDPREV
-#: Merge.rc:2022
+#: Merge.rc:2032
msgid "Find Pre&v"
msgstr "Trova su"
#. IDD_EDIT_REPLACE, IDC_EDIT_REPLACE
-#: Merge.rc:2023
+#: Merge.rc:2033
msgid "&Replace"
msgstr "&Sostituisci"
#. IDD_EDIT_REPLACE, IDC_EDIT_REPLACE_ALL
-#: Merge.rc:2024
+#: Merge.rc:2034
msgid "Replace &All"
msgstr "Sost&ituisci tutto"
#. IDS_OPTIONSPG_MARKERCOLORS
-#: Merge.rc:2030 Merge.rc:4209
+#: Merge.rc:2040 Merge.rc:4219
msgid "Markers"
msgstr "Segnaposti"
#. IDD_EDIT_MARKER, IDC_EDIT_MARKERS_ENABLED
-#: Merge.rc:2033
+#: Merge.rc:2043
msgid "Enable &markers"
msgstr "Abilita &segnaposti"
#. IDD_FILTERS_LINEFILTERS, IDC_LFILTER_ADDBTN
-#: Merge.rc:2035 Merge.rc:2057
+#: Merge.rc:2045 Merge.rc:2067
msgid "New"
msgstr "Nuovo"
#. IDD_EDIT_MARKER, IDC_STATIC
-#: Merge.rc:2039
+#: Merge.rc:2049
msgid "&Background color:"
msgstr "Colore di s&fondo:"
#. IDS_MESSAGEBOX_OK
-#: Merge.rc:2044 Merge.rc:2829 Merge.rc:3086 Merge.rc:4171
+#: Merge.rc:2054 Merge.rc:2839 Merge.rc:3096 Merge.rc:4181
msgid "&Ok"
msgstr "&OK"
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:2045 Merge.rc:2525 Merge.rc:3199
+#: Merge.rc:2055 Merge.rc:2535 Merge.rc:3209
msgid "&Apply"
msgstr "&Applica"
#. IDD_FILTERS_LINEFILTERS
-#: Merge.rc:2051
+#: Merge.rc:2061
msgid "Line Filters"
msgstr "Filtri linea"
#. IDD_FILTERS_LINEFILTERS, IDC_IGNOREREGEXP
-#: Merge.rc:2054
+#: Merge.rc:2064
msgid "Enable Line Filters"
msgstr "Attiva i filtri linee"
#. IDD_FILTERS_LINEFILTERS, IDC_STATIC
-#: Merge.rc:2055
+#: Merge.rc:2065
msgid "Regular Expressions (one per line):"
msgstr "Espressioni regolari (una per riga):"
#. IDD_PLUGINS_LIST, IDC_PLUGIN_EDIT
-#: Merge.rc:2058 Merge.rc:2924
+#: Merge.rc:2068 Merge.rc:2934
msgid "Edit"
msgstr "Modifica"
#. IDD_PLUGINS_LIST, IDC_PLUGIN_REMOVE
-#: Merge.rc:2059 Merge.rc:2071 Merge.rc:2925
+#: Merge.rc:2069 Merge.rc:2081 Merge.rc:2935
msgid "Remove"
msgstr "Rimuovi"
#. IDD_FILTERS_SUBSTITUTIONFILTERS
-#: Merge.rc:2064
+#: Merge.rc:2074
msgid "Substitution Filters"
msgstr "Filtri sostituzione"
#. IDD_FILTERS_SUBSTITUTIONFILTERS, IDC_STATIC
-#: Merge.rc:2067
+#: Merge.rc:2077
msgid ""
"Changes to the listed pairs below will be ignored or marked as "
"insignificant. Patches are unaffected."
@@ -3148,548 +3159,548 @@ msgstr ""
"Le patch non sono interessate."
#. IDD_FILTERS_SUBSTITUTIONFILTERS, IDC_IGNORED_SUSBSTITUTIONS_ENABLED
-#: Merge.rc:2068
+#: Merge.rc:2078
msgid "Enable"
msgstr "Abilita"
#. IDD_PLUGINS_LIST, IDC_PLUGIN_ADD
-#: Merge.rc:2070 Merge.rc:2923
+#: Merge.rc:2080 Merge.rc:2933
msgid "Add"
msgstr "Aggiungi"
#. IDD_FILTERS_SUBSTITUTIONFILTERS, IDC_LFILTER_CLEARBTN
-#: Merge.rc:2072
+#: Merge.rc:2082
msgid "Clear"
msgstr "Azzera"
#. IDD_PREFERENCES
-#: Merge.rc:2077
+#: Merge.rc:2087
msgid "Options"
msgstr "Opzioni"
#. IDD_PREFERENCES, IDC_TREEOPT_IMPORT
-#: Merge.rc:2086
+#: Merge.rc:2096
msgid "Import..."
msgstr "Importa..."
#. IDD_PREFERENCES, IDC_TREEOPT_EXPORT
-#: Merge.rc:2087
+#: Merge.rc:2097
msgid "Export..."
msgstr "Esporta..."
#. IDS_OPTIONSPG_GENCOMPARE
-#: Merge.rc:2092 Merge.rc:4199 Merge.rc:4202 Merge.rc:4219
+#: Merge.rc:2102 Merge.rc:4209 Merge.rc:4212 Merge.rc:4229
msgid "General"
msgstr "Generale"
#. IDD_PROPPAGE_GENERAL, IDC_SCROLL_CHECK
-#: Merge.rc:2095
+#: Merge.rc:2105
msgid "Automatically &scroll to first difference"
msgstr "&Visualizza automaticamente la prima differenza"
#. IDD_PROPPAGE_GENERAL, IDC_SCROLL_TO_FIRST_INLINE_DIFF_CHECK
-#: Merge.rc:2097
+#: Merge.rc:2107
msgid "Automatically s&croll to first inline difference"
msgstr "S&corri automaticamente alla prima differenza in linea"
#. IDD_PROPPAGE_GENERAL, IDC_STATIC
-#: Merge.rc:2099
+#: Merge.rc:2109
msgid "Cl&ose windows with 'Esc':"
msgstr "C&hiudi finestra con 'Esc':"
#. IDD_PROPPAGE_GENERAL, IDC_VERIFY_OPEN_PATHS
-#: Merge.rc:2101
+#: Merge.rc:2111
msgid "&Automatically verify paths in Open dialog"
msgstr "Verifica &automaticamente i percorsi finestra Apri"
#. IDD_PROPPAGE_GENERAL, IDC_STATIC
-#: Merge.rc:2103
+#: Merge.rc:2113
msgid "Single instance mode:"
msgstr "Modalità a singola istanza:"
#. IDD_PROPPAGE_GENERAL, IDC_ASK_MULTIWINDOW_CLOSE
-#: Merge.rc:2105
+#: Merge.rc:2115
msgid "As&k when closing multiple windows"
msgstr "Conferma c&hiusura di più finestre"
#. IDD_PROPPAGE_GENERAL, IDC_PRESERVE_FILETIME
-#: Merge.rc:2107
+#: Merge.rc:2117
msgid "&Preserve file time in file compare"
msgstr "&Preserva orario del file durante il confronto"
#. IDD_PROPPAGE_GENERAL, IDC_STARTUP_FOLDER_SELECT
-#: Merge.rc:2109
+#: Merge.rc:2119
msgid "Show \"Select Files or Folders\" dialog on startup"
msgstr "All'avvio visualizza la finestra “Seleziona file o cartelle”"
#. IDD_PROPPAGE_GENERAL, IDC_CLOSE_WITH_OK
-#: Merge.rc:2111
+#: Merge.rc:2121
msgid "Close \"Select Files or Folders\" dialog on clicking Compare button"
msgstr ""
"Quando si seleziona \"Confronta\" visualizza la finestra “Seleziona file o "
"cartelle”"
#. IDD_PROPPAGE_GENERAL, IDC_STATIC
-#: Merge.rc:2113
+#: Merge.rc:2123
msgid "Op&en dialog Auto completion:"
msgstr "Com&pletamento automatico selezione file:"
#. IDD_PROPPAGE_GENERAL, IDC_STATIC
-#: Merge.rc:2115
+#: Merge.rc:2125
msgid "Auto-&reload modified files:"
msgstr "&Ricarica automaticamente file modificati:"
#. IDD_PROPPAGE_GENERAL, IDC_STATIC
-#: Merge.rc:2117
+#: Merge.rc:2127
msgid "Language:"
msgstr "Lingua:"
#. IDD_PROPPAGE_COMPARE_WEBPAGE, IDC_COMPARE_DEFAULTS
-#: Merge.rc:2119 Merge.rc:2299 Merge.rc:2321 Merge.rc:2352 Merge.rc:2369
-#: Merge.rc:2386 Merge.rc:2394 Merge.rc:2430 Merge.rc:2454 Merge.rc:2633
-#: Merge.rc:2644 Merge.rc:2653 Merge.rc:2887 Merge.rc:2922 Merge.rc:2985
-#: Merge.rc:3010 Merge.rc:3024 Merge.rc:3038 Merge.rc:3054
+#: Merge.rc:2129 Merge.rc:2309 Merge.rc:2331 Merge.rc:2362 Merge.rc:2379
+#: Merge.rc:2396 Merge.rc:2404 Merge.rc:2440 Merge.rc:2464 Merge.rc:2643
+#: Merge.rc:2654 Merge.rc:2663 Merge.rc:2897 Merge.rc:2932 Merge.rc:2995
+#: Merge.rc:3020 Merge.rc:3034 Merge.rc:3048 Merge.rc:3064
msgid "Defaults"
msgstr "Predefinito"
#. IDS_OPTIONSPG_COLORS
-#: Merge.rc:2124 Merge.rc:2140 Merge.rc:2267 Merge.rc:2292 Merge.rc:4205
+#: Merge.rc:2134 Merge.rc:2150 Merge.rc:2277 Merge.rc:2302 Merge.rc:4215
msgid "Colors"
msgstr "Colori"
#. IDD_PROPPAGE_COLOR_SCHEMES, IDC_STATIC
-#: Merge.rc:2127
+#: Merge.rc:2137
msgid "Color &mode:"
msgstr "&Modo colore:"
#. IDD_PROPPAGE_COLOR_SCHEMES, IDC_STATIC
-#: Merge.rc:2129
+#: Merge.rc:2139
msgid "&Light mode scheme:"
msgstr "Modo schema c&hiaro:"
#. IDD_PROPPAGE_COLOR_SCHEMES, IDC_STATIC
-#: Merge.rc:2131
+#: Merge.rc:2141
msgid "&Dark mode scheme:"
msgstr "Mo&do schema scuro:"
#. IDD_PROPPAGE_COLOR_SCHEMES, IDC_STATIC
-#: Merge.rc:2133
+#: Merge.rc:2143
msgid "Your custom schemes"
msgstr "Schemi personalizzati"
#. IDD_PROPPAGE_COLOR_SCHEMES, IDC_COLOR_SCHEME_SAVE
-#: Merge.rc:2134
+#: Merge.rc:2144
msgid "&Save current scheme..."
msgstr "&Salva schema attuale..."
#. IDD_PROPPAGE_COLOR_SCHEMES, IDC_COLOR_SCHEME_DELETE
-#: Merge.rc:2135
+#: Merge.rc:2145
msgid "Delete ¤t scheme..."
msgstr "Elimina s&chema attuale..."
#. IDD_PROPPAGE_COLORS_DIR, IDC_BACKGROUND_COLUMN_LABEL
-#: Merge.rc:2143 Merge.rc:2238 Merge.rc:2258 Merge.rc:2272
+#: Merge.rc:2153 Merge.rc:2248 Merge.rc:2268 Merge.rc:2282
msgid "Background"
msgstr "Sfondo"
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2144
+#: Merge.rc:2154
msgid "Deleted"
msgstr "Eliminata"
#. IDS_OPTIONSPG_TEXTCOLORS
-#: Merge.rc:2145 Merge.rc:2207 Merge.rc:2239 Merge.rc:2273 Merge.rc:4207
+#: Merge.rc:2155 Merge.rc:2217 Merge.rc:2249 Merge.rc:2283 Merge.rc:4217
msgid "Text"
msgstr "Testo"
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2146
+#: Merge.rc:2156
msgid "Difference:"
msgstr "Differenza:"
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2151
+#: Merge.rc:2161
msgid "Selected Difference:"
msgstr "Differenza selezionata:"
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2156
+#: Merge.rc:2166
msgid "Ignored Difference:"
msgstr "Differenza ignorata:"
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2161
+#: Merge.rc:2171
msgid "Moved:"
msgstr "Spostata:"
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2166
+#: Merge.rc:2176
msgid "Selected Moved:"
msgstr "Selezionata spostata:"
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2171
+#: Merge.rc:2181
msgid "Same As Next (3 panes):"
msgstr "Come quella successiva (3 pannelli):"
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2176
+#: Merge.rc:2186
msgid "Same As Next (Selected):"
msgstr "Come quella successiva (selezionata):"
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2181
+#: Merge.rc:2191
msgid "Word Difference:"
msgstr "Differenza di parole:"
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2186
+#: Merge.rc:2196
msgid "Selected Word Diff:"
msgstr "Diff. parole selezionata:"
#. IDD_INPUTBOX
-#: Merge.rc:2195 Merge.rc:2230 Merge.rc:2251 Merge.rc:3099
+#: Merge.rc:2205 Merge.rc:2240 Merge.rc:2261 Merge.rc:3109
msgid "Dialog"
msgstr "Finestra di dialogo"
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC
-#: Merge.rc:2198
+#: Merge.rc:2208
msgid "Keywords:"
msgstr "Parole chiave:"
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC
-#: Merge.rc:2199
+#: Merge.rc:2209
msgid "Function names:"
msgstr "Nomi funzione:"
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC
-#: Merge.rc:2200
+#: Merge.rc:2210
msgid "Comments:"
msgstr "Commenti:"
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC
-#: Merge.rc:2201
+#: Merge.rc:2211
msgid "Numbers:"
msgstr "Numeri:"
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC
-#: Merge.rc:2202
+#: Merge.rc:2212
msgid "Operators:"
msgstr "Operatori:"
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC
-#: Merge.rc:2203
+#: Merge.rc:2213
msgid "Strings:"
msgstr "Stringhe:"
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC
-#: Merge.rc:2204
+#: Merge.rc:2214
msgid "Preprocessor:"
msgstr "Preprocessore:"
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC
-#: Merge.rc:2205
+#: Merge.rc:2215
msgid "User 1:"
msgstr "Utente 1:"
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC
-#: Merge.rc:2206
+#: Merge.rc:2216
msgid "User 2:"
msgstr "Utente 2:"
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_SCOLOR_USER2_BOLD
-#: Merge.rc:2209 Merge.rc:2211 Merge.rc:2213 Merge.rc:2215 Merge.rc:2217
-#: Merge.rc:2219 Merge.rc:2221 Merge.rc:2223 Merge.rc:2225
+#: Merge.rc:2219 Merge.rc:2221 Merge.rc:2223 Merge.rc:2225 Merge.rc:2227
+#: Merge.rc:2229 Merge.rc:2231 Merge.rc:2233 Merge.rc:2235
msgid "Bold"
msgstr "Grassetto"
#. IDD_PROPPAGE_COLORS_TEXT, IDC_DEFAULT_STANDARD_COLORS
-#: Merge.rc:2233
+#: Merge.rc:2243
msgid "&Use customized text colors"
msgstr "Per il testo &usa colori personalizzati"
#. IDD_PROPPAGE_COLORS_TEXT, IDC_WHITESPACE_COLOR_LABEL
-#: Merge.rc:2235
+#: Merge.rc:2245
msgid "Whitespace:"
msgstr "Spazi:"
#. IDD_PROPPAGE_COLORS_TEXT, IDC_TEXT_COLOR_LABEL
-#: Merge.rc:2236
+#: Merge.rc:2246
msgid "Regular text:"
msgstr "Testo normale:"
#. IDD_PROPPAGE_COLORS_TEXT, IDC_SELECTION_COLOR_LABEL
-#: Merge.rc:2237
+#: Merge.rc:2247
msgid "Selection:"
msgstr "Selezione:"
#. IDD_PROPPAGE_COLORS_DIR, IDC_STATIC
-#: Merge.rc:2245 Merge.rc:2286
+#: Merge.rc:2255 Merge.rc:2296
msgid "Margin:"
msgstr "Margine:"
#. IDD_PROPPAGE_COLORS_MARKER, IDC_MARKER0_COLOR_LABEL
-#: Merge.rc:2254
+#: Merge.rc:2264
msgid "Search Marker:"
msgstr "Cerca segnaposto:"
#. IDD_PROPPAGE_COLORS_MARKER, IDC_MARKER1_COLOR_LABEL
-#: Merge.rc:2255
+#: Merge.rc:2265
msgid "User Defined Marker 1:"
msgstr "Segnaposto predefinito 1:"
#. IDD_PROPPAGE_COLORS_MARKER, IDC_MARKER2_COLOR_LABEL
-#: Merge.rc:2256
+#: Merge.rc:2266
msgid "User Defined Marker 2:"
msgstr "Segnaposto predefinito 2:"
#. IDD_PROPPAGE_COLORS_MARKER, IDC_MARKER3_COLOR_LABEL
-#: Merge.rc:2257
+#: Merge.rc:2267
msgid "User Defined Marker 3:"
msgstr "Segnaposto predefinito 3:"
#. IDD_PROPPAGE_COLORS_DIR, IDC_USE_DIR_COMPARE_COLORS
-#: Merge.rc:2270
+#: Merge.rc:2280
msgid "&Use folder compare colors"
msgstr "&Usa colori confronto cartelle"
#. IDD_PROPPAGE_COLORS_DIR, IDC_STATIC
-#: Merge.rc:2274
+#: Merge.rc:2284
msgid "Items equal:"
msgstr "Elementi uguali:"
#. IDD_PROPPAGE_COLORS_DIR, IDC_STATIC
-#: Merge.rc:2277
+#: Merge.rc:2287
msgid "Items different:"
msgstr "Elementi differenti:"
#. IDD_PROPPAGE_COLORS_DIR, IDC_STATIC
-#: Merge.rc:2280
+#: Merge.rc:2290
msgid "Items missing:"
msgstr "Elementi inesistenti:"
#. IDD_PROPPAGE_COLORS_DIR, IDC_STATIC
-#: Merge.rc:2283
+#: Merge.rc:2293
msgid "Items filtered:"
msgstr "Elementi filtrati:"
#. IDD_PROPPAGE_COLORS_SYSTEM, IDC_SYSCOLOR_HOOK_ENABLED
-#: Merge.rc:2295
+#: Merge.rc:2305
msgid "&Use custom system colors"
msgstr "&Usa colori sistema personalizzati"
#. IDS_PRPCAT_SYSTEM
-#: Merge.rc:2304 Merge.rc:4211 Merge.rc:4212 Merge.rc:4657
+#: Merge.rc:2314 Merge.rc:4221 Merge.rc:4222 Merge.rc:4667
msgid "System"
msgstr "Sistema"
#. IDD_PROPPAGE_SYSTEM, IDC_USE_RECYCLE_BIN
-#: Merge.rc:2307
+#: Merge.rc:2317
msgid "&Use Recycle Bin"
msgstr "Sposta i file eliminati nel &Cestino"
#. IDD_PROPPAGE_SYSTEM, IDC_STATIC
-#: Merge.rc:2308
+#: Merge.rc:2318
msgid "&External editor:"
msgstr "&Editor esterno:"
#. IDD_PROPPAGE_SYSTEM, IDC_STATIC
-#: Merge.rc:2311
+#: Merge.rc:2321
msgid "&Store user data in:"
msgstr "Memorizza dati utente in:"
#. IDD_PROPPAGE_SYSTEM, IDC_STATIC
-#: Merge.rc:2313
+#: Merge.rc:2323
msgid "&Filter folder:"
msgstr "Cartella &filtri:"
#. IDD_PROPPAGE_SYSTEM, IDC_STATIC
-#: Merge.rc:2316
+#: Merge.rc:2326
msgid "Temporary files folder"
msgstr "Cartella file temporanei"
#. IDD_PROPPAGE_SYSTEM, IDC_TMPFOLDER_SYSTEM
-#: Merge.rc:2317
+#: Merge.rc:2327
msgid "S&ystem temp folder"
msgstr "Cartella temporanea s&istema"
#. IDD_PROPPAGE_SYSTEM, IDC_STATIC
-#: Merge.rc:2318
+#: Merge.rc:2328
msgid "C&ustom folder:"
msgstr "Cartella &personalizzata:"
#. IDD_GENERATE_PATCH, IDC_DIFF_BROWSE_FILE2
-#: Merge.rc:2320 Merge.rc:2416
+#: Merge.rc:2330 Merge.rc:2426
msgid "Br&owse..."
msgstr "Sf&oglia..."
#. IDS_OPTIONSPG_COMPARE
-#: Merge.rc:2326 Merge.rc:4200
+#: Merge.rc:2336 Merge.rc:4210
msgid "Compare"
msgstr "Confronta"
#. IDD_PROPPAGE_COMPARE, IDC_STATIC
-#: Merge.rc:2329
+#: Merge.rc:2339
msgid "Whitespaces"
msgstr "Spazi"
#. IDD_PROPPAGE_COMPARE, IDC_WHITESPACE
-#: Merge.rc:2330
+#: Merge.rc:2340
msgid "&Compare"
msgstr "&Confronta"
#. IDD_PROPPAGE_COMPARE, IDC_WHITE_CHANGE
-#: Merge.rc:2331
+#: Merge.rc:2341
msgid "&Ignore change"
msgstr "&Ignora cambiamento"
#. IDD_PROPPAGE_COMPARE, IDC_ALL_WHITE
-#: Merge.rc:2332
+#: Merge.rc:2342
msgid "I&gnore all"
msgstr "I&gnora tutto"
#. IDD_PROPPAGE_COMPARE, IDC_IGNBLANKS_CHECK
-#: Merge.rc:2333
+#: Merge.rc:2343
msgid "Ignore blan&k lines"
msgstr "Ign&ora le linee vuote"
#. IDD_PROPPAGE_COMPARE, IDC_IGNCASE_CHECK
-#: Merge.rc:2334
+#: Merge.rc:2344
msgid "Ignore &case"
msgstr "Ig&nora differenze maiuscole/minuscole"
#. IDD_PROPPAGE_COMPARE, IDC_EOL_SENSITIVE
-#: Merge.rc:2335
+#: Merge.rc:2345
msgid "Igno&re EOL differences (Windows/Unix/Mac)"
msgstr "Igno&ra differenze fine riga (Windows/Unix/Mac)"
#. IDD_PROPPAGE_COMPARE, IDC_IGNORE_NUMBERS
-#: Merge.rc:2337
+#: Merge.rc:2347
msgid "Ignore num&bers"
msgstr "Ignora i nu&meri"
#. IDD_PROPPAGE_COMPARE, IDC_CP_SENSITIVE
-#: Merge.rc:2338
+#: Merge.rc:2348
msgid "Ignore codepage &differences"
msgstr "Ignora differenze di codice di &pagina"
#. IDD_PROPPAGE_COMPARE, IDC_FILTERCOMMENTS_CHECK
-#: Merge.rc:2339
+#: Merge.rc:2349
msgid "Ignore c&omment differences"
msgstr "Ignora le differenze nei c&ommenti"
#. IDD_PROPPAGE_COMPARE, IDC_IGNEOFEOL_CHECK
-#: Merge.rc:2341
+#: Merge.rc:2351
msgid "Ignore &missing trailing EOL"
msgstr "Ignora EOL finale &mancante"
#. IDD_PROPPAGE_COMPARE, IDC_IGNLBRKS_CHECK
-#: Merge.rc:2343
+#: Merge.rc:2353
msgid "Ignore line &breaks (treat as spaces)"
msgstr "Ignora interru&zioni linea (trattale come spazi)"
#. IDD_PROPPAGE_COMPARE, IDC_MOVED_BLOCKS
-#: Merge.rc:2345
+#: Merge.rc:2355
msgid "E&nable moved block detection"
msgstr "Attiva rilevamento blocc&hi spostati"
#. IDD_PROPPAGE_COMPARE, IDC_ALIGN_SIMILAR_LINES
-#: Merge.rc:2346
+#: Merge.rc:2356
msgid "Align &similar lines"
msgstr "Allinea le righe &simili"
#. IDD_PROPPAGE_COMPARE, IDC_STATIC
-#: Merge.rc:2347
+#: Merge.rc:2357
msgid "Diff &algorithm:"
msgstr "&Algoritmo differenze:"
#. IDD_PROPPAGE_COMPARE, IDC_INDENT_HEURISTIC
-#: Merge.rc:2349
+#: Merge.rc:2359
msgid "Enable indent &heuristic"
msgstr "Abilita rientro &euristico"
#. IDD_PROPPAGE_COMPARE, IDC_COMPLETELY_BLANK_OUT_IGNORED_DIFFERENCES
-#: Merge.rc:2350
+#: Merge.rc:2360
msgid "Completely unhighlight the ignored differences"
msgstr "Rimuovi completamente l'evidenziazione dalle differenze ignorate"
#. IDS_OPTIONSPG_EDITOR
-#: Merge.rc:2357 Merge.rc:4201
+#: Merge.rc:2367 Merge.rc:4211
msgid "Editor"
msgstr "Editor"
#. IDD_PROPPAGE_EDITOR, IDC_HILITE_CHECK
-#: Merge.rc:2360
+#: Merge.rc:2370
msgid "&Highlight syntax"
msgstr "E&videnzia sintassi"
#. IDD_PROPPAGE_EDITOR, IDC_MIXED_EOL
-#: Merge.rc:2361
+#: Merge.rc:2371
msgid "&Preserve original EOL"
msgstr "&Conserva terminatori di riga originali"
#. IDD_PROPPAGE_EDITOR, IDC_STATIC
-#: Merge.rc:2362
+#: Merge.rc:2372
msgid "Tabs"
msgstr "Tabulazioni"
#. IDD_PROPPAGE_EDITOR, IDC_STATIC
-#: Merge.rc:2363
+#: Merge.rc:2373
msgid "&Tab size:"
msgstr "&Dimensione tabulazioni:"
#. IDD_PROPPAGE_EDITOR, IDC_PROP_INSERT_TABS
-#: Merge.rc:2365
+#: Merge.rc:2375
msgid "&Insert tabs"
msgstr "&Inserisci tabulazioni"
#. IDD_PROPPAGE_EDITOR, IDC_PROP_INSERT_SPACES
-#: Merge.rc:2366
+#: Merge.rc:2376
msgid "Insert &spaces"
msgstr "In&serisci spazi"
#. IDD_PROPPAGE_EDITOR, IDC_STATIC
-#: Merge.rc:2367
+#: Merge.rc:2377
msgid "&Rendering mode:"
msgstr "Modo &rendering:"
#. IDD_PROPPAGE_EDITOR_COMPAREMERGE, IDC_AUTOMRESCAN_CHECK
-#: Merge.rc:2376
+#: Merge.rc:2386
msgid "&Automatic rescan"
msgstr "Rianalisi &automatica"
#. IDD_PROPPAGE_EDITOR_COMPAREMERGE, IDC_STATIC
-#: Merge.rc:2377
+#: Merge.rc:2387
msgid "Copy &granularity for selected differences:"
msgstr "Copia granularità per le differenze selezionate:"
#. IDD_PROPPAGE_EDITOR_COMPAREMERGE, IDC_LINE_COLORING_GROUP
-#: Merge.rc:2379
+#: Merge.rc:2389
msgid "Line Difference Coloring"
msgstr "Colorazione differenze di linea"
#. IDD_PROPPAGE_EDITOR_COMPAREMERGE, IDC_VIEW_LINE_DIFFERENCES
-#: Merge.rc:2380
+#: Merge.rc:2390
msgid "View line differences"
msgstr "Visualizza differenze di linea"
#. IDD_PROPPAGE_EDITOR_COMPAREMERGE, IDC_EDITOR_CHARLEVEL
-#: Merge.rc:2381
+#: Merge.rc:2391
msgid "&Character-level"
msgstr "Livello &caratteri"
#. IDD_PROPPAGE_EDITOR_COMPAREMERGE, IDC_EDITOR_WORDLEVEL
-#: Merge.rc:2382
+#: Merge.rc:2392
msgid "&Word-level:"
msgstr "Livello &parole:"
#. IDD_PROPPAGE_EDITOR_COMPAREMERGE, IDC_STATIC
-#: Merge.rc:2384
+#: Merge.rc:2394
msgid "W&ord break characters:"
msgstr "Caratteri terminatori &parola:"
#. IDD_PROPPAGE_MESSAGEBOXES, IDC_STATIC
-#: Merge.rc:2401
+#: Merge.rc:2411
msgid ""
"Some messages can be hidden by the user. Press Reset to make all messages "
"visible again."
@@ -3698,399 +3709,399 @@ msgstr ""
"Per rendere di nuovo visibili tutti i messaggi seleziona 'Ripristina'."
#. IDD_SELECT_FILES_OR_FOLDERS, IDC_RESET
-#: Merge.rc:2402 Merge.rc:3085
+#: Merge.rc:2412 Merge.rc:3095
msgid "Reset"
msgstr "Ripristina"
#. IDD_GENERATE_PATCH
-#: Merge.rc:2408
+#: Merge.rc:2418
msgid "Patch Generator"
msgstr "Generatore patch"
#. IDD_GENERATE_PATCH, IDC_STATIC
-#: Merge.rc:2411
+#: Merge.rc:2421
msgid "File&1:"
msgstr "File&1:"
#. IDD_GENERATE_PATCH, IDC_STATIC
-#: Merge.rc:2414
+#: Merge.rc:2424
msgid "File&2:"
msgstr "File&2:"
#. IDD_GENERATE_PATCH, IDC_DIFF_SWAPFILES
-#: Merge.rc:2417
+#: Merge.rc:2427
msgid "&Swap"
msgstr "&Scambia"
#. IDD_DIRCMP_REPORT, IDC_REPORT_COPYCLIPBOARD
-#: Merge.rc:2418 Merge.rc:2690
+#: Merge.rc:2428 Merge.rc:2700
msgid "&Copy to clipboard"
msgstr "&Copia negli Appunti"
#. IDD_GENERATE_PATCH, IDC_DIFF_APPENDFILE
-#: Merge.rc:2419
+#: Merge.rc:2429
msgid "&Append to existing file"
msgstr "&Appendi a file esistente"
#. IDD_GENERATE_PATCH, IDC_STATIC
-#: Merge.rc:2420
+#: Merge.rc:2430
msgid "&Result:"
msgstr "Ris&ultato:"
#. IDD_GENERATE_PATCH, IDC_DIFF_BROWSE_RESULT
-#: Merge.rc:2422
+#: Merge.rc:2432
msgid "Bro&wse..."
msgstr "Sf&oglia..."
#. IDD_GENERATE_PATCH, IDC_STATIC
-#: Merge.rc:2423
+#: Merge.rc:2433
msgid "&Format"
msgstr "&Formato"
#. IDD_GENERATE_PATCH, IDC_STATIC
-#: Merge.rc:2424
+#: Merge.rc:2434
msgid "St&yle:"
msgstr "Sti&le:"
#. IDD_GENERATE_PATCH, IDC_STATIC
-#: Merge.rc:2426
+#: Merge.rc:2436
msgid "&Context:"
msgstr "&Contesto:"
#. IDD_GENERATE_PATCH, IDC_DIFF_INCLCMDLINE
-#: Merge.rc:2428
+#: Merge.rc:2438
msgid "Inclu&de command line"
msgstr "Includi &linea di comando"
#. IDD_GENERATE_PATCH, IDC_DIFF_OPENTOEDITOR
-#: Merge.rc:2429
+#: Merge.rc:2439
msgid "Open in e&xternal editor"
msgstr "Apri in e&ditor esterno"
#. IDD_DIRCOLS
-#: Merge.rc:2446
+#: Merge.rc:2456
msgid "Display Columns"
msgstr "Scelta delle colonne"
#. IDD_DIRCOLS, IDC_UP
-#: Merge.rc:2450
+#: Merge.rc:2460
msgid "Move &Up"
msgstr "Sposta &su"
#. IDD_DIRCOLS, IDC_DOWN
-#: Merge.rc:2451
+#: Merge.rc:2461
msgid "Move &Down"
msgstr "Sposta &giù"
#. IDD_DIRCOLS, IDC_COLDLG_ADDITIONAL_PROPERTIES
-#: Merge.rc:2453
+#: Merge.rc:2463
msgid "&Additional Properties"
msgstr "Proprietà &aggiuntive"
#. IDD_DIRADDITIONALPROPS
-#: Merge.rc:2461
+#: Merge.rc:2471
msgid "Additional Properties"
msgstr "Proprietà aggiuntive"
#. IDD_PLUGINS_SELECTPLUGIN
-#: Merge.rc:2475
+#: Merge.rc:2485
msgid "Select Plugin"
msgstr "Seleziona plugin"
#. IDD_PLUGINS_EDITPLUGIN, IDC_STATIC
-#: Merge.rc:2478 Merge.rc:3115
+#: Merge.rc:2488 Merge.rc:3125
msgid "Plugin &name:"
msgstr "&Nome plugin:"
#. IDD_PLUGINS_SELECTPLUGIN, IDC_STATIC
-#: Merge.rc:2480
+#: Merge.rc:2490
msgid "&Target files:"
msgstr "&File destinazione:"
#. IDD_PLUGINS_EDITPLUGIN, IDC_STATIC
-#: Merge.rc:2482 Merge.rc:3117
+#: Merge.rc:2492 Merge.rc:3127
msgid "Extensions list:"
msgstr "Elenco estensioni:"
#. IDD_PLUGINS_EDITPLUGIN, IDC_STATIC
-#: Merge.rc:2484 Merge.rc:3119
+#: Merge.rc:2494 Merge.rc:3129
msgid "Description:"
msgstr "Descrizione:"
#. IDD_PLUGINS_EDITPLUGIN, IDC_STATIC
-#: Merge.rc:2486 Merge.rc:3121
+#: Merge.rc:2496 Merge.rc:3131
msgid "Default arguments:"
msgstr "Parametri predefiniti:"
#. IDD_PLUGINS_SELECTPLUGIN, IDC_PLUGIN_ALLOW_ALL
-#: Merge.rc:2488
+#: Merge.rc:2498
msgid "Display all plugins (Ignore extension)"
msgstr "Visualizza tutti i plugin, senza verificare l'estensione"
#. IDD_PLUGINS_SELECTPLUGIN, IDC_PLUGIN_OPEN_IN_SAME_FRAME_TYPE
-#: Merge.rc:2490
+#: Merge.rc:2500
msgid "&Open files in same window type after unpacking"
msgstr "Dopo aver scompatto i file &aprili nello stesso tipo di finestra"
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_PIPELINE_STATIC
-#: Merge.rc:2492 Merge.rc:3129
+#: Merge.rc:2502 Merge.rc:3139
msgid "&Plugin pipeline:"
msgstr "Pipeline &plugin:"
#. IDD_PLUGINS_SELECTPLUGIN, IDC_PLUGIN_ALIAS
-#: Merge.rc:2495
+#: Merge.rc:2505
msgid "&Alias..."
msgstr "&Alias..."
#. IDD_DIRCOMP_PROGRESS, IDC_COMPARISON_STOP
-#: Merge.rc:2505
+#: Merge.rc:2515
msgid "Stop"
msgstr "Stop"
#. IDD_DIRCOMP_PROGRESS, IDC_COMPARISON_PAUSE
-#: Merge.rc:2506
+#: Merge.rc:2516
msgid "Pause"
msgstr "Pausa"
#. IDD_DIRCOMP_PROGRESS, IDC_COMPARISON_CONTINUE
-#: Merge.rc:2507
+#: Merge.rc:2517
msgid "Continue"
msgstr "Continua"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC
-#: Merge.rc:2509 Merge.rc:2973
+#: Merge.rc:2519 Merge.rc:2983
msgid "C&PU cores to use:"
msgstr "&Numero core CPU da usare:"
#. IDD_DIRCOMP_PROGRESS, IDC_STATIC
-#: Merge.rc:2510
+#: Merge.rc:2520
msgid "Items total:"
msgstr "Totale elementi:"
#. IDD_DIRCOMP_PROGRESS, IDC_STATIC
-#: Merge.rc:2511
+#: Merge.rc:2521
msgid "Items compared:"
msgstr "Elementi confrontati:"
#. IDS_PREVIEWBAR_CLOSE
-#: Merge.rc:2526 Merge.rc:2846 Merge.rc:5328
+#: Merge.rc:2536 Merge.rc:2856 Merge.rc:5339
msgid "&Close"
msgstr "&Chiudi"
#. IDD_WMGOTO
-#: Merge.rc:2537
+#: Merge.rc:2547
msgid "Go to"
msgstr "Vai a"
#. IDD_WMGOTO, IDC_STATIC
-#: Merge.rc:2540
+#: Merge.rc:2550
msgid "G&o to:"
msgstr "Va&i a:"
#. IDD_WMGOTO, IDC_STATIC
-#: Merge.rc:2543
+#: Merge.rc:2553
msgid "File"
msgstr "File"
#. IDD_WMGOTO, IDC_STATIC
-#: Merge.rc:2547
+#: Merge.rc:2557
msgid "Go to what"
msgstr "Vai a cosa"
#. IDD_WMGOTO, IDC_WMGOTO_TOLINE
-#: Merge.rc:2548
+#: Merge.rc:2558
msgid "Li&ne"
msgstr "Li&nea"
#. IDD_WMGOTO, IDC_WMGOTO_TODIFF
-#: Merge.rc:2549
+#: Merge.rc:2559
msgid "&Difference"
msgstr "Di&fferenza"
#. IDD_WMGOTO, IDOK
-#: Merge.rc:2550
+#: Merge.rc:2560
msgid "&Go to"
msgstr "&Vai"
#. IDS_PROJECT_ITEM_FILE_FILTER
-#: Merge.rc:2556 Merge.rc:4321
+#: Merge.rc:2566 Merge.rc:4331
msgid "File Filters"
msgstr "Filtri file"
#. IDD_FILTERS_FILEFILTERS, IDC_STATIC
-#: Merge.rc:2559
+#: Merge.rc:2569
msgid "&Mask / Filter Expression"
msgstr "Espressione filtro/&maschera"
#. IDD_FILTERS_FILEFILTERS, IDC_STATIC
-#: Merge.rc:2562
+#: Merge.rc:2572
msgid "Preset &Filters"
msgstr "Filtro &pre-impostazioni"
#. IDD_FILTERS_FILEFILTERS, IDC_FILTERFILE_TEST_BTN
-#: Merge.rc:2564
+#: Merge.rc:2574
msgid "Test..."
msgstr "Prova..."
#. IDD_FILTERS_FILEFILTERS, IDC_FILTERFILE_INSTALL
-#: Merge.rc:2565
+#: Merge.rc:2575
msgid "Install..."
msgstr "Installa..."
#. IDD_FILTERS_FILEFILTERS, IDC_FILTERFILE_NEWBTN
-#: Merge.rc:2566
+#: Merge.rc:2576
msgid "New..."
msgstr "Nuovo..."
#. IDD_FILTERS_FILEFILTERS, IDC_FILTERFILE_EDITBTN
-#: Merge.rc:2567
+#: Merge.rc:2577
msgid "Edit..."
msgstr "Modifica..."
#. IDD_FILTERS_FILEFILTERS, IDC_FILTERFILE_DELETEBTN
-#: Merge.rc:2568
+#: Merge.rc:2578
msgid "Delete..."
msgstr "Elimina..."
#. IDD_FILTERS_CONDITION
-#: Merge.rc:2573
+#: Merge.rc:2583
msgid "Filter Condition"
msgstr "Condizione filtro"
#. IDD_FILTERS_CONDITION, IDC_STATIC
-#: Merge.rc:2576
+#: Merge.rc:2586
msgid "&Left-hand side:"
msgstr "&Lato sinistro::"
#. IDD_FILTERS_CONDITION, IDC_STATIC
-#: Merge.rc:2578
+#: Merge.rc:2588
msgid "&Operator:"
msgstr "&Operatore:"
#. IDD_FILTERS_CONDITION, IDC_STATIC
-#: Merge.rc:2580
+#: Merge.rc:2590
msgid "&Right-hand side:"
msgstr "Lato dest&ro:"
#. IDD_FILTERS_CONDITION, IDC_STATIC
-#: Merge.rc:2586
+#: Merge.rc:2596
msgid "Expression:"
msgstr "Espressione:"
#. IDD_COMPARISON_RESULT_FILTER
-#: Merge.rc:2595
+#: Merge.rc:2605
msgid "Filter by Comparison Result"
msgstr "Filtra per risultati confronto"
#. IDD_COMPARISON_RESULT_FILTER, IDC_RADIO_INCLUDE
-#: Merge.rc:2598
+#: Merge.rc:2608
msgid "&Include"
msgstr "&Includi"
#. IDD_COMPARISON_RESULT_FILTER, IDC_RADIO_EXCLUDE
-#: Merge.rc:2599
+#: Merge.rc:2609
msgid "&Exclude"
msgstr "&Excludi"
#. IDD_COMPARISON_RESULT_FILTER, IDC_STATIC
-#: Merge.rc:2600
+#: Merge.rc:2610
msgid "Comparison Results"
msgstr "Risultati confronto"
#. IDS_IDENTICAL
-#: Merge.rc:2601 Merge.rc:2733 Merge.rc:2794 Merge.rc:4698
+#: Merge.rc:2611 Merge.rc:2743 Merge.rc:2804 Merge.rc:4708
msgid "Identical"
msgstr "Identici"
#. IDS_DIFFERENT
-#: Merge.rc:2602 Merge.rc:2714 Merge.rc:2755 Merge.rc:4708
+#: Merge.rc:2612 Merge.rc:2724 Merge.rc:2765 Merge.rc:4718
msgid "Different"
msgstr "Diversi"
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_LEFT_ONLY
-#: Merge.rc:2603
+#: Merge.rc:2613
msgid "Left only"
msgstr "Solo sinistro"
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_RIGHT_ONLY
-#: Merge.rc:2604
+#: Merge.rc:2614
msgid "Right only"
msgstr "Solo destro"
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_SKIPPED
-#: Merge.rc:2605
+#: Merge.rc:2615
msgid "Skipped"
msgstr "Ignorato"
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_MIDDLE_ONLY
-#: Merge.rc:2606
+#: Merge.rc:2616
msgid "Middle only"
msgstr "Solo centrale"
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_LEFT_ONLY_DIFFERENT
-#: Merge.rc:2607
+#: Merge.rc:2617
msgid "Left only (different)"
msgstr "Solo sinistro (differente)"
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_MIDDLE_ONLY_DIFFERENT
-#: Merge.rc:2608
+#: Merge.rc:2618
msgid "Middle only (different)"
msgstr "Solo centrale (differente)"
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_RIGHT_ONLY_DIFFERENT
-#: Merge.rc:2609
+#: Merge.rc:2619
msgid "Right only (different)"
msgstr "Solo destro (differente)"
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_LEFT_ONLY_MISSING
-#: Merge.rc:2610
+#: Merge.rc:2620
msgid "Left only (missing)"
msgstr "Solo sinistro (mancante)"
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_MIDDLE_ONLY_MISSING
-#: Merge.rc:2611
+#: Merge.rc:2621
msgid "Middle only (missing)"
msgstr "Solo centrale (mancante)"
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_RIGHT_ONLY_MISSING
-#: Merge.rc:2612
+#: Merge.rc:2622
msgid "Right only (missing)"
msgstr "Solo destro (mancante)"
#. IDS_OPTIONSPG_CODEPAGE
-#: Merge.rc:2619 Merge.rc:2811 Merge.rc:4213
+#: Merge.rc:2629 Merge.rc:2821 Merge.rc:4223
msgid "Codepage"
msgstr "Codice pagina"
#. IDD_PROPPAGE_CODEPAGE, IDC_STATIC
-#: Merge.rc:2622
+#: Merge.rc:2632
msgid "Default Codepage"
msgstr "Codice pagina predefinito"
#. IDD_PROPPAGE_CODEPAGE, IDC_STATIC
-#: Merge.rc:2623
+#: Merge.rc:2633
msgid "Select the default codepage for non-Unicode files:"
msgstr ""
"Seleziona il codice pagina predefinito assegnato al caricamento di file non-"
"Unicode:"
#. IDD_PROPPAGE_CODEPAGE, IDC_CP_SYSTEM
-#: Merge.rc:2624
+#: Merge.rc:2634
msgid "System codepage"
msgstr "Codice pagina sistema"
#. IDD_PROPPAGE_CODEPAGE, IDC_CP_UI
-#: Merge.rc:2625
+#: Merge.rc:2635
msgid "According to WinMerge User Interface"
msgstr "Uguale all'interfaccia di WinMerge"
#. IDD_PROPPAGE_CODEPAGE, IDC_CP_CUSTOM
-#: Merge.rc:2626
+#: Merge.rc:2636
msgid "Custom codepage:"
msgstr "Codice pagina personalizzato:"
#. IDD_PROPPAGE_CODEPAGE, IDC_DETECT_CODEPAGE
-#: Merge.rc:2628
+#: Merge.rc:2638
msgid ""
"Detect codepage for: .html, .rc, .xml\n"
"Restart required."
@@ -4099,7 +4110,7 @@ msgstr ""
"Necessario riavvio della sessione."
#. IDD_PROPPAGE_CODEPAGE, IDC_DETECT_CODEPAGE2
-#: Merge.rc:2630
+#: Merge.rc:2640
msgid ""
"Detect codepage for files with mlang.dll\n"
"Restart required."
@@ -4108,769 +4119,769 @@ msgstr ""
"Necessario riavvio della sessione."
#. IDS_OPTIONSPG_ARCHIVE
-#: Merge.rc:2638 Merge.rc:4214
+#: Merge.rc:2648 Merge.rc:4224
msgid "Archive Support"
msgstr "Supporto archivi"
#. IDD_PROPPAGE_ARCHIVE, IDC_ARCHIVE_ENABLE
-#: Merge.rc:2641
+#: Merge.rc:2651
msgid "&Enable archive file support"
msgstr "&Attiva supporto file archivio"
#. IDD_PROPPAGE_ARCHIVE, IDC_ARCHIVE_DETECTTYPE
-#: Merge.rc:2642
+#: Merge.rc:2652
msgid "&Detect archive type from file signature"
msgstr "&Rileva il tipo di archivio dalla firma dei file"
#. IDD_PROPPAGE_PROJECT, IDC_STATIC
-#: Merge.rc:2651
+#: Merge.rc:2661
msgid "Items saved to or restored from the project file:"
msgstr "Elementi salvati o ripristinati dal file di progetto:"
#. IDD_SAVECLOSING
-#: Merge.rc:2658
+#: Merge.rc:2668
msgid "Save Modified Files?"
msgstr "Salvare i file modificati?"
#. IDD_SAVECLOSING, IDC_SAVECLOSING_LEFTFRAME
-#: Merge.rc:2661
+#: Merge.rc:2671
msgid "Left side file"
msgstr "File zona sinistra"
#. IDD_SAVECLOSING, IDC_SAVECLOSING_SAVELEFT
-#: Merge.rc:2663
+#: Merge.rc:2673
msgid "&Save changes"
msgstr "&Salva modifiche"
#. IDD_SAVECLOSING, IDC_SAVECLOSING_DISCARDLEFT
-#: Merge.rc:2664
+#: Merge.rc:2674
msgid "&Discard changes"
msgstr "S&carta modifiche"
#. IDD_SAVECLOSING, IDC_SAVECLOSING_MIDDLEFRAME
-#: Merge.rc:2665
+#: Merge.rc:2675
msgid "Middle side file"
msgstr "File zona centrale"
#. IDD_SAVECLOSING, IDC_SAVECLOSING_SAVEMIDDLE
-#: Merge.rc:2667
+#: Merge.rc:2677
msgid "Sa&ve changes"
msgstr "S&alva modifiche"
#. IDD_SAVECLOSING, IDC_SAVECLOSING_DISCARDMIDDLE
-#: Merge.rc:2668
+#: Merge.rc:2678
msgid "Discard c&hanges"
msgstr "Sca&rta modifiche"
#. IDD_SAVECLOSING, IDC_SAVECLOSING_RIGHTFRAME
-#: Merge.rc:2669
+#: Merge.rc:2679
msgid "Right side file"
msgstr "File zona destra"
#. IDD_SAVECLOSING, IDC_SAVECLOSING_SAVERIGHT
-#: Merge.rc:2671
+#: Merge.rc:2681
msgid "S&ave changes"
msgstr "Salva &modifiche"
#. IDD_SAVECLOSING, IDC_SAVECLOSING_DISCARDRIGHT
-#: Merge.rc:2672
+#: Merge.rc:2682
msgid "Dis&card changes"
msgstr "Sca&rta modifiche"
#. IDD_SAVECLOSING, IDC_SAVECLOSING_DISCARDALL
-#: Merge.rc:2673
+#: Merge.rc:2683
msgid "Disca&rd All"
msgstr "Scarta t&utto"
#. IDD_DIRCMP_REPORT
-#: Merge.rc:2680
+#: Merge.rc:2690
msgid "Folder Compare Report"
msgstr "Rapporto confronto tra cartelle"
#. IDD_DIRCMP_REPORT, IDC_STATIC
-#: Merge.rc:2683
+#: Merge.rc:2693
msgid "Report &file:"
msgstr "&File rapporto:"
#. IDD_DIRCMP_REPORT, IDC_STATIC
-#: Merge.rc:2686
+#: Merge.rc:2696
msgid "&Style:"
msgstr "&Stile:"
#. IDD_DIRCMP_REPORT, IDC_REPORT_INCLUDEFILECMPREPORT
-#: Merge.rc:2688
+#: Merge.rc:2698
msgid "&Include file compare report"
msgstr "&Includi il rapporto sul confronto tra file"
#. IDD_FILTERS_FILEFILTERS_SHARED
-#: Merge.rc:2697
+#: Merge.rc:2707
msgid "Shared or Private Filter"
msgstr "Filtro condiviso o privato"
#. IDD_FILTERS_FILEFILTERS_SHARED, IDC_STATIC
-#: Merge.rc:2700
+#: Merge.rc:2710
msgid "What type of filter do you want?"
msgstr "Che genere di filtro vuoi creare?"
#. IDD_FILTERS_FILEFILTERS_SHARED, IDC_SHARED
-#: Merge.rc:2701
+#: Merge.rc:2711
msgid "Shared Filter (for all users)"
msgstr "Filtro condiviso (per tutti gli utenti in questo computer)"
#. IDD_FILTERS_FILEFILTERS_SHARED, IDC_PRIVATE
-#: Merge.rc:2702
+#: Merge.rc:2712
msgid "Private Filter (current user only)"
msgstr "Filtro privato (solo per l'utente attuale)"
#. IDD_COMPARE_STATISTICS3
-#: Merge.rc:2709 Merge.rc:2750
+#: Merge.rc:2719 Merge.rc:2760
msgid "Compare Statistics"
msgstr "Statistiche confronto"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2712 Merge.rc:2753
+#: Merge.rc:2722 Merge.rc:2763
msgid "Folders:"
msgstr "Cartelle:"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2713 Merge.rc:2754
+#: Merge.rc:2723 Merge.rc:2764
msgid "Files:"
msgstr "File:"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2719 Merge.rc:2738 Merge.rc:2760 Merge.rc:2799
+#: Merge.rc:2729 Merge.rc:2748 Merge.rc:2770 Merge.rc:2809
msgid "Binary:"
msgstr "Binari:"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2722 Merge.rc:2763
+#: Merge.rc:2732 Merge.rc:2773
msgid "Unique"
msgstr "Unici"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2723 Merge.rc:2764
+#: Merge.rc:2733 Merge.rc:2774
msgid "Left:"
msgstr "Sinistra:"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2728 Merge.rc:2774
+#: Merge.rc:2738 Merge.rc:2784
msgid "Right:"
msgstr "Destra:"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2742 Merge.rc:2803
+#: Merge.rc:2752 Merge.rc:2813
msgid "Total:"
msgstr "Totale:"
#. IDD_COMPARE_STATISTICS3, IDOK
-#: Merge.rc:2745 Merge.rc:2806
+#: Merge.rc:2755 Merge.rc:2816
msgid "Close"
msgstr "Chiudi"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2769
+#: Merge.rc:2779
msgid "Middle:"
msgstr "Centrale:"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2779
+#: Merge.rc:2789
msgid "Missing Left:"
msgstr "Mancanti a sinistra:"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2784
+#: Merge.rc:2794
msgid "Missing Middle:"
msgstr "Mancanti al centro:"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2789
+#: Merge.rc:2799
msgid "Missing Right:"
msgstr "Mancanti a destra:"
#. IDD_LOAD_SAVE_CODEPAGE, IDC_AFFECTS_GROUP
-#: Merge.rc:2814
+#: Merge.rc:2824
msgid "Affects"
msgstr "Coinvolge"
#. IDD_LOAD_SAVE_CODEPAGE, IDC_RIGHT_FILES_LABEL
-#: Merge.rc:2816 Merge.rc:2818 Merge.rc:2820
+#: Merge.rc:2826 Merge.rc:2828 Merge.rc:2830
msgid "(Affects)"
msgstr "(Coinvolge)"
#. IDD_LOAD_SAVE_CODEPAGE, IDC_LOADING_GROUP
-#: Merge.rc:2821
+#: Merge.rc:2831
msgid "Select Codepage for"
msgstr "Seleziona codice pagina per"
#. IDD_LOAD_SAVE_CODEPAGE, IDC_LOAD_FILES_LABEL
-#: Merge.rc:2822
+#: Merge.rc:2832
msgid "&File Loading:"
msgstr "Caricamento &file:"
#. IDD_LOAD_SAVE_CODEPAGE, IDC_SAVE_FILES_LABEL
-#: Merge.rc:2824
+#: Merge.rc:2834
msgid "File &Saving:"
msgstr "&Salvataggio file:"
#. IDD_LOAD_SAVE_CODEPAGE, IDC_LOAD_SAVE_SAME_CODEPAGE
-#: Merge.rc:2827
+#: Merge.rc:2837
msgid "&Use same codepage for both"
msgstr "&Usa lo stesso codice pagina per entrambi"
#. IDS_MESSAGEBOX_CANCEL
-#: Merge.rc:2830 Merge.rc:4172
+#: Merge.rc:2840 Merge.rc:4182
msgid "&Cancel"
msgstr "Annu&lla"
#. IDD_FILTERS_FILEFILTERS_TEST
-#: Merge.rc:2835
+#: Merge.rc:2845
msgid "Test Filter"
msgstr "Verifica filtro"
#. IDD_FILTERS_FILEFILTERS_TEST, IDC_HEADER
-#: Merge.rc:2838
+#: Merge.rc:2848
msgid "Testing filter:"
msgstr "Verifica filtro in corso:"
#. IDD_FILTERS_FILEFILTERS_TEST, IDC_PROMPT_LABEL
-#: Merge.rc:2840
+#: Merge.rc:2850
msgid "&Enter text to test:"
msgstr "&Inserire il testo di prova:"
#. IDD_FILTERS_FILEFILTERS_TEST, IDC_IS_DIRECTORY
-#: Merge.rc:2842
+#: Merge.rc:2852
msgid "&Folder Name"
msgstr "&Nome cartella"
#. IDD_FILTERS_FILEFILTERS_TEST, IDC_STATIC
-#: Merge.rc:2843
+#: Merge.rc:2853
msgid "Result:"
msgstr "Risultato:"
#. IDD_FILTERS_FILEFILTERS_TEST, IDC_TEST_BTN
-#: Merge.rc:2845
+#: Merge.rc:2855
msgid "&Test"
msgstr "&Prova"
#. IDS_OPTIONSPG_TABLECOMPARE
-#: Merge.rc:2851 Merge.rc:2990 Merge.rc:4228
+#: Merge.rc:2861 Merge.rc:3000 Merge.rc:4238
msgid "Table"
msgstr "Tabella"
#. IDD_OPEN_TABLE, IDC_STATIC
-#: Merge.rc:2854
+#: Merge.rc:2864
msgid "File type"
msgstr "Tipo file"
#. IDD_OPEN_TABLE, IDC_COMPARETABLE_CSV
-#: Merge.rc:2855
+#: Merge.rc:2865
msgid "&CSV"
msgstr "&CSV"
#. IDD_OPEN_TABLE, IDC_COMPARETABLE_TSV
-#: Merge.rc:2856
+#: Merge.rc:2866
msgid "&TSV"
msgstr "&TSV"
#. IDD_OPEN_TABLE, IDC_COMPARETABLE_DSV
-#: Merge.rc:2857
+#: Merge.rc:2867
msgid "Custom &Delimiter-Separated Values"
msgstr "Valori separati da &delimitatore personalizzato"
#. IDD_PROPPAGE_COMPARE_TABLE, IDC_STATIC
-#: Merge.rc:2859 Merge.rc:2861 Merge.rc:2996 Merge.rc:3004
+#: Merge.rc:2869 Merge.rc:2871 Merge.rc:3006 Merge.rc:3014
msgid "D&elimiter character:"
msgstr "Carattere di delimitazione:"
#. IDD_PROPPAGE_COMPARE_TABLE, IDC_COMPARETABLE_ALLOWNEWLINE
-#: Merge.rc:2863 Merge.rc:3006
+#: Merge.rc:2873 Merge.rc:3016
msgid "&Allow newlines in quotes"
msgstr "&Consenti a capo tra le virgolette"
#. IDD_PROPPAGE_COMPARE_TABLE, IDC_STATIC
-#: Merge.rc:2865 Merge.rc:3008
+#: Merge.rc:2875 Merge.rc:3018
msgid "&Quote character:"
msgstr "Carattere &virgolette:"
#. IDS_OPTIONSPG_BACKUPS
-#: Merge.rc:2873 Merge.rc:4216
+#: Merge.rc:2883 Merge.rc:4226
msgid "Backup Files"
msgstr "File backup"
#. IDD_PROPPAGE_BACKUPS, IDC_STATIC
-#: Merge.rc:2876
+#: Merge.rc:2886
msgid "Create backup files for:"
msgstr "Crea copie di backup in:"
#. IDD_PROPPAGE_BACKUPS, IDC_BACKUP_FOLDERCMP
-#: Merge.rc:2877
+#: Merge.rc:2887
msgid "&Folder compare"
msgstr "Confron&to tra cartelle"
#. IDD_PROPPAGE_BACKUPS, IDC_BACKUP_FILECMP
-#: Merge.rc:2878
+#: Merge.rc:2888
msgid "Fil&e compare"
msgstr "Confronto tra &file"
#. IDD_PROPPAGE_BACKUPS, IDC_STATIC
-#: Merge.rc:2879
+#: Merge.rc:2889
msgid "Create backup files in:"
msgstr "Crea copie di backup in:"
#. IDD_PROPPAGE_BACKUPS, IDC_BACKUP_ORIGFOLD
-#: Merge.rc:2880
+#: Merge.rc:2890
msgid "&Original file's folder"
msgstr "Cartella &originaria del file"
#. IDD_PROPPAGE_BACKUPS, IDC_BACKUP_GLOBALFOLD
-#: Merge.rc:2881
+#: Merge.rc:2891
msgid "&Global backup folder:"
msgstr "Cartella &globale di backup:"
#. IDD_PROPPAGE_BACKUPS, IDC_STATIC
-#: Merge.rc:2884
+#: Merge.rc:2894
msgid "Backup filename:"
msgstr "Nome file backup:"
#. IDD_PROPPAGE_BACKUPS, IDC_BACKUP_APPEND_BAK
-#: Merge.rc:2885
+#: Merge.rc:2895
msgid "&Append .bak extension"
msgstr "Aggiungi l'estensione .ba&k"
#. IDD_PROPPAGE_BACKUPS, IDC_BACKUP_APPEND_TIME
-#: Merge.rc:2886
+#: Merge.rc:2896
msgid "A&ppend timestamp"
msgstr "Aggiungi marca &temporale"
#. IDS_CONFIRM_COPY_CAPTION
-#: Merge.rc:2892 Merge.rc:4565
+#: Merge.rc:2902 Merge.rc:4575
msgid "Confirm Copy"
msgstr "Conferma copia"
#. IDD_CONFIRM_COPY, IDC_FLDCONFIRM_QUERY
-#: Merge.rc:2896
+#: Merge.rc:2906
msgid "Are you sure you want to copy XXX items?"
msgstr "Vuoi copiare XXX elementi?"
#. IDD_CONFIRM_COPY, IDC_FLDCONFIRM_FROM_TEXT
-#: Merge.rc:2897
+#: Merge.rc:2907
msgid "From left"
msgstr "Da sinistra"
#. IDD_CONFIRM_COPY, IDC_FLDCONFIRM_TO_TEXT
-#: Merge.rc:2899
+#: Merge.rc:2909
msgid "To right"
msgstr "A destra"
#. IDS_MESSAGEBOX_DONT_ASK_AGAIN
-#: Merge.rc:2901 Merge.rc:4191
+#: Merge.rc:2911 Merge.rc:4201
msgid "Don't ask this &question again."
msgstr "Non fare più &questa domanda."
#. IDD_CONFIRM_COPY, IDYES
-#: Merge.rc:2903
+#: Merge.rc:2913
msgid "Yes"
msgstr "Sì"
#. IDD_CONFIRM_COPY, IDNO
-#: Merge.rc:2904
+#: Merge.rc:2914
msgid "No"
msgstr "No"
#. IDS_PROJECT_ITEM_PLUGIN
-#: Merge.rc:2909 Merge.rc:4323
+#: Merge.rc:2919 Merge.rc:4333
msgid "Plugins"
msgstr "Plugin"
#. IDD_PLUGINS_LIST, IDC_PLUGINS_ENABLE
-#: Merge.rc:2912
+#: Merge.rc:2922
msgid "&Enable plugins"
msgstr "&Abilita plugin"
#. IDD_PLUGINS_EDITPLUGIN, IDC_STATIC
-#: Merge.rc:2913 Merge.rc:3113
+#: Merge.rc:2923 Merge.rc:3123
msgid "Plugin &type:"
msgstr "&Tipo plugin:"
#. IDD_PLUGINS_LIST, IDC_STATIC
-#: Merge.rc:2916
+#: Merge.rc:2926
msgid "File filters:"
msgstr "Filtri file:"
#. IDD_PLUGINS_LIST, IDC_STATIC
-#: Merge.rc:2918
+#: Merge.rc:2928
msgid "&Plugin arguments:"
msgstr "Parametri &plugin:"
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_AUTOMATIC
-#: Merge.rc:2920 Merge.rc:3134
+#: Merge.rc:2930 Merge.rc:3144
msgid "Enable &automatic unpacking/prediffing"
msgstr "Abilita decompressione/pre-differenza automatica per il plugin"
#. IDS_OPTIONSPG_SHELL
-#: Merge.rc:2934 Merge.rc:4217
+#: Merge.rc:2944 Merge.rc:4227
msgid "Shell Integration"
msgstr "Integrazione shell sistema"
#. IDD_PROPPAGE_SHELL, IDC_STATIC
-#: Merge.rc:2937
+#: Merge.rc:2947
msgid "Explorer"
msgstr "Esplora risorse"
#. IDD_PROPPAGE_SHELL, IDC_EXPLORER_CONTEXT
-#: Merge.rc:2938
+#: Merge.rc:2948
msgid "&Add to context menu"
msgstr "&Aggiungi al menu contestuale"
#. IDD_PROPPAGE_SHELL, IDC_EXPLORER_ADVANCED
-#: Merge.rc:2939
+#: Merge.rc:2949
msgid "E&nable advanced menu"
msgstr "Abilita menu a&vanzato"
#. IDD_PROPPAGE_SHELL, IDC_EXPLORER_COMPARE_AS
-#: Merge.rc:2940
+#: Merge.rc:2950
msgid "Enable &Compare As menu"
msgstr "Abilita menu '&Confronta come'"
#. IDD_PROPPAGE_SHELL, IDC_REGISTER_SHELLEXTENSION
-#: Merge.rc:2941
+#: Merge.rc:2951
msgid "&Register Shell Extension"
msgstr "&Registra estensione shell"
#. IDD_PROPPAGE_SHELL, IDC_UNREGISTER_SHELLEXTENSION
-#: Merge.rc:2942
+#: Merge.rc:2952
msgid "&Unregister Shell Extension"
msgstr "&De-registra estensione shell"
#. IDD_PROPPAGE_SHELL, IDC_REGISTER_SHELLEXTENSION_PERUSER
-#: Merge.rc:2943
+#: Merge.rc:2953
msgid "Register Shell Extension for Current User &Only"
msgstr "Registra estensione shell solo per l'&utente attuale"
#. IDD_PROPPAGE_SHELL, IDC_UNREGISTER_SHELLEXTENSION_PERUSER
-#: Merge.rc:2944
+#: Merge.rc:2954
msgid "Unregister Shell Extension for Current User On&ly"
msgstr "De-registra estensione shell solo per &l'utente attuale"
#. IDD_PROPPAGE_SHELL, IDC_REGISTER_WINMERGECONTEXTMENU
-#: Merge.rc:2945
+#: Merge.rc:2955
msgid "Register Shell Extension for &Windows 11"
msgstr "Registra estensione shell per &Windows 11 o successivi"
#. IDD_PROPPAGE_SHELL, IDC_UNREGISTER_WINMERGECONTEXTMENU
-#: Merge.rc:2946
+#: Merge.rc:2956
msgid "Unregister Shell Extension for W&indows 11"
msgstr "Deregistra estensione shell per &Windows 11 o successivi"
#. IDD_PROPPAGE_SHELL, IDC_STATIC
-#: Merge.rc:2947
+#: Merge.rc:2957
msgid "Jump List"
msgstr "Elenco salti"
#. IDD_PROPPAGE_SHELL, IDC_CLEAR_ALL_RECENT_ITEMS
-#: Merge.rc:2949
+#: Merge.rc:2959
msgid "Clear all recent items"
msgstr "Cancella tutti gli elementi recenti"
#. IDS_OPTIONSPG_FOLDERCOMPARE
-#: Merge.rc:2954 Merge.rc:4225
+#: Merge.rc:2964 Merge.rc:4235
msgctxt "Options dialog|Categories"
msgid "Folder"
msgstr "Cartella"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC
-#: Merge.rc:2957
+#: Merge.rc:2967
msgid "&Compare method:"
msgstr "&Modalità confronto:"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_COMPARE_STOPFIRST
-#: Merge.rc:2959
+#: Merge.rc:2969
msgid "S&top after first difference"
msgstr "&Fermati dopo la prima differenza"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_IGNORE_SMALLTIMEDIFF
-#: Merge.rc:2961
+#: Merge.rc:2971
msgid "Ign&ore time differences less than 3 seconds"
msgstr "Ignora differenze di tempo inferiori a 3 secondi"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC
-#: Merge.rc:2964
+#: Merge.rc:2974
msgid "Expand subfolders &after comparison:"
msgstr "Dopo il confronto &espandi automaticamente sottocartelle :"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_COMPARE_WALKSUBDIRS
-#: Merge.rc:2966
+#: Merge.rc:2976
msgid "Include &unique subfolders contents"
msgstr "&Includi contenuti unici sotto-cartelle"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_IGNORE_REPARSEPOINTS
-#: Merge.rc:2968
+#: Merge.rc:2978
msgid "Ignore &reparse points"
msgstr "Ignora i punti di &ri-analisi"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC
-#: Merge.rc:2969
+#: Merge.rc:2979
msgid "Switch to &quick compare when size exceeds (MB):"
msgstr "Soglia per passare al confronto &rapido (MB):"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC
-#: Merge.rc:2971
+#: Merge.rc:2981
msgid "Switch to &binary compare when size exceeds (MB):"
msgstr "Soglia per passare al confronto &binario (MB):"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC
-#: Merge.rc:2975
+#: Merge.rc:2985
msgid "Additional comparison condi&tions:"
msgstr "U<eriori condizioni dii confronto:"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC
-#: Merge.rc:2978
+#: Merge.rc:2988
msgid "&Rename/move detection:"
msgstr "&Rilevamento rinomina/spostamenti:"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC
-#: Merge.rc:2980
+#: Merge.rc:2990
msgid "Rename/move detection &keys:"
msgstr "Rilevamento tasti nomina/spostamento:"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC
-#: Merge.rc:2983
+#: Merge.rc:2993
msgid "M&erge renames and moves:"
msgstr "Unisci rinomina &e sposta:"
#. IDD_PROPPAGE_COMPARE_TABLE, IDC_STATIC
-#: Merge.rc:2994 Merge.rc:2999 Merge.rc:3002
+#: Merge.rc:3004 Merge.rc:3009 Merge.rc:3012
msgid "File patterns:"
msgstr "Pattern file:"
#. IDD_PROPPAGE_COMPARE_TABLE, IDC_STATIC
-#: Merge.rc:3001
+#: Merge.rc:3011
msgid "Custom Delimiter-Separated Values"
msgstr "Valori separati da delimitatore personalizzato"
#. IDS_OPTIONSPG_BINARYCOMPARE
-#: Merge.rc:3015 Merge.rc:4227
+#: Merge.rc:3025 Merge.rc:4237
msgctxt "Options dialog|Categories"
msgid "Binary"
msgstr "Binario"
#. IDD_PROPPAGE_COMPARE_BINARY, IDC_STATIC
-#: Merge.rc:3018
+#: Merge.rc:3028
msgid "Binary file &patterns:"
msgstr "&Pattern file binari:"
#. IDD_PROPPAGE_COMPARE_BINARY, IDC_STATIC
-#: Merge.rc:3020
+#: Merge.rc:3030
msgid "Frhed settings"
msgstr "Impostazioni di Frhed"
#. IDD_PROPPAGE_COMPARE_BINARY, IDC_COMPAREBINARY_VIEWSETTINGS
-#: Merge.rc:3021
+#: Merge.rc:3031
msgid "View &Settings..."
msgstr "Visualizza imposta&zioni..."
#. IDD_PROPPAGE_COMPARE_BINARY, IDC_COMPAREBINARY_BINARYMODE
-#: Merge.rc:3022
+#: Merge.rc:3032
msgid "&Binary Mode..."
msgstr "Modalità binaria..."
#. IDD_PROPPAGE_COMPARE_BINARY, IDC_COMPAREBINARY_CHARACTERSET
-#: Merge.rc:3023
+#: Merge.rc:3033
msgid "&Character Set..."
msgstr "Set &caratteri..."
#. IDS_PRPCAT_IMAGE
-#: Merge.rc:3029 Merge.rc:4226 Merge.rc:4665
+#: Merge.rc:3039 Merge.rc:4236 Merge.rc:4675
msgid "Image"
msgstr "Immagine"
#. IDD_PROPPAGE_COMPARE_IMAGE, IDC_STATIC
-#: Merge.rc:3032
+#: Merge.rc:3042
msgid "Image file &patterns:"
msgstr "&Pattern file immagine:"
#. IDD_PROPPAGE_COMPARE_IMAGE, IDC_ENABLE_IMGCMP_IN_DIRCMP
-#: Merge.rc:3034
+#: Merge.rc:3044
msgid "&Enable image compare in folder compare"
msgstr "&Abilita il confronto delle immagini in confronto cartelle"
#. IDD_PROPPAGE_COMPARE_IMAGE, IDC_STATIC
-#: Merge.rc:3036
+#: Merge.rc:3046
msgid "OCR result:"
msgstr "Risultato OCR:"
#. IDS_OPTIONSPG_WEBPAGECOMPARE
-#: Merge.rc:3043 Merge.rc:4229
+#: Merge.rc:3053 Merge.rc:4239
msgid "Webpage"
msgstr "Pagina web"
#. IDD_PROPPAGE_COMPARE_WEBPAGE, IDC_STATIC
-#: Merge.rc:3046
+#: Merge.rc:3056
msgid "URL pattern to &include (Regular expression):"
msgstr "Pattern URL da &includere (espressione regolare):"
#. IDD_PROPPAGE_COMPARE_WEBPAGE, IDC_STATIC
-#: Merge.rc:3048
+#: Merge.rc:3058
msgid "URL pattern to &exclude (Regular expression):"
msgstr "Pattern degli URL da &escludere (espressione regolare):"
#. IDD_PROPPAGE_COMPARE_WEBPAGE, IDC_STATIC
-#: Merge.rc:3050
+#: Merge.rc:3060
msgid "&User data folder location:"
msgstr "Percorso cartella dati &utente:"
#. IDD_PROPPAGE_COMPARE_WEBPAGE, IDC_COMPAREWEBPAGE_USERDATAFOLDER_PERPANE
-#: Merge.rc:3052
+#: Merge.rc:3062
msgid "&Separate user data folders for each pane"
msgstr "&Separa le cartelle dati utente per ogni pannello"
#. IDD_ENCODINGERROR, IDC_HEXVIEW
-#: Merge.rc:3065
+#: Merge.rc:3075
msgid "&Hex View"
msgstr "Vista &esadecimale"
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3110
+#: Merge.rc:3120
msgid "Edit Plugin"
msgstr "Modifica plugin"
#. IDD_PLUGINS_EDITPLUGIN, IDC_STATIC
-#: Merge.rc:3123
+#: Merge.rc:3133
msgid "&Category:"
msgstr "&Categoria:"
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_MENUCAPTION_STATIC
-#: Merge.rc:3125
+#: Merge.rc:3135
msgid "&Menu caption:"
msgstr "&Didascalia menu:"
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_WINDOWTYPE_STATIC
-#: Merge.rc:3127
+#: Merge.rc:3137
msgid "&Window type:"
msgstr "Tipo &finestra:"
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_UNPACKEDFILEEXTENSION_STATIC
-#: Merge.rc:3132
+#: Merge.rc:3142
msgid "&Unpacked file extension:"
msgstr "&Estensione file decompresso:"
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_ARGUMENTSREQUIRED
-#: Merge.rc:3136
+#: Merge.rc:3146
msgid "&Require arguments"
msgstr "&Richiede argomenti"
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_GENERATESCRIPT
-#: Merge.rc:3137
+#: Merge.rc:3147
msgid "&Generate editor script"
msgstr "&Genera script editor"
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_COMMAND_LINE_STATIC
-#: Merge.rc:3140
+#: Merge.rc:3150
msgid "Command &line:"
msgstr "&Linea di comando:"
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_SCRIPT_FILEEXTENSION_STATIC
-#: Merge.rc:3143
+#: Merge.rc:3153
msgid "&Script file extension:"
msgstr "Estensione file &script:"
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_SCRIPT_BODY_STATIC
-#: Merge.rc:3145
+#: Merge.rc:3155
msgid "Script &body:"
msgstr "Corpo &script:"
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3154
+#: Merge.rc:3164
msgid "Font"
msgstr "Font"
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3157
+#: Merge.rc:3167
msgid "&Font:"
msgstr "&Font:"
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3163
+#: Merge.rc:3173
msgid "Font st&yle:"
msgstr "St&ile font:"
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3169
+#: Merge.rc:3179
msgid "&Size:"
msgstr "&Dimensione:"
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3175
+#: Merge.rc:3185
msgid "Effects"
msgstr "Effetti"
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3176
+#: Merge.rc:3186
msgid "Stri&keout"
msgstr "Ribatt&uto"
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3177
+#: Merge.rc:3187
msgid "&Underline"
msgstr "&Sottolineato"
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3179
+#: Merge.rc:3189
msgid "&Color:"
msgstr "&Colore:"
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3184
+#: Merge.rc:3194
msgid "Sample"
msgstr "Esempio"
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3185
+#: Merge.rc:3195
msgid "AaBbYyZz"
msgstr "AaBbYyZz"
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3189
+#: Merge.rc:3199
msgid "Sc&ript:"
msgstr "Sc&ript:"
#. IDD_PLUGINS_EDITPLUGIN, IDC_MANAGE_LINK
-#: Merge.rc:3194
+#: Merge.rc:3204
msgid "Show more fonts"
msgstr "Visualizza altre font"
#. ID_INDICATOR_EXT
-#: Merge.rc:4118
+#: Merge.rc:4128
msgid "EXT"
msgstr "EST"
#. ID_INDICATOR_CAPS
-#: Merge.rc:4119
+#: Merge.rc:4129
msgid "CAP"
msgstr "MA"
#. ID_INDICATOR_NUM
-#: Merge.rc:4120
+#: Merge.rc:4130
msgid "NUM"
msgstr "NUM"
#. ID_INDICATOR_SCRL
-#: Merge.rc:4121
+#: Merge.rc:4131
msgid "SCRL"
msgstr "BS"
#. ID_INDICATOR_OVR
-#: Merge.rc:4122
+#: Merge.rc:4132
msgid "OVR"
msgstr "SSC"
#. ID_INDICATOR_REC
-#: Merge.rc:4123
+#: Merge.rc:4133
msgid "REC"
msgstr "REG"
#. ID_FILE_NEW
-#: Merge.rc:4129
+#: Merge.rc:4139
msgid ""
"\n"
"New Documents (Ctrl+N)"
@@ -4879,7 +4890,7 @@ msgstr ""
"Nuovi documenti (Ctrl+N)"
#. ID_FILE_OPEN
-#: Merge.rc:4130
+#: Merge.rc:4140
msgid ""
"\n"
"Open (Ctrl+O)"
@@ -4888,7 +4899,7 @@ msgstr ""
"Apri (Ctrl+O)"
#. ID_FILE_SAVE
-#: Merge.rc:4131
+#: Merge.rc:4141
msgid ""
"\n"
"Save (Ctrl+S)"
@@ -4897,27 +4908,27 @@ msgstr ""
"Salva (Ctrl+S)"
#. IDS_UNK_ERROR_READING_PROJECT
-#: Merge.rc:4137
+#: Merge.rc:4147
msgid "Unknown error opening project file."
msgstr "Errore sconosciuto durante l'apertura del file progetto."
#. IDS_UNK_ERROR_SAVING_PROJECT
-#: Merge.rc:4138
+#: Merge.rc:4148
msgid "Unknown error saving project file."
msgstr "Errore sconosciuto durante il salvataggio del file progetto."
#. IDS_PROJFILE_LOAD_SUCCESS
-#: Merge.rc:4143
+#: Merge.rc:4153
msgid "Project file loaded."
msgstr "Caricamento file progetto completato."
#. IDS_PROJFILE_SAVE_SUCCESS
-#: Merge.rc:4144
+#: Merge.rc:4154
msgid "Project file saved."
msgstr "Salvataggio file progetto completato."
#. ID_EDIT_UNDO
-#: Merge.rc:4150
+#: Merge.rc:4160
msgid ""
"\n"
"Undo (Ctrl+Z)"
@@ -4926,7 +4937,7 @@ msgstr ""
"Annulla (Ctrl+Z)"
#. ID_EDIT_REDO
-#: Merge.rc:4151
+#: Merge.rc:4161
msgid ""
"\n"
"Redo (Ctrl+Y)"
@@ -4935,7 +4946,7 @@ msgstr ""
"Ripristina (Ctrl+Y)"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:4158
+#: Merge.rc:4168
msgid ""
"\n"
"FileCompare\n"
@@ -4954,7 +4965,7 @@ msgstr ""
"Comparazione file WinMerge"
#. IDR_DIRDOCTYPE
-#: Merge.rc:4159
+#: Merge.rc:4169
msgid ""
"\n"
"FolderCompare\n"
@@ -4973,7 +4984,7 @@ msgstr ""
"Comparazione cartelle WinMerge"
#. IDS_SPLASH_GPLTEXT
-#: Merge.rc:4165
+#: Merge.rc:4175
msgid ""
"WinMerge comes with ABSOLUTELY NO WARRANTY. It is free software and can be "
"redistributed under the conditions of the GNU General Public License - see "
@@ -4985,66 +4996,66 @@ msgstr ""
"Aiuto."
#. IDS_MESSAGEBOX_ABORT
-#: Merge.rc:4173
+#: Merge.rc:4183
msgid "&Abort"
msgstr "In&terrompi"
#. IDS_MESSAGEBOX_RETRY
-#: Merge.rc:4174
+#: Merge.rc:4184
msgid "&Retry"
msgstr "&Riprova"
#. IDS_MESSAGEBOX_IGNORE
-#: Merge.rc:4175
+#: Merge.rc:4185
msgid "&Ignore"
msgstr "&Ignora"
#. IDS_MESSAGEBOX_IGNOREALL
-#: Merge.rc:4176
+#: Merge.rc:4186
msgid "Ignore &all"
msgstr "Ignora t&utto"
#. IDS_MESSAGEBOX_YES
-#: Merge.rc:4177
+#: Merge.rc:4187
msgid "&Yes"
msgstr "&Sì"
#. IDS_MESSAGEBOX_YES_TO_ALL
-#: Merge.rc:4183
+#: Merge.rc:4193
msgid "Yes to &all"
msgstr "Sì a &tutto"
#. IDS_MESSAGEBOX_NO
-#: Merge.rc:4184
+#: Merge.rc:4194
msgid "&No"
msgstr "&No"
#. IDS_MESSAGEBOX_NO_TO_ALL
-#: Merge.rc:4185
+#: Merge.rc:4195
msgid "No to a&ll"
msgstr "No a t&utto"
#. IDS_MESSAGEBOX_CONTINUE
-#: Merge.rc:4186
+#: Merge.rc:4196
msgid "&Continue"
msgstr "&Continua"
#. IDS_MESSAGEBOX_SKIP
-#: Merge.rc:4187
+#: Merge.rc:4197
msgid "&Skip"
msgstr "&Salta"
#. IDS_MESSAGEBOX_SKIPALL
-#: Merge.rc:4188
+#: Merge.rc:4198
msgid "Skip &all"
msgstr "S&alta tutto"
#. IDS_MESSAGEBOX_DONT_DISPLAY_AGAIN
-#: Merge.rc:4190
+#: Merge.rc:4200
msgid "Don't display this &message again."
msgstr "Non visualizzare più questo &messaggio."
-#: Merge.rc:4193
+#: Merge.rc:4203
msgid ""
"To make this message box visible, press Reset on the Message Boxes page in "
"Options."
@@ -5053,93 +5064,93 @@ msgstr ""
"nella 'Casella messaggi' il pulsante 'Ripristina'."
#. IDS_OPTIONSPG_EDITOR_COMPAREMERGE
-#: Merge.rc:4203
+#: Merge.rc:4213
msgid "Compare/Merge"
msgstr "Confronta/unisci"
#. IDS_OPTIONSPG_SYNTAXCOLORS
-#: Merge.rc:4204 Merge.rc:4208
+#: Merge.rc:4214 Merge.rc:4218
msgid "Syntax"
msgstr "Sintassi"
#. IDS_OPTIONSPG_COLOR_SCHEMES
-#: Merge.rc:4206
+#: Merge.rc:4216
msgid "Color Schemes"
msgstr "Schemi colore"
#. IDS_OPTIONSPG_DIRCOLORS
-#: Merge.rc:4210
+#: Merge.rc:4220
msgid "Folder Compare"
msgstr "Confronto cartelle"
#. IDS_OPTIONSPG_PROJECT
-#: Merge.rc:4215
+#: Merge.rc:4225
msgid "Project"
msgstr "Progetto"
#. IDS_COLHDR_NSDIFFS
-#: Merge.rc:4218 Merge.rc:4640
+#: Merge.rc:4228 Merge.rc:4650
msgid "Differences"
msgstr "Differenze"
#. IDS_OPTIONSPG_MESSAGEBOXES
-#: Merge.rc:4220
+#: Merge.rc:4230
msgid "Message Boxes"
msgstr "Avvisi"
#. IDS_TO
-#: Merge.rc:4235
+#: Merge.rc:4245
msgid "To:"
msgstr "A:"
#. IDS_FROM_LEFT
-#: Merge.rc:4236
+#: Merge.rc:4246
msgid "From left:"
msgstr "Da sinistra:"
#. IDS_TO_LEFT
-#: Merge.rc:4237
+#: Merge.rc:4247
msgid "To left:"
msgstr "A sinistra:"
#. IDS_FROM_RIGHT
-#: Merge.rc:4238
+#: Merge.rc:4248
msgid "From right:"
msgstr "Da destra:"
#. IDS_TO_RIGHT
-#: Merge.rc:4239
+#: Merge.rc:4249
msgid "To right:"
msgstr "A destra:"
#. IDS_FROM_MIDDLE
-#: Merge.rc:4240
+#: Merge.rc:4250
msgid "From middle:"
msgstr "Dal centro:"
#. IDS_TO_MIDDLE
-#: Merge.rc:4241
+#: Merge.rc:4251
msgid "To middle:"
msgstr "Al centro:"
#. IDS_VERSION_FMT
-#: Merge.rc:4247
+#: Merge.rc:4257
#, c-format
msgid "Version %1"
msgstr "Versione %1"
#. IDS_OPTIONS_TITLE
-#: Merge.rc:4253
+#: Merge.rc:4263
#, c-format
msgid "Options (%1)"
msgstr "Opzioni (%1)"
#. IDS_MESSAGE_BOX_ARE_RESET
-#: Merge.rc:4254
+#: Merge.rc:4264
msgid "All message boxes are now displayed again."
msgstr "Tutti i messaggi di avviso verranno visualizzati nuovamente."
-#: Merge.rc:4256
+#: Merge.rc:4266
#, c-format
msgid "Tab size value is out of range. Please use 1 - %1."
msgstr ""
@@ -5148,37 +5159,37 @@ msgstr ""
"Usa un valore compreso tra 1 e %1."
#. IDS_PROJECT_OPEN
-#: Merge.rc:4262 Merge.rc:4318
+#: Merge.rc:4272 Merge.rc:4328
msgid "Open"
msgstr "Apri"
#. IDS_PROGRAMFILES
-#: Merge.rc:4263
+#: Merge.rc:4273
msgid "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||"
msgstr "Applicazioni|*.exe;*.bat;*.cmd|Tutti i file (*.*)|*.*||"
#. IDS_ALLFILES
-#: Merge.rc:4264
+#: Merge.rc:4274
msgid "All Files (*.*)|*.*||"
msgstr "Tutti i file (*.*)|*.*||"
#. IDS_PROJECTFILES
-#: Merge.rc:4265
+#: Merge.rc:4275
msgid "WinMerge Project Files (*.WinMerge)|*.WinMerge||"
msgstr "File progetto WinMerge (*.WinMerge)|*.WinMerge||"
#. IDS_INIFILES
-#: Merge.rc:4267
+#: Merge.rc:4277
msgid "Options files (*.ini)|*.ini|All Files (*.*)|*.*||"
msgstr "File opzioni (*.ini)|*.ini|Tutti i file (*.*)|*.*||"
#. IDS_REPLACELIST_FILES
-#: Merge.rc:4268
+#: Merge.rc:4278
msgid "Tab-Separated Values (*.tsv;*.txt)|*.tsv;*.txt|All Files (*.*)|*.*||"
msgstr "Valori separati da tabulazioni (*.tsv;*.txt)|*.tsv;*.txt|Tutti i file (*.*)|*.*||"
#. IDS_TEXT_REPORT_FILES
-#: Merge.rc:4274
+#: Merge.rc:4284
msgid ""
"Text Files (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|All Files (*.*)|"
"*.*||"
@@ -5187,121 +5198,121 @@ msgstr ""
"(*.*)|*.*||"
#. IDS_HTML_REPORT_FILES
-#: Merge.rc:4275
+#: Merge.rc:4285
msgid "HTML Files (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||"
msgstr "File HTML (*.htm,*.html)|*.htm;*.html|Tutti i file (*.*)|*.*||"
#. IDS_XML_REPORT_FILES
-#: Merge.rc:4276
+#: Merge.rc:4286
msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||"
msgstr "File XML (*.xml)|*.xml|Tutti i file (*.*)|*.*||"
#. IDS_EXPANDSUBDIRS_DONOTEXPAND
-#: Merge.rc:4294
+#: Merge.rc:4304
msgid "Do not expand"
msgstr "Non espandere"
#. IDS_EXPANDSUBDIRS_ALL
-#: Merge.rc:4295
+#: Merge.rc:4305
msgid "Expand all subfolders"
msgstr "Espandi tutte le sottocartelle"
#. IDS_EXPANDSUBDIRS_DIFFERENT
-#: Merge.rc:4296
+#: Merge.rc:4306
msgid "Expand different subfolders"
msgstr "Espandi sottocartelle differenti"
#. IDS_EXPANDSUBDIRS_IDENTICAL
-#: Merge.rc:4297
+#: Merge.rc:4307
msgid "Expand identical subfolders"
msgstr "Espandi sottocartelle identiche"
#. IDS_SYNTAXTABLE_FILETYPE
-#: Merge.rc:4303
+#: Merge.rc:4313
msgid "File Type"
msgstr "Tipo file"
#. IDS_COLHDR_EXTENSION
-#: Merge.rc:4304 Merge.rc:4597
+#: Merge.rc:4314 Merge.rc:4607
msgid "Extension"
msgstr "Estensione"
#. IDS_PRPCAT_MESSAGE
-#: Merge.rc:4310 Merge.rc:4669
+#: Merge.rc:4320 Merge.rc:4679
msgid "Message"
msgstr "Messaggio"
#. IDS_MESSAGEBOX_ANSWER
-#: Merge.rc:4311
+#: Merge.rc:4321
msgid "Answer"
msgstr "Risposta"
#. IDS_PROJECT_ITEM
-#: Merge.rc:4317
+#: Merge.rc:4327
msgid "Item"
msgstr "Elemento"
#. IDS_PROJECT_LOAD
-#: Merge.rc:4319
+#: Merge.rc:4329
msgid "Load"
msgstr "Carica"
#. IDS_PROJECT_SAVE
-#: Merge.rc:4320
+#: Merge.rc:4330
msgid "Save"
msgstr "Salva"
#. IDS_PROJECT_ITEM_INCLUDE_SUBFOLDERS
-#: Merge.rc:4322
+#: Merge.rc:4332
msgid "Include Subfolders"
msgstr "Includi sottocartelle"
#. IDS_PROJECT_ITEM_COMPARE_OPTIONS
-#: Merge.rc:4324
+#: Merge.rc:4334
msgid "Compare Options"
msgstr "Opzioni confronto"
#. IDS_PROJECT_ITEM_HIDDEN_ITEMS
-#: Merge.rc:4325
+#: Merge.rc:4335
msgid "Hidden Items"
msgstr "Elementi nascosti"
#. IDS_PLUGINSLIST_NAME
-#: Merge.rc:4331 Merge.rc:4956
+#: Merge.rc:4341 Merge.rc:4966
msgid "Name"
msgstr "Nome"
#. IDS_FILTERFILE_PATHTITLE
-#: Merge.rc:4332
+#: Merge.rc:4342
msgid "Location"
msgstr "Percorso"
#. IDS_FILTER_TITLE
-#: Merge.rc:4333
+#: Merge.rc:4343
msgid "Filters"
msgstr "Filtri"
#. IDS_FILTER_PREFIX
-#: Merge.rc:4334
+#: Merge.rc:4344
msgid "[F] "
msgstr "[F] "
#. IDS_PLUGINSLIST_DESC
-#: Merge.rc:4335 Merge.rc:4958
+#: Merge.rc:4345 Merge.rc:4968
msgid "Description"
msgstr "Descrizione"
#. IDS_FILEFILTER_SAVENEW
-#: Merge.rc:4336
+#: Merge.rc:4346
msgid "Select Filename for New Filter"
msgstr "Seleziona nome file per il nuovo filtro"
#. IDS_FILEFILTER_FILEMASK
-#: Merge.rc:4337
+#: Merge.rc:4347
msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||"
msgstr "Filtri file (*.flt)|*.flt|Tutti i file (*.*)|*.*||"
-#: Merge.rc:4339
+#: Merge.rc:4349
#, c-format
msgid ""
"Cannot find filter template!\n"
@@ -5314,7 +5325,7 @@ msgstr ""
"Copia il file %1 nella cartella WinMerge/Filters:\n"
"%2."
-#: Merge.rc:4341
+#: Merge.rc:4351
#, c-format
msgid ""
"Cannot copy filter template:\n"
@@ -5328,7 +5339,7 @@ msgstr ""
"\n"
"Assicurati che questa cartella esista e di avere i permessi di scrittura."
-#: Merge.rc:4343
+#: Merge.rc:4353
msgid ""
"User's filter folder is not defined!\n"
"\n"
@@ -5338,7 +5349,7 @@ msgstr ""
"\n"
"Seleziona la cartella per i filtri in Opzioni/Sistema."
-#: Merge.rc:4345
+#: Merge.rc:4355
#, c-format
msgid ""
"Failed to delete filter:\n"
@@ -5352,11 +5363,11 @@ msgstr ""
"Il file potrebbe essere in sola lettura."
#. IDS_FILEFILTER_INSTALL
-#: Merge.rc:4346
+#: Merge.rc:4356
msgid "Locate Filter File to Install"
msgstr "Seleziona il file filtro da installare"
-#: Merge.rc:4348
+#: Merge.rc:4358
msgid ""
"Installing filter file failed.\n"
"\n"
@@ -5367,19 +5378,19 @@ msgstr ""
"Impossibile copiare il nuovo file nella cartella dei filtri."
#. IDS_FILEFILTER_OVERWRITE
-#: Merge.rc:4349
+#: Merge.rc:4359
msgid "Filter file exists. Overwrite?"
msgstr ""
"Il file del filtro esiste già.\n"
"Vuoi sovrascrivere il file esistente?"
#. IDS_FILTERLINE_REGEXP
-#: Merge.rc:4355
+#: Merge.rc:4365
msgid "Regular expression"
msgstr "Espressione regolare"
#. IDS_FILTERCHANGED
-#: Merge.rc:4361
+#: Merge.rc:4371
msgid ""
"Filters updated. Refresh all open folder compares?\n"
"\n"
@@ -5392,217 +5403,217 @@ msgstr ""
"aggiornare i confronti successivamente."
#. IDS_DIRECTORY_WINDOW_TITLE
-#: Merge.rc:4367
+#: Merge.rc:4377
msgid "Folder Comparison Results"
msgstr "Risultati confronto tra cartelle"
#. IDS_FILE_COMPARISON_TITLE
-#: Merge.rc:4368
+#: Merge.rc:4378
msgid "File Comparison"
msgstr "Confronto tra file"
#. IDS_EMPTY_LEFT_FILE
-#: Merge.rc:4369
+#: Merge.rc:4379
msgid "Untitled Left"
msgstr "File di sinistra senza titolo"
#. IDS_EMPTY_MIDDLE_FILE
-#: Merge.rc:4370
+#: Merge.rc:4380
msgid "Untitled Middle"
msgstr "File centrale senza titolo"
#. IDS_EMPTY_RIGHT_FILE
-#: Merge.rc:4371
+#: Merge.rc:4381
msgid "Untitled Right"
msgstr "File di destra senza titolo"
#. IDS_CONFLICT_BASE_FILE
-#: Merge.rc:4372
+#: Merge.rc:4382
msgid "Base File"
msgstr "File base"
#. IDS_CONFLICT_THEIRS_FILE
-#: Merge.rc:4373
+#: Merge.rc:4383
msgid "Theirs File"
msgstr "Loro file"
#. IDS_CONFLICT_MINE_FILE
-#: Merge.rc:4374
+#: Merge.rc:4384
msgid "Mine File"
msgstr "Mio file"
#. IDS_SELFCOMPARE_ORIGINAL_FILE
-#: Merge.rc:4375
+#: Merge.rc:4385
msgid "Original File"
msgstr "File originale"
#. IDS_LINE_STATUS_INFO_EOL
-#: Merge.rc:4381
+#: Merge.rc:4391
#, c-format
msgid "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s"
msgstr "Ln: %s Col: %d/%d Car: %d/%d EOL: %s"
#. IDS_EMPTY_LINE_STATUS_INFO
-#: Merge.rc:4382
+#: Merge.rc:4392
#, c-format
msgid "Line: %s"
msgstr "Linea: %s"
#. IDS_LINE_STATUS_INFO
-#: Merge.rc:4383
+#: Merge.rc:4393
#, c-format
msgid "Ln: %s Col: %d/%d Ch: %d/%d"
msgstr "Ln: %s Col: %d/%d Car: %d/%d"
#. IDS_LINE_STATUS_INFO_SEL
-#: Merge.rc:4384
+#: Merge.rc:4394
#, c-format
msgid " Sel: %d | %d"
msgstr " Sel: %d | %d"
#. IDS_MERGEMODE_MERGING
-#: Merge.rc:4385
+#: Merge.rc:4395
msgid "Merge"
msgstr "Unione"
#. IDS_DIFF_NUMBER_STATUS_FMT
-#: Merge.rc:4386
+#: Merge.rc:4396
#, c-format
msgid "Difference %1 of %2"
msgstr "Differenza %1 di %2"
#. IDS_NO_DIFF_SEL_FMT
-#: Merge.rc:4387
+#: Merge.rc:4397
#, c-format
msgid "%1 Differences Found"
msgstr "%1 differenze trovate"
#. IDS_1_DIFF_FOUND
-#: Merge.rc:4388
+#: Merge.rc:4398
msgid "1 Difference Found"
msgstr "1 differenza trovata"
#. IDS_NO_ERR_SEL_FMT
-#: Merge.rc:4389
+#: Merge.rc:4399
#, c-format
msgid "%1 Errors Found"
msgstr "Trovati %1 errori"
#. IDS_1_ERR_FOUND
-#: Merge.rc:4390
+#: Merge.rc:4400
msgid "1 Error Found"
msgstr "Trovato 1 errore"
#. IDS_STATUSBAR_READONLY, Abbreviation from "Read Only"
-#: Merge.rc:4391
+#: Merge.rc:4401
msgid "RO"
msgstr "SL"
#. IDS_DIRVIEW_STATUS_FMT_FOCUS
-#: Merge.rc:4397
+#: Merge.rc:4407
#, c-format
msgid "Item %1 of %2"
msgstr "Elemento %1 di %2"
#. IDS_DIRVIEW_STATUS_FMT_NOFOCUS
-#: Merge.rc:4398
+#: Merge.rc:4408
#, c-format
msgid "Items: %1"
msgstr "Elementi: %1"
#. IDS_DIRVIEW_STATUS_COMPARING
-#: Merge.rc:4399
+#: Merge.rc:4409
msgid "Comparing items..."
msgstr "Confronto elementi..."
#. IDS_ITEMS_PER_SEC
-#: Merge.rc:4400
+#: Merge.rc:4410
#, c-format
msgid "%.1f[items/sec]"
msgstr "%.1f[elementi/sec]"
#. IDS_ERROR_INCOMPARABLE
-#: Merge.rc:4406
+#: Merge.rc:4416
msgid "Select two existing folders/files to compare."
msgstr "Seleziona due cartelle o file esistenti da confrontare."
#. IDS_DIRSEL_TAG
-#: Merge.rc:4407
+#: Merge.rc:4417
msgid "Folder Selection"
msgstr "Selezione cartella"
#. IDS_OPEN_FILESDIRS
-#: Merge.rc:4408
+#: Merge.rc:4418
msgid "Select two (or three) folders/files to compare."
msgstr "Seleziona due (o tre) cartelle o due (o tre) file da confrontare."
#. IDS_OPEN_LEFTINVALID
-#: Merge.rc:4409
+#: Merge.rc:4419
msgid "Left (1st) path is invalid!"
msgstr "Il percorso di sinistra (1°) non è valido!"
#. IDS_OPEN_MIDDLEINVALID
-#: Merge.rc:4410
+#: Merge.rc:4420
msgid "Middle (2nd) path is invalid!"
msgstr "Il percorso centrale (2°) non è valido!"
#. IDS_OPEN_RIGHTINVALID2
-#: Merge.rc:4411
+#: Merge.rc:4421
msgid "Right (2nd) path is invalid!"
msgstr "Il percorso di destra (2°) non è valido!"
#. IDS_OPEN_RIGHTINVALID3
-#: Merge.rc:4412
+#: Merge.rc:4422
msgid "Right (3rd) path is invalid!"
msgstr "Il percorso di destra (3°) non è valido!"
#. IDS_OPEN_BOTHINVALID
-#: Merge.rc:4413
+#: Merge.rc:4423
msgid "Both paths are invalid!"
msgstr "Entrambi i percorsi non sono validi!"
-#: Merge.rc:4415
+#: Merge.rc:4425
msgid "Left (1st) and Middle (2nd) paths are invalid!"
msgstr "I percorsi di sinistra (1°) e centrale (2°) non sono validi!"
#. IDS_OPEN_LEFTRIGHTINVALID
-#: Merge.rc:4416
+#: Merge.rc:4426
msgid "Left (1st) and Right (3rd) paths are invalid!"
msgstr "I percorsi di sinistra (1°) e di destra (3°) non sono validi!"
-#: Merge.rc:4418
+#: Merge.rc:4428
msgid "Middle (2nd) and Right (3rd) paths are invalid!"
msgstr "I percorsi centrale (2°) e di destra (3°) non sono validi!"
#. IDS_OPEN_ALLINVALID
-#: Merge.rc:4419
+#: Merge.rc:4429
msgid "All paths are invalid!"
msgstr "Tutti i percorsi non sono validi!"
#. IDS_OPEN_UNPACKERDISABLED
-#: Merge.rc:4420
+#: Merge.rc:4430
msgid "Only enabled for file comparisons"
msgstr "Abilitato solo per il confronto tra file"
#. IDS_OPEN_MISMATCH
-#: Merge.rc:4421
+#: Merge.rc:4431
msgid "Cannot compare file and folder!"
msgstr "Impossibile confrontare file e cartelle!"
#. IDS_ERROR_FILE_NOT_FOUND
-#: Merge.rc:4427
+#: Merge.rc:4437
#, c-format
msgid "File not found: %1"
msgstr "File non trovato: %1"
#. IDS_ERROR_FILE_NOT_UNPACKED
-#: Merge.rc:4428
+#: Merge.rc:4438
#, c-format
msgid "File not unpacked: %1"
msgstr "File non decompresso: %1"
#. IDS_ERROR_FILEOPEN
-#: Merge.rc:4429
+#: Merge.rc:4439
#, c-format
msgid ""
"Cannot open file\n"
@@ -5616,12 +5627,12 @@ msgstr ""
"%2"
#. IDS_ERROR_CONF_RESOLVE
-#: Merge.rc:4430
+#: Merge.rc:4440
msgid "Failed to parse conflict file."
msgstr "Non è stato possibile analizzare il file del conflitto."
#. IDS_NOT_CONFLICT_FILE
-#: Merge.rc:4431
+#: Merge.rc:4441
#, c-format
msgid ""
"The file\n"
@@ -5633,7 +5644,7 @@ msgstr ""
"non è un file del conflitto."
#. IDS_COMPARE_LARGE_FILES
-#: Merge.rc:4432
+#: Merge.rc:4442
msgid ""
"Comparing large files requires significant memory.\n"
"Show only comparison results (not file contents)?"
@@ -5644,29 +5655,29 @@ msgstr ""
"file)?"
#. IDS_SAVE_AS_TITLE
-#: Merge.rc:4438
+#: Merge.rc:4448
msgid "Save As"
msgstr "Salva con nome"
#. IDS_SAVE_FMT
-#: Merge.rc:4439
+#: Merge.rc:4449
#, c-format
msgid "Save changes to %1?"
msgstr "Vuoi salvare le modifiche in %1?"
#. IDS_SAVEREADONLY_FMT
-#: Merge.rc:4440
+#: Merge.rc:4450
#, c-format
msgid "%1 is read-only. Override? Or 'No' to save as new filename?"
msgstr ""
"%1 è in sola lettura. Vuoi sovrascriverlo?"
#. IDS_ERROR_BACKUP
-#: Merge.rc:4441
+#: Merge.rc:4451
msgid "Error backing up file"
msgstr "Errore durante il salvataggio di una copia di backup del file"
-#: Merge.rc:4443
+#: Merge.rc:4453
#, c-format
msgid ""
"Unable to backup original file:\n"
@@ -5680,7 +5691,7 @@ msgstr ""
"Vuoi continuare comunque?"
#. IDS_FILESAVE_FAILED
-#: Merge.rc:4444
+#: Merge.rc:4454
#, c-format
msgid ""
"Saving file failed.\n"
@@ -5696,7 +5707,7 @@ msgstr ""
"\t- usare un nome diverso per il file (seleziona 'OK')\n"
"\t- annullare l'operazione attuale (seleziona 'Annulla')?"
-#: Merge.rc:4446
+#: Merge.rc:4456
#, c-format
msgid ""
"Plugin '%2' cannot pack changes to left file into '%1'.\n"
@@ -5710,7 +5721,7 @@ msgstr ""
"\n"
"Vuoi salvare la versione non compressa in un altro file?"
-#: Merge.rc:4448
+#: Merge.rc:4458
#, c-format
msgid ""
"Plugin '%2' cannot pack changes to middle file into '%1'.\n"
@@ -5724,7 +5735,7 @@ msgstr ""
"\n"
"Vuoi salvare la versione decompressa in un altro file?"
-#: Merge.rc:4450
+#: Merge.rc:4460
#, c-format
msgid ""
"Plugin '%2' cannot pack changes to right file into '%1'.\n"
@@ -5739,7 +5750,7 @@ msgstr ""
"Vuoi salvare la versione non compressa in un altro file?"
#. IDS_FILECHANGED_ONDISK
-#: Merge.rc:4451
+#: Merge.rc:4461
#, c-format
msgid ""
"Another application updated\n"
@@ -5755,7 +5766,7 @@ msgstr ""
"Vuoi sovrascrivere il file modificato?"
#. IDS_SAVEREADONLY_MULTI
-#: Merge.rc:4452
+#: Merge.rc:4462
#, c-format
msgid ""
"%1\n"
@@ -5765,7 +5776,7 @@ msgstr ""
"è in sola lettura. Vuoi sovrascriverlo?"
#. IDS_FILECHANGED_RESCAN
-#: Merge.rc:4453
+#: Merge.rc:4463
#, c-format
msgid ""
"Another application updated\n"
@@ -5781,22 +5792,22 @@ msgstr ""
"Vuoi ricaricare il file modificato?"
#. IDS_SAVE_LEFT_AS
-#: Merge.rc:4454
+#: Merge.rc:4464
msgid "Save Left File As"
msgstr "Salva il file di sinistra con nome"
#. IDS_SAVE_MIDDLE_AS
-#: Merge.rc:4455
+#: Merge.rc:4465
msgid "Save Middle File As"
msgstr "Salva il file centrale con nome"
#. IDS_SAVE_RIGHT_AS
-#: Merge.rc:4456
+#: Merge.rc:4466
msgid "Save Right File As"
msgstr "Salva il file di destra con nome"
#. IDS_FILE_DISAPPEARED
-#: Merge.rc:4461
+#: Merge.rc:4471
#, c-format
msgid ""
"File\n"
@@ -5809,7 +5820,7 @@ msgstr ""
"Per continuare salva una copia del file."
#. IDS_VIEWS_OUTOFSYNC
-#: Merge.rc:4467
+#: Merge.rc:4477
msgid ""
"Cannot merge unsynched documents.\n"
"\n"
@@ -5820,124 +5831,124 @@ msgstr ""
"Aggiorna i documenti prima di continuare."
#. IDS_BREAK_ON_WHITESPACE
-#: Merge.rc:4472
+#: Merge.rc:4482
msgid "Break at whitespace"
msgstr "Interrompi agli spazi"
#. IDS_BREAK_ON_PUNCTUATION
-#: Merge.rc:4473
+#: Merge.rc:4483
msgid "Break at whitespace or punctuation"
msgstr "Interrompi agli spazi o alla punteggiatura"
#. IDS_L2M
-#: Merge.rc:4479
+#: Merge.rc:4489
msgid "Copy to &Middle\tAlt+Right"
msgstr "Copia al ¢ro\tAlt+Destra"
#. IDS_R2M
-#: Merge.rc:4480
+#: Merge.rc:4490
msgid "Copy to &Middle\tAlt+Left"
msgstr "Copia al ¢ro\tAlt+Sinistra"
#. IDS_COPY_FROM_MIDDLE_R
-#: Merge.rc:4481
+#: Merge.rc:4491
msgid "Copy from Middle\tAlt+Shift+Right"
msgstr "Copia dal centro\tAlt+Maiusc+Destra"
#. IDS_COPY_FROM_MIDDLE_L
-#: Merge.rc:4482
+#: Merge.rc:4492
msgid "Copy from Middle\tAlt+Shift+Left"
msgstr "Copia dal centro\tAlt+Maiusc+Sinistra"
#. IDS_L2MNEXT
-#: Merge.rc:4483
+#: Merge.rc:4493
msgid "Copy to Middle and Advance\tCtrl+Alt+Right"
msgstr "Copia al centro e vai alla successiva\tCtrl+Alt+Destra"
#. IDS_R2MNEXT
-#: Merge.rc:4484
+#: Merge.rc:4494
msgid "Copy to Middle and Advance\tCtrl+Alt+Left"
msgstr "Copia al centro e vai alla successiva\tCtrl+Alt+Sinistra"
#. IDS_ALL_MIDDLE
-#: Merge.rc:4485
+#: Merge.rc:4495
msgid "Copy All to Middle"
msgstr "Copia tutto al centro"
#. IDS_COPY_RIGHT_TO_LEFT
-#: Merge.rc:4491
+#: Merge.rc:4501
#, c-format
msgid "Right to Left (%1)"
msgstr "Da destra a sinistra (%1)"
#. IDS_COPY_RIGHT_TO_MIDDLE
-#: Merge.rc:4492
+#: Merge.rc:4502
#, c-format
msgid "Right to Middle (%1)"
msgstr "Da destra al centro (%1)"
#. IDS_COPY_MIDDLE_TO_LEFT
-#: Merge.rc:4493
+#: Merge.rc:4503
#, c-format
msgid "Middle to Left (%1)"
msgstr "Dal centro a sinistra (%1)"
#. IDS_COPY_MIDDLE_TO_RIGHT
-#: Merge.rc:4494
+#: Merge.rc:4504
#, c-format
msgid "Middle to Right (%1)"
msgstr "Dal centro a destra (%1)"
#. IDS_COPY_LEFT_TO_RIGHT
-#: Merge.rc:4495
+#: Merge.rc:4505
#, c-format
msgid "Left to Right (%1)"
msgstr "Da sinistra a destra (%1)"
#. IDS_COPY_LEFT_TO_MIDDLE
-#: Merge.rc:4496
+#: Merge.rc:4506
#, c-format
msgid "Left to Middle (%1)"
msgstr "Da sinistra al centro (%1)"
#. IDS_MOVE_LEFT_TO
-#: Merge.rc:4507 Merge.rc:4539
+#: Merge.rc:4517 Merge.rc:4549
#, c-format
msgid "Left to... (%1)"
msgstr "Da sinistra a... (%1)"
#. IDS_MOVE_MIDDLE_TO
-#: Merge.rc:4508 Merge.rc:4540
+#: Merge.rc:4518 Merge.rc:4550
#, c-format
msgid "Middle to... (%1)"
msgstr "Dal centro a... (%1)"
#. IDS_MOVE_RIGHT_TO
-#: Merge.rc:4509 Merge.rc:4541
+#: Merge.rc:4519 Merge.rc:4551
#, c-format
msgid "Right to... (%1)"
msgstr "Da destra a... (%1)"
#. IDS_COPY_BOTH_TO
-#: Merge.rc:4510
+#: Merge.rc:4520
#, c-format
msgid "Both to... (%1)"
msgstr "Entrambi a... (%1)"
#. IDS_COPY_ALL_TO
-#: Merge.rc:4511
+#: Merge.rc:4521
#, c-format
msgid "All to... (%1)"
msgstr "Tutti a... (%1)"
#. IDS_COPY_DIFFERENCES_TO
-#: Merge.rc:4512
+#: Merge.rc:4522
#, c-format
msgid "Differences to... (%1)"
msgstr "Differenze a... (%1)"
#. IDS_COPY_ONLYDIFFITEMS
-#: Merge.rc:4519
+#: Merge.rc:4529
msgid ""
"Some selected items are identical or skipped.\n"
"Copy only items with differences?"
@@ -5946,64 +5957,64 @@ msgstr ""
"Vuoi copiare solo gli elementi con differenze?"
#. IDS_DEL_LEFT_FMT
-#: Merge.rc:4525
+#: Merge.rc:4535
#, c-format
msgid "Left (%1)"
msgstr "Sinistra (%1)"
#. IDS_DEL_MIDDLE_FMT
-#: Merge.rc:4526
+#: Merge.rc:4536
#, c-format
msgid "Middle (%1)"
msgstr "Centro (%1)"
#. IDS_DEL_RIGHT_FMT
-#: Merge.rc:4527
+#: Merge.rc:4537
#, c-format
msgid "Right (%1)"
msgstr "Destra (%1)"
#. IDS_DEL_BOTH_FMT
-#: Merge.rc:4528
+#: Merge.rc:4538
#, c-format
msgid "Both (%1)"
msgstr "Entrambi (%1)"
#. IDS_DEL_ALL_FMT
-#: Merge.rc:4529
+#: Merge.rc:4539
#, c-format
msgid "All (%1)"
msgstr "Tutti (%1)"
#. IDS_SELECT_DEST_LEFT
-#: Merge.rc:4545
+#: Merge.rc:4555
msgid "Left Side - Select Destination Folder:"
msgstr "Lato sinistro - seleziona cartella di destinazione:"
#. IDS_SELECT_DEST_MIDDLE
-#: Merge.rc:4546
+#: Merge.rc:4556
msgid "Middle Side - Select Destination Folder:"
msgstr "Lato centrale - seleziona cartella di destinazione:"
#. IDS_SELECT_DEST_RIGHT
-#: Merge.rc:4547
+#: Merge.rc:4557
msgid "Right Side - Select Destination Folder:"
msgstr "Lato destro - seleziona cartella di destinazione:"
#. IDS_FILES_AFFECTED_FMT
-#: Merge.rc:4548
+#: Merge.rc:4558
#, c-format
msgid "(%1 Files Affected)"
msgstr "(%1 file interessati)"
#. IDS_FILES_AFFECTED_FMT2
-#: Merge.rc:4549
+#: Merge.rc:4559
#, c-format
msgid "(%1 of %2 Files Affected)"
msgstr "(%1 di %2 file interessati)"
#. IDS_CONFIRM_DELETE_SINGLE
-#: Merge.rc:4555
+#: Merge.rc:4565
#, c-format
msgid ""
"Are you sure you want to delete\n"
@@ -6015,18 +6026,18 @@ msgstr ""
"%1 ?"
#. IDS_CONFIRM_SINGLE_COPY
-#: Merge.rc:4556
+#: Merge.rc:4566
msgid "Are you sure you want to copy?"
msgstr "Sei sicuro di voler copiare?"
#. IDS_CONFIRM_MULTIPLE_COPY
-#: Merge.rc:4557
+#: Merge.rc:4567
#, c-format
msgid "Are you sure you want to copy %d items?"
msgstr "Sei sicuro di voler copiare %d elementi?"
#. IDS_DIRCMP_NOTSYNC
-#: Merge.rc:4558
+#: Merge.rc:4568
#, c-format
msgid ""
"Operation aborted!\n"
@@ -6046,50 +6057,50 @@ msgstr ""
"Aggiorna il confronto."
#. IDS_CONFIRM_SINGLE_MOVE
-#: Merge.rc:4563
+#: Merge.rc:4573
msgid "Are you sure you want to move?"
msgstr "Spostare?"
#. IDS_CONFIRM_MULTIPLE_MOVE
-#: Merge.rc:4564
+#: Merge.rc:4574
#, c-format
msgid "Are you sure you want to move %d items?"
msgstr "Sei sicuro di voler spostare %d elementi?"
#. IDS_CONFIRM_MOVE_CAPTION
-#: Merge.rc:4566
+#: Merge.rc:4576
msgid "Confirm Move"
msgstr "Conferma spostamento"
-#: Merge.rc:4568
+#: Merge.rc:4578
msgid "Close the folder comparison window?"
msgstr ""
"Si sta per chiudere la finestra che sta confrontando le cartelle.\n"
"Vuoi chiudere la finestra?"
-#: Merge.rc:4570
+#: Merge.rc:4580
msgid "Close the folder comparison window, which took a long time?"
msgstr ""
"Vuoi chiudere la finestra di confronto delle cartelle, che ha richiesto "
"molto tempo?"
#. IDS_ERROR_INVALID_DIR_FILE_NAME
-#: Merge.rc:4571
+#: Merge.rc:4581
msgid "The file or folder name is invalid."
msgstr "Il nome file o cartella non è valido."
#. IDS_ERROR_EXECUTE_FILE
-#: Merge.rc:4577
+#: Merge.rc:4587
#, c-format
msgid "Failed to execute external editor: %1"
msgstr "Impossibile avviare l'editor esterno: %1"
#. IDS_UNKNOWN_ARCHIVE_FORMAT
-#: Merge.rc:4583
+#: Merge.rc:4593
msgid "Unknown archive format"
msgstr "Formato archivio sconosciuto"
-#: Merge.rc:4585
+#: Merge.rc:4595
msgid ""
"Failed to extract archive.\n"
"Compare as text file?"
@@ -6098,757 +6109,757 @@ msgstr ""
"Vuoi confrontare i file archivio come file testo?"
#. IDS_COLHDR_FILENAME
-#: Merge.rc:4591
+#: Merge.rc:4601
msgid "Filename"
msgstr "Nome file"
#. IDS_COLHDR_DIR
-#: Merge.rc:4592
+#: Merge.rc:4602
msgctxt "DirView|ColumnHeader"
msgid "Folder"
msgstr "Cartella"
#. IDS_COLHDR_RESULT
-#: Merge.rc:4593
+#: Merge.rc:4603
msgid "Comparison Result"
msgstr "Risultato confronto"
#. IDS_COLHDR_LTIMEM
-#: Merge.rc:4594
+#: Merge.rc:4604
msgid "Left Date"
msgstr "Data di sinistra"
#. IDS_COLHDR_RTIMEM
-#: Merge.rc:4595
+#: Merge.rc:4605
msgid "Right Date"
msgstr "Data di destra"
#. IDS_COLHDR_MTIMEM
-#: Merge.rc:4596
+#: Merge.rc:4606
msgid "Middle Date"
msgstr "Data centrale"
#. IDS_COLHDR_LSIZE
-#: Merge.rc:4598
+#: Merge.rc:4608
msgid "Left Size"
msgstr "Dimensioni di sinistra"
#. IDS_COLHDR_RSIZE
-#: Merge.rc:4599
+#: Merge.rc:4609
msgid "Right Size"
msgstr "Dimensioni di destra"
#. IDS_COLHDR_MSIZE
-#: Merge.rc:4604
+#: Merge.rc:4614
msgid "Middle Size"
msgstr "Dimensioni centrale"
#. IDS_COLHDR_RSIZE_SHORT
-#: Merge.rc:4605
+#: Merge.rc:4615
msgid "Right Size (Short)"
msgstr "Dim. destra (breve)"
#. IDS_COLHDR_LSIZE_SHORT
-#: Merge.rc:4606
+#: Merge.rc:4616
msgid "Left Size (Short)"
msgstr "Dim. sinistra (breve)"
#. IDS_COLHDR_MSIZE_SHORT
-#: Merge.rc:4607
+#: Merge.rc:4617
msgid "Middle Size (Short)"
msgstr "Dim. centro (breve)"
#. IDS_COLHDR_LTIMEC
-#: Merge.rc:4613
+#: Merge.rc:4623
msgid "Left Creation Time"
msgstr "Data creazione di sinistra"
#. IDS_COLHDR_RTIMEC
-#: Merge.rc:4614
+#: Merge.rc:4624
msgid "Right Creation Time"
msgstr "Data creazione di destra"
#. IDS_COLHDR_MTIMEC
-#: Merge.rc:4615
+#: Merge.rc:4625
msgid "Middle Creation Time"
msgstr "Data creazione centrale"
#. IDS_COLHDR_NEWER
-#: Merge.rc:4616
+#: Merge.rc:4626
msgid "Newer File"
msgstr "File più recente"
#. IDS_COLHDR_LVERSION
-#: Merge.rc:4617
+#: Merge.rc:4627
msgid "Left File Version"
msgstr "Versione file sinistra"
#. IDS_COLHDR_RVERSION
-#: Merge.rc:4618
+#: Merge.rc:4628
msgid "Right File Version"
msgstr "Versione file destra"
#. IDS_COLHDR_MVERSION
-#: Merge.rc:4619
+#: Merge.rc:4629
msgid "Middle File Version"
msgstr "Versione file centrale"
#. IDS_COLHDR_RESULT_ABBR
-#: Merge.rc:4620
+#: Merge.rc:4630
msgid "Short Result"
msgstr "Risultato breve"
#. IDS_COLHDR_LATTRIBUTES
-#: Merge.rc:4621
+#: Merge.rc:4631
msgid "Left Attributes"
msgstr "Attributi sinistra"
#. IDS_COLHDR_RATTRIBUTES
-#: Merge.rc:4622
+#: Merge.rc:4632
msgid "Right Attributes"
msgstr "Attributi destra"
#. IDS_COLHDR_MATTRIBUTES
-#: Merge.rc:4623
+#: Merge.rc:4633
msgid "Middle Attributes"
msgstr "Attributi centrale"
#. IDS_COLHDR_LEOL_TYPE
-#: Merge.rc:4628
+#: Merge.rc:4638
msgid "Left EOL"
msgstr "EOL di sinistra"
#. IDS_COLHDR_MEOL_TYPE
-#: Merge.rc:4629
+#: Merge.rc:4639
msgid "Middle EOL"
msgstr "EOL centrale"
#. IDS_COLHDR_REOL_TYPE
-#: Merge.rc:4630
+#: Merge.rc:4640
msgid "Right EOL"
msgstr "EOL di destra"
#. IDS_COLHDR_LENCODING
-#: Merge.rc:4636
+#: Merge.rc:4646
msgid "Left Encoding"
msgstr "Codifica di sinistra"
#. IDS_COLHDR_RENCODING
-#: Merge.rc:4637
+#: Merge.rc:4647
msgid "Right Encoding"
msgstr "Codifica di destra"
#. IDS_COLHDR_MENCODING
-#: Merge.rc:4638
+#: Merge.rc:4648
msgid "Middle Encoding"
msgstr "Codifica centrale"
#. IDS_COLHDR_NIDIFFS
-#: Merge.rc:4639
+#: Merge.rc:4649
msgid "Ignored Diff"
msgstr "Diff ignorate"
#. IDS_COLHDR_BINARY
-#: Merge.rc:4641
+#: Merge.rc:4651
msgctxt "DirView|ColumnHeader"
msgid "Binary"
msgstr "Binario"
#. IDS_PLUGINS_TYPE_UNPACKER
-#: Merge.rc:4642 Merge.rc:4959
+#: Merge.rc:4652 Merge.rc:4969
msgid "Unpacker"
msgstr "Decompressore"
#. IDS_PLUGIN_TYPE4
-#: Merge.rc:4643 Merge.rc:4960 Merge.rc:5267
+#: Merge.rc:4653 Merge.rc:4970 Merge.rc:5277
msgid "Prediffer"
msgstr "Prediffer"
#. IDS_COLHDR_LEFT
-#: Merge.rc:4644
+#: Merge.rc:4654
msgid "Left"
msgstr "Sinistra"
#. IDS_COLHDR_MIDDLE
-#: Merge.rc:4645
+#: Merge.rc:4655
msgid "Middle"
msgstr "Centro"
#. IDS_COLHDR_RIGHT
-#: Merge.rc:4646
+#: Merge.rc:4656
msgid "Right"
msgstr "Destra"
#. IDS_COLHDR_DIFF
-#: Merge.rc:4647
+#: Merge.rc:4657
msgid "Diff"
msgstr "Diff"
#. IDS_COLHDR_LEFT_DUPLICATE
-#: Merge.rc:4648
+#: Merge.rc:4658
msgid "Left Duplicate Count"
msgstr "Numero di duplicati a sinistra"
#. IDS_COLHDR_RIGHT_DUPLICATE
-#: Merge.rc:4649
+#: Merge.rc:4659
msgid "Right Duplicate Count"
msgstr "Numero di duplicati a destra"
#. IDS_COLHDR_MIDDLE_DUPLICATE
-#: Merge.rc:4650
+#: Merge.rc:4660
msgid "Middle Duplicate Count"
msgstr "Numero di duplicati al centro"
#. IDS_COLHDR_MOVE
-#: Merge.rc:4651
+#: Merge.rc:4661
msgid "Move"
msgstr "Sposta"
#. IDS_PRPCAT_AUDIO
-#: Merge.rc:4658
+#: Merge.rc:4668
msgid "Audio"
msgstr "Audio"
#. IDS_PRPCAT_CALENDAR
-#: Merge.rc:4659
+#: Merge.rc:4669
msgid "Calendar"
msgstr "Calendario"
#. IDS_PRPCAT_COMMUNICATION
-#: Merge.rc:4660
+#: Merge.rc:4670
msgid "Communication"
msgstr "Comunicazione"
#. IDS_PRPCAT_CONTACT
-#: Merge.rc:4661
+#: Merge.rc:4671
msgid "Contact"
msgstr "Contatti"
#. IDS_PRPCAT_DEVICES
-#: Merge.rc:4662
+#: Merge.rc:4672
msgid "Devices"
msgstr "Dispositivi"
#. IDS_PRPCAT_DOCUMENT
-#: Merge.rc:4663
+#: Merge.rc:4673
msgid "Document"
msgstr "Documento"
#. IDS_PRPCAT_HOME
-#: Merge.rc:4664
+#: Merge.rc:4674
msgid "Home"
msgstr "Home"
#. IDS_PRPCAT_JOURNAL
-#: Merge.rc:4666
+#: Merge.rc:4676
msgid "Journal"
msgstr "Diario"
#. IDS_PRPCAT_LINK
-#: Merge.rc:4667
+#: Merge.rc:4677
msgid "Link"
msgstr "Link"
#. IDS_PRPCAT_MEDIA
-#: Merge.rc:4668
+#: Merge.rc:4678
msgid "Media"
msgstr "Media"
#. IDS_PRPCAT_MUSIC
-#: Merge.rc:4670
+#: Merge.rc:4680
msgid "Music"
msgstr "Musica"
#. IDS_PRPCAT_NOTE
-#: Merge.rc:4671
+#: Merge.rc:4681
msgid "Note"
msgstr "Note"
#. IDS_PRPCAT_PHOTO
-#: Merge.rc:4672
+#: Merge.rc:4682
msgid "Photo"
msgstr "Foto"
#. IDS_PRPCAT_RECORDEDTV
-#: Merge.rc:4673
+#: Merge.rc:4683
msgid "RecordedTV"
msgstr "RegistrazioniTV"
#. IDS_PRPCAT_SEARCH
-#: Merge.rc:4674
+#: Merge.rc:4684
msgid "Search"
msgstr "Ricerca"
#. IDS_PRPCAT_SECURITY
-#: Merge.rc:4675
+#: Merge.rc:4685
msgid "Security"
msgstr "Sicurezza"
#. IDS_PRPCAT_SOFTWARE
-#: Merge.rc:4676
+#: Merge.rc:4686
msgid "Software"
msgstr "Software"
#. IDS_PRPCAT_TASK
-#: Merge.rc:4677
+#: Merge.rc:4687
msgid "Task"
msgstr "Attività"
#. IDS_PRPCAT_VIDEO
-#: Merge.rc:4678
+#: Merge.rc:4688
msgid "Video"
msgstr "Video"
#. IDS_PRPCAT_HASH
-#: Merge.rc:4679
+#: Merge.rc:4689
msgid "Hash"
msgstr "Hash"
#. IDS_CANT_COMPARE_FILES
-#: Merge.rc:4685
+#: Merge.rc:4695
msgid "Unable to compare files"
msgstr "Impossibile confrontare i file"
#. IDS_ABORTED_ITEM
-#: Merge.rc:4686
+#: Merge.rc:4696
msgid "Item aborted"
msgstr "Elemento annullato"
#. IDS_FILE_SKIPPED
-#: Merge.rc:4687
+#: Merge.rc:4697
msgid "File skipped"
msgstr "File saltato"
#. IDS_DIR_SKIPPED
-#: Merge.rc:4688
+#: Merge.rc:4698
msgid "Folder skipped"
msgstr "Cartella saltata"
#. IDS_LEFT_ONLY_IN_FMT
-#: Merge.rc:4689
+#: Merge.rc:4699
#, c-format
msgid "Left only: %1"
msgstr "Solo sinistra: %1"
#. IDS_MIDDLE_ONLY_IN_FMT
-#: Merge.rc:4690
+#: Merge.rc:4700
#, c-format
msgid "Middle only: %1"
msgstr "Solo al centro: %1"
#. IDS_RIGHT_ONLY_IN_FMT
-#: Merge.rc:4691
+#: Merge.rc:4701
#, c-format
msgid "Right only: %1"
msgstr "Solo destra: %1"
#. IDS_DOES_NOT_EXIST_IN_FMT
-#: Merge.rc:4692
+#: Merge.rc:4702
#, c-format
msgid "Does not exist in %1"
msgstr "Non esiste in %1"
#. IDS_BIN_FILES_SAME
-#: Merge.rc:4693
+#: Merge.rc:4703
msgid "Binary files are identical"
msgstr "I file binari sono identici"
#. IDS_BIN_FILES_DIFF
-#: Merge.rc:4699
+#: Merge.rc:4709
msgid "Binary files are different"
msgstr "I file binari sono diversi"
#. IDS_FILES_ARE_DIFFERENT
-#: Merge.rc:4700
+#: Merge.rc:4710
msgid "Files are different"
msgstr "I file sono diversi"
#. IDS_FOLDERS_ARE_DIFFERENT
-#: Merge.rc:4701
+#: Merge.rc:4711
msgid "Folders are different"
msgstr "Le cartelle sono diverse"
#. IDS_LEFTONLY
-#: Merge.rc:4702
+#: Merge.rc:4712
msgid "Left Only"
msgstr "Solo a sinistra"
#. IDS_RIGHTONLY
-#: Merge.rc:4703
+#: Merge.rc:4713
msgid "Right Only"
msgstr "Solo a destra"
#. IDS_MIDDLEONLY
-#: Merge.rc:4704
+#: Merge.rc:4714
msgid "Middle Only"
msgstr "Solo al centro"
#. IDS_NOITEMLEFT
-#: Merge.rc:4705
+#: Merge.rc:4715
msgid "No item in left"
msgstr "Nessun elemento a sinistra"
#. IDS_NOITEMRIGHT
-#: Merge.rc:4706
+#: Merge.rc:4716
msgid "No item in right"
msgstr "Nessun elemento a destra"
#. IDS_NOITEMMIDDLE
-#: Merge.rc:4707
+#: Merge.rc:4717
msgid "No item in middle"
msgstr "Nessun elemento al centro"
#. IDS_CMPRES_ERROR
-#: Merge.rc:4709
+#: Merge.rc:4719
msgid "Error"
msgstr "Errore"
#. IDS_TEXT_FILES_SAME
-#: Merge.rc:4710
+#: Merge.rc:4720
msgid "Text files are identical"
msgstr "I file di testo sono identici"
#. IDS_LEFTONLY_DIFF
-#: Merge.rc:4711
+#: Merge.rc:4721
msgid " (Middle and right are identical)"
msgstr " (centrale e destro sono identici)"
#. IDS_MIDDLEONLY_DIFF
-#: Merge.rc:4712
+#: Merge.rc:4722
msgid " (Left and right are identical)"
msgstr " (sinistro e destro sono identici)"
#. IDS_RIGHTONLY_DIFF
-#: Merge.rc:4713
+#: Merge.rc:4723
msgid " (Left and middle are identical)"
msgstr " (sinistro e centrale sono identici)"
#. IDS_PATH_MISMATCH
-#: Merge.rc:4714
+#: Merge.rc:4724
msgid " (paths differ)"
msgstr " (percorso differente)"
#. IDS_TEXT_FILES_DIFF
-#: Merge.rc:4715
+#: Merge.rc:4725
msgid "Text files are different"
msgstr "I file di testo sono diversi"
#. IDS_IMAGE_FILES_SAME
-#: Merge.rc:4716
+#: Merge.rc:4726
msgid "Image files are identical"
msgstr "Le immagini sono identiche"
#. IDS_IMAGE_FILES_DIFF
-#: Merge.rc:4717
+#: Merge.rc:4727
msgid "Image files are different"
msgstr "Le immagini sono diverse"
#. IDS_EXPR_DIFF
-#: Merge.rc:4718
+#: Merge.rc:4728
#, c-format
msgid "Files are different (expr: %1)"
msgstr "I file sono differenti (espr: %1)"
#. IDS_HASH_GROUP
-#: Merge.rc:4719
+#: Merge.rc:4729
#, c-format
msgid "Group%d"
msgstr "Gurppo%d"
#. IDS_RENAME_MOVE_DETECTION_DISALBED
-#: Merge.rc:4720
+#: Merge.rc:4730
msgctxt "Options dialog|Compare|Folder|Detect renames and moves"
msgid "Disabled"
msgstr "Disabilitato"
#. IDS_RENAME_MOVE_DETECTION_RENAME
-#: Merge.rc:4721
+#: Merge.rc:4731
msgid "Detect renames"
msgstr "Rileva rinomine"
#. IDS_RENAME_MOVE_DETECTION_RENAME_MOVE
-#: Merge.rc:4722
+#: Merge.rc:4732
msgid "Detect renames and moves"
msgstr "Rileva rinomine e spostamenti"
#. IDS_RENAME_MOVE_MERGE_MODE_RENAME
-#: Merge.rc:4723
+#: Merge.rc:4733
msgid "Merge renames"
msgstr "Unisci rinomina"
#. IDS_RENAME_MOVE_MERGE_MODE_RENAME_MOVE
-#: Merge.rc:4724
+#: Merge.rc:4734
msgid "Merge renames and moves"
msgstr "Unisci rinomina e sposta"
#. IDS_RENAMED
-#: Merge.rc:4725
+#: Merge.rc:4735
msgid "Renamed"
msgstr "Rinominato"
#. IDS_MOVED
-#: Merge.rc:4726
+#: Merge.rc:4736
msgid "Moved"
msgstr "Spostato"
#. IDS_RENAMED_MOVED
-#: Merge.rc:4727
+#: Merge.rc:4737
msgid "Renamed/Moved"
msgstr "Rinominato/spostato"
#. IDS_RENAMED_MOVED_ITEMS
-#: Merge.rc:4728
+#: Merge.rc:4738
#, c-format
msgid "(%1 items)"
msgstr "(%1 elementi)"
#. IDS_RENAMED_MOVED_RESULT
-#: Merge.rc:4729
+#: Merge.rc:4739
#, c-format
msgid "%1 (set %2): "
msgstr "%1 (imposta %2): "
#. IDS_SWITCH_FLAT_MODE
-#: Merge.rc:4730
+#: Merge.rc:4740
msgid "Some moved items have been merged.\nIn Tree Mode, these items may appear in positions that do not reflect the actual folder structure, which can be confusing.\nSwitch to Flat Mode?"
msgstr "Alcuni elementi spostati sono stati uniti.\nIn modalità struttura, questi elementi potrebbero essere visualizzati in posizioni che non riflettono la struttura effettiva delle cartelle, il che può creare confusione.\nVuoi passare alla modalità semplice?"
#. IDS_ELAPSED_TIME
-#: Merge.rc:4736
+#: Merge.rc:4746
#, c-format
msgid "Elapsed time: %ld ms"
msgstr "Tempo trascorso: %ld ms"
#. IDS_STATUS_SELITEM1
-#: Merge.rc:4737
+#: Merge.rc:4747
msgid "1 item selected"
msgstr "1 elemento selezionato"
#. IDS_STATUS_SELITEMS
-#: Merge.rc:4738
+#: Merge.rc:4748
#, c-format
msgid "%1 items selected"
msgstr "%1 elementi selezionati"
#. IDS_COLDESC_FILENAME
-#: Merge.rc:4744
+#: Merge.rc:4754
msgid "Filename or folder name."
msgstr "Nome file o cartella."
#. IDS_COLDESC_DIR
-#: Merge.rc:4745
+#: Merge.rc:4755
msgid "Subfolder name when subfolders are included."
msgstr "Nome sotto-cartella quando le sotto-cartelle sono incluse."
#. IDS_COLDESC_RESULT
-#: Merge.rc:4746
+#: Merge.rc:4756
msgid "Comparison result, long form."
msgstr "Risultato del confronto, forma completa."
#. IDS_COLDESC_LTIMEM
-#: Merge.rc:4751
+#: Merge.rc:4761
msgid "Left side modification date."
msgstr "Data ultima modifica del lato sinistro."
#. IDS_COLDESC_RTIMEM
-#: Merge.rc:4752
+#: Merge.rc:4762
msgid "Right side modification date."
msgstr "Data ultima modifica del lato destro."
#. IDS_COLDESC_MTIMEM
-#: Merge.rc:4753
+#: Merge.rc:4763
msgid "Middle side modification date."
msgstr "Data ultima modifica del lato centrale."
#. IDS_COLDESC_EXTENSION
-#: Merge.rc:4754
+#: Merge.rc:4764
msgid "File's extension."
msgstr "Estensione del file."
#. IDS_COLDESC_LSIZE
-#: Merge.rc:4755
+#: Merge.rc:4765
msgid "Left file size in bytes."
msgstr "Dimensione di sinistra in byte."
#. IDS_COLDESC_RSIZE
-#: Merge.rc:4756
+#: Merge.rc:4766
msgid "Right file size in bytes."
msgstr "Dimensione di destra in byte."
#. IDS_COLDESC_MSIZE
-#: Merge.rc:4757
+#: Merge.rc:4767
msgid "Middle file size in bytes."
msgstr "Dimensione del centro in byte."
#. IDS_COLDESC_LSIZE_SHORT
-#: Merge.rc:4758
+#: Merge.rc:4768
msgid "Left file size abbreviated."
msgstr "Dimensione di sinistra brevi."
#. IDS_COLDESC_RSIZE_SHORT
-#: Merge.rc:4759
+#: Merge.rc:4769
msgid "Right file size abbreviated."
msgstr "Dimensione di destra brevi."
#. IDS_COLDESC_MSIZE_SHORT
-#: Merge.rc:4760
+#: Merge.rc:4770
msgid "Middle file size abbreviated."
msgstr "Dimensione del centro brevi."
#. IDS_COLDESC_LTIMEC
-#: Merge.rc:4766
+#: Merge.rc:4776
msgid "Left side creation time."
msgstr "Data di creazione di sinistra."
#. IDS_COLDESC_RTIMEC
-#: Merge.rc:4767
+#: Merge.rc:4777
msgid "Right side creation time."
msgstr "Data di creazione di destra."
#. IDS_COLDESC_MTIMEC
-#: Merge.rc:4768
+#: Merge.rc:4778
msgid "Middle side creation time."
msgstr "Data creazione lato sinistro centro."
#. IDS_COLDESC_NEWER
-#: Merge.rc:4769
+#: Merge.rc:4779
msgid "Tells which side has newer modification date."
msgstr "Indica quale lato ha la data dell'ultima modifica più recente."
#. IDS_COLDESC_LVERSION
-#: Merge.rc:4770
+#: Merge.rc:4780
msgid "Left side file version, only for some file types."
msgstr "Versione file lato sinistro, solo per alcuni tipi di file."
#. IDS_COLDESC_RVERSION
-#: Merge.rc:4771
+#: Merge.rc:4781
msgid "Right side file version, only for some file types."
msgstr "Versione file lato destro, solo per alcuni tipi di file."
#. IDS_COLDESC_MVERSION
-#: Merge.rc:4776
+#: Merge.rc:4786
msgid "Middle side file version, only for some file types."
msgstr "Versione file lato centrale, solo per alcuni tipi di file."
#. IDS_COLDESC_RESULT_ABBR
-#: Merge.rc:4777
+#: Merge.rc:4787
msgid "Short comparison result."
msgstr "Risultato confronto in forma breve."
#. IDS_COLDESC_LATTRIBUTES
-#: Merge.rc:4778
+#: Merge.rc:4788
msgid "Left side attributes."
msgstr "Attributi lato sinistro."
#. IDS_COLDESC_RATTRIBUTES
-#: Merge.rc:4779
+#: Merge.rc:4789
msgid "Right side attributes."
msgstr "Attributi lato destro."
#. IDS_COLDESC_MATTRIBUTES
-#: Merge.rc:4780
+#: Merge.rc:4790
msgid "Middle side attributes."
msgstr "Attributi lato centrale."
#. IDS_COLDESC_LEOL_TYPE
-#: Merge.rc:4781
+#: Merge.rc:4791
msgid "Left side file EOL type."
msgstr "Tipo fine linea lato sinistro."
#. IDS_COLDESC_REOL_TYPE
-#: Merge.rc:4782
+#: Merge.rc:4792
msgid "Right side file EOL type."
msgstr "Tipo fine linea lato destro."
#. IDS_COLDESC_MEOL_TYPE
-#: Merge.rc:4783
+#: Merge.rc:4793
msgid "Middle side file EOL type."
msgstr "Tipo fine linea lato centrale."
#. IDS_COLDESC_LENCODING
-#: Merge.rc:4789
+#: Merge.rc:4799
msgid "Left side encoding."
msgstr "Codifica zona sinistra."
#. IDS_COLDESC_RENCODING
-#: Merge.rc:4790
+#: Merge.rc:4800
msgid "Right side encoding."
msgstr "Codifica lato destro."
#. IDS_COLDESC_MENCODING
-#: Merge.rc:4791
+#: Merge.rc:4801
msgid "Middle side encoding."
msgstr "Codifica lato centrale."
#. IDS_COLDESC_NIDIFFS
-#: Merge.rc:4792
+#: Merge.rc:4802
msgid "Number of ignored differences in file. Ignored and cannot be merged."
msgstr ""
"Numero di differenze ignorate nel file.\n"
"Queste differenze sono ignorate da WinMerge e non possono venire unite."
#. IDS_COLDESC_NSDIFFS
-#: Merge.rc:4793
+#: Merge.rc:4803
msgid "Number of differences in file (excluding ignored)."
msgstr ""
"Numero di differenze nel file.\n"
"Questo numero non include le differenze ignorate."
#. IDS_COLDESC_BINARY
-#: Merge.rc:4794
+#: Merge.rc:4804
msgid "Shows an asterisk (*) if the file is binary."
msgstr "Visualizza un asterisco (*) se il file è binario."
#. IDS_COLDESC_UNPACKER
-#: Merge.rc:4795
+#: Merge.rc:4805
msgid "Unpacker plugin name or pipeline."
msgstr "Nome o pipeline plugin decompressione."
#. IDS_COLDESC_PREDIFFER
-#: Merge.rc:4796
+#: Merge.rc:4806
msgid "Prediffer plugin name or pipeline."
msgstr "Nome plugin Prediffer o pipeline."
#. IDS_DIRECTORY_REPORT_TITLE
-#: Merge.rc:4802
+#: Merge.rc:4812
#, c-format
msgid "Compare %1 with %2"
msgstr "Confronta %1 con %2"
#. IDS_DIRECTORY_REPORT_TITLE3
-#: Merge.rc:4803
+#: Merge.rc:4813
#, c-format
msgid "Compare %1 with %2 and %3"
msgstr "Confronta %1 con %2 e %3"
#. IDS_REPORT_COMMALIST
-#: Merge.rc:4804
+#: Merge.rc:4814
msgid "Comma-separated list"
msgstr "Elenco separato da virgole"
#. IDS_REPORT_TABLIST
-#: Merge.rc:4805
+#: Merge.rc:4815
msgid "Tab-separated list"
msgstr "Elenco separato da tabulazioni"
#. IDS_REPORT_SIMPLEHTML
-#: Merge.rc:4806
+#: Merge.rc:4816
msgid "Simple HTML"
msgstr "HTML semplice"
#. IDS_REPORT_SIMPLEXML
-#: Merge.rc:4807
+#: Merge.rc:4817
msgid "Simple XML"
msgstr "XML semplice"
-#: Merge.rc:4809
+#: Merge.rc:4819
msgid "Report file already exists. Overwrite?"
msgstr ""
"Il file del rapporto esiste già.\n"
"Vuoi sovrascrivere il file esistente?"
#. IDS_REPORT_ERROR
-#: Merge.rc:4814
+#: Merge.rc:4824
#, c-format
msgid ""
"Error creating the report:\n"
@@ -6858,59 +6869,59 @@ msgstr ""
"%1"
#. IDS_REPORT_SUCCESS
-#: Merge.rc:4815
+#: Merge.rc:4825
msgid "Report created successfully."
msgstr "Creazione rapporto completata."
#. IDS_SYNCPOINT_LASTBLOCK
-#: Merge.rc:4821
+#: Merge.rc:4831
msgid "Cannot add a synchronization point at this line."
msgstr "Impossibile aggiungere un punto di sincronizzazione su questa linea."
#. IDS_FILE_TO_ITSELF
-#: Merge.rc:4827
+#: Merge.rc:4837
msgid "Same file is opened in both panes."
msgstr "Lo stesso file è aperto in entrambi i pannelli."
#. IDS_FILESSAME
-#: Merge.rc:4828
+#: Merge.rc:4838
msgid "Selected files are identical."
msgstr "I file selezionati sono identici."
#. IDS_FILESSAME_CURCFG
-#: Merge.rc:4829
+#: Merge.rc:4839
msgid "Selected files are identical (with current settings).\r\nChecking binary identity..."
msgstr "I file selezionati sono identici (con le impostazioni attuali).\r\nVerifica identità binaria..."
#. IDS_FILESSAME_BINERROR
-#: Merge.rc:4830
+#: Merge.rc:4840
msgid "Selected files are identical (with current settings).\r\nBut binary comparison failed."
msgstr "I file selezionati sono identici (con le impostazioni attuali).\r\nMa il confronto binario non è riuscito."
#. IDS_FILESSAME_BINSAME
-#: Merge.rc:4831
+#: Merge.rc:4841
msgid "Selected files are identical (binary match)."
msgstr "I file selezionati sono identici (corrispondenza binaria)."
#. IDS_FILESSAME_BINDIFF
-#: Merge.rc:4832
+#: Merge.rc:4842
msgid "Selected files are identical (with current settings).\r\nBut differ at the binary level."
msgstr "I file selezionati sono identici (con le impostazioni attuali).\r\nMa differiscono a livello binario."
#. IDS_FILEERROR
-#: Merge.rc:4833
+#: Merge.rc:4843
msgid "An error occurred while comparing files."
msgstr "Si è verificato un errore durante il confronto dei file."
#. IDS_TEMP_FILEERROR
-#: Merge.rc:4834
+#: Merge.rc:4844
msgid "Could not create temporary files. Check your temporary path settings."
msgstr ""
"Impossibile creare file temporanei.\n"
"Controlla le impostazioni del percorso dei file temporanei."
#. IDS_SUGGEST_IGNOREEOL
-#: Merge.rc:4835
+#: Merge.rc:4845
msgid ""
"Files use different EOL.\n"
"\n"
@@ -6927,17 +6938,17 @@ msgstr ""
"differenze fine riga (Windows/Unix/Mac)'."
#. IDS_INVALID_DIRECTORY
-#: Merge.rc:4836
+#: Merge.rc:4846
msgid "Selected folder is invalid."
msgstr "La cartella selezionata non è valida."
#. IDS_CANNOT_OPEN_BINARYFILE
-#: Merge.rc:4837
+#: Merge.rc:4847
msgid "Cannot open a binary file in Editor."
msgstr "Impossibile aprire un file binario nell'editor."
#. IDS_CREATE_PAIR_FOLDER
-#: Merge.rc:4838
+#: Merge.rc:4848
#, c-format
msgid ""
"Create matching folder:\n"
@@ -6951,41 +6962,41 @@ msgstr ""
"dall'altro lato ed aprirle entrambe?"
#. IDS_CONFIRM_COPY_ALL_DIFFS
-#: Merge.rc:4839
+#: Merge.rc:4849
msgid "Copy all differences to other file?"
msgstr "Sei sicuro di voler copiare tutte le differenze nell'altro file?"
#. IDS_MOVE_TO_NEXTFILE
-#: Merge.rc:4844
+#: Merge.rc:4854
msgid "Move to next file?"
msgstr "Vuoi passare al file successivo?"
#. IDS_MOVE_TO_PREVFILE
-#: Merge.rc:4845
+#: Merge.rc:4855
msgid "Move to previous file?"
msgstr "Vuoi passare al file precedente?"
#. IDS_MOVE_TO_NEXTPAGE
-#: Merge.rc:4846
+#: Merge.rc:4856
msgid "Move to next page?"
msgstr "Vuoi passare alla pagina successiva?"
#. IDS_MOVE_TO_PREVPAGE
-#: Merge.rc:4847
+#: Merge.rc:4857
msgid "Move to previous page?"
msgstr "Vuoi passare alla pagina precedente?"
#. IDS_MOVE_TO_FIRSTFILE
-#: Merge.rc:4848
+#: Merge.rc:4858
msgid "Move to first file?"
msgstr "Vuoi passare al primo file?"
#. IDS_MOVE_TO_LASTFILE
-#: Merge.rc:4849
+#: Merge.rc:4859
msgid "Move to last file?"
msgstr "Vuoi passare all'ultimo file?"
-#: Merge.rc:4856
+#: Merge.rc:4866
#, c-format
msgid ""
"Different codepages: left (cp%d), right (cp%d).\n"
@@ -6999,53 +7010,53 @@ msgstr ""
"Vuoi considerare entrambi i file come se avessero il codice pagina "
"predefinito di Windows (raccomandato)?"
-#: Merge.rc:4858
+#: Merge.rc:4868
msgid "Information lost due to encoding errors: both files"
msgstr "Informazioni perse a causa di errori nella codifica: entrambi i file"
-#: Merge.rc:4860
+#: Merge.rc:4870
msgid "Information lost due to encoding errors: first file"
msgstr "Informazioni perse a causa di errori nella codifica: primo file"
-#: Merge.rc:4862
+#: Merge.rc:4872
msgid "Information lost due to encoding errors: second file"
msgstr "Informazioni perse a causa di errori nella codifica: secondo file"
-#: Merge.rc:4864
+#: Merge.rc:4874
msgid "Information lost due to encoding errors: third file"
msgstr "Informazioni perse a causa di errori nella codifica: terzo file"
#. IDS_LINEDIFF_NODIFF
-#: Merge.rc:4870
+#: Merge.rc:4880
msgid "No difference"
msgstr "Nessuna differenza"
#. IDS_LINEDIFF_NODIFF_CAPTION
-#: Merge.rc:4871
+#: Merge.rc:4881
msgid "Line difference"
msgstr "Differenza linea"
#. IDS_NUM_REPLACED
-#: Merge.rc:4877
+#: Merge.rc:4887
#, c-format
msgid "Replaced %1 string(s)."
msgstr "%1 stringhe sostituite."
#. IDS_EDIT_TEXT_NOT_FOUND
-#: Merge.rc:4878
+#: Merge.rc:4888
#, c-format
msgid "Cannot find string \"%s\"."
msgstr "Impossibile trovare la stringa “%s”."
#. IDS_MERGE_MODE
-#: Merge.rc:4884
+#: Merge.rc:4894
msgid "Entering Merge Mode. Press F9 to turn off."
msgstr ""
"Stai per entrare nella modalità Unione.\n"
"Per disattivarla premi il tasto F9."
#. IDS_AUTO_MERGE
-#: Merge.rc:4890
+#: Merge.rc:4900
#, c-format
msgid ""
"Automatic merges: %1\n"
@@ -7055,101 +7066,101 @@ msgstr ""
"Numero di conflitti non risolti: %2"
#. IDS_CODEPAGE_MERGED
-#: Merge.rc:4891
+#: Merge.rc:4901
msgid "Codepage change merged."
msgstr "La modifica al codice di pagina è stata unita."
#. IDS_CODEPAGE_CONFLICT
-#: Merge.rc:4892
+#: Merge.rc:4902
msgid "Codepage changes are conflicting."
msgstr "Le modifiche al codice di pagina sono in conflitto."
#. IDS_EOL_MERGED
-#: Merge.rc:4893
+#: Merge.rc:4903
msgid "EOL change merged."
msgstr "La modifica ai caratteri di fine linea è stata unita."
#. IDS_EOL_CONFLICT
-#: Merge.rc:4894
+#: Merge.rc:4904
msgid "EOL changes are conflicting."
msgstr "Le modifiche ai caratteri di fine linea sono in conflitto."
#. IDS_LOCBAR_CAPTION
-#: Merge.rc:4900
+#: Merge.rc:4910
msgid "Location Pane"
msgstr "Pannello posizione"
#. IDS_DIFFBAR_CAPTION
-#: Merge.rc:4901
+#: Merge.rc:4911
msgid "Diff Pane"
msgstr "Pannello differenze"
#. IDS_DIFF_SUCCEEDED
-#: Merge.rc:4908
+#: Merge.rc:4918
msgid "Patch file written."
msgstr "Scrittura file patch completata."
#. IDS_DIFF_ITEM1NOTFOUND
-#: Merge.rc:4909
+#: Merge.rc:4919
msgid "First item not found!"
msgstr "1. oggetto non trovato!"
#. IDS_DIFF_ITEM2NOTFOUND
-#: Merge.rc:4910
+#: Merge.rc:4920
msgid "Second item not found!"
msgstr "2. oggetto non trovato!"
#. IDS_DIFF_FILEOVERWRITE
-#: Merge.rc:4911
+#: Merge.rc:4921
msgid "Patch file already exists. Overwrite?"
msgstr ""
"Il file di patch esiste già.\n"
"Vuoi sovrascriverlo?"
#. IDS_DIFF_SELECTEDFILES
-#: Merge.rc:4912
+#: Merge.rc:4922
#, c-format
msgid "[%1 files selected]"
msgstr "[%1 file selezionati]"
#. IDS_DIFF_NORMAL
-#: Merge.rc:4913
+#: Merge.rc:4923
msgid "Normal"
msgstr "Normale"
#. IDS_DIFF_CONTEXT
-#: Merge.rc:4914
+#: Merge.rc:4924
msgid "Context"
msgstr "Contesto"
#. IDS_DIFF_UNIFIED
-#: Merge.rc:4915
+#: Merge.rc:4925
msgid "Unified"
msgstr "Unificato"
#. IDS_FILEWRITE_ERROR
-#: Merge.rc:4917
+#: Merge.rc:4927
#, c-format
msgid "Could not write to file %1."
msgstr "Impossibile scrivere nel file %1."
#. IDS_PATH_NOT_ABSOLUTE
-#: Merge.rc:4918
+#: Merge.rc:4928
#, c-format
msgid "Output path is not absolute: %1"
msgstr "Il percorso destinazione specificato non è assoluto: %1"
#. IDS_MUST_SPECIFY_OUTPUT
-#: Merge.rc:4919
+#: Merge.rc:4929
msgid "Specify an output file."
msgstr "Specifica un file destinazione."
-#: Merge.rc:4921
+#: Merge.rc:4931
msgid "Cannot create patch from binary files."
msgstr "Impossibile creare un file di patch da file binari."
#. IDS_SAVEFILES_FORPATCH
-#: Merge.rc:4922
+#: Merge.rc:4932
msgid ""
"Save all files first.\n"
"\n"
@@ -7161,12 +7172,12 @@ msgstr ""
"nei file."
#. IDS_FOLDER_NOTEXIST
-#: Merge.rc:4923
+#: Merge.rc:4933
msgid "Folder does not exist."
msgstr "La cartella non esiste."
#. IDS_NO_ZIP_SUPPORT
-#: Merge.rc:4928
+#: Merge.rc:4938
msgid ""
"Archive support not enabled.\n"
"7-Zip and/or Merge7z*.dll not found.\n"
@@ -7178,37 +7189,37 @@ msgstr ""
"Consulta il manuale per ulteriori informazioni sugli archivi."
#. IDS_OPT_EXPORT_CAPTION
-#: Merge.rc:4929
+#: Merge.rc:4939
msgid "Select file for export"
msgstr "Seleziona il file per l'esportazione"
#. IDS_OPT_IMPORT_CAPTION
-#: Merge.rc:4930
+#: Merge.rc:4940
msgid "Select file for import"
msgstr "Seleziona il file per l'importazione"
#. IDS_OPT_IMPORT_DONE
-#: Merge.rc:4931
+#: Merge.rc:4941
msgid "Options imported from file."
msgstr "Opzioni importate dal file."
#. IDS_OPT_EXPORT_DONE
-#: Merge.rc:4932
+#: Merge.rc:4942
msgid "Options exported to file."
msgstr "Opzioni esportate nel file."
#. IDS_OPT_IMPORT_ERR
-#: Merge.rc:4933
+#: Merge.rc:4943
msgid "Failed to import options from file."
msgstr "Impossibile importare le opzioni dal file."
#. IDS_OPT_EXPORT_ERR
-#: Merge.rc:4934
+#: Merge.rc:4944
msgid "Failed to write options to file."
msgstr "Impossibile esportare le opzioni nel file."
#. IDS_CLOSEALL_WINDOWS
-#: Merge.rc:4935
+#: Merge.rc:4945
msgid ""
"Close multiple compare windows?\n"
"\n"
@@ -7219,44 +7230,44 @@ msgstr ""
"Vuoi proseguire?"
#. IDS_EOL_MIXED
-#: Merge.rc:4944
+#: Merge.rc:4954
msgid "Mixed"
msgstr "Mescolato"
#. IDS_EOL_BIN
-#: Merge.rc:4945
+#: Merge.rc:4955
msgctxt "EOL Type"
msgid "Binary"
msgstr "Binario"
#. IDS_EOL_NONE
-#: Merge.rc:4949
+#: Merge.rc:4959
msgid "None"
msgstr "Nessuno"
#. IDS_MARKER_COLOR_FMT
-#: Merge.rc:4950
+#: Merge.rc:4960
#, c-format
msgid "Marker Color %d"
msgstr "Colore dell'evidenziatore %d"
#. IDS_MARKER_NEW_PATTERN
-#: Merge.rc:4951
+#: Merge.rc:4961
msgid "New Pattern"
msgstr "Nuovo pattern"
#. IDS_PLUGINSLIST_TYPE
-#: Merge.rc:4957
+#: Merge.rc:4967
msgid "Type"
msgstr "Tipo"
#. IDS_PLUGINS_TYPE_EDITSCRIPT
-#: Merge.rc:4961
+#: Merge.rc:4971
msgid "Editor script"
msgstr "Editor script"
#. ID_SELECTLINEDIFF
-#: Merge.rc:4967
+#: Merge.rc:4977
msgid ""
"\n"
"Difference in Current Line (F4)"
@@ -7265,7 +7276,7 @@ msgstr ""
"Differenza nella linea attuale (F4)"
#. ID_OPTIONS
-#: Merge.rc:4968
+#: Merge.rc:4978
msgid ""
"\n"
"Options"
@@ -7274,7 +7285,7 @@ msgstr ""
"Opzioni"
#. ID_REFRESH
-#: Merge.rc:4969
+#: Merge.rc:4979
msgid ""
"\n"
"Refresh (F5)"
@@ -7283,7 +7294,7 @@ msgstr ""
"Aggiorna (F5)"
#. ID_PREVDIFF
-#: Merge.rc:4975
+#: Merge.rc:4985
msgid ""
"\n"
"Previous Difference (Alt+Up)"
@@ -7292,7 +7303,7 @@ msgstr ""
"Differenza precedente (Alt+Su)"
#. ID_NEXTDIFF
-#: Merge.rc:4976
+#: Merge.rc:4986
msgid ""
"\n"
"Next Difference (Alt+Down)"
@@ -7301,7 +7312,7 @@ msgstr ""
"Differenza successiva (Alt+Giù)"
#. ID_PREVCONFLICT
-#: Merge.rc:4977
+#: Merge.rc:4987
msgid ""
"\n"
"Previous Conflict (Alt+Shift+Up)"
@@ -7310,7 +7321,7 @@ msgstr ""
"Conflitto precedente (Alt+Maiusc+Su)"
#. ID_NEXTCONFLICT
-#: Merge.rc:4978
+#: Merge.rc:4988
msgid ""
"\n"
"Next Conflict (Alt+Shift+Down)"
@@ -7319,7 +7330,7 @@ msgstr ""
"Conflitto successivo (Alt+Maiusc+Giù)"
#. ID_FIRSTDIFF
-#: Merge.rc:4983
+#: Merge.rc:4993
msgid ""
"\n"
"First Difference (Alt+Home)"
@@ -7328,7 +7339,7 @@ msgstr ""
"Prima differenza (Alt+Inizio)"
#. ID_CURDIFF
-#: Merge.rc:4984
+#: Merge.rc:4994
msgid ""
"\n"
"Current Difference (Alt+Enter)"
@@ -7337,7 +7348,7 @@ msgstr ""
"Differenza attuale (Alt+Invio)"
#. ID_LASTDIFF
-#: Merge.rc:4985
+#: Merge.rc:4995
msgid ""
"\n"
"Last Difference (Alt+End)"
@@ -7346,7 +7357,7 @@ msgstr ""
"Ultima differenza (Alt+Fine)"
#. ID_L2R
-#: Merge.rc:4986
+#: Merge.rc:4996
msgid ""
"\n"
"Copy to Right (Alt+Right)"
@@ -7355,7 +7366,7 @@ msgstr ""
"Copia a destra (Alt+Destra)"
#. ID_R2L
-#: Merge.rc:4987
+#: Merge.rc:4997
msgid ""
"\n"
"Copy to Left (Alt+Left)"
@@ -7364,7 +7375,7 @@ msgstr ""
"Copia a sinistra (Alt+Sinistra)"
#. ID_L2RNEXT
-#: Merge.rc:4988
+#: Merge.rc:4998
msgid ""
"\n"
"Copy to Right and Advance (Ctrl+Alt+Right)"
@@ -7373,7 +7384,7 @@ msgstr ""
"Copia a destra e avanza (Ctrl+Alt+Destra)"
#. ID_R2LNEXT
-#: Merge.rc:4989
+#: Merge.rc:4999
msgid ""
"\n"
"Copy to Left and Advance (Ctrl+Alt+Left)"
@@ -7382,7 +7393,7 @@ msgstr ""
"Copia a sinistra e avanza (Ctrl+Alt+Sinistra)"
#. ID_ALL_RIGHT
-#: Merge.rc:4990
+#: Merge.rc:5000
msgid ""
"\n"
"Copy All to Right"
@@ -7391,7 +7402,7 @@ msgstr ""
"Copia tutto a destra"
#. ID_ALL_LEFT
-#: Merge.rc:4991
+#: Merge.rc:5001
msgid ""
"\n"
"Copy All to Left"
@@ -7400,7 +7411,7 @@ msgstr ""
"Copia tutto a sinistra"
#. ID_AUTO_MERGE
-#: Merge.rc:4992
+#: Merge.rc:5002
msgid ""
"\n"
"Auto Merge (Ctrl+Alt+M)"
@@ -7409,7 +7420,7 @@ msgstr ""
"Unione automatica (Ctrl+Alt+M)"
#. ID_FIRSTFILE
-#: Merge.rc:4993
+#: Merge.rc:5003
msgid ""
"\n"
"First File"
@@ -7418,7 +7429,7 @@ msgstr ""
"Primo file"
#. ID_NEXTFILE
-#: Merge.rc:4994
+#: Merge.rc:5004
msgid ""
"\n"
"Next File (Ctrl+F8)"
@@ -7427,7 +7438,7 @@ msgstr ""
"File successivo (Ctrl+F8)"
#. ID_LASTFILE
-#: Merge.rc:4995
+#: Merge.rc:5005
msgid ""
"\n"
"Last File"
@@ -7436,7 +7447,7 @@ msgstr ""
"Ultimo file"
#. ID_PREVFILE
-#: Merge.rc:4996
+#: Merge.rc:5006
msgid ""
"\n"
"Previous File (Ctrl+F7)"
@@ -7445,39 +7456,39 @@ msgstr ""
"File precedente (Ctrl+F7)"
#. IDS_UNPACK_AUTO
-#: Merge.rc:5003
+#: Merge.rc:5013
msgid "Adapted unpacker applied to both files (one needs extension)."
msgstr ""
"Il decompressore è applicato a entrambi i file (è sufficiente che uno dei "
"file abbia l'estensione)."
#. IDS_NO_PREDIFFER
-#: Merge.rc:5004
+#: Merge.rc:5014
msgid "No Prediffer (Normal)"
msgstr "Nessun prediffer (normale)"
#. IDS_SUGGESTED_PLUGINS
-#: Merge.rc:5005
+#: Merge.rc:5015
msgid "Suggested Plugins"
msgstr "Plugin consigliate"
#. IDS_NOT_SUGGESTED_PLUGINS
-#: Merge.rc:5006
+#: Merge.rc:5016
msgid "All Plugins"
msgstr "Tutti i plugin"
#. IDS_PRIVATEBUILD_FMT
-#: Merge.rc:5012
+#: Merge.rc:5022
#, c-format
msgid "Private Build: %1"
msgstr "Build privata: %1"
#. IDS_CHECKFORUPDATES_UPTODATE
-#: Merge.rc:5013
+#: Merge.rc:5023
msgid "Your software is up to date."
msgstr "La versione installata del programma è aggiornata."
-#: Merge.rc:5015
+#: Merge.rc:5025
#, c-format
msgid ""
"WinMerge update available.\n"
@@ -7488,116 +7499,116 @@ msgstr ""
"Vuoi scaricarla adesso?"
#. IDS_ALLRIGHTS_RESERVED
-#: Merge.rc:5016
+#: Merge.rc:5026
msgid " - All rights reserved."
msgstr " - Tutti diritti riservati."
#. IDS_CHECKFORUPDATES_FAILED
-#: Merge.rc:5021
+#: Merge.rc:5031
msgid "Failed to download latest version information"
msgstr ""
"Non è stato possibile scaricare le informazioni sulla versione aggiornata"
#. IDS_TITLE_PLUGINS_SETTINGS
-#: Merge.rc:5027
+#: Merge.rc:5037
msgid "Plugin Settings"
msgstr "Impostazioni plugin"
#. IDS_NO_SCT_SCRIPTS
-#: Merge.rc:5029
+#: Merge.rc:5039
msgid "WSH not found - .sct scripts disabled"
msgstr "WSH non trovato - script .sct disattivati"
#. IDS_LOCBAR_GOTOLINE_FMT
-#: Merge.rc:5037
+#: Merge.rc:5047
#, c-format
msgid "G&o to Line %1"
msgstr "Vai alla &linea %1"
#. IDS_GOTO_MOVED_LINE
-#: Merge.rc:5043
+#: Merge.rc:5053
msgid "Go to Moved Line\tCtrl+Shift+G"
msgstr "Vai alla riga spostata\tCtrl+Maiusc+G"
#. IDS_AUTOCOMPLETE_DISABLED
-#: Merge.rc:5049
+#: Merge.rc:5059
msgctxt "Options dialog|General|Open dialog Auto completion"
msgid "Disabled"
msgstr "Disabilitato"
#. IDS_AUTOCOMPLETE_FILE_SYS
-#: Merge.rc:5050
+#: Merge.rc:5060
msgid "From file system"
msgstr "Dal file system"
#. IDS_AUTOCOMPLETE_MRU
-#: Merge.rc:5051
+#: Merge.rc:5061
msgid "From Most Recently Used list"
msgstr "Dall'elenco dei file recenti"
#. IDS_COLORSCHEME_PLAIN
-#: Merge.rc:5057
+#: Merge.rc:5067
msgid "No Highlighting"
msgstr "Nessuna evidenziazione"
#. IDS_COLORSCHEME_BATCH
-#: Merge.rc:5063
+#: Merge.rc:5073
msgid "Batch"
msgstr "Batch"
#. IDS_COLORSCHEME_PO
-#: Merge.rc:5090
+#: Merge.rc:5100
msgid "Portable Object"
msgstr "Oggetto portatile"
#. IDS_COLORSCHEME_RSRC
-#: Merge.rc:5094
+#: Merge.rc:5104
msgid "Resources"
msgstr "Risorse"
#. IDS_COLORSCHEME_SH
-#: Merge.rc:5098
+#: Merge.rc:5108
msgid "Shell"
msgstr "Shell"
#. IDS_CLOSE_LEFT_TABS
-#: Merge.rc:5115
+#: Merge.rc:5125
msgid "Close &Left Tabs"
msgstr "Chiudi schede a &sinistra"
#. IDS_CLOSE_RIGHT_TABS
-#: Merge.rc:5116
+#: Merge.rc:5126
msgid "Close R&ight Tabs"
msgstr "Chiudi schede a &destra"
#. IDS_CLOSE_OTHER_TABS
-#: Merge.rc:5117
+#: Merge.rc:5127
msgid "Close &Other Tabs"
msgstr "Chiudi &altre schede"
#. IDS_TABBAR_AUTO_MAXWIDTH
-#: Merge.rc:5118
+#: Merge.rc:5128
msgid "Enable &Auto Max Width"
msgstr "Abilita altezza massima &automatica"
#. IDS_WEBPAGE_MENU
-#: Merge.rc:5128
+#: Merge.rc:5138
msgid "We&bpage"
msgstr "Pagina we&b"
#. IDS_VIEW_WRAP_TEXT
-#: Merge.rc:5133
+#: Merge.rc:5143
msgid "W&rap Text"
msgstr "Testo con a &capo automatico"
#. IDS_NOTINSTALLED
-#: Merge.rc:5138
+#: Merge.rc:5148
#, c-format
msgid "%1 is not installed."
msgstr "%1 non è installato."
#. IDS_CREATE_FOLDER
-#: Merge.rc:5143
+#: Merge.rc:5153
#, c-format
msgid "%1 does not exist. Create it?"
msgstr ""
@@ -7605,12 +7616,12 @@ msgstr ""
"Vuoi crearlo?"
#. IDS_CREATE_FOLDER_ERROR
-#: Merge.rc:5144
+#: Merge.rc:5154
msgid "Failed to create folder."
msgstr "Non è stato possibile creare la cartella."
#. IDC_EXT_EDITOR_PATH
-#: Merge.rc:5149
+#: Merge.rc:5159
msgid ""
"Parameters:\n"
"$file: Current file path\n"
@@ -7621,488 +7632,488 @@ msgstr ""
"$linenum: numero di linea alla posizione attuale del cursore"
#. IDS_DIFF_ALGORITHM_DEFAULT
-#: Merge.rc:5154
+#: Merge.rc:5164
msgid "default"
msgstr "predefinito"
#. IDS_DIFF_ALGORITHM_MINIMAL
-#: Merge.rc:5155
+#: Merge.rc:5165
msgid "minimal"
msgstr "minimo"
#. IDS_DIFF_ALGORITHM_PATIENCE
-#: Merge.rc:5156
+#: Merge.rc:5166
msgid "patience"
msgstr "pazienza"
#. IDS_DIFF_ALGORITHM_HISTOGRAM
-#: Merge.rc:5157
+#: Merge.rc:5167
msgid "histogram"
msgstr "istogramma"
#. IDS_DIFF_ALGORITHM_NONE
-#: Merge.rc:5158
+#: Merge.rc:5168
msgid "none"
msgstr "nessuno"
#. IDS_RENDERING_MODE_GDI
-#: Merge.rc:5163
+#: Merge.rc:5173
msgid "GDI"
msgstr "GDI"
#. IDS_RENDERING_MODE_DIRECTWRITE_DEFAULT
-#: Merge.rc:5164
+#: Merge.rc:5174
msgid "DirectWrite Default"
msgstr "Predefinita DirectWrite"
#. IDS_RENDERING_MODE_DIRECTWRITE_ALIASED
-#: Merge.rc:5165
+#: Merge.rc:5175
msgid "DirectWrite Aliased"
msgstr "Alias DirectWrite"
#. IDS_RENDERING_MODE_DIRECTWRITE_GDI_CLASSIC
-#: Merge.rc:5166
+#: Merge.rc:5176
msgid "DirectWrite GDI Classic"
msgstr "GDI Classica DirectWrite"
#. IDS_RENDERING_MODE_DIRECTWRITE_GDI_NATURAL
-#: Merge.rc:5167
+#: Merge.rc:5177
msgid "DirectWrite GDI Natural"
msgstr "GDI naturale DirectWrite"
#. IDS_RENDERING_MODE_DIRECTWRITE_NATURAL
-#: Merge.rc:5168
+#: Merge.rc:5178
msgid "DirectWrite Natural"
msgstr "Naturale DirectWrite"
#. IDS_RENDERING_MODE_DIRECTWRITE_NATURAL_SYMMETRIC
-#: Merge.rc:5169
+#: Merge.rc:5179
msgid "DirectWrite Natural Symmetric"
msgstr "Naturale simmetrica DirectWrite"
#. IDS_CLOSE_WINDOWS_WITH_ESC_DISABLED
-#: Merge.rc:5174
+#: Merge.rc:5184
msgctxt "Options dialog|General|Close windows with Esc"
msgid "Disabled"
msgstr "Disabilitata"
#. IDS_CLOSE_WINDOWS_WITH_ESC_1
-#: Merge.rc:5175
+#: Merge.rc:5185
msgid "MDI child window or main window"
msgstr "Finestra secondaria MDI o finestra principale"
#. IDS_CLOSE_WINDOWS_WITH_ESC_2
-#: Merge.rc:5176
+#: Merge.rc:5186
msgid "MDI child window only"
msgstr "Solo finestra secondaria MDI"
#. IDS_CLOSE_WINDOWS_WITH_ESC_3
-#: Merge.rc:5177
+#: Merge.rc:5187
msgid "Close main window if only one MDI child window"
msgstr ""
"Se è presente una sola finestra secondaria MDI chiudi la finestra principale"
#. IDS_DIFF_GROUP
-#: Merge.rc:5182
+#: Merge.rc:5192
msgctxt "ImgMergeFrame|LocationPane"
msgid "Diff"
msgstr "Differenze"
#. IDS_DIFF_HIGHLIGHT
-#: Merge.rc:5183
+#: Merge.rc:5193
msgctxt "ImgMergeFrame|LocationPane"
msgid "Highlight"
msgstr "Evidenzia"
#. IDS_DIFF_BLINK
-#: Merge.rc:5184
+#: Merge.rc:5194
msgctxt "ImgMergeFrame|LocationPane"
msgid "Blink"
msgstr "Lampeggia"
#. IDS_DIFF_BLOCKSIZE
-#: Merge.rc:5185
+#: Merge.rc:5195
msgctxt "ImgMergeFrame|LocationPane"
msgid "Block Size"
msgstr "Dimensione blocco"
#. IDS_DIFF_BLOCKALPHA
-#: Merge.rc:5186
+#: Merge.rc:5196
msgctxt "ImgMergeFrame|LocationPane"
msgid "Block Alpha"
msgstr "Blocca alfa"
#. IDS_DIFF_CDTHRESHOLD
-#: Merge.rc:5187
+#: Merge.rc:5197
msgctxt "ImgMergeFrame|LocationPane"
msgid "CD Threshold"
msgstr "Soglia CD"
#. IDS_DIFF_INSERTION_DELETION_DETECTION
-#: Merge.rc:5188
+#: Merge.rc:5198
msgctxt "ImgMergeFrame|LocationPane"
msgid "Ins/Del Detection"
msgstr "Rilevamento Ins/Canc"
#. IDS_OVERLAY_MODE_NONE
-#: Merge.rc:5189 Merge.rc:5194
+#: Merge.rc:5199 Merge.rc:5204
msgctxt "ImgMergeFrame|LocationPane"
msgid "None"
msgstr "Nessuno"
#. IDS_DIFF_INSERTION_DELETION_DETECTION_VERTICAL
-#: Merge.rc:5190
+#: Merge.rc:5200
msgctxt "ImgMergeFrame|LocationPane"
msgid "Vertical"
msgstr "Verticale"
#. IDS_DIFF_INSERTION_DELETION_DETECTION_HORIZONTAL
-#: Merge.rc:5191
+#: Merge.rc:5201
msgctxt "ImgMergeFrame|LocationPane"
msgid "Horizontal"
msgstr "Orizzontale"
#. IDS_OVERLAY_GROUP
-#: Merge.rc:5192
+#: Merge.rc:5202
msgctxt "ImgMergeFrame|LocationPane"
msgid "Overlay"
msgstr "Sovrapposizione"
#. IDS_OVERLAY_ALPHA
-#: Merge.rc:5193
+#: Merge.rc:5203
msgctxt "ImgMergeFrame|LocationPane"
msgid "Alpha"
msgstr "Alfa"
#. IDS_OVERLAY_MODE_XOR
-#: Merge.rc:5195
+#: Merge.rc:5205
msgctxt "ImgMergeFrame|LocationPane"
msgid "XOR"
msgstr "XOR"
#. IDS_OVERLAY_MODE_ALPHA
-#: Merge.rc:5196
+#: Merge.rc:5206
msgctxt "ImgMergeFrame|LocationPane"
msgid "Alpha Blend"
msgstr "Miscela alfa"
#. IDS_OVERLAY_MODE_ALPHA_ANIMATION
-#: Merge.rc:5197
+#: Merge.rc:5207
msgctxt "ImgMergeFrame|LocationPane"
msgid "Alpha Animation"
msgstr "Animazione alfa"
#. IDS_ZOOM
-#: Merge.rc:5198
+#: Merge.rc:5208
msgctxt "ImgMergeFrame|LocationPane"
msgid "Zoom"
msgstr "Zoom"
#. IDS_PAGE
-#: Merge.rc:5199
+#: Merge.rc:5209
msgctxt "ImgMergeFrame|LocationPane"
msgid "Page:"
msgstr "Pagina:"
#. IDS_IMGCMP_STATUS_PT_RGBA_FMT
-#: Merge.rc:5200
+#: Merge.rc:5210
#, c-format
msgid "Pt: (%d, %d) RGBA: (%d, %d, %d, %d) "
msgstr "Pt: (%d, %d) RGBA: (%d, %d, %d, %d) "
#. IDS_IMGCMP_STATUS_DIST1_FMT
-#: Merge.rc:5201
+#: Merge.rc:5211
#, c-format
msgid "Dist: %g "
msgstr "Dist: %g "
#. IDS_IMGCMP_STATUS_DIST2_FMT
-#: Merge.rc:5202
+#: Merge.rc:5212
#, c-format
msgid "Dist: %g, %g "
msgstr "Dist: %g, %g "
#. IDS_IMGCMP_STATUS_PAGE_ZOOM_SIZE_BPP_FMT
-#: Merge.rc:5203
+#: Merge.rc:5213
#, c-format
msgid "Page: %d/%d Zoom: %d%% %dx%dpx %dbpp "
msgstr "Pagina: %d/%d Zoom: %d%% %dx%dpx %dbpp "
#. IDS_IMGCMP_STATUS_RC_FMT
-#: Merge.rc:5204
+#: Merge.rc:5214
#, c-format
msgid "Rc: (%d, %d) "
msgstr "Rc: (%d, %d) "
#. IDS_IMGCMP_STATUS_FLIPPED_FMT
-#: Merge.rc:5205
+#: Merge.rc:5215
#, c-format
msgid "Flipped: %s "
msgstr "Invertito: %s "
#. IDS_IMGCMP_STATUS_ROTATED_FMT
-#: Merge.rc:5206
+#: Merge.rc:5216
#, c-format
msgid "Rotated: %d "
msgstr "Ruotato: %d "
#. IDS_IMGCMP_REPORT_ALLPAGES
-#: Merge.rc:5207
+#: Merge.rc:5217
msgid "All pages"
msgstr "Tutte le pagine"
#. IDS_IGNSUB_STR1
-#: Merge.rc:5212
+#: Merge.rc:5222
msgid ""
msgstr ""
#. IDS_IGNSUB_STR2
-#: Merge.rc:5213
+#: Merge.rc:5223
msgid "No differences found to select"
msgstr "Non è stata trovata nessuna differenza da selezionare"
#. IDS_IGNSUB_STR3
-#: Merge.rc:5214
+#: Merge.rc:5224
msgid "No differences found to add as substitution filter"
msgstr "Nessuna differenza trovata da aggiungere come filtro sostituzione"
#. IDS_IGNSUB_STR4
-#: Merge.rc:5215
+#: Merge.rc:5225
msgid "The pair is already in the Substitution Filters list"
msgstr "La coppia è già presente nell'elenco dei filtri sostituzione"
#. IDS_IGNSUB_STR5
-#: Merge.rc:5216
+#: Merge.rc:5226
msgid "Add this change to Substitution Filters?"
msgstr "Vuoi aggiungere questa modifica ai filtri sostituzione?"
#. IDS_OCRRESULT_TEXTONLY
-#: Merge.rc:5221
+#: Merge.rc:5231
msgid "Text only"
msgstr "Solo testo"
#. IDS_OCRRESULT_POS_LINE
-#: Merge.rc:5222
+#: Merge.rc:5232
msgid "Line-by-line position and text"
msgstr "Posizione e testo riga per riga"
#. IDS_OCRRESULT_POS_WORD
-#: Merge.rc:5223
+#: Merge.rc:5233
msgid "Word-by-word position and text"
msgstr "Posizione e testo parola per parola"
#. IDS_USERDATAFOLDER_APPDATA
-#: Merge.rc:5228
+#: Merge.rc:5238
msgid "AppData (Roaming) folder"
msgstr "Cartella Appdata (Roaming)"
#. IDS_USERDATAFOLDER_INSTALL
-#: Merge.rc:5229
+#: Merge.rc:5239
msgid "Install folder"
msgstr "Cartella installazione"
#. IDS_USERDATAFOLDER_DOCUMENTS
-#: Merge.rc:5230
+#: Merge.rc:5240
msgid "Documents folder"
msgstr "Cartella Documenti"
#. IDS_SINGLEINSTANCE_DISABLED
-#: Merge.rc:5235
+#: Merge.rc:5245
msgctxt "Options dialog|General|Single instance mode"
msgid "Disabled"
msgstr "Disabilitata"
#. IDS_SINGLEINSTANCE_STR1
-#: Merge.rc:5236
+#: Merge.rc:5246
msgid "Allow only one instance to run"
msgstr "Permetti l'esecuzione di un'unica istanza del programma"
#. IDS_SINGLEINSTANCE_STR2
-#: Merge.rc:5237
+#: Merge.rc:5247
msgid "Allow only one instance; wait for termination"
msgstr ""
"Permetti l'esecuzione di un'unica istanza del programma e attendi che termini"
#. IDS_AUTO_RELOAD_MODIFIED_FILES_DISABLED
-#: Merge.rc:5242
+#: Merge.rc:5252
msgctxt "Options dialog|General|Auto-reload modified files"
msgid "Disabled"
msgstr "Disabilitato"
#. IDS_AUTO_RELOAD_MODIFIED_FILES_STR1
-#: Merge.rc:5243
+#: Merge.rc:5253
msgid "Only on window activated"
msgstr "Solo nella finestra attivata"
#. IDS_AUTO_RELOAD_MODIFIED_FILES_STR2
-#: Merge.rc:5244
+#: Merge.rc:5254
msgid "Immediately"
msgstr "Immediatamente"
#. IDS_PLUGIN_ALL
-#: Merge.rc:5249
+#: Merge.rc:5259
msgid "Al&l"
msgstr "&Tutti"
#. IDS_PLUGIN_OTHERS
-#: Merge.rc:5250
+#: Merge.rc:5260
msgid "&Others"
msgstr "&Altri"
-#: Merge.rc:5252
+#: Merge.rc:5262
#, c-format
msgid "Missing plugin name in pipeline: %1"
msgstr "Nome plugin mancante nella pipeline plugin: %1"
-#: Merge.rc:5254
+#: Merge.rc:5264
#, c-format
msgid "Missing quote in plugin pipeline: %1"
msgstr "Virgoletta mancante nella pipeline plugin: %1"
#. IDS_PLUGIN_NAME_ALREADY_EXISTS
-#: Merge.rc:5255
+#: Merge.rc:5265
#, c-format
msgid "Plugin name '%1' already exists."
msgstr "Il nome plugin '%1' esiste già."
#. IDS_PLUGIN_TITLE1
-#: Merge.rc:5256
+#: Merge.rc:5266
msgid "Specify plugin arguments"
msgstr "Specifica gli argomenti del plugin"
-#: Merge.rc:5258
+#: Merge.rc:5268
#, c-format
msgid "Plugin not found or invalid: %1"
msgstr "Plugin non trovato o non valido: %1"
#. IDS_PLUGIN_NOT_UNPACK
-#: Merge.rc:5259
+#: Merge.rc:5269
#, c-format
msgid "'%1' is not an unpacker plugin"
msgstr "'%1' non è un plugin di decompressione"
#. IDS_PLUGIN_NOT_PREDIFF
-#: Merge.rc:5260
+#: Merge.rc:5270
#, c-format
msgid "'%1' is not a prediffer plugin"
msgstr "'%1' non è un plugin pre-differente"
-#: Merge.rc:5262
+#: Merge.rc:5272
#, c-format
msgid "Error prediffing '%1' with '%2'. Prediffing disabled."
msgstr "Errore pre-differenze \"%1\" con \"%2\". Pre-differenze disabilitate."
#. IDS_PLUGIN_CIRCULAR_REFERENCE
-#: Merge.rc:5263
+#: Merge.rc:5273
#, c-format
msgid "Circular reference in plugin pipeline: %1"
msgstr "Riferimento circolare pipeline plugin: %1"
#. IDS_PLUGIN_TYPE1
-#: Merge.rc:5264
+#: Merge.rc:5274
msgid "URL Handler"
msgstr "Gestore URL"
#. IDS_PLUGIN_TYPE2
-#: Merge.rc:5265
+#: Merge.rc:5275
msgid "File Unpacker"
msgstr "Decompressione file"
#. IDS_PLUGIN_TYPE3
-#: Merge.rc:5266
+#: Merge.rc:5276
msgid "File or Folder Unpacker"
msgstr "Decompressione file/cartella"
#. IDS_PLUGIN_TYPE5
-#: Merge.rc:5268
+#: Merge.rc:5278
msgid "Alias for Unpacker"
msgstr "Alias decompressione"
#. IDS_PLUGIN_TYPE6
-#: Merge.rc:5269
+#: Merge.rc:5279
msgid "Alias for Prediffer"
msgstr "Alias pre-differenza"
#. IDS_PLUGIN_TYPE7
-#: Merge.rc:5270
+#: Merge.rc:5280
msgid "Alias for Editor script"
msgstr "Alias per script editor"
#. IDS_PLUGIN_ALIAS_DESC
-#: Merge.rc:5271
+#: Merge.rc:5281
#, c-format
msgid "Alias for plugin pipeline '%1'"
msgstr "Alias pipeline plugin '%1'"
#. IDS_PLUGIN_NEW_DESC
-#: Merge.rc:5272
+#: Merge.rc:5282
msgid "New plugin description"
msgstr "Nuova descrizione plugin"
#. IDS_PLUGIN_TARGETS_ALL
-#: Merge.rc:5273
+#: Merge.rc:5283
msgid "All"
msgstr "Tutti"
#. IDS_PLUGIN_TARGETS_1ST
-#: Merge.rc:5274
+#: Merge.rc:5284
msgid "1st"
msgstr "Primo"
#. IDS_PLUGIN_TARGETS_2ND
-#: Merge.rc:5275
+#: Merge.rc:5285
msgid "2nd"
msgstr "Secondo"
#. IDS_PLUGIN_TARGETS_3RD
-#: Merge.rc:5276
+#: Merge.rc:5286
msgid "3rd"
msgstr "terzo"
#. IDS_PLUGIN_TARGETS_1ST_2ND
-#: Merge.rc:5277
+#: Merge.rc:5287
msgid "1st and 2nd"
msgstr "Primo e secondo"
#. IDS_PLUGIN_TARGETS_1ST_3RD
-#: Merge.rc:5278
+#: Merge.rc:5288
msgid "1st and 3rd"
msgstr "Primo e terzo"
#. IDS_PLUGIN_TARGETS_2ND_3RD
-#: Merge.rc:5279
+#: Merge.rc:5289
msgid "2nd and 3rd"
msgstr "Secondo e terzo"
#. IDS_FILTER_APPLIED
-#: Merge.rc:5284
+#: Merge.rc:5294
msgid "Filter applied"
msgstr "Filtro applicato"
#. IDS_FILTERMENU_COMPARE
-#: Merge.rc:5289
+#: Merge.rc:5299
#, c-format
msgid "Compare %1"
msgstr "Confronta %1"
#. IDS_FILTERMENU_FILTER_BY_THIS_COLUMN
-#: Merge.rc:5290
+#: Merge.rc:5300
msgid "&Filter by This Column"
msgstr "&Filtra in base a questa colonna"
#. IDS_FILTERMENU_FILTER_BY_THIS_COLUMN2
-#: Merge.rc:5291
+#: Merge.rc:5301
msgid "&Filter by This Column..."
msgstr "&Filtra in base a questa colonna..."
#. IDS_CLIPBOARDHISTORY_TIME
-#: Merge.rc:5296
+#: Merge.rc:5306
#, c-format
msgid "Clipboard at %s"
msgstr "Appunti in %s"
#. IDS_CLIPBOARDHISTORY_DISABLED
-#: Merge.rc:5297
+#: Merge.rc:5307
msgid ""
"Clipboard history disabled.\r\n"
"Enable: Windows logo key + V, then Turn on."
@@ -8111,113 +8122,118 @@ msgstr ""
"Per abilitare la cronologia degli appunti, premi il tasto Logo Windows + V, "
"quindi fai clic sul pulsante Attiva."
-#: Merge.rc:5299
+#: Merge.rc:5309
msgid "This system does not support clipboard history."
msgstr "Questo sistema non supporta la cronologia degli appunti."
-#: Merge.rc:5301
+#: Merge.rc:5311
msgid "32-bit WinMerge does not support Clipboard Compare"
msgstr ""
"La versione di WinMerge a 32 bit non supporta il confronto degli appunti"
#. IDS_WEBVIEW2_RUNTIME_NOT_INSTALLED
-#: Merge.rc:5306
+#: Merge.rc:5316
msgid "WebView2 runtime not installed. Download it?"
msgstr ""
"Il runtime WebView2 non è installato.\n"
"Vuoi scaricarlo?"
#. IDS_JUMPLIST_NEW_TEXT_COMPARE
-#: Merge.rc:5311
+#: Merge.rc:5321
msgid "New Text Compare"
msgstr "Nuovo confronto testo"
#. IDS_JUMPLIST_NEW_TABLE_COMPARE
-#: Merge.rc:5312
+#: Merge.rc:5322
msgid "New Table Compare"
msgstr "Nuova confronto tabella"
#. IDS_JUMPLIST_NEW_BINARY_COMPARE
-#: Merge.rc:5313
+#: Merge.rc:5323
msgid "New Binary Compare"
msgstr "Nuovo confronto binario"
#. IDS_JUMPLIST_NEW_IMAGE_COMPARE
-#: Merge.rc:5314
+#: Merge.rc:5324
msgid "New Image Compare"
msgstr "Nuovo confronto immagine"
#. IDS_JUMPLIST_NEW_WEBPAGE_COMPARE
-#: Merge.rc:5315
+#: Merge.rc:5325
msgid "New Webpage Compare"
msgstr "Nuovo confronto pagina web"
+#. IDS_JUMPLIST_NEW_FOLDER_COMPARE
+#: Merge.rc:5326
+msgid "New Folder Compare"
+msgstr ""
+
#. IDS_JUMPLIST_CLIPBOARD_COMPARE
-#: Merge.rc:5316
+#: Merge.rc:5327
msgid "Clipboard Compare"
msgstr "Confronto appunti"
#. IDS_PREVIEWBAR_PRINT
-#: Merge.rc:5321
+#: Merge.rc:5332
msgid "&Print..."
msgstr "Stam&pa...."
#. IDS_PREVIEWBAR_PREVPAGE
-#: Merge.rc:5323
+#: Merge.rc:5334
msgid "Pre&v Page"
msgstr "Pagina &prec"
#. IDS_PREVIEWBAR_TWOPAGE
-#: Merge.rc:5324
+#: Merge.rc:5335
msgid "&Two Page"
msgstr "&Due pagine"
#. IDS_PREVIEWBAR_ONEPAGE
-#: Merge.rc:5325
+#: Merge.rc:5336
msgid "&One Page"
msgstr "&Una pagina"
#. IDS_PREVIEWBAR_ZOOMIN
-#: Merge.rc:5326
+#: Merge.rc:5337
msgid "Zoom &In"
msgstr "Zoom +"
#. IDS_PREVIEWBAR_ZOOMOUT
-#: Merge.rc:5327
+#: Merge.rc:5338
msgid "Zoom &Out"
msgstr "Zoom &-"
#. IDS_WEBPAGE_COMPARING
-#: Merge.rc:5333
+#: Merge.rc:5344
msgid "Comparing..."
msgstr "Confronto..."
#. IDS_WEBPAGE_ZOOM
-#: Merge.rc:5334
+#: Merge.rc:5345
msgid "Zoom:"
msgstr "Zoom:"
#. IDS_COPY_GRANULARITY_DIFFHUNK
-#: Merge.rc:5339
+#: Merge.rc:5350
msgid "Diff hunk"
msgstr "Segmento diff"
#. IDS_COPY_GRANULARITY_INLINE
-#: Merge.rc:5340
+#: Merge.rc:5351
msgid "Inline diff"
msgstr "Diff. in linea"
#. IDS_COPY_GRANULARITY_LINE
-#: Merge.rc:5341
+#: Merge.rc:5352
msgid "Line"
msgstr "Linea"
-#: Merge.rc:5342
+#: Merge.rc:5353
msgid "Character"
msgstr "Carattere"
#. ID_MICE_PREVDIFF
-#: Merge.rc:5347
+#: Merge.rc:5358
msgid ""
"\n"
"Previous Difference (Alt+Up)\n"
@@ -8230,7 +8246,7 @@ msgstr ""
"(Alt+Rotellina Su)"
#. ID_MICE_NEXTDIFF
-#: Merge.rc:5348
+#: Merge.rc:5359
msgid ""
"\n"
"Next Difference (Alt+Down)\n"
@@ -8243,7 +8259,7 @@ msgstr ""
"(Alt+Rotellina Giù)"
#. ID_MICE_L2R
-#: Merge.rc:5349
+#: Merge.rc:5360
msgid ""
"\n"
"Copy to Right (Alt+Right)\n"
@@ -8258,7 +8274,7 @@ msgstr ""
"(Alt+Maiusc+Rotellina giù)"
#. ID_MICE_R2L
-#: Merge.rc:5350
+#: Merge.rc:5361
msgid ""
"\n"
"Copy to Left (Alt+Left)\n"
@@ -8273,7 +8289,7 @@ msgstr ""
"(Alt+Maiusc+Rotellina su)"
#. ID_MICE_L2RNEXT
-#: Merge.rc:5351
+#: Merge.rc:5362
msgid ""
"\n"
"Copy to Right and Advance (Ctrl+Alt+Right)\n"
@@ -8286,7 +8302,7 @@ msgstr ""
"(Ctrl+Alt+Maiusc+Rotella Giù)"
#. ID_MICE_R2LNEXT
-#: Merge.rc:5352
+#: Merge.rc:5363
msgid ""
"\n"
"Copy to Left and Advance (Ctrl+Alt+Left)\n"
@@ -8299,262 +8315,262 @@ msgstr ""
"(Ctrl+Alt+Maiusc+Rotellina Su)"
#. IDS_LOG_COMPARING_2
-#: Merge.rc:5362
+#: Merge.rc:5373
#, c-format
msgid "Comparing %1 with %2"
msgstr "Confronto %1 con %2"
#. IDS_LOG_COMPARING_3
-#: Merge.rc:5363
+#: Merge.rc:5374
#, c-format
msgid "Comparing %1 with %2 and %3"
msgstr "Confronto %1 con %2 e %3"
#. IDS_LOG_COMPARE_COMPLETED
-#: Merge.rc:5364
+#: Merge.rc:5375
msgid "Comparison completed"
msgstr "Confronto completato"
#. IDS_LOG_COMPARE_ERROR_2
-#: Merge.rc:5365
+#: Merge.rc:5376
#, c-format
msgid "Failed to compare %1 with %2: "
msgstr "Impossibile confrontare %1 con %2: "
#. IDS_LOG_COMPARE_ERROR_3
-#: Merge.rc:5366
+#: Merge.rc:5377
#, c-format
msgid "Failed to compare %1 with %2 and %3: "
msgstr "Impossibile confrontare %1 con %2 e %3: "
#. IDS_LOG_FILE_SAVED
-#: Merge.rc:5367
+#: Merge.rc:5378
msgid "File saved"
msgstr "File salvato"
#. IDS_LOG_COPYING_FILES
-#: Merge.rc:5368
+#: Merge.rc:5379
msgid "Copying files..."
msgstr "Copia file..."
#. IDS_LOG_MOVING_FILES
-#: Merge.rc:5369
+#: Merge.rc:5380
msgid "Moving files..."
msgstr "Spostamento file..."
#. IDS_LOG_DELETING_FILES
-#: Merge.rc:5370
+#: Merge.rc:5381
msgid "Deleting files..."
msgstr "Eliminazione file..."
#. IDS_LOG_RECYCLEBIN
-#: Merge.rc:5371
+#: Merge.rc:5382
msgid "Recycle Bin"
msgstr "Cestino"
#. IDS_LOG_PERMANENTLY_DELETED
-#: Merge.rc:5372
+#: Merge.rc:5383
msgid "Permanently deleted"
msgstr "Permanentemente eliminati"
#. IDS_LOG_FILEOPERATION_COMPLETED
-#: Merge.rc:5373
+#: Merge.rc:5384
msgid "File operation completed successfully"
msgstr "Operazione file completata correttamente"
#. IDS_LOG_FILEOPERATION_CANCELED
-#: Merge.rc:5374
+#: Merge.rc:5385
msgid "File operation canceled"
msgstr "Operazione file annullata"
#. IDS_FILTER_ERROR_NO_ERROR
-#: Merge.rc:5379
+#: Merge.rc:5390
msgid "No error"
msgstr "Nessun errore"
#. IDS_FILTER_ERROR_EMPTY_EXPRESSION
-#: Merge.rc:5380
+#: Merge.rc:5391
msgid "Filter expression is empty"
msgstr "L'espressione filtro è vuota"
#. IDS_FILTER_ERROR_UNKNOWN_CHAR
-#: Merge.rc:5381
+#: Merge.rc:5392
msgid "Unknown character in filter expression"
msgstr "Carattere sconosciuto nell'espressione filtro"
#. IDS_FILTER_ERROR_UNTERMINATED_STRING
-#: Merge.rc:5382
+#: Merge.rc:5393
msgid "Unterminated string literal"
msgstr "Stringa letterale non terminata"
#. IDS_FILTER_ERROR_SYNTAX_ERROR
-#: Merge.rc:5383
+#: Merge.rc:5394
msgid "Syntax error in filter expression"
msgstr "Errore di sintassi nell'espressione filtro"
#. IDS_FILTER_ERROR_PARSE_FAILURE
-#: Merge.rc:5384
+#: Merge.rc:5395
msgid "Failed to parse filter expression"
msgstr "Impossibile analizzare l'espressione filtro"
#. IDS_FILTER_ERROR_INVALID_LITERAL
-#: Merge.rc:5385
+#: Merge.rc:5396
msgid "Invalid literal value"
msgstr "Valore letterale non valido"
#. IDS_FILTER_ERROR_INVALID_REGULAR_EXPRESSION
-#: Merge.rc:5386
+#: Merge.rc:5397
msgid "Invalid regular expression"
msgstr "Espressione regolare non valida"
#. IDS_FILTER_ERROR_UNDEFINED_IDENTIFIER
-#: Merge.rc:5387
+#: Merge.rc:5398
msgid "Undefined identifier"
msgstr "Identificatore non definito"
#. IDS_FILTER_ERROR_INVALID_ARGUMENT_COUNT
-#: Merge.rc:5388
+#: Merge.rc:5399
msgid "Invalid number of arguments"
msgstr "Numero di argomenti non valido"
#. IDS_FILTER_ERROR_FILTER_NAME_NOT_FOUND
-#: Merge.rc:5389
+#: Merge.rc:5400
msgid "Filter name not found"
msgstr "Nome filtro non trovato"
#. IDS_FILTER_ERROR_DIVIDE_BY_ZERO
-#: Merge.rc:5390
+#: Merge.rc:5401
msgid "Division by zero in filter expression"
msgstr "Divisione per zero nell'espressione filtro"
#. IDS_FILTER_ERROR_UNKNOWN_ERROR
-#: Merge.rc:5391
+#: Merge.rc:5402
msgid "Unknown error"
msgstr "Errore sconosciuto"
#. IDS_FILTER_ERROR_INVALID_PROPERTY_NAME
-#: Merge.rc:5392
+#: Merge.rc:5403
msgid "Invalid property name"
msgstr "Nome proprietà non valido"
#. IDS_FILTER_ERROR_INVALID_DIRECTIVE
-#: Merge.rc:5393
+#: Merge.rc:5404
msgid "Invalid directive"
msgstr "Direttiva non valida"
#. IDS_FILTER_OP_EQUALS
-#: Merge.rc:5398
+#: Merge.rc:5409
msgid "Equals"
msgstr "Uguale"
#. IDS_FILTER_OP_NOT_EQUALS
-#: Merge.rc:5399
+#: Merge.rc:5410
msgid "Does not equal"
msgstr "Non uguale"
#. IDS_FILTER_OP_LESS_THAN
-#: Merge.rc:5400
+#: Merge.rc:5411
msgid "Less than"
msgstr "Inferiore a"
#. IDS_FILTER_OP_LESS_EQUAL
-#: Merge.rc:5401
+#: Merge.rc:5412
msgid "Less than or equal to"
msgstr "Inferiore a o uguale a"
#. IDS_FILTER_OP_GREATER_EQUAL
-#: Merge.rc:5402
+#: Merge.rc:5413
msgid "Greater than or equal to"
msgstr "Maggiore di o uguale a"
#. IDS_FILTER_OP_GREATER_THAN
-#: Merge.rc:5403
+#: Merge.rc:5414
msgid "Greater than"
msgstr "Maggiore di"
#. IDS_FILTER_OP_BETWEEN
-#: Merge.rc:5404
+#: Merge.rc:5415
msgid "Between"
msgstr "Tra"
#. IDS_FILTER_OP_NOT_BETWEEN
-#: Merge.rc:5405
+#: Merge.rc:5416
msgid "Not Between"
msgstr "Non tra"
#. IDS_FILTER_OP_CONTAINS
-#: Merge.rc:5406
+#: Merge.rc:5417
msgid "Contains"
msgstr "Contiene"
#. IDS_FILTER_OP_NOT_CONTAINS
-#: Merge.rc:5407
+#: Merge.rc:5418
msgid "Not Contains"
msgstr "Non contiene"
#. IDS_FILTER_OP_RECONTAINS
-#: Merge.rc:5408
+#: Merge.rc:5419
msgid "Contains (regex)"
msgstr "Contiene (regx)"
#. IDS_FILTER_OP_NOT_RECONTAINS
-#: Merge.rc:5409
+#: Merge.rc:5420
msgid "Not Contains (regex)"
msgstr "Non contiene (regex)"
#. IDS_FILTER_OP_LIKE
-#: Merge.rc:5410
+#: Merge.rc:5421
msgid "Match (wildcard)"
msgstr "Corrispondenza (carattere jolly)"
#. IDS_FILTER_OP_NOT_LIKE
-#: Merge.rc:5411
+#: Merge.rc:5422
msgid "Not match (wildcard)"
msgstr "Non corrispondenza (carattere jolly)"
#. IDS_FILTER_OP_MATCHES
-#: Merge.rc:5412
+#: Merge.rc:5423
msgid "Match (regex)"
msgstr "Corrispondenza (regex)"
#. IDS_FILTER_OP_NOT_MATCHES
-#: Merge.rc:5413
+#: Merge.rc:5424
msgid "Not match (regex)"
msgstr "Non corrispondenza (regex)"
#. IDS_COLORMODE_LIGHT
-#: Merge.rc:5418
+#: Merge.rc:5429
msgid "Light"
msgstr "Chiaro"
#. IDS_COLORMODE_DARK
-#: Merge.rc:5419
+#: Merge.rc:5430
msgid "Dark"
msgstr "Scuro"
#. IDS_COLORMODE_FOLLOWSYSTEM
-#: Merge.rc:5420
+#: Merge.rc:5431
msgid "Follow system"
msgstr "Sistema"
#. IDS_EXAMPLE
-#: Merge.rc:5425
+#: Merge.rc:5436
#, c-format
msgid "e.g. %1"
msgstr "es. %1"
#. IDS_DETECTED_PREVIOUS_CRASH
-#: Merge.rc:5430
+#: Merge.rc:5441
msgid "WinMerge detected a previous crash. Please report this if possible."
msgstr "WinMerge ha rilevato un precedente arresto anomalo. Se possibile, segnalalo."
#. IDS_REGEX_REPLACE_LIST_TEMPLATE
-#: Merge.rc:5435
+#: Merge.rc:5446
msgid "# Regex replacement list\r\n# Format: regexreplacement\r\n# Backreferences like $1, $2 are supported\r\n\r\n(\\d{4})-(\\d{2})-(\\d{2})\t$1_$2_$3\r\n"
msgstr "# Elenco sostituzione Regex\r\n# Formato: regexsostituzione\r\n# Sono supportati riferimenti all'indietro come $1, $2\r\n\r\n(\\d{4})-(\\d{2})-(\\d{2})\t$1_$2_$3\r\n"
#. IDS_STRING_REPLACE_LIST_TEMPLATE
-#: Merge.rc:5436
+#: Merge.rc:5447
msgid "# Replacement list\r\n# Format: searchreplacement\r\n# Lines starting with # are ignored\r\n\r\nfrom1\tto1\r\nfrom2\tto2\r\n"
msgstr "# Elenco sostituzioni\r\n# Formato: ricercasostituzione\r\n# Le righe che iniziano con # verranno ignorate\r\n\r\nda1\ta1\r\nda2\ta2\r\n"
diff --git a/Translations/WinMerge/Japanese.po b/Translations/WinMerge/Japanese.po
index aed0f7e879d..a591e9762b9 100644
--- a/Translations/WinMerge/Japanese.po
+++ b/Translations/WinMerge/Japanese.po
@@ -22,7 +22,7 @@ msgstr ""
"X-Generator: Poedit 3.6\n"
#. LANGUAGE, SUBLANGUAGE
-#: Merge.rc:26 Merge.rc:59 Merge.rc:5453
+#: Merge.rc:26 Merge.rc:59 Merge.rc:5464
msgid "LANG_ENGLISH, SUBLANG_ENGLISH_US"
msgstr "LANG_JAPANESE, SUBLANG_DEFAULT"
@@ -107,7 +107,7 @@ msgid "Copy Selected Diff (Right) to Clipboard\tCtrl+&3"
msgstr "選択した差異(右側)をクリップボードへコピー\tCtrl+&3"
#. IDR_MERGEDOCTYPE, ID_SELECTLINEDIFF
-#: Merge.rc:110 Merge.rc:673
+#: Merge.rc:110 Merge.rc:680
msgid "Select Line &Difference\tF4"
msgstr "行内差異を選択(&D)\tF4"
@@ -137,7 +137,7 @@ msgid "Cu&t"
msgstr "切り取り(&T)"
#. IDR_POPUP_DIRVIEW
-#: Merge.rc:118 Merge.rc:943
+#: Merge.rc:118 Merge.rc:951
msgid "&Copy"
msgstr "コピー(&C)"
@@ -147,19 +147,19 @@ msgid "&Paste"
msgstr "貼り付け(&P)"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:121 Merge.rc:875 Merge.rc:882
+#: Merge.rc:121 Merge.rc:882 Merge.rc:889
msgid "&Scripts"
msgstr "スクリプト(&S)"
#. IDS_NO_EDIT_SCRIPTS
-#: Merge.rc:123 Merge.rc:338 Merge.rc:447 Merge.rc:654 Merge.rc:659
-#: Merge.rc:865 Merge.rc:877 Merge.rc:884 Merge.rc:940 Merge.rc:1183
-#: Merge.rc:5028
+#: Merge.rc:123 Merge.rc:340 Merge.rc:451 Merge.rc:661 Merge.rc:666
+#: Merge.rc:872 Merge.rc:884 Merge.rc:891 Merge.rc:948 Merge.rc:1193
+#: Merge.rc:5038
msgid "< Empty >"
msgstr "< なし >"
#. IDR_POPUP_LOCATIONBAR, ID_EDIT_WMGOTO
-#: Merge.rc:126 Merge.rc:691 Merge.rc:1081
+#: Merge.rc:126 Merge.rc:698 Merge.rc:1089
msgid "&Go to...\tCtrl+G"
msgstr "移動(&G)...\tCtrl+G"
@@ -179,27 +179,27 @@ msgid "Op&en"
msgstr "開く(&E)"
#. IDR_POPUP_DIRVIEW, ID_DIR_OPEN_RIGHT
-#: Merge.rc:132 Merge.rc:981 Merge.rc:988 Merge.rc:995
+#: Merge.rc:132 Merge.rc:989 Merge.rc:996 Merge.rc:1003
msgid "With &Registered Application"
msgstr "登録されたアプリケーションで(&R)"
#. IDR_POPUP_DIRVIEW, ID_DIR_OPEN_RIGHT_WITHEDITOR
-#: Merge.rc:133 Merge.rc:982 Merge.rc:989 Merge.rc:996
+#: Merge.rc:133 Merge.rc:990 Merge.rc:997 Merge.rc:1004
msgid "With &External Editor\tCtrl+Alt+E"
msgstr "外部エディターで(&E)\tCtrl+Alt+E"
#. IDR_POPUP_DIRVIEW, ID_DIR_OPEN_RIGHT_WITH
-#: Merge.rc:134 Merge.rc:983 Merge.rc:990 Merge.rc:997
+#: Merge.rc:134 Merge.rc:991 Merge.rc:998 Merge.rc:1005
msgid "&With..."
msgstr "プログラムの選択(&W)..."
#. IDR_POPUP_DIRVIEW, ID_DIR_OPEN_RIGHT_PARENT_FOLDER
-#: Merge.rc:135 Merge.rc:984 Merge.rc:991 Merge.rc:998
+#: Merge.rc:135 Merge.rc:992 Merge.rc:999 Merge.rc:1006
msgid "Open &Parent Folder..."
msgstr "親フォルダーを開く(&P)..."
#. IDR_POPUP_IMG_CTXT, ID_FILE_SHELLMENU
-#: Merge.rc:137 Merge.rc:1239
+#: Merge.rc:137 Merge.rc:1249
msgid "S&hell Menu"
msgstr "シェル メニュー(&H)"
@@ -234,8 +234,8 @@ msgid "Ins&ertion/Deletion Detection"
msgstr "挿入/削除検出(&E)"
#. IDR_MERGEDOCTYPE, ID_TOOLBAR_NONE
-#: Merge.rc:176 Merge.rc:209 Merge.rc:216 Merge.rc:358 Merge.rc:507
-#: Merge.rc:751
+#: Merge.rc:176 Merge.rc:209 Merge.rc:216 Merge.rc:360 Merge.rc:511
+#: Merge.rc:758
msgid "&None"
msgstr "なし(&N)"
@@ -250,12 +250,12 @@ msgid "&Horizontal"
msgstr "水平方向(&H)"
#. IDR_POPUP_IMG_CTXT, ID_IMG_CURPANE_PREVPAGE
-#: Merge.rc:181 Merge.rc:189 Merge.rc:1230
+#: Merge.rc:181 Merge.rc:189 Merge.rc:1240
msgid "&Previous Page"
msgstr "前ページ(&P)"
#. IDS_PREVIEWBAR_NEXTPAGE
-#: Merge.rc:182 Merge.rc:190 Merge.rc:1231 Merge.rc:5322
+#: Merge.rc:182 Merge.rc:190 Merge.rc:1241 Merge.rc:5333
msgid "&Next Page"
msgstr "次ページ(&N)"
@@ -265,42 +265,42 @@ msgid "&Active Pane"
msgstr "選択ペイン(&A)"
#. IDR_POPUP_IMG_CTXT, ID_IMG_CURPANE_ROTATE_RIGHT_90
-#: Merge.rc:185 Merge.rc:1225
+#: Merge.rc:185 Merge.rc:1235
msgid "Rotate &Right 90deg"
msgstr "右へ90度回転(&R)"
#. IDR_POPUP_IMG_CTXT, ID_IMG_CURPANE_ROTATE_LEFT_90
-#: Merge.rc:186 Merge.rc:1226
+#: Merge.rc:186 Merge.rc:1236
msgid "Rotate &Left 90deg"
msgstr "左へ90度回転(&L)"
#. IDR_POPUP_IMG_CTXT, ID_IMG_CURPANE_FLIP_VERTICALLY
-#: Merge.rc:187 Merge.rc:1227
+#: Merge.rc:187 Merge.rc:1237
msgid "Flip V&ertically"
msgstr "上下反転(&E)"
#. IDR_POPUP_IMG_CTXT, ID_IMG_CURPANE_FLIP_HORIZONTALLY
-#: Merge.rc:188 Merge.rc:1228
+#: Merge.rc:188 Merge.rc:1238
msgid "Flip H&orizontally"
msgstr "左右反転(&O)"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:193 Merge.rc:699
+#: Merge.rc:193 Merge.rc:706
msgid "&Zoom"
msgstr "拡大/縮小(&Z)"
#. IDR_MERGEDOCTYPE, ID_VIEW_ZOOMIN
-#: Merge.rc:202 Merge.rc:701
+#: Merge.rc:202 Merge.rc:708
msgid "Zoom &In\tCtrl++"
msgstr "拡大(&I)\tCtrl++"
#. IDR_MERGEDOCTYPE, ID_VIEW_ZOOMOUT
-#: Merge.rc:203 Merge.rc:702
+#: Merge.rc:203 Merge.rc:709
msgid "Zoom &Out\tCtrl+-"
msgstr "縮小(&O)\tCtrl+-"
#. IDR_MERGEDOCTYPE, ID_VIEW_ZOOMNORMAL, Zoom to normal
-#: Merge.rc:205 Merge.rc:704
+#: Merge.rc:205 Merge.rc:711
msgid "&Normal\tCtrl+*"
msgstr "標準に戻す(&N)\tCtrl+*"
@@ -325,27 +325,27 @@ msgid "Dragging &Mode"
msgstr "ドラッグモード(&M)"
#. IDR_POPUP_IMG_CTXT, ID_IMG_DRAGGINGMODE_MOVE
-#: Merge.rc:217 Merge.rc:955 Merge.rc:1233
+#: Merge.rc:217 Merge.rc:963 Merge.rc:1243
msgid "&Move"
msgstr "移動(&M)"
#. IDR_POPUP_IMG_CTXT, ID_IMG_DRAGGINGMODE_ADJUST_OFFSET
-#: Merge.rc:218 Merge.rc:1234
+#: Merge.rc:218 Merge.rc:1244
msgid "&Adjust Offset"
msgstr "オフセット調整(&A)"
#. IDR_POPUP_IMG_CTXT, ID_IMG_DRAGGINGMODE_VERTICAL_WIPE
-#: Merge.rc:219 Merge.rc:1235
+#: Merge.rc:219 Merge.rc:1245
msgid "&Vertical Wipe"
msgstr "垂直ワイプ(&V)"
#. IDR_POPUP_IMG_CTXT, ID_IMG_DRAGGINGMODE_HORIZONTAL_WIPE
-#: Merge.rc:220 Merge.rc:1236
+#: Merge.rc:220 Merge.rc:1246
msgid "&Horizontal Wipe"
msgstr "水平ワイプ(&H)"
#. IDR_POPUP_IMG_CTXT, ID_IMG_DRAGGINGMODE_RECTANGLE_SELECT
-#: Merge.rc:221 Merge.rc:1237
+#: Merge.rc:221 Merge.rc:1247
msgid "Rectangle &Select"
msgstr "矩形選択(&S)"
@@ -380,37 +380,37 @@ msgid "Compare Extracted &Text from Images"
msgstr "画像から抽出したテキストを比較(&T)"
#. IDD_OPEN, IDOK
-#: Merge.rc:272 Merge.rc:1980
+#: Merge.rc:272 Merge.rc:1990
msgid "Co&mpare"
msgstr "比較(&M)"
#. IDR_POPUP_WEBPAGE_COMPARE, ID_WEB_COMPARE_SCREENSHOTS
-#: Merge.rc:274 Merge.rc:1247
+#: Merge.rc:274 Merge.rc:1257
msgid "&Screenshots"
msgstr "スクリーンショット(&S)"
#. IDR_POPUP_WEBPAGE_COMPARE, ID_WEB_COMPARE_FULLSIZE_SCREENSHOTS
-#: Merge.rc:275 Merge.rc:1248
+#: Merge.rc:275 Merge.rc:1258
msgid "&Full Size Screenshots"
msgstr "フルサイズ スクリーンショット(&F)"
#. IDR_POPUP_WEBPAGE_COMPARE, ID_WEB_COMPARE_HTMLS
-#: Merge.rc:276 Merge.rc:1249
+#: Merge.rc:276 Merge.rc:1259
msgid "&HTMLs"
msgstr "&HTML"
#. IDR_POPUP_WEBPAGE_COMPARE, ID_WEB_COMPARE_TEXTS
-#: Merge.rc:277 Merge.rc:1250
+#: Merge.rc:277 Merge.rc:1260
msgid "&Texts"
msgstr "テキスト(&T)"
#. IDR_POPUP_WEBPAGE_COMPARE, ID_WEB_COMPARE_RESOURCETREES
-#: Merge.rc:278 Merge.rc:1251
+#: Merge.rc:278 Merge.rc:1261
msgid "&Resource Trees"
msgstr "リソース ツリー(&R)"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_SIZE
-#: Merge.rc:280 Merge.rc:1775
+#: Merge.rc:280 Merge.rc:1785
msgid "&Size"
msgstr "サイズ(&S)"
@@ -425,27 +425,27 @@ msgid "&Event Sync"
msgstr "イベント同期(&E)"
#. IDR_POPUP_WEBPAGE_SYNC_EVENTS, ID_WEB_SYNC_ENABLED
-#: Merge.rc:291 Merge.rc:1259
+#: Merge.rc:291 Merge.rc:1269
msgid "&Enabled"
msgstr "有効(&E)"
#. IDR_POPUP_WEBPAGE_SYNC_EVENTS, ID_WEB_SYNC_SCROLL
-#: Merge.rc:293 Merge.rc:1261
+#: Merge.rc:293 Merge.rc:1271
msgid "&Scroll"
msgstr "スクロール(&S)"
#. IDR_POPUP_WEBPAGE_SYNC_EVENTS, ID_WEB_SYNC_CLICK
-#: Merge.rc:294 Merge.rc:1262
+#: Merge.rc:294 Merge.rc:1272
msgid "&Click"
msgstr "クリック(&C)"
#. IDR_POPUP_WEBPAGE_SYNC_EVENTS, ID_WEB_SYNC_INPUT
-#: Merge.rc:295 Merge.rc:1263
+#: Merge.rc:295 Merge.rc:1273
msgid "&Input"
msgstr "入力(&I)"
#. IDR_POPUP_WEBPAGE_SYNC_EVENTS, ID_WEB_SYNC_GOBACKFORWARD
-#: Merge.rc:296 Merge.rc:1264
+#: Merge.rc:296 Merge.rc:1274
msgid "&Go Back/Forward"
msgstr "戻る/進む(&G)"
@@ -475,3611 +475,3622 @@ msgid "&All Profiles"
msgstr "すべてのプロファイル(&A)"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:310 Merge.rc:411 Merge.rc:586
+#: Merge.rc:310 Merge.rc:413 Merge.rc:590
msgid "&File"
msgstr "ファイル(&F)"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:312 Merge.rc:413 Merge.rc:588
+#: Merge.rc:312 Merge.rc:415 Merge.rc:592
msgid "&New"
msgstr "新規(&N)"
#. IDR_POPUP_COMPARE, ID_MERGE_COMPARE_TEXT
-#: Merge.rc:314 Merge.rc:322 Merge.rc:415 Merge.rc:423 Merge.rc:590
-#: Merge.rc:598 Merge.rc:649 Merge.rc:935 Merge.rc:1159 Merge.rc:1171
+#: Merge.rc:314 Merge.rc:323 Merge.rc:417 Merge.rc:426 Merge.rc:594
+#: Merge.rc:603 Merge.rc:655 Merge.rc:942 Merge.rc:1167 Merge.rc:1180
msgid "&Text"
msgstr "テキスト(&T)"
#. IDR_POPUP_COMPARE, ID_MERGE_COMPARE_TABLE
-#: Merge.rc:315 Merge.rc:323 Merge.rc:416 Merge.rc:424 Merge.rc:591
-#: Merge.rc:599 Merge.rc:650 Merge.rc:936 Merge.rc:1160 Merge.rc:1172
+#: Merge.rc:315 Merge.rc:324 Merge.rc:418 Merge.rc:427 Merge.rc:595
+#: Merge.rc:604 Merge.rc:656 Merge.rc:943 Merge.rc:1168 Merge.rc:1181
msgid "T&able"
msgstr "テーブル(&A)"
#. IDR_POPUP_COMPARE, ID_MERGE_COMPARE_HEX
-#: Merge.rc:316 Merge.rc:324 Merge.rc:417 Merge.rc:425 Merge.rc:592
-#: Merge.rc:600 Merge.rc:651 Merge.rc:937 Merge.rc:1161 Merge.rc:1173
+#: Merge.rc:316 Merge.rc:325 Merge.rc:419 Merge.rc:428 Merge.rc:596
+#: Merge.rc:605 Merge.rc:657 Merge.rc:944 Merge.rc:1169 Merge.rc:1182
msgid "&Binary"
msgstr "バイナリ(&B)"
#. IDS_IMAGE_MENU
-#: Merge.rc:317 Merge.rc:325 Merge.rc:418 Merge.rc:426 Merge.rc:593
-#: Merge.rc:601 Merge.rc:652 Merge.rc:938 Merge.rc:1162 Merge.rc:1174
-#: Merge.rc:5123
+#: Merge.rc:317 Merge.rc:326 Merge.rc:420 Merge.rc:429 Merge.rc:597
+#: Merge.rc:606 Merge.rc:658 Merge.rc:945 Merge.rc:1170 Merge.rc:1183
+#: Merge.rc:5133
msgid "&Image"
msgstr "画像(&I)"
#. IDR_POPUP_COMPARE, ID_MERGE_COMPARE_WEBPAGE
-#: Merge.rc:318 Merge.rc:326 Merge.rc:419 Merge.rc:427 Merge.rc:594
-#: Merge.rc:602 Merge.rc:653 Merge.rc:939 Merge.rc:1163 Merge.rc:1175
+#: Merge.rc:318 Merge.rc:327 Merge.rc:421 Merge.rc:430 Merge.rc:598
+#: Merge.rc:607 Merge.rc:659 Merge.rc:946 Merge.rc:1171 Merge.rc:1184
msgid "&Webpage"
msgstr "&Webページ"
+#. IDR_POPUP_NEW, ID_FILE_NEW_FOLDER
+#: Merge.rc:319 Merge.rc:328 Merge.rc:422 Merge.rc:431 Merge.rc:599
+#: Merge.rc:608 Merge.rc:1172
+msgid "&Folder"
+msgstr "フォルダー(&F)"
+
#. IDR_MERGEDOCTYPE
-#: Merge.rc:320 Merge.rc:421 Merge.rc:596
+#: Merge.rc:321 Merge.rc:424 Merge.rc:601
msgid "New (&3 panes)"
msgstr "新規 (&3 ペイン)"
#. IDR_MERGEDOCTYPE, ID_FILE_OPEN
-#: Merge.rc:328 Merge.rc:429 Merge.rc:604
+#: Merge.rc:330 Merge.rc:433 Merge.rc:610
msgid "&Open...\tCtrl+O"
msgstr "開く(&O)...\tCtrl+O"
#. IDR_MERGEDOCTYPE, ID_FILE_OPENCONFLICT
-#: Merge.rc:329 Merge.rc:430 Merge.rc:605
+#: Merge.rc:331 Merge.rc:434 Merge.rc:611
msgid "Open Conflic&t File..."
msgstr "コンフリクト ファイルを開く(&T)..."
#. IDR_MERGEDOCTYPE, ID_FILE_OPENCLIPBOARD
-#: Merge.rc:330 Merge.rc:431 Merge.rc:606
+#: Merge.rc:332 Merge.rc:435 Merge.rc:612
msgid "Open C&lipboard"
msgstr "クリップボードを開く(&L)"
#. IDR_POPUP_PROJECT, ID_FILE_OPENPROJECT
-#: Merge.rc:332 Merge.rc:433 Merge.rc:608 Merge.rc:1191
+#: Merge.rc:334 Merge.rc:437 Merge.rc:614 Merge.rc:1201
msgid "Open Pro&ject...\tCtrl+J"
msgstr "プロジェクトを開く(&J)...\tCtrl+J"
#. IDD_OPEN, ID_SAVE_PROJECT
-#: Merge.rc:333 Merge.rc:434 Merge.rc:609 Merge.rc:1193 Merge.rc:1979
+#: Merge.rc:335 Merge.rc:438 Merge.rc:615 Merge.rc:1203 Merge.rc:1989
msgid "Sa&ve Project..."
msgstr "プロジェクトを保存(&V)..."
#. IDR_MAINFRAME, ID_FILE_PROJECT_MRU_FIRST
-#: Merge.rc:335
+#: Merge.rc:337
msgid "Recent Projects"
msgstr "最近使用したプロジェクト"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:336 Merge.rc:445 Merge.rc:657
+#: Merge.rc:338 Merge.rc:449 Merge.rc:664
msgid "Recent F&iles or Folders"
msgstr "最近使用したファイルまたはフォルダー(&I)"
#. IDR_MERGEDOCTYPE, ID_APP_EXIT
-#: Merge.rc:341 Merge.rc:450 Merge.rc:662
+#: Merge.rc:343 Merge.rc:454 Merge.rc:669
msgid "E&xit\tCtrl+Q"
msgstr "終了(&X)\tCtrl+Q"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:343 Merge.rc:452 Merge.rc:664
+#: Merge.rc:345 Merge.rc:456 Merge.rc:671
msgid "&Edit"
msgstr "編集(&E)"
#. IDR_MERGEDOCTYPE, ID_EDIT_PASTE
-#: Merge.rc:345 Merge.rc:671
+#: Merge.rc:347 Merge.rc:678
msgid "&Paste\tCtrl+V"
msgstr "貼り付け(&P)\tCtrl+V"
#. IDR_MERGEDOCTYPE, ID_OPTIONS
-#: Merge.rc:347 Merge.rc:456 Merge.rc:693
+#: Merge.rc:349 Merge.rc:460 Merge.rc:700
msgid "&Options...\tCtrl+,"
msgstr "設定(&O)...\tCtrl+,"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:349 Merge.rc:458 Merge.rc:695
+#: Merge.rc:351 Merge.rc:462 Merge.rc:702
msgid "&View"
msgstr "表示(&V)"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:351 Merge.rc:500 Merge.rc:744
+#: Merge.rc:353 Merge.rc:504 Merge.rc:751
msgid "Ta&b Bar"
msgstr "タブ バー(&B)"
#. IDR_MERGEDOCTYPE, ID_VIEW_TAB_BAR
-#: Merge.rc:353 Merge.rc:502 Merge.rc:746
+#: Merge.rc:355 Merge.rc:506 Merge.rc:753
msgid "&View Tab Bar"
msgstr "タブ バーを表示(&V)"
#. IDR_MERGEDOCTYPE, ID_VIEW_TAB_BAR_ON_TITLE_BAR
-#: Merge.rc:354 Merge.rc:503 Merge.rc:747
+#: Merge.rc:356 Merge.rc:507 Merge.rc:754
msgid "&On Title Bar"
msgstr "タイトルバー上に配置(&O)"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:356 Merge.rc:505 Merge.rc:749
+#: Merge.rc:358 Merge.rc:509 Merge.rc:756
msgid "&Toolbar"
msgstr "ツールバー(&T)"
#. IDR_MERGEDOCTYPE, ID_TOOLBAR_SMALL
-#: Merge.rc:359 Merge.rc:508 Merge.rc:752
+#: Merge.rc:361 Merge.rc:512 Merge.rc:759
msgid "&Small"
msgstr "小(&S)"
#. IDR_MERGEDOCTYPE, ID_TOOLBAR_MEDIUM
-#: Merge.rc:360 Merge.rc:509 Merge.rc:753
+#: Merge.rc:362 Merge.rc:513 Merge.rc:760
msgid "&Medium"
msgstr "中(&M)"
#. IDR_MERGEDOCTYPE, ID_TOOLBAR_BIG
-#: Merge.rc:361 Merge.rc:510 Merge.rc:754
+#: Merge.rc:363 Merge.rc:514 Merge.rc:761
msgid "&Big"
msgstr "大(&B)"
#. IDR_MERGEDOCTYPE, ID_TOOLBAR_HUGE
-#: Merge.rc:362 Merge.rc:511 Merge.rc:755
+#: Merge.rc:364 Merge.rc:515 Merge.rc:762
msgid "&Huge"
msgstr "特大(&H)"
#. IDS_VIEW_MENU_BAR
-#: Merge.rc:364 Merge.rc:513 Merge.rc:757 Merge.rc:5357
+#: Merge.rc:366 Merge.rc:517 Merge.rc:764 Merge.rc:5368
msgid "Men&u Bar"
msgstr "メニューバー(&U)"
#. IDR_DIRDOCTYPE, ID_VIEW_OUTPUT_BAR
-#: Merge.rc:365 Merge.rc:515
+#: Merge.rc:367 Merge.rc:519
msgid "&Output Pane"
msgstr "出力ペイン(&O)"
#. IDR_MERGEDOCTYPE, ID_VIEW_STATUS_BAR
-#: Merge.rc:366 Merge.rc:516 Merge.rc:758
+#: Merge.rc:368 Merge.rc:520 Merge.rc:765
msgid "&Status Bar"
msgstr "ステータス バー(&S)"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:368 Merge.rc:539 Merge.rc:847
+#: Merge.rc:370 Merge.rc:543 Merge.rc:854
msgid "&Tools"
msgstr "ツール(&T)"
#. IDR_MERGEDOCTYPE, ID_TOOLS_FILTERS
-#: Merge.rc:370 Merge.rc:542 Merge.rc:849
+#: Merge.rc:372 Merge.rc:546 Merge.rc:856
msgid "&Filters..."
msgstr "フィルター(&F)..."
#. IDR_MERGEDOCTYPE, ID_TOOLS_GENERATEPATCH
-#: Merge.rc:371 Merge.rc:543 Merge.rc:850
+#: Merge.rc:373 Merge.rc:547 Merge.rc:857
msgid "&Generate Patch..."
msgstr "パッチの生成(&G)..."
#. IDR_MERGEDOCTYPE
-#: Merge.rc:373 Merge.rc:546 Merge.rc:853
+#: Merge.rc:375 Merge.rc:550 Merge.rc:860
msgid "&Plugins"
msgstr "プラグイン(&P)"
#. IDD_PLUGINS_LIST, IDC_PLUGIN_SETTINGS
-#: Merge.rc:375 Merge.rc:548 Merge.rc:855 Merge.rc:2494 Merge.rc:2926
+#: Merge.rc:377 Merge.rc:552 Merge.rc:862 Merge.rc:2504 Merge.rc:2936
msgid "P&lugin Settings..."
msgstr "プラグインの設定(&L)..."
#. IDR_MERGEDOCTYPE, ID_PREDIFFER_MANUAL
-#: Merge.rc:377 Merge.rc:550 Merge.rc:857
+#: Merge.rc:379 Merge.rc:554 Merge.rc:864
msgid "Ma&nual Prediffer"
msgstr "手動比較前処理(&N)"
#. IDR_MERGEDOCTYPE, ID_PREDIFFER_AUTO
-#: Merge.rc:378 Merge.rc:551 Merge.rc:858
+#: Merge.rc:380 Merge.rc:555 Merge.rc:865
msgid "A&utomatic Prediffer"
msgstr "自動比較前処理(&U)"
#. IDR_MERGEDOCTYPE, ID_UNPACK_MANUAL
-#: Merge.rc:380 Merge.rc:553 Merge.rc:860
+#: Merge.rc:382 Merge.rc:557 Merge.rc:867
msgid "&Manual Unpacking"
msgstr "手動展開(&M)"
#. IDR_MERGEDOCTYPE, ID_UNPACK_AUTO
-#: Merge.rc:381 Merge.rc:554 Merge.rc:861
+#: Merge.rc:383 Merge.rc:558 Merge.rc:868
msgid "&Automatic Unpacking"
msgstr "自動展開(&A)"
#. IDR_MERGEDOCTYPE, ID_RELOAD_PLUGINS
-#: Merge.rc:383 Merge.rc:558 Merge.rc:889
+#: Merge.rc:385 Merge.rc:562 Merge.rc:896
msgid "&Reload Plugins"
msgstr "プラグインの再読み込み(&R)"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:385 Merge.rc:560 Merge.rc:891
+#: Merge.rc:387 Merge.rc:564 Merge.rc:898
msgid "&Window"
msgstr "ウィンドウ(&W)"
#. IDR_MERGEDOCTYPE, ID_FILE_CLOSE
-#: Merge.rc:387 Merge.rc:562 Merge.rc:893
+#: Merge.rc:389 Merge.rc:566 Merge.rc:900
msgid "Cl&ose\tCtrl+W"
msgstr "閉じる(&O)\tCtrl+W"
#. IDR_MERGEDOCTYPE, ID_WINDOW_CLOSEALL
-#: Merge.rc:388 Merge.rc:563 Merge.rc:894
+#: Merge.rc:390 Merge.rc:567 Merge.rc:901
msgid "Clo&se All"
msgstr "すべて閉じる(&S)"
#. IDR_MERGEDOCTYPE, ID_NEXT_PANE
-#: Merge.rc:390 Merge.rc:565 Merge.rc:896
+#: Merge.rc:392 Merge.rc:569 Merge.rc:903
msgid "Change &Pane\tF6"
msgstr "ペインの切り替え(&P)\tF6"
#. IDR_MERGEDOCTYPE, ID_WINDOW_TILE_HORZ
-#: Merge.rc:392 Merge.rc:567 Merge.rc:900
+#: Merge.rc:394 Merge.rc:571 Merge.rc:907
msgid "Tile &Horizontally"
msgstr "上下に並べて表示(&H)"
#. IDR_MERGEDOCTYPE, ID_WINDOW_TILE_VERT
-#: Merge.rc:393 Merge.rc:568 Merge.rc:901
+#: Merge.rc:395 Merge.rc:572 Merge.rc:908
msgid "Tile &Vertically"
msgstr "左右に並べて表示(&V)"
#. IDR_MERGEDOCTYPE, ID_WINDOW_CASCADE
-#: Merge.rc:394 Merge.rc:569 Merge.rc:902
+#: Merge.rc:396 Merge.rc:573 Merge.rc:909
msgid "&Cascade"
msgstr "重ねて表示(&C)"
#. IDS_MESSAGEBOX_HELP
-#: Merge.rc:396 Merge.rc:571 Merge.rc:904 Merge.rc:3200 Merge.rc:4189
+#: Merge.rc:398 Merge.rc:575 Merge.rc:911 Merge.rc:3210 Merge.rc:4199
msgid "&Help"
msgstr "ヘルプ(&H)"
#. IDR_MERGEDOCTYPE, ID_HELP_CONTENTS
-#: Merge.rc:398 Merge.rc:573 Merge.rc:906
+#: Merge.rc:400 Merge.rc:577 Merge.rc:913
msgid "&WinMerge Help\tF1"
msgstr "&WinMerge ヘルプ\tF1"
#. IDR_MERGEDOCTYPE, ID_HELP_RELEASENOTES
-#: Merge.rc:400 Merge.rc:575 Merge.rc:908
+#: Merge.rc:402 Merge.rc:579 Merge.rc:915
msgid "R&elease Notes"
msgstr "リリース ノート(&E)"
#. IDR_MERGEDOCTYPE, ID_HELP_TRANSLATIONS
-#: Merge.rc:401 Merge.rc:576 Merge.rc:909
+#: Merge.rc:403 Merge.rc:580 Merge.rc:916
msgid "&Translations"
msgstr "翻訳(&T)"
#. IDR_MERGEDOCTYPE, ID_HELP_GETCONFIG
-#: Merge.rc:402 Merge.rc:577 Merge.rc:910
+#: Merge.rc:404 Merge.rc:581 Merge.rc:917
msgid "C&onfiguration"
msgstr "設定ログ(&O)"
#. IDR_MERGEDOCTYPE, ID_HELP_GNULICENSE
-#: Merge.rc:404 Merge.rc:579 Merge.rc:912
+#: Merge.rc:406 Merge.rc:583 Merge.rc:919
msgid "&GNU General Public License"
msgstr "&GNU General Public License"
#. IDR_MERGEDOCTYPE, ID_APP_ABOUT
-#: Merge.rc:405 Merge.rc:580 Merge.rc:913
+#: Merge.rc:407 Merge.rc:584 Merge.rc:920
msgid "&About WinMerge..."
msgstr "WinMerge について(&A)..."
#. IDR_MERGEDOCTYPE
-#: Merge.rc:436 Merge.rc:629
+#: Merge.rc:440 Merge.rc:635
msgid "&Read-Only"
msgstr "読み取り専用(&R)"
#. IDR_MERGEDOCTYPE, ID_FILE_LEFT_READONLY
-#: Merge.rc:438 Merge.rc:631
+#: Merge.rc:442 Merge.rc:637
msgid "L&eft Read-Only"
msgstr "左側を読み取り専用(&E)"
#. IDR_MERGEDOCTYPE, ID_FILE_MIDDLE_READONLY
-#: Merge.rc:439 Merge.rc:632
+#: Merge.rc:443 Merge.rc:638
msgid "M&iddle Read-Only"
msgstr "中央を読み取り専用(&I)"
#. IDR_MERGEDOCTYPE, ID_FILE_RIGHT_READONLY
-#: Merge.rc:440 Merge.rc:633
+#: Merge.rc:444 Merge.rc:639
msgid "Ri&ght Read-Only"
msgstr "右側を読み取り専用(&G)"
#. IDD_ENCODINGERROR, IDC_FILEENCODING
-#: Merge.rc:443 Merge.rc:646 Merge.rc:1038 Merge.rc:3063
+#: Merge.rc:447 Merge.rc:652 Merge.rc:1046 Merge.rc:3073
msgid "&File Encoding..."
msgstr "ファイル エンコーディング(&F)..."
#. IDR_POPUP_OUTPUTVIEW, ID_EDIT_SELECT_ALL
-#: Merge.rc:454 Merge.rc:674 Merge.rc:1343
+#: Merge.rc:458 Merge.rc:681 Merge.rc:1353
msgid "Select &All\tCtrl+A"
msgstr "すべて選択(&A)\tCtrl+A"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWIDENTICAL
-#: Merge.rc:460
+#: Merge.rc:464
msgid "Show &Identical Items"
msgstr "同一項目の表示(&I)"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWDIFFERENT
-#: Merge.rc:461
+#: Merge.rc:465
msgid "Show &Different Items"
msgstr "差異項目の表示(&D)"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWUNIQUELEFT
-#: Merge.rc:462
+#: Merge.rc:466
msgid "Show L&eft Unique Items"
msgstr "左側のみに存在する項目の表示(&E)"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWUNIQUEMIDDLE
-#: Merge.rc:463
+#: Merge.rc:467
msgid "Show Midd&le Unique Items"
msgstr "中央のみに存在する項目の表示(&L)"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWUNIQUERIGHT
-#: Merge.rc:464
+#: Merge.rc:468
msgid "Show Ri&ght Unique Items"
msgstr "右側のみに存在する項目の表示(&G)"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWSKIPPED
-#: Merge.rc:465
+#: Merge.rc:469
msgid "Show S&kipped Items"
msgstr "スキップされた項目の表示(&K)"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWBINARIES
-#: Merge.rc:466
+#: Merge.rc:470
msgid "S&how Binary Files"
msgstr "バイナリ ファイルの表示(&H)"
#. IDR_DIRDOCTYPE
-#: Merge.rc:467
+#: Merge.rc:471
msgid "&3-way Compare"
msgstr "&3方向比較"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWDIFFERENTLEFTONLY
-#: Merge.rc:469
+#: Merge.rc:473
msgid "Show &Left Only Different Items"
msgstr "左側のみ差異のある項目の表示(&L)"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWDIFFERENTMIDDLEONLY
-#: Merge.rc:470
+#: Merge.rc:474
msgid "Show &Middle Only Different Items"
msgstr "中央のみ差異のある項目の表示(&M)"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWDIFFERENTRIGHTONLY
-#: Merge.rc:471
+#: Merge.rc:475
msgid "Show &Right Only Different Items"
msgstr "右側のみ差異のある項目の表示(&R)"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWMISSINGLEFTONLY
-#: Merge.rc:473
+#: Merge.rc:477
msgid "Show L&eft Only Missing Items"
msgstr "左側のみ欠落した項目の表示(&E)"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWMISSINGMIDDLEONLY
-#: Merge.rc:474
+#: Merge.rc:478
msgid "Show Mi&ddle Only Missing Items"
msgstr "中央のみ欠落した項目の表示(&D)"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWMISSINGRIGHTONLY
-#: Merge.rc:475
+#: Merge.rc:479
msgid "Show Rig&ht Only Missing Items"
msgstr "右側のみ欠落した項目の表示(&H)"
#. IDR_DIRDOCTYPE, ID_VIEW_SHOWHIDDENITEMS
-#: Merge.rc:478
+#: Merge.rc:482
msgid "Show Hidd&en Items"
msgstr "非表示の項目を表示(&E)"
#. IDR_DIRDOCTYPE, ID_VIEW_TREEMODE
-#: Merge.rc:480
+#: Merge.rc:484
msgid "Tree &Mode"
msgstr "ツリー表示(&M)"
#. IDR_DIRDOCTYPE
-#: Merge.rc:481
+#: Merge.rc:485
msgid "E&xpand Subfolders"
msgstr "サブフォルダーの展開(&X)"
#. IDR_DIRDOCTYPE, ID_VIEW_EXPAND_ALLSUBDIRS
-#: Merge.rc:483
+#: Merge.rc:487
msgid "&All Subfolders"
msgstr "すべてのサブフォルダー(&A)"
#. IDR_DIRDOCTYPE, ID_VIEW_EXPAND_DIFFERENT_SUBDIRS
-#: Merge.rc:484
+#: Merge.rc:488
msgid "&Different Subfolders"
msgstr "差異があるサブフォルダー(&D)"
#. IDR_DIRDOCTYPE, ID_VIEW_EXPAND_IDENTICAL_SUBDIRS
-#: Merge.rc:485
+#: Merge.rc:489
msgid "&Identical Subfolders"
msgstr "同一のサブフォルダー(&I)"
#. IDR_DIRDOCTYPE, ID_VIEW_COLLAPSE_ALLSUBDIRS
-#: Merge.rc:487
+#: Merge.rc:491
msgid "&Collapse All Subfolders"
msgstr "すべてのサブフォルダーを折りたたむ(&C)"
#. IDR_DIRDOCTYPE, ID_VIEW_SHOW_EMPTY_FOLDERS
-#: Merge.rc:488
+#: Merge.rc:492
msgid "Show &Empty Folders"
msgstr "空フォルダーの表示(&E)"
#. IDR_MERGEDOCTYPE, ID_VIEW_SELECTFONT
-#: Merge.rc:490 Merge.rc:697
+#: Merge.rc:494 Merge.rc:704
msgid "Select &Font..."
msgstr "フォントの選択(&F)..."
#. IDR_MERGEDOCTYPE, ID_VIEW_USEDEFAULTFONT
-#: Merge.rc:491 Merge.rc:698
+#: Merge.rc:495 Merge.rc:705
msgid "Use Default Font"
msgstr "デフォルト フォントを使用"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:493 Merge.rc:736
+#: Merge.rc:497 Merge.rc:743
msgid "Sw&ap Panes"
msgstr "ペインの交換(&A)"
#. IDR_MERGEDOCTYPE, ID_SWAPPANES_SWAP12
-#: Merge.rc:495 Merge.rc:738
+#: Merge.rc:499 Merge.rc:745
msgid "Swap &1st | 2nd"
msgstr "&1 番目と 2 番目を交換"
#. IDR_MERGEDOCTYPE, ID_SWAPPANES_SWAP23
-#: Merge.rc:496 Merge.rc:739
+#: Merge.rc:500 Merge.rc:746
msgid "Swap &2nd | 3rd"
msgstr "&2 番目と 3 番目を交換"
#. IDR_MERGEDOCTYPE, ID_SWAPPANES_SWAP13
-#: Merge.rc:497 Merge.rc:740
+#: Merge.rc:501 Merge.rc:747
msgid "Swap 1st | &3rd"
msgstr "1 番目と &3 番目を交換"
#. IDR_DIRDOCTYPE, ID_VIEW_DISPLAY_FILTER_BAR_MENU
-#: Merge.rc:514
+#: Merge.rc:518
msgid "Displa&y Filter Bar\tCtrl+Shift+L"
msgstr "表示フィルター(&Y)\tCtrl+Shift+L"
#. IDR_DIRDOCTYPE, ID_VIEW_DIR_STATISTICS
-#: Merge.rc:518
+#: Merge.rc:522
msgid "Com&pare Statistics..."
msgstr "比較統計(&P)..."
#. IDR_MERGEDOCTYPE, ID_REFRESH
-#: Merge.rc:520 Merge.rc:763
+#: Merge.rc:524 Merge.rc:770
msgid "Refresh\tF5"
msgstr "最新の情報に更新\tF5"
#. IDR_POPUP_DIRVIEW, ID_RESCAN
-#: Merge.rc:521 Merge.rc:1030
+#: Merge.rc:525 Merge.rc:1038
msgid "&Refresh Selected\tCtrl+F5"
msgstr "選択項目を最新に更新(&R)\tCtrl+F5"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:523 Merge.rc:765
+#: Merge.rc:527 Merge.rc:772
msgid "&Merge"
msgstr "マージ(&M)"
#. IDR_DIRDOCTYPE, ID_MERGE_COMPARE
-#: Merge.rc:525
+#: Merge.rc:529
msgid "Co&mpare\tEnter"
msgstr "比較(&M)\tEnter"
#. IDR_MERGEDOCTYPE, ID_NEXTDIFF
-#: Merge.rc:527 Merge.rc:767
+#: Merge.rc:531 Merge.rc:774
msgid "&Next Difference\tAlt+Down"
msgstr "次の差異(&N)\tAlt+Down"
#. IDR_MERGEDOCTYPE, ID_PREVDIFF
-#: Merge.rc:528 Merge.rc:768
+#: Merge.rc:532 Merge.rc:775
msgid "&Previous Difference\tAlt+Up"
msgstr "前の差異(&P)\tAlt+Up"
#. IDR_MERGEDOCTYPE, ID_FIRSTDIFF
-#: Merge.rc:530 Merge.rc:773
+#: Merge.rc:534 Merge.rc:780
msgid "&First Difference\tAlt+Home"
msgstr "最初の差異(&F)\tAlt+Home"
#. IDR_MERGEDOCTYPE, ID_CURDIFF
-#: Merge.rc:531 Merge.rc:774
+#: Merge.rc:535 Merge.rc:781
msgid "&Current Difference\tAlt+Enter"
msgstr "現在の差異(&C)\tAlt+Enter"
#. IDR_MERGEDOCTYPE, ID_LASTDIFF
-#: Merge.rc:532 Merge.rc:775
+#: Merge.rc:536 Merge.rc:782
msgid "&Last Difference\tAlt+End"
msgstr "最後の差異(&L)\tAlt+End"
#. IDR_MERGEDOCTYPE, ID_L2R
-#: Merge.rc:534 Merge.rc:830
+#: Merge.rc:538 Merge.rc:837
msgid "Copy to &Right\tAlt+Right"
msgstr "右側にコピー(&R)\tAlt+Right"
#. IDR_MERGEDOCTYPE, ID_R2L
-#: Merge.rc:535 Merge.rc:831
+#: Merge.rc:539 Merge.rc:838
msgid "Copy to L&eft\tAlt+Left"
msgstr "左側にコピー(&E)\tAlt+Left"
#. IDR_DIRDOCTYPE, ID_MERGE_DELETE
-#: Merge.rc:537
+#: Merge.rc:541
msgid "&Delete\tDel"
msgstr "削除(&D)\tDel"
#. IDR_POPUP_DIRVIEW, ID_TOOLS_CUSTOMIZECOLUMNS
-#: Merge.rc:541 Merge.rc:1042
+#: Merge.rc:545 Merge.rc:1050
msgid "&Customize Columns..."
msgstr "列の設定(&C)..."
#. IDR_MERGEDOCTYPE, ID_TOOLS_GENERATEREPORT
-#: Merge.rc:544 Merge.rc:851
+#: Merge.rc:548 Merge.rc:858
msgid "Generate &Report..."
msgstr "レポートの生成(&R)..."
#. IDD_ENCODINGERROR, IDC_PLUGIN
-#: Merge.rc:556 Merge.rc:867 Merge.rc:3064
+#: Merge.rc:560 Merge.rc:874 Merge.rc:3074
msgid "&Edit with Unpacker..."
msgstr "展開プラグインで開く(&E)..."
#. IDR_MERGEDOCTYPE, ID_FILE_SAVE
-#: Merge.rc:611
+#: Merge.rc:617
msgid "&Save\tCtrl+S"
msgstr "保存(&S)\tCtrl+S"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:612
+#: Merge.rc:618
msgid "Sav&e"
msgstr "保存(&E)"
#. IDR_POPUP_SAVE, ID_FILE_SAVE_LEFT
-#: Merge.rc:614 Merge.rc:1201
+#: Merge.rc:620 Merge.rc:1211
msgid "Save &Left"
msgstr "左側のファイルを保存(&L)"
#. IDR_POPUP_SAVE, ID_FILE_SAVE_MIDDLE
-#: Merge.rc:615 Merge.rc:1202
+#: Merge.rc:621 Merge.rc:1212
msgid "Save &Middle"
msgstr "中央のファイルを保存(&M)"
#. IDR_POPUP_SAVE, ID_FILE_SAVE_RIGHT
-#: Merge.rc:616 Merge.rc:1203
+#: Merge.rc:622 Merge.rc:1213
msgid "Save &Right"
msgstr "右側のファイルを保存(&R)"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:618
+#: Merge.rc:624
msgid "Save &As"
msgstr "名前を付けて保存(&A)"
#. IDR_POPUP_SAVE, ID_FILE_SAVEAS_LEFT
-#: Merge.rc:620 Merge.rc:1205
+#: Merge.rc:626 Merge.rc:1215
msgid "Save &Left As..."
msgstr "名前を付けて左側のファイルを保存(&L)..."
#. IDR_POPUP_SAVE, ID_FILE_SAVEAS_MIDDLE
-#: Merge.rc:621 Merge.rc:1206
+#: Merge.rc:627 Merge.rc:1216
msgid "Save &Middle As..."
msgstr "名前を付けて中央のファイルを保存(&M)..."
#. IDR_POPUP_SAVE, ID_FILE_SAVEAS_RIGHT
-#: Merge.rc:622 Merge.rc:1207
+#: Merge.rc:628 Merge.rc:1217
msgid "Save &Right As..."
msgstr "名前を付けて右側のファイルを保存(&R)..."
#. IDR_MERGEDOCTYPE, ID_FILE_PRINT
-#: Merge.rc:625
+#: Merge.rc:631
msgid "&Print...\tCtrl+P"
msgstr "印刷(&P)...\tCtrl+P"
#. IDR_MERGEDOCTYPE, ID_FILE_PAGE_SETUP
-#: Merge.rc:626
+#: Merge.rc:632
msgid "Page Set&up..."
msgstr "ページ設定(&U)..."
#. IDR_MERGEDOCTYPE, ID_FILE_PRINT_PREVIEW
-#: Merge.rc:627
+#: Merge.rc:633
msgid "Print Previe&w..."
msgstr "印刷プレビュー(&W)..."
#. IDR_MERGEDOCTYPE
-#: Merge.rc:636
+#: Merge.rc:642
msgid "&Convert Line Endings to"
msgstr "改行コードの変換(&C)"
#. IDR_MERGEDOCTYPE, ID_FILE_MERGINGMODE
-#: Merge.rc:643
+#: Merge.rc:649
msgid "Mer&ge Mode\tF9"
msgstr "マージモード(&G)\tF9"
#. IDR_MERGEDOCTYPE, ID_RESCAN
-#: Merge.rc:645
+#: Merge.rc:651
msgid "Reloa&d\tCtrl+F5"
msgstr "再読み込み(&D)\tCtrl+F5"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:647
+#: Merge.rc:653
msgid "Reco&mpare As"
msgstr "形式を指定して再比較(&M)"
+#. IDR_POPUP_COMPARE, ID_MERGE_COMPARE_FOLDER
+#: Merge.rc:660 Merge.rc:947 Merge.rc:1185
+msgid "A&rchive"
+msgstr "アーカイブ(&R)"
+
#. IDR_MERGEDOCTYPE, ID_EDIT_UNDO
-#: Merge.rc:666
+#: Merge.rc:673
msgid "&Undo\tCtrl+Z"
msgstr "元に戻す(&U)\tCtrl+Z"
#. IDR_MERGEDOCTYPE, ID_EDIT_REDO
-#: Merge.rc:667
+#: Merge.rc:674
msgid "&Redo\tCtrl+Y"
msgstr "やり直し(&R)\tCtrl+Y"
#. IDR_MERGEDOCTYPE, ID_EDIT_CUT
-#: Merge.rc:669
+#: Merge.rc:676
msgid "Cu&t\tCtrl+X"
msgstr "切り取り(&T)\tCtrl+X"
#. IDR_POPUP_OUTPUTVIEW, ID_EDIT_COPY
-#: Merge.rc:670 Merge.rc:1342
+#: Merge.rc:677 Merge.rc:1352
msgid "&Copy\tCtrl+C"
msgstr "コピー(&C)\tCtrl+C"
#. IDR_MERGEDOCTYPE, ID_EDIT_FIND
-#: Merge.rc:676
+#: Merge.rc:683
msgid "F&ind...\tCtrl+F"
msgstr "検索(&I)...\tCtrl+F"
#. IDR_MERGEDOCTYPE, ID_EDIT_REPLACE
-#: Merge.rc:677
+#: Merge.rc:684
msgid "Repla&ce...\tCtrl+H"
msgstr "置換(&C)...\tCtrl+H"
#. IDR_MERGEDOCTYPE, ID_EDIT_MARK
-#: Merge.rc:678
+#: Merge.rc:685
msgid "&Marker...\tCtrl+Shift+M"
msgstr "マーカー(&M)...\tCtrl+Shift+M"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:680
+#: Merge.rc:687
msgid "Advanced"
msgstr "高度な操作"
#. IDR_MERGEDOCTYPE, ID_EDIT_COPY_LINENUMBERS
-#: Merge.rc:682
+#: Merge.rc:689
msgid "&Copy With Line Numbers\tCtrl+Shift+C"
msgstr "行番号付きでコピー(&C)\tCtrl+Shift+C"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:684
+#: Merge.rc:691
msgid "&Bookmarks"
msgstr "ブックマーク(&B)"
#. IDR_MERGEDOCTYPE, ID_EDIT_TOGGLE_BOOKMARK
-#: Merge.rc:686
+#: Merge.rc:693
msgid "&Toggle Bookmark\tCtrl+F2"
msgstr "ブックマークの作成・削除(&T)\tCtrl+F2"
#. IDR_MERGEDOCTYPE, ID_EDIT_GOTO_NEXT_BOOKMARK
-#: Merge.rc:687
+#: Merge.rc:694
msgid "&Next Bookmark\tF2"
msgstr "次のブックマークへ移動(&N)\tF2"
#. IDR_MERGEDOCTYPE, ID_EDIT_GOTO_PREV_BOOKMARK
-#: Merge.rc:688
+#: Merge.rc:695
msgid "&Previous Bookmark\tShift+F2"
msgstr "前のブックマークへ移動(&P)\tShift+F2"
#. IDR_MERGEDOCTYPE, ID_EDIT_CLEAR_ALL_BOOKMARKS
-#: Merge.rc:689
+#: Merge.rc:696
msgid "&Clear All Bookmarks"
msgstr "すべてのブックマークをクリア(&C)"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:706
+#: Merge.rc:713
msgid "Syntax Highlight"
msgstr "シンタックス ハイライト"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:711
+#: Merge.rc:718
msgid "&Diff Context"
msgstr "Diff コンテキスト(&D)"
#. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_ALL
-#: Merge.rc:713
+#: Merge.rc:720
msgid "&All Lines"
msgstr "全行(&A)"
#. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_0
-#: Merge.rc:715
+#: Merge.rc:722
msgid "&0 Lines"
msgstr "&0 行"
#. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_1
-#: Merge.rc:716
+#: Merge.rc:723
msgid "&1 Line"
msgstr "&1 行"
#. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_3
-#: Merge.rc:717
+#: Merge.rc:724
msgid "&3 Lines"
msgstr "&3 行"
#. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_5
-#: Merge.rc:718
+#: Merge.rc:725
msgid "&5 Lines"
msgstr "&5 行"
#. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_7
-#: Merge.rc:719
+#: Merge.rc:726
msgid "&7 Lines"
msgstr "&7 行"
#. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_9
-#: Merge.rc:720
+#: Merge.rc:727
msgid "&9 Lines"
msgstr "&9 行"
#. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_TOGGLE
-#: Merge.rc:722
+#: Merge.rc:729
msgid "&Toggle All and 0-9 Lines\tCtrl+D"
msgstr "全行/0 ~ 9 行切替(&T)\tCtrl+D"
#. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_INVERT
-#: Merge.rc:724
+#: Merge.rc:731
msgid "&Invert (Hide Different Lines)"
msgstr "反転 (差異行を非表示にする)(&I)"
#. IDR_MERGEDOCTYPE, ID_VIEW_RESIZE_PANES
-#: Merge.rc:727
+#: Merge.rc:734
msgid "&Lock Panes"
msgstr "ペインをロック(&L)"
#. IDR_MERGEDOCTYPE, ID_VIEW_WHITESPACE
-#: Merge.rc:728
+#: Merge.rc:735
msgid "&View Whitespace"
msgstr "空白を表示(&V)"
#. IDR_MERGEDOCTYPE, ID_VIEW_EOL
-#: Merge.rc:729
+#: Merge.rc:736
msgid "View E&OL"
msgstr "改行を表示(&O)"
#. IDR_MERGEDOCTYPE, ID_VIEW_LINEDIFFS
-#: Merge.rc:730
+#: Merge.rc:737
msgid "Vie&w Line Differences"
msgstr "行内差異を表示(&W)"
#. IDR_MERGEDOCTYPE, ID_VIEW_LINENUMBERS
-#: Merge.rc:731
+#: Merge.rc:738
msgid "View Line &Numbers"
msgstr "行番号を表示(&N)"
#. IDR_MERGEDOCTYPE, ID_VIEW_SELMARGIN
-#: Merge.rc:732
+#: Merge.rc:739
msgid "View &Margins"
msgstr "マージンを表示(&M)"
#. IDR_MERGEDOCTYPE, ID_VIEW_TOPMARGIN
-#: Merge.rc:733
+#: Merge.rc:740
msgid "View To&p Margins"
msgstr "上マージンを表示(&P)"
#. IDR_MERGEDOCTYPE, ID_VIEW_WORDWRAP
-#: Merge.rc:734
+#: Merge.rc:741
msgid "W&rap Lines"
msgstr "行を右端で折返す(&R)"
#. IDR_MERGEDOCTYPE, ID_VIEW_SPLITVERTICALLY
-#: Merge.rc:742
+#: Merge.rc:749
msgid "Split V&ertically"
msgstr "垂直分割(&E)"
#. IDR_MERGEDOCTYPE, ID_VIEW_DETAIL_BAR
-#: Merge.rc:759
+#: Merge.rc:766
msgid "Diff &Pane"
msgstr "Diff ペイン(&P)"
#. IDR_MERGEDOCTYPE, ID_VIEW_LOCATION_BAR
-#: Merge.rc:760
+#: Merge.rc:767
msgid "Lo&cation Pane"
msgstr "ロケーション ペイン(&C)"
#. IDS_OUTPUTBAR_CAPTION
-#: Merge.rc:761 Merge.rc:4902
+#: Merge.rc:768 Merge.rc:4912
msgid "Output Pane"
msgstr "出力 ペイン"
#. IDR_MERGEDOCTYPE, ID_NEXTCONFLICT
-#: Merge.rc:770
+#: Merge.rc:777
msgid "Ne&xt Conflict\tAlt+Shift+Down"
msgstr "次のコンフリクト(&X)\tAlt+Shift+Down"
#. IDR_MERGEDOCTYPE, ID_PREVCONFLICT
-#: Merge.rc:771
+#: Merge.rc:778
msgid "Pre&vious Conflict\tAlt+Shift+Up"
msgstr "前のコンフリクト(&V)\tAlt+Shift+Up"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:777
+#: Merge.rc:784
msgid "A&dvanced"
msgstr "高度な操作(&D)"
#. IDR_MERGEDOCTYPE, ID_NEXTDIFFLM
-#: Merge.rc:779
+#: Merge.rc:786
msgid "Next Difference (Left/Middle)\tAlt+1"
msgstr "次の左側と中央の差異\tAlt+1"
#. IDR_MERGEDOCTYPE, ID_PREVDIFFLM
-#: Merge.rc:780
+#: Merge.rc:787
msgid "Previous Difference (Left/Middle)\tAlt+Shift+1"
msgstr "前の左側と中央の差異\tAlt+Shift+1"
#. IDR_MERGEDOCTYPE, ID_NEXTDIFFLR
-#: Merge.rc:782
+#: Merge.rc:789
msgid "Next Difference (Left/Right)\tAlt+2"
msgstr "次の左側と右側の差異\tAlt+2"
#. IDR_MERGEDOCTYPE, ID_PREVDIFFLR
-#: Merge.rc:783
+#: Merge.rc:790
msgid "Previous Difference (Left/Right)\tAlt+Shift+2"
msgstr "前の左側と右側の差異\tAlt+Shift+2"
#. IDR_MERGEDOCTYPE, ID_NEXTDIFFMR
-#: Merge.rc:785
+#: Merge.rc:792
msgid "Next Difference (Middle/Right)\tAlt+3"
msgstr "次の中央と右側の差異\tAlt+3"
#. IDR_MERGEDOCTYPE, ID_PREVDIFFMR
-#: Merge.rc:786
+#: Merge.rc:793
msgid "Previous Difference (Middle/Right)\tAlt+Shift+3"
msgstr "前の中央と右側の差異\tAlt+Shift+3"
#. IDR_MERGEDOCTYPE, ID_NEXTDIFFLO
-#: Merge.rc:788
+#: Merge.rc:795
msgid "Next Left-Only Difference\tAlt+7"
msgstr "次の左側のみの差異\tAlt+7"
#. IDR_MERGEDOCTYPE, ID_PREVDIFFLO
-#: Merge.rc:789
+#: Merge.rc:796
msgid "Previous Left-Only Difference\tAlt+Shift+7"
msgstr "前の左側のみの差異\tAlt+Shift+7"
#. IDR_MERGEDOCTYPE, ID_NEXTDIFFMO
-#: Merge.rc:791
+#: Merge.rc:798
msgid "Next Middle-Only Difference\tAlt+8"
msgstr "次の中央のみの差異\tAlt+8"
#. IDR_MERGEDOCTYPE, ID_PREVDIFFMO
-#: Merge.rc:792
+#: Merge.rc:799
msgid "Previous Middle-Only Difference\tAlt+Shift+8"
msgstr "前の中央のみの差異\tAlt+Shift+8"
#. IDR_MERGEDOCTYPE, ID_NEXTDIFFRO
-#: Merge.rc:794
+#: Merge.rc:801
msgid "Next Right-Only Difference\tAlt+9"
msgstr "次の右側のみの差異\tAlt+9"
#. IDR_MERGEDOCTYPE, ID_PREVDIFFRO
-#: Merge.rc:795
+#: Merge.rc:802
msgid "Previous Right-Only Difference\tAlt+Shift+9"
msgstr "前の右側のみの差異\tAlt+Shift+9"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:797
+#: Merge.rc:804
msgid "Copy from &Left to"
msgstr "左側からコピー(&L)"
#. IDD_LOAD_SAVE_CODEPAGE, IDC_AFFECTS_MIDDLE_BTN
-#: Merge.rc:799 Merge.rc:810 Merge.rc:815 Merge.rc:826 Merge.rc:970
-#: Merge.rc:2545 Merge.rc:2817
+#: Merge.rc:806 Merge.rc:817 Merge.rc:822 Merge.rc:833 Merge.rc:978
+#: Merge.rc:2555 Merge.rc:2827
msgid "&Middle"
msgstr "中央(&M)"
#. IDD_LOAD_SAVE_CODEPAGE, IDC_AFFECTS_RIGHT_BTN
-#: Merge.rc:800 Merge.rc:805 Merge.rc:816 Merge.rc:821 Merge.rc:971
-#: Merge.rc:2546 Merge.rc:2819
+#: Merge.rc:807 Merge.rc:812 Merge.rc:823 Merge.rc:828 Merge.rc:979
+#: Merge.rc:2556 Merge.rc:2829
msgid "&Right"
msgstr "右側(&R)"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:802
+#: Merge.rc:809
msgid "Copy from &Middle to"
msgstr "中央からコピー(&M)"
#. IDD_LOAD_SAVE_CODEPAGE, IDC_AFFECTS_LEFT_BTN
-#: Merge.rc:804 Merge.rc:809 Merge.rc:820 Merge.rc:825 Merge.rc:969
-#: Merge.rc:2544 Merge.rc:2815
+#: Merge.rc:811 Merge.rc:816 Merge.rc:827 Merge.rc:832 Merge.rc:977
+#: Merge.rc:2554 Merge.rc:2825
msgid "&Left"
msgstr "左側(&L)"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:807
+#: Merge.rc:814
msgid "Copy from &Right to"
msgstr "右側からコピー(&R)"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:813
+#: Merge.rc:820
msgid "Copy Selected Lines from Le&ft to"
msgstr "選択した行を左側からコピー(&F)"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:818
+#: Merge.rc:825
msgid "Copy Selected Lines from Mi&ddle to"
msgstr "選択した行を中央からコピー(&D)"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:823
+#: Merge.rc:830
msgid "Copy Selected Lines from Ri&ght to"
msgstr "選択した行を右側からコピー(&G)"
#. IDR_MERGEDOCTYPE, ID_COPY_FROM_LEFT
-#: Merge.rc:833
+#: Merge.rc:840
msgid "Copy from Left\tAlt+Shift+Right"
msgstr "左側からコピー\tAlt+Shift+Right"
#. IDR_MERGEDOCTYPE, ID_COPY_FROM_RIGHT
-#: Merge.rc:834
+#: Merge.rc:841
msgid "Copy from Right\tAlt+Shift+Left"
msgstr "右側からコピー\tAlt+Shift+Left"
#. IDR_MERGEDOCTYPE, ID_L2RNEXT
-#: Merge.rc:836
+#: Merge.rc:843
msgid "C&opy to Right and Advance\tCtrl+Alt+Right"
msgstr "右側にコピーして次に進む(&O)\tCtrl+Alt+Right"
#. IDR_MERGEDOCTYPE, ID_R2LNEXT
-#: Merge.rc:837
+#: Merge.rc:844
msgid "Copy &to Left and Advance\tCtrl+Alt+Left"
msgstr "左側にコピーして次に進む(&T)\tCtrl+Alt+Left"
#. IDR_MERGEDOCTYPE, ID_ALL_RIGHT
-#: Merge.rc:839
+#: Merge.rc:846
msgid "Copy &All to Right"
msgstr "すべてを右側にコピー(&A)"
#. IDR_MERGEDOCTYPE, ID_ALL_LEFT
-#: Merge.rc:840
+#: Merge.rc:847
msgid "Cop&y All to Left"
msgstr "すべてを左側にコピー(&Y)"
#. IDR_MERGEDOCTYPE, ID_AUTO_MERGE
-#: Merge.rc:842
+#: Merge.rc:849
msgid "A&uto Merge\tCtrl+Alt+M"
msgstr "自動マージ(&U)\tCtrl+Alt+M"
#. IDR_MERGEDOCTYPE, ID_ADD_SYNCPOINT
-#: Merge.rc:844
+#: Merge.rc:851
msgid "Add &Synchronization Point\tAlt+S"
msgstr "同期ポイントの追加(&S)\tAlt+S"
#. IDR_MERGEDOCTYPE, ID_CLEAR_SYNCPOINTS
-#: Merge.rc:845
+#: Merge.rc:852
msgid "Clear Sync&hronization Points"
msgstr "同期ポイントのクリア(&H)"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:863
+#: Merge.rc:870
msgid "Unpac&ker"
msgstr "展開プラグイン(&K)"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:869
+#: Merge.rc:876
msgid "&Prediffer"
msgstr "比較前処理プラグイン(&P)"
#. IDR_MERGEDOCTYPE, ID_APPLY_PREDIFFER
-#: Merge.rc:873
+#: Merge.rc:880
msgid "Apply Pre&differ..."
msgstr "比較前処理プラグインを適用(&D)..."
#. IDR_MERGEDOCTYPE, ID_TRANSFORM_WITH_SCRIPT
-#: Merge.rc:879
+#: Merge.rc:886
msgid "&Transform with Editor Script..."
msgstr "エディター スクリプトで変換(&T)..."
#. IDR_MERGEDOCTYPE
-#: Merge.rc:880
+#: Merge.rc:887
msgid "Scripts for &Copying"
msgstr "コピー時適用エディタースクリプト(&C)"
#. IDR_MERGEDOCTYPE, ID_SELECT_EDITOR_SCRIPT_FOR_COPYING
-#: Merge.rc:886
+#: Merge.rc:893
msgid "Select &Editor Script..."
msgstr "エディタスクリプトの選択(&E)..."
#. IDR_MERGEDOCTYPE, ID_WINDOW_SPLIT
-#: Merge.rc:898
+#: Merge.rc:905
msgid "Sp&lit"
msgstr "分割(&L)"
#. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE
-#: Merge.rc:921
+#: Merge.rc:928
msgid "Comp&are"
msgstr "比較(&A)"
#. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE_WITH_MOVED_RENAMED
-#: Merge.rc:922
+#: Merge.rc:929
msgid "Compar&e with Renamed/Moved Items"
msgstr "名前変更/移動項目と比較(&E)"
#. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE_IN_NEW_WINDOW
-#: Merge.rc:923
+#: Merge.rc:930
msgid "Compare in New &Window"
msgstr "新しいウインドウで比較(&W)"
#. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE_NONHORIZONTALLY
-#: Merge.rc:924 Merge.rc:931
+#: Merge.rc:931 Merge.rc:938
msgid "Compare Non-hor&izontally..."
msgstr "非水平的に比較する(&I)..."
#. IDR_POPUP_DIRVIEW
-#: Merge.rc:925
+#: Merge.rc:932
msgid "Compare Non-hor&izontally"
msgstr "非水平的に比較する(&I)"
#. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE_LEFT1_LEFT2
-#: Merge.rc:927
+#: Merge.rc:934
msgid "First &Left with Second Left"
msgstr "1 番目の左側項目と 2 番目の左側項目(&L)"
#. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE_RIGHT1_RIGHT2
-#: Merge.rc:928
+#: Merge.rc:935
msgid "First &Right with Second Right"
msgstr "1 番目の右側項目と 2 番目の右側項目(&R)"
#. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE_LEFT1_RIGHT2
-#: Merge.rc:929
+#: Merge.rc:936
msgid "&First Left with Second Right"
msgstr "1 番目の左側項目と 2 番目の右側項目(&F)"
#. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE_LEFT2_RIGHT1
-#: Merge.rc:930
+#: Merge.rc:937
msgid "&Second Left with First Right"
msgstr "2 番目の左側項目と 1 番目の右側項目(&S)"
#. IDR_POPUP_DIRVIEW
-#: Merge.rc:933
+#: Merge.rc:940
msgid "Co&mpare As"
msgstr "形式を指定して比較(&M)"
#. IDS_COPY_LEFT_TO_MIDDLE2
-#: Merge.rc:945 Merge.rc:957 Merge.rc:4502
+#: Merge.rc:953 Merge.rc:965 Merge.rc:4512
#, c-format
msgid "Left to Middle (%1 of %2)"
msgstr "左側から中央 (%1 / %2)"
#. IDS_COPY_LEFT_TO_RIGHT2
-#: Merge.rc:946 Merge.rc:958 Merge.rc:4501
+#: Merge.rc:954 Merge.rc:966 Merge.rc:4511
#, c-format
msgid "Left to Right (%1 of %2)"
msgstr "左側を右側に (%1 / %2)"
#. IDS_MOVE_LEFT_TO2
-#: Merge.rc:947 Merge.rc:959 Merge.rc:1022 Merge.rc:4513 Merge.rc:4542
+#: Merge.rc:955 Merge.rc:967 Merge.rc:1030 Merge.rc:4523 Merge.rc:4552
#, c-format
msgid "Left to... (%1 of %2)"
msgstr "左側を... (%1 / %2)"
#. IDS_COPY_MIDDLE_TO_LEFT2
-#: Merge.rc:948 Merge.rc:960 Merge.rc:4499
+#: Merge.rc:956 Merge.rc:968 Merge.rc:4509
#, c-format
msgid "Middle to Left (%1 of %2)"
msgstr "中央から左側 (%1 / %2)"
#. IDS_COPY_MIDDLE_TO_RIGHT2
-#: Merge.rc:949 Merge.rc:961 Merge.rc:4500
+#: Merge.rc:957 Merge.rc:969 Merge.rc:4510
#, c-format
msgid "Middle to Right (%1 of %2)"
msgstr "中央から右側 (%1 / %2)"
#. IDS_MOVE_MIDDLE_TO2
-#: Merge.rc:950 Merge.rc:962 Merge.rc:1023 Merge.rc:4514 Merge.rc:4543
+#: Merge.rc:958 Merge.rc:970 Merge.rc:1031 Merge.rc:4524 Merge.rc:4553
#, c-format
msgid "Middle to... (%1 of %2)"
msgstr "中央を... (%1 / %2)"
#. IDS_COPY_RIGHT_TO_MIDDLE2
-#: Merge.rc:951 Merge.rc:963 Merge.rc:4498
+#: Merge.rc:959 Merge.rc:971 Merge.rc:4508
#, c-format
msgid "Right to Middle (%1 of %2)"
msgstr "右側から中央 (%1 / %2)"
#. IDS_COPY_RIGHT_TO_LEFT2
-#: Merge.rc:952 Merge.rc:964 Merge.rc:4497
+#: Merge.rc:960 Merge.rc:972 Merge.rc:4507
#, c-format
msgid "Right to Left (%1 of %2)"
msgstr "右側を左側に (%1 / %2)"
#. IDS_MOVE_RIGHT_TO2
-#: Merge.rc:953 Merge.rc:965 Merge.rc:1024 Merge.rc:4515 Merge.rc:4544
+#: Merge.rc:961 Merge.rc:973 Merge.rc:1032 Merge.rc:4525 Merge.rc:4554
#, c-format
msgid "Right to... (%1 of %2)"
msgstr "右側を... (%1 / %2)"
#. IDD_EDIT_MARKER, IDC_EDIT_MARKER_DELETE
-#: Merge.rc:967 Merge.rc:2036
+#: Merge.rc:975 Merge.rc:2046
msgid "&Delete"
msgstr "削除(&D)"
#. IDR_POPUP_DIRVIEW, ID_DIR_DEL_BOTH
-#: Merge.rc:972
+#: Merge.rc:980
msgid "&Both"
msgstr "両側(&B)"
#. IDR_POPUP_DIRVIEW, ID_DIR_DEL_ALL
-#: Merge.rc:973
+#: Merge.rc:981
msgid "&All"
msgstr "すべて(&A)"
#. IDD_EDIT_REPLACE, IDC_EDIT_SCOPE_SELECTION
-#: Merge.rc:974 Merge.rc:2019
+#: Merge.rc:982 Merge.rc:2029
msgid "&Selection"
msgstr "選択範囲(&S)"
#. IDR_POPUP_DIRVIEW, ID_DIR_ITEM_RENAME
-#: Merge.rc:976
+#: Merge.rc:984
msgid "Re&name"
msgstr "名前の変更(&N)"
#. IDR_POPUP_DIRVIEW, ID_DIR_HIDE_FILENAMES
-#: Merge.rc:977
+#: Merge.rc:985
msgid "&Hide Items"
msgstr "選択項目を非表示(&H)"
#. IDR_POPUP_DIRVIEW
-#: Merge.rc:979
+#: Merge.rc:987
msgid "&Open Left"
msgstr "左側を開く(&O)"
#. IDR_POPUP_DIRVIEW
-#: Merge.rc:986
+#: Merge.rc:994
msgid "Open Midd&le"
msgstr "中央を開く(&L)"
#. IDR_POPUP_DIRVIEW
-#: Merge.rc:993
+#: Merge.rc:1001
msgid "O&pen Right"
msgstr "右側を開く(&P)"
#. IDR_POPUP_DIRVIEW
-#: Merge.rc:1001
+#: Merge.rc:1009
msgid "Cop&y Paths"
msgstr "パス名をコピー(&Y)"
#. IDS_DEL_LEFT_FMT2
-#: Merge.rc:1003 Merge.rc:1012 Merge.rc:4530
+#: Merge.rc:1011 Merge.rc:1020 Merge.rc:4540
#, c-format
msgid "Left (%1 of %2)"
msgstr "左側 (%1 / %2)"
#. IDS_DEL_MIDDLE_FMT2
-#: Merge.rc:1004 Merge.rc:1013 Merge.rc:4531
+#: Merge.rc:1012 Merge.rc:1021 Merge.rc:4541
#, c-format
msgid "Middle (%1 of %2)"
msgstr "中央 (%1 / %2)"
#. IDS_DEL_RIGHT_FMT2
-#: Merge.rc:1005 Merge.rc:1014 Merge.rc:4532
+#: Merge.rc:1013 Merge.rc:1022 Merge.rc:4542
#, c-format
msgid "Right (%1 of %2)"
msgstr "右側 (%1 / %2)"
#. IDS_DEL_BOTH_FMT2
-#: Merge.rc:1006 Merge.rc:1015 Merge.rc:4533
+#: Merge.rc:1014 Merge.rc:1023 Merge.rc:4543
#, c-format
msgid "Both (%1 of %2)"
msgstr "両側 (%1 / %2)"
#. IDS_DEL_ALL_FMT2
-#: Merge.rc:1007 Merge.rc:1016 Merge.rc:4538
+#: Merge.rc:1015 Merge.rc:1024 Merge.rc:4548
#, c-format
msgid "All (%1 of %2)"
msgstr "すべて (%1 / %2)"
#. IDR_POPUP_DIRVIEW, ID_DIR_COPY_FILENAMES
-#: Merge.rc:1009
+#: Merge.rc:1017
msgid "Copy &Filenames"
msgstr "ファイル名をコピー(&F)"
#. IDR_POPUP_DIRVIEW
-#: Merge.rc:1010
+#: Merge.rc:1018
msgid "Copy Items to Clip&board"
msgstr "項目をクリップボードにコピー(&B)"
#. IDR_POPUP_DIRVIEW, ID_DIR_COPY_ALL_DISP_COLUMNS
-#: Merge.rc:1018
+#: Merge.rc:1026
msgid "Copy All Di&splayed Columns"
msgstr "すべての表示列をコピー(&S)"
#. IDR_POPUP_DIRVIEW
-#: Merge.rc:1020
+#: Merge.rc:1028
msgid "&Zip"
msgstr "圧縮(&Z)"
#. IDS_COPY_BOTH_TO2
-#: Merge.rc:1025 Merge.rc:4516
+#: Merge.rc:1033 Merge.rc:4526
#, c-format
msgid "Both to... (%1 of %2)"
msgstr "両側を... (%1 / %2)"
#. IDS_COPY_ALL_TO2
-#: Merge.rc:1026 Merge.rc:4517
+#: Merge.rc:1034 Merge.rc:4527
#, c-format
msgid "All to... (%1 of %2)"
msgstr "すべてを... (%1 / %2)"
#. IDS_COPY_DIFFERENCES_TO2
-#: Merge.rc:1027 Merge.rc:4518
+#: Merge.rc:1035 Merge.rc:4528
#, c-format
msgid "Differences to... (%1 of %2)"
msgstr "差異を... (%1 / %2)"
#. IDR_POPUP_DIRVIEW, ID_DIR_SHELL_CONTEXT_MENU_LEFT
-#: Merge.rc:1032
+#: Merge.rc:1040
msgid "Left Shell Menu"
msgstr "左側シェル メニュー"
#. IDR_POPUP_DIRVIEW, ID_DIR_SHELL_CONTEXT_MENU_MIDDLE
-#: Merge.rc:1033
+#: Merge.rc:1041
msgid "Middle Shell Menu"
msgstr "中央シェル メニュー"
#. IDR_POPUP_DIRVIEW, ID_DIR_SHELL_CONTEXT_MENU_RIGHT
-#: Merge.rc:1034
+#: Merge.rc:1042
msgid "Right Shell Menu"
msgstr "右側シェル メニュー"
#. IDR_POPUP_DIRVIEW, ID_DIR_SHELL_CONTEXT_MENU_BOTH
-#: Merge.rc:1035
+#: Merge.rc:1043
msgid "Both Shell Menu"
msgstr "両側シェル メニュー"
#. IDR_POPUP_DIRVIEW, ID_DIR_SHELL_CONTEXT_MENU_ALL
-#: Merge.rc:1036
+#: Merge.rc:1044
msgid "All Shell Menu"
msgstr "全てのシェル メニュー"
#. IDR_POPUP_EDITOR_HEADERBAR, ID_EDITOR_COPY
-#: Merge.rc:1050
+#: Merge.rc:1058
msgid "Copy"
msgstr "コピー"
#. IDR_POPUP_EDITOR_HEADERBAR, ID_EDITOR_COPY_PATH
-#: Merge.rc:1051
+#: Merge.rc:1059
msgid "&Copy Full Path"
msgstr "フルパスをコピー(&C)"
#. IDR_POPUP_EDITOR_HEADERBAR, ID_EDITOR_COPY_FILENAME
-#: Merge.rc:1052
+#: Merge.rc:1060
msgid "Copy &Filename"
msgstr "ファイル名をコピー(&F)"
#. IDR_POPUP_EDITOR_HEADERBAR, ID_EDITOR_EDIT_CAPTION
-#: Merge.rc:1053
+#: Merge.rc:1061
msgid "&Edit Caption\tF2"
msgstr "キャプションの編集(&E)\tF2"
#. IDR_POPUP_EDITOR_HEADERBAR, ID_EDITOR_EDIT_PATH
-#: Merge.rc:1055
+#: Merge.rc:1063
msgid "Edit &Path\tCtrl+L"
msgstr "パスの編集(&P)\tCtrl+L"
#. IDR_POPUP_EDITOR_HEADERBAR, ID_EDITOR_SELECT_FILE
-#: Merge.rc:1056
+#: Merge.rc:1064
msgid "&Open..."
msgstr "開く(&O)..."
#. IDR_POPUP_PLUGINS_SETTINGS
-#: Merge.rc:1062
+#: Merge.rc:1070
msgid "Unpacker Settings"
msgstr "展開プラグイン設定"
#. IDS_USERCHOICE_NONE
-#: Merge.rc:1064 Merge.rc:1070 Merge.rc:1789 Merge.rc:1793 Merge.rc:5030
+#: Merge.rc:1072 Merge.rc:1078 Merge.rc:1799 Merge.rc:1803 Merge.rc:5040
msgid ""
msgstr "<なし>"
#. IDS_USERCHOICE_AUTOMATIC
-#: Merge.rc:1065 Merge.rc:1071 Merge.rc:5031
+#: Merge.rc:1073 Merge.rc:1079 Merge.rc:5041
msgid ""
msgstr "<自動>"
#. IDD_OPEN, IDC_SELECT_PREDIFFER
-#: Merge.rc:1066 Merge.rc:1072 Merge.rc:1970 Merge.rc:1974
+#: Merge.rc:1074 Merge.rc:1080 Merge.rc:1980 Merge.rc:1984
msgid "&Select..."
msgstr "選択(&S)..."
#. IDR_POPUP_PLUGINS_SETTINGS
-#: Merge.rc:1068
+#: Merge.rc:1076
msgid "Prediffer Settings"
msgstr "比較前処理プラグイン設定"
#. IDR_POPUP_LOCATIONBAR, ID_LOCBAR_GOTODIFF
-#: Merge.rc:1080
+#: Merge.rc:1088
msgid "G&o to Diff"
msgstr "差異へ移動(&O)"
#. IDR_POPUP_LOCATIONBAR, ID_LOCBAR_MOVECURSOR_ONCLICK
-#: Merge.rc:1083
+#: Merge.rc:1091
msgid "Move Cursor on &Click"
msgstr "クリックでカーソルを移動(&C)"
#. IDR_POPUP_LOCATIONBAR, ID_DISPLAY_MOVED_NONE
-#: Merge.rc:1085
+#: Merge.rc:1093
msgid "&No Moved Blocks"
msgstr "移動ブロック表示なし(&N)"
#. IDR_POPUP_LOCATIONBAR, ID_DISPLAY_MOVED_ALL
-#: Merge.rc:1086
+#: Merge.rc:1094
msgid "&All Moved Blocks"
msgstr "全移動ブロック表示(&A)"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS
-#: Merge.rc:1094 Merge.rc:1127
+#: Merge.rc:1102 Merge.rc:1135
msgid "W&hitespaces"
msgstr "空白(&H)"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_WHITESPACE_COMPARE
-#: Merge.rc:1096 Merge.rc:1129
+#: Merge.rc:1104 Merge.rc:1137
msgid "Com&pare"
msgstr "比較する(&P)"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_WHITESPACE_IGNORE
-#: Merge.rc:1097 Merge.rc:1130
+#: Merge.rc:1105 Merge.rc:1138
msgid "I&gnore Changes"
msgstr "変更を無視(&G)"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_WHITESPACE_IGNOREALL
-#: Merge.rc:1098 Merge.rc:1131
+#: Merge.rc:1106 Merge.rc:1139
msgid "Ig&nore All"
msgstr "すべて無視(&N)"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_IGNORE_BLANKLINES
-#: Merge.rc:1100 Merge.rc:1133
+#: Merge.rc:1108 Merge.rc:1141
msgid "Ignore Blan&k Lines"
msgstr "空行を無視する(&K)"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_IGNORE_CASE
-#: Merge.rc:1101 Merge.rc:1134
+#: Merge.rc:1109 Merge.rc:1142
msgid "Ignore &Case"
msgstr "大文字と小文字を区別しない(&C)"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_IGNORE_EOL
-#: Merge.rc:1102 Merge.rc:1135
+#: Merge.rc:1110 Merge.rc:1143
msgid "Igno&re EOL Differences (Windows/Unix/Mac)"
msgstr "改行文字の違いを無視する(&R) (Windows/Unix/Mac)"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_IGNORE_CODEPAGE
-#: Merge.rc:1103 Merge.rc:1136
+#: Merge.rc:1111 Merge.rc:1144
msgid "Ignore Codepage &Differences"
msgstr "コードページの違いを無視する(&D)"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_IGNORE_NUMBERS
-#: Merge.rc:1104 Merge.rc:1137
+#: Merge.rc:1112 Merge.rc:1145
msgid "Ignore Num&bers"
msgstr "数字を無視する(&B)"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_IGNORE_COMMENTS
-#: Merge.rc:1105 Merge.rc:1138
+#: Merge.rc:1113 Merge.rc:1146
msgid "Ignore C&omment Differences"
msgstr "コメントの違いを無視する(&O)"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_IGNORE_MISSING_TRAILING_EOL
-#: Merge.rc:1106 Merge.rc:1139
+#: Merge.rc:1114 Merge.rc:1147
msgid "Ignore &Missing Trailing EOL"
msgstr "ファイル末尾の改行文字の有無を無視する(&E)"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_IGNORE_LINE_BREAKS
-#: Merge.rc:1107 Merge.rc:1140
+#: Merge.rc:1115 Merge.rc:1148
msgid "Ignore Line &Breaks (Treat as Spaces)"
msgstr "改行を無視(空白として扱う)(&B)"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_RECURS_CHECK
-#: Merge.rc:1109 Merge.rc:2963
+#: Merge.rc:1117 Merge.rc:2973
msgid "&Include Subfolders"
msgstr "サブフォルダーを含める(&I)"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS
-#: Merge.rc:1110 Merge.rc:1142
+#: Merge.rc:1118 Merge.rc:1150
msgid "&Compare Method"
msgstr "比較方法(&C)"
#. IDS_COMPMETHOD_FULL_CONTENTS
-#: Merge.rc:1112 Merge.rc:1144 Merge.rc:1328 Merge.rc:4282
+#: Merge.rc:1120 Merge.rc:1152 Merge.rc:1338 Merge.rc:4292
msgid "Full Contents"
msgstr "フルコンテンツ"
#. IDS_COMPMETHOD_QUICK_CONTENTS
-#: Merge.rc:1113 Merge.rc:1145 Merge.rc:1329 Merge.rc:4283
+#: Merge.rc:1121 Merge.rc:1153 Merge.rc:1339 Merge.rc:4293
msgid "Quick Contents"
msgstr "クイック コンテンツ"
#. IDS_COMPMETHOD_BINARY_CONTENTS
-#: Merge.rc:1114 Merge.rc:1146 Merge.rc:1330 Merge.rc:4284
+#: Merge.rc:1122 Merge.rc:1154 Merge.rc:1340 Merge.rc:4294
msgid "Binary Contents"
msgstr "バイナリ コンテンツ"
#. IDS_COMPMETHOD_MODDATE
-#: Merge.rc:1115 Merge.rc:1147 Merge.rc:1331 Merge.rc:4285
+#: Merge.rc:1123 Merge.rc:1155 Merge.rc:1341 Merge.rc:4295
msgid "Modified Date"
msgstr "更新日時のみ"
#. IDS_COMPMETHOD_DATESIZE
-#: Merge.rc:1116 Merge.rc:1148 Merge.rc:1332 Merge.rc:4286
+#: Merge.rc:1124 Merge.rc:1156 Merge.rc:1342 Merge.rc:4296
msgid "Modified Date and Size"
msgstr "更新日時とサイズ"
#. IDS_COMPMETHOD_SIZE
-#: Merge.rc:1117 Merge.rc:1149 Merge.rc:1333 Merge.rc:4287
+#: Merge.rc:1125 Merge.rc:1157 Merge.rc:1343 Merge.rc:4297
msgid "Size"
msgstr "サイズのみ"
#. IDS_COMPMETHOD_EXISTENCE
-#: Merge.rc:1118 Merge.rc:1150 Merge.rc:1334 Merge.rc:4288
+#: Merge.rc:1126 Merge.rc:1158 Merge.rc:1344 Merge.rc:4298
msgid "Existence"
msgstr "存在のみ"
#. IDR_POPUP_PROJECT, ID_LOAD_PROJECT
-#: Merge.rc:1192
+#: Merge.rc:1202
msgid "&Load Project..."
msgstr "プロジェクトを読み込み(&L)..."
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARGALL
-#: Merge.rc:1272 Merge.rc:1301
+#: Merge.rc:1282 Merge.rc:1311
msgid "${*} - All Arguments"
msgstr "${*} - すべての引数"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARG1
-#: Merge.rc:1273 Merge.rc:1302
+#: Merge.rc:1283 Merge.rc:1312
msgid "${1} - First Argument"
msgstr "${1} - 最初の引数"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARG2
-#: Merge.rc:1274 Merge.rc:1303
+#: Merge.rc:1284 Merge.rc:1313
msgid "${2} - Second Argument"
msgstr "${2} - 2番目の引数"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARG3
-#: Merge.rc:1275 Merge.rc:1304
+#: Merge.rc:1285 Merge.rc:1314
msgid "${3} - Third Argument"
msgstr "${3} - 3番目の引数"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARG4
-#: Merge.rc:1276 Merge.rc:1305
+#: Merge.rc:1286 Merge.rc:1315
msgid "${4} - Fourth Argument"
msgstr "${4} - 4番目の引数"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARG5
-#: Merge.rc:1277 Merge.rc:1306
+#: Merge.rc:1287 Merge.rc:1316
msgid "${5} - Fifth Argument"
msgstr "${5} - 5番目の引数"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARG6
-#: Merge.rc:1278 Merge.rc:1307
+#: Merge.rc:1288 Merge.rc:1317
msgid "${6} - Sixth Argument"
msgstr "${6} - 6番目の引数"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARG7
-#: Merge.rc:1279 Merge.rc:1308
+#: Merge.rc:1289 Merge.rc:1318
msgid "${7} - Seventh Argument"
msgstr "${7} - 7番目の引数"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARG8
-#: Merge.rc:1280 Merge.rc:1309
+#: Merge.rc:1290 Merge.rc:1319
msgid "${8} - Eighth Argument"
msgstr "${8} - 8番目の引数"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARG9
-#: Merge.rc:1281 Merge.rc:1310
+#: Merge.rc:1291 Merge.rc:1320
msgid "${9} - Ninth Argument"
msgstr "${9} - 9番目の引数"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_SRC_FILE
-#: Merge.rc:1289
+#: Merge.rc:1299
msgid "${SRC_FILE} - Source File"
msgstr "${SRC_FILE} - ソースファイル"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_SRC_FOLDER
-#: Merge.rc:1290
+#: Merge.rc:1300
msgid "${SRC_FOLDER} - Source Folder"
msgstr "${SRC_FOLDER} - ソースフォルダー"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_SRC_URL
-#: Merge.rc:1291
+#: Merge.rc:1301
msgid "${SRC_URL} - Source URL"
msgstr "${SRC_URL} - ソースURL"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_SRC_URL_PROTOCOL
-#: Merge.rc:1292
+#: Merge.rc:1302
msgid "${SRC_URL_PROTOCOL} - Source URL Protocol"
msgstr "${SRC_URL_PROTOCOL} - ソースURLプロトコル"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_SRC_URL_SUFFIX
-#: Merge.rc:1293
+#: Merge.rc:1303
msgid "${SRC_URL_SUFFIX} - Source URL Suffix"
msgstr "${SRC_URL_SUFFIX} - ソースURLサフィックス"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_DST_FILE
-#: Merge.rc:1294
+#: Merge.rc:1304
msgid "${DST_FILE} - Destination File"
msgstr "${DST_FILE} - 宛先ファイル"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_DST_FOLDER
-#: Merge.rc:1295
+#: Merge.rc:1305
msgid "${DST_FOLDER} - Destination Folder"
msgstr "${DST_FOLDER} - 宛先フォルダー"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_DST_URL
-#: Merge.rc:1296
+#: Merge.rc:1306
msgid "${DST_URL} - Destination URL"
msgstr "${DST_URL} - 宛先URL"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_DST_URL_PROTOCOL
-#: Merge.rc:1297
+#: Merge.rc:1307
msgid "${DST_URL_PROTOCOL} - Destination URL Protocol"
msgstr "${DST_URL_PROTOCOL} - 宛先URLプロトコル"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_DST_URL_SUFFIX
-#: Merge.rc:1298
+#: Merge.rc:1308
msgid "${DST_URL_SUFFIX} - Destination URL Suffix"
msgstr "${DST_URL_SUFFIX} - 宛先URLサフィックス"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_WINMERGE_HOME
-#: Merge.rc:1299
+#: Merge.rc:1309
msgid "${WINMERGE_HOME} - WinMerge Home Directory"
msgstr "${WINMERGE_HOME} - WinMergeホームディレクトリ"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_SCRIPT_FILE
-#: Merge.rc:1300
+#: Merge.rc:1310
msgid "${SCRIPT_FILE} - Script File"
msgstr "${SCRIPT_FILE} - スクリプトファイル"
#. IDR_POPUP_PLUGIN_ADD_MENU, ID_PLUGIN_ADD_UNPACKER
-#: Merge.rc:1318
+#: Merge.rc:1328
msgid "Add &Unpacker Plugin..."
msgstr "展開プラグインを追加(&U)..."
#. IDR_POPUP_PLUGIN_ADD_MENU, ID_PLUGIN_ADD_PREDIFFER
-#: Merge.rc:1319
+#: Merge.rc:1329
msgid "Add &Prediffer Plugin..."
msgstr "比較前処理プラグインを追加(&P)..."
#. IDR_POPUP_PLUGIN_ADD_MENU, ID_PLUGIN_DUPLICATE
-#: Merge.rc:1320
+#: Merge.rc:1330
msgid "&Duplicate Plugin..."
msgstr "プラグインを複製(&D)..."
#. IDR_POPUP_OUTPUTVIEW, ID_EDIT_CLEAR_ALL
-#: Merge.rc:1344
+#: Merge.rc:1354
msgid "Clear &All"
msgstr "すべてクリア(&A)"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_MASK_CLEAR
-#: Merge.rc:1352
+#: Merge.rc:1362
msgid "&Clear All"
msgstr "すべてクリア(&C)"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_MASK_REMOVE_LAST
-#: Merge.rc:1353
+#: Merge.rc:1363
msgid "Remove Last Filter &Group"
msgstr "最後のフィルターグループを削除(&G)"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_MASK_ALL
-#: Merge.rc:1354
+#: Merge.rc:1364
msgid "R&eset to Default (*.*)"
msgstr "デフォルト (*.*) にリセット(&E)"
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1355
+#: Merge.rc:1365
msgid "Add E&xclude File"
msgstr "除外ファイルを追加(&X)"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_SYS
-#: Merge.rc:1357
+#: Merge.rc:1367
msgid "&System Files"
msgstr "システムファイル(&S)"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_BACKUP
-#: Merge.rc:1358
+#: Merge.rc:1368
msgid "&Editor Backup Files"
msgstr "エディタのバックアップファイル(&E)"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_BIN
-#: Merge.rc:1359
+#: Merge.rc:1369
msgid "&Compiled Binary Files"
msgstr "コンパイル済みバイナリファイル(&C)"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_LOG
-#: Merge.rc:1360
+#: Merge.rc:1370
msgid "&Log Files"
msgstr "ログファイル(&L)"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_TEMP
-#: Merge.rc:1361
+#: Merge.rc:1371
msgid "&Temporary or Cache Files"
msgstr "一時ファイル・キャッシュファイル(&T)"
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1363
+#: Merge.rc:1373
msgid "Add Excl&ude Folder"
msgstr "除外フォルダーを追加(&U)"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FOLDER_VCS
-#: Merge.rc:1365
+#: Merge.rc:1375
msgid "&Version Control"
msgstr "バージョン管理(&V)"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FOLDER_BUILD
-#: Merge.rc:1366
+#: Merge.rc:1376
msgid "&Build Artifacts"
msgstr "ビルド生成物(&B)"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FOLDER_IDE
-#: Merge.rc:1367
+#: Merge.rc:1377
msgid "&IDE"
msgstr "IDE関連(&I)"
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1370
+#: Merge.rc:1380
msgid "Add &File Condition"
msgstr "ファイル条件を追加(&F)"
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1372 Merge.rc:1551
+#: Merge.rc:1382 Merge.rc:1561
msgid "File &Size"
msgstr "ファイルサイズ(&S)"
#. IDR_POPUP_FILTERMENU_DIFF_SIZE, ID_FILTERMENU_DIFF_SIZE_LT_1KB
-#: Merge.rc:1374 Merge.rc:1527 Merge.rc:1564 Merge.rc:1629 Merge.rc:1707
+#: Merge.rc:1384 Merge.rc:1537 Merge.rc:1574 Merge.rc:1639 Merge.rc:1717
msgid "Less than 1KB"
msgstr "1KB 未満"
#. IDR_POPUP_FILTERMENU_DIFF_SIZE, ID_FILTERMENU_DIFF_SIZE_GE_1KB
-#: Merge.rc:1375 Merge.rc:1528 Merge.rc:1565 Merge.rc:1630 Merge.rc:1708
+#: Merge.rc:1385 Merge.rc:1538 Merge.rc:1575 Merge.rc:1640 Merge.rc:1718
msgid "1KB or more"
msgstr "1KB 以上"
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_LT_10KB
-#: Merge.rc:1376 Merge.rc:1529 Merge.rc:1631
+#: Merge.rc:1386 Merge.rc:1539 Merge.rc:1641
msgid "Less than 10KB"
msgstr "10KB 未満"
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_GE_10KB
-#: Merge.rc:1377 Merge.rc:1530 Merge.rc:1632
+#: Merge.rc:1387 Merge.rc:1540 Merge.rc:1642
msgid "10KB or more"
msgstr "10KB 以上"
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_LT_100KB
-#: Merge.rc:1378 Merge.rc:1531 Merge.rc:1633
+#: Merge.rc:1388 Merge.rc:1541 Merge.rc:1643
msgid "Less than 100KB"
msgstr "100KB 未満"
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_GE_100KB
-#: Merge.rc:1379 Merge.rc:1532 Merge.rc:1634
+#: Merge.rc:1389 Merge.rc:1542 Merge.rc:1644
msgid "100KB or more"
msgstr "100KB 以上"
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_LT_1MB
-#: Merge.rc:1380 Merge.rc:1533 Merge.rc:1635
+#: Merge.rc:1390 Merge.rc:1543 Merge.rc:1645
msgid "Less than 1MB"
msgstr "1MB 未満"
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_GE_1MB
-#: Merge.rc:1381 Merge.rc:1534 Merge.rc:1636
+#: Merge.rc:1391 Merge.rc:1544 Merge.rc:1646
msgid "1MB or more"
msgstr "1MB 以上"
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_LT_10MB
-#: Merge.rc:1382 Merge.rc:1535 Merge.rc:1637
+#: Merge.rc:1392 Merge.rc:1545 Merge.rc:1647
msgid "Less than 10MB"
msgstr "10MB 未満"
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_GE_10MB
-#: Merge.rc:1383 Merge.rc:1536 Merge.rc:1638
+#: Merge.rc:1393 Merge.rc:1546 Merge.rc:1648
msgid "10MB or more"
msgstr "10MB 以上"
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_LT_100MB
-#: Merge.rc:1384 Merge.rc:1537 Merge.rc:1639
+#: Merge.rc:1394 Merge.rc:1547 Merge.rc:1649
msgid "Less than 100MB"
msgstr "100MB 未満"
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_GE_100MB
-#: Merge.rc:1385 Merge.rc:1538 Merge.rc:1640
+#: Merge.rc:1395 Merge.rc:1548 Merge.rc:1650
msgid "100MB or more"
msgstr "100MB 以上"
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_LT_1GB
-#: Merge.rc:1386 Merge.rc:1539 Merge.rc:1641
+#: Merge.rc:1396 Merge.rc:1549 Merge.rc:1651
msgid "Less than 1GB"
msgstr "1GB 未満"
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_GE_1GB
-#: Merge.rc:1387 Merge.rc:1642
+#: Merge.rc:1397 Merge.rc:1652
msgid "1GB or more"
msgstr "1GB 以上"
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_RANGE
-#: Merge.rc:1388 Merge.rc:1465 Merge.rc:1517 Merge.rc:1523 Merge.rc:1540
-#: Merge.rc:1566 Merge.rc:1587 Merge.rc:1643 Merge.rc:1709 Merge.rc:1734
+#: Merge.rc:1398 Merge.rc:1475 Merge.rc:1527 Merge.rc:1533 Merge.rc:1550
+#: Merge.rc:1576 Merge.rc:1597 Merge.rc:1653 Merge.rc:1719 Merge.rc:1744
msgid "Custom Range..."
msgstr "カスタム範囲..."
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1390 Merge.rc:1471 Merge.rc:1568
+#: Merge.rc:1400 Merge.rc:1481 Merge.rc:1578
msgid "&Last Modified"
msgstr "最終更新日(&L)"
#. IDR_POPUP_FILTERMENU_DATE
-#: Merge.rc:1392 Merge.rc:1473 Merge.rc:1651
+#: Merge.rc:1402 Merge.rc:1483 Merge.rc:1661
msgid "&Hour"
msgstr "時間単位(&H)"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_HOUR_BEFORE_1
-#: Merge.rc:1394 Merge.rc:1475 Merge.rc:1653
+#: Merge.rc:1404 Merge.rc:1485 Merge.rc:1663
msgid "More than 1 hour ago"
msgstr "1時間以上前"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_HOUR_WITHIN_1
-#: Merge.rc:1395 Merge.rc:1476 Merge.rc:1654
+#: Merge.rc:1405 Merge.rc:1486 Merge.rc:1664
msgid "Within 1 hour"
msgstr "1時間以内"
#. IDR_POPUP_FILTERMENU_DATE
-#: Merge.rc:1397 Merge.rc:1478 Merge.rc:1656
+#: Merge.rc:1407 Merge.rc:1488 Merge.rc:1666
msgid "&Day"
msgstr "日単位(&D)"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_DAY_BEFORE_TODAY
-#: Merge.rc:1399 Merge.rc:1480 Merge.rc:1658
+#: Merge.rc:1409 Merge.rc:1490 Merge.rc:1668
msgid "Before today"
msgstr "今日より前"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_DAY_TODAY
-#: Merge.rc:1400 Merge.rc:1481 Merge.rc:1659
+#: Merge.rc:1410 Merge.rc:1491 Merge.rc:1669
msgid "Today"
msgstr "今日"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_DAY_BEFORE_YESTERDAY
-#: Merge.rc:1401 Merge.rc:1482 Merge.rc:1660
+#: Merge.rc:1411 Merge.rc:1492 Merge.rc:1670
msgid "Before yesterday"
msgstr "昨日より前"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_DAY_YESTERDAY
-#: Merge.rc:1402 Merge.rc:1483 Merge.rc:1661
+#: Merge.rc:1412 Merge.rc:1493 Merge.rc:1671
msgid "Yesterday"
msgstr "昨日"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_DAY_SINCE_YESTERDAY
-#: Merge.rc:1403 Merge.rc:1484 Merge.rc:1662
+#: Merge.rc:1413 Merge.rc:1494 Merge.rc:1672
msgid "Since yesterday"
msgstr "昨日以降"
#. IDR_POPUP_FILTERMENU_DATE
-#: Merge.rc:1405 Merge.rc:1486 Merge.rc:1664
+#: Merge.rc:1415 Merge.rc:1496 Merge.rc:1674
msgid "&Week"
msgstr "週単位(&W)"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_WEEK_BEFORE_THIS
-#: Merge.rc:1407 Merge.rc:1488 Merge.rc:1666
+#: Merge.rc:1417 Merge.rc:1498 Merge.rc:1676
msgid "Before this week"
msgstr "今週より前"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_WEEK_THIS
-#: Merge.rc:1408 Merge.rc:1489 Merge.rc:1667
+#: Merge.rc:1418 Merge.rc:1499 Merge.rc:1677
msgid "This week"
msgstr "今週"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_WEEK_BEFORE_LAST
-#: Merge.rc:1409 Merge.rc:1490 Merge.rc:1668
+#: Merge.rc:1419 Merge.rc:1500 Merge.rc:1678
msgid "Before last week"
msgstr "先週より前"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_WEEK_LAST
-#: Merge.rc:1410 Merge.rc:1491 Merge.rc:1669
+#: Merge.rc:1420 Merge.rc:1501 Merge.rc:1679
msgid "Last week"
msgstr "先週"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_WEEK_SINCE_LAST
-#: Merge.rc:1411 Merge.rc:1492 Merge.rc:1670
+#: Merge.rc:1421 Merge.rc:1502 Merge.rc:1680
msgid "Since last week"
msgstr "先週以降"
#. IDR_POPUP_FILTERMENU_DATE
-#: Merge.rc:1413 Merge.rc:1494 Merge.rc:1672
+#: Merge.rc:1423 Merge.rc:1504 Merge.rc:1682
msgid "&Month"
msgstr "月単位(&M)"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_MONTH_BEFORE_THIS
-#: Merge.rc:1415 Merge.rc:1496 Merge.rc:1674
+#: Merge.rc:1425 Merge.rc:1506 Merge.rc:1684
msgid "Before this month"
msgstr "今月より前"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_MONTH_THIS
-#: Merge.rc:1416 Merge.rc:1497 Merge.rc:1675
+#: Merge.rc:1426 Merge.rc:1507 Merge.rc:1685
msgid "This month"
msgstr "今月"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_MONTH_BEFORE_LAST
-#: Merge.rc:1417 Merge.rc:1498 Merge.rc:1676
+#: Merge.rc:1427 Merge.rc:1508 Merge.rc:1686
msgid "Before last month"
msgstr "先月より前"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_MONTH_LAST
-#: Merge.rc:1418 Merge.rc:1499 Merge.rc:1677
+#: Merge.rc:1428 Merge.rc:1509 Merge.rc:1687
msgid "Last month"
msgstr "先月"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_MONTH_SINCE_LAST
-#: Merge.rc:1419 Merge.rc:1500 Merge.rc:1678
+#: Merge.rc:1429 Merge.rc:1510 Merge.rc:1688
msgid "Since last month"
msgstr "先月以降"
#. IDR_POPUP_FILTERMENU_DATE
-#: Merge.rc:1421 Merge.rc:1502 Merge.rc:1680
+#: Merge.rc:1431 Merge.rc:1512 Merge.rc:1690
msgid "&Year"
msgstr "年単位(&Y)"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_YEAR_BEFORE_THIS
-#: Merge.rc:1423 Merge.rc:1504 Merge.rc:1682
+#: Merge.rc:1433 Merge.rc:1514 Merge.rc:1692
msgid "Before this year"
msgstr "今年より前"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_YEAR_THIS
-#: Merge.rc:1424 Merge.rc:1505 Merge.rc:1683
+#: Merge.rc:1434 Merge.rc:1515 Merge.rc:1693
msgid "This year"
msgstr "今年"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_YEAR_BEFORE_LAST
-#: Merge.rc:1425 Merge.rc:1506 Merge.rc:1684
+#: Merge.rc:1435 Merge.rc:1516 Merge.rc:1694
msgid "Before last year"
msgstr "昨年より前"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_YEAR_LAST
-#: Merge.rc:1426 Merge.rc:1507 Merge.rc:1685
+#: Merge.rc:1436 Merge.rc:1517 Merge.rc:1695
msgid "Last year"
msgstr "昨年"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_YEAR_SINCE_LAST
-#: Merge.rc:1427 Merge.rc:1508 Merge.rc:1686
+#: Merge.rc:1437 Merge.rc:1518 Merge.rc:1696
msgid "Since last year"
msgstr "昨年以降"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_RANGE
-#: Merge.rc:1429 Merge.rc:1510 Merge.rc:1688
+#: Merge.rc:1439 Merge.rc:1520 Merge.rc:1698
msgid "&Custom Range..."
msgstr "カスタム範囲(&C)..."
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1431 Merge.rc:1589
+#: Merge.rc:1441 Merge.rc:1599
msgid "&Attributes"
msgstr "属性(&A)"
#. IDR_POPUP_FILTERMENU_ATTR, ID_FILTERMENU_ATTR_READONLY
-#: Merge.rc:1433 Merge.rc:1607
+#: Merge.rc:1443 Merge.rc:1617
msgid "Read-only files"
msgstr "読み取り専用ファイル"
#. IDR_POPUP_FILTERMENU_ATTR, ID_FILTERMENU_ATTR_NOT_READONLY
-#: Merge.rc:1434 Merge.rc:1608
+#: Merge.rc:1444 Merge.rc:1618
msgid "Not read-only files"
msgstr "読み取り専用ではないファイル"
#. IDR_POPUP_FILTERMENU_ATTR, ID_FILTERMENU_ATTR_HIDDEN
-#: Merge.rc:1435 Merge.rc:1609
+#: Merge.rc:1445 Merge.rc:1619
msgid "Hidden files"
msgstr "隠しファイル"
#. IDR_POPUP_FILTERMENU_ATTR, ID_FILTERMENU_ATTR_NOT_HIDDEN
-#: Merge.rc:1436 Merge.rc:1610
+#: Merge.rc:1446 Merge.rc:1620
msgid "Not hidden files"
msgstr "隠しファイルではない"
#. IDR_POPUP_FILTERMENU_ATTR, ID_FILTERMENU_ATTR_SYSTEM
-#: Merge.rc:1437 Merge.rc:1611
+#: Merge.rc:1447 Merge.rc:1621
msgid "System files"
msgstr "システムファイル"
#. IDR_POPUP_FILTERMENU_ATTR, ID_FILTERMENU_ATTR_NOT_SYSTEM
-#: Merge.rc:1438 Merge.rc:1612
+#: Merge.rc:1448 Merge.rc:1622
msgid "Not system files"
msgstr "システムファイルではない"
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1440
+#: Merge.rc:1450
msgid "File &Content"
msgstr "ファイル内容(&C)"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_CONTAINS
-#: Merge.rc:1442
+#: Merge.rc:1452
msgid "Contains string..."
msgstr "指定文字列を含む..."
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_NOT_CONTAINS
-#: Merge.rc:1443
+#: Merge.rc:1453
msgid "Does not contain string..."
msgstr "指定文字列を含まない..."
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_FIRST_LINE_CONTAINS
-#: Merge.rc:1444
+#: Merge.rc:1454
msgid "First line contains string..."
msgstr "先頭行に文字列を含む..."
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_FIRST_LINE_NOT_CONTAINS
-#: Merge.rc:1445
+#: Merge.rc:1455
msgid "First line does not contain string..."
msgstr "先頭行に文字列を含まない..."
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_FIRST_10_CONTAINS
-#: Merge.rc:1446
+#: Merge.rc:1456
msgid "First 10 lines contain string..."
msgstr "先頭10行に文字列を含む..."
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_FIRST_10_NOT_CONTAINS
-#: Merge.rc:1447
+#: Merge.rc:1457
msgid "First 10 lines do not contain string..."
msgstr "先頭10行に文字列を含まない..."
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_LAST_10_CONTAINS
-#: Merge.rc:1448
+#: Merge.rc:1458
msgid "Last 10 lines contain string..."
msgstr "末尾10行に文字列を含む..."
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_LAST_10_NOT_CONTAINS
-#: Merge.rc:1449
+#: Merge.rc:1459
msgid "Last 10 lines do not contain string..."
msgstr "末尾10行に文字列を含まない..."
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_LAST_LINE_CONTAINS
-#: Merge.rc:1450
+#: Merge.rc:1460
msgid "Last line contains string..."
msgstr "末尾行に文字列を含む..."
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_LAST_LINE_NOT_CONTAINS
-#: Merge.rc:1451
+#: Merge.rc:1461
msgid "Last line does not contain string..."
msgstr "末尾行に文字列を含まない..."
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1453
+#: Merge.rc:1463
msgid "&Line Count"
msgstr "行数(&L)"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_LT_10
-#: Merge.rc:1455
+#: Merge.rc:1465
msgid "Less than 10"
msgstr "10未満"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_GE_10
-#: Merge.rc:1456
+#: Merge.rc:1466
msgid "10 or more"
msgstr "10以上"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_LT_100
-#: Merge.rc:1457
+#: Merge.rc:1467
msgid "Less than 100"
msgstr "100未満"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_GE_100
-#: Merge.rc:1458
+#: Merge.rc:1468
msgid "100 or more"
msgstr "100以上"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_LT_1000
-#: Merge.rc:1459
+#: Merge.rc:1469
msgid "Less than 1000"
msgstr "1000未満"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_GE_1000
-#: Merge.rc:1460
+#: Merge.rc:1470
msgid "1000 or more"
msgstr "1000以上"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_LT_10000
-#: Merge.rc:1461
+#: Merge.rc:1471
msgid "Less than 10000"
msgstr "10000未満"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_GE_10000
-#: Merge.rc:1462
+#: Merge.rc:1472
msgid "10000 or more"
msgstr "10000以上"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_LT_100000
-#: Merge.rc:1463
+#: Merge.rc:1473
msgid "Less than 100000"
msgstr "100000未満"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_GE_100000
-#: Merge.rc:1464
+#: Merge.rc:1474
msgid "100000 or more"
msgstr "100000以上"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_PROPS
-#: Merge.rc:1467 Merge.rc:1594 Merge.rc:1761 Merge.rc:1778
+#: Merge.rc:1477 Merge.rc:1604 Merge.rc:1771 Merge.rc:1788
msgid "Additional &Properties..."
msgstr "追加プロパティ(&P)..."
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1469
+#: Merge.rc:1479
msgid "Add F&older Condition"
msgstr "フォルダー条件を追加(&O)"
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1513
+#: Merge.rc:1523
msgid "&Files"
msgstr "ファイル数(&F)"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FOLDER_FILES_EQ_0
-#: Merge.rc:1515
+#: Merge.rc:1525
msgid "0 files"
msgstr "0 ファイル"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FOLDER_FILES_GE_1
-#: Merge.rc:1516
+#: Merge.rc:1526
msgid "1 file or more"
msgstr "1 ファイル以上"
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1519
+#: Merge.rc:1529
msgid "&Items"
msgstr "項目数(&I)"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FOLDER_ITEMS_EQ_0
-#: Merge.rc:1521
+#: Merge.rc:1531
msgid "0 items"
msgstr "0 項目"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FOLDER_ITEMS_GE_1
-#: Merge.rc:1522
+#: Merge.rc:1532
msgid "1 item or more"
msgstr "1 項目以上"
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1525
+#: Merge.rc:1535
msgid "&Total Size"
msgstr "合計サイズ(&T)"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FOLDER_STATS_RECURSIVE
-#: Merge.rc:1542
+#: Merge.rc:1552
msgid "&Recursive"
msgstr "再帰的(&R)"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONDITION_ANY
-#: Merge.rc:1544
+#: Merge.rc:1554
msgid "Target: &Any (Left/Middle/Right)"
msgstr "対象: いずれか (左/中央/右)(&A)"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONDITION_LEFT
-#: Merge.rc:1545
+#: Merge.rc:1555
msgid "Target: &Left"
msgstr "対象: 左(&L)"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONDITION_MIDDLE
-#: Merge.rc:1546
+#: Merge.rc:1556
msgid "Target: &Middle"
msgstr "対象: 中央(&M)"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONDITION_RIGHT
-#: Merge.rc:1547
+#: Merge.rc:1557
msgid "Target: &Right"
msgstr "対象: 右(&R)"
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1549
+#: Merge.rc:1559
msgid "Add &Difference Condition"
msgstr "差異条件を追加(&D)"
#. IDR_POPUP_FILTERMENU_DIFF_PROP, ID_FILTERMENU_DIFF_PROP_EQUAL
-#: Merge.rc:1553 Merge.rc:1570 Merge.rc:1591 Merge.rc:1696 Merge.rc:1717
-#: Merge.rc:1742
+#: Merge.rc:1563 Merge.rc:1580 Merge.rc:1601 Merge.rc:1706 Merge.rc:1727
+#: Merge.rc:1752
msgid "Equal"
msgstr "一致"
#. IDR_POPUP_FILTERMENU_DIFF_PROP, ID_FILTERMENU_DIFF_PROP_NOT_EQUAL
-#: Merge.rc:1554 Merge.rc:1571 Merge.rc:1592 Merge.rc:1697 Merge.rc:1718
-#: Merge.rc:1743
+#: Merge.rc:1564 Merge.rc:1581 Merge.rc:1602 Merge.rc:1707 Merge.rc:1728
+#: Merge.rc:1753
msgid "Not Equal"
msgstr "不一致"
#. IDR_POPUP_FILTERMENU_DIFF_PROP, ID_FILTERMENU_DIFF_PROP_LESS
-#: Merge.rc:1555 Merge.rc:1572 Merge.rc:1698 Merge.rc:1719 Merge.rc:1744
+#: Merge.rc:1565 Merge.rc:1582 Merge.rc:1708 Merge.rc:1729 Merge.rc:1754
msgid "Less Than"
msgstr "<"
#. IDR_POPUP_FILTERMENU_DIFF_PROP, ID_FILTERMENU_DIFF_PROP_LESS_EQUAL
-#: Merge.rc:1556 Merge.rc:1573 Merge.rc:1699 Merge.rc:1720 Merge.rc:1745
+#: Merge.rc:1566 Merge.rc:1583 Merge.rc:1709 Merge.rc:1730 Merge.rc:1755
msgid "Less Than or Equal to"
msgstr "<="
#. IDR_POPUP_FILTERMENU_DIFF_PROP, ID_FILTERMENU_DIFF_PROP_GREATER
-#: Merge.rc:1557 Merge.rc:1574 Merge.rc:1700 Merge.rc:1721 Merge.rc:1746
+#: Merge.rc:1567 Merge.rc:1584 Merge.rc:1710 Merge.rc:1731 Merge.rc:1756
msgid "Greater Than"
msgstr ">"
#. IDR_POPUP_FILTERMENU_DIFF_PROP, ID_FILTERMENU_DIFF_PROP_GREATER_EQUAL
-#: Merge.rc:1558 Merge.rc:1575 Merge.rc:1701 Merge.rc:1722 Merge.rc:1747
+#: Merge.rc:1568 Merge.rc:1585 Merge.rc:1711 Merge.rc:1732 Merge.rc:1757
msgid "Greater Than or Equal to"
msgstr ">="
#. IDR_POPUP_FILTERMENU_DIFF_SIZE, ID_FILTERMENU_DIFF_SIZE_LT_10B
-#: Merge.rc:1560 Merge.rc:1703
+#: Merge.rc:1570 Merge.rc:1713
msgid "Less than 10B"
msgstr "10B 未満"
#. IDR_POPUP_FILTERMENU_DIFF_SIZE, ID_FILTERMENU_DIFF_SIZE_GE_10B
-#: Merge.rc:1561 Merge.rc:1704
+#: Merge.rc:1571 Merge.rc:1714
msgid "10B or more"
msgstr "10B 以上"
#. IDR_POPUP_FILTERMENU_DIFF_SIZE, ID_FILTERMENU_DIFF_SIZE_LT_100B
-#: Merge.rc:1562 Merge.rc:1705
+#: Merge.rc:1572 Merge.rc:1715
msgid "Less than 100B"
msgstr "100B 未満"
#. IDR_POPUP_FILTERMENU_DIFF_SIZE, ID_FILTERMENU_DIFF_SIZE_GE_100B
-#: Merge.rc:1563 Merge.rc:1706
+#: Merge.rc:1573 Merge.rc:1716
msgid "100B or more"
msgstr "100B 以上"
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_LT_1SECOND
-#: Merge.rc:1577 Merge.rc:1724
+#: Merge.rc:1587 Merge.rc:1734
msgid "Less than 1 second"
msgstr "一秒未満"
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_GE_1SECOND
-#: Merge.rc:1578 Merge.rc:1725
+#: Merge.rc:1588 Merge.rc:1735
msgid "1 second or more"
msgstr "一秒以上"
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_LT_1MINUTE
-#: Merge.rc:1579 Merge.rc:1726
+#: Merge.rc:1589 Merge.rc:1736
msgid "Less than 1 minute"
msgstr "一分未満"
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_GE_1MINUTE
-#: Merge.rc:1580 Merge.rc:1727
+#: Merge.rc:1590 Merge.rc:1737
msgid "1 minute or more"
msgstr "一分以上"
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_LT_1HOUR
-#: Merge.rc:1581 Merge.rc:1728
+#: Merge.rc:1591 Merge.rc:1738
msgid "Less than 1 hour"
msgstr "一時間未満"
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_GE_1HOUR
-#: Merge.rc:1582 Merge.rc:1729
+#: Merge.rc:1592 Merge.rc:1739
msgid "1 hour or more"
msgstr "一時間以上"
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_LT_1DAY
-#: Merge.rc:1583 Merge.rc:1730
+#: Merge.rc:1593 Merge.rc:1740
msgid "Less than 1 day"
msgstr "一日未満"
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_GE_1DAY
-#: Merge.rc:1584 Merge.rc:1731
+#: Merge.rc:1594 Merge.rc:1741
msgid "1 day or more"
msgstr "一日以上"
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_LT_1WEEK
-#: Merge.rc:1585 Merge.rc:1732
+#: Merge.rc:1595 Merge.rc:1742
msgid "Less than 1 week"
msgstr "一週間未満"
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_GE_1WEEK
-#: Merge.rc:1586 Merge.rc:1733
+#: Merge.rc:1596 Merge.rc:1743
msgid "1 week or more"
msgstr "一週間以上"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_CONDITION_DIFF_LEFT_RIGHT
-#: Merge.rc:1596
+#: Merge.rc:1606
msgid "Target: &Left and Right"
msgstr "対象: 左と右(&L)"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_CONDITION_DIFF_LEFT_MIDDLE
-#: Merge.rc:1597
+#: Merge.rc:1607
msgid "Target: Left and &Middle"
msgstr "対象: 左と中央(&M)"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_CONDITION_DIFF_MIDDLE_RIGHT
-#: Merge.rc:1598
+#: Merge.rc:1608
msgid "Target: Middle and &Right"
msgstr "対象: 中央と右(&R)"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_CONDITION_DIFF_ALL
-#: Merge.rc:1599
+#: Merge.rc:1609
msgid "Target: &All"
msgstr "対象: すべて(&A)"
#. IDR_POPUP_FILTERMENU_BINARY, ID_FILTERMENU_BINARY_ONLY
-#: Merge.rc:1620
+#: Merge.rc:1630
msgid "Binary files only"
msgstr "バイナリファイルのみ"
#. IDR_POPUP_FILTERMENU_BINARY, ID_FILTERMENU_TEXT_ONLY
-#: Merge.rc:1621
+#: Merge.rc:1631
msgid "Text files only"
msgstr "テキストファイルのみ"
#. IDR_POPUP_ADDCMPMENU, ID_ADDCMPMENU_CLEAR
-#: Merge.rc:1755
+#: Merge.rc:1765
msgid "&Clear conditions"
msgstr "条件をクリア(&C)"
#. IDR_POPUP_ADDCMPMENU, ID_ADDCMPMENU_CMP_SIZE
-#: Merge.rc:1757
+#: Merge.rc:1767
msgid "Compare &Size"
msgstr "サイズを比較(&S)"
#. IDR_POPUP_ADDCMPMENU, ID_ADDCMPMENU_CMP_DATE
-#: Merge.rc:1758
+#: Merge.rc:1768
msgid "Compare &Date"
msgstr "更新日時を比較(&D)"
#. IDR_POPUP_ADDCMPMENU, ID_ADDCMPMENU_CMP_ATTR
-#: Merge.rc:1759
+#: Merge.rc:1769
msgid "Compare &Attributes"
msgstr "属性を比較(&A)"
#. IDR_POPUP_ADDCMPMENU, ID_ADDCMPMENU_CMP_CONTENTS
-#: Merge.rc:1760
+#: Merge.rc:1770
msgid "Compare C&ontents"
msgstr "内容を比較(&O)"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_CLEAR
-#: Merge.rc:1769
+#: Merge.rc:1779
msgid "&Clear Keys"
msgstr "キーをクリア(&C)"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_NAME
-#: Merge.rc:1771
+#: Merge.rc:1781
msgid "&Name"
msgstr "名前(&N)"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_BASENAME
-#: Merge.rc:1772
+#: Merge.rc:1782
msgid "&Base name (without extension)"
msgstr "拡張子を除いた名前(&B)"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_NORMALIZED_NAME
-#: Merge.rc:1773
+#: Merge.rc:1783
msgid "Normalized &Unicode Name"
msgstr "Unicode正規化した名前(&U)"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_RELPATH
-#: Merge.rc:1774
+#: Merge.rc:1784
msgid "&Relative Path"
msgstr "相対パス(&R)"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_DATE
-#: Merge.rc:1776
+#: Merge.rc:1786
msgid "&Date"
msgstr "更新日時(&D)"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_HASH_MD5
-#: Merge.rc:1777
+#: Merge.rc:1787
msgid "&Hash (MD5)"
msgstr "ハッシュ (MD5)(&H)"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_REPLACE
-#: Merge.rc:1780
+#: Merge.rc:1790
msgid "Insert &replace() Function"
msgstr "replace()関数を挿入(&R)"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_REGEXREPLACE
-#: Merge.rc:1781
+#: Merge.rc:1791
msgid "Insert rege&xReplace() Function"
msgstr "regexReplace() 関数を挿入(&X)"
#. IDR_POPUP_RENAMEMOVE_MENU
-#: Merge.rc:1782
+#: Merge.rc:1792
msgid "Replace &Lists"
msgstr "置換リスト(&L)"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_CREATE_REPLACELIST
-#: Merge.rc:1784
+#: Merge.rc:1794
msgid "&Create String Replace List and Insert..."
msgstr "文字列置換リストを作成して挿入(&C)..."
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_CREATE_REGEXREPLACELIST
-#: Merge.rc:1785
+#: Merge.rc:1795
msgid "Create &Regex Replace List and Insert..."
msgstr "正規表現置換リストを作成して挿入(&R)..."
#. IDR_POPUP_RENAMEMOVE_MENU
-#: Merge.rc:1787
+#: Merge.rc:1797
msgid "&String Replace Lists"
msgstr "文字列置換リスト(&S)"
#. IDR_POPUP_RENAMEMOVE_MENU
-#: Merge.rc:1791
+#: Merge.rc:1801
msgid "Re&gex Replace Lists"
msgstr "正規表現置換リスト(&G)"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_STRING_REPLACE_LISTS_FOLDER
-#: Merge.rc:1796
+#: Merge.rc:1806
msgid "Open String Replace Lists Folder..."
msgstr "文字列置換リストのフォルダーを開く..."
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_REGEX_REPLACE_LISTS_FOLDER
-#: Merge.rc:1797
+#: Merge.rc:1807
msgid "Open Regex Replace Lists Folder..."
msgstr "正規表現置換リストのフォルダーを開く..."
#. IDD_FILTERS_CONDITION, IDC_CONDITION_MATCHCASE
-#: Merge.rc:1799 Merge.rc:1995 Merge.rc:2014 Merge.rc:2042 Merge.rc:2585
+#: Merge.rc:1809 Merge.rc:2005 Merge.rc:2024 Merge.rc:2052 Merge.rc:2595
msgid "Match &case"
msgstr "大文字と小文字を区別する(&C)"
#. IDR_POPUP_RENAMEMOVE_MENU
-#: Merge.rc:1801
+#: Merge.rc:1811
msgid "Text &Normalization"
msgstr "テキストの正規化(&N)"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_TOLOWER
-#: Merge.rc:1803
+#: Merge.rc:1813
msgid "&Lowercase"
msgstr "小文字に変換(&N)"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_TOUPPER
-#: Merge.rc:1804
+#: Merge.rc:1814
msgid "&Uppercase"
msgstr "大文字に変換(&U)"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_TOHALFWIDTH
-#: Merge.rc:1805
+#: Merge.rc:1815
msgid "&Half-width"
msgstr "半角に変換(&H)"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_TOFULLWIDTH
-#: Merge.rc:1806
+#: Merge.rc:1816
msgid "&Full-width"
msgstr "全角に変換(&F)"
#. IDR_POPUP_RENAMEMOVE_MENU
-#: Merge.rc:1807
+#: Merge.rc:1817
msgid "&Chinese Conversion"
msgstr "中国語変換(&C)"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_TOSIMPLIFIEDCHINESE
-#: Merge.rc:1809
+#: Merge.rc:1819
msgid "&Simplified Chinese"
msgstr "繁体字中国語を簡体字中国語に変換(&S)"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_TOTRADITIONALCHINESE
-#: Merge.rc:1810
+#: Merge.rc:1820
msgid "&Traditional Chinese"
msgstr "簡体字中国語を繁体字中国語に変換(&T)"
#. IDR_POPUP_RENAMEMOVE_MENU
-#: Merge.rc:1812
+#: Merge.rc:1822
msgid "&Japanese Conversion"
msgstr "日本語変換(&J)"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_TOHIRAGANA
-#: Merge.rc:1814
+#: Merge.rc:1824
msgid "&Hiragana"
msgstr "カタカナをひらがなに変換(&H)"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_TOKATAKANA
-#: Merge.rc:1815
+#: Merge.rc:1825
msgid "&Katakana"
msgstr "ひらがなをカタカナに変換(&K)"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_NORMALIZEUNICODE
-#: Merge.rc:1817
+#: Merge.rc:1827
msgid "Normalize &Unicode"
msgstr "Unicode正規化(&U)"
#. IDD_ABOUTBOX
-#: Merge.rc:1932
+#: Merge.rc:1942
msgid "About WinMerge"
msgstr "WinMerge について"
#. IDD_ABOUTBOX, IDC_WWW
-#: Merge.rc:1936
+#: Merge.rc:1946
msgid "Visit the WinMerge Homepage!"
msgstr "WinMerge のホームページに行く!"
#. IDD_PLUGINS_EDITPLUGIN, IDOK
-#: Merge.rc:1938 Merge.rc:2080 Merge.rc:2431 Merge.rc:2455 Merge.rc:2469
-#: Merge.rc:2497 Merge.rc:2588 Merge.rc:2613 Merge.rc:2674 Merge.rc:2691
-#: Merge.rc:2703 Merge.rc:2867 Merge.rc:2927 Merge.rc:3062 Merge.rc:3104
-#: Merge.rc:3147 Merge.rc:3197
+#: Merge.rc:1948 Merge.rc:2090 Merge.rc:2441 Merge.rc:2465 Merge.rc:2479
+#: Merge.rc:2507 Merge.rc:2598 Merge.rc:2623 Merge.rc:2684 Merge.rc:2701
+#: Merge.rc:2713 Merge.rc:2877 Merge.rc:2937 Merge.rc:3072 Merge.rc:3114
+#: Merge.rc:3157 Merge.rc:3207
msgid "OK"
msgstr "OK"
#. IDD_ABOUTBOX, IDC_OPEN_CONTRIBUTORS
-#: Merge.rc:1939
+#: Merge.rc:1949
msgid "Contributors"
msgstr "貢献者"
#. IDD_SELECT_FILES_OR_FOLDERS
-#: Merge.rc:1945 Merge.rc:3070
+#: Merge.rc:1955 Merge.rc:3080
msgid "Select Files or Folders"
msgstr "ファイルまたはフォルダーの選択"
#. IDD_OPEN, IDC_FILES_DIRS_GROUP0
-#: Merge.rc:1949
+#: Merge.rc:1959
msgid "&1st File or Folder"
msgstr "&1 番目のファイルまたはフォルダー"
#. IDD_OPEN, IDC_PATH0_READONLY
-#: Merge.rc:1951
+#: Merge.rc:1961
msgid "Re&ad-only"
msgstr "読み取り専用(&A)"
#. IDD_OPEN, IDC_SWAP01_STATIC
-#: Merge.rc:1953
+#: Merge.rc:1963
msgid "Swap 1st | 2nd"
msgstr "1 番目と 2 番目を交換"
#. IDD_GENERATE_PATCH, IDC_DIFF_BROWSE_FILE1
-#: Merge.rc:1954 Merge.rc:2310 Merge.rc:2413
+#: Merge.rc:1964 Merge.rc:2320 Merge.rc:2423
msgid "&Browse..."
msgstr "参照(&B)..."
#. IDD_OPEN, IDC_FILES_DIRS_GROUP1
-#: Merge.rc:1955
+#: Merge.rc:1965
msgid "&2nd File or Folder"
msgstr "&2 番目のファイルまたはフォルダー"
#. IDD_OPEN, IDC_PATH1_READONLY
-#: Merge.rc:1957
+#: Merge.rc:1967
msgid "Rea&d-only"
msgstr "読み取り専用(&D)"
#. IDD_OPEN, IDC_SWAP12_STATIC
-#: Merge.rc:1959
+#: Merge.rc:1969
msgid "Swap 2nd | 3rd"
msgstr "2 番目と 3 番目を交換"
#. IDD_PROPPAGE_SYSTEM, IDC_FILTER_USER_BROWSE
-#: Merge.rc:1960 Merge.rc:2315
+#: Merge.rc:1970 Merge.rc:2325
msgid "B&rowse..."
msgstr "参照(&R)..."
#. IDD_OPEN, IDC_FILES_DIRS_GROUP2
-#: Merge.rc:1961
+#: Merge.rc:1971
msgid "&3rd File or Folder (Optional)"
msgstr "&3 番目のファイルまたはフォルダー (オプション)"
#. IDD_OPEN, IDC_PATH2_READONLY
-#: Merge.rc:1963
+#: Merge.rc:1973
msgid "Read-o&nly"
msgstr "読み取り専用(&N)"
#. IDD_OPEN, IDC_SWAP02_STATIC
-#: Merge.rc:1965
+#: Merge.rc:1975
msgid "Swap 1st | 3rd"
msgstr "1 番目と 3 番目を交換"
#. IDD_PROPPAGE_BACKUPS, IDC_BACKUP_BROWSE
-#: Merge.rc:1966 Merge.rc:2685 Merge.rc:2883
+#: Merge.rc:1976 Merge.rc:2695 Merge.rc:2893
msgid "Browse..."
msgstr "参照..."
#. IDD_OPEN, IDC_FILES_DIRS_GROUP3
-#: Merge.rc:1968
+#: Merge.rc:1978
msgid " Folder: Filter"
msgstr " フォルダー: フィルター"
#. IDD_OPEN, IDC_RECURS_CHECK
-#: Merge.rc:1971
+#: Merge.rc:1981
msgid "&Include subfolders"
msgstr "サブフォルダーを含める(&I)"
#. IDD_OPEN, IDC_FILES_DIRS_GROUP5
-#: Merge.rc:1972
+#: Merge.rc:1982
msgid " File: Prediffer Plugin"
msgstr " ファイル: 比較前処理プラグイン"
#. IDD_OPEN, IDC_FILES_DIRS_GROUP4
-#: Merge.rc:1976
+#: Merge.rc:1986
msgid " File: Unpacker Plugin"
msgstr " ファイル: 展開プラグイン"
#. IDD_OPEN, IDC_SELECT_UNPACKER
-#: Merge.rc:1978
+#: Merge.rc:1988
msgid "Se&lect..."
msgstr "選択(&L)..."
#. IDD_PLUGINS_EDITPLUGIN, IDCANCEL
-#: Merge.rc:1981 Merge.rc:2001 Merge.rc:2025 Merge.rc:2046 Merge.rc:2081
-#: Merge.rc:2432 Merge.rc:2456 Merge.rc:2470 Merge.rc:2498 Merge.rc:2551
-#: Merge.rc:2589 Merge.rc:2614 Merge.rc:2675 Merge.rc:2692 Merge.rc:2704
-#: Merge.rc:2868 Merge.rc:2928 Merge.rc:3087 Merge.rc:3105 Merge.rc:3148
-#: Merge.rc:3198
+#: Merge.rc:1991 Merge.rc:2011 Merge.rc:2035 Merge.rc:2056 Merge.rc:2091
+#: Merge.rc:2442 Merge.rc:2466 Merge.rc:2480 Merge.rc:2508 Merge.rc:2561
+#: Merge.rc:2599 Merge.rc:2624 Merge.rc:2685 Merge.rc:2702 Merge.rc:2714
+#: Merge.rc:2878 Merge.rc:2938 Merge.rc:3097 Merge.rc:3115 Merge.rc:3158
+#: Merge.rc:3208
msgid "Cancel"
msgstr "キャンセル"
#. IDD_OPEN, IDC_OPEN_STATUS
-#: Merge.rc:1982
+#: Merge.rc:1992
msgid "Status:"
msgstr "ステータス:"
#. IDD_PLUGINS_LIST, ID_HELP
-#: Merge.rc:1983 Merge.rc:2082 Merge.rc:2929
+#: Merge.rc:1993 Merge.rc:2092 Merge.rc:2939
msgid "Help"
msgstr "ヘルプ"
#. IDD_OPEN, IDC_OPTIONS
-#: Merge.rc:1984
+#: Merge.rc:1994
msgid "&Options..."
msgstr "設定(&O)..."
#. IDD_EDIT_FIND
-#: Merge.rc:1989
+#: Merge.rc:1999
msgid "Find"
msgstr "検索"
#. IDD_EDIT_MARKER, IDC_STATIC
-#: Merge.rc:1992 Merge.rc:2009 Merge.rc:2037
+#: Merge.rc:2002 Merge.rc:2019 Merge.rc:2047
msgid "Fi&nd what:"
msgstr "検索する文字列(&N):"
#. IDD_EDIT_MARKER, IDC_EDIT_WHOLE_WORD
-#: Merge.rc:1994 Merge.rc:2013 Merge.rc:2041
+#: Merge.rc:2004 Merge.rc:2023 Merge.rc:2051
msgid "Match &whole word only"
msgstr "単語単位で探す(&W)"
#. IDD_EDIT_MARKER, IDC_EDIT_REGEXP
-#: Merge.rc:1996 Merge.rc:2015 Merge.rc:2043
+#: Merge.rc:2006 Merge.rc:2025 Merge.rc:2053
msgid "Regular &expression"
msgstr "正規表現(&E)"
#. IDD_EDIT_FIND, IDC_FINDDLG_DONTWRAP
-#: Merge.rc:1997
+#: Merge.rc:2007
msgid "D&on't wrap end of file"
msgstr "最後まで検索した後ループしない(&O)"
#. IDD_EDIT_FIND, IDC_FINDDLG_DONTCLOSE
-#: Merge.rc:1998
+#: Merge.rc:2008
msgid "&Don't close this dialog"
msgstr "このダイアログ ボックスを閉じない(&D)"
#. IDD_EDIT_REPLACE, IDC_EDIT_SKIP
-#: Merge.rc:1999 Merge.rc:2021
+#: Merge.rc:2009 Merge.rc:2031
msgid "&Find Next"
msgstr "次を検索(&F)"
#. IDD_EDIT_FIND, IDC_EDIT_FINDPREV
-#: Merge.rc:2000
+#: Merge.rc:2010
msgid "Find &Prev"
msgstr "前を検索(&P)"
#. IDD_EDIT_REPLACE
-#: Merge.rc:2006
+#: Merge.rc:2016
msgid "Replace"
msgstr "置換"
#. IDD_EDIT_REPLACE, IDC_STATIC
-#: Merge.rc:2011
+#: Merge.rc:2021
msgid "Re&place with:"
msgstr "置換後の文字列(&P):"
#. IDD_EDIT_REPLACE, IDC_EDIT_SCOPE_DONT_WRAP
-#: Merge.rc:2016
+#: Merge.rc:2026
msgid "&Don't wrap at end of file"
msgstr "ファイルの終端で折り返さない(&D)"
#. IDD_EDIT_REPLACE, IDC_STATIC
-#: Merge.rc:2018
+#: Merge.rc:2028
msgid "Replace in"
msgstr "範囲"
#. IDD_EDIT_REPLACE, IDC_EDIT_SCOPE_WHOLE_FILE
-#: Merge.rc:2020
+#: Merge.rc:2030
msgid "Wh&ole file"
msgstr "ファイル全体(&O)"
#. IDD_EDIT_REPLACE, IDC_EDIT_FINDPREV
-#: Merge.rc:2022
+#: Merge.rc:2032
msgid "Find Pre&v"
msgstr "前を検索(&V)"
#. IDD_EDIT_REPLACE, IDC_EDIT_REPLACE
-#: Merge.rc:2023
+#: Merge.rc:2033
msgid "&Replace"
msgstr "置換して次に(&R)"
#. IDD_EDIT_REPLACE, IDC_EDIT_REPLACE_ALL
-#: Merge.rc:2024
+#: Merge.rc:2034
msgid "Replace &All"
msgstr "すべて置換(&A)"
#. IDS_OPTIONSPG_MARKERCOLORS
-#: Merge.rc:2030 Merge.rc:4209
+#: Merge.rc:2040 Merge.rc:4219
msgid "Markers"
msgstr "マーカー"
#. IDD_EDIT_MARKER, IDC_EDIT_MARKERS_ENABLED
-#: Merge.rc:2033
+#: Merge.rc:2043
msgid "Enable &markers"
msgstr "マーカーを有効にする(&M)"
#. IDD_FILTERS_LINEFILTERS, IDC_LFILTER_ADDBTN
-#: Merge.rc:2035 Merge.rc:2057
+#: Merge.rc:2045 Merge.rc:2067
msgid "New"
msgstr "新規"
#. IDD_EDIT_MARKER, IDC_STATIC
-#: Merge.rc:2039
+#: Merge.rc:2049
msgid "&Background color:"
msgstr "背景色(&B)"
#. IDS_MESSAGEBOX_OK
-#: Merge.rc:2044 Merge.rc:2829 Merge.rc:3086 Merge.rc:4171
+#: Merge.rc:2054 Merge.rc:2839 Merge.rc:3096 Merge.rc:4181
msgid "&Ok"
msgstr "&OK"
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:2045 Merge.rc:2525 Merge.rc:3199
+#: Merge.rc:2055 Merge.rc:2535 Merge.rc:3209
msgid "&Apply"
msgstr "適用(&A)"
#. IDD_FILTERS_LINEFILTERS
-#: Merge.rc:2051
+#: Merge.rc:2061
msgid "Line Filters"
msgstr "行フィルター"
#. IDD_FILTERS_LINEFILTERS, IDC_IGNOREREGEXP
-#: Merge.rc:2054
+#: Merge.rc:2064
msgid "Enable Line Filters"
msgstr "行フィルターを有効にする"
#. IDD_FILTERS_LINEFILTERS, IDC_STATIC
-#: Merge.rc:2055
+#: Merge.rc:2065
msgid "Regular Expressions (one per line):"
msgstr "正規表現: (1 行につき 1 ルール)"
#. IDD_PLUGINS_LIST, IDC_PLUGIN_EDIT
-#: Merge.rc:2058 Merge.rc:2924
+#: Merge.rc:2068 Merge.rc:2934
msgid "Edit"
msgstr "編集"
#. IDD_PLUGINS_LIST, IDC_PLUGIN_REMOVE
-#: Merge.rc:2059 Merge.rc:2071 Merge.rc:2925
+#: Merge.rc:2069 Merge.rc:2081 Merge.rc:2935
msgid "Remove"
msgstr "削除"
#. IDD_FILTERS_SUBSTITUTIONFILTERS
-#: Merge.rc:2064
+#: Merge.rc:2074
msgid "Substitution Filters"
msgstr "置換フィルター"
#. IDD_FILTERS_SUBSTITUTIONFILTERS, IDC_STATIC
-#: Merge.rc:2067
+#: Merge.rc:2077
msgid "Changes to the listed pairs below will be ignored or marked as insignificant. Patches are unaffected."
msgstr "以下の置換リストで両ファイルの差異ブロックの内容を置換します。置換した結果、内容が一致した場合、そのブロックの元々の差異は無視されます。生成するパッチには影響しません。"
#. IDD_FILTERS_SUBSTITUTIONFILTERS, IDC_IGNORED_SUSBSTITUTIONS_ENABLED
-#: Merge.rc:2068
+#: Merge.rc:2078
msgid "Enable"
msgstr "有効にする"
#. IDD_PLUGINS_LIST, IDC_PLUGIN_ADD
-#: Merge.rc:2070 Merge.rc:2923
+#: Merge.rc:2080 Merge.rc:2933
msgid "Add"
msgstr "追加"
#. IDD_FILTERS_SUBSTITUTIONFILTERS, IDC_LFILTER_CLEARBTN
-#: Merge.rc:2072
+#: Merge.rc:2082
msgid "Clear"
msgstr "クリア"
#. IDD_PREFERENCES
-#: Merge.rc:2077
+#: Merge.rc:2087
msgid "Options"
msgstr "オプション"
#. IDD_PREFERENCES, IDC_TREEOPT_IMPORT
-#: Merge.rc:2086
+#: Merge.rc:2096
msgid "Import..."
msgstr "インポート..."
#. IDD_PREFERENCES, IDC_TREEOPT_EXPORT
-#: Merge.rc:2087
+#: Merge.rc:2097
msgid "Export..."
msgstr "エクスポート..."
#. IDS_OPTIONSPG_GENCOMPARE
-#: Merge.rc:2092 Merge.rc:4199 Merge.rc:4202 Merge.rc:4219
+#: Merge.rc:2102 Merge.rc:4209 Merge.rc:4212 Merge.rc:4229
msgid "General"
msgstr "一般"
#. IDD_PROPPAGE_GENERAL, IDC_SCROLL_CHECK
-#: Merge.rc:2095
+#: Merge.rc:2105
msgid "Automatically &scroll to first difference"
msgstr "自動的に最初の差異にスクロールする(&S)"
#. IDD_PROPPAGE_GENERAL, IDC_SCROLL_TO_FIRST_INLINE_DIFF_CHECK
-#: Merge.rc:2097
+#: Merge.rc:2107
msgid "Automatically s&croll to first inline difference"
msgstr "自動的に最初の行内差異にスクロールする(&C)"
#. IDD_PROPPAGE_GENERAL, IDC_STATIC
-#: Merge.rc:2099
+#: Merge.rc:2109
msgid "Cl&ose windows with 'Esc':"
msgstr "'Esc' キーでウィンドウを閉じる(&O):"
#. IDD_PROPPAGE_GENERAL, IDC_VERIFY_OPEN_PATHS
-#: Merge.rc:2101
+#: Merge.rc:2111
msgid "&Automatically verify paths in Open dialog"
msgstr "[開く] ダイアログで自動的にパスを検査する(&A)"
#. IDD_PROPPAGE_GENERAL, IDC_STATIC
-#: Merge.rc:2103
+#: Merge.rc:2113
msgid "Single instance mode:"
msgstr "単一インスタンスモード:"
#. IDD_PROPPAGE_GENERAL, IDC_ASK_MULTIWINDOW_CLOSE
-#: Merge.rc:2105
+#: Merge.rc:2115
msgid "As&k when closing multiple windows"
msgstr "複数のウィンドウを閉じるときに尋ねる(&K)"
#. IDD_PROPPAGE_GENERAL, IDC_PRESERVE_FILETIME
-#: Merge.rc:2107
+#: Merge.rc:2117
msgid "&Preserve file time in file compare"
msgstr "ファイル比較時のファイル時刻を保つ(&P)"
#. IDD_PROPPAGE_GENERAL, IDC_STARTUP_FOLDER_SELECT
-#: Merge.rc:2109
+#: Merge.rc:2119
msgid "Show \"Select Files or Folders\" dialog on startup"
msgstr "起動時に [ファイルまたはフォルダーの選択] ダイアログを表示する"
#. IDD_PROPPAGE_GENERAL, IDC_CLOSE_WITH_OK
-#: Merge.rc:2111
+#: Merge.rc:2121
msgid "Close \"Select Files or Folders\" dialog on clicking Compare button"
msgstr "[比較] 押下時に [ファイルまたはフォルダーの選択] ダイアログを閉じる"
#. IDD_PROPPAGE_GENERAL, IDC_STATIC
-#: Merge.rc:2113
+#: Merge.rc:2123
msgid "Op&en dialog Auto completion:"
msgstr "[開く] ダイアログのオートコンプリート(&E):"
#. IDD_PROPPAGE_GENERAL, IDC_STATIC
-#: Merge.rc:2115
+#: Merge.rc:2125
msgid "Auto-&reload modified files:"
msgstr "変更されたファイルの自動再読み込み(&R):"
#. IDD_PROPPAGE_GENERAL, IDC_STATIC
-#: Merge.rc:2117
+#: Merge.rc:2127
msgid "Language:"
msgstr "言語:"
#. IDD_PROPPAGE_COMPARE_WEBPAGE, IDC_COMPARE_DEFAULTS
-#: Merge.rc:2119 Merge.rc:2299 Merge.rc:2321 Merge.rc:2352 Merge.rc:2369
-#: Merge.rc:2386 Merge.rc:2394 Merge.rc:2430 Merge.rc:2454 Merge.rc:2633
-#: Merge.rc:2644 Merge.rc:2653 Merge.rc:2887 Merge.rc:2922 Merge.rc:2985
-#: Merge.rc:3010 Merge.rc:3024 Merge.rc:3038 Merge.rc:3054
+#: Merge.rc:2129 Merge.rc:2309 Merge.rc:2331 Merge.rc:2362 Merge.rc:2379
+#: Merge.rc:2396 Merge.rc:2404 Merge.rc:2440 Merge.rc:2464 Merge.rc:2643
+#: Merge.rc:2654 Merge.rc:2663 Merge.rc:2897 Merge.rc:2932 Merge.rc:2995
+#: Merge.rc:3020 Merge.rc:3034 Merge.rc:3048 Merge.rc:3064
msgid "Defaults"
msgstr "デフォルト"
#. IDS_OPTIONSPG_COLORS
-#: Merge.rc:2124 Merge.rc:2140 Merge.rc:2267 Merge.rc:2292 Merge.rc:4205
+#: Merge.rc:2134 Merge.rc:2150 Merge.rc:2277 Merge.rc:2302 Merge.rc:4215
msgid "Colors"
msgstr "色"
#. IDD_PROPPAGE_COLOR_SCHEMES, IDC_STATIC
-#: Merge.rc:2127
+#: Merge.rc:2137
msgid "Color &mode:"
msgstr "色モード(&M):"
#. IDD_PROPPAGE_COLOR_SCHEMES, IDC_STATIC
-#: Merge.rc:2129
+#: Merge.rc:2139
msgid "&Light mode scheme:"
msgstr "ライトモード用配色(&L):"
#. IDD_PROPPAGE_COLOR_SCHEMES, IDC_STATIC
-#: Merge.rc:2131
+#: Merge.rc:2141
msgid "&Dark mode scheme:"
msgstr "ダークモード用配色(&D):"
#. IDD_PROPPAGE_COLOR_SCHEMES, IDC_STATIC
-#: Merge.rc:2133
+#: Merge.rc:2143
msgid "Your custom schemes"
msgstr "ユーザ定義配色"
#. IDD_PROPPAGE_COLOR_SCHEMES, IDC_COLOR_SCHEME_SAVE
-#: Merge.rc:2134
+#: Merge.rc:2144
msgid "&Save current scheme..."
msgstr "現在の配色を保存(&S)..."
#. IDD_PROPPAGE_COLOR_SCHEMES, IDC_COLOR_SCHEME_DELETE
-#: Merge.rc:2135
+#: Merge.rc:2145
msgid "Delete ¤t scheme..."
msgstr "現在の配色を削除(&C)..."
#. IDD_PROPPAGE_COLORS_DIR, IDC_BACKGROUND_COLUMN_LABEL
-#: Merge.rc:2143 Merge.rc:2238 Merge.rc:2258 Merge.rc:2272
+#: Merge.rc:2153 Merge.rc:2248 Merge.rc:2268 Merge.rc:2282
msgid "Background"
msgstr "背景"
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2144
+#: Merge.rc:2154
msgid "Deleted"
msgstr "削除"
#. IDS_OPTIONSPG_TEXTCOLORS
-#: Merge.rc:2145 Merge.rc:2207 Merge.rc:2239 Merge.rc:2273 Merge.rc:4207
+#: Merge.rc:2155 Merge.rc:2217 Merge.rc:2249 Merge.rc:2283 Merge.rc:4217
msgid "Text"
msgstr "テキスト"
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2146
+#: Merge.rc:2156
msgid "Difference:"
msgstr "差異:"
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2151
+#: Merge.rc:2161
msgid "Selected Difference:"
msgstr "選択された差異:"
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2156
+#: Merge.rc:2166
msgid "Ignored Difference:"
msgstr "無視された差異:"
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2161
+#: Merge.rc:2171
msgid "Moved:"
msgstr "移動ブロック:"
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2166
+#: Merge.rc:2176
msgid "Selected Moved:"
msgstr "選択された移動ブロック:"
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2171
+#: Merge.rc:2181
msgid "Same As Next (3 panes):"
msgstr ""
"差異:\n"
"(ただし隣接ペインと同じ)"
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2176
+#: Merge.rc:2186
msgid "Same As Next (Selected):"
msgstr ""
"選択された差異:\n"
"(ただし隣接ペインと同じ)"
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2181
+#: Merge.rc:2191
msgid "Word Difference:"
msgstr "単語の差異:"
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2186
+#: Merge.rc:2196
msgid "Selected Word Diff:"
msgstr "選択された単語の差異:"
#. IDD_INPUTBOX
-#: Merge.rc:2195 Merge.rc:2230 Merge.rc:2251 Merge.rc:3099
+#: Merge.rc:2205 Merge.rc:2240 Merge.rc:2261 Merge.rc:3109
msgid "Dialog"
msgstr "ダイアログ"
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC
-#: Merge.rc:2198
+#: Merge.rc:2208
msgid "Keywords:"
msgstr "キーワード:"
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC
-#: Merge.rc:2199
+#: Merge.rc:2209
msgid "Function names:"
msgstr "関数名:"
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC
-#: Merge.rc:2200
+#: Merge.rc:2210
msgid "Comments:"
msgstr "コメント:"
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC
-#: Merge.rc:2201
+#: Merge.rc:2211
msgid "Numbers:"
msgstr "数値:"
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC
-#: Merge.rc:2202
+#: Merge.rc:2212
msgid "Operators:"
msgstr "オペレーター:"
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC
-#: Merge.rc:2203
+#: Merge.rc:2213
msgid "Strings:"
msgstr "文字列:"
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC
-#: Merge.rc:2204
+#: Merge.rc:2214
msgid "Preprocessor:"
msgstr "プリプロセッサ:"
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC
-#: Merge.rc:2205
+#: Merge.rc:2215
msgid "User 1:"
msgstr "ユーザー 1:"
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC
-#: Merge.rc:2206
+#: Merge.rc:2216
msgid "User 2:"
msgstr "ユーザー 2:"
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_SCOLOR_USER2_BOLD
-#: Merge.rc:2209 Merge.rc:2211 Merge.rc:2213 Merge.rc:2215 Merge.rc:2217
-#: Merge.rc:2219 Merge.rc:2221 Merge.rc:2223 Merge.rc:2225
+#: Merge.rc:2219 Merge.rc:2221 Merge.rc:2223 Merge.rc:2225 Merge.rc:2227
+#: Merge.rc:2229 Merge.rc:2231 Merge.rc:2233 Merge.rc:2235
msgid "Bold"
msgstr "太字"
#. IDD_PROPPAGE_COLORS_TEXT, IDC_DEFAULT_STANDARD_COLORS
-#: Merge.rc:2233
+#: Merge.rc:2243
msgid "&Use customized text colors"
msgstr "テキストの色をカスタマイズする(&U)"
#. IDD_PROPPAGE_COLORS_TEXT, IDC_WHITESPACE_COLOR_LABEL
-#: Merge.rc:2235
+#: Merge.rc:2245
msgid "Whitespace:"
msgstr "空白:"
#. IDD_PROPPAGE_COLORS_TEXT, IDC_TEXT_COLOR_LABEL
-#: Merge.rc:2236
+#: Merge.rc:2246
msgid "Regular text:"
msgstr "標準テキスト:"
#. IDD_PROPPAGE_COLORS_TEXT, IDC_SELECTION_COLOR_LABEL
-#: Merge.rc:2237
+#: Merge.rc:2247
msgid "Selection:"
msgstr "選択:"
#. IDD_PROPPAGE_COLORS_DIR, IDC_STATIC
-#: Merge.rc:2245 Merge.rc:2286
+#: Merge.rc:2255 Merge.rc:2296
msgid "Margin:"
msgstr "マージン:"
#. IDD_PROPPAGE_COLORS_MARKER, IDC_MARKER0_COLOR_LABEL
-#: Merge.rc:2254
+#: Merge.rc:2264
msgid "Search Marker:"
msgstr "検索マーカー:"
#. IDD_PROPPAGE_COLORS_MARKER, IDC_MARKER1_COLOR_LABEL
-#: Merge.rc:2255
+#: Merge.rc:2265
msgid "User Defined Marker 1:"
msgstr "ユーザー定義マーカー 1:"
#. IDD_PROPPAGE_COLORS_MARKER, IDC_MARKER2_COLOR_LABEL
-#: Merge.rc:2256
+#: Merge.rc:2266
msgid "User Defined Marker 2:"
msgstr "ユーザー定義マーカー 2:"
#. IDD_PROPPAGE_COLORS_MARKER, IDC_MARKER3_COLOR_LABEL
-#: Merge.rc:2257
+#: Merge.rc:2267
msgid "User Defined Marker 3:"
msgstr "ユーザー定義マーカー 3:"
#. IDD_PROPPAGE_COLORS_DIR, IDC_USE_DIR_COMPARE_COLORS
-#: Merge.rc:2270
+#: Merge.rc:2280
msgid "&Use folder compare colors"
msgstr "フォルダー比較用の色を使用する(&U)"
#. IDD_PROPPAGE_COLORS_DIR, IDC_STATIC
-#: Merge.rc:2274
+#: Merge.rc:2284
msgid "Items equal:"
msgstr "同一項目:"
#. IDD_PROPPAGE_COLORS_DIR, IDC_STATIC
-#: Merge.rc:2277
+#: Merge.rc:2287
msgid "Items different:"
msgstr "差異項目:"
#. IDD_PROPPAGE_COLORS_DIR, IDC_STATIC
-#: Merge.rc:2280
+#: Merge.rc:2290
msgid "Items missing:"
msgstr "すべて存在しない項目:"
#. IDD_PROPPAGE_COLORS_DIR, IDC_STATIC
-#: Merge.rc:2283
+#: Merge.rc:2293
msgid "Items filtered:"
msgstr "無視された項目:"
#. IDD_PROPPAGE_COLORS_SYSTEM, IDC_SYSCOLOR_HOOK_ENABLED
-#: Merge.rc:2295
+#: Merge.rc:2305
msgid "&Use custom system colors"
msgstr "カスタムシステムカラーを使用する(一部のUI要素には適用されません)"
#. IDS_PRPCAT_SYSTEM
-#: Merge.rc:2304 Merge.rc:4211 Merge.rc:4212 Merge.rc:4657
+#: Merge.rc:2314 Merge.rc:4221 Merge.rc:4222 Merge.rc:4667
msgid "System"
msgstr "システム"
#. IDD_PROPPAGE_SYSTEM, IDC_USE_RECYCLE_BIN
-#: Merge.rc:2307
+#: Merge.rc:2317
msgid "&Use Recycle Bin"
msgstr "削除されたファイルをごみ箱に移動する(&S)"
#. IDD_PROPPAGE_SYSTEM, IDC_STATIC
-#: Merge.rc:2308
+#: Merge.rc:2318
msgid "&External editor:"
msgstr "外部エディター(&E): (使用可能な置換文字列: $file, $linenum)"
#. IDD_PROPPAGE_SYSTEM, IDC_STATIC
-#: Merge.rc:2311
+#: Merge.rc:2321
msgid "&Store user data in:"
msgstr "ユーザーデータの保存先(&S):"
#. IDD_PROPPAGE_SYSTEM, IDC_STATIC
-#: Merge.rc:2313
+#: Merge.rc:2323
msgid "&Filter folder:"
msgstr "フィルター用フォルダー(&F):"
#. IDD_PROPPAGE_SYSTEM, IDC_STATIC
-#: Merge.rc:2316
+#: Merge.rc:2326
msgid "Temporary files folder"
msgstr "テンポラリ ファイル用フォルダー"
#. IDD_PROPPAGE_SYSTEM, IDC_TMPFOLDER_SYSTEM
-#: Merge.rc:2317
+#: Merge.rc:2327
msgid "S&ystem temp folder"
msgstr "システムのテンポラリ フォルダー(&Y)"
#. IDD_PROPPAGE_SYSTEM, IDC_STATIC
-#: Merge.rc:2318
+#: Merge.rc:2328
msgid "C&ustom folder:"
msgstr "指定したフォルダー(&U):"
#. IDD_GENERATE_PATCH, IDC_DIFF_BROWSE_FILE2
-#: Merge.rc:2320 Merge.rc:2416
+#: Merge.rc:2330 Merge.rc:2426
msgid "Br&owse..."
msgstr "参照(&O)..."
#. IDS_OPTIONSPG_COMPARE
-#: Merge.rc:2326 Merge.rc:4200
+#: Merge.rc:2336 Merge.rc:4210
msgid "Compare"
msgstr "比較"
#. IDD_PROPPAGE_COMPARE, IDC_STATIC
-#: Merge.rc:2329
+#: Merge.rc:2339
msgid "Whitespaces"
msgstr "空白"
#. IDD_PROPPAGE_COMPARE, IDC_WHITESPACE
-#: Merge.rc:2330
+#: Merge.rc:2340
msgid "&Compare"
msgstr "比較する(&C)"
#. IDD_PROPPAGE_COMPARE, IDC_WHITE_CHANGE
-#: Merge.rc:2331
+#: Merge.rc:2341
msgid "&Ignore change"
msgstr "変更を無視(&I)"
#. IDD_PROPPAGE_COMPARE, IDC_ALL_WHITE
-#: Merge.rc:2332
+#: Merge.rc:2342
msgid "I&gnore all"
msgstr "すべて無視(&G)"
#. IDD_PROPPAGE_COMPARE, IDC_IGNBLANKS_CHECK
-#: Merge.rc:2333
+#: Merge.rc:2343
msgid "Ignore blan&k lines"
msgstr "空行を無視する(&K)"
#. IDD_PROPPAGE_COMPARE, IDC_IGNCASE_CHECK
-#: Merge.rc:2334
+#: Merge.rc:2344
msgid "Ignore &case"
msgstr "大文字と小文字を区別しない(&C)"
#. IDD_PROPPAGE_COMPARE, IDC_EOL_SENSITIVE
-#: Merge.rc:2335
+#: Merge.rc:2345
msgid "Igno&re EOL differences (Windows/Unix/Mac)"
msgstr "改行文字の違いを無視する(&R) (Windows/Unix/Mac)"
#. IDD_PROPPAGE_COMPARE, IDC_IGNORE_NUMBERS
-#: Merge.rc:2337
+#: Merge.rc:2347
msgid "Ignore num&bers"
msgstr "数字を無視する(&B)"
#. IDD_PROPPAGE_COMPARE, IDC_CP_SENSITIVE
-#: Merge.rc:2338
+#: Merge.rc:2348
msgid "Ignore codepage &differences"
msgstr "コードページの違いを無視する(&D)"
#. IDD_PROPPAGE_COMPARE, IDC_FILTERCOMMENTS_CHECK
-#: Merge.rc:2339
+#: Merge.rc:2349
msgid "Ignore c&omment differences"
msgstr "コメントの違いを無視する(&O)"
#. IDD_PROPPAGE_COMPARE, IDC_IGNEOFEOL_CHECK
-#: Merge.rc:2341
+#: Merge.rc:2351
msgid "Ignore &missing trailing EOL"
msgstr "ファイル末尾の改行文字の有無を無視する(&E)"
#. IDD_PROPPAGE_COMPARE, IDC_IGNLBRKS_CHECK
-#: Merge.rc:2343
+#: Merge.rc:2353
msgid "Ignore line &breaks (treat as spaces)"
msgstr "改行を無視(空白として扱う)(&B)"
#. IDD_PROPPAGE_COMPARE, IDC_MOVED_BLOCKS
-#: Merge.rc:2345
+#: Merge.rc:2355
msgid "E&nable moved block detection"
msgstr "移動ブロック検出を有効にする(&N)"
#. IDD_PROPPAGE_COMPARE, IDC_ALIGN_SIMILAR_LINES
-#: Merge.rc:2346
+#: Merge.rc:2356
msgid "Align &similar lines"
msgstr "類似行をマッチさせる(&S)"
#. IDD_PROPPAGE_COMPARE, IDC_STATIC
-#: Merge.rc:2347
+#: Merge.rc:2357
msgid "Diff &algorithm:"
msgstr "Diff アルゴリズム(&A):"
#. IDD_PROPPAGE_COMPARE, IDC_INDENT_HEURISTIC
-#: Merge.rc:2349
+#: Merge.rc:2359
msgid "Enable indent &heuristic"
msgstr "Indent heuristic を有効にする(&H)"
#. IDD_PROPPAGE_COMPARE, IDC_COMPLETELY_BLANK_OUT_IGNORED_DIFFERENCES
-#: Merge.rc:2350
+#: Merge.rc:2360
msgid "Completely unhighlight the ignored differences"
msgstr "無視された差異の行を同一行の色と同じにする"
#. IDS_OPTIONSPG_EDITOR
-#: Merge.rc:2357 Merge.rc:4201
+#: Merge.rc:2367 Merge.rc:4211
msgid "Editor"
msgstr "エディター"
#. IDD_PROPPAGE_EDITOR, IDC_HILITE_CHECK
-#: Merge.rc:2360
+#: Merge.rc:2370
msgid "&Highlight syntax"
msgstr "シンタックス ハイライトを有効にする(&H)"
#. IDD_PROPPAGE_EDITOR, IDC_MIXED_EOL
-#: Merge.rc:2361
+#: Merge.rc:2371
msgid "&Preserve original EOL"
msgstr "元の EOL 文字を保存する(&P)"
#. IDD_PROPPAGE_EDITOR, IDC_STATIC
-#: Merge.rc:2362
+#: Merge.rc:2372
msgid "Tabs"
msgstr "タブ"
#. IDD_PROPPAGE_EDITOR, IDC_STATIC
-#: Merge.rc:2363
+#: Merge.rc:2373
msgid "&Tab size:"
msgstr "タブ幅(&T):"
#. IDD_PROPPAGE_EDITOR, IDC_PROP_INSERT_TABS
-#: Merge.rc:2365
+#: Merge.rc:2375
msgid "&Insert tabs"
msgstr "タブを挿入(&I)"
#. IDD_PROPPAGE_EDITOR, IDC_PROP_INSERT_SPACES
-#: Merge.rc:2366
+#: Merge.rc:2376
msgid "Insert &spaces"
msgstr "スペースを挿入(&S)"
#. IDD_PROPPAGE_EDITOR, IDC_STATIC
-#: Merge.rc:2367
+#: Merge.rc:2377
msgid "&Rendering mode:"
msgstr "レンダリングモード(&R):"
#. IDD_PROPPAGE_EDITOR_COMPAREMERGE, IDC_AUTOMRESCAN_CHECK
-#: Merge.rc:2376
+#: Merge.rc:2386
msgid "&Automatic rescan"
msgstr "自動的に再スキャンする(&A)"
#. IDD_PROPPAGE_EDITOR_COMPAREMERGE, IDC_STATIC
-#: Merge.rc:2377
+#: Merge.rc:2387
msgid "Copy &granularity for selected differences:"
msgstr "選択された差異のコピー粒度(&G)"
#. IDD_PROPPAGE_EDITOR_COMPAREMERGE, IDC_LINE_COLORING_GROUP
-#: Merge.rc:2379
+#: Merge.rc:2389
msgid "Line Difference Coloring"
msgstr "行内差異の色付け"
#. IDD_PROPPAGE_EDITOR_COMPAREMERGE, IDC_VIEW_LINE_DIFFERENCES
-#: Merge.rc:2380
+#: Merge.rc:2390
msgid "View line differences"
msgstr "行内差異を表示する"
#. IDD_PROPPAGE_EDITOR_COMPAREMERGE, IDC_EDITOR_CHARLEVEL
-#: Merge.rc:2381
+#: Merge.rc:2391
msgid "&Character-level"
msgstr "文字単位(&C)"
#. IDD_PROPPAGE_EDITOR_COMPAREMERGE, IDC_EDITOR_WORDLEVEL
-#: Merge.rc:2382
+#: Merge.rc:2392
msgid "&Word-level:"
msgstr "単語単位(&W):"
#. IDD_PROPPAGE_EDITOR_COMPAREMERGE, IDC_STATIC
-#: Merge.rc:2384
+#: Merge.rc:2394
msgid "W&ord break characters:"
msgstr "単語区切り文字(&O)"
#. IDD_PROPPAGE_MESSAGEBOXES, IDC_STATIC
-#: Merge.rc:2401
+#: Merge.rc:2411
msgid "Some messages can be hidden by the user. Press Reset to make all messages visible again."
msgstr "WinMerge は、いくつかの共通メッセージボックスを非表示にできます。すべてのメッセージボックスを再び表示させるには、[リセット] ボタンを押してください。"
#. IDD_SELECT_FILES_OR_FOLDERS, IDC_RESET
-#: Merge.rc:2402 Merge.rc:3085
+#: Merge.rc:2412 Merge.rc:3095
msgid "Reset"
msgstr "リセット"
#. IDD_GENERATE_PATCH
-#: Merge.rc:2408
+#: Merge.rc:2418
msgid "Patch Generator"
msgstr "パッチ生成"
#. IDD_GENERATE_PATCH, IDC_STATIC
-#: Merge.rc:2411
+#: Merge.rc:2421
msgid "File&1:"
msgstr "ファイル &1:"
#. IDD_GENERATE_PATCH, IDC_STATIC
-#: Merge.rc:2414
+#: Merge.rc:2424
msgid "File&2:"
msgstr "ファイル &2:"
#. IDD_GENERATE_PATCH, IDC_DIFF_SWAPFILES
-#: Merge.rc:2417
+#: Merge.rc:2427
msgid "&Swap"
msgstr "交換(&S)"
#. IDD_DIRCMP_REPORT, IDC_REPORT_COPYCLIPBOARD
-#: Merge.rc:2418 Merge.rc:2690
+#: Merge.rc:2428 Merge.rc:2700
msgid "&Copy to clipboard"
msgstr "クリップボードにコピー(&C)"
#. IDD_GENERATE_PATCH, IDC_DIFF_APPENDFILE
-#: Merge.rc:2419
+#: Merge.rc:2429
msgid "&Append to existing file"
msgstr "既存のファイルに追加する(&A)"
#. IDD_GENERATE_PATCH, IDC_STATIC
-#: Merge.rc:2420
+#: Merge.rc:2430
msgid "&Result:"
msgstr "結果(&R):"
#. IDD_GENERATE_PATCH, IDC_DIFF_BROWSE_RESULT
-#: Merge.rc:2422
+#: Merge.rc:2432
msgid "Bro&wse..."
msgstr "参照(&W)..."
#. IDD_GENERATE_PATCH, IDC_STATIC
-#: Merge.rc:2423
+#: Merge.rc:2433
msgid "&Format"
msgstr "出力形式(&F)"
#. IDD_GENERATE_PATCH, IDC_STATIC
-#: Merge.rc:2424
+#: Merge.rc:2434
msgid "St&yle:"
msgstr "スタイル(&Y):"
#. IDD_GENERATE_PATCH, IDC_STATIC
-#: Merge.rc:2426
+#: Merge.rc:2436
msgid "&Context:"
msgstr "コンテキスト(&C):"
#. IDD_GENERATE_PATCH, IDC_DIFF_INCLCMDLINE
-#: Merge.rc:2428
+#: Merge.rc:2438
msgid "Inclu&de command line"
msgstr "コマンド行を含める(&D)"
#. IDD_GENERATE_PATCH, IDC_DIFF_OPENTOEDITOR
-#: Merge.rc:2429
+#: Merge.rc:2439
msgid "Open in e&xternal editor"
msgstr "外部エディターで開く(&X)"
#. IDD_DIRCOLS
-#: Merge.rc:2446
+#: Merge.rc:2456
msgid "Display Columns"
msgstr "列の表示"
#. IDD_DIRCOLS, IDC_UP
-#: Merge.rc:2450
+#: Merge.rc:2460
msgid "Move &Up"
msgstr "上へ(&U)"
#. IDD_DIRCOLS, IDC_DOWN
-#: Merge.rc:2451
+#: Merge.rc:2461
msgid "Move &Down"
msgstr "下へ(&D)"
#. IDD_DIRCOLS, IDC_COLDLG_ADDITIONAL_PROPERTIES
-#: Merge.rc:2453
+#: Merge.rc:2463
msgid "&Additional Properties"
msgstr "追加プロパティ(&A)"
#. IDD_DIRADDITIONALPROPS
-#: Merge.rc:2461
+#: Merge.rc:2471
msgid "Additional Properties"
msgstr "追加プロパティ"
#. IDD_PLUGINS_SELECTPLUGIN
-#: Merge.rc:2475
+#: Merge.rc:2485
msgid "Select Plugin"
msgstr "プラグインの選択"
#. IDD_PLUGINS_EDITPLUGIN, IDC_STATIC
-#: Merge.rc:2478 Merge.rc:3115
+#: Merge.rc:2488 Merge.rc:3125
msgid "Plugin &name:"
msgstr "プラグイン名(&N):"
#. IDD_PLUGINS_SELECTPLUGIN, IDC_STATIC
-#: Merge.rc:2480
+#: Merge.rc:2490
msgid "&Target files:"
msgstr "対象ファイル(&T)"
#. IDD_PLUGINS_EDITPLUGIN, IDC_STATIC
-#: Merge.rc:2482 Merge.rc:3117
+#: Merge.rc:2492 Merge.rc:3127
msgid "Extensions list:"
msgstr "拡張子一覧:"
#. IDD_PLUGINS_EDITPLUGIN, IDC_STATIC
-#: Merge.rc:2484 Merge.rc:3119
+#: Merge.rc:2494 Merge.rc:3129
msgid "Description:"
msgstr "説明:"
#. IDD_PLUGINS_EDITPLUGIN, IDC_STATIC
-#: Merge.rc:2486 Merge.rc:3121
+#: Merge.rc:2496 Merge.rc:3131
msgid "Default arguments:"
msgstr "デフォルト引数:"
#. IDD_PLUGINS_SELECTPLUGIN, IDC_PLUGIN_ALLOW_ALL
-#: Merge.rc:2488
+#: Merge.rc:2498
msgid "Display all plugins (Ignore extension)"
msgstr "拡張子を無視してすべてのプラグインを表示する"
#. IDD_PLUGINS_SELECTPLUGIN, IDC_PLUGIN_OPEN_IN_SAME_FRAME_TYPE
-#: Merge.rc:2490
+#: Merge.rc:2500
msgid "&Open files in same window type after unpacking"
msgstr "展開プラグイン適用後、ファイルを同じウインドウ タイプで開く(&O)"
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_PIPELINE_STATIC
-#: Merge.rc:2492 Merge.rc:3129
+#: Merge.rc:2502 Merge.rc:3139
msgid "&Plugin pipeline:"
msgstr "プラグイン パイプライン(&P):"
#. IDD_PLUGINS_SELECTPLUGIN, IDC_PLUGIN_ALIAS
-#: Merge.rc:2495
+#: Merge.rc:2505
msgid "&Alias..."
msgstr "エイリアス(&A)..."
#. IDD_DIRCOMP_PROGRESS, IDC_COMPARISON_STOP
-#: Merge.rc:2505
+#: Merge.rc:2515
msgid "Stop"
msgstr "停止"
#. IDD_DIRCOMP_PROGRESS, IDC_COMPARISON_PAUSE
-#: Merge.rc:2506
+#: Merge.rc:2516
msgid "Pause"
msgstr "一時停止"
#. IDD_DIRCOMP_PROGRESS, IDC_COMPARISON_CONTINUE
-#: Merge.rc:2507
+#: Merge.rc:2517
msgid "Continue"
msgstr "再開"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC
-#: Merge.rc:2509 Merge.rc:2973
+#: Merge.rc:2519 Merge.rc:2983
msgid "C&PU cores to use:"
msgstr "使用するCPUコアの数(&N):"
#. IDD_DIRCOMP_PROGRESS, IDC_STATIC
-#: Merge.rc:2510
+#: Merge.rc:2520
msgid "Items total:"
msgstr "全項目数:"
#. IDD_DIRCOMP_PROGRESS, IDC_STATIC
-#: Merge.rc:2511
+#: Merge.rc:2521
msgid "Items compared:"
msgstr "比較した項目:"
#. IDS_PREVIEWBAR_CLOSE
-#: Merge.rc:2526 Merge.rc:2846 Merge.rc:5328
+#: Merge.rc:2536 Merge.rc:2856 Merge.rc:5339
msgid "&Close"
msgstr "閉じる(&C)"
#. IDD_WMGOTO
-#: Merge.rc:2537
+#: Merge.rc:2547
msgid "Go to"
msgstr "移動"
#. IDD_WMGOTO, IDC_STATIC
-#: Merge.rc:2540
+#: Merge.rc:2550
msgid "G&o to:"
msgstr "番号(&O):"
#. IDD_WMGOTO, IDC_STATIC
-#: Merge.rc:2543
+#: Merge.rc:2553
msgid "File"
msgstr "ファイル"
#. IDD_WMGOTO, IDC_STATIC
-#: Merge.rc:2547
+#: Merge.rc:2557
msgid "Go to what"
msgstr "移動種別"
#. IDD_WMGOTO, IDC_WMGOTO_TOLINE
-#: Merge.rc:2548
+#: Merge.rc:2558
msgid "Li&ne"
msgstr "行(&N)"
#. IDD_WMGOTO, IDC_WMGOTO_TODIFF
-#: Merge.rc:2549
+#: Merge.rc:2559
msgid "&Difference"
msgstr "差異(&D)"
#. IDD_WMGOTO, IDOK
-#: Merge.rc:2550
+#: Merge.rc:2560
msgid "&Go to"
msgstr "移動(&G)"
#. IDS_PROJECT_ITEM_FILE_FILTER
-#: Merge.rc:2556 Merge.rc:4321
+#: Merge.rc:2566 Merge.rc:4331
msgid "File Filters"
msgstr "ファイル フィルター"
#. IDD_FILTERS_FILEFILTERS, IDC_STATIC
-#: Merge.rc:2559
+#: Merge.rc:2569
msgid "&Mask / Filter Expression"
msgstr "マスク / フィルター式(&M)"
#. IDD_FILTERS_FILEFILTERS, IDC_STATIC
-#: Merge.rc:2562
+#: Merge.rc:2572
msgid "Preset &Filters"
msgstr "フィルターのプリセット(&F)"
#. IDD_FILTERS_FILEFILTERS, IDC_FILTERFILE_TEST_BTN
-#: Merge.rc:2564
+#: Merge.rc:2574
msgid "Test..."
msgstr "テスト..."
#. IDD_FILTERS_FILEFILTERS, IDC_FILTERFILE_INSTALL
-#: Merge.rc:2565
+#: Merge.rc:2575
msgid "Install..."
msgstr "インストール..."
#. IDD_FILTERS_FILEFILTERS, IDC_FILTERFILE_NEWBTN
-#: Merge.rc:2566
+#: Merge.rc:2576
msgid "New..."
msgstr "新規..."
#. IDD_FILTERS_FILEFILTERS, IDC_FILTERFILE_EDITBTN
-#: Merge.rc:2567
+#: Merge.rc:2577
msgid "Edit..."
msgstr "編集..."
#. IDD_FILTERS_FILEFILTERS, IDC_FILTERFILE_DELETEBTN
-#: Merge.rc:2568
+#: Merge.rc:2578
msgid "Delete..."
msgstr "削除..."
#. IDD_FILTERS_CONDITION
-#: Merge.rc:2573
+#: Merge.rc:2583
msgid "Filter Condition"
msgstr "フィルター条件"
#. IDD_FILTERS_CONDITION, IDC_STATIC
-#: Merge.rc:2576
+#: Merge.rc:2586
msgid "&Left-hand side:"
msgstr "左辺(&L):"
#. IDD_FILTERS_CONDITION, IDC_STATIC
-#: Merge.rc:2578
+#: Merge.rc:2588
msgid "&Operator:"
msgstr "演算子(&O):"
#. IDD_FILTERS_CONDITION, IDC_STATIC
-#: Merge.rc:2580
+#: Merge.rc:2590
msgid "&Right-hand side:"
msgstr "右辺(&R):"
#. IDD_FILTERS_CONDITION, IDC_STATIC
-#: Merge.rc:2586
+#: Merge.rc:2596
msgid "Expression:"
msgstr "式:"
#. IDD_COMPARISON_RESULT_FILTER
-#: Merge.rc:2595
+#: Merge.rc:2605
msgid "Filter by Comparison Result"
msgstr "比較結果でフィルター"
#. IDD_COMPARISON_RESULT_FILTER, IDC_RADIO_INCLUDE
-#: Merge.rc:2598
+#: Merge.rc:2608
msgid "&Include"
msgstr "含める(&I)"
#. IDD_COMPARISON_RESULT_FILTER, IDC_RADIO_EXCLUDE
-#: Merge.rc:2599
+#: Merge.rc:2609
msgid "&Exclude"
msgstr "除外(&E)"
#. IDD_COMPARISON_RESULT_FILTER, IDC_STATIC
-#: Merge.rc:2600
+#: Merge.rc:2610
msgid "Comparison Results"
msgstr "比較結果"
#. IDS_IDENTICAL
-#: Merge.rc:2601 Merge.rc:2733 Merge.rc:2794 Merge.rc:4698
+#: Merge.rc:2611 Merge.rc:2743 Merge.rc:2804 Merge.rc:4708
msgid "Identical"
msgstr "同一"
#. IDS_DIFFERENT
-#: Merge.rc:2602 Merge.rc:2714 Merge.rc:2755 Merge.rc:4708
+#: Merge.rc:2612 Merge.rc:2724 Merge.rc:2765 Merge.rc:4718
msgid "Different"
msgstr "差異あり"
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_LEFT_ONLY
-#: Merge.rc:2603
+#: Merge.rc:2613
msgid "Left only"
msgstr "左側のみ"
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_RIGHT_ONLY
-#: Merge.rc:2604
+#: Merge.rc:2614
msgid "Right only"
msgstr "右側のみ"
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_SKIPPED
-#: Merge.rc:2605
+#: Merge.rc:2615
msgid "Skipped"
msgstr "スキップ"
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_MIDDLE_ONLY
-#: Merge.rc:2606
+#: Merge.rc:2616
msgid "Middle only"
msgstr "中央のみ"
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_LEFT_ONLY_DIFFERENT
-#: Merge.rc:2607
+#: Merge.rc:2617
msgid "Left only (different)"
msgstr "左側のみ(差異あり)"
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_MIDDLE_ONLY_DIFFERENT
-#: Merge.rc:2608
+#: Merge.rc:2618
msgid "Middle only (different)"
msgstr "中央のみ(差異あり)"
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_RIGHT_ONLY_DIFFERENT
-#: Merge.rc:2609
+#: Merge.rc:2619
msgid "Right only (different)"
msgstr "右側のみ(差異あり)"
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_LEFT_ONLY_MISSING
-#: Merge.rc:2610
+#: Merge.rc:2620
msgid "Left only (missing)"
msgstr "左側のみ(欠如)"
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_MIDDLE_ONLY_MISSING
-#: Merge.rc:2611
+#: Merge.rc:2621
msgid "Middle only (missing)"
msgstr "中央のみ(欠如)"
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_RIGHT_ONLY_MISSING
-#: Merge.rc:2612
+#: Merge.rc:2622
msgid "Right only (missing)"
msgstr "右側のみ(欠如)"
#. IDS_OPTIONSPG_CODEPAGE
-#: Merge.rc:2619 Merge.rc:2811 Merge.rc:4213
+#: Merge.rc:2629 Merge.rc:2821 Merge.rc:4223
msgid "Codepage"
msgstr "コードページ"
#. IDD_PROPPAGE_CODEPAGE, IDC_STATIC
-#: Merge.rc:2622
+#: Merge.rc:2632
msgid "Default Codepage"
msgstr "デフォルト コードページ"
#. IDD_PROPPAGE_CODEPAGE, IDC_STATIC
-#: Merge.rc:2623
+#: Merge.rc:2633
msgid "Select the default codepage for non-Unicode files:"
msgstr "非 Unicode ファイルを読み込んだ際のデフォルト コードページ:"
#. IDD_PROPPAGE_CODEPAGE, IDC_CP_SYSTEM
-#: Merge.rc:2624
+#: Merge.rc:2634
msgid "System codepage"
msgstr "システム コードページ"
#. IDD_PROPPAGE_CODEPAGE, IDC_CP_UI
-#: Merge.rc:2625
+#: Merge.rc:2635
msgid "According to WinMerge User Interface"
msgstr "WinMerge ユーザー インターフェイス言語"
#. IDD_PROPPAGE_CODEPAGE, IDC_CP_CUSTOM
-#: Merge.rc:2626
+#: Merge.rc:2636
msgid "Custom codepage:"
msgstr "指定したコードページ:"
#. IDD_PROPPAGE_CODEPAGE, IDC_DETECT_CODEPAGE
-#: Merge.rc:2628
+#: Merge.rc:2638
msgid ""
"Detect codepage for: .html, .rc, .xml\n"
"Restart required."
@@ -4088,7 +4099,7 @@ msgstr ""
"セッションの再起動が必要です。"
#. IDD_PROPPAGE_CODEPAGE, IDC_DETECT_CODEPAGE2
-#: Merge.rc:2630
+#: Merge.rc:2640
msgid ""
"Detect codepage for files with mlang.dll\n"
"Restart required."
@@ -4097,769 +4108,769 @@ msgstr ""
"この設定を有効にするとフォルダー スキャンがかなり遅くなります。また、セッションの再起動が必要です。"
#. IDS_OPTIONSPG_ARCHIVE
-#: Merge.rc:2638 Merge.rc:4214
+#: Merge.rc:2648 Merge.rc:4224
msgid "Archive Support"
msgstr "アーカイブ サポート"
#. IDD_PROPPAGE_ARCHIVE, IDC_ARCHIVE_ENABLE
-#: Merge.rc:2641
+#: Merge.rc:2651
msgid "&Enable archive file support"
msgstr "アーカイブ ファイル サポートを有効にする(&E)"
#. IDD_PROPPAGE_ARCHIVE, IDC_ARCHIVE_DETECTTYPE
-#: Merge.rc:2642
+#: Merge.rc:2652
msgid "&Detect archive type from file signature"
msgstr "ファイルのシグネチャからアーカイブ形式を検出する(&D)"
#. IDD_PROPPAGE_PROJECT, IDC_STATIC
-#: Merge.rc:2651
+#: Merge.rc:2661
msgid "Items saved to or restored from the project file:"
msgstr "プロジェクト ファイルに保存またはプロジェクト ファイルから復元する項目:"
#. IDD_SAVECLOSING
-#: Merge.rc:2658
+#: Merge.rc:2668
msgid "Save Modified Files?"
msgstr "変更されたファイルを保存しますか?"
#. IDD_SAVECLOSING, IDC_SAVECLOSING_LEFTFRAME
-#: Merge.rc:2661
+#: Merge.rc:2671
msgid "Left side file"
msgstr "左側ファイル"
#. IDD_SAVECLOSING, IDC_SAVECLOSING_SAVELEFT
-#: Merge.rc:2663
+#: Merge.rc:2673
msgid "&Save changes"
msgstr "変更を保存する(&S)"
#. IDD_SAVECLOSING, IDC_SAVECLOSING_DISCARDLEFT
-#: Merge.rc:2664
+#: Merge.rc:2674
msgid "&Discard changes"
msgstr "変更を破棄する(&D)"
#. IDD_SAVECLOSING, IDC_SAVECLOSING_MIDDLEFRAME
-#: Merge.rc:2665
+#: Merge.rc:2675
msgid "Middle side file"
msgstr "中央ファイル"
#. IDD_SAVECLOSING, IDC_SAVECLOSING_SAVEMIDDLE
-#: Merge.rc:2667
+#: Merge.rc:2677
msgid "Sa&ve changes"
msgstr "変更を保存する(&V)"
#. IDD_SAVECLOSING, IDC_SAVECLOSING_DISCARDMIDDLE
-#: Merge.rc:2668
+#: Merge.rc:2678
msgid "Discard c&hanges"
msgstr "変更を破棄する(&H)"
#. IDD_SAVECLOSING, IDC_SAVECLOSING_RIGHTFRAME
-#: Merge.rc:2669
+#: Merge.rc:2679
msgid "Right side file"
msgstr "右側ファイル"
#. IDD_SAVECLOSING, IDC_SAVECLOSING_SAVERIGHT
-#: Merge.rc:2671
+#: Merge.rc:2681
msgid "S&ave changes"
msgstr "変更を保存する(&A)"
#. IDD_SAVECLOSING, IDC_SAVECLOSING_DISCARDRIGHT
-#: Merge.rc:2672
+#: Merge.rc:2682
msgid "Dis&card changes"
msgstr "変更を破棄する(&C)"
#. IDD_SAVECLOSING, IDC_SAVECLOSING_DISCARDALL
-#: Merge.rc:2673
+#: Merge.rc:2683
msgid "Disca&rd All"
msgstr "すべて破棄する(&R)"
#. IDD_DIRCMP_REPORT
-#: Merge.rc:2680
+#: Merge.rc:2690
msgid "Folder Compare Report"
msgstr "フォルダー比較レポート"
#. IDD_DIRCMP_REPORT, IDC_STATIC
-#: Merge.rc:2683
+#: Merge.rc:2693
msgid "Report &file:"
msgstr "レポート ファイル(&F):"
#. IDD_DIRCMP_REPORT, IDC_STATIC
-#: Merge.rc:2686
+#: Merge.rc:2696
msgid "&Style:"
msgstr "スタイル(&S):"
#. IDD_DIRCMP_REPORT, IDC_REPORT_INCLUDEFILECMPREPORT
-#: Merge.rc:2688
+#: Merge.rc:2698
msgid "&Include file compare report"
msgstr "ファイル比較レポートを含める(&I)"
#. IDD_FILTERS_FILEFILTERS_SHARED
-#: Merge.rc:2697
+#: Merge.rc:2707
msgid "Shared or Private Filter"
msgstr "共有/プライベート フィルター"
#. IDD_FILTERS_FILEFILTERS_SHARED, IDC_STATIC
-#: Merge.rc:2700
+#: Merge.rc:2710
msgid "What type of filter do you want?"
msgstr "どのタイプのフィルターを作成しますか?"
#. IDD_FILTERS_FILEFILTERS_SHARED, IDC_SHARED
-#: Merge.rc:2701
+#: Merge.rc:2711
msgid "Shared Filter (for all users)"
msgstr "共有フィルター (このマシン上のすべてのユーザーに有効)"
#. IDD_FILTERS_FILEFILTERS_SHARED, IDC_PRIVATE
-#: Merge.rc:2702
+#: Merge.rc:2712
msgid "Private Filter (current user only)"
msgstr "プライベート フィルター (現在のユーザーのみ)"
#. IDD_COMPARE_STATISTICS3
-#: Merge.rc:2709 Merge.rc:2750
+#: Merge.rc:2719 Merge.rc:2760
msgid "Compare Statistics"
msgstr "比較統計"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2712 Merge.rc:2753
+#: Merge.rc:2722 Merge.rc:2763
msgid "Folders:"
msgstr "フォルダー:"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2713 Merge.rc:2754
+#: Merge.rc:2723 Merge.rc:2764
msgid "Files:"
msgstr "ファイル:"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2719 Merge.rc:2738 Merge.rc:2760 Merge.rc:2799
+#: Merge.rc:2729 Merge.rc:2748 Merge.rc:2770 Merge.rc:2809
msgid "Binary:"
msgstr "バイナリ:"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2722 Merge.rc:2763
+#: Merge.rc:2732 Merge.rc:2773
msgid "Unique"
msgstr "片方のみ"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2723 Merge.rc:2764
+#: Merge.rc:2733 Merge.rc:2774
msgid "Left:"
msgstr "左側:"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2728 Merge.rc:2774
+#: Merge.rc:2738 Merge.rc:2784
msgid "Right:"
msgstr "右側:"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2742 Merge.rc:2803
+#: Merge.rc:2752 Merge.rc:2813
msgid "Total:"
msgstr "合計:"
#. IDD_COMPARE_STATISTICS3, IDOK
-#: Merge.rc:2745 Merge.rc:2806
+#: Merge.rc:2755 Merge.rc:2816
msgid "Close"
msgstr "閉じる"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2769
+#: Merge.rc:2779
msgid "Middle:"
msgstr "中央:"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2779
+#: Merge.rc:2789
msgid "Missing Left:"
msgstr "左側のみ無し:"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2784
+#: Merge.rc:2794
msgid "Missing Middle:"
msgstr "中央のみ無し:"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2789
+#: Merge.rc:2799
msgid "Missing Right:"
msgstr "右側のみ無し:"
#. IDD_LOAD_SAVE_CODEPAGE, IDC_AFFECTS_GROUP
-#: Merge.rc:2814
+#: Merge.rc:2824
msgid "Affects"
msgstr "反映先"
#. IDD_LOAD_SAVE_CODEPAGE, IDC_RIGHT_FILES_LABEL
-#: Merge.rc:2816 Merge.rc:2818 Merge.rc:2820
+#: Merge.rc:2826 Merge.rc:2828 Merge.rc:2830
msgid "(Affects)"
msgstr "(反映先)"
#. IDD_LOAD_SAVE_CODEPAGE, IDC_LOADING_GROUP
-#: Merge.rc:2821
+#: Merge.rc:2831
msgid "Select Codepage for"
msgstr "コードページの選択"
#. IDD_LOAD_SAVE_CODEPAGE, IDC_LOAD_FILES_LABEL
-#: Merge.rc:2822
+#: Merge.rc:2832
msgid "&File Loading:"
msgstr "ファイルの読み込み(&F):"
#. IDD_LOAD_SAVE_CODEPAGE, IDC_SAVE_FILES_LABEL
-#: Merge.rc:2824
+#: Merge.rc:2834
msgid "File &Saving:"
msgstr "ファイルの保存(&S)"
#. IDD_LOAD_SAVE_CODEPAGE, IDC_LOAD_SAVE_SAME_CODEPAGE
-#: Merge.rc:2827
+#: Merge.rc:2837
msgid "&Use same codepage for both"
msgstr "読み込みと保存で同じコードページを使用する(&U)"
#. IDS_MESSAGEBOX_CANCEL
-#: Merge.rc:2830 Merge.rc:4172
+#: Merge.rc:2840 Merge.rc:4182
msgid "&Cancel"
msgstr "キャンセル(&C)"
#. IDD_FILTERS_FILEFILTERS_TEST
-#: Merge.rc:2835
+#: Merge.rc:2845
msgid "Test Filter"
msgstr "フィルターのテスト"
#. IDD_FILTERS_FILEFILTERS_TEST, IDC_HEADER
-#: Merge.rc:2838
+#: Merge.rc:2848
msgid "Testing filter:"
msgstr "テストするフィルター:"
#. IDD_FILTERS_FILEFILTERS_TEST, IDC_PROMPT_LABEL
-#: Merge.rc:2840
+#: Merge.rc:2850
msgid "&Enter text to test:"
msgstr "テストするテキストの入力(&E):"
#. IDD_FILTERS_FILEFILTERS_TEST, IDC_IS_DIRECTORY
-#: Merge.rc:2842
+#: Merge.rc:2852
msgid "&Folder Name"
msgstr "フォルダー名(&F)"
#. IDD_FILTERS_FILEFILTERS_TEST, IDC_STATIC
-#: Merge.rc:2843
+#: Merge.rc:2853
msgid "Result:"
msgstr "結果:"
#. IDD_FILTERS_FILEFILTERS_TEST, IDC_TEST_BTN
-#: Merge.rc:2845
+#: Merge.rc:2855
msgid "&Test"
msgstr "テスト(&T)"
#. IDS_OPTIONSPG_TABLECOMPARE
-#: Merge.rc:2851 Merge.rc:2990 Merge.rc:4228
+#: Merge.rc:2861 Merge.rc:3000 Merge.rc:4238
msgid "Table"
msgstr "テーブル"
#. IDD_OPEN_TABLE, IDC_STATIC
-#: Merge.rc:2854
+#: Merge.rc:2864
msgid "File type"
msgstr "ファイル タイプ"
#. IDD_OPEN_TABLE, IDC_COMPARETABLE_CSV
-#: Merge.rc:2855
+#: Merge.rc:2865
msgid "&CSV"
msgstr "&CSV"
#. IDD_OPEN_TABLE, IDC_COMPARETABLE_TSV
-#: Merge.rc:2856
+#: Merge.rc:2866
msgid "&TSV"
msgstr "&TSV"
#. IDD_OPEN_TABLE, IDC_COMPARETABLE_DSV
-#: Merge.rc:2857
+#: Merge.rc:2867
msgid "Custom &Delimiter-Separated Values"
msgstr "ユーザー指定文字区切り値(&D)"
#. IDD_PROPPAGE_COMPARE_TABLE, IDC_STATIC
-#: Merge.rc:2859 Merge.rc:2861 Merge.rc:2996 Merge.rc:3004
+#: Merge.rc:2869 Merge.rc:2871 Merge.rc:3006 Merge.rc:3014
msgid "D&elimiter character:"
msgstr "区切り文字(&E)"
#. IDD_PROPPAGE_COMPARE_TABLE, IDC_COMPARETABLE_ALLOWNEWLINE
-#: Merge.rc:2863 Merge.rc:3006
+#: Merge.rc:2873 Merge.rc:3016
msgid "&Allow newlines in quotes"
msgstr "引用符内の改行を値として扱う(&A)"
#. IDD_PROPPAGE_COMPARE_TABLE, IDC_STATIC
-#: Merge.rc:2865 Merge.rc:3008
+#: Merge.rc:2875 Merge.rc:3018
msgid "&Quote character:"
msgstr "引用符文字(&Q)"
#. IDS_OPTIONSPG_BACKUPS
-#: Merge.rc:2873 Merge.rc:4216
+#: Merge.rc:2883 Merge.rc:4226
msgid "Backup Files"
msgstr "バックアップ ファイル"
#. IDD_PROPPAGE_BACKUPS, IDC_STATIC
-#: Merge.rc:2876
+#: Merge.rc:2886
msgid "Create backup files for:"
msgstr "バックアップ ファイル作成:"
#. IDD_PROPPAGE_BACKUPS, IDC_BACKUP_FOLDERCMP
-#: Merge.rc:2877
+#: Merge.rc:2887
msgid "&Folder compare"
msgstr "フォルダー比較(&F)"
#. IDD_PROPPAGE_BACKUPS, IDC_BACKUP_FILECMP
-#: Merge.rc:2878
+#: Merge.rc:2888
msgid "Fil&e compare"
msgstr "ファイル比較(&E)"
#. IDD_PROPPAGE_BACKUPS, IDC_STATIC
-#: Merge.rc:2879
+#: Merge.rc:2889
msgid "Create backup files in:"
msgstr "バックアップ ファイル作成先:"
#. IDD_PROPPAGE_BACKUPS, IDC_BACKUP_ORIGFOLD
-#: Merge.rc:2880
+#: Merge.rc:2890
msgid "&Original file's folder"
msgstr "元ファイルのフォルダー(&O)"
#. IDD_PROPPAGE_BACKUPS, IDC_BACKUP_GLOBALFOLD
-#: Merge.rc:2881
+#: Merge.rc:2891
msgid "&Global backup folder:"
msgstr "共通のバックアップ フォルダー(&G):"
#. IDD_PROPPAGE_BACKUPS, IDC_STATIC
-#: Merge.rc:2884
+#: Merge.rc:2894
msgid "Backup filename:"
msgstr "バックアップ ファイル名:"
#. IDD_PROPPAGE_BACKUPS, IDC_BACKUP_APPEND_BAK
-#: Merge.rc:2885
+#: Merge.rc:2895
msgid "&Append .bak extension"
msgstr ".bak 拡張子を追加する(&A)"
#. IDD_PROPPAGE_BACKUPS, IDC_BACKUP_APPEND_TIME
-#: Merge.rc:2886
+#: Merge.rc:2896
msgid "A&ppend timestamp"
msgstr "タイムスタンプを追加する(&P)"
#. IDS_CONFIRM_COPY_CAPTION
-#: Merge.rc:2892 Merge.rc:4565
+#: Merge.rc:2902 Merge.rc:4575
msgid "Confirm Copy"
msgstr "コピーの確認"
#. IDD_CONFIRM_COPY, IDC_FLDCONFIRM_QUERY
-#: Merge.rc:2896
+#: Merge.rc:2906
msgid "Are you sure you want to copy XXX items?"
msgstr "本当に XXX 項目をコピーしますか?"
#. IDD_CONFIRM_COPY, IDC_FLDCONFIRM_FROM_TEXT
-#: Merge.rc:2897
+#: Merge.rc:2907
msgid "From left"
msgstr "左側から"
#. IDD_CONFIRM_COPY, IDC_FLDCONFIRM_TO_TEXT
-#: Merge.rc:2899
+#: Merge.rc:2909
msgid "To right"
msgstr "右側へ"
#. IDS_MESSAGEBOX_DONT_ASK_AGAIN
-#: Merge.rc:2901 Merge.rc:4191
+#: Merge.rc:2911 Merge.rc:4201
msgid "Don't ask this &question again."
msgstr "再びこの質問をしない(&Q)"
#. IDD_CONFIRM_COPY, IDYES
-#: Merge.rc:2903
+#: Merge.rc:2913
msgid "Yes"
msgstr "はい"
#. IDD_CONFIRM_COPY, IDNO
-#: Merge.rc:2904
+#: Merge.rc:2914
msgid "No"
msgstr "いいえ"
#. IDS_PROJECT_ITEM_PLUGIN
-#: Merge.rc:2909 Merge.rc:4323
+#: Merge.rc:2919 Merge.rc:4333
msgid "Plugins"
msgstr "プラグイン"
#. IDD_PLUGINS_LIST, IDC_PLUGINS_ENABLE
-#: Merge.rc:2912
+#: Merge.rc:2922
msgid "&Enable plugins"
msgstr "プラグインを有効にする(&E)"
#. IDD_PLUGINS_EDITPLUGIN, IDC_STATIC
-#: Merge.rc:2913 Merge.rc:3113
+#: Merge.rc:2923 Merge.rc:3123
msgid "Plugin &type:"
msgstr "プラグインの種類(&T):"
#. IDD_PLUGINS_LIST, IDC_STATIC
-#: Merge.rc:2916
+#: Merge.rc:2926
msgid "File filters:"
msgstr "ファイル フィルター:"
#. IDD_PLUGINS_LIST, IDC_STATIC
-#: Merge.rc:2918
+#: Merge.rc:2928
msgid "&Plugin arguments:"
msgstr "プラグイン引数(&P):"
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_AUTOMATIC
-#: Merge.rc:2920 Merge.rc:3134
+#: Merge.rc:2930 Merge.rc:3144
msgid "Enable &automatic unpacking/prediffing"
msgstr "自動展開/自動比較前処理をこのプラグインで有効にする(&A)"
#. IDS_OPTIONSPG_SHELL
-#: Merge.rc:2934 Merge.rc:4217
+#: Merge.rc:2944 Merge.rc:4227
msgid "Shell Integration"
msgstr "シェル統合"
#. IDD_PROPPAGE_SHELL, IDC_STATIC
-#: Merge.rc:2937
+#: Merge.rc:2947
msgid "Explorer"
msgstr "エクスプローラー"
#. IDD_PROPPAGE_SHELL, IDC_EXPLORER_CONTEXT
-#: Merge.rc:2938
+#: Merge.rc:2948
msgid "&Add to context menu"
msgstr "コンテキストメニューに追加する(&A)"
#. IDD_PROPPAGE_SHELL, IDC_EXPLORER_ADVANCED
-#: Merge.rc:2939
+#: Merge.rc:2949
msgid "E&nable advanced menu"
msgstr "拡張メニューを有効にする(&N)"
#. IDD_PROPPAGE_SHELL, IDC_EXPLORER_COMPARE_AS
-#: Merge.rc:2940
+#: Merge.rc:2950
msgid "Enable &Compare As menu"
msgstr "「形式を指定して比較」メニューを有効にする(&C)"
#. IDD_PROPPAGE_SHELL, IDC_REGISTER_SHELLEXTENSION
-#: Merge.rc:2941
+#: Merge.rc:2951
msgid "&Register Shell Extension"
msgstr "シェル拡張を登録(&R)"
#. IDD_PROPPAGE_SHELL, IDC_UNREGISTER_SHELLEXTENSION
-#: Merge.rc:2942
+#: Merge.rc:2952
msgid "&Unregister Shell Extension"
msgstr "シェル拡張の登録を解除(&U)"
#. IDD_PROPPAGE_SHELL, IDC_REGISTER_SHELLEXTENSION_PERUSER
-#: Merge.rc:2943
+#: Merge.rc:2953
msgid "Register Shell Extension for Current User &Only"
msgstr "現在のユーザーのみシェル拡張を登録(&O)"
#. IDD_PROPPAGE_SHELL, IDC_UNREGISTER_SHELLEXTENSION_PERUSER
-#: Merge.rc:2944
+#: Merge.rc:2954
msgid "Unregister Shell Extension for Current User On&ly"
msgstr "現在のユーザーのみシェル拡張の登録を解除(&L)"
#. IDD_PROPPAGE_SHELL, IDC_REGISTER_WINMERGECONTEXTMENU
-#: Merge.rc:2945
+#: Merge.rc:2955
msgid "Register Shell Extension for &Windows 11"
msgstr "Windows 11 以降用シェル拡張を登録(&W)"
#. IDD_PROPPAGE_SHELL, IDC_UNREGISTER_WINMERGECONTEXTMENU
-#: Merge.rc:2946
+#: Merge.rc:2956
msgid "Unregister Shell Extension for W&indows 11"
msgstr "Windows 11 以降用シェル拡張の登録を解除(&I)"
#. IDD_PROPPAGE_SHELL, IDC_STATIC
-#: Merge.rc:2947
+#: Merge.rc:2957
msgid "Jump List"
msgstr "ジャンプリスト"
#. IDD_PROPPAGE_SHELL, IDC_CLEAR_ALL_RECENT_ITEMS
-#: Merge.rc:2949
+#: Merge.rc:2959
msgid "Clear all recent items"
msgstr "すべての最近使ったものの履歴をクリアする"
#. IDS_OPTIONSPG_FOLDERCOMPARE
-#: Merge.rc:2954 Merge.rc:4225
+#: Merge.rc:2964 Merge.rc:4235
msgctxt "Options dialog|Categories"
msgid "Folder"
msgstr "フォルダー"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC
-#: Merge.rc:2957
+#: Merge.rc:2967
msgid "&Compare method:"
msgstr "比較方法(&C):"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_COMPARE_STOPFIRST
-#: Merge.rc:2959
+#: Merge.rc:2969
msgid "S&top after first difference"
msgstr "最初の差異で比較を終了する(&T)"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_IGNORE_SMALLTIMEDIFF
-#: Merge.rc:2961
+#: Merge.rc:2971
msgid "Ign&ore time differences less than 3 seconds"
msgstr "3 秒以下の時間差を無視する(&O)"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC
-#: Merge.rc:2964
+#: Merge.rc:2974
msgid "Expand subfolders &after comparison:"
msgstr "比較後自動的にサブフォルダーを展開する(&A):"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_COMPARE_WALKSUBDIRS
-#: Merge.rc:2966
+#: Merge.rc:2976
msgid "Include &unique subfolders contents"
msgstr "片方にしか存在しないサブフォルダー内も含める(&U)"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_IGNORE_REPARSEPOINTS
-#: Merge.rc:2968
+#: Merge.rc:2978
msgid "Ignore &reparse points"
msgstr "再解析ポイントを無視する(&R)"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC
-#: Merge.rc:2969
+#: Merge.rc:2979
msgid "Switch to &quick compare when size exceeds (MB):"
msgstr "クイック比較切替閾値 (MB)(&Q):"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC
-#: Merge.rc:2971
+#: Merge.rc:2981
msgid "Switch to &binary compare when size exceeds (MB):"
msgstr "バイナリ比較切替閾値 (MB)(&B):"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC
-#: Merge.rc:2975
+#: Merge.rc:2985
msgid "Additional comparison condi&tions:"
msgstr "追加比較条件(&T):"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC
-#: Merge.rc:2978
+#: Merge.rc:2988
msgid "&Rename/move detection:"
msgstr "名前変更/移動検出(&R)"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC
-#: Merge.rc:2980
+#: Merge.rc:2990
msgid "Rename/move detection &keys:"
msgstr "名前変更/移動検出用キー生成式(&K)"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC
-#: Merge.rc:2983
+#: Merge.rc:2993
msgid "M&erge renames and moves:"
msgstr "名前変更/移動項目のマージ(&E):"
#. IDD_PROPPAGE_COMPARE_TABLE, IDC_STATIC
-#: Merge.rc:2994 Merge.rc:2999 Merge.rc:3002
+#: Merge.rc:3004 Merge.rc:3009 Merge.rc:3012
msgid "File patterns:"
msgstr "ファイル パターン:"
#. IDD_PROPPAGE_COMPARE_TABLE, IDC_STATIC
-#: Merge.rc:3001
+#: Merge.rc:3011
msgid "Custom Delimiter-Separated Values"
msgstr "ユーザー指定文字区切り値"
#. IDS_OPTIONSPG_BINARYCOMPARE
-#: Merge.rc:3015 Merge.rc:4227
+#: Merge.rc:3025 Merge.rc:4237
msgctxt "Options dialog|Categories"
msgid "Binary"
msgstr "バイナリ"
#. IDD_PROPPAGE_COMPARE_BINARY, IDC_STATIC
-#: Merge.rc:3018
+#: Merge.rc:3028
msgid "Binary file &patterns:"
msgstr "バイナリ ファイルとして扱うパターン(&P):"
#. IDD_PROPPAGE_COMPARE_BINARY, IDC_STATIC
-#: Merge.rc:3020
+#: Merge.rc:3030
msgid "Frhed settings"
msgstr "Frhed 設定"
#. IDD_PROPPAGE_COMPARE_BINARY, IDC_COMPAREBINARY_VIEWSETTINGS
-#: Merge.rc:3021
+#: Merge.rc:3031
msgid "View &Settings..."
msgstr "表示設定(&S)..."
#. IDD_PROPPAGE_COMPARE_BINARY, IDC_COMPAREBINARY_BINARYMODE
-#: Merge.rc:3022
+#: Merge.rc:3032
msgid "&Binary Mode..."
msgstr "バイナリモード(&B)..."
#. IDD_PROPPAGE_COMPARE_BINARY, IDC_COMPAREBINARY_CHARACTERSET
-#: Merge.rc:3023
+#: Merge.rc:3033
msgid "&Character Set..."
msgstr "文字セット(&C)..."
#. IDS_PRPCAT_IMAGE
-#: Merge.rc:3029 Merge.rc:4226 Merge.rc:4665
+#: Merge.rc:3039 Merge.rc:4236 Merge.rc:4675
msgid "Image"
msgstr "画像"
#. IDD_PROPPAGE_COMPARE_IMAGE, IDC_STATIC
-#: Merge.rc:3032
+#: Merge.rc:3042
msgid "Image file &patterns:"
msgstr "画像ファイルとして扱うパターン(&P):"
#. IDD_PROPPAGE_COMPARE_IMAGE, IDC_ENABLE_IMGCMP_IN_DIRCMP
-#: Merge.rc:3034
+#: Merge.rc:3044
msgid "&Enable image compare in folder compare"
msgstr "フォルダー比較で画像比較を有効にする(&E)"
#. IDD_PROPPAGE_COMPARE_IMAGE, IDC_STATIC
-#: Merge.rc:3036
+#: Merge.rc:3046
msgid "OCR result:"
msgstr "OCRの結果:"
#. IDS_OPTIONSPG_WEBPAGECOMPARE
-#: Merge.rc:3043 Merge.rc:4229
+#: Merge.rc:3053 Merge.rc:4239
msgid "Webpage"
msgstr "Webページ"
#. IDD_PROPPAGE_COMPARE_WEBPAGE, IDC_STATIC
-#: Merge.rc:3046
+#: Merge.rc:3056
msgid "URL pattern to &include (Regular expression):"
msgstr "URL パターン (正規表現)(&I):"
#. IDD_PROPPAGE_COMPARE_WEBPAGE, IDC_STATIC
-#: Merge.rc:3048
+#: Merge.rc:3058
msgid "URL pattern to &exclude (Regular expression):"
msgstr "除外 URL パターン (正規表現)(&E):"
#. IDD_PROPPAGE_COMPARE_WEBPAGE, IDC_STATIC
-#: Merge.rc:3050
+#: Merge.rc:3060
msgid "&User data folder location:"
msgstr "ユーザー データ フォルダーの場所(&U):"
#. IDD_PROPPAGE_COMPARE_WEBPAGE, IDC_COMPAREWEBPAGE_USERDATAFOLDER_PERPANE
-#: Merge.rc:3052
+#: Merge.rc:3062
msgid "&Separate user data folders for each pane"
msgstr "ユーザー データ フォルダーをペイン毎に分離する(&S)"
#. IDD_ENCODINGERROR, IDC_HEXVIEW
-#: Merge.rc:3065
+#: Merge.rc:3075
msgid "&Hex View"
msgstr "HEX 表示(&H)"
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3110
+#: Merge.rc:3120
msgid "Edit Plugin"
msgstr "プラグインの編集"
#. IDD_PLUGINS_EDITPLUGIN, IDC_STATIC
-#: Merge.rc:3123
+#: Merge.rc:3133
msgid "&Category:"
msgstr "カテゴリー(&C)"
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_MENUCAPTION_STATIC
-#: Merge.rc:3125
+#: Merge.rc:3135
msgid "&Menu caption:"
msgstr "メニューキャプション(&M)"
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_WINDOWTYPE_STATIC
-#: Merge.rc:3127
+#: Merge.rc:3137
msgid "&Window type:"
msgstr "ウインドウ種別(&W)"
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_UNPACKEDFILEEXTENSION_STATIC
-#: Merge.rc:3132
+#: Merge.rc:3142
msgid "&Unpacked file extension:"
msgstr "展開後のファイルの拡張子(&U):"
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_ARGUMENTSREQUIRED
-#: Merge.rc:3136
+#: Merge.rc:3146
msgid "&Require arguments"
msgstr "引数を要求する(&R)"
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_GENERATESCRIPT
-#: Merge.rc:3137
+#: Merge.rc:3147
msgid "&Generate editor script"
msgstr "エディタースクリプトを生成する(&G)"
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_COMMAND_LINE_STATIC
-#: Merge.rc:3140
+#: Merge.rc:3150
msgid "Command &line:"
msgstr "コマンドライン(&L):"
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_SCRIPT_FILEEXTENSION_STATIC
-#: Merge.rc:3143
+#: Merge.rc:3153
msgid "&Script file extension:"
msgstr "スクリプトファイル拡張子(&S):"
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_SCRIPT_BODY_STATIC
-#: Merge.rc:3145
+#: Merge.rc:3155
msgid "Script &body:"
msgstr "スクリプト本体(&B):"
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3154
+#: Merge.rc:3164
msgid "Font"
msgstr "フォント"
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3157
+#: Merge.rc:3167
msgid "&Font:"
msgstr "フォント名(&F):"
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3163
+#: Merge.rc:3173
msgid "Font st&yle:"
msgstr "スタイル(&Y):"
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3169
+#: Merge.rc:3179
msgid "&Size:"
msgstr "サイズ(&S):"
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3175
+#: Merge.rc:3185
msgid "Effects"
msgstr "効果"
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3176
+#: Merge.rc:3186
msgid "Stri&keout"
msgstr "取り消し線(&K)"
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3177
+#: Merge.rc:3187
msgid "&Underline"
msgstr "下線(&U)"
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3179
+#: Merge.rc:3189
msgid "&Color:"
msgstr "色(&C):"
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3184
+#: Merge.rc:3194
msgid "Sample"
msgstr "サンプル"
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3185
+#: Merge.rc:3195
msgid "AaBbYyZz"
msgstr "AaBbYyZz"
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3189
+#: Merge.rc:3199
msgid "Sc&ript:"
msgstr "文字セット(&R):"
#. IDD_PLUGINS_EDITPLUGIN, IDC_MANAGE_LINK
-#: Merge.rc:3194
+#: Merge.rc:3204
msgid "Show more fonts"
msgstr "他のフォントを表示"
#. ID_INDICATOR_EXT
-#: Merge.rc:4118
+#: Merge.rc:4128
msgid "EXT"
msgstr "EXT"
#. ID_INDICATOR_CAPS
-#: Merge.rc:4119
+#: Merge.rc:4129
msgid "CAP"
msgstr "CAP"
#. ID_INDICATOR_NUM
-#: Merge.rc:4120
+#: Merge.rc:4130
msgid "NUM"
msgstr "NUM"
#. ID_INDICATOR_SCRL
-#: Merge.rc:4121
+#: Merge.rc:4131
msgid "SCRL"
msgstr "SCRL"
#. ID_INDICATOR_OVR
-#: Merge.rc:4122
+#: Merge.rc:4132
msgid "OVR"
msgstr "上書"
#. ID_INDICATOR_REC
-#: Merge.rc:4123
+#: Merge.rc:4133
msgid "REC"
msgstr "記録"
#. ID_FILE_NEW
-#: Merge.rc:4129
+#: Merge.rc:4139
msgid ""
"\n"
"New Documents (Ctrl+N)"
@@ -4868,7 +4879,7 @@ msgstr ""
"新しいドキュメント (Ctrl+N)"
#. ID_FILE_OPEN
-#: Merge.rc:4130
+#: Merge.rc:4140
msgid ""
"\n"
"Open (Ctrl+O)"
@@ -4877,7 +4888,7 @@ msgstr ""
"開く (Ctrl+O)"
#. ID_FILE_SAVE
-#: Merge.rc:4131
+#: Merge.rc:4141
msgid ""
"\n"
"Save (Ctrl+S)"
@@ -4886,27 +4897,27 @@ msgstr ""
"保存 (Ctrl+S)"
#. IDS_UNK_ERROR_READING_PROJECT
-#: Merge.rc:4137
+#: Merge.rc:4147
msgid "Unknown error opening project file."
msgstr "未知のエラー: プロジェクト ファイルが開けません。"
#. IDS_UNK_ERROR_SAVING_PROJECT
-#: Merge.rc:4138
+#: Merge.rc:4148
msgid "Unknown error saving project file."
msgstr "未知のエラー: プロジェクト ファイルが保存できません。"
#. IDS_PROJFILE_LOAD_SUCCESS
-#: Merge.rc:4143
+#: Merge.rc:4153
msgid "Project file loaded."
msgstr "プロジェクト ファイルが読み込まれました。"
#. IDS_PROJFILE_SAVE_SUCCESS
-#: Merge.rc:4144
+#: Merge.rc:4154
msgid "Project file saved."
msgstr "プロジェクト ファイルが保存されました。"
#. ID_EDIT_UNDO
-#: Merge.rc:4150
+#: Merge.rc:4160
msgid ""
"\n"
"Undo (Ctrl+Z)"
@@ -4915,7 +4926,7 @@ msgstr ""
"元に戻す (Ctrl+Z)"
#. ID_EDIT_REDO
-#: Merge.rc:4151
+#: Merge.rc:4161
msgid ""
"\n"
"Redo (Ctrl+Y)"
@@ -4924,7 +4935,7 @@ msgstr ""
"やり直し (Ctrl+Y)"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:4158
+#: Merge.rc:4168
msgid ""
"\n"
"FileCompare\n"
@@ -4943,7 +4954,7 @@ msgstr ""
"WinMerge File Compare"
#. IDR_DIRDOCTYPE
-#: Merge.rc:4159
+#: Merge.rc:4169
msgid ""
"\n"
"FolderCompare\n"
@@ -4962,162 +4973,162 @@ msgstr ""
"WinMerge Folder Compare"
#. IDS_SPLASH_GPLTEXT
-#: Merge.rc:4165
+#: Merge.rc:4175
msgid "WinMerge comes with ABSOLUTELY NO WARRANTY. It is free software and can be redistributed under the conditions of the GNU General Public License - see the Help menu for details."
msgstr "WinMerge comes with ABSOLUTELY NO WARRANTY. It is free software and can be redistributed under the conditions of the GNU General Public License - see the Help menu for details."
#. IDS_MESSAGEBOX_ABORT
-#: Merge.rc:4173
+#: Merge.rc:4183
msgid "&Abort"
msgstr "中止(&A)"
#. IDS_MESSAGEBOX_RETRY
-#: Merge.rc:4174
+#: Merge.rc:4184
msgid "&Retry"
msgstr "再試行(&R)"
#. IDS_MESSAGEBOX_IGNORE
-#: Merge.rc:4175
+#: Merge.rc:4185
msgid "&Ignore"
msgstr "無視(&I)"
#. IDS_MESSAGEBOX_IGNOREALL
-#: Merge.rc:4176
+#: Merge.rc:4186
msgid "Ignore &all"
msgstr "すべて無視(&A)"
#. IDS_MESSAGEBOX_YES
-#: Merge.rc:4177
+#: Merge.rc:4187
msgid "&Yes"
msgstr "はい(&Y)"
#. IDS_MESSAGEBOX_YES_TO_ALL
-#: Merge.rc:4183
+#: Merge.rc:4193
msgid "Yes to &all"
msgstr "すべてはい(&A)"
#. IDS_MESSAGEBOX_NO
-#: Merge.rc:4184
+#: Merge.rc:4194
msgid "&No"
msgstr "いいえ(&N)"
#. IDS_MESSAGEBOX_NO_TO_ALL
-#: Merge.rc:4185
+#: Merge.rc:4195
msgid "No to a&ll"
msgstr "すべていいえ(&L)"
#. IDS_MESSAGEBOX_CONTINUE
-#: Merge.rc:4186
+#: Merge.rc:4196
msgid "&Continue"
msgstr "続行(&C)"
#. IDS_MESSAGEBOX_SKIP
-#: Merge.rc:4187
+#: Merge.rc:4197
msgid "&Skip"
msgstr "スキップ(&S)"
#. IDS_MESSAGEBOX_SKIPALL
-#: Merge.rc:4188
+#: Merge.rc:4198
msgid "Skip &all"
msgstr "すべてスキップ(&A)"
#. IDS_MESSAGEBOX_DONT_DISPLAY_AGAIN
-#: Merge.rc:4190
+#: Merge.rc:4200
msgid "Don't display this &message again."
msgstr "再びこのメッセージを表示しない(&M)"
-#: Merge.rc:4193
+#: Merge.rc:4203
msgid "To make this message box visible, press Reset on the Message Boxes page in Options."
msgstr "このメッセージボックスを再度表示させたい場合は、[オプション] ダイアログのメッセージボックス ページで [リセット] ボタンを押してください。"
#. IDS_OPTIONSPG_EDITOR_COMPAREMERGE
-#: Merge.rc:4203
+#: Merge.rc:4213
msgid "Compare/Merge"
msgstr "比較/マージ"
#. IDS_OPTIONSPG_SYNTAXCOLORS
-#: Merge.rc:4204 Merge.rc:4208
+#: Merge.rc:4214 Merge.rc:4218
msgid "Syntax"
msgstr "シンタックス"
#. IDS_OPTIONSPG_COLOR_SCHEMES
-#: Merge.rc:4206
+#: Merge.rc:4216
msgid "Color Schemes"
msgstr "配色"
#. IDS_OPTIONSPG_DIRCOLORS
-#: Merge.rc:4210
+#: Merge.rc:4220
msgid "Folder Compare"
msgstr "フォルダー比較"
#. IDS_OPTIONSPG_PROJECT
-#: Merge.rc:4215
+#: Merge.rc:4225
msgid "Project"
msgstr "プロジェクト"
#. IDS_COLHDR_NSDIFFS
-#: Merge.rc:4218 Merge.rc:4640
+#: Merge.rc:4228 Merge.rc:4650
msgid "Differences"
msgstr "差異"
#. IDS_OPTIONSPG_MESSAGEBOXES
-#: Merge.rc:4220
+#: Merge.rc:4230
msgid "Message Boxes"
msgstr "メッセージボックス"
#. IDS_TO
-#: Merge.rc:4235
+#: Merge.rc:4245
msgid "To:"
msgstr "To:"
#. IDS_FROM_LEFT
-#: Merge.rc:4236
+#: Merge.rc:4246
msgid "From left:"
msgstr "左側から:"
#. IDS_TO_LEFT
-#: Merge.rc:4237
+#: Merge.rc:4247
msgid "To left:"
msgstr "左側へ:"
#. IDS_FROM_RIGHT
-#: Merge.rc:4238
+#: Merge.rc:4248
msgid "From right:"
msgstr "右側から:"
#. IDS_TO_RIGHT
-#: Merge.rc:4239
+#: Merge.rc:4249
msgid "To right:"
msgstr "右側へ:"
#. IDS_FROM_MIDDLE
-#: Merge.rc:4240
+#: Merge.rc:4250
msgid "From middle:"
msgstr "中央から:"
#. IDS_TO_MIDDLE
-#: Merge.rc:4241
+#: Merge.rc:4251
msgid "To middle:"
msgstr "中央へ:"
#. IDS_VERSION_FMT
-#: Merge.rc:4247
+#: Merge.rc:4257
#, c-format
msgid "Version %1"
msgstr "Version %1"
#. IDS_OPTIONS_TITLE
-#: Merge.rc:4253
+#: Merge.rc:4263
#, c-format
msgid "Options (%1)"
msgstr "オプション (%1)"
#. IDS_MESSAGE_BOX_ARE_RESET
-#: Merge.rc:4254
+#: Merge.rc:4264
msgid "All message boxes are now displayed again."
msgstr "すべてのメッセージボックスが、再び表示されます。"
-#: Merge.rc:4256
+#: Merge.rc:4266
#, c-format
msgid "Tab size value is out of range. Please use 1 - %1."
msgstr ""
@@ -5126,156 +5137,156 @@ msgstr ""
"1 から %1 までの値を指定してください。"
#. IDS_PROJECT_OPEN
-#: Merge.rc:4262 Merge.rc:4318
+#: Merge.rc:4272 Merge.rc:4328
msgid "Open"
msgstr "開く"
#. IDS_PROGRAMFILES
-#: Merge.rc:4263
+#: Merge.rc:4273
msgid "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||"
msgstr "プログラム|*.exe;*.bat;*.cmd|すべてのファイル (*.*)|*.*||"
#. IDS_ALLFILES
-#: Merge.rc:4264
+#: Merge.rc:4274
msgid "All Files (*.*)|*.*||"
msgstr "すべてのファイル (*.*)|*.*||"
#. IDS_PROJECTFILES
-#: Merge.rc:4265
+#: Merge.rc:4275
msgid "WinMerge Project Files (*.WinMerge)|*.WinMerge||"
msgstr "WinMerge プロジェクト ファイル (*.WinMerge)|*.WinMerge||"
#. IDS_INIFILES
-#: Merge.rc:4267
+#: Merge.rc:4277
msgid "Options files (*.ini)|*.ini|All Files (*.*)|*.*||"
msgstr "設定ファイル (*.ini)|*.ini|すべてのファイル (*.*)|*.*||"
#. IDS_REPLACELIST_FILES
-#: Merge.rc:4268
+#: Merge.rc:4278
msgid "Tab-Separated Values (*.tsv;*.txt)|*.tsv;*.txt|All Files (*.*)|*.*||"
msgstr "タブ区切り値 (*.tsv;*.txt)|*.tsv;*.txt|すべてのファイル (*.*)|*.*||"
#. IDS_TEXT_REPORT_FILES
-#: Merge.rc:4274
+#: Merge.rc:4284
msgid "Text Files (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|All Files (*.*)|*.*||"
msgstr "テキスト ファイル (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|すべてのファイル (*.*)|*.*||"
#. IDS_HTML_REPORT_FILES
-#: Merge.rc:4275
+#: Merge.rc:4285
msgid "HTML Files (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||"
msgstr "HTML ファイル (*.htm,*.html)|*.htm;*.html|すべてのファイル (*.*)|*.*||"
#. IDS_XML_REPORT_FILES
-#: Merge.rc:4276
+#: Merge.rc:4286
msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||"
msgstr "XML ファイル (*.xml)|*.xml|すべてのファイル (*.*)|*.*||"
#. IDS_EXPANDSUBDIRS_DONOTEXPAND
-#: Merge.rc:4294
+#: Merge.rc:4304
msgid "Do not expand"
msgstr "展開しない"
#. IDS_EXPANDSUBDIRS_ALL
-#: Merge.rc:4295
+#: Merge.rc:4305
msgid "Expand all subfolders"
msgstr "すべてのサブフォルダーを展開"
#. IDS_EXPANDSUBDIRS_DIFFERENT
-#: Merge.rc:4296
+#: Merge.rc:4306
msgid "Expand different subfolders"
msgstr "差異のあるサブフォルダーを展開"
#. IDS_EXPANDSUBDIRS_IDENTICAL
-#: Merge.rc:4297
+#: Merge.rc:4307
msgid "Expand identical subfolders"
msgstr "同一のサブフォルダーを展開"
#. IDS_SYNTAXTABLE_FILETYPE
-#: Merge.rc:4303
+#: Merge.rc:4313
msgid "File Type"
msgstr "ファイル タイプ"
#. IDS_COLHDR_EXTENSION
-#: Merge.rc:4304 Merge.rc:4597
+#: Merge.rc:4314 Merge.rc:4607
msgid "Extension"
msgstr "拡張子"
#. IDS_PRPCAT_MESSAGE
-#: Merge.rc:4310 Merge.rc:4669
+#: Merge.rc:4320 Merge.rc:4679
msgid "Message"
msgstr "メッセージ"
#. IDS_MESSAGEBOX_ANSWER
-#: Merge.rc:4311
+#: Merge.rc:4321
msgid "Answer"
msgstr "回答"
#. IDS_PROJECT_ITEM
-#: Merge.rc:4317
+#: Merge.rc:4327
msgid "Item"
msgstr "項目"
#. IDS_PROJECT_LOAD
-#: Merge.rc:4319
+#: Merge.rc:4329
msgid "Load"
msgstr "読み込み"
#. IDS_PROJECT_SAVE
-#: Merge.rc:4320
+#: Merge.rc:4330
msgid "Save"
msgstr "保存"
#. IDS_PROJECT_ITEM_INCLUDE_SUBFOLDERS
-#: Merge.rc:4322
+#: Merge.rc:4332
msgid "Include Subfolders"
msgstr "サブフォルダーを含める"
#. IDS_PROJECT_ITEM_COMPARE_OPTIONS
-#: Merge.rc:4324
+#: Merge.rc:4334
msgid "Compare Options"
msgstr "比較オプション"
#. IDS_PROJECT_ITEM_HIDDEN_ITEMS
-#: Merge.rc:4325
+#: Merge.rc:4335
msgid "Hidden Items"
msgstr "非表示の項目"
#. IDS_PLUGINSLIST_NAME
-#: Merge.rc:4331 Merge.rc:4956
+#: Merge.rc:4341 Merge.rc:4966
msgid "Name"
msgstr "名前"
#. IDS_FILTERFILE_PATHTITLE
-#: Merge.rc:4332
+#: Merge.rc:4342
msgid "Location"
msgstr "場所"
#. IDS_FILTER_TITLE
-#: Merge.rc:4333
+#: Merge.rc:4343
msgid "Filters"
msgstr "フィルター"
#. IDS_FILTER_PREFIX
-#: Merge.rc:4334
+#: Merge.rc:4344
msgid "[F] "
msgstr "[F] "
#. IDS_PLUGINSLIST_DESC
-#: Merge.rc:4335 Merge.rc:4958
+#: Merge.rc:4345 Merge.rc:4968
msgid "Description"
msgstr "説明"
#. IDS_FILEFILTER_SAVENEW
-#: Merge.rc:4336
+#: Merge.rc:4346
msgid "Select Filename for New Filter"
msgstr "新しいフィルターのファイル名を指定してください"
#. IDS_FILEFILTER_FILEMASK
-#: Merge.rc:4337
+#: Merge.rc:4347
msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||"
msgstr "ファイル フィルター (*.flt)|*.flt|すべてのファイル (*.*)|*.*||"
-#: Merge.rc:4339
+#: Merge.rc:4349
#, c-format
msgid ""
"Cannot find filter template!\n"
@@ -5288,7 +5299,7 @@ msgstr ""
"ファイル %1 を以下の WinMerge/Filters フォルダーにコピーしてください:\n"
"%2"
-#: Merge.rc:4341
+#: Merge.rc:4351
#, c-format
msgid ""
"Cannot copy filter template:\n"
@@ -5300,7 +5311,7 @@ msgstr ""
"\n"
"フォルダーの存在または書き込み可能であるか確認してください。"
-#: Merge.rc:4343
+#: Merge.rc:4353
msgid ""
"User's filter folder is not defined!\n"
"\n"
@@ -5310,7 +5321,7 @@ msgstr ""
"\n"
"[オプション/システム] でフィルター用フォルダーを指定してください。"
-#: Merge.rc:4345
+#: Merge.rc:4355
#, c-format
msgid ""
"Failed to delete filter:\n"
@@ -5323,11 +5334,11 @@ msgstr ""
"そのファイルは読み取り専用ではありませんか?"
#. IDS_FILEFILTER_INSTALL
-#: Merge.rc:4346
+#: Merge.rc:4356
msgid "Locate Filter File to Install"
msgstr "インストールするフィルター ファイルを選択"
-#: Merge.rc:4348
+#: Merge.rc:4358
msgid ""
"Installing filter file failed.\n"
"\n"
@@ -5338,17 +5349,17 @@ msgstr ""
"新しいフィルター ファイルをフィルター フォルダーにコピーできません。"
#. IDS_FILEFILTER_OVERWRITE
-#: Merge.rc:4349
+#: Merge.rc:4359
msgid "Filter file exists. Overwrite?"
msgstr "フィルター ファイルは既に存在しています。既存のファイルを上書きしますか?"
#. IDS_FILTERLINE_REGEXP
-#: Merge.rc:4355
+#: Merge.rc:4365
msgid "Regular expression"
msgstr "正規表現"
#. IDS_FILTERCHANGED
-#: Merge.rc:4361
+#: Merge.rc:4371
msgid ""
"Filters updated. Refresh all open folder compares?\n"
"\n"
@@ -5359,217 +5370,217 @@ msgstr ""
"もし、いまはすべての比較ウィンドウを更新したくない場合、「いいえ」を選択し、後で比較ウィンドウを更新してください。"
#. IDS_DIRECTORY_WINDOW_TITLE
-#: Merge.rc:4367
+#: Merge.rc:4377
msgid "Folder Comparison Results"
msgstr "フォルダー比較結果"
#. IDS_FILE_COMPARISON_TITLE
-#: Merge.rc:4368
+#: Merge.rc:4378
msgid "File Comparison"
msgstr "ファイル比較"
#. IDS_EMPTY_LEFT_FILE
-#: Merge.rc:4369
+#: Merge.rc:4379
msgid "Untitled Left"
msgstr "左無題"
#. IDS_EMPTY_MIDDLE_FILE
-#: Merge.rc:4370
+#: Merge.rc:4380
msgid "Untitled Middle"
msgstr "中無題"
#. IDS_EMPTY_RIGHT_FILE
-#: Merge.rc:4371
+#: Merge.rc:4381
msgid "Untitled Right"
msgstr "右無題"
#. IDS_CONFLICT_BASE_FILE
-#: Merge.rc:4372
+#: Merge.rc:4382
msgid "Base File"
msgstr "Base File"
#. IDS_CONFLICT_THEIRS_FILE
-#: Merge.rc:4373
+#: Merge.rc:4383
msgid "Theirs File"
msgstr "Theirs File"
#. IDS_CONFLICT_MINE_FILE
-#: Merge.rc:4374
+#: Merge.rc:4384
msgid "Mine File"
msgstr "Mine File"
#. IDS_SELFCOMPARE_ORIGINAL_FILE
-#: Merge.rc:4375
+#: Merge.rc:4385
msgid "Original File"
msgstr "元のファイル"
#. IDS_LINE_STATUS_INFO_EOL
-#: Merge.rc:4381
+#: Merge.rc:4391
#, c-format
msgid "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s"
msgstr "行: %s 列: %d/%d 文字: %d/%d EOL: %s"
#. IDS_EMPTY_LINE_STATUS_INFO
-#: Merge.rc:4382
+#: Merge.rc:4392
#, c-format
msgid "Line: %s"
msgstr "行: %s"
#. IDS_LINE_STATUS_INFO
-#: Merge.rc:4383
+#: Merge.rc:4393
#, c-format
msgid "Ln: %s Col: %d/%d Ch: %d/%d"
msgstr "行: %s 列: %d/%d 文字: %d/%d"
#. IDS_LINE_STATUS_INFO_SEL
-#: Merge.rc:4384
+#: Merge.rc:4394
#, c-format
msgid " Sel: %d | %d"
msgstr " 選択: %d | %d"
#. IDS_MERGEMODE_MERGING
-#: Merge.rc:4385
+#: Merge.rc:4395
msgid "Merge"
msgstr "マージ"
#. IDS_DIFF_NUMBER_STATUS_FMT
-#: Merge.rc:4386
+#: Merge.rc:4396
#, c-format
msgid "Difference %1 of %2"
msgstr "差異 %1 / %2"
#. IDS_NO_DIFF_SEL_FMT
-#: Merge.rc:4387
+#: Merge.rc:4397
#, c-format
msgid "%1 Differences Found"
msgstr "%1 件の差異が見つかりました"
#. IDS_1_DIFF_FOUND
-#: Merge.rc:4388
+#: Merge.rc:4398
msgid "1 Difference Found"
msgstr "1 件の差異が見つかりました"
#. IDS_NO_ERR_SEL_FMT
-#: Merge.rc:4389
+#: Merge.rc:4399
#, c-format
msgid "%1 Errors Found"
msgstr "%1 件のエラーが発生しました"
#. IDS_1_ERR_FOUND
-#: Merge.rc:4390
+#: Merge.rc:4400
msgid "1 Error Found"
msgstr "1 件のエラーが発生しました"
#. IDS_STATUSBAR_READONLY, Abbreviation from "Read Only"
-#: Merge.rc:4391
+#: Merge.rc:4401
msgid "RO"
msgstr "RO"
#. IDS_DIRVIEW_STATUS_FMT_FOCUS
-#: Merge.rc:4397
+#: Merge.rc:4407
#, c-format
msgid "Item %1 of %2"
msgstr "項目 %1 / %2"
#. IDS_DIRVIEW_STATUS_FMT_NOFOCUS
-#: Merge.rc:4398
+#: Merge.rc:4408
#, c-format
msgid "Items: %1"
msgstr "項目: %1"
#. IDS_DIRVIEW_STATUS_COMPARING
-#: Merge.rc:4399
+#: Merge.rc:4409
msgid "Comparing items..."
msgstr "項目を比較しています..."
#. IDS_ITEMS_PER_SEC
-#: Merge.rc:4400
+#: Merge.rc:4410
#, c-format
msgid "%.1f[items/sec]"
msgstr "%.1f[項目/秒]"
#. IDS_ERROR_INCOMPARABLE
-#: Merge.rc:4406
+#: Merge.rc:4416
msgid "Select two existing folders/files to compare."
msgstr "存在するフォルダーまたはファイルを選択してください。"
#. IDS_DIRSEL_TAG
-#: Merge.rc:4407
+#: Merge.rc:4417
msgid "Folder Selection"
msgstr "Folder Selection"
#. IDS_OPEN_FILESDIRS
-#: Merge.rc:4408
+#: Merge.rc:4418
msgid "Select two (or three) folders/files to compare."
msgstr "比較するフォルダーまたはファイルを 2 つ (または 3 つ) 選択してください。"
#. IDS_OPEN_LEFTINVALID
-#: Merge.rc:4409
+#: Merge.rc:4419
msgid "Left (1st) path is invalid!"
msgstr "左側 (1 番目) のパスが無効です!"
#. IDS_OPEN_MIDDLEINVALID
-#: Merge.rc:4410
+#: Merge.rc:4420
msgid "Middle (2nd) path is invalid!"
msgstr "中央 (2 番目) のパスが無効です!"
#. IDS_OPEN_RIGHTINVALID2
-#: Merge.rc:4411
+#: Merge.rc:4421
msgid "Right (2nd) path is invalid!"
msgstr "右側 (2 番目) のパスが無効です!"
#. IDS_OPEN_RIGHTINVALID3
-#: Merge.rc:4412
+#: Merge.rc:4422
msgid "Right (3rd) path is invalid!"
msgstr "右側 (3 番目) のパスが無効です!"
#. IDS_OPEN_BOTHINVALID
-#: Merge.rc:4413
+#: Merge.rc:4423
msgid "Both paths are invalid!"
msgstr "両側 (1 番目と 2 番目) のパスが無効です!"
-#: Merge.rc:4415
+#: Merge.rc:4425
msgid "Left (1st) and Middle (2nd) paths are invalid!"
msgstr "左側 (1 番目) と中央 (2 番目) のパスが無効です!"
#. IDS_OPEN_LEFTRIGHTINVALID
-#: Merge.rc:4416
+#: Merge.rc:4426
msgid "Left (1st) and Right (3rd) paths are invalid!"
msgstr "左側 (1 番目) と右側 (3 番目) のパスが無効です!"
-#: Merge.rc:4418
+#: Merge.rc:4428
msgid "Middle (2nd) and Right (3rd) paths are invalid!"
msgstr "中央 (2 番目) と右側 (3 番目) のパスが無効です!"
#. IDS_OPEN_ALLINVALID
-#: Merge.rc:4419
+#: Merge.rc:4429
msgid "All paths are invalid!"
msgstr "すべてのパスが無効です!"
#. IDS_OPEN_UNPACKERDISABLED
-#: Merge.rc:4420
+#: Merge.rc:4430
msgid "Only enabled for file comparisons"
msgstr "ファイル比較のみ有効"
#. IDS_OPEN_MISMATCH
-#: Merge.rc:4421
+#: Merge.rc:4431
msgid "Cannot compare file and folder!"
msgstr "ファイルとフォルダーは比較できません!"
#. IDS_ERROR_FILE_NOT_FOUND
-#: Merge.rc:4427
+#: Merge.rc:4437
#, c-format
msgid "File not found: %1"
msgstr "ファイルが見つかりません: %1"
#. IDS_ERROR_FILE_NOT_UNPACKED
-#: Merge.rc:4428
+#: Merge.rc:4438
#, c-format
msgid "File not unpacked: %1"
msgstr "ファイルが展開されていません: %1"
#. IDS_ERROR_FILEOPEN
-#: Merge.rc:4429
+#: Merge.rc:4439
#, c-format
msgid ""
"Cannot open file\n"
@@ -5583,12 +5594,12 @@ msgstr ""
"%2"
#. IDS_ERROR_CONF_RESOLVE
-#: Merge.rc:4430
+#: Merge.rc:4440
msgid "Failed to parse conflict file."
msgstr "コンフリクト ファイルの解析に失敗しました。"
#. IDS_NOT_CONFLICT_FILE
-#: Merge.rc:4431
+#: Merge.rc:4441
#, c-format
msgid ""
"The file\n"
@@ -5600,7 +5611,7 @@ msgstr ""
"はコンフリクト ファイルではありません。"
#. IDS_COMPARE_LARGE_FILES
-#: Merge.rc:4432
+#: Merge.rc:4442
msgid ""
"Comparing large files requires significant memory.\n"
"Show only comparison results (not file contents)?"
@@ -5610,12 +5621,12 @@ msgstr ""
"内容の表示はせずに、比較結果のみ表示しますか?"
#. IDS_SAVE_AS_TITLE
-#: Merge.rc:4438
+#: Merge.rc:4448
msgid "Save As"
msgstr "名前を付けて保存"
#. IDS_SAVE_FMT
-#: Merge.rc:4439
+#: Merge.rc:4449
#, c-format
msgid "Save changes to %1?"
msgstr ""
@@ -5623,17 +5634,17 @@ msgstr ""
"変更を保存しますか?"
#. IDS_SAVEREADONLY_FMT
-#: Merge.rc:4440
+#: Merge.rc:4450
#, c-format
msgid "%1 is read-only. Override? Or 'No' to save as new filename?"
msgstr "%1 は読み取り専用ファイルです。読み取り専用ファイルを上書きしますか? (新しいファイル名では保存しません。)"
#. IDS_ERROR_BACKUP
-#: Merge.rc:4441
+#: Merge.rc:4451
msgid "Error backing up file"
msgstr "ファイル バックアップ エラー"
-#: Merge.rc:4443
+#: Merge.rc:4453
#, c-format
msgid ""
"Unable to backup original file:\n"
@@ -5647,7 +5658,7 @@ msgstr ""
"無視して続けますか?"
#. IDS_FILESAVE_FAILED
-#: Merge.rc:4444
+#: Merge.rc:4454
#, c-format
msgid ""
"Saving file failed.\n"
@@ -5662,7 +5673,7 @@ msgstr ""
"- 別名で保存する場合は [OK] を、\n"
"- 中止する場合は [キャンセル] を押してください。"
-#: Merge.rc:4446
+#: Merge.rc:4456
#, c-format
msgid ""
"Plugin '%2' cannot pack changes to left file into '%1'.\n"
@@ -5675,7 +5686,7 @@ msgstr ""
"\n"
"展開されたものを別ファイルに保存しますか?"
-#: Merge.rc:4448
+#: Merge.rc:4458
#, c-format
msgid ""
"Plugin '%2' cannot pack changes to middle file into '%1'.\n"
@@ -5688,7 +5699,7 @@ msgstr ""
"\n"
"展開されたものを別ファイルに保存しますか?"
-#: Merge.rc:4450
+#: Merge.rc:4460
#, c-format
msgid ""
"Plugin '%2' cannot pack changes to right file into '%1'.\n"
@@ -5702,7 +5713,7 @@ msgstr ""
"展開されたものを別ファイルに保存しますか?"
#. IDS_FILECHANGED_ONDISK
-#: Merge.rc:4451
+#: Merge.rc:4461
#, c-format
msgid ""
"Another application updated\n"
@@ -5715,7 +5726,7 @@ msgstr ""
"このファイルは WinMerge 以外のアプリケーションで修正されています。修正されたファイルに上書きしますか?"
#. IDS_SAVEREADONLY_MULTI
-#: Merge.rc:4452
+#: Merge.rc:4462
#, c-format
msgid ""
"%1\n"
@@ -5725,7 +5736,7 @@ msgstr ""
"は、読み取り専用です。読み取り専用の項目を上書きしますか?"
#. IDS_FILECHANGED_RESCAN
-#: Merge.rc:4453
+#: Merge.rc:4463
#, c-format
msgid ""
"Another application updated\n"
@@ -5740,22 +5751,22 @@ msgstr ""
"ファイルを開きなおしますか?"
#. IDS_SAVE_LEFT_AS
-#: Merge.rc:4454
+#: Merge.rc:4464
msgid "Save Left File As"
msgstr "左側のファイルを名前を付けて保存"
#. IDS_SAVE_MIDDLE_AS
-#: Merge.rc:4455
+#: Merge.rc:4465
msgid "Save Middle File As"
msgstr "中央のファイルを名前を付けて保存"
#. IDS_SAVE_RIGHT_AS
-#: Merge.rc:4456
+#: Merge.rc:4466
msgid "Save Right File As"
msgstr "右側のファイルを名前を付けて保存"
#. IDS_FILE_DISAPPEARED
-#: Merge.rc:4461
+#: Merge.rc:4471
#, c-format
msgid ""
"File\n"
@@ -5767,7 +5778,7 @@ msgstr ""
"は消滅しました。続行するためにファイルのコピーを保存してください。"
#. IDS_VIEWS_OUTOFSYNC
-#: Merge.rc:4467
+#: Merge.rc:4477
msgid ""
"Cannot merge unsynched documents.\n"
"\n"
@@ -5778,124 +5789,124 @@ msgstr ""
"続行する前にドキュメントを F5 キーで最新にしてください。"
#. IDS_BREAK_ON_WHITESPACE
-#: Merge.rc:4472
+#: Merge.rc:4482
msgid "Break at whitespace"
msgstr "空白で区切る"
#. IDS_BREAK_ON_PUNCTUATION
-#: Merge.rc:4473
+#: Merge.rc:4483
msgid "Break at whitespace or punctuation"
msgstr "空白か句読点で区切る"
#. IDS_L2M
-#: Merge.rc:4479
+#: Merge.rc:4489
msgid "Copy to &Middle\tAlt+Right"
msgstr "中央にコピー(&M)\tAlt+Right"
#. IDS_R2M
-#: Merge.rc:4480
+#: Merge.rc:4490
msgid "Copy to &Middle\tAlt+Left"
msgstr "中央にコピー(&M)\tAlt+Left"
#. IDS_COPY_FROM_MIDDLE_R
-#: Merge.rc:4481
+#: Merge.rc:4491
msgid "Copy from Middle\tAlt+Shift+Right"
msgstr "中央からコピー\tAlt+Shift+Right"
#. IDS_COPY_FROM_MIDDLE_L
-#: Merge.rc:4482
+#: Merge.rc:4492
msgid "Copy from Middle\tAlt+Shift+Left"
msgstr "中央からコピー\tAlt+Shift+Left"
#. IDS_L2MNEXT
-#: Merge.rc:4483
+#: Merge.rc:4493
msgid "Copy to Middle and Advance\tCtrl+Alt+Right"
msgstr "中央にコピーして次に進む\tCtrl+Alt+Right"
#. IDS_R2MNEXT
-#: Merge.rc:4484
+#: Merge.rc:4494
msgid "Copy to Middle and Advance\tCtrl+Alt+Left"
msgstr "中央にコピーして次に進む\tCtrl+Alt+Left"
#. IDS_ALL_MIDDLE
-#: Merge.rc:4485
+#: Merge.rc:4495
msgid "Copy All to Middle"
msgstr "すべてを中央にコピー"
#. IDS_COPY_RIGHT_TO_LEFT
-#: Merge.rc:4491
+#: Merge.rc:4501
#, c-format
msgid "Right to Left (%1)"
msgstr "右側から左側 (%1)"
#. IDS_COPY_RIGHT_TO_MIDDLE
-#: Merge.rc:4492
+#: Merge.rc:4502
#, c-format
msgid "Right to Middle (%1)"
msgstr "右側から中央 (%1)"
#. IDS_COPY_MIDDLE_TO_LEFT
-#: Merge.rc:4493
+#: Merge.rc:4503
#, c-format
msgid "Middle to Left (%1)"
msgstr "中央から左側 (%1)"
#. IDS_COPY_MIDDLE_TO_RIGHT
-#: Merge.rc:4494
+#: Merge.rc:4504
#, c-format
msgid "Middle to Right (%1)"
msgstr "中央から右側 (%1)"
#. IDS_COPY_LEFT_TO_RIGHT
-#: Merge.rc:4495
+#: Merge.rc:4505
#, c-format
msgid "Left to Right (%1)"
msgstr "左側から右側 (%1)"
#. IDS_COPY_LEFT_TO_MIDDLE
-#: Merge.rc:4496
+#: Merge.rc:4506
#, c-format
msgid "Left to Middle (%1)"
msgstr "左側から中央 (%1)"
#. IDS_MOVE_LEFT_TO
-#: Merge.rc:4507 Merge.rc:4539
+#: Merge.rc:4517 Merge.rc:4549
#, c-format
msgid "Left to... (%1)"
msgstr "左側を... (%1)"
#. IDS_MOVE_MIDDLE_TO
-#: Merge.rc:4508 Merge.rc:4540
+#: Merge.rc:4518 Merge.rc:4550
#, c-format
msgid "Middle to... (%1)"
msgstr "中央を... (%1)"
#. IDS_MOVE_RIGHT_TO
-#: Merge.rc:4509 Merge.rc:4541
+#: Merge.rc:4519 Merge.rc:4551
#, c-format
msgid "Right to... (%1)"
msgstr "右側を... (%1)"
#. IDS_COPY_BOTH_TO
-#: Merge.rc:4510
+#: Merge.rc:4520
#, c-format
msgid "Both to... (%1)"
msgstr "両側を... (%1)"
#. IDS_COPY_ALL_TO
-#: Merge.rc:4511
+#: Merge.rc:4521
#, c-format
msgid "All to... (%1)"
msgstr "すべてを... (%1)"
#. IDS_COPY_DIFFERENCES_TO
-#: Merge.rc:4512
+#: Merge.rc:4522
#, c-format
msgid "Differences to... (%1)"
msgstr "差異を... (%1)"
#. IDS_COPY_ONLYDIFFITEMS
-#: Merge.rc:4519
+#: Merge.rc:4529
msgid ""
"Some selected items are identical or skipped.\n"
"Copy only items with differences?"
@@ -5904,64 +5915,64 @@ msgstr ""
"差異のある項目だけをコピーしますか?"
#. IDS_DEL_LEFT_FMT
-#: Merge.rc:4525
+#: Merge.rc:4535
#, c-format
msgid "Left (%1)"
msgstr "左側 (%1)"
#. IDS_DEL_MIDDLE_FMT
-#: Merge.rc:4526
+#: Merge.rc:4536
#, c-format
msgid "Middle (%1)"
msgstr "中央 (%1)"
#. IDS_DEL_RIGHT_FMT
-#: Merge.rc:4527
+#: Merge.rc:4537
#, c-format
msgid "Right (%1)"
msgstr "右側 (%1)"
#. IDS_DEL_BOTH_FMT
-#: Merge.rc:4528
+#: Merge.rc:4538
#, c-format
msgid "Both (%1)"
msgstr "両側 (%1)"
#. IDS_DEL_ALL_FMT
-#: Merge.rc:4529
+#: Merge.rc:4539
#, c-format
msgid "All (%1)"
msgstr "すべて (%1)"
#. IDS_SELECT_DEST_LEFT
-#: Merge.rc:4545
+#: Merge.rc:4555
msgid "Left Side - Select Destination Folder:"
msgstr "左側 - コピー/移動先フォルダーの指定:"
#. IDS_SELECT_DEST_MIDDLE
-#: Merge.rc:4546
+#: Merge.rc:4556
msgid "Middle Side - Select Destination Folder:"
msgstr "中央 - コピー/移動先フォルダーの指定:"
#. IDS_SELECT_DEST_RIGHT
-#: Merge.rc:4547
+#: Merge.rc:4557
msgid "Right Side - Select Destination Folder:"
msgstr "右側 - コピー/移動先フォルダーの指定:"
#. IDS_FILES_AFFECTED_FMT
-#: Merge.rc:4548
+#: Merge.rc:4558
#, c-format
msgid "(%1 Files Affected)"
msgstr "(%1 個のファイルに作用)"
#. IDS_FILES_AFFECTED_FMT2
-#: Merge.rc:4549
+#: Merge.rc:4559
#, c-format
msgid "(%1 of %2 Files Affected)"
msgstr "(%1 / %2 個のファイルに作用)"
#. IDS_CONFIRM_DELETE_SINGLE
-#: Merge.rc:4555
+#: Merge.rc:4565
#, c-format
msgid ""
"Are you sure you want to delete\n"
@@ -5974,18 +5985,18 @@ msgstr ""
"を削除しますか?"
#. IDS_CONFIRM_SINGLE_COPY
-#: Merge.rc:4556
+#: Merge.rc:4566
msgid "Are you sure you want to copy?"
msgstr "本当にコピーしますか?"
#. IDS_CONFIRM_MULTIPLE_COPY
-#: Merge.rc:4557
+#: Merge.rc:4567
#, c-format
msgid "Are you sure you want to copy %d items?"
msgstr "本当に %d 項目をコピーしますか?"
#. IDS_DIRCMP_NOTSYNC
-#: Merge.rc:4558
+#: Merge.rc:4568
#, c-format
msgid ""
"Operation aborted!\n"
@@ -6005,46 +6016,46 @@ msgstr ""
"再度比較してください。"
#. IDS_CONFIRM_SINGLE_MOVE
-#: Merge.rc:4563
+#: Merge.rc:4573
msgid "Are you sure you want to move?"
msgstr "項目を移動しますか?"
#. IDS_CONFIRM_MULTIPLE_MOVE
-#: Merge.rc:4564
+#: Merge.rc:4574
#, c-format
msgid "Are you sure you want to move %d items?"
msgstr "%d 個の項目を移動しますか?"
#. IDS_CONFIRM_MOVE_CAPTION
-#: Merge.rc:4566
+#: Merge.rc:4576
msgid "Confirm Move"
msgstr "移動の確認"
-#: Merge.rc:4568
+#: Merge.rc:4578
msgid "Close the folder comparison window?"
msgstr "フォルダー比較中のウィンドウを閉じようとしています。本当にウィンドウを閉じますか?"
-#: Merge.rc:4570
+#: Merge.rc:4580
msgid "Close the folder comparison window, which took a long time?"
msgstr "比較にかなりの時間を要したウィンドウを閉じようとしています。本当にウィンドウを閉じますか?"
#. IDS_ERROR_INVALID_DIR_FILE_NAME
-#: Merge.rc:4571
+#: Merge.rc:4581
msgid "The file or folder name is invalid."
msgstr "ファイル名またはフォルダー名が無効です。"
#. IDS_ERROR_EXECUTE_FILE
-#: Merge.rc:4577
+#: Merge.rc:4587
#, c-format
msgid "Failed to execute external editor: %1"
msgstr "外部エディターの実行に失敗しました: %1"
#. IDS_UNKNOWN_ARCHIVE_FORMAT
-#: Merge.rc:4583
+#: Merge.rc:4593
msgid "Unknown archive format"
msgstr "未知のアーカイブ形式です"
-#: Merge.rc:4585
+#: Merge.rc:4595
msgid ""
"Failed to extract archive.\n"
"Compare as text file?"
@@ -6053,518 +6064,518 @@ msgstr ""
"アーカイブファイルをテキストファイルとして比較しますか?"
#. IDS_COLHDR_FILENAME
-#: Merge.rc:4591
+#: Merge.rc:4601
msgid "Filename"
msgstr "名前"
#. IDS_COLHDR_DIR
-#: Merge.rc:4592
+#: Merge.rc:4602
msgctxt "DirView|ColumnHeader"
msgid "Folder"
msgstr "フォルダー"
#. IDS_COLHDR_RESULT
-#: Merge.rc:4593
+#: Merge.rc:4603
msgid "Comparison Result"
msgstr "比較結果"
#. IDS_COLHDR_LTIMEM
-#: Merge.rc:4594
+#: Merge.rc:4604
msgid "Left Date"
msgstr "左更新日時"
#. IDS_COLHDR_RTIMEM
-#: Merge.rc:4595
+#: Merge.rc:4605
msgid "Right Date"
msgstr "右更新日時"
#. IDS_COLHDR_MTIMEM
-#: Merge.rc:4596
+#: Merge.rc:4606
msgid "Middle Date"
msgstr "中更新日時"
#. IDS_COLHDR_LSIZE
-#: Merge.rc:4598
+#: Merge.rc:4608
msgid "Left Size"
msgstr "左サイズ"
#. IDS_COLHDR_RSIZE
-#: Merge.rc:4599
+#: Merge.rc:4609
msgid "Right Size"
msgstr "右サイズ"
#. IDS_COLHDR_MSIZE
-#: Merge.rc:4604
+#: Merge.rc:4614
msgid "Middle Size"
msgstr "中サイズ"
#. IDS_COLHDR_RSIZE_SHORT
-#: Merge.rc:4605
+#: Merge.rc:4615
msgid "Right Size (Short)"
msgstr "右サイズ(短縮)"
#. IDS_COLHDR_LSIZE_SHORT
-#: Merge.rc:4606
+#: Merge.rc:4616
msgid "Left Size (Short)"
msgstr "左サイズ(短縮)"
#. IDS_COLHDR_MSIZE_SHORT
-#: Merge.rc:4607
+#: Merge.rc:4617
msgid "Middle Size (Short)"
msgstr "中サイズ(短縮)"
#. IDS_COLHDR_LTIMEC
-#: Merge.rc:4613
+#: Merge.rc:4623
msgid "Left Creation Time"
msgstr "左作成日時"
#. IDS_COLHDR_RTIMEC
-#: Merge.rc:4614
+#: Merge.rc:4624
msgid "Right Creation Time"
msgstr "右作成日時"
#. IDS_COLHDR_MTIMEC
-#: Merge.rc:4615
+#: Merge.rc:4625
msgid "Middle Creation Time"
msgstr "中作成日時"
#. IDS_COLHDR_NEWER
-#: Merge.rc:4616
+#: Merge.rc:4626
msgid "Newer File"
msgstr "日時比較"
#. IDS_COLHDR_LVERSION
-#: Merge.rc:4617
+#: Merge.rc:4627
msgid "Left File Version"
msgstr "左バージョン"
#. IDS_COLHDR_RVERSION
-#: Merge.rc:4618
+#: Merge.rc:4628
msgid "Right File Version"
msgstr "右バージョン"
#. IDS_COLHDR_MVERSION
-#: Merge.rc:4619
+#: Merge.rc:4629
msgid "Middle File Version"
msgstr "中バージョン"
#. IDS_COLHDR_RESULT_ABBR
-#: Merge.rc:4620
+#: Merge.rc:4630
msgid "Short Result"
msgstr "比較結果(簡易)"
#. IDS_COLHDR_LATTRIBUTES
-#: Merge.rc:4621
+#: Merge.rc:4631
msgid "Left Attributes"
msgstr "左属性"
#. IDS_COLHDR_RATTRIBUTES
-#: Merge.rc:4622
+#: Merge.rc:4632
msgid "Right Attributes"
msgstr "右属性"
#. IDS_COLHDR_MATTRIBUTES
-#: Merge.rc:4623
+#: Merge.rc:4633
msgid "Middle Attributes"
msgstr "中属性"
#. IDS_COLHDR_LEOL_TYPE
-#: Merge.rc:4628
+#: Merge.rc:4638
msgid "Left EOL"
msgstr "左EOL"
#. IDS_COLHDR_MEOL_TYPE
-#: Merge.rc:4629
+#: Merge.rc:4639
msgid "Middle EOL"
msgstr "中EOL"
#. IDS_COLHDR_REOL_TYPE
-#: Merge.rc:4630
+#: Merge.rc:4640
msgid "Right EOL"
msgstr "右EOL"
#. IDS_COLHDR_LENCODING
-#: Merge.rc:4636
+#: Merge.rc:4646
msgid "Left Encoding"
msgstr "左文字コード"
#. IDS_COLHDR_RENCODING
-#: Merge.rc:4637
+#: Merge.rc:4647
msgid "Right Encoding"
msgstr "右文字コード"
#. IDS_COLHDR_MENCODING
-#: Merge.rc:4638
+#: Merge.rc:4648
msgid "Middle Encoding"
msgstr "中文字コード"
#. IDS_COLHDR_NIDIFFS
-#: Merge.rc:4639
+#: Merge.rc:4649
msgid "Ignored Diff"
msgstr "無視した差異数"
#. IDS_COLHDR_BINARY
-#: Merge.rc:4641
+#: Merge.rc:4651
msgctxt "DirView|ColumnHeader"
msgid "Binary"
msgstr "バイナリ"
#. IDS_PLUGINS_TYPE_UNPACKER
-#: Merge.rc:4642 Merge.rc:4959
+#: Merge.rc:4652 Merge.rc:4969
msgid "Unpacker"
msgstr "展開プラグイン"
#. IDS_PLUGIN_TYPE4
-#: Merge.rc:4643 Merge.rc:4960 Merge.rc:5267
+#: Merge.rc:4653 Merge.rc:4970 Merge.rc:5277
msgid "Prediffer"
msgstr "比較前処理プラグイン"
#. IDS_COLHDR_LEFT
-#: Merge.rc:4644
+#: Merge.rc:4654
msgid "Left"
msgstr "左側"
#. IDS_COLHDR_MIDDLE
-#: Merge.rc:4645
+#: Merge.rc:4655
msgid "Middle"
msgstr "中央"
#. IDS_COLHDR_RIGHT
-#: Merge.rc:4646
+#: Merge.rc:4656
msgid "Right"
msgstr "右側"
#. IDS_COLHDR_DIFF
-#: Merge.rc:4647
+#: Merge.rc:4657
msgid "Diff"
msgstr "差異"
#. IDS_COLHDR_LEFT_DUPLICATE
-#: Merge.rc:4648
+#: Merge.rc:4658
msgid "Left Duplicate Count"
msgstr "左側重複数"
#. IDS_COLHDR_RIGHT_DUPLICATE
-#: Merge.rc:4649
+#: Merge.rc:4659
msgid "Right Duplicate Count"
msgstr "右側重複数"
#. IDS_COLHDR_MIDDLE_DUPLICATE
-#: Merge.rc:4650
+#: Merge.rc:4660
msgid "Middle Duplicate Count"
msgstr "中央重複数"
#. IDS_COLHDR_MOVE
-#: Merge.rc:4651
+#: Merge.rc:4661
msgid "Move"
msgstr "移動"
#. IDS_PRPCAT_AUDIO
-#: Merge.rc:4658
+#: Merge.rc:4668
msgid "Audio"
msgstr "音声"
#. IDS_PRPCAT_CALENDAR
-#: Merge.rc:4659
+#: Merge.rc:4669
msgid "Calendar"
msgstr "予定表"
#. IDS_PRPCAT_COMMUNICATION
-#: Merge.rc:4660
+#: Merge.rc:4670
msgid "Communication"
msgstr "コミュニケーション"
#. IDS_PRPCAT_CONTACT
-#: Merge.rc:4661
+#: Merge.rc:4671
msgid "Contact"
msgstr "連絡先"
#. IDS_PRPCAT_DEVICES
-#: Merge.rc:4662
+#: Merge.rc:4672
msgid "Devices"
msgstr "デバイス"
#. IDS_PRPCAT_DOCUMENT
-#: Merge.rc:4663
+#: Merge.rc:4673
msgid "Document"
msgstr "ドキュメント"
#. IDS_PRPCAT_HOME
-#: Merge.rc:4664
+#: Merge.rc:4674
msgid "Home"
msgstr "ホーム"
#. IDS_PRPCAT_JOURNAL
-#: Merge.rc:4666
+#: Merge.rc:4676
msgid "Journal"
msgstr "ジャーナル"
#. IDS_PRPCAT_LINK
-#: Merge.rc:4667
+#: Merge.rc:4677
msgid "Link"
msgstr "リンク"
#. IDS_PRPCAT_MEDIA
-#: Merge.rc:4668
+#: Merge.rc:4678
msgid "Media"
msgstr "メディア"
#. IDS_PRPCAT_MUSIC
-#: Merge.rc:4670
+#: Merge.rc:4680
msgid "Music"
msgstr "音楽"
#. IDS_PRPCAT_NOTE
-#: Merge.rc:4671
+#: Merge.rc:4681
msgid "Note"
msgstr "ノート"
#. IDS_PRPCAT_PHOTO
-#: Merge.rc:4672
+#: Merge.rc:4682
msgid "Photo"
msgstr "写真"
#. IDS_PRPCAT_RECORDEDTV
-#: Merge.rc:4673
+#: Merge.rc:4683
msgid "RecordedTV"
msgstr "TV録画"
#. IDS_PRPCAT_SEARCH
-#: Merge.rc:4674
+#: Merge.rc:4684
msgid "Search"
msgstr "検索"
#. IDS_PRPCAT_SECURITY
-#: Merge.rc:4675
+#: Merge.rc:4685
msgid "Security"
msgstr "セキュリティ"
#. IDS_PRPCAT_SOFTWARE
-#: Merge.rc:4676
+#: Merge.rc:4686
msgid "Software"
msgstr "ソフトウェア"
#. IDS_PRPCAT_TASK
-#: Merge.rc:4677
+#: Merge.rc:4687
msgid "Task"
msgstr "タスク"
#. IDS_PRPCAT_VIDEO
-#: Merge.rc:4678
+#: Merge.rc:4688
msgid "Video"
msgstr "ビデオ"
#. IDS_PRPCAT_HASH
-#: Merge.rc:4679
+#: Merge.rc:4689
msgid "Hash"
msgstr "ハッシュ"
#. IDS_CANT_COMPARE_FILES
-#: Merge.rc:4685
+#: Merge.rc:4695
msgid "Unable to compare files"
msgstr "ファイルを比較できません"
#. IDS_ABORTED_ITEM
-#: Merge.rc:4686
+#: Merge.rc:4696
msgid "Item aborted"
msgstr "中断された項目"
#. IDS_FILE_SKIPPED
-#: Merge.rc:4687
+#: Merge.rc:4697
msgid "File skipped"
msgstr "スキップされたファイル"
#. IDS_DIR_SKIPPED
-#: Merge.rc:4688
+#: Merge.rc:4698
msgid "Folder skipped"
msgstr "スキップされたフォルダー"
#. IDS_LEFT_ONLY_IN_FMT
-#: Merge.rc:4689
+#: Merge.rc:4699
#, c-format
msgid "Left only: %1"
msgstr "左側のみ: %1"
#. IDS_MIDDLE_ONLY_IN_FMT
-#: Merge.rc:4690
+#: Merge.rc:4700
#, c-format
msgid "Middle only: %1"
msgstr "中央のみ: %1"
#. IDS_RIGHT_ONLY_IN_FMT
-#: Merge.rc:4691
+#: Merge.rc:4701
#, c-format
msgid "Right only: %1"
msgstr "右側のみ: %1"
#. IDS_DOES_NOT_EXIST_IN_FMT
-#: Merge.rc:4692
+#: Merge.rc:4702
#, c-format
msgid "Does not exist in %1"
msgstr "%1 内のみ存在しません"
#. IDS_BIN_FILES_SAME
-#: Merge.rc:4693
+#: Merge.rc:4703
msgid "Binary files are identical"
msgstr "バイナリ ファイルは同一です"
#. IDS_BIN_FILES_DIFF
-#: Merge.rc:4699
+#: Merge.rc:4709
msgid "Binary files are different"
msgstr "バイナリ ファイルは異なっています"
#. IDS_FILES_ARE_DIFFERENT
-#: Merge.rc:4700
+#: Merge.rc:4710
msgid "Files are different"
msgstr "ファイルは異なっています"
#. IDS_FOLDERS_ARE_DIFFERENT
-#: Merge.rc:4701
+#: Merge.rc:4711
msgid "Folders are different"
msgstr "フォルダーは異なっています"
#. IDS_LEFTONLY
-#: Merge.rc:4702
+#: Merge.rc:4712
msgid "Left Only"
msgstr "左側のみ"
#. IDS_RIGHTONLY
-#: Merge.rc:4703
+#: Merge.rc:4713
msgid "Right Only"
msgstr "右側のみ"
#. IDS_MIDDLEONLY
-#: Merge.rc:4704
+#: Merge.rc:4714
msgid "Middle Only"
msgstr "中央のみ"
#. IDS_NOITEMLEFT
-#: Merge.rc:4705
+#: Merge.rc:4715
msgid "No item in left"
msgstr "左側にない"
#. IDS_NOITEMRIGHT
-#: Merge.rc:4706
+#: Merge.rc:4716
msgid "No item in right"
msgstr "右側にない"
#. IDS_NOITEMMIDDLE
-#: Merge.rc:4707
+#: Merge.rc:4717
msgid "No item in middle"
msgstr "中央にない"
#. IDS_CMPRES_ERROR
-#: Merge.rc:4709
+#: Merge.rc:4719
msgid "Error"
msgstr "エラー"
#. IDS_TEXT_FILES_SAME
-#: Merge.rc:4710
+#: Merge.rc:4720
msgid "Text files are identical"
msgstr "テキスト ファイルは同一です"
#. IDS_LEFTONLY_DIFF
-#: Merge.rc:4711
+#: Merge.rc:4721
msgid " (Middle and right are identical)"
msgstr " (中央と右側は同一です)"
#. IDS_MIDDLEONLY_DIFF
-#: Merge.rc:4712
+#: Merge.rc:4722
msgid " (Left and right are identical)"
msgstr " (左側と右側は同一です)"
#. IDS_RIGHTONLY_DIFF
-#: Merge.rc:4713
+#: Merge.rc:4723
msgid " (Left and middle are identical)"
msgstr " (左側と中央は同一です)"
#. IDS_PATH_MISMATCH
-#: Merge.rc:4714
+#: Merge.rc:4724
msgid " (paths differ)"
msgstr "(パス不一致)"
#. IDS_TEXT_FILES_DIFF
-#: Merge.rc:4715
+#: Merge.rc:4725
msgid "Text files are different"
msgstr "テキスト ファイルは異なります"
#. IDS_IMAGE_FILES_SAME
-#: Merge.rc:4716
+#: Merge.rc:4726
msgid "Image files are identical"
msgstr "画像ファイルは同一です"
#. IDS_IMAGE_FILES_DIFF
-#: Merge.rc:4717
+#: Merge.rc:4727
msgid "Image files are different"
msgstr "画像ファイルは異なります"
#. IDS_EXPR_DIFF
-#: Merge.rc:4718
+#: Merge.rc:4728
#, c-format
msgid "Files are different (expr: %1)"
msgstr "ファイルは異なります (式: %1)"
#. IDS_HASH_GROUP
-#: Merge.rc:4719
+#: Merge.rc:4729
#, c-format
msgid "Group%d"
msgstr "グループ%d"
#. IDS_RENAME_MOVE_DETECTION_DISALBED
-#: Merge.rc:4720
+#: Merge.rc:4730
msgctxt "Options dialog|Compare|Folder|Detect renames and moves"
msgid "Disabled"
msgstr "無効"
#. IDS_RENAME_MOVE_DETECTION_RENAME
-#: Merge.rc:4721
+#: Merge.rc:4731
msgid "Detect renames"
msgstr "名前変更を検出"
#. IDS_RENAME_MOVE_DETECTION_RENAME_MOVE
-#: Merge.rc:4722
+#: Merge.rc:4732
msgid "Detect renames and moves"
msgstr "名前変更と移動を検出"
#. IDS_RENAME_MOVE_MERGE_MODE_RENAME
-#: Merge.rc:4723
+#: Merge.rc:4733
msgid "Merge renames"
msgstr "名前変更項目をマージ"
#. IDS_RENAME_MOVE_MERGE_MODE_RENAME_MOVE
-#: Merge.rc:4724
+#: Merge.rc:4734
msgid "Merge renames and moves"
msgstr "名前変更と移動項目をマージ"
#. IDS_RENAMED
-#: Merge.rc:4725
+#: Merge.rc:4735
msgid "Renamed"
msgstr "名前変更"
#. IDS_MOVED
-#: Merge.rc:4726
+#: Merge.rc:4736
msgid "Moved"
msgstr "移動"
#. IDS_RENAMED_MOVED
-#: Merge.rc:4727
+#: Merge.rc:4737
msgid "Renamed/Moved"
msgstr "名前変更/移動"
#. IDS_RENAMED_MOVED_ITEMS
-#: Merge.rc:4728
+#: Merge.rc:4738
#, c-format
msgid "(%1 items)"
msgstr "(%1 項目)"
#. IDS_RENAMED_MOVED_RESULT
-#: Merge.rc:4729
+#: Merge.rc:4739
#, c-format
msgid "%1 (set %2): "
msgstr "%1 (グループ %2): "
#. IDS_SWITCH_FLAT_MODE
-#: Merge.rc:4730
+#: Merge.rc:4740
msgid ""
"Some moved items have been merged.\n"
"In Tree Mode, these items may appear in positions that do not reflect the actual folder structure, which can be confusing.\n"
@@ -6575,235 +6586,235 @@ msgstr ""
"フラット表示に切り替えますか?"
#. IDS_ELAPSED_TIME
-#: Merge.rc:4736
+#: Merge.rc:4746
#, c-format
msgid "Elapsed time: %ld ms"
msgstr "経過時間: %ld ms"
#. IDS_STATUS_SELITEM1
-#: Merge.rc:4737
+#: Merge.rc:4747
msgid "1 item selected"
msgstr "1 個の項目を選択"
#. IDS_STATUS_SELITEMS
-#: Merge.rc:4738
+#: Merge.rc:4748
#, c-format
msgid "%1 items selected"
msgstr "%1 個の項目を選択"
#. IDS_COLDESC_FILENAME
-#: Merge.rc:4744
+#: Merge.rc:4754
msgid "Filename or folder name."
msgstr "ファイル名またはフォルダー名です。"
#. IDS_COLDESC_DIR
-#: Merge.rc:4745
+#: Merge.rc:4755
msgid "Subfolder name when subfolders are included."
msgstr "サブフォルダー名です。[サブフォルダーを含める] が有効な場合に表示されます。"
#. IDS_COLDESC_RESULT
-#: Merge.rc:4746
+#: Merge.rc:4756
msgid "Comparison result, long form."
msgstr "長い形式の比較結果を表示します。"
#. IDS_COLDESC_LTIMEM
-#: Merge.rc:4751
+#: Merge.rc:4761
msgid "Left side modification date."
msgstr "左側の更新日時です。"
#. IDS_COLDESC_RTIMEM
-#: Merge.rc:4752
+#: Merge.rc:4762
msgid "Right side modification date."
msgstr "右側の更新日時です。"
#. IDS_COLDESC_MTIMEM
-#: Merge.rc:4753
+#: Merge.rc:4763
msgid "Middle side modification date."
msgstr "中央の更新日時です。"
#. IDS_COLDESC_EXTENSION
-#: Merge.rc:4754
+#: Merge.rc:4764
msgid "File's extension."
msgstr "ファイルの拡張子です。"
#. IDS_COLDESC_LSIZE
-#: Merge.rc:4755
+#: Merge.rc:4765
msgid "Left file size in bytes."
msgstr "左側ファイルのバイト数です。"
#. IDS_COLDESC_RSIZE
-#: Merge.rc:4756
+#: Merge.rc:4766
msgid "Right file size in bytes."
msgstr "右側ファイルのバイト数です。"
#. IDS_COLDESC_MSIZE
-#: Merge.rc:4757
+#: Merge.rc:4767
msgid "Middle file size in bytes."
msgstr "中央ファイルのバイト数です。"
#. IDS_COLDESC_LSIZE_SHORT
-#: Merge.rc:4758
+#: Merge.rc:4768
msgid "Left file size abbreviated."
msgstr "左側ファイルのバイト数(短縮形)です。"
#. IDS_COLDESC_RSIZE_SHORT
-#: Merge.rc:4759
+#: Merge.rc:4769
msgid "Right file size abbreviated."
msgstr "右側ファイルのバイト数(短縮形)です。"
#. IDS_COLDESC_MSIZE_SHORT
-#: Merge.rc:4760
+#: Merge.rc:4770
msgid "Middle file size abbreviated."
msgstr "中央ファイルのバイト数(短縮形)です。"
#. IDS_COLDESC_LTIMEC
-#: Merge.rc:4766
+#: Merge.rc:4776
msgid "Left side creation time."
msgstr "左側の作成日時です。"
#. IDS_COLDESC_RTIMEC
-#: Merge.rc:4767
+#: Merge.rc:4777
msgid "Right side creation time."
msgstr "右側の作成日時です。"
#. IDS_COLDESC_MTIMEC
-#: Merge.rc:4768
+#: Merge.rc:4778
msgid "Middle side creation time."
msgstr "中央の作成日時です。"
#. IDS_COLDESC_NEWER
-#: Merge.rc:4769
+#: Merge.rc:4779
msgid "Tells which side has newer modification date."
msgstr "どちらが最新の更新日時かを表示します。"
#. IDS_COLDESC_LVERSION
-#: Merge.rc:4770
+#: Merge.rc:4780
msgid "Left side file version, only for some file types."
msgstr "左側ファイルのバージョンです。一部のファイル形式に限り表示されます。"
#. IDS_COLDESC_RVERSION
-#: Merge.rc:4771
+#: Merge.rc:4781
msgid "Right side file version, only for some file types."
msgstr "右側ファイルのバージョンです。一部のファイル形式に限り表示されます。"
#. IDS_COLDESC_MVERSION
-#: Merge.rc:4776
+#: Merge.rc:4786
msgid "Middle side file version, only for some file types."
msgstr "中央ファイルのバージョンです。一部のファイル形式に限り表示されます。"
#. IDS_COLDESC_RESULT_ABBR
-#: Merge.rc:4777
+#: Merge.rc:4787
msgid "Short comparison result."
msgstr "短い形式の比較結果を表示します。"
#. IDS_COLDESC_LATTRIBUTES
-#: Merge.rc:4778
+#: Merge.rc:4788
msgid "Left side attributes."
msgstr "左側の属性です。"
#. IDS_COLDESC_RATTRIBUTES
-#: Merge.rc:4779
+#: Merge.rc:4789
msgid "Right side attributes."
msgstr "右側の属性です。"
#. IDS_COLDESC_MATTRIBUTES
-#: Merge.rc:4780
+#: Merge.rc:4790
msgid "Middle side attributes."
msgstr "中央の属性です。"
#. IDS_COLDESC_LEOL_TYPE
-#: Merge.rc:4781
+#: Merge.rc:4791
msgid "Left side file EOL type."
msgstr "左側の EOL タイプです。"
#. IDS_COLDESC_REOL_TYPE
-#: Merge.rc:4782
+#: Merge.rc:4792
msgid "Right side file EOL type."
msgstr "右側の EOL タイプです。"
#. IDS_COLDESC_MEOL_TYPE
-#: Merge.rc:4783
+#: Merge.rc:4793
msgid "Middle side file EOL type."
msgstr "中央の EOL タイプです。"
#. IDS_COLDESC_LENCODING
-#: Merge.rc:4789
+#: Merge.rc:4799
msgid "Left side encoding."
msgstr "左側の文字コードです。"
#. IDS_COLDESC_RENCODING
-#: Merge.rc:4790
+#: Merge.rc:4800
msgid "Right side encoding."
msgstr "右側の文字コードです。"
#. IDS_COLDESC_MENCODING
-#: Merge.rc:4791
+#: Merge.rc:4801
msgid "Middle side encoding."
msgstr "中央の文字コードです。"
#. IDS_COLDESC_NIDIFFS
-#: Merge.rc:4792
+#: Merge.rc:4802
msgid "Number of ignored differences in file. Ignored and cannot be merged."
msgstr "ファイル内で無視した差異の数です。この差異は WinMerge によって無視され、マージされません。"
#. IDS_COLDESC_NSDIFFS
-#: Merge.rc:4793
+#: Merge.rc:4803
msgid "Number of differences in file (excluding ignored)."
msgstr "ファイル内の差異の数です。この数値は無視した差異数を含みません。"
#. IDS_COLDESC_BINARY
-#: Merge.rc:4794
+#: Merge.rc:4804
msgid "Shows an asterisk (*) if the file is binary."
msgstr "バイナリ ファイルの場合にアスタリスク (*) を表示します。"
#. IDS_COLDESC_UNPACKER
-#: Merge.rc:4795
+#: Merge.rc:4805
msgid "Unpacker plugin name or pipeline."
msgstr "展開プラグイン名またはパイプラインを表示します。"
#. IDS_COLDESC_PREDIFFER
-#: Merge.rc:4796
+#: Merge.rc:4806
msgid "Prediffer plugin name or pipeline."
msgstr "比較前処理プラグイン名またはパイプラインを表示します。"
#. IDS_DIRECTORY_REPORT_TITLE
-#: Merge.rc:4802
+#: Merge.rc:4812
#, c-format
msgid "Compare %1 with %2"
msgstr "%1 と %2 の比較"
#. IDS_DIRECTORY_REPORT_TITLE3
-#: Merge.rc:4803
+#: Merge.rc:4813
#, c-format
msgid "Compare %1 with %2 and %3"
msgstr "%1 と %2 および %3 の比較"
#. IDS_REPORT_COMMALIST
-#: Merge.rc:4804
+#: Merge.rc:4814
msgid "Comma-separated list"
msgstr "CSV 形式"
#. IDS_REPORT_TABLIST
-#: Merge.rc:4805
+#: Merge.rc:4815
msgid "Tab-separated list"
msgstr "TAB 区切り形式"
#. IDS_REPORT_SIMPLEHTML
-#: Merge.rc:4806
+#: Merge.rc:4816
msgid "Simple HTML"
msgstr "シンプルな HTML 形式"
#. IDS_REPORT_SIMPLEXML
-#: Merge.rc:4807
+#: Merge.rc:4817
msgid "Simple XML"
msgstr "シンプルな XML 形式"
-#: Merge.rc:4809
+#: Merge.rc:4819
msgid "Report file already exists. Overwrite?"
msgstr "レポート ファイルは既に存在しています。既存のファイルを上書きしますか?"
#. IDS_REPORT_ERROR
-#: Merge.rc:4814
+#: Merge.rc:4824
#, c-format
msgid ""
"Error creating the report:\n"
@@ -6813,27 +6824,27 @@ msgstr ""
"%1"
#. IDS_REPORT_SUCCESS
-#: Merge.rc:4815
+#: Merge.rc:4825
msgid "Report created successfully."
msgstr "レポートの生成に成功しました。"
#. IDS_SYNCPOINT_LASTBLOCK
-#: Merge.rc:4821
+#: Merge.rc:4831
msgid "Cannot add a synchronization point at this line."
msgstr "この行には同期ポイントを追加できません。"
#. IDS_FILE_TO_ITSELF
-#: Merge.rc:4827
+#: Merge.rc:4837
msgid "Same file is opened in both panes."
msgstr "同じファイルが両側のパネルで開かれています。"
#. IDS_FILESSAME
-#: Merge.rc:4828
+#: Merge.rc:4838
msgid "Selected files are identical."
msgstr "選択されたファイルは同一です。"
#. IDS_FILESSAME_CURCFG
-#: Merge.rc:4829
+#: Merge.rc:4839
msgid ""
"Selected files are identical (with current settings).\r\n"
"Checking binary identity..."
@@ -6842,7 +6853,7 @@ msgstr ""
"バイナリ一致を確認しています..."
#. IDS_FILESSAME_BINERROR
-#: Merge.rc:4830
+#: Merge.rc:4840
msgid ""
"Selected files are identical (with current settings).\r\n"
"But binary comparison failed."
@@ -6851,12 +6862,12 @@ msgstr ""
"しかし、バイナリ比較でエラーが発生しました。"
#. IDS_FILESSAME_BINSAME
-#: Merge.rc:4831
+#: Merge.rc:4841
msgid "Selected files are identical (binary match)."
msgstr "選択されたファイルは一致しています(バイナリ一致)。"
#. IDS_FILESSAME_BINDIFF
-#: Merge.rc:4832
+#: Merge.rc:4842
msgid ""
"Selected files are identical (with current settings).\r\n"
"But differ at the binary level."
@@ -6865,17 +6876,17 @@ msgstr ""
"しかし、バイナリレベルでは異なります。"
#. IDS_FILEERROR
-#: Merge.rc:4833
+#: Merge.rc:4843
msgid "An error occurred while comparing files."
msgstr "ファイルの比較時にエラーが発生しました。"
#. IDS_TEMP_FILEERROR
-#: Merge.rc:4834
+#: Merge.rc:4844
msgid "Could not create temporary files. Check your temporary path settings."
msgstr "テンポラリ ファイルが作成できません。テンポラリ パス設定を確認してください。"
#. IDS_SUGGEST_IGNOREEOL
-#: Merge.rc:4835
+#: Merge.rc:4845
msgid ""
"Files use different EOL.\n"
"\n"
@@ -6892,17 +6903,17 @@ msgstr ""
"有効にしてください。"
#. IDS_INVALID_DIRECTORY
-#: Merge.rc:4836
+#: Merge.rc:4846
msgid "Selected folder is invalid."
msgstr "選択されたフォルダーは無効です。"
#. IDS_CANNOT_OPEN_BINARYFILE
-#: Merge.rc:4837
+#: Merge.rc:4847
msgid "Cannot open a binary file in Editor."
msgstr "バイナリ ファイルをエディターで開くことはできません。"
#. IDS_CREATE_PAIR_FOLDER
-#: Merge.rc:4838
+#: Merge.rc:4848
#, c-format
msgid ""
"Create matching folder:\n"
@@ -6915,41 +6926,41 @@ msgstr ""
"%1"
#. IDS_CONFIRM_COPY_ALL_DIFFS
-#: Merge.rc:4839
+#: Merge.rc:4849
msgid "Copy all differences to other file?"
msgstr "本当にすべての差異を他のファイルにコピーしますか?"
#. IDS_MOVE_TO_NEXTFILE
-#: Merge.rc:4844
+#: Merge.rc:4854
msgid "Move to next file?"
msgstr "次のファイルに移動しますか?"
#. IDS_MOVE_TO_PREVFILE
-#: Merge.rc:4845
+#: Merge.rc:4855
msgid "Move to previous file?"
msgstr "前のファイルに移動しますか?"
#. IDS_MOVE_TO_NEXTPAGE
-#: Merge.rc:4846
+#: Merge.rc:4856
msgid "Move to next page?"
msgstr "次のページに移動しますか?"
#. IDS_MOVE_TO_PREVPAGE
-#: Merge.rc:4847
+#: Merge.rc:4857
msgid "Move to previous page?"
msgstr "前のページに移動しますか?"
#. IDS_MOVE_TO_FIRSTFILE
-#: Merge.rc:4848
+#: Merge.rc:4858
msgid "Move to first file?"
msgstr "最初のファイルに移動しますか?"
#. IDS_MOVE_TO_LASTFILE
-#: Merge.rc:4849
+#: Merge.rc:4859
msgid "Move to last file?"
msgstr "最後のファイルに移動しますか?"
-#: Merge.rc:4856
+#: Merge.rc:4866
#, c-format
msgid ""
"Different codepages: left (cp%d), right (cp%d).\n"
@@ -6960,53 +6971,53 @@ msgstr ""
"各々のファイルをそのコードページで表示すれば、正しく表示されますが、マージやコピーが危険になります。\n"
"コードページをデフォルト コードページとして扱いますが、よろしいですか(推奨)?"
-#: Merge.rc:4858
+#: Merge.rc:4868
msgid "Information lost due to encoding errors: both files"
msgstr "エンコーディング エラーにより情報が失われています。(両側のファイル)"
-#: Merge.rc:4860
+#: Merge.rc:4870
msgid "Information lost due to encoding errors: first file"
msgstr "エンコーディング エラーにより情報が失われています。(1 番目のファイル)"
-#: Merge.rc:4862
+#: Merge.rc:4872
msgid "Information lost due to encoding errors: second file"
msgstr "エンコーディング エラーにより情報が失われています。(2 番目のファイル)"
-#: Merge.rc:4864
+#: Merge.rc:4874
msgid "Information lost due to encoding errors: third file"
msgstr "エンコーディング エラーにより情報が失われています。(3 番目のファイル)"
#. IDS_LINEDIFF_NODIFF
-#: Merge.rc:4870
+#: Merge.rc:4880
msgid "No difference"
msgstr "差異はありません"
#. IDS_LINEDIFF_NODIFF_CAPTION
-#: Merge.rc:4871
+#: Merge.rc:4881
msgid "Line difference"
msgstr "行内差異"
#. IDS_NUM_REPLACED
-#: Merge.rc:4877
+#: Merge.rc:4887
#, c-format
msgid "Replaced %1 string(s)."
msgstr "%1 個の文字列を置換しました。"
#. IDS_EDIT_TEXT_NOT_FOUND
-#: Merge.rc:4878
+#: Merge.rc:4888
#, c-format
msgid "Cannot find string \"%s\"."
msgstr "文字列 \"%s\" が見つかりません。"
#. IDS_MERGE_MODE
-#: Merge.rc:4884
+#: Merge.rc:4894
msgid "Entering Merge Mode. Press F9 to turn off."
msgstr ""
"マージモードに切り替えます。マージモードはカーソル キーのみでマージしたり、次や前の差異に移動できるモードです。\n"
"マージモードをオフにしたい場合は、F9 キーを押してください。"
#. IDS_AUTO_MERGE
-#: Merge.rc:4890
+#: Merge.rc:4900
#, c-format
msgid ""
"Automatic merges: %1\n"
@@ -7016,99 +7027,99 @@ msgstr ""
"解決されていないコンフリクトの数: %2"
#. IDS_CODEPAGE_MERGED
-#: Merge.rc:4891
+#: Merge.rc:4901
msgid "Codepage change merged."
msgstr "コードページの変更がマージされました。"
#. IDS_CODEPAGE_CONFLICT
-#: Merge.rc:4892
+#: Merge.rc:4902
msgid "Codepage changes are conflicting."
msgstr "コードページの変更がコンフリクトしています。"
#. IDS_EOL_MERGED
-#: Merge.rc:4893
+#: Merge.rc:4903
msgid "EOL change merged."
msgstr "改行コードの変更がマージされました。"
#. IDS_EOL_CONFLICT
-#: Merge.rc:4894
+#: Merge.rc:4904
msgid "EOL changes are conflicting."
msgstr "改行コードの変更がコンフリクトしています。"
#. IDS_LOCBAR_CAPTION
-#: Merge.rc:4900
+#: Merge.rc:4910
msgid "Location Pane"
msgstr "ロケーション ペイン"
#. IDS_DIFFBAR_CAPTION
-#: Merge.rc:4901
+#: Merge.rc:4911
msgid "Diff Pane"
msgstr "Diff ペイン"
#. IDS_DIFF_SUCCEEDED
-#: Merge.rc:4908
+#: Merge.rc:4918
msgid "Patch file written."
msgstr "パッチ ファイルの書き込みに成功しました。"
#. IDS_DIFF_ITEM1NOTFOUND
-#: Merge.rc:4909
+#: Merge.rc:4919
msgid "First item not found!"
msgstr "1. 項目が見つかりません!"
#. IDS_DIFF_ITEM2NOTFOUND
-#: Merge.rc:4910
+#: Merge.rc:4920
msgid "Second item not found!"
msgstr "2. 項目が見つかりません!"
#. IDS_DIFF_FILEOVERWRITE
-#: Merge.rc:4911
+#: Merge.rc:4921
msgid "Patch file already exists. Overwrite?"
msgstr "出力結果ファイルは既に存在しています。上書きしますか?"
#. IDS_DIFF_SELECTEDFILES
-#: Merge.rc:4912
+#: Merge.rc:4922
#, c-format
msgid "[%1 files selected]"
msgstr "[%1 個のファイルが選択されています]"
#. IDS_DIFF_NORMAL
-#: Merge.rc:4913
+#: Merge.rc:4923
msgid "Normal"
msgstr "ノーマル"
#. IDS_DIFF_CONTEXT
-#: Merge.rc:4914
+#: Merge.rc:4924
msgid "Context"
msgstr "コンテキスト"
#. IDS_DIFF_UNIFIED
-#: Merge.rc:4915
+#: Merge.rc:4925
msgid "Unified"
msgstr "ユニファイド"
#. IDS_FILEWRITE_ERROR
-#: Merge.rc:4917
+#: Merge.rc:4927
#, c-format
msgid "Could not write to file %1."
msgstr "ファイル %1 に書き込めません。"
#. IDS_PATH_NOT_ABSOLUTE
-#: Merge.rc:4918
+#: Merge.rc:4928
#, c-format
msgid "Output path is not absolute: %1"
msgstr "指定した出力パスは、絶対パスではありません: %1"
#. IDS_MUST_SPECIFY_OUTPUT
-#: Merge.rc:4919
+#: Merge.rc:4929
msgid "Specify an output file."
msgstr "出力パスを指定してください。"
-#: Merge.rc:4921
+#: Merge.rc:4931
msgid "Cannot create patch from binary files."
msgstr "バイナリ ファイルからパッチ ファイルは生成できません。"
#. IDS_SAVEFILES_FORPATCH
-#: Merge.rc:4922
+#: Merge.rc:4932
msgid ""
"Save all files first.\n"
"\n"
@@ -7119,12 +7130,12 @@ msgstr ""
"パッチの生成には、変更がすべて保存されている必要があります。"
#. IDS_FOLDER_NOTEXIST
-#: Merge.rc:4923
+#: Merge.rc:4933
msgid "Folder does not exist."
msgstr "フォルダーは存在しません。"
#. IDS_NO_ZIP_SUPPORT
-#: Merge.rc:4928
+#: Merge.rc:4938
msgid ""
"Archive support not enabled.\n"
"7-Zip and/or Merge7z*.dll not found.\n"
@@ -7135,37 +7146,37 @@ msgstr ""
"アーカイブ サポートを有効にする方法については、マニュアルを参照してください。"
#. IDS_OPT_EXPORT_CAPTION
-#: Merge.rc:4929
+#: Merge.rc:4939
msgid "Select file for export"
msgstr "エクスポートするファイルを指定してください"
#. IDS_OPT_IMPORT_CAPTION
-#: Merge.rc:4930
+#: Merge.rc:4940
msgid "Select file for import"
msgstr "インポートするファイルを選択してください"
#. IDS_OPT_IMPORT_DONE
-#: Merge.rc:4931
+#: Merge.rc:4941
msgid "Options imported from file."
msgstr "設定情報をファイルからインポートしました。"
#. IDS_OPT_EXPORT_DONE
-#: Merge.rc:4932
+#: Merge.rc:4942
msgid "Options exported to file."
msgstr "設定情報をファイルにエクスポートしました。"
#. IDS_OPT_IMPORT_ERR
-#: Merge.rc:4933
+#: Merge.rc:4943
msgid "Failed to import options from file."
msgstr "ファイルから設定情報のインポートに失敗しました。"
#. IDS_OPT_EXPORT_ERR
-#: Merge.rc:4934
+#: Merge.rc:4944
msgid "Failed to write options to file."
msgstr "ファイルへの設定情報の書き込みに失敗しました。"
#. IDS_CLOSEALL_WINDOWS
-#: Merge.rc:4935
+#: Merge.rc:4945
msgid ""
"Close multiple compare windows?\n"
"\n"
@@ -7176,44 +7187,44 @@ msgstr ""
"続行しますか?"
#. IDS_EOL_MIXED
-#: Merge.rc:4944
+#: Merge.rc:4954
msgid "Mixed"
msgstr "Mixed"
#. IDS_EOL_BIN
-#: Merge.rc:4945
+#: Merge.rc:4955
msgctxt "EOL Type"
msgid "Binary"
msgstr "バイナリ"
#. IDS_EOL_NONE
-#: Merge.rc:4949
+#: Merge.rc:4959
msgid "None"
msgstr "なし"
#. IDS_MARKER_COLOR_FMT
-#: Merge.rc:4950
+#: Merge.rc:4960
#, c-format
msgid "Marker Color %d"
msgstr "マーカー色 %d"
#. IDS_MARKER_NEW_PATTERN
-#: Merge.rc:4951
+#: Merge.rc:4961
msgid "New Pattern"
msgstr "新しいパターン"
#. IDS_PLUGINSLIST_TYPE
-#: Merge.rc:4957
+#: Merge.rc:4967
msgid "Type"
msgstr "タイプ"
#. IDS_PLUGINS_TYPE_EDITSCRIPT
-#: Merge.rc:4961
+#: Merge.rc:4971
msgid "Editor script"
msgstr "エディター スクリプト"
#. ID_SELECTLINEDIFF
-#: Merge.rc:4967
+#: Merge.rc:4977
msgid ""
"\n"
"Difference in Current Line (F4)"
@@ -7222,7 +7233,7 @@ msgstr ""
"現在の行内差異 (F4)"
#. ID_OPTIONS
-#: Merge.rc:4968
+#: Merge.rc:4978
msgid ""
"\n"
"Options"
@@ -7231,7 +7242,7 @@ msgstr ""
"設定"
#. ID_REFRESH
-#: Merge.rc:4969
+#: Merge.rc:4979
msgid ""
"\n"
"Refresh (F5)"
@@ -7240,7 +7251,7 @@ msgstr ""
"表示更新 (F5)"
#. ID_PREVDIFF
-#: Merge.rc:4975
+#: Merge.rc:4985
msgid ""
"\n"
"Previous Difference (Alt+Up)"
@@ -7249,7 +7260,7 @@ msgstr ""
"前の差異 (Alt+Up)"
#. ID_NEXTDIFF
-#: Merge.rc:4976
+#: Merge.rc:4986
msgid ""
"\n"
"Next Difference (Alt+Down)"
@@ -7258,7 +7269,7 @@ msgstr ""
"次の差異 (Alt+Down)"
#. ID_PREVCONFLICT
-#: Merge.rc:4977
+#: Merge.rc:4987
msgid ""
"\n"
"Previous Conflict (Alt+Shift+Up)"
@@ -7267,7 +7278,7 @@ msgstr ""
"前のコンフリクト (Alt+Shift+Up)"
#. ID_NEXTCONFLICT
-#: Merge.rc:4978
+#: Merge.rc:4988
msgid ""
"\n"
"Next Conflict (Alt+Shift+Down)"
@@ -7276,7 +7287,7 @@ msgstr ""
"次のコンフリクト (Alt+Shift+Down)"
#. ID_FIRSTDIFF
-#: Merge.rc:4983
+#: Merge.rc:4993
msgid ""
"\n"
"First Difference (Alt+Home)"
@@ -7285,7 +7296,7 @@ msgstr ""
"最初の差異 (Alt+Home)"
#. ID_CURDIFF
-#: Merge.rc:4984
+#: Merge.rc:4994
msgid ""
"\n"
"Current Difference (Alt+Enter)"
@@ -7294,7 +7305,7 @@ msgstr ""
"現在の差異 (Alt+Enter)"
#. ID_LASTDIFF
-#: Merge.rc:4985
+#: Merge.rc:4995
msgid ""
"\n"
"Last Difference (Alt+End)"
@@ -7303,7 +7314,7 @@ msgstr ""
"最後の差異 (Alt+End)"
#. ID_L2R
-#: Merge.rc:4986
+#: Merge.rc:4996
msgid ""
"\n"
"Copy to Right (Alt+Right)"
@@ -7312,7 +7323,7 @@ msgstr ""
"右側へコピー (Alt+Right)"
#. ID_R2L
-#: Merge.rc:4987
+#: Merge.rc:4997
msgid ""
"\n"
"Copy to Left (Alt+Left)"
@@ -7321,7 +7332,7 @@ msgstr ""
"左側へコピー (Alt+Left)"
#. ID_L2RNEXT
-#: Merge.rc:4988
+#: Merge.rc:4998
msgid ""
"\n"
"Copy to Right and Advance (Ctrl+Alt+Right)"
@@ -7330,7 +7341,7 @@ msgstr ""
"右側へコピーし次へ (Ctrl+Alt+Right)"
#. ID_R2LNEXT
-#: Merge.rc:4989
+#: Merge.rc:4999
msgid ""
"\n"
"Copy to Left and Advance (Ctrl+Alt+Left)"
@@ -7339,7 +7350,7 @@ msgstr ""
"左側へコピーし次へ (Ctrl+Alt+Left)"
#. ID_ALL_RIGHT
-#: Merge.rc:4990
+#: Merge.rc:5000
msgid ""
"\n"
"Copy All to Right"
@@ -7348,7 +7359,7 @@ msgstr ""
"すべてを右側にコピー"
#. ID_ALL_LEFT
-#: Merge.rc:4991
+#: Merge.rc:5001
msgid ""
"\n"
"Copy All to Left"
@@ -7357,7 +7368,7 @@ msgstr ""
"すべてを左側にコピー"
#. ID_AUTO_MERGE
-#: Merge.rc:4992
+#: Merge.rc:5002
msgid ""
"\n"
"Auto Merge (Ctrl+Alt+M)"
@@ -7366,7 +7377,7 @@ msgstr ""
"自動マージ (Ctrl+Alt+M)"
#. ID_FIRSTFILE
-#: Merge.rc:4993
+#: Merge.rc:5003
msgid ""
"\n"
"First File"
@@ -7375,7 +7386,7 @@ msgstr ""
"最初のファイル"
#. ID_NEXTFILE
-#: Merge.rc:4994
+#: Merge.rc:5004
msgid ""
"\n"
"Next File (Ctrl+F8)"
@@ -7384,7 +7395,7 @@ msgstr ""
"次のファイル (Ctrl+F8)"
#. ID_LASTFILE
-#: Merge.rc:4995
+#: Merge.rc:5005
msgid ""
"\n"
"Last File"
@@ -7393,7 +7404,7 @@ msgstr ""
"最後のファイル"
#. ID_PREVFILE
-#: Merge.rc:4996
+#: Merge.rc:5006
msgid ""
"\n"
"Previous File (Ctrl+F7)"
@@ -7402,37 +7413,37 @@ msgstr ""
"前のファイル (Ctrl+F7)"
#. IDS_UNPACK_AUTO
-#: Merge.rc:5003
+#: Merge.rc:5013
msgid "Adapted unpacker applied to both files (one needs extension)."
msgstr "自動的に展開プラグインを選択し、両側のファイルに適用します (どちらかのファイルに拡張子が必要です)"
#. IDS_NO_PREDIFFER
-#: Merge.rc:5004
+#: Merge.rc:5014
msgid "No Prediffer (Normal)"
msgstr "比較前処理プラグインを使用しない (標準)"
#. IDS_SUGGESTED_PLUGINS
-#: Merge.rc:5005
+#: Merge.rc:5015
msgid "Suggested Plugins"
msgstr "関連するプラグイン"
#. IDS_NOT_SUGGESTED_PLUGINS
-#: Merge.rc:5006
+#: Merge.rc:5016
msgid "All Plugins"
msgstr "すべてのプラグイン"
#. IDS_PRIVATEBUILD_FMT
-#: Merge.rc:5012
+#: Merge.rc:5022
#, c-format
msgid "Private Build: %1"
msgstr "Private Build: %1"
#. IDS_CHECKFORUPDATES_UPTODATE
-#: Merge.rc:5013
+#: Merge.rc:5023
msgid "Your software is up to date."
msgstr "お使いのソフトウェアは最新版です。"
-#: Merge.rc:5015
+#: Merge.rc:5025
#, c-format
msgid ""
"WinMerge update available.\n"
@@ -7442,125 +7453,125 @@ msgstr ""
"%1 をダウンロードしますか? (現在 %2 を使用中)"
#. IDS_ALLRIGHTS_RESERVED
-#: Merge.rc:5016
+#: Merge.rc:5026
msgid " - All rights reserved."
msgstr " - All rights reserved."
#. IDS_CHECKFORUPDATES_FAILED
-#: Merge.rc:5021
+#: Merge.rc:5031
msgid "Failed to download latest version information"
msgstr "最新版情報のダウンロードに失敗しました"
#. IDS_TITLE_PLUGINS_SETTINGS
-#: Merge.rc:5027
+#: Merge.rc:5037
msgid "Plugin Settings"
msgstr "プラグイン設定"
#. IDS_NO_SCT_SCRIPTS
-#: Merge.rc:5029
+#: Merge.rc:5039
msgid "WSH not found - .sct scripts disabled"
msgstr "WSH が見つかりません - .sct スクリプトは無効化されました"
#. IDS_LOCBAR_GOTOLINE_FMT
-#: Merge.rc:5037
+#: Merge.rc:5047
#, c-format
msgid "G&o to Line %1"
msgstr "行 %1 に移動(&O)"
#. IDS_GOTO_MOVED_LINE
-#: Merge.rc:5043
+#: Merge.rc:5053
msgid "Go to Moved Line\tCtrl+Shift+G"
msgstr "移動行に移動\tCtrl+Shift+G"
#. IDS_AUTOCOMPLETE_DISABLED
-#: Merge.rc:5049
+#: Merge.rc:5059
msgctxt "Options dialog|General|Open dialog Auto completion"
msgid "Disabled"
msgstr "無効"
#. IDS_AUTOCOMPLETE_FILE_SYS
-#: Merge.rc:5050
+#: Merge.rc:5060
msgid "From file system"
msgstr "ファイル システム"
#. IDS_AUTOCOMPLETE_MRU
-#: Merge.rc:5051
+#: Merge.rc:5061
msgid "From Most Recently Used list"
msgstr "最近使ったリスト"
#. IDS_COLORSCHEME_PLAIN
-#: Merge.rc:5057
+#: Merge.rc:5067
msgid "No Highlighting"
msgstr "ハイライトなし"
#. IDS_COLORSCHEME_BATCH
-#: Merge.rc:5063
+#: Merge.rc:5073
msgid "Batch"
msgstr "Batch"
#. IDS_COLORSCHEME_PO
-#: Merge.rc:5090
+#: Merge.rc:5100
msgid "Portable Object"
msgstr "Portable Object(.po)"
#. IDS_COLORSCHEME_RSRC
-#: Merge.rc:5094
+#: Merge.rc:5104
msgid "Resources"
msgstr "Resources"
#. IDS_COLORSCHEME_SH
-#: Merge.rc:5098
+#: Merge.rc:5108
msgid "Shell"
msgstr "Shell"
#. IDS_CLOSE_LEFT_TABS
-#: Merge.rc:5115
+#: Merge.rc:5125
msgid "Close &Left Tabs"
msgstr "左側のタブをすべて閉じる(&L)"
#. IDS_CLOSE_RIGHT_TABS
-#: Merge.rc:5116
+#: Merge.rc:5126
msgid "Close R&ight Tabs"
msgstr "右側のタブをすべて閉じる(&I)"
#. IDS_CLOSE_OTHER_TABS
-#: Merge.rc:5117
+#: Merge.rc:5127
msgid "Close &Other Tabs"
msgstr "他のタブをすべて閉じる(&O)"
#. IDS_TABBAR_AUTO_MAXWIDTH
-#: Merge.rc:5118
+#: Merge.rc:5128
msgid "Enable &Auto Max Width"
msgstr "タブ幅の自動調整を有効にする(&A)"
#. IDS_WEBPAGE_MENU
-#: Merge.rc:5128
+#: Merge.rc:5138
msgid "We&bpage"
msgstr "Webページ(&B)"
#. IDS_VIEW_WRAP_TEXT
-#: Merge.rc:5133
+#: Merge.rc:5143
msgid "W&rap Text"
msgstr "折り返して全体を表示(&R)"
#. IDS_NOTINSTALLED
-#: Merge.rc:5138
+#: Merge.rc:5148
msgid "%1 is not installed."
msgstr "%1 がインストールされていません。"
#. IDS_CREATE_FOLDER
-#: Merge.rc:5143
+#: Merge.rc:5153
#, c-format
msgid "%1 does not exist. Create it?"
msgstr "%1 は存在しません。作成しますか?"
#. IDS_CREATE_FOLDER_ERROR
-#: Merge.rc:5144
+#: Merge.rc:5154
msgid "Failed to create folder."
msgstr "フォルダーの作成に失敗しました。"
#. IDC_EXT_EDITOR_PATH
-#: Merge.rc:5149
+#: Merge.rc:5159
msgid ""
"Parameters:\n"
"$file: Current file path\n"
@@ -7571,486 +7582,486 @@ msgstr ""
"$linenum: 現在のカーソル位置の行番号"
#. IDS_DIFF_ALGORITHM_DEFAULT
-#: Merge.rc:5154
+#: Merge.rc:5164
msgid "default"
msgstr "default"
#. IDS_DIFF_ALGORITHM_MINIMAL
-#: Merge.rc:5155
+#: Merge.rc:5165
msgid "minimal"
msgstr "minimal"
#. IDS_DIFF_ALGORITHM_PATIENCE
-#: Merge.rc:5156
+#: Merge.rc:5166
msgid "patience"
msgstr "patience"
#. IDS_DIFF_ALGORITHM_HISTOGRAM
-#: Merge.rc:5157
+#: Merge.rc:5167
msgid "histogram"
msgstr "histogram"
#. IDS_DIFF_ALGORITHM_NONE
-#: Merge.rc:5158
+#: Merge.rc:5168
msgid "none"
msgstr "none"
#. IDS_RENDERING_MODE_GDI
-#: Merge.rc:5163
+#: Merge.rc:5173
msgid "GDI"
msgstr "GDI"
#. IDS_RENDERING_MODE_DIRECTWRITE_DEFAULT
-#: Merge.rc:5164
+#: Merge.rc:5174
msgid "DirectWrite Default"
msgstr "DirectWrite Default"
#. IDS_RENDERING_MODE_DIRECTWRITE_ALIASED
-#: Merge.rc:5165
+#: Merge.rc:5175
msgid "DirectWrite Aliased"
msgstr "DirectWrite Aliased"
#. IDS_RENDERING_MODE_DIRECTWRITE_GDI_CLASSIC
-#: Merge.rc:5166
+#: Merge.rc:5176
msgid "DirectWrite GDI Classic"
msgstr "DirectWrite GDI Classic"
#. IDS_RENDERING_MODE_DIRECTWRITE_GDI_NATURAL
-#: Merge.rc:5167
+#: Merge.rc:5177
msgid "DirectWrite GDI Natural"
msgstr "DirectWrite GDI Natural"
#. IDS_RENDERING_MODE_DIRECTWRITE_NATURAL
-#: Merge.rc:5168
+#: Merge.rc:5178
msgid "DirectWrite Natural"
msgstr "DirectWrite Natural"
#. IDS_RENDERING_MODE_DIRECTWRITE_NATURAL_SYMMETRIC
-#: Merge.rc:5169
+#: Merge.rc:5179
msgid "DirectWrite Natural Symmetric"
msgstr "DirectWrite Natural Symmetric"
#. IDS_CLOSE_WINDOWS_WITH_ESC_DISABLED
-#: Merge.rc:5174
+#: Merge.rc:5184
msgctxt "Options dialog|General|Close windows with Esc"
msgid "Disabled"
msgstr "無効"
#. IDS_CLOSE_WINDOWS_WITH_ESC_1
-#: Merge.rc:5175
+#: Merge.rc:5185
msgid "MDI child window or main window"
msgstr "MDI 子ウインドウまたはメインウインドウ"
#. IDS_CLOSE_WINDOWS_WITH_ESC_2
-#: Merge.rc:5176
+#: Merge.rc:5186
msgid "MDI child window only"
msgstr "MDI 子ウインドウのみ"
#. IDS_CLOSE_WINDOWS_WITH_ESC_3
-#: Merge.rc:5177
+#: Merge.rc:5187
msgid "Close main window if only one MDI child window"
msgstr "MDI 子ウィンドウが 1 つしかない場合、メインウィンドウを閉じる"
#. IDS_DIFF_GROUP
-#: Merge.rc:5182
+#: Merge.rc:5192
msgctxt "ImgMergeFrame|LocationPane"
msgid "Diff"
msgstr "差異"
#. IDS_DIFF_HIGHLIGHT
-#: Merge.rc:5183
+#: Merge.rc:5193
msgctxt "ImgMergeFrame|LocationPane"
msgid "Highlight"
msgstr "差異表示"
#. IDS_DIFF_BLINK
-#: Merge.rc:5184
+#: Merge.rc:5194
msgctxt "ImgMergeFrame|LocationPane"
msgid "Blink"
msgstr "点滅"
#. IDS_DIFF_BLOCKSIZE
-#: Merge.rc:5185
+#: Merge.rc:5195
msgctxt "ImgMergeFrame|LocationPane"
msgid "Block Size"
msgstr "ブロック サイズ"
#. IDS_DIFF_BLOCKALPHA
-#: Merge.rc:5186
+#: Merge.rc:5196
msgctxt "ImgMergeFrame|LocationPane"
msgid "Block Alpha"
msgstr "ブロック透明度"
#. IDS_DIFF_CDTHRESHOLD
-#: Merge.rc:5187
+#: Merge.rc:5197
msgctxt "ImgMergeFrame|LocationPane"
msgid "CD Threshold"
msgstr "色距離閾値"
#. IDS_DIFF_INSERTION_DELETION_DETECTION
-#: Merge.rc:5188
+#: Merge.rc:5198
msgctxt "ImgMergeFrame|LocationPane"
msgid "Ins/Del Detection"
msgstr "挿入/削除検出"
#. IDS_OVERLAY_MODE_NONE
-#: Merge.rc:5189 Merge.rc:5194
+#: Merge.rc:5199 Merge.rc:5204
msgctxt "ImgMergeFrame|LocationPane"
msgid "None"
msgstr "なし"
#. IDS_DIFF_INSERTION_DELETION_DETECTION_VERTICAL
-#: Merge.rc:5190
+#: Merge.rc:5200
msgctxt "ImgMergeFrame|LocationPane"
msgid "Vertical"
msgstr "垂直方向"
#. IDS_DIFF_INSERTION_DELETION_DETECTION_HORIZONTAL
-#: Merge.rc:5191
+#: Merge.rc:5201
msgctxt "ImgMergeFrame|LocationPane"
msgid "Horizontal"
msgstr "水平方向"
#. IDS_OVERLAY_GROUP
-#: Merge.rc:5192
+#: Merge.rc:5202
msgctxt "ImgMergeFrame|LocationPane"
msgid "Overlay"
msgstr "重ね合わせ"
#. IDS_OVERLAY_ALPHA
-#: Merge.rc:5193
+#: Merge.rc:5203
msgctxt "ImgMergeFrame|LocationPane"
msgid "Alpha"
msgstr "透明度"
#. IDS_OVERLAY_MODE_XOR
-#: Merge.rc:5195
+#: Merge.rc:5205
msgctxt "ImgMergeFrame|LocationPane"
msgid "XOR"
msgstr "XOR"
#. IDS_OVERLAY_MODE_ALPHA
-#: Merge.rc:5196
+#: Merge.rc:5206
msgctxt "ImgMergeFrame|LocationPane"
msgid "Alpha Blend"
msgstr "アルファブレンド"
#. IDS_OVERLAY_MODE_ALPHA_ANIMATION
-#: Merge.rc:5197
+#: Merge.rc:5207
msgctxt "ImgMergeFrame|LocationPane"
msgid "Alpha Animation"
msgstr "アニメ表示"
#. IDS_ZOOM
-#: Merge.rc:5198
+#: Merge.rc:5208
msgctxt "ImgMergeFrame|LocationPane"
msgid "Zoom"
msgstr "拡大"
#. IDS_PAGE
-#: Merge.rc:5199
+#: Merge.rc:5209
msgctxt "ImgMergeFrame|LocationPane"
msgid "Page:"
msgstr "ページ:"
#. IDS_IMGCMP_STATUS_PT_RGBA_FMT
-#: Merge.rc:5200
+#: Merge.rc:5210
#, c-format
msgid "Pt: (%d, %d) RGBA: (%d, %d, %d, %d) "
msgstr "Pt: (%d, %d) RGBA: (%d, %d, %d, %d) "
#. IDS_IMGCMP_STATUS_DIST1_FMT
-#: Merge.rc:5201
+#: Merge.rc:5211
#, c-format
msgid "Dist: %g "
msgstr "色距離: %g "
#. IDS_IMGCMP_STATUS_DIST2_FMT
-#: Merge.rc:5202
+#: Merge.rc:5212
#, c-format
msgid "Dist: %g, %g "
msgstr "色距離: %g, %g "
#. IDS_IMGCMP_STATUS_PAGE_ZOOM_SIZE_BPP_FMT
-#: Merge.rc:5203
+#: Merge.rc:5213
#, c-format
msgid "Page: %d/%d Zoom: %d%% %dx%dpx %dbpp "
msgstr "ページ: %d/%d 拡大: %d%% %dx%dpx %dbpp "
#. IDS_IMGCMP_STATUS_RC_FMT
-#: Merge.rc:5204
+#: Merge.rc:5214
#, c-format
msgid "Rc: (%d, %d) "
msgstr "範囲: (%d, %d) "
#. IDS_IMGCMP_STATUS_FLIPPED_FMT
-#: Merge.rc:5205
+#: Merge.rc:5215
#, c-format
msgid "Flipped: %s "
msgstr "反転: %s "
#. IDS_IMGCMP_STATUS_ROTATED_FMT
-#: Merge.rc:5206
+#: Merge.rc:5216
#, c-format
msgid "Rotated: %d "
msgstr "回転: %d° "
#. IDS_IMGCMP_REPORT_ALLPAGES
-#: Merge.rc:5207
+#: Merge.rc:5217
msgid "All pages"
msgstr "全ページ"
#. IDS_IGNSUB_STR1
-#: Merge.rc:5212
+#: Merge.rc:5222
msgid ""
msgstr "<ここを編集>"
#. IDS_IGNSUB_STR2
-#: Merge.rc:5213
+#: Merge.rc:5223
msgid "No differences found to select"
msgstr "選択する差異がありません"
#. IDS_IGNSUB_STR3
-#: Merge.rc:5214
+#: Merge.rc:5224
msgid "No differences found to add as substitution filter"
msgstr "置換フィルターに追加する差異がありません"
#. IDS_IGNSUB_STR4
-#: Merge.rc:5215
+#: Merge.rc:5225
msgid "The pair is already in the Substitution Filters list"
msgstr "このペアは、既に置換フィルターのリストに存在しています"
#. IDS_IGNSUB_STR5
-#: Merge.rc:5216
+#: Merge.rc:5226
msgid "Add this change to Substitution Filters?"
msgstr "この差異を置換フィルターに追加しますか?"
#. IDS_OCRRESULT_TEXTONLY
-#: Merge.rc:5221
+#: Merge.rc:5231
msgid "Text only"
msgstr "テキストのみ"
#. IDS_OCRRESULT_POS_LINE
-#: Merge.rc:5222
+#: Merge.rc:5232
msgid "Line-by-line position and text"
msgstr "行毎の位置情報とテキスト"
#. IDS_OCRRESULT_POS_WORD
-#: Merge.rc:5223
+#: Merge.rc:5233
msgid "Word-by-word position and text"
msgstr "単語毎の位置情報とテキスト"
#. IDS_USERDATAFOLDER_APPDATA
-#: Merge.rc:5228
+#: Merge.rc:5238
msgid "AppData (Roaming) folder"
msgstr "AppData (Roaming) フォルダー"
#. IDS_USERDATAFOLDER_INSTALL
-#: Merge.rc:5229
+#: Merge.rc:5239
msgid "Install folder"
msgstr "インストール フォルダー"
#. IDS_USERDATAFOLDER_DOCUMENTS
-#: Merge.rc:5230
+#: Merge.rc:5240
msgid "Documents folder"
msgstr "ドキュメントフォルダー"
#. IDS_SINGLEINSTANCE_DISABLED
-#: Merge.rc:5235
+#: Merge.rc:5245
msgctxt "Options dialog|General|Single instance mode"
msgid "Disabled"
msgstr "無効"
#. IDS_SINGLEINSTANCE_STR1
-#: Merge.rc:5236
+#: Merge.rc:5246
msgid "Allow only one instance to run"
msgstr "1 つのみインスタンスを起動する"
#. IDS_SINGLEINSTANCE_STR2
-#: Merge.rc:5237
+#: Merge.rc:5247
msgid "Allow only one instance; wait for termination"
msgstr "1 つのみインスタンスを起動し、既起動インスタンスの終了を待つ"
#. IDS_AUTO_RELOAD_MODIFIED_FILES_DISABLED
-#: Merge.rc:5242
+#: Merge.rc:5252
msgctxt "Options dialog|General|Auto-reload modified files"
msgid "Disabled"
msgstr "無効"
#. IDS_AUTO_RELOAD_MODIFIED_FILES_STR1
-#: Merge.rc:5243
+#: Merge.rc:5253
msgid "Only on window activated"
msgstr "ウインドウがアクティブになった時のみ"
#. IDS_AUTO_RELOAD_MODIFIED_FILES_STR2
-#: Merge.rc:5244
+#: Merge.rc:5254
msgid "Immediately"
msgstr "即時"
#. IDS_PLUGIN_ALL
-#: Merge.rc:5249
+#: Merge.rc:5259
msgid "Al&l"
msgstr "すべて(&L)"
#. IDS_PLUGIN_OTHERS
-#: Merge.rc:5250
+#: Merge.rc:5260
msgid "&Others"
msgstr "その他(&O)"
-#: Merge.rc:5252
+#: Merge.rc:5262
#, c-format
msgid "Missing plugin name in pipeline: %1"
msgstr "プラグイン パイプラインにプラグイン名が指定されていません: %1"
-#: Merge.rc:5254
+#: Merge.rc:5264
#, c-format
msgid "Missing quote in plugin pipeline: %1"
msgstr "プラグイン パイプラインが引用符で閉じていません: %1"
#. IDS_PLUGIN_NAME_ALREADY_EXISTS
-#: Merge.rc:5255
+#: Merge.rc:5265
#, c-format
msgid "Plugin name '%1' already exists."
msgstr "プラグイン名 '%1' は既に存在しています。"
#. IDS_PLUGIN_TITLE1
-#: Merge.rc:5256
+#: Merge.rc:5266
msgid "Specify plugin arguments"
msgstr "プラグイン引数を指定してください"
-#: Merge.rc:5258
+#: Merge.rc:5268
#, c-format
msgid "Plugin not found or invalid: %1"
msgstr "プラグインが見つからないまたは無効です: %1"
#. IDS_PLUGIN_NOT_UNPACK
-#: Merge.rc:5259
+#: Merge.rc:5269
#, c-format
msgid "'%1' is not an unpacker plugin"
msgstr "'%1'は展開プラグインではありません"
#. IDS_PLUGIN_NOT_PREDIFF
-#: Merge.rc:5260
+#: Merge.rc:5270
#, c-format
msgid "'%1' is not a prediffer plugin"
msgstr "'%1'は比較前処理プラグインではありません"
-#: Merge.rc:5262
+#: Merge.rc:5272
#, c-format
msgid "Error prediffing '%1' with '%2'. Prediffing disabled."
msgstr "プラグイン'%2'でファイル'%1'の比較前処理を実行中にエラーが発生しました。比較前処理は適用されませんでした。"
#. IDS_PLUGIN_CIRCULAR_REFERENCE
-#: Merge.rc:5263
+#: Merge.rc:5273
#, c-format
msgid "Circular reference in plugin pipeline: %1"
msgstr "プラグインパイプラインに循環参照があります: %1"
#. IDS_PLUGIN_TYPE1
-#: Merge.rc:5264
+#: Merge.rc:5274
msgid "URL Handler"
msgstr "URL処理プラグイン"
#. IDS_PLUGIN_TYPE2
-#: Merge.rc:5265
+#: Merge.rc:5275
msgid "File Unpacker"
msgstr "ファイル展開プラグイン"
#. IDS_PLUGIN_TYPE3
-#: Merge.rc:5266
+#: Merge.rc:5276
msgid "File or Folder Unpacker"
msgstr "ファイルまたはフォルダー展開プラグイン"
#. IDS_PLUGIN_TYPE5
-#: Merge.rc:5268
+#: Merge.rc:5278
msgid "Alias for Unpacker"
msgstr "展開プラグインのエイリアス"
#. IDS_PLUGIN_TYPE6
-#: Merge.rc:5269
+#: Merge.rc:5279
msgid "Alias for Prediffer"
msgstr "比較前処理プラグインのエイリアス"
#. IDS_PLUGIN_TYPE7
-#: Merge.rc:5270
+#: Merge.rc:5280
msgid "Alias for Editor script"
msgstr "エディタースクリプトのエイリアス"
#. IDS_PLUGIN_ALIAS_DESC
-#: Merge.rc:5271
+#: Merge.rc:5281
#, c-format
msgid "Alias for plugin pipeline '%1'"
msgstr "プラグインパイプライン '%1' のエイリアス"
#. IDS_PLUGIN_NEW_DESC
-#: Merge.rc:5272
+#: Merge.rc:5282
msgid "New plugin description"
msgstr "新しいプラグインの説明"
#. IDS_PLUGIN_TARGETS_ALL
-#: Merge.rc:5273
+#: Merge.rc:5283
msgid "All"
msgstr "すべて"
#. IDS_PLUGIN_TARGETS_1ST
-#: Merge.rc:5274
+#: Merge.rc:5284
msgid "1st"
msgstr "1番目"
#. IDS_PLUGIN_TARGETS_2ND
-#: Merge.rc:5275
+#: Merge.rc:5285
msgid "2nd"
msgstr "2番目"
#. IDS_PLUGIN_TARGETS_3RD
-#: Merge.rc:5276
+#: Merge.rc:5286
msgid "3rd"
msgstr "3番目"
#. IDS_PLUGIN_TARGETS_1ST_2ND
-#: Merge.rc:5277
+#: Merge.rc:5287
msgid "1st and 2nd"
msgstr "1番目と2番目"
#. IDS_PLUGIN_TARGETS_1ST_3RD
-#: Merge.rc:5278
+#: Merge.rc:5288
msgid "1st and 3rd"
msgstr "1番目と3番目"
#. IDS_PLUGIN_TARGETS_2ND_3RD
-#: Merge.rc:5279
+#: Merge.rc:5289
msgid "2nd and 3rd"
msgstr "2番目と3番目"
#. IDS_FILTER_APPLIED
-#: Merge.rc:5284
+#: Merge.rc:5294
msgid "Filter applied"
msgstr "フィルター適用"
#. IDS_FILTERMENU_COMPARE
-#: Merge.rc:5289
+#: Merge.rc:5299
#, c-format
msgid "Compare %1"
msgstr "%1 を比較"
#. IDS_FILTERMENU_FILTER_BY_THIS_COLUMN
-#: Merge.rc:5290
+#: Merge.rc:5300
msgid "&Filter by This Column"
msgstr "この列でフィルター(&F)"
#. IDS_FILTERMENU_FILTER_BY_THIS_COLUMN2
-#: Merge.rc:5291
+#: Merge.rc:5301
msgid "&Filter by This Column..."
msgstr "この列でフィルター(&F)..."
#. IDS_CLIPBOARDHISTORY_TIME
-#: Merge.rc:5296
+#: Merge.rc:5306
#, c-format
msgid "Clipboard at %s"
msgstr "クリップボード %s"
#. IDS_CLIPBOARDHISTORY_DISABLED
-#: Merge.rc:5297
+#: Merge.rc:5307
msgid ""
"Clipboard history disabled.\r\n"
"Enable: Windows logo key + V, then Turn on."
@@ -8058,110 +8069,115 @@ msgstr ""
"クリップボード履歴が無効になっています。\r\n"
"クリップボード履歴を有効にするには、Windows キー + V を押下後、[有効にする] ボタンをクリックしてください。"
-#: Merge.rc:5299
+#: Merge.rc:5309
msgid "This system does not support clipboard history."
msgstr "このシステムではクリップボード履歴はサポートされていません。"
-#: Merge.rc:5301
+#: Merge.rc:5311
msgid "32-bit WinMerge does not support Clipboard Compare"
msgstr "32bit版 WinMerge ではクリップボード比較はサポートされていません。"
#. IDS_WEBVIEW2_RUNTIME_NOT_INSTALLED
-#: Merge.rc:5306
+#: Merge.rc:5316
msgid "WebView2 runtime not installed. Download it?"
msgstr "WebView2 ランタイムがインストールされていません。ダウンロードしますか?"
#. IDS_JUMPLIST_NEW_TEXT_COMPARE
-#: Merge.rc:5311
+#: Merge.rc:5321
msgid "New Text Compare"
msgstr "新規テキスト比較"
#. IDS_JUMPLIST_NEW_TABLE_COMPARE
-#: Merge.rc:5312
+#: Merge.rc:5322
msgid "New Table Compare"
msgstr "新規テーブル比較"
#. IDS_JUMPLIST_NEW_BINARY_COMPARE
-#: Merge.rc:5313
+#: Merge.rc:5323
msgid "New Binary Compare"
msgstr "新規バイナリ比較"
#. IDS_JUMPLIST_NEW_IMAGE_COMPARE
-#: Merge.rc:5314
+#: Merge.rc:5324
msgid "New Image Compare"
msgstr "新規画像比較"
#. IDS_JUMPLIST_NEW_WEBPAGE_COMPARE
-#: Merge.rc:5315
+#: Merge.rc:5325
msgid "New Webpage Compare"
msgstr "新規Webページ比較"
+#. IDS_JUMPLIST_NEW_FOLDER_COMPARE
+#: Merge.rc:5326
+msgid "New Folder Compare"
+msgstr "新規フォルダー比較"
+
#. IDS_JUMPLIST_CLIPBOARD_COMPARE
-#: Merge.rc:5316
+#: Merge.rc:5327
msgid "Clipboard Compare"
msgstr "クリップボード比較"
#. IDS_PREVIEWBAR_PRINT
-#: Merge.rc:5321
+#: Merge.rc:5332
msgid "&Print..."
msgstr "印刷(&P)..."
#. IDS_PREVIEWBAR_PREVPAGE
-#: Merge.rc:5323
+#: Merge.rc:5334
msgid "Pre&v Page"
msgstr "前ページ(&V)"
#. IDS_PREVIEWBAR_TWOPAGE
-#: Merge.rc:5324
+#: Merge.rc:5335
msgid "&Two Page"
msgstr "2ページ(&T)"
#. IDS_PREVIEWBAR_ONEPAGE
-#: Merge.rc:5325
+#: Merge.rc:5336
msgid "&One Page"
msgstr "1ページ(&O)"
#. IDS_PREVIEWBAR_ZOOMIN
-#: Merge.rc:5326
+#: Merge.rc:5337
msgid "Zoom &In"
msgstr "拡大(&I)"
#. IDS_PREVIEWBAR_ZOOMOUT
-#: Merge.rc:5327
+#: Merge.rc:5338
msgid "Zoom &Out"
msgstr "縮小(&O)"
#. IDS_WEBPAGE_COMPARING
-#: Merge.rc:5333
+#: Merge.rc:5344
msgid "Comparing..."
msgstr "比較しています..."
#. IDS_WEBPAGE_ZOOM
-#: Merge.rc:5334
+#: Merge.rc:5345
msgid "Zoom:"
msgstr "拡大率:"
#. IDS_COPY_GRANULARITY_DIFFHUNK
-#: Merge.rc:5339
+#: Merge.rc:5350
msgid "Diff hunk"
msgstr "差異ブロック"
#. IDS_COPY_GRANULARITY_INLINE
-#: Merge.rc:5340
+#: Merge.rc:5351
msgid "Inline diff"
msgstr "行内差異"
#. IDS_COPY_GRANULARITY_LINE
-#: Merge.rc:5341
+#: Merge.rc:5352
msgid "Line"
msgstr "行"
-#: Merge.rc:5342
+#: Merge.rc:5353
msgid "Character"
msgstr "文字"
#. ID_MICE_PREVDIFF
-#: Merge.rc:5347
+#: Merge.rc:5358
msgid ""
"\n"
"Previous Difference (Alt+Up)\n"
@@ -8174,7 +8190,7 @@ msgstr ""
"(Alt+Wheel Up)"
#. ID_MICE_NEXTDIFF
-#: Merge.rc:5348
+#: Merge.rc:5359
msgid ""
"\n"
"Next Difference (Alt+Down)\n"
@@ -8187,7 +8203,7 @@ msgstr ""
"(Alt+Wheel Down)"
#. ID_MICE_L2R
-#: Merge.rc:5349
+#: Merge.rc:5360
msgid ""
"\n"
"Copy to Right (Alt+Right)\n"
@@ -8202,7 +8218,7 @@ msgstr ""
"(Alt+Shift+Wheel Down)"
#. ID_MICE_R2L
-#: Merge.rc:5350
+#: Merge.rc:5361
msgid ""
"\n"
"Copy to Left (Alt+Left)\n"
@@ -8217,7 +8233,7 @@ msgstr ""
"(Alt+Shift+Wheel Up)"
#. ID_MICE_L2RNEXT
-#: Merge.rc:5351
+#: Merge.rc:5362
msgid ""
"\n"
"Copy to Right and Advance (Ctrl+Alt+Right)\n"
@@ -8230,7 +8246,7 @@ msgstr ""
"(Ctrl+Alt+Shift+Wheel Down)"
#. ID_MICE_R2LNEXT
-#: Merge.rc:5352
+#: Merge.rc:5363
msgid ""
"\n"
"Copy to Left and Advance (Ctrl+Alt+Left)\n"
@@ -8243,257 +8259,257 @@ msgstr ""
"(Ctrl+Alt+Shift+Wheel Up)"
#. IDS_LOG_COMPARING_2
-#: Merge.rc:5362
+#: Merge.rc:5373
#, c-format
msgid "Comparing %1 with %2"
msgstr "%1 と %2 を比較しています"
#. IDS_LOG_COMPARING_3
-#: Merge.rc:5363
+#: Merge.rc:5374
#, c-format
msgid "Comparing %1 with %2 and %3"
msgstr "%1 と %2 と %3 を比較しています"
#. IDS_LOG_COMPARE_COMPLETED
-#: Merge.rc:5364
+#: Merge.rc:5375
msgid "Comparison completed"
msgstr "比較が完了しました"
#. IDS_LOG_COMPARE_ERROR_2
-#: Merge.rc:5365
+#: Merge.rc:5376
#, c-format
msgid "Failed to compare %1 with %2: "
msgstr "%1 と %2 の比較に失敗しました: "
#. IDS_LOG_COMPARE_ERROR_3
-#: Merge.rc:5366
+#: Merge.rc:5377
#, c-format
msgid "Failed to compare %1 with %2 and %3: "
msgstr "%1 と %2 と %3 の比較に失敗しました: "
#. IDS_LOG_FILE_SAVED
-#: Merge.rc:5367
+#: Merge.rc:5378
msgid "File saved"
msgstr "ファイルが保存されました"
#. IDS_LOG_COPYING_FILES
-#: Merge.rc:5368
+#: Merge.rc:5379
msgid "Copying files..."
msgstr "ファイルをコピーしています..."
#. IDS_LOG_MOVING_FILES
-#: Merge.rc:5369
+#: Merge.rc:5380
msgid "Moving files..."
msgstr "ファイルを移動しています..."
#. IDS_LOG_DELETING_FILES
-#: Merge.rc:5370
+#: Merge.rc:5381
msgid "Deleting files..."
msgstr "ファイルを削除しています..."
#. IDS_LOG_RECYCLEBIN
-#: Merge.rc:5371
+#: Merge.rc:5382
msgid "Recycle Bin"
msgstr "ゴミ箱"
#. IDS_LOG_PERMANENTLY_DELETED
-#: Merge.rc:5372
+#: Merge.rc:5383
msgid "Permanently deleted"
msgstr "完全に削除"
#. IDS_LOG_FILEOPERATION_COMPLETED
-#: Merge.rc:5373
+#: Merge.rc:5384
msgid "File operation completed successfully"
msgstr "ファイル操作が正常に完了しました"
#. IDS_LOG_FILEOPERATION_CANCELED
-#: Merge.rc:5374
+#: Merge.rc:5385
msgid "File operation canceled"
msgstr "ファイル操作がキャンセルされました"
#. IDS_FILTER_ERROR_NO_ERROR
-#: Merge.rc:5379
+#: Merge.rc:5390
msgid "No error"
msgstr "エラーはありません"
#. IDS_FILTER_ERROR_EMPTY_EXPRESSION
-#: Merge.rc:5380
+#: Merge.rc:5391
msgid "Filter expression is empty"
msgstr "フィルター式が空です"
#. IDS_FILTER_ERROR_UNKNOWN_CHAR
-#: Merge.rc:5381
+#: Merge.rc:5392
msgid "Unknown character in filter expression"
msgstr "フィルター式に不明な文字があります"
#. IDS_FILTER_ERROR_UNTERMINATED_STRING
-#: Merge.rc:5382
+#: Merge.rc:5393
msgid "Unterminated string literal"
msgstr "文字列リテラルが閉じられていません"
#. IDS_FILTER_ERROR_SYNTAX_ERROR
-#: Merge.rc:5383
+#: Merge.rc:5394
msgid "Syntax error in filter expression"
msgstr "フィルター式の構文エラーです"
#. IDS_FILTER_ERROR_PARSE_FAILURE
-#: Merge.rc:5384
+#: Merge.rc:5395
msgid "Failed to parse filter expression"
msgstr "フィルター式の解析に失敗しました"
#. IDS_FILTER_ERROR_INVALID_LITERAL
-#: Merge.rc:5385
+#: Merge.rc:5396
msgid "Invalid literal value"
msgstr "無効なリテラル値です"
#. IDS_FILTER_ERROR_INVALID_REGULAR_EXPRESSION
-#: Merge.rc:5386
+#: Merge.rc:5397
msgid "Invalid regular expression"
msgstr "無効な正規表現です"
#. IDS_FILTER_ERROR_UNDEFINED_IDENTIFIER
-#: Merge.rc:5387
+#: Merge.rc:5398
msgid "Undefined identifier"
msgstr "未定義の識別子です"
#. IDS_FILTER_ERROR_INVALID_ARGUMENT_COUNT
-#: Merge.rc:5388
+#: Merge.rc:5399
msgid "Invalid number of arguments"
msgstr "引数の数が正しくありません"
#. IDS_FILTER_ERROR_FILTER_NAME_NOT_FOUND
-#: Merge.rc:5389
+#: Merge.rc:5400
msgid "Filter name not found"
msgstr "フィルター名が見つかりません"
#. IDS_FILTER_ERROR_DIVIDE_BY_ZERO
-#: Merge.rc:5390
+#: Merge.rc:5401
msgid "Division by zero in filter expression"
msgstr "フィルター式で0による除算が行われました"
#. IDS_FILTER_ERROR_UNKNOWN_ERROR
-#: Merge.rc:5391
+#: Merge.rc:5402
msgid "Unknown error"
msgstr "不明なエラーです"
#. IDS_FILTER_ERROR_INVALID_PROPERTY_NAME
-#: Merge.rc:5392
+#: Merge.rc:5403
msgid "Invalid property name"
msgstr "無効なプロパティ名です"
#. IDS_FILTER_ERROR_INVALID_DIRECTIVE
-#: Merge.rc:5393
+#: Merge.rc:5404
msgid "Invalid directive"
msgstr "無効なディレクティブです"
#. IDS_FILTER_OP_EQUALS
-#: Merge.rc:5398
+#: Merge.rc:5409
msgid "Equals"
msgstr "等しい"
#. IDS_FILTER_OP_NOT_EQUALS
-#: Merge.rc:5399
+#: Merge.rc:5410
msgid "Does not equal"
msgstr "等しくない"
#. IDS_FILTER_OP_LESS_THAN
-#: Merge.rc:5400
+#: Merge.rc:5411
msgid "Less than"
msgstr "より小さい"
#. IDS_FILTER_OP_LESS_EQUAL
-#: Merge.rc:5401
+#: Merge.rc:5412
msgid "Less than or equal to"
msgstr "以下"
#. IDS_FILTER_OP_GREATER_EQUAL
-#: Merge.rc:5402
+#: Merge.rc:5413
msgid "Greater than or equal to"
msgstr "以上"
#. IDS_FILTER_OP_GREATER_THAN
-#: Merge.rc:5403
+#: Merge.rc:5414
msgid "Greater than"
msgstr "より大きい"
#. IDS_FILTER_OP_BETWEEN
-#: Merge.rc:5404
+#: Merge.rc:5415
msgid "Between"
msgstr "範囲内"
#. IDS_FILTER_OP_NOT_BETWEEN
-#: Merge.rc:5405
+#: Merge.rc:5416
msgid "Not Between"
msgstr "範囲外"
#. IDS_FILTER_OP_CONTAINS
-#: Merge.rc:5406
+#: Merge.rc:5417
msgid "Contains"
msgstr "含む"
#. IDS_FILTER_OP_NOT_CONTAINS
-#: Merge.rc:5407
+#: Merge.rc:5418
msgid "Not Contains"
msgstr "含まない"
#. IDS_FILTER_OP_RECONTAINS
-#: Merge.rc:5408
+#: Merge.rc:5419
msgid "Contains (regex)"
msgstr "含む(正規表現)"
#. IDS_FILTER_OP_NOT_RECONTAINS
-#: Merge.rc:5409
+#: Merge.rc:5420
msgid "Not Contains (regex)"
msgstr "含まない(正規表現)"
#. IDS_FILTER_OP_LIKE
-#: Merge.rc:5410
+#: Merge.rc:5421
msgid "Match (wildcard)"
msgstr "一致(ワイルドカード)"
#. IDS_FILTER_OP_NOT_LIKE
-#: Merge.rc:5411
+#: Merge.rc:5422
msgid "Not match (wildcard)"
msgstr "不一致(ワイルドカード)"
#. IDS_FILTER_OP_MATCHES
-#: Merge.rc:5412
+#: Merge.rc:5423
msgid "Match (regex)"
msgstr "一致(正規表現)"
#. IDS_FILTER_OP_NOT_MATCHES
-#: Merge.rc:5413
+#: Merge.rc:5424
msgid "Not match (regex)"
msgstr "不一致(正規表現)"
#. IDS_COLORMODE_LIGHT
-#: Merge.rc:5418
+#: Merge.rc:5429
msgid "Light"
msgstr "ライト"
#. IDS_COLORMODE_DARK
-#: Merge.rc:5419
+#: Merge.rc:5430
msgid "Dark"
msgstr "ダーク"
#. IDS_COLORMODE_FOLLOWSYSTEM
-#: Merge.rc:5420
+#: Merge.rc:5431
msgid "Follow system"
msgstr "システムに従う"
#. IDS_EXAMPLE
-#: Merge.rc:5425
+#: Merge.rc:5436
#, c-format
msgid "e.g. %1"
msgstr "例: %1"
#. IDS_DETECTED_PREVIOUS_CRASH
-#: Merge.rc:5430
+#: Merge.rc:5441
msgid "WinMerge detected a previous crash. Please report this if possible."
msgstr "以前の WinMerge のクラッシュを検出しました。可能であればご報告ください。"
#. IDS_REGEX_REPLACE_LIST_TEMPLATE
-#: Merge.rc:5435
+#: Merge.rc:5446
msgid ""
"# Regex replacement list\r\n"
"# Format: regexreplacement\r\n"
@@ -8508,7 +8524,7 @@ msgstr ""
"(\\d{4})-(\\d{2})-(\\d{2})\t$1_$2_$3\r\n"
#. IDS_STRING_REPLACE_LIST_TEMPLATE
-#: Merge.rc:5436
+#: Merge.rc:5447
msgid ""
"# Replacement list\r\n"
"# Format: searchreplacement\r\n"
diff --git a/Translations/WinMerge/Korean.po b/Translations/WinMerge/Korean.po
index 8af71798adf..e90dccff35d 100644
--- a/Translations/WinMerge/Korean.po
+++ b/Translations/WinMerge/Korean.po
@@ -30,7 +30,7 @@ msgstr ""
"X-Poedit-Bookmarks: 308,-1,-1,-1,-1,-1,-1,-1,-1,-1\n"
#. LANGUAGE, SUBLANGUAGE
-#: Merge.rc:26 Merge.rc:59 Merge.rc:5453
+#: Merge.rc:26 Merge.rc:59 Merge.rc:5464
#, c-format
msgid "LANG_ENGLISH, SUBLANG_ENGLISH_US"
msgstr "LANG_KOREAN, SUBLANG_DEFAULT"
@@ -116,7 +116,7 @@ msgid "Copy Selected Diff (Right) to Clipboard\tCtrl+&3"
msgstr "선택한 차이 (오른쪽)를 클립보드로 복사\tCtrl+&3"
#. IDR_MERGEDOCTYPE, ID_SELECTLINEDIFF
-#: Merge.rc:110 Merge.rc:673
+#: Merge.rc:110 Merge.rc:680
#, c-format
msgid "Select Line &Difference\tF4"
msgstr "다음 차이 선택(&D)\tF4"
@@ -150,7 +150,7 @@ msgid "Cu&t"
msgstr "잘라내기(&T)"
#. IDR_POPUP_DIRVIEW
-#: Merge.rc:118 Merge.rc:943
+#: Merge.rc:118 Merge.rc:951
#, c-format
msgid "&Copy"
msgstr "복사(&C)"
@@ -162,21 +162,21 @@ msgid "&Paste"
msgstr "붙여넣기(&P)"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:121 Merge.rc:875 Merge.rc:882
+#: Merge.rc:121 Merge.rc:882 Merge.rc:889
#, c-format
msgid "&Scripts"
msgstr "스크립트(&S)"
#. IDS_NO_EDIT_SCRIPTS
-#: Merge.rc:123 Merge.rc:338 Merge.rc:447 Merge.rc:654 Merge.rc:659
-#: Merge.rc:865 Merge.rc:877 Merge.rc:884 Merge.rc:940 Merge.rc:1183
-#: Merge.rc:5028
+#: Merge.rc:123 Merge.rc:340 Merge.rc:451 Merge.rc:661 Merge.rc:666
+#: Merge.rc:872 Merge.rc:884 Merge.rc:891 Merge.rc:948 Merge.rc:1193
+#: Merge.rc:5038
#, c-format
msgid "< Empty >"
msgstr "< 비어 있음 >"
#. IDR_POPUP_LOCATIONBAR, ID_EDIT_WMGOTO
-#: Merge.rc:126 Merge.rc:691 Merge.rc:1081
+#: Merge.rc:126 Merge.rc:698 Merge.rc:1089
msgid "&Go to...\tCtrl+G"
msgstr "이동(&G)...\tCtrl+G"
@@ -197,27 +197,27 @@ msgid "Op&en"
msgstr "열기(&E)"
#. IDR_POPUP_DIRVIEW, ID_DIR_OPEN_RIGHT
-#: Merge.rc:132 Merge.rc:981 Merge.rc:988 Merge.rc:995
+#: Merge.rc:132 Merge.rc:989 Merge.rc:996 Merge.rc:1003
msgid "With &Registered Application"
msgstr "등록된 응용 프로그램 사용(&R)"
#. IDR_POPUP_DIRVIEW, ID_DIR_OPEN_RIGHT_WITHEDITOR
-#: Merge.rc:133 Merge.rc:982 Merge.rc:989 Merge.rc:996
+#: Merge.rc:133 Merge.rc:990 Merge.rc:997 Merge.rc:1004
msgid "With &External Editor\tCtrl+Alt+E"
msgstr "외부 편집기 사용(&E)\tCtrl+Alt+E"
#. IDR_POPUP_DIRVIEW, ID_DIR_OPEN_RIGHT_WITH
-#: Merge.rc:134 Merge.rc:983 Merge.rc:990 Merge.rc:997
+#: Merge.rc:134 Merge.rc:991 Merge.rc:998 Merge.rc:1005
msgid "&With..."
msgstr "프로그램 선택(&W)..."
#. IDR_POPUP_DIRVIEW, ID_DIR_OPEN_RIGHT_PARENT_FOLDER
-#: Merge.rc:135 Merge.rc:984 Merge.rc:991 Merge.rc:998
+#: Merge.rc:135 Merge.rc:992 Merge.rc:999 Merge.rc:1006
msgid "Open &Parent Folder..."
msgstr "상위 폴더 열기(&P)"
#. IDR_POPUP_IMG_CTXT, ID_FILE_SHELLMENU
-#: Merge.rc:137 Merge.rc:1239
+#: Merge.rc:137 Merge.rc:1249
msgid "S&hell Menu"
msgstr "셸 메뉴(&H)"
@@ -255,8 +255,8 @@ msgid "Ins&ertion/Deletion Detection"
msgstr "삽입/삭제 감지(&E)"
#. IDR_MERGEDOCTYPE, ID_TOOLBAR_NONE
-#: Merge.rc:176 Merge.rc:209 Merge.rc:216 Merge.rc:358 Merge.rc:507
-#: Merge.rc:751
+#: Merge.rc:176 Merge.rc:209 Merge.rc:216 Merge.rc:360 Merge.rc:511
+#: Merge.rc:758
#, c-format
msgid "&None"
msgstr "없음(&N)"
@@ -272,13 +272,13 @@ msgid "&Horizontal"
msgstr "수평(&H)"
#. IDR_POPUP_IMG_CTXT, ID_IMG_CURPANE_PREVPAGE
-#: Merge.rc:181 Merge.rc:189 Merge.rc:1230
+#: Merge.rc:181 Merge.rc:189 Merge.rc:1240
#, c-format
msgid "&Previous Page"
msgstr "이전 페이지(&P)"
#. IDS_PREVIEWBAR_NEXTPAGE
-#: Merge.rc:182 Merge.rc:190 Merge.rc:1231 Merge.rc:5322
+#: Merge.rc:182 Merge.rc:190 Merge.rc:1241 Merge.rc:5333
#, c-format
msgid "&Next Page"
msgstr "다음 페이지(&N)"
@@ -290,45 +290,45 @@ msgid "&Active Pane"
msgstr "활성 창(&A)"
#. IDR_POPUP_IMG_CTXT, ID_IMG_CURPANE_ROTATE_RIGHT_90
-#: Merge.rc:185 Merge.rc:1225
+#: Merge.rc:185 Merge.rc:1235
msgid "Rotate &Right 90deg"
msgstr "오른쪽으로 90도 회전(&R)"
#. IDR_POPUP_IMG_CTXT, ID_IMG_CURPANE_ROTATE_LEFT_90
-#: Merge.rc:186 Merge.rc:1226
+#: Merge.rc:186 Merge.rc:1236
msgid "Rotate &Left 90deg"
msgstr "왼쪽으로 90도 회전(&L)"
#. IDR_POPUP_IMG_CTXT, ID_IMG_CURPANE_FLIP_VERTICALLY
-#: Merge.rc:187 Merge.rc:1227
+#: Merge.rc:187 Merge.rc:1237
msgid "Flip V&ertically"
msgstr "수직으로 뒤집기(&E)"
#. IDR_POPUP_IMG_CTXT, ID_IMG_CURPANE_FLIP_HORIZONTALLY
-#: Merge.rc:188 Merge.rc:1228
+#: Merge.rc:188 Merge.rc:1238
msgid "Flip H&orizontally"
msgstr "수평으로 뒤집기(&O)"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:193 Merge.rc:699
+#: Merge.rc:193 Merge.rc:706
#, c-format
msgid "&Zoom"
msgstr "확대/축소(&Z)"
#. IDR_MERGEDOCTYPE, ID_VIEW_ZOOMIN
-#: Merge.rc:202 Merge.rc:701
+#: Merge.rc:202 Merge.rc:708
#, c-format
msgid "Zoom &In\tCtrl++"
msgstr "확대(&I)\tCtrl++"
#. IDR_MERGEDOCTYPE, ID_VIEW_ZOOMOUT
-#: Merge.rc:203 Merge.rc:702
+#: Merge.rc:203 Merge.rc:709
#, c-format
msgid "Zoom &Out\tCtrl+-"
msgstr "축소(&O)\tCtrl+-"
#. IDR_MERGEDOCTYPE, ID_VIEW_ZOOMNORMAL, Zoom to normal
-#: Merge.rc:205 Merge.rc:704
+#: Merge.rc:205 Merge.rc:711
#, c-format
msgid "&Normal\tCtrl+*"
msgstr "정상(&N)\tCtrl+*"
@@ -358,29 +358,29 @@ msgid "Dragging &Mode"
msgstr "끌기 모드(&M)"
#. IDR_POPUP_IMG_CTXT, ID_IMG_DRAGGINGMODE_MOVE
-#: Merge.rc:217 Merge.rc:955 Merge.rc:1233
+#: Merge.rc:217 Merge.rc:963 Merge.rc:1243
#, c-format
msgid "&Move"
msgstr "이동(&M)"
#. IDR_POPUP_IMG_CTXT, ID_IMG_DRAGGINGMODE_ADJUST_OFFSET
-#: Merge.rc:218 Merge.rc:1234
+#: Merge.rc:218 Merge.rc:1244
#, c-format
msgid "&Adjust Offset"
msgstr "오프셋 조정(&A)"
#. IDR_POPUP_IMG_CTXT, ID_IMG_DRAGGINGMODE_VERTICAL_WIPE
-#: Merge.rc:219 Merge.rc:1235
+#: Merge.rc:219 Merge.rc:1245
msgid "&Vertical Wipe"
msgstr "수직 지우기(&V)"
#. IDR_POPUP_IMG_CTXT, ID_IMG_DRAGGINGMODE_HORIZONTAL_WIPE
-#: Merge.rc:220 Merge.rc:1236
+#: Merge.rc:220 Merge.rc:1246
msgid "&Horizontal Wipe"
msgstr "수평 지우기(&H)"
#. IDR_POPUP_IMG_CTXT, ID_IMG_DRAGGINGMODE_RECTANGLE_SELECT
-#: Merge.rc:221 Merge.rc:1237
+#: Merge.rc:221 Merge.rc:1247
msgid "Rectangle &Select"
msgstr "직사각형 영역 선택(&S)"
@@ -416,37 +416,37 @@ msgid "Compare Extracted &Text from Images"
msgstr "이미지에서 추출한 텍스트 비교(&T)"
#. IDD_OPEN, IDOK
-#: Merge.rc:272 Merge.rc:1980
+#: Merge.rc:272 Merge.rc:1990
msgid "Co&mpare"
msgstr "비교(&M)"
#. IDR_POPUP_WEBPAGE_COMPARE, ID_WEB_COMPARE_SCREENSHOTS
-#: Merge.rc:274 Merge.rc:1247
+#: Merge.rc:274 Merge.rc:1257
msgid "&Screenshots"
msgstr "스크린샷(&S)"
#. IDR_POPUP_WEBPAGE_COMPARE, ID_WEB_COMPARE_FULLSIZE_SCREENSHOTS
-#: Merge.rc:275 Merge.rc:1248
+#: Merge.rc:275 Merge.rc:1258
msgid "&Full Size Screenshots"
msgstr "전체 크기 스크린샷(&F)"
#. IDR_POPUP_WEBPAGE_COMPARE, ID_WEB_COMPARE_HTMLS
-#: Merge.rc:276 Merge.rc:1249
+#: Merge.rc:276 Merge.rc:1259
msgid "&HTMLs"
msgstr "HTML(&H)"
#. IDR_POPUP_WEBPAGE_COMPARE, ID_WEB_COMPARE_TEXTS
-#: Merge.rc:277 Merge.rc:1250
+#: Merge.rc:277 Merge.rc:1260
msgid "&Texts"
msgstr "텍스트(&T)"
#. IDR_POPUP_WEBPAGE_COMPARE, ID_WEB_COMPARE_RESOURCETREES
-#: Merge.rc:278 Merge.rc:1251
+#: Merge.rc:278 Merge.rc:1261
msgid "&Resource Trees"
msgstr "리소스 트리(&R)"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_SIZE
-#: Merge.rc:280 Merge.rc:1775
+#: Merge.rc:280 Merge.rc:1785
msgid "&Size"
msgstr "크기(&S)"
@@ -461,27 +461,27 @@ msgid "&Event Sync"
msgstr "이벤트 동기화(&E)"
#. IDR_POPUP_WEBPAGE_SYNC_EVENTS, ID_WEB_SYNC_ENABLED
-#: Merge.rc:291 Merge.rc:1259
+#: Merge.rc:291 Merge.rc:1269
msgid "&Enabled"
msgstr "사용함(&E)"
#. IDR_POPUP_WEBPAGE_SYNC_EVENTS, ID_WEB_SYNC_SCROLL
-#: Merge.rc:293 Merge.rc:1261
+#: Merge.rc:293 Merge.rc:1271
msgid "&Scroll"
msgstr "스크롤(&S)"
#. IDR_POPUP_WEBPAGE_SYNC_EVENTS, ID_WEB_SYNC_CLICK
-#: Merge.rc:294 Merge.rc:1262
+#: Merge.rc:294 Merge.rc:1272
msgid "&Click"
msgstr "클릭(&C)"
#. IDR_POPUP_WEBPAGE_SYNC_EVENTS, ID_WEB_SYNC_INPUT
-#: Merge.rc:295 Merge.rc:1263
+#: Merge.rc:295 Merge.rc:1273
msgid "&Input"
msgstr "입력(&I)"
#. IDR_POPUP_WEBPAGE_SYNC_EVENTS, ID_WEB_SYNC_GOBACKFORWARD
-#: Merge.rc:296 Merge.rc:1264
+#: Merge.rc:296 Merge.rc:1274
msgid "&Go Back/Forward"
msgstr "뒤로 이동/앞으로(&G)"
@@ -511,3970 +511,3981 @@ msgid "&All Profiles"
msgstr "모든 프로필(&A)"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:310 Merge.rc:411 Merge.rc:586
+#: Merge.rc:310 Merge.rc:413 Merge.rc:590
#, c-format
msgid "&File"
msgstr "파일(&F)"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:312 Merge.rc:413 Merge.rc:588
+#: Merge.rc:312 Merge.rc:415 Merge.rc:592
#, c-format
msgid "&New"
msgstr "새로 만들기(&N)"
#. IDR_POPUP_COMPARE, ID_MERGE_COMPARE_TEXT
-#: Merge.rc:314 Merge.rc:322 Merge.rc:415 Merge.rc:423 Merge.rc:590
-#: Merge.rc:598 Merge.rc:649 Merge.rc:935 Merge.rc:1159 Merge.rc:1171
+#: Merge.rc:314 Merge.rc:323 Merge.rc:417 Merge.rc:426 Merge.rc:594
+#: Merge.rc:603 Merge.rc:655 Merge.rc:942 Merge.rc:1167 Merge.rc:1180
#, c-format
msgid "&Text"
msgstr "텍스트(&T)"
#. IDR_POPUP_COMPARE, ID_MERGE_COMPARE_TABLE
-#: Merge.rc:315 Merge.rc:323 Merge.rc:416 Merge.rc:424 Merge.rc:591
-#: Merge.rc:599 Merge.rc:650 Merge.rc:936 Merge.rc:1160 Merge.rc:1172
+#: Merge.rc:315 Merge.rc:324 Merge.rc:418 Merge.rc:427 Merge.rc:595
+#: Merge.rc:604 Merge.rc:656 Merge.rc:943 Merge.rc:1168 Merge.rc:1181
msgid "T&able"
msgstr "테이블(&A)"
#. IDR_POPUP_COMPARE, ID_MERGE_COMPARE_HEX
-#: Merge.rc:316 Merge.rc:324 Merge.rc:417 Merge.rc:425 Merge.rc:592
-#: Merge.rc:600 Merge.rc:651 Merge.rc:937 Merge.rc:1161 Merge.rc:1173
+#: Merge.rc:316 Merge.rc:325 Merge.rc:419 Merge.rc:428 Merge.rc:596
+#: Merge.rc:605 Merge.rc:657 Merge.rc:944 Merge.rc:1169 Merge.rc:1182
#, c-format
msgid "&Binary"
msgstr "바이너리(&B)"
#. IDS_IMAGE_MENU
-#: Merge.rc:317 Merge.rc:325 Merge.rc:418 Merge.rc:426 Merge.rc:593
-#: Merge.rc:601 Merge.rc:652 Merge.rc:938 Merge.rc:1162 Merge.rc:1174
-#: Merge.rc:5123
+#: Merge.rc:317 Merge.rc:326 Merge.rc:420 Merge.rc:429 Merge.rc:597
+#: Merge.rc:606 Merge.rc:658 Merge.rc:945 Merge.rc:1170 Merge.rc:1183
+#: Merge.rc:5133
#, c-format
msgid "&Image"
msgstr "이미지(&I)"
#. IDR_POPUP_COMPARE, ID_MERGE_COMPARE_WEBPAGE
-#: Merge.rc:318 Merge.rc:326 Merge.rc:419 Merge.rc:427 Merge.rc:594
-#: Merge.rc:602 Merge.rc:653 Merge.rc:939 Merge.rc:1163 Merge.rc:1175
+#: Merge.rc:318 Merge.rc:327 Merge.rc:421 Merge.rc:430 Merge.rc:598
+#: Merge.rc:607 Merge.rc:659 Merge.rc:946 Merge.rc:1171 Merge.rc:1184
msgid "&Webpage"
msgstr "웹페이지(&W)"
+#. IDR_POPUP_NEW, ID_FILE_NEW_FOLDER
+#: Merge.rc:319 Merge.rc:328 Merge.rc:422 Merge.rc:431 Merge.rc:599
+#: Merge.rc:608 Merge.rc:1172
+msgid "&Folder"
+msgstr ""
+
#. IDR_MERGEDOCTYPE
-#: Merge.rc:320 Merge.rc:421 Merge.rc:596
+#: Merge.rc:321 Merge.rc:424 Merge.rc:601
#, c-format
msgid "New (&3 panes)"
msgstr "새로 만들기 (3개 창)(&3)"
#. IDR_MERGEDOCTYPE, ID_FILE_OPEN
-#: Merge.rc:328 Merge.rc:429 Merge.rc:604
+#: Merge.rc:330 Merge.rc:433 Merge.rc:610
#, c-format
msgid "&Open...\tCtrl+O"
msgstr "열기(&O)...\tCtrl+O"
#. IDR_MERGEDOCTYPE, ID_FILE_OPENCONFLICT
-#: Merge.rc:329 Merge.rc:430 Merge.rc:605
+#: Merge.rc:331 Merge.rc:434 Merge.rc:611
msgid "Open Conflic&t File..."
msgstr "충돌 파일 열기(&T)..."
#. IDR_MERGEDOCTYPE, ID_FILE_OPENCLIPBOARD
-#: Merge.rc:330 Merge.rc:431 Merge.rc:606
+#: Merge.rc:332 Merge.rc:435 Merge.rc:612
msgid "Open C&lipboard"
msgstr "클립보드 열기(&L)"
#. IDR_POPUP_PROJECT, ID_FILE_OPENPROJECT
-#: Merge.rc:332 Merge.rc:433 Merge.rc:608 Merge.rc:1191
+#: Merge.rc:334 Merge.rc:437 Merge.rc:614 Merge.rc:1201
#, c-format
msgid "Open Pro&ject...\tCtrl+J"
msgstr "프로젝트 열기(&J)...\tCtrl+J"
#. IDD_OPEN, ID_SAVE_PROJECT
-#: Merge.rc:333 Merge.rc:434 Merge.rc:609 Merge.rc:1193 Merge.rc:1979
+#: Merge.rc:335 Merge.rc:438 Merge.rc:615 Merge.rc:1203 Merge.rc:1989
#, c-format
msgid "Sa&ve Project..."
msgstr "프로젝트 저장(&V)..."
#. IDR_MAINFRAME, ID_FILE_PROJECT_MRU_FIRST
-#: Merge.rc:335
+#: Merge.rc:337
#, c-format
msgid "Recent Projects"
msgstr "최근 프로젝트"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:336 Merge.rc:445 Merge.rc:657
+#: Merge.rc:338 Merge.rc:449 Merge.rc:664
#, c-format
msgid "Recent F&iles or Folders"
msgstr "최근 파일/폴더(&I)"
#. IDR_MERGEDOCTYPE, ID_APP_EXIT
-#: Merge.rc:341 Merge.rc:450 Merge.rc:662
+#: Merge.rc:343 Merge.rc:454 Merge.rc:669
msgid "E&xit\tCtrl+Q"
msgstr "종료(&X)\tCtrl+Q"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:343 Merge.rc:452 Merge.rc:664
+#: Merge.rc:345 Merge.rc:456 Merge.rc:671
#, c-format
msgid "&Edit"
msgstr "편집(&E)"
#. IDR_MERGEDOCTYPE, ID_EDIT_PASTE
-#: Merge.rc:345 Merge.rc:671
+#: Merge.rc:347 Merge.rc:678
#, c-format
msgid "&Paste\tCtrl+V"
msgstr "붙여넣기(&P)\tCtrl+V"
#. IDR_MERGEDOCTYPE, ID_OPTIONS
-#: Merge.rc:347 Merge.rc:456 Merge.rc:693
+#: Merge.rc:349 Merge.rc:460 Merge.rc:700
#, c-format
msgid "&Options...\tCtrl+,"
msgstr "옵션(&O)...\tCtrl+,"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:349 Merge.rc:458 Merge.rc:695
+#: Merge.rc:351 Merge.rc:462 Merge.rc:702
#, c-format
msgid "&View"
msgstr "보기(&V)"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:351 Merge.rc:500 Merge.rc:744
+#: Merge.rc:353 Merge.rc:504 Merge.rc:751
#, c-format
msgid "Ta&b Bar"
msgstr "탭 표시줄(&B)"
#. IDR_MERGEDOCTYPE, ID_VIEW_TAB_BAR
-#: Merge.rc:353 Merge.rc:502 Merge.rc:746
+#: Merge.rc:355 Merge.rc:506 Merge.rc:753
msgid "&View Tab Bar"
msgstr "보기 탭 표시줄(&V)"
#. IDR_MERGEDOCTYPE, ID_VIEW_TAB_BAR_ON_TITLE_BAR
-#: Merge.rc:354 Merge.rc:503 Merge.rc:747
+#: Merge.rc:356 Merge.rc:507 Merge.rc:754
msgid "&On Title Bar"
msgstr "제목 표시줄에(&O)"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:356 Merge.rc:505 Merge.rc:749
+#: Merge.rc:358 Merge.rc:509 Merge.rc:756
#, c-format
msgid "&Toolbar"
msgstr "도구 모음(&T)"
#. IDR_MERGEDOCTYPE, ID_TOOLBAR_SMALL
-#: Merge.rc:359 Merge.rc:508 Merge.rc:752
+#: Merge.rc:361 Merge.rc:512 Merge.rc:759
#, c-format
msgid "&Small"
msgstr "작게(&S)"
#. IDR_MERGEDOCTYPE, ID_TOOLBAR_MEDIUM
-#: Merge.rc:360 Merge.rc:509 Merge.rc:753
+#: Merge.rc:362 Merge.rc:513 Merge.rc:760
msgid "&Medium"
msgstr "중간(&M)"
#. IDR_MERGEDOCTYPE, ID_TOOLBAR_BIG
-#: Merge.rc:361 Merge.rc:510 Merge.rc:754
+#: Merge.rc:363 Merge.rc:514 Merge.rc:761
#, c-format
msgid "&Big"
msgstr "크게(&B)"
#. IDR_MERGEDOCTYPE, ID_TOOLBAR_HUGE
-#: Merge.rc:362 Merge.rc:511 Merge.rc:755
+#: Merge.rc:364 Merge.rc:515 Merge.rc:762
#, c-format
msgid "&Huge"
msgstr "매우 크게(&H)"
#. IDS_VIEW_MENU_BAR
-#: Merge.rc:364 Merge.rc:513 Merge.rc:757 Merge.rc:5357
+#: Merge.rc:366 Merge.rc:517 Merge.rc:764 Merge.rc:5368
msgid "Men&u Bar"
msgstr "메뉴 표시줄(&U)"
#. IDR_DIRDOCTYPE, ID_VIEW_OUTPUT_BAR
-#: Merge.rc:365 Merge.rc:515
+#: Merge.rc:367 Merge.rc:519
msgid "&Output Pane"
msgstr "출력 창(&O)"
#. IDR_MERGEDOCTYPE, ID_VIEW_STATUS_BAR
-#: Merge.rc:366 Merge.rc:516 Merge.rc:758
+#: Merge.rc:368 Merge.rc:520 Merge.rc:765
#, c-format
msgid "&Status Bar"
msgstr "상태 표시줄(&S)"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:368 Merge.rc:539 Merge.rc:847
+#: Merge.rc:370 Merge.rc:543 Merge.rc:854
#, c-format
msgid "&Tools"
msgstr "도구(&T)"
#. IDR_MERGEDOCTYPE, ID_TOOLS_FILTERS
-#: Merge.rc:370 Merge.rc:542 Merge.rc:849
+#: Merge.rc:372 Merge.rc:546 Merge.rc:856
#, c-format
msgid "&Filters..."
msgstr "필터(&F)..."
#. IDR_MERGEDOCTYPE, ID_TOOLS_GENERATEPATCH
-#: Merge.rc:371 Merge.rc:543 Merge.rc:850
+#: Merge.rc:373 Merge.rc:547 Merge.rc:857
#, c-format
msgid "&Generate Patch..."
msgstr "패치 생성(&G)..."
#. IDR_MERGEDOCTYPE
-#: Merge.rc:373 Merge.rc:546 Merge.rc:853
+#: Merge.rc:375 Merge.rc:550 Merge.rc:860
#, c-format
msgid "&Plugins"
msgstr "플러그인(&P)"
#. IDD_PLUGINS_LIST, IDC_PLUGIN_SETTINGS
-#: Merge.rc:375 Merge.rc:548 Merge.rc:855 Merge.rc:2494 Merge.rc:2926
+#: Merge.rc:377 Merge.rc:552 Merge.rc:862 Merge.rc:2504 Merge.rc:2936
#, c-format
msgid "P&lugin Settings..."
msgstr "플러그인 설정(&L)..."
#. IDR_MERGEDOCTYPE, ID_PREDIFFER_MANUAL
-#: Merge.rc:377 Merge.rc:550 Merge.rc:857
+#: Merge.rc:379 Merge.rc:554 Merge.rc:864
#, c-format
msgid "Ma&nual Prediffer"
msgstr "수동 사전 차이(&N)"
#. IDR_MERGEDOCTYPE, ID_PREDIFFER_AUTO
-#: Merge.rc:378 Merge.rc:551 Merge.rc:858
+#: Merge.rc:380 Merge.rc:555 Merge.rc:865
#, c-format
msgid "A&utomatic Prediffer"
msgstr "자동 사전 차이(&U)"
#. IDR_MERGEDOCTYPE, ID_UNPACK_MANUAL
-#: Merge.rc:380 Merge.rc:553 Merge.rc:860
+#: Merge.rc:382 Merge.rc:557 Merge.rc:867
#, c-format
msgid "&Manual Unpacking"
msgstr "수동 압축 풀기(&M)"
#. IDR_MERGEDOCTYPE, ID_UNPACK_AUTO
-#: Merge.rc:381 Merge.rc:554 Merge.rc:861
+#: Merge.rc:383 Merge.rc:558 Merge.rc:868
#, c-format
msgid "&Automatic Unpacking"
msgstr "자동 압축 풀기(&A)"
#. IDR_MERGEDOCTYPE, ID_RELOAD_PLUGINS
-#: Merge.rc:383 Merge.rc:558 Merge.rc:889
+#: Merge.rc:385 Merge.rc:562 Merge.rc:896
#, c-format
msgid "&Reload Plugins"
msgstr "플러그인 다시 불러오기(&R)"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:385 Merge.rc:560 Merge.rc:891
+#: Merge.rc:387 Merge.rc:564 Merge.rc:898
#, c-format
msgid "&Window"
msgstr "창(&W)"
#. IDR_MERGEDOCTYPE, ID_FILE_CLOSE
-#: Merge.rc:387 Merge.rc:562 Merge.rc:893
+#: Merge.rc:389 Merge.rc:566 Merge.rc:900
msgid "Cl&ose\tCtrl+W"
msgstr "닫기(&O)\tCtrl+W"
#. IDR_MERGEDOCTYPE, ID_WINDOW_CLOSEALL
-#: Merge.rc:388 Merge.rc:563 Merge.rc:894
+#: Merge.rc:390 Merge.rc:567 Merge.rc:901
#, c-format
msgid "Clo&se All"
msgstr "모두 닫기(&S)"
#. IDR_MERGEDOCTYPE, ID_NEXT_PANE
-#: Merge.rc:390 Merge.rc:565 Merge.rc:896
+#: Merge.rc:392 Merge.rc:569 Merge.rc:903
#, c-format
msgid "Change &Pane\tF6"
msgstr "창 전환(&P)\tF6"
#. IDR_MERGEDOCTYPE, ID_WINDOW_TILE_HORZ
-#: Merge.rc:392 Merge.rc:567 Merge.rc:900
+#: Merge.rc:394 Merge.rc:571 Merge.rc:907
#, c-format
msgid "Tile &Horizontally"
msgstr "수평 배열(&H)"
#. IDR_MERGEDOCTYPE, ID_WINDOW_TILE_VERT
-#: Merge.rc:393 Merge.rc:568 Merge.rc:901
+#: Merge.rc:395 Merge.rc:572 Merge.rc:908
#, c-format
msgid "Tile &Vertically"
msgstr "수직 배열(&V)"
#. IDR_MERGEDOCTYPE, ID_WINDOW_CASCADE
-#: Merge.rc:394 Merge.rc:569 Merge.rc:902
+#: Merge.rc:396 Merge.rc:573 Merge.rc:909
#, c-format
msgid "&Cascade"
msgstr "계단식(&C)"
#. IDS_MESSAGEBOX_HELP
-#: Merge.rc:396 Merge.rc:571 Merge.rc:904 Merge.rc:3200 Merge.rc:4189
+#: Merge.rc:398 Merge.rc:575 Merge.rc:911 Merge.rc:3210 Merge.rc:4199
#, c-format
msgid "&Help"
msgstr "도움말(&H)"
#. IDR_MERGEDOCTYPE, ID_HELP_CONTENTS
-#: Merge.rc:398 Merge.rc:573 Merge.rc:906
+#: Merge.rc:400 Merge.rc:577 Merge.rc:913
#, c-format
msgid "&WinMerge Help\tF1"
msgstr "WinMerge 도움말(&W)\tF1"
#. IDR_MERGEDOCTYPE, ID_HELP_RELEASENOTES
-#: Merge.rc:400 Merge.rc:575 Merge.rc:908
+#: Merge.rc:402 Merge.rc:579 Merge.rc:915
#, c-format
msgid "R&elease Notes"
msgstr "릴리즈 노트(&E)"
#. IDR_MERGEDOCTYPE, ID_HELP_TRANSLATIONS
-#: Merge.rc:401 Merge.rc:576 Merge.rc:909
+#: Merge.rc:403 Merge.rc:580 Merge.rc:916
#, c-format
msgid "&Translations"
msgstr "번역(&T)"
#. IDR_MERGEDOCTYPE, ID_HELP_GETCONFIG
-#: Merge.rc:402 Merge.rc:577 Merge.rc:910
+#: Merge.rc:404 Merge.rc:581 Merge.rc:917
#, c-format
msgid "C&onfiguration"
msgstr "구성(&O)"
#. IDR_MERGEDOCTYPE, ID_HELP_GNULICENSE
-#: Merge.rc:404 Merge.rc:579 Merge.rc:912
+#: Merge.rc:406 Merge.rc:583 Merge.rc:919
#, c-format
msgid "&GNU General Public License"
msgstr "GNU 일반 공용 라이선스(&G)"
#. IDR_MERGEDOCTYPE, ID_APP_ABOUT
-#: Merge.rc:405 Merge.rc:580 Merge.rc:913
+#: Merge.rc:407 Merge.rc:584 Merge.rc:920
#, c-format
msgid "&About WinMerge..."
msgstr "WinMerge 정보(&A)..."
#. IDR_MERGEDOCTYPE
-#: Merge.rc:436 Merge.rc:629
+#: Merge.rc:440 Merge.rc:635
#, c-format
msgid "&Read-Only"
msgstr "읽기 전용(&R)"
#. IDR_MERGEDOCTYPE, ID_FILE_LEFT_READONLY
-#: Merge.rc:438 Merge.rc:631
+#: Merge.rc:442 Merge.rc:637
#, c-format
msgid "L&eft Read-Only"
msgstr "왼쪽 읽기 전용(&E)"
#. IDR_MERGEDOCTYPE, ID_FILE_MIDDLE_READONLY
-#: Merge.rc:439 Merge.rc:632
+#: Merge.rc:443 Merge.rc:638
#, c-format
msgid "M&iddle Read-Only"
msgstr "가운데 읽기 전용(&I)"
#. IDR_MERGEDOCTYPE, ID_FILE_RIGHT_READONLY
-#: Merge.rc:440 Merge.rc:633
+#: Merge.rc:444 Merge.rc:639
#, c-format
msgid "Ri&ght Read-Only"
msgstr "오른쪽 읽기 전용(&G)"
#. IDD_ENCODINGERROR, IDC_FILEENCODING
-#: Merge.rc:443 Merge.rc:646 Merge.rc:1038 Merge.rc:3063
+#: Merge.rc:447 Merge.rc:652 Merge.rc:1046 Merge.rc:3073
#, c-format
msgid "&File Encoding..."
msgstr "파일 인코딩(&F)..."
#. IDR_POPUP_OUTPUTVIEW, ID_EDIT_SELECT_ALL
-#: Merge.rc:454 Merge.rc:674 Merge.rc:1343
+#: Merge.rc:458 Merge.rc:681 Merge.rc:1353
#, c-format
msgid "Select &All\tCtrl+A"
msgstr "전체 선택(&A)\tCtrl+A"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWIDENTICAL
-#: Merge.rc:460
+#: Merge.rc:464
#, c-format
msgid "Show &Identical Items"
msgstr "같은 항목 표시(&I)"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWDIFFERENT
-#: Merge.rc:461
+#: Merge.rc:465
#, c-format
msgid "Show &Different Items"
msgstr "다른 항목 표시(&D)"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWUNIQUELEFT
-#: Merge.rc:462
+#: Merge.rc:466
#, c-format
msgid "Show L&eft Unique Items"
msgstr "왼쪽에만 있는 항목 표시(&E)"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWUNIQUEMIDDLE
-#: Merge.rc:463
+#: Merge.rc:467
#, c-format
msgid "Show Midd&le Unique Items"
msgstr "가운데에만 있는 항목 표시(&L)"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWUNIQUERIGHT
-#: Merge.rc:464
+#: Merge.rc:468
#, c-format
msgid "Show Ri&ght Unique Items"
msgstr "오른쪽에만 있는 항목 표시(&G)"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWSKIPPED
-#: Merge.rc:465
+#: Merge.rc:469
#, c-format
msgid "Show S&kipped Items"
msgstr "건너뛴 항목 표시(&K)"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWBINARIES
-#: Merge.rc:466
+#: Merge.rc:470
#, c-format
msgid "S&how Binary Files"
msgstr "바이너리 파일 표시(&H)"
#. IDR_DIRDOCTYPE
-#: Merge.rc:467
+#: Merge.rc:471
#, c-format
msgid "&3-way Compare"
msgstr "3 방향 비교(&3)"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWDIFFERENTLEFTONLY
-#: Merge.rc:469
+#: Merge.rc:473
#, c-format
msgid "Show &Left Only Different Items"
msgstr "왼쪽만 다른 항목 표시(&L)"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWDIFFERENTMIDDLEONLY
-#: Merge.rc:470
+#: Merge.rc:474
#, c-format
msgid "Show &Middle Only Different Items"
msgstr "가운데만 다른 항목 표시(&M)"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWDIFFERENTRIGHTONLY
-#: Merge.rc:471
+#: Merge.rc:475
#, c-format
msgid "Show &Right Only Different Items"
msgstr "오른쪽만 다른 항목 표시(&R)"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWMISSINGLEFTONLY
-#: Merge.rc:473
+#: Merge.rc:477
msgid "Show L&eft Only Missing Items"
msgstr "왼쪽만 없는 항목 표시(&E)"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWMISSINGMIDDLEONLY
-#: Merge.rc:474
+#: Merge.rc:478
msgid "Show Mi&ddle Only Missing Items"
msgstr "가운데만 없는 항목 표시(&D)"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWMISSINGRIGHTONLY
-#: Merge.rc:475
+#: Merge.rc:479
msgid "Show Rig&ht Only Missing Items"
msgstr "오른쪽만 없는 항목 표시(&H)"
#. IDR_DIRDOCTYPE, ID_VIEW_SHOWHIDDENITEMS
-#: Merge.rc:478
+#: Merge.rc:482
#, c-format
msgid "Show Hidd&en Items"
msgstr "숨김 파일 표시(&E)"
#. IDR_DIRDOCTYPE, ID_VIEW_TREEMODE
-#: Merge.rc:480
+#: Merge.rc:484
#, c-format
msgid "Tree &Mode"
msgstr "트리 모드(&M)"
#. IDR_DIRDOCTYPE
-#: Merge.rc:481
+#: Merge.rc:485
msgid "E&xpand Subfolders"
msgstr "하위 폴더 확장(&X)"
#. IDR_DIRDOCTYPE, ID_VIEW_EXPAND_ALLSUBDIRS
-#: Merge.rc:483
+#: Merge.rc:487
msgid "&All Subfolders"
msgstr "모든 하위 폴더(&A)"
#. IDR_DIRDOCTYPE, ID_VIEW_EXPAND_DIFFERENT_SUBDIRS
-#: Merge.rc:484
+#: Merge.rc:488
msgid "&Different Subfolders"
msgstr "다른 하위 폴더(&D)"
#. IDR_DIRDOCTYPE, ID_VIEW_EXPAND_IDENTICAL_SUBDIRS
-#: Merge.rc:485
+#: Merge.rc:489
msgid "&Identical Subfolders"
msgstr "같은 하위 폴더(&I)"
#. IDR_DIRDOCTYPE, ID_VIEW_COLLAPSE_ALLSUBDIRS
-#: Merge.rc:487
+#: Merge.rc:491
#, c-format
msgid "&Collapse All Subfolders"
msgstr "모든 하위 폴더 접기(&C)"
#. IDR_DIRDOCTYPE, ID_VIEW_SHOW_EMPTY_FOLDERS
-#: Merge.rc:488
+#: Merge.rc:492
msgid "Show &Empty Folders"
msgstr "빈 폴더 표시(&E)"
#. IDR_MERGEDOCTYPE, ID_VIEW_SELECTFONT
-#: Merge.rc:490 Merge.rc:697
+#: Merge.rc:494 Merge.rc:704
#, c-format
msgid "Select &Font..."
msgstr "글꼴 선택(&F)..."
#. IDR_MERGEDOCTYPE, ID_VIEW_USEDEFAULTFONT
-#: Merge.rc:491 Merge.rc:698
+#: Merge.rc:495 Merge.rc:705
#, c-format
msgid "Use Default Font"
msgstr "기본 글꼴 사용"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:493 Merge.rc:736
+#: Merge.rc:497 Merge.rc:743
#, c-format
msgid "Sw&ap Panes"
msgstr "창 맞바꾸기(&A)"
#. IDR_MERGEDOCTYPE, ID_SWAPPANES_SWAP12
-#: Merge.rc:495 Merge.rc:738
+#: Merge.rc:499 Merge.rc:745
msgid "Swap &1st | 2nd"
msgstr "첫 번째와 두 번째 맞바꾸기(&1)"
#. IDR_MERGEDOCTYPE, ID_SWAPPANES_SWAP23
-#: Merge.rc:496 Merge.rc:739
+#: Merge.rc:500 Merge.rc:746
msgid "Swap &2nd | 3rd"
msgstr "두 번째와 세 번째 맞바꾸기(&2)"
#. IDR_MERGEDOCTYPE, ID_SWAPPANES_SWAP13
-#: Merge.rc:497 Merge.rc:740
+#: Merge.rc:501 Merge.rc:747
msgid "Swap 1st | &3rd"
msgstr "첫 번째와 세 번째 맞바꾸기(&3)"
#. IDR_DIRDOCTYPE, ID_VIEW_DISPLAY_FILTER_BAR_MENU
-#: Merge.rc:514
+#: Merge.rc:518
msgid "Displa&y Filter Bar\tCtrl+Shift+L"
msgstr "표시 필터 막대(&Y)\tCtrl+Shift+L"
#. IDR_DIRDOCTYPE, ID_VIEW_DIR_STATISTICS
-#: Merge.rc:518
+#: Merge.rc:522
#, c-format
msgid "Com&pare Statistics..."
msgstr "통계 비교(&P)..."
#. IDR_MERGEDOCTYPE, ID_REFRESH
-#: Merge.rc:520 Merge.rc:763
+#: Merge.rc:524 Merge.rc:770
#, c-format
msgid "Refresh\tF5"
msgstr "새로 고침\tF5"
#. IDR_POPUP_DIRVIEW, ID_RESCAN
-#: Merge.rc:521 Merge.rc:1030
+#: Merge.rc:525 Merge.rc:1038
#, c-format
msgid "&Refresh Selected\tCtrl+F5"
msgstr "선택 영역 새로 고침(&R)\tCtrl+F5"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:523 Merge.rc:765
+#: Merge.rc:527 Merge.rc:772
#, c-format
msgid "&Merge"
msgstr "병합(&M)"
#. IDR_DIRDOCTYPE, ID_MERGE_COMPARE
-#: Merge.rc:525
+#: Merge.rc:529
#, c-format
msgid "Co&mpare\tEnter"
msgstr "비교(&M)\tEnter"
#. IDR_MERGEDOCTYPE, ID_NEXTDIFF
-#: Merge.rc:527 Merge.rc:767
+#: Merge.rc:531 Merge.rc:774
#, c-format
msgid "&Next Difference\tAlt+Down"
msgstr "다음 차이(&N)\tAlt+Down"
#. IDR_MERGEDOCTYPE, ID_PREVDIFF
-#: Merge.rc:528 Merge.rc:768
+#: Merge.rc:532 Merge.rc:775
#, c-format
msgid "&Previous Difference\tAlt+Up"
msgstr "이전 차이(&P)\tAlt+Up"
#. IDR_MERGEDOCTYPE, ID_FIRSTDIFF
-#: Merge.rc:530 Merge.rc:773
+#: Merge.rc:534 Merge.rc:780
#, c-format
msgid "&First Difference\tAlt+Home"
msgstr "처음 차이(&F)\tAlt+Home"
#. IDR_MERGEDOCTYPE, ID_CURDIFF
-#: Merge.rc:531 Merge.rc:774
+#: Merge.rc:535 Merge.rc:781
#, c-format
msgid "&Current Difference\tAlt+Enter"
msgstr "현재 차이(&C)\tAlt+Enter"
#. IDR_MERGEDOCTYPE, ID_LASTDIFF
-#: Merge.rc:532 Merge.rc:775
+#: Merge.rc:536 Merge.rc:782
#, c-format
msgid "&Last Difference\tAlt+End"
msgstr "마지막 차이(&L)\tAlt+End"
#. IDR_MERGEDOCTYPE, ID_L2R
-#: Merge.rc:534 Merge.rc:830
+#: Merge.rc:538 Merge.rc:837
#, c-format
msgid "Copy to &Right\tAlt+Right"
msgstr "오른쪽으로 복사(&R)\tAlt+Right"
#. IDR_MERGEDOCTYPE, ID_R2L
-#: Merge.rc:535 Merge.rc:831
+#: Merge.rc:539 Merge.rc:838
#, c-format
msgid "Copy to L&eft\tAlt+Left"
msgstr "왼쪽으로 복사(&E)\tAlt+Left"
#. IDR_DIRDOCTYPE, ID_MERGE_DELETE
-#: Merge.rc:537
+#: Merge.rc:541
#, c-format
msgid "&Delete\tDel"
msgstr "삭제(&D)\tDel"
#. IDR_POPUP_DIRVIEW, ID_TOOLS_CUSTOMIZECOLUMNS
-#: Merge.rc:541 Merge.rc:1042
+#: Merge.rc:545 Merge.rc:1050
#, c-format
msgid "&Customize Columns..."
msgstr "열 사용자 정의(&C)..."
#. IDR_MERGEDOCTYPE, ID_TOOLS_GENERATEREPORT
-#: Merge.rc:544 Merge.rc:851
+#: Merge.rc:548 Merge.rc:858
#, c-format
msgid "Generate &Report..."
msgstr "보고서 생성(&R)..."
#. IDD_ENCODINGERROR, IDC_PLUGIN
-#: Merge.rc:556 Merge.rc:867 Merge.rc:3064
+#: Merge.rc:560 Merge.rc:874 Merge.rc:3074
#, c-format
msgid "&Edit with Unpacker..."
msgstr "Unpacker로 편집(&E)..."
#. IDR_MERGEDOCTYPE, ID_FILE_SAVE
-#: Merge.rc:611
+#: Merge.rc:617
#, c-format
msgid "&Save\tCtrl+S"
msgstr "저장(&S)\tCtrl+S"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:612
+#: Merge.rc:618
#, c-format
msgid "Sav&e"
msgstr "저장(&E)"
#. IDR_POPUP_SAVE, ID_FILE_SAVE_LEFT
-#: Merge.rc:614 Merge.rc:1201
+#: Merge.rc:620 Merge.rc:1211
#, c-format
msgid "Save &Left"
msgstr "왼쪽 저장(&L)"
#. IDR_POPUP_SAVE, ID_FILE_SAVE_MIDDLE
-#: Merge.rc:615 Merge.rc:1202
+#: Merge.rc:621 Merge.rc:1212
#, c-format
msgid "Save &Middle"
msgstr "가운데 저장(&M)"
#. IDR_POPUP_SAVE, ID_FILE_SAVE_RIGHT
-#: Merge.rc:616 Merge.rc:1203
+#: Merge.rc:622 Merge.rc:1213
#, c-format
msgid "Save &Right"
msgstr "오른쪽 저장(&R)"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:618
+#: Merge.rc:624
#, c-format
msgid "Save &As"
msgstr "다른 이름으로(&A)"
#. IDR_POPUP_SAVE, ID_FILE_SAVEAS_LEFT
-#: Merge.rc:620 Merge.rc:1205
+#: Merge.rc:626 Merge.rc:1215
#, c-format
msgid "Save &Left As..."
msgstr "왼쪽 저장(&L)..."
#. IDR_POPUP_SAVE, ID_FILE_SAVEAS_MIDDLE
-#: Merge.rc:621 Merge.rc:1206
+#: Merge.rc:627 Merge.rc:1216
#, c-format
msgid "Save &Middle As..."
msgstr "가운데 저장(&M)..."
#. IDR_POPUP_SAVE, ID_FILE_SAVEAS_RIGHT
-#: Merge.rc:622 Merge.rc:1207
+#: Merge.rc:628 Merge.rc:1217
#, c-format
msgid "Save &Right As..."
msgstr "오른쪽 저장(&R)..."
#. IDR_MERGEDOCTYPE, ID_FILE_PRINT
-#: Merge.rc:625
+#: Merge.rc:631
msgid "&Print...\tCtrl+P"
msgstr "인쇄(&P)...\tCtrl+P"
#. IDR_MERGEDOCTYPE, ID_FILE_PAGE_SETUP
-#: Merge.rc:626
+#: Merge.rc:632
msgid "Page Set&up..."
msgstr "페이지 설정(&U)..."
#. IDR_MERGEDOCTYPE, ID_FILE_PRINT_PREVIEW
-#: Merge.rc:627
+#: Merge.rc:633
msgid "Print Previe&w..."
msgstr "인쇄 미리보기(&W)..."
#. IDR_MERGEDOCTYPE
-#: Merge.rc:636
+#: Merge.rc:642
#, c-format
msgid "&Convert Line Endings to"
msgstr "줄 끝 변환(&C)"
#. IDR_MERGEDOCTYPE, ID_FILE_MERGINGMODE
-#: Merge.rc:643
+#: Merge.rc:649
#, c-format
msgid "Mer&ge Mode\tF9"
msgstr "병합 모드(&G)\tF9"
#. IDR_MERGEDOCTYPE, ID_RESCAN
-#: Merge.rc:645
+#: Merge.rc:651
msgid "Reloa&d\tCtrl+F5"
msgstr "다시 불러오기(&D)\tCtrl+F5"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:647
+#: Merge.rc:653
#, c-format
msgid "Reco&mpare As"
msgstr "다시 비교(&M)"
+#. IDR_POPUP_COMPARE, ID_MERGE_COMPARE_FOLDER
+#: Merge.rc:660 Merge.rc:947 Merge.rc:1185
+msgid "A&rchive"
+msgstr ""
+
#. IDR_MERGEDOCTYPE, ID_EDIT_UNDO
-#: Merge.rc:666
+#: Merge.rc:673
#, c-format
msgid "&Undo\tCtrl+Z"
msgstr "실행 취소(&U)\tCtrl+Z"
#. IDR_MERGEDOCTYPE, ID_EDIT_REDO
-#: Merge.rc:667
+#: Merge.rc:674
#, c-format
msgid "&Redo\tCtrl+Y"
msgstr "다시 실행(&R)\tCtrl+Y"
#. IDR_MERGEDOCTYPE, ID_EDIT_CUT
-#: Merge.rc:669
+#: Merge.rc:676
#, c-format
msgid "Cu&t\tCtrl+X"
msgstr "잘라내기(&T)\tCtrl+X"
#. IDR_POPUP_OUTPUTVIEW, ID_EDIT_COPY
-#: Merge.rc:670 Merge.rc:1342
+#: Merge.rc:677 Merge.rc:1352
#, c-format
msgid "&Copy\tCtrl+C"
msgstr "복사(&C)\tCtrl+C"
#. IDR_MERGEDOCTYPE, ID_EDIT_FIND
-#: Merge.rc:676
+#: Merge.rc:683
#, c-format
msgid "F&ind...\tCtrl+F"
msgstr "찾기(&I)...\tCtrl+F"
#. IDR_MERGEDOCTYPE, ID_EDIT_REPLACE
-#: Merge.rc:677
+#: Merge.rc:684
#, c-format
msgid "Repla&ce...\tCtrl+H"
msgstr "바꾸기(&C)...\tCtrl+H"
#. IDR_MERGEDOCTYPE, ID_EDIT_MARK
-#: Merge.rc:678
+#: Merge.rc:685
#, c-format
msgid "&Marker...\tCtrl+Shift+M"
msgstr "마커(&M)...\tCtrl+Shift+M"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:680
+#: Merge.rc:687
#, c-format
msgid "Advanced"
msgstr "고급"
#. IDR_MERGEDOCTYPE, ID_EDIT_COPY_LINENUMBERS
-#: Merge.rc:682
+#: Merge.rc:689
#, c-format
msgid "&Copy With Line Numbers\tCtrl+Shift+C"
msgstr "줄 번호 포함 복사(&C)\tCtrl+Shift+C"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:684
+#: Merge.rc:691
#, c-format
msgid "&Bookmarks"
msgstr "북마크(&B)"
#. IDR_MERGEDOCTYPE, ID_EDIT_TOGGLE_BOOKMARK
-#: Merge.rc:686
+#: Merge.rc:693
#, c-format
msgid "&Toggle Bookmark\tCtrl+F2"
msgstr "북마크 전환(&T)\tCtrl+F2"
#. IDR_MERGEDOCTYPE, ID_EDIT_GOTO_NEXT_BOOKMARK
-#: Merge.rc:687
+#: Merge.rc:694
#, c-format
msgid "&Next Bookmark\tF2"
msgstr "다음 북마크(&N)\tF2"
#. IDR_MERGEDOCTYPE, ID_EDIT_GOTO_PREV_BOOKMARK
-#: Merge.rc:688
+#: Merge.rc:695
#, c-format
msgid "&Previous Bookmark\tShift+F2"
msgstr "이전 북마크(&P)\tShift+F2"
#. IDR_MERGEDOCTYPE, ID_EDIT_CLEAR_ALL_BOOKMARKS
-#: Merge.rc:689
+#: Merge.rc:696
#, c-format
msgid "&Clear All Bookmarks"
msgstr "전체 북마크 지우기(&C)"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:706
+#: Merge.rc:713
#, c-format
msgid "Syntax Highlight"
msgstr "구문 강조"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:711
+#: Merge.rc:718
#, c-format
msgid "&Diff Context"
msgstr "문맥 차이(&D)"
#. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_ALL
-#: Merge.rc:713
+#: Merge.rc:720
#, c-format
msgid "&All Lines"
msgstr "모든 줄(&A)"
#. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_0
-#: Merge.rc:715
+#: Merge.rc:722
#, c-format
msgid "&0 Lines"
msgstr "&0 줄"
#. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_1
-#: Merge.rc:716
+#: Merge.rc:723
#, c-format
msgid "&1 Line"
msgstr "&1 줄"
#. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_3
-#: Merge.rc:717
+#: Merge.rc:724
#, c-format
msgid "&3 Lines"
msgstr "&3 줄"
#. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_5
-#: Merge.rc:718
+#: Merge.rc:725
#, c-format
msgid "&5 Lines"
msgstr "&5 줄"
#. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_7
-#: Merge.rc:719
+#: Merge.rc:726
#, c-format
msgid "&7 Lines"
msgstr "&7 줄"
#. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_9
-#: Merge.rc:720
+#: Merge.rc:727
#, c-format
msgid "&9 Lines"
msgstr "&9 줄"
#. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_TOGGLE
-#: Merge.rc:722
+#: Merge.rc:729
#, c-format
msgid "&Toggle All and 0-9 Lines\tCtrl+D"
msgstr "모든 및 0-9 줄 전환(&T)\tCtrl+D"
#. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_INVERT
-#: Merge.rc:724
+#: Merge.rc:731
msgid "&Invert (Hide Different Lines)"
msgstr "반전 (다른 줄 숨기기)(&I)"
#. IDR_MERGEDOCTYPE, ID_VIEW_RESIZE_PANES
-#: Merge.rc:727
+#: Merge.rc:734
#, c-format
msgid "&Lock Panes"
msgstr "창 잠금(&L)"
#. IDR_MERGEDOCTYPE, ID_VIEW_WHITESPACE
-#: Merge.rc:728
+#: Merge.rc:735
#, c-format
msgid "&View Whitespace"
msgstr "공백 보기(&V)"
#. IDR_MERGEDOCTYPE, ID_VIEW_EOL
-#: Merge.rc:729
+#: Merge.rc:736
msgid "View E&OL"
msgstr "EOL 보기(&O)"
#. IDR_MERGEDOCTYPE, ID_VIEW_LINEDIFFS
-#: Merge.rc:730
+#: Merge.rc:737
#, c-format
msgid "Vie&w Line Differences"
msgstr "줄 차이 보기(&W)"
#. IDR_MERGEDOCTYPE, ID_VIEW_LINENUMBERS
-#: Merge.rc:731
+#: Merge.rc:738
#, c-format
msgid "View Line &Numbers"
msgstr "줄 번호 보기(&N)"
#. IDR_MERGEDOCTYPE, ID_VIEW_SELMARGIN
-#: Merge.rc:732
+#: Merge.rc:739
#, c-format
msgid "View &Margins"
msgstr "여백 보기(&M)"
#. IDR_MERGEDOCTYPE, ID_VIEW_TOPMARGIN
-#: Merge.rc:733
+#: Merge.rc:740
msgid "View To&p Margins"
msgstr "상단 여백 보기(&P)"
#. IDR_MERGEDOCTYPE, ID_VIEW_WORDWRAP
-#: Merge.rc:734
+#: Merge.rc:741
#, c-format
msgid "W&rap Lines"
msgstr "자동 줄 바꿈(&R)"
#. IDR_MERGEDOCTYPE, ID_VIEW_SPLITVERTICALLY
-#: Merge.rc:742
+#: Merge.rc:749
#, c-format
msgid "Split V&ertically"
msgstr "수직 분할(&E)"
#. IDR_MERGEDOCTYPE, ID_VIEW_DETAIL_BAR
-#: Merge.rc:759
+#: Merge.rc:766
#, c-format
msgid "Diff &Pane"
msgstr "차이 창(&P)"
#. IDR_MERGEDOCTYPE, ID_VIEW_LOCATION_BAR
-#: Merge.rc:760
+#: Merge.rc:767
#, c-format
msgid "Lo&cation Pane"
msgstr "위치 창(&C)"
#. IDS_OUTPUTBAR_CAPTION
-#: Merge.rc:761 Merge.rc:4902
+#: Merge.rc:768 Merge.rc:4912
msgid "Output Pane"
msgstr "출력 창"
#. IDR_MERGEDOCTYPE, ID_NEXTCONFLICT
-#: Merge.rc:770
+#: Merge.rc:777
#, c-format
msgid "Ne&xt Conflict\tAlt+Shift+Down"
msgstr "다음 충돌(&X)\tAlt+Shift+Down"
#. IDR_MERGEDOCTYPE, ID_PREVCONFLICT
-#: Merge.rc:771
+#: Merge.rc:778
#, c-format
msgid "Pre&vious Conflict\tAlt+Shift+Up"
msgstr "이전 충돌(&V)\tAlt+Shift+Up"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:777
+#: Merge.rc:784
#, c-format
msgid "A&dvanced"
msgstr "고급(&D)"
#. IDR_MERGEDOCTYPE, ID_NEXTDIFFLM
-#: Merge.rc:779
+#: Merge.rc:786
#, c-format
msgid "Next Difference (Left/Middle)\tAlt+1"
msgstr "다음 차이: 왼쪽과 가운데 사이\tAlt+1"
#. IDR_MERGEDOCTYPE, ID_PREVDIFFLM
-#: Merge.rc:780
+#: Merge.rc:787
#, c-format
msgid "Previous Difference (Left/Middle)\tAlt+Shift+1"
msgstr "이전 차이: 왼쪽과 가운데 사이\tAlt+Shift+1"
#. IDR_MERGEDOCTYPE, ID_NEXTDIFFLR
-#: Merge.rc:782
+#: Merge.rc:789
#, c-format
msgid "Next Difference (Left/Right)\tAlt+2"
msgstr "다음 차이: 왼쪽과 오른쪽 사이\tAlt+2"
#. IDR_MERGEDOCTYPE, ID_PREVDIFFLR
-#: Merge.rc:783
+#: Merge.rc:790
#, c-format
msgid "Previous Difference (Left/Right)\tAlt+Shift+2"
msgstr "이천 차이: 왼쪽과 오른쪽 사이\tAlt+Shift+2"
#. IDR_MERGEDOCTYPE, ID_NEXTDIFFMR
-#: Merge.rc:785
+#: Merge.rc:792
#, c-format
msgid "Next Difference (Middle/Right)\tAlt+3"
msgstr "다음 차이: 가운데와 오른쪽 사이\tAlt+3"
#. IDR_MERGEDOCTYPE, ID_PREVDIFFMR
-#: Merge.rc:786
+#: Merge.rc:793
#, c-format
msgid "Previous Difference (Middle/Right)\tAlt+Shift+3"
msgstr "이전 차이: 가운데와 오른쪽 사이\tAlt+Shift+3"
#. IDR_MERGEDOCTYPE, ID_NEXTDIFFLO
-#: Merge.rc:788
+#: Merge.rc:795
#, c-format
msgid "Next Left-Only Difference\tAlt+7"
msgstr "다음 차이: 왼쪽만\tAlt+7"
#. IDR_MERGEDOCTYPE, ID_PREVDIFFLO
-#: Merge.rc:789
+#: Merge.rc:796
#, c-format
msgid "Previous Left-Only Difference\tAlt+Shift+7"
msgstr "이전 차이: 왼쪽만\tAlt+Shift+7"
#. IDR_MERGEDOCTYPE, ID_NEXTDIFFMO
-#: Merge.rc:791
+#: Merge.rc:798
#, c-format
msgid "Next Middle-Only Difference\tAlt+8"
msgstr "다음 차이: 가운데만\tAlt+8"
#. IDR_MERGEDOCTYPE, ID_PREVDIFFMO
-#: Merge.rc:792
+#: Merge.rc:799
#, c-format
msgid "Previous Middle-Only Difference\tAlt+Shift+8"
msgstr "이전 차이: 가운데만\tAlt+Shift+8"
#. IDR_MERGEDOCTYPE, ID_NEXTDIFFRO
-#: Merge.rc:794
+#: Merge.rc:801
#, c-format
msgid "Next Right-Only Difference\tAlt+9"
msgstr "다음 차이: 오른쪽만\tAlt+9"
#. IDR_MERGEDOCTYPE, ID_PREVDIFFRO
-#: Merge.rc:795
+#: Merge.rc:802
#, c-format
msgid "Previous Right-Only Difference\tAlt+Shift+9"
msgstr "이전 차이: 오른쪽만\tAlt+Shift+9"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:797
+#: Merge.rc:804
msgid "Copy from &Left to"
msgstr "왼쪽에서 복사(&L)"
#. IDD_LOAD_SAVE_CODEPAGE, IDC_AFFECTS_MIDDLE_BTN
-#: Merge.rc:799 Merge.rc:810 Merge.rc:815 Merge.rc:826 Merge.rc:970
-#: Merge.rc:2545 Merge.rc:2817
+#: Merge.rc:806 Merge.rc:817 Merge.rc:822 Merge.rc:833 Merge.rc:978
+#: Merge.rc:2555 Merge.rc:2827
#, c-format
msgid "&Middle"
msgstr "가운데(&M)"
#. IDD_LOAD_SAVE_CODEPAGE, IDC_AFFECTS_RIGHT_BTN
-#: Merge.rc:800 Merge.rc:805 Merge.rc:816 Merge.rc:821 Merge.rc:971
-#: Merge.rc:2546 Merge.rc:2819
+#: Merge.rc:807 Merge.rc:812 Merge.rc:823 Merge.rc:828 Merge.rc:979
+#: Merge.rc:2556 Merge.rc:2829
#, c-format
msgid "&Right"
msgstr "오른쪽(&R)"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:802
+#: Merge.rc:809
msgid "Copy from &Middle to"
msgstr "가운데에서 복사(&M)"
#. IDD_LOAD_SAVE_CODEPAGE, IDC_AFFECTS_LEFT_BTN
-#: Merge.rc:804 Merge.rc:809 Merge.rc:820 Merge.rc:825 Merge.rc:969
-#: Merge.rc:2544 Merge.rc:2815
+#: Merge.rc:811 Merge.rc:816 Merge.rc:827 Merge.rc:832 Merge.rc:977
+#: Merge.rc:2554 Merge.rc:2825
#, c-format
msgid "&Left"
msgstr "왼쪽(&L)"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:807
+#: Merge.rc:814
msgid "Copy from &Right to"
msgstr "오른쪽에서 복사(&R)"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:813
+#: Merge.rc:820
msgid "Copy Selected Lines from Le&ft to"
msgstr "왼쪽에서 선택한 줄을 복사(&F)"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:818
+#: Merge.rc:825
msgid "Copy Selected Lines from Mi&ddle to"
msgstr "가운데에서 선택한 줄을 복사(&D)"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:823
+#: Merge.rc:830
msgid "Copy Selected Lines from Ri&ght to"
msgstr "오른쪽에서 선택한 줄을 복사(&G)"
#. IDR_MERGEDOCTYPE, ID_COPY_FROM_LEFT
-#: Merge.rc:833
+#: Merge.rc:840
#, c-format
msgid "Copy from Left\tAlt+Shift+Right"
msgstr "왼쪽에서 복사\tAlt+Shift+Right"
#. IDR_MERGEDOCTYPE, ID_COPY_FROM_RIGHT
-#: Merge.rc:834
+#: Merge.rc:841
#, c-format
msgid "Copy from Right\tAlt+Shift+Left"
msgstr "오른쪽에서 복사\tAlt+Shift+Left"
#. IDR_MERGEDOCTYPE, ID_L2RNEXT
-#: Merge.rc:836
+#: Merge.rc:843
msgid "C&opy to Right and Advance\tCtrl+Alt+Right"
msgstr "오른쪽으로 복사 후 진행(&O)\tCtrl+Alt+Right"
#. IDR_MERGEDOCTYPE, ID_R2LNEXT
-#: Merge.rc:837
+#: Merge.rc:844
msgid "Copy &to Left and Advance\tCtrl+Alt+Left"
msgstr "왼쪽으로 복사 후 진행(&T)\tCtrl+Alt+Left"
#. IDR_MERGEDOCTYPE, ID_ALL_RIGHT
-#: Merge.rc:839
+#: Merge.rc:846
#, c-format
msgid "Copy &All to Right"
msgstr "모두 오른쪽으로 복사(&A)"
#. IDR_MERGEDOCTYPE, ID_ALL_LEFT
-#: Merge.rc:840
+#: Merge.rc:847
#, c-format
msgid "Cop&y All to Left"
msgstr "모두 왼쪽으로 복사(&Y)"
#. IDR_MERGEDOCTYPE, ID_AUTO_MERGE
-#: Merge.rc:842
+#: Merge.rc:849
msgid "A&uto Merge\tCtrl+Alt+M"
msgstr "자동 병합(&U)\tCtrl+Alt+M"
#. IDR_MERGEDOCTYPE, ID_ADD_SYNCPOINT
-#: Merge.rc:844
+#: Merge.rc:851
#, c-format
msgid "Add &Synchronization Point\tAlt+S"
msgstr "동기화 지점 추가(&S)\tAlt+S"
#. IDR_MERGEDOCTYPE, ID_CLEAR_SYNCPOINTS
-#: Merge.rc:845
+#: Merge.rc:852
#, c-format
msgid "Clear Sync&hronization Points"
msgstr "동기화 지점 지우기(&H)"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:863
+#: Merge.rc:870
msgid "Unpac&ker"
msgstr "압축 풀기(&K)"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:869
+#: Merge.rc:876
#, c-format
msgid "&Prediffer"
msgstr "사전 차이(&P)"
#. IDR_MERGEDOCTYPE, ID_APPLY_PREDIFFER
-#: Merge.rc:873
+#: Merge.rc:880
msgid "Apply Pre&differ..."
msgstr "사전 차이 적용(&D)..."
#. IDR_MERGEDOCTYPE, ID_TRANSFORM_WITH_SCRIPT
-#: Merge.rc:879
+#: Merge.rc:886
msgid "&Transform with Editor Script..."
msgstr "편집기 스크립트로 변환(&T)..."
#. IDR_MERGEDOCTYPE
-#: Merge.rc:880
+#: Merge.rc:887
msgid "Scripts for &Copying"
msgstr "복사할 때 스크립트(&C)"
#. IDR_MERGEDOCTYPE, ID_SELECT_EDITOR_SCRIPT_FOR_COPYING
-#: Merge.rc:886
+#: Merge.rc:893
msgid "Select &Editor Script..."
msgstr "편집기 스크립트 선택(&E)..."
#. IDR_MERGEDOCTYPE, ID_WINDOW_SPLIT
-#: Merge.rc:898
+#: Merge.rc:905
#, c-format
msgid "Sp&lit"
msgstr "분할(&L)"
#. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE
-#: Merge.rc:921
+#: Merge.rc:928
#, c-format
msgid "Comp&are"
msgstr "비교(&A)"
#. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE_WITH_MOVED_RENAMED
-#: Merge.rc:922
+#: Merge.rc:929
msgid "Compar&e with Renamed/Moved Items"
msgstr "이름 바꾸기/이동된 항목과 비교(&E)"
#. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE_IN_NEW_WINDOW
-#: Merge.rc:923
+#: Merge.rc:930
msgid "Compare in New &Window"
msgstr "새 창에서 비교(&W)"
#. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE_NONHORIZONTALLY
-#: Merge.rc:924 Merge.rc:931
+#: Merge.rc:931 Merge.rc:938
msgid "Compare Non-hor&izontally..."
msgstr "수평이 아닌 방식으로 비교(&I)..."
#. IDR_POPUP_DIRVIEW
-#: Merge.rc:925
+#: Merge.rc:932
#, c-format
msgid "Compare Non-hor&izontally"
msgstr "수평이 아닌 방식으로 비교(&I)"
#. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE_LEFT1_LEFT2
-#: Merge.rc:927
+#: Merge.rc:934
#, c-format
msgid "First &Left with Second Left"
msgstr "첫 번째 왼쪽 항목을 두 번째 왼쪽 항목으로(&L)"
#. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE_RIGHT1_RIGHT2
-#: Merge.rc:928
+#: Merge.rc:935
#, c-format
msgid "First &Right with Second Right"
msgstr "첫 번째 오른쪽 항목을 두 번째 오른쪽 항목으로(&R)"
#. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE_LEFT1_RIGHT2
-#: Merge.rc:929
+#: Merge.rc:936
#, c-format
msgid "&First Left with Second Right"
msgstr "첫 번째 왼쪽 항목을 두 번째 오른쪽 항목으로(&F)"
#. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE_LEFT2_RIGHT1
-#: Merge.rc:930
+#: Merge.rc:937
#, c-format
msgid "&Second Left with First Right"
msgstr "두 번째 왼쪽 항목을 첫 번째 오른쪽 항목으로(&S)"
#. IDR_POPUP_DIRVIEW
-#: Merge.rc:933
+#: Merge.rc:940
#, c-format
msgid "Co&mpare As"
msgstr "다른 방식으로 비교(&M)"
#. IDS_COPY_LEFT_TO_MIDDLE2
-#: Merge.rc:945 Merge.rc:957 Merge.rc:4502
+#: Merge.rc:953 Merge.rc:965 Merge.rc:4512
#, c-format
msgid "Left to Middle (%1 of %2)"
msgstr "왼쪽에서 가운데로 (%1 / %2)"
#. IDS_COPY_LEFT_TO_RIGHT2
-#: Merge.rc:946 Merge.rc:958 Merge.rc:4501
+#: Merge.rc:954 Merge.rc:966 Merge.rc:4511
#, c-format
msgid "Left to Right (%1 of %2)"
msgstr "왼쪽에서 오른쪽으로 (%1 / %2)"
#. IDS_MOVE_LEFT_TO2
-#: Merge.rc:947 Merge.rc:959 Merge.rc:1022 Merge.rc:4513 Merge.rc:4542
+#: Merge.rc:955 Merge.rc:967 Merge.rc:1030 Merge.rc:4523 Merge.rc:4552
#, c-format
msgid "Left to... (%1 of %2)"
msgstr "왼쪽에서... (%1 / %2)"
#. IDS_COPY_MIDDLE_TO_LEFT2
-#: Merge.rc:948 Merge.rc:960 Merge.rc:4499
+#: Merge.rc:956 Merge.rc:968 Merge.rc:4509
#, c-format
msgid "Middle to Left (%1 of %2)"
msgstr "가운데에서 왼쪽으로 (%1 / %2)"
#. IDS_COPY_MIDDLE_TO_RIGHT2
-#: Merge.rc:949 Merge.rc:961 Merge.rc:4500
+#: Merge.rc:957 Merge.rc:969 Merge.rc:4510
#, c-format
msgid "Middle to Right (%1 of %2)"
msgstr "가운데에서 오른쪽으로 (%1 / %2)"
#. IDS_MOVE_MIDDLE_TO2
-#: Merge.rc:950 Merge.rc:962 Merge.rc:1023 Merge.rc:4514 Merge.rc:4543
+#: Merge.rc:958 Merge.rc:970 Merge.rc:1031 Merge.rc:4524 Merge.rc:4553
#, c-format
msgid "Middle to... (%1 of %2)"
msgstr "가운데에서... (%1 / %2)"
#. IDS_COPY_RIGHT_TO_MIDDLE2
-#: Merge.rc:951 Merge.rc:963 Merge.rc:4498
+#: Merge.rc:959 Merge.rc:971 Merge.rc:4508
#, c-format
msgid "Right to Middle (%1 of %2)"
msgstr "오른쪽에서 가운데로 (%1 / %2)"
#. IDS_COPY_RIGHT_TO_LEFT2
-#: Merge.rc:952 Merge.rc:964 Merge.rc:4497
+#: Merge.rc:960 Merge.rc:972 Merge.rc:4507
#, c-format
msgid "Right to Left (%1 of %2)"
msgstr "오른쪽에서 왼쪽으로 (%1 / %2)"
#. IDS_MOVE_RIGHT_TO2
-#: Merge.rc:953 Merge.rc:965 Merge.rc:1024 Merge.rc:4515 Merge.rc:4544
+#: Merge.rc:961 Merge.rc:973 Merge.rc:1032 Merge.rc:4525 Merge.rc:4554
#, c-format
msgid "Right to... (%1 of %2)"
msgstr "오른쪽에서... (%1 / %2)"
#. IDD_EDIT_MARKER, IDC_EDIT_MARKER_DELETE
-#: Merge.rc:967 Merge.rc:2036
+#: Merge.rc:975 Merge.rc:2046
#, c-format
msgid "&Delete"
msgstr "삭제(&D)"
#. IDR_POPUP_DIRVIEW, ID_DIR_DEL_BOTH
-#: Merge.rc:972
+#: Merge.rc:980
#, c-format
msgid "&Both"
msgstr "양쪽(&B)"
#. IDR_POPUP_DIRVIEW, ID_DIR_DEL_ALL
-#: Merge.rc:973
+#: Merge.rc:981
#, c-format
msgid "&All"
msgstr "전체(&A)"
#. IDD_EDIT_REPLACE, IDC_EDIT_SCOPE_SELECTION
-#: Merge.rc:974 Merge.rc:2019
+#: Merge.rc:982 Merge.rc:2029
#, c-format
msgid "&Selection"
msgstr "선택(&S)"
#. IDR_POPUP_DIRVIEW, ID_DIR_ITEM_RENAME
-#: Merge.rc:976
+#: Merge.rc:984
#, c-format
msgid "Re&name"
msgstr "이름 바꾸기(&N)"
#. IDR_POPUP_DIRVIEW, ID_DIR_HIDE_FILENAMES
-#: Merge.rc:977
+#: Merge.rc:985
#, c-format
msgid "&Hide Items"
msgstr "항목 숨기기(&H)"
#. IDR_POPUP_DIRVIEW
-#: Merge.rc:979
+#: Merge.rc:987
#, c-format
msgid "&Open Left"
msgstr "왼쪽 열기(&O)"
#. IDR_POPUP_DIRVIEW
-#: Merge.rc:986
+#: Merge.rc:994
#, c-format
msgid "Open Midd&le"
msgstr "가운데 열기(&L)"
#. IDR_POPUP_DIRVIEW
-#: Merge.rc:993
+#: Merge.rc:1001
#, c-format
msgid "O&pen Right"
msgstr "오른쪽 열기(&P)"
#. IDR_POPUP_DIRVIEW
-#: Merge.rc:1001
+#: Merge.rc:1009
#, c-format
msgid "Cop&y Paths"
msgstr "경로 복사(&Y)"
#. IDS_DEL_LEFT_FMT2
-#: Merge.rc:1003 Merge.rc:1012 Merge.rc:4530
+#: Merge.rc:1011 Merge.rc:1020 Merge.rc:4540
#, c-format
msgid "Left (%1 of %2)"
msgstr "왼쪽 (%1 / %2)"
#. IDS_DEL_MIDDLE_FMT2
-#: Merge.rc:1004 Merge.rc:1013 Merge.rc:4531
+#: Merge.rc:1012 Merge.rc:1021 Merge.rc:4541
#, c-format
msgid "Middle (%1 of %2)"
msgstr "가운데 (%1 / %2)"
#. IDS_DEL_RIGHT_FMT2
-#: Merge.rc:1005 Merge.rc:1014 Merge.rc:4532
+#: Merge.rc:1013 Merge.rc:1022 Merge.rc:4542
#, c-format
msgid "Right (%1 of %2)"
msgstr "오른쪽 (%1 / %2)"
#. IDS_DEL_BOTH_FMT2
-#: Merge.rc:1006 Merge.rc:1015 Merge.rc:4533
+#: Merge.rc:1014 Merge.rc:1023 Merge.rc:4543
#, c-format
msgid "Both (%1 of %2)"
msgstr "양쪽 (%1 / %2)"
#. IDS_DEL_ALL_FMT2
-#: Merge.rc:1007 Merge.rc:1016 Merge.rc:4538
+#: Merge.rc:1015 Merge.rc:1024 Merge.rc:4548
#, c-format
msgid "All (%1 of %2)"
msgstr "전체 (%1 / %2)"
#. IDR_POPUP_DIRVIEW, ID_DIR_COPY_FILENAMES
-#: Merge.rc:1009
+#: Merge.rc:1017
#, c-format
msgid "Copy &Filenames"
msgstr "파일 이름들 복사(&F)"
#. IDR_POPUP_DIRVIEW
-#: Merge.rc:1010
+#: Merge.rc:1018
#, c-format
msgid "Copy Items to Clip&board"
msgstr "항목을 클립보드로 복사(&B)"
#. IDR_POPUP_DIRVIEW, ID_DIR_COPY_ALL_DISP_COLUMNS
-#: Merge.rc:1018
+#: Merge.rc:1026
msgid "Copy All Di&splayed Columns"
msgstr "표시된 모든 열 복사(&S)"
#. IDR_POPUP_DIRVIEW
-#: Merge.rc:1020
+#: Merge.rc:1028
#, c-format
msgid "&Zip"
msgstr "Zip 압축(&Z)"
#. IDS_COPY_BOTH_TO2
-#: Merge.rc:1025 Merge.rc:4516
+#: Merge.rc:1033 Merge.rc:4526
#, c-format
msgid "Both to... (%1 of %2)"
msgstr "양쪽... (%1 / %2)"
#. IDS_COPY_ALL_TO2
-#: Merge.rc:1026 Merge.rc:4517
+#: Merge.rc:1034 Merge.rc:4527
#, c-format
msgid "All to... (%1 of %2)"
msgstr "모두... (%1 / %2)"
#. IDS_COPY_DIFFERENCES_TO2
-#: Merge.rc:1027 Merge.rc:4518
+#: Merge.rc:1035 Merge.rc:4528
#, c-format
msgid "Differences to... (%1 of %2)"
msgstr "차이... (%1 / %2)"
#. IDR_POPUP_DIRVIEW, ID_DIR_SHELL_CONTEXT_MENU_LEFT
-#: Merge.rc:1032
+#: Merge.rc:1040
#, c-format
msgid "Left Shell Menu"
msgstr "왼쪽 셸 메뉴"
#. IDR_POPUP_DIRVIEW, ID_DIR_SHELL_CONTEXT_MENU_MIDDLE
-#: Merge.rc:1033
+#: Merge.rc:1041
#, c-format
msgid "Middle Shell Menu"
msgstr "가운데 셸 메뉴"
#. IDR_POPUP_DIRVIEW, ID_DIR_SHELL_CONTEXT_MENU_RIGHT
-#: Merge.rc:1034
+#: Merge.rc:1042
#, c-format
msgid "Right Shell Menu"
msgstr "오른쪽 셸 메뉴"
#. IDR_POPUP_DIRVIEW, ID_DIR_SHELL_CONTEXT_MENU_BOTH
-#: Merge.rc:1035
+#: Merge.rc:1043
msgid "Both Shell Menu"
msgstr "두 셀 메뉴"
#. IDR_POPUP_DIRVIEW, ID_DIR_SHELL_CONTEXT_MENU_ALL
-#: Merge.rc:1036
+#: Merge.rc:1044
msgid "All Shell Menu"
msgstr "모든 쉘 메뉴"
#. IDR_POPUP_EDITOR_HEADERBAR, ID_EDITOR_COPY
-#: Merge.rc:1050
+#: Merge.rc:1058
#, c-format
msgid "Copy"
msgstr "복사"
#. IDR_POPUP_EDITOR_HEADERBAR, ID_EDITOR_COPY_PATH
-#: Merge.rc:1051
+#: Merge.rc:1059
#, c-format
msgid "&Copy Full Path"
msgstr "전체 경로 복사(&C)"
#. IDR_POPUP_EDITOR_HEADERBAR, ID_EDITOR_COPY_FILENAME
-#: Merge.rc:1052
+#: Merge.rc:1060
#, c-format
msgid "Copy &Filename"
msgstr "파일 이름 복사(&F)"
#. IDR_POPUP_EDITOR_HEADERBAR, ID_EDITOR_EDIT_CAPTION
-#: Merge.rc:1053
+#: Merge.rc:1061
msgid "&Edit Caption\tF2"
msgstr "캡션 편집(&E)\tF2"
#. IDR_POPUP_EDITOR_HEADERBAR, ID_EDITOR_EDIT_PATH
-#: Merge.rc:1055
+#: Merge.rc:1063
msgid "Edit &Path\tCtrl+L"
msgstr "편집 경로(&P)\tCtrl+L"
#. IDR_POPUP_EDITOR_HEADERBAR, ID_EDITOR_SELECT_FILE
-#: Merge.rc:1056
+#: Merge.rc:1064
msgid "&Open..."
msgstr "열기(&O)..."
#. IDR_POPUP_PLUGINS_SETTINGS
-#: Merge.rc:1062
+#: Merge.rc:1070
msgid "Unpacker Settings"
msgstr "압축 풀기 설정"
#. IDS_USERCHOICE_NONE
-#: Merge.rc:1064 Merge.rc:1070 Merge.rc:1789 Merge.rc:1793 Merge.rc:5030
+#: Merge.rc:1072 Merge.rc:1078 Merge.rc:1799 Merge.rc:1803 Merge.rc:5040
#, c-format
msgid ""
msgstr "<없음>"
#. IDS_USERCHOICE_AUTOMATIC
-#: Merge.rc:1065 Merge.rc:1071 Merge.rc:5031
+#: Merge.rc:1073 Merge.rc:1079 Merge.rc:5041
#, c-format
msgid ""
msgstr "<자동>"
#. IDD_OPEN, IDC_SELECT_PREDIFFER
-#: Merge.rc:1066 Merge.rc:1072 Merge.rc:1970 Merge.rc:1974
+#: Merge.rc:1074 Merge.rc:1080 Merge.rc:1980 Merge.rc:1984
#, c-format
msgid "&Select..."
msgstr "선택(&S)..."
#. IDR_POPUP_PLUGINS_SETTINGS
-#: Merge.rc:1068
+#: Merge.rc:1076
#, c-format
msgid "Prediffer Settings"
msgstr "사전 차이 설정"
#. IDR_POPUP_LOCATIONBAR, ID_LOCBAR_GOTODIFF
-#: Merge.rc:1080
+#: Merge.rc:1088
msgid "G&o to Diff"
msgstr "차이로 이동(&O)"
#. IDR_POPUP_LOCATIONBAR, ID_LOCBAR_MOVECURSOR_ONCLICK
-#: Merge.rc:1083
+#: Merge.rc:1091
msgid "Move Cursor on &Click"
msgstr "클릭 시 커서 이동(&C)"
#. IDR_POPUP_LOCATIONBAR, ID_DISPLAY_MOVED_NONE
-#: Merge.rc:1085
+#: Merge.rc:1093
#, c-format
msgid "&No Moved Blocks"
msgstr "이동된 블럭 없음(&N)"
#. IDR_POPUP_LOCATIONBAR, ID_DISPLAY_MOVED_ALL
-#: Merge.rc:1086
+#: Merge.rc:1094
#, c-format
msgid "&All Moved Blocks"
msgstr "모든 이동된 블럭(&A)"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS
-#: Merge.rc:1094 Merge.rc:1127
+#: Merge.rc:1102 Merge.rc:1135
#, c-format
msgid "W&hitespaces"
msgstr "공백 문자(&H)"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_WHITESPACE_COMPARE
-#: Merge.rc:1096 Merge.rc:1129
+#: Merge.rc:1104 Merge.rc:1137
#, c-format
msgid "Com&pare"
msgstr "비교(&P)"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_WHITESPACE_IGNORE
-#: Merge.rc:1097 Merge.rc:1130
+#: Merge.rc:1105 Merge.rc:1138
#, c-format
msgid "I&gnore Changes"
msgstr "변경사항 무시(&G)"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_WHITESPACE_IGNOREALL
-#: Merge.rc:1098 Merge.rc:1131
+#: Merge.rc:1106 Merge.rc:1139
#, c-format
msgid "Ig&nore All"
msgstr "모두 무시(&N)"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_IGNORE_BLANKLINES
-#: Merge.rc:1100 Merge.rc:1133
+#: Merge.rc:1108 Merge.rc:1141
#, c-format
msgid "Ignore Blan&k Lines"
msgstr "공백 줄 무시(&K)"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_IGNORE_CASE
-#: Merge.rc:1101 Merge.rc:1134
+#: Merge.rc:1109 Merge.rc:1142
#, c-format
msgid "Ignore &Case"
msgstr "대소문자 무시(&C)"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_IGNORE_EOL
-#: Merge.rc:1102 Merge.rc:1135
+#: Merge.rc:1110 Merge.rc:1143
#, c-format
msgid "Igno&re EOL Differences (Windows/Unix/Mac)"
msgstr "케리지 리턴 차이 무시 (Windows/Unix/Mac)(&R)"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_IGNORE_CODEPAGE
-#: Merge.rc:1103 Merge.rc:1136
+#: Merge.rc:1111 Merge.rc:1144
#, c-format
msgid "Ignore Codepage &Differences"
msgstr "코드페이지 차이 무시(&D)"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_IGNORE_NUMBERS
-#: Merge.rc:1104 Merge.rc:1137
+#: Merge.rc:1112 Merge.rc:1145
msgid "Ignore Num&bers"
msgstr "숫자 무시(&B)"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_IGNORE_COMMENTS
-#: Merge.rc:1105 Merge.rc:1138
+#: Merge.rc:1113 Merge.rc:1146
msgid "Ignore C&omment Differences"
msgstr "주석 차이 무시(&O)"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_IGNORE_MISSING_TRAILING_EOL
-#: Merge.rc:1106 Merge.rc:1139
+#: Merge.rc:1114 Merge.rc:1147
msgid "Ignore &Missing Trailing EOL"
msgstr "누락된 후행 EOL 무시(&M)"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_IGNORE_LINE_BREAKS
-#: Merge.rc:1107 Merge.rc:1140
+#: Merge.rc:1115 Merge.rc:1148
msgid "Ignore Line &Breaks (Treat as Spaces)"
msgstr "줄 바꿈 무시 (공백으로 처리)(&B)"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_RECURS_CHECK
-#: Merge.rc:1109 Merge.rc:2963
+#: Merge.rc:1117 Merge.rc:2973
#, c-format
msgid "&Include Subfolders"
msgstr "하위 폴더 포함(&I)"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS
-#: Merge.rc:1110 Merge.rc:1142
+#: Merge.rc:1118 Merge.rc:1150
#, c-format
msgid "&Compare Method"
msgstr "비교 방법(&C)"
#. IDS_COMPMETHOD_FULL_CONTENTS
-#: Merge.rc:1112 Merge.rc:1144 Merge.rc:1328 Merge.rc:4282
+#: Merge.rc:1120 Merge.rc:1152 Merge.rc:1338 Merge.rc:4292
#, c-format
msgid "Full Contents"
msgstr "전체 내용"
#. IDS_COMPMETHOD_QUICK_CONTENTS
-#: Merge.rc:1113 Merge.rc:1145 Merge.rc:1329 Merge.rc:4283
+#: Merge.rc:1121 Merge.rc:1153 Merge.rc:1339 Merge.rc:4293
#, c-format
msgid "Quick Contents"
msgstr "빠른 내용"
#. IDS_COMPMETHOD_BINARY_CONTENTS
-#: Merge.rc:1114 Merge.rc:1146 Merge.rc:1330 Merge.rc:4284
+#: Merge.rc:1122 Merge.rc:1154 Merge.rc:1340 Merge.rc:4294
#, c-format
msgid "Binary Contents"
msgstr "바이너리 내용"
#. IDS_COMPMETHOD_MODDATE
-#: Merge.rc:1115 Merge.rc:1147 Merge.rc:1331 Merge.rc:4285
+#: Merge.rc:1123 Merge.rc:1155 Merge.rc:1341 Merge.rc:4295
#, c-format
msgid "Modified Date"
msgstr "변경된 날짜"
#. IDS_COMPMETHOD_DATESIZE
-#: Merge.rc:1116 Merge.rc:1148 Merge.rc:1332 Merge.rc:4286
+#: Merge.rc:1124 Merge.rc:1156 Merge.rc:1342 Merge.rc:4296
#, c-format
msgid "Modified Date and Size"
msgstr "변경된 날짜 및 크기"
#. IDS_COMPMETHOD_SIZE
-#: Merge.rc:1117 Merge.rc:1149 Merge.rc:1333 Merge.rc:4287
+#: Merge.rc:1125 Merge.rc:1157 Merge.rc:1343 Merge.rc:4297
#, c-format
msgid "Size"
msgstr "크기"
#. IDS_COMPMETHOD_EXISTENCE
-#: Merge.rc:1118 Merge.rc:1150 Merge.rc:1334 Merge.rc:4288
+#: Merge.rc:1126 Merge.rc:1158 Merge.rc:1344 Merge.rc:4298
msgid "Existence"
msgstr "존재"
#. IDR_POPUP_PROJECT, ID_LOAD_PROJECT
-#: Merge.rc:1192
+#: Merge.rc:1202
#, c-format
msgid "&Load Project..."
msgstr "프로젝트 불러오기(&L)..."
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARGALL
-#: Merge.rc:1272 Merge.rc:1301
+#: Merge.rc:1282 Merge.rc:1311
msgid "${*} - All Arguments"
msgstr "${*} - 모든 인수"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARG1
-#: Merge.rc:1273 Merge.rc:1302
+#: Merge.rc:1283 Merge.rc:1312
msgid "${1} - First Argument"
msgstr "${1} - 첫 번째 인수"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARG2
-#: Merge.rc:1274 Merge.rc:1303
+#: Merge.rc:1284 Merge.rc:1313
msgid "${2} - Second Argument"
msgstr "${2} - 두 번째 인수"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARG3
-#: Merge.rc:1275 Merge.rc:1304
+#: Merge.rc:1285 Merge.rc:1314
msgid "${3} - Third Argument"
msgstr "${3} - 세 번째 인수"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARG4
-#: Merge.rc:1276 Merge.rc:1305
+#: Merge.rc:1286 Merge.rc:1315
msgid "${4} - Fourth Argument"
msgstr "${4} - 네 번째 인수"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARG5
-#: Merge.rc:1277 Merge.rc:1306
+#: Merge.rc:1287 Merge.rc:1316
msgid "${5} - Fifth Argument"
msgstr "${5} - 다섯 번쩨 인수"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARG6
-#: Merge.rc:1278 Merge.rc:1307
+#: Merge.rc:1288 Merge.rc:1317
msgid "${6} - Sixth Argument"
msgstr "${6} - 여섯 번째 인수"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARG7
-#: Merge.rc:1279 Merge.rc:1308
+#: Merge.rc:1289 Merge.rc:1318
msgid "${7} - Seventh Argument"
msgstr "${7} - 일곱 번째 인수"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARG8
-#: Merge.rc:1280 Merge.rc:1309
+#: Merge.rc:1290 Merge.rc:1319
msgid "${8} - Eighth Argument"
msgstr "${8} - 여덟 번째 인수"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARG9
-#: Merge.rc:1281 Merge.rc:1310
+#: Merge.rc:1291 Merge.rc:1320
msgid "${9} - Ninth Argument"
msgstr "${9} - 아홉 번째 인수"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_SRC_FILE
-#: Merge.rc:1289
+#: Merge.rc:1299
msgid "${SRC_FILE} - Source File"
msgstr "${SRC_FILE} - 소스 파일"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_SRC_FOLDER
-#: Merge.rc:1290
+#: Merge.rc:1300
msgid "${SRC_FOLDER} - Source Folder"
msgstr "${SRC_FOLDER} - 소스 폴더"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_SRC_URL
-#: Merge.rc:1291
+#: Merge.rc:1301
msgid "${SRC_URL} - Source URL"
msgstr "${SRC_URL} - 소스 URL"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_SRC_URL_PROTOCOL
-#: Merge.rc:1292
+#: Merge.rc:1302
msgid "${SRC_URL_PROTOCOL} - Source URL Protocol"
msgstr "${SRC_URL_PROTOCOL} - 소스 URL 프로토콜"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_SRC_URL_SUFFIX
-#: Merge.rc:1293
+#: Merge.rc:1303
msgid "${SRC_URL_SUFFIX} - Source URL Suffix"
msgstr "${SRC_URL_SUFFIX} - 소스 URL 접미사"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_DST_FILE
-#: Merge.rc:1294
+#: Merge.rc:1304
msgid "${DST_FILE} - Destination File"
msgstr "${DST_FILE} - 대상 파일"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_DST_FOLDER
-#: Merge.rc:1295
+#: Merge.rc:1305
msgid "${DST_FOLDER} - Destination Folder"
msgstr "${DST_FOLDER} - 대상 폴더"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_DST_URL
-#: Merge.rc:1296
+#: Merge.rc:1306
msgid "${DST_URL} - Destination URL"
msgstr "${DST_URL} - 대상 URL"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_DST_URL_PROTOCOL
-#: Merge.rc:1297
+#: Merge.rc:1307
msgid "${DST_URL_PROTOCOL} - Destination URL Protocol"
msgstr "${DST_URL_PROTOCOL} - 대상 URL 프로토콜"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_DST_URL_SUFFIX
-#: Merge.rc:1298
+#: Merge.rc:1308
msgid "${DST_URL_SUFFIX} - Destination URL Suffix"
msgstr "${DST_URL_SUFFIX} - 대상 URL 접미사"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_WINMERGE_HOME
-#: Merge.rc:1299
+#: Merge.rc:1309
msgid "${WINMERGE_HOME} - WinMerge Home Directory"
msgstr "${WINMERGE_HOME} - WinMerge 홈 디렉터리"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_SCRIPT_FILE
-#: Merge.rc:1300
+#: Merge.rc:1310
msgid "${SCRIPT_FILE} - Script File"
msgstr "${SCRIPT_FILE} - 스크립트 파일"
#. IDR_POPUP_PLUGIN_ADD_MENU, ID_PLUGIN_ADD_UNPACKER
-#: Merge.rc:1318
+#: Merge.rc:1328
msgid "Add &Unpacker Plugin..."
msgstr "압축해제 플러그인 추가(&U)..."
#. IDR_POPUP_PLUGIN_ADD_MENU, ID_PLUGIN_ADD_PREDIFFER
-#: Merge.rc:1319
+#: Merge.rc:1329
msgid "Add &Prediffer Plugin..."
msgstr "사전 차이 플러그인 추가(&P)..."
#. IDR_POPUP_PLUGIN_ADD_MENU, ID_PLUGIN_DUPLICATE
-#: Merge.rc:1320
+#: Merge.rc:1330
msgid "&Duplicate Plugin..."
msgstr "중복 플러그인(&D)..."
#. IDR_POPUP_OUTPUTVIEW, ID_EDIT_CLEAR_ALL
-#: Merge.rc:1344
+#: Merge.rc:1354
msgid "Clear &All"
msgstr "모두 지우기(&A)"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_MASK_CLEAR
-#: Merge.rc:1352
+#: Merge.rc:1362
msgid "&Clear All"
msgstr "모두 지우기(&C)"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_MASK_REMOVE_LAST
-#: Merge.rc:1353
+#: Merge.rc:1363
msgid "Remove Last Filter &Group"
msgstr "마지막 필터 그룹 제거(&G)"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_MASK_ALL
-#: Merge.rc:1354
+#: Merge.rc:1364
msgid "R&eset to Default (*.*)"
msgstr "기본값으로 재설정 (*.*)(&E)"
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1355
+#: Merge.rc:1365
msgid "Add E&xclude File"
msgstr "제외 파일 추가(&X)"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_SYS
-#: Merge.rc:1357
+#: Merge.rc:1367
msgid "&System Files"
msgstr "시스템 파일(&S)"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_BACKUP
-#: Merge.rc:1358
+#: Merge.rc:1368
msgid "&Editor Backup Files"
msgstr "편집기 백업 파일(&E)"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_BIN
-#: Merge.rc:1359
+#: Merge.rc:1369
msgid "&Compiled Binary Files"
msgstr "컴파일된 바이너리 파일(&C)"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_LOG
-#: Merge.rc:1360
+#: Merge.rc:1370
msgid "&Log Files"
msgstr "로그 파일(&L)"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_TEMP
-#: Merge.rc:1361
+#: Merge.rc:1371
msgid "&Temporary or Cache Files"
msgstr "임시 파일 또는 캐시 파일(&T)"
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1363
+#: Merge.rc:1373
msgid "Add Excl&ude Folder"
msgstr "제외 폴더 추가(&U)"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FOLDER_VCS
-#: Merge.rc:1365
+#: Merge.rc:1375
msgid "&Version Control"
msgstr "버전 제어(&V)"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FOLDER_BUILD
-#: Merge.rc:1366
+#: Merge.rc:1376
msgid "&Build Artifacts"
msgstr "아티팩트 구축(&B)"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FOLDER_IDE
-#: Merge.rc:1367
+#: Merge.rc:1377
msgid "&IDE"
msgstr "IDE(&I)"
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1370
+#: Merge.rc:1380
msgid "Add &File Condition"
msgstr "파일 조건 추가(&F)"
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1372 Merge.rc:1551
+#: Merge.rc:1382 Merge.rc:1561
msgid "File &Size"
msgstr "파일 크기(&S)"
#. IDR_POPUP_FILTERMENU_DIFF_SIZE, ID_FILTERMENU_DIFF_SIZE_LT_1KB
-#: Merge.rc:1374 Merge.rc:1527 Merge.rc:1564 Merge.rc:1629 Merge.rc:1707
+#: Merge.rc:1384 Merge.rc:1537 Merge.rc:1574 Merge.rc:1639 Merge.rc:1717
msgid "Less than 1KB"
msgstr "1KB 미만"
#. IDR_POPUP_FILTERMENU_DIFF_SIZE, ID_FILTERMENU_DIFF_SIZE_GE_1KB
-#: Merge.rc:1375 Merge.rc:1528 Merge.rc:1565 Merge.rc:1630 Merge.rc:1708
+#: Merge.rc:1385 Merge.rc:1538 Merge.rc:1575 Merge.rc:1640 Merge.rc:1718
msgid "1KB or more"
msgstr "1KB 이상"
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_LT_10KB
-#: Merge.rc:1376 Merge.rc:1529 Merge.rc:1631
+#: Merge.rc:1386 Merge.rc:1539 Merge.rc:1641
msgid "Less than 10KB"
msgstr "10KB 미만"
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_GE_10KB
-#: Merge.rc:1377 Merge.rc:1530 Merge.rc:1632
+#: Merge.rc:1387 Merge.rc:1540 Merge.rc:1642
msgid "10KB or more"
msgstr "10KB 이상"
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_LT_100KB
-#: Merge.rc:1378 Merge.rc:1531 Merge.rc:1633
+#: Merge.rc:1388 Merge.rc:1541 Merge.rc:1643
msgid "Less than 100KB"
msgstr "100KB 미만"
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_GE_100KB
-#: Merge.rc:1379 Merge.rc:1532 Merge.rc:1634
+#: Merge.rc:1389 Merge.rc:1542 Merge.rc:1644
msgid "100KB or more"
msgstr "100KB 이상"
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_LT_1MB
-#: Merge.rc:1380 Merge.rc:1533 Merge.rc:1635
+#: Merge.rc:1390 Merge.rc:1543 Merge.rc:1645
msgid "Less than 1MB"
msgstr "1MB 미만"
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_GE_1MB
-#: Merge.rc:1381 Merge.rc:1534 Merge.rc:1636
+#: Merge.rc:1391 Merge.rc:1544 Merge.rc:1646
msgid "1MB or more"
msgstr "1MB 이상"
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_LT_10MB
-#: Merge.rc:1382 Merge.rc:1535 Merge.rc:1637
+#: Merge.rc:1392 Merge.rc:1545 Merge.rc:1647
msgid "Less than 10MB"
msgstr "10MB 미만"
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_GE_10MB
-#: Merge.rc:1383 Merge.rc:1536 Merge.rc:1638
+#: Merge.rc:1393 Merge.rc:1546 Merge.rc:1648
msgid "10MB or more"
msgstr "10MB 이상"
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_LT_100MB
-#: Merge.rc:1384 Merge.rc:1537 Merge.rc:1639
+#: Merge.rc:1394 Merge.rc:1547 Merge.rc:1649
msgid "Less than 100MB"
msgstr "100MB 미만"
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_GE_100MB
-#: Merge.rc:1385 Merge.rc:1538 Merge.rc:1640
+#: Merge.rc:1395 Merge.rc:1548 Merge.rc:1650
msgid "100MB or more"
msgstr "100MB 이상"
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_LT_1GB
-#: Merge.rc:1386 Merge.rc:1539 Merge.rc:1641
+#: Merge.rc:1396 Merge.rc:1549 Merge.rc:1651
msgid "Less than 1GB"
msgstr "1GB 미만"
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_GE_1GB
-#: Merge.rc:1387 Merge.rc:1642
+#: Merge.rc:1397 Merge.rc:1652
msgid "1GB or more"
msgstr "1GB 이상"
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_RANGE
-#: Merge.rc:1388 Merge.rc:1465 Merge.rc:1517 Merge.rc:1523 Merge.rc:1540
-#: Merge.rc:1566 Merge.rc:1587 Merge.rc:1643 Merge.rc:1709 Merge.rc:1734
+#: Merge.rc:1398 Merge.rc:1475 Merge.rc:1527 Merge.rc:1533 Merge.rc:1550
+#: Merge.rc:1576 Merge.rc:1597 Merge.rc:1653 Merge.rc:1719 Merge.rc:1744
msgid "Custom Range..."
msgstr "사용자 지정 범위..."
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1390 Merge.rc:1471 Merge.rc:1568
+#: Merge.rc:1400 Merge.rc:1481 Merge.rc:1578
msgid "&Last Modified"
msgstr "마지막 수정일(&L)"
#. IDR_POPUP_FILTERMENU_DATE
-#: Merge.rc:1392 Merge.rc:1473 Merge.rc:1651
+#: Merge.rc:1402 Merge.rc:1483 Merge.rc:1661
msgid "&Hour"
msgstr "시(&H)"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_HOUR_BEFORE_1
-#: Merge.rc:1394 Merge.rc:1475 Merge.rc:1653
+#: Merge.rc:1404 Merge.rc:1485 Merge.rc:1663
msgid "More than 1 hour ago"
msgstr "1시간 이상 전"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_HOUR_WITHIN_1
-#: Merge.rc:1395 Merge.rc:1476 Merge.rc:1654
+#: Merge.rc:1405 Merge.rc:1486 Merge.rc:1664
msgid "Within 1 hour"
msgstr "1시간 이내"
#. IDR_POPUP_FILTERMENU_DATE
-#: Merge.rc:1397 Merge.rc:1478 Merge.rc:1656
+#: Merge.rc:1407 Merge.rc:1488 Merge.rc:1666
msgid "&Day"
msgstr "일(&D)"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_DAY_BEFORE_TODAY
-#: Merge.rc:1399 Merge.rc:1480 Merge.rc:1658
+#: Merge.rc:1409 Merge.rc:1490 Merge.rc:1668
msgid "Before today"
msgstr "오늘 이전"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_DAY_TODAY
-#: Merge.rc:1400 Merge.rc:1481 Merge.rc:1659
+#: Merge.rc:1410 Merge.rc:1491 Merge.rc:1669
msgid "Today"
msgstr "오늘"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_DAY_BEFORE_YESTERDAY
-#: Merge.rc:1401 Merge.rc:1482 Merge.rc:1660
+#: Merge.rc:1411 Merge.rc:1492 Merge.rc:1670
msgid "Before yesterday"
msgstr "어제 이전"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_DAY_YESTERDAY
-#: Merge.rc:1402 Merge.rc:1483 Merge.rc:1661
+#: Merge.rc:1412 Merge.rc:1493 Merge.rc:1671
msgid "Yesterday"
msgstr "어제"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_DAY_SINCE_YESTERDAY
-#: Merge.rc:1403 Merge.rc:1484 Merge.rc:1662
+#: Merge.rc:1413 Merge.rc:1494 Merge.rc:1672
msgid "Since yesterday"
msgstr "어제부터"
#. IDR_POPUP_FILTERMENU_DATE
-#: Merge.rc:1405 Merge.rc:1486 Merge.rc:1664
+#: Merge.rc:1415 Merge.rc:1496 Merge.rc:1674
msgid "&Week"
msgstr "주(&W)"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_WEEK_BEFORE_THIS
-#: Merge.rc:1407 Merge.rc:1488 Merge.rc:1666
+#: Merge.rc:1417 Merge.rc:1498 Merge.rc:1676
msgid "Before this week"
msgstr "이번 주 이전"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_WEEK_THIS
-#: Merge.rc:1408 Merge.rc:1489 Merge.rc:1667
+#: Merge.rc:1418 Merge.rc:1499 Merge.rc:1677
msgid "This week"
msgstr "이번 주"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_WEEK_BEFORE_LAST
-#: Merge.rc:1409 Merge.rc:1490 Merge.rc:1668
+#: Merge.rc:1419 Merge.rc:1500 Merge.rc:1678
msgid "Before last week"
msgstr "지난주 이전"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_WEEK_LAST
-#: Merge.rc:1410 Merge.rc:1491 Merge.rc:1669
+#: Merge.rc:1420 Merge.rc:1501 Merge.rc:1679
msgid "Last week"
msgstr "지난주"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_WEEK_SINCE_LAST
-#: Merge.rc:1411 Merge.rc:1492 Merge.rc:1670
+#: Merge.rc:1421 Merge.rc:1502 Merge.rc:1680
msgid "Since last week"
msgstr "지난주부터"
#. IDR_POPUP_FILTERMENU_DATE
-#: Merge.rc:1413 Merge.rc:1494 Merge.rc:1672
+#: Merge.rc:1423 Merge.rc:1504 Merge.rc:1682
msgid "&Month"
msgstr "월(&M)"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_MONTH_BEFORE_THIS
-#: Merge.rc:1415 Merge.rc:1496 Merge.rc:1674
+#: Merge.rc:1425 Merge.rc:1506 Merge.rc:1684
msgid "Before this month"
msgstr "이번 달 전"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_MONTH_THIS
-#: Merge.rc:1416 Merge.rc:1497 Merge.rc:1675
+#: Merge.rc:1426 Merge.rc:1507 Merge.rc:1685
msgid "This month"
msgstr "이번 달"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_MONTH_BEFORE_LAST
-#: Merge.rc:1417 Merge.rc:1498 Merge.rc:1676
+#: Merge.rc:1427 Merge.rc:1508 Merge.rc:1686
msgid "Before last month"
msgstr "지난달 이전"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_MONTH_LAST
-#: Merge.rc:1418 Merge.rc:1499 Merge.rc:1677
+#: Merge.rc:1428 Merge.rc:1509 Merge.rc:1687
msgid "Last month"
msgstr "지난달"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_MONTH_SINCE_LAST
-#: Merge.rc:1419 Merge.rc:1500 Merge.rc:1678
+#: Merge.rc:1429 Merge.rc:1510 Merge.rc:1688
msgid "Since last month"
msgstr "지난달부터"
#. IDR_POPUP_FILTERMENU_DATE
-#: Merge.rc:1421 Merge.rc:1502 Merge.rc:1680
+#: Merge.rc:1431 Merge.rc:1512 Merge.rc:1690
msgid "&Year"
msgstr "년(&Y)"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_YEAR_BEFORE_THIS
-#: Merge.rc:1423 Merge.rc:1504 Merge.rc:1682
+#: Merge.rc:1433 Merge.rc:1514 Merge.rc:1692
msgid "Before this year"
msgstr "올해 이전"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_YEAR_THIS
-#: Merge.rc:1424 Merge.rc:1505 Merge.rc:1683
+#: Merge.rc:1434 Merge.rc:1515 Merge.rc:1693
msgid "This year"
msgstr "올해"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_YEAR_BEFORE_LAST
-#: Merge.rc:1425 Merge.rc:1506 Merge.rc:1684
+#: Merge.rc:1435 Merge.rc:1516 Merge.rc:1694
msgid "Before last year"
msgstr "작년 이전"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_YEAR_LAST
-#: Merge.rc:1426 Merge.rc:1507 Merge.rc:1685
+#: Merge.rc:1436 Merge.rc:1517 Merge.rc:1695
msgid "Last year"
msgstr "작년"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_YEAR_SINCE_LAST
-#: Merge.rc:1427 Merge.rc:1508 Merge.rc:1686
+#: Merge.rc:1437 Merge.rc:1518 Merge.rc:1696
msgid "Since last year"
msgstr "작년부터"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_RANGE
-#: Merge.rc:1429 Merge.rc:1510 Merge.rc:1688
+#: Merge.rc:1439 Merge.rc:1520 Merge.rc:1698
msgid "&Custom Range..."
msgstr "사용자 지정 범위(&C)..."
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1431 Merge.rc:1589
+#: Merge.rc:1441 Merge.rc:1599
msgid "&Attributes"
msgstr "속성(&A)"
#. IDR_POPUP_FILTERMENU_ATTR, ID_FILTERMENU_ATTR_READONLY
-#: Merge.rc:1433 Merge.rc:1607
+#: Merge.rc:1443 Merge.rc:1617
msgid "Read-only files"
msgstr "읽기 전용 파일"
#. IDR_POPUP_FILTERMENU_ATTR, ID_FILTERMENU_ATTR_NOT_READONLY
-#: Merge.rc:1434 Merge.rc:1608
+#: Merge.rc:1444 Merge.rc:1618
msgid "Not read-only files"
msgstr "읽기 전용 파일 아님"
#. IDR_POPUP_FILTERMENU_ATTR, ID_FILTERMENU_ATTR_HIDDEN
-#: Merge.rc:1435 Merge.rc:1609
+#: Merge.rc:1445 Merge.rc:1619
msgid "Hidden files"
msgstr "숨김 파일"
#. IDR_POPUP_FILTERMENU_ATTR, ID_FILTERMENU_ATTR_NOT_HIDDEN
-#: Merge.rc:1436 Merge.rc:1610
+#: Merge.rc:1446 Merge.rc:1620
msgid "Not hidden files"
msgstr "숨김 파일 아님"
#. IDR_POPUP_FILTERMENU_ATTR, ID_FILTERMENU_ATTR_SYSTEM
-#: Merge.rc:1437 Merge.rc:1611
+#: Merge.rc:1447 Merge.rc:1621
msgid "System files"
msgstr "시스템 파일"
#. IDR_POPUP_FILTERMENU_ATTR, ID_FILTERMENU_ATTR_NOT_SYSTEM
-#: Merge.rc:1438 Merge.rc:1612
+#: Merge.rc:1448 Merge.rc:1622
msgid "Not system files"
msgstr "시스템 파일 아님"
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1440
+#: Merge.rc:1450
msgid "File &Content"
msgstr "파일 내용(&C)"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_CONTAINS
-#: Merge.rc:1442
+#: Merge.rc:1452
msgid "Contains string..."
msgstr "문자열이 포함되어 있습니다..."
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_NOT_CONTAINS
-#: Merge.rc:1443
+#: Merge.rc:1453
msgid "Does not contain string..."
msgstr "문자열이 포함되어 있지 않습니다..."
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_FIRST_LINE_CONTAINS
-#: Merge.rc:1444
+#: Merge.rc:1454
msgid "First line contains string..."
msgstr "첫 번째 줄에는 문자열이 포함되어 있습니다..."
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_FIRST_LINE_NOT_CONTAINS
-#: Merge.rc:1445
+#: Merge.rc:1455
msgid "First line does not contain string..."
msgstr "첫 번째 줄에 문자열이 포함되어 있지 않습니다..."
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_FIRST_10_CONTAINS
-#: Merge.rc:1446
+#: Merge.rc:1456
msgid "First 10 lines contain string..."
msgstr "처음 10개 줄에 문자열이 포함되어 있습니다..."
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_FIRST_10_NOT_CONTAINS
-#: Merge.rc:1447
+#: Merge.rc:1457
msgid "First 10 lines do not contain string..."
msgstr "처음 10개 줄에 문자열이 포함되어 있지 않습니다..."
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_LAST_10_CONTAINS
-#: Merge.rc:1448
+#: Merge.rc:1458
msgid "Last 10 lines contain string..."
msgstr "마지막 10개 줄에 문자열이 포함되어 있습니다..."
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_LAST_10_NOT_CONTAINS
-#: Merge.rc:1449
+#: Merge.rc:1459
msgid "Last 10 lines do not contain string..."
msgstr "마지막 10개 줄에 문자열이 포함되어 있지 않습니다..."
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_LAST_LINE_CONTAINS
-#: Merge.rc:1450
+#: Merge.rc:1460
msgid "Last line contains string..."
msgstr "마지막 줄에 문자열이 포함되어 있습니다..."
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_LAST_LINE_NOT_CONTAINS
-#: Merge.rc:1451
+#: Merge.rc:1461
msgid "Last line does not contain string..."
msgstr "마지막 줄에 문자열이 포함되어 있지 않습니다..."
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1453
+#: Merge.rc:1463
msgid "&Line Count"
msgstr "줄 수(&L)"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_LT_10
-#: Merge.rc:1455
+#: Merge.rc:1465
msgid "Less than 10"
msgstr "10 미만"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_GE_10
-#: Merge.rc:1456
+#: Merge.rc:1466
msgid "10 or more"
msgstr "10 이상"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_LT_100
-#: Merge.rc:1457
+#: Merge.rc:1467
msgid "Less than 100"
msgstr "100 미만"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_GE_100
-#: Merge.rc:1458
+#: Merge.rc:1468
msgid "100 or more"
msgstr "100 이상"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_LT_1000
-#: Merge.rc:1459
+#: Merge.rc:1469
msgid "Less than 1000"
msgstr "1000 미만"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_GE_1000
-#: Merge.rc:1460
+#: Merge.rc:1470
msgid "1000 or more"
msgstr "1000 이상"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_LT_10000
-#: Merge.rc:1461
+#: Merge.rc:1471
msgid "Less than 10000"
msgstr "10000 미만"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_GE_10000
-#: Merge.rc:1462
+#: Merge.rc:1472
msgid "10000 or more"
msgstr "10000 이상"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_LT_100000
-#: Merge.rc:1463
+#: Merge.rc:1473
msgid "Less than 100000"
msgstr "100000 미만"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_GE_100000
-#: Merge.rc:1464
+#: Merge.rc:1474
msgid "100000 or more"
msgstr "100000 이상"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_PROPS
-#: Merge.rc:1467 Merge.rc:1594 Merge.rc:1761 Merge.rc:1778
+#: Merge.rc:1477 Merge.rc:1604 Merge.rc:1771 Merge.rc:1788
msgid "Additional &Properties..."
msgstr "추가 속성(&P)..."
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1469
+#: Merge.rc:1479
msgid "Add F&older Condition"
msgstr "폴더 조건 추가(&O)"
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1513
+#: Merge.rc:1523
msgid "&Files"
msgstr "파일(&F)"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FOLDER_FILES_EQ_0
-#: Merge.rc:1515
+#: Merge.rc:1525
msgid "0 files"
msgstr "0개 파일"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FOLDER_FILES_GE_1
-#: Merge.rc:1516
+#: Merge.rc:1526
msgid "1 file or more"
msgstr "1개 이상의 파일"
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1519
+#: Merge.rc:1529
msgid "&Items"
msgstr "항목(&I)"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FOLDER_ITEMS_EQ_0
-#: Merge.rc:1521
+#: Merge.rc:1531
msgid "0 items"
msgstr "0개 항목"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FOLDER_ITEMS_GE_1
-#: Merge.rc:1522
+#: Merge.rc:1532
msgid "1 item or more"
msgstr "1개 이상의 항목"
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1525
+#: Merge.rc:1535
msgid "&Total Size"
msgstr "전체 항목(&T)"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FOLDER_STATS_RECURSIVE
-#: Merge.rc:1542
+#: Merge.rc:1552
msgid "&Recursive"
msgstr "재귀적(&R)"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONDITION_ANY
-#: Merge.rc:1544
+#: Merge.rc:1554
msgid "Target: &Any (Left/Middle/Right)"
msgstr "대상: 모두 (왼쪽/가운데/오른쪽)(&A)"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONDITION_LEFT
-#: Merge.rc:1545
+#: Merge.rc:1555
msgid "Target: &Left"
msgstr "대상: 왼쪽(&L)"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONDITION_MIDDLE
-#: Merge.rc:1546
+#: Merge.rc:1556
msgid "Target: &Middle"
msgstr "대상: 가운데(&M)"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONDITION_RIGHT
-#: Merge.rc:1547
+#: Merge.rc:1557
msgid "Target: &Right"
msgstr "대상 : 오른쪽(&R)"
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1549
+#: Merge.rc:1559
msgid "Add &Difference Condition"
msgstr "차이 조건 추가(&D)"
#. IDR_POPUP_FILTERMENU_DIFF_PROP, ID_FILTERMENU_DIFF_PROP_EQUAL
-#: Merge.rc:1553 Merge.rc:1570 Merge.rc:1591 Merge.rc:1696 Merge.rc:1717
-#: Merge.rc:1742
+#: Merge.rc:1563 Merge.rc:1580 Merge.rc:1601 Merge.rc:1706 Merge.rc:1727
+#: Merge.rc:1752
msgid "Equal"
msgstr "같음"
#. IDR_POPUP_FILTERMENU_DIFF_PROP, ID_FILTERMENU_DIFF_PROP_NOT_EQUAL
-#: Merge.rc:1554 Merge.rc:1571 Merge.rc:1592 Merge.rc:1697 Merge.rc:1718
-#: Merge.rc:1743
+#: Merge.rc:1564 Merge.rc:1581 Merge.rc:1602 Merge.rc:1707 Merge.rc:1728
+#: Merge.rc:1753
msgid "Not Equal"
msgstr "같지 않음"
#. IDR_POPUP_FILTERMENU_DIFF_PROP, ID_FILTERMENU_DIFF_PROP_LESS
-#: Merge.rc:1555 Merge.rc:1572 Merge.rc:1698 Merge.rc:1719 Merge.rc:1744
+#: Merge.rc:1565 Merge.rc:1582 Merge.rc:1708 Merge.rc:1729 Merge.rc:1754
msgid "Less Than"
msgstr "보다 작음"
#. IDR_POPUP_FILTERMENU_DIFF_PROP, ID_FILTERMENU_DIFF_PROP_LESS_EQUAL
-#: Merge.rc:1556 Merge.rc:1573 Merge.rc:1699 Merge.rc:1720 Merge.rc:1745
+#: Merge.rc:1566 Merge.rc:1583 Merge.rc:1709 Merge.rc:1730 Merge.rc:1755
msgid "Less Than or Equal to"
msgstr "보다 작거나 같음"
#. IDR_POPUP_FILTERMENU_DIFF_PROP, ID_FILTERMENU_DIFF_PROP_GREATER
-#: Merge.rc:1557 Merge.rc:1574 Merge.rc:1700 Merge.rc:1721 Merge.rc:1746
+#: Merge.rc:1567 Merge.rc:1584 Merge.rc:1710 Merge.rc:1731 Merge.rc:1756
msgid "Greater Than"
msgstr "보다 큼"
#. IDR_POPUP_FILTERMENU_DIFF_PROP, ID_FILTERMENU_DIFF_PROP_GREATER_EQUAL
-#: Merge.rc:1558 Merge.rc:1575 Merge.rc:1701 Merge.rc:1722 Merge.rc:1747
+#: Merge.rc:1568 Merge.rc:1585 Merge.rc:1711 Merge.rc:1732 Merge.rc:1757
msgid "Greater Than or Equal to"
msgstr "보다 크거나 같음"
#. IDR_POPUP_FILTERMENU_DIFF_SIZE, ID_FILTERMENU_DIFF_SIZE_LT_10B
-#: Merge.rc:1560 Merge.rc:1703
+#: Merge.rc:1570 Merge.rc:1713
msgid "Less than 10B"
msgstr "10B 미만"
#. IDR_POPUP_FILTERMENU_DIFF_SIZE, ID_FILTERMENU_DIFF_SIZE_GE_10B
-#: Merge.rc:1561 Merge.rc:1704
+#: Merge.rc:1571 Merge.rc:1714
msgid "10B or more"
msgstr "10B 이상"
#. IDR_POPUP_FILTERMENU_DIFF_SIZE, ID_FILTERMENU_DIFF_SIZE_LT_100B
-#: Merge.rc:1562 Merge.rc:1705
+#: Merge.rc:1572 Merge.rc:1715
msgid "Less than 100B"
msgstr "100B 미만"
#. IDR_POPUP_FILTERMENU_DIFF_SIZE, ID_FILTERMENU_DIFF_SIZE_GE_100B
-#: Merge.rc:1563 Merge.rc:1706
+#: Merge.rc:1573 Merge.rc:1716
msgid "100B or more"
msgstr "100B 이상"
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_LT_1SECOND
-#: Merge.rc:1577 Merge.rc:1724
+#: Merge.rc:1587 Merge.rc:1734
msgid "Less than 1 second"
msgstr "1초 미만"
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_GE_1SECOND
-#: Merge.rc:1578 Merge.rc:1725
+#: Merge.rc:1588 Merge.rc:1735
msgid "1 second or more"
msgstr "1초 이상"
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_LT_1MINUTE
-#: Merge.rc:1579 Merge.rc:1726
+#: Merge.rc:1589 Merge.rc:1736
msgid "Less than 1 minute"
msgstr "1분 미만"
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_GE_1MINUTE
-#: Merge.rc:1580 Merge.rc:1727
+#: Merge.rc:1590 Merge.rc:1737
msgid "1 minute or more"
msgstr "1분 이상"
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_LT_1HOUR
-#: Merge.rc:1581 Merge.rc:1728
+#: Merge.rc:1591 Merge.rc:1738
msgid "Less than 1 hour"
msgstr "1시간 미만"
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_GE_1HOUR
-#: Merge.rc:1582 Merge.rc:1729
+#: Merge.rc:1592 Merge.rc:1739
msgid "1 hour or more"
msgstr "1시간 이상"
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_LT_1DAY
-#: Merge.rc:1583 Merge.rc:1730
+#: Merge.rc:1593 Merge.rc:1740
msgid "Less than 1 day"
msgstr "1일 미만"
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_GE_1DAY
-#: Merge.rc:1584 Merge.rc:1731
+#: Merge.rc:1594 Merge.rc:1741
msgid "1 day or more"
msgstr "1일 이상"
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_LT_1WEEK
-#: Merge.rc:1585 Merge.rc:1732
+#: Merge.rc:1595 Merge.rc:1742
msgid "Less than 1 week"
msgstr "1주 미만"
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_GE_1WEEK
-#: Merge.rc:1586 Merge.rc:1733
+#: Merge.rc:1596 Merge.rc:1743
msgid "1 week or more"
msgstr "1주 이상"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_CONDITION_DIFF_LEFT_RIGHT
-#: Merge.rc:1596
+#: Merge.rc:1606
msgid "Target: &Left and Right"
msgstr "대상: 왼쪽 및 오른쪽(&L)"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_CONDITION_DIFF_LEFT_MIDDLE
-#: Merge.rc:1597
+#: Merge.rc:1607
msgid "Target: Left and &Middle"
msgstr "대상: 왼쪽 및 가운데(&M)"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_CONDITION_DIFF_MIDDLE_RIGHT
-#: Merge.rc:1598
+#: Merge.rc:1608
msgid "Target: Middle and &Right"
msgstr "대상: 가운데 및 오른쪽(&R)"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_CONDITION_DIFF_ALL
-#: Merge.rc:1599
+#: Merge.rc:1609
msgid "Target: &All"
msgstr "대상: 모두(&A)"
#. IDR_POPUP_FILTERMENU_BINARY, ID_FILTERMENU_BINARY_ONLY
-#: Merge.rc:1620
+#: Merge.rc:1630
msgid "Binary files only"
msgstr "바이너리 파일만"
#. IDR_POPUP_FILTERMENU_BINARY, ID_FILTERMENU_TEXT_ONLY
-#: Merge.rc:1621
+#: Merge.rc:1631
msgid "Text files only"
msgstr "텍스트 파일만"
#. IDR_POPUP_ADDCMPMENU, ID_ADDCMPMENU_CLEAR
-#: Merge.rc:1755
+#: Merge.rc:1765
msgid "&Clear conditions"
msgstr "조건 지우기(&C)"
#. IDR_POPUP_ADDCMPMENU, ID_ADDCMPMENU_CMP_SIZE
-#: Merge.rc:1757
+#: Merge.rc:1767
msgid "Compare &Size"
msgstr "크기 비교(&S)"
#. IDR_POPUP_ADDCMPMENU, ID_ADDCMPMENU_CMP_DATE
-#: Merge.rc:1758
+#: Merge.rc:1768
msgid "Compare &Date"
msgstr "날짜 비교(&D)"
#. IDR_POPUP_ADDCMPMENU, ID_ADDCMPMENU_CMP_ATTR
-#: Merge.rc:1759
+#: Merge.rc:1769
msgid "Compare &Attributes"
msgstr "속성 비교(&A)"
#. IDR_POPUP_ADDCMPMENU, ID_ADDCMPMENU_CMP_CONTENTS
-#: Merge.rc:1760
+#: Merge.rc:1770
msgid "Compare C&ontents"
msgstr "내용 비교(&O)"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_CLEAR
-#: Merge.rc:1769
+#: Merge.rc:1779
msgid "&Clear Keys"
msgstr "키 지우기(&C)"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_NAME
-#: Merge.rc:1771
+#: Merge.rc:1781
msgid "&Name"
msgstr "이름(&N)"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_BASENAME
-#: Merge.rc:1772
+#: Merge.rc:1782
msgid "&Base name (without extension)"
msgstr "기본 이름 (확장자 없음)(&B)"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_NORMALIZED_NAME
-#: Merge.rc:1773
+#: Merge.rc:1783
msgid "Normalized &Unicode Name"
msgstr "정규화된 유니코드 이름(&U)"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_RELPATH
-#: Merge.rc:1774
+#: Merge.rc:1784
msgid "&Relative Path"
msgstr "상대 경로(&R)"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_DATE
-#: Merge.rc:1776
+#: Merge.rc:1786
msgid "&Date"
msgstr "날짜(&D)"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_HASH_MD5
-#: Merge.rc:1777
+#: Merge.rc:1787
msgid "&Hash (MD5)"
msgstr "해시 (MD5)(&H)"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_REPLACE
-#: Merge.rc:1780
+#: Merge.rc:1790
msgid "Insert &replace() Function"
msgstr "replace() 함수 삽입(&R)"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_REGEXREPLACE
-#: Merge.rc:1781
+#: Merge.rc:1791
msgid "Insert rege&xReplace() Function"
msgstr "regexReplace() 함수 삽입(&X)"
#. IDR_POPUP_RENAMEMOVE_MENU
-#: Merge.rc:1782
+#: Merge.rc:1792
msgid "Replace &Lists"
msgstr "목록 교체(&L)"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_CREATE_REPLACELIST
-#: Merge.rc:1784
+#: Merge.rc:1794
msgid "&Create String Replace List and Insert..."
msgstr "문자열 대체 목록 만들기 및 삽입(&C)..."
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_CREATE_REGEXREPLACELIST
-#: Merge.rc:1785
+#: Merge.rc:1795
msgid "Create &Regex Replace List and Insert..."
msgstr "정규식 대체 목록 생성 및 삽입(&R)..."
#. IDR_POPUP_RENAMEMOVE_MENU
-#: Merge.rc:1787
+#: Merge.rc:1797
msgid "&String Replace Lists"
msgstr "문자열 대체 목록(&S)"
#. IDR_POPUP_RENAMEMOVE_MENU
-#: Merge.rc:1791
+#: Merge.rc:1801
msgid "Re&gex Replace Lists"
msgstr "정규식 대체 목록(&G)"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_STRING_REPLACE_LISTS_FOLDER
-#: Merge.rc:1796
+#: Merge.rc:1806
msgid "Open String Replace Lists Folder..."
msgstr "문자열 대체 목록 폴더 열기..."
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_REGEX_REPLACE_LISTS_FOLDER
-#: Merge.rc:1797
+#: Merge.rc:1807
msgid "Open Regex Replace Lists Folder..."
msgstr "정규식 대체 목록 폴더 열기..."
#. IDD_FILTERS_CONDITION, IDC_CONDITION_MATCHCASE
-#: Merge.rc:1799 Merge.rc:1995 Merge.rc:2014 Merge.rc:2042 Merge.rc:2585
+#: Merge.rc:1809 Merge.rc:2005 Merge.rc:2024 Merge.rc:2052 Merge.rc:2595
#, c-format
msgid "Match &case"
msgstr "대소문자 구분(&C)"
#. IDR_POPUP_RENAMEMOVE_MENU
-#: Merge.rc:1801
+#: Merge.rc:1811
msgid "Text &Normalization"
msgstr "텍스트 정규화(&N)"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_TOLOWER
-#: Merge.rc:1803
+#: Merge.rc:1813
msgid "&Lowercase"
msgstr "소문자(&L)"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_TOUPPER
-#: Merge.rc:1804
+#: Merge.rc:1814
msgid "&Uppercase"
msgstr "대문자(&U)"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_TOHALFWIDTH
-#: Merge.rc:1805
+#: Merge.rc:1815
msgid "&Half-width"
msgstr "반각 문자(&H)"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_TOFULLWIDTH
-#: Merge.rc:1806
+#: Merge.rc:1816
msgid "&Full-width"
msgstr "전각 문자(&F)"
#. IDR_POPUP_RENAMEMOVE_MENU
-#: Merge.rc:1807
+#: Merge.rc:1817
msgid "&Chinese Conversion"
msgstr "중국어 변환(&C)"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_TOSIMPLIFIEDCHINESE
-#: Merge.rc:1809
+#: Merge.rc:1819
msgid "&Simplified Chinese"
msgstr "중국어 간체(&S)"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_TOTRADITIONALCHINESE
-#: Merge.rc:1810
+#: Merge.rc:1820
msgid "&Traditional Chinese"
msgstr "중국어 번체(&T)"
#. IDR_POPUP_RENAMEMOVE_MENU
-#: Merge.rc:1812
+#: Merge.rc:1822
msgid "&Japanese Conversion"
msgstr "일본어 변환(&J)"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_TOHIRAGANA
-#: Merge.rc:1814
+#: Merge.rc:1824
msgid "&Hiragana"
msgstr "히나가나(&H)"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_TOKATAKANA
-#: Merge.rc:1815
+#: Merge.rc:1825
msgid "&Katakana"
msgstr "가타카나(&K)"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_NORMALIZEUNICODE
-#: Merge.rc:1817
+#: Merge.rc:1827
msgid "Normalize &Unicode"
msgstr "유니코드 정규화(&U)"
#. IDD_ABOUTBOX
-#: Merge.rc:1932
+#: Merge.rc:1942
#, c-format
msgid "About WinMerge"
msgstr "WinMerge 정보"
#. IDD_ABOUTBOX, IDC_WWW
-#: Merge.rc:1936
+#: Merge.rc:1946
msgid "Visit the WinMerge Homepage!"
msgstr "WinMerge 홈페이지 방문!"
#. IDD_PLUGINS_EDITPLUGIN, IDOK
-#: Merge.rc:1938 Merge.rc:2080 Merge.rc:2431 Merge.rc:2455 Merge.rc:2469
-#: Merge.rc:2497 Merge.rc:2588 Merge.rc:2613 Merge.rc:2674 Merge.rc:2691
-#: Merge.rc:2703 Merge.rc:2867 Merge.rc:2927 Merge.rc:3062 Merge.rc:3104
-#: Merge.rc:3147 Merge.rc:3197
+#: Merge.rc:1948 Merge.rc:2090 Merge.rc:2441 Merge.rc:2465 Merge.rc:2479
+#: Merge.rc:2507 Merge.rc:2598 Merge.rc:2623 Merge.rc:2684 Merge.rc:2701
+#: Merge.rc:2713 Merge.rc:2877 Merge.rc:2937 Merge.rc:3072 Merge.rc:3114
+#: Merge.rc:3157 Merge.rc:3207
#, c-format
msgid "OK"
msgstr "확인"
#. IDD_ABOUTBOX, IDC_OPEN_CONTRIBUTORS
-#: Merge.rc:1939
+#: Merge.rc:1949
#, c-format
msgid "Contributors"
msgstr "기여자"
#. IDD_SELECT_FILES_OR_FOLDERS
-#: Merge.rc:1945 Merge.rc:3070
+#: Merge.rc:1955 Merge.rc:3080
#, c-format
msgid "Select Files or Folders"
msgstr "파일 또는 폴더 선택"
#. IDD_OPEN, IDC_FILES_DIRS_GROUP0
-#: Merge.rc:1949
+#: Merge.rc:1959
#, c-format
msgid "&1st File or Folder"
msgstr "첫 번째 파일 또는 폴더(&1)"
#. IDD_OPEN, IDC_PATH0_READONLY
-#: Merge.rc:1951
+#: Merge.rc:1961
#, c-format
msgid "Re&ad-only"
msgstr "읽기 전용(&A)"
#. IDD_OPEN, IDC_SWAP01_STATIC
-#: Merge.rc:1953
+#: Merge.rc:1963
#, c-format
msgid "Swap 1st | 2nd"
msgstr "첫 번째와 두 번째 맞바꾸기"
#. IDD_GENERATE_PATCH, IDC_DIFF_BROWSE_FILE1
-#: Merge.rc:1954 Merge.rc:2310 Merge.rc:2413
+#: Merge.rc:1964 Merge.rc:2320 Merge.rc:2423
#, c-format
msgid "&Browse..."
msgstr "찾아보기(&B)..."
#. IDD_OPEN, IDC_FILES_DIRS_GROUP1
-#: Merge.rc:1955
+#: Merge.rc:1965
#, c-format
msgid "&2nd File or Folder"
msgstr "두 번째 파일 또는 폴더(&2)"
#. IDD_OPEN, IDC_PATH1_READONLY
-#: Merge.rc:1957
+#: Merge.rc:1967
#, c-format
msgid "Rea&d-only"
msgstr "읽기 전용(&D)"
#. IDD_OPEN, IDC_SWAP12_STATIC
-#: Merge.rc:1959
+#: Merge.rc:1969
#, c-format
msgid "Swap 2nd | 3rd"
msgstr "두 번째와 세 번째 맞바꾸기"
#. IDD_PROPPAGE_SYSTEM, IDC_FILTER_USER_BROWSE
-#: Merge.rc:1960 Merge.rc:2315
+#: Merge.rc:1970 Merge.rc:2325
#, c-format
msgid "B&rowse..."
msgstr "찾아보기(&R)..."
#. IDD_OPEN, IDC_FILES_DIRS_GROUP2
-#: Merge.rc:1961
+#: Merge.rc:1971
#, c-format
msgid "&3rd File or Folder (Optional)"
msgstr "세 번째 파일 또는 폴더 (선택 사항)(&3)"
#. IDD_OPEN, IDC_PATH2_READONLY
-#: Merge.rc:1963
+#: Merge.rc:1973
#, c-format
msgid "Read-o&nly"
msgstr "읽기 전용(&N)"
#. IDD_OPEN, IDC_SWAP02_STATIC
-#: Merge.rc:1965
+#: Merge.rc:1975
#, c-format
msgid "Swap 1st | 3rd"
msgstr "첫 번째와 세 번째 맞바꾸기"
#. IDD_PROPPAGE_BACKUPS, IDC_BACKUP_BROWSE
-#: Merge.rc:1966 Merge.rc:2685 Merge.rc:2883
+#: Merge.rc:1976 Merge.rc:2695 Merge.rc:2893
#, c-format
msgid "Browse..."
msgstr "찾아보기..."
#. IDD_OPEN, IDC_FILES_DIRS_GROUP3
-#: Merge.rc:1968
+#: Merge.rc:1978
#, c-format
msgid " Folder: Filter"
msgstr " 폴더: 필터"
#. IDD_OPEN, IDC_RECURS_CHECK
-#: Merge.rc:1971
+#: Merge.rc:1981
msgid "&Include subfolders"
msgstr "하위 폴더 포함(&I)"
#. IDD_OPEN, IDC_FILES_DIRS_GROUP5
-#: Merge.rc:1972
+#: Merge.rc:1982
msgid " File: Prediffer Plugin"
msgstr " 파일: 사전 차이 플러그인"
#. IDD_OPEN, IDC_FILES_DIRS_GROUP4
-#: Merge.rc:1976
+#: Merge.rc:1986
#, c-format
msgid " File: Unpacker Plugin"
msgstr " 파일: 압축 풀기 플러그인"
#. IDD_OPEN, IDC_SELECT_UNPACKER
-#: Merge.rc:1978
+#: Merge.rc:1988
#, c-format
msgid "Se&lect..."
msgstr "선택(&L)..."
#. IDD_PLUGINS_EDITPLUGIN, IDCANCEL
-#: Merge.rc:1981 Merge.rc:2001 Merge.rc:2025 Merge.rc:2046 Merge.rc:2081
-#: Merge.rc:2432 Merge.rc:2456 Merge.rc:2470 Merge.rc:2498 Merge.rc:2551
-#: Merge.rc:2589 Merge.rc:2614 Merge.rc:2675 Merge.rc:2692 Merge.rc:2704
-#: Merge.rc:2868 Merge.rc:2928 Merge.rc:3087 Merge.rc:3105 Merge.rc:3148
-#: Merge.rc:3198
+#: Merge.rc:1991 Merge.rc:2011 Merge.rc:2035 Merge.rc:2056 Merge.rc:2091
+#: Merge.rc:2442 Merge.rc:2466 Merge.rc:2480 Merge.rc:2508 Merge.rc:2561
+#: Merge.rc:2599 Merge.rc:2624 Merge.rc:2685 Merge.rc:2702 Merge.rc:2714
+#: Merge.rc:2878 Merge.rc:2938 Merge.rc:3097 Merge.rc:3115 Merge.rc:3158
+#: Merge.rc:3208
#, c-format
msgid "Cancel"
msgstr "취소"
#. IDD_OPEN, IDC_OPEN_STATUS
-#: Merge.rc:1982
+#: Merge.rc:1992
#, c-format
msgid "Status:"
msgstr "상태:"
#. IDD_PLUGINS_LIST, ID_HELP
-#: Merge.rc:1983 Merge.rc:2082 Merge.rc:2929
+#: Merge.rc:1993 Merge.rc:2092 Merge.rc:2939
#, c-format
msgid "Help"
msgstr "도움말"
#. IDD_OPEN, IDC_OPTIONS
-#: Merge.rc:1984
+#: Merge.rc:1994
msgid "&Options..."
msgstr "옵션(&O)..."
#. IDD_EDIT_FIND
-#: Merge.rc:1989
+#: Merge.rc:1999
#, c-format
msgid "Find"
msgstr "찾기"
#. IDD_EDIT_MARKER, IDC_STATIC
-#: Merge.rc:1992 Merge.rc:2009 Merge.rc:2037
+#: Merge.rc:2002 Merge.rc:2019 Merge.rc:2047
#, c-format
msgid "Fi&nd what:"
msgstr "찾을 내용(&N) :"
#. IDD_EDIT_MARKER, IDC_EDIT_WHOLE_WORD
-#: Merge.rc:1994 Merge.rc:2013 Merge.rc:2041
+#: Merge.rc:2004 Merge.rc:2023 Merge.rc:2051
#, c-format
msgid "Match &whole word only"
msgstr "전체 단어만 일치(&W)"
#. IDD_EDIT_MARKER, IDC_EDIT_REGEXP
-#: Merge.rc:1996 Merge.rc:2015 Merge.rc:2043
+#: Merge.rc:2006 Merge.rc:2025 Merge.rc:2053
#, c-format
msgid "Regular &expression"
msgstr "정규식 사용(&E)"
#. IDD_EDIT_FIND, IDC_FINDDLG_DONTWRAP
-#: Merge.rc:1997
+#: Merge.rc:2007
#, c-format
msgid "D&on't wrap end of file"
msgstr "파일 끝을 줄 바꾸지 않음(&O)"
#. IDD_EDIT_FIND, IDC_FINDDLG_DONTCLOSE
-#: Merge.rc:1998
+#: Merge.rc:2008
#, c-format
msgid "&Don't close this dialog"
msgstr "이 대화 상자를 닫지 않음(&D)"
#. IDD_EDIT_REPLACE, IDC_EDIT_SKIP
-#: Merge.rc:1999 Merge.rc:2021
+#: Merge.rc:2009 Merge.rc:2031
#, c-format
msgid "&Find Next"
msgstr "다음 찾기(&F)"
#. IDD_EDIT_FIND, IDC_EDIT_FINDPREV
-#: Merge.rc:2000
+#: Merge.rc:2010
#, c-format
msgid "Find &Prev"
msgstr "이전 찾기(&P)"
#. IDD_EDIT_REPLACE
-#: Merge.rc:2006
+#: Merge.rc:2016
#, c-format
msgid "Replace"
msgstr "바꾸기"
#. IDD_EDIT_REPLACE, IDC_STATIC
-#: Merge.rc:2011
+#: Merge.rc:2021
#, c-format
msgid "Re&place with:"
msgstr "바꿀 내용(&P):"
#. IDD_EDIT_REPLACE, IDC_EDIT_SCOPE_DONT_WRAP
-#: Merge.rc:2016
+#: Merge.rc:2026
#, c-format
msgid "&Don't wrap at end of file"
msgstr "파일 끝을 줄 바꾸지 않음(&D)"
#. IDD_EDIT_REPLACE, IDC_STATIC
-#: Merge.rc:2018
+#: Merge.rc:2028
#, c-format
msgid "Replace in"
msgstr "적용 범위"
#. IDD_EDIT_REPLACE, IDC_EDIT_SCOPE_WHOLE_FILE
-#: Merge.rc:2020
+#: Merge.rc:2030
#, c-format
msgid "Wh&ole file"
msgstr "전체 파일(&O)"
#. IDD_EDIT_REPLACE, IDC_EDIT_FINDPREV
-#: Merge.rc:2022
+#: Merge.rc:2032
msgid "Find Pre&v"
msgstr "이전 찾기(&V)"
#. IDD_EDIT_REPLACE, IDC_EDIT_REPLACE
-#: Merge.rc:2023
+#: Merge.rc:2033
#, c-format
msgid "&Replace"
msgstr "바꾸기(&R)"
#. IDD_EDIT_REPLACE, IDC_EDIT_REPLACE_ALL
-#: Merge.rc:2024
+#: Merge.rc:2034
#, c-format
msgid "Replace &All"
msgstr "모두 바꿈(&A)"
#. IDS_OPTIONSPG_MARKERCOLORS
-#: Merge.rc:2030 Merge.rc:4209
+#: Merge.rc:2040 Merge.rc:4219
#, c-format
msgid "Markers"
msgstr "마커"
#. IDD_EDIT_MARKER, IDC_EDIT_MARKERS_ENABLED
-#: Merge.rc:2033
+#: Merge.rc:2043
#, c-format
msgid "Enable &markers"
msgstr "마커 사용함(&M)"
#. IDD_FILTERS_LINEFILTERS, IDC_LFILTER_ADDBTN
-#: Merge.rc:2035 Merge.rc:2057
+#: Merge.rc:2045 Merge.rc:2067
#, c-format
msgid "New"
msgstr "새로 만들기"
#. IDD_EDIT_MARKER, IDC_STATIC
-#: Merge.rc:2039
+#: Merge.rc:2049
#, c-format
msgid "&Background color:"
msgstr "배경 색상(&B):"
#. IDS_MESSAGEBOX_OK
-#: Merge.rc:2044 Merge.rc:2829 Merge.rc:3086 Merge.rc:4171
+#: Merge.rc:2054 Merge.rc:2839 Merge.rc:3096 Merge.rc:4181
#, c-format
msgid "&Ok"
msgstr "확인(&O)"
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:2045 Merge.rc:2525 Merge.rc:3199
+#: Merge.rc:2055 Merge.rc:2535 Merge.rc:3209
#, c-format
msgid "&Apply"
msgstr "적용(&A)"
#. IDD_FILTERS_LINEFILTERS
-#: Merge.rc:2051
+#: Merge.rc:2061
msgid "Line Filters"
msgstr "줄 필터"
#. IDD_FILTERS_LINEFILTERS, IDC_IGNOREREGEXP
-#: Merge.rc:2054
+#: Merge.rc:2064
#, c-format
msgid "Enable Line Filters"
msgstr "줄 필터 사용함"
#. IDD_FILTERS_LINEFILTERS, IDC_STATIC
-#: Merge.rc:2055
+#: Merge.rc:2065
#, c-format
msgid "Regular Expressions (one per line):"
msgstr "정규식 (매 줄마다 적용):"
#. IDD_PLUGINS_LIST, IDC_PLUGIN_EDIT
-#: Merge.rc:2058 Merge.rc:2924
+#: Merge.rc:2068 Merge.rc:2934
#, c-format
msgid "Edit"
msgstr "편집"
#. IDD_PLUGINS_LIST, IDC_PLUGIN_REMOVE
-#: Merge.rc:2059 Merge.rc:2071 Merge.rc:2925
+#: Merge.rc:2069 Merge.rc:2081 Merge.rc:2935
#, c-format
msgid "Remove"
msgstr "제거"
#. IDD_FILTERS_SUBSTITUTIONFILTERS
-#: Merge.rc:2064
+#: Merge.rc:2074
msgid "Substitution Filters"
msgstr "대체 필터"
#. IDD_FILTERS_SUBSTITUTIONFILTERS, IDC_STATIC
-#: Merge.rc:2067
+#: Merge.rc:2077
msgid "Changes to the listed pairs below will be ignored or marked as insignificant. Patches are unaffected."
msgstr "아래에 나열된 쌍에 대한 변경 사항은 무시되거나 중요하지 않은 것으로 표시됩니다. 패치는 영향을 받지 않습니다."
#. IDD_FILTERS_SUBSTITUTIONFILTERS, IDC_IGNORED_SUSBSTITUTIONS_ENABLED
-#: Merge.rc:2068
+#: Merge.rc:2078
msgid "Enable"
msgstr "사용함"
#. IDD_PLUGINS_LIST, IDC_PLUGIN_ADD
-#: Merge.rc:2070 Merge.rc:2923
+#: Merge.rc:2080 Merge.rc:2933
msgid "Add"
msgstr "추가"
#. IDD_FILTERS_SUBSTITUTIONFILTERS, IDC_LFILTER_CLEARBTN
-#: Merge.rc:2072
+#: Merge.rc:2082
msgid "Clear"
msgstr "지우기"
#. IDD_PREFERENCES
-#: Merge.rc:2077
+#: Merge.rc:2087
#, c-format
msgid "Options"
msgstr "옵션"
#. IDD_PREFERENCES, IDC_TREEOPT_IMPORT
-#: Merge.rc:2086
+#: Merge.rc:2096
#, c-format
msgid "Import..."
msgstr "가져오기..."
#. IDD_PREFERENCES, IDC_TREEOPT_EXPORT
-#: Merge.rc:2087
+#: Merge.rc:2097
#, c-format
msgid "Export..."
msgstr "내보내기..."
#. IDS_OPTIONSPG_GENCOMPARE
-#: Merge.rc:2092 Merge.rc:4199 Merge.rc:4202 Merge.rc:4219
+#: Merge.rc:2102 Merge.rc:4209 Merge.rc:4212 Merge.rc:4229
#, c-format
msgid "General"
msgstr "일반"
#. IDD_PROPPAGE_GENERAL, IDC_SCROLL_CHECK
-#: Merge.rc:2095
+#: Merge.rc:2105
#, c-format
msgid "Automatically &scroll to first difference"
msgstr "첫 번째 차이로 자동 스크롤(&S)"
#. IDD_PROPPAGE_GENERAL, IDC_SCROLL_TO_FIRST_INLINE_DIFF_CHECK
-#: Merge.rc:2097
+#: Merge.rc:2107
msgid "Automatically s&croll to first inline difference"
msgstr "-> 나란히 있는 첫 번째 차이로 자동 스크롤(&C)"
#. IDD_PROPPAGE_GENERAL, IDC_STATIC
-#: Merge.rc:2099
+#: Merge.rc:2109
msgid "Cl&ose windows with 'Esc':"
msgstr "'Esc'로 창 닫기(&O):"
#. IDD_PROPPAGE_GENERAL, IDC_VERIFY_OPEN_PATHS
-#: Merge.rc:2101
+#: Merge.rc:2111
#, c-format
msgid "&Automatically verify paths in Open dialog"
msgstr "열기 대화 상자에서 경로 자동 확인(&A)"
#. IDD_PROPPAGE_GENERAL, IDC_STATIC
-#: Merge.rc:2103
+#: Merge.rc:2113
msgid "Single instance mode:"
msgstr "중복 실행 금지 모드:"
#. IDD_PROPPAGE_GENERAL, IDC_ASK_MULTIWINDOW_CLOSE
-#: Merge.rc:2105
+#: Merge.rc:2115
#, c-format
msgid "As&k when closing multiple windows"
msgstr "여러 창을 닫을 때 물어보기(&K)"
#. IDD_PROPPAGE_GENERAL, IDC_PRESERVE_FILETIME
-#: Merge.rc:2107
+#: Merge.rc:2117
#, c-format
msgid "&Preserve file time in file compare"
msgstr "파일 비교시 파일 시간 보존(&P)"
#. IDD_PROPPAGE_GENERAL, IDC_STARTUP_FOLDER_SELECT
-#: Merge.rc:2109
+#: Merge.rc:2119
#, c-format
msgid "Show \"Select Files or Folders\" dialog on startup"
msgstr "시작 시 \"파일 또는 폴더 선택\" 대화 상자 표시"
#. IDD_PROPPAGE_GENERAL, IDC_CLOSE_WITH_OK
-#: Merge.rc:2111
+#: Merge.rc:2121
msgid "Close \"Select Files or Folders\" dialog on clicking Compare button"
msgstr "비교 버튼 누를 때 \"파일 또는 폴더 선택\" 대화 상자 닫기"
#. IDD_PROPPAGE_GENERAL, IDC_STATIC
-#: Merge.rc:2113
+#: Merge.rc:2123
#, c-format
msgid "Op&en dialog Auto completion:"
msgstr "열기 대화 상자 자동 완성(&E):"
#. IDD_PROPPAGE_GENERAL, IDC_STATIC
-#: Merge.rc:2115
+#: Merge.rc:2125
msgid "Auto-&reload modified files:"
msgstr "수정된 파일 자동 다시 불러오기(&R:"
#. IDD_PROPPAGE_GENERAL, IDC_STATIC
-#: Merge.rc:2117
+#: Merge.rc:2127
#, c-format
msgid "Language:"
msgstr "언어:"
#. IDD_PROPPAGE_COMPARE_WEBPAGE, IDC_COMPARE_DEFAULTS
-#: Merge.rc:2119 Merge.rc:2299 Merge.rc:2321 Merge.rc:2352 Merge.rc:2369
-#: Merge.rc:2386 Merge.rc:2394 Merge.rc:2430 Merge.rc:2454 Merge.rc:2633
-#: Merge.rc:2644 Merge.rc:2653 Merge.rc:2887 Merge.rc:2922 Merge.rc:2985
-#: Merge.rc:3010 Merge.rc:3024 Merge.rc:3038 Merge.rc:3054
+#: Merge.rc:2129 Merge.rc:2309 Merge.rc:2331 Merge.rc:2362 Merge.rc:2379
+#: Merge.rc:2396 Merge.rc:2404 Merge.rc:2440 Merge.rc:2464 Merge.rc:2643
+#: Merge.rc:2654 Merge.rc:2663 Merge.rc:2897 Merge.rc:2932 Merge.rc:2995
+#: Merge.rc:3020 Merge.rc:3034 Merge.rc:3048 Merge.rc:3064
#, c-format
msgid "Defaults"
msgstr "기본값"
#. IDS_OPTIONSPG_COLORS
-#: Merge.rc:2124 Merge.rc:2140 Merge.rc:2267 Merge.rc:2292 Merge.rc:4205
+#: Merge.rc:2134 Merge.rc:2150 Merge.rc:2277 Merge.rc:2302 Merge.rc:4215
#, c-format
msgid "Colors"
msgstr "색상"
#. IDD_PROPPAGE_COLOR_SCHEMES, IDC_STATIC
-#: Merge.rc:2127
+#: Merge.rc:2137
msgid "Color &mode:"
msgstr "색상 모드(&M):"
#. IDD_PROPPAGE_COLOR_SCHEMES, IDC_STATIC
-#: Merge.rc:2129
+#: Merge.rc:2139
msgid "&Light mode scheme:"
msgstr "밝은 모드 구성표(&L):"
#. IDD_PROPPAGE_COLOR_SCHEMES, IDC_STATIC
-#: Merge.rc:2131
+#: Merge.rc:2141
msgid "&Dark mode scheme:"
msgstr "어두운 모드 구성표(&D):"
#. IDD_PROPPAGE_COLOR_SCHEMES, IDC_STATIC
-#: Merge.rc:2133
+#: Merge.rc:2143
msgid "Your custom schemes"
msgstr "사용자 지정 구성표"
#. IDD_PROPPAGE_COLOR_SCHEMES, IDC_COLOR_SCHEME_SAVE
-#: Merge.rc:2134
+#: Merge.rc:2144
msgid "&Save current scheme..."
msgstr "현재 구성표 저장(&S)..."
#. IDD_PROPPAGE_COLOR_SCHEMES, IDC_COLOR_SCHEME_DELETE
-#: Merge.rc:2135
+#: Merge.rc:2145
msgid "Delete ¤t scheme..."
msgstr "현재 구성표 삭제(&C)..."
#. IDD_PROPPAGE_COLORS_DIR, IDC_BACKGROUND_COLUMN_LABEL
-#: Merge.rc:2143 Merge.rc:2238 Merge.rc:2258 Merge.rc:2272
+#: Merge.rc:2153 Merge.rc:2248 Merge.rc:2268 Merge.rc:2282
#, c-format
msgid "Background"
msgstr "배경색"
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2144
+#: Merge.rc:2154
#, c-format
msgid "Deleted"
msgstr "삭제됨"
#. IDS_OPTIONSPG_TEXTCOLORS
-#: Merge.rc:2145 Merge.rc:2207 Merge.rc:2239 Merge.rc:2273 Merge.rc:4207
+#: Merge.rc:2155 Merge.rc:2217 Merge.rc:2249 Merge.rc:2283 Merge.rc:4217
#, c-format
msgid "Text"
msgstr "텍스트"
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2146
+#: Merge.rc:2156
#, c-format
msgid "Difference:"
msgstr "차이:"
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2151
+#: Merge.rc:2161
#, c-format
msgid "Selected Difference:"
msgstr "선택된 차이:"
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2156
+#: Merge.rc:2166
#, c-format
msgid "Ignored Difference:"
msgstr "무시된 차이:"
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2161
+#: Merge.rc:2171
#, c-format
msgid "Moved:"
msgstr "이동:"
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2166
+#: Merge.rc:2176
#, c-format
msgid "Selected Moved:"
msgstr "선택된 이동:"
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2171
+#: Merge.rc:2181
#, c-format
msgid "Same As Next (3 panes):"
msgstr "다음과 같음 (3개 창):"
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2176
+#: Merge.rc:2186
#, c-format
msgid "Same As Next (Selected):"
msgstr "다음과 같음 (선택):"
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2181
+#: Merge.rc:2191
#, c-format
msgid "Word Difference:"
msgstr "단어 차이:"
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2186
+#: Merge.rc:2196
#, c-format
msgid "Selected Word Diff:"
msgstr "선택된 단어 차이:"
#. IDD_INPUTBOX
-#: Merge.rc:2195 Merge.rc:2230 Merge.rc:2251 Merge.rc:3099
+#: Merge.rc:2205 Merge.rc:2240 Merge.rc:2261 Merge.rc:3109
#, c-format
msgid "Dialog"
msgstr "대화 상자"
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC
-#: Merge.rc:2198
+#: Merge.rc:2208
#, c-format
msgid "Keywords:"
msgstr "키워드:"
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC
-#: Merge.rc:2199
+#: Merge.rc:2209
#, c-format
msgid "Function names:"
msgstr "함수 이름:"
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC
-#: Merge.rc:2200
+#: Merge.rc:2210
#, c-format
msgid "Comments:"
msgstr "주석:"
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC
-#: Merge.rc:2201
+#: Merge.rc:2211
#, c-format
msgid "Numbers:"
msgstr "숫자:"
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC
-#: Merge.rc:2202
+#: Merge.rc:2212
#, c-format
msgid "Operators:"
msgstr "연산자:"
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC
-#: Merge.rc:2203
+#: Merge.rc:2213
#, c-format
msgid "Strings:"
msgstr "문자열:"
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC
-#: Merge.rc:2204
+#: Merge.rc:2214
#, c-format
msgid "Preprocessor:"
msgstr "전처리기:"
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC
-#: Merge.rc:2205
+#: Merge.rc:2215
#, c-format
msgid "User 1:"
msgstr "사용자 1:"
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC
-#: Merge.rc:2206
+#: Merge.rc:2216
#, c-format
msgid "User 2:"
msgstr "사용자 2:"
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_SCOLOR_USER2_BOLD
-#: Merge.rc:2209 Merge.rc:2211 Merge.rc:2213 Merge.rc:2215 Merge.rc:2217
-#: Merge.rc:2219 Merge.rc:2221 Merge.rc:2223 Merge.rc:2225
+#: Merge.rc:2219 Merge.rc:2221 Merge.rc:2223 Merge.rc:2225 Merge.rc:2227
+#: Merge.rc:2229 Merge.rc:2231 Merge.rc:2233 Merge.rc:2235
#, c-format
msgid "Bold"
msgstr "굵게"
#. IDD_PROPPAGE_COLORS_TEXT, IDC_DEFAULT_STANDARD_COLORS
-#: Merge.rc:2233
+#: Merge.rc:2243
#, c-format
msgid "&Use customized text colors"
msgstr "사용자 지정 텍스트 색상 사용(&U)"
#. IDD_PROPPAGE_COLORS_TEXT, IDC_WHITESPACE_COLOR_LABEL
-#: Merge.rc:2235
+#: Merge.rc:2245
#, c-format
msgid "Whitespace:"
msgstr "공백 문자:"
#. IDD_PROPPAGE_COLORS_TEXT, IDC_TEXT_COLOR_LABEL
-#: Merge.rc:2236
+#: Merge.rc:2246
#, c-format
msgid "Regular text:"
msgstr "일반 텍스트:"
#. IDD_PROPPAGE_COLORS_TEXT, IDC_SELECTION_COLOR_LABEL
-#: Merge.rc:2237
+#: Merge.rc:2247
#, c-format
msgid "Selection:"
msgstr "선택:"
#. IDD_PROPPAGE_COLORS_DIR, IDC_STATIC
-#: Merge.rc:2245 Merge.rc:2286
+#: Merge.rc:2255 Merge.rc:2296
#, c-format
msgid "Margin:"
msgstr "여백:"
#. IDD_PROPPAGE_COLORS_MARKER, IDC_MARKER0_COLOR_LABEL
-#: Merge.rc:2254
+#: Merge.rc:2264
#, c-format
msgid "Search Marker:"
msgstr "마커 검색:"
#. IDD_PROPPAGE_COLORS_MARKER, IDC_MARKER1_COLOR_LABEL
-#: Merge.rc:2255
+#: Merge.rc:2265
#, c-format
msgid "User Defined Marker 1:"
msgstr "사용자 정의 마커1:"
#. IDD_PROPPAGE_COLORS_MARKER, IDC_MARKER2_COLOR_LABEL
-#: Merge.rc:2256
+#: Merge.rc:2266
#, c-format
msgid "User Defined Marker 2:"
msgstr "사용자 정의 마커2:"
#. IDD_PROPPAGE_COLORS_MARKER, IDC_MARKER3_COLOR_LABEL
-#: Merge.rc:2257
+#: Merge.rc:2267
#, c-format
msgid "User Defined Marker 3:"
msgstr "사용자 정의 마커3:"
#. IDD_PROPPAGE_COLORS_DIR, IDC_USE_DIR_COMPARE_COLORS
-#: Merge.rc:2270
+#: Merge.rc:2280
msgid "&Use folder compare colors"
msgstr "폴더 비교 색상 사용(&U)"
#. IDD_PROPPAGE_COLORS_DIR, IDC_STATIC
-#: Merge.rc:2274
+#: Merge.rc:2284
msgid "Items equal:"
msgstr "같은 항목:"
#. IDD_PROPPAGE_COLORS_DIR, IDC_STATIC
-#: Merge.rc:2277
+#: Merge.rc:2287
msgid "Items different:"
msgstr "다른 항목:"
#. IDD_PROPPAGE_COLORS_DIR, IDC_STATIC
-#: Merge.rc:2280
+#: Merge.rc:2290
msgid "Items missing:"
msgstr "존재하지 않는 항목:"
#. IDD_PROPPAGE_COLORS_DIR, IDC_STATIC
-#: Merge.rc:2283
+#: Merge.rc:2293
msgid "Items filtered:"
msgstr "필터된 항목:"
#. IDD_PROPPAGE_COLORS_SYSTEM, IDC_SYSCOLOR_HOOK_ENABLED
-#: Merge.rc:2295
+#: Merge.rc:2305
msgid "&Use custom system colors"
msgstr "사용자 지정 시스템 색상 사용 (일부 UI 요소는 적용되지 않을 수 있습니다)"
#. IDS_PRPCAT_SYSTEM
-#: Merge.rc:2304 Merge.rc:4211 Merge.rc:4212 Merge.rc:4657
+#: Merge.rc:2314 Merge.rc:4221 Merge.rc:4222 Merge.rc:4667
#, c-format
msgid "System"
msgstr "시스템"
#. IDD_PROPPAGE_SYSTEM, IDC_USE_RECYCLE_BIN
-#: Merge.rc:2307
+#: Merge.rc:2317
#, c-format
msgid "&Use Recycle Bin"
msgstr "삭제한 파일은 휴지통으로 보내기(&S)"
#. IDD_PROPPAGE_SYSTEM, IDC_STATIC
-#: Merge.rc:2308
+#: Merge.rc:2318
#, c-format
msgid "&External editor:"
msgstr "외부 편집기(&E):"
#. IDD_PROPPAGE_SYSTEM, IDC_STATIC
-#: Merge.rc:2311
+#: Merge.rc:2321
msgid "&Store user data in:"
msgstr "사용자 데이터 저장 위치(&S):"
#. IDD_PROPPAGE_SYSTEM, IDC_STATIC
-#: Merge.rc:2313
+#: Merge.rc:2323
#, c-format
msgid "&Filter folder:"
msgstr "필터 폴더(&F):"
#. IDD_PROPPAGE_SYSTEM, IDC_STATIC
-#: Merge.rc:2316
+#: Merge.rc:2326
#, c-format
msgid "Temporary files folder"
msgstr "임시 파일 폴더"
#. IDD_PROPPAGE_SYSTEM, IDC_TMPFOLDER_SYSTEM
-#: Merge.rc:2317
+#: Merge.rc:2327
#, c-format
msgid "S&ystem temp folder"
msgstr "시스템 임시 폴더(&Y)"
#. IDD_PROPPAGE_SYSTEM, IDC_STATIC
-#: Merge.rc:2318
+#: Merge.rc:2328
#, c-format
msgid "C&ustom folder:"
msgstr "사용자 지정 폴더(&U):"
#. IDD_GENERATE_PATCH, IDC_DIFF_BROWSE_FILE2
-#: Merge.rc:2320 Merge.rc:2416
+#: Merge.rc:2330 Merge.rc:2426
#, c-format
msgid "Br&owse..."
msgstr "찾아보기(&O)..."
#. IDS_OPTIONSPG_COMPARE
-#: Merge.rc:2326 Merge.rc:4200
+#: Merge.rc:2336 Merge.rc:4210
#, c-format
msgid "Compare"
msgstr "비교"
#. IDD_PROPPAGE_COMPARE, IDC_STATIC
-#: Merge.rc:2329
+#: Merge.rc:2339
#, c-format
msgid "Whitespaces"
msgstr "공백 문자"
#. IDD_PROPPAGE_COMPARE, IDC_WHITESPACE
-#: Merge.rc:2330
+#: Merge.rc:2340
#, c-format
msgid "&Compare"
msgstr "비교(&C)"
#. IDD_PROPPAGE_COMPARE, IDC_WHITE_CHANGE
-#: Merge.rc:2331
+#: Merge.rc:2341
#, c-format
msgid "&Ignore change"
msgstr "변경사항 무시(&I)"
#. IDD_PROPPAGE_COMPARE, IDC_ALL_WHITE
-#: Merge.rc:2332
+#: Merge.rc:2342
#, c-format
msgid "I&gnore all"
msgstr "모두 무시(&G)"
#. IDD_PROPPAGE_COMPARE, IDC_IGNBLANKS_CHECK
-#: Merge.rc:2333
+#: Merge.rc:2343
msgid "Ignore blan&k lines"
msgstr "공백 줄 무시(&K)"
#. IDD_PROPPAGE_COMPARE, IDC_IGNCASE_CHECK
-#: Merge.rc:2334
+#: Merge.rc:2344
msgid "Ignore &case"
msgstr "대소문자 무시(&C)"
#. IDD_PROPPAGE_COMPARE, IDC_EOL_SENSITIVE
-#: Merge.rc:2335
+#: Merge.rc:2345
msgid "Igno&re EOL differences (Windows/Unix/Mac)"
msgstr "EOL 차이 무시 (Windows/Unix/Mac)"
#. IDD_PROPPAGE_COMPARE, IDC_IGNORE_NUMBERS
-#: Merge.rc:2337
+#: Merge.rc:2347
msgid "Ignore num&bers"
msgstr "숫자 무시(&B)"
#. IDD_PROPPAGE_COMPARE, IDC_CP_SENSITIVE
-#: Merge.rc:2338
+#: Merge.rc:2348
msgid "Ignore codepage &differences"
msgstr "코드페이지 차이 무시(&D)"
#. IDD_PROPPAGE_COMPARE, IDC_FILTERCOMMENTS_CHECK
-#: Merge.rc:2339
+#: Merge.rc:2349
msgid "Ignore c&omment differences"
msgstr "주석 차이 무시(&O)"
#. IDD_PROPPAGE_COMPARE, IDC_IGNEOFEOL_CHECK
-#: Merge.rc:2341
+#: Merge.rc:2351
msgid "Ignore &missing trailing EOL"
msgstr "누락된 후행 EOL 무시(&M)"
#. IDD_PROPPAGE_COMPARE, IDC_IGNLBRKS_CHECK
-#: Merge.rc:2343
+#: Merge.rc:2353
msgid "Ignore line &breaks (treat as spaces)"
msgstr "줄 바꿈 무시 (공백으로 처리)(&B)"
#. IDD_PROPPAGE_COMPARE, IDC_MOVED_BLOCKS
-#: Merge.rc:2345
+#: Merge.rc:2355
#, c-format
msgid "E&nable moved block detection"
msgstr "이동된 블럭 감지 사용함(&N)"
#. IDD_PROPPAGE_COMPARE, IDC_ALIGN_SIMILAR_LINES
-#: Merge.rc:2346
+#: Merge.rc:2356
msgid "Align &similar lines"
msgstr "유사한 줄 정렬(&S)"
#. IDD_PROPPAGE_COMPARE, IDC_STATIC
-#: Merge.rc:2347
+#: Merge.rc:2357
msgid "Diff &algorithm:"
msgstr "비교 알고리즘(&A)"
#. IDD_PROPPAGE_COMPARE, IDC_INDENT_HEURISTIC
-#: Merge.rc:2349
+#: Merge.rc:2359
msgid "Enable indent &heuristic"
msgstr "들여쓰기 휴리스틱 사용함(&H)"
#. IDD_PROPPAGE_COMPARE, IDC_COMPLETELY_BLANK_OUT_IGNORED_DIFFERENCES
-#: Merge.rc:2350
+#: Merge.rc:2360
msgid "Completely unhighlight the ignored differences"
msgstr "무시된 차이 강조하지 않음"
#. IDS_OPTIONSPG_EDITOR
-#: Merge.rc:2357 Merge.rc:4201
+#: Merge.rc:2367 Merge.rc:4211
#, c-format
msgid "Editor"
msgstr "편집기"
#. IDD_PROPPAGE_EDITOR, IDC_HILITE_CHECK
-#: Merge.rc:2360
+#: Merge.rc:2370
#, c-format
msgid "&Highlight syntax"
msgstr "구문 강조 표시(&H)"
#. IDD_PROPPAGE_EDITOR, IDC_MIXED_EOL
-#: Merge.rc:2361
+#: Merge.rc:2371
#, c-format
msgid "&Preserve original EOL"
msgstr "원래 EOL 문자 유지(&P)"
#. IDD_PROPPAGE_EDITOR, IDC_STATIC
-#: Merge.rc:2362
+#: Merge.rc:2372
#, c-format
msgid "Tabs"
msgstr "탭"
#. IDD_PROPPAGE_EDITOR, IDC_STATIC
-#: Merge.rc:2363
+#: Merge.rc:2373
#, c-format
msgid "&Tab size:"
msgstr "탭 크기(&T):"
#. IDD_PROPPAGE_EDITOR, IDC_PROP_INSERT_TABS
-#: Merge.rc:2365
+#: Merge.rc:2375
#, c-format
msgid "&Insert tabs"
msgstr "탭 삽입(&I)"
#. IDD_PROPPAGE_EDITOR, IDC_PROP_INSERT_SPACES
-#: Merge.rc:2366
+#: Merge.rc:2376
#, c-format
msgid "Insert &spaces"
msgstr "공백 삽입(&S)"
#. IDD_PROPPAGE_EDITOR, IDC_STATIC
-#: Merge.rc:2367
+#: Merge.rc:2377
msgid "&Rendering mode:"
msgstr "렌더링 모드(&R)"
#. IDD_PROPPAGE_EDITOR_COMPAREMERGE, IDC_AUTOMRESCAN_CHECK
-#: Merge.rc:2376
+#: Merge.rc:2386
#, c-format
msgid "&Automatic rescan"
msgstr "자동으로 다시 검색(&A)"
#. IDD_PROPPAGE_EDITOR_COMPAREMERGE, IDC_STATIC
-#: Merge.rc:2377
+#: Merge.rc:2387
msgid "Copy &granularity for selected differences:"
msgstr "선택한 차이에 대한 세분화 복사(G):"
#. IDD_PROPPAGE_EDITOR_COMPAREMERGE, IDC_LINE_COLORING_GROUP
-#: Merge.rc:2379
+#: Merge.rc:2389
#, c-format
msgid "Line Difference Coloring"
msgstr "줄 차이 채색"
#. IDD_PROPPAGE_EDITOR_COMPAREMERGE, IDC_VIEW_LINE_DIFFERENCES
-#: Merge.rc:2380
+#: Merge.rc:2390
#, c-format
msgid "View line differences"
msgstr "줄 차이 보기"
#. IDD_PROPPAGE_EDITOR_COMPAREMERGE, IDC_EDITOR_CHARLEVEL
-#: Merge.rc:2381
+#: Merge.rc:2391
#, c-format
msgid "&Character-level"
msgstr "문자 단위(&C)"
#. IDD_PROPPAGE_EDITOR_COMPAREMERGE, IDC_EDITOR_WORDLEVEL
-#: Merge.rc:2382
+#: Merge.rc:2392
#, c-format
msgid "&Word-level:"
msgstr "단어 단위(&W):"
#. IDD_PROPPAGE_EDITOR_COMPAREMERGE, IDC_STATIC
-#: Merge.rc:2384
+#: Merge.rc:2394
#, c-format
msgid "W&ord break characters:"
msgstr "단어 분리 문자(&O):"
#. IDD_PROPPAGE_MESSAGEBOXES, IDC_STATIC
-#: Merge.rc:2401
+#: Merge.rc:2411
msgid "Some messages can be hidden by the user. Press Reset to make all messages visible again."
msgstr "WinMerge를 사용하면 몇 가지 일반 메시지 상자를 숨길 수 있습니다. 모든 메시지 상자를 다시 표시하려면 재설정 버튼을 누릅니다."
#. IDD_SELECT_FILES_OR_FOLDERS, IDC_RESET
-#: Merge.rc:2402 Merge.rc:3085
+#: Merge.rc:2412 Merge.rc:3095
#, c-format
msgid "Reset"
msgstr "재설정"
#. IDD_GENERATE_PATCH
-#: Merge.rc:2408
+#: Merge.rc:2418
#, c-format
msgid "Patch Generator"
msgstr "패치 생성기"
#. IDD_GENERATE_PATCH, IDC_STATIC
-#: Merge.rc:2411
+#: Merge.rc:2421
#, c-format
msgid "File&1:"
msgstr "파일&1:"
#. IDD_GENERATE_PATCH, IDC_STATIC
-#: Merge.rc:2414
+#: Merge.rc:2424
#, c-format
msgid "File&2:"
msgstr "파일&2:"
#. IDD_GENERATE_PATCH, IDC_DIFF_SWAPFILES
-#: Merge.rc:2417
+#: Merge.rc:2427
#, c-format
msgid "&Swap"
msgstr "맞바꾸기(&S)"
#. IDD_DIRCMP_REPORT, IDC_REPORT_COPYCLIPBOARD
-#: Merge.rc:2418 Merge.rc:2690
+#: Merge.rc:2428 Merge.rc:2700
#, c-format
msgid "&Copy to clipboard"
msgstr "클립보드로 복사(&C)"
#. IDD_GENERATE_PATCH, IDC_DIFF_APPENDFILE
-#: Merge.rc:2419
+#: Merge.rc:2429
#, c-format
msgid "&Append to existing file"
msgstr "기존 파일에 추가(&A)"
#. IDD_GENERATE_PATCH, IDC_STATIC
-#: Merge.rc:2420
+#: Merge.rc:2430
#, c-format
msgid "&Result:"
msgstr "결과(&R):"
#. IDD_GENERATE_PATCH, IDC_DIFF_BROWSE_RESULT
-#: Merge.rc:2422
+#: Merge.rc:2432
#, c-format
msgid "Bro&wse..."
msgstr "찾아보기(&W)..."
#. IDD_GENERATE_PATCH, IDC_STATIC
-#: Merge.rc:2423
+#: Merge.rc:2433
#, c-format
msgid "&Format"
msgstr "형식(&F)"
#. IDD_GENERATE_PATCH, IDC_STATIC
-#: Merge.rc:2424
+#: Merge.rc:2434
#, c-format
msgid "St&yle:"
msgstr "스타일(&Y):"
#. IDD_GENERATE_PATCH, IDC_STATIC
-#: Merge.rc:2426
+#: Merge.rc:2436
#, c-format
msgid "&Context:"
msgstr "문맥(&C)"
#. IDD_GENERATE_PATCH, IDC_DIFF_INCLCMDLINE
-#: Merge.rc:2428
+#: Merge.rc:2438
#, c-format
msgid "Inclu&de command line"
msgstr "명령행 포함(&D)"
#. IDD_GENERATE_PATCH, IDC_DIFF_OPENTOEDITOR
-#: Merge.rc:2429
+#: Merge.rc:2439
#, c-format
msgid "Open in e&xternal editor"
msgstr "외부 편집기로 열기(&X)"
#. IDD_DIRCOLS
-#: Merge.rc:2446
+#: Merge.rc:2456
#, c-format
msgid "Display Columns"
msgstr "열 표시"
#. IDD_DIRCOLS, IDC_UP
-#: Merge.rc:2450
+#: Merge.rc:2460
#, c-format
msgid "Move &Up"
msgstr "위로 이동(&U)"
#. IDD_DIRCOLS, IDC_DOWN
-#: Merge.rc:2451
+#: Merge.rc:2461
#, c-format
msgid "Move &Down"
msgstr "아래로 이동(&D)"
#. IDD_DIRCOLS, IDC_COLDLG_ADDITIONAL_PROPERTIES
-#: Merge.rc:2453
+#: Merge.rc:2463
msgid "&Additional Properties"
msgstr "추가 속성(&A)"
#. IDD_DIRADDITIONALPROPS
-#: Merge.rc:2461
+#: Merge.rc:2471
msgid "Additional Properties"
msgstr "추가 속성"
#. IDD_PLUGINS_SELECTPLUGIN
-#: Merge.rc:2475
+#: Merge.rc:2485
msgid "Select Plugin"
msgstr "플러그인 선택"
#. IDD_PLUGINS_EDITPLUGIN, IDC_STATIC
-#: Merge.rc:2478 Merge.rc:3115
+#: Merge.rc:2488 Merge.rc:3125
msgid "Plugin &name:"
msgstr "플러그인 이름(&N):"
#. IDD_PLUGINS_SELECTPLUGIN, IDC_STATIC
-#: Merge.rc:2480
+#: Merge.rc:2490
msgid "&Target files:"
msgstr "대상 파일(&T):"
#. IDD_PLUGINS_EDITPLUGIN, IDC_STATIC
-#: Merge.rc:2482 Merge.rc:3117
+#: Merge.rc:2492 Merge.rc:3127
#, c-format
msgid "Extensions list:"
msgstr "확장자 목록:"
#. IDD_PLUGINS_EDITPLUGIN, IDC_STATIC
-#: Merge.rc:2484 Merge.rc:3119
+#: Merge.rc:2494 Merge.rc:3129
#, c-format
msgid "Description:"
msgstr "설명:"
#. IDD_PLUGINS_EDITPLUGIN, IDC_STATIC
-#: Merge.rc:2486 Merge.rc:3121
+#: Merge.rc:2496 Merge.rc:3131
msgid "Default arguments:"
msgstr "기본 인수:"
#. IDD_PLUGINS_SELECTPLUGIN, IDC_PLUGIN_ALLOW_ALL
-#: Merge.rc:2488
+#: Merge.rc:2498
msgid "Display all plugins (Ignore extension)"
msgstr "모든 플러그인을 표시하고, 확장을 확인하지 않음"
#. IDD_PLUGINS_SELECTPLUGIN, IDC_PLUGIN_OPEN_IN_SAME_FRAME_TYPE
-#: Merge.rc:2490
+#: Merge.rc:2500
msgid "&Open files in same window type after unpacking"
msgstr "압축을 푼 후 동일한 창 유형의 파일 열기(&O)"
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_PIPELINE_STATIC
-#: Merge.rc:2492 Merge.rc:3129
+#: Merge.rc:2502 Merge.rc:3139
msgid "&Plugin pipeline:"
msgstr "플러그인 파이프라인(&P):"
#. IDD_PLUGINS_SELECTPLUGIN, IDC_PLUGIN_ALIAS
-#: Merge.rc:2495
+#: Merge.rc:2505
msgid "&Alias..."
msgstr "별칭(&A)..."
#. IDD_DIRCOMP_PROGRESS, IDC_COMPARISON_STOP
-#: Merge.rc:2505
+#: Merge.rc:2515
#, c-format
msgid "Stop"
msgstr "중지"
#. IDD_DIRCOMP_PROGRESS, IDC_COMPARISON_PAUSE
-#: Merge.rc:2506
+#: Merge.rc:2516
#, c-format
msgid "Pause"
msgstr "일시 중지"
#. IDD_DIRCOMP_PROGRESS, IDC_COMPARISON_CONTINUE
-#: Merge.rc:2507
+#: Merge.rc:2517
#, c-format
msgid "Continue"
msgstr "계속"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC
-#: Merge.rc:2509 Merge.rc:2973
+#: Merge.rc:2519 Merge.rc:2983
msgid "C&PU cores to use:"
msgstr "사용할 CPU 코어 수(&N):"
#. IDD_DIRCOMP_PROGRESS, IDC_STATIC
-#: Merge.rc:2510
+#: Merge.rc:2520
#, c-format
msgid "Items total:"
msgstr "전체 항목:"
#. IDD_DIRCOMP_PROGRESS, IDC_STATIC
-#: Merge.rc:2511
+#: Merge.rc:2521
#, c-format
msgid "Items compared:"
msgstr "비교된 항목:"
#. IDS_PREVIEWBAR_CLOSE
-#: Merge.rc:2526 Merge.rc:2846 Merge.rc:5328
+#: Merge.rc:2536 Merge.rc:2856 Merge.rc:5339
#, c-format
msgid "&Close"
msgstr "닫기(&C)"
#. IDD_WMGOTO
-#: Merge.rc:2537
+#: Merge.rc:2547
msgid "Go to"
msgstr "이동"
#. IDD_WMGOTO, IDC_STATIC
-#: Merge.rc:2540
+#: Merge.rc:2550
msgid "G&o to:"
msgstr "이동(&O):"
#. IDD_WMGOTO, IDC_STATIC
-#: Merge.rc:2543
+#: Merge.rc:2553
#, c-format
msgid "File"
msgstr "파일"
#. IDD_WMGOTO, IDC_STATIC
-#: Merge.rc:2547
+#: Merge.rc:2557
msgid "Go to what"
msgstr "이동 위치"
#. IDD_WMGOTO, IDC_WMGOTO_TOLINE
-#: Merge.rc:2548
+#: Merge.rc:2558
#, c-format
msgid "Li&ne"
msgstr "줄(&N)"
#. IDD_WMGOTO, IDC_WMGOTO_TODIFF
-#: Merge.rc:2549
+#: Merge.rc:2559
#, c-format
msgid "&Difference"
msgstr "차이(&D)"
#. IDD_WMGOTO, IDOK
-#: Merge.rc:2550
+#: Merge.rc:2560
msgid "&Go to"
msgstr "이동(&G)"
#. IDS_PROJECT_ITEM_FILE_FILTER
-#: Merge.rc:2556 Merge.rc:4321
+#: Merge.rc:2566 Merge.rc:4331
msgid "File Filters"
msgstr "파일 필터"
#. IDD_FILTERS_FILEFILTERS, IDC_STATIC
-#: Merge.rc:2559
+#: Merge.rc:2569
msgid "&Mask / Filter Expression"
msgstr "마스크 / 필터 표현식(&M)"
#. IDD_FILTERS_FILEFILTERS, IDC_STATIC
-#: Merge.rc:2562
+#: Merge.rc:2572
msgid "Preset &Filters"
msgstr "사전 설정 필터(&F)"
#. IDD_FILTERS_FILEFILTERS, IDC_FILTERFILE_TEST_BTN
-#: Merge.rc:2564
+#: Merge.rc:2574
msgid "Test..."
msgstr "테스트..."
#. IDD_FILTERS_FILEFILTERS, IDC_FILTERFILE_INSTALL
-#: Merge.rc:2565
+#: Merge.rc:2575
#, c-format
msgid "Install..."
msgstr "설치..."
#. IDD_FILTERS_FILEFILTERS, IDC_FILTERFILE_NEWBTN
-#: Merge.rc:2566
+#: Merge.rc:2576
#, c-format
msgid "New..."
msgstr "새로 만들기..."
#. IDD_FILTERS_FILEFILTERS, IDC_FILTERFILE_EDITBTN
-#: Merge.rc:2567
+#: Merge.rc:2577
#, c-format
msgid "Edit..."
msgstr "편집..."
#. IDD_FILTERS_FILEFILTERS, IDC_FILTERFILE_DELETEBTN
-#: Merge.rc:2568
+#: Merge.rc:2578
#, c-format
msgid "Delete..."
msgstr "삭제..."
#. IDD_FILTERS_CONDITION
-#: Merge.rc:2573
+#: Merge.rc:2583
msgid "Filter Condition"
msgstr "필터 조건"
#. IDD_FILTERS_CONDITION, IDC_STATIC
-#: Merge.rc:2576
+#: Merge.rc:2586
msgid "&Left-hand side:"
msgstr "왼쪽(&L)"
#. IDD_FILTERS_CONDITION, IDC_STATIC
-#: Merge.rc:2578
+#: Merge.rc:2588
msgid "&Operator:"
msgstr "연산자(&O):"
#. IDD_FILTERS_CONDITION, IDC_STATIC
-#: Merge.rc:2580
+#: Merge.rc:2590
msgid "&Right-hand side:"
msgstr "오른쪽(&R)"
#. IDD_FILTERS_CONDITION, IDC_STATIC
-#: Merge.rc:2586
+#: Merge.rc:2596
msgid "Expression:"
msgstr "표현식:"
#. IDD_COMPARISON_RESULT_FILTER
-#: Merge.rc:2595
+#: Merge.rc:2605
msgid "Filter by Comparison Result"
msgstr "비교 결과 필터링"
#. IDD_COMPARISON_RESULT_FILTER, IDC_RADIO_INCLUDE
-#: Merge.rc:2598
+#: Merge.rc:2608
msgid "&Include"
msgstr "포함(&I)"
#. IDD_COMPARISON_RESULT_FILTER, IDC_RADIO_EXCLUDE
-#: Merge.rc:2599
+#: Merge.rc:2609
msgid "&Exclude"
msgstr "제외(&E)"
#. IDD_COMPARISON_RESULT_FILTER, IDC_STATIC
-#: Merge.rc:2600
+#: Merge.rc:2610
msgid "Comparison Results"
msgstr "비교 결과"
#. IDS_IDENTICAL
-#: Merge.rc:2601 Merge.rc:2733 Merge.rc:2794 Merge.rc:4698
+#: Merge.rc:2611 Merge.rc:2743 Merge.rc:2804 Merge.rc:4708
#, c-format
msgid "Identical"
msgstr "동일"
#. IDS_DIFFERENT
-#: Merge.rc:2602 Merge.rc:2714 Merge.rc:2755 Merge.rc:4708
+#: Merge.rc:2612 Merge.rc:2724 Merge.rc:2765 Merge.rc:4718
#, c-format
msgid "Different"
msgstr "다름"
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_LEFT_ONLY
-#: Merge.rc:2603
+#: Merge.rc:2613
msgid "Left only"
msgstr "왼쪽만"
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_RIGHT_ONLY
-#: Merge.rc:2604
+#: Merge.rc:2614
msgid "Right only"
msgstr "오른쪽만"
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_SKIPPED
-#: Merge.rc:2605
+#: Merge.rc:2615
msgid "Skipped"
msgstr "건너뜀"
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_MIDDLE_ONLY
-#: Merge.rc:2606
+#: Merge.rc:2616
msgid "Middle only"
msgstr "중간만"
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_LEFT_ONLY_DIFFERENT
-#: Merge.rc:2607
+#: Merge.rc:2617
msgid "Left only (different)"
msgstr "왼쪽만 (차이)"
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_MIDDLE_ONLY_DIFFERENT
-#: Merge.rc:2608
+#: Merge.rc:2618
msgid "Middle only (different)"
msgstr "중간만 (차이)"
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_RIGHT_ONLY_DIFFERENT
-#: Merge.rc:2609
+#: Merge.rc:2619
msgid "Right only (different)"
msgstr "오른쪽만 (차이)"
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_LEFT_ONLY_MISSING
-#: Merge.rc:2610
+#: Merge.rc:2620
msgid "Left only (missing)"
msgstr "왼쪽만 (누락)"
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_MIDDLE_ONLY_MISSING
-#: Merge.rc:2611
+#: Merge.rc:2621
msgid "Middle only (missing)"
msgstr "중간만 (누락)"
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_RIGHT_ONLY_MISSING
-#: Merge.rc:2612
+#: Merge.rc:2622
msgid "Right only (missing)"
msgstr "오른쪽만 (누락)"
#. IDS_OPTIONSPG_CODEPAGE
-#: Merge.rc:2619 Merge.rc:2811 Merge.rc:4213
+#: Merge.rc:2629 Merge.rc:2821 Merge.rc:4223
#, c-format
msgid "Codepage"
msgstr "코드페이지"
#. IDD_PROPPAGE_CODEPAGE, IDC_STATIC
-#: Merge.rc:2622
+#: Merge.rc:2632
#, c-format
msgid "Default Codepage"
msgstr "기본 코드페이지"
#. IDD_PROPPAGE_CODEPAGE, IDC_STATIC
-#: Merge.rc:2623
+#: Merge.rc:2633
#, c-format
msgid "Select the default codepage for non-Unicode files:"
msgstr "비유니코드 파일 열 때 사용할 기본 코드페이지:"
#. IDD_PROPPAGE_CODEPAGE, IDC_CP_SYSTEM
-#: Merge.rc:2624
+#: Merge.rc:2634
#, c-format
msgid "System codepage"
msgstr "시스템 코드페이지"
#. IDD_PROPPAGE_CODEPAGE, IDC_CP_UI
-#: Merge.rc:2625
+#: Merge.rc:2635
#, c-format
msgid "According to WinMerge User Interface"
msgstr "WinMerge 사용자 인터페이스를 따름"
#. IDD_PROPPAGE_CODEPAGE, IDC_CP_CUSTOM
-#: Merge.rc:2626
+#: Merge.rc:2636
#, c-format
msgid "Custom codepage:"
msgstr "사용자 지정 코드페이지:"
#. IDD_PROPPAGE_CODEPAGE, IDC_DETECT_CODEPAGE
-#: Merge.rc:2628
+#: Merge.rc:2638
msgid ""
"Detect codepage for: .html, .rc, .xml\n"
"Restart required."
@@ -4483,7 +4494,7 @@ msgstr ""
"세션을 다시 시작해야 합니다."
#. IDD_PROPPAGE_CODEPAGE, IDC_DETECT_CODEPAGE2
-#: Merge.rc:2630
+#: Merge.rc:2640
msgid ""
"Detect codepage for files with mlang.dll\n"
"Restart required."
@@ -4492,857 +4503,857 @@ msgstr ""
"세션을 다시 시작해야 합니다."
#. IDS_OPTIONSPG_ARCHIVE
-#: Merge.rc:2638 Merge.rc:4214
+#: Merge.rc:2648 Merge.rc:4224
#, c-format
msgid "Archive Support"
msgstr "압축 지원"
#. IDD_PROPPAGE_ARCHIVE, IDC_ARCHIVE_ENABLE
-#: Merge.rc:2641
+#: Merge.rc:2651
#, c-format
msgid "&Enable archive file support"
msgstr "압축 파일 지원 사용함(&E)"
#. IDD_PROPPAGE_ARCHIVE, IDC_ARCHIVE_DETECTTYPE
-#: Merge.rc:2642
+#: Merge.rc:2652
#, c-format
msgid "&Detect archive type from file signature"
msgstr "파일 서명에서 압축 형식 감지(&D)"
#. IDD_PROPPAGE_PROJECT, IDC_STATIC
-#: Merge.rc:2651
+#: Merge.rc:2661
msgid "Items saved to or restored from the project file:"
msgstr "프로젝트 파일에 저장되거나 복원된 항목:"
#. IDD_SAVECLOSING
-#: Merge.rc:2658
+#: Merge.rc:2668
#, c-format
msgid "Save Modified Files?"
msgstr "수정된 파일을 저장하시겠습니까?"
#. IDD_SAVECLOSING, IDC_SAVECLOSING_LEFTFRAME
-#: Merge.rc:2661
+#: Merge.rc:2671
#, c-format
msgid "Left side file"
msgstr "왼쪽 파일"
#. IDD_SAVECLOSING, IDC_SAVECLOSING_SAVELEFT
-#: Merge.rc:2663
+#: Merge.rc:2673
#, c-format
msgid "&Save changes"
msgstr "변경사항 저장(&S)"
#. IDD_SAVECLOSING, IDC_SAVECLOSING_DISCARDLEFT
-#: Merge.rc:2664
+#: Merge.rc:2674
#, c-format
msgid "&Discard changes"
msgstr "변경사항 취소(&D)"
#. IDD_SAVECLOSING, IDC_SAVECLOSING_MIDDLEFRAME
-#: Merge.rc:2665
+#: Merge.rc:2675
#, c-format
msgid "Middle side file"
msgstr "가운데 파일"
#. IDD_SAVECLOSING, IDC_SAVECLOSING_SAVEMIDDLE
-#: Merge.rc:2667
+#: Merge.rc:2677
#, c-format
msgid "Sa&ve changes"
msgstr "변경사항 저장(&V)"
#. IDD_SAVECLOSING, IDC_SAVECLOSING_DISCARDMIDDLE
-#: Merge.rc:2668
+#: Merge.rc:2678
#, c-format
msgid "Discard c&hanges"
msgstr "변경사항 취소(&H)"
#. IDD_SAVECLOSING, IDC_SAVECLOSING_RIGHTFRAME
-#: Merge.rc:2669
+#: Merge.rc:2679
#, c-format
msgid "Right side file"
msgstr "오른쪽 파일"
#. IDD_SAVECLOSING, IDC_SAVECLOSING_SAVERIGHT
-#: Merge.rc:2671
+#: Merge.rc:2681
#, c-format
msgid "S&ave changes"
msgstr "변경사항 저장(&A)"
#. IDD_SAVECLOSING, IDC_SAVECLOSING_DISCARDRIGHT
-#: Merge.rc:2672
+#: Merge.rc:2682
#, c-format
msgid "Dis&card changes"
msgstr "변경사항 취소(&C)"
#. IDD_SAVECLOSING, IDC_SAVECLOSING_DISCARDALL
-#: Merge.rc:2673
+#: Merge.rc:2683
#, c-format
msgid "Disca&rd All"
msgstr "모두 취소(&R)"
#. IDD_DIRCMP_REPORT
-#: Merge.rc:2680
+#: Merge.rc:2690
#, c-format
msgid "Folder Compare Report"
msgstr "폴더 비교 보고서"
#. IDD_DIRCMP_REPORT, IDC_STATIC
-#: Merge.rc:2683
+#: Merge.rc:2693
#, c-format
msgid "Report &file:"
msgstr "보고서 파일(&F):"
#. IDD_DIRCMP_REPORT, IDC_STATIC
-#: Merge.rc:2686
+#: Merge.rc:2696
#, c-format
msgid "&Style:"
msgstr "스타일(&S):"
#. IDD_DIRCMP_REPORT, IDC_REPORT_INCLUDEFILECMPREPORT
-#: Merge.rc:2688
+#: Merge.rc:2698
#, c-format
msgid "&Include file compare report"
msgstr "파일 비교 보고서 포함(&I)"
#. IDD_FILTERS_FILEFILTERS_SHARED
-#: Merge.rc:2697
+#: Merge.rc:2707
#, c-format
msgid "Shared or Private Filter"
msgstr "공유/개인 필터"
#. IDD_FILTERS_FILEFILTERS_SHARED, IDC_STATIC
-#: Merge.rc:2700
+#: Merge.rc:2710
#, c-format
msgid "What type of filter do you want?"
msgstr "어떤 유형의 필터를 만드시겠습니까?"
#. IDD_FILTERS_FILEFILTERS_SHARED, IDC_SHARED
-#: Merge.rc:2701
+#: Merge.rc:2711
#, c-format
msgid "Shared Filter (for all users)"
msgstr "공유 필터 (모든 사용자용)"
#. IDD_FILTERS_FILEFILTERS_SHARED, IDC_PRIVATE
-#: Merge.rc:2702
+#: Merge.rc:2712
#, c-format
msgid "Private Filter (current user only)"
msgstr "개인 필터 (현재 사용자만)"
#. IDD_COMPARE_STATISTICS3
-#: Merge.rc:2709 Merge.rc:2750
+#: Merge.rc:2719 Merge.rc:2760
#, c-format
msgid "Compare Statistics"
msgstr "통계 비교"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2712 Merge.rc:2753
+#: Merge.rc:2722 Merge.rc:2763
#, c-format
msgid "Folders:"
msgstr "폴더:"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2713 Merge.rc:2754
+#: Merge.rc:2723 Merge.rc:2764
#, c-format
msgid "Files:"
msgstr "파일:"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2719 Merge.rc:2738 Merge.rc:2760 Merge.rc:2799
+#: Merge.rc:2729 Merge.rc:2748 Merge.rc:2770 Merge.rc:2809
#, c-format
msgid "Binary:"
msgstr "바이너리:"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2722 Merge.rc:2763
+#: Merge.rc:2732 Merge.rc:2773
#, c-format
msgid "Unique"
msgstr "고유한"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2723 Merge.rc:2764
+#: Merge.rc:2733 Merge.rc:2774
#, c-format
msgid "Left:"
msgstr "왼쪽:"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2728 Merge.rc:2774
+#: Merge.rc:2738 Merge.rc:2784
#, c-format
msgid "Right:"
msgstr "오른쪽:"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2742 Merge.rc:2803
+#: Merge.rc:2752 Merge.rc:2813
#, c-format
msgid "Total:"
msgstr "전체:"
#. IDD_COMPARE_STATISTICS3, IDOK
-#: Merge.rc:2745 Merge.rc:2806
+#: Merge.rc:2755 Merge.rc:2816
#, c-format
msgid "Close"
msgstr "닫기"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2769
+#: Merge.rc:2779
#, c-format
msgid "Middle:"
msgstr "가운데:"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2779
+#: Merge.rc:2789
#, c-format
msgid "Missing Left:"
msgstr "왼쪽 없음:"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2784
+#: Merge.rc:2794
#, c-format
msgid "Missing Middle:"
msgstr "가운데 없음:"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2789
+#: Merge.rc:2799
#, c-format
msgid "Missing Right:"
msgstr "오른쪽 없음:"
#. IDD_LOAD_SAVE_CODEPAGE, IDC_AFFECTS_GROUP
-#: Merge.rc:2814
+#: Merge.rc:2824
#, c-format
msgid "Affects"
msgstr "적용"
#. IDD_LOAD_SAVE_CODEPAGE, IDC_RIGHT_FILES_LABEL
-#: Merge.rc:2816 Merge.rc:2818 Merge.rc:2820
+#: Merge.rc:2826 Merge.rc:2828 Merge.rc:2830
#, c-format
msgid "(Affects)"
msgstr "(적용)"
#. IDD_LOAD_SAVE_CODEPAGE, IDC_LOADING_GROUP
-#: Merge.rc:2821
+#: Merge.rc:2831
#, c-format
msgid "Select Codepage for"
msgstr "코드페이지 선택"
#. IDD_LOAD_SAVE_CODEPAGE, IDC_LOAD_FILES_LABEL
-#: Merge.rc:2822
+#: Merge.rc:2832
#, c-format
msgid "&File Loading:"
msgstr "파일 불러오기(&F):"
#. IDD_LOAD_SAVE_CODEPAGE, IDC_SAVE_FILES_LABEL
-#: Merge.rc:2824
+#: Merge.rc:2834
#, c-format
msgid "File &Saving:"
msgstr "파일 저장(&S):"
#. IDD_LOAD_SAVE_CODEPAGE, IDC_LOAD_SAVE_SAME_CODEPAGE
-#: Merge.rc:2827
+#: Merge.rc:2837
#, c-format
msgid "&Use same codepage for both"
msgstr "양쪽에 같은 코드페이지 사용(&U)"
#. IDS_MESSAGEBOX_CANCEL
-#: Merge.rc:2830 Merge.rc:4172
+#: Merge.rc:2840 Merge.rc:4182
#, c-format
msgid "&Cancel"
msgstr "취소(&C)"
#. IDD_FILTERS_FILEFILTERS_TEST
-#: Merge.rc:2835
+#: Merge.rc:2845
#, c-format
msgid "Test Filter"
msgstr "필터 테스트"
#. IDD_FILTERS_FILEFILTERS_TEST, IDC_HEADER
-#: Merge.rc:2838
+#: Merge.rc:2848
msgid "Testing filter:"
msgstr "필터 테스트 중:"
#. IDD_FILTERS_FILEFILTERS_TEST, IDC_PROMPT_LABEL
-#: Merge.rc:2840
+#: Merge.rc:2850
#, c-format
msgid "&Enter text to test:"
msgstr "시험할 텍스트 입력(&E)"
#. IDD_FILTERS_FILEFILTERS_TEST, IDC_IS_DIRECTORY
-#: Merge.rc:2842
+#: Merge.rc:2852
#, c-format
msgid "&Folder Name"
msgstr "폴더 이름(&F)"
#. IDD_FILTERS_FILEFILTERS_TEST, IDC_STATIC
-#: Merge.rc:2843
+#: Merge.rc:2853
#, c-format
msgid "Result:"
msgstr "결과:"
#. IDD_FILTERS_FILEFILTERS_TEST, IDC_TEST_BTN
-#: Merge.rc:2845
+#: Merge.rc:2855
#, c-format
msgid "&Test"
msgstr "테스트(&T)"
#. IDS_OPTIONSPG_TABLECOMPARE
-#: Merge.rc:2851 Merge.rc:2990 Merge.rc:4228
+#: Merge.rc:2861 Merge.rc:3000 Merge.rc:4238
msgid "Table"
msgstr "테이블"
#. IDD_OPEN_TABLE, IDC_STATIC
-#: Merge.rc:2854
+#: Merge.rc:2864
msgid "File type"
msgstr "파일 종류"
#. IDD_OPEN_TABLE, IDC_COMPARETABLE_CSV
-#: Merge.rc:2855
+#: Merge.rc:2865
msgid "&CSV"
msgstr "&CSV"
#. IDD_OPEN_TABLE, IDC_COMPARETABLE_TSV
-#: Merge.rc:2856
+#: Merge.rc:2866
msgid "&TSV"
msgstr "&TSV"
#. IDD_OPEN_TABLE, IDC_COMPARETABLE_DSV
-#: Merge.rc:2857
+#: Merge.rc:2867
msgid "Custom &Delimiter-Separated Values"
msgstr "사용자 지정 구분 기호로 구분된 값(&D)"
#. IDD_PROPPAGE_COMPARE_TABLE, IDC_STATIC
-#: Merge.rc:2859 Merge.rc:2861 Merge.rc:2996 Merge.rc:3004
+#: Merge.rc:2869 Merge.rc:2871 Merge.rc:3006 Merge.rc:3014
msgid "D&elimiter character:"
msgstr "구분 기호(&E)"
#. IDD_PROPPAGE_COMPARE_TABLE, IDC_COMPARETABLE_ALLOWNEWLINE
-#: Merge.rc:2863 Merge.rc:3006
+#: Merge.rc:2873 Merge.rc:3016
msgid "&Allow newlines in quotes"
msgstr "따옴표에 새 줄 허용(&A)"
#. IDD_PROPPAGE_COMPARE_TABLE, IDC_STATIC
-#: Merge.rc:2865 Merge.rc:3008
+#: Merge.rc:2875 Merge.rc:3018
msgid "&Quote character:"
msgstr "따옴표 기호(&Q)"
#. IDS_OPTIONSPG_BACKUPS
-#: Merge.rc:2873 Merge.rc:4216
+#: Merge.rc:2883 Merge.rc:4226
#, c-format
msgid "Backup Files"
msgstr "파일 백업"
#. IDD_PROPPAGE_BACKUPS, IDC_STATIC
-#: Merge.rc:2876
+#: Merge.rc:2886
#, c-format
msgid "Create backup files for:"
msgstr "다음 위치에 백업 파일 만들기:"
#. IDD_PROPPAGE_BACKUPS, IDC_BACKUP_FOLDERCMP
-#: Merge.rc:2877
+#: Merge.rc:2887
#, c-format
msgid "&Folder compare"
msgstr "폴더 비교(&F)"
#. IDD_PROPPAGE_BACKUPS, IDC_BACKUP_FILECMP
-#: Merge.rc:2878
+#: Merge.rc:2888
#, c-format
msgid "Fil&e compare"
msgstr "파일 비교(&E)"
#. IDD_PROPPAGE_BACKUPS, IDC_STATIC
-#: Merge.rc:2879
+#: Merge.rc:2889
#, c-format
msgid "Create backup files in:"
msgstr "백업 파일 만들기 위치:"
#. IDD_PROPPAGE_BACKUPS, IDC_BACKUP_ORIGFOLD
-#: Merge.rc:2880
+#: Merge.rc:2890
#, c-format
msgid "&Original file's folder"
msgstr "원본 파일의 폴더(&O)"
#. IDD_PROPPAGE_BACKUPS, IDC_BACKUP_GLOBALFOLD
-#: Merge.rc:2881
+#: Merge.rc:2891
#, c-format
msgid "&Global backup folder:"
msgstr "전역 백업 폴더(&G):"
#. IDD_PROPPAGE_BACKUPS, IDC_STATIC
-#: Merge.rc:2884
+#: Merge.rc:2894
#, c-format
msgid "Backup filename:"
msgstr "백업 파일 이름:"
#. IDD_PROPPAGE_BACKUPS, IDC_BACKUP_APPEND_BAK
-#: Merge.rc:2885
+#: Merge.rc:2895
msgid "&Append .bak extension"
msgstr ".bak 확장자 추가(&A)"
#. IDD_PROPPAGE_BACKUPS, IDC_BACKUP_APPEND_TIME
-#: Merge.rc:2886
+#: Merge.rc:2896
#, c-format
msgid "A&ppend timestamp"
msgstr "타임스탬프 추가(&P)"
#. IDS_CONFIRM_COPY_CAPTION
-#: Merge.rc:2892 Merge.rc:4565
+#: Merge.rc:2902 Merge.rc:4575
#, c-format
msgid "Confirm Copy"
msgstr "복사 확인"
#. IDD_CONFIRM_COPY, IDC_FLDCONFIRM_QUERY
-#: Merge.rc:2896
+#: Merge.rc:2906
#, c-format
msgid "Are you sure you want to copy XXX items?"
msgstr "XXX 항목을 복사하시겠습니까?"
#. IDD_CONFIRM_COPY, IDC_FLDCONFIRM_FROM_TEXT
-#: Merge.rc:2897
+#: Merge.rc:2907
#, c-format
msgid "From left"
msgstr "왼쪽에서"
#. IDD_CONFIRM_COPY, IDC_FLDCONFIRM_TO_TEXT
-#: Merge.rc:2899
+#: Merge.rc:2909
#, c-format
msgid "To right"
msgstr "오른쪽으로"
#. IDS_MESSAGEBOX_DONT_ASK_AGAIN
-#: Merge.rc:2901 Merge.rc:4191
+#: Merge.rc:2911 Merge.rc:4201
#, c-format
msgid "Don't ask this &question again."
msgstr "다시 묻지 않음.(&Q)"
#. IDD_CONFIRM_COPY, IDYES
-#: Merge.rc:2903
+#: Merge.rc:2913
#, c-format
msgid "Yes"
msgstr "예"
#. IDD_CONFIRM_COPY, IDNO
-#: Merge.rc:2904
+#: Merge.rc:2914
#, c-format
msgid "No"
msgstr "아니요"
#. IDS_PROJECT_ITEM_PLUGIN
-#: Merge.rc:2909 Merge.rc:4323
+#: Merge.rc:2919 Merge.rc:4333
#, c-format
msgid "Plugins"
msgstr "플러그인"
#. IDD_PLUGINS_LIST, IDC_PLUGINS_ENABLE
-#: Merge.rc:2912
+#: Merge.rc:2922
#, c-format
msgid "&Enable plugins"
msgstr "플러그인 사용함(&E)"
#. IDD_PLUGINS_EDITPLUGIN, IDC_STATIC
-#: Merge.rc:2913 Merge.rc:3113
+#: Merge.rc:2923 Merge.rc:3123
msgid "Plugin &type:"
msgstr "플러그인(&T):"
#. IDD_PLUGINS_LIST, IDC_STATIC
-#: Merge.rc:2916
+#: Merge.rc:2926
msgid "File filters:"
msgstr "파일 필터:"
#. IDD_PLUGINS_LIST, IDC_STATIC
-#: Merge.rc:2918
+#: Merge.rc:2928
msgid "&Plugin arguments:"
msgstr "플러그인 인수(&P):"
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_AUTOMATIC
-#: Merge.rc:2920 Merge.rc:3134
+#: Merge.rc:2930 Merge.rc:3144
msgid "Enable &automatic unpacking/prediffing"
msgstr "플러그인의 자동 압축 풀기/사전 차이 사용함(&A)"
#. IDS_OPTIONSPG_SHELL
-#: Merge.rc:2934 Merge.rc:4217
+#: Merge.rc:2944 Merge.rc:4227
#, c-format
msgid "Shell Integration"
msgstr "셸 통합"
#. IDD_PROPPAGE_SHELL, IDC_STATIC
-#: Merge.rc:2937
+#: Merge.rc:2947
#, c-format
msgid "Explorer"
msgstr "탐색기"
#. IDD_PROPPAGE_SHELL, IDC_EXPLORER_CONTEXT
-#: Merge.rc:2938
+#: Merge.rc:2948
#, c-format
msgid "&Add to context menu"
msgstr "상황에 맞는 메뉴에 추가(&A)"
#. IDD_PROPPAGE_SHELL, IDC_EXPLORER_ADVANCED
-#: Merge.rc:2939
+#: Merge.rc:2949
#, c-format
msgid "E&nable advanced menu"
msgstr "고급 메뉴 사용(&N)"
#. IDD_PROPPAGE_SHELL, IDC_EXPLORER_COMPARE_AS
-#: Merge.rc:2940
+#: Merge.rc:2950
msgid "Enable &Compare As menu"
msgstr "다른 이름으로 비교 메뉴 사용(&C)"
#. IDD_PROPPAGE_SHELL, IDC_REGISTER_SHELLEXTENSION
-#: Merge.rc:2941
+#: Merge.rc:2951
#, c-format
msgid "&Register Shell Extension"
msgstr "셸 확장 등록(&R)"
#. IDD_PROPPAGE_SHELL, IDC_UNREGISTER_SHELLEXTENSION
-#: Merge.rc:2942
+#: Merge.rc:2952
#, c-format
msgid "&Unregister Shell Extension"
msgstr "셸 확장 등록 해제(&U)"
#. IDD_PROPPAGE_SHELL, IDC_REGISTER_SHELLEXTENSION_PERUSER
-#: Merge.rc:2943
+#: Merge.rc:2953
msgid "Register Shell Extension for Current User &Only"
msgstr "현재 사용자만 셸 확장 등록(&O)"
#. IDD_PROPPAGE_SHELL, IDC_UNREGISTER_SHELLEXTENSION_PERUSER
-#: Merge.rc:2944
+#: Merge.rc:2954
msgid "Unregister Shell Extension for Current User On&ly"
msgstr "현재 사용자만 셸 확장 등록 해제(&L)"
#. IDD_PROPPAGE_SHELL, IDC_REGISTER_WINMERGECONTEXTMENU
-#: Merge.rc:2945
+#: Merge.rc:2955
msgid "Register Shell Extension for &Windows 11"
msgstr "Windows 11 이상에서 셸 확장 등록(&W)"
#. IDD_PROPPAGE_SHELL, IDC_UNREGISTER_WINMERGECONTEXTMENU
-#: Merge.rc:2946
+#: Merge.rc:2956
msgid "Unregister Shell Extension for W&indows 11"
msgstr "Windows 11 이상에서 셸 확장 등록 해제(&I)"
#. IDD_PROPPAGE_SHELL, IDC_STATIC
-#: Merge.rc:2947
+#: Merge.rc:2957
msgid "Jump List"
msgstr "점프 목록"
#. IDD_PROPPAGE_SHELL, IDC_CLEAR_ALL_RECENT_ITEMS
-#: Merge.rc:2949
+#: Merge.rc:2959
msgid "Clear all recent items"
msgstr "최근 항목 모두 지우기"
#. IDS_OPTIONSPG_FOLDERCOMPARE
-#: Merge.rc:2954 Merge.rc:4225
+#: Merge.rc:2964 Merge.rc:4235
msgctxt "Options dialog|Categories"
msgid "Folder"
msgstr "폴더"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC
-#: Merge.rc:2957
+#: Merge.rc:2967
msgid "&Compare method:"
msgstr "비교 방법(&C):"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_COMPARE_STOPFIRST
-#: Merge.rc:2959
+#: Merge.rc:2969
#, c-format
msgid "S&top after first difference"
msgstr "첫 차이 이후 중지(&T)"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_IGNORE_SMALLTIMEDIFF
-#: Merge.rc:2961
+#: Merge.rc:2971
#, c-format
msgid "Ign&ore time differences less than 3 seconds"
msgstr "3초 이내의 시간 차이 무시(&O)"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC
-#: Merge.rc:2964
+#: Merge.rc:2974
msgid "Expand subfolders &after comparison:"
msgstr "비교 후 하위 폴더 자동 확장(&A):"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_COMPARE_WALKSUBDIRS
-#: Merge.rc:2966
+#: Merge.rc:2976
#, c-format
msgid "Include &unique subfolders contents"
msgstr "이름이 같은 하위 폴더 내용 포함(&U)"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_IGNORE_REPARSEPOINTS
-#: Merge.rc:2968
+#: Merge.rc:2978
#, c-format
msgid "Ignore &reparse points"
msgstr "재분석 지점 무시(&R)"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC
-#: Merge.rc:2969
+#: Merge.rc:2979
msgid "Switch to &quick compare when size exceeds (MB):"
msgstr "빠른 비교로 전환하기 위한 임계값 (MB)(&Q):"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC
-#: Merge.rc:2971
+#: Merge.rc:2981
msgid "Switch to &binary compare when size exceeds (MB):"
msgstr "바이너리 비교로 전환하기 위한 임계값 (MB)(&B):"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC
-#: Merge.rc:2975
+#: Merge.rc:2985
msgid "Additional comparison condi&tions:"
msgstr "추가 비교 조건(&T):"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC
-#: Merge.rc:2978
+#: Merge.rc:2988
msgid "&Rename/move detection:"
msgstr "이름 바꾸기/이동 감지(&R):"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC
-#: Merge.rc:2980
+#: Merge.rc:2990
msgid "Rename/move detection &keys:"
msgstr "감지 키 이름 바꾸기/이동(&K):"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC
-#: Merge.rc:2983
+#: Merge.rc:2993
msgid "M&erge renames and moves:"
msgstr "이름 바꾸기 및 이동 병합(&E):"
#. IDD_PROPPAGE_COMPARE_TABLE, IDC_STATIC
-#: Merge.rc:2994 Merge.rc:2999 Merge.rc:3002
+#: Merge.rc:3004 Merge.rc:3009 Merge.rc:3012
msgid "File patterns:"
msgstr "파일 패턴:"
#. IDD_PROPPAGE_COMPARE_TABLE, IDC_STATIC
-#: Merge.rc:3001
+#: Merge.rc:3011
msgid "Custom Delimiter-Separated Values"
msgstr "사용자 지정 구분 기호로 구분된 값"
#. IDS_OPTIONSPG_BINARYCOMPARE
-#: Merge.rc:3015 Merge.rc:4227
+#: Merge.rc:3025 Merge.rc:4237
msgctxt "Options dialog|Categories"
msgid "Binary"
msgstr "바이너리"
#. IDD_PROPPAGE_COMPARE_BINARY, IDC_STATIC
-#: Merge.rc:3018
+#: Merge.rc:3028
#, c-format
msgid "Binary file &patterns:"
msgstr "바이너리 파일 패턴(&P):"
#. IDD_PROPPAGE_COMPARE_BINARY, IDC_STATIC
-#: Merge.rc:3020
+#: Merge.rc:3030
#, c-format
msgid "Frhed settings"
msgstr "무료 헥사 편집기 설정"
#. IDD_PROPPAGE_COMPARE_BINARY, IDC_COMPAREBINARY_VIEWSETTINGS
-#: Merge.rc:3021
+#: Merge.rc:3031
#, c-format
msgid "View &Settings..."
msgstr "보기 설정(&S)..."
#. IDD_PROPPAGE_COMPARE_BINARY, IDC_COMPAREBINARY_BINARYMODE
-#: Merge.rc:3022
+#: Merge.rc:3032
#, c-format
msgid "&Binary Mode..."
msgstr "바이너리 모드(&B)..."
#. IDD_PROPPAGE_COMPARE_BINARY, IDC_COMPAREBINARY_CHARACTERSET
-#: Merge.rc:3023
+#: Merge.rc:3033
#, c-format
msgid "&Character Set..."
msgstr "문자셋(&C)..."
#. IDS_PRPCAT_IMAGE
-#: Merge.rc:3029 Merge.rc:4226 Merge.rc:4665
+#: Merge.rc:3039 Merge.rc:4236 Merge.rc:4675
msgid "Image"
msgstr "이미지"
#. IDD_PROPPAGE_COMPARE_IMAGE, IDC_STATIC
-#: Merge.rc:3032
+#: Merge.rc:3042
#, c-format
msgid "Image file &patterns:"
msgstr "이미지 파일 패턴(&P):"
#. IDD_PROPPAGE_COMPARE_IMAGE, IDC_ENABLE_IMGCMP_IN_DIRCMP
-#: Merge.rc:3034
+#: Merge.rc:3044
msgid "&Enable image compare in folder compare"
msgstr "폴더 비교시 이미지 비교 사용함(&E)"
#. IDD_PROPPAGE_COMPARE_IMAGE, IDC_STATIC
-#: Merge.rc:3036
+#: Merge.rc:3046
msgid "OCR result:"
msgstr "OCR 결과:"
#. IDS_OPTIONSPG_WEBPAGECOMPARE
-#: Merge.rc:3043 Merge.rc:4229
+#: Merge.rc:3053 Merge.rc:4239
msgid "Webpage"
msgstr "웹페이지"
#. IDD_PROPPAGE_COMPARE_WEBPAGE, IDC_STATIC
-#: Merge.rc:3046
+#: Merge.rc:3056
msgid "URL pattern to &include (Regular expression):"
msgstr "포함할 URL 패턴 (정규식)(&I):"
#. IDD_PROPPAGE_COMPARE_WEBPAGE, IDC_STATIC
-#: Merge.rc:3048
+#: Merge.rc:3058
msgid "URL pattern to &exclude (Regular expression):"
msgstr "제외할 URL 패턴 (정규식)(&E):"
#. IDD_PROPPAGE_COMPARE_WEBPAGE, IDC_STATIC
-#: Merge.rc:3050
+#: Merge.rc:3060
msgid "&User data folder location:"
msgstr "사용자 데이터 폴더 위치(&U):"
#. IDD_PROPPAGE_COMPARE_WEBPAGE, IDC_COMPAREWEBPAGE_USERDATAFOLDER_PERPANE
-#: Merge.rc:3052
+#: Merge.rc:3062
msgid "&Separate user data folders for each pane"
msgstr "각 창에 대해 별도의 사용자 데이터 폴더(&S)"
#. IDD_ENCODINGERROR, IDC_HEXVIEW
-#: Merge.rc:3065
+#: Merge.rc:3075
#, c-format
msgid "&Hex View"
msgstr "16진수 보기(&H)"
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3110
+#: Merge.rc:3120
msgid "Edit Plugin"
msgstr "편집 플러그인"
#. IDD_PLUGINS_EDITPLUGIN, IDC_STATIC
-#: Merge.rc:3123
+#: Merge.rc:3133
msgid "&Category:"
msgstr "범주(&C):"
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_MENUCAPTION_STATIC
-#: Merge.rc:3125
+#: Merge.rc:3135
msgid "&Menu caption:"
msgstr "메뉴 캡션(&M):"
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_WINDOWTYPE_STATIC
-#: Merge.rc:3127
+#: Merge.rc:3137
msgid "&Window type:"
msgstr "창 유형(&W)"
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_UNPACKEDFILEEXTENSION_STATIC
-#: Merge.rc:3132
+#: Merge.rc:3142
msgid "&Unpacked file extension:"
msgstr "압축되지 않은 파일 확장자(&U):"
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_ARGUMENTSREQUIRED
-#: Merge.rc:3136
+#: Merge.rc:3146
msgid "&Require arguments"
msgstr "인수 필요(&R)"
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_GENERATESCRIPT
-#: Merge.rc:3137
+#: Merge.rc:3147
msgid "&Generate editor script"
msgstr "편집기 스크립트 생성(&G)"
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_COMMAND_LINE_STATIC
-#: Merge.rc:3140
+#: Merge.rc:3150
msgid "Command &line:"
msgstr "명령줄((&L):"
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_SCRIPT_FILEEXTENSION_STATIC
-#: Merge.rc:3143
+#: Merge.rc:3153
msgid "&Script file extension:"
msgstr "스크립트 파일 확장자(&S):"
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_SCRIPT_BODY_STATIC
-#: Merge.rc:3145
+#: Merge.rc:3155
msgid "Script &body:"
msgstr "스크립트 본문(&B:"
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3154
+#: Merge.rc:3164
msgid "Font"
msgstr "글꼴"
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3157
+#: Merge.rc:3167
msgid "&Font:"
msgstr "글꼴(&F):"
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3163
+#: Merge.rc:3173
msgid "Font st&yle:"
msgstr "글꼴 스타일(&Y)"
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3169
+#: Merge.rc:3179
msgid "&Size:"
msgstr "크기(&S):"
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3175
+#: Merge.rc:3185
msgid "Effects"
msgstr "효과"
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3176
+#: Merge.rc:3186
msgid "Stri&keout"
msgstr "취소선(&K)"
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3177
+#: Merge.rc:3187
msgid "&Underline"
msgstr "밑줄(&U)"
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3179
+#: Merge.rc:3189
msgid "&Color:"
msgstr "색상(&C)"
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3184
+#: Merge.rc:3194
msgid "Sample"
msgstr "예시"
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3185
+#: Merge.rc:3195
msgid "AaBbYyZz"
msgstr "AaBbYyZz"
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3189
+#: Merge.rc:3199
msgid "Sc&ript:"
msgstr "스크립트(&R)"
#. IDD_PLUGINS_EDITPLUGIN, IDC_MANAGE_LINK
-#: Merge.rc:3194
+#: Merge.rc:3204
msgid "Show more fonts"
msgstr "더 많은 글꼴 표시"
#. ID_INDICATOR_EXT
-#: Merge.rc:4118
+#: Merge.rc:4128
#, c-format
msgid "EXT"
msgstr "EXT"
#. ID_INDICATOR_CAPS
-#: Merge.rc:4119
+#: Merge.rc:4129
#, c-format
msgid "CAP"
msgstr "CAP"
#. ID_INDICATOR_NUM
-#: Merge.rc:4120
+#: Merge.rc:4130
#, c-format
msgid "NUM"
msgstr "NUM"
#. ID_INDICATOR_SCRL
-#: Merge.rc:4121
+#: Merge.rc:4131
#, c-format
msgid "SCRL"
msgstr "SCRL"
#. ID_INDICATOR_OVR
-#: Merge.rc:4122
+#: Merge.rc:4132
#, c-format
msgid "OVR"
msgstr "OVR"
#. ID_INDICATOR_REC
-#: Merge.rc:4123
+#: Merge.rc:4133
#, c-format
msgid "REC"
msgstr "REC"
#. ID_FILE_NEW
-#: Merge.rc:4129
+#: Merge.rc:4139
#, c-format
msgid ""
"\n"
@@ -5352,7 +5363,7 @@ msgstr ""
"새 문서 (Ctrl+N)"
#. ID_FILE_OPEN
-#: Merge.rc:4130
+#: Merge.rc:4140
#, c-format
msgid ""
"\n"
@@ -5362,7 +5373,7 @@ msgstr ""
"열기 (Ctrl+O)"
#. ID_FILE_SAVE
-#: Merge.rc:4131
+#: Merge.rc:4141
#, c-format
msgid ""
"\n"
@@ -5372,29 +5383,29 @@ msgstr ""
"저장 (Ctrl+S)"
#. IDS_UNK_ERROR_READING_PROJECT
-#: Merge.rc:4137
+#: Merge.rc:4147
msgid "Unknown error opening project file."
msgstr "프로젝트를 여는 중 알 수 없는 오류가 발생했습니다."
#. IDS_UNK_ERROR_SAVING_PROJECT
-#: Merge.rc:4138
+#: Merge.rc:4148
msgid "Unknown error saving project file."
msgstr "프로젝트를 저장하는 중 알 수 없는 오류가 발생했습니다."
#. IDS_PROJFILE_LOAD_SUCCESS
-#: Merge.rc:4143
+#: Merge.rc:4153
#, c-format
msgid "Project file loaded."
msgstr "프로젝트 파일을 성공적으로 불러왔습니다."
#. IDS_PROJFILE_SAVE_SUCCESS
-#: Merge.rc:4144
+#: Merge.rc:4154
#, c-format
msgid "Project file saved."
msgstr "프로젝트 파일을 성공적으로 저장했습니다."
#. ID_EDIT_UNDO
-#: Merge.rc:4150
+#: Merge.rc:4160
#, c-format
msgid ""
"\n"
@@ -5404,7 +5415,7 @@ msgstr ""
"실행 취소 (Ctrl+Z)"
#. ID_EDIT_REDO
-#: Merge.rc:4151
+#: Merge.rc:4161
#, c-format
msgid ""
"\n"
@@ -5414,7 +5425,7 @@ msgstr ""
"다시 실행 (Ctrl+Y)"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:4158
+#: Merge.rc:4168
#, c-format
msgid ""
"\n"
@@ -5434,7 +5445,7 @@ msgstr ""
"WinMerge 파일 비교"
#. IDR_DIRDOCTYPE
-#: Merge.rc:4159
+#: Merge.rc:4169
#, c-format
msgid ""
"\n"
@@ -5454,183 +5465,183 @@ msgstr ""
"WinMerge 폴더 비교"
#. IDS_SPLASH_GPLTEXT
-#: Merge.rc:4165
+#: Merge.rc:4175
#, c-format
msgid "WinMerge comes with ABSOLUTELY NO WARRANTY. It is free software and can be redistributed under the conditions of the GNU General Public License - see the Help menu for details."
msgstr "WinMerge는 절대로 보증 없이 제공됩니다. 이 소프트웨어는 무료이며, 특정 상황에서 재배포는 환영합니다; 자세한 내용은 도움말 메뉴의 GNU 일반 공중 라이선스를 확인하세요."
#. IDS_MESSAGEBOX_ABORT
-#: Merge.rc:4173
+#: Merge.rc:4183
#, c-format
msgid "&Abort"
msgstr "취소(&A)"
#. IDS_MESSAGEBOX_RETRY
-#: Merge.rc:4174
+#: Merge.rc:4184
#, c-format
msgid "&Retry"
msgstr "재시도(&R)"
#. IDS_MESSAGEBOX_IGNORE
-#: Merge.rc:4175
+#: Merge.rc:4185
#, c-format
msgid "&Ignore"
msgstr "무시(&I)"
#. IDS_MESSAGEBOX_IGNOREALL
-#: Merge.rc:4176
+#: Merge.rc:4186
#, c-format
msgid "Ignore &all"
msgstr "모두 무시(&A)"
#. IDS_MESSAGEBOX_YES
-#: Merge.rc:4177
+#: Merge.rc:4187
#, c-format
msgid "&Yes"
msgstr "예(&Y)"
#. IDS_MESSAGEBOX_YES_TO_ALL
-#: Merge.rc:4183
+#: Merge.rc:4193
#, c-format
msgid "Yes to &all"
msgstr "모두 예(&A)"
#. IDS_MESSAGEBOX_NO
-#: Merge.rc:4184
+#: Merge.rc:4194
#, c-format
msgid "&No"
msgstr "아니요(&N)"
#. IDS_MESSAGEBOX_NO_TO_ALL
-#: Merge.rc:4185
+#: Merge.rc:4195
#, c-format
msgid "No to a&ll"
msgstr "모두 아니요(&L)"
#. IDS_MESSAGEBOX_CONTINUE
-#: Merge.rc:4186
+#: Merge.rc:4196
#, c-format
msgid "&Continue"
msgstr "계속(&C)"
#. IDS_MESSAGEBOX_SKIP
-#: Merge.rc:4187
+#: Merge.rc:4197
#, c-format
msgid "&Skip"
msgstr "건너뛰기(&S)"
#. IDS_MESSAGEBOX_SKIPALL
-#: Merge.rc:4188
+#: Merge.rc:4198
#, c-format
msgid "Skip &all"
msgstr "모두 건너뛰기(&A)"
#. IDS_MESSAGEBOX_DONT_DISPLAY_AGAIN
-#: Merge.rc:4190
+#: Merge.rc:4200
#, c-format
msgid "Don't display this &message again."
msgstr "이 메시지를 다시 표시하지 않음(&M)"
-#: Merge.rc:4193
+#: Merge.rc:4203
msgid "To make this message box visible, press Reset on the Message Boxes page in Options."
msgstr "이 메시지 상자를 다시 표시하려면 옵션 대화 상자의 메시지 상자 페이지에서 재설정 버튼을 누르세요."
#. IDS_OPTIONSPG_EDITOR_COMPAREMERGE
-#: Merge.rc:4203
+#: Merge.rc:4213
msgid "Compare/Merge"
msgstr "비교/병합"
#. IDS_OPTIONSPG_SYNTAXCOLORS
-#: Merge.rc:4204 Merge.rc:4208
+#: Merge.rc:4214 Merge.rc:4218
#, c-format
msgid "Syntax"
msgstr "구문"
#. IDS_OPTIONSPG_COLOR_SCHEMES
-#: Merge.rc:4206
+#: Merge.rc:4216
msgid "Color Schemes"
msgstr "색상 테마"
#. IDS_OPTIONSPG_DIRCOLORS
-#: Merge.rc:4210
+#: Merge.rc:4220
msgid "Folder Compare"
msgstr "폴더 비교"
#. IDS_OPTIONSPG_PROJECT
-#: Merge.rc:4215
+#: Merge.rc:4225
msgid "Project"
msgstr "프로젝트"
#. IDS_COLHDR_NSDIFFS
-#: Merge.rc:4218 Merge.rc:4640
+#: Merge.rc:4228 Merge.rc:4650
#, c-format
msgid "Differences"
msgstr "차이"
#. IDS_OPTIONSPG_MESSAGEBOXES
-#: Merge.rc:4220
+#: Merge.rc:4230
msgid "Message Boxes"
msgstr "대화 상자"
#. IDS_TO
-#: Merge.rc:4235
+#: Merge.rc:4245
#, c-format
msgid "To:"
msgstr "대상:"
#. IDS_FROM_LEFT
-#: Merge.rc:4236
+#: Merge.rc:4246
#, c-format
msgid "From left:"
msgstr "왼쪽에서:"
#. IDS_TO_LEFT
-#: Merge.rc:4237
+#: Merge.rc:4247
#, c-format
msgid "To left:"
msgstr "왼쪽으로:"
#. IDS_FROM_RIGHT
-#: Merge.rc:4238
+#: Merge.rc:4248
#, c-format
msgid "From right:"
msgstr "오른쪽에서:"
#. IDS_TO_RIGHT
-#: Merge.rc:4239
+#: Merge.rc:4249
#, c-format
msgid "To right:"
msgstr "오른쪽으로:"
#. IDS_FROM_MIDDLE
-#: Merge.rc:4240
+#: Merge.rc:4250
msgid "From middle:"
msgstr "가운데에서:"
#. IDS_TO_MIDDLE
-#: Merge.rc:4241
+#: Merge.rc:4251
msgid "To middle:"
msgstr "가운데로:"
#. IDS_VERSION_FMT
-#: Merge.rc:4247
+#: Merge.rc:4257
#, c-format
msgid "Version %1"
msgstr "버전 %1"
#. IDS_OPTIONS_TITLE
-#: Merge.rc:4253
+#: Merge.rc:4263
#, c-format
msgid "Options (%1)"
msgstr "옵션 (%1)"
#. IDS_MESSAGE_BOX_ARE_RESET
-#: Merge.rc:4254
+#: Merge.rc:4264
#, c-format
msgid "All message boxes are now displayed again."
msgstr "이제 모든 메시지 박스를 다시 표시합니다."
-#: Merge.rc:4256
+#: Merge.rc:4266
#, c-format
msgid "Tab size value is out of range. Please use 1 - %1."
msgstr ""
@@ -5639,172 +5650,172 @@ msgstr ""
"1 - %1의 값을 사용하세요."
#. IDS_PROJECT_OPEN
-#: Merge.rc:4262 Merge.rc:4318
+#: Merge.rc:4272 Merge.rc:4328
#, c-format
msgid "Open"
msgstr "열기"
#. IDS_PROGRAMFILES
-#: Merge.rc:4263
+#: Merge.rc:4273
#, c-format
msgid "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||"
msgstr "프로그램|*.exe;*.bat;*.cmd|모든 파일 (*.*)|*.*||"
#. IDS_ALLFILES
-#: Merge.rc:4264
+#: Merge.rc:4274
#, c-format
msgid "All Files (*.*)|*.*||"
msgstr "모든 파일 (*.*)|*.*||"
#. IDS_PROJECTFILES
-#: Merge.rc:4265
+#: Merge.rc:4275
#, c-format
msgid "WinMerge Project Files (*.WinMerge)|*.WinMerge||"
msgstr "WinMerge 프로젝트 파일 (*.WinMerge)|*.WinMerge||"
#. IDS_INIFILES
-#: Merge.rc:4267
+#: Merge.rc:4277
#, c-format
msgid "Options files (*.ini)|*.ini|All Files (*.*)|*.*||"
msgstr "옵션 파일 (*.ini)|*.ini|모든 파일 (*.*)|*.*||"
#. IDS_REPLACELIST_FILES
-#: Merge.rc:4268
+#: Merge.rc:4278
msgid "Tab-Separated Values (*.tsv;*.txt)|*.tsv;*.txt|All Files (*.*)|*.*||"
msgstr "탭으로 구분된 값 (*.tsv;*.txt)|*.tsv;*.txt|모든 파일 (*.*)|*.*|"
#. IDS_TEXT_REPORT_FILES
-#: Merge.rc:4274
+#: Merge.rc:4284
#, c-format
msgid "Text Files (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|All Files (*.*)|*.*||"
msgstr "텍스트 파일 (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|모든 파일 (*.*)|*.*||"
#. IDS_HTML_REPORT_FILES
-#: Merge.rc:4275
+#: Merge.rc:4285
#, c-format
msgid "HTML Files (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||"
msgstr "HTML 파일 (*.htm,*.html)|*.htm;*.html|모든 파일 (*.*)|*.*||"
#. IDS_XML_REPORT_FILES
-#: Merge.rc:4276
+#: Merge.rc:4286
#, c-format
msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||"
msgstr "XML 파일 (*.xml)|*.xml|모든 파일 (*.*)|*.*||"
#. IDS_EXPANDSUBDIRS_DONOTEXPAND
-#: Merge.rc:4294
+#: Merge.rc:4304
msgid "Do not expand"
msgstr "확장 안 함"
#. IDS_EXPANDSUBDIRS_ALL
-#: Merge.rc:4295
+#: Merge.rc:4305
msgid "Expand all subfolders"
msgstr "모든 하위 폴더 확장"
#. IDS_EXPANDSUBDIRS_DIFFERENT
-#: Merge.rc:4296
+#: Merge.rc:4306
msgid "Expand different subfolders"
msgstr "다른 하위 폴더 확장"
#. IDS_EXPANDSUBDIRS_IDENTICAL
-#: Merge.rc:4297
+#: Merge.rc:4307
msgid "Expand identical subfolders"
msgstr "같은 하위 폴더 확장"
#. IDS_SYNTAXTABLE_FILETYPE
-#: Merge.rc:4303
+#: Merge.rc:4313
msgid "File Type"
msgstr "파일 유형"
#. IDS_COLHDR_EXTENSION
-#: Merge.rc:4304 Merge.rc:4597
+#: Merge.rc:4314 Merge.rc:4607
#, c-format
msgid "Extension"
msgstr "확장자"
#. IDS_PRPCAT_MESSAGE
-#: Merge.rc:4310 Merge.rc:4669
+#: Merge.rc:4320 Merge.rc:4679
msgid "Message"
msgstr "메시지"
#. IDS_MESSAGEBOX_ANSWER
-#: Merge.rc:4311
+#: Merge.rc:4321
msgid "Answer"
msgstr "응답"
#. IDS_PROJECT_ITEM
-#: Merge.rc:4317
+#: Merge.rc:4327
msgid "Item"
msgstr "항목"
#. IDS_PROJECT_LOAD
-#: Merge.rc:4319
+#: Merge.rc:4329
msgid "Load"
msgstr "불러오기"
#. IDS_PROJECT_SAVE
-#: Merge.rc:4320
+#: Merge.rc:4330
msgid "Save"
msgstr "저장"
#. IDS_PROJECT_ITEM_INCLUDE_SUBFOLDERS
-#: Merge.rc:4322
+#: Merge.rc:4332
msgid "Include Subfolders"
msgstr "하위 폴더 포함"
#. IDS_PROJECT_ITEM_COMPARE_OPTIONS
-#: Merge.rc:4324
+#: Merge.rc:4334
msgid "Compare Options"
msgstr "옵션 비교"
#. IDS_PROJECT_ITEM_HIDDEN_ITEMS
-#: Merge.rc:4325
+#: Merge.rc:4335
msgid "Hidden Items"
msgstr "숨겨진 항목"
#. IDS_PLUGINSLIST_NAME
-#: Merge.rc:4331 Merge.rc:4956
+#: Merge.rc:4341 Merge.rc:4966
#, c-format
msgid "Name"
msgstr "이름"
#. IDS_FILTERFILE_PATHTITLE
-#: Merge.rc:4332
+#: Merge.rc:4342
#, c-format
msgid "Location"
msgstr "위치"
#. IDS_FILTER_TITLE
-#: Merge.rc:4333
+#: Merge.rc:4343
#, c-format
msgid "Filters"
msgstr "필터"
#. IDS_FILTER_PREFIX
-#: Merge.rc:4334
+#: Merge.rc:4344
#, c-format
msgid "[F] "
msgstr "[F] "
#. IDS_PLUGINSLIST_DESC
-#: Merge.rc:4335 Merge.rc:4958
+#: Merge.rc:4345 Merge.rc:4968
#, c-format
msgid "Description"
msgstr "설명"
#. IDS_FILEFILTER_SAVENEW
-#: Merge.rc:4336
+#: Merge.rc:4346
#, c-format
msgid "Select Filename for New Filter"
msgstr "새 필터의 파일 이름 선택"
#. IDS_FILEFILTER_FILEMASK
-#: Merge.rc:4337
+#: Merge.rc:4347
#, c-format
msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||"
msgstr "파일 필터 (*.flt)|*.flt|모든 필터 (*.*)|*.*||"
-#: Merge.rc:4339
+#: Merge.rc:4349
#, c-format
msgid ""
"Cannot find filter template!\n"
@@ -5817,7 +5828,7 @@ msgstr ""
"%1 파일을 다음 WinMerge/Filters 폴더에 복사하세요:\n"
"%2."
-#: Merge.rc:4341
+#: Merge.rc:4351
#, c-format
msgid ""
"Cannot copy filter template:\n"
@@ -5830,7 +5841,7 @@ msgstr ""
"\n"
"폴더가 존재하고 쓰기 가능한지 확인하세요."
-#: Merge.rc:4343
+#: Merge.rc:4353
#, c-format
msgid ""
"User's filter folder is not defined!\n"
@@ -5841,7 +5852,7 @@ msgstr ""
"\n"
"옵션/시스템에서 필터 폴더를 선택하세요."
-#: Merge.rc:4345
+#: Merge.rc:4355
#, c-format
msgid ""
"Failed to delete filter:\n"
@@ -5855,12 +5866,12 @@ msgstr ""
"파일은 읽기 전용일 수 있습니다."
#. IDS_FILEFILTER_INSTALL
-#: Merge.rc:4346
+#: Merge.rc:4356
#, c-format
msgid "Locate Filter File to Install"
msgstr "설치할 필터 파일 위치"
-#: Merge.rc:4348
+#: Merge.rc:4358
#, c-format
msgid ""
"Installing filter file failed.\n"
@@ -5872,19 +5883,19 @@ msgstr ""
"새 필터 파일을 필터 폴더에 복사할 수 없습니다."
#. IDS_FILEFILTER_OVERWRITE
-#: Merge.rc:4349
+#: Merge.rc:4359
#, c-format
msgid "Filter file exists. Overwrite?"
msgstr "필터 파일이 이미 있습니다. 기존 필터를 덮어쓰시겠습니까?"
#. IDS_FILTERLINE_REGEXP
-#: Merge.rc:4355
+#: Merge.rc:4365
#, c-format
msgid "Regular expression"
msgstr "정규식"
#. IDS_FILTERCHANGED
-#: Merge.rc:4361
+#: Merge.rc:4371
msgid ""
"Filters updated. Refresh all open folder compares?\n"
"\n"
@@ -5895,239 +5906,239 @@ msgstr ""
"모든 비교를 새로 고치지 않으려면 지금 '아니요'를 선택하고 나중에 비교를 새로 고치면 됩니다."
#. IDS_DIRECTORY_WINDOW_TITLE
-#: Merge.rc:4367
+#: Merge.rc:4377
#, c-format
msgid "Folder Comparison Results"
msgstr "폴더 비교 결과"
#. IDS_FILE_COMPARISON_TITLE
-#: Merge.rc:4368
+#: Merge.rc:4378
#, c-format
msgid "File Comparison"
msgstr "파일 비교"
#. IDS_EMPTY_LEFT_FILE
-#: Merge.rc:4369
+#: Merge.rc:4379
#, c-format
msgid "Untitled Left"
msgstr "왼쪽 제목 없음"
#. IDS_EMPTY_MIDDLE_FILE
-#: Merge.rc:4370
+#: Merge.rc:4380
#, c-format
msgid "Untitled Middle"
msgstr "가운데 제목 없음"
#. IDS_EMPTY_RIGHT_FILE
-#: Merge.rc:4371
+#: Merge.rc:4381
#, c-format
msgid "Untitled Right"
msgstr "오른쪽 제목 없음"
#. IDS_CONFLICT_BASE_FILE
-#: Merge.rc:4372
+#: Merge.rc:4382
msgid "Base File"
msgstr "기본 파일"
#. IDS_CONFLICT_THEIRS_FILE
-#: Merge.rc:4373
+#: Merge.rc:4383
#, c-format
msgid "Theirs File"
msgstr "그 파일"
#. IDS_CONFLICT_MINE_FILE
-#: Merge.rc:4374
+#: Merge.rc:4384
#, c-format
msgid "Mine File"
msgstr "내 파일"
#. IDS_SELFCOMPARE_ORIGINAL_FILE
-#: Merge.rc:4375
+#: Merge.rc:4385
msgid "Original File"
msgstr "원본 파일"
#. IDS_LINE_STATUS_INFO_EOL
-#: Merge.rc:4381
+#: Merge.rc:4391
#, c-format
msgid "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s"
msgstr "줄: %s 열: %d/%d 문자: %d/%d 줄끝: %s"
#. IDS_EMPTY_LINE_STATUS_INFO
-#: Merge.rc:4382
+#: Merge.rc:4392
#, c-format
msgid "Line: %s"
msgstr "줄: %s"
#. IDS_LINE_STATUS_INFO
-#: Merge.rc:4383
+#: Merge.rc:4393
#, c-format
msgid "Ln: %s Col: %d/%d Ch: %d/%d"
msgstr "줄: %s 열: %d/%d 문자: %d/%d"
#. IDS_LINE_STATUS_INFO_SEL
-#: Merge.rc:4384
+#: Merge.rc:4394
#, c-format
msgid " Sel: %d | %d"
msgstr " 선택됨: %d | %d"
#. IDS_MERGEMODE_MERGING
-#: Merge.rc:4385
+#: Merge.rc:4395
#, c-format
msgid "Merge"
msgstr "병합"
#. IDS_DIFF_NUMBER_STATUS_FMT
-#: Merge.rc:4386
+#: Merge.rc:4396
#, c-format
msgid "Difference %1 of %2"
msgstr "차이 %1 / %2"
#. IDS_NO_DIFF_SEL_FMT
-#: Merge.rc:4387
+#: Merge.rc:4397
#, c-format
msgid "%1 Differences Found"
msgstr "%1개 차이 발견"
#. IDS_1_DIFF_FOUND
-#: Merge.rc:4388
+#: Merge.rc:4398
#, c-format
msgid "1 Difference Found"
msgstr "1개 차이 발견"
#. IDS_NO_ERR_SEL_FMT
-#: Merge.rc:4389
+#: Merge.rc:4399
#, c-format
msgid "%1 Errors Found"
msgstr "%1개의 오류 발견"
#. IDS_1_ERR_FOUND
-#: Merge.rc:4390
+#: Merge.rc:4400
msgid "1 Error Found"
msgstr "1개의 오류 발견"
#. IDS_STATUSBAR_READONLY, Abbreviation from "Read Only"
-#: Merge.rc:4391
+#: Merge.rc:4401
#, c-format
msgid "RO"
msgstr "RO"
#. IDS_DIRVIEW_STATUS_FMT_FOCUS
-#: Merge.rc:4397
+#: Merge.rc:4407
#, c-format
msgid "Item %1 of %2"
msgstr "항목 %1 / %2"
#. IDS_DIRVIEW_STATUS_FMT_NOFOCUS
-#: Merge.rc:4398
+#: Merge.rc:4408
#, c-format
msgid "Items: %1"
msgstr "항목: %1"
#. IDS_DIRVIEW_STATUS_COMPARING
-#: Merge.rc:4399
+#: Merge.rc:4409
#, c-format
msgid "Comparing items..."
msgstr "항목 비교 중..."
#. IDS_ITEMS_PER_SEC
-#: Merge.rc:4400
+#: Merge.rc:4410
#, c-format
msgid "%.1f[items/sec]"
msgstr "%.1f[항목/초]"
#. IDS_ERROR_INCOMPARABLE
-#: Merge.rc:4406
+#: Merge.rc:4416
msgid "Select two existing folders/files to compare."
msgstr "비교할 기존의 폴더나 파일 두 개를 선택하세요."
#. IDS_DIRSEL_TAG
-#: Merge.rc:4407
+#: Merge.rc:4417
#, c-format
msgid "Folder Selection"
msgstr "폴더 선택"
#. IDS_OPEN_FILESDIRS
-#: Merge.rc:4408
+#: Merge.rc:4418
#, c-format
msgid "Select two (or three) folders/files to compare."
msgstr "비교할 2-3개의 폴더 또는 파일을 선택하세요."
#. IDS_OPEN_LEFTINVALID
-#: Merge.rc:4409
+#: Merge.rc:4419
#, c-format
msgid "Left (1st) path is invalid!"
msgstr "왼쪽 (첫 번째) 경로가 잘못되었습니다!"
#. IDS_OPEN_MIDDLEINVALID
-#: Merge.rc:4410
+#: Merge.rc:4420
#, c-format
msgid "Middle (2nd) path is invalid!"
msgstr "가운데 (두 번째) 경로가 잘못되었습니다!"
#. IDS_OPEN_RIGHTINVALID2
-#: Merge.rc:4411
+#: Merge.rc:4421
#, c-format
msgid "Right (2nd) path is invalid!"
msgstr "오른쪽 (두 번째) 경로가 잘못되었습니다!"
#. IDS_OPEN_RIGHTINVALID3
-#: Merge.rc:4412
+#: Merge.rc:4422
#, c-format
msgid "Right (3rd) path is invalid!"
msgstr "오른쪽 (세 번째) 경로가 잘못되었습니다!"
#. IDS_OPEN_BOTHINVALID
-#: Merge.rc:4413
+#: Merge.rc:4423
#, c-format
msgid "Both paths are invalid!"
msgstr "양쪽 모두 잘못된 경로입니다!"
-#: Merge.rc:4415
+#: Merge.rc:4425
#, c-format
msgid "Left (1st) and Middle (2nd) paths are invalid!"
msgstr "왼쪽 (첫 번째)와 가운데 (두 번째) 경로가 잘못되었습니다!"
#. IDS_OPEN_LEFTRIGHTINVALID
-#: Merge.rc:4416
+#: Merge.rc:4426
#, c-format
msgid "Left (1st) and Right (3rd) paths are invalid!"
msgstr "왼쪽 (첫 번째)와 오른쪽 (세 번째) 경로가 잘못되었습니다!"
-#: Merge.rc:4418
+#: Merge.rc:4428
msgid "Middle (2nd) and Right (3rd) paths are invalid!"
msgstr "가운데 (두 번째)와 오른쪽 (세 번째) 경로가 잘못되었습니다!"
#. IDS_OPEN_ALLINVALID
-#: Merge.rc:4419
+#: Merge.rc:4429
#, c-format
msgid "All paths are invalid!"
msgstr "모든 경로가 잘못되었습니다!"
#. IDS_OPEN_UNPACKERDISABLED
-#: Merge.rc:4420
+#: Merge.rc:4430
msgid "Only enabled for file comparisons"
msgstr "파일 비교에만 사용"
#. IDS_OPEN_MISMATCH
-#: Merge.rc:4421
+#: Merge.rc:4431
#, c-format
msgid "Cannot compare file and folder!"
msgstr "파일 및 폴더를 비교할 수 없습니다!"
#. IDS_ERROR_FILE_NOT_FOUND
-#: Merge.rc:4427
+#: Merge.rc:4437
#, c-format
msgid "File not found: %1"
msgstr "파일을 찾을 수 없습니다: %1"
#. IDS_ERROR_FILE_NOT_UNPACKED
-#: Merge.rc:4428
+#: Merge.rc:4438
#, c-format
msgid "File not unpacked: %1"
msgstr "파일의 자료 변환을 하지 않았습니다: %1"
#. IDS_ERROR_FILEOPEN
-#: Merge.rc:4429
+#: Merge.rc:4439
#, c-format
msgid ""
"Cannot open file\n"
@@ -6141,13 +6152,13 @@ msgstr ""
"%2"
#. IDS_ERROR_CONF_RESOLVE
-#: Merge.rc:4430
+#: Merge.rc:4440
#, c-format
msgid "Failed to parse conflict file."
msgstr "불일치 파일 분석에 실패함."
#. IDS_NOT_CONFLICT_FILE
-#: Merge.rc:4431
+#: Merge.rc:4441
#, c-format
msgid ""
"The file\n"
@@ -6159,7 +6170,7 @@ msgstr ""
"파일은 충돌 파일이 아닙니다."
#. IDS_COMPARE_LARGE_FILES
-#: Merge.rc:4432
+#: Merge.rc:4442
msgid ""
"Comparing large files requires significant memory.\n"
"Show only comparison results (not file contents)?"
@@ -6168,30 +6179,30 @@ msgstr ""
"파일 내용이 아닌 비교 결과만 표시하시겠습니까?"
#. IDS_SAVE_AS_TITLE
-#: Merge.rc:4438
+#: Merge.rc:4448
#, c-format
msgid "Save As"
msgstr "다른 이름으로 저장"
#. IDS_SAVE_FMT
-#: Merge.rc:4439
+#: Merge.rc:4449
#, c-format
msgid "Save changes to %1?"
msgstr "변경 내용을 %1에 저장하시겠습니까?"
#. IDS_SAVEREADONLY_FMT
-#: Merge.rc:4440
+#: Merge.rc:4450
#, c-format
msgid "%1 is read-only. Override? Or 'No' to save as new filename?"
msgstr "%1은(는) 읽기 전용입니다. 재정의하시겠습니까? 아니면 새 파일 이름으로 저장하려면 '아니요'를 선택하시겠습니까?"
#. IDS_ERROR_BACKUP
-#: Merge.rc:4441
+#: Merge.rc:4451
#, c-format
msgid "Error backing up file"
msgstr "파일 백업 중 오류"
-#: Merge.rc:4443
+#: Merge.rc:4453
#, c-format
msgid ""
"Unable to backup original file:\n"
@@ -6205,7 +6216,7 @@ msgstr ""
"그래도 계속하시겠습니까?"
#. IDS_FILESAVE_FAILED
-#: Merge.rc:4444
+#: Merge.rc:4454
#, c-format
msgid ""
"Saving file failed.\n"
@@ -6221,7 +6232,7 @@ msgstr ""
"\t- 다른 파일 이름 사용 (확인 누르기)\n"
"\t- 현재 작업 중단 (취소 누르기)"
-#: Merge.rc:4446
+#: Merge.rc:4456
#, c-format
msgid ""
"Plugin '%2' cannot pack changes to left file into '%1'.\n"
@@ -6234,7 +6245,7 @@ msgstr ""
"\n"
"압축을 푼 버전을 다른 파일에 저장하시겠습니까?"
-#: Merge.rc:4448
+#: Merge.rc:4458
#, c-format
msgid ""
"Plugin '%2' cannot pack changes to middle file into '%1'.\n"
@@ -6247,7 +6258,7 @@ msgstr ""
"\n"
"압축을 푼 버전을 다른 파일에 저장하시겠습니까?"
-#: Merge.rc:4450
+#: Merge.rc:4460
#, c-format
msgid ""
"Plugin '%2' cannot pack changes to right file into '%1'.\n"
@@ -6261,7 +6272,7 @@ msgstr ""
"압축을 푼 버전을 다른 파일에 저장하시겠습니까?"
#. IDS_FILECHANGED_ONDISK
-#: Merge.rc:4451
+#: Merge.rc:4461
#, c-format
msgid ""
"Another application updated\n"
@@ -6277,7 +6288,7 @@ msgstr ""
"변경된 파일을 덮어쓰시겠습니까?"
#. IDS_SAVEREADONLY_MULTI
-#: Merge.rc:4452
+#: Merge.rc:4462
#, c-format
msgid ""
"%1\n"
@@ -6287,7 +6298,7 @@ msgstr ""
"읽기 전용으로 표시됩니다. 읽기 전용 항목을 재정의하시겠습니까?"
#. IDS_FILECHANGED_RESCAN
-#: Merge.rc:4453
+#: Merge.rc:4463
#, c-format
msgid ""
"Another application updated\n"
@@ -6303,25 +6314,25 @@ msgstr ""
"파일을 다시 불러오시겠습니까?"
#. IDS_SAVE_LEFT_AS
-#: Merge.rc:4454
+#: Merge.rc:4464
#, c-format
msgid "Save Left File As"
msgstr "왼쪽 파일 다른 이름으로 저장"
#. IDS_SAVE_MIDDLE_AS
-#: Merge.rc:4455
+#: Merge.rc:4465
#, c-format
msgid "Save Middle File As"
msgstr "가운데 파일 다른 이름으로 저장"
#. IDS_SAVE_RIGHT_AS
-#: Merge.rc:4456
+#: Merge.rc:4466
#, c-format
msgid "Save Right File As"
msgstr "오른쪽 파일 다른 이름으로 저장"
#. IDS_FILE_DISAPPEARED
-#: Merge.rc:4461
+#: Merge.rc:4471
#, c-format
msgid ""
"File\n"
@@ -6333,7 +6344,7 @@ msgstr ""
"이 사라졌습니다. 계속하려면 이 파일의 사본을 저장하세요."
#. IDS_VIEWS_OUTOFSYNC
-#: Merge.rc:4467
+#: Merge.rc:4477
#, c-format
msgid ""
"Cannot merge unsynched documents.\n"
@@ -6345,124 +6356,124 @@ msgstr ""
"계속하기 전에 문서를 새로 고침하세요."
#. IDS_BREAK_ON_WHITESPACE
-#: Merge.rc:4472
+#: Merge.rc:4482
msgid "Break at whitespace"
msgstr "공백에서 줄바꿈"
#. IDS_BREAK_ON_PUNCTUATION
-#: Merge.rc:4473
+#: Merge.rc:4483
msgid "Break at whitespace or punctuation"
msgstr "공백 또는 구두점에서 줄바꿈"
#. IDS_L2M
-#: Merge.rc:4479
+#: Merge.rc:4489
msgid "Copy to &Middle\tAlt+Right"
msgstr "가운데로 복사(&M)\tAlt+Right"
#. IDS_R2M
-#: Merge.rc:4480
+#: Merge.rc:4490
msgid "Copy to &Middle\tAlt+Left"
msgstr "가운데로 복사(&M)\tAlt+Left"
#. IDS_COPY_FROM_MIDDLE_R
-#: Merge.rc:4481
+#: Merge.rc:4491
msgid "Copy from Middle\tAlt+Shift+Right"
msgstr "가운데에서 복사\tAlt+Shift+Right"
#. IDS_COPY_FROM_MIDDLE_L
-#: Merge.rc:4482
+#: Merge.rc:4492
msgid "Copy from Middle\tAlt+Shift+Left"
msgstr "가운데에서 복사\tAlt+Shift+Left"
#. IDS_L2MNEXT
-#: Merge.rc:4483
+#: Merge.rc:4493
msgid "Copy to Middle and Advance\tCtrl+Alt+Right"
msgstr "가운데로 복사 후 진행\tCtrl+Alt+Right"
#. IDS_R2MNEXT
-#: Merge.rc:4484
+#: Merge.rc:4494
msgid "Copy to Middle and Advance\tCtrl+Alt+Left"
msgstr "가운데로 복사 후 진행\tCtrl+Alt+Left"
#. IDS_ALL_MIDDLE
-#: Merge.rc:4485
+#: Merge.rc:4495
msgid "Copy All to Middle"
msgstr "모두 가운데로 복사"
#. IDS_COPY_RIGHT_TO_LEFT
-#: Merge.rc:4491
+#: Merge.rc:4501
#, c-format
msgid "Right to Left (%1)"
msgstr "오른쪽에서 왼쪽으로 (%1)"
#. IDS_COPY_RIGHT_TO_MIDDLE
-#: Merge.rc:4492
+#: Merge.rc:4502
#, c-format
msgid "Right to Middle (%1)"
msgstr "오른쪽에서 가운데로 (%1)"
#. IDS_COPY_MIDDLE_TO_LEFT
-#: Merge.rc:4493
+#: Merge.rc:4503
#, c-format
msgid "Middle to Left (%1)"
msgstr "가운데에서 왼쪽으로 (%1)"
#. IDS_COPY_MIDDLE_TO_RIGHT
-#: Merge.rc:4494
+#: Merge.rc:4504
#, c-format
msgid "Middle to Right (%1)"
msgstr "가운데에서 오른쪽으로 (%1)"
#. IDS_COPY_LEFT_TO_RIGHT
-#: Merge.rc:4495
+#: Merge.rc:4505
#, c-format
msgid "Left to Right (%1)"
msgstr "왼쪽에서 오른쪽으로 (%1)"
#. IDS_COPY_LEFT_TO_MIDDLE
-#: Merge.rc:4496
+#: Merge.rc:4506
#, c-format
msgid "Left to Middle (%1)"
msgstr "왼쪽에서 가운데로 (%1)"
#. IDS_MOVE_LEFT_TO
-#: Merge.rc:4507 Merge.rc:4539
+#: Merge.rc:4517 Merge.rc:4549
#, c-format
msgid "Left to... (%1)"
msgstr "왼쪽에서... (%1)"
#. IDS_MOVE_MIDDLE_TO
-#: Merge.rc:4508 Merge.rc:4540
+#: Merge.rc:4518 Merge.rc:4550
#, c-format
msgid "Middle to... (%1)"
msgstr "가운데에서... (%1)"
#. IDS_MOVE_RIGHT_TO
-#: Merge.rc:4509 Merge.rc:4541
+#: Merge.rc:4519 Merge.rc:4551
#, c-format
msgid "Right to... (%1)"
msgstr "오른쪽에서... (%1)"
#. IDS_COPY_BOTH_TO
-#: Merge.rc:4510
+#: Merge.rc:4520
#, c-format
msgid "Both to... (%1)"
msgstr "양쪽... (%1)"
#. IDS_COPY_ALL_TO
-#: Merge.rc:4511
+#: Merge.rc:4521
#, c-format
msgid "All to... (%1)"
msgstr "모두... (%1)"
#. IDS_COPY_DIFFERENCES_TO
-#: Merge.rc:4512
+#: Merge.rc:4522
#, c-format
msgid "Differences to... (%1)"
msgstr "차이... (%1)"
#. IDS_COPY_ONLYDIFFITEMS
-#: Merge.rc:4519
+#: Merge.rc:4529
msgid ""
"Some selected items are identical or skipped.\n"
"Copy only items with differences?"
@@ -6471,67 +6482,67 @@ msgstr ""
"차이가 있는 항목만 복사하시겠습니까?"
#. IDS_DEL_LEFT_FMT
-#: Merge.rc:4525
+#: Merge.rc:4535
#, c-format
msgid "Left (%1)"
msgstr "왼쪽 (%1)"
#. IDS_DEL_MIDDLE_FMT
-#: Merge.rc:4526
+#: Merge.rc:4536
#, c-format
msgid "Middle (%1)"
msgstr "가운데 (%1)"
#. IDS_DEL_RIGHT_FMT
-#: Merge.rc:4527
+#: Merge.rc:4537
#, c-format
msgid "Right (%1)"
msgstr "오른쪽 (%1)"
#. IDS_DEL_BOTH_FMT
-#: Merge.rc:4528
+#: Merge.rc:4538
#, c-format
msgid "Both (%1)"
msgstr "양쪽 (%1)"
#. IDS_DEL_ALL_FMT
-#: Merge.rc:4529
+#: Merge.rc:4539
#, c-format
msgid "All (%1)"
msgstr "전체 (%1)"
#. IDS_SELECT_DEST_LEFT
-#: Merge.rc:4545
+#: Merge.rc:4555
#, c-format
msgid "Left Side - Select Destination Folder:"
msgstr "왼쪽 - 대상 폴더를 선택하세요:"
#. IDS_SELECT_DEST_MIDDLE
-#: Merge.rc:4546
+#: Merge.rc:4556
#, c-format
msgid "Middle Side - Select Destination Folder:"
msgstr "가운데 - 대상 폴더를 선택하세요:"
#. IDS_SELECT_DEST_RIGHT
-#: Merge.rc:4547
+#: Merge.rc:4557
#, c-format
msgid "Right Side - Select Destination Folder:"
msgstr "오른쪽 - 대상 폴더를 선택하세요:"
#. IDS_FILES_AFFECTED_FMT
-#: Merge.rc:4548
+#: Merge.rc:4558
#, c-format
msgid "(%1 Files Affected)"
msgstr "(%1 파일 변경됨)"
#. IDS_FILES_AFFECTED_FMT2
-#: Merge.rc:4549
+#: Merge.rc:4559
#, c-format
msgid "(%1 of %2 Files Affected)"
msgstr "(%1 / %2 파일 변경됨)"
#. IDS_CONFIRM_DELETE_SINGLE
-#: Merge.rc:4555
+#: Merge.rc:4565
#, c-format
msgid ""
"Are you sure you want to delete\n"
@@ -6543,18 +6554,18 @@ msgstr ""
"위 내용을 정말 삭제하시겠습니까?"
#. IDS_CONFIRM_SINGLE_COPY
-#: Merge.rc:4556
+#: Merge.rc:4566
msgid "Are you sure you want to copy?"
msgstr "복사하시겠습니까?"
#. IDS_CONFIRM_MULTIPLE_COPY
-#: Merge.rc:4557
+#: Merge.rc:4567
#, c-format
msgid "Are you sure you want to copy %d items?"
msgstr "%d개의 항목을 복사하시겠습니까?"
#. IDS_DIRCMP_NOTSYNC
-#: Merge.rc:4558
+#: Merge.rc:4568
#, c-format
msgid ""
"Operation aborted!\n"
@@ -6573,49 +6584,49 @@ msgstr ""
"비교를 새로 고침하세요."
#. IDS_CONFIRM_SINGLE_MOVE
-#: Merge.rc:4563
+#: Merge.rc:4573
msgid "Are you sure you want to move?"
msgstr "정말로 이동하시겠습니까?"
#. IDS_CONFIRM_MULTIPLE_MOVE
-#: Merge.rc:4564
+#: Merge.rc:4574
#, c-format
msgid "Are you sure you want to move %d items?"
msgstr "%d개 항목을 이동하시겠습니까?"
#. IDS_CONFIRM_MOVE_CAPTION
-#: Merge.rc:4566
+#: Merge.rc:4576
#, c-format
msgid "Confirm Move"
msgstr "이동 확인"
-#: Merge.rc:4568
+#: Merge.rc:4578
#, c-format
msgid "Close the folder comparison window?"
msgstr "폴더를 비교하는 창을 닫으려고 합니다. 창을 닫으시겠습니까?"
-#: Merge.rc:4570
+#: Merge.rc:4580
msgid "Close the folder comparison window, which took a long time?"
msgstr "시간이 많이 걸린 폴더 비교 창을 닫으려고 합니다. 창을 닫으시겠습니까?"
#. IDS_ERROR_INVALID_DIR_FILE_NAME
-#: Merge.rc:4571
+#: Merge.rc:4581
msgid "The file or folder name is invalid."
msgstr "파일 또는 폴더 이름이 잘못되었습니다."
#. IDS_ERROR_EXECUTE_FILE
-#: Merge.rc:4577
+#: Merge.rc:4587
#, c-format
msgid "Failed to execute external editor: %1"
msgstr "외부 편집기 실행 실패: %1"
#. IDS_UNKNOWN_ARCHIVE_FORMAT
-#: Merge.rc:4583
+#: Merge.rc:4593
#, c-format
msgid "Unknown archive format"
msgstr "알 수 없는 압축 형식"
-#: Merge.rc:4585
+#: Merge.rc:4595
msgid ""
"Failed to extract archive.\n"
"Compare as text file?"
@@ -6624,565 +6635,565 @@ msgstr ""
"압축 파일을 텍스트 파일로 비교하시겠습니까?"
#. IDS_COLHDR_FILENAME
-#: Merge.rc:4591
+#: Merge.rc:4601
#, c-format
msgid "Filename"
msgstr "파일 이름"
#. IDS_COLHDR_DIR
-#: Merge.rc:4592
+#: Merge.rc:4602
msgctxt "DirView|ColumnHeader"
msgid "Folder"
msgstr "폴더"
#. IDS_COLHDR_RESULT
-#: Merge.rc:4593
+#: Merge.rc:4603
#, c-format
msgid "Comparison Result"
msgstr "비교 결과"
#. IDS_COLHDR_LTIMEM
-#: Merge.rc:4594
+#: Merge.rc:4604
#, c-format
msgid "Left Date"
msgstr "왼쪽 날짜"
#. IDS_COLHDR_RTIMEM
-#: Merge.rc:4595
+#: Merge.rc:4605
#, c-format
msgid "Right Date"
msgstr "오른쪽 날짜"
#. IDS_COLHDR_MTIMEM
-#: Merge.rc:4596
+#: Merge.rc:4606
#, c-format
msgid "Middle Date"
msgstr "가운데 날짜"
#. IDS_COLHDR_LSIZE
-#: Merge.rc:4598
+#: Merge.rc:4608
#, c-format
msgid "Left Size"
msgstr "왼쪽 크기"
#. IDS_COLHDR_RSIZE
-#: Merge.rc:4599
+#: Merge.rc:4609
#, c-format
msgid "Right Size"
msgstr "오른쪽 크기"
#. IDS_COLHDR_MSIZE
-#: Merge.rc:4604
+#: Merge.rc:4614
#, c-format
msgid "Middle Size"
msgstr "가운데 크기"
#. IDS_COLHDR_RSIZE_SHORT
-#: Merge.rc:4605
+#: Merge.rc:4615
#, c-format
msgid "Right Size (Short)"
msgstr "오른쪽 크기 (짧게)"
#. IDS_COLHDR_LSIZE_SHORT
-#: Merge.rc:4606
+#: Merge.rc:4616
#, c-format
msgid "Left Size (Short)"
msgstr "왼쪽 크기 (짧게)"
#. IDS_COLHDR_MSIZE_SHORT
-#: Merge.rc:4607
+#: Merge.rc:4617
#, c-format
msgid "Middle Size (Short)"
msgstr "가운데 크기 (짧게)"
#. IDS_COLHDR_LTIMEC
-#: Merge.rc:4613
+#: Merge.rc:4623
#, c-format
msgid "Left Creation Time"
msgstr "왼쪽 생성 시간"
#. IDS_COLHDR_RTIMEC
-#: Merge.rc:4614
+#: Merge.rc:4624
#, c-format
msgid "Right Creation Time"
msgstr "오른쪽 생성 시간"
#. IDS_COLHDR_MTIMEC
-#: Merge.rc:4615
+#: Merge.rc:4625
#, c-format
msgid "Middle Creation Time"
msgstr "가운데 생성 시간"
#. IDS_COLHDR_NEWER
-#: Merge.rc:4616
+#: Merge.rc:4626
#, c-format
msgid "Newer File"
msgstr "최신 파일"
#. IDS_COLHDR_LVERSION
-#: Merge.rc:4617
+#: Merge.rc:4627
#, c-format
msgid "Left File Version"
msgstr "왼쪽 파일 버전"
#. IDS_COLHDR_RVERSION
-#: Merge.rc:4618
+#: Merge.rc:4628
#, c-format
msgid "Right File Version"
msgstr "오른쪽 파일 버전"
#. IDS_COLHDR_MVERSION
-#: Merge.rc:4619
+#: Merge.rc:4629
#, c-format
msgid "Middle File Version"
msgstr "가운데 파일 버전"
#. IDS_COLHDR_RESULT_ABBR
-#: Merge.rc:4620
+#: Merge.rc:4630
#, c-format
msgid "Short Result"
msgstr "짧은 결과"
#. IDS_COLHDR_LATTRIBUTES
-#: Merge.rc:4621
+#: Merge.rc:4631
#, c-format
msgid "Left Attributes"
msgstr "왼쪽 속성"
#. IDS_COLHDR_RATTRIBUTES
-#: Merge.rc:4622
+#: Merge.rc:4632
#, c-format
msgid "Right Attributes"
msgstr "오른쪽 속성"
#. IDS_COLHDR_MATTRIBUTES
-#: Merge.rc:4623
+#: Merge.rc:4633
#, c-format
msgid "Middle Attributes"
msgstr "가운데 속성"
#. IDS_COLHDR_LEOL_TYPE
-#: Merge.rc:4628
+#: Merge.rc:4638
#, c-format
msgid "Left EOL"
msgstr "왼쪽 줄끝"
#. IDS_COLHDR_MEOL_TYPE
-#: Merge.rc:4629
+#: Merge.rc:4639
#, c-format
msgid "Middle EOL"
msgstr "가운데 줄끝"
#. IDS_COLHDR_REOL_TYPE
-#: Merge.rc:4630
+#: Merge.rc:4640
#, c-format
msgid "Right EOL"
msgstr "오른쪽 줄끝"
#. IDS_COLHDR_LENCODING
-#: Merge.rc:4636
+#: Merge.rc:4646
#, c-format
msgid "Left Encoding"
msgstr "왼쪽 인코딩"
#. IDS_COLHDR_RENCODING
-#: Merge.rc:4637
+#: Merge.rc:4647
#, c-format
msgid "Right Encoding"
msgstr "오른쪽 인코딩"
#. IDS_COLHDR_MENCODING
-#: Merge.rc:4638
+#: Merge.rc:4648
#, c-format
msgid "Middle Encoding"
msgstr "가운데 인코딩"
#. IDS_COLHDR_NIDIFFS
-#: Merge.rc:4639
+#: Merge.rc:4649
msgid "Ignored Diff"
msgstr "무시된 차이"
#. IDS_COLHDR_BINARY
-#: Merge.rc:4641
+#: Merge.rc:4651
msgctxt "DirView|ColumnHeader"
msgid "Binary"
msgstr "바이너리"
#. IDS_PLUGINS_TYPE_UNPACKER
-#: Merge.rc:4642 Merge.rc:4959
+#: Merge.rc:4652 Merge.rc:4969
#, c-format
msgid "Unpacker"
msgstr "압축 풀기"
#. IDS_PLUGIN_TYPE4
-#: Merge.rc:4643 Merge.rc:4960 Merge.rc:5267
+#: Merge.rc:4653 Merge.rc:4970 Merge.rc:5277
#, c-format
msgid "Prediffer"
msgstr "사전 차이"
#. IDS_COLHDR_LEFT
-#: Merge.rc:4644
+#: Merge.rc:4654
msgid "Left"
msgstr "왼쪽"
#. IDS_COLHDR_MIDDLE
-#: Merge.rc:4645
+#: Merge.rc:4655
msgid "Middle"
msgstr "가운데"
#. IDS_COLHDR_RIGHT
-#: Merge.rc:4646
+#: Merge.rc:4656
msgid "Right"
msgstr "오른쪽"
#. IDS_COLHDR_DIFF
-#: Merge.rc:4647
+#: Merge.rc:4657
msgid "Diff"
msgstr "차이"
#. IDS_COLHDR_LEFT_DUPLICATE
-#: Merge.rc:4648
+#: Merge.rc:4658
msgid "Left Duplicate Count"
msgstr "왼쪽 중복 개수"
#. IDS_COLHDR_RIGHT_DUPLICATE
-#: Merge.rc:4649
+#: Merge.rc:4659
msgid "Right Duplicate Count"
msgstr "오른쪽 중복 개수"
#. IDS_COLHDR_MIDDLE_DUPLICATE
-#: Merge.rc:4650
+#: Merge.rc:4660
msgid "Middle Duplicate Count"
msgstr "가운데 중복 개수"
#. IDS_COLHDR_MOVE
-#: Merge.rc:4651
+#: Merge.rc:4661
msgid "Move"
msgstr "이동"
#. IDS_PRPCAT_AUDIO
-#: Merge.rc:4658
+#: Merge.rc:4668
msgid "Audio"
msgstr "오디오"
#. IDS_PRPCAT_CALENDAR
-#: Merge.rc:4659
+#: Merge.rc:4669
msgid "Calendar"
msgstr "캘린더"
#. IDS_PRPCAT_COMMUNICATION
-#: Merge.rc:4660
+#: Merge.rc:4670
msgid "Communication"
msgstr "대화"
#. IDS_PRPCAT_CONTACT
-#: Merge.rc:4661
+#: Merge.rc:4671
msgid "Contact"
msgstr "연락처"
#. IDS_PRPCAT_DEVICES
-#: Merge.rc:4662
+#: Merge.rc:4672
msgid "Devices"
msgstr "장치"
#. IDS_PRPCAT_DOCUMENT
-#: Merge.rc:4663
+#: Merge.rc:4673
msgid "Document"
msgstr "문서"
#. IDS_PRPCAT_HOME
-#: Merge.rc:4664
+#: Merge.rc:4674
msgid "Home"
msgstr "홈"
#. IDS_PRPCAT_JOURNAL
-#: Merge.rc:4666
+#: Merge.rc:4676
msgid "Journal"
msgstr "저널"
#. IDS_PRPCAT_LINK
-#: Merge.rc:4667
+#: Merge.rc:4677
msgid "Link"
msgstr "링크"
#. IDS_PRPCAT_MEDIA
-#: Merge.rc:4668
+#: Merge.rc:4678
msgid "Media"
msgstr "미디어"
#. IDS_PRPCAT_MUSIC
-#: Merge.rc:4670
+#: Merge.rc:4680
msgid "Music"
msgstr "음악"
#. IDS_PRPCAT_NOTE
-#: Merge.rc:4671
+#: Merge.rc:4681
msgid "Note"
msgstr "메모"
#. IDS_PRPCAT_PHOTO
-#: Merge.rc:4672
+#: Merge.rc:4682
msgid "Photo"
msgstr "사진"
#. IDS_PRPCAT_RECORDEDTV
-#: Merge.rc:4673
+#: Merge.rc:4683
msgid "RecordedTV"
msgstr "녹회된 TV"
#. IDS_PRPCAT_SEARCH
-#: Merge.rc:4674
+#: Merge.rc:4684
msgid "Search"
msgstr "검색"
#. IDS_PRPCAT_SECURITY
-#: Merge.rc:4675
+#: Merge.rc:4685
msgid "Security"
msgstr "보안"
#. IDS_PRPCAT_SOFTWARE
-#: Merge.rc:4676
+#: Merge.rc:4686
msgid "Software"
msgstr "소프트웨어"
#. IDS_PRPCAT_TASK
-#: Merge.rc:4677
+#: Merge.rc:4687
msgid "Task"
msgstr "작업"
#. IDS_PRPCAT_VIDEO
-#: Merge.rc:4678
+#: Merge.rc:4688
msgid "Video"
msgstr "비디오"
#. IDS_PRPCAT_HASH
-#: Merge.rc:4679
+#: Merge.rc:4689
msgid "Hash"
msgstr "해쉬"
#. IDS_CANT_COMPARE_FILES
-#: Merge.rc:4685
+#: Merge.rc:4695
#, c-format
msgid "Unable to compare files"
msgstr "파일을 비교할 수 없습니다"
#. IDS_ABORTED_ITEM
-#: Merge.rc:4686
+#: Merge.rc:4696
#, c-format
msgid "Item aborted"
msgstr "취소된 항목"
#. IDS_FILE_SKIPPED
-#: Merge.rc:4687
+#: Merge.rc:4697
#, c-format
msgid "File skipped"
msgstr "파일을 건너뛰었습니다"
#. IDS_DIR_SKIPPED
-#: Merge.rc:4688
+#: Merge.rc:4698
#, c-format
msgid "Folder skipped"
msgstr "건너뛴 폴더"
#. IDS_LEFT_ONLY_IN_FMT
-#: Merge.rc:4689
+#: Merge.rc:4699
#, c-format
msgid "Left only: %1"
msgstr "왼쪽만: %1"
#. IDS_MIDDLE_ONLY_IN_FMT
-#: Merge.rc:4690
+#: Merge.rc:4700
#, c-format
msgid "Middle only: %1"
msgstr "가운데만: %1"
#. IDS_RIGHT_ONLY_IN_FMT
-#: Merge.rc:4691
+#: Merge.rc:4701
#, c-format
msgid "Right only: %1"
msgstr "오른쪽만: %1"
#. IDS_DOES_NOT_EXIST_IN_FMT
-#: Merge.rc:4692
+#: Merge.rc:4702
#, c-format
msgid "Does not exist in %1"
msgstr "%1에 존재하지 않습니다"
#. IDS_BIN_FILES_SAME
-#: Merge.rc:4693
+#: Merge.rc:4703
#, c-format
msgid "Binary files are identical"
msgstr "바이너리 파일이 동일합니다"
#. IDS_BIN_FILES_DIFF
-#: Merge.rc:4699
+#: Merge.rc:4709
#, c-format
msgid "Binary files are different"
msgstr "바이너리 파일이 다릅니다"
#. IDS_FILES_ARE_DIFFERENT
-#: Merge.rc:4700
+#: Merge.rc:4710
#, c-format
msgid "Files are different"
msgstr "파일이 서로 다릅니다"
#. IDS_FOLDERS_ARE_DIFFERENT
-#: Merge.rc:4701
+#: Merge.rc:4711
#, c-format
msgid "Folders are different"
msgstr "폴더가 다릅니다"
#. IDS_LEFTONLY
-#: Merge.rc:4702
+#: Merge.rc:4712
#, c-format
msgid "Left Only"
msgstr "왼쪽만"
#. IDS_RIGHTONLY
-#: Merge.rc:4703
+#: Merge.rc:4713
#, c-format
msgid "Right Only"
msgstr "오른쪽만"
#. IDS_MIDDLEONLY
-#: Merge.rc:4704
+#: Merge.rc:4714
#, c-format
msgid "Middle Only"
msgstr "가운데만"
#. IDS_NOITEMLEFT
-#: Merge.rc:4705
+#: Merge.rc:4715
#, c-format
msgid "No item in left"
msgstr "왼쪽에 항목 없음"
#. IDS_NOITEMRIGHT
-#: Merge.rc:4706
+#: Merge.rc:4716
#, c-format
msgid "No item in right"
msgstr "오른쪽에 항목 없음"
#. IDS_NOITEMMIDDLE
-#: Merge.rc:4707
+#: Merge.rc:4717
#, c-format
msgid "No item in middle"
msgstr "가운데에 항목 없음"
#. IDS_CMPRES_ERROR
-#: Merge.rc:4709
+#: Merge.rc:4719
#, c-format
msgid "Error"
msgstr "오류"
#. IDS_TEXT_FILES_SAME
-#: Merge.rc:4710
+#: Merge.rc:4720
#, c-format
msgid "Text files are identical"
msgstr "텍스트 파일이 같습니다"
#. IDS_LEFTONLY_DIFF
-#: Merge.rc:4711
+#: Merge.rc:4721
msgid " (Middle and right are identical)"
msgstr " (가운데와 오른쪽은 동일합니다)"
#. IDS_MIDDLEONLY_DIFF
-#: Merge.rc:4712
+#: Merge.rc:4722
msgid " (Left and right are identical)"
msgstr " (왼쪽과 오른쪽은 동일합니다)"
#. IDS_RIGHTONLY_DIFF
-#: Merge.rc:4713
+#: Merge.rc:4723
msgid " (Left and middle are identical)"
msgstr " (왼쪽과 가운데는 동일합니다)"
#. IDS_PATH_MISMATCH
-#: Merge.rc:4714
+#: Merge.rc:4724
msgid " (paths differ)"
msgstr " (경로가 다름)"
#. IDS_TEXT_FILES_DIFF
-#: Merge.rc:4715
+#: Merge.rc:4725
#, c-format
msgid "Text files are different"
msgstr "텍스트 파일이 다릅니다"
#. IDS_IMAGE_FILES_SAME
-#: Merge.rc:4716
+#: Merge.rc:4726
msgid "Image files are identical"
msgstr "이미지 파일이 동일합니다"
#. IDS_IMAGE_FILES_DIFF
-#: Merge.rc:4717
+#: Merge.rc:4727
msgid "Image files are different"
msgstr "이미지 파일이 다릅니다"
#. IDS_EXPR_DIFF
-#: Merge.rc:4718
+#: Merge.rc:4728
#, c-format
msgid "Files are different (expr: %1)"
msgstr "추가 비교 조건: 파일이 다릅니다 (식: %1)"
#. IDS_HASH_GROUP
-#: Merge.rc:4719
+#: Merge.rc:4729
#, c-format
msgid "Group%d"
msgstr "그룹%d"
#. IDS_RENAME_MOVE_DETECTION_DISALBED
-#: Merge.rc:4720
+#: Merge.rc:4730
msgctxt "Options dialog|Compare|Folder|Detect renames and moves"
msgid "Disabled"
msgstr "사용 안 함"
#. IDS_RENAME_MOVE_DETECTION_RENAME
-#: Merge.rc:4721
+#: Merge.rc:4731
msgid "Detect renames"
msgstr "이름 바꾸기 감지"
#. IDS_RENAME_MOVE_DETECTION_RENAME_MOVE
-#: Merge.rc:4722
+#: Merge.rc:4732
msgid "Detect renames and moves"
msgstr "이름 바꾸기 및 이동 감지"
#. IDS_RENAME_MOVE_MERGE_MODE_RENAME
-#: Merge.rc:4723
+#: Merge.rc:4733
msgid "Merge renames"
msgstr "이름 바꾸기 병합"
#. IDS_RENAME_MOVE_MERGE_MODE_RENAME_MOVE
-#: Merge.rc:4724
+#: Merge.rc:4734
msgid "Merge renames and moves"
msgstr "이름 바꾸기 및 이동 병합"
#. IDS_RENAMED
-#: Merge.rc:4725
+#: Merge.rc:4735
msgid "Renamed"
msgstr "이름 바뀜"
#. IDS_MOVED
-#: Merge.rc:4726
+#: Merge.rc:4736
msgid "Moved"
msgstr "이동됨"
#. IDS_RENAMED_MOVED
-#: Merge.rc:4727
+#: Merge.rc:4737
msgid "Renamed/Moved"
msgstr "이름 바뀜/이동됨"
#. IDS_RENAMED_MOVED_ITEMS
-#: Merge.rc:4728
+#: Merge.rc:4738
#, c-format
msgid "(%1 items)"
msgstr "(%1개 항목)"
#. IDS_RENAMED_MOVED_RESULT
-#: Merge.rc:4729
+#: Merge.rc:4739
#, c-format
msgid "%1 (set %2): "
msgstr "%1 (세트 %2): "
#. IDS_SWITCH_FLAT_MODE
-#: Merge.rc:4730
+#: Merge.rc:4740
msgid ""
"Some moved items have been merged.\n"
"In Tree Mode, these items may appear in positions that do not reflect the actual folder structure, which can be confusing.\n"
@@ -7193,268 +7204,268 @@ msgstr ""
"플랫 모드로 전환하시겠습니까?"
#. IDS_ELAPSED_TIME
-#: Merge.rc:4736
+#: Merge.rc:4746
#, c-format
msgid "Elapsed time: %ld ms"
msgstr "경과 시간: %ld ms"
#. IDS_STATUS_SELITEM1
-#: Merge.rc:4737
+#: Merge.rc:4747
#, c-format
msgid "1 item selected"
msgstr "1개 항목 선택"
#. IDS_STATUS_SELITEMS
-#: Merge.rc:4738
+#: Merge.rc:4748
#, c-format
msgid "%1 items selected"
msgstr "%1개 항목 선택"
#. IDS_COLDESC_FILENAME
-#: Merge.rc:4744
+#: Merge.rc:4754
#, c-format
msgid "Filename or folder name."
msgstr "파일 이름 또는 폴더 이름."
#. IDS_COLDESC_DIR
-#: Merge.rc:4745
+#: Merge.rc:4755
#, c-format
msgid "Subfolder name when subfolders are included."
msgstr "하위 폴더를 포함할 때 하위 폴더 이름."
#. IDS_COLDESC_RESULT
-#: Merge.rc:4746
+#: Merge.rc:4756
#, c-format
msgid "Comparison result, long form."
msgstr "비교 결과 세부 내역."
#. IDS_COLDESC_LTIMEM
-#: Merge.rc:4751
+#: Merge.rc:4761
#, c-format
msgid "Left side modification date."
msgstr "왼쪽 변경 날짜."
#. IDS_COLDESC_RTIMEM
-#: Merge.rc:4752
+#: Merge.rc:4762
#, c-format
msgid "Right side modification date."
msgstr "오른쪽 변경 날짜."
#. IDS_COLDESC_MTIMEM
-#: Merge.rc:4753
+#: Merge.rc:4763
#, c-format
msgid "Middle side modification date."
msgstr "가운데 변경 날짜."
#. IDS_COLDESC_EXTENSION
-#: Merge.rc:4754
+#: Merge.rc:4764
#, c-format
msgid "File's extension."
msgstr "파일 확장자."
#. IDS_COLDESC_LSIZE
-#: Merge.rc:4755
+#: Merge.rc:4765
#, c-format
msgid "Left file size in bytes."
msgstr "왼쪽 파일 크기를 바이트로."
#. IDS_COLDESC_RSIZE
-#: Merge.rc:4756
+#: Merge.rc:4766
#, c-format
msgid "Right file size in bytes."
msgstr "오른쪽 파일 크기를 바이트로."
#. IDS_COLDESC_MSIZE
-#: Merge.rc:4757
+#: Merge.rc:4767
#, c-format
msgid "Middle file size in bytes."
msgstr "가운데 파일 크기를 바이트로."
#. IDS_COLDESC_LSIZE_SHORT
-#: Merge.rc:4758
+#: Merge.rc:4768
#, c-format
msgid "Left file size abbreviated."
msgstr "축약된 왼쪽 파일 크기."
#. IDS_COLDESC_RSIZE_SHORT
-#: Merge.rc:4759
+#: Merge.rc:4769
#, c-format
msgid "Right file size abbreviated."
msgstr "축약된 오른쪽 파일 크기."
#. IDS_COLDESC_MSIZE_SHORT
-#: Merge.rc:4760
+#: Merge.rc:4770
#, c-format
msgid "Middle file size abbreviated."
msgstr "축약된 가운데 파일 크기."
#. IDS_COLDESC_LTIMEC
-#: Merge.rc:4766
+#: Merge.rc:4776
#, c-format
msgid "Left side creation time."
msgstr "왼쪽 파일 만든 날짜."
#. IDS_COLDESC_RTIMEC
-#: Merge.rc:4767
+#: Merge.rc:4777
#, c-format
msgid "Right side creation time."
msgstr "오른쪽 파일 만든 날짜."
#. IDS_COLDESC_MTIMEC
-#: Merge.rc:4768
+#: Merge.rc:4778
#, c-format
msgid "Middle side creation time."
msgstr "가운데 파일 만든 날짜."
#. IDS_COLDESC_NEWER
-#: Merge.rc:4769
+#: Merge.rc:4779
#, c-format
msgid "Tells which side has newer modification date."
msgstr "어느 쪽이 더 최근에 수정되었는지 알려줍니다."
#. IDS_COLDESC_LVERSION
-#: Merge.rc:4770
+#: Merge.rc:4780
msgid "Left side file version, only for some file types."
msgstr "왼쪽 파일 버전, 몇몇 파일 형식만."
#. IDS_COLDESC_RVERSION
-#: Merge.rc:4771
+#: Merge.rc:4781
msgid "Right side file version, only for some file types."
msgstr "오른쪽 파일 버전, 몇몇 파일 형식만."
#. IDS_COLDESC_MVERSION
-#: Merge.rc:4776
+#: Merge.rc:4786
msgid "Middle side file version, only for some file types."
msgstr "가운데 파일 버전, 몇몇 파일 형식만."
#. IDS_COLDESC_RESULT_ABBR
-#: Merge.rc:4777
+#: Merge.rc:4787
#, c-format
msgid "Short comparison result."
msgstr "짧은 비교 결과."
#. IDS_COLDESC_LATTRIBUTES
-#: Merge.rc:4778
+#: Merge.rc:4788
#, c-format
msgid "Left side attributes."
msgstr "왼쪽 속성."
#. IDS_COLDESC_RATTRIBUTES
-#: Merge.rc:4779
+#: Merge.rc:4789
#, c-format
msgid "Right side attributes."
msgstr "오른쪽 속성."
#. IDS_COLDESC_MATTRIBUTES
-#: Merge.rc:4780
+#: Merge.rc:4790
#, c-format
msgid "Middle side attributes."
msgstr "가운데 속성."
#. IDS_COLDESC_LEOL_TYPE
-#: Merge.rc:4781
+#: Merge.rc:4791
msgid "Left side file EOL type."
msgstr "왼쪽 파일 줄끝 형식."
#. IDS_COLDESC_REOL_TYPE
-#: Merge.rc:4782
+#: Merge.rc:4792
msgid "Right side file EOL type."
msgstr "오른쪽 파일 줄끝 형식."
#. IDS_COLDESC_MEOL_TYPE
-#: Merge.rc:4783
+#: Merge.rc:4793
msgid "Middle side file EOL type."
msgstr "가운데 파일 줄끝 형식."
#. IDS_COLDESC_LENCODING
-#: Merge.rc:4789
+#: Merge.rc:4799
#, c-format
msgid "Left side encoding."
msgstr "왼쪽 인코딩."
#. IDS_COLDESC_RENCODING
-#: Merge.rc:4790
+#: Merge.rc:4800
#, c-format
msgid "Right side encoding."
msgstr "오른쪽 인코딩."
#. IDS_COLDESC_MENCODING
-#: Merge.rc:4791
+#: Merge.rc:4801
#, c-format
msgid "Middle side encoding."
msgstr "가운데 인코딩."
#. IDS_COLDESC_NIDIFFS
-#: Merge.rc:4792
+#: Merge.rc:4802
#, c-format
msgid "Number of ignored differences in file. Ignored and cannot be merged."
msgstr "파일에서 무시된 차이의 수입니다. 무시되어 병합할 수 없습니다."
#. IDS_COLDESC_NSDIFFS
-#: Merge.rc:4793
+#: Merge.rc:4803
#, c-format
msgid "Number of differences in file (excluding ignored)."
msgstr "파일에서 무시된 차이의 수입니다 (무시된 항목 제외)."
#. IDS_COLDESC_BINARY
-#: Merge.rc:4794
+#: Merge.rc:4804
#, c-format
msgid "Shows an asterisk (*) if the file is binary."
msgstr "파일이 이진 파일인 경우 별표(*)를 표시합니다."
#. IDS_COLDESC_UNPACKER
-#: Merge.rc:4795
+#: Merge.rc:4805
msgid "Unpacker plugin name or pipeline."
msgstr "압축 풀기 플러그인 이름 또는 파이프라인입니다."
#. IDS_COLDESC_PREDIFFER
-#: Merge.rc:4796
+#: Merge.rc:4806
msgid "Prediffer plugin name or pipeline."
msgstr "사전 차이 플러그인 이름 또는 파이프라인입니다."
#. IDS_DIRECTORY_REPORT_TITLE
-#: Merge.rc:4802
+#: Merge.rc:4812
#, c-format
msgid "Compare %1 with %2"
msgstr "%1을 %2와 비교"
#. IDS_DIRECTORY_REPORT_TITLE3
-#: Merge.rc:4803
+#: Merge.rc:4813
#, c-format
msgid "Compare %1 with %2 and %3"
msgstr "%1을 %2 및 %3과(와) 비교"
#. IDS_REPORT_COMMALIST
-#: Merge.rc:4804
+#: Merge.rc:4814
#, c-format
msgid "Comma-separated list"
msgstr "쉼표로 분리된 목록"
#. IDS_REPORT_TABLIST
-#: Merge.rc:4805
+#: Merge.rc:4815
#, c-format
msgid "Tab-separated list"
msgstr "탭으로 분리된 목록"
#. IDS_REPORT_SIMPLEHTML
-#: Merge.rc:4806
+#: Merge.rc:4816
#, c-format
msgid "Simple HTML"
msgstr "단순한 HTML"
#. IDS_REPORT_SIMPLEXML
-#: Merge.rc:4807
+#: Merge.rc:4817
#, c-format
msgid "Simple XML"
msgstr "단순한 XML"
-#: Merge.rc:4809
+#: Merge.rc:4819
#, c-format
msgid "Report file already exists. Overwrite?"
msgstr "보고서 파일이 이미 있습니다. 기존 파일을 덮어쓰시겠습니까?"
#. IDS_REPORT_ERROR
-#: Merge.rc:4814
+#: Merge.rc:4824
#, c-format
msgid ""
"Error creating the report:\n"
@@ -7464,30 +7475,30 @@ msgstr ""
"%1"
#. IDS_REPORT_SUCCESS
-#: Merge.rc:4815
+#: Merge.rc:4825
#, c-format
msgid "Report created successfully."
msgstr "보고서를 성공적으로 만들었습니다."
#. IDS_SYNCPOINT_LASTBLOCK
-#: Merge.rc:4821
+#: Merge.rc:4831
msgid "Cannot add a synchronization point at this line."
msgstr "이 줄에 동기화 지점을 추가할 수 없습니다."
#. IDS_FILE_TO_ITSELF
-#: Merge.rc:4827
+#: Merge.rc:4837
#, c-format
msgid "Same file is opened in both panes."
msgstr "같은 파일을 양쪽 창에 열었습니다."
#. IDS_FILESSAME
-#: Merge.rc:4828
+#: Merge.rc:4838
#, c-format
msgid "Selected files are identical."
msgstr "선택한 파일들은 동일합니다."
#. IDS_FILESSAME_CURCFG
-#: Merge.rc:4829
+#: Merge.rc:4839
msgid ""
"Selected files are identical (with current settings).\r\n"
"Checking binary identity..."
@@ -7496,7 +7507,7 @@ msgstr ""
"바이너리 동일성 확인 중..."
#. IDS_FILESSAME_BINERROR
-#: Merge.rc:4830
+#: Merge.rc:4840
msgid ""
"Selected files are identical (with current settings).\r\n"
"But binary comparison failed."
@@ -7505,12 +7516,12 @@ msgstr ""
"그러나 바이너리 비교가 실패했습니다."
#. IDS_FILESSAME_BINSAME
-#: Merge.rc:4831
+#: Merge.rc:4841
msgid "Selected files are identical (binary match)."
msgstr "선택된 파일들은 동일합니다 (이진 일치)."
#. IDS_FILESSAME_BINDIFF
-#: Merge.rc:4832
+#: Merge.rc:4842
msgid ""
"Selected files are identical (with current settings).\r\n"
"But differ at the binary level."
@@ -7519,19 +7530,19 @@ msgstr ""
"그러나 바이너리 수준에서는 차이가 있습니다."
#. IDS_FILEERROR
-#: Merge.rc:4833
+#: Merge.rc:4843
#, c-format
msgid "An error occurred while comparing files."
msgstr "파일 비교 중 오류가 발생했습니다."
#. IDS_TEMP_FILEERROR
-#: Merge.rc:4834
+#: Merge.rc:4844
#, c-format
msgid "Could not create temporary files. Check your temporary path settings."
msgstr "임시 파일을 만들 수 없습니다. 임시 경로 설정을 확인하세요."
#. IDS_SUGGEST_IGNOREEOL
-#: Merge.rc:4835
+#: Merge.rc:4845
msgid ""
"Files use different EOL.\n"
"\n"
@@ -7546,19 +7557,19 @@ msgstr ""
"참고: 모든 캐리지 리턴을 항상 동등하게 처리하려면, 편집 메뉴 -> 옵션 대화상자의 비교 탭에서 '케리지 리턴 차이 무시 (윈도우/유닉스/맥)' 옵션을 설정하면 됩니다."
#. IDS_INVALID_DIRECTORY
-#: Merge.rc:4836
+#: Merge.rc:4846
#, c-format
msgid "Selected folder is invalid."
msgstr "선택한 폴더는 무효합니다."
#. IDS_CANNOT_OPEN_BINARYFILE
-#: Merge.rc:4837
+#: Merge.rc:4847
#, c-format
msgid "Cannot open a binary file in Editor."
msgstr "바이너리 파일은 편집기로 열 수 없습니다."
#. IDS_CREATE_PAIR_FOLDER
-#: Merge.rc:4838
+#: Merge.rc:4848
#, c-format
msgid ""
"Create matching folder:\n"
@@ -7572,45 +7583,45 @@ msgstr ""
"을(를) 다른 쪽에 만들고 이 폴더를 여시겠습니까?"
#. IDS_CONFIRM_COPY_ALL_DIFFS
-#: Merge.rc:4839
+#: Merge.rc:4849
msgid "Copy all differences to other file?"
msgstr "모든 차이를 다른 파일에 복사하시겠습니까?"
#. IDS_MOVE_TO_NEXTFILE
-#: Merge.rc:4844
+#: Merge.rc:4854
#, c-format
msgid "Move to next file?"
msgstr "다음 파일로 이동하시겠습니까?"
#. IDS_MOVE_TO_PREVFILE
-#: Merge.rc:4845
+#: Merge.rc:4855
#, c-format
msgid "Move to previous file?"
msgstr "이전 파일로 이동하시겠습니까?"
#. IDS_MOVE_TO_NEXTPAGE
-#: Merge.rc:4846
+#: Merge.rc:4856
#, c-format
msgid "Move to next page?"
msgstr "다음 페이지로 이동하시겠습니까?"
#. IDS_MOVE_TO_PREVPAGE
-#: Merge.rc:4847
+#: Merge.rc:4857
#, c-format
msgid "Move to previous page?"
msgstr "이전 페이지로 이동하시겠습니까?"
#. IDS_MOVE_TO_FIRSTFILE
-#: Merge.rc:4848
+#: Merge.rc:4858
msgid "Move to first file?"
msgstr "첫 번째 파일로 이동하시겠습니까?"
#. IDS_MOVE_TO_LASTFILE
-#: Merge.rc:4849
+#: Merge.rc:4859
msgid "Move to last file?"
msgstr "마지막 파일로 이동하시겠습니까?"
-#: Merge.rc:4856
+#: Merge.rc:4866
#, c-format
msgid ""
"Different codepages: left (cp%d), right (cp%d).\n"
@@ -7621,57 +7632,57 @@ msgstr ""
"각 파일을 코드페이지에 표시하면 더 잘 표시되지만 병합/복사는 위험할 수 있습니다.\n"
"두 파일을 모두 기본 Windows 코드페이지에 있는 것으로 처리하시겠습니까 (권장)?"
-#: Merge.rc:4858
+#: Merge.rc:4868
#, c-format
msgid "Information lost due to encoding errors: both files"
msgstr "인코딩 오류로 인해 손실된 정보: 두 파일 모두"
-#: Merge.rc:4860
+#: Merge.rc:4870
#, c-format
msgid "Information lost due to encoding errors: first file"
msgstr "인코딩 오류로 인해 손실된 정보: 첫 번째 파일"
-#: Merge.rc:4862
+#: Merge.rc:4872
#, c-format
msgid "Information lost due to encoding errors: second file"
msgstr "인코딩 오류로 인해 손실된 정보: 두 번째 파일"
-#: Merge.rc:4864
+#: Merge.rc:4874
#, c-format
msgid "Information lost due to encoding errors: third file"
msgstr "인코딩 오류로 인해 손실된 정보: 세 번째 파일"
#. IDS_LINEDIFF_NODIFF
-#: Merge.rc:4870
+#: Merge.rc:4880
#, c-format
msgid "No difference"
msgstr "차이 없음"
#. IDS_LINEDIFF_NODIFF_CAPTION
-#: Merge.rc:4871
+#: Merge.rc:4881
#, c-format
msgid "Line difference"
msgstr "줄 차이"
#. IDS_NUM_REPLACED
-#: Merge.rc:4877
+#: Merge.rc:4887
#, c-format
msgid "Replaced %1 string(s)."
msgstr "%1개 문자열을 바꿨습니다."
#. IDS_EDIT_TEXT_NOT_FOUND
-#: Merge.rc:4878
+#: Merge.rc:4888
#, c-format
msgid "Cannot find string \"%s\"."
msgstr "다음 문자열을 찾을 수 없습니다: \"%s\"."
#. IDS_MERGE_MODE
-#: Merge.rc:4884
+#: Merge.rc:4894
msgid "Entering Merge Mode. Press F9 to turn off."
msgstr "지금 병합 모드에 진입 중입니다. 병합 모드를 끄고 싶으면 F9 키를 누르세요."
#. IDS_AUTO_MERGE
-#: Merge.rc:4890
+#: Merge.rc:4900
#, c-format
msgid ""
"Automatic merges: %1\n"
@@ -7681,107 +7692,107 @@ msgstr ""
"미해결 충돌 개수: %2"
#. IDS_CODEPAGE_MERGED
-#: Merge.rc:4891
+#: Merge.rc:4901
msgid "Codepage change merged."
msgstr "코드페이지 변경사항을 병합했습니다."
#. IDS_CODEPAGE_CONFLICT
-#: Merge.rc:4892
+#: Merge.rc:4902
msgid "Codepage changes are conflicting."
msgstr "코드페이지 변경사항이 충돌하고 있습니다."
#. IDS_EOL_MERGED
-#: Merge.rc:4893
+#: Merge.rc:4903
msgid "EOL change merged."
msgstr "줄끝 변경사항을 병합했습니다."
#. IDS_EOL_CONFLICT
-#: Merge.rc:4894
+#: Merge.rc:4904
msgid "EOL changes are conflicting."
msgstr "줄끝 변경사항이 충돌하고 있습니다."
#. IDS_LOCBAR_CAPTION
-#: Merge.rc:4900
+#: Merge.rc:4910
#, c-format
msgid "Location Pane"
msgstr "위치 창"
#. IDS_DIFFBAR_CAPTION
-#: Merge.rc:4901
+#: Merge.rc:4911
#, c-format
msgid "Diff Pane"
msgstr "차이 창"
#. IDS_DIFF_SUCCEEDED
-#: Merge.rc:4908
+#: Merge.rc:4918
#, c-format
msgid "Patch file written."
msgstr "패치 파일을 성공적으로 기록했습니다."
#. IDS_DIFF_ITEM1NOTFOUND
-#: Merge.rc:4909
+#: Merge.rc:4919
msgid "First item not found!"
msgstr "1. 항목을 찾을 수 없습니다!"
#. IDS_DIFF_ITEM2NOTFOUND
-#: Merge.rc:4910
+#: Merge.rc:4920
msgid "Second item not found!"
msgstr "2. 항목을 찾을 수 없습니다!"
#. IDS_DIFF_FILEOVERWRITE
-#: Merge.rc:4911
+#: Merge.rc:4921
#, c-format
msgid "Patch file already exists. Overwrite?"
msgstr "패치 파일이 이미 존재합니다. 덮어쓰시겠습니까?"
#. IDS_DIFF_SELECTEDFILES
-#: Merge.rc:4912
+#: Merge.rc:4922
#, c-format
msgid "[%1 files selected]"
msgstr "[%1 개의 파일 선택됨]"
#. IDS_DIFF_NORMAL
-#: Merge.rc:4913
+#: Merge.rc:4923
#, c-format
msgid "Normal"
msgstr "보통"
#. IDS_DIFF_CONTEXT
-#: Merge.rc:4914
+#: Merge.rc:4924
#, c-format
msgid "Context"
msgstr "문맥"
#. IDS_DIFF_UNIFIED
-#: Merge.rc:4915
+#: Merge.rc:4925
#, c-format
msgid "Unified"
msgstr "통합"
#. IDS_FILEWRITE_ERROR
-#: Merge.rc:4917
+#: Merge.rc:4927
#, c-format
msgid "Could not write to file %1."
msgstr "%1 파일에 쓸 수 없습니다."
#. IDS_PATH_NOT_ABSOLUTE
-#: Merge.rc:4918
+#: Merge.rc:4928
#, c-format
msgid "Output path is not absolute: %1"
msgstr "지정한 출력 경로는 절대 경로가 아닙니다: %1"
#. IDS_MUST_SPECIFY_OUTPUT
-#: Merge.rc:4919
+#: Merge.rc:4929
msgid "Specify an output file."
msgstr "출력 파일 지정."
-#: Merge.rc:4921
+#: Merge.rc:4931
#, c-format
msgid "Cannot create patch from binary files."
msgstr "바이너리 파일에서는 패치 파일을 만들 수 없습니다."
#. IDS_SAVEFILES_FORPATCH
-#: Merge.rc:4922
+#: Merge.rc:4932
#, c-format
msgid ""
"Save all files first.\n"
@@ -7793,13 +7804,13 @@ msgstr ""
"패치를 만들려면 파일에 저장되지 않은 변경 사항이 없어야 합니다."
#. IDS_FOLDER_NOTEXIST
-#: Merge.rc:4923
+#: Merge.rc:4933
#, c-format
msgid "Folder does not exist."
msgstr "폴더가 존재하지 않습니다."
#. IDS_NO_ZIP_SUPPORT
-#: Merge.rc:4928
+#: Merge.rc:4938
msgid ""
"Archive support not enabled.\n"
"7-Zip and/or Merge7z*.dll not found.\n"
@@ -7810,43 +7821,43 @@ msgstr ""
"압축 지원에 대한 추가 정보와 사용법은 매뉴얼을 참조하세요."
#. IDS_OPT_EXPORT_CAPTION
-#: Merge.rc:4929
+#: Merge.rc:4939
#, c-format
msgid "Select file for export"
msgstr "내보낼 파일을 선택하세요"
#. IDS_OPT_IMPORT_CAPTION
-#: Merge.rc:4930
+#: Merge.rc:4940
#, c-format
msgid "Select file for import"
msgstr "가져올 파일을 선택하세요"
#. IDS_OPT_IMPORT_DONE
-#: Merge.rc:4931
+#: Merge.rc:4941
#, c-format
msgid "Options imported from file."
msgstr "파일에서 가져온 옵션입니다."
#. IDS_OPT_EXPORT_DONE
-#: Merge.rc:4932
+#: Merge.rc:4942
#, c-format
msgid "Options exported to file."
msgstr "파일로 내보낸 옵션입니다."
#. IDS_OPT_IMPORT_ERR
-#: Merge.rc:4933
+#: Merge.rc:4943
#, c-format
msgid "Failed to import options from file."
msgstr "파일에서 옵션을 가져오지 못했습니다."
#. IDS_OPT_EXPORT_ERR
-#: Merge.rc:4934
+#: Merge.rc:4944
#, c-format
msgid "Failed to write options to file."
msgstr "파일에 옵션을 쓰지 못했습니다."
#. IDS_CLOSEALL_WINDOWS
-#: Merge.rc:4935
+#: Merge.rc:4945
#, c-format
msgid ""
"Close multiple compare windows?\n"
@@ -7858,48 +7869,48 @@ msgstr ""
"계속하시겠습니까?"
#. IDS_EOL_MIXED
-#: Merge.rc:4944
+#: Merge.rc:4954
#, c-format
msgid "Mixed"
msgstr "혼합됨"
#. IDS_EOL_BIN
-#: Merge.rc:4945
+#: Merge.rc:4955
msgctxt "EOL Type"
msgid "Binary"
msgstr "바이너리"
#. IDS_EOL_NONE
-#: Merge.rc:4949
+#: Merge.rc:4959
#, c-format
msgid "None"
msgstr "없음"
#. IDS_MARKER_COLOR_FMT
-#: Merge.rc:4950
+#: Merge.rc:4960
#, c-format
msgid "Marker Color %d"
msgstr "마커 색상 %d"
#. IDS_MARKER_NEW_PATTERN
-#: Merge.rc:4951
+#: Merge.rc:4961
msgid "New Pattern"
msgstr "새 패턴"
#. IDS_PLUGINSLIST_TYPE
-#: Merge.rc:4957
+#: Merge.rc:4967
#, c-format
msgid "Type"
msgstr "유형"
#. IDS_PLUGINS_TYPE_EDITSCRIPT
-#: Merge.rc:4961
+#: Merge.rc:4971
#, c-format
msgid "Editor script"
msgstr "편집기 스크립트"
#. ID_SELECTLINEDIFF
-#: Merge.rc:4967
+#: Merge.rc:4977
#, c-format
msgid ""
"\n"
@@ -7909,7 +7920,7 @@ msgstr ""
"현재 줄의 차이 (F4)"
#. ID_OPTIONS
-#: Merge.rc:4968
+#: Merge.rc:4978
#, c-format
msgid ""
"\n"
@@ -7919,7 +7930,7 @@ msgstr ""
"옵션"
#. ID_REFRESH
-#: Merge.rc:4969
+#: Merge.rc:4979
#, c-format
msgid ""
"\n"
@@ -7929,7 +7940,7 @@ msgstr ""
"새로 고침 (F5)"
#. ID_PREVDIFF
-#: Merge.rc:4975
+#: Merge.rc:4985
#, c-format
msgid ""
"\n"
@@ -7939,7 +7950,7 @@ msgstr ""
"이전 차이 (Alt+Up)"
#. ID_NEXTDIFF
-#: Merge.rc:4976
+#: Merge.rc:4986
#, c-format
msgid ""
"\n"
@@ -7949,7 +7960,7 @@ msgstr ""
"다음 차이 (Alt+Down)"
#. ID_PREVCONFLICT
-#: Merge.rc:4977
+#: Merge.rc:4987
#, c-format
msgid ""
"\n"
@@ -7959,7 +7970,7 @@ msgstr ""
"이전 충돌 (Alt+Shift+Up)"
#. ID_NEXTCONFLICT
-#: Merge.rc:4978
+#: Merge.rc:4988
#, c-format
msgid ""
"\n"
@@ -7969,7 +7980,7 @@ msgstr ""
"다음 충돌 (Alt+Shift+Down)"
#. ID_FIRSTDIFF
-#: Merge.rc:4983
+#: Merge.rc:4993
#, c-format
msgid ""
"\n"
@@ -7979,7 +7990,7 @@ msgstr ""
"첫 차이 (Alt+Home)"
#. ID_CURDIFF
-#: Merge.rc:4984
+#: Merge.rc:4994
#, c-format
msgid ""
"\n"
@@ -7989,7 +8000,7 @@ msgstr ""
"현재 차이 (Alt+Enter)"
#. ID_LASTDIFF
-#: Merge.rc:4985
+#: Merge.rc:4995
#, c-format
msgid ""
"\n"
@@ -7999,7 +8010,7 @@ msgstr ""
"마지막 차이 (Alt+End)"
#. ID_L2R
-#: Merge.rc:4986
+#: Merge.rc:4996
msgid ""
"\n"
"Copy to Right (Alt+Right)"
@@ -8008,7 +8019,7 @@ msgstr ""
"오른쪽으로 복사 (Alt+Right)"
#. ID_R2L
-#: Merge.rc:4987
+#: Merge.rc:4997
msgid ""
"\n"
"Copy to Left (Alt+Left)"
@@ -8017,7 +8028,7 @@ msgstr ""
"왼쪽으로 복사 (Alt+Left)"
#. ID_L2RNEXT
-#: Merge.rc:4988
+#: Merge.rc:4998
msgid ""
"\n"
"Copy to Right and Advance (Ctrl+Alt+Right)"
@@ -8026,7 +8037,7 @@ msgstr ""
"오른쪽으로 복사 후 진행 (Ctrl+Alt+Right)"
#. ID_R2LNEXT
-#: Merge.rc:4989
+#: Merge.rc:4999
msgid ""
"\n"
"Copy to Left and Advance (Ctrl+Alt+Left)"
@@ -8035,7 +8046,7 @@ msgstr ""
"왼쪽으로 복사 후 진행 (Ctrl+Alt+Left)"
#. ID_ALL_RIGHT
-#: Merge.rc:4990
+#: Merge.rc:5000
msgid ""
"\n"
"Copy All to Right"
@@ -8044,7 +8055,7 @@ msgstr ""
"모두 오른쪽으로 복사"
#. ID_ALL_LEFT
-#: Merge.rc:4991
+#: Merge.rc:5001
msgid ""
"\n"
"Copy All to Left"
@@ -8053,7 +8064,7 @@ msgstr ""
"모두 왼쪽으로 복사"
#. ID_AUTO_MERGE
-#: Merge.rc:4992
+#: Merge.rc:5002
#, c-format
msgid ""
"\n"
@@ -8063,7 +8074,7 @@ msgstr ""
"자동 병합 (Ctrl+Alt+M)"
#. ID_FIRSTFILE
-#: Merge.rc:4993
+#: Merge.rc:5003
msgid ""
"\n"
"First File"
@@ -8072,7 +8083,7 @@ msgstr ""
"첫 파일"
#. ID_NEXTFILE
-#: Merge.rc:4994
+#: Merge.rc:5004
msgid ""
"\n"
"Next File (Ctrl+F8)"
@@ -8081,7 +8092,7 @@ msgstr ""
"다음 파일 (Ctrl+F8)"
#. ID_LASTFILE
-#: Merge.rc:4995
+#: Merge.rc:5005
msgid ""
"\n"
"Last File"
@@ -8090,7 +8101,7 @@ msgstr ""
" 마지막 파일"
#. ID_PREVFILE
-#: Merge.rc:4996
+#: Merge.rc:5006
msgid ""
"\n"
"Previous File (Ctrl+F7)"
@@ -8099,39 +8110,39 @@ msgstr ""
"이전 파일 (Ctrl+F7)"
#. IDS_UNPACK_AUTO
-#: Merge.rc:5003
+#: Merge.rc:5013
msgid "Adapted unpacker applied to both files (one needs extension)."
msgstr "적용된 압푹축 풀기는 두 파일 모두에 적용됩니다 한 파일만 확장자가 필요함)."
#. IDS_NO_PREDIFFER
-#: Merge.rc:5004
+#: Merge.rc:5014
#, c-format
msgid "No Prediffer (Normal)"
msgstr "사전 차이 없음 (보통)"
#. IDS_SUGGESTED_PLUGINS
-#: Merge.rc:5005
+#: Merge.rc:5015
#, c-format
msgid "Suggested Plugins"
msgstr "추천 플러그인"
#. IDS_NOT_SUGGESTED_PLUGINS
-#: Merge.rc:5006
+#: Merge.rc:5016
msgid "All Plugins"
msgstr "모든 플러그인"
#. IDS_PRIVATEBUILD_FMT
-#: Merge.rc:5012
+#: Merge.rc:5022
#, c-format
msgid "Private Build: %1"
msgstr "개인 빌드: %1"
#. IDS_CHECKFORUPDATES_UPTODATE
-#: Merge.rc:5013
+#: Merge.rc:5023
msgid "Your software is up to date."
msgstr "최신 버전을 사용 중입니다."
-#: Merge.rc:5015
+#: Merge.rc:5025
#, c-format
msgid ""
"WinMerge update available.\n"
@@ -8141,140 +8152,140 @@ msgstr ""
"%1을(를) 사용할 수 있습니다 (%2를 가지고 있습니다). 지금 다운로드하시겠습니까?"
#. IDS_ALLRIGHTS_RESERVED
-#: Merge.rc:5016
+#: Merge.rc:5026
msgid " - All rights reserved."
msgstr " - 모든 권리 보유."
#. IDS_CHECKFORUPDATES_FAILED
-#: Merge.rc:5021
+#: Merge.rc:5031
#, c-format
msgid "Failed to download latest version information"
msgstr "최신 버전 정보 다운로드 실패"
#. IDS_TITLE_PLUGINS_SETTINGS
-#: Merge.rc:5027
+#: Merge.rc:5037
#, c-format
msgid "Plugin Settings"
msgstr "플러그인 설정"
#. IDS_NO_SCT_SCRIPTS
-#: Merge.rc:5029
+#: Merge.rc:5039
#, c-format
msgid "WSH not found - .sct scripts disabled"
msgstr "WSH이 없습니다 - .sct 스크립트 비활성화됨"
#. IDS_LOCBAR_GOTOLINE_FMT
-#: Merge.rc:5037
+#: Merge.rc:5047
#, c-format
msgid "G&o to Line %1"
msgstr "%1줄로 이동(&O)"
#. IDS_GOTO_MOVED_LINE
-#: Merge.rc:5043
+#: Merge.rc:5053
msgid "Go to Moved Line\tCtrl+Shift+G"
msgstr "이동된 줄로 이동\tCtrl+Shift+G"
#. IDS_AUTOCOMPLETE_DISABLED
-#: Merge.rc:5049
+#: Merge.rc:5059
msgctxt "Options dialog|General|Open dialog Auto completion"
msgid "Disabled"
msgstr "사용 안 함"
#. IDS_AUTOCOMPLETE_FILE_SYS
-#: Merge.rc:5050
+#: Merge.rc:5060
#, c-format
msgid "From file system"
msgstr "파일 시스템에서"
#. IDS_AUTOCOMPLETE_MRU
-#: Merge.rc:5051
+#: Merge.rc:5061
#, c-format
msgid "From Most Recently Used list"
msgstr "최근 목록에서"
#. IDS_COLORSCHEME_PLAIN
-#: Merge.rc:5057
+#: Merge.rc:5067
#, c-format
msgid "No Highlighting"
msgstr "강조 표시 없음"
#. IDS_COLORSCHEME_BATCH
-#: Merge.rc:5063
+#: Merge.rc:5073
#, c-format
msgid "Batch"
msgstr "일괄Batch"
#. IDS_COLORSCHEME_PO
-#: Merge.rc:5090
+#: Merge.rc:5100
#, c-format
msgid "Portable Object"
msgstr "포터블 개체"
#. IDS_COLORSCHEME_RSRC
-#: Merge.rc:5094
+#: Merge.rc:5104
#, c-format
msgid "Resources"
msgstr "리소스"
#. IDS_COLORSCHEME_SH
-#: Merge.rc:5098
+#: Merge.rc:5108
#, c-format
msgid "Shell"
msgstr "쉘"
#. IDS_CLOSE_LEFT_TABS
-#: Merge.rc:5115
+#: Merge.rc:5125
#, c-format
msgid "Close &Left Tabs"
msgstr "왼쪽 탭 닫기(&L)"
#. IDS_CLOSE_RIGHT_TABS
-#: Merge.rc:5116
+#: Merge.rc:5126
#, c-format
msgid "Close R&ight Tabs"
msgstr "오른쪽 탭 닫기(&I)"
#. IDS_CLOSE_OTHER_TABS
-#: Merge.rc:5117
+#: Merge.rc:5127
#, c-format
msgid "Close &Other Tabs"
msgstr "다른 탭 닫기(&O)"
#. IDS_TABBAR_AUTO_MAXWIDTH
-#: Merge.rc:5118
+#: Merge.rc:5128
#, c-format
msgid "Enable &Auto Max Width"
msgstr "자동 최대 너비 사용(&A)"
#. IDS_WEBPAGE_MENU
-#: Merge.rc:5128
+#: Merge.rc:5138
msgid "We&bpage"
msgstr "웹페이지(&B)"
#. IDS_VIEW_WRAP_TEXT
-#: Merge.rc:5133
+#: Merge.rc:5143
msgid "W&rap Text"
msgstr "텍스트 줄 바꿈(&R)"
#. IDS_NOTINSTALLED
-#: Merge.rc:5138
+#: Merge.rc:5148
msgid "%1 is not installed."
msgstr "%1가 설치되지 않았습니다."
#. IDS_CREATE_FOLDER
-#: Merge.rc:5143
+#: Merge.rc:5153
#, c-format
msgid "%1 does not exist. Create it?"
msgstr "%1이(가) 존재하지 않습니다. 생성하시겠습니까?"
#. IDS_CREATE_FOLDER_ERROR
-#: Merge.rc:5144
+#: Merge.rc:5154
#, c-format
msgid "Failed to create folder."
msgstr "폴더 생성에 실패했습니다."
#. IDC_EXT_EDITOR_PATH
-#: Merge.rc:5149
+#: Merge.rc:5159
#, c-format
msgid ""
"Parameters:\n"
@@ -8286,487 +8297,487 @@ msgstr ""
"$linenum: 현재 커서 위치의 줄 번호"
#. IDS_DIFF_ALGORITHM_DEFAULT
-#: Merge.rc:5154
+#: Merge.rc:5164
msgid "default"
msgstr "기본"
#. IDS_DIFF_ALGORITHM_MINIMAL
-#: Merge.rc:5155
+#: Merge.rc:5165
msgid "minimal"
msgstr "최소화"
#. IDS_DIFF_ALGORITHM_PATIENCE
-#: Merge.rc:5156
+#: Merge.rc:5166
msgid "patience"
msgstr "페이션스"
#. IDS_DIFF_ALGORITHM_HISTOGRAM
-#: Merge.rc:5157
+#: Merge.rc:5167
msgid "histogram"
msgstr "히스토그램"
#. IDS_DIFF_ALGORITHM_NONE
-#: Merge.rc:5158
+#: Merge.rc:5168
msgid "none"
msgstr "없음"
#. IDS_RENDERING_MODE_GDI
-#: Merge.rc:5163
+#: Merge.rc:5173
msgid "GDI"
msgstr "GDI"
#. IDS_RENDERING_MODE_DIRECTWRITE_DEFAULT
-#: Merge.rc:5164
+#: Merge.rc:5174
msgid "DirectWrite Default"
msgstr "DirectWrite 기본"
#. IDS_RENDERING_MODE_DIRECTWRITE_ALIASED
-#: Merge.rc:5165
+#: Merge.rc:5175
msgid "DirectWrite Aliased"
msgstr "DirectWrite Aliased"
#. IDS_RENDERING_MODE_DIRECTWRITE_GDI_CLASSIC
-#: Merge.rc:5166
+#: Merge.rc:5176
msgid "DirectWrite GDI Classic"
msgstr "DirectWrite GDI Classic"
#. IDS_RENDERING_MODE_DIRECTWRITE_GDI_NATURAL
-#: Merge.rc:5167
+#: Merge.rc:5177
msgid "DirectWrite GDI Natural"
msgstr "DirectWrite GDI Natural"
#. IDS_RENDERING_MODE_DIRECTWRITE_NATURAL
-#: Merge.rc:5168
+#: Merge.rc:5178
msgid "DirectWrite Natural"
msgstr "DirectWrite Natural"
#. IDS_RENDERING_MODE_DIRECTWRITE_NATURAL_SYMMETRIC
-#: Merge.rc:5169
+#: Merge.rc:5179
msgid "DirectWrite Natural Symmetric"
msgstr "DirectWrite Natural Symmetric"
#. IDS_CLOSE_WINDOWS_WITH_ESC_DISABLED
-#: Merge.rc:5174
+#: Merge.rc:5184
msgctxt "Options dialog|General|Close windows with Esc"
msgid "Disabled"
msgstr "사용 안 함"
#. IDS_CLOSE_WINDOWS_WITH_ESC_1
-#: Merge.rc:5175
+#: Merge.rc:5185
msgid "MDI child window or main window"
msgstr "MDI 하위 창 또는 기본 창"
#. IDS_CLOSE_WINDOWS_WITH_ESC_2
-#: Merge.rc:5176
+#: Merge.rc:5186
msgid "MDI child window only"
msgstr "MDI 하위 창만"
#. IDS_CLOSE_WINDOWS_WITH_ESC_3
-#: Merge.rc:5177
+#: Merge.rc:5187
msgid "Close main window if only one MDI child window"
msgstr "MDI 하위 창이 하나만 있는 경우 기본 창 닫기"
#. IDS_DIFF_GROUP
-#: Merge.rc:5182
+#: Merge.rc:5192
msgctxt "ImgMergeFrame|LocationPane"
msgid "Diff"
msgstr "차이"
#. IDS_DIFF_HIGHLIGHT
-#: Merge.rc:5183
+#: Merge.rc:5193
msgctxt "ImgMergeFrame|LocationPane"
msgid "Highlight"
msgstr "강조 표시"
#. IDS_DIFF_BLINK
-#: Merge.rc:5184
+#: Merge.rc:5194
msgctxt "ImgMergeFrame|LocationPane"
msgid "Blink"
msgstr "깜박임"
#. IDS_DIFF_BLOCKSIZE
-#: Merge.rc:5185
+#: Merge.rc:5195
msgctxt "ImgMergeFrame|LocationPane"
msgid "Block Size"
msgstr "블록 크기"
#. IDS_DIFF_BLOCKALPHA
-#: Merge.rc:5186
+#: Merge.rc:5196
msgctxt "ImgMergeFrame|LocationPane"
msgid "Block Alpha"
msgstr "블록 알파"
#. IDS_DIFF_CDTHRESHOLD
-#: Merge.rc:5187
+#: Merge.rc:5197
msgctxt "ImgMergeFrame|LocationPane"
msgid "CD Threshold"
msgstr "CD 임계값"
#. IDS_DIFF_INSERTION_DELETION_DETECTION
-#: Merge.rc:5188
+#: Merge.rc:5198
msgctxt "ImgMergeFrame|LocationPane"
msgid "Ins/Del Detection"
msgstr "삽입/삭제 감지"
#. IDS_OVERLAY_MODE_NONE
-#: Merge.rc:5189 Merge.rc:5194
+#: Merge.rc:5199 Merge.rc:5204
msgctxt "ImgMergeFrame|LocationPane"
msgid "None"
msgstr "없음"
#. IDS_DIFF_INSERTION_DELETION_DETECTION_VERTICAL
-#: Merge.rc:5190
+#: Merge.rc:5200
msgctxt "ImgMergeFrame|LocationPane"
msgid "Vertical"
msgstr "수직"
#. IDS_DIFF_INSERTION_DELETION_DETECTION_HORIZONTAL
-#: Merge.rc:5191
+#: Merge.rc:5201
msgctxt "ImgMergeFrame|LocationPane"
msgid "Horizontal"
msgstr "수평"
#. IDS_OVERLAY_GROUP
-#: Merge.rc:5192
+#: Merge.rc:5202
msgctxt "ImgMergeFrame|LocationPane"
msgid "Overlay"
msgstr "오버레이"
#. IDS_OVERLAY_ALPHA
-#: Merge.rc:5193
+#: Merge.rc:5203
msgctxt "ImgMergeFrame|LocationPane"
msgid "Alpha"
msgstr "알파"
#. IDS_OVERLAY_MODE_XOR
-#: Merge.rc:5195
+#: Merge.rc:5205
msgctxt "ImgMergeFrame|LocationPane"
msgid "XOR"
msgstr "XOR"
#. IDS_OVERLAY_MODE_ALPHA
-#: Merge.rc:5196
+#: Merge.rc:5206
msgctxt "ImgMergeFrame|LocationPane"
msgid "Alpha Blend"
msgstr "알파 혼합"
#. IDS_OVERLAY_MODE_ALPHA_ANIMATION
-#: Merge.rc:5197
+#: Merge.rc:5207
msgctxt "ImgMergeFrame|LocationPane"
msgid "Alpha Animation"
msgstr "알파 애니메이션"
#. IDS_ZOOM
-#: Merge.rc:5198
+#: Merge.rc:5208
msgctxt "ImgMergeFrame|LocationPane"
msgid "Zoom"
msgstr "확대/축소"
#. IDS_PAGE
-#: Merge.rc:5199
+#: Merge.rc:5209
msgctxt "ImgMergeFrame|LocationPane"
msgid "Page:"
msgstr "페이지:"
#. IDS_IMGCMP_STATUS_PT_RGBA_FMT
-#: Merge.rc:5200
+#: Merge.rc:5210
#, c-format
msgid "Pt: (%d, %d) RGBA: (%d, %d, %d, %d) "
msgstr "Pt: (%d, %d) RGBA: (%d, %d, %d, %d) "
#. IDS_IMGCMP_STATUS_DIST1_FMT
-#: Merge.rc:5201
+#: Merge.rc:5211
#, c-format
msgid "Dist: %g "
msgstr "치수: %g "
#. IDS_IMGCMP_STATUS_DIST2_FMT
-#: Merge.rc:5202
+#: Merge.rc:5212
#, c-format
msgid "Dist: %g, %g "
msgstr "치수: %g, %g "
#. IDS_IMGCMP_STATUS_PAGE_ZOOM_SIZE_BPP_FMT
-#: Merge.rc:5203
+#: Merge.rc:5213
#, c-format
msgid "Page: %d/%d Zoom: %d%% %dx%dpx %dbpp "
msgstr "페이지: %d/%d 줌: %d%% %dx%dpx %dbpp "
#. IDS_IMGCMP_STATUS_RC_FMT
-#: Merge.rc:5204
+#: Merge.rc:5214
#, c-format
msgid "Rc: (%d, %d) "
msgstr "Rc: (%d, %d) "
#. IDS_IMGCMP_STATUS_FLIPPED_FMT
-#: Merge.rc:5205
+#: Merge.rc:5215
#, c-format
msgid "Flipped: %s "
msgstr "뒤집음: %s "
#. IDS_IMGCMP_STATUS_ROTATED_FMT
-#: Merge.rc:5206
+#: Merge.rc:5216
#, c-format
msgid "Rotated: %d "
msgstr "회전됨: %d "
#. IDS_IMGCMP_REPORT_ALLPAGES
-#: Merge.rc:5207
+#: Merge.rc:5217
msgid "All pages"
msgstr "모든 페이지"
#. IDS_IGNSUB_STR1
-#: Merge.rc:5212
+#: Merge.rc:5222
msgid ""
msgstr "<여기서 편집>"
#. IDS_IGNSUB_STR2
-#: Merge.rc:5213
+#: Merge.rc:5223
msgid "No differences found to select"
msgstr "선택할 차이을 찾을 수 없습니다"
#. IDS_IGNSUB_STR3
-#: Merge.rc:5214
+#: Merge.rc:5224
msgid "No differences found to add as substitution filter"
msgstr "대체 필터로 추가할 차이를 찾을 수 없습니다"
#. IDS_IGNSUB_STR4
-#: Merge.rc:5215
+#: Merge.rc:5225
msgid "The pair is already in the Substitution Filters list"
msgstr "쌍이 이미 대체 필터 목록에 있습니다"
#. IDS_IGNSUB_STR5
-#: Merge.rc:5216
+#: Merge.rc:5226
msgid "Add this change to Substitution Filters?"
msgstr "대체 필터에 이 변경 사항을 추가하시겠습니까?"
#. IDS_OCRRESULT_TEXTONLY
-#: Merge.rc:5221
+#: Merge.rc:5231
msgid "Text only"
msgstr "텍스트만"
#. IDS_OCRRESULT_POS_LINE
-#: Merge.rc:5222
+#: Merge.rc:5232
msgid "Line-by-line position and text"
msgstr "줄별 위치 및 텍스트"
#. IDS_OCRRESULT_POS_WORD
-#: Merge.rc:5223
+#: Merge.rc:5233
msgid "Word-by-word position and text"
msgstr "단어별 위치 및 텍스트"
#. IDS_USERDATAFOLDER_APPDATA
-#: Merge.rc:5228
+#: Merge.rc:5238
msgid "AppData (Roaming) folder"
msgstr "AppData (Roaming) 폴더"
#. IDS_USERDATAFOLDER_INSTALL
-#: Merge.rc:5229
+#: Merge.rc:5239
msgid "Install folder"
msgstr "설치 폴더"
#. IDS_USERDATAFOLDER_DOCUMENTS
-#: Merge.rc:5230
+#: Merge.rc:5240
msgid "Documents folder"
msgstr "문서 폴더"
#. IDS_SINGLEINSTANCE_DISABLED
-#: Merge.rc:5235
+#: Merge.rc:5245
msgctxt "Options dialog|General|Single instance mode"
msgid "Disabled"
msgstr "사용 안 함"
#. IDS_SINGLEINSTANCE_STR1
-#: Merge.rc:5236
+#: Merge.rc:5246
#, c-format
msgid "Allow only one instance to run"
msgstr "하나의 인스턴스만 실행 허용"
#. IDS_SINGLEINSTANCE_STR2
-#: Merge.rc:5237
+#: Merge.rc:5247
msgid "Allow only one instance; wait for termination"
msgstr "하나의 인스턴스만 실행하고 인스턴스가 종료될 때까지 대기"
#. IDS_AUTO_RELOAD_MODIFIED_FILES_DISABLED
-#: Merge.rc:5242
+#: Merge.rc:5252
msgctxt "Options dialog|General|Auto-reload modified files"
msgid "Disabled"
msgstr "사용 안 함"
#. IDS_AUTO_RELOAD_MODIFIED_FILES_STR1
-#: Merge.rc:5243
+#: Merge.rc:5253
msgid "Only on window activated"
msgstr "창에서만 활성화됨"
#. IDS_AUTO_RELOAD_MODIFIED_FILES_STR2
-#: Merge.rc:5244
+#: Merge.rc:5254
msgid "Immediately"
msgstr "즉시"
#. IDS_PLUGIN_ALL
-#: Merge.rc:5249
+#: Merge.rc:5259
msgid "Al&l"
msgstr "모두(&L)"
#. IDS_PLUGIN_OTHERS
-#: Merge.rc:5250
+#: Merge.rc:5260
msgid "&Others"
msgstr "기타(&O)"
-#: Merge.rc:5252
+#: Merge.rc:5262
#, c-format
msgid "Missing plugin name in pipeline: %1"
msgstr "플러그인 파이프라인에 누락된 플러그인 이름: %1"
-#: Merge.rc:5254
+#: Merge.rc:5264
#, c-format
msgid "Missing quote in plugin pipeline: %1"
msgstr "플러그인 파이프라인에 따옴표가 없습니다: %1"
#. IDS_PLUGIN_NAME_ALREADY_EXISTS
-#: Merge.rc:5255
+#: Merge.rc:5265
#, c-format
msgid "Plugin name '%1' already exists."
msgstr "플러그인 이름 '%1'이(가) 이미 있습니다."
#. IDS_PLUGIN_TITLE1
-#: Merge.rc:5256
+#: Merge.rc:5266
msgid "Specify plugin arguments"
msgstr "플러그인 인수 지정"
-#: Merge.rc:5258
+#: Merge.rc:5268
#, c-format
msgid "Plugin not found or invalid: %1"
msgstr "플러그인을 찾을 수 없거나 잘못되었습니다: %1"
#. IDS_PLUGIN_NOT_UNPACK
-#: Merge.rc:5259
+#: Merge.rc:5269
#, c-format
msgid "'%1' is not an unpacker plugin"
msgstr "'%1'은(는) 압축 풀기 플러그인이 아닙니다"
#. IDS_PLUGIN_NOT_PREDIFF
-#: Merge.rc:5260
+#: Merge.rc:5270
#, c-format
msgid "'%1' is not a prediffer plugin"
msgstr "'%1'은(는) 사전 차이 플러그인이 아닙니다"
-#: Merge.rc:5262
+#: Merge.rc:5272
#, c-format
msgid "Error prediffing '%1' with '%2'. Prediffing disabled."
msgstr "'%1' 파일을 '%2' 플러그인과 미리 비교하는 동안 오류가 발생했습니다. 미리 비교은 더 이상 적용되지 않습니다."
#. IDS_PLUGIN_CIRCULAR_REFERENCE
-#: Merge.rc:5263
+#: Merge.rc:5273
#, c-format
msgid "Circular reference in plugin pipeline: %1"
msgstr "플러그인 파이프라인의 순환 참조: %1"
#. IDS_PLUGIN_TYPE1
-#: Merge.rc:5264
+#: Merge.rc:5274
msgid "URL Handler"
msgstr "URL 처리기"
#. IDS_PLUGIN_TYPE2
-#: Merge.rc:5265
+#: Merge.rc:5275
msgid "File Unpacker"
msgstr "파일 압축 풀기"
#. IDS_PLUGIN_TYPE3
-#: Merge.rc:5266
+#: Merge.rc:5276
msgid "File or Folder Unpacker"
msgstr "파일 또는 폴더 압축 풀기"
#. IDS_PLUGIN_TYPE5
-#: Merge.rc:5268
+#: Merge.rc:5278
msgid "Alias for Unpacker"
msgstr "압축 풀기의 별칭"
#. IDS_PLUGIN_TYPE6
-#: Merge.rc:5269
+#: Merge.rc:5279
msgid "Alias for Prediffer"
msgstr "사전 차이의 별칭"
#. IDS_PLUGIN_TYPE7
-#: Merge.rc:5270
+#: Merge.rc:5280
msgid "Alias for Editor script"
msgstr "편집기 스크립트의 별칭"
#. IDS_PLUGIN_ALIAS_DESC
-#: Merge.rc:5271
+#: Merge.rc:5281
#, c-format
msgid "Alias for plugin pipeline '%1'"
msgstr "플러그인 파이프라인 '%1'의 별칭"
#. IDS_PLUGIN_NEW_DESC
-#: Merge.rc:5272
+#: Merge.rc:5282
msgid "New plugin description"
msgstr "새 플러그인 설명"
#. IDS_PLUGIN_TARGETS_ALL
-#: Merge.rc:5273
+#: Merge.rc:5283
msgid "All"
msgstr "모두"
#. IDS_PLUGIN_TARGETS_1ST
-#: Merge.rc:5274
+#: Merge.rc:5284
msgid "1st"
msgstr "첫 번째"
#. IDS_PLUGIN_TARGETS_2ND
-#: Merge.rc:5275
+#: Merge.rc:5285
msgid "2nd"
msgstr "두 번째"
#. IDS_PLUGIN_TARGETS_3RD
-#: Merge.rc:5276
+#: Merge.rc:5286
msgid "3rd"
msgstr "세 번째"
#. IDS_PLUGIN_TARGETS_1ST_2ND
-#: Merge.rc:5277
+#: Merge.rc:5287
msgid "1st and 2nd"
msgstr "첫 번째 및 두 번쩨"
#. IDS_PLUGIN_TARGETS_1ST_3RD
-#: Merge.rc:5278
+#: Merge.rc:5288
msgid "1st and 3rd"
msgstr "척 번째 및 세번째"
#. IDS_PLUGIN_TARGETS_2ND_3RD
-#: Merge.rc:5279
+#: Merge.rc:5289
msgid "2nd and 3rd"
msgstr "두 번째 및 세번째"
#. IDS_FILTER_APPLIED
-#: Merge.rc:5284
+#: Merge.rc:5294
msgid "Filter applied"
msgstr "필터 적용됨"
#. IDS_FILTERMENU_COMPARE
-#: Merge.rc:5289
+#: Merge.rc:5299
#, c-format
msgid "Compare %1"
msgstr "비교 %1"
#. IDS_FILTERMENU_FILTER_BY_THIS_COLUMN
-#: Merge.rc:5290
+#: Merge.rc:5300
msgid "&Filter by This Column"
msgstr "이 열로 필터링(&F)"
#. IDS_FILTERMENU_FILTER_BY_THIS_COLUMN2
-#: Merge.rc:5291
+#: Merge.rc:5301
msgid "&Filter by This Column..."
msgstr "이 열로 필터링(&F)..."
#. IDS_CLIPBOARDHISTORY_TIME
-#: Merge.rc:5296
+#: Merge.rc:5306
#, c-format
msgid "Clipboard at %s"
msgstr "%s의 클립보드"
#. IDS_CLIPBOARDHISTORY_DISABLED
-#: Merge.rc:5297
+#: Merge.rc:5307
msgid ""
"Clipboard history disabled.\r\n"
"Enable: Windows logo key + V, then Turn on."
@@ -8774,110 +8785,115 @@ msgstr ""
"클립보드 기록울 사용할 수 없습니다.\r\n"
"사용함: Windows 로고 키 + V를 누른 다음 켭니다."
-#: Merge.rc:5299
+#: Merge.rc:5309
msgid "This system does not support clipboard history."
msgstr "이 시스템은 클립보드 기록을 지원하지 않습니다."
-#: Merge.rc:5301
+#: Merge.rc:5311
msgid "32-bit WinMerge does not support Clipboard Compare"
msgstr "32비트 버전의 WinMerge는 클립보드 비교를 지원하지 않습니다"
#. IDS_WEBVIEW2_RUNTIME_NOT_INSTALLED
-#: Merge.rc:5306
+#: Merge.rc:5316
msgid "WebView2 runtime not installed. Download it?"
msgstr "WebView2 런타임이 설치되지 않았습니다. 다운로드하시겠습니까?"
#. IDS_JUMPLIST_NEW_TEXT_COMPARE
-#: Merge.rc:5311
+#: Merge.rc:5321
msgid "New Text Compare"
msgstr "새 텍스트 비교"
#. IDS_JUMPLIST_NEW_TABLE_COMPARE
-#: Merge.rc:5312
+#: Merge.rc:5322
msgid "New Table Compare"
msgstr "새 테이블 비교"
#. IDS_JUMPLIST_NEW_BINARY_COMPARE
-#: Merge.rc:5313
+#: Merge.rc:5323
msgid "New Binary Compare"
msgstr "새 바이너리 비교"
#. IDS_JUMPLIST_NEW_IMAGE_COMPARE
-#: Merge.rc:5314
+#: Merge.rc:5324
msgid "New Image Compare"
msgstr "새 이미지 비교"
#. IDS_JUMPLIST_NEW_WEBPAGE_COMPARE
-#: Merge.rc:5315
+#: Merge.rc:5325
msgid "New Webpage Compare"
msgstr "새 웹 페이지 비교"
+#. IDS_JUMPLIST_NEW_FOLDER_COMPARE
+#: Merge.rc:5326
+msgid "New Folder Compare"
+msgstr ""
+
#. IDS_JUMPLIST_CLIPBOARD_COMPARE
-#: Merge.rc:5316
+#: Merge.rc:5327
msgid "Clipboard Compare"
msgstr "클립보드 비교"
#. IDS_PREVIEWBAR_PRINT
-#: Merge.rc:5321
+#: Merge.rc:5332
msgid "&Print..."
msgstr "인쇄(&P)..."
#. IDS_PREVIEWBAR_PREVPAGE
-#: Merge.rc:5323
+#: Merge.rc:5334
msgid "Pre&v Page"
msgstr "이전 페이지(&V)"
#. IDS_PREVIEWBAR_TWOPAGE
-#: Merge.rc:5324
+#: Merge.rc:5335
msgid "&Two Page"
msgstr "2 페이지(&T)"
#. IDS_PREVIEWBAR_ONEPAGE
-#: Merge.rc:5325
+#: Merge.rc:5336
msgid "&One Page"
msgstr "1 페이지(&O)"
#. IDS_PREVIEWBAR_ZOOMIN
-#: Merge.rc:5326
+#: Merge.rc:5337
msgid "Zoom &In"
msgstr "확대(&I)"
#. IDS_PREVIEWBAR_ZOOMOUT
-#: Merge.rc:5327
+#: Merge.rc:5338
msgid "Zoom &Out"
msgstr "축소(&O)"
#. IDS_WEBPAGE_COMPARING
-#: Merge.rc:5333
+#: Merge.rc:5344
msgid "Comparing..."
msgstr "비교 중..."
#. IDS_WEBPAGE_ZOOM
-#: Merge.rc:5334
+#: Merge.rc:5345
msgid "Zoom:"
msgstr "확대/축소:"
#. IDS_COPY_GRANULARITY_DIFFHUNK
-#: Merge.rc:5339
+#: Merge.rc:5350
msgid "Diff hunk"
msgstr "차이 덩어리"
#. IDS_COPY_GRANULARITY_INLINE
-#: Merge.rc:5340
+#: Merge.rc:5351
msgid "Inline diff"
msgstr "인라인 차이"
#. IDS_COPY_GRANULARITY_LINE
-#: Merge.rc:5341
+#: Merge.rc:5352
msgid "Line"
msgstr "줄"
-#: Merge.rc:5342
+#: Merge.rc:5353
msgid "Character"
msgstr "문자"
#. ID_MICE_PREVDIFF
-#: Merge.rc:5347
+#: Merge.rc:5358
msgid ""
"\n"
"Previous Difference (Alt+Up)\n"
@@ -8890,7 +8906,7 @@ msgstr ""
"(Alt+휠 ⭡)"
#. ID_MICE_NEXTDIFF
-#: Merge.rc:5348
+#: Merge.rc:5359
msgid ""
"\n"
"Next Difference (Alt+Down)\n"
@@ -8903,7 +8919,7 @@ msgstr ""
"(Alt+휠 ⭣)"
#. ID_MICE_L2R
-#: Merge.rc:5349
+#: Merge.rc:5360
msgid ""
"\n"
"Copy to Right (Alt+Right)\n"
@@ -8918,7 +8934,7 @@ msgstr ""
"(Alt+Shift+휠 ⭣)"
#. ID_MICE_R2L
-#: Merge.rc:5350
+#: Merge.rc:5361
msgid ""
"\n"
"Copy to Left (Alt+Left)\n"
@@ -8933,7 +8949,7 @@ msgstr ""
"(Alt+Shift+휠 ⭡)"
#. ID_MICE_L2RNEXT
-#: Merge.rc:5351
+#: Merge.rc:5362
msgid ""
"\n"
"Copy to Right and Advance (Ctrl+Alt+Right)\n"
@@ -8946,7 +8962,7 @@ msgstr ""
"(Ctrl+Alt+Shift+휠 ⭣)"
#. ID_MICE_R2LNEXT
-#: Merge.rc:5352
+#: Merge.rc:5363
msgid ""
"\n"
"Copy to Left and Advance (Ctrl+Alt+Left)\n"
@@ -8959,257 +8975,257 @@ msgstr ""
"(Ctrl+Alt+Shift+휠 ⭡)"
#. IDS_LOG_COMPARING_2
-#: Merge.rc:5362
+#: Merge.rc:5373
#, c-format
msgid "Comparing %1 with %2"
msgstr "%1과 %2 비교"
#. IDS_LOG_COMPARING_3
-#: Merge.rc:5363
+#: Merge.rc:5374
#, c-format
msgid "Comparing %1 with %2 and %3"
msgstr "%1과 %2 및 %3 비교"
#. IDS_LOG_COMPARE_COMPLETED
-#: Merge.rc:5364
+#: Merge.rc:5375
msgid "Comparison completed"
msgstr "비교 완료"
#. IDS_LOG_COMPARE_ERROR_2
-#: Merge.rc:5365
+#: Merge.rc:5376
#, c-format
msgid "Failed to compare %1 with %2: "
msgstr "%1과 %2를 비교하지 못했습니다: "
#. IDS_LOG_COMPARE_ERROR_3
-#: Merge.rc:5366
+#: Merge.rc:5377
#, c-format
msgid "Failed to compare %1 with %2 and %3: "
msgstr "%1과 %2 및 %3을 비교하지 못했습니다: "
#. IDS_LOG_FILE_SAVED
-#: Merge.rc:5367
+#: Merge.rc:5378
msgid "File saved"
msgstr "파일이 저장되었습니다"
#. IDS_LOG_COPYING_FILES
-#: Merge.rc:5368
+#: Merge.rc:5379
msgid "Copying files..."
msgstr "파일 복사 중..."
#. IDS_LOG_MOVING_FILES
-#: Merge.rc:5369
+#: Merge.rc:5380
msgid "Moving files..."
msgstr "파일 이동 중..."
#. IDS_LOG_DELETING_FILES
-#: Merge.rc:5370
+#: Merge.rc:5381
msgid "Deleting files..."
msgstr "파일 삭제 중..."
#. IDS_LOG_RECYCLEBIN
-#: Merge.rc:5371
+#: Merge.rc:5382
msgid "Recycle Bin"
msgstr "휴지통"
#. IDS_LOG_PERMANENTLY_DELETED
-#: Merge.rc:5372
+#: Merge.rc:5383
msgid "Permanently deleted"
msgstr "영구 삭제"
#. IDS_LOG_FILEOPERATION_COMPLETED
-#: Merge.rc:5373
+#: Merge.rc:5384
msgid "File operation completed successfully"
msgstr "파일 작업이 성공적으로 완료되었습니다"
#. IDS_LOG_FILEOPERATION_CANCELED
-#: Merge.rc:5374
+#: Merge.rc:5385
msgid "File operation canceled"
msgstr "파일 작업이 취소되었습니다"
#. IDS_FILTER_ERROR_NO_ERROR
-#: Merge.rc:5379
+#: Merge.rc:5390
msgid "No error"
msgstr "오류 없음"
#. IDS_FILTER_ERROR_EMPTY_EXPRESSION
-#: Merge.rc:5380
+#: Merge.rc:5391
msgid "Filter expression is empty"
msgstr "필터 표현식이 비어 있습니다"
#. IDS_FILTER_ERROR_UNKNOWN_CHAR
-#: Merge.rc:5381
+#: Merge.rc:5392
msgid "Unknown character in filter expression"
msgstr "필터 표현식에서 알 수 없는 문자"
#. IDS_FILTER_ERROR_UNTERMINATED_STRING
-#: Merge.rc:5382
+#: Merge.rc:5393
msgid "Unterminated string literal"
msgstr "종료되지 않은 문자열 리터럴"
#. IDS_FILTER_ERROR_SYNTAX_ERROR
-#: Merge.rc:5383
+#: Merge.rc:5394
msgid "Syntax error in filter expression"
msgstr "필터 표현식의 구문 오류"
#. IDS_FILTER_ERROR_PARSE_FAILURE
-#: Merge.rc:5384
+#: Merge.rc:5395
msgid "Failed to parse filter expression"
msgstr "필터 표현식을 구문 분석하지 못했습니다"
#. IDS_FILTER_ERROR_INVALID_LITERAL
-#: Merge.rc:5385
+#: Merge.rc:5396
msgid "Invalid literal value"
msgstr "잘못된 문자 그대로의 값"
#. IDS_FILTER_ERROR_INVALID_REGULAR_EXPRESSION
-#: Merge.rc:5386
+#: Merge.rc:5397
msgid "Invalid regular expression"
msgstr "잘못된 정규 표현식"
#. IDS_FILTER_ERROR_UNDEFINED_IDENTIFIER
-#: Merge.rc:5387
+#: Merge.rc:5398
msgid "Undefined identifier"
msgstr "정의되지 않은 식별자"
#. IDS_FILTER_ERROR_INVALID_ARGUMENT_COUNT
-#: Merge.rc:5388
+#: Merge.rc:5399
msgid "Invalid number of arguments"
msgstr "인수 수가 잘못되었습니다"
#. IDS_FILTER_ERROR_FILTER_NAME_NOT_FOUND
-#: Merge.rc:5389
+#: Merge.rc:5400
msgid "Filter name not found"
msgstr "필터 이름을 찾을 수 없습니다"
#. IDS_FILTER_ERROR_DIVIDE_BY_ZERO
-#: Merge.rc:5390
+#: Merge.rc:5401
msgid "Division by zero in filter expression"
msgstr "필터 표현식에서 0으로 나눕니다"
#. IDS_FILTER_ERROR_UNKNOWN_ERROR
-#: Merge.rc:5391
+#: Merge.rc:5402
msgid "Unknown error"
msgstr "알 수 없는 오류"
#. IDS_FILTER_ERROR_INVALID_PROPERTY_NAME
-#: Merge.rc:5392
+#: Merge.rc:5403
msgid "Invalid property name"
msgstr "잘못된 속성 이름"
#. IDS_FILTER_ERROR_INVALID_DIRECTIVE
-#: Merge.rc:5393
+#: Merge.rc:5404
msgid "Invalid directive"
msgstr "잘못된 지침"
#. IDS_FILTER_OP_EQUALS
-#: Merge.rc:5398
+#: Merge.rc:5409
msgid "Equals"
msgstr "같음"
#. IDS_FILTER_OP_NOT_EQUALS
-#: Merge.rc:5399
+#: Merge.rc:5410
msgid "Does not equal"
msgstr "같지 않음"
#. IDS_FILTER_OP_LESS_THAN
-#: Merge.rc:5400
+#: Merge.rc:5411
msgid "Less than"
msgstr "보다 적은"
#. IDS_FILTER_OP_LESS_EQUAL
-#: Merge.rc:5401
+#: Merge.rc:5412
msgid "Less than or equal to"
msgstr "작거나 같음"
#. IDS_FILTER_OP_GREATER_EQUAL
-#: Merge.rc:5402
+#: Merge.rc:5413
msgid "Greater than or equal to"
msgstr "크거나 같음"
#. IDS_FILTER_OP_GREATER_THAN
-#: Merge.rc:5403
+#: Merge.rc:5414
msgid "Greater than"
msgstr "보다 적은"
#. IDS_FILTER_OP_BETWEEN
-#: Merge.rc:5404
+#: Merge.rc:5415
msgid "Between"
msgstr "사이에"
#. IDS_FILTER_OP_NOT_BETWEEN
-#: Merge.rc:5405
+#: Merge.rc:5416
msgid "Not Between"
msgstr "사이가 아님"
#. IDS_FILTER_OP_CONTAINS
-#: Merge.rc:5406
+#: Merge.rc:5417
msgid "Contains"
msgstr "포함"
#. IDS_FILTER_OP_NOT_CONTAINS
-#: Merge.rc:5407
+#: Merge.rc:5418
msgid "Not Contains"
msgstr "포함하지 않음"
#. IDS_FILTER_OP_RECONTAINS
-#: Merge.rc:5408
+#: Merge.rc:5419
msgid "Contains (regex)"
msgstr "포함 (정규식)"
#. IDS_FILTER_OP_NOT_RECONTAINS
-#: Merge.rc:5409
+#: Merge.rc:5420
msgid "Not Contains (regex)"
msgstr "포함하지 않음 (정규식)"
#. IDS_FILTER_OP_LIKE
-#: Merge.rc:5410
+#: Merge.rc:5421
msgid "Match (wildcard)"
msgstr "일치 (와일드카드)"
#. IDS_FILTER_OP_NOT_LIKE
-#: Merge.rc:5411
+#: Merge.rc:5422
msgid "Not match (wildcard)"
msgstr "일치하지 않음 (와일드카드)"
#. IDS_FILTER_OP_MATCHES
-#: Merge.rc:5412
+#: Merge.rc:5423
msgid "Match (regex)"
msgstr "일치 (정규 표현식)"
#. IDS_FILTER_OP_NOT_MATCHES
-#: Merge.rc:5413
+#: Merge.rc:5424
msgid "Not match (regex)"
msgstr "일치하지 않음 (정규 표현식)"
#. IDS_COLORMODE_LIGHT
-#: Merge.rc:5418
+#: Merge.rc:5429
msgid "Light"
msgstr "밝은"
#. IDS_COLORMODE_DARK
-#: Merge.rc:5419
+#: Merge.rc:5430
msgid "Dark"
msgstr "어두운"
#. IDS_COLORMODE_FOLLOWSYSTEM
-#: Merge.rc:5420
+#: Merge.rc:5431
msgid "Follow system"
msgstr "시스템을 따름"
#. IDS_EXAMPLE
-#: Merge.rc:5425
+#: Merge.rc:5436
#, c-format
msgid "e.g. %1"
msgstr "예: %1"
#. IDS_DETECTED_PREVIOUS_CRASH
-#: Merge.rc:5430
+#: Merge.rc:5441
msgid "WinMerge detected a previous crash. Please report this if possible."
msgstr "WinMerge가 이전 충돌을 감지했습니다. 가능하다면 이를 보고해 주세요."
#. IDS_REGEX_REPLACE_LIST_TEMPLATE
-#: Merge.rc:5435
+#: Merge.rc:5446
msgid ""
"# Regex replacement list\r\n"
"# Format: regexreplacement\r\n"
@@ -9224,7 +9240,7 @@ msgstr ""
"(\\d{4})-(\\d{2})-(\\d{2})\t$1_$2_$3\r\n"
#. IDS_STRING_REPLACE_LIST_TEMPLATE
-#: Merge.rc:5436
+#: Merge.rc:5447
msgid ""
"# Replacement list\r\n"
"# Format: searchreplacement\r\n"
diff --git a/Translations/WinMerge/Lithuanian.po b/Translations/WinMerge/Lithuanian.po
index b2cd76f4401..e311a24ceea 100644
--- a/Translations/WinMerge/Lithuanian.po
+++ b/Translations/WinMerge/Lithuanian.po
@@ -23,7 +23,7 @@ msgstr ""
"X-Generator: Poedit 3.9.0\n"
#. LANGUAGE, SUBLANGUAGE
-#: Merge.rc:26 Merge.rc:59 Merge.rc:5453
+#: Merge.rc:26 Merge.rc:59 Merge.rc:5464
msgid "LANG_ENGLISH, SUBLANG_ENGLISH_US"
msgstr "LANG_LITHUANIAN, SUBLANG_DEFAULT"
@@ -108,7 +108,7 @@ msgid "Copy Selected Diff (Right) to Clipboard\tCtrl+&3"
msgstr "Kopijuoti pažymėta skirtumą (Dešinėje) į mainų sritį\tCtrl+&3"
#. IDR_MERGEDOCTYPE, ID_SELECTLINEDIFF
-#: Merge.rc:110 Merge.rc:673
+#: Merge.rc:110 Merge.rc:680
msgid "Select Line &Difference\tF4"
msgstr "Pažymėti &skirtumą"
@@ -138,7 +138,7 @@ msgid "Cu&t"
msgstr "Iškirp&ti"
#. IDR_POPUP_DIRVIEW
-#: Merge.rc:118 Merge.rc:943
+#: Merge.rc:118 Merge.rc:951
msgid "&Copy"
msgstr "&Kopijuoti"
@@ -148,19 +148,19 @@ msgid "&Paste"
msgstr "Įter&pti"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:121 Merge.rc:875 Merge.rc:882
+#: Merge.rc:121 Merge.rc:882 Merge.rc:889
msgid "&Scripts"
msgstr "&Skriptai"
#. IDS_NO_EDIT_SCRIPTS
-#: Merge.rc:123 Merge.rc:338 Merge.rc:447 Merge.rc:654 Merge.rc:659
-#: Merge.rc:865 Merge.rc:877 Merge.rc:884 Merge.rc:940 Merge.rc:1183
-#: Merge.rc:5028
+#: Merge.rc:123 Merge.rc:340 Merge.rc:451 Merge.rc:661 Merge.rc:666
+#: Merge.rc:872 Merge.rc:884 Merge.rc:891 Merge.rc:948 Merge.rc:1193
+#: Merge.rc:5038
msgid "< Empty >"
msgstr "< Tuščia >"
#. IDR_POPUP_LOCATIONBAR, ID_EDIT_WMGOTO
-#: Merge.rc:126 Merge.rc:691 Merge.rc:1081
+#: Merge.rc:126 Merge.rc:698 Merge.rc:1089
msgid "&Go to...\tCtrl+G"
msgstr "Per&eiti į...\tCtrl+G"
@@ -180,27 +180,27 @@ msgid "Op&en"
msgstr "Atv&erti"
#. IDR_POPUP_DIRVIEW, ID_DIR_OPEN_RIGHT
-#: Merge.rc:132 Merge.rc:981 Merge.rc:988 Merge.rc:995
+#: Merge.rc:132 Merge.rc:989 Merge.rc:996 Merge.rc:1003
msgid "With &Registered Application"
msgstr "Su &Registruota programa"
#. IDR_POPUP_DIRVIEW, ID_DIR_OPEN_RIGHT_WITHEDITOR
-#: Merge.rc:133 Merge.rc:982 Merge.rc:989 Merge.rc:996
+#: Merge.rc:133 Merge.rc:990 Merge.rc:997 Merge.rc:1004
msgid "With &External Editor\tCtrl+Alt+E"
msgstr "Su Išoriniu r&edaktoriumi\tCtrl+Alt+E"
#. IDR_POPUP_DIRVIEW, ID_DIR_OPEN_RIGHT_WITH
-#: Merge.rc:134 Merge.rc:983 Merge.rc:990 Merge.rc:997
+#: Merge.rc:134 Merge.rc:991 Merge.rc:998 Merge.rc:1005
msgid "&With..."
msgstr "&Su..."
#. IDR_POPUP_DIRVIEW, ID_DIR_OPEN_RIGHT_PARENT_FOLDER
-#: Merge.rc:135 Merge.rc:984 Merge.rc:991 Merge.rc:998
+#: Merge.rc:135 Merge.rc:992 Merge.rc:999 Merge.rc:1006
msgid "Open &Parent Folder..."
msgstr "Atverti &tėvinį katalogą..."
#. IDR_POPUP_IMG_CTXT, ID_FILE_SHELLMENU
-#: Merge.rc:137 Merge.rc:1239
+#: Merge.rc:137 Merge.rc:1249
msgid "S&hell Menu"
msgstr "&Sistemos meniu"
@@ -235,8 +235,8 @@ msgid "Ins&ertion/Deletion Detection"
msgstr "Įt&erpimo/Ištrynimo aptikimas"
#. IDR_MERGEDOCTYPE, ID_TOOLBAR_NONE
-#: Merge.rc:176 Merge.rc:209 Merge.rc:216 Merge.rc:358 Merge.rc:507
-#: Merge.rc:751
+#: Merge.rc:176 Merge.rc:209 Merge.rc:216 Merge.rc:360 Merge.rc:511
+#: Merge.rc:758
msgid "&None"
msgstr "&Nerodoma"
@@ -251,12 +251,12 @@ msgid "&Horizontal"
msgstr "&Horizontaliai"
#. IDR_POPUP_IMG_CTXT, ID_IMG_CURPANE_PREVPAGE
-#: Merge.rc:181 Merge.rc:189 Merge.rc:1230
+#: Merge.rc:181 Merge.rc:189 Merge.rc:1240
msgid "&Previous Page"
msgstr "&Praeitas psl."
#. IDS_PREVIEWBAR_NEXTPAGE
-#: Merge.rc:182 Merge.rc:190 Merge.rc:1231 Merge.rc:5322
+#: Merge.rc:182 Merge.rc:190 Merge.rc:1241 Merge.rc:5333
msgid "&Next Page"
msgstr "&Kitas psl."
@@ -266,42 +266,42 @@ msgid "&Active Pane"
msgstr "&Aktyvus polangis"
#. IDR_POPUP_IMG_CTXT, ID_IMG_CURPANE_ROTATE_RIGHT_90
-#: Merge.rc:185 Merge.rc:1225
+#: Merge.rc:185 Merge.rc:1235
msgid "Rotate &Right 90deg"
msgstr "Pasukti 90 l. &dešinėn"
#. IDR_POPUP_IMG_CTXT, ID_IMG_CURPANE_ROTATE_LEFT_90
-#: Merge.rc:186 Merge.rc:1226
+#: Merge.rc:186 Merge.rc:1236
msgid "Rotate &Left 90deg"
msgstr "Pasukti 90 l. &kairėn"
#. IDR_POPUP_IMG_CTXT, ID_IMG_CURPANE_FLIP_VERTICALLY
-#: Merge.rc:187 Merge.rc:1227
+#: Merge.rc:187 Merge.rc:1237
msgid "Flip V&ertically"
msgstr "Apversti v&ertikaliai"
#. IDR_POPUP_IMG_CTXT, ID_IMG_CURPANE_FLIP_HORIZONTALLY
-#: Merge.rc:188 Merge.rc:1228
+#: Merge.rc:188 Merge.rc:1238
msgid "Flip H&orizontally"
msgstr "Apversti h&orizontaliai"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:193 Merge.rc:699
+#: Merge.rc:193 Merge.rc:706
msgid "&Zoom"
msgstr "&Keisti mastelį"
#. IDR_MERGEDOCTYPE, ID_VIEW_ZOOMIN
-#: Merge.rc:202 Merge.rc:701
+#: Merge.rc:202 Merge.rc:708
msgid "Zoom &In\tCtrl++"
msgstr "Did&inti\tCtrl++"
#. IDR_MERGEDOCTYPE, ID_VIEW_ZOOMOUT
-#: Merge.rc:203 Merge.rc:702
+#: Merge.rc:203 Merge.rc:709
msgid "Zoom &Out\tCtrl+-"
msgstr "Mažin&ti\tCtrl+-"
#. IDR_MERGEDOCTYPE, ID_VIEW_ZOOMNORMAL, Zoom to normal
-#: Merge.rc:205 Merge.rc:704
+#: Merge.rc:205 Merge.rc:711
msgid "&Normal\tCtrl+*"
msgstr "&Normalus\tCtrl+*"
@@ -326,27 +326,27 @@ msgid "Dragging &Mode"
msgstr "Vilki&mo režimas"
#. IDR_POPUP_IMG_CTXT, ID_IMG_DRAGGINGMODE_MOVE
-#: Merge.rc:217 Merge.rc:955 Merge.rc:1233
+#: Merge.rc:217 Merge.rc:963 Merge.rc:1243
msgid "&Move"
msgstr "&Perkelti"
#. IDR_POPUP_IMG_CTXT, ID_IMG_DRAGGINGMODE_ADJUST_OFFSET
-#: Merge.rc:218 Merge.rc:1234
+#: Merge.rc:218 Merge.rc:1244
msgid "&Adjust Offset"
msgstr "&Reguliuoti poslinkį"
#. IDR_POPUP_IMG_CTXT, ID_IMG_DRAGGINGMODE_VERTICAL_WIPE
-#: Merge.rc:219 Merge.rc:1235
+#: Merge.rc:219 Merge.rc:1245
msgid "&Vertical Wipe"
msgstr "&Vertikalus trinimas"
#. IDR_POPUP_IMG_CTXT, ID_IMG_DRAGGINGMODE_HORIZONTAL_WIPE
-#: Merge.rc:220 Merge.rc:1236
+#: Merge.rc:220 Merge.rc:1246
msgid "&Horizontal Wipe"
msgstr "&Horizontalus trinimas"
#. IDR_POPUP_IMG_CTXT, ID_IMG_DRAGGINGMODE_RECTANGLE_SELECT
-#: Merge.rc:221 Merge.rc:1237
+#: Merge.rc:221 Merge.rc:1247
msgid "Rectangle &Select"
msgstr "&Stačiakampis žymėjimas"
@@ -381,37 +381,37 @@ msgid "Compare Extracted &Text from Images"
msgstr "Lyginti iš paveikslėlių ištrauktą &tekstą"
#. IDD_OPEN, IDOK
-#: Merge.rc:272 Merge.rc:1980
+#: Merge.rc:272 Merge.rc:1990
msgid "Co&mpare"
msgstr "Ly&ginti"
#. IDR_POPUP_WEBPAGE_COMPARE, ID_WEB_COMPARE_SCREENSHOTS
-#: Merge.rc:274 Merge.rc:1247
+#: Merge.rc:274 Merge.rc:1257
msgid "&Screenshots"
msgstr "Ekrano kopija&s"
#. IDR_POPUP_WEBPAGE_COMPARE, ID_WEB_COMPARE_FULLSIZE_SCREENSHOTS
-#: Merge.rc:275 Merge.rc:1248
+#: Merge.rc:275 Merge.rc:1258
msgid "&Full Size Screenshots"
msgstr "&Viso dydžio ekrano kopijas"
#. IDR_POPUP_WEBPAGE_COMPARE, ID_WEB_COMPARE_HTMLS
-#: Merge.rc:276 Merge.rc:1249
+#: Merge.rc:276 Merge.rc:1259
msgid "&HTMLs"
msgstr "&HTML'us"
#. IDR_POPUP_WEBPAGE_COMPARE, ID_WEB_COMPARE_TEXTS
-#: Merge.rc:277 Merge.rc:1250
+#: Merge.rc:277 Merge.rc:1260
msgid "&Texts"
msgstr "&Tekstus"
#. IDR_POPUP_WEBPAGE_COMPARE, ID_WEB_COMPARE_RESOURCETREES
-#: Merge.rc:278 Merge.rc:1251
+#: Merge.rc:278 Merge.rc:1261
msgid "&Resource Trees"
msgstr "&Resursų medžius"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_SIZE
-#: Merge.rc:280 Merge.rc:1775
+#: Merge.rc:280 Merge.rc:1785
msgid "&Size"
msgstr "Dydi&s"
@@ -426,27 +426,27 @@ msgid "&Event Sync"
msgstr "Į&vykių sinchr."
#. IDR_POPUP_WEBPAGE_SYNC_EVENTS, ID_WEB_SYNC_ENABLED
-#: Merge.rc:291 Merge.rc:1259
+#: Merge.rc:291 Merge.rc:1269
msgid "&Enabled"
msgstr "Į&jungta"
#. IDR_POPUP_WEBPAGE_SYNC_EVENTS, ID_WEB_SYNC_SCROLL
-#: Merge.rc:293 Merge.rc:1261
+#: Merge.rc:293 Merge.rc:1271
msgid "&Scroll"
msgstr "&Slinkti"
#. IDR_POPUP_WEBPAGE_SYNC_EVENTS, ID_WEB_SYNC_CLICK
-#: Merge.rc:294 Merge.rc:1262
+#: Merge.rc:294 Merge.rc:1272
msgid "&Click"
msgstr "&Paspausti"
#. IDR_POPUP_WEBPAGE_SYNC_EVENTS, ID_WEB_SYNC_INPUT
-#: Merge.rc:295 Merge.rc:1263
+#: Merge.rc:295 Merge.rc:1273
msgid "&Input"
msgstr "Įvest&i"
#. IDR_POPUP_WEBPAGE_SYNC_EVENTS, ID_WEB_SYNC_GOBACKFORWARD
-#: Merge.rc:296 Merge.rc:1264
+#: Merge.rc:296 Merge.rc:1274
msgid "&Go Back/Forward"
msgstr "&Eiti atgal/Pirmyn"
@@ -476,7582 +476,7598 @@ msgid "&All Profiles"
msgstr "Visi profili&ai"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:310 Merge.rc:411 Merge.rc:586
+#: Merge.rc:310 Merge.rc:413 Merge.rc:590
msgid "&File"
msgstr "&Failas"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:312 Merge.rc:413 Merge.rc:588
+#: Merge.rc:312 Merge.rc:415 Merge.rc:592
msgid "&New"
msgstr "&Naujas"
#. IDR_POPUP_COMPARE, ID_MERGE_COMPARE_TEXT
-#: Merge.rc:314 Merge.rc:322 Merge.rc:415 Merge.rc:423 Merge.rc:590
-#: Merge.rc:598 Merge.rc:649 Merge.rc:935 Merge.rc:1159 Merge.rc:1171
+#: Merge.rc:314 Merge.rc:323 Merge.rc:417 Merge.rc:426 Merge.rc:594
+#: Merge.rc:603 Merge.rc:655 Merge.rc:942 Merge.rc:1167 Merge.rc:1180
msgid "&Text"
msgstr "&Tekstas"
#. IDR_POPUP_COMPARE, ID_MERGE_COMPARE_TABLE
-#: Merge.rc:315 Merge.rc:323 Merge.rc:416 Merge.rc:424 Merge.rc:591
-#: Merge.rc:599 Merge.rc:650 Merge.rc:936 Merge.rc:1160 Merge.rc:1172
+#: Merge.rc:315 Merge.rc:324 Merge.rc:418 Merge.rc:427 Merge.rc:595
+#: Merge.rc:604 Merge.rc:656 Merge.rc:943 Merge.rc:1168 Merge.rc:1181
msgid "T&able"
msgstr "&Lentelė"
#. IDR_POPUP_COMPARE, ID_MERGE_COMPARE_HEX
-#: Merge.rc:316 Merge.rc:324 Merge.rc:417 Merge.rc:425 Merge.rc:592
-#: Merge.rc:600 Merge.rc:651 Merge.rc:937 Merge.rc:1161 Merge.rc:1173
+#: Merge.rc:316 Merge.rc:325 Merge.rc:419 Merge.rc:428 Merge.rc:596
+#: Merge.rc:605 Merge.rc:657 Merge.rc:944 Merge.rc:1169 Merge.rc:1182
msgid "&Binary"
msgstr "&Binarinis"
#. IDS_IMAGE_MENU
-#: Merge.rc:317 Merge.rc:325 Merge.rc:418 Merge.rc:426 Merge.rc:593
-#: Merge.rc:601 Merge.rc:652 Merge.rc:938 Merge.rc:1162 Merge.rc:1174
-#: Merge.rc:5123
+#: Merge.rc:317 Merge.rc:326 Merge.rc:420 Merge.rc:429 Merge.rc:597
+#: Merge.rc:606 Merge.rc:658 Merge.rc:945 Merge.rc:1170 Merge.rc:1183
+#: Merge.rc:5133
msgid "&Image"
msgstr "Pave&ikslėlis"
#. IDR_POPUP_COMPARE, ID_MERGE_COMPARE_WEBPAGE
-#: Merge.rc:318 Merge.rc:326 Merge.rc:419 Merge.rc:427 Merge.rc:594
-#: Merge.rc:602 Merge.rc:653 Merge.rc:939 Merge.rc:1163 Merge.rc:1175
+#: Merge.rc:318 Merge.rc:327 Merge.rc:421 Merge.rc:430 Merge.rc:598
+#: Merge.rc:607 Merge.rc:659 Merge.rc:946 Merge.rc:1171 Merge.rc:1184
msgid "&Webpage"
msgstr "Ti&nklapis"
+#. IDR_POPUP_NEW, ID_FILE_NEW_FOLDER
+#: Merge.rc:319 Merge.rc:328 Merge.rc:422 Merge.rc:431 Merge.rc:599
+#: Merge.rc:608 Merge.rc:1172
+msgid "&Folder"
+msgstr ""
+
#. IDR_MERGEDOCTYPE
-#: Merge.rc:320 Merge.rc:421 Merge.rc:596
+#: Merge.rc:321 Merge.rc:424 Merge.rc:601
msgid "New (&3 panes)"
msgstr "Naujas (&3 polangiai)"
#. IDR_MERGEDOCTYPE, ID_FILE_OPEN
-#: Merge.rc:328 Merge.rc:429 Merge.rc:604
+#: Merge.rc:330 Merge.rc:433 Merge.rc:610
msgid "&Open...\tCtrl+O"
msgstr "&Atverti...\tCtrl+O"
#. IDR_MERGEDOCTYPE, ID_FILE_OPENCONFLICT
-#: Merge.rc:329 Merge.rc:430 Merge.rc:605
+#: Merge.rc:331 Merge.rc:434 Merge.rc:611
msgid "Open Conflic&t File..."
msgstr "Atver&ti konfliktų failą..."
#. IDR_MERGEDOCTYPE, ID_FILE_OPENCLIPBOARD
-#: Merge.rc:330 Merge.rc:431 Merge.rc:606
+#: Merge.rc:332 Merge.rc:435 Merge.rc:612
msgid "Open C&lipboard"
msgstr "Atverti &mainų sritį"
#. IDR_POPUP_PROJECT, ID_FILE_OPENPROJECT
-#: Merge.rc:332 Merge.rc:433 Merge.rc:608 Merge.rc:1191
+#: Merge.rc:334 Merge.rc:437 Merge.rc:614 Merge.rc:1201
msgid "Open Pro&ject...\tCtrl+J"
msgstr "Atverti pro&jektą...\tCtrl+J"
#. IDD_OPEN, ID_SAVE_PROJECT
-#: Merge.rc:333 Merge.rc:434 Merge.rc:609 Merge.rc:1193 Merge.rc:1979
+#: Merge.rc:335 Merge.rc:438 Merge.rc:615 Merge.rc:1203 Merge.rc:1989
msgid "Sa&ve Project..."
msgstr "Iš&saugoti projektą..."
#. IDR_MAINFRAME, ID_FILE_PROJECT_MRU_FIRST
-#: Merge.rc:335
+#: Merge.rc:337
msgid "Recent Projects"
msgstr "Paskutinieji projektai"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:336 Merge.rc:445 Merge.rc:657
+#: Merge.rc:338 Merge.rc:449 Merge.rc:664
msgid "Recent F&iles or Folders"
msgstr "Paskiausiai naudoti fa&ilai ar katalogai"
#. IDR_MERGEDOCTYPE, ID_APP_EXIT
-#: Merge.rc:341 Merge.rc:450 Merge.rc:662
+#: Merge.rc:343 Merge.rc:454 Merge.rc:669
msgid "E&xit\tCtrl+Q"
msgstr "&Išeiti\tCtrl+Q"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:343 Merge.rc:452 Merge.rc:664
+#: Merge.rc:345 Merge.rc:456 Merge.rc:671
msgid "&Edit"
msgstr "R&edaguoti"
#. IDR_MERGEDOCTYPE, ID_EDIT_PASTE
-#: Merge.rc:345 Merge.rc:671
+#: Merge.rc:347 Merge.rc:678
msgid "&Paste\tCtrl+V"
msgstr "Įter&pti\tCtrl+V"
#. IDR_MERGEDOCTYPE, ID_OPTIONS
-#: Merge.rc:347 Merge.rc:456 Merge.rc:693
+#: Merge.rc:349 Merge.rc:460 Merge.rc:700
msgid "&Options...\tCtrl+,"
msgstr "Nu&ostatos...\tCtrl+,"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:349 Merge.rc:458 Merge.rc:695
+#: Merge.rc:351 Merge.rc:462 Merge.rc:702
msgid "&View"
msgstr "&Vaizdas"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:351 Merge.rc:500 Merge.rc:744
+#: Merge.rc:353 Merge.rc:504 Merge.rc:751
msgid "Ta&b Bar"
msgstr "&Kortelių juosta"
#. IDR_MERGEDOCTYPE, ID_VIEW_TAB_BAR
-#: Merge.rc:353 Merge.rc:502 Merge.rc:746
+#: Merge.rc:355 Merge.rc:506 Merge.rc:753
msgid "&View Tab Bar"
msgstr "&Rodyti kortelių juostą"
#. IDR_MERGEDOCTYPE, ID_VIEW_TAB_BAR_ON_TITLE_BAR
-#: Merge.rc:354 Merge.rc:503 Merge.rc:747
+#: Merge.rc:356 Merge.rc:507 Merge.rc:754
msgid "&On Title Bar"
msgstr "Ant pavadinim&o juostos"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:356 Merge.rc:505 Merge.rc:749
+#: Merge.rc:358 Merge.rc:509 Merge.rc:756
msgid "&Toolbar"
msgstr "Mygtukų juos&ta"
#. IDR_MERGEDOCTYPE, ID_TOOLBAR_SMALL
-#: Merge.rc:359 Merge.rc:508 Merge.rc:752
+#: Merge.rc:361 Merge.rc:512 Merge.rc:759
msgid "&Small"
msgstr "Maž&i mygtukai"
#. IDR_MERGEDOCTYPE, ID_TOOLBAR_MEDIUM
-#: Merge.rc:360 Merge.rc:509 Merge.rc:753
+#: Merge.rc:362 Merge.rc:513 Merge.rc:760
msgid "&Medium"
msgstr "&Vidutiniai mygtukai"
#. IDR_MERGEDOCTYPE, ID_TOOLBAR_BIG
-#: Merge.rc:361 Merge.rc:510 Merge.rc:754
+#: Merge.rc:363 Merge.rc:514 Merge.rc:761
msgid "&Big"
msgstr "&Dideli mygtukai"
#. IDR_MERGEDOCTYPE, ID_TOOLBAR_HUGE
-#: Merge.rc:362 Merge.rc:511 Merge.rc:755
+#: Merge.rc:364 Merge.rc:515 Merge.rc:762
msgid "&Huge"
msgstr "&Milžiniški mygtukai"
#. IDS_VIEW_MENU_BAR
-#: Merge.rc:364 Merge.rc:513 Merge.rc:757 Merge.rc:5357
+#: Merge.rc:366 Merge.rc:517 Merge.rc:764 Merge.rc:5368
msgid "Men&u Bar"
msgstr "Meni&u juosta"
#. IDR_DIRDOCTYPE, ID_VIEW_OUTPUT_BAR
-#: Merge.rc:365 Merge.rc:515
+#: Merge.rc:367 Merge.rc:519
msgid "&Output Pane"
msgstr "Rezultatų p&olangis"
#. IDR_MERGEDOCTYPE, ID_VIEW_STATUS_BAR
-#: Merge.rc:366 Merge.rc:516 Merge.rc:758
+#: Merge.rc:368 Merge.rc:520 Merge.rc:765
msgid "&Status Bar"
msgstr "Bū&senos juosta"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:368 Merge.rc:539 Merge.rc:847
+#: Merge.rc:370 Merge.rc:543 Merge.rc:854
msgid "&Tools"
msgstr "Į&rankiai"
#. IDR_MERGEDOCTYPE, ID_TOOLS_FILTERS
-#: Merge.rc:370 Merge.rc:542 Merge.rc:849
+#: Merge.rc:372 Merge.rc:546 Merge.rc:856
msgid "&Filters..."
msgstr "&Filtrai..."
#. IDR_MERGEDOCTYPE, ID_TOOLS_GENERATEPATCH
-#: Merge.rc:371 Merge.rc:543 Merge.rc:850
+#: Merge.rc:373 Merge.rc:547 Merge.rc:857
msgid "&Generate Patch..."
msgstr "&Generuoti pataisą..."
#. IDR_MERGEDOCTYPE
-#: Merge.rc:373 Merge.rc:546 Merge.rc:853
+#: Merge.rc:375 Merge.rc:550 Merge.rc:860
msgid "&Plugins"
msgstr "&Papildiniai"
#. IDD_PLUGINS_LIST, IDC_PLUGIN_SETTINGS
-#: Merge.rc:375 Merge.rc:548 Merge.rc:855 Merge.rc:2494 Merge.rc:2926
+#: Merge.rc:377 Merge.rc:552 Merge.rc:862 Merge.rc:2504 Merge.rc:2936
msgid "P&lugin Settings..."
msgstr "Papi&ldinio nuostatos..."
#. IDR_MERGEDOCTYPE, ID_PREDIFFER_MANUAL
-#: Merge.rc:377 Merge.rc:550 Merge.rc:857
+#: Merge.rc:379 Merge.rc:554 Merge.rc:864
msgid "Ma&nual Prediffer"
msgstr "Ra&nkinis parengėjas"
#. IDR_MERGEDOCTYPE, ID_PREDIFFER_AUTO
-#: Merge.rc:378 Merge.rc:551 Merge.rc:858
+#: Merge.rc:380 Merge.rc:555 Merge.rc:865
msgid "A&utomatic Prediffer"
msgstr "A&utomatinis parengėjas"
#. IDR_MERGEDOCTYPE, ID_UNPACK_MANUAL
-#: Merge.rc:380 Merge.rc:553 Merge.rc:860
+#: Merge.rc:382 Merge.rc:557 Merge.rc:867
msgid "&Manual Unpacking"
msgstr "Rankinis išpakavi&mas"
#. IDR_MERGEDOCTYPE, ID_UNPACK_AUTO
-#: Merge.rc:381 Merge.rc:554 Merge.rc:861
+#: Merge.rc:383 Merge.rc:558 Merge.rc:868
msgid "&Automatic Unpacking"
msgstr "&Automatinis išpakavimas"
#. IDR_MERGEDOCTYPE, ID_RELOAD_PLUGINS
-#: Merge.rc:383 Merge.rc:558 Merge.rc:889
+#: Merge.rc:385 Merge.rc:562 Merge.rc:896
msgid "&Reload Plugins"
msgstr "&Iš naujo įkelti papildinius"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:385 Merge.rc:560 Merge.rc:891
+#: Merge.rc:387 Merge.rc:564 Merge.rc:898
msgid "&Window"
msgstr "&Langas"
#. IDR_MERGEDOCTYPE, ID_FILE_CLOSE
-#: Merge.rc:387 Merge.rc:562 Merge.rc:893
+#: Merge.rc:389 Merge.rc:566 Merge.rc:900
msgid "Cl&ose\tCtrl+W"
msgstr "Už&verti\tCtrl+W"
#. IDR_MERGEDOCTYPE, ID_WINDOW_CLOSEALL
-#: Merge.rc:388 Merge.rc:563 Merge.rc:894
+#: Merge.rc:390 Merge.rc:567 Merge.rc:901
msgid "Clo&se All"
msgstr "Užv&erti viską"
#. IDR_MERGEDOCTYPE, ID_NEXT_PANE
-#: Merge.rc:390 Merge.rc:565 Merge.rc:896
+#: Merge.rc:392 Merge.rc:569 Merge.rc:903
msgid "Change &Pane\tF6"
msgstr "Keisti &polangį\tF6"
#. IDR_MERGEDOCTYPE, ID_WINDOW_TILE_HORZ
-#: Merge.rc:392 Merge.rc:567 Merge.rc:900
+#: Merge.rc:394 Merge.rc:571 Merge.rc:907
msgid "Tile &Horizontally"
msgstr "Iškloti &gulsčiai"
#. IDR_MERGEDOCTYPE, ID_WINDOW_TILE_VERT
-#: Merge.rc:393 Merge.rc:568 Merge.rc:901
+#: Merge.rc:395 Merge.rc:572 Merge.rc:908
msgid "Tile &Vertically"
msgstr "Iškloti &stačiai"
#. IDR_MERGEDOCTYPE, ID_WINDOW_CASCADE
-#: Merge.rc:394 Merge.rc:569 Merge.rc:902
+#: Merge.rc:396 Merge.rc:573 Merge.rc:909
msgid "&Cascade"
msgstr "&Išdėstyti pakopomis"
#. IDS_MESSAGEBOX_HELP
-#: Merge.rc:396 Merge.rc:571 Merge.rc:904 Merge.rc:3200 Merge.rc:4189
+#: Merge.rc:398 Merge.rc:575 Merge.rc:911 Merge.rc:3210 Merge.rc:4199
msgid "&Help"
msgstr "&Žinynas"
#. IDR_MERGEDOCTYPE, ID_HELP_CONTENTS
-#: Merge.rc:398 Merge.rc:573 Merge.rc:906
+#: Merge.rc:400 Merge.rc:577 Merge.rc:913
msgid "&WinMerge Help\tF1"
msgstr "„&WinMerge“ žinynas\tF1"
#. IDR_MERGEDOCTYPE, ID_HELP_RELEASENOTES
-#: Merge.rc:400 Merge.rc:575 Merge.rc:908
+#: Merge.rc:402 Merge.rc:579 Merge.rc:915
msgid "R&elease Notes"
msgstr "L&aidos informacija"
#. IDR_MERGEDOCTYPE, ID_HELP_TRANSLATIONS
-#: Merge.rc:401 Merge.rc:576 Merge.rc:909
+#: Merge.rc:403 Merge.rc:580 Merge.rc:916
msgid "&Translations"
msgstr "Ver&timai"
#. IDR_MERGEDOCTYPE, ID_HELP_GETCONFIG
-#: Merge.rc:402 Merge.rc:577 Merge.rc:910
+#: Merge.rc:404 Merge.rc:581 Merge.rc:917
msgid "C&onfiguration"
msgstr "K&onfigūracija"
#. IDR_MERGEDOCTYPE, ID_HELP_GNULICENSE
-#: Merge.rc:404 Merge.rc:579 Merge.rc:912
+#: Merge.rc:406 Merge.rc:583 Merge.rc:919
msgid "&GNU General Public License"
msgstr "&GNU Bendroji viešoji licencija"
#. IDR_MERGEDOCTYPE, ID_APP_ABOUT
-#: Merge.rc:405 Merge.rc:580 Merge.rc:913
+#: Merge.rc:407 Merge.rc:584 Merge.rc:920
msgid "&About WinMerge..."
msgstr "&Apie „WinMerge“..."
#. IDR_MERGEDOCTYPE
-#: Merge.rc:436 Merge.rc:629
+#: Merge.rc:440 Merge.rc:635
msgid "&Read-Only"
msgstr "&Tik skaitymui"
#. IDR_MERGEDOCTYPE, ID_FILE_LEFT_READONLY
-#: Merge.rc:438 Merge.rc:631
+#: Merge.rc:442 Merge.rc:637
msgid "L&eft Read-Only"
msgstr "&Kairysis tik skaitymui"
#. IDR_MERGEDOCTYPE, ID_FILE_MIDDLE_READONLY
-#: Merge.rc:439 Merge.rc:632
+#: Merge.rc:443 Merge.rc:638
msgid "M&iddle Read-Only"
msgstr "V&idurinis tik skaitymui"
#. IDR_MERGEDOCTYPE, ID_FILE_RIGHT_READONLY
-#: Merge.rc:440 Merge.rc:633
+#: Merge.rc:444 Merge.rc:639
msgid "Ri&ght Read-Only"
msgstr "&Dešinysis tik skaitymui"
#. IDD_ENCODINGERROR, IDC_FILEENCODING
-#: Merge.rc:443 Merge.rc:646 Merge.rc:1038 Merge.rc:3063
+#: Merge.rc:447 Merge.rc:652 Merge.rc:1046 Merge.rc:3073
msgid "&File Encoding..."
msgstr "&Failo koduotė..."
#. IDR_POPUP_OUTPUTVIEW, ID_EDIT_SELECT_ALL
-#: Merge.rc:454 Merge.rc:674 Merge.rc:1343
+#: Merge.rc:458 Merge.rc:681 Merge.rc:1353
msgid "Select &All\tCtrl+A"
msgstr "P&ažymėti viską\tCtrl+A"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWIDENTICAL
-#: Merge.rc:460
+#: Merge.rc:464
msgid "Show &Identical Items"
msgstr "Rodyti v&ienodus elementus"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWDIFFERENT
-#: Merge.rc:461
+#: Merge.rc:465
msgid "Show &Different Items"
msgstr "Ro&dyti skirtingus elementus"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWUNIQUELEFT
-#: Merge.rc:462
+#: Merge.rc:466
msgid "Show L&eft Unique Items"
msgstr "Rodyti unikalius &elementus kairėje"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWUNIQUEMIDDLE
-#: Merge.rc:463
+#: Merge.rc:467
msgid "Show Midd&le Unique Items"
msgstr "Rodyti unikalius e&lementus viduryje"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWUNIQUERIGHT
-#: Merge.rc:464
+#: Merge.rc:468
msgid "Show Ri&ght Unique Items"
msgstr "Rodyti unikalius ele&mentus dešinėje"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWSKIPPED
-#: Merge.rc:465
+#: Merge.rc:469
msgid "Show S&kipped Items"
msgstr "Rodyti praleis&tus elementus"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWBINARIES
-#: Merge.rc:466
+#: Merge.rc:470
msgid "S&how Binary Files"
msgstr "R&odyti binarinius failus"
#. IDR_DIRDOCTYPE
-#: Merge.rc:467
+#: Merge.rc:471
msgid "&3-way Compare"
msgstr "&3 krypčių lyginimas"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWDIFFERENTLEFTONLY
-#: Merge.rc:469
+#: Merge.rc:473
msgid "Show &Left Only Different Items"
msgstr "Rodyti skirtingus elementus tik &kairėje"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWDIFFERENTMIDDLEONLY
-#: Merge.rc:470
+#: Merge.rc:474
msgid "Show &Middle Only Different Items"
msgstr "Rodyti skirtingus elementus tik &viduryje"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWDIFFERENTRIGHTONLY
-#: Merge.rc:471
+#: Merge.rc:475
msgid "Show &Right Only Different Items"
msgstr "Rodyti skirtingus elementus tik &dešinėje"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWMISSINGLEFTONLY
-#: Merge.rc:473
+#: Merge.rc:477
msgid "Show L&eft Only Missing Items"
msgstr "Rodyti tik kairėj&e trūkstamus elementus"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWMISSINGMIDDLEONLY
-#: Merge.rc:474
+#: Merge.rc:478
msgid "Show Mi&ddle Only Missing Items"
msgstr "Rodyti tik vi&duryje trūkstamus elementus"
#. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWMISSINGRIGHTONLY
-#: Merge.rc:475
+#: Merge.rc:479
msgid "Show Rig&ht Only Missing Items"
msgstr "Rodyti tik deš&inėje trūkstamus elementus"
#. IDR_DIRDOCTYPE, ID_VIEW_SHOWHIDDENITEMS
-#: Merge.rc:478
+#: Merge.rc:482
msgid "Show Hidd&en Items"
msgstr "Rodyti sl&epiamus elementus"
#. IDR_DIRDOCTYPE, ID_VIEW_TREEMODE
-#: Merge.rc:480
+#: Merge.rc:484
msgid "Tree &Mode"
msgstr "&Medžio režimas"
#. IDR_DIRDOCTYPE
-#: Merge.rc:481
+#: Merge.rc:485
msgid "E&xpand Subfolders"
msgstr "Išs&kleisti pakatalogius"
#. IDR_DIRDOCTYPE, ID_VIEW_EXPAND_ALLSUBDIRS
-#: Merge.rc:483
+#: Merge.rc:487
msgid "&All Subfolders"
msgstr "&Visus pakatalogius"
#. IDR_DIRDOCTYPE, ID_VIEW_EXPAND_DIFFERENT_SUBDIRS
-#: Merge.rc:484
+#: Merge.rc:488
msgid "&Different Subfolders"
msgstr "&Skirtingus pakatalogius"
#. IDR_DIRDOCTYPE, ID_VIEW_EXPAND_IDENTICAL_SUBDIRS
-#: Merge.rc:485
+#: Merge.rc:489
msgid "&Identical Subfolders"
msgstr "&Identiškus pakatalogius"
#. IDR_DIRDOCTYPE, ID_VIEW_COLLAPSE_ALLSUBDIRS
-#: Merge.rc:487
+#: Merge.rc:491
msgid "&Collapse All Subfolders"
msgstr "Sus&kleisti visus pakatalogius"
#. IDR_DIRDOCTYPE, ID_VIEW_SHOW_EMPTY_FOLDERS
-#: Merge.rc:488
+#: Merge.rc:492
msgid "Show &Empty Folders"
msgstr "Rodyti &tuščius katalogus"
#. IDR_MERGEDOCTYPE, ID_VIEW_SELECTFONT
-#: Merge.rc:490 Merge.rc:697
+#: Merge.rc:494 Merge.rc:704
msgid "Select &Font..."
msgstr "Parinkti &šriftą..."
#. IDR_MERGEDOCTYPE, ID_VIEW_USEDEFAULTFONT
-#: Merge.rc:491 Merge.rc:698
+#: Merge.rc:495 Merge.rc:705
msgid "Use Default Font"
msgstr "Naudoti numatytąjį šriftą"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:493 Merge.rc:736
+#: Merge.rc:497 Merge.rc:743
msgid "Sw&ap Panes"
msgstr "Sukeisti pol&angius"
#. IDR_MERGEDOCTYPE, ID_SWAPPANES_SWAP12
-#: Merge.rc:495 Merge.rc:738
+#: Merge.rc:499 Merge.rc:745
msgid "Swap &1st | 2nd"
msgstr "Sukeisti &1-ą | 2-ą"
#. IDR_MERGEDOCTYPE, ID_SWAPPANES_SWAP23
-#: Merge.rc:496 Merge.rc:739
+#: Merge.rc:500 Merge.rc:746
msgid "Swap &2nd | 3rd"
msgstr "Sukeisti &2-ą | 3-ią"
#. IDR_MERGEDOCTYPE, ID_SWAPPANES_SWAP13
-#: Merge.rc:497 Merge.rc:740
+#: Merge.rc:501 Merge.rc:747
msgid "Swap 1st | &3rd"
msgstr "Sukeisti 1-ą | &3-ią"
#. IDR_DIRDOCTYPE, ID_VIEW_DISPLAY_FILTER_BAR_MENU
-#: Merge.rc:514
+#: Merge.rc:518
msgid "Displa&y Filter Bar\tCtrl+Shift+L"
msgstr "Rod&yti filtrų juostą\tCtrl+Shift+L"
#. IDR_DIRDOCTYPE, ID_VIEW_DIR_STATISTICS
-#: Merge.rc:518
+#: Merge.rc:522
msgid "Com&pare Statistics..."
msgstr "Ly&ginimo statistika..."
#. IDR_MERGEDOCTYPE, ID_REFRESH
-#: Merge.rc:520 Merge.rc:763
+#: Merge.rc:524 Merge.rc:770
msgid "Refresh\tF5"
msgstr "Atnaujinti\tF5"
#. IDR_POPUP_DIRVIEW, ID_RESCAN
-#: Merge.rc:521 Merge.rc:1030
+#: Merge.rc:525 Merge.rc:1038
msgid "&Refresh Selected\tCtrl+F5"
msgstr "&Atnaujinti pažymėtą\tCtrl+F5"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:523 Merge.rc:765
+#: Merge.rc:527 Merge.rc:772
msgid "&Merge"
msgstr "&Sulieti"
#. IDR_DIRDOCTYPE, ID_MERGE_COMPARE
-#: Merge.rc:525
+#: Merge.rc:529
msgid "Co&mpare\tEnter"
msgstr "Ly&ginti\tEnter"
#. IDR_MERGEDOCTYPE, ID_NEXTDIFF
-#: Merge.rc:527 Merge.rc:767
+#: Merge.rc:531 Merge.rc:774
msgid "&Next Difference\tAlt+Down"
msgstr "&Kitas skirtumas\tAlt+Down"
#. IDR_MERGEDOCTYPE, ID_PREVDIFF
-#: Merge.rc:528 Merge.rc:768
+#: Merge.rc:532 Merge.rc:775
msgid "&Previous Difference\tAlt+Up"
msgstr "&Praeitas skirtumas\tAlt+Up"
#. IDR_MERGEDOCTYPE, ID_FIRSTDIFF
-#: Merge.rc:530 Merge.rc:773
+#: Merge.rc:534 Merge.rc:780
msgid "&First Difference\tAlt+Home"
msgstr "&Pirmas skirtumas\tAlt+Home"
#. IDR_MERGEDOCTYPE, ID_CURDIFF
-#: Merge.rc:531 Merge.rc:774
+#: Merge.rc:535 Merge.rc:781
msgid "&Current Difference\tAlt+Enter"
msgstr "&Dabartinis skirtumas\tAlt+Enter"
#. IDR_MERGEDOCTYPE, ID_LASTDIFF
-#: Merge.rc:532 Merge.rc:775
+#: Merge.rc:536 Merge.rc:782
msgid "&Last Difference\tAlt+End"
msgstr "&Paskutinis skirtumas\tAlt+End"
#. IDR_MERGEDOCTYPE, ID_L2R
-#: Merge.rc:534 Merge.rc:830
+#: Merge.rc:538 Merge.rc:837
msgid "Copy to &Right\tAlt+Right"
msgstr "Kopijuoti į &dešinę\tAlt+Right"
#. IDR_MERGEDOCTYPE, ID_R2L
-#: Merge.rc:535 Merge.rc:831
+#: Merge.rc:539 Merge.rc:838
msgid "Copy to L&eft\tAlt+Left"
msgstr "Kopijuoti į k&airę\tAlt+Left"
#. IDR_DIRDOCTYPE, ID_MERGE_DELETE
-#: Merge.rc:537
+#: Merge.rc:541
msgid "&Delete\tDel"
msgstr "&Trinti\tDel"
#. IDR_POPUP_DIRVIEW, ID_TOOLS_CUSTOMIZECOLUMNS
-#: Merge.rc:541 Merge.rc:1042
+#: Merge.rc:545 Merge.rc:1050
msgid "&Customize Columns..."
msgstr "&Parinkti stulpelius..."
#. IDR_MERGEDOCTYPE, ID_TOOLS_GENERATEREPORT
-#: Merge.rc:544 Merge.rc:851
+#: Merge.rc:548 Merge.rc:858
msgid "Generate &Report..."
msgstr "Ku&rti ataskaitą..."
#. IDD_ENCODINGERROR, IDC_PLUGIN
-#: Merge.rc:556 Merge.rc:867 Merge.rc:3064
+#: Merge.rc:560 Merge.rc:874 Merge.rc:3074
msgid "&Edit with Unpacker..."
msgstr "R&edaguoti su išpakavimu..."
#. IDR_MERGEDOCTYPE, ID_FILE_SAVE
-#: Merge.rc:611
+#: Merge.rc:617
msgid "&Save\tCtrl+S"
msgstr "Iš&saugoti\tCtrl+S"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:612
+#: Merge.rc:618
msgid "Sav&e"
msgstr "Išsaugot&i"
#. IDR_POPUP_SAVE, ID_FILE_SAVE_LEFT
-#: Merge.rc:614 Merge.rc:1201
+#: Merge.rc:620 Merge.rc:1211
msgid "Save &Left"
msgstr "Išsaugoti &kairįjį"
#. IDR_POPUP_SAVE, ID_FILE_SAVE_MIDDLE
-#: Merge.rc:615 Merge.rc:1202
+#: Merge.rc:621 Merge.rc:1212
msgid "Save &Middle"
msgstr "Išsaugoti &vidurinį"
#. IDR_POPUP_SAVE, ID_FILE_SAVE_RIGHT
-#: Merge.rc:616 Merge.rc:1203
+#: Merge.rc:622 Merge.rc:1213
msgid "Save &Right"
msgstr "Išsaugoti &dešinįjį"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:618
+#: Merge.rc:624
msgid "Save &As"
msgstr "Išs&augoti kaip"
#. IDR_POPUP_SAVE, ID_FILE_SAVEAS_LEFT
-#: Merge.rc:620 Merge.rc:1205
+#: Merge.rc:626 Merge.rc:1215
msgid "Save &Left As..."
msgstr "Išsaugoti &kairįjį kaip..."
#. IDR_POPUP_SAVE, ID_FILE_SAVEAS_MIDDLE
-#: Merge.rc:621 Merge.rc:1206
+#: Merge.rc:627 Merge.rc:1216
msgid "Save &Middle As..."
msgstr "Išsaugoti vidurinį &kaip..."
#. IDR_POPUP_SAVE, ID_FILE_SAVEAS_RIGHT
-#: Merge.rc:622 Merge.rc:1207
+#: Merge.rc:628 Merge.rc:1217
msgid "Save &Right As..."
msgstr "Išsaugoti &dešinįjį kaip..."
#. IDR_MERGEDOCTYPE, ID_FILE_PRINT
-#: Merge.rc:625
+#: Merge.rc:631
msgid "&Print...\tCtrl+P"
msgstr "S&pausdinti...\tCtrl+P"
#. IDR_MERGEDOCTYPE, ID_FILE_PAGE_SETUP
-#: Merge.rc:626
+#: Merge.rc:632
msgid "Page Set&up..."
msgstr "P&uslapio nuostatos..."
#. IDR_MERGEDOCTYPE, ID_FILE_PRINT_PREVIEW
-#: Merge.rc:627
+#: Merge.rc:633
msgid "Print Previe&w..."
msgstr "Spaudinio peržiūr&a..."
#. IDR_MERGEDOCTYPE
-#: Merge.rc:636
+#: Merge.rc:642
msgid "&Convert Line Endings to"
msgstr "Keisti eilučių pabaigos formatą į"
#. IDR_MERGEDOCTYPE, ID_FILE_MERGINGMODE
-#: Merge.rc:643
+#: Merge.rc:649
msgid "Mer&ge Mode\tF9"
msgstr "Sulieji&mo režimas\tF9"
#. IDR_MERGEDOCTYPE, ID_RESCAN
-#: Merge.rc:645
+#: Merge.rc:651
msgid "Reloa&d\tCtrl+F5"
msgstr "&Atnaujinti\tCtrl+F5"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:647
+#: Merge.rc:653
msgid "Reco&mpare As"
msgstr "Paly&ginti iš naujo kaip"
+#. IDR_POPUP_COMPARE, ID_MERGE_COMPARE_FOLDER
+#: Merge.rc:660 Merge.rc:947 Merge.rc:1185
+msgid "A&rchive"
+msgstr ""
+
#. IDR_MERGEDOCTYPE, ID_EDIT_UNDO
-#: Merge.rc:666
+#: Merge.rc:673
msgid "&Undo\tCtrl+Z"
msgstr "Atša&ukti\tCtrl+Z"
#. IDR_MERGEDOCTYPE, ID_EDIT_REDO
-#: Merge.rc:667
+#: Merge.rc:674
msgid "&Redo\tCtrl+Y"
msgstr "Paka&rtoti\tCtrl+Y"
#. IDR_MERGEDOCTYPE, ID_EDIT_CUT
-#: Merge.rc:669
+#: Merge.rc:676
msgid "Cu&t\tCtrl+X"
msgstr "Iškirp&ti\tCtrl+X"
#. IDR_POPUP_OUTPUTVIEW, ID_EDIT_COPY
-#: Merge.rc:670 Merge.rc:1342
+#: Merge.rc:677 Merge.rc:1352
msgid "&Copy\tCtrl+C"
msgstr "&Kopijuoti\tCtrl+C"
#. IDR_MERGEDOCTYPE, ID_EDIT_FIND
-#: Merge.rc:676
+#: Merge.rc:683
msgid "F&ind...\tCtrl+F"
msgstr "R&asti...\tCtrl+F"
#. IDR_MERGEDOCTYPE, ID_EDIT_REPLACE
-#: Merge.rc:677
+#: Merge.rc:684
msgid "Repla&ce...\tCtrl+H"
msgstr "Pakeis&ti...\tCtrl+H"
#. IDR_MERGEDOCTYPE, ID_EDIT_MARK
-#: Merge.rc:678
+#: Merge.rc:685
msgid "&Marker...\tCtrl+Shift+M"
msgstr "Žy&meklis...\tCtrl+Shift+M"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:680
+#: Merge.rc:687
msgid "Advanced"
msgstr "Daugiau"
#. IDR_MERGEDOCTYPE, ID_EDIT_COPY_LINENUMBERS
-#: Merge.rc:682
+#: Merge.rc:689
msgid "&Copy With Line Numbers\tCtrl+Shift+C"
msgstr "&Kopijuoti su eilučių numeriais\tCtrl+Shift+C"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:684
+#: Merge.rc:691
msgid "&Bookmarks"
msgstr "&Žymės"
#. IDR_MERGEDOCTYPE, ID_EDIT_TOGGLE_BOOKMARK
-#: Merge.rc:686
+#: Merge.rc:693
msgid "&Toggle Bookmark\tCtrl+F2"
msgstr "&Uždėti žymę\tCtrl+F2"
#. IDR_MERGEDOCTYPE, ID_EDIT_GOTO_NEXT_BOOKMARK
-#: Merge.rc:687
+#: Merge.rc:694
msgid "&Next Bookmark\tF2"
msgstr "&Kita žymė\tF2"
#. IDR_MERGEDOCTYPE, ID_EDIT_GOTO_PREV_BOOKMARK
-#: Merge.rc:688
+#: Merge.rc:695
msgid "&Previous Bookmark\tShift+F2"
msgstr "&Ankstesnė žyma\tShift+F2"
#. IDR_MERGEDOCTYPE, ID_EDIT_CLEAR_ALL_BOOKMARKS
-#: Merge.rc:689
+#: Merge.rc:696
msgid "&Clear All Bookmarks"
msgstr "&Išvalyti visas žymes"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:706
+#: Merge.rc:713
msgid "Syntax Highlight"
msgstr "Sintaksės paryškinimas"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:711
+#: Merge.rc:718
msgid "&Diff Context"
msgstr "&Skirtumų kontekstas"
#. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_ALL
-#: Merge.rc:713
+#: Merge.rc:720
msgid "&All Lines"
msgstr "&Visos eilutės"
#. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_0
-#: Merge.rc:715
+#: Merge.rc:722
msgid "&0 Lines"
msgstr "&0 eilučių"
#. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_1
-#: Merge.rc:716
+#: Merge.rc:723
msgid "&1 Line"
msgstr "&1 eilutė"
#. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_3
-#: Merge.rc:717
+#: Merge.rc:724
msgid "&3 Lines"
msgstr "&3 eilutės"
#. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_5
-#: Merge.rc:718
+#: Merge.rc:725
msgid "&5 Lines"
msgstr "&5 eilutės"
#. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_7
-#: Merge.rc:719
+#: Merge.rc:726
msgid "&7 Lines"
msgstr "&7 eilutės"
#. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_9
-#: Merge.rc:720
+#: Merge.rc:727
msgid "&9 Lines"
msgstr "&9 eilutės"
#. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_TOGGLE
-#: Merge.rc:722
+#: Merge.rc:729
msgid "&Toggle All and 0-9 Lines\tCtrl+D"
msgstr "Įjungti Visas ir 0-9 eilutes\tCtrl+D"
#. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_INVERT
-#: Merge.rc:724
+#: Merge.rc:731
msgid "&Invert (Hide Different Lines)"
msgstr "&Invertuoti (slėpti skirtingas eilutes)"
#. IDR_MERGEDOCTYPE, ID_VIEW_RESIZE_PANES
-#: Merge.rc:727
+#: Merge.rc:734
msgid "&Lock Panes"
msgstr "Užrakinti po&langius"
#. IDR_MERGEDOCTYPE, ID_VIEW_WHITESPACE
-#: Merge.rc:728
+#: Merge.rc:735
msgid "&View Whitespace"
msgstr "&Rodyti tarpų simbolius"
#. IDR_MERGEDOCTYPE, ID_VIEW_EOL
-#: Merge.rc:729
+#: Merge.rc:736
msgid "View E&OL"
msgstr "R&odyti eilučių skirtukus"
#. IDR_MERGEDOCTYPE, ID_VIEW_LINEDIFFS
-#: Merge.rc:730
+#: Merge.rc:737
msgid "Vie&w Line Differences"
msgstr "Ro&dyti skirtumus eilutėse"
#. IDR_MERGEDOCTYPE, ID_VIEW_LINENUMBERS
-#: Merge.rc:731
+#: Merge.rc:738
msgid "View Line &Numbers"
msgstr "Rodyti eilučių &numerius"
#. IDR_MERGEDOCTYPE, ID_VIEW_SELMARGIN
-#: Merge.rc:732
+#: Merge.rc:739
msgid "View &Margins"
msgstr "Rodyti pa&raštes"
#. IDR_MERGEDOCTYPE, ID_VIEW_TOPMARGIN
-#: Merge.rc:733
+#: Merge.rc:740
msgid "View To&p Margins"
msgstr "Rodyti virš. ¶štes"
#. IDR_MERGEDOCTYPE, ID_VIEW_WORDWRAP
-#: Merge.rc:734
+#: Merge.rc:741
msgid "W&rap Lines"
msgstr "S&kaidyti eilutes"
#. IDR_MERGEDOCTYPE, ID_VIEW_SPLITVERTICALLY
-#: Merge.rc:742
+#: Merge.rc:749
msgid "Split V&ertically"
msgstr "Padalintas v&ertikaliai"
#. IDR_MERGEDOCTYPE, ID_VIEW_DETAIL_BAR
-#: Merge.rc:759
+#: Merge.rc:766
msgid "Diff &Pane"
msgstr "Skirtumų &polangis"
#. IDR_MERGEDOCTYPE, ID_VIEW_LOCATION_BAR
-#: Merge.rc:760
+#: Merge.rc:767
msgid "Lo&cation Pane"
msgstr "Vi&etos polangis"
#. IDS_OUTPUTBAR_CAPTION
-#: Merge.rc:761 Merge.rc:4902
+#: Merge.rc:768 Merge.rc:4912
msgid "Output Pane"
msgstr "Rezultatų polangis"
#. IDR_MERGEDOCTYPE, ID_NEXTCONFLICT
-#: Merge.rc:770
+#: Merge.rc:777
msgid "Ne&xt Conflict\tAlt+Shift+Down"
msgstr "Ki&tas konfliktas\tAlt+Shift+Down"
#. IDR_MERGEDOCTYPE, ID_PREVCONFLICT
-#: Merge.rc:771
+#: Merge.rc:778
msgid "Pre&vious Conflict\tAlt+Shift+Up"
msgstr "Pra&eitas konfliktas\tAlt+Shift+Up"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:777
+#: Merge.rc:784
msgid "A&dvanced"
msgstr "Papil&domai"
#. IDR_MERGEDOCTYPE, ID_NEXTDIFFLM
-#: Merge.rc:779
+#: Merge.rc:786
msgid "Next Difference (Left/Middle)\tAlt+1"
msgstr "Kitas skirtumas (Kairėje ir Viduryje)\tAlt+1"
#. IDR_MERGEDOCTYPE, ID_PREVDIFFLM
-#: Merge.rc:780
+#: Merge.rc:787
msgid "Previous Difference (Left/Middle)\tAlt+Shift+1"
msgstr "Praeitas skirtumas (Kairėje ir Viduryje)\tAlt+Shift+1"
#. IDR_MERGEDOCTYPE, ID_NEXTDIFFLR
-#: Merge.rc:782
+#: Merge.rc:789
msgid "Next Difference (Left/Right)\tAlt+2"
msgstr "Kitas skirtumas (Kairėje ir Dešinėje)\tAlt+2"
#. IDR_MERGEDOCTYPE, ID_PREVDIFFLR
-#: Merge.rc:783
+#: Merge.rc:790
msgid "Previous Difference (Left/Right)\tAlt+Shift+2"
msgstr "Praeitas skirtumas (Kairėje ir Dešinėje)\tAlt+Shift+2"
#. IDR_MERGEDOCTYPE, ID_NEXTDIFFMR
-#: Merge.rc:785
+#: Merge.rc:792
msgid "Next Difference (Middle/Right)\tAlt+3"
msgstr "Kitas skirtumas (Viduryje ir Dešinėje)\tAlt+3"
#. IDR_MERGEDOCTYPE, ID_PREVDIFFMR
-#: Merge.rc:786
+#: Merge.rc:793
msgid "Previous Difference (Middle/Right)\tAlt+Shift+3"
msgstr "Praeitas skirtumas (Viduryje ir Dešinėje)\tAlt+Shift+3"
#. IDR_MERGEDOCTYPE, ID_NEXTDIFFLO
-#: Merge.rc:788
+#: Merge.rc:795
msgid "Next Left-Only Difference\tAlt+7"
msgstr "Kitas skirtumas Tik kairėje\tAlt+7"
#. IDR_MERGEDOCTYPE, ID_PREVDIFFLO
-#: Merge.rc:789
+#: Merge.rc:796
msgid "Previous Left-Only Difference\tAlt+Shift+7"
msgstr "Praeitas skirtumas Tik kairėje\tAlt+Shift+7"
#. IDR_MERGEDOCTYPE, ID_NEXTDIFFMO
-#: Merge.rc:791
+#: Merge.rc:798
msgid "Next Middle-Only Difference\tAlt+8"
msgstr "Kitas skirtumas Tik viduryje\tAlt+8"
#. IDR_MERGEDOCTYPE, ID_PREVDIFFMO
-#: Merge.rc:792
+#: Merge.rc:799
msgid "Previous Middle-Only Difference\tAlt+Shift+8"
msgstr "Praeitas skirtumas Tik viduryje\tAlt+Shift+8"
#. IDR_MERGEDOCTYPE, ID_NEXTDIFFRO
-#: Merge.rc:794
+#: Merge.rc:801
msgid "Next Right-Only Difference\tAlt+9"
msgstr "Kitas skirtumas Tik dešinėje\tAlt+9"
#. IDR_MERGEDOCTYPE, ID_PREVDIFFRO
-#: Merge.rc:795
+#: Merge.rc:802
msgid "Previous Right-Only Difference\tAlt+Shift+9"
msgstr "Praeitas skirtumas Tik dešinėje\tAlt+Shift+9"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:797
+#: Merge.rc:804
msgid "Copy from &Left to"
msgstr "Kopijuoti iš &kairės į"
#. IDD_LOAD_SAVE_CODEPAGE, IDC_AFFECTS_MIDDLE_BTN
-#: Merge.rc:799 Merge.rc:810 Merge.rc:815 Merge.rc:826 Merge.rc:970
-#: Merge.rc:2545 Merge.rc:2817
+#: Merge.rc:806 Merge.rc:817 Merge.rc:822 Merge.rc:833 Merge.rc:978
+#: Merge.rc:2555 Merge.rc:2827
msgid "&Middle"
msgstr "&Vidurinį"
#. IDD_LOAD_SAVE_CODEPAGE, IDC_AFFECTS_RIGHT_BTN
-#: Merge.rc:800 Merge.rc:805 Merge.rc:816 Merge.rc:821 Merge.rc:971
-#: Merge.rc:2546 Merge.rc:2819
+#: Merge.rc:807 Merge.rc:812 Merge.rc:823 Merge.rc:828 Merge.rc:979
+#: Merge.rc:2556 Merge.rc:2829
msgid "&Right"
msgstr "&Dešinįjį"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:802
+#: Merge.rc:809
msgid "Copy from &Middle to"
msgstr "Kopijuoti iš &vidurio į"
#. IDD_LOAD_SAVE_CODEPAGE, IDC_AFFECTS_LEFT_BTN
-#: Merge.rc:804 Merge.rc:809 Merge.rc:820 Merge.rc:825 Merge.rc:969
-#: Merge.rc:2544 Merge.rc:2815
+#: Merge.rc:811 Merge.rc:816 Merge.rc:827 Merge.rc:832 Merge.rc:977
+#: Merge.rc:2554 Merge.rc:2825
msgid "&Left"
msgstr "&Kairįjį"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:807
+#: Merge.rc:814
msgid "Copy from &Right to"
msgstr "Kopijuoti iš &dešinės į"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:813
+#: Merge.rc:820
msgid "Copy Selected Lines from Le&ft to"
msgstr "Kopijuoti pažymėtas eilutes iš k&airės į"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:818
+#: Merge.rc:825
msgid "Copy Selected Lines from Mi&ddle to"
msgstr "Kopijuoti pažymėtas eilutes iš vi&durio į"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:823
+#: Merge.rc:830
msgid "Copy Selected Lines from Ri&ght to"
msgstr "Kopijuoti pažymėtas eilutes iš d&ešinės į"
#. IDR_MERGEDOCTYPE, ID_COPY_FROM_LEFT
-#: Merge.rc:833
+#: Merge.rc:840
msgid "Copy from Left\tAlt+Shift+Right"
msgstr "Kopijuoti iš kairės\tAlt+Shift+Right"
#. IDR_MERGEDOCTYPE, ID_COPY_FROM_RIGHT
-#: Merge.rc:834
+#: Merge.rc:841
msgid "Copy from Right\tAlt+Shift+Left"
msgstr "Kopijuoti iš dešinės\tAlt+Shift+Left"
#. IDR_MERGEDOCTYPE, ID_L2RNEXT
-#: Merge.rc:836
+#: Merge.rc:843
msgid "C&opy to Right and Advance\tCtrl+Alt+Right"
msgstr "K&opijuoti į dešinę ir Daugiau\tCtrl+Alt+Right"
#. IDR_MERGEDOCTYPE, ID_R2LNEXT
-#: Merge.rc:837
+#: Merge.rc:844
msgid "Copy &to Left and Advance\tCtrl+Alt+Left"
msgstr "Kopijuo&ti į kairę ir Daugiau\tCtrl+Alt+Left"
#. IDR_MERGEDOCTYPE, ID_ALL_RIGHT
-#: Merge.rc:839
+#: Merge.rc:846
msgid "Copy &All to Right"
msgstr "Kopijuoti &viską į dešinę"
#. IDR_MERGEDOCTYPE, ID_ALL_LEFT
-#: Merge.rc:840
+#: Merge.rc:847
msgid "Cop&y All to Left"
msgstr "Kop&ijuoti viską į kairę"
#. IDR_MERGEDOCTYPE, ID_AUTO_MERGE
-#: Merge.rc:842
+#: Merge.rc:849
msgid "A&uto Merge\tCtrl+Alt+M"
msgstr "A&utomatiškai sulieti\tCtrl+Alt+M"
#. IDR_MERGEDOCTYPE, ID_ADD_SYNCPOINT
-#: Merge.rc:844
+#: Merge.rc:851
msgid "Add &Synchronization Point\tAlt+S"
msgstr "Įdėti &sinchronizavimo tašką\tAlt+S"
#. IDR_MERGEDOCTYPE, ID_CLEAR_SYNCPOINTS
-#: Merge.rc:845
+#: Merge.rc:852
msgid "Clear Sync&hronization Points"
msgstr "Išvalyti sinc&hronizavino taškus"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:863
+#: Merge.rc:870
msgid "Unpac&ker"
msgstr "Išpa&kuotojas"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:869
+#: Merge.rc:876
msgid "&Prediffer"
msgstr "&Parengėjas"
#. IDR_MERGEDOCTYPE, ID_APPLY_PREDIFFER
-#: Merge.rc:873
+#: Merge.rc:880
msgid "Apply Pre&differ..."
msgstr "Taikyti paren&gėją..."
#. IDR_MERGEDOCTYPE, ID_TRANSFORM_WITH_SCRIPT
-#: Merge.rc:879
+#: Merge.rc:886
msgid "&Transform with Editor Script..."
msgstr "&Transformuoti su redaktoriaus skriptu..."
#. IDR_MERGEDOCTYPE
-#: Merge.rc:880
+#: Merge.rc:887
msgid "Scripts for &Copying"
msgstr "Skriptai &kopijavimui"
#. IDR_MERGEDOCTYPE, ID_SELECT_EDITOR_SCRIPT_FOR_COPYING
-#: Merge.rc:886
+#: Merge.rc:893
msgid "Select &Editor Script..."
msgstr "Parinkti r&edagavimo skriptą..."
#. IDR_MERGEDOCTYPE, ID_WINDOW_SPLIT
-#: Merge.rc:898
+#: Merge.rc:905
msgid "Sp&lit"
msgstr "Pada&linti"
#. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE
-#: Merge.rc:921
+#: Merge.rc:928
msgid "Comp&are"
msgstr "Lyg&inti"
#. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE_WITH_MOVED_RENAMED
-#: Merge.rc:922
+#: Merge.rc:929
msgid "Compar&e with Renamed/Moved Items"
msgstr "Lyginti su Pervardintais/Perkeltais &elementais"
#. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE_IN_NEW_WINDOW
-#: Merge.rc:923
+#: Merge.rc:930
msgid "Compare in New &Window"
msgstr "Lyginti naujame &lange"
#. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE_NONHORIZONTALLY
-#: Merge.rc:924 Merge.rc:931
+#: Merge.rc:931 Merge.rc:938
msgid "Compare Non-hor&izontally..."
msgstr "Lyginti ne hor&izontaliai..."
#. IDR_POPUP_DIRVIEW
-#: Merge.rc:925
+#: Merge.rc:932
msgid "Compare Non-hor&izontally"
msgstr "Lyginti ne hor&izontaliai"
#. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE_LEFT1_LEFT2
-#: Merge.rc:927
+#: Merge.rc:934
msgid "First &Left with Second Left"
msgstr "Pirmąjį &kairėje su antruoju kairėje"
#. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE_RIGHT1_RIGHT2
-#: Merge.rc:928
+#: Merge.rc:935
msgid "First &Right with Second Right"
msgstr "Pirmąjį &dešinėje su antruoju dešinėje"
#. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE_LEFT1_RIGHT2
-#: Merge.rc:929
+#: Merge.rc:936
msgid "&First Left with Second Right"
msgstr "&Pirmąjį &kairėje su antruoju dešinėje"
#. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE_LEFT2_RIGHT1
-#: Merge.rc:930
+#: Merge.rc:937
msgid "&Second Left with First Right"
msgstr "&Antrąjį kairėje su pirmuoju dešinėje"
#. IDR_POPUP_DIRVIEW
-#: Merge.rc:933
+#: Merge.rc:940
msgid "Co&mpare As"
msgstr "Ly&ginti kaip"
#. IDS_COPY_LEFT_TO_MIDDLE2
-#: Merge.rc:945 Merge.rc:957 Merge.rc:4502
+#: Merge.rc:953 Merge.rc:965 Merge.rc:4512
#, c-format
msgid "Left to Middle (%1 of %2)"
msgstr "Kairįjį į Vidurinį (%1 iš %2)"
#. IDS_COPY_LEFT_TO_RIGHT2
-#: Merge.rc:946 Merge.rc:958 Merge.rc:4501
+#: Merge.rc:954 Merge.rc:966 Merge.rc:4511
#, c-format
msgid "Left to Right (%1 of %2)"
msgstr "Kairįjį į Dešinįjį (%1 iš %2)"
#. IDS_MOVE_LEFT_TO2
-#: Merge.rc:947 Merge.rc:959 Merge.rc:1022 Merge.rc:4513 Merge.rc:4542
+#: Merge.rc:955 Merge.rc:967 Merge.rc:1030 Merge.rc:4523 Merge.rc:4552
#, c-format
msgid "Left to... (%1 of %2)"
msgstr "Kairįjį į... (%1 iš %2)"
#. IDS_COPY_MIDDLE_TO_LEFT2
-#: Merge.rc:948 Merge.rc:960 Merge.rc:4499
+#: Merge.rc:956 Merge.rc:968 Merge.rc:4509
#, c-format
msgid "Middle to Left (%1 of %2)"
msgstr "Vidurinį į Kairįjį (%1 iš %2)"
#. IDS_COPY_MIDDLE_TO_RIGHT2
-#: Merge.rc:949 Merge.rc:961 Merge.rc:4500
+#: Merge.rc:957 Merge.rc:969 Merge.rc:4510
#, c-format
msgid "Middle to Right (%1 of %2)"
msgstr "Vidurinį į Dešinįjį (%1 iš %2)"
#. IDS_MOVE_MIDDLE_TO2
-#: Merge.rc:950 Merge.rc:962 Merge.rc:1023 Merge.rc:4514 Merge.rc:4543
+#: Merge.rc:958 Merge.rc:970 Merge.rc:1031 Merge.rc:4524 Merge.rc:4553
#, c-format
msgid "Middle to... (%1 of %2)"
msgstr "Vidurinį į... (%1 iš %2)"
#. IDS_COPY_RIGHT_TO_MIDDLE2
-#: Merge.rc:951 Merge.rc:963 Merge.rc:4498
+#: Merge.rc:959 Merge.rc:971 Merge.rc:4508
#, c-format
msgid "Right to Middle (%1 of %2)"
msgstr "Dešinįjį į Vidurinį (%1 iš %2)"
#. IDS_COPY_RIGHT_TO_LEFT2
-#: Merge.rc:952 Merge.rc:964 Merge.rc:4497
+#: Merge.rc:960 Merge.rc:972 Merge.rc:4507
#, c-format
msgid "Right to Left (%1 of %2)"
msgstr "Dešinįjį į kairįjį (%1 iš %2)"
#. IDS_MOVE_RIGHT_TO2
-#: Merge.rc:953 Merge.rc:965 Merge.rc:1024 Merge.rc:4515 Merge.rc:4544
+#: Merge.rc:961 Merge.rc:973 Merge.rc:1032 Merge.rc:4525 Merge.rc:4554
#, c-format
msgid "Right to... (%1 of %2)"
msgstr "Dešinįjį į... (%1 iš %2)"
#. IDD_EDIT_MARKER, IDC_EDIT_MARKER_DELETE
-#: Merge.rc:967 Merge.rc:2036
+#: Merge.rc:975 Merge.rc:2046
msgid "&Delete"
msgstr "&Trinti"
#. IDR_POPUP_DIRVIEW, ID_DIR_DEL_BOTH
-#: Merge.rc:972
+#: Merge.rc:980
msgid "&Both"
msgstr "A&bu"
#. IDR_POPUP_DIRVIEW, ID_DIR_DEL_ALL
-#: Merge.rc:973
+#: Merge.rc:981
msgid "&All"
msgstr "V&iską"
#. IDD_EDIT_REPLACE, IDC_EDIT_SCOPE_SELECTION
-#: Merge.rc:974 Merge.rc:2019
+#: Merge.rc:982 Merge.rc:2029
msgid "&Selection"
msgstr "&Pažym. fragmente"
#. IDR_POPUP_DIRVIEW, ID_DIR_ITEM_RENAME
-#: Merge.rc:976
+#: Merge.rc:984
msgid "Re&name"
msgstr "Pervardi&nti"
#. IDR_POPUP_DIRVIEW, ID_DIR_HIDE_FILENAMES
-#: Merge.rc:977
+#: Merge.rc:985
msgid "&Hide Items"
msgstr "&Slėpti elementus"
#. IDR_POPUP_DIRVIEW
-#: Merge.rc:979
+#: Merge.rc:987
msgid "&Open Left"
msgstr "&Atverti kairįjį"
#. IDR_POPUP_DIRVIEW
-#: Merge.rc:986
+#: Merge.rc:994
msgid "Open Midd&le"
msgstr "Atverti &vidurinį"
#. IDR_POPUP_DIRVIEW
-#: Merge.rc:993
+#: Merge.rc:1001
msgid "O&pen Right"
msgstr "A&tverti dešinįjį"
#. IDR_POPUP_DIRVIEW
-#: Merge.rc:1001
+#: Merge.rc:1009
msgid "Cop&y Paths"
msgstr "Kop&ijuoti kelius"
#. IDS_DEL_LEFT_FMT2
-#: Merge.rc:1003 Merge.rc:1012 Merge.rc:4530
+#: Merge.rc:1011 Merge.rc:1020 Merge.rc:4540
#, c-format
msgid "Left (%1 of %2)"
msgstr "Kairėje (%1 iš %2)"
#. IDS_DEL_MIDDLE_FMT2
-#: Merge.rc:1004 Merge.rc:1013 Merge.rc:4531
+#: Merge.rc:1012 Merge.rc:1021 Merge.rc:4541
#, c-format
msgid "Middle (%1 of %2)"
msgstr "Viduryje (%1 iš %2)"
#. IDS_DEL_RIGHT_FMT2
-#: Merge.rc:1005 Merge.rc:1014 Merge.rc:4532
+#: Merge.rc:1013 Merge.rc:1022 Merge.rc:4542
#, c-format
msgid "Right (%1 of %2)"
msgstr "Dešinėje (%1 iš %2)"
#. IDS_DEL_BOTH_FMT2
-#: Merge.rc:1006 Merge.rc:1015 Merge.rc:4533
+#: Merge.rc:1014 Merge.rc:1023 Merge.rc:4543
#, c-format
msgid "Both (%1 of %2)"
msgstr "Abu (%1 iš %2)"
#. IDS_DEL_ALL_FMT2
-#: Merge.rc:1007 Merge.rc:1016 Merge.rc:4538
+#: Merge.rc:1015 Merge.rc:1024 Merge.rc:4548
#, c-format
msgid "All (%1 of %2)"
msgstr "Visi (%1 iš %2)"
#. IDR_POPUP_DIRVIEW, ID_DIR_COPY_FILENAMES
-#: Merge.rc:1009
+#: Merge.rc:1017
msgid "Copy &Filenames"
msgstr "Kopijuoti &failų vardus"
#. IDR_POPUP_DIRVIEW
-#: Merge.rc:1010
+#: Merge.rc:1018
msgid "Copy Items to Clip&board"
msgstr "Kopijuoti elementus į mainų &sritį"
#. IDR_POPUP_DIRVIEW, ID_DIR_COPY_ALL_DISP_COLUMNS
-#: Merge.rc:1018
+#: Merge.rc:1026
msgid "Copy All Di&splayed Columns"
msgstr "Kopijuoti visus rodomu&s stulpelius"
#. IDR_POPUP_DIRVIEW
-#: Merge.rc:1020
+#: Merge.rc:1028
msgid "&Zip"
msgstr "&Zip"
#. IDS_COPY_BOTH_TO2
-#: Merge.rc:1025 Merge.rc:4516
+#: Merge.rc:1033 Merge.rc:4526
#, c-format
msgid "Both to... (%1 of %2)"
msgstr "Abu į... (%1 iš %2)"
#. IDS_COPY_ALL_TO2
-#: Merge.rc:1026 Merge.rc:4517
+#: Merge.rc:1034 Merge.rc:4527
#, c-format
msgid "All to... (%1 of %2)"
msgstr "Viską į... (%1 iš %2)"
#. IDS_COPY_DIFFERENCES_TO2
-#: Merge.rc:1027 Merge.rc:4518
+#: Merge.rc:1035 Merge.rc:4528
#, c-format
msgid "Differences to... (%1 of %2)"
msgstr "Skirtumus į... (%1 iš %2)"
#. IDR_POPUP_DIRVIEW, ID_DIR_SHELL_CONTEXT_MENU_LEFT
-#: Merge.rc:1032
+#: Merge.rc:1040
msgid "Left Shell Menu"
msgstr "Sistemos meniu kairėje"
#. IDR_POPUP_DIRVIEW, ID_DIR_SHELL_CONTEXT_MENU_MIDDLE
-#: Merge.rc:1033
+#: Merge.rc:1041
msgid "Middle Shell Menu"
msgstr "Sistemos meniu viduryje"
#. IDR_POPUP_DIRVIEW, ID_DIR_SHELL_CONTEXT_MENU_RIGHT
-#: Merge.rc:1034
+#: Merge.rc:1042
msgid "Right Shell Menu"
msgstr "Sistemos meniu dešinėje"
#. IDR_POPUP_DIRVIEW, ID_DIR_SHELL_CONTEXT_MENU_BOTH
-#: Merge.rc:1035
+#: Merge.rc:1043
msgid "Both Shell Menu"
msgstr "Abu sistemos meniu"
#. IDR_POPUP_DIRVIEW, ID_DIR_SHELL_CONTEXT_MENU_ALL
-#: Merge.rc:1036
+#: Merge.rc:1044
msgid "All Shell Menu"
msgstr "Visi sistemos meniu"
#. IDR_POPUP_EDITOR_HEADERBAR, ID_EDITOR_COPY
-#: Merge.rc:1050
+#: Merge.rc:1058
msgid "Copy"
msgstr "Kopijuoti"
#. IDR_POPUP_EDITOR_HEADERBAR, ID_EDITOR_COPY_PATH
-#: Merge.rc:1051
+#: Merge.rc:1059
msgid "&Copy Full Path"
msgstr "Kopijuoti pilną &kelią"
#. IDR_POPUP_EDITOR_HEADERBAR, ID_EDITOR_COPY_FILENAME
-#: Merge.rc:1052
+#: Merge.rc:1060
msgid "Copy &Filename"
msgstr "Kopijuoti &failo vardą"
#. IDR_POPUP_EDITOR_HEADERBAR, ID_EDITOR_EDIT_CAPTION
-#: Merge.rc:1053
+#: Merge.rc:1061
msgid "&Edit Caption\tF2"
msgstr "R&edaguoti antraštę\tF2"
#. IDR_POPUP_EDITOR_HEADERBAR, ID_EDITOR_EDIT_PATH
-#: Merge.rc:1055
+#: Merge.rc:1063
msgid "Edit &Path\tCtrl+L"
msgstr "&Redaguoti kelią\tCtrl+L"
#. IDR_POPUP_EDITOR_HEADERBAR, ID_EDITOR_SELECT_FILE
-#: Merge.rc:1056
+#: Merge.rc:1064
msgid "&Open..."
msgstr "&Atverti..."
#. IDR_POPUP_PLUGINS_SETTINGS
-#: Merge.rc:1062
+#: Merge.rc:1070
msgid "Unpacker Settings"
msgstr "Išpakuotojo nuostatos"
#. IDS_USERCHOICE_NONE
-#: Merge.rc:1064 Merge.rc:1070 Merge.rc:1789 Merge.rc:1793 Merge.rc:5030
+#: Merge.rc:1072 Merge.rc:1078 Merge.rc:1799 Merge.rc:1803 Merge.rc:5040
msgid ""
msgstr ""
#. IDS_USERCHOICE_AUTOMATIC
-#: Merge.rc:1065 Merge.rc:1071 Merge.rc:5031
+#: Merge.rc:1073 Merge.rc:1079 Merge.rc:5041
msgid ""
msgstr ""
#. IDD_OPEN, IDC_SELECT_PREDIFFER
-#: Merge.rc:1066 Merge.rc:1072 Merge.rc:1970 Merge.rc:1974
+#: Merge.rc:1074 Merge.rc:1080 Merge.rc:1980 Merge.rc:1984
msgid "&Select..."
msgstr "Pa&rinkti..."
#. IDR_POPUP_PLUGINS_SETTINGS
-#: Merge.rc:1068
+#: Merge.rc:1076
msgid "Prediffer Settings"
msgstr "Parengėjo nuostatos"
#. IDR_POPUP_LOCATIONBAR, ID_LOCBAR_GOTODIFF
-#: Merge.rc:1080
+#: Merge.rc:1088
msgid "G&o to Diff"
msgstr "Pereiti prie skirtum&o"
#. IDR_POPUP_LOCATIONBAR, ID_LOCBAR_MOVECURSOR_ONCLICK
-#: Merge.rc:1083
+#: Merge.rc:1091
msgid "Move Cursor on &Click"
msgstr "Perkelti žymeklį &spustelėjus"
#. IDR_POPUP_LOCATIONBAR, ID_DISPLAY_MOVED_NONE
-#: Merge.rc:1085
+#: Merge.rc:1093
msgid "&No Moved Blocks"
msgstr "&Neperkelti blokai"
#. IDR_POPUP_LOCATIONBAR, ID_DISPLAY_MOVED_ALL
-#: Merge.rc:1086
+#: Merge.rc:1094
msgid "&All Moved Blocks"
msgstr "&Visi perkelti blokai"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS
-#: Merge.rc:1094 Merge.rc:1127
+#: Merge.rc:1102 Merge.rc:1135
msgid "W&hitespaces"
msgstr "T&arpai"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_WHITESPACE_COMPARE
-#: Merge.rc:1096 Merge.rc:1129
+#: Merge.rc:1104 Merge.rc:1137
msgid "Com&pare"
msgstr "Ly&ginti"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_WHITESPACE_IGNORE
-#: Merge.rc:1097 Merge.rc:1130
+#: Merge.rc:1105 Merge.rc:1138
msgid "I&gnore Changes"
msgstr "I&gnoruoti pokyčius"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_WHITESPACE_IGNOREALL
-#: Merge.rc:1098 Merge.rc:1131
+#: Merge.rc:1106 Merge.rc:1139
msgid "Ig&nore All"
msgstr "Ig&noruoti visus"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_IGNORE_BLANKLINES
-#: Merge.rc:1100 Merge.rc:1133
+#: Merge.rc:1108 Merge.rc:1141
msgid "Ignore Blan&k Lines"
msgstr "Nepaisyti &tuščių eilučių"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_IGNORE_CASE
-#: Merge.rc:1101 Merge.rc:1134
+#: Merge.rc:1109 Merge.rc:1142
msgid "Ignore &Case"
msgstr "Nepaisyti raidžių &dydžio"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_IGNORE_EOL
-#: Merge.rc:1102 Merge.rc:1135
+#: Merge.rc:1110 Merge.rc:1143
msgid "Igno&re EOL Differences (Windows/Unix/Mac)"
msgstr "Igno&ruoti eil. pabaigų formato skirtumus (Windows/Unix/Mac)"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_IGNORE_CODEPAGE
-#: Merge.rc:1103 Merge.rc:1136
+#: Merge.rc:1111 Merge.rc:1144
msgid "Ignore Codepage &Differences"
msgstr "Nepaisyti ko&duočių skirtumų"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_IGNORE_NUMBERS
-#: Merge.rc:1104 Merge.rc:1137
+#: Merge.rc:1112 Merge.rc:1145
msgid "Ignore Num&bers"
msgstr "Ignoruoti skai&čius"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_IGNORE_COMMENTS
-#: Merge.rc:1105 Merge.rc:1138
+#: Merge.rc:1113 Merge.rc:1146
msgid "Ignore C&omment Differences"
msgstr "Nepaisyti skirtumų k&omentaruose"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_IGNORE_MISSING_TRAILING_EOL
-#: Merge.rc:1106 Merge.rc:1139
+#: Merge.rc:1114 Merge.rc:1147
msgid "Ignore &Missing Trailing EOL"
msgstr "Nepaisyti trūksta&mų galinių EOL"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_IGNORE_LINE_BREAKS
-#: Merge.rc:1107 Merge.rc:1140
+#: Merge.rc:1115 Merge.rc:1148
msgid "Ignore Line &Breaks (Treat as Spaces)"
msgstr "Nepaisyti eilutės &lūžių (laikyti tarpais)"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_RECURS_CHECK
-#: Merge.rc:1109 Merge.rc:2963
+#: Merge.rc:1117 Merge.rc:2973
msgid "&Include Subfolders"
msgstr "Įtraukt&i pakatalogius"
#. IDR_POPUP_PROJECT_DIFF_OPTIONS
-#: Merge.rc:1110 Merge.rc:1142
+#: Merge.rc:1118 Merge.rc:1150
msgid "&Compare Method"
msgstr "&Lyginimo metodas"
#. IDS_COMPMETHOD_FULL_CONTENTS
-#: Merge.rc:1112 Merge.rc:1144 Merge.rc:1328 Merge.rc:4282
+#: Merge.rc:1120 Merge.rc:1152 Merge.rc:1338 Merge.rc:4292
msgid "Full Contents"
msgstr "Visas turinys"
#. IDS_COMPMETHOD_QUICK_CONTENTS
-#: Merge.rc:1113 Merge.rc:1145 Merge.rc:1329 Merge.rc:4283
+#: Merge.rc:1121 Merge.rc:1153 Merge.rc:1339 Merge.rc:4293
msgid "Quick Contents"
msgstr "Turinys (greitai)"
#. IDS_COMPMETHOD_BINARY_CONTENTS
-#: Merge.rc:1114 Merge.rc:1146 Merge.rc:1330 Merge.rc:4284
+#: Merge.rc:1122 Merge.rc:1154 Merge.rc:1340 Merge.rc:4294
msgid "Binary Contents"
msgstr "Binarinis turinys"
#. IDS_COMPMETHOD_MODDATE
-#: Merge.rc:1115 Merge.rc:1147 Merge.rc:1331 Merge.rc:4285
+#: Merge.rc:1123 Merge.rc:1155 Merge.rc:1341 Merge.rc:4295
msgid "Modified Date"
msgstr "Pakeista data"
#. IDS_COMPMETHOD_DATESIZE
-#: Merge.rc:1116 Merge.rc:1148 Merge.rc:1332 Merge.rc:4286
+#: Merge.rc:1124 Merge.rc:1156 Merge.rc:1342 Merge.rc:4296
msgid "Modified Date and Size"
msgstr "Pakeista data ir dydis"
#. IDS_COMPMETHOD_SIZE
-#: Merge.rc:1117 Merge.rc:1149 Merge.rc:1333 Merge.rc:4287
+#: Merge.rc:1125 Merge.rc:1157 Merge.rc:1343 Merge.rc:4297
msgid "Size"
msgstr "Dydis"
#. IDS_COMPMETHOD_EXISTENCE
-#: Merge.rc:1118 Merge.rc:1150 Merge.rc:1334 Merge.rc:4288
+#: Merge.rc:1126 Merge.rc:1158 Merge.rc:1344 Merge.rc:4298
msgid "Existence"
msgstr "Egzistavimas"
#. IDR_POPUP_PROJECT, ID_LOAD_PROJECT
-#: Merge.rc:1192
+#: Merge.rc:1202
msgid "&Load Project..."
msgstr "Įke<i projektą..."
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARGALL
-#: Merge.rc:1272 Merge.rc:1301
+#: Merge.rc:1282 Merge.rc:1311
msgid "${*} - All Arguments"
msgstr "${*} - Visi argumentai"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARG1
-#: Merge.rc:1273 Merge.rc:1302
+#: Merge.rc:1283 Merge.rc:1312
msgid "${1} - First Argument"
msgstr "${1} - Pirmas argumentas"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARG2
-#: Merge.rc:1274 Merge.rc:1303
+#: Merge.rc:1284 Merge.rc:1313
msgid "${2} - Second Argument"
msgstr "${2} - Antras argumentas"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARG3
-#: Merge.rc:1275 Merge.rc:1304
+#: Merge.rc:1285 Merge.rc:1314
msgid "${3} - Third Argument"
msgstr "${3} - Trečias argumentas"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARG4
-#: Merge.rc:1276 Merge.rc:1305
+#: Merge.rc:1286 Merge.rc:1315
msgid "${4} - Fourth Argument"
msgstr "${4} - Ketvirtas argumentas"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARG5
-#: Merge.rc:1277 Merge.rc:1306
+#: Merge.rc:1287 Merge.rc:1316
msgid "${5} - Fifth Argument"
msgstr "${5} - Penktas argumentas"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARG6
-#: Merge.rc:1278 Merge.rc:1307
+#: Merge.rc:1288 Merge.rc:1317
msgid "${6} - Sixth Argument"
msgstr "${6} - Šeštas argumentas"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARG7
-#: Merge.rc:1279 Merge.rc:1308
+#: Merge.rc:1289 Merge.rc:1318
msgid "${7} - Seventh Argument"
msgstr "${7} - Septintas argumentas"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARG8
-#: Merge.rc:1280 Merge.rc:1309
+#: Merge.rc:1290 Merge.rc:1319
msgid "${8} - Eighth Argument"
msgstr "${8} - Aštuntas argumentas"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_ARG9
-#: Merge.rc:1281 Merge.rc:1310
+#: Merge.rc:1291 Merge.rc:1320
msgid "${9} - Ninth Argument"
msgstr "${9} - Devintas argumentas"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_SRC_FILE
-#: Merge.rc:1289
+#: Merge.rc:1299
msgid "${SRC_FILE} - Source File"
msgstr "${SRC_FILE} - Pradinis failas"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_SRC_FOLDER
-#: Merge.rc:1290
+#: Merge.rc:1300
msgid "${SRC_FOLDER} - Source Folder"
msgstr "${SRC_FOLDER} - Pradinis katalogas"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_SRC_URL
-#: Merge.rc:1291
+#: Merge.rc:1301
msgid "${SRC_URL} - Source URL"
msgstr "${SRC_URL} - Pradinis URL"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_SRC_URL_PROTOCOL
-#: Merge.rc:1292
+#: Merge.rc:1302
msgid "${SRC_URL_PROTOCOL} - Source URL Protocol"
msgstr "${SRC_URL_PROTOCOL} - Pradinio URL protokolas"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_SRC_URL_SUFFIX
-#: Merge.rc:1293
+#: Merge.rc:1303
msgid "${SRC_URL_SUFFIX} - Source URL Suffix"
msgstr "${SRC_URL_SUFFIX} - Pradinio URL priesaga"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_DST_FILE
-#: Merge.rc:1294
+#: Merge.rc:1304
msgid "${DST_FILE} - Destination File"
msgstr "${DST_FILE} - Rezultatų failas"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_DST_FOLDER
-#: Merge.rc:1295
+#: Merge.rc:1305
msgid "${DST_FOLDER} - Destination Folder"
msgstr "${DST_FOLDER} - Rezultatų katalogas"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_DST_URL
-#: Merge.rc:1296
+#: Merge.rc:1306
msgid "${DST_URL} - Destination URL"
msgstr "${DST_URL} - Rezultatų URL"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_DST_URL_PROTOCOL
-#: Merge.rc:1297
+#: Merge.rc:1307
msgid "${DST_URL_PROTOCOL} - Destination URL Protocol"
msgstr "${DST_URL_PROTOCOL} - Rezultatų URL protokolas"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_DST_URL_SUFFIX
-#: Merge.rc:1298
+#: Merge.rc:1308
msgid "${DST_URL_SUFFIX} - Destination URL Suffix"
msgstr "${DST_URL_SUFFIX} - Rezultatų URL priesaga"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_WINMERGE_HOME
-#: Merge.rc:1299
+#: Merge.rc:1309
msgid "${WINMERGE_HOME} - WinMerge Home Directory"
msgstr "${WINMERGE_HOME} - „Winmerge“ pagrindinis katalogas"
#. IDR_POPUP_PLUGIN_COMMAND_LINE_MENU, ID_PLUGIN_COMMAND_LINE_SCRIPT_FILE
-#: Merge.rc:1300
+#: Merge.rc:1310
msgid "${SCRIPT_FILE} - Script File"
msgstr "${SCRIPT_FILE} - Skripto failas"
#. IDR_POPUP_PLUGIN_ADD_MENU, ID_PLUGIN_ADD_UNPACKER
-#: Merge.rc:1318
+#: Merge.rc:1328
msgid "Add &Unpacker Plugin..."
msgstr "Pridėti &išpakuotoją..."
#. IDR_POPUP_PLUGIN_ADD_MENU, ID_PLUGIN_ADD_PREDIFFER
-#: Merge.rc:1319
+#: Merge.rc:1329
msgid "Add &Prediffer Plugin..."
msgstr "Pridėti &parengėją..."
#. IDR_POPUP_PLUGIN_ADD_MENU, ID_PLUGIN_DUPLICATE
-#: Merge.rc:1320
+#: Merge.rc:1330
msgid "&Duplicate Plugin..."
msgstr "&Dubliuoti papildinį..."
#. IDR_POPUP_OUTPUTVIEW, ID_EDIT_CLEAR_ALL
-#: Merge.rc:1344
+#: Merge.rc:1354
msgid "Clear &All"
msgstr "Išv&alyti viską"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_MASK_CLEAR
-#: Merge.rc:1352
+#: Merge.rc:1362
msgid "&Clear All"
msgstr "&Išvalyti viską"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_MASK_REMOVE_LAST
-#: Merge.rc:1353
+#: Merge.rc:1363
msgid "Remove Last Filter &Group"
msgstr "Pašalinti paskutinę filtrų &grupę"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_MASK_ALL
-#: Merge.rc:1354
+#: Merge.rc:1364
msgid "R&eset to Default (*.*)"
msgstr "A&tstatyti į numatytuosius (*.*)"
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1355
+#: Merge.rc:1365
msgid "Add E&xclude File"
msgstr "Pridėti n&eįtraukiamą failą"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_SYS
-#: Merge.rc:1357
+#: Merge.rc:1367
msgid "&System Files"
msgstr "&Sisteminiai failai"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_BACKUP
-#: Merge.rc:1358
+#: Merge.rc:1368
msgid "&Editor Backup Files"
msgstr "R&edaktoriaus rezerviniai failai"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_BIN
-#: Merge.rc:1359
+#: Merge.rc:1369
msgid "&Compiled Binary Files"
msgstr "&Kompiliuoti binariniai failai"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_LOG
-#: Merge.rc:1360
+#: Merge.rc:1370
msgid "&Log Files"
msgstr "Žurna&lų failai"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_TEMP
-#: Merge.rc:1361
+#: Merge.rc:1371
msgid "&Temporary or Cache Files"
msgstr "Laikinieji ar &talpyklos failai"
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1363
+#: Merge.rc:1373
msgid "Add Excl&ude Folder"
msgstr "Pridėti neįtra&ukiamą katalogą"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FOLDER_VCS
-#: Merge.rc:1365
+#: Merge.rc:1375
msgid "&Version Control"
msgstr "&Versijų kontrolė"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FOLDER_BUILD
-#: Merge.rc:1366
+#: Merge.rc:1376
msgid "&Build Artifacts"
msgstr "Kurimo artefaktai"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FOLDER_IDE
-#: Merge.rc:1367
+#: Merge.rc:1377
msgid "&IDE"
msgstr "&IDE"
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1370
+#: Merge.rc:1380
msgid "Add &File Condition"
msgstr "Pridėti &failo sąlygą"
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1372 Merge.rc:1551
+#: Merge.rc:1382 Merge.rc:1561
msgid "File &Size"
msgstr "Failo dydi&s"
#. IDR_POPUP_FILTERMENU_DIFF_SIZE, ID_FILTERMENU_DIFF_SIZE_LT_1KB
-#: Merge.rc:1374 Merge.rc:1527 Merge.rc:1564 Merge.rc:1629 Merge.rc:1707
+#: Merge.rc:1384 Merge.rc:1537 Merge.rc:1574 Merge.rc:1639 Merge.rc:1717
msgid "Less than 1KB"
msgstr "Mažiau nei 1KB"
#. IDR_POPUP_FILTERMENU_DIFF_SIZE, ID_FILTERMENU_DIFF_SIZE_GE_1KB
-#: Merge.rc:1375 Merge.rc:1528 Merge.rc:1565 Merge.rc:1630 Merge.rc:1708
+#: Merge.rc:1385 Merge.rc:1538 Merge.rc:1575 Merge.rc:1640 Merge.rc:1718
msgid "1KB or more"
msgstr "1KB ar daugiau"
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_LT_10KB
-#: Merge.rc:1376 Merge.rc:1529 Merge.rc:1631
+#: Merge.rc:1386 Merge.rc:1539 Merge.rc:1641
msgid "Less than 10KB"
msgstr "Mažiau nei 10KB"
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_GE_10KB
-#: Merge.rc:1377 Merge.rc:1530 Merge.rc:1632
+#: Merge.rc:1387 Merge.rc:1540 Merge.rc:1642
msgid "10KB or more"
msgstr "10KB ar daugiau"
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_LT_100KB
-#: Merge.rc:1378 Merge.rc:1531 Merge.rc:1633
+#: Merge.rc:1388 Merge.rc:1541 Merge.rc:1643
msgid "Less than 100KB"
msgstr "Mažiau nei 100KB"
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_GE_100KB
-#: Merge.rc:1379 Merge.rc:1532 Merge.rc:1634
+#: Merge.rc:1389 Merge.rc:1542 Merge.rc:1644
msgid "100KB or more"
msgstr "100KB ar daugiau"
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_LT_1MB
-#: Merge.rc:1380 Merge.rc:1533 Merge.rc:1635
+#: Merge.rc:1390 Merge.rc:1543 Merge.rc:1645
msgid "Less than 1MB"
msgstr "Mažiau nei 1MB"
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_GE_1MB
-#: Merge.rc:1381 Merge.rc:1534 Merge.rc:1636
+#: Merge.rc:1391 Merge.rc:1544 Merge.rc:1646
msgid "1MB or more"
msgstr "1MB ar daugiau"
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_LT_10MB
-#: Merge.rc:1382 Merge.rc:1535 Merge.rc:1637
+#: Merge.rc:1392 Merge.rc:1545 Merge.rc:1647
msgid "Less than 10MB"
msgstr "Mažiau nei 10MB"
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_GE_10MB
-#: Merge.rc:1383 Merge.rc:1536 Merge.rc:1638
+#: Merge.rc:1393 Merge.rc:1546 Merge.rc:1648
msgid "10MB or more"
msgstr "10MB ar daugiau"
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_LT_100MB
-#: Merge.rc:1384 Merge.rc:1537 Merge.rc:1639
+#: Merge.rc:1394 Merge.rc:1547 Merge.rc:1649
msgid "Less than 100MB"
msgstr "Mažiau nei 100MB"
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_GE_100MB
-#: Merge.rc:1385 Merge.rc:1538 Merge.rc:1640
+#: Merge.rc:1395 Merge.rc:1548 Merge.rc:1650
msgid "100MB or more"
msgstr "100MB ar daugiau"
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_LT_1GB
-#: Merge.rc:1386 Merge.rc:1539 Merge.rc:1641
+#: Merge.rc:1396 Merge.rc:1549 Merge.rc:1651
msgid "Less than 1GB"
msgstr "Mažiau nei 1GB"
#. IDR_POPUP_FILTERMENU_SIZE, ID_FILTERMENU_SIZE_GE_1GB
-#: Merge.rc:1387 Merge.rc:1642
+#: Merge.rc:1397 Merge.rc:1652
msgid "1GB or more"
msgstr "1GB ar daugiau"
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_RANGE
-#: Merge.rc:1388 Merge.rc:1465 Merge.rc:1517 Merge.rc:1523 Merge.rc:1540
-#: Merge.rc:1566 Merge.rc:1587 Merge.rc:1643 Merge.rc:1709 Merge.rc:1734
+#: Merge.rc:1398 Merge.rc:1475 Merge.rc:1527 Merge.rc:1533 Merge.rc:1550
+#: Merge.rc:1576 Merge.rc:1597 Merge.rc:1653 Merge.rc:1719 Merge.rc:1744
msgid "Custom Range..."
msgstr "Pasirinktinis diapazonas..."
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1390 Merge.rc:1471 Merge.rc:1568
+#: Merge.rc:1400 Merge.rc:1481 Merge.rc:1578
msgid "&Last Modified"
msgstr "Vė&liausiai modifikuota"
#. IDR_POPUP_FILTERMENU_DATE
-#: Merge.rc:1392 Merge.rc:1473 Merge.rc:1651
+#: Merge.rc:1402 Merge.rc:1483 Merge.rc:1661
msgid "&Hour"
msgstr "Valanda"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_HOUR_BEFORE_1
-#: Merge.rc:1394 Merge.rc:1475 Merge.rc:1653
+#: Merge.rc:1404 Merge.rc:1485 Merge.rc:1663
msgid "More than 1 hour ago"
msgstr "Daugiau nei prieš 1 val."
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_HOUR_WITHIN_1
-#: Merge.rc:1395 Merge.rc:1476 Merge.rc:1654
+#: Merge.rc:1405 Merge.rc:1486 Merge.rc:1664
msgid "Within 1 hour"
msgstr "Per 1 valandą"
#. IDR_POPUP_FILTERMENU_DATE
-#: Merge.rc:1397 Merge.rc:1478 Merge.rc:1656
+#: Merge.rc:1407 Merge.rc:1488 Merge.rc:1666
msgid "&Day"
msgstr "&Diena"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_DAY_BEFORE_TODAY
-#: Merge.rc:1399 Merge.rc:1480 Merge.rc:1658
+#: Merge.rc:1409 Merge.rc:1490 Merge.rc:1668
msgid "Before today"
msgstr "Iki šiandien"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_DAY_TODAY
-#: Merge.rc:1400 Merge.rc:1481 Merge.rc:1659
+#: Merge.rc:1410 Merge.rc:1491 Merge.rc:1669
msgid "Today"
msgstr "Šiandien"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_DAY_BEFORE_YESTERDAY
-#: Merge.rc:1401 Merge.rc:1482 Merge.rc:1660
+#: Merge.rc:1411 Merge.rc:1492 Merge.rc:1670
msgid "Before yesterday"
msgstr "Iki vakar"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_DAY_YESTERDAY
-#: Merge.rc:1402 Merge.rc:1483 Merge.rc:1661
+#: Merge.rc:1412 Merge.rc:1493 Merge.rc:1671
msgid "Yesterday"
msgstr "Vakar"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_DAY_SINCE_YESTERDAY
-#: Merge.rc:1403 Merge.rc:1484 Merge.rc:1662
+#: Merge.rc:1413 Merge.rc:1494 Merge.rc:1672
msgid "Since yesterday"
msgstr "Nuo vakar"
#. IDR_POPUP_FILTERMENU_DATE
-#: Merge.rc:1405 Merge.rc:1486 Merge.rc:1664
+#: Merge.rc:1415 Merge.rc:1496 Merge.rc:1674
msgid "&Week"
msgstr "Savaitė"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_WEEK_BEFORE_THIS
-#: Merge.rc:1407 Merge.rc:1488 Merge.rc:1666
+#: Merge.rc:1417 Merge.rc:1498 Merge.rc:1676
msgid "Before this week"
msgstr "Iki šios savaitės"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_WEEK_THIS
-#: Merge.rc:1408 Merge.rc:1489 Merge.rc:1667
+#: Merge.rc:1418 Merge.rc:1499 Merge.rc:1677
msgid "This week"
msgstr "Šią savaitę"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_WEEK_BEFORE_LAST
-#: Merge.rc:1409 Merge.rc:1490 Merge.rc:1668
+#: Merge.rc:1419 Merge.rc:1500 Merge.rc:1678
msgid "Before last week"
msgstr "Iki praeitos savaitės"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_WEEK_LAST
-#: Merge.rc:1410 Merge.rc:1491 Merge.rc:1669
+#: Merge.rc:1420 Merge.rc:1501 Merge.rc:1679
msgid "Last week"
msgstr "Praeitą savaitę"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_WEEK_SINCE_LAST
-#: Merge.rc:1411 Merge.rc:1492 Merge.rc:1670
+#: Merge.rc:1421 Merge.rc:1502 Merge.rc:1680
msgid "Since last week"
msgstr "Nuo praeitos savaitės"
#. IDR_POPUP_FILTERMENU_DATE
-#: Merge.rc:1413 Merge.rc:1494 Merge.rc:1672
+#: Merge.rc:1423 Merge.rc:1504 Merge.rc:1682
msgid "&Month"
msgstr "&Mėnuo"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_MONTH_BEFORE_THIS
-#: Merge.rc:1415 Merge.rc:1496 Merge.rc:1674
+#: Merge.rc:1425 Merge.rc:1506 Merge.rc:1684
msgid "Before this month"
msgstr "Iki šio mėnesio"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_MONTH_THIS
-#: Merge.rc:1416 Merge.rc:1497 Merge.rc:1675
+#: Merge.rc:1426 Merge.rc:1507 Merge.rc:1685
msgid "This month"
msgstr "Šį mėnesį"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_MONTH_BEFORE_LAST
-#: Merge.rc:1417 Merge.rc:1498 Merge.rc:1676
+#: Merge.rc:1427 Merge.rc:1508 Merge.rc:1686
msgid "Before last month"
msgstr "Iki praeito mėnesio"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_MONTH_LAST
-#: Merge.rc:1418 Merge.rc:1499 Merge.rc:1677
+#: Merge.rc:1428 Merge.rc:1509 Merge.rc:1687
msgid "Last month"
msgstr "Praeitą mėnesį"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_MONTH_SINCE_LAST
-#: Merge.rc:1419 Merge.rc:1500 Merge.rc:1678
+#: Merge.rc:1429 Merge.rc:1510 Merge.rc:1688
msgid "Since last month"
msgstr "Nuo praeito mėnesio"
#. IDR_POPUP_FILTERMENU_DATE
-#: Merge.rc:1421 Merge.rc:1502 Merge.rc:1680
+#: Merge.rc:1431 Merge.rc:1512 Merge.rc:1690
msgid "&Year"
msgstr "Metai"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_YEAR_BEFORE_THIS
-#: Merge.rc:1423 Merge.rc:1504 Merge.rc:1682
+#: Merge.rc:1433 Merge.rc:1514 Merge.rc:1692
msgid "Before this year"
msgstr "Iki šių metų"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_YEAR_THIS
-#: Merge.rc:1424 Merge.rc:1505 Merge.rc:1683
+#: Merge.rc:1434 Merge.rc:1515 Merge.rc:1693
msgid "This year"
msgstr "Šiemet"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_YEAR_BEFORE_LAST
-#: Merge.rc:1425 Merge.rc:1506 Merge.rc:1684
+#: Merge.rc:1435 Merge.rc:1516 Merge.rc:1694
msgid "Before last year"
msgstr "Iki praeitų metų"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_YEAR_LAST
-#: Merge.rc:1426 Merge.rc:1507 Merge.rc:1685
+#: Merge.rc:1436 Merge.rc:1517 Merge.rc:1695
msgid "Last year"
msgstr "Praeitais metais"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_YEAR_SINCE_LAST
-#: Merge.rc:1427 Merge.rc:1508 Merge.rc:1686
+#: Merge.rc:1437 Merge.rc:1518 Merge.rc:1696
msgid "Since last year"
msgstr "Nuo praeitų metų"
#. IDR_POPUP_FILTERMENU_DATE, ID_FILTERMENU_DATE_RANGE
-#: Merge.rc:1429 Merge.rc:1510 Merge.rc:1688
+#: Merge.rc:1439 Merge.rc:1520 Merge.rc:1698
msgid "&Custom Range..."
msgstr "Pasirinktinis diapazonas..."
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1431 Merge.rc:1589
+#: Merge.rc:1441 Merge.rc:1599
msgid "&Attributes"
msgstr "&Atributai"
#. IDR_POPUP_FILTERMENU_ATTR, ID_FILTERMENU_ATTR_READONLY
-#: Merge.rc:1433 Merge.rc:1607
+#: Merge.rc:1443 Merge.rc:1617
msgid "Read-only files"
msgstr "Failai „Tik skaitymui“"
#. IDR_POPUP_FILTERMENU_ATTR, ID_FILTERMENU_ATTR_NOT_READONLY
-#: Merge.rc:1434 Merge.rc:1608
+#: Merge.rc:1444 Merge.rc:1618
msgid "Not read-only files"
msgstr "Failai ne „Tik skaitymui“"
#. IDR_POPUP_FILTERMENU_ATTR, ID_FILTERMENU_ATTR_HIDDEN
-#: Merge.rc:1435 Merge.rc:1609
+#: Merge.rc:1445 Merge.rc:1619
msgid "Hidden files"
msgstr "Paslėpti failai"
#. IDR_POPUP_FILTERMENU_ATTR, ID_FILTERMENU_ATTR_NOT_HIDDEN
-#: Merge.rc:1436 Merge.rc:1610
+#: Merge.rc:1446 Merge.rc:1620
msgid "Not hidden files"
msgstr "Ne paslėpti failai"
#. IDR_POPUP_FILTERMENU_ATTR, ID_FILTERMENU_ATTR_SYSTEM
-#: Merge.rc:1437 Merge.rc:1611
+#: Merge.rc:1447 Merge.rc:1621
msgid "System files"
msgstr "Sisteminiai failai"
#. IDR_POPUP_FILTERMENU_ATTR, ID_FILTERMENU_ATTR_NOT_SYSTEM
-#: Merge.rc:1438 Merge.rc:1612
+#: Merge.rc:1448 Merge.rc:1622
msgid "Not system files"
msgstr "Ne sisteminiai failai"
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1440
+#: Merge.rc:1450
msgid "File &Content"
msgstr "Failo &turinys"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_CONTAINS
-#: Merge.rc:1442
+#: Merge.rc:1452
msgid "Contains string..."
msgstr "Yra tekstas..."
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_NOT_CONTAINS
-#: Merge.rc:1443
+#: Merge.rc:1453
msgid "Does not contain string..."
msgstr "Nėra teksto..."
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_FIRST_LINE_CONTAINS
-#: Merge.rc:1444
+#: Merge.rc:1454
msgid "First line contains string..."
msgstr "Pirmoje eilutėje yra tekstas..."
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_FIRST_LINE_NOT_CONTAINS
-#: Merge.rc:1445
+#: Merge.rc:1455
msgid "First line does not contain string..."
msgstr "Pirmoje eilutėje nėra teksto..."
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_FIRST_10_CONTAINS
-#: Merge.rc:1446
+#: Merge.rc:1456
msgid "First 10 lines contain string..."
msgstr "Pirmose 10 eilučių yra tekstas..."
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_FIRST_10_NOT_CONTAINS
-#: Merge.rc:1447
+#: Merge.rc:1457
msgid "First 10 lines do not contain string..."
msgstr "Pirmose 10 eilučių nėra teksto..."
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_LAST_10_CONTAINS
-#: Merge.rc:1448
+#: Merge.rc:1458
msgid "Last 10 lines contain string..."
msgstr "Paskutinėse 10 eilučių yra tekstas..."
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_LAST_10_NOT_CONTAINS
-#: Merge.rc:1449
+#: Merge.rc:1459
msgid "Last 10 lines do not contain string..."
msgstr "Paskutinėse 10 eilučių nėra teksto..."
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_LAST_LINE_CONTAINS
-#: Merge.rc:1450
+#: Merge.rc:1460
msgid "Last line contains string..."
msgstr "Paskutinėje eilutėje yra tekstas..."
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_LAST_LINE_NOT_CONTAINS
-#: Merge.rc:1451
+#: Merge.rc:1461
msgid "Last line does not contain string..."
msgstr "Paskutinėje eilutėje nėra teksto..."
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1453
+#: Merge.rc:1463
msgid "&Line Count"
msgstr "Ei&lučių skaičius"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_LT_10
-#: Merge.rc:1455
+#: Merge.rc:1465
msgid "Less than 10"
msgstr "Mažiau nei 10"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_GE_10
-#: Merge.rc:1456
+#: Merge.rc:1466
msgid "10 or more"
msgstr "10 ar daugiau"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_LT_100
-#: Merge.rc:1457
+#: Merge.rc:1467
msgid "Less than 100"
msgstr "Mažiau nei 100"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_GE_100
-#: Merge.rc:1458
+#: Merge.rc:1468
msgid "100 or more"
msgstr "100 ar daugiau"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_LT_1000
-#: Merge.rc:1459
+#: Merge.rc:1469
msgid "Less than 1000"
msgstr "Mažiau nei 1000"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_GE_1000
-#: Merge.rc:1460
+#: Merge.rc:1470
msgid "1000 or more"
msgstr "1000 ar daugiau"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_LT_10000
-#: Merge.rc:1461
+#: Merge.rc:1471
msgid "Less than 10000"
msgstr "Mažiau nei 10000"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_GE_10000
-#: Merge.rc:1462
+#: Merge.rc:1472
msgid "10000 or more"
msgstr "10000 ar daugiau"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_LT_100000
-#: Merge.rc:1463
+#: Merge.rc:1473
msgid "Less than 100000"
msgstr "Mažiau nei 100000"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_GE_100000
-#: Merge.rc:1464
+#: Merge.rc:1474
msgid "100000 or more"
msgstr "100000 ar daugiau"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_PROPS
-#: Merge.rc:1467 Merge.rc:1594 Merge.rc:1761 Merge.rc:1778
+#: Merge.rc:1477 Merge.rc:1604 Merge.rc:1771 Merge.rc:1788
msgid "Additional &Properties..."
msgstr "&Papildomos savybės..."
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1469
+#: Merge.rc:1479
msgid "Add F&older Condition"
msgstr "Pridėti katal&ogo sąlygą"
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1513
+#: Merge.rc:1523
msgid "&Files"
msgstr "&Failai"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FOLDER_FILES_EQ_0
-#: Merge.rc:1515
+#: Merge.rc:1525
msgid "0 files"
msgstr "0 failų"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FOLDER_FILES_GE_1
-#: Merge.rc:1516
+#: Merge.rc:1526
msgid "1 file or more"
msgstr "1 ar daugiau failas (-ų)"
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1519
+#: Merge.rc:1529
msgid "&Items"
msgstr "Elementa&i"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FOLDER_ITEMS_EQ_0
-#: Merge.rc:1521
+#: Merge.rc:1531
msgid "0 items"
msgstr "0 elementų"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FOLDER_ITEMS_GE_1
-#: Merge.rc:1522
+#: Merge.rc:1532
msgid "1 item or more"
msgstr "1 ar daugiau elementas (-ų)"
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1525
+#: Merge.rc:1535
msgid "&Total Size"
msgstr "&Dydis iš viso"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FOLDER_STATS_RECURSIVE
-#: Merge.rc:1542
+#: Merge.rc:1552
msgid "&Recursive"
msgstr "&Rekursinis"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONDITION_ANY
-#: Merge.rc:1544
+#: Merge.rc:1554
msgid "Target: &Any (Left/Middle/Right)"
msgstr "Rezultatai: Bet kur (Kairėje/Viduryje/Dešinėje)"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONDITION_LEFT
-#: Merge.rc:1545
+#: Merge.rc:1555
msgid "Target: &Left"
msgstr "Rezultatai: &Kairėje"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONDITION_MIDDLE
-#: Merge.rc:1546
+#: Merge.rc:1556
msgid "Target: &Middle"
msgstr "Rezultatai: &Viduryje"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONDITION_RIGHT
-#: Merge.rc:1547
+#: Merge.rc:1557
msgid "Target: &Right"
msgstr "Rezultatai: &Dešinėje"
#. IDR_POPUP_FILTERMENU
-#: Merge.rc:1549
+#: Merge.rc:1559
msgid "Add &Difference Condition"
msgstr "Pri&dėti skirtumo sąlygą"
#. IDR_POPUP_FILTERMENU_DIFF_PROP, ID_FILTERMENU_DIFF_PROP_EQUAL
-#: Merge.rc:1553 Merge.rc:1570 Merge.rc:1591 Merge.rc:1696 Merge.rc:1717
-#: Merge.rc:1742
+#: Merge.rc:1563 Merge.rc:1580 Merge.rc:1601 Merge.rc:1706 Merge.rc:1727
+#: Merge.rc:1752
msgid "Equal"
msgstr "Lygu"
#. IDR_POPUP_FILTERMENU_DIFF_PROP, ID_FILTERMENU_DIFF_PROP_NOT_EQUAL
-#: Merge.rc:1554 Merge.rc:1571 Merge.rc:1592 Merge.rc:1697 Merge.rc:1718
-#: Merge.rc:1743
+#: Merge.rc:1564 Merge.rc:1581 Merge.rc:1602 Merge.rc:1707 Merge.rc:1728
+#: Merge.rc:1753
msgid "Not Equal"
msgstr "Nelygu"
#. IDR_POPUP_FILTERMENU_DIFF_PROP, ID_FILTERMENU_DIFF_PROP_LESS
-#: Merge.rc:1555 Merge.rc:1572 Merge.rc:1698 Merge.rc:1719 Merge.rc:1744
+#: Merge.rc:1565 Merge.rc:1582 Merge.rc:1708 Merge.rc:1729 Merge.rc:1754
msgid "Less Than"
msgstr "Mažiau nei"
#. IDR_POPUP_FILTERMENU_DIFF_PROP, ID_FILTERMENU_DIFF_PROP_LESS_EQUAL
-#: Merge.rc:1556 Merge.rc:1573 Merge.rc:1699 Merge.rc:1720 Merge.rc:1745
+#: Merge.rc:1566 Merge.rc:1583 Merge.rc:1709 Merge.rc:1730 Merge.rc:1755
msgid "Less Than or Equal to"
msgstr "Mažiau nei arba lygu"
#. IDR_POPUP_FILTERMENU_DIFF_PROP, ID_FILTERMENU_DIFF_PROP_GREATER
-#: Merge.rc:1557 Merge.rc:1574 Merge.rc:1700 Merge.rc:1721 Merge.rc:1746
+#: Merge.rc:1567 Merge.rc:1584 Merge.rc:1710 Merge.rc:1731 Merge.rc:1756
msgid "Greater Than"
msgstr "Daugiau nei"
#. IDR_POPUP_FILTERMENU_DIFF_PROP, ID_FILTERMENU_DIFF_PROP_GREATER_EQUAL
-#: Merge.rc:1558 Merge.rc:1575 Merge.rc:1701 Merge.rc:1722 Merge.rc:1747
+#: Merge.rc:1568 Merge.rc:1585 Merge.rc:1711 Merge.rc:1732 Merge.rc:1757
msgid "Greater Than or Equal to"
msgstr "Daugiau nei arba lygu"
#. IDR_POPUP_FILTERMENU_DIFF_SIZE, ID_FILTERMENU_DIFF_SIZE_LT_10B
-#: Merge.rc:1560 Merge.rc:1703
+#: Merge.rc:1570 Merge.rc:1713
msgid "Less than 10B"
msgstr "Mažiau nei 10B"
#. IDR_POPUP_FILTERMENU_DIFF_SIZE, ID_FILTERMENU_DIFF_SIZE_GE_10B
-#: Merge.rc:1561 Merge.rc:1704
+#: Merge.rc:1571 Merge.rc:1714
msgid "10B or more"
msgstr "10B ar daugiau"
#. IDR_POPUP_FILTERMENU_DIFF_SIZE, ID_FILTERMENU_DIFF_SIZE_LT_100B
-#: Merge.rc:1562 Merge.rc:1705
+#: Merge.rc:1572 Merge.rc:1715
msgid "Less than 100B"
msgstr "Mažiau nei 100B"
#. IDR_POPUP_FILTERMENU_DIFF_SIZE, ID_FILTERMENU_DIFF_SIZE_GE_100B
-#: Merge.rc:1563 Merge.rc:1706
+#: Merge.rc:1573 Merge.rc:1716
msgid "100B or more"
msgstr "100B ar daugiau"
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_LT_1SECOND
-#: Merge.rc:1577 Merge.rc:1724
+#: Merge.rc:1587 Merge.rc:1734
msgid "Less than 1 second"
msgstr "Mažiau nei 1 sekundė"
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_GE_1SECOND
-#: Merge.rc:1578 Merge.rc:1725
+#: Merge.rc:1588 Merge.rc:1735
msgid "1 second or more"
msgstr "1 sekundė ar daugiau"
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_LT_1MINUTE
-#: Merge.rc:1579 Merge.rc:1726
+#: Merge.rc:1589 Merge.rc:1736
msgid "Less than 1 minute"
msgstr "Mažiau nei 1 minutė"
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_GE_1MINUTE
-#: Merge.rc:1580 Merge.rc:1727
+#: Merge.rc:1590 Merge.rc:1737
msgid "1 minute or more"
msgstr "1 minutė ar daugiau"
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_LT_1HOUR
-#: Merge.rc:1581 Merge.rc:1728
+#: Merge.rc:1591 Merge.rc:1738
msgid "Less than 1 hour"
msgstr "Mažiau nei 1 valanda"
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_GE_1HOUR
-#: Merge.rc:1582 Merge.rc:1729
+#: Merge.rc:1592 Merge.rc:1739
msgid "1 hour or more"
msgstr "1 valanda ar daugiau"
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_LT_1DAY
-#: Merge.rc:1583 Merge.rc:1730
+#: Merge.rc:1593 Merge.rc:1740
msgid "Less than 1 day"
msgstr "Mažiau nei 1 diena"
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_GE_1DAY
-#: Merge.rc:1584 Merge.rc:1731
+#: Merge.rc:1594 Merge.rc:1741
msgid "1 day or more"
msgstr "1 diena ar daugiau"
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_LT_1WEEK
-#: Merge.rc:1585 Merge.rc:1732
+#: Merge.rc:1595 Merge.rc:1742
msgid "Less than 1 week"
msgstr "Mažiau nei 1 savaitė"
#. IDR_POPUP_FILTERMENU_DIFF_DATE, ID_FILTERMENU_DIFF_DATE_GE_1WEEK
-#: Merge.rc:1586 Merge.rc:1733
+#: Merge.rc:1596 Merge.rc:1743
msgid "1 week or more"
msgstr "1 savaitė ar daugiau"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_CONDITION_DIFF_LEFT_RIGHT
-#: Merge.rc:1596
+#: Merge.rc:1606
msgid "Target: &Left and Right"
msgstr "Rezultatai: &Kairėje ir Dešinėje"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_CONDITION_DIFF_LEFT_MIDDLE
-#: Merge.rc:1597
+#: Merge.rc:1607
msgid "Target: Left and &Middle"
msgstr "Rezultatai: Kairėje ir &Viduryje"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_CONDITION_DIFF_MIDDLE_RIGHT
-#: Merge.rc:1598
+#: Merge.rc:1608
msgid "Target: Middle and &Right"
msgstr "Rezultatai: Viduryje ir &Dešinėje"
#. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_CONDITION_DIFF_ALL
-#: Merge.rc:1599
+#: Merge.rc:1609
msgid "Target: &All"
msgstr "Rezultatai: &Visi"
#. IDR_POPUP_FILTERMENU_BINARY, ID_FILTERMENU_BINARY_ONLY
-#: Merge.rc:1620
+#: Merge.rc:1630
msgid "Binary files only"
msgstr "Tik binariniai failai"
#. IDR_POPUP_FILTERMENU_BINARY, ID_FILTERMENU_TEXT_ONLY
-#: Merge.rc:1621
+#: Merge.rc:1631
msgid "Text files only"
msgstr "Tik tekstiniai failai"
#. IDR_POPUP_ADDCMPMENU, ID_ADDCMPMENU_CLEAR
-#: Merge.rc:1755
+#: Merge.rc:1765
msgid "&Clear conditions"
msgstr "&Išvalyti sąlygas"
#. IDR_POPUP_ADDCMPMENU, ID_ADDCMPMENU_CMP_SIZE
-#: Merge.rc:1757
+#: Merge.rc:1767
msgid "Compare &Size"
msgstr "Lyginti &dydį"
#. IDR_POPUP_ADDCMPMENU, ID_ADDCMPMENU_CMP_DATE
-#: Merge.rc:1758
+#: Merge.rc:1768
msgid "Compare &Date"
msgstr "Lyginti &datą"
#. IDR_POPUP_ADDCMPMENU, ID_ADDCMPMENU_CMP_ATTR
-#: Merge.rc:1759
+#: Merge.rc:1769
msgid "Compare &Attributes"
msgstr "Lyginti &atributus"
#. IDR_POPUP_ADDCMPMENU, ID_ADDCMPMENU_CMP_CONTENTS
-#: Merge.rc:1760
+#: Merge.rc:1770
msgid "Compare C&ontents"
msgstr "Lyginti t&urinį"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_CLEAR
-#: Merge.rc:1769
+#: Merge.rc:1779
msgid "&Clear Keys"
msgstr "&Išvalyti raktus"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_NAME
-#: Merge.rc:1771
+#: Merge.rc:1781
msgid "&Name"
msgstr "Pavadi&nimas"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_BASENAME
-#: Merge.rc:1772
+#: Merge.rc:1782
msgid "&Base name (without extension)"
msgstr "&Bazinis pavadinimas (be plėtinio)"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_NORMALIZED_NAME
-#: Merge.rc:1773
+#: Merge.rc:1783
msgid "Normalized &Unicode Name"
msgstr "Normalizuotas &Unicode pavadinimas"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_RELPATH
-#: Merge.rc:1774
+#: Merge.rc:1784
msgid "&Relative Path"
msgstr "&Santykinis kelias"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_DATE
-#: Merge.rc:1776
+#: Merge.rc:1786
msgid "&Date"
msgstr "&Data"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_HASH_MD5
-#: Merge.rc:1777
+#: Merge.rc:1787
msgid "&Hash (MD5)"
msgstr "&Maiša (MD5)"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_REPLACE
-#: Merge.rc:1780
+#: Merge.rc:1790
msgid "Insert &replace() Function"
msgstr "Įterpti &replace() funkciją"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_REGEXREPLACE
-#: Merge.rc:1781
+#: Merge.rc:1791
msgid "Insert rege&xReplace() Function"
msgstr "Įterpti rege&xReplace() funkciją"
#. IDR_POPUP_RENAMEMOVE_MENU
-#: Merge.rc:1782
+#: Merge.rc:1792
msgid "Replace &Lists"
msgstr "Pakeitimų &sąrašai"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_CREATE_REPLACELIST
-#: Merge.rc:1784
+#: Merge.rc:1794
msgid "&Create String Replace List and Insert..."
msgstr "&Kurti eilučių pakeitimų sąrašą ir įterpti..."
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_CREATE_REGEXREPLACELIST
-#: Merge.rc:1785
+#: Merge.rc:1795
msgid "Create &Regex Replace List and Insert..."
msgstr "Kurti &Regex pakeitimų sąrašą ir įterpti..."
#. IDR_POPUP_RENAMEMOVE_MENU
-#: Merge.rc:1787
+#: Merge.rc:1797
msgid "&String Replace Lists"
msgstr "Eilučių pakeitimų &sąrašai"
#. IDR_POPUP_RENAMEMOVE_MENU
-#: Merge.rc:1791
+#: Merge.rc:1801
msgid "Re&gex Replace Lists"
msgstr "Re&gex pakeitimų sąrašai"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_STRING_REPLACE_LISTS_FOLDER
-#: Merge.rc:1796
+#: Merge.rc:1806
msgid "Open String Replace Lists Folder..."
msgstr "Atverti eilučių pakeitimų sąrašų katalogą..."
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_REGEX_REPLACE_LISTS_FOLDER
-#: Merge.rc:1797
+#: Merge.rc:1807
msgid "Open Regex Replace Lists Folder..."
msgstr "Atverti Regex pakeitimų sąrašų katalogą..."
#. IDD_FILTERS_CONDITION, IDC_CONDITION_MATCHCASE
-#: Merge.rc:1799 Merge.rc:1995 Merge.rc:2014 Merge.rc:2042 Merge.rc:2585
+#: Merge.rc:1809 Merge.rc:2005 Merge.rc:2024 Merge.rc:2052 Merge.rc:2595
msgid "Match &case"
msgstr "Paisyti &raidžių dydžio"
#. IDR_POPUP_RENAMEMOVE_MENU
-#: Merge.rc:1801
+#: Merge.rc:1811
msgid "Text &Normalization"
msgstr "Teksto &normalizavimas"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_TOLOWER
-#: Merge.rc:1803
+#: Merge.rc:1813
msgid "&Lowercase"
msgstr "&Mažosiomis raidėmis"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_TOUPPER
-#: Merge.rc:1804
+#: Merge.rc:1814
msgid "&Uppercase"
msgstr "&Didžiosiomis raidėmis"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_TOHALFWIDTH
-#: Merge.rc:1805
+#: Merge.rc:1815
msgid "&Half-width"
msgstr "&Pusė pločio"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_TOFULLWIDTH
-#: Merge.rc:1806
+#: Merge.rc:1816
msgid "&Full-width"
msgstr "&Visas plotis"
#. IDR_POPUP_RENAMEMOVE_MENU
-#: Merge.rc:1807
+#: Merge.rc:1817
msgid "&Chinese Conversion"
msgstr "&Kinų k. konvertavimas"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_TOSIMPLIFIEDCHINESE
-#: Merge.rc:1809
+#: Merge.rc:1819
msgid "&Simplified Chinese"
msgstr "&Supaprastinta kinų"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_TOTRADITIONALCHINESE
-#: Merge.rc:1810
+#: Merge.rc:1820
msgid "&Traditional Chinese"
msgstr "&Tradicinė kinų"
#. IDR_POPUP_RENAMEMOVE_MENU
-#: Merge.rc:1812
+#: Merge.rc:1822
msgid "&Japanese Conversion"
msgstr "&Japonų k. konvertavimas"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_TOHIRAGANA
-#: Merge.rc:1814
+#: Merge.rc:1824
msgid "&Hiragana"
msgstr "&Hiragana"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_TOKATAKANA
-#: Merge.rc:1815
+#: Merge.rc:1825
msgid "&Katakana"
msgstr "&Katakana"
#. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_NORMALIZEUNICODE
-#: Merge.rc:1817
+#: Merge.rc:1827
msgid "Normalize &Unicode"
msgstr "Normalizuoti &Unicode"
#. IDD_ABOUTBOX
-#: Merge.rc:1932
+#: Merge.rc:1942
msgid "About WinMerge"
msgstr "Apie WinMerge"
#. IDD_ABOUTBOX, IDC_WWW
-#: Merge.rc:1936
+#: Merge.rc:1946
msgid "Visit the WinMerge Homepage!"
msgstr "Aplankykite „WinMerge“ namų puslapį!"
#. IDD_PLUGINS_EDITPLUGIN, IDOK
-#: Merge.rc:1938 Merge.rc:2080 Merge.rc:2431 Merge.rc:2455 Merge.rc:2469
-#: Merge.rc:2497 Merge.rc:2588 Merge.rc:2613 Merge.rc:2674 Merge.rc:2691
-#: Merge.rc:2703 Merge.rc:2867 Merge.rc:2927 Merge.rc:3062 Merge.rc:3104
-#: Merge.rc:3147 Merge.rc:3197
+#: Merge.rc:1948 Merge.rc:2090 Merge.rc:2441 Merge.rc:2465 Merge.rc:2479
+#: Merge.rc:2507 Merge.rc:2598 Merge.rc:2623 Merge.rc:2684 Merge.rc:2701
+#: Merge.rc:2713 Merge.rc:2877 Merge.rc:2937 Merge.rc:3072 Merge.rc:3114
+#: Merge.rc:3157 Merge.rc:3207
msgid "OK"
msgstr "Gerai"
#. IDD_ABOUTBOX, IDC_OPEN_CONTRIBUTORS
-#: Merge.rc:1939
+#: Merge.rc:1949
msgid "Contributors"
msgstr "Talkininkai"
#. IDD_SELECT_FILES_OR_FOLDERS
-#: Merge.rc:1945 Merge.rc:3070
+#: Merge.rc:1955 Merge.rc:3080
msgid "Select Files or Folders"
msgstr "Parinkite failus ar katalogus"
#. IDD_OPEN, IDC_FILES_DIRS_GROUP0
-#: Merge.rc:1949
+#: Merge.rc:1959
msgid "&1st File or Folder"
msgstr "&1-as failas ar katalogas"
#. IDD_OPEN, IDC_PATH0_READONLY
-#: Merge.rc:1951
+#: Merge.rc:1961
msgid "Re&ad-only"
msgstr "Tik sk&aitymui"
#. IDD_OPEN, IDC_SWAP01_STATIC
-#: Merge.rc:1953
+#: Merge.rc:1963
msgid "Swap 1st | 2nd"
msgstr "Sukeisti 1-ą | 2-ą"
#. IDD_GENERATE_PATCH, IDC_DIFF_BROWSE_FILE1
-#: Merge.rc:1954 Merge.rc:2310 Merge.rc:2413
+#: Merge.rc:1964 Merge.rc:2320 Merge.rc:2423
msgid "&Browse..."
msgstr "&Rasti..."
#. IDD_OPEN, IDC_FILES_DIRS_GROUP1
-#: Merge.rc:1955
+#: Merge.rc:1965
msgid "&2nd File or Folder"
msgstr "&2-as failas ar katalogas"
#. IDD_OPEN, IDC_PATH1_READONLY
-#: Merge.rc:1957
+#: Merge.rc:1967
msgid "Rea&d-only"
msgstr "Tik ska&itymui"
#. IDD_OPEN, IDC_SWAP12_STATIC
-#: Merge.rc:1959
+#: Merge.rc:1969
msgid "Swap 2nd | 3rd"
msgstr "Sukeisti 2-ą | 3-ią"
#. IDD_PROPPAGE_SYSTEM, IDC_FILTER_USER_BROWSE
-#: Merge.rc:1960 Merge.rc:2315
+#: Merge.rc:1970 Merge.rc:2325
msgid "B&rowse..."
msgstr "R&asti..."
#. IDD_OPEN, IDC_FILES_DIRS_GROUP2
-#: Merge.rc:1961
+#: Merge.rc:1971
msgid "&3rd File or Folder (Optional)"
msgstr "&3-ias failas ar katalogas (nebūtinas)"
#. IDD_OPEN, IDC_PATH2_READONLY
-#: Merge.rc:1963
+#: Merge.rc:1973
msgid "Read-o&nly"
msgstr "Tik skai&tymui"
#. IDD_OPEN, IDC_SWAP02_STATIC
-#: Merge.rc:1965
+#: Merge.rc:1975
msgid "Swap 1st | 3rd"
msgstr "Sukeisti 1-ą | 3-ią"
#. IDD_PROPPAGE_BACKUPS, IDC_BACKUP_BROWSE
-#: Merge.rc:1966 Merge.rc:2685 Merge.rc:2883
+#: Merge.rc:1976 Merge.rc:2695 Merge.rc:2893
msgid "Browse..."
msgstr "Rasti..."
#. IDD_OPEN, IDC_FILES_DIRS_GROUP3
-#: Merge.rc:1968
+#: Merge.rc:1978
msgid " Folder: Filter"
msgstr " Katalogams: Filtras"
#. IDD_OPEN, IDC_RECURS_CHECK
-#: Merge.rc:1971
+#: Merge.rc:1981
msgid "&Include subfolders"
msgstr "Įtraukt&i pakatalogius"
#. IDD_OPEN, IDC_FILES_DIRS_GROUP5
-#: Merge.rc:1972
+#: Merge.rc:1982
msgid " File: Prediffer Plugin"
msgstr " Failams: Parengėjas"
#. IDD_OPEN, IDC_FILES_DIRS_GROUP4
-#: Merge.rc:1976
+#: Merge.rc:1986
msgid " File: Unpacker Plugin"
msgstr " Failams: Išpakuotojas"
#. IDD_OPEN, IDC_SELECT_UNPACKER
-#: Merge.rc:1978
+#: Merge.rc:1988
msgid "Se&lect..."
msgstr "Pa&rinkti..."
#. IDD_PLUGINS_EDITPLUGIN, IDCANCEL
-#: Merge.rc:1981 Merge.rc:2001 Merge.rc:2025 Merge.rc:2046 Merge.rc:2081
-#: Merge.rc:2432 Merge.rc:2456 Merge.rc:2470 Merge.rc:2498 Merge.rc:2551
-#: Merge.rc:2589 Merge.rc:2614 Merge.rc:2675 Merge.rc:2692 Merge.rc:2704
-#: Merge.rc:2868 Merge.rc:2928 Merge.rc:3087 Merge.rc:3105 Merge.rc:3148
-#: Merge.rc:3198
+#: Merge.rc:1991 Merge.rc:2011 Merge.rc:2035 Merge.rc:2056 Merge.rc:2091
+#: Merge.rc:2442 Merge.rc:2466 Merge.rc:2480 Merge.rc:2508 Merge.rc:2561
+#: Merge.rc:2599 Merge.rc:2624 Merge.rc:2685 Merge.rc:2702 Merge.rc:2714
+#: Merge.rc:2878 Merge.rc:2938 Merge.rc:3097 Merge.rc:3115 Merge.rc:3158
+#: Merge.rc:3208
msgid "Cancel"
msgstr "Atsisakyti"
#. IDD_OPEN, IDC_OPEN_STATUS
-#: Merge.rc:1982
+#: Merge.rc:1992
msgid "Status:"
msgstr "Būsena:"
#. IDD_PLUGINS_LIST, ID_HELP
-#: Merge.rc:1983 Merge.rc:2082 Merge.rc:2929
+#: Merge.rc:1993 Merge.rc:2092 Merge.rc:2939
msgid "Help"
msgstr "Pagalba"
#. IDD_OPEN, IDC_OPTIONS
-#: Merge.rc:1984
+#: Merge.rc:1994
msgid "&Options..."
msgstr "Nu&ostatos..."
#. IDD_EDIT_FIND
-#: Merge.rc:1989
+#: Merge.rc:1999
msgid "Find"
msgstr "Rasti"
#. IDD_EDIT_MARKER, IDC_STATIC
-#: Merge.rc:1992 Merge.rc:2009 Merge.rc:2037
+#: Merge.rc:2002 Merge.rc:2019 Merge.rc:2047
msgid "Fi&nd what:"
msgstr "Ko &ieškoti?:"
#. IDD_EDIT_MARKER, IDC_EDIT_WHOLE_WORD
-#: Merge.rc:1994 Merge.rc:2013 Merge.rc:2041
+#: Merge.rc:2004 Merge.rc:2023 Merge.rc:2051
msgid "Match &whole word only"
msgstr "Tik &pilnų žodžių"
#. IDD_EDIT_MARKER, IDC_EDIT_REGEXP
-#: Merge.rc:1996 Merge.rc:2015 Merge.rc:2043
+#: Merge.rc:2006 Merge.rc:2025 Merge.rc:2053
msgid "Regular &expression"
msgstr "Naud. reguliariąją &išraišką"
#. IDD_EDIT_FIND, IDC_FINDDLG_DONTWRAP
-#: Merge.rc:1997
+#: Merge.rc:2007
msgid "D&on't wrap end of file"
msgstr "Fail&o gale nepradėti iš pradžių"
#. IDD_EDIT_FIND, IDC_FINDDLG_DONTCLOSE
-#: Merge.rc:1998
+#: Merge.rc:2008
msgid "&Don't close this dialog"
msgstr "Neužverti šio &dialogo lango"
#. IDD_EDIT_REPLACE, IDC_EDIT_SKIP
-#: Merge.rc:1999 Merge.rc:2021
+#: Merge.rc:2009 Merge.rc:2031
msgid "&Find Next"
msgstr "&Rasti kitą"
#. IDD_EDIT_FIND, IDC_EDIT_FINDPREV
-#: Merge.rc:2000
+#: Merge.rc:2010
msgid "Find &Prev"
msgstr "Rasti &praeitą"
#. IDD_EDIT_REPLACE
-#: Merge.rc:2006
+#: Merge.rc:2016
msgid "Replace"
msgstr "Pakeisti"
#. IDD_EDIT_REPLACE, IDC_STATIC
-#: Merge.rc:2011
+#: Merge.rc:2021
msgid "Re&place with:"
msgstr "&Pakeisti kuo:"
#. IDD_EDIT_REPLACE, IDC_EDIT_SCOPE_DONT_WRAP
-#: Merge.rc:2016
+#: Merge.rc:2026
msgid "&Don't wrap at end of file"
msgstr "Failo gale nepra&dėti iš pradžių"
#. IDD_EDIT_REPLACE, IDC_STATIC
-#: Merge.rc:2018
+#: Merge.rc:2028
msgid "Replace in"
msgstr "Keisti"
#. IDD_EDIT_REPLACE, IDC_EDIT_SCOPE_WHOLE_FILE
-#: Merge.rc:2020
+#: Merge.rc:2030
msgid "Wh&ole file"
msgstr "Vi&same faile"
#. IDD_EDIT_REPLACE, IDC_EDIT_FINDPREV
-#: Merge.rc:2022
+#: Merge.rc:2032
msgid "Find Pre&v"
msgstr "Rasti praei&tą"
#. IDD_EDIT_REPLACE, IDC_EDIT_REPLACE
-#: Merge.rc:2023
+#: Merge.rc:2033
msgid "&Replace"
msgstr "&Pakeisti"
#. IDD_EDIT_REPLACE, IDC_EDIT_REPLACE_ALL
-#: Merge.rc:2024
+#: Merge.rc:2034
msgid "Replace &All"
msgstr "Pakeisti v&iską"
#. IDS_OPTIONSPG_MARKERCOLORS
-#: Merge.rc:2030 Merge.rc:4209
+#: Merge.rc:2040 Merge.rc:4219
msgid "Markers"
msgstr "Žymeklių"
#. IDD_EDIT_MARKER, IDC_EDIT_MARKERS_ENABLED
-#: Merge.rc:2033
+#: Merge.rc:2043
msgid "Enable &markers"
msgstr "Įjungti žy&meklius"
#. IDD_FILTERS_LINEFILTERS, IDC_LFILTER_ADDBTN
-#: Merge.rc:2035 Merge.rc:2057
+#: Merge.rc:2045 Merge.rc:2067
msgid "New"
msgstr "Naujas"
#. IDD_EDIT_MARKER, IDC_STATIC
-#: Merge.rc:2039
+#: Merge.rc:2049
msgid "&Background color:"
msgstr "&Fono spalva:"
#. IDS_MESSAGEBOX_OK
-#: Merge.rc:2044 Merge.rc:2829 Merge.rc:3086 Merge.rc:4171
+#: Merge.rc:2054 Merge.rc:2839 Merge.rc:3096 Merge.rc:4181
msgid "&Ok"
msgstr "&Gerai"
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:2045 Merge.rc:2525 Merge.rc:3199
+#: Merge.rc:2055 Merge.rc:2535 Merge.rc:3209
msgid "&Apply"
msgstr "T&aikyti"
#. IDD_FILTERS_LINEFILTERS
-#: Merge.rc:2051
+#: Merge.rc:2061
msgid "Line Filters"
msgstr "Eilutės filtrai"
#. IDD_FILTERS_LINEFILTERS, IDC_IGNOREREGEXP
-#: Merge.rc:2054
+#: Merge.rc:2064
msgid "Enable Line Filters"
msgstr "Įjungti eilutės filtrus"
#. IDD_FILTERS_LINEFILTERS, IDC_STATIC
-#: Merge.rc:2055
+#: Merge.rc:2065
msgid "Regular Expressions (one per line):"
msgstr "Reguliarieji reiškiniai (vienas eilutėje):"
#. IDD_PLUGINS_LIST, IDC_PLUGIN_EDIT
-#: Merge.rc:2058 Merge.rc:2924
+#: Merge.rc:2068 Merge.rc:2934
msgid "Edit"
msgstr "Redaguoti"
#. IDD_PLUGINS_LIST, IDC_PLUGIN_REMOVE
-#: Merge.rc:2059 Merge.rc:2071 Merge.rc:2925
+#: Merge.rc:2069 Merge.rc:2081 Merge.rc:2935
msgid "Remove"
msgstr "Pašalinti"
#. IDD_FILTERS_SUBSTITUTIONFILTERS
-#: Merge.rc:2064
+#: Merge.rc:2074
msgid "Substitution Filters"
msgstr "Keitinių filtrai"
#. IDD_FILTERS_SUBSTITUTIONFILTERS, IDC_STATIC
-#: Merge.rc:2067
+#: Merge.rc:2077
msgid "Changes to the listed pairs below will be ignored or marked as insignificant. Patches are unaffected."
msgstr "Skirtumai, kurie rodomi skyduose kaip toliau išvardytos poros, bus ignoruojami arba pažymėti kaip nereikšmingi. Pataisos nepaveikiamos."
#. IDD_FILTERS_SUBSTITUTIONFILTERS, IDC_IGNORED_SUSBSTITUTIONS_ENABLED
-#: Merge.rc:2068
+#: Merge.rc:2078
msgid "Enable"
msgstr "Įjungti"
#. IDD_PLUGINS_LIST, IDC_PLUGIN_ADD
-#: Merge.rc:2070 Merge.rc:2923
+#: Merge.rc:2080 Merge.rc:2933
msgid "Add"
msgstr "Pridėti"
#. IDD_FILTERS_SUBSTITUTIONFILTERS, IDC_LFILTER_CLEARBTN
-#: Merge.rc:2072
+#: Merge.rc:2082
msgid "Clear"
msgstr "Išvalyti"
#. IDD_PREFERENCES
-#: Merge.rc:2077
+#: Merge.rc:2087
msgid "Options"
msgstr "Nuostatos"
#. IDD_PREFERENCES, IDC_TREEOPT_IMPORT
-#: Merge.rc:2086
+#: Merge.rc:2096
msgid "Import..."
msgstr "Importuoti..."
#. IDD_PREFERENCES, IDC_TREEOPT_EXPORT
-#: Merge.rc:2087
+#: Merge.rc:2097
msgid "Export..."
msgstr "Eksportuoti..."
#. IDS_OPTIONSPG_GENCOMPARE
-#: Merge.rc:2092 Merge.rc:4199 Merge.rc:4202 Merge.rc:4219
+#: Merge.rc:2102 Merge.rc:4209 Merge.rc:4212 Merge.rc:4229
msgid "General"
msgstr "Bendros"
#. IDD_PROPPAGE_GENERAL, IDC_SCROLL_CHECK
-#: Merge.rc:2095
+#: Merge.rc:2105
msgid "Automatically &scroll to first difference"
msgstr "Automatiškai pa&slinkti prie pirmo skirtumo"
#. IDD_PROPPAGE_GENERAL, IDC_SCROLL_TO_FIRST_INLINE_DIFF_CHECK
-#: Merge.rc:2097
+#: Merge.rc:2107
msgid "Automatically s&croll to first inline difference"
msgstr "Automatiškai pas&linkti prie pirmo skirtumo eilutėje"
#. IDD_PROPPAGE_GENERAL, IDC_STATIC
-#: Merge.rc:2099
+#: Merge.rc:2109
msgid "Cl&ose windows with 'Esc':"
msgstr "Užverti langus „Esc“ klavišu:"
#. IDD_PROPPAGE_GENERAL, IDC_VERIFY_OPEN_PATHS
-#: Merge.rc:2101
+#: Merge.rc:2111
msgid "&Automatically verify paths in Open dialog"
msgstr "&Automatiškai tikrinti kelius „Atverti“ lange"
#. IDD_PROPPAGE_GENERAL, IDC_STATIC
-#: Merge.rc:2103
+#: Merge.rc:2113
msgid "Single instance mode:"
msgstr "Vieno programos egzemplioriaus režimas:"
#. IDD_PROPPAGE_GENERAL, IDC_ASK_MULTIWINDOW_CLOSE
-#: Merge.rc:2105
+#: Merge.rc:2115
msgid "As&k when closing multiple windows"
msgstr "&Klausti patvirtinimo, kai uždaromi keli langai"
#. IDD_PROPPAGE_GENERAL, IDC_PRESERVE_FILETIME
-#: Merge.rc:2107
+#: Merge.rc:2117
msgid "&Preserve file time in file compare"
msgstr "Lyginant failus ne&pakeisti failo keitimo laiko"
#. IDD_PROPPAGE_GENERAL, IDC_STARTUP_FOLDER_SELECT
-#: Merge.rc:2109
+#: Merge.rc:2119
msgid "Show \"Select Files or Folders\" dialog on startup"
msgstr "Rodyti „Parinkite failus ar katalogus“ startuojant"
#. IDD_PROPPAGE_GENERAL, IDC_CLOSE_WITH_OK
-#: Merge.rc:2111
+#: Merge.rc:2121
msgid "Close \"Select Files or Folders\" dialog on clicking Compare button"
msgstr "Užverti „Parinkite failus ar katalogus“ po „Lyginti“ paspaudimo"
#. IDD_PROPPAGE_GENERAL, IDC_STATIC
-#: Merge.rc:2113
+#: Merge.rc:2123
msgid "Op&en dialog Auto completion:"
msgstr "Lango „Atv&erti“ automatinis užpildymas:"
#. IDD_PROPPAGE_GENERAL, IDC_STATIC
-#: Merge.rc:2115
+#: Merge.rc:2125
msgid "Auto-&reload modified files:"
msgstr "Automatiškai iš naujo &įkelti pakeistus failus:"
#. IDD_PROPPAGE_GENERAL, IDC_STATIC
-#: Merge.rc:2117
+#: Merge.rc:2127
msgid "Language:"
msgstr "Kalba:"
#. IDD_PROPPAGE_COMPARE_WEBPAGE, IDC_COMPARE_DEFAULTS
-#: Merge.rc:2119 Merge.rc:2299 Merge.rc:2321 Merge.rc:2352 Merge.rc:2369
-#: Merge.rc:2386 Merge.rc:2394 Merge.rc:2430 Merge.rc:2454 Merge.rc:2633
-#: Merge.rc:2644 Merge.rc:2653 Merge.rc:2887 Merge.rc:2922 Merge.rc:2985
-#: Merge.rc:3010 Merge.rc:3024 Merge.rc:3038 Merge.rc:3054
+#: Merge.rc:2129 Merge.rc:2309 Merge.rc:2331 Merge.rc:2362 Merge.rc:2379
+#: Merge.rc:2396 Merge.rc:2404 Merge.rc:2440 Merge.rc:2464 Merge.rc:2643
+#: Merge.rc:2654 Merge.rc:2663 Merge.rc:2897 Merge.rc:2932 Merge.rc:2995
+#: Merge.rc:3020 Merge.rc:3034 Merge.rc:3048 Merge.rc:3064
msgid "Defaults"
msgstr "Numat. reikšmės"
#. IDS_OPTIONSPG_COLORS
-#: Merge.rc:2124 Merge.rc:2140 Merge.rc:2267 Merge.rc:2292 Merge.rc:4205
+#: Merge.rc:2134 Merge.rc:2150 Merge.rc:2277 Merge.rc:2302 Merge.rc:4215
msgid "Colors"
msgstr "Spalvų"
#. IDD_PROPPAGE_COLOR_SCHEMES, IDC_STATIC
-#: Merge.rc:2127
+#: Merge.rc:2137
msgid "Color &mode:"
msgstr "Spalvinė &būsena:"
#. IDD_PROPPAGE_COLOR_SCHEMES, IDC_STATIC
-#: Merge.rc:2129
+#: Merge.rc:2139
msgid "&Light mode scheme:"
msgstr "&Šviesi schema:"
#. IDD_PROPPAGE_COLOR_SCHEMES, IDC_STATIC
-#: Merge.rc:2131
+#: Merge.rc:2141
msgid "&Dark mode scheme:"
msgstr "&Tamsi schema:"
#. IDD_PROPPAGE_COLOR_SCHEMES, IDC_STATIC
-#: Merge.rc:2133
+#: Merge.rc:2143
msgid "Your custom schemes"
msgstr "Pasirinktinės schemos"
#. IDD_PROPPAGE_COLOR_SCHEMES, IDC_COLOR_SCHEME_SAVE
-#: Merge.rc:2134
+#: Merge.rc:2144
msgid "&Save current scheme..."
msgstr "Iš&saugoti dabartinę schemą..."
#. IDD_PROPPAGE_COLOR_SCHEMES, IDC_COLOR_SCHEME_DELETE
-#: Merge.rc:2135
+#: Merge.rc:2145
msgid "Delete ¤t scheme..."
msgstr "Pašalinti dabartinę s&chemą..."
#. IDD_PROPPAGE_COLORS_DIR, IDC_BACKGROUND_COLUMN_LABEL
-#: Merge.rc:2143 Merge.rc:2238 Merge.rc:2258 Merge.rc:2272
+#: Merge.rc:2153 Merge.rc:2248 Merge.rc:2268 Merge.rc:2282
msgid "Background"
msgstr "Fono"
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2144
+#: Merge.rc:2154
msgid "Deleted"
msgstr "Ištrinto"
#. IDS_OPTIONSPG_TEXTCOLORS
-#: Merge.rc:2145 Merge.rc:2207 Merge.rc:2239 Merge.rc:2273 Merge.rc:4207
+#: Merge.rc:2155 Merge.rc:2217 Merge.rc:2249 Merge.rc:2283 Merge.rc:4217
msgid "Text"
msgstr "Tekstų"
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2146
+#: Merge.rc:2156
msgid "Difference:"
msgstr "Skirtumas:"
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2151
+#: Merge.rc:2161
msgid "Selected Difference:"
msgstr "Pažymėtas skirtumas:"
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2156
+#: Merge.rc:2166
msgid "Ignored Difference:"
msgstr "Ignoruotas skirtumas:"
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2161
+#: Merge.rc:2171
msgid "Moved:"
msgstr "Perkeltas:"
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2166
+#: Merge.rc:2176
msgid "Selected Moved:"
msgstr "Pažymėtas perkeltas:"
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2171
+#: Merge.rc:2181
msgid "Same As Next (3 panes):"
msgstr "Toks pat kaip kitas (3 polangiai):"
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2176
+#: Merge.rc:2186
msgid "Same As Next (Selected):"
msgstr "Toks pat kaip kitas (pažymėtas):"
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2181
+#: Merge.rc:2191
msgid "Word Difference:"
msgstr "Žodžio skirtumas:"
#. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC
-#: Merge.rc:2186
+#: Merge.rc:2196
msgid "Selected Word Diff:"
msgstr "Pažym. žodžio skirtumas:"
#. IDD_INPUTBOX
-#: Merge.rc:2195 Merge.rc:2230 Merge.rc:2251 Merge.rc:3099
+#: Merge.rc:2205 Merge.rc:2240 Merge.rc:2261 Merge.rc:3109
msgid "Dialog"
msgstr "Dialogas"
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC
-#: Merge.rc:2198
+#: Merge.rc:2208
msgid "Keywords:"
msgstr "Raktažodžiai:"
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC
-#: Merge.rc:2199
+#: Merge.rc:2209
msgid "Function names:"
msgstr "Funkcijų vardai:"
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC
-#: Merge.rc:2200
+#: Merge.rc:2210
msgid "Comments:"
msgstr "Komentarai:"
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC
-#: Merge.rc:2201
+#: Merge.rc:2211
msgid "Numbers:"
msgstr "Skaičiai:"
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC
-#: Merge.rc:2202
+#: Merge.rc:2212
msgid "Operators:"
msgstr "Operatoriai:"
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC
-#: Merge.rc:2203
+#: Merge.rc:2213
msgid "Strings:"
msgstr "Eilutės:"
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC
-#: Merge.rc:2204
+#: Merge.rc:2214
msgid "Preprocessor:"
msgstr "Preprocessorius:"
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC
-#: Merge.rc:2205
+#: Merge.rc:2215
msgid "User 1:"
msgstr "Naudotojas 1:"
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC
-#: Merge.rc:2206
+#: Merge.rc:2216
msgid "User 2:"
msgstr "Naudotojas 2:"
#. IDD_PROPPAGE_COLORS_SYNTAX, IDC_SCOLOR_USER2_BOLD
-#: Merge.rc:2209 Merge.rc:2211 Merge.rc:2213 Merge.rc:2215 Merge.rc:2217
-#: Merge.rc:2219 Merge.rc:2221 Merge.rc:2223 Merge.rc:2225
+#: Merge.rc:2219 Merge.rc:2221 Merge.rc:2223 Merge.rc:2225 Merge.rc:2227
+#: Merge.rc:2229 Merge.rc:2231 Merge.rc:2233 Merge.rc:2235
msgid "Bold"
msgstr "Pastorintas"
#. IDD_PROPPAGE_COLORS_TEXT, IDC_DEFAULT_STANDARD_COLORS
-#: Merge.rc:2233
+#: Merge.rc:2243
msgid "&Use customized text colors"
msgstr "Na&udoti pasirinkt. teksto spalvas"
#. IDD_PROPPAGE_COLORS_TEXT, IDC_WHITESPACE_COLOR_LABEL
-#: Merge.rc:2235
+#: Merge.rc:2245
msgid "Whitespace:"
msgstr "Tarpas:"
#. IDD_PROPPAGE_COLORS_TEXT, IDC_TEXT_COLOR_LABEL
-#: Merge.rc:2236
+#: Merge.rc:2246
msgid "Regular text:"
msgstr "Paprastas tekstas:"
#. IDD_PROPPAGE_COLORS_TEXT, IDC_SELECTION_COLOR_LABEL
-#: Merge.rc:2237
+#: Merge.rc:2247
msgid "Selection:"
msgstr "Pažymėtas fragmentas:"
#. IDD_PROPPAGE_COLORS_DIR, IDC_STATIC
-#: Merge.rc:2245 Merge.rc:2286
+#: Merge.rc:2255 Merge.rc:2296
msgid "Margin:"
msgstr "Paraštė:"
#. IDD_PROPPAGE_COLORS_MARKER, IDC_MARKER0_COLOR_LABEL
-#: Merge.rc:2254
+#: Merge.rc:2264
msgid "Search Marker:"
msgstr "Paieškos žymeklis:"
#. IDD_PROPPAGE_COLORS_MARKER, IDC_MARKER1_COLOR_LABEL
-#: Merge.rc:2255
+#: Merge.rc:2265
msgid "User Defined Marker 1:"
msgstr "Naudotojo žymeklis 1:"
#. IDD_PROPPAGE_COLORS_MARKER, IDC_MARKER2_COLOR_LABEL
-#: Merge.rc:2256
+#: Merge.rc:2266
msgid "User Defined Marker 2:"
msgstr "Naudotojo žymeklis 2:"
#. IDD_PROPPAGE_COLORS_MARKER, IDC_MARKER3_COLOR_LABEL
-#: Merge.rc:2257
+#: Merge.rc:2267
msgid "User Defined Marker 3:"
msgstr "Naudotojo žymeklis 3:"
#. IDD_PROPPAGE_COLORS_DIR, IDC_USE_DIR_COMPARE_COLORS
-#: Merge.rc:2270
+#: Merge.rc:2280
msgid "&Use folder compare colors"
msgstr "Na&udoti katalogų lyginimo spalvas"
#. IDD_PROPPAGE_COLORS_DIR, IDC_STATIC
-#: Merge.rc:2274
+#: Merge.rc:2284
msgid "Items equal:"
msgstr "Elementai vienodi:"
#. IDD_PROPPAGE_COLORS_DIR, IDC_STATIC
-#: Merge.rc:2277
+#: Merge.rc:2287
msgid "Items different:"
msgstr "Elementai skiriasi:"
#. IDD_PROPPAGE_COLORS_DIR, IDC_STATIC
-#: Merge.rc:2280
+#: Merge.rc:2290
msgid "Items missing:"
msgstr "Elementų nėra:"
#. IDD_PROPPAGE_COLORS_DIR, IDC_STATIC
-#: Merge.rc:2283
+#: Merge.rc:2293
msgid "Items filtered:"
msgstr "Elementai filtruoti:"
#. IDD_PROPPAGE_COLORS_SYSTEM, IDC_SYSCOLOR_HOOK_ENABLED
-#: Merge.rc:2295
+#: Merge.rc:2305
msgid "&Use custom system colors"
msgstr "Na&udoti pasirinkt. sistemos spalvas"
#. IDS_PRPCAT_SYSTEM
-#: Merge.rc:2304 Merge.rc:4211 Merge.rc:4212 Merge.rc:4657
+#: Merge.rc:2314 Merge.rc:4221 Merge.rc:4222 Merge.rc:4667
msgid "System"
msgstr "Sistemos"
#. IDD_PROPPAGE_SYSTEM, IDC_USE_RECYCLE_BIN
-#: Merge.rc:2307
+#: Merge.rc:2317
msgid "&Use Recycle Bin"
msgstr "Na&udoti šiukšliadėžę"
#. IDD_PROPPAGE_SYSTEM, IDC_STATIC
-#: Merge.rc:2308
+#: Merge.rc:2318
msgid "&External editor:"
msgstr "Išorinis r&edaktorius:"
#. IDD_PROPPAGE_SYSTEM, IDC_STATIC
-#: Merge.rc:2311
+#: Merge.rc:2321
msgid "&Store user data in:"
msgstr "Naudotojo duomenis &saugoti:"
#. IDD_PROPPAGE_SYSTEM, IDC_STATIC
-#: Merge.rc:2313
+#: Merge.rc:2323
msgid "&Filter folder:"
msgstr "&Filtro katalogas:"
#. IDD_PROPPAGE_SYSTEM, IDC_STATIC
-#: Merge.rc:2316
+#: Merge.rc:2326
msgid "Temporary files folder"
msgstr "Laikinų failų katalogas"
#. IDD_PROPPAGE_SYSTEM, IDC_TMPFOLDER_SYSTEM
-#: Merge.rc:2317
+#: Merge.rc:2327
msgid "S&ystem temp folder"
msgstr "S&istemos laikinasis katalogas"
#. IDD_PROPPAGE_SYSTEM, IDC_STATIC
-#: Merge.rc:2318
+#: Merge.rc:2328
msgid "C&ustom folder:"
msgstr "P&asirinktinis katalogas:"
#. IDD_GENERATE_PATCH, IDC_DIFF_BROWSE_FILE2
-#: Merge.rc:2320 Merge.rc:2416
+#: Merge.rc:2330 Merge.rc:2426
msgid "Br&owse..."
msgstr "Ra&sti..."
#. IDS_OPTIONSPG_COMPARE
-#: Merge.rc:2326 Merge.rc:4200
+#: Merge.rc:2336 Merge.rc:4210
msgid "Compare"
msgstr "Lyginimo"
#. IDD_PROPPAGE_COMPARE, IDC_STATIC
-#: Merge.rc:2329
+#: Merge.rc:2339
msgid "Whitespaces"
msgstr "Tarpai"
#. IDD_PROPPAGE_COMPARE, IDC_WHITESPACE
-#: Merge.rc:2330
+#: Merge.rc:2340
msgid "&Compare"
msgstr "&Lyginti"
#. IDD_PROPPAGE_COMPARE, IDC_WHITE_CHANGE
-#: Merge.rc:2331
+#: Merge.rc:2341
msgid "&Ignore change"
msgstr "&Ignoruoti pokyčius"
#. IDD_PROPPAGE_COMPARE, IDC_ALL_WHITE
-#: Merge.rc:2332
+#: Merge.rc:2342
msgid "I&gnore all"
msgstr "I&gnoruoti visus"
#. IDD_PROPPAGE_COMPARE, IDC_IGNBLANKS_CHECK
-#: Merge.rc:2333
+#: Merge.rc:2343
msgid "Ignore blan&k lines"
msgstr "Nepaisyti &tuščių eilučių"
#. IDD_PROPPAGE_COMPARE, IDC_IGNCASE_CHECK
-#: Merge.rc:2334
+#: Merge.rc:2344
msgid "Ignore &case"
msgstr "Nepaisyti raidžių &dydžio"
#. IDD_PROPPAGE_COMPARE, IDC_EOL_SENSITIVE
-#: Merge.rc:2335
+#: Merge.rc:2345
msgid "Igno&re EOL differences (Windows/Unix/Mac)"
msgstr "Igno&ruoti eil. pabaigų formato skirtumus (Windows/Unix/Mac)"
#. IDD_PROPPAGE_COMPARE, IDC_IGNORE_NUMBERS
-#: Merge.rc:2337
+#: Merge.rc:2347
msgid "Ignore num&bers"
msgstr "Ignoruoti skai&čius"
#. IDD_PROPPAGE_COMPARE, IDC_CP_SENSITIVE
-#: Merge.rc:2338
+#: Merge.rc:2348
msgid "Ignore codepage &differences"
msgstr "Nepaisyti ko&duočių skirtumų"
#. IDD_PROPPAGE_COMPARE, IDC_FILTERCOMMENTS_CHECK
-#: Merge.rc:2339
+#: Merge.rc:2349
msgid "Ignore c&omment differences"
msgstr "Nepaisyti skirtumų k&omentaruose"
#. IDD_PROPPAGE_COMPARE, IDC_IGNEOFEOL_CHECK
-#: Merge.rc:2341
+#: Merge.rc:2351
msgid "Ignore &missing trailing EOL"
msgstr "Nepaisyti trūksta&mų galinių EOL"
#. IDD_PROPPAGE_COMPARE, IDC_IGNLBRKS_CHECK
-#: Merge.rc:2343
+#: Merge.rc:2353
msgid "Ignore line &breaks (treat as spaces)"
msgstr "Nepaisyti eilutės &lūžių (laikyti tarpais)"
#. IDD_PROPPAGE_COMPARE, IDC_MOVED_BLOCKS
-#: Merge.rc:2345
+#: Merge.rc:2355
msgid "E&nable moved block detection"
msgstr "Įju&ngti perkeltų blokų aptikimą"
#. IDD_PROPPAGE_COMPARE, IDC_ALIGN_SIMILAR_LINES
-#: Merge.rc:2346
+#: Merge.rc:2356
msgid "Align &similar lines"
msgstr "&Sutapdinti panašias eilutes"
#. IDD_PROPPAGE_COMPARE, IDC_STATIC
-#: Merge.rc:2347
+#: Merge.rc:2357
msgid "Diff &algorithm:"
msgstr "Lyginimo &algoritmas:"
#. IDD_PROPPAGE_COMPARE, IDC_INDENT_HEURISTIC
-#: Merge.rc:2349
+#: Merge.rc:2359
msgid "Enable indent &heuristic"
msgstr "Įgalinti &heuristinę įtrauką"
#. IDD_PROPPAGE_COMPARE, IDC_COMPLETELY_BLANK_OUT_IGNORED_DIFFERENCES
-#: Merge.rc:2350
+#: Merge.rc:2360
msgid "Completely unhighlight the ignored differences"
msgstr "Visiškai nuimti paryškinimą ignoruojamiems skirtumams"
#. IDS_OPTIONSPG_EDITOR
-#: Merge.rc:2357 Merge.rc:4201
+#: Merge.rc:2367 Merge.rc:4211
msgid "Editor"
msgstr "Redaktoriaus"
#. IDD_PROPPAGE_EDITOR, IDC_HILITE_CHECK
-#: Merge.rc:2360
+#: Merge.rc:2370
msgid "&Highlight syntax"
msgstr "&Naudoti sintaksės paryškinimą"
#. IDD_PROPPAGE_EDITOR, IDC_MIXED_EOL
-#: Merge.rc:2361
+#: Merge.rc:2371
msgid "&Preserve original EOL"
msgstr "Išsaugoti originalų eil. pabaigos formatą"
#. IDD_PROPPAGE_EDITOR, IDC_STATIC
-#: Merge.rc:2362
+#: Merge.rc:2372
msgid "Tabs"
msgstr "TAB simboliai"
#. IDD_PROPPAGE_EDITOR, IDC_STATIC
-#: Merge.rc:2363
+#: Merge.rc:2373
msgid "&Tab size:"
msgstr "&TAB simbolio dydis:"
#. IDD_PROPPAGE_EDITOR, IDC_PROP_INSERT_TABS
-#: Merge.rc:2365
+#: Merge.rc:2375
msgid "&Insert tabs"
msgstr "Įterpt&i TAB simbolius"
#. IDD_PROPPAGE_EDITOR, IDC_PROP_INSERT_SPACES
-#: Merge.rc:2366
+#: Merge.rc:2376
msgid "Insert &spaces"
msgstr "Įterpti tarpu&s"
#. IDD_PROPPAGE_EDITOR, IDC_STATIC
-#: Merge.rc:2367
+#: Merge.rc:2377
msgid "&Rendering mode:"
msgstr "Atvaizdavimo &režimas:"
#. IDD_PROPPAGE_EDITOR_COMPAREMERGE, IDC_AUTOMRESCAN_CHECK
-#: Merge.rc:2376
+#: Merge.rc:2386
msgid "&Automatic rescan"
msgstr "&Automatiškai perskanuoti"
#. IDD_PROPPAGE_EDITOR_COMPAREMERGE, IDC_STATIC
-#: Merge.rc:2377
+#: Merge.rc:2387
msgid "Copy &granularity for selected differences:"
msgstr "Kopijuoti pasirinktų skirtumų &granuliuotumą:"
#. IDD_PROPPAGE_EDITOR_COMPAREMERGE, IDC_LINE_COLORING_GROUP
-#: Merge.rc:2379
+#: Merge.rc:2389
msgid "Line Difference Coloring"
msgstr "Skirtumų eilutėse spalvinimas"
#. IDD_PROPPAGE_EDITOR_COMPAREMERGE, IDC_VIEW_LINE_DIFFERENCES
-#: Merge.rc:2380
+#: Merge.rc:2390
msgid "View line differences"
msgstr "Rodyti skirtumus eilutėse"
#. IDD_PROPPAGE_EDITOR_COMPAREMERGE, IDC_EDITOR_CHARLEVEL
-#: Merge.rc:2381
+#: Merge.rc:2391
msgid "&Character-level"
msgstr "&Simbolio lygyje"
#. IDD_PROPPAGE_EDITOR_COMPAREMERGE, IDC_EDITOR_WORDLEVEL
-#: Merge.rc:2382
+#: Merge.rc:2392
msgid "&Word-level:"
msgstr "Žo&džio lygyje:"
#. IDD_PROPPAGE_EDITOR_COMPAREMERGE, IDC_STATIC
-#: Merge.rc:2384
+#: Merge.rc:2394
msgid "W&ord break characters:"
msgstr "Ž&odžių skirtukų simboliai:"
#. IDD_PROPPAGE_MESSAGEBOXES, IDC_STATIC
-#: Merge.rc:2401
+#: Merge.rc:2411
msgid "Some messages can be hidden by the user. Press Reset to make all messages visible again."
msgstr "Naudotojas gali paslėpti kai kuriuos bendrus pranešimus. Paspauskite mygtuką „Atkurti“, kad visi pranešimai vėl būtų matomi."
#. IDD_SELECT_FILES_OR_FOLDERS, IDC_RESET
-#: Merge.rc:2402 Merge.rc:3085
+#: Merge.rc:2412 Merge.rc:3095
msgid "Reset"
msgstr "Atkurti"
#. IDD_GENERATE_PATCH
-#: Merge.rc:2408
+#: Merge.rc:2418
msgid "Patch Generator"
msgstr "Pataisos generatorius"
#. IDD_GENERATE_PATCH, IDC_STATIC
-#: Merge.rc:2411
+#: Merge.rc:2421
msgid "File&1:"
msgstr "Failas&1:"
#. IDD_GENERATE_PATCH, IDC_STATIC
-#: Merge.rc:2414
+#: Merge.rc:2424
msgid "File&2:"
msgstr "Failas&2:"
#. IDD_GENERATE_PATCH, IDC_DIFF_SWAPFILES
-#: Merge.rc:2417
+#: Merge.rc:2427
msgid "&Swap"
msgstr "&Sukeisti"
#. IDD_DIRCMP_REPORT, IDC_REPORT_COPYCLIPBOARD
-#: Merge.rc:2418 Merge.rc:2690
+#: Merge.rc:2428 Merge.rc:2700
msgid "&Copy to clipboard"
msgstr "&Kopijuoti į mainų sritį"
#. IDD_GENERATE_PATCH, IDC_DIFF_APPENDFILE
-#: Merge.rc:2419
+#: Merge.rc:2429
msgid "&Append to existing file"
msgstr "Pridėti prie es&amo failo"
#. IDD_GENERATE_PATCH, IDC_STATIC
-#: Merge.rc:2420
+#: Merge.rc:2430
msgid "&Result:"
msgstr "&Rezultatas:"
#. IDD_GENERATE_PATCH, IDC_DIFF_BROWSE_RESULT
-#: Merge.rc:2422
+#: Merge.rc:2432
msgid "Bro&wse..."
msgstr "Ras&ti..."
#. IDD_GENERATE_PATCH, IDC_STATIC
-#: Merge.rc:2423
+#: Merge.rc:2433
msgid "&Format"
msgstr "&Formatas"
#. IDD_GENERATE_PATCH, IDC_STATIC
-#: Merge.rc:2424
+#: Merge.rc:2434
msgid "St&yle:"
msgstr "St&ilius:"
#. IDD_GENERATE_PATCH, IDC_STATIC
-#: Merge.rc:2426
+#: Merge.rc:2436
msgid "&Context:"
msgstr "&Kontekstas:"
#. IDD_GENERATE_PATCH, IDC_DIFF_INCLCMDLINE
-#: Merge.rc:2428
+#: Merge.rc:2438
msgid "Inclu&de command line"
msgstr "Įterpti koman&dinę eilutę"
#. IDD_GENERATE_PATCH, IDC_DIFF_OPENTOEDITOR
-#: Merge.rc:2429
+#: Merge.rc:2439
msgid "Open in e&xternal editor"
msgstr "Atverti &išoriniame redaktoriuje"
#. IDD_DIRCOLS
-#: Merge.rc:2446
+#: Merge.rc:2456
msgid "Display Columns"
msgstr "Rodyti stulpelius"
#. IDD_DIRCOLS, IDC_UP
-#: Merge.rc:2450
+#: Merge.rc:2460
msgid "Move &Up"
msgstr "Perkelti a&ukštyn"
#. IDD_DIRCOLS, IDC_DOWN
-#: Merge.rc:2451
+#: Merge.rc:2461
msgid "Move &Down"
msgstr "Perkelti ž&emyn"
#. IDD_DIRCOLS, IDC_COLDLG_ADDITIONAL_PROPERTIES
-#: Merge.rc:2453
+#: Merge.rc:2463
msgid "&Additional Properties"
msgstr "P&apildomos savybės"
#. IDD_DIRADDITIONALPROPS
-#: Merge.rc:2461
+#: Merge.rc:2471
msgid "Additional Properties"
msgstr "Papildomos savybės"
#. IDD_PLUGINS_SELECTPLUGIN
-#: Merge.rc:2475
+#: Merge.rc:2485
msgid "Select Plugin"
msgstr "Pasirinkite papildinį"
#. IDD_PLUGINS_EDITPLUGIN, IDC_STATIC
-#: Merge.rc:2478 Merge.rc:3115
+#: Merge.rc:2488 Merge.rc:3125
msgid "Plugin &name:"
msgstr "Papildinio pavadini&mas:"
#. IDD_PLUGINS_SELECTPLUGIN, IDC_STATIC
-#: Merge.rc:2480
+#: Merge.rc:2490
msgid "&Target files:"
msgstr "Rezulta&to failai:"
#. IDD_PLUGINS_EDITPLUGIN, IDC_STATIC
-#: Merge.rc:2482 Merge.rc:3117
+#: Merge.rc:2492 Merge.rc:3127
msgid "Extensions list:"
msgstr "Plėtinių sąrašas:"
#. IDD_PLUGINS_EDITPLUGIN, IDC_STATIC
-#: Merge.rc:2484 Merge.rc:3119
+#: Merge.rc:2494 Merge.rc:3129
msgid "Description:"
msgstr "Aprašas:"
#. IDD_PLUGINS_EDITPLUGIN, IDC_STATIC
-#: Merge.rc:2486 Merge.rc:3121
+#: Merge.rc:2496 Merge.rc:3131
msgid "Default arguments:"
msgstr "Numatytieji argumentai:"
#. IDD_PLUGINS_SELECTPLUGIN, IDC_PLUGIN_ALLOW_ALL
-#: Merge.rc:2488
+#: Merge.rc:2498
msgid "Display all plugins (Ignore extension)"
msgstr "Rodyti visus papildinius netikrinant plėtinių"
#. IDD_PLUGINS_SELECTPLUGIN, IDC_PLUGIN_OPEN_IN_SAME_FRAME_TYPE
-#: Merge.rc:2490
+#: Merge.rc:2500
msgid "&Open files in same window type after unpacking"
msgstr "P&o išpakavimo atidaryti failus to paties tipo lange"
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_PIPELINE_STATIC
-#: Merge.rc:2492 Merge.rc:3129
+#: Merge.rc:2502 Merge.rc:3139
msgid "&Plugin pipeline:"
msgstr "&Papildinio komandų grandinė:"
#. IDD_PLUGINS_SELECTPLUGIN, IDC_PLUGIN_ALIAS
-#: Merge.rc:2495
+#: Merge.rc:2505
msgid "&Alias..."
msgstr "Pseudonim&as..."
#. IDD_DIRCOMP_PROGRESS, IDC_COMPARISON_STOP
-#: Merge.rc:2505
+#: Merge.rc:2515
msgid "Stop"
msgstr "Sustoti"
#. IDD_DIRCOMP_PROGRESS, IDC_COMPARISON_PAUSE
-#: Merge.rc:2506
+#: Merge.rc:2516
msgid "Pause"
msgstr "Pristabdyti"
#. IDD_DIRCOMP_PROGRESS, IDC_COMPARISON_CONTINUE
-#: Merge.rc:2507
+#: Merge.rc:2517
msgid "Continue"
msgstr "Tęsti"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC
-#: Merge.rc:2509 Merge.rc:2973
+#: Merge.rc:2519 Merge.rc:2983
msgid "C&PU cores to use:"
msgstr "Naudojamas &procesoriaus branduolių skaičius:"
#. IDD_DIRCOMP_PROGRESS, IDC_STATIC
-#: Merge.rc:2510
+#: Merge.rc:2520
msgid "Items total:"
msgstr "Iš viso elementų:"
#. IDD_DIRCOMP_PROGRESS, IDC_STATIC
-#: Merge.rc:2511
+#: Merge.rc:2521
msgid "Items compared:"
msgstr "Elementų palyginta:"
#. IDS_PREVIEWBAR_CLOSE
-#: Merge.rc:2526 Merge.rc:2846 Merge.rc:5328
+#: Merge.rc:2536 Merge.rc:2856 Merge.rc:5339
msgid "&Close"
msgstr "&Užverti"
#. IDD_WMGOTO
-#: Merge.rc:2537
+#: Merge.rc:2547
msgid "Go to"
msgstr "Pereiti į"
#. IDD_WMGOTO, IDC_STATIC
-#: Merge.rc:2540
+#: Merge.rc:2550
msgid "G&o to:"
msgstr "P&ereiti:"
#. IDD_WMGOTO, IDC_STATIC
-#: Merge.rc:2543
+#: Merge.rc:2553
msgid "File"
msgstr "Failas"
#. IDD_WMGOTO, IDC_STATIC
-#: Merge.rc:2547
+#: Merge.rc:2557
msgid "Go to what"
msgstr "Pereiti į"
#. IDD_WMGOTO, IDC_WMGOTO_TOLINE
-#: Merge.rc:2548
+#: Merge.rc:2558
msgid "Li&ne"
msgstr "Ei&lutę"
#. IDD_WMGOTO, IDC_WMGOTO_TODIFF
-#: Merge.rc:2549
+#: Merge.rc:2559
msgid "&Difference"
msgstr "&Skirtumą"
#. IDD_WMGOTO, IDOK
-#: Merge.rc:2550
+#: Merge.rc:2560
msgid "&Go to"
msgstr "&Pereiti į"
#. IDS_PROJECT_ITEM_FILE_FILTER
-#: Merge.rc:2556 Merge.rc:4321
+#: Merge.rc:2566 Merge.rc:4331
msgid "File Filters"
msgstr "Failo filtrai"
#. IDD_FILTERS_FILEFILTERS, IDC_STATIC
-#: Merge.rc:2559
+#: Merge.rc:2569
msgid "&Mask / Filter Expression"
msgstr "&Šablono / filtro išraiška"
#. IDD_FILTERS_FILEFILTERS, IDC_STATIC
-#: Merge.rc:2562
+#: Merge.rc:2572
msgid "Preset &Filters"
msgstr "Iš anksto nustatyti &filtrai"
#. IDD_FILTERS_FILEFILTERS, IDC_FILTERFILE_TEST_BTN
-#: Merge.rc:2564
+#: Merge.rc:2574
msgid "Test..."
msgstr "Testas..."
#. IDD_FILTERS_FILEFILTERS, IDC_FILTERFILE_INSTALL
-#: Merge.rc:2565
+#: Merge.rc:2575
msgid "Install..."
msgstr "Diegti..."
#. IDD_FILTERS_FILEFILTERS, IDC_FILTERFILE_NEWBTN
-#: Merge.rc:2566
+#: Merge.rc:2576
msgid "New..."
msgstr "Naujas..."
#. IDD_FILTERS_FILEFILTERS, IDC_FILTERFILE_EDITBTN
-#: Merge.rc:2567
+#: Merge.rc:2577
msgid "Edit..."
msgstr "Redaguoti..."
#. IDD_FILTERS_FILEFILTERS, IDC_FILTERFILE_DELETEBTN
-#: Merge.rc:2568
+#: Merge.rc:2578
msgid "Delete..."
msgstr "Trinti..."
#. IDD_FILTERS_CONDITION
-#: Merge.rc:2573
+#: Merge.rc:2583
msgid "Filter Condition"
msgstr "Filtro sąlyga"
#. IDD_FILTERS_CONDITION, IDC_STATIC
-#: Merge.rc:2576
+#: Merge.rc:2586
msgid "&Left-hand side:"
msgstr "&Kairėje:"
#. IDD_FILTERS_CONDITION, IDC_STATIC
-#: Merge.rc:2578
+#: Merge.rc:2588
msgid "&Operator:"
msgstr "&Operatorius:"
#. IDD_FILTERS_CONDITION, IDC_STATIC
-#: Merge.rc:2580
+#: Merge.rc:2590
msgid "&Right-hand side:"
msgstr "&Dešinėje:"
#. IDD_FILTERS_CONDITION, IDC_STATIC
-#: Merge.rc:2586
+#: Merge.rc:2596
msgid "Expression:"
msgstr "Išraiška:"
#. IDD_COMPARISON_RESULT_FILTER
-#: Merge.rc:2595
+#: Merge.rc:2605
msgid "Filter by Comparison Result"
msgstr "Filtruoti pagal lyginimo rezultatus"
#. IDD_COMPARISON_RESULT_FILTER, IDC_RADIO_INCLUDE
-#: Merge.rc:2598
+#: Merge.rc:2608
msgid "&Include"
msgstr "Įtraukt&i"
#. IDD_COMPARISON_RESULT_FILTER, IDC_RADIO_EXCLUDE
-#: Merge.rc:2599
+#: Merge.rc:2609
msgid "&Exclude"
msgstr "N&eįtraukti"
#. IDD_COMPARISON_RESULT_FILTER, IDC_STATIC
-#: Merge.rc:2600
+#: Merge.rc:2610
msgid "Comparison Results"
msgstr "Lyginimo rezultatai"
#. IDS_IDENTICAL
-#: Merge.rc:2601 Merge.rc:2733 Merge.rc:2794 Merge.rc:4698
+#: Merge.rc:2611 Merge.rc:2743 Merge.rc:2804 Merge.rc:4708
msgid "Identical"
msgstr "Yra vienodi"
#. IDS_DIFFERENT
-#: Merge.rc:2602 Merge.rc:2714 Merge.rc:2755 Merge.rc:4708
+#: Merge.rc:2612 Merge.rc:2724 Merge.rc:2765 Merge.rc:4718
msgid "Different"
msgstr "Yra skirtingi"
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_LEFT_ONLY
-#: Merge.rc:2603
+#: Merge.rc:2613
msgid "Left only"
msgstr "Tik kairysis"
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_RIGHT_ONLY
-#: Merge.rc:2604
+#: Merge.rc:2614
msgid "Right only"
msgstr "Tik dešinysis"
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_SKIPPED
-#: Merge.rc:2605
+#: Merge.rc:2615
msgid "Skipped"
msgstr "Praleistas"
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_MIDDLE_ONLY
-#: Merge.rc:2606
+#: Merge.rc:2616
msgid "Middle only"
msgstr "Tik vidurinis"
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_LEFT_ONLY_DIFFERENT
-#: Merge.rc:2607
+#: Merge.rc:2617
msgid "Left only (different)"
msgstr "Tik kairysis (skirtingas)"
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_MIDDLE_ONLY_DIFFERENT
-#: Merge.rc:2608
+#: Merge.rc:2618
msgid "Middle only (different)"
msgstr "Tik vidurinis (skirtingas)"
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_RIGHT_ONLY_DIFFERENT
-#: Merge.rc:2609
+#: Merge.rc:2619
msgid "Right only (different)"
msgstr "Tik dešinysis (skirtingas)"
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_LEFT_ONLY_MISSING
-#: Merge.rc:2610
+#: Merge.rc:2620
msgid "Left only (missing)"
msgstr "Tik kairysis (trūkstamas)"
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_MIDDLE_ONLY_MISSING
-#: Merge.rc:2611
+#: Merge.rc:2621
msgid "Middle only (missing)"
msgstr "Tik vidurinis (trūkstamas)"
#. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_RIGHT_ONLY_MISSING
-#: Merge.rc:2612
+#: Merge.rc:2622
msgid "Right only (missing)"
msgstr "Tik dešinysis (trūkstamas)"
#. IDS_OPTIONSPG_CODEPAGE
-#: Merge.rc:2619 Merge.rc:2811 Merge.rc:4213
+#: Merge.rc:2629 Merge.rc:2821 Merge.rc:4223
msgid "Codepage"
msgstr "Koduotės"
#. IDD_PROPPAGE_CODEPAGE, IDC_STATIC
-#: Merge.rc:2622
+#: Merge.rc:2632
msgid "Default Codepage"
msgstr "Numatytoji koduotė"
#. IDD_PROPPAGE_CODEPAGE, IDC_STATIC
-#: Merge.rc:2623
+#: Merge.rc:2633
msgid "Select the default codepage for non-Unicode files:"
msgstr "Parinkite numatytąją koduotę ne Unicode failams:"
#. IDD_PROPPAGE_CODEPAGE, IDC_CP_SYSTEM
-#: Merge.rc:2624
+#: Merge.rc:2634
msgid "System codepage"
msgstr "Sistemos koduotė"
#. IDD_PROPPAGE_CODEPAGE, IDC_CP_UI
-#: Merge.rc:2625
+#: Merge.rc:2635
msgid "According to WinMerge User Interface"
msgstr "Pagal „WinMerge“ naudotojo sąsają"
#. IDD_PROPPAGE_CODEPAGE, IDC_CP_CUSTOM
-#: Merge.rc:2626
+#: Merge.rc:2636
msgid "Custom codepage:"
msgstr "Pasirinkt. koduotė:"
#. IDD_PROPPAGE_CODEPAGE, IDC_DETECT_CODEPAGE
-#: Merge.rc:2628
+#: Merge.rc:2638
msgid "Detect codepage for: .html, .rc, .xml\nRestart required."
msgstr "Aptikti šio tipo failų koduotę: .html, .rc, .xml\nReikės restartuoti sesiją."
#. IDD_PROPPAGE_CODEPAGE, IDC_DETECT_CODEPAGE2
-#: Merge.rc:2630
+#: Merge.rc:2640
msgid "Detect codepage for files with mlang.dll\nRestart required."
msgstr "Aptikti tekstinių failų koduotę „mlang.dll“ pagalba\nReikės restartuoti sesiją."
#. IDS_OPTIONSPG_ARCHIVE
-#: Merge.rc:2638 Merge.rc:4214
+#: Merge.rc:2648 Merge.rc:4224
msgid "Archive Support"
msgstr "Archyvų palaikymo"
#. IDD_PROPPAGE_ARCHIVE, IDC_ARCHIVE_ENABLE
-#: Merge.rc:2641
+#: Merge.rc:2651
msgid "&Enable archive file support"
msgstr "Į&jungti archyvo failų palaikymą"
#. IDD_PROPPAGE_ARCHIVE, IDC_ARCHIVE_DETECTTYPE
-#: Merge.rc:2642
+#: Merge.rc:2652
msgid "&Detect archive type from file signature"
msgstr "&Nustatyti archyvo tipą iš failo parašo"
#. IDD_PROPPAGE_PROJECT, IDC_STATIC
-#: Merge.rc:2651
+#: Merge.rc:2661
msgid "Items saved to or restored from the project file:"
msgstr "Projekto faile išsaugoti ar iš jo atstatyti elementai:"
#. IDD_SAVECLOSING
-#: Merge.rc:2658
+#: Merge.rc:2668
msgid "Save Modified Files?"
msgstr "Išsaugoti pakeistus failus?"
#. IDD_SAVECLOSING, IDC_SAVECLOSING_LEFTFRAME
-#: Merge.rc:2661
+#: Merge.rc:2671
msgid "Left side file"
msgstr "Kairysis failas"
#. IDD_SAVECLOSING, IDC_SAVECLOSING_SAVELEFT
-#: Merge.rc:2663
+#: Merge.rc:2673
msgid "&Save changes"
msgstr "Iš&saugoti pakeitimus"
#. IDD_SAVECLOSING, IDC_SAVECLOSING_DISCARDLEFT
-#: Merge.rc:2664
+#: Merge.rc:2674
msgid "&Discard changes"
msgstr "&Atmesti pakeitimus"
#. IDD_SAVECLOSING, IDC_SAVECLOSING_MIDDLEFRAME
-#: Merge.rc:2665
+#: Merge.rc:2675
msgid "Middle side file"
msgstr "Vidurinis failas"
#. IDD_SAVECLOSING, IDC_SAVECLOSING_SAVEMIDDLE
-#: Merge.rc:2667
+#: Merge.rc:2677
msgid "Sa&ve changes"
msgstr "Iš&saugoti pakeitimus"
#. IDD_SAVECLOSING, IDC_SAVECLOSING_DISCARDMIDDLE
-#: Merge.rc:2668
+#: Merge.rc:2678
msgid "Discard c&hanges"
msgstr "Atmesti &pakeitimus"
#. IDD_SAVECLOSING, IDC_SAVECLOSING_RIGHTFRAME
-#: Merge.rc:2669
+#: Merge.rc:2679
msgid "Right side file"
msgstr "Dešinysis failas"
#. IDD_SAVECLOSING, IDC_SAVECLOSING_SAVERIGHT
-#: Merge.rc:2671
+#: Merge.rc:2681
msgid "S&ave changes"
msgstr "Išs&augoti pakeitimus"
#. IDD_SAVECLOSING, IDC_SAVECLOSING_DISCARDRIGHT
-#: Merge.rc:2672
+#: Merge.rc:2682
msgid "Dis&card changes"
msgstr "At&mesti pakeitimus"
#. IDD_SAVECLOSING, IDC_SAVECLOSING_DISCARDALL
-#: Merge.rc:2673
+#: Merge.rc:2683
msgid "Disca&rd All"
msgstr "Atmes&ti viską"
#. IDD_DIRCMP_REPORT
-#: Merge.rc:2680
+#: Merge.rc:2690
msgid "Folder Compare Report"
msgstr "Katalogų lyginimo ataskaita"
#. IDD_DIRCMP_REPORT, IDC_STATIC
-#: Merge.rc:2683
+#: Merge.rc:2693
msgid "Report &file:"
msgstr "Ataskaitos &failas:"
#. IDD_DIRCMP_REPORT, IDC_STATIC
-#: Merge.rc:2686
+#: Merge.rc:2696
msgid "&Style:"
msgstr "&Stilius:"
#. IDD_DIRCMP_REPORT, IDC_REPORT_INCLUDEFILECMPREPORT
-#: Merge.rc:2688
+#: Merge.rc:2698
msgid "&Include file compare report"
msgstr "Įtraukt&i failų palyginimo ataskaitą"
#. IDD_FILTERS_FILEFILTERS_SHARED
-#: Merge.rc:2697
+#: Merge.rc:2707
msgid "Shared or Private Filter"
msgstr "Bendro naudojimo ar asmeninis filtras"
#. IDD_FILTERS_FILEFILTERS_SHARED, IDC_STATIC
-#: Merge.rc:2700
+#: Merge.rc:2710
msgid "What type of filter do you want?"
msgstr "Kokio tipo filtrą norite sukurti?"
#. IDD_FILTERS_FILEFILTERS_SHARED, IDC_SHARED
-#: Merge.rc:2701
+#: Merge.rc:2711
msgid "Shared Filter (for all users)"
msgstr "Bendrai naudojami filtrai (visiems naudotojams)"
#. IDD_FILTERS_FILEFILTERS_SHARED, IDC_PRIVATE
-#: Merge.rc:2702
+#: Merge.rc:2712
msgid "Private Filter (current user only)"
msgstr "Asmeniniai filtrai (tik šiam naudotojui)"
#. IDD_COMPARE_STATISTICS3
-#: Merge.rc:2709 Merge.rc:2750
+#: Merge.rc:2719 Merge.rc:2760
msgid "Compare Statistics"
msgstr "Lyginimo statistika"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2712 Merge.rc:2753
+#: Merge.rc:2722 Merge.rc:2763
msgid "Folders:"
msgstr "Katalogai:"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2713 Merge.rc:2754
+#: Merge.rc:2723 Merge.rc:2764
msgid "Files:"
msgstr "Failai:"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2719 Merge.rc:2738 Merge.rc:2760 Merge.rc:2799
+#: Merge.rc:2729 Merge.rc:2748 Merge.rc:2770 Merge.rc:2809
msgid "Binary:"
msgstr "Binariniai:"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2722 Merge.rc:2763
+#: Merge.rc:2732 Merge.rc:2773
msgid "Unique"
msgstr "Yra unikalūs"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2723 Merge.rc:2764
+#: Merge.rc:2733 Merge.rc:2774
msgid "Left:"
msgstr "Kairėje:"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2728 Merge.rc:2774
+#: Merge.rc:2738 Merge.rc:2784
msgid "Right:"
msgstr "Dešinėje:"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2742 Merge.rc:2803
+#: Merge.rc:2752 Merge.rc:2813
msgid "Total:"
msgstr "Iš viso:"
#. IDD_COMPARE_STATISTICS3, IDOK
-#: Merge.rc:2745 Merge.rc:2806
+#: Merge.rc:2755 Merge.rc:2816
msgid "Close"
msgstr "Užverti"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2769
+#: Merge.rc:2779
msgid "Middle:"
msgstr "Vidurinį:"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2779
+#: Merge.rc:2789
msgid "Missing Left:"
msgstr "Trūksta kairėje:"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2784
+#: Merge.rc:2794
msgid "Missing Middle:"
msgstr "Trūksta viduryje:"
#. IDD_COMPARE_STATISTICS3, IDC_STATIC
-#: Merge.rc:2789
+#: Merge.rc:2799
msgid "Missing Right:"
msgstr "Trūksta dešinėje:"
#. IDD_LOAD_SAVE_CODEPAGE, IDC_AFFECTS_GROUP
-#: Merge.rc:2814
+#: Merge.rc:2824
msgid "Affects"
msgstr "Paveiks"
#. IDD_LOAD_SAVE_CODEPAGE, IDC_RIGHT_FILES_LABEL
-#: Merge.rc:2816 Merge.rc:2818 Merge.rc:2820
+#: Merge.rc:2826 Merge.rc:2828 Merge.rc:2830
msgid "(Affects)"
msgstr "(Paveiks)"
#. IDD_LOAD_SAVE_CODEPAGE, IDC_LOADING_GROUP
-#: Merge.rc:2821
+#: Merge.rc:2831
msgid "Select Codepage for"
msgstr "Parinkti koduotę"
#. IDD_LOAD_SAVE_CODEPAGE, IDC_LOAD_FILES_LABEL
-#: Merge.rc:2822
+#: Merge.rc:2832
msgid "&File Loading:"
msgstr "&Failo įkėlimui:"
#. IDD_LOAD_SAVE_CODEPAGE, IDC_SAVE_FILES_LABEL
-#: Merge.rc:2824
+#: Merge.rc:2834
msgid "File &Saving:"
msgstr "Failo iš&saugojimui:"
#. IDD_LOAD_SAVE_CODEPAGE, IDC_LOAD_SAVE_SAME_CODEPAGE
-#: Merge.rc:2827
+#: Merge.rc:2837
msgid "&Use same codepage for both"
msgstr "Na&udoti tą pačią koduotę abiems"
#. IDS_MESSAGEBOX_CANCEL
-#: Merge.rc:2830 Merge.rc:4172
+#: Merge.rc:2840 Merge.rc:4182
msgid "&Cancel"
msgstr "&Atsisakyti"
#. IDD_FILTERS_FILEFILTERS_TEST
-#: Merge.rc:2835
+#: Merge.rc:2845
msgid "Test Filter"
msgstr "Testuoti filtrą"
#. IDD_FILTERS_FILEFILTERS_TEST, IDC_HEADER
-#: Merge.rc:2838
+#: Merge.rc:2848
msgid "Testing filter:"
msgstr "Testuojamas filtras:"
#. IDD_FILTERS_FILEFILTERS_TEST, IDC_PROMPT_LABEL
-#: Merge.rc:2840
+#: Merge.rc:2850
msgid "&Enter text to test:"
msgstr "Įv&eskite tekstą patikrinimui:"
#. IDD_FILTERS_FILEFILTERS_TEST, IDC_IS_DIRECTORY
-#: Merge.rc:2842
+#: Merge.rc:2852
msgid "&Folder Name"
msgstr "&Katalogo vardas"
#. IDD_FILTERS_FILEFILTERS_TEST, IDC_STATIC
-#: Merge.rc:2843
+#: Merge.rc:2853
msgid "Result:"
msgstr "Rezultatas:"
#. IDD_FILTERS_FILEFILTERS_TEST, IDC_TEST_BTN
-#: Merge.rc:2845
+#: Merge.rc:2855
msgid "&Test"
msgstr "&Testuoti"
#. IDS_OPTIONSPG_TABLECOMPARE
-#: Merge.rc:2851 Merge.rc:2990 Merge.rc:4228
+#: Merge.rc:2861 Merge.rc:3000 Merge.rc:4238
msgid "Table"
msgstr "Lentelių"
#. IDD_OPEN_TABLE, IDC_STATIC
-#: Merge.rc:2854
+#: Merge.rc:2864
msgid "File type"
msgstr "Failo tipas"
#. IDD_OPEN_TABLE, IDC_COMPARETABLE_CSV
-#: Merge.rc:2855
+#: Merge.rc:2865
msgid "&CSV"
msgstr "&CSV"
#. IDD_OPEN_TABLE, IDC_COMPARETABLE_TSV
-#: Merge.rc:2856
+#: Merge.rc:2866
msgid "&TSV"
msgstr "&TSV"
#. IDD_OPEN_TABLE, IDC_COMPARETABLE_DSV
-#: Merge.rc:2857
+#: Merge.rc:2867
msgid "Custom &Delimiter-Separated Values"
msgstr "Pasirinkt. &skirtukais atskirtos reikšmės"
#. IDD_PROPPAGE_COMPARE_TABLE, IDC_STATIC
-#: Merge.rc:2859 Merge.rc:2861 Merge.rc:2996 Merge.rc:3004
+#: Merge.rc:2869 Merge.rc:2871 Merge.rc:3006 Merge.rc:3014
msgid "D&elimiter character:"
msgstr "S&kirtuko simbolis:"
#. IDD_PROPPAGE_COMPARE_TABLE, IDC_COMPARETABLE_ALLOWNEWLINE
-#: Merge.rc:2863 Merge.rc:3006
+#: Merge.rc:2873 Merge.rc:3016
msgid "&Allow newlines in quotes"
msgstr "Leisti n&aujas eilutes kabutėse"
#. IDD_PROPPAGE_COMPARE_TABLE, IDC_STATIC
-#: Merge.rc:2865 Merge.rc:3008
+#: Merge.rc:2875 Merge.rc:3018
msgid "&Quote character:"
msgstr "&Kabučių simbolis:"
#. IDS_OPTIONSPG_BACKUPS
-#: Merge.rc:2873 Merge.rc:4216
+#: Merge.rc:2883 Merge.rc:4226
msgid "Backup Files"
msgstr "Rezervinių failų kurimo"
#. IDD_PROPPAGE_BACKUPS, IDC_STATIC
-#: Merge.rc:2876
+#: Merge.rc:2886
msgid "Create backup files for:"
msgstr "Kurti rezervinius failus kai:"
#. IDD_PROPPAGE_BACKUPS, IDC_BACKUP_FOLDERCMP
-#: Merge.rc:2877
+#: Merge.rc:2887
msgid "&Folder compare"
msgstr "Lyginami &katalogai"
#. IDD_PROPPAGE_BACKUPS, IDC_BACKUP_FILECMP
-#: Merge.rc:2878
+#: Merge.rc:2888
msgid "Fil&e compare"
msgstr "Lyginami fai&lai"
#. IDD_PROPPAGE_BACKUPS, IDC_STATIC
-#: Merge.rc:2879
+#: Merge.rc:2889
msgid "Create backup files in:"
msgstr "Kurti rezervinius failus:"
#. IDD_PROPPAGE_BACKUPS, IDC_BACKUP_ORIGFOLD
-#: Merge.rc:2880
+#: Merge.rc:2890
msgid "&Original file's folder"
msgstr "Pradinio fail&o kataloge"
#. IDD_PROPPAGE_BACKUPS, IDC_BACKUP_GLOBALFOLD
-#: Merge.rc:2881
+#: Merge.rc:2891
msgid "&Global backup folder:"
msgstr "&Bendrame rezervavimo kataloge:"
#. IDD_PROPPAGE_BACKUPS, IDC_STATIC
-#: Merge.rc:2884
+#: Merge.rc:2894
msgid "Backup filename:"
msgstr "Rezervinio failo vardas:"
#. IDD_PROPPAGE_BACKUPS, IDC_BACKUP_APPEND_BAK
-#: Merge.rc:2885
+#: Merge.rc:2895
msgid "&Append .bak extension"
msgstr "&Pridėti .bak plėtinį"
#. IDD_PROPPAGE_BACKUPS, IDC_BACKUP_APPEND_TIME
-#: Merge.rc:2886
+#: Merge.rc:2896
msgid "A&ppend timestamp"
msgstr "P&ridėti laiko žymą"
#. IDS_CONFIRM_COPY_CAPTION
-#: Merge.rc:2892 Merge.rc:4565
+#: Merge.rc:2902 Merge.rc:4575
msgid "Confirm Copy"
msgstr "Patvirtinti kopijavimą"
#. IDD_CONFIRM_COPY, IDC_FLDCONFIRM_QUERY
-#: Merge.rc:2896
+#: Merge.rc:2906
msgid "Are you sure you want to copy XXX items?"
msgstr "Ar tikrai norite kopijuoti XXX elementų?"
#. IDD_CONFIRM_COPY, IDC_FLDCONFIRM_FROM_TEXT
-#: Merge.rc:2897
+#: Merge.rc:2907
msgid "From left"
msgstr "Iš kairės"
#. IDD_CONFIRM_COPY, IDC_FLDCONFIRM_TO_TEXT
-#: Merge.rc:2899
+#: Merge.rc:2909
msgid "To right"
msgstr "Į dešinę"
#. IDS_MESSAGEBOX_DONT_ASK_AGAIN
-#: Merge.rc:2901 Merge.rc:4191
+#: Merge.rc:2911 Merge.rc:4201
msgid "Don't ask this &question again."
msgstr "Daugiau neklausti šio &klausimo."
#. IDD_CONFIRM_COPY, IDYES
-#: Merge.rc:2903
+#: Merge.rc:2913
msgid "Yes"
msgstr "Taip"
#. IDD_CONFIRM_COPY, IDNO
-#: Merge.rc:2904
+#: Merge.rc:2914
msgid "No"
msgstr "Ne"
#. IDS_PROJECT_ITEM_PLUGIN
-#: Merge.rc:2909 Merge.rc:4323
+#: Merge.rc:2919 Merge.rc:4333
msgid "Plugins"
msgstr "Papildiniai"
#. IDD_PLUGINS_LIST, IDC_PLUGINS_ENABLE
-#: Merge.rc:2912
+#: Merge.rc:2922
msgid "&Enable plugins"
msgstr "Įjungti &papildinius"
#. IDD_PLUGINS_EDITPLUGIN, IDC_STATIC
-#: Merge.rc:2913 Merge.rc:3113
+#: Merge.rc:2923 Merge.rc:3123
msgid "Plugin &type:"
msgstr "Papildinio &tipas:"
#. IDD_PLUGINS_LIST, IDC_STATIC
-#: Merge.rc:2916
+#: Merge.rc:2926
msgid "File filters:"
msgstr "Failų filtrai:"
#. IDD_PLUGINS_LIST, IDC_STATIC
-#: Merge.rc:2918
+#: Merge.rc:2928
msgid "&Plugin arguments:"
msgstr "&Papildinio argumentai:"
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_AUTOMATIC
-#: Merge.rc:2920 Merge.rc:3134
+#: Merge.rc:2930 Merge.rc:3144
msgid "Enable &automatic unpacking/prediffing"
msgstr "Įjungti &automatinį išpakavimą/parengimą"
#. IDS_OPTIONSPG_SHELL
-#: Merge.rc:2934 Merge.rc:4217
+#: Merge.rc:2944 Merge.rc:4227
msgid "Shell Integration"
msgstr "Integr. Windows aplinkoje"
#. IDD_PROPPAGE_SHELL, IDC_STATIC
-#: Merge.rc:2937
+#: Merge.rc:2947
msgid "Explorer"
msgstr "„Explorer“'is"
#. IDD_PROPPAGE_SHELL, IDC_EXPLORER_CONTEXT
-#: Merge.rc:2938
+#: Merge.rc:2948
msgid "&Add to context menu"
msgstr "&Pridėti į kontekstinį meniu"
#. IDD_PROPPAGE_SHELL, IDC_EXPLORER_ADVANCED
-#: Merge.rc:2939
+#: Merge.rc:2949
msgid "E&nable advanced menu"
msgstr "Įju&ngti išplėstinį meniu"
#. IDD_PROPPAGE_SHELL, IDC_EXPLORER_COMPARE_AS
-#: Merge.rc:2940
+#: Merge.rc:2950
msgid "Enable &Compare As menu"
msgstr "Įtraukti &Lyginti į meniu"
#. IDD_PROPPAGE_SHELL, IDC_REGISTER_SHELLEXTENSION
-#: Merge.rc:2941
+#: Merge.rc:2951
msgid "&Register Shell Extension"
msgstr "&Registruoti aplinkos plėtinį"
#. IDD_PROPPAGE_SHELL, IDC_UNREGISTER_SHELLEXTENSION
-#: Merge.rc:2942
+#: Merge.rc:2952
msgid "&Unregister Shell Extension"
msgstr "&Išregistruoti aplinkos plėtinį"
#. IDD_PROPPAGE_SHELL, IDC_REGISTER_SHELLEXTENSION_PERUSER
-#: Merge.rc:2943
+#: Merge.rc:2953
msgid "Register Shell Extension for Current User &Only"
msgstr "Registruoti aplinkos plėtinį tik šiam naud&otojui"
#. IDD_PROPPAGE_SHELL, IDC_UNREGISTER_SHELLEXTENSION_PERUSER
-#: Merge.rc:2944
+#: Merge.rc:2954
msgid "Unregister Shell Extension for Current User On&ly"
msgstr "Išregistruoti aplinkos p&lėtinį tik šiam naudotojui"
#. IDD_PROPPAGE_SHELL, IDC_REGISTER_WINMERGECONTEXTMENU
-#: Merge.rc:2945
+#: Merge.rc:2955
msgid "Register Shell Extension for &Windows 11"
msgstr "Registruoti aplinkos plėtinį &Windows 11"
#. IDD_PROPPAGE_SHELL, IDC_UNREGISTER_WINMERGECONTEXTMENU
-#: Merge.rc:2946
+#: Merge.rc:2956
msgid "Unregister Shell Extension for W&indows 11"
msgstr "Išregistruoti aplinkos plėtinį W&indows 11"
#. IDD_PROPPAGE_SHELL, IDC_STATIC
-#: Merge.rc:2947
+#: Merge.rc:2957
msgid "Jump List"
msgstr "Spartusis sąrašas"
#. IDD_PROPPAGE_SHELL, IDC_CLEAR_ALL_RECENT_ITEMS
-#: Merge.rc:2949
+#: Merge.rc:2959
msgid "Clear all recent items"
msgstr "Išvalyti visus naujausius elementus"
#. IDS_OPTIONSPG_FOLDERCOMPARE
-#: Merge.rc:2954 Merge.rc:4225
+#: Merge.rc:2964 Merge.rc:4235
msgctxt "Options dialog|Categories"
msgid "Folder"
msgstr "Katalogų"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC
-#: Merge.rc:2957
+#: Merge.rc:2967
msgid "&Compare method:"
msgstr "&Lyginimo metodas:"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_COMPARE_STOPFIRST
-#: Merge.rc:2959
+#: Merge.rc:2969
msgid "S&top after first difference"
msgstr "Sus&toti radus pirmą skirtumą"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_IGNORE_SMALLTIMEDIFF
-#: Merge.rc:2961
+#: Merge.rc:2971
msgid "Ign&ore time differences less than 3 seconds"
msgstr "Ign&oruoti mažesnį nei 3 sekundžių laiko skirtumą"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC
-#: Merge.rc:2964
+#: Merge.rc:2974
msgid "Expand subfolders &after comparison:"
msgstr "Išskleisti p&akatalogius po lyginimo:"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_COMPARE_WALKSUBDIRS
-#: Merge.rc:2966
+#: Merge.rc:2976
msgid "Include &unique subfolders contents"
msgstr "Įtraukti &unikalų pakatalogių turinį"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_IGNORE_REPARSEPOINTS
-#: Merge.rc:2968
+#: Merge.rc:2978
msgid "Ignore &reparse points"
msgstr "Ignoruoti paka&rtotinio apdorojimo taškus"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC
-#: Merge.rc:2969
+#: Merge.rc:2979
msgid "Switch to &quick compare when size exceeds (MB):"
msgstr "Persijungti į &spartųjį lyginimą kai dydis virš (MB):"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC
-#: Merge.rc:2971
+#: Merge.rc:2981
msgid "Switch to &binary compare when size exceeds (MB):"
msgstr "Persijungti į &binarinį lyginimą kai dydis virš (MB):"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC
-#: Merge.rc:2975
+#: Merge.rc:2985
msgid "Additional comparison condi&tions:"
msgstr "Papildomos lyginimo sąlygos:"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC
-#: Merge.rc:2978
+#: Merge.rc:2988
msgid "&Rename/move detection:"
msgstr "Pe&rvardijimo/perkėlimo aptikimas:"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC
-#: Merge.rc:2980
+#: Merge.rc:2990
msgid "Rename/move detection &keys:"
msgstr "Pervardijimo/perkėlimo aptikimo ra&ktai:"
#. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC
-#: Merge.rc:2983
+#: Merge.rc:2993
msgid "M&erge renames and moves:"
msgstr "Suli&eti pervardijimus ir perkėlimus:"
#. IDD_PROPPAGE_COMPARE_TABLE, IDC_STATIC
-#: Merge.rc:2994 Merge.rc:2999 Merge.rc:3002
+#: Merge.rc:3004 Merge.rc:3009 Merge.rc:3012
msgid "File patterns:"
msgstr "Failų šablonai:"
#. IDD_PROPPAGE_COMPARE_TABLE, IDC_STATIC
-#: Merge.rc:3001
+#: Merge.rc:3011
msgid "Custom Delimiter-Separated Values"
msgstr "Pasirinkt. skirtukais atskirtos reikšmės"
#. IDS_OPTIONSPG_BINARYCOMPARE
-#: Merge.rc:3015 Merge.rc:4227
+#: Merge.rc:3025 Merge.rc:4237
msgctxt "Options dialog|Categories"
msgid "Binary"
msgstr "Binarinių"
#. IDD_PROPPAGE_COMPARE_BINARY, IDC_STATIC
-#: Merge.rc:3018
+#: Merge.rc:3028
msgid "Binary file &patterns:"
msgstr "Binarinių failų š&ablonai:"
#. IDD_PROPPAGE_COMPARE_BINARY, IDC_STATIC
-#: Merge.rc:3020
+#: Merge.rc:3030
msgid "Frhed settings"
msgstr "„Frhed“ nuostatos"
#. IDD_PROPPAGE_COMPARE_BINARY, IDC_COMPAREBINARY_VIEWSETTINGS
-#: Merge.rc:3021
+#: Merge.rc:3031
msgid "View &Settings..."
msgstr "Peržiūrėti parametrus..."
#. IDD_PROPPAGE_COMPARE_BINARY, IDC_COMPAREBINARY_BINARYMODE
-#: Merge.rc:3022
+#: Merge.rc:3032
msgid "&Binary Mode..."
msgstr "&Binarinis režimas..."
#. IDD_PROPPAGE_COMPARE_BINARY, IDC_COMPAREBINARY_CHARACTERSET
-#: Merge.rc:3023
+#: Merge.rc:3033
msgid "&Character Set..."
msgstr "&Simbolių rinkinys..."
#. IDS_PRPCAT_IMAGE
-#: Merge.rc:3029 Merge.rc:4226 Merge.rc:4665
+#: Merge.rc:3039 Merge.rc:4236 Merge.rc:4675
msgid "Image"
msgstr "Paveikslėlių"
#. IDD_PROPPAGE_COMPARE_IMAGE, IDC_STATIC
-#: Merge.rc:3032
+#: Merge.rc:3042
msgid "Image file &patterns:"
msgstr "&Paveikslėlių failų šablonai:"
#. IDD_PROPPAGE_COMPARE_IMAGE, IDC_ENABLE_IMGCMP_IN_DIRCMP
-#: Merge.rc:3034
+#: Merge.rc:3044
msgid "&Enable image compare in folder compare"
msgstr "Lyginti pav&eikslėlius lyginant katalogus"
#. IDD_PROPPAGE_COMPARE_IMAGE, IDC_STATIC
-#: Merge.rc:3036
+#: Merge.rc:3046
msgid "OCR result:"
msgstr "Optinio ženklų atpažinimo (OCR) rezultatas:"
#. IDS_OPTIONSPG_WEBPAGECOMPARE
-#: Merge.rc:3043 Merge.rc:4229
+#: Merge.rc:3053 Merge.rc:4239
msgid "Webpage"
msgstr "Tinklalapių"
#. IDD_PROPPAGE_COMPARE_WEBPAGE, IDC_STATIC
-#: Merge.rc:3046
+#: Merge.rc:3056
msgid "URL pattern to &include (Regular expression):"
msgstr "URL šablonas, ką įtraukt&i (Reguliarioji išraiška)"
#. IDD_PROPPAGE_COMPARE_WEBPAGE, IDC_STATIC
-#: Merge.rc:3048
+#: Merge.rc:3058
msgid "URL pattern to &exclude (Regular expression):"
msgstr "URL šablonas, ką pašalinti (Reguliarioji išraiška)"
#. IDD_PROPPAGE_COMPARE_WEBPAGE, IDC_STATIC
-#: Merge.rc:3050
+#: Merge.rc:3060
msgid "&User data folder location:"
msgstr "Na&udotojo duomenų katalogo vieta:"
#. IDD_PROPPAGE_COMPARE_WEBPAGE, IDC_COMPAREWEBPAGE_USERDATAFOLDER_PERPANE
-#: Merge.rc:3052
+#: Merge.rc:3062
msgid "&Separate user data folders for each pane"
msgstr "At&skiri naudotojo duomenų katalogai kiekvienam polangiui"
#. IDD_ENCODINGERROR, IDC_HEXVIEW
-#: Merge.rc:3065
+#: Merge.rc:3075
msgid "&Hex View"
msgstr "Žiūrėti &Hex režimu"
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3110
+#: Merge.rc:3120
msgid "Edit Plugin"
msgstr "Redaguoti papildinį"
#. IDD_PLUGINS_EDITPLUGIN, IDC_STATIC
-#: Merge.rc:3123
+#: Merge.rc:3133
msgid "&Category:"
msgstr "&Kategorija:"
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_MENUCAPTION_STATIC
-#: Merge.rc:3125
+#: Merge.rc:3135
msgid "&Menu caption:"
msgstr "&Meniu antraštė:"
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_WINDOWTYPE_STATIC
-#: Merge.rc:3127
+#: Merge.rc:3137
msgid "&Window type:"
msgstr "&Lango tipas:"
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_UNPACKEDFILEEXTENSION_STATIC
-#: Merge.rc:3132
+#: Merge.rc:3142
msgid "&Unpacked file extension:"
msgstr "&Išpakuoto failo plėtinys:"
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_ARGUMENTSREQUIRED
-#: Merge.rc:3136
+#: Merge.rc:3146
msgid "&Require arguments"
msgstr "&Reikalauti argumentų"
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_GENERATESCRIPT
-#: Merge.rc:3137
+#: Merge.rc:3147
msgid "&Generate editor script"
msgstr "&Generuoti redaktoriaus skriptą"
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_COMMAND_LINE_STATIC
-#: Merge.rc:3140
+#: Merge.rc:3150
msgid "Command &line:"
msgstr "Komandinė ei&lutė:"
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_SCRIPT_FILEEXTENSION_STATIC
-#: Merge.rc:3143
+#: Merge.rc:3153
msgid "&Script file extension:"
msgstr "&Skripto failo plėtinys:"
#. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_SCRIPT_BODY_STATIC
-#: Merge.rc:3145
+#: Merge.rc:3155
msgid "Script &body:"
msgstr "Skripto &tekstas:"
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3154
+#: Merge.rc:3164
msgid "Font"
msgstr "Šriftas"
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3157
+#: Merge.rc:3167
msgid "&Font:"
msgstr "&Šriftas:"
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3163
+#: Merge.rc:3173
msgid "Font st&yle:"
msgstr "Šrifto st&ilius:"
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3169
+#: Merge.rc:3179
msgid "&Size:"
msgstr "&Dydis:"
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3175
+#: Merge.rc:3185
msgid "Effects"
msgstr "Efektai"
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3176
+#: Merge.rc:3186
msgid "Stri&keout"
msgstr "Perbrau&ktas"
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3177
+#: Merge.rc:3187
msgid "&Underline"
msgstr "Pabra&uktas"
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3179
+#: Merge.rc:3189
msgid "&Color:"
msgstr "&Spalva:"
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3184
+#: Merge.rc:3194
msgid "Sample"
msgstr "Pavyzdys"
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3185
+#: Merge.rc:3195
msgid "AaBbYyZz"
msgstr "AaBbYyZz"
#. IDD_PLUGINS_EDITPLUGIN
-#: Merge.rc:3189
+#: Merge.rc:3199
msgid "Sc&ript:"
msgstr "Sk&riptas:"
#. IDD_PLUGINS_EDITPLUGIN, IDC_MANAGE_LINK
-#: Merge.rc:3194
+#: Merge.rc:3204
msgid "Show more fonts"
msgstr "Parodyti daugiau šriftų"
#. ID_INDICATOR_EXT
-#: Merge.rc:4118
+#: Merge.rc:4128
msgid "EXT"
msgstr "EXT"
#. ID_INDICATOR_CAPS
-#: Merge.rc:4119
+#: Merge.rc:4129
msgid "CAP"
msgstr "CAP"
#. ID_INDICATOR_NUM
-#: Merge.rc:4120
+#: Merge.rc:4130
msgid "NUM"
msgstr "NUM"
#. ID_INDICATOR_SCRL
-#: Merge.rc:4121
+#: Merge.rc:4131
msgid "SCRL"
msgstr "SCRL"
#. ID_INDICATOR_OVR
-#: Merge.rc:4122
+#: Merge.rc:4132
msgid "OVR"
msgstr "OVR"
#. ID_INDICATOR_REC
-#: Merge.rc:4123
+#: Merge.rc:4133
msgid "REC"
msgstr "REC"
#. ID_FILE_NEW
-#: Merge.rc:4129
+#: Merge.rc:4139
msgid "\nNew Documents (Ctrl+N)"
msgstr "\nNauji dokumentai (Ctrl+N)"
#. ID_FILE_OPEN
-#: Merge.rc:4130
+#: Merge.rc:4140
msgid "\nOpen (Ctrl+O)"
msgstr "\nAtverti (Ctrl+O)"
#. ID_FILE_SAVE
-#: Merge.rc:4131
+#: Merge.rc:4141
msgid "\nSave (Ctrl+S)"
msgstr "\nIšsaugoti (Ctrl+S)"
#. IDS_UNK_ERROR_READING_PROJECT
-#: Merge.rc:4137
+#: Merge.rc:4147
msgid "Unknown error opening project file."
msgstr "Nežinoma klaida bandant atidaryti projekto failą."
#. IDS_UNK_ERROR_SAVING_PROJECT
-#: Merge.rc:4138
+#: Merge.rc:4148
msgid "Unknown error saving project file."
msgstr "Nežinoma klaida bandant išsaugoti projekto failą."
#. IDS_PROJFILE_LOAD_SUCCESS
-#: Merge.rc:4143
+#: Merge.rc:4153
msgid "Project file loaded."
msgstr "Projekto failas įkrautas."
#. IDS_PROJFILE_SAVE_SUCCESS
-#: Merge.rc:4144
+#: Merge.rc:4154
msgid "Project file saved."
msgstr "Projekto failas išsaugotas."
#. ID_EDIT_UNDO
-#: Merge.rc:4150
+#: Merge.rc:4160
msgid "\nUndo (Ctrl+Z)"
msgstr "\nAtšaukti (Ctrl+Z)"
#. ID_EDIT_REDO
-#: Merge.rc:4151
+#: Merge.rc:4161
msgid "\nRedo (Ctrl+Y)"
msgstr "\nPakartoti (Ctrl+Y)"
#. IDR_MERGEDOCTYPE
-#: Merge.rc:4158
+#: Merge.rc:4168
msgid "\nFileCompare\n\n\n\nWinMerge.FileCompare\nWinMerge File Compare"
msgstr "\nFileCompare\n\n\n\nWinMerge.FileCompare\nWinMerge failų lyginimas"
#. IDR_DIRDOCTYPE
-#: Merge.rc:4159
+#: Merge.rc:4169
msgid "\nFolderCompare\n\n\n\nWinMerge.FolderCompare\nWinMerge Folder Compare"
msgstr "\nFolderCompare\n\n\n\nWinMerge.FolderCompare\nWinMerge katalogų lyginimas"
#. IDS_SPLASH_GPLTEXT
-#: Merge.rc:4165
+#: Merge.rc:4175
msgid "WinMerge comes with ABSOLUTELY NO WARRANTY. It is free software and can be redistributed under the conditions of the GNU General Public License - see the Help menu for details."
msgstr "„WinMerge“ tiekiama VISIŠKAI BE JOKIŲ GARANTIJŲ. Tai nemokama programinė įranga ir jūs galite ją platinti tam tikromis sąlygomis. Daugiau apie tai rasite „Žinyno“ meniu punkte „GNU Bendroji viešoji licencija“."
#. IDS_MESSAGEBOX_ABORT
-#: Merge.rc:4173
+#: Merge.rc:4183
msgid "&Abort"
msgstr "Nutr&aukti"
#. IDS_MESSAGEBOX_RETRY
-#: Merge.rc:4174
+#: Merge.rc:4184
msgid "&Retry"
msgstr "Ka&rtoti"
#. IDS_MESSAGEBOX_IGNORE
-#: Merge.rc:4175
+#: Merge.rc:4185
msgid "&Ignore"
msgstr "&Ignoruoti"
#. IDS_MESSAGEBOX_IGNOREALL
-#: Merge.rc:4176
+#: Merge.rc:4186
msgid "Ignore &all"
msgstr "Ignoruoti visk&ą"
#. IDS_MESSAGEBOX_YES
-#: Merge.rc:4177
+#: Merge.rc:4187
msgid "&Yes"
msgstr "&Taip"
#. IDS_MESSAGEBOX_YES_TO_ALL
-#: Merge.rc:4183
+#: Merge.rc:4193
msgid "Yes to &all"
msgstr "T&aip visiems"
#. IDS_MESSAGEBOX_NO
-#: Merge.rc:4184
+#: Merge.rc:4194
msgid "&No"
msgstr "&Ne"
#. IDS_MESSAGEBOX_NO_TO_ALL
-#: Merge.rc:4185
+#: Merge.rc:4195
msgid "No to a&ll"
msgstr "Ne vi&siems"
#. IDS_MESSAGEBOX_CONTINUE
-#: Merge.rc:4186
+#: Merge.rc:4196
msgid "&Continue"
msgstr "Tę&sti"
#. IDS_MESSAGEBOX_SKIP
-#: Merge.rc:4187
+#: Merge.rc:4197
msgid "&Skip"
msgstr "Pralei&sti"
#. IDS_MESSAGEBOX_SKIPALL
-#: Merge.rc:4188
+#: Merge.rc:4198
msgid "Skip &all"
msgstr "Praleisti visk&ą"
#. IDS_MESSAGEBOX_DONT_DISPLAY_AGAIN
-#: Merge.rc:4190
+#: Merge.rc:4200
msgid "Don't display this &message again."
msgstr "Daugiau nerodyti šio praneši&mo."
-#: Merge.rc:4193
+#: Merge.rc:4203
msgid "To make this message box visible, press Reset on the Message Boxes page in Options."
msgstr "Kad šis pranešimas būtų matomas, paspauskite „Nuostatų“ ekrano „Bendrų pranešimų“ dalyje esantį mygtuką „Atkurti“."
#. IDS_OPTIONSPG_EDITOR_COMPAREMERGE
-#: Merge.rc:4203
+#: Merge.rc:4213
msgid "Compare/Merge"
msgstr "Lyginimo/Suliejimo"
#. IDS_OPTIONSPG_SYNTAXCOLORS
-#: Merge.rc:4204 Merge.rc:4208
+#: Merge.rc:4214 Merge.rc:4218
msgid "Syntax"
msgstr "Sintaksės"
#. IDS_OPTIONSPG_COLOR_SCHEMES
-#: Merge.rc:4206
+#: Merge.rc:4216
msgid "Color Schemes"
msgstr "Schemų"
#. IDS_OPTIONSPG_DIRCOLORS
-#: Merge.rc:4210
+#: Merge.rc:4220
msgid "Folder Compare"
msgstr "Katalogų lyginimo"
#. IDS_OPTIONSPG_PROJECT
-#: Merge.rc:4215
+#: Merge.rc:4225
msgid "Project"
msgstr "Projekto"
#. IDS_COLHDR_NSDIFFS
-#: Merge.rc:4218 Merge.rc:4640
+#: Merge.rc:4228 Merge.rc:4650
msgid "Differences"
msgstr "Skirtumų"
#. IDS_OPTIONSPG_MESSAGEBOXES
-#: Merge.rc:4220
+#: Merge.rc:4230
msgid "Message Boxes"
msgstr "Bendrų pranešimų"
#. IDS_TO
-#: Merge.rc:4235
+#: Merge.rc:4245
msgid "To:"
msgstr "Į:"
#. IDS_FROM_LEFT
-#: Merge.rc:4236
+#: Merge.rc:4246
msgid "From left:"
msgstr "Iš kairės:"
#. IDS_TO_LEFT
-#: Merge.rc:4237
+#: Merge.rc:4247
msgid "To left:"
msgstr "Į kairę:"
#. IDS_FROM_RIGHT
-#: Merge.rc:4238
+#: Merge.rc:4248
msgid "From right:"
msgstr "Iš dešinės:"
#. IDS_TO_RIGHT
-#: Merge.rc:4239
+#: Merge.rc:4249
msgid "To right:"
msgstr "Į dešinę:"
#. IDS_FROM_MIDDLE
-#: Merge.rc:4240
+#: Merge.rc:4250
msgid "From middle:"
msgstr "Iš vidurio:"
#. IDS_TO_MIDDLE
-#: Merge.rc:4241
+#: Merge.rc:4251
msgid "To middle:"
msgstr "Į vidurį:"
#. IDS_VERSION_FMT
-#: Merge.rc:4247
+#: Merge.rc:4257
#, c-format
msgid "Version %1"
msgstr "Versija %1"
#. IDS_OPTIONS_TITLE
-#: Merge.rc:4253
+#: Merge.rc:4263
#, c-format
msgid "Options (%1)"
msgstr "Nuostatos (%1)"
#. IDS_MESSAGE_BOX_ARE_RESET
-#: Merge.rc:4254
+#: Merge.rc:4264
msgid "All message boxes are now displayed again."
msgstr "Dabar vėl bus rodomi visi pranešimai."
-#: Merge.rc:4256
+#: Merge.rc:4266
#, c-format
msgid "Tab size value is out of range. Please use 1 - %1."
msgstr "Lauke „TAB simbolio dydis“ nurodyta reikšmė nepatenka į diapazoną.\n\nNaudokite reikšmes nuo 1 iki %1."
#. IDS_PROJECT_OPEN
-#: Merge.rc:4262 Merge.rc:4318
+#: Merge.rc:4272 Merge.rc:4328
msgid "Open"
msgstr "Atverti"
#. IDS_PROGRAMFILES
-#: Merge.rc:4263
+#: Merge.rc:4273
msgid "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||"
msgstr "Programos|*.exe;*.bat;*.cmd|Visi failai (*.*)|*.*||"
#. IDS_ALLFILES
-#: Merge.rc:4264
+#: Merge.rc:4274
msgid "All Files (*.*)|*.*||"
msgstr "Visi failai (*.*)|*.*||"
#. IDS_PROJECTFILES
-#: Merge.rc:4265
+#: Merge.rc:4275
msgid "WinMerge Project Files (*.WinMerge)|*.WinMerge||"
msgstr "„WinMerge“ projekto failai (*.WinMerge)|*.WinMerge||"
#. IDS_INIFILES
-#: Merge.rc:4267
+#: Merge.rc:4277
msgid "Options files (*.ini)|*.ini|All Files (*.*)|*.*||"
msgstr "Nuostatų failai (*.ini)|*.ini|Visi failai (*.*)|*.*||"
#. IDS_REPLACELIST_FILES
-#: Merge.rc:4268
+#: Merge.rc:4278
msgid "Tab-Separated Values (*.tsv;*.txt)|*.tsv;*.txt|All Files (*.*)|*.*||"
msgstr "TAB simboliais sudalintos reikšmės (*.tsv;*.txt)|*.tsv;*.txt|All Files (*.*)|*.*||"
#. IDS_TEXT_REPORT_FILES
-#: Merge.rc:4274
+#: Merge.rc:4284
msgid "Text Files (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|All Files (*.*)|*.*||"
msgstr "Teksto failai (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|Visi failai (*.*)|*.*||"
#. IDS_HTML_REPORT_FILES
-#: Merge.rc:4275
+#: Merge.rc:4285
msgid "HTML Files (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||"
msgstr "HTML failai (*.htm,*.html)|*.htm;*.html|Visi failai (*.*)|*.*||"
#. IDS_XML_REPORT_FILES
-#: Merge.rc:4276
+#: Merge.rc:4286
msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||"
msgstr "XML failai (*.xml)|*.xml|Visi failai (*.*)|*.*||"
#. IDS_EXPANDSUBDIRS_DONOTEXPAND
-#: Merge.rc:4294
+#: Merge.rc:4304
msgid "Do not expand"
msgstr "Neišskleisti"
#. IDS_EXPANDSUBDIRS_ALL
-#: Merge.rc:4295
+#: Merge.rc:4305
msgid "Expand all subfolders"
msgstr "Išskleisti visus pakatalogius"
#. IDS_EXPANDSUBDIRS_DIFFERENT
-#: Merge.rc:4296
+#: Merge.rc:4306
msgid "Expand different subfolders"
msgstr "Išskleisti skirtingus pakatalogius"
#. IDS_EXPANDSUBDIRS_IDENTICAL
-#: Merge.rc:4297
+#: Merge.rc:4307
msgid "Expand identical subfolders"
msgstr "Išskleisti identiškus pakatalogius"
#. IDS_SYNTAXTABLE_FILETYPE
-#: Merge.rc:4303
+#: Merge.rc:4313
msgid "File Type"
msgstr "Failo tipas"
#. IDS_COLHDR_EXTENSION
-#: Merge.rc:4304 Merge.rc:4597
+#: Merge.rc:4314 Merge.rc:4607
msgid "Extension"
msgstr "Plėtinys"
#. IDS_PRPCAT_MESSAGE
-#: Merge.rc:4310 Merge.rc:4669
+#: Merge.rc:4320 Merge.rc:4679
msgid "Message"
msgstr "Pranešimas"
#. IDS_MESSAGEBOX_ANSWER
-#: Merge.rc:4311
+#: Merge.rc:4321
msgid "Answer"
msgstr "Atsakymas"
#. IDS_PROJECT_ITEM
-#: Merge.rc:4317
+#: Merge.rc:4327
msgid "Item"
msgstr "Elementas"
#. IDS_PROJECT_LOAD
-#: Merge.rc:4319
+#: Merge.rc:4329
msgid "Load"
msgstr "Įkelti"
#. IDS_PROJECT_SAVE
-#: Merge.rc:4320
+#: Merge.rc:4330
msgid "Save"
msgstr "Išsaugoti"
#. IDS_PROJECT_ITEM_INCLUDE_SUBFOLDERS
-#: Merge.rc:4322
+#: Merge.rc:4332
msgid "Include Subfolders"
msgstr "Su pakatalogiais"
#. IDS_PROJECT_ITEM_COMPARE_OPTIONS
-#: Merge.rc:4324
+#: Merge.rc:4334
msgid "Compare Options"
msgstr "Lyginimo nuostatos"
#. IDS_PROJECT_ITEM_HIDDEN_ITEMS
-#: Merge.rc:4325
+#: Merge.rc:4335
msgid "Hidden Items"
msgstr "Paslėpti elementai"
#. IDS_PLUGINSLIST_NAME
-#: Merge.rc:4331 Merge.rc:4956
+#: Merge.rc:4341 Merge.rc:4966
msgid "Name"
msgstr "Pavadinimas"
#. IDS_FILTERFILE_PATHTITLE
-#: Merge.rc:4332
+#: Merge.rc:4342
msgid "Location"
msgstr "Vieta"
#. IDS_FILTER_TITLE
-#: Merge.rc:4333
+#: Merge.rc:4343
msgid "Filters"
msgstr "Filtrai"
#. IDS_FILTER_PREFIX
-#: Merge.rc:4334
+#: Merge.rc:4344
msgid "[F] "
msgstr "[F] "
#. IDS_PLUGINSLIST_DESC
-#: Merge.rc:4335 Merge.rc:4958
+#: Merge.rc:4345 Merge.rc:4968
msgid "Description"
msgstr "Aprašas"
#. IDS_FILEFILTER_SAVENEW
-#: Merge.rc:4336
+#: Merge.rc:4346
msgid "Select Filename for New Filter"
msgstr "Nurodykite naujo filtro failo vardą"
#. IDS_FILEFILTER_FILEMASK
-#: Merge.rc:4337
+#: Merge.rc:4347
msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||"
msgstr "Failo filtrai (*.flt)|*.flt|Visi failai (*.*)|*.*||"
-#: Merge.rc:4339
+#: Merge.rc:4349
#, c-format
msgid "Cannot find filter template!\n\nCopy %1 to WinMerge/Filters Folder:\n%2."
msgstr "Nepavyko rasti filtro šablono!\n\nNukopijuokit %1 į WinMerge/Filters katalogą:\n%2."
-#: Merge.rc:4341
+#: Merge.rc:4351
#, c-format
msgid "Cannot copy filter template:\n%1\n\nMake sure the folder exists and is writable."
msgstr "Nepavyko nukopijuoti filtro šablono į filtrų katalogą:\n%1\n\nĮsitikinkite, kad katalogas egzistuoja ir yra įrašomas."
-#: Merge.rc:4343
+#: Merge.rc:4353
msgid "User's filter folder is not defined!\n\nSelect filter folder in Options/System."
msgstr "Vartotojo filtrų katalotgas nėra apibrėžtas!\n\nNurodykite filtrų katalogą „Nuostatos/Sistemos“ meniu punkte."
-#: Merge.rc:4345
+#: Merge.rc:4355
#, c-format
msgid "Failed to delete filter:\n%1\n\nFile may be read-only."
msgstr "Nepavyko ištrinti filtro:\n%1\n\nMatyt failo statusas yra „Tik skaitymui“."
#. IDS_FILEFILTER_INSTALL
-#: Merge.rc:4346
+#: Merge.rc:4356
msgid "Locate Filter File to Install"
msgstr "Rasti filtro diegimo failą"
-#: Merge.rc:4348
+#: Merge.rc:4358
msgid "Installing filter file failed.\n\nCould not copy new filter to folder."
msgstr "Filtro failo diegimas nepavyko.\n\nNepavyko nukopijuoti naujo filtro į filtrų katalogą."
#. IDS_FILEFILTER_OVERWRITE
-#: Merge.rc:4349
+#: Merge.rc:4359
msgid "Filter file exists. Overwrite?"
msgstr "Filtro failas jau yra. Perrašyti esamą filtrą?"
#. IDS_FILTERLINE_REGEXP
-#: Merge.rc:4355
+#: Merge.rc:4365
msgid "Regular expression"
msgstr "Reguliarioji išraiška"
#. IDS_FILTERCHANGED
-#: Merge.rc:4361
+#: Merge.rc:4371
msgid "Filters updated. Refresh all open folder compares?\n\nSelect 'No' to refresh later."
msgstr "Filtrai buvo pakeisti. Atnaujinti visus atvertus katalogų palyginimus?\n\nPasirinkite „Ne“, kad atnaujinti palyginimus vėliau."
#. IDS_DIRECTORY_WINDOW_TITLE
-#: Merge.rc:4367
+#: Merge.rc:4377
msgid "Folder Comparison Results"
msgstr "Katalogų lyginimo rezultatai"
#. IDS_FILE_COMPARISON_TITLE
-#: Merge.rc:4368
+#: Merge.rc:4378
msgid "File Comparison"
msgstr "Failo palyginimas"
#. IDS_EMPTY_LEFT_FILE
-#: Merge.rc:4369
+#: Merge.rc:4379
msgid "Untitled Left"
msgstr "Bevardis kairysis"
#. IDS_EMPTY_MIDDLE_FILE
-#: Merge.rc:4370
+#: Merge.rc:4380
msgid "Untitled Middle"
msgstr "Bevardis vidurinis"
#. IDS_EMPTY_RIGHT_FILE
-#: Merge.rc:4371
+#: Merge.rc:4381
msgid "Untitled Right"
msgstr "Bevardis dešinysis"
#. IDS_CONFLICT_BASE_FILE
-#: Merge.rc:4372
+#: Merge.rc:4382
msgid "Base File"
msgstr "Pagrindinis failas"
#. IDS_CONFLICT_THEIRS_FILE
-#: Merge.rc:4373
+#: Merge.rc:4383
msgid "Theirs File"
msgstr "Jų failas"
#. IDS_CONFLICT_MINE_FILE
-#: Merge.rc:4374
+#: Merge.rc:4384
msgid "Mine File"
msgstr "Mano failas"
#. IDS_SELFCOMPARE_ORIGINAL_FILE
-#: Merge.rc:4375
+#: Merge.rc:4385
msgid "Original File"
msgstr "Pradinis failas"
#. IDS_LINE_STATUS_INFO_EOL
-#: Merge.rc:4381
+#: Merge.rc:4391
#, c-format
msgid "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s"
msgstr "Eil.: %s Stlp.: %d/%d Sk.: %d/%d EPF: %s"
#. IDS_EMPTY_LINE_STATUS_INFO
-#: Merge.rc:4382
+#: Merge.rc:4392
#, c-format
msgid "Line: %s"
msgstr "Eilutė: %s"
#. IDS_LINE_STATUS_INFO
-#: Merge.rc:4383
+#: Merge.rc:4393
#, c-format
msgid "Ln: %s Col: %d/%d Ch: %d/%d"
msgstr "Eil.: %s Stlp.: %d/%d Sk.: %d/%d"
#. IDS_LINE_STATUS_INFO_SEL
-#: Merge.rc:4384
+#: Merge.rc:4394
#, c-format
msgid " Sel: %d | %d"
msgstr " Paž: %d | %d"
#. IDS_MERGEMODE_MERGING
-#: Merge.rc:4385
+#: Merge.rc:4395
msgid "Merge"
msgstr "Sulieti"
#. IDS_DIFF_NUMBER_STATUS_FMT
-#: Merge.rc:4386
+#: Merge.rc:4396
#, c-format
msgid "Difference %1 of %2"
msgstr "Skirtumas %1 iš %2"
#. IDS_NO_DIFF_SEL_FMT
-#: Merge.rc:4387
+#: Merge.rc:4397
#, c-format
msgid "%1 Differences Found"
msgstr "Rasti (-a) %1 skirtumai (-ų)"
#. IDS_1_DIFF_FOUND
-#: Merge.rc:4388
+#: Merge.rc:4398
msgid "1 Difference Found"
msgstr "Rastas 1 skirtumas"
#. IDS_NO_ERR_SEL_FMT
-#: Merge.rc:4389
+#: Merge.rc:4399
#, c-format
msgid "%1 Errors Found"
msgstr "Rastos (-a) %1 klaidos (-ų)"
#. IDS_1_ERR_FOUND
-#: Merge.rc:4390
+#: Merge.rc:4400
msgid "1 Error Found"
msgstr "Rasta 1 klaida"
#. IDS_STATUSBAR_READONLY, Abbreviation from "Read Only"
-#: Merge.rc:4391
+#: Merge.rc:4401
msgid "RO"
msgstr "RO"
#. IDS_DIRVIEW_STATUS_FMT_FOCUS
-#: Merge.rc:4397
+#: Merge.rc:4407
#, c-format
msgid "Item %1 of %2"
msgstr "Elementas %1 iš %2"
#. IDS_DIRVIEW_STATUS_FMT_NOFOCUS
-#: Merge.rc:4398
+#: Merge.rc:4408
#, c-format
msgid "Items: %1"
msgstr "Elementų: %1"
#. IDS_DIRVIEW_STATUS_COMPARING
-#: Merge.rc:4399
+#: Merge.rc:4409
msgid "Comparing items..."
msgstr "Lygina elementus..."
#. IDS_ITEMS_PER_SEC
-#: Merge.rc:4400
+#: Merge.rc:4410
#, c-format
msgid "%.1f[items/sec]"
msgstr "%.1f[elementų/sek.]"
#. IDS_ERROR_INCOMPARABLE
-#: Merge.rc:4406
+#: Merge.rc:4416
msgid "Select two existing folders/files to compare."
msgstr "Nurodykite lyginimui du egzistuojančius katalogus ar failus."
#. IDS_DIRSEL_TAG
-#: Merge.rc:4407
+#: Merge.rc:4417
msgid "Folder Selection"
msgstr "Katalogo išrinkimas"
#. IDS_OPEN_FILESDIRS
-#: Merge.rc:4408
+#: Merge.rc:4418
msgid "Select two (or three) folders/files to compare."
msgstr "Nurodykite lyginimui du (arba tris) katalogus ar failus."
#. IDS_OPEN_LEFTINVALID
-#: Merge.rc:4409
+#: Merge.rc:4419
msgid "Left (1st) path is invalid!"
msgstr "Kairysis (1-as) kelias klaidingas!"
#. IDS_OPEN_MIDDLEINVALID
-#: Merge.rc:4410
+#: Merge.rc:4420
msgid "Middle (2nd) path is invalid!"
msgstr "Vidurinis (2-as) kelias klaidingas!"
#. IDS_OPEN_RIGHTINVALID2
-#: Merge.rc:4411
+#: Merge.rc:4421
msgid "Right (2nd) path is invalid!"
msgstr "Dešinysis (2-as) kelias klaidingas!"
#. IDS_OPEN_RIGHTINVALID3
-#: Merge.rc:4412
+#: Merge.rc:4422
msgid "Right (3rd) path is invalid!"
msgstr "Dešinysis (3-ias) kelias klaidingas!"
#. IDS_OPEN_BOTHINVALID
-#: Merge.rc:4413
+#: Merge.rc:4423
msgid "Both paths are invalid!"
msgstr "Abu keliai klaidingi!"
-#: Merge.rc:4415
+#: Merge.rc:4425
msgid "Left (1st) and Middle (2nd) paths are invalid!"
msgstr "Kairysis (1-as) ir vidurinis (2-as) keliai klaidingi!"
#. IDS_OPEN_LEFTRIGHTINVALID
-#: Merge.rc:4416
+#: Merge.rc:4426
msgid "Left (1st) and Right (3rd) paths are invalid!"
msgstr "Kairysis (1-as) ir dešinysis (3-ias) keliai klaidingi!"
-#: Merge.rc:4418
+#: Merge.rc:4428
msgid "Middle (2nd) and Right (3rd) paths are invalid!"
msgstr "Vidurinis (2-as) ir dešinysis (3-ias) keliai klaidingi!"
#. IDS_OPEN_ALLINVALID
-#: Merge.rc:4419
+#: Merge.rc:4429
msgid "All paths are invalid!"
msgstr "Visi keliai klaidingi!"
#. IDS_OPEN_UNPACKERDISABLED
-#: Merge.rc:4420
+#: Merge.rc:4430
msgid "Only enabled for file comparisons"
msgstr "Leistas tik failų palyginimas"
#. IDS_OPEN_MISMATCH
-#: Merge.rc:4421
+#: Merge.rc:4431
msgid "Cannot compare file and folder!"
msgstr "Negalima lyginti failo ir katalogo!"
#. IDS_ERROR_FILE_NOT_FOUND
-#: Merge.rc:4427
+#: Merge.rc:4437
#, c-format
msgid "File not found: %1"
msgstr "Nerastas failas: %1"
#. IDS_ERROR_FILE_NOT_UNPACKED
-#: Merge.rc:4428
+#: Merge.rc:4438
#, c-format
msgid "File not unpacked: %1"
msgstr "Failas %1 neišpakuotas"
#. IDS_ERROR_FILEOPEN
-#: Merge.rc:4429
+#: Merge.rc:4439
#, c-format
msgid "Cannot open file\n%1\n\n%2"
msgstr "Negalima atidaryti failo\n%1\n\n%2"
#. IDS_ERROR_CONF_RESOLVE
-#: Merge.rc:4430
+#: Merge.rc:4440
msgid "Failed to parse conflict file."
msgstr "Nepavyko išnagrinėti konfliktų failo."
#. IDS_NOT_CONFLICT_FILE
-#: Merge.rc:4431
+#: Merge.rc:4441
#, c-format
msgid "The file\n%1\nis not a conflict file."
msgstr "Failas\n%1\nnėra konfliktų failas."
#. IDS_COMPARE_LARGE_FILES
-#: Merge.rc:4432
+#: Merge.rc:4442
msgid "Comparing large files requires significant memory.\nShow only comparison results (not file contents)?"
msgstr "Didelių failų palyginimas reikalauja labai daug atminties.\nGal norite matyti tik palyginimo rezultatus, o ne failų turinį?"
#. IDS_SAVE_AS_TITLE
-#: Merge.rc:4438
+#: Merge.rc:4448
msgid "Save As"
msgstr "Išsaugoti kaip"
#. IDS_SAVE_FMT
-#: Merge.rc:4439
+#: Merge.rc:4449
#, c-format
msgid "Save changes to %1?"
msgstr "Išsaugoti pakeitimus į %1?"
#. IDS_SAVEREADONLY_FMT
-#: Merge.rc:4440
+#: Merge.rc:4450
#, c-format
msgid "%1 is read-only. Override? Or 'No' to save as new filename?"
msgstr "%1 pažymėtas „Tik skaitymui“. Perrašyti? Arba „Ne“, jei įrašyti nauju vardu?"
#. IDS_ERROR_BACKUP
-#: Merge.rc:4441
+#: Merge.rc:4451
msgid "Error backing up file"
msgstr "Klaida kuriant rezervinį failą"
-#: Merge.rc:4443
+#: Merge.rc:4453
#, c-format
msgid "Unable to backup original file:\n%1\n\nContinue anyway?"
msgstr "Nepavyko sukurti rezervinės kopijos failui:\n%1\n\nVis tiek tęsti?"
#. IDS_FILESAVE_FAILED
-#: Merge.rc:4444
+#: Merge.rc:4454
#, c-format
msgid "Saving file failed.\n%1\n%2\n\t- Use different filename (OK)\n\t- Abort (Cancel)?"
msgstr "Failo įrašyti nepavyko.\n%1\n%2\n\t- panaudoti kitą failo vardą („Gerai“)\n\t- nutraukti šią operaciją („Atsisakyti“)?"
-#: Merge.rc:4446
+#: Merge.rc:4456
#, c-format
msgid "Plugin '%2' cannot pack changes to left file into '%1'.\n\nOriginal unchanged. Save unpacked version?"
msgstr "Papildinys '%2' negali supakuoti pakeitimų kairiajame faile atgal į '%1'.\n\nPradinis failas nebus pakeistas. Išsaugoti išpakuotą versiją?"
-#: Merge.rc:4448
+#: Merge.rc:4458
#, c-format
msgid "Plugin '%2' cannot pack changes to middle file into '%1'.\n\nOriginal unchanged. Save unpacked version?"
msgstr "Papildinys '%2' negali supakuoti pakeitimų viduriniame faile atgal į '%1'.\n\nPradinis failas nebus pakeistas. Išsaugoti išpakuotą versiją?"
-#: Merge.rc:4450
+#: Merge.rc:4460
#, c-format
msgid "Plugin '%2' cannot pack changes to right file into '%1'.\n\nOriginal unchanged. Save unpacked version?"
msgstr "Papildinys '%2' negali supakuoti pakeitimų dešiniajame faile atgal į '%1'.\n\nPradinis failas nebus pakeistas. Išsaugoti išpakuotą versiją?"
#. IDS_FILECHANGED_ONDISK
-#: Merge.rc:4451
+#: Merge.rc:4461
#, c-format
msgid "Another application updated\n%1\nsince WinMerge loaded it.\n\nOverwrite?"
msgstr "Kita programa pakeitė failą\n%1\npo to, kai jis buvo įkeltas į „Winmerge“.\n\nPerrašyti pakeistą failą?"
#. IDS_SAVEREADONLY_MULTI
-#: Merge.rc:4452
+#: Merge.rc:4462
#, c-format
msgid "%1\nis read-only. Override?"
msgstr "%1\npažymėtas „Tik skaitymui“. Perrašyti?"
#. IDS_FILECHANGED_RESCAN
-#: Merge.rc:4453
+#: Merge.rc:4463
#, c-format
msgid "Another application updated\n%1\nsince last scan.\n\nReload?"
msgstr "Kita programa pakeitė\n%1\npo to, kai jis buvo paskutinį kartą skanuotas.\n\nĮkelti iš naujo?"
#. IDS_SAVE_LEFT_AS
-#: Merge.rc:4454
+#: Merge.rc:4464
msgid "Save Left File As"
msgstr "Išsaugoti kairįjį failą kaip"
#. IDS_SAVE_MIDDLE_AS
-#: Merge.rc:4455
+#: Merge.rc:4465
msgid "Save Middle File As"
msgstr "Išsaugoti vidurinį failą kaip"
#. IDS_SAVE_RIGHT_AS
-#: Merge.rc:4456
+#: Merge.rc:4466
msgid "Save Right File As"
msgstr "Išsaugoti dašinįjį failą kaip"
#. IDS_FILE_DISAPPEARED
-#: Merge.rc:4461
+#: Merge.rc:4471
#, c-format
msgid "File\n%1\nnot found. Save a copy to continue."
msgstr "Failas\n% 1\nnerastas. Norėdami tęsti, įrašykite kopiją."
#. IDS_VIEWS_OUTOFSYNC
-#: Merge.rc:4467
+#: Merge.rc:4477
msgid "Cannot merge unsynched documents.\n\nRefresh before continuing."
msgstr "Negalima sulieti nesinchronizuotų dokumentų.\n\nAtnaujinkite prieš tęsiant."
#. IDS_BREAK_ON_WHITESPACE
-#: Merge.rc:4472
+#: Merge.rc:4482
msgid "Break at whitespace"
msgstr "Skaidyti per tarpą"
#. IDS_BREAK_ON_PUNCTUATION
-#: Merge.rc:4473
+#: Merge.rc:4483
msgid "Break at whitespace or punctuation"
msgstr "Skaidyti per tarpą ar skirtuką"
#. IDS_L2M
-#: Merge.rc:4479
+#: Merge.rc:4489
msgid "Copy to &Middle\tAlt+Right"
msgstr "Kopijuoti į &Vidurį\tAlt+Right"
#. IDS_R2M
-#: Merge.rc:4480
+#: Merge.rc:4490
msgid "Copy to &Middle\tAlt+Left"
msgstr "Kopijuoti į &Vidurį\tAlt+Left"
#. IDS_COPY_FROM_MIDDLE_R
-#: Merge.rc:4481
+#: Merge.rc:4491
msgid "Copy from Middle\tAlt+Shift+Right"
msgstr "Kopijuoti iš Vidurio\tAlt+Shift+Right"
#. IDS_COPY_FROM_MIDDLE_L
-#: Merge.rc:4482
+#: Merge.rc:4492
msgid "Copy from Middle\tAlt+Shift+Left"
msgstr "Kopijuoti iš Vidurio\tAlt+Shift+Left"
#. IDS_L2MNEXT
-#: Merge.rc:4483
+#: Merge.rc:4493
msgid "Copy to Middle and Advance\tCtrl+Alt+Right"
msgstr "Kopijuoti į vidurį ir Daugiau\tCtrl+Alt+Right"
#. IDS_R2MNEXT
-#: Merge.rc:4484
+#: Merge.rc:4494
msgid "Copy to Middle and Advance\tCtrl+Alt+Left"
msgstr "Kopijuoti į vidurį ir Daugiau\tCtrl+Alt+Left"
#. IDS_ALL_MIDDLE
-#: Merge.rc:4485
+#: Merge.rc:4495
msgid "Copy All to Middle"
msgstr "Kopijuoti viską į vidurį"
#. IDS_COPY_RIGHT_TO_LEFT
-#: Merge.rc:4491
+#: Merge.rc:4501
#, c-format
msgid "Right to Left (%1)"
msgstr "Dešinįjį į Kairįjį (%1)"
#. IDS_COPY_RIGHT_TO_MIDDLE
-#: Merge.rc:4492
+#: Merge.rc:4502
#, c-format
msgid "Right to Middle (%1)"
msgstr "Dešinįjį į Vidurinį (%1)"
#. IDS_COPY_MIDDLE_TO_LEFT
-#: Merge.rc:4493
+#: Merge.rc:4503
#, c-format
msgid "Middle to Left (%1)"
msgstr "Vidurinį į Kairįjį (%1 iš %2)"
#. IDS_COPY_MIDDLE_TO_RIGHT
-#: Merge.rc:4494
+#: Merge.rc:4504
#, c-format
msgid "Middle to Right (%1)"
msgstr "Vidurinį į Dešinįjį (%1)"
#. IDS_COPY_LEFT_TO_RIGHT
-#: Merge.rc:4495
+#: Merge.rc:4505
#, c-format
msgid "Left to Right (%1)"
msgstr "Kairįjį į Dešinįjį (%1)"
#. IDS_COPY_LEFT_TO_MIDDLE
-#: Merge.rc:4496
+#: Merge.rc:4506
#, c-format
msgid "Left to Middle (%1)"
msgstr "Kairįjį į Vidurinį (%1)"
#. IDS_MOVE_LEFT_TO
-#: Merge.rc:4507 Merge.rc:4539
+#: Merge.rc:4517 Merge.rc:4549
#, c-format
msgid "Left to... (%1)"
msgstr "Kairįjį į... (%1)"
#. IDS_MOVE_MIDDLE_TO
-#: Merge.rc:4508 Merge.rc:4540
+#: Merge.rc:4518 Merge.rc:4550
#, c-format
msgid "Middle to... (%1)"
msgstr "Vidurinį į... (%1)"
#. IDS_MOVE_RIGHT_TO
-#: Merge.rc:4509 Merge.rc:4541
+#: Merge.rc:4519 Merge.rc:4551
#, c-format
msgid "Right to... (%1)"
msgstr "Dešinįjį į... (%1)"
#. IDS_COPY_BOTH_TO
-#: Merge.rc:4510
+#: Merge.rc:4520
#, c-format
msgid "Both to... (%1)"
msgstr "Abu į... (%1)"
#. IDS_COPY_ALL_TO
-#: Merge.rc:4511
+#: Merge.rc:4521
#, c-format
msgid "All to... (%1)"
msgstr "Viską į... (%1)"
#. IDS_COPY_DIFFERENCES_TO
-#: Merge.rc:4512
+#: Merge.rc:4522
#, c-format
msgid "Differences to... (%1)"
msgstr "Skirtumus į... (%1)"
#. IDS_COPY_ONLYDIFFITEMS
-#: Merge.rc:4519
+#: Merge.rc:4529
msgid "Some selected items are identical or skipped.\nCopy only items with differences?"
msgstr "Kai kurie pasirinkti elementai yra identiški arba praleisti.\nKopijuoti tik besiskiriančius elementus?"
#. IDS_DEL_LEFT_FMT
-#: Merge.rc:4525
+#: Merge.rc:4535
#, c-format
msgid "Left (%1)"
msgstr "Kairėje (%1)"
#. IDS_DEL_MIDDLE_FMT
-#: Merge.rc:4526
+#: Merge.rc:4536
#, c-format
msgid "Middle (%1)"
msgstr "Viduryje (%1)"
#. IDS_DEL_RIGHT_FMT
-#: Merge.rc:4527
+#: Merge.rc:4537
#, c-format
msgid "Right (%1)"
msgstr "Dešinėje (%1)"
#. IDS_DEL_BOTH_FMT
-#: Merge.rc:4528
+#: Merge.rc:4538
#, c-format
msgid "Both (%1)"
msgstr "Abu (%1)"
#. IDS_DEL_ALL_FMT
-#: Merge.rc:4529
+#: Merge.rc:4539
#, c-format
msgid "All (%1)"
msgstr "Visi (%1)"
#. IDS_SELECT_DEST_LEFT
-#: Merge.rc:4545
+#: Merge.rc:4555
msgid "Left Side - Select Destination Folder:"
msgstr "Kairioji pusė - nurodykit rezultatų katalogą:"
#. IDS_SELECT_DEST_MIDDLE
-#: Merge.rc:4546
+#: Merge.rc:4556
msgid "Middle Side - Select Destination Folder:"
msgstr "Vidurys - nurodykit rezultatų katalogą:"
#. IDS_SELECT_DEST_RIGHT
-#: Merge.rc:4547
+#: Merge.rc:4557
msgid "Right Side - Select Destination Folder:"
msgstr "Dešinioji pusė - nurodykit rezultatų katalogą:"
#. IDS_FILES_AFFECTED_FMT
-#: Merge.rc:4548
+#: Merge.rc:4558
#, c-format
msgid "(%1 Files Affected)"
msgstr "(Paveikta %1 failų)"
#. IDS_FILES_AFFECTED_FMT2
-#: Merge.rc:4549
+#: Merge.rc:4559
#, c-format
msgid "(%1 of %2 Files Affected)"
msgstr "(Paveikta %1 iš %2 failų)"
#. IDS_CONFIRM_DELETE_SINGLE
-#: Merge.rc:4555
+#: Merge.rc:4565
#, c-format
msgid "Are you sure you want to delete\n\n%1 ?"
msgstr "Ar tikrai norite ištrinti\n\n%1 ?"
#. IDS_CONFIRM_SINGLE_COPY
-#: Merge.rc:4556
+#: Merge.rc:4566
msgid "Are you sure you want to copy?"
msgstr "Ar tikrai norite nukopijuoti?"
#. IDS_CONFIRM_MULTIPLE_COPY
-#: Merge.rc:4557
+#: Merge.rc:4567
#, c-format
msgid "Are you sure you want to copy %d items?"
msgstr "Ar tikrai norite nukopijuoti %d elementus?"
#. IDS_DIRCMP_NOTSYNC
-#: Merge.rc:4558
+#: Merge.rc:4568
#, c-format
msgid "Operation aborted!\n\nFolder contents changed, path\n%1\nnot found.\n\nRefresh the compare."
msgstr "Operacija nutraukta!\n\nPasikeitė katalogų turinys, kelias\n%1\nnerastas.\n\nAtnaujinkite palyginimą."
#. IDS_CONFIRM_SINGLE_MOVE
-#: Merge.rc:4563
+#: Merge.rc:4573
msgid "Are you sure you want to move?"
msgstr "Ar tikrai norite perkelti?"
#. IDS_CONFIRM_MULTIPLE_MOVE
-#: Merge.rc:4564
+#: Merge.rc:4574
#, c-format
msgid "Are you sure you want to move %d items?"
msgstr "Ar tikrai norite perkelti %d elementus?"
#. IDS_CONFIRM_MOVE_CAPTION
-#: Merge.rc:4566
+#: Merge.rc:4576
msgid "Confirm Move"
msgstr "Patvirtinti perkėlimą"
-#: Merge.rc:4568
+#: Merge.rc:4578
msgid "Close the folder comparison window?"
msgstr "Užverti katalogų lyginimo langą?"
-#: Merge.rc:4570
+#: Merge.rc:4580
msgid "Close the folder comparison window, which took a long time?"
msgstr "Užverti katalogų lyginimo langą, kurio suformavimas užtruko nemažai laiko?"
#. IDS_ERROR_INVALID_DIR_FILE_NAME
-#: Merge.rc:4571
+#: Merge.rc:4581
msgid "The file or folder name is invalid."
msgstr "Netinkamas failo ar katalogo pavadinimas."
#. IDS_ERROR_EXECUTE_FILE
-#: Merge.rc:4577
+#: Merge.rc:4587
#, c-format
msgid "Failed to execute external editor: %1"
msgstr "Nepavyko paleisti išorinio redaktoriaus: %1"
#. IDS_UNKNOWN_ARCHIVE_FORMAT
-#: Merge.rc:4583
+#: Merge.rc:4593
msgid "Unknown archive format"
msgstr "Nežinomo formato archyvas"
-#: Merge.rc:4585
+#: Merge.rc:4595
msgid "Failed to extract archive.\nCompare as text file?"
msgstr "Nepavyko išskleisti archyvo.\nLyginti kaip tekstinį failą?"
#. IDS_COLHDR_FILENAME
-#: Merge.rc:4591
+#: Merge.rc:4601
msgid "Filename"
msgstr "Failas"
#. IDS_COLHDR_DIR
-#: Merge.rc:4592
+#: Merge.rc:4602
msgctxt "DirView|ColumnHeader"
msgid "Folder"
msgstr "Katalogas"
#. IDS_COLHDR_RESULT
-#: Merge.rc:4593
+#: Merge.rc:4603
msgid "Comparison Result"
msgstr "Lyginimo rezultatas"
#. IDS_COLHDR_LTIMEM
-#: Merge.rc:4594
+#: Merge.rc:4604
msgid "Left Date"
msgstr "Kairiojo data"
#. IDS_COLHDR_RTIMEM
-#: Merge.rc:4595
+#: Merge.rc:4605
msgid "Right Date"
msgstr "Dešiniojo data"
#. IDS_COLHDR_MTIMEM
-#: Merge.rc:4596
+#: Merge.rc:4606
msgid "Middle Date"
msgstr "Vidurinio data"
#. IDS_COLHDR_LSIZE
-#: Merge.rc:4598
+#: Merge.rc:4608
msgid "Left Size"
msgstr "Kairiojo dydis"
#. IDS_COLHDR_RSIZE
-#: Merge.rc:4599
+#: Merge.rc:4609
msgid "Right Size"
msgstr "Dešiniojo dydis"
#. IDS_COLHDR_MSIZE
-#: Merge.rc:4604
+#: Merge.rc:4614
msgid "Middle Size"
msgstr "Vidurinio dydis"
#. IDS_COLHDR_RSIZE_SHORT
-#: Merge.rc:4605
+#: Merge.rc:4615
msgid "Right Size (Short)"
msgstr "Dešiniojo dydis (trumpas)"
#. IDS_COLHDR_LSIZE_SHORT
-#: Merge.rc:4606
+#: Merge.rc:4616
msgid "Left Size (Short)"
msgstr "Kairiojo dydis (trumpas)"
#. IDS_COLHDR_MSIZE_SHORT
-#: Merge.rc:4607
+#: Merge.rc:4617
msgid "Middle Size (Short)"
msgstr "Vidurinio dydis (trumpas)"
#. IDS_COLHDR_LTIMEC
-#: Merge.rc:4613
+#: Merge.rc:4623
msgid "Left Creation Time"
msgstr "Kairiojo sukūrimo laikas"
#. IDS_COLHDR_RTIMEC
-#: Merge.rc:4614
+#: Merge.rc:4624
msgid "Right Creation Time"
msgstr "Dešiniojo sukūrimo laikas"
#. IDS_COLHDR_MTIMEC
-#: Merge.rc:4615
+#: Merge.rc:4625
msgid "Middle Creation Time"
msgstr "Vidurinio sukūrimo laikas"
#. IDS_COLHDR_NEWER
-#: Merge.rc:4616
+#: Merge.rc:4626
msgid "Newer File"
msgstr "Naujesnis failas"
#. IDS_COLHDR_LVERSION
-#: Merge.rc:4617
+#: Merge.rc:4627
msgid "Left File Version"
msgstr "Kairiojo failo versija"
#. IDS_COLHDR_RVERSION
-#: Merge.rc:4618
+#: Merge.rc:4628
msgid "Right File Version"
msgstr "Dešiniojo failo versija"
#. IDS_COLHDR_MVERSION
-#: Merge.rc:4619
+#: Merge.rc:4629
msgid "Middle File Version"
msgstr "Vidurinio failo versija"
#. IDS_COLHDR_RESULT_ABBR
-#: Merge.rc:4620
+#: Merge.rc:4630
msgid "Short Result"
msgstr "Trumpas rezultatas"
#. IDS_COLHDR_LATTRIBUTES
-#: Merge.rc:4621
+#: Merge.rc:4631
msgid "Left Attributes"
msgstr "Kairiojo atributai"
#. IDS_COLHDR_RATTRIBUTES
-#: Merge.rc:4622
+#: Merge.rc:4632
msgid "Right Attributes"
msgstr "Dešiniojo atributai"
#. IDS_COLHDR_MATTRIBUTES
-#: Merge.rc:4623
+#: Merge.rc:4633
msgid "Middle Attributes"
msgstr "Vidurinio atributai"
#. IDS_COLHDR_LEOL_TYPE
-#: Merge.rc:4628
+#: Merge.rc:4638
msgid "Left EOL"
msgstr "Kairiojo EPF"
#. IDS_COLHDR_MEOL_TYPE
-#: Merge.rc:4629
+#: Merge.rc:4639
msgid "Middle EOL"
msgstr "Viduriniojo EPF"
#. IDS_COLHDR_REOL_TYPE
-#: Merge.rc:4630
+#: Merge.rc:4640
msgid "Right EOL"
msgstr "Dešiniojo EPF"
#. IDS_COLHDR_LENCODING
-#: Merge.rc:4636
+#: Merge.rc:4646
msgid "Left Encoding"
msgstr "Kairiojo koduotė"
#. IDS_COLHDR_RENCODING
-#: Merge.rc:4637
+#: Merge.rc:4647
msgid "Right Encoding"
msgstr "Dešiniojo koduotė"
#. IDS_COLHDR_MENCODING
-#: Merge.rc:4638
+#: Merge.rc:4648
msgid "Middle Encoding"
msgstr "Vidurinio koduotė"
#. IDS_COLHDR_NIDIFFS
-#: Merge.rc:4639
+#: Merge.rc:4649
msgid "Ignored Diff"
msgstr "Ignoruoti skirtumai"
#. IDS_COLHDR_BINARY
-#: Merge.rc:4641
+#: Merge.rc:4651
msgctxt "DirView|ColumnHeader"
msgid "Binary"
msgstr "Binarinis"
#. IDS_PLUGINS_TYPE_UNPACKER
-#: Merge.rc:4642 Merge.rc:4959
+#: Merge.rc:4652 Merge.rc:4969
msgid "Unpacker"
msgstr "Išpakuotojas"
#. IDS_PLUGIN_TYPE4
-#: Merge.rc:4643 Merge.rc:4960 Merge.rc:5267
+#: Merge.rc:4653 Merge.rc:4970 Merge.rc:5277
msgid "Prediffer"
msgstr "Parengėjas"
#. IDS_COLHDR_LEFT
-#: Merge.rc:4644
+#: Merge.rc:4654
msgid "Left"
msgstr "Kairėje"
#. IDS_COLHDR_MIDDLE
-#: Merge.rc:4645
+#: Merge.rc:4655
msgid "Middle"
msgstr "Viduryje"
#. IDS_COLHDR_RIGHT
-#: Merge.rc:4646
+#: Merge.rc:4656
msgid "Right"
msgstr "Dešinėje"
#. IDS_COLHDR_DIFF
-#: Merge.rc:4647
+#: Merge.rc:4657
msgid "Diff"
msgstr "Skirtumai"
#. IDS_COLHDR_LEFT_DUPLICATE
-#: Merge.rc:4648
+#: Merge.rc:4658
msgid "Left Duplicate Count"
msgstr "Dublikatų kiekis kairėje"
#. IDS_COLHDR_RIGHT_DUPLICATE
-#: Merge.rc:4649
+#: Merge.rc:4659
msgid "Right Duplicate Count"
msgstr "Dublikatų kiekis dešinėje"
#. IDS_COLHDR_MIDDLE_DUPLICATE
-#: Merge.rc:4650
+#: Merge.rc:4660
msgid "Middle Duplicate Count"
msgstr "Dublikatų kiekis viduryje"
#. IDS_COLHDR_MOVE
-#: Merge.rc:4651
+#: Merge.rc:4661
msgid "Move"
msgstr "Perkelti"
#. IDS_PRPCAT_AUDIO
-#: Merge.rc:4658
+#: Merge.rc:4668
msgid "Audio"
msgstr "Audio"
#. IDS_PRPCAT_CALENDAR
-#: Merge.rc:4659
+#: Merge.rc:4669
msgid "Calendar"
msgstr "Kalendorius"
#. IDS_PRPCAT_COMMUNICATION
-#: Merge.rc:4660
+#: Merge.rc:4670
msgid "Communication"
msgstr "Komunikavimas"
#. IDS_PRPCAT_CONTACT
-#: Merge.rc:4661
+#: Merge.rc:4671
msgid "Contact"
msgstr "Kontaktas"
#. IDS_PRPCAT_DEVICES
-#: Merge.rc:4662
+#: Merge.rc:4672
msgid "Devices"
msgstr "Įrenginiai"
#. IDS_PRPCAT_DOCUMENT
-#: Merge.rc:4663
+#: Merge.rc:4673
msgid "Document"
msgstr "Dokumentas"
#. IDS_PRPCAT_HOME
-#: Merge.rc:4664
+#: Merge.rc:4674
msgid "Home"
msgstr "Namas"
#. IDS_PRPCAT_JOURNAL
-#: Merge.rc:4666
+#: Merge.rc:4676
msgid "Journal"
msgstr "Žurnalas"
#. IDS_PRPCAT_LINK
-#: Merge.rc:4667
+#: Merge.rc:4677
msgid "Link"
msgstr "Nuoroda"
#. IDS_PRPCAT_MEDIA
-#: Merge.rc:4668
+#: Merge.rc:4678
msgid "Media"
msgstr "Media"
#. IDS_PRPCAT_MUSIC
-#: Merge.rc:4670
+#: Merge.rc:4680
msgid "Music"
msgstr "Muzika"
#. IDS_PRPCAT_NOTE
-#: Merge.rc:4671
+#: Merge.rc:4681
msgid "Note"
msgstr "Pastaba"
#. IDS_PRPCAT_PHOTO
-#: Merge.rc:4672
+#: Merge.rc:4682
msgid "Photo"
msgstr "Fotografija"
#. IDS_PRPCAT_RECORDEDTV
-#: Merge.rc:4673
+#: Merge.rc:4683
msgid "RecordedTV"
msgstr "TV įrašas"
#. IDS_PRPCAT_SEARCH
-#: Merge.rc:4674
+#: Merge.rc:4684
msgid "Search"
msgstr "Paieška"
#. IDS_PRPCAT_SECURITY
-#: Merge.rc:4675
+#: Merge.rc:4685
msgid "Security"
msgstr "Saugumas"
#. IDS_PRPCAT_SOFTWARE
-#: Merge.rc:4676
+#: Merge.rc:4686
msgid "Software"
msgstr "Programinė įranga"
#. IDS_PRPCAT_TASK
-#: Merge.rc:4677
+#: Merge.rc:4687
msgid "Task"
msgstr "Užduotis"
#. IDS_PRPCAT_VIDEO
-#: Merge.rc:4678
+#: Merge.rc:4688
msgid "Video"
msgstr "Video"
#. IDS_PRPCAT_HASH
-#: Merge.rc:4679
+#: Merge.rc:4689
msgid "Hash"
msgstr "Maiša"
#. IDS_CANT_COMPARE_FILES
-#: Merge.rc:4685
+#: Merge.rc:4695
msgid "Unable to compare files"
msgstr "Neįmanoma palyginti failų"
#. IDS_ABORTED_ITEM
-#: Merge.rc:4686
+#: Merge.rc:4696
msgid "Item aborted"
msgstr "Elementų praleista"
#. IDS_FILE_SKIPPED
-#: Merge.rc:4687
+#: Merge.rc:4697
msgid "File skipped"
msgstr "Praleistas failas"
#. IDS_DIR_SKIPPED
-#: Merge.rc:4688
+#: Merge.rc:4698
msgid "Folder skipped"
msgstr "Praleistas katalogas"
#. IDS_LEFT_ONLY_IN_FMT
-#: Merge.rc:4689
+#: Merge.rc:4699
#, c-format
msgid "Left only: %1"
msgstr "Yra tik kairėje: %1"
#. IDS_MIDDLE_ONLY_IN_FMT
-#: Merge.rc:4690
+#: Merge.rc:4700
#, c-format
msgid "Middle only: %1"
msgstr "Yra tik viduryje: %1"
#. IDS_RIGHT_ONLY_IN_FMT
-#: Merge.rc:4691
+#: Merge.rc:4701
#, c-format
msgid "Right only: %1"
msgstr "Yra tik dešinėje: %1"
#. IDS_DOES_NOT_EXIST_IN_FMT
-#: Merge.rc:4692
+#: Merge.rc:4702
#, c-format
msgid "Does not exist in %1"
msgstr "Nėra %1"
#. IDS_BIN_FILES_SAME
-#: Merge.rc:4693
+#: Merge.rc:4703
msgid "Binary files are identical"
msgstr "Binariniai failai vienodi"
#. IDS_BIN_FILES_DIFF
-#: Merge.rc:4699
+#: Merge.rc:4709
msgid "Binary files are different"
msgstr "Binariniai failai skiriasi"
#. IDS_FILES_ARE_DIFFERENT
-#: Merge.rc:4700
+#: Merge.rc:4710
msgid "Files are different"
msgstr "Failai skiriasi"
#. IDS_FOLDERS_ARE_DIFFERENT
-#: Merge.rc:4701
+#: Merge.rc:4711
msgid "Folders are different"
msgstr "Katalogai skiriasi"
#. IDS_LEFTONLY
-#: Merge.rc:4702
+#: Merge.rc:4712
msgid "Left Only"
msgstr "Yra tik kairysis"
#. IDS_RIGHTONLY
-#: Merge.rc:4703
+#: Merge.rc:4713
msgid "Right Only"
msgstr "Yra tik dešinysis"
#. IDS_MIDDLEONLY
-#: Merge.rc:4704
+#: Merge.rc:4714
msgid "Middle Only"
msgstr "Yra tik vidurinis"
#. IDS_NOITEMLEFT
-#: Merge.rc:4705
+#: Merge.rc:4715
msgid "No item in left"
msgstr "Nėra elemento kairėje"
#. IDS_NOITEMRIGHT
-#: Merge.rc:4706
+#: Merge.rc:4716
msgid "No item in right"
msgstr "Nėra elemento dešinėje"
#. IDS_NOITEMMIDDLE
-#: Merge.rc:4707
+#: Merge.rc:4717
msgid "No item in middle"
msgstr "Nėra elemento viduryje"
#. IDS_CMPRES_ERROR
-#: Merge.rc:4709
+#: Merge.rc:4719
msgid "Error"
msgstr "Klaida"
#. IDS_TEXT_FILES_SAME
-#: Merge.rc:4710
+#: Merge.rc:4720
msgid "Text files are identical"
msgstr "Tekstiniai failai vienodi"
#. IDS_LEFTONLY_DIFF
-#: Merge.rc:4711
+#: Merge.rc:4721
msgid " (Middle and right are identical)"
msgstr " (Vidurinis ir dešinysis yra vienodi)"
#. IDS_MIDDLEONLY_DIFF
-#: Merge.rc:4712
+#: Merge.rc:4722
msgid " (Left and right are identical)"
msgstr " (Kairysis ir dešinysis yra vienodi)"
#. IDS_RIGHTONLY_DIFF
-#: Merge.rc:4713
+#: Merge.rc:4723
msgid " (Left and middle are identical)"
msgstr " (Kairysis ir vidurinis yra vienodi)"
#. IDS_PATH_MISMATCH
-#: Merge.rc:4714
+#: Merge.rc:4724
msgid " (paths differ)"
msgstr " (keliai skiriasi)"
#. IDS_TEXT_FILES_DIFF
-#: Merge.rc:4715
+#: Merge.rc:4725
msgid "Text files are different"
msgstr "Tekstiniai failai skiriasi"
#. IDS_IMAGE_FILES_SAME
-#: Merge.rc:4716
+#: Merge.rc:4726
msgid "Image files are identical"
msgstr "Paveikslėliai vienodi"
#. IDS_IMAGE_FILES_DIFF
-#: Merge.rc:4717
+#: Merge.rc:4727
msgid "Image files are different"
msgstr "Paveikslėliai skiriasi"
#. IDS_EXPR_DIFF
-#: Merge.rc:4718
+#: Merge.rc:4728
#, c-format
msgid "Files are different (expr: %1)"
msgstr "Failai skiriasi (išraiška: %1)"
#. IDS_HASH_GROUP
-#: Merge.rc:4719
+#: Merge.rc:4729
#, c-format
msgid "Group%d"
msgstr "Grupė%d"
#. IDS_RENAME_MOVE_DETECTION_DISALBED
-#: Merge.rc:4720
+#: Merge.rc:4730
msgctxt "Options dialog|Compare|Folder|Detect renames and moves"
msgid "Disabled"
msgstr "Išjungta"
#. IDS_RENAME_MOVE_DETECTION_RENAME
-#: Merge.rc:4721
+#: Merge.rc:4731
msgid "Detect renames"
msgstr "Aptikti pervardijimą"
#. IDS_RENAME_MOVE_DETECTION_RENAME_MOVE
-#: Merge.rc:4722
+#: Merge.rc:4732
msgid "Detect renames and moves"
msgstr "Aptikti pervardijimą ir perkėlimą"
#. IDS_RENAME_MOVE_MERGE_MODE_RENAME
-#: Merge.rc:4723
+#: Merge.rc:4733
msgid "Merge renames"
msgstr "Sulieti pervardijimus"
#. IDS_RENAME_MOVE_MERGE_MODE_RENAME_MOVE
-#: Merge.rc:4724
+#: Merge.rc:4734
msgid "Merge renames and moves"
msgstr "Sulieti pervardijimus ir perkėlimus"
#. IDS_RENAMED
-#: Merge.rc:4725
+#: Merge.rc:4735
msgid "Renamed"
msgstr "Pervardinta"
#. IDS_MOVED
-#: Merge.rc:4726
+#: Merge.rc:4736
msgid "Moved"
msgstr "Perkelta"
#. IDS_RENAMED_MOVED
-#: Merge.rc:4727
+#: Merge.rc:4737
msgid "Renamed/Moved"
msgstr "Pervardinta/Perkelta"
#. IDS_RENAMED_MOVED_ITEMS
-#: Merge.rc:4728
+#: Merge.rc:4738
#, c-format
msgid "(%1 items)"
msgstr "(%1 elementai)"
#. IDS_RENAMED_MOVED_RESULT
-#: Merge.rc:4729
+#: Merge.rc:4739
#, c-format
msgid "%1 (set %2): "
msgstr "%1 (nust. %2): "
#. IDS_SWITCH_FLAT_MODE
-#: Merge.rc:4730
+#: Merge.rc:4740
msgid "Some moved items have been merged.\nIn Tree Mode, these items may appear in positions that do not reflect the actual folder structure, which can be confusing.\nSwitch to Flat Mode?"
msgstr "Kai kurie perkelti elementai buvo sujungti.\nMedžio režimu šie elementai gali būti rodomi pozicijose, neatspindinčiose tikrosios aplanko struktūros, kas gali kelti painiavą.\nPerjungti į plokščiąjį režimą?"
#. IDS_ELAPSED_TIME
-#: Merge.rc:4736
+#: Merge.rc:4746
#, c-format
msgid "Elapsed time: %ld ms"
msgstr "Praėjęs laikas: %ld ms"
#. IDS_STATUS_SELITEM1
-#: Merge.rc:4737
+#: Merge.rc:4747
msgid "1 item selected"
msgstr "pasirinktas 1 elementas"
#. IDS_STATUS_SELITEMS
-#: Merge.rc:4738
+#: Merge.rc:4748
#, c-format
msgid "%1 items selected"
msgstr "pasirinkta %1 elementų"
#. IDS_COLDESC_FILENAME
-#: Merge.rc:4744
+#: Merge.rc:4754
msgid "Filename or folder name."
msgstr "Failo arba katalogo vardas."
#. IDS_COLDESC_DIR
-#: Merge.rc:4745
+#: Merge.rc:4755
msgid "Subfolder name when subfolders are included."
msgstr "Pakatalogio pavadinimas, jei įtraukiami pakatalogiai."
#. IDS_COLDESC_RESULT
-#: Merge.rc:4746
+#: Merge.rc:4756
msgid "Comparison result, long form."
msgstr "Lyginimo rezultatas, išsami forma."
#. IDS_COLDESC_LTIMEM
-#: Merge.rc:4751
+#: Merge.rc:4761
msgid "Left side modification date."
msgstr "Kairiosios pusės redagavimo data."
#. IDS_COLDESC_RTIMEM
-#: Merge.rc:4752
+#: Merge.rc:4762
msgid "Right side modification date."
msgstr "Dešiniosios pusės redagavimo data."
#. IDS_COLDESC_MTIMEM
-#: Merge.rc:4753
+#: Merge.rc:4763
msgid "Middle side modification date."
msgstr "Vidurinės pusės redagavimo data."
#. IDS_COLDESC_EXTENSION
-#: Merge.rc:4754
+#: Merge.rc:4764
msgid "File's extension."
msgstr "Failo plėtinys."
#. IDS_COLDESC_LSIZE
-#: Merge.rc:4755
+#: Merge.rc:4765
msgid "Left file size in bytes."
msgstr "Kairiojo failo dydis baitais."
#. IDS_COLDESC_RSIZE
-#: Merge.rc:4756
+#: Merge.rc:4766
msgid "Right file size in bytes."
msgstr "Dešiniojo failo dydis baitais."
#. IDS_COLDESC_MSIZE
-#: Merge.rc:4757
+#: Merge.rc:4767
msgid "Middle file size in bytes."
msgstr "Vidurinio failo dydis baitais."
#. IDS_COLDESC_LSIZE_SHORT
-#: Merge.rc:4758
+#: Merge.rc:4768
msgid "Left file size abbreviated."
msgstr "Kairiojo failo dydis sutrumpintas."
#. IDS_COLDESC_RSIZE_SHORT
-#: Merge.rc:4759
+#: Merge.rc:4769
msgid "Right file size abbreviated."
msgstr "Dešiniojo failo dydis sutrumpintas."
#. IDS_COLDESC_MSIZE_SHORT
-#: Merge.rc:4760
+#: Merge.rc:4770
msgid "Middle file size abbreviated."
msgstr "Vidurinio failo dydis sutrumpintas."
#. IDS_COLDESC_LTIMEC
-#: Merge.rc:4766
+#: Merge.rc:4776
msgid "Left side creation time."
msgstr "Kairiosios pusės sukūrimo laikas."
#. IDS_COLDESC_RTIMEC
-#: Merge.rc:4767
+#: Merge.rc:4777
msgid "Right side creation time."
msgstr "Dešiniosios pusės sukūrimo laikas."
#. IDS_COLDESC_MTIMEC
-#: Merge.rc:4768
+#: Merge.rc:4778
msgid "Middle side creation time."
msgstr "Vidurinės pusės sukūrimo laikas."
#. IDS_COLDESC_NEWER
-#: Merge.rc:4769
+#: Merge.rc:4779
msgid "Tells which side has newer modification date."
msgstr "Parodo, kurioje pusėje yra naujesnė modifikavimo data."
#. IDS_COLDESC_LVERSION
-#: Merge.rc:4770
+#: Merge.rc:4780
msgid "Left side file version, only for some file types."
msgstr "Kairiojo failo versija, tik kai kuriems failų tipams."
#. IDS_COLDESC_RVERSION
-#: Merge.rc:4771
+#: Merge.rc:4781
msgid "Right side file version, only for some file types."
msgstr "Dešiniojo failo versija, tik kai kuriems failų tipams."
#. IDS_COLDESC_MVERSION
-#: Merge.rc:4776
+#: Merge.rc:4786
msgid "Middle side file version, only for some file types."
msgstr "Vidurinio failo versija, tik kai kuriems failų tipams."
#. IDS_COLDESC_RESULT_ABBR
-#: Merge.rc:4777
+#: Merge.rc:4787
msgid "Short comparison result."
msgstr "Trumpo palyginimo rezultatai."
#. IDS_COLDESC_LATTRIBUTES
-#: Merge.rc:4778
+#: Merge.rc:4788
msgid "Left side attributes."
msgstr "Kairiosios pusės atributai."
#. IDS_COLDESC_RATTRIBUTES
-#: Merge.rc:4779
+#: Merge.rc:4789
msgid "Right side attributes."
msgstr "Dešiniosios pusės atributai."
#. IDS_COLDESC_MATTRIBUTES
-#: Merge.rc:4780
+#: Merge.rc:4790
msgid "Middle side attributes."
msgstr "Vidurinės pusės atributai."
#. IDS_COLDESC_LEOL_TYPE
-#: Merge.rc:4781
+#: Merge.rc:4791
msgid "Left side file EOL type."
msgstr "Kairiojo failo eilučių pabaigos formatas."
#. IDS_COLDESC_REOL_TYPE
-#: Merge.rc:4782
+#: Merge.rc:4792
msgid "Right side file EOL type."
msgstr "Dešiniojo failo eilučių pabaigos formatas."
#. IDS_COLDESC_MEOL_TYPE
-#: Merge.rc:4783
+#: Merge.rc:4793
msgid "Middle side file EOL type."
msgstr "Vidurinio failo eilučių pabaigos formatas."
#. IDS_COLDESC_LENCODING
-#: Merge.rc:4789
+#: Merge.rc:4799
msgid "Left side encoding."
msgstr "Kairiosios pusės koduotė."
#. IDS_COLDESC_RENCODING
-#: Merge.rc:4790
+#: Merge.rc:4800
msgid "Right side encoding."
msgstr "Dešiniosios pusės koduotė."
#. IDS_COLDESC_MENCODING
-#: Merge.rc:4791
+#: Merge.rc:4801
msgid "Middle side encoding."
msgstr "Vidurinės pusės koduotė."
#. IDS_COLDESC_NIDIFFS
-#: Merge.rc:4792
+#: Merge.rc:4802
msgid "Number of ignored differences in file. Ignored and cannot be merged."
msgstr "Ignoruotų skirtumų skaičius faile. Šie skirtumai yra „WinMerge“ ignoruoti ir negali būti sulieti."
#. IDS_COLDESC_NSDIFFS
-#: Merge.rc:4793
+#: Merge.rc:4803
msgid "Number of differences in file (excluding ignored)."
msgstr "Skirtumų skaičius faile. Šis skaičius neapima ignoruotų skirtumų."
#. IDS_COLDESC_BINARY
-#: Merge.rc:4794
+#: Merge.rc:4804
msgid "Shows an asterisk (*) if the file is binary."
msgstr "Rodyti žvaigždutę (*) jei failas yra binarinis."
#. IDS_COLDESC_UNPACKER
-#: Merge.rc:4795
+#: Merge.rc:4805
msgid "Unpacker plugin name or pipeline."
msgstr "Išpakuotojo papildinio pavadinimas arba komandų grandinė."
#. IDS_COLDESC_PREDIFFER
-#: Merge.rc:4796
+#: Merge.rc:4806
msgid "Prediffer plugin name or pipeline."
msgstr "Parengėjo papildinio pavadinimas arba komandų grandinė."
#. IDS_DIRECTORY_REPORT_TITLE
-#: Merge.rc:4802
+#: Merge.rc:4812
#, c-format
msgid "Compare %1 with %2"
msgstr "Lyginti %1 su %2"
#. IDS_DIRECTORY_REPORT_TITLE3
-#: Merge.rc:4803
+#: Merge.rc:4813
#, c-format
msgid "Compare %1 with %2 and %3"
msgstr "Lyginti %1 su %2 ir %3"
#. IDS_REPORT_COMMALIST
-#: Merge.rc:4804
+#: Merge.rc:4814
msgid "Comma-separated list"
msgstr "Kableliais sudalintas sąrašas"
#. IDS_REPORT_TABLIST
-#: Merge.rc:4805
+#: Merge.rc:4815
msgid "Tab-separated list"
msgstr "TAB simboliais sudalintas sąrašas"
#. IDS_REPORT_SIMPLEHTML
-#: Merge.rc:4806
+#: Merge.rc:4816
msgid "Simple HTML"
msgstr "Paprastas HTML"
#. IDS_REPORT_SIMPLEXML
-#: Merge.rc:4807
+#: Merge.rc:4817
msgid "Simple XML"
msgstr "Paprastas XML"
-#: Merge.rc:4809
+#: Merge.rc:4819
msgid "Report file already exists. Overwrite?"
msgstr "Ataskaitos failas jau yra. Perrašyti?"
#. IDS_REPORT_ERROR
-#: Merge.rc:4814
+#: Merge.rc:4824
#, c-format
msgid "Error creating the report:\n%1"
msgstr "Klaida kuriant ataskaitą:\n%1"
#. IDS_REPORT_SUCCESS
-#: Merge.rc:4815
+#: Merge.rc:4825
msgid "Report created successfully."
msgstr "Ataskaita sukurta sėkmingai."
#. IDS_SYNCPOINT_LASTBLOCK
-#: Merge.rc:4821
+#: Merge.rc:4831
msgid "Cannot add a synchronization point at this line."
msgstr "Šioje eilutėje negalima pridėti sinchronizavimo taško."
#. IDS_FILE_TO_ITSELF
-#: Merge.rc:4827
+#: Merge.rc:4837
msgid "Same file is opened in both panes."
msgstr "Tas pats failas pasirinktas abiejose pusėse."
#. IDS_FILESSAME
-#: Merge.rc:4828
+#: Merge.rc:4838
msgid "Selected files are identical."
msgstr "Pasirinkti failai yra vienodi."
#. IDS_FILESSAME_CURCFG
-#: Merge.rc:4829
+#: Merge.rc:4839
msgid "Selected files are identical (with current settings).\r\nChecking binary identity..."
msgstr "Pasirinkti failai yra vienodi (su dabartiniais nustatymais).\r\nTikrinamas binarinis tapatumas..."
#. IDS_FILESSAME_BINERROR
-#: Merge.rc:4830
+#: Merge.rc:4840
msgid "Selected files are identical (with current settings).\r\nBut binary comparison failed."
msgstr "Pasirinkti failai yra vienodi (su dabartiniais nustatymais).\r\nTačiau binarinis palyginimas nepavyko."
#. IDS_FILESSAME_BINSAME
-#: Merge.rc:4831
+#: Merge.rc:4841
msgid "Selected files are identical (binary match)."
msgstr "Pasirinkti failai yra vienodi (taip pat ir binariniame lygmenyje)"
#. IDS_FILESSAME_BINDIFF
-#: Merge.rc:4832
+#: Merge.rc:4842
msgid "Selected files are identical (with current settings).\r\nBut differ at the binary level."
msgstr "Pasirinkti failai yra vienodi (su dabartiniais nustatymais).\r\nBet skiriasi binariniame lygmenyje."
#. IDS_FILEERROR
-#: Merge.rc:4833
+#: Merge.rc:4843
msgid "An error occurred while comparing files."
msgstr "Lyginant failus įvyko klaida."
#. IDS_TEMP_FILEERROR
-#: Merge.rc:4834
+#: Merge.rc:4844
msgid "Could not create temporary files. Check your temporary path settings."
msgstr "Nepavyko sukurti laikinų failų. Patikrinkite laikinųjų kelių nustatymus."
#. IDS_SUGGEST_IGNOREEOL
-#: Merge.rc:4835
+#: Merge.rc:4845
msgid "Files use different EOL.\n\nTreat all EOL as equivalent?\n\nSet 'Ignore EOL differences (Windows/Unix/Mac)' in Compare section of Options."
msgstr "Failai naudoja skirtingus eilučių pabaigos tipus.\n\nAr norite, kad į tai nebūtų kreipiamas dėmesys?\n\n„Nuostatų“ (Redaguoti / Nuostatos...) ekrano „Lyginimo“ dalyje įjunkite „Ignoruoti eilučių pabaigos skirtumus (Windows/Unix/Mac)“."
#. IDS_INVALID_DIRECTORY
-#: Merge.rc:4836
+#: Merge.rc:4846
msgid "Selected folder is invalid."
msgstr "Pasirinktas katalogas yra netinkamas."
#. IDS_CANNOT_OPEN_BINARYFILE
-#: Merge.rc:4837
+#: Merge.rc:4847
msgid "Cannot open a binary file in Editor."
msgstr "Negalima atidaryti binarinio failo redaktoriuje."
#. IDS_CREATE_PAIR_FOLDER
-#: Merge.rc:4838
+#: Merge.rc:4848
#, c-format
msgid "Create matching folder:\n%1\non the other side and open?"
msgstr "Norite sukurti atitinkamą katalogą:\n%1\nkitoje pusėje ir atverti šiuos katalogus?"
#. IDS_CONFIRM_COPY_ALL_DIFFS
-#: Merge.rc:4839
+#: Merge.rc:4849
msgid "Copy all differences to other file?"
msgstr "Nukopijuoti visus skirtumus į kitą failą?"
#. IDS_MOVE_TO_NEXTFILE
-#: Merge.rc:4844
+#: Merge.rc:4854
msgid "Move to next file?"
msgstr "Pereiti prie kito failo?"
#. IDS_MOVE_TO_PREVFILE
-#: Merge.rc:4845
+#: Merge.rc:4855
msgid "Move to previous file?"
msgstr "Pereiti prie praeito failo?"
#. IDS_MOVE_TO_NEXTPAGE
-#: Merge.rc:4846
+#: Merge.rc:4856
msgid "Move to next page?"
msgstr "Pereiti prie kito puslapio?"
#. IDS_MOVE_TO_PREVPAGE
-#: Merge.rc:4847
+#: Merge.rc:4857
msgid "Move to previous page?"
msgstr "Pereiti prie praeito puslapio?"
#. IDS_MOVE_TO_FIRSTFILE
-#: Merge.rc:4848
+#: Merge.rc:4858
msgid "Move to first file?"
msgstr "Pereiti prie pirmo failo?"
#. IDS_MOVE_TO_LASTFILE
-#: Merge.rc:4849
+#: Merge.rc:4859
msgid "Move to last file?"
msgstr "Pereiti prie paskutinio failo?"
-#: Merge.rc:4856
+#: Merge.rc:4866
#, c-format
msgid "Different codepages: left (cp%d), right (cp%d).\nDisplay in codepage (better display) or default Windows codepage (safer merging)?\n(Recommended: default Windows codepage)"
msgstr "Skiriasi failų koduotės: kairiojo (cp%d), dešiniojo (cp%d).\nKiekvieno failo rodymas savoje koduotėje duos geresnį vaizdą, bet gali būti pavojingas suliejant ar kopijuojant.\nNorite, kad abu failai būtų rodomi numatytoje „Windows“ koduotėje (rekomenduojama)?"
-#: Merge.rc:4858
+#: Merge.rc:4868
msgid "Information lost due to encoding errors: both files"
msgstr "Informacija prarasta dėl kodavimo klaidų: abu failai"
-#: Merge.rc:4860
+#: Merge.rc:4870
msgid "Information lost due to encoding errors: first file"
msgstr "Informacija prarasta dėl kodavimo klaidų: pirmasis failas"
-#: Merge.rc:4862
+#: Merge.rc:4872
msgid "Information lost due to encoding errors: second file"
msgstr "Informacija prarasta dėl kodavimo klaidų: antrasis failas"
-#: Merge.rc:4864
+#: Merge.rc:4874
msgid "Information lost due to encoding errors: third file"
msgstr "Informacija prarasta dėl kodavimo klaidų: trečiasis failas"
#. IDS_LINEDIFF_NODIFF
-#: Merge.rc:4870
+#: Merge.rc:4880
msgid "No difference"
msgstr "Nėra skirtumų"
#. IDS_LINEDIFF_NODIFF_CAPTION
-#: Merge.rc:4871
+#: Merge.rc:4881
msgid "Line difference"
msgstr "Skirtumai eilutėje"
#. IDS_NUM_REPLACED
-#: Merge.rc:4877
+#: Merge.rc:4887
#, c-format
msgid "Replaced %1 string(s)."
msgstr "Pakeista %1 eilutė(-ės)."
#. IDS_EDIT_TEXT_NOT_FOUND
-#: Merge.rc:4878
+#: Merge.rc:4888
#, c-format
msgid "Cannot find string \"%s\"."
msgstr "Nerasta eilutė \"%s\"."
#. IDS_MERGE_MODE
-#: Merge.rc:4884
+#: Merge.rc:4894
msgid "Entering Merge Mode. Press F9 to turn off."
msgstr "Dabar įeinate į Suliejimo režimą. Paspauskite F9 klavišą, jei norite išjungti."
#. IDS_AUTO_MERGE
-#: Merge.rc:4890
+#: Merge.rc:4900
#, c-format
msgid "Automatic merges: %1\nUnresolved conflicts: %2"
msgstr "Automatiškai sulietų pakeitimų skaičius: %1\nNeišspręstų konfliktų skaičius: %2"
#. IDS_CODEPAGE_MERGED
-#: Merge.rc:4891
+#: Merge.rc:4901
msgid "Codepage change merged."
msgstr "Koduotės pasikeitimas buvo sulietas."
#. IDS_CODEPAGE_CONFLICT
-#: Merge.rc:4892
+#: Merge.rc:4902
msgid "Codepage changes are conflicting."
msgstr "Koduotės pakeitimai yra prieštaringi."
#. IDS_EOL_MERGED
-#: Merge.rc:4893
+#: Merge.rc:4903
msgid "EOL change merged."
msgstr "Eilučių pabaigos formato pasikeitimas buvo sulietas."
#. IDS_EOL_CONFLICT
-#: Merge.rc:4894
+#: Merge.rc:4904
msgid "EOL changes are conflicting."
msgstr "Eilučių pabaigos formato pakeitimai yra prieštaringi."
#. IDS_LOCBAR_CAPTION
-#: Merge.rc:4900
+#: Merge.rc:4910
msgid "Location Pane"
msgstr "Vietos polangis"
#. IDS_DIFFBAR_CAPTION
-#: Merge.rc:4901
+#: Merge.rc:4911
msgid "Diff Pane"
msgstr "Skirtumų polangis"
#. IDS_DIFF_SUCCEEDED
-#: Merge.rc:4908
+#: Merge.rc:4918
msgid "Patch file written."
msgstr "Pataisų failas sėkmingai įrašytas."
#. IDS_DIFF_ITEM1NOTFOUND
-#: Merge.rc:4909
+#: Merge.rc:4919
msgid "First item not found!"
msgstr "Pirmas elementas nerastas!"
#. IDS_DIFF_ITEM2NOTFOUND
-#: Merge.rc:4910
+#: Merge.rc:4920
msgid "Second item not found!"
msgstr "Antras elementas nerastas!"
#. IDS_DIFF_FILEOVERWRITE
-#: Merge.rc:4911
+#: Merge.rc:4921
msgid "Patch file already exists. Overwrite?"
msgstr "Pataisų failas jau yra. Perrašyti?"
#. IDS_DIFF_SELECTEDFILES
-#: Merge.rc:4912
+#: Merge.rc:4922
#, c-format
msgid "[%1 files selected]"
msgstr "[pasirinkta %1 failų]"
#. IDS_DIFF_NORMAL
-#: Merge.rc:4913
+#: Merge.rc:4923
msgid "Normal"
msgstr "Normalus"
#. IDS_DIFF_CONTEXT
-#: Merge.rc:4914
+#: Merge.rc:4924
msgid "Context"
msgstr "Kontekstinis"
#. IDS_DIFF_UNIFIED
-#: Merge.rc:4915
+#: Merge.rc:4925
msgid "Unified"
msgstr "Unifikuotas"
#. IDS_FILEWRITE_ERROR
-#: Merge.rc:4917
+#: Merge.rc:4927
#, c-format
msgid "Could not write to file %1."
msgstr "Nepavyko rašymas į failą %1."
#. IDS_PATH_NOT_ABSOLUTE
-#: Merge.rc:4918
+#: Merge.rc:4928
#, c-format
msgid "Output path is not absolute: %1"
msgstr "Rezultato kelias nėra absoliutus kelias: %1"
#. IDS_MUST_SPECIFY_OUTPUT
-#: Merge.rc:4919
+#: Merge.rc:4929
msgid "Specify an output file."
msgstr "Nurodykite failą rezultatams."
-#: Merge.rc:4921
+#: Merge.rc:4931
msgid "Cannot create patch from binary files."
msgstr "Negalima kurti pataisų failo iš binarinių failų."
#. IDS_SAVEFILES_FORPATCH
-#: Merge.rc:4922
+#: Merge.rc:4932
msgid "Save all files first.\n\nCreating a patch requires no unsaved changes."
msgstr "Pirmiausia išsaugokite visus failus.\n\nPataisos kūrimui reikia, kad failuose nebūtų neišsaugotų pakeitimų."
#. IDS_FOLDER_NOTEXIST
-#: Merge.rc:4923
+#: Merge.rc:4933
msgid "Folder does not exist."
msgstr "Katalogas nerastas."
#. IDS_NO_ZIP_SUPPORT
-#: Merge.rc:4928
+#: Merge.rc:4938
msgid "Archive support not enabled.\n7-Zip and/or Merge7z*.dll not found.\nSee manual for archive support."
msgstr "Archyvų palaikymas nėra įjungtas.\nNerasti 7-Zip ir/arba Merge7z*.dll.\nInformacijos apie archyvų palaikymą ieškokite naudotojo vadove."
#. IDS_OPT_EXPORT_CAPTION
-#: Merge.rc:4929
+#: Merge.rc:4939
msgid "Select file for export"
msgstr "Pasirinkite failą eksportui"
#. IDS_OPT_IMPORT_CAPTION
-#: Merge.rc:4930
+#: Merge.rc:4940
msgid "Select file for import"
msgstr "Pasirinkite failą importui"
#. IDS_OPT_IMPORT_DONE
-#: Merge.rc:4931
+#: Merge.rc:4941
msgid "Options imported from file."
msgstr "Iš failo importuoti parametrai."
#. IDS_OPT_EXPORT_DONE
-#: Merge.rc:4932
+#: Merge.rc:4942
msgid "Options exported to file."
msgstr "Į failą eksportuoti parametrai."
#. IDS_OPT_IMPORT_ERR
-#: Merge.rc:4933
+#: Merge.rc:4943
msgid "Failed to import options from file."
msgstr "Nepavyko importuoti parametrų iš failo."
#. IDS_OPT_EXPORT_ERR
-#: Merge.rc:4934
+#: Merge.rc:4944
msgid "Failed to write options to file."
msgstr "Nepavyko įrašyti parametrų į failą."
#. IDS_CLOSEALL_WINDOWS
-#: Merge.rc:4935
+#: Merge.rc:4945
msgid "Close multiple compare windows?\n\nContinue?"
msgstr "Ketinate užverti keletą palyginimo langų.\n\nNorite tęsti?"
#. IDS_EOL_MIXED
-#: Merge.rc:4944
+#: Merge.rc:4954
msgid "Mixed"
msgstr "Mišrus"
#. IDS_EOL_BIN
-#: Merge.rc:4945
+#: Merge.rc:4955
msgctxt "EOL Type"
msgid "Binary"
msgstr "Binarinių"
#. IDS_EOL_NONE
-#: Merge.rc:4949
+#: Merge.rc:4959
msgid "None"
msgstr "Nėra"
#. IDS_MARKER_COLOR_FMT
-#: Merge.rc:4950
+#: Merge.rc:4960
#, c-format
msgid "Marker Color %d"
msgstr "Žymeklio spalva %d"
#. IDS_MARKER_NEW_PATTERN
-#: Merge.rc:4951
+#: Merge.rc:4961
msgid "New Pattern"
msgstr "Naujas šablonas"
#. IDS_PLUGINSLIST_TYPE
-#: Merge.rc:4957
+#: Merge.rc:4967
msgid "Type"
msgstr "Tipas"
#. IDS_PLUGINS_TYPE_EDITSCRIPT
-#: Merge.rc:4961
+#: Merge.rc:4971
msgid "Editor script"
msgstr "Redaktoriaus skriptas"
#. ID_SELECTLINEDIFF
-#: Merge.rc:4967
+#: Merge.rc:4977
msgid "\nDifference in Current Line (F4)"
msgstr "\nSkirtumas dabartinėje eilutėje (F4)"
#. ID_OPTIONS
-#: Merge.rc:4968
+#: Merge.rc:4978
msgid "\nOptions"
msgstr "\nNuostatos"
#. ID_REFRESH
-#: Merge.rc:4969
+#: Merge.rc:4979
msgid "\nRefresh (F5)"
msgstr "\nAtnaujinti (F5)"
#. ID_PREVDIFF
-#: Merge.rc:4975
+#: Merge.rc:4985
msgid "\nPrevious Difference (Alt+Up)"
msgstr "\nPraeitas skirtumas (Alt+Up)"
#. ID_NEXTDIFF
-#: Merge.rc:4976
+#: Merge.rc:4986
msgid "\nNext Difference (Alt+Down)"
msgstr "\nKitas skirtumas (Alt+Down)"
#. ID_PREVCONFLICT
-#: Merge.rc:4977
+#: Merge.rc:4987
msgid "\nPrevious Conflict (Alt+Shift+Up)"
msgstr "\nPraeitas konfliktas (Alt+Shift+Up)"
#. ID_NEXTCONFLICT
-#: Merge.rc:4978
+#: Merge.rc:4988
msgid "\nNext Conflict (Alt+Shift+Down)"
msgstr "\nKitas konfliktas (Alt+Shift+Down)"
#. ID_FIRSTDIFF
-#: Merge.rc:4983
+#: Merge.rc:4993
msgid "\nFirst Difference (Alt+Home)"
msgstr "\nPirmas skirtumas (Alt+Home)"
#. ID_CURDIFF
-#: Merge.rc:4984
+#: Merge.rc:4994
msgid "\nCurrent Difference (Alt+Enter)"
msgstr "\nDabartinis skirtumas (Alt+Enter)"
#. ID_LASTDIFF
-#: Merge.rc:4985
+#: Merge.rc:4995
msgid "\nLast Difference (Alt+End)"
msgstr "\nPaskutinis skirtumas (Alt+End)"
#. ID_L2R
-#: Merge.rc:4986
+#: Merge.rc:4996
msgid "\nCopy to Right (Alt+Right)"
msgstr "\nKopijuoti į dešinę (Alt+Right)"
#. ID_R2L
-#: Merge.rc:4987
+#: Merge.rc:4997
msgid "\nCopy to Left (Alt+Left)"
msgstr "\nKopijuoti į kairę (Alt+Left)"
#. ID_L2RNEXT
-#: Merge.rc:4988
+#: Merge.rc:4998
msgid "\nCopy to Right and Advance (Ctrl+Alt+Right)"
msgstr "\nKopijuoti į dešinę ir Daugiau (Ctrl+Alt+Right)"
#. ID_R2LNEXT
-#: Merge.rc:4989
+#: Merge.rc:4999
msgid "\nCopy to Left and Advance (Ctrl+Alt+Left)"
msgstr "\nKopijuoti į kairę ir Daugiau (Ctrl+Alt+Left)"
#. ID_ALL_RIGHT
-#: Merge.rc:4990
+#: Merge.rc:5000
msgid "\nCopy All to Right"
msgstr "\nKopijuoti viską į dešinę"
#. ID_ALL_LEFT
-#: Merge.rc:4991
+#: Merge.rc:5001
msgid "\nCopy All to Left"
msgstr "\nKopijuoti viską į kairę"
#. ID_AUTO_MERGE
-#: Merge.rc:4992
+#: Merge.rc:5002
msgid "\nAuto Merge (Ctrl+Alt+M)"
msgstr "\nAutomatinis suliejimas (Ctrl+Alt+M)"
#. ID_FIRSTFILE
-#: Merge.rc:4993
+#: Merge.rc:5003
msgid "\nFirst File"
msgstr "\nPirmas failas"
#. ID_NEXTFILE
-#: Merge.rc:4994
+#: Merge.rc:5004
msgid "\nNext File (Ctrl+F8)"
msgstr "\nKitas failas (Ctrl+F8)"
#. ID_LASTFILE
-#: Merge.rc:4995
+#: Merge.rc:5005
msgid "\nLast File"
msgstr "\nPaskutinis failas"
#. ID_PREVFILE
-#: Merge.rc:4996
+#: Merge.rc:5006
msgid "\nPrevious File (Ctrl+F7)"
msgstr "\nPraeitas failas (Ctrl+F7)"
#. IDS_UNPACK_AUTO
-#: Merge.rc:5003
+#: Merge.rc:5013
msgid "Adapted unpacker applied to both files (one needs extension)."
msgstr "Pritaikytas išpakuotojas taikomas abiems failams (tik vienam reikia plėtinio)."
#. IDS_NO_PREDIFFER
-#: Merge.rc:5004
+#: Merge.rc:5014
msgid "No Prediffer (Normal)"
msgstr "Nėra parengėjo (normalu)"
#. IDS_SUGGESTED_PLUGINS
-#: Merge.rc:5005
+#: Merge.rc:5015
msgid "Suggested Plugins"
msgstr "Siūlomi papildiniai"
#. IDS_NOT_SUGGESTED_PLUGINS
-#: Merge.rc:5006
+#: Merge.rc:5016
msgid "All Plugins"
msgstr "Visi papildiniai"
#. IDS_PRIVATEBUILD_FMT
-#: Merge.rc:5012
+#: Merge.rc:5022
#, c-format
msgid "Private Build: %1"
msgstr "Neoficiali versija: %1"
#. IDS_CHECKFORUPDATES_UPTODATE
-#: Merge.rc:5013
+#: Merge.rc:5023
msgid "Your software is up to date."
msgstr "Jūsų programinė įranga yra atnaujinta."
-#: Merge.rc:5015
+#: Merge.rc:5025
#, c-format
msgid "WinMerge update available.\n%1 available (you have %2). Download now?"
msgstr "Yra nauja „WinMerge“ versija.\n%1 dabar yra prieinama (jūs naudojate %2). Norite parsisiųsti dabar?"
#. IDS_ALLRIGHTS_RESERVED
-#: Merge.rc:5016
+#: Merge.rc:5026
msgid " - All rights reserved."
msgstr " - Visos teisės saugomos."
#. IDS_CHECKFORUPDATES_FAILED
-#: Merge.rc:5021
+#: Merge.rc:5031
msgid "Failed to download latest version information"
msgstr "Nepavyko atsisiųsti naujausios versijos informacijos"
#. IDS_TITLE_PLUGINS_SETTINGS
-#: Merge.rc:5027
+#: Merge.rc:5037
msgid "Plugin Settings"
msgstr "Papildinio nuostatos"
#. IDS_NO_SCT_SCRIPTS
-#: Merge.rc:5029
+#: Merge.rc:5039
msgid "WSH not found - .sct scripts disabled"
msgstr "Nerastas WSH - .sct skriptai išjungti"
#. IDS_LOCBAR_GOTOLINE_FMT
-#: Merge.rc:5037
+#: Merge.rc:5047
#, c-format
msgid "G&o to Line %1"
msgstr "E&iti į %1 eilutę"
#. IDS_GOTO_MOVED_LINE
-#: Merge.rc:5043
+#: Merge.rc:5053
msgid "Go to Moved Line\tCtrl+Shift+G"
msgstr "Eiti į perkeltą eilutę\tCtrl+Shift+G"
#. IDS_AUTOCOMPLETE_DISABLED
-#: Merge.rc:5049
+#: Merge.rc:5059
msgctxt "Options dialog|General|Open dialog Auto completion"
msgid "Disabled"
msgstr "Išjungta"
#. IDS_AUTOCOMPLETE_FILE_SYS
-#: Merge.rc:5050
+#: Merge.rc:5060
msgid "From file system"
msgstr "Iš sistemos"
#. IDS_AUTOCOMPLETE_MRU
-#: Merge.rc:5051
+#: Merge.rc:5061
msgid "From Most Recently Used list"
msgstr "Iš dažniausiai naudojamų sąrašo"
#. IDS_COLORSCHEME_PLAIN
-#: Merge.rc:5057
+#: Merge.rc:5067
msgid "No Highlighting"
msgstr "Nenaudoti paryškinimo"
#. IDS_COLORSCHEME_BATCH
-#: Merge.rc:5063
+#: Merge.rc:5073
msgid "Batch"
msgstr "Batch"
#. IDS_COLORSCHEME_PO
-#: Merge.rc:5090
+#: Merge.rc:5100
msgid "Portable Object"
msgstr "Portable Object"
#. IDS_COLORSCHEME_RSRC
-#: Merge.rc:5094
+#: Merge.rc:5104
msgid "Resources"
msgstr "Resources"
#. IDS_COLORSCHEME_SH
-#: Merge.rc:5098
+#: Merge.rc:5108
msgid "Shell"
msgstr "Shell"
#. IDS_CLOSE_LEFT_TABS
-#: Merge.rc:5115
+#: Merge.rc:5125
msgid "Close &Left Tabs"
msgstr "Užverti korteles &kairėje"
#. IDS_CLOSE_RIGHT_TABS
-#: Merge.rc:5116
+#: Merge.rc:5126
msgid "Close R&ight Tabs"
msgstr "Užverti korteles &dešinėje"
#. IDS_CLOSE_OTHER_TABS
-#: Merge.rc:5117
+#: Merge.rc:5127
msgid "Close &Other Tabs"
msgstr "Užverti k&itas korteles"
#. IDS_TABBAR_AUTO_MAXWIDTH
-#: Merge.rc:5118
+#: Merge.rc:5128
msgid "Enable &Auto Max Width"
msgstr "Įjungti &Automatinį maks. plotį"
#. IDS_WEBPAGE_MENU
-#: Merge.rc:5128
+#: Merge.rc:5138
msgid "We&bpage"
msgstr "Ti&nklapiai"
#. IDS_VIEW_WRAP_TEXT
-#: Merge.rc:5133
+#: Merge.rc:5143
msgid "W&rap Text"
msgstr "S&kaidyti tekstą"
#. IDS_NOTINSTALLED
-#: Merge.rc:5138
+#: Merge.rc:5148
msgid "%1 is not installed."
msgstr "„%1“ neįdiegtas."
#. IDS_CREATE_FOLDER
-#: Merge.rc:5143
+#: Merge.rc:5153
#, c-format
msgid "%1 does not exist. Create it?"
msgstr "%1 nėra. Norite jį sukurti?"
#. IDS_CREATE_FOLDER_ERROR
-#: Merge.rc:5144
+#: Merge.rc:5154
msgid "Failed to create folder."
msgstr "Nepavyko sukurti katalogo."
#. IDC_EXT_EDITOR_PATH
-#: Merge.rc:5149
+#: Merge.rc:5159
msgid "Parameters:\n$file: Current file path\n$linenum: Current cursor line number"
msgstr "Parametrai:\n$file: Esamo failo kelio pavadinimas\n$linenum: Esamos žymeklio pozicijos eilutės numeris"
#. IDS_DIFF_ALGORITHM_DEFAULT
-#: Merge.rc:5154
+#: Merge.rc:5164
msgid "default"
msgstr "numatytasis"
#. IDS_DIFF_ALGORITHM_MINIMAL
-#: Merge.rc:5155
+#: Merge.rc:5165
msgid "minimal"
msgstr "minimalus"
#. IDS_DIFF_ALGORITHM_PATIENCE
-#: Merge.rc:5156
+#: Merge.rc:5166
msgid "patience"
msgstr "kantrus"
#. IDS_DIFF_ALGORITHM_HISTOGRAM
-#: Merge.rc:5157
+#: Merge.rc:5167
msgid "histogram"
msgstr "histograma"
#. IDS_DIFF_ALGORITHM_NONE
-#: Merge.rc:5158
+#: Merge.rc:5168
msgid "none"
msgstr "joks"
#. IDS_RENDERING_MODE_GDI
-#: Merge.rc:5163
+#: Merge.rc:5173
msgid "GDI"
msgstr "GDI"
#. IDS_RENDERING_MODE_DIRECTWRITE_DEFAULT
-#: Merge.rc:5164
+#: Merge.rc:5174
msgid "DirectWrite Default"
msgstr "DirectWrite numatytasis"
#. IDS_RENDERING_MODE_DIRECTWRITE_ALIASED
-#: Merge.rc:5165
+#: Merge.rc:5175
msgid "DirectWrite Aliased"
msgstr "DirectWrite dantytasis"
#. IDS_RENDERING_MODE_DIRECTWRITE_GDI_CLASSIC
-#: Merge.rc:5166
+#: Merge.rc:5176
msgid "DirectWrite GDI Classic"
msgstr "DirectWrite GDI klasikinis"
#. IDS_RENDERING_MODE_DIRECTWRITE_GDI_NATURAL
-#: Merge.rc:5167
+#: Merge.rc:5177
msgid "DirectWrite GDI Natural"
msgstr "DirectWrite GDI naturalus"
#. IDS_RENDERING_MODE_DIRECTWRITE_NATURAL
-#: Merge.rc:5168
+#: Merge.rc:5178
msgid "DirectWrite Natural"
msgstr "DirectWrite naturalus"
#. IDS_RENDERING_MODE_DIRECTWRITE_NATURAL_SYMMETRIC
-#: Merge.rc:5169
+#: Merge.rc:5179
msgid "DirectWrite Natural Symmetric"
msgstr "DirectWrite naturalus simetrinis"
#. IDS_CLOSE_WINDOWS_WITH_ESC_DISABLED
-#: Merge.rc:5174
+#: Merge.rc:5184
msgctxt "Options dialog|General|Close windows with Esc"
msgid "Disabled"
msgstr "Išjungta"
#. IDS_CLOSE_WINDOWS_WITH_ESC_1
-#: Merge.rc:5175
+#: Merge.rc:5185
msgid "MDI child window or main window"
msgstr "MDI antrinį arba pagrindinį langą"
#. IDS_CLOSE_WINDOWS_WITH_ESC_2
-#: Merge.rc:5176
+#: Merge.rc:5186
msgid "MDI child window only"
msgstr "Tik MDI antrinį langą"
#. IDS_CLOSE_WINDOWS_WITH_ESC_3
-#: Merge.rc:5177
+#: Merge.rc:5187
msgid "Close main window if only one MDI child window"
msgstr "Užverti pagrindinį langą, jei yra tik vienas MDI antrinis langas"
#. IDS_DIFF_GROUP
-#: Merge.rc:5182
+#: Merge.rc:5192
msgctxt "ImgMergeFrame|LocationPane"
msgid "Diff"
msgstr "Skirtumai"
#. IDS_DIFF_HIGHLIGHT
-#: Merge.rc:5183
+#: Merge.rc:5193
msgctxt "ImgMergeFrame|LocationPane"
msgid "Highlight"
msgstr "Paryškinti"
#. IDS_DIFF_BLINK
-#: Merge.rc:5184
+#: Merge.rc:5194
msgctxt "ImgMergeFrame|LocationPane"
msgid "Blink"
msgstr "Mirksi"
#. IDS_DIFF_BLOCKSIZE
-#: Merge.rc:5185
+#: Merge.rc:5195
msgctxt "ImgMergeFrame|LocationPane"
msgid "Block Size"
msgstr "Bloko dydis"
#. IDS_DIFF_BLOCKALPHA
-#: Merge.rc:5186
+#: Merge.rc:5196
msgctxt "ImgMergeFrame|LocationPane"
msgid "Block Alpha"
msgstr "Bloko alfa"
#. IDS_DIFF_CDTHRESHOLD
-#: Merge.rc:5187
+#: Merge.rc:5197
msgctxt "ImgMergeFrame|LocationPane"
msgid "CD Threshold"
msgstr "CD slenkstis"
#. IDS_DIFF_INSERTION_DELETION_DETECTION
-#: Merge.rc:5188
+#: Merge.rc:5198
msgctxt "ImgMergeFrame|LocationPane"
msgid "Ins/Del Detection"
msgstr "Skirtumų aptikimas"
#. IDS_OVERLAY_MODE_NONE
-#: Merge.rc:5189 Merge.rc:5194
+#: Merge.rc:5199 Merge.rc:5204
msgctxt "ImgMergeFrame|LocationPane"
msgid "None"
msgstr "Nėra"
#. IDS_DIFF_INSERTION_DELETION_DETECTION_VERTICAL
-#: Merge.rc:5190
+#: Merge.rc:5200
msgctxt "ImgMergeFrame|LocationPane"
msgid "Vertical"
msgstr "Vertikaliai"
#. IDS_DIFF_INSERTION_DELETION_DETECTION_HORIZONTAL
-#: Merge.rc:5191
+#: Merge.rc:5201
msgctxt "ImgMergeFrame|LocationPane"
msgid "Horizontal"
msgstr "Horizontaliai"
#. IDS_OVERLAY_GROUP
-#: Merge.rc:5192
+#: Merge.rc:5202
msgctxt "ImgMergeFrame|LocationPane"
msgid "Overlay"
msgstr "Perdengimas"
#. IDS_OVERLAY_ALPHA
-#: Merge.rc:5193
+#: Merge.rc:5203
msgctxt "ImgMergeFrame|LocationPane"
msgid "Alpha"
msgstr "Alfa"
#. IDS_OVERLAY_MODE_XOR
-#: Merge.rc:5195
+#: Merge.rc:5205
msgctxt "ImgMergeFrame|LocationPane"
msgid "XOR"
msgstr "XOR"
#. IDS_OVERLAY_MODE_ALPHA
-#: Merge.rc:5196
+#: Merge.rc:5206
msgctxt "ImgMergeFrame|LocationPane"
msgid "Alpha Blend"
msgstr "Alfa sl. suliejimas"
#. IDS_OVERLAY_MODE_ALPHA_ANIMATION
-#: Merge.rc:5197
+#: Merge.rc:5207
msgctxt "ImgMergeFrame|LocationPane"
msgid "Alpha Animation"
msgstr "Alfa sl. animacija"
#. IDS_ZOOM
-#: Merge.rc:5198
+#: Merge.rc:5208
msgctxt "ImgMergeFrame|LocationPane"
msgid "Zoom"
msgstr "Mastelis"
#. IDS_PAGE
-#: Merge.rc:5199
+#: Merge.rc:5209
msgctxt "ImgMergeFrame|LocationPane"
msgid "Page:"
msgstr "Psl.:"
#. IDS_IMGCMP_STATUS_PT_RGBA_FMT
-#: Merge.rc:5200
+#: Merge.rc:5210
#, c-format
msgid "Pt: (%d, %d) RGBA: (%d, %d, %d, %d) "
msgstr "Tšk.: (%d, %d) RGBA: (%d, %d, %d, %d) "
#. IDS_IMGCMP_STATUS_DIST1_FMT
-#: Merge.rc:5201
+#: Merge.rc:5211
#, c-format
msgid "Dist: %g "
msgstr "Dist: %g "
#. IDS_IMGCMP_STATUS_DIST2_FMT
-#: Merge.rc:5202
+#: Merge.rc:5212
#, c-format
msgid "Dist: %g, %g "
msgstr "Dist: %g, %g "
#. IDS_IMGCMP_STATUS_PAGE_ZOOM_SIZE_BPP_FMT
-#: Merge.rc:5203
+#: Merge.rc:5213
#, c-format
msgid "Page: %d/%d Zoom: %d%% %dx%dpx %dbpp "
msgstr "Psl.: %d/%d Mastelis: %d%% %dx%dpx %dbpp "
#. IDS_IMGCMP_STATUS_RC_FMT
-#: Merge.rc:5204
+#: Merge.rc:5214
#, c-format
msgid "Rc: (%d, %d) "
msgstr "St.: (%d, %d) "
#. IDS_IMGCMP_STATUS_FLIPPED_FMT
-#: Merge.rc:5205
+#: Merge.rc:5215
#, c-format
msgid "Flipped: %s "
msgstr "Apversta: %s "
#. IDS_IMGCMP_STATUS_ROTATED_FMT
-#: Merge.rc:5206
+#: Merge.rc:5216
#, c-format
msgid "Rotated: %d "
msgstr "Pasukta: %d "
#. IDS_IMGCMP_REPORT_ALLPAGES
-#: Merge.rc:5207
+#: Merge.rc:5217
msgid "All pages"
msgstr "Visi psl."
#. IDS_IGNSUB_STR1
-#: Merge.rc:5212
+#: Merge.rc:5222
msgid ""
msgstr ""
#. IDS_IGNSUB_STR2
-#: Merge.rc:5213
+#: Merge.rc:5223
msgid "No differences found to select"
msgstr "Nerasta skirtumų, kuriuos būtų galima pasirinkti"
#. IDS_IGNSUB_STR3
-#: Merge.rc:5214
+#: Merge.rc:5224
msgid "No differences found to add as substitution filter"
msgstr "Nerasta skirtumų, kuriuos būtų galima pridėti kaip keitinio filtrą"
#. IDS_IGNSUB_STR4
-#: Merge.rc:5215
+#: Merge.rc:5225
msgid "The pair is already in the Substitution Filters list"
msgstr "Pora jau yra Keitinių filtrų sąraše"
#. IDS_IGNSUB_STR5
-#: Merge.rc:5216
+#: Merge.rc:5226
msgid "Add this change to Substitution Filters?"
msgstr "Įtraukti šį skirtumą į Keitinių filtrus?"
#. IDS_OCRRESULT_TEXTONLY
-#: Merge.rc:5221
+#: Merge.rc:5231
msgid "Text only"
msgstr "Tik tekstas"
#. IDS_OCRRESULT_POS_LINE
-#: Merge.rc:5222
+#: Merge.rc:5232
msgid "Line-by-line position and text"
msgstr "Paeilutinė pozicija ir tekstas"
#. IDS_OCRRESULT_POS_WORD
-#: Merge.rc:5223
+#: Merge.rc:5233
msgid "Word-by-word position and text"
msgstr "Pažodinė pozicija ir tekstas"
#. IDS_USERDATAFOLDER_APPDATA
-#: Merge.rc:5228
+#: Merge.rc:5238
msgid "AppData (Roaming) folder"
msgstr "„AppData“ (Roaming) kataloge"
#. IDS_USERDATAFOLDER_INSTALL
-#: Merge.rc:5229
+#: Merge.rc:5239
msgid "Install folder"
msgstr "Diegimo kataloge"
#. IDS_USERDATAFOLDER_DOCUMENTS
-#: Merge.rc:5230
+#: Merge.rc:5240
msgid "Documents folder"
msgstr "„Documents“ kataloge"
#. IDS_SINGLEINSTANCE_DISABLED
-#: Merge.rc:5235
+#: Merge.rc:5245
msgctxt "Options dialog|General|Single instance mode"
msgid "Disabled"
msgstr "Išjungta"
#. IDS_SINGLEINSTANCE_STR1
-#: Merge.rc:5236
+#: Merge.rc:5246
msgid "Allow only one instance to run"
msgstr "Leisti vykdyti tik vieną egzempliorių"
#. IDS_SINGLEINSTANCE_STR2
-#: Merge.rc:5237
+#: Merge.rc:5247
msgid "Allow only one instance; wait for termination"
msgstr "Leisti vykdyti tik vieną egzempliorių ir laukti kol jo vykdymas baigsis"
#. IDS_AUTO_RELOAD_MODIFIED_FILES_DISABLED
-#: Merge.rc:5242
+#: Merge.rc:5252
msgctxt "Options dialog|General|Auto-reload modified files"
msgid "Disabled"
msgstr "Išjungta"
#. IDS_AUTO_RELOAD_MODIFIED_FILES_STR1
-#: Merge.rc:5243
+#: Merge.rc:5253
msgid "Only on window activated"
msgstr "Tik suaktyvinus langą"
#. IDS_AUTO_RELOAD_MODIFIED_FILES_STR2
-#: Merge.rc:5244
+#: Merge.rc:5254
msgid "Immediately"
msgstr "Nedelsiant"
#. IDS_PLUGIN_ALL
-#: Merge.rc:5249
+#: Merge.rc:5259
msgid "Al&l"
msgstr "Visi"
#. IDS_PLUGIN_OTHERS
-#: Merge.rc:5250
+#: Merge.rc:5260
msgid "&Others"
msgstr "Kita"
-#: Merge.rc:5252
+#: Merge.rc:5262
#, c-format
msgid "Missing plugin name in pipeline: %1"
msgstr "Trūksta papildinio pavadinimo komandų grandinėje: %1"
-#: Merge.rc:5254
+#: Merge.rc:5264
#, c-format
msgid "Missing quote in plugin pipeline: %1"
msgstr "Trūksta kabučių papildinio komandų grandinėje: %1"
#. IDS_PLUGIN_NAME_ALREADY_EXISTS
-#: Merge.rc:5255
+#: Merge.rc:5265
#, c-format
msgid "Plugin name '%1' already exists."
msgstr "Papildinys '%1' vardu jau yra."
#. IDS_PLUGIN_TITLE1
-#: Merge.rc:5256
+#: Merge.rc:5266
msgid "Specify plugin arguments"
msgstr "Nurodykite papildinio argumentus"
-#: Merge.rc:5258
+#: Merge.rc:5268
#, c-format
msgid "Plugin not found or invalid: %1"
msgstr "Nerastas arba netinkamas papildinys: %1"
#. IDS_PLUGIN_NOT_UNPACK
-#: Merge.rc:5259
+#: Merge.rc:5269
#, c-format
msgid "'%1' is not an unpacker plugin"
msgstr "'%1' nėra išpakuotojas"
#. IDS_PLUGIN_NOT_PREDIFF
-#: Merge.rc:5260
+#: Merge.rc:5270
#, c-format
msgid "'%1' is not a prediffer plugin"
msgstr "'%1' nėra parengėjas"
-#: Merge.rc:5262
+#: Merge.rc:5272
#, c-format
msgid "Error prediffing '%1' with '%2'. Prediffing disabled."
msgstr "Parengimo papildiniui '%2' apdorojant failą '%1' įvyko klaida. Parengimas išjungtas."
#. IDS_PLUGIN_CIRCULAR_REFERENCE
-#: Merge.rc:5263
+#: Merge.rc:5273
#, c-format
msgid "Circular reference in plugin pipeline: %1"
msgstr "Ciklinė nuoroda papildinio komandų grandinėje: %1"
#. IDS_PLUGIN_TYPE1
-#: Merge.rc:5264
+#: Merge.rc:5274
msgid "URL Handler"
msgstr "URL apdorotojas"
#. IDS_PLUGIN_TYPE2
-#: Merge.rc:5265
+#: Merge.rc:5275
msgid "File Unpacker"
msgstr "Failo išpakuotojas"
#. IDS_PLUGIN_TYPE3
-#: Merge.rc:5266
+#: Merge.rc:5276
msgid "File or Folder Unpacker"
msgstr "Failo ar Katalogo išpakuotojas"
#. IDS_PLUGIN_TYPE5
-#: Merge.rc:5268
+#: Merge.rc:5278
msgid "Alias for Unpacker"
msgstr "Išpakuotojo pseudonimas"
#. IDS_PLUGIN_TYPE6
-#: Merge.rc:5269
+#: Merge.rc:5279
msgid "Alias for Prediffer"
msgstr "Parengėjo pseudonimas"
#. IDS_PLUGIN_TYPE7
-#: Merge.rc:5270
+#: Merge.rc:5280
msgid "Alias for Editor script"
msgstr "Redaktoriaus skripto pseudonimas"
#. IDS_PLUGIN_ALIAS_DESC
-#: Merge.rc:5271
+#: Merge.rc:5281
#, c-format
msgid "Alias for plugin pipeline '%1'"
msgstr "Papildinio komandų grandinės '%1' pseudonimas"
#. IDS_PLUGIN_NEW_DESC
-#: Merge.rc:5272
+#: Merge.rc:5282
msgid "New plugin description"
msgstr "Naujo papildinio aprašas"
#. IDS_PLUGIN_TARGETS_ALL
-#: Merge.rc:5273
+#: Merge.rc:5283
msgid "All"
msgstr "Visus"
#. IDS_PLUGIN_TARGETS_1ST
-#: Merge.rc:5274
+#: Merge.rc:5284
msgid "1st"
msgstr "1-ą"
#. IDS_PLUGIN_TARGETS_2ND
-#: Merge.rc:5275
+#: Merge.rc:5285
msgid "2nd"
msgstr "2-ą"
#. IDS_PLUGIN_TARGETS_3RD
-#: Merge.rc:5276
+#: Merge.rc:5286
msgid "3rd"
msgstr "3-ą"
#. IDS_PLUGIN_TARGETS_1ST_2ND
-#: Merge.rc:5277
+#: Merge.rc:5287
msgid "1st and 2nd"
msgstr "1-ą ir 2-ą"
#. IDS_PLUGIN_TARGETS_1ST_3RD
-#: Merge.rc:5278
+#: Merge.rc:5288
msgid "1st and 3rd"
msgstr "1-ą ir 3-ą"
#. IDS_PLUGIN_TARGETS_2ND_3RD
-#: Merge.rc:5279
+#: Merge.rc:5289
msgid "2nd and 3rd"
msgstr "2-ą ir 3-ą"
#. IDS_FILTER_APPLIED
-#: Merge.rc:5284
+#: Merge.rc:5294
msgid "Filter applied"
msgstr "Pritaikytas filtras"
#. IDS_FILTERMENU_COMPARE
-#: Merge.rc:5289
+#: Merge.rc:5299
#, c-format
msgid "Compare %1"
msgstr "Palyginti %1"
#. IDS_FILTERMENU_FILTER_BY_THIS_COLUMN
-#: Merge.rc:5290
+#: Merge.rc:5300
msgid "&Filter by This Column"
msgstr "&Filtruoti pagal šį stulpelį"
#. IDS_FILTERMENU_FILTER_BY_THIS_COLUMN2
-#: Merge.rc:5291
+#: Merge.rc:5301
msgid "&Filter by This Column..."
msgstr "&Filtruoti pagal šį stulpelį..."
#. IDS_CLIPBOARDHISTORY_TIME
-#: Merge.rc:5296
+#: Merge.rc:5306
#, c-format
msgid "Clipboard at %s"
msgstr "Mainų sritis %s"
#. IDS_CLIPBOARDHISTORY_DISABLED
-#: Merge.rc:5297
+#: Merge.rc:5307
msgid "Clipboard history disabled.\r\nEnable: Windows logo key + V, then Turn on."
msgstr "Mainų srities istorijos funkcionalumas išjungtas.\r\nNorėdami įjungti, paspauskite Win+V klavišus ir tada „Įjungti“ mygtuką."
-#: Merge.rc:5299
+#: Merge.rc:5309
msgid "This system does not support clipboard history."
msgstr "Ši sistema nepalaiko mainų srities istorijos."
-#: Merge.rc:5301
+#: Merge.rc:5311
msgid "32-bit WinMerge does not support Clipboard Compare"
msgstr "32 bitų „WinMerge“ versija nepalaiko lyginimo mainų srityje"
#. IDS_WEBVIEW2_RUNTIME_NOT_INSTALLED
-#: Merge.rc:5306
+#: Merge.rc:5316
msgid "WebView2 runtime not installed. Download it?"
msgstr "„WebView2“ vykdymo aplinka neįdiegta. Norite ją parsisiųsti?"
#. IDS_JUMPLIST_NEW_TEXT_COMPARE
-#: Merge.rc:5311
+#: Merge.rc:5321
msgid "New Text Compare"
msgstr "Naujas teksto palyginimas"
#. IDS_JUMPLIST_NEW_TABLE_COMPARE
-#: Merge.rc:5312
+#: Merge.rc:5322
msgid "New Table Compare"
msgstr "Naujas lentelių palyginimas"
#. IDS_JUMPLIST_NEW_BINARY_COMPARE
-#: Merge.rc:5313
+#: Merge.rc:5323
msgid "New Binary Compare"
msgstr "Naujas binarinių failų palyginimas"
#. IDS_JUMPLIST_NEW_IMAGE_COMPARE
-#: Merge.rc:5314
+#: Merge.rc:5324
msgid "New Image Compare"
msgstr "Naujas vaizdų palyginimas"
#. IDS_JUMPLIST_NEW_WEBPAGE_COMPARE
-#: Merge.rc:5315
+#: Merge.rc:5325
msgid "New Webpage Compare"
msgstr "Naujas tinklapių palyginimas"
+#. IDS_JUMPLIST_NEW_FOLDER_COMPARE
+#: Merge.rc:5326
+msgid "New Folder Compare"
+msgstr ""
+
#. IDS_JUMPLIST_CLIPBOARD_COMPARE
-#: Merge.rc:5316
+#: Merge.rc:5327
msgid "Clipboard Compare"
msgstr "Mainų srities palyginimas"
#. IDS_PREVIEWBAR_PRINT
-#: Merge.rc:5321
+#: Merge.rc:5332
msgid "&Print..."
msgstr "S&pausdinti..."
#. IDS_PREVIEWBAR_PREVPAGE
-#: Merge.rc:5323
+#: Merge.rc:5334
msgid "Pre&v Page"
msgstr "P&raeitas psl."
#. IDS_PREVIEWBAR_TWOPAGE
-#: Merge.rc:5324
+#: Merge.rc:5335
msgid "&Two Page"
msgstr "&2 psl."
#. IDS_PREVIEWBAR_ONEPAGE
-#: Merge.rc:5325
+#: Merge.rc:5336
msgid "&One Page"
msgstr "&1 psl."
#. IDS_PREVIEWBAR_ZOOMIN
-#: Merge.rc:5326
+#: Merge.rc:5337
msgid "Zoom &In"
msgstr "Did&inti"
#. IDS_PREVIEWBAR_ZOOMOUT
-#: Merge.rc:5327
+#: Merge.rc:5338
msgid "Zoom &Out"
msgstr "Mažin&ti"
#. IDS_WEBPAGE_COMPARING
-#: Merge.rc:5333
+#: Merge.rc:5344
msgid "Comparing..."
msgstr "Lygina..."
#. IDS_WEBPAGE_ZOOM
-#: Merge.rc:5334
+#: Merge.rc:5345
msgid "Zoom:"
msgstr "Mastelis:"
#. IDS_COPY_GRANULARITY_DIFFHUNK
-#: Merge.rc:5339
+#: Merge.rc:5350
msgid "Diff hunk"
msgstr "Skirt. bloke"
#. IDS_COPY_GRANULARITY_INLINE
-#: Merge.rc:5340
+#: Merge.rc:5351
msgid "Inline diff"
msgstr "Skirt. eilutėje"
#. IDS_COPY_GRANULARITY_LINE
-#: Merge.rc:5341
+#: Merge.rc:5352
msgid "Line"
msgstr "Eilutė"
-#: Merge.rc:5342
+#: Merge.rc:5353
msgid "Character"
msgstr "Simbolis"
#. ID_MICE_PREVDIFF
-#: Merge.rc:5347
+#: Merge.rc:5358
msgid "\nPrevious Difference (Alt+Up)\n(Right Button+Wheel Up)\n(Alt+Wheel Up)"
msgstr "\nPraeitas skirtumas (Alt+Up)\n(Right Button+Wheel Up)\n(Alt+Wheel Up)"
#. ID_MICE_NEXTDIFF
-#: Merge.rc:5348
+#: Merge.rc:5359
msgid "\nNext Difference (Alt+Down)\n(Right Button+Wheel Down)\n(Alt+Wheel Down)"
msgstr "\nKitas skirtumas (Alt+Down)\n(Right Button+Wheel Down)\n(Alt+Wheel Down)"
#. ID_MICE_L2R
-#: Merge.rc:5349
+#: Merge.rc:5360
msgid "\nCopy to Right (Alt+Right)\n(Right Button+Wheel Right)\n(Alt+Wheel Right)\n(Alt+Shift+Wheel Down)"
msgstr "\nKopijuoti į dešinę (Alt+Right)\n(Right Button+Wheel Right)\n(Alt+Wheel Right)\n(Alt+Shift+Wheel Down)"
#. ID_MICE_R2L
-#: Merge.rc:5350
+#: Merge.rc:5361
msgid "\nCopy to Left (Alt+Left)\n(Right Button+Wheel Left)\n(Alt+Wheel Left)\n(Alt+Shift+Wheel Up)"
msgstr "\nKopijuoti į kairę (Alt+Left)\n(Right Button+Wheel Left)\n(Alt+Wheel Left)\n(Alt+Shift+Wheel Up)"
#. ID_MICE_L2RNEXT
-#: Merge.rc:5351
+#: Merge.rc:5362
msgid "\nCopy to Right and Advance (Ctrl+Alt+Right)\n(Ctrl+Alt+Wheel Right)\n(Ctrl+Alt+Shift+Wheel Down)"
msgstr "\nKopijuoti į dešinę ir Daugiau (Ctrl+Alt+Right)\n(Ctrl+Alt+Wheel Right)\n(Ctrl+Alt+Shift+Wheel Down)"
#. ID_MICE_R2LNEXT
-#: Merge.rc:5352
+#: Merge.rc:5363
msgid "\nCopy to Left and Advance (Ctrl+Alt+Left)\n(Ctrl+Alt+Wheel Left)\n(Ctrl+Alt+Shift+Wheel Up)"
msgstr "\nKopijuoti į kairę ir Daugiau (Ctrl+Alt+Left)\n(Ctrl+Alt+Wheel Left)\n(Ctrl+Alt+Shift+Wheel Up)"
#. IDS_LOG_COMPARING_2
-#: Merge.rc:5362
+#: Merge.rc:5373
#, c-format
msgid "Comparing %1 with %2"
msgstr "Lyginama %1 su %2"
#. IDS_LOG_COMPARING_3
-#: Merge.rc:5363
+#: Merge.rc:5374
#, c-format
msgid "Comparing %1 with %2 and %3"
msgstr "Lyginama %1 su %2 ir %3"
#. IDS_LOG_COMPARE_COMPLETED
-#: Merge.rc:5364
+#: Merge.rc:5375
msgid "Comparison completed"
msgstr "Palyginimas baigtas"
#. IDS_LOG_COMPARE_ERROR_2
-#: Merge.rc:5365
+#: Merge.rc:5376
#, c-format
msgid "Failed to compare %1 with %2: "
msgstr "Nepavyko %1 ir %2 palyginimas: "
#. IDS_LOG_COMPARE_ERROR_3
-#: Merge.rc:5366
+#: Merge.rc:5377
#, c-format
msgid "Failed to compare %1 with %2 and %3: "
msgstr "Nepavyko %1, %2 ir %3 palyginimas: "
#. IDS_LOG_FILE_SAVED
-#: Merge.rc:5367
+#: Merge.rc:5378
msgid "File saved"
msgstr "Failas išsaugotas"
#. IDS_LOG_COPYING_FILES
-#: Merge.rc:5368
+#: Merge.rc:5379
msgid "Copying files..."
msgstr "Failų kopijavimas..."
#. IDS_LOG_MOVING_FILES
-#: Merge.rc:5369
+#: Merge.rc:5380
msgid "Moving files..."
msgstr "Failų perkėlimas..."
#. IDS_LOG_DELETING_FILES
-#: Merge.rc:5370
+#: Merge.rc:5381
msgid "Deleting files..."
msgstr "Failų trynimas..."
#. IDS_LOG_RECYCLEBIN
-#: Merge.rc:5371
+#: Merge.rc:5382
msgid "Recycle Bin"
msgstr "Šiukšliadėžė"
#. IDS_LOG_PERMANENTLY_DELETED
-#: Merge.rc:5372
+#: Merge.rc:5383
msgid "Permanently deleted"
msgstr "Ištrinta visam laikui"
#. IDS_LOG_FILEOPERATION_COMPLETED
-#: Merge.rc:5373
+#: Merge.rc:5384
msgid "File operation completed successfully"
msgstr "Failo operacija baigta sėkmingai"
#. IDS_LOG_FILEOPERATION_CANCELED
-#: Merge.rc:5374
+#: Merge.rc:5385
msgid "File operation canceled"
msgstr "Failo operacija atšaukta"
#. IDS_FILTER_ERROR_NO_ERROR
-#: Merge.rc:5379
+#: Merge.rc:5390
msgid "No error"
msgstr "Klaidų nėra"
#. IDS_FILTER_ERROR_EMPTY_EXPRESSION
-#: Merge.rc:5380
+#: Merge.rc:5391
msgid "Filter expression is empty"
msgstr "Filtro išraiška tuščia"
#. IDS_FILTER_ERROR_UNKNOWN_CHAR
-#: Merge.rc:5381
+#: Merge.rc:5392
msgid "Unknown character in filter expression"
msgstr "Nežinomas simbolis filtro išraiškoje"
#. IDS_FILTER_ERROR_UNTERMINATED_STRING
-#: Merge.rc:5382
+#: Merge.rc:5393
msgid "Unterminated string literal"
msgstr "Neužbaigta eilutės tiesioginė išraiška"
#. IDS_FILTER_ERROR_SYNTAX_ERROR
-#: Merge.rc:5383
+#: Merge.rc:5394
msgid "Syntax error in filter expression"
msgstr "Sintaksės klaida filtro išraiškoje"
#. IDS_FILTER_ERROR_PARSE_FAILURE
-#: Merge.rc:5384
+#: Merge.rc:5395
msgid "Failed to parse filter expression"
msgstr "Nepavyko išanalizuoti filtro išraiškos"
#. IDS_FILTER_ERROR_INVALID_LITERAL
-#: Merge.rc:5385
+#: Merge.rc:5396
msgid "Invalid literal value"
msgstr "Klaidinga tiesioginės išraiškos reikšmė"
#. IDS_FILTER_ERROR_INVALID_REGULAR_EXPRESSION
-#: Merge.rc:5386
+#: Merge.rc:5397
msgid "Invalid regular expression"
msgstr "Klaidinga reguliarioji išraiška"
#. IDS_FILTER_ERROR_UNDEFINED_IDENTIFIER
-#: Merge.rc:5387
+#: Merge.rc:5398
msgid "Undefined identifier"
msgstr "Neapibrėžtas identifikatorius"
#. IDS_FILTER_ERROR_INVALID_ARGUMENT_COUNT
-#: Merge.rc:5388
+#: Merge.rc:5399
msgid "Invalid number of arguments"
msgstr "Neteisingas argumentų skaičius"
#. IDS_FILTER_ERROR_FILTER_NAME_NOT_FOUND
-#: Merge.rc:5389
+#: Merge.rc:5400
msgid "Filter name not found"
msgstr "Filtro pavadinimas nerastas"
#. IDS_FILTER_ERROR_DIVIDE_BY_ZERO
-#: Merge.rc:5390
+#: Merge.rc:5401
msgid "Division by zero in filter expression"
msgstr "Dalyba iš nulio filtro išraiškoje"
#. IDS_FILTER_ERROR_UNKNOWN_ERROR
-#: Merge.rc:5391
+#: Merge.rc:5402
msgid "Unknown error"
msgstr "Nežinoma klaida"
#. IDS_FILTER_ERROR_INVALID_PROPERTY_NAME
-#: Merge.rc:5392
+#: Merge.rc:5403
msgid "Invalid property name"
msgstr "Netinkamas ypatybės pavadinimas"
#. IDS_FILTER_ERROR_INVALID_DIRECTIVE
-#: Merge.rc:5393
+#: Merge.rc:5404
msgid "Invalid directive"
msgstr "Netinkama direktyva"
#. IDS_FILTER_OP_EQUALS
-#: Merge.rc:5398
+#: Merge.rc:5409
msgid "Equals"
msgstr "Lygu"
#. IDS_FILTER_OP_NOT_EQUALS
-#: Merge.rc:5399
+#: Merge.rc:5410
msgid "Does not equal"
msgstr "Nelygu"
#. IDS_FILTER_OP_LESS_THAN
-#: Merge.rc:5400
+#: Merge.rc:5411
msgid "Less than"
msgstr "Mažiau nei"
#. IDS_FILTER_OP_LESS_EQUAL
-#: Merge.rc:5401
+#: Merge.rc:5412
msgid "Less than or equal to"
msgstr "Mažiau arba lygu"
#. IDS_FILTER_OP_GREATER_EQUAL
-#: Merge.rc:5402
+#: Merge.rc:5413
msgid "Greater than or equal to"
msgstr "Daugiau arba lygu"
#. IDS_FILTER_OP_GREATER_THAN
-#: Merge.rc:5403
+#: Merge.rc:5414
msgid "Greater than"
msgstr "Daugiau nei"
#. IDS_FILTER_OP_BETWEEN
-#: Merge.rc:5404
+#: Merge.rc:5415
msgid "Between"
msgstr "Tarp"
#. IDS_FILTER_OP_NOT_BETWEEN
-#: Merge.rc:5405
+#: Merge.rc:5416
msgid "Not Between"
msgstr "Ne tarp"
#. IDS_FILTER_OP_CONTAINS
-#: Merge.rc:5406
+#: Merge.rc:5417
msgid "Contains"
msgstr "Turi"
#. IDS_FILTER_OP_NOT_CONTAINS
-#: Merge.rc:5407
+#: Merge.rc:5418
msgid "Not Contains"
msgstr "Neturi"
#. IDS_FILTER_OP_RECONTAINS
-#: Merge.rc:5408
+#: Merge.rc:5419
msgid "Contains (regex)"
msgstr "Turi (regex)"
#. IDS_FILTER_OP_NOT_RECONTAINS
-#: Merge.rc:5409
+#: Merge.rc:5420
msgid "Not Contains (regex)"
msgstr "Neturi (regex)"
#. IDS_FILTER_OP_LIKE
-#: Merge.rc:5410
+#: Merge.rc:5421
msgid "Match (wildcard)"
msgstr "Sutampa (wildcard)"
#. IDS_FILTER_OP_NOT_LIKE
-#: Merge.rc:5411
+#: Merge.rc:5422
msgid "Not match (wildcard)"
msgstr "Nesutampa (wildcard)"
#. IDS_FILTER_OP_MATCHES
-#: Merge.rc:5412
+#: Merge.rc:5423
msgid "Match (regex)"
msgstr "Sutampa (regex)"
#. IDS_FILTER_OP_NOT_MATCHES
-#: Merge.rc:5413
+#: Merge.rc:5424
msgid "Not match (regex)"
msgstr "Nesutampa (regex)"
#. IDS_COLORMODE_LIGHT
-#: Merge.rc:5418
+#: Merge.rc:5429
msgid "Light"
msgstr "Šviesi schema"
#. IDS_COLORMODE_DARK
-#: Merge.rc:5419
+#: Merge.rc:5430
msgid "Dark"
msgstr "Tamsi schema"
#. IDS_COLORMODE_FOLLOWSYSTEM
-#: Merge.rc:5420
+#: Merge.rc:5431
msgid "Follow system"
msgstr "Kaip sistemos"
#. IDS_EXAMPLE
-#: Merge.rc:5425
+#: Merge.rc:5436
#, c-format
msgid "e.g. %1"
msgstr "pvz. %1"
#. IDS_DETECTED_PREVIOUS_CRASH
-#: Merge.rc:5430
+#: Merge.rc:5441
msgid "WinMerge detected a previous crash. Please report this if possible."
msgstr "„WinMerge“ aptiko, kad buvo gedimas. Jei įmanoma, praneškite apie tai."
#. IDS_REGEX_REPLACE_LIST_TEMPLATE
-#: Merge.rc:5435
+#: Merge.rc:5446
msgid "# Regex replacement list\r\n# Format: regexreplacement\r\n# Backreferences like $1, $2 are supported\r\n\r\n(\\d{4})-(\\d{2})-(\\d{2})\t$1_$2_$3\r\n"
msgstr "# Regex pakeitimų sąrašas\r\n# Formatas: regexreplacement\r\n# Backreferences like $1, $2 are supported\r\n\r\n(\\d{4})-(\\d{2})-(\\d{2})\t$1_$2_$3\r\n"
#. IDS_STRING_REPLACE_LIST_TEMPLATE
-#: Merge.rc:5436
+#: Merge.rc:5447
msgid "# Replacement list\r\n# Format: search